Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

languages: Respect `devEngines` package manager for package scripts (#58113)

liam0cb2b616f93a
diff --git a/crates/languages/src/package_json.rs b/crates/languages/src/package_json.rs
index 80e9e3cc0d5..a3004420dff 100644
--- a/crates/languages/src/package_json.rs
+++ b/crates/languages/src/package_json.rs
@@ -80,22 +80,7 @@ impl PackageJsonData {
}
}
- let package_manager = package_json
- .get("packageManager")
- .and_then(|value| value.as_str())
- .and_then(|value| {
- if value.starts_with("pnpm") {
- Some("pnpm")
- } else if value.starts_with("yarn") {
- Some("yarn")
- } else if value.starts_with("npm") {
- Some("npm")
- } else if value.starts_with("bun") {
- Some("bun")
- } else {
- None
- }
- });
+ let package_manager = package_manager_from_package_json(&package_json);
Self {
jest_package_path,
@@ -126,3 +111,92 @@ impl PackageJsonData {
self.package_manager = self.package_manager.or(other.package_manager);
}
}
+
+fn package_manager_from_package_json(
+ package_json: &HashMap<String, Value>,
+) -> Option<&'static str> {
+ package_json
+ .get("packageManager")
+ .and_then(|value| value.as_str())
+ .and_then(package_manager_name)
+ .or_else(|| {
+ package_json
+ .get("devEngines")
+ .and_then(|value| value.as_object())
+ .and_then(|dev_engines| dev_engines.get("packageManager"))
+ .and_then(package_manager_from_dev_engine)
+ })
+}
+
+fn package_manager_from_dev_engine(value: &Value) -> Option<&'static str> {
+ match value {
+ Value::Object(package_manager) => package_manager
+ .get("name")
+ .and_then(|name| name.as_str())
+ .and_then(package_manager_name),
+ Value::Array(package_managers) => package_managers
+ .iter()
+ .find_map(package_manager_from_dev_engine),
+ _ => None,
+ }
+}
+
+fn package_manager_name(value: &str) -> Option<&'static str> {
+ let value = value.split_once('@').map(|(name, _)| name).unwrap_or(value);
+ match value {
+ "pnpm" => Some("pnpm"),
+ "yarn" => Some("yarn"),
+ "npm" => Some("npm"),
+ "bun" => Some("bun"),
+ _ => None,
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use std::path::Path;
+
+ use super::PackageJsonData;
+
+ #[test]
+ fn package_manager_detection() {
+ fn package_manager(source: &str) -> Option<&'static str> {
+ PackageJsonData::new(
+ Path::new("/root/package.json").into(),
+ serde_json_lenient::from_str(source).expect("provided source should be valid JSON"),
+ )
+ .package_manager
+ }
+
+ assert_eq!(
+ package_manager(r#"{"packageManager": "[email protected]"}"#),
+ Some("pnpm")
+ );
+
+ assert_eq!(
+ package_manager(
+ r#"{"devEngines": {"packageManager": {"name": "pnpm", "version": "^11.1.3", "onFail": "download"}}}"#
+ ),
+ Some("pnpm"),
+ );
+
+ assert_eq!(
+ package_manager(
+ r#"{"devEngines": {"packageManager": [{"name": "foo"}, {"name": "yarn", "version": "^4.0.0"}]}}"#
+ ),
+ Some("yarn"),
+ );
+
+ assert_eq!(
+ package_manager(
+ r#"{"packageManager": "[email protected]", "devEngines": {"packageManager": {"name": "pnpm"}}}"#
+ ),
+ Some("npm"),
+ );
+
+ assert_eq!(
+ package_manager(r#"{"devEngines": {"packageManager": {"version": "^11.1.3"}}}"#),
+ None,
+ );
+ }
+}