Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
node_runtime: Fix npm v12 output deserialization (#60798)
Vitaly Slobodin8c4550cb95d8
diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rsindex e960634a842..035c86f8adf 100644--- a/crates/node_runtime/src/node_runtime.rs+++ b/crates/node_runtime/src/node_runtime.rs@@ -273,7 +273,12 @@ impl NodeRuntime {).await?;- let info: NpmInfo = serde_json::from_slice(&output.stdout)?;+ let info: NpmInfo = deserialize_npm_info_from_response(&output.stdout).map_err(|e| {+ anyhow::anyhow!(+ "failed to parse npm info response: {e}\nstdout: {}",+ String::from_utf8_lossy(&output.stdout)+ )+ })?;let before = npm_config_before(instance.as_ref(), http.proxy()).await.context("getting npm before config")@@ -412,6 +417,21 @@ pub struct NpmInfo {time: HashMap<String, String>,}+/// Parse NpmInfo from npm info --json output, handling both v11 and >= v12 formats.+fn deserialize_npm_info_from_response(data: &[u8]) -> Result<NpmInfo, serde_json::Error> {+ let value: serde_json::Value = serde_json::from_slice(data)?;++ // npm >= 12 returns an array with one object: [ { ... } ]+ if let serde_json::Value::Array(arr) = &value {+ if arr.len() == 1 {+ return NpmInfo::deserialize(&arr[0]);+ }+ }++ // npm <= v11 returns a bare JSON object: { ... }+ NpmInfo::deserialize(value)+}+#[derive(Debug, Deserialize, Default)]pub struct NpmInfoDistTags {latest: Option<Version>,@@ -1104,8 +1124,8 @@ mod tests {use semver::Version;use super::{- NpmInfo, VersionStrategy, build_npm_command_args, proxy_argument,- select_npm_package_version, should_install_npm_package_version,+ NpmInfo, VersionStrategy, build_npm_command_args, deserialize_npm_info_from_response,+ proxy_argument, select_npm_package_version, should_install_npm_package_version,};// Map localhost to 127.0.0.1@@ -1384,4 +1404,46 @@ mod tests {);Ok(())}++ #[test]+ fn test_deserialize_npm_info_npm11_format() -> Result<()> {+ let json = r#"{+ "dist-tags": { "latest": "3.0.0" },+ "versions": ["1.0.0", "2.0.0", "3.0.0"]+ }"#;++ let info = deserialize_npm_info_from_response(json.as_bytes())?;+ assert_eq!(info.dist_tags.latest, Some(Version::parse("3.0.0")?));+ assert_eq!(+ info.versions,+ vec![+ Version::parse("1.0.0")?,+ Version::parse("2.0.0")?,+ Version::parse("3.0.0")?+ ]+ );+ Ok(())+ }++ #[test]+ fn test_deserialize_npm_v12_format() -> Result<()> {+ let json = r#"[+ {+ "dist-tags": { "latest": "3.0.0" },+ "versions": ["1.0.0", "2.0.0", "3.0.0"]+ }+ ]"#;++ let info = deserialize_npm_info_from_response(json.as_bytes())?;+ assert_eq!(info.dist_tags.latest, Some(Version::parse("3.0.0")?));+ assert_eq!(+ info.versions,+ vec![+ Version::parse("1.0.0")?,+ Version::parse("2.0.0")?,+ Version::parse("3.0.0")?+ ]+ );+ Ok(())+ }}