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.

node_runtime: Tolerate non-string values in npm time metadata (#57765)

Luke Deen Taylore25458243bb5
diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
index 7ce29532644..e960634a842 100644
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -408,7 +408,7 @@ pub struct NpmInfo {
#[serde(default)]
dist_tags: NpmInfoDistTags,
versions: Vec<Version>,
- #[serde(default)]
+ #[serde(default, deserialize_with = "deserialize_npm_info_time")]
time: HashMap<String, String>,
}
@@ -417,6 +417,25 @@ pub struct NpmInfoDistTags {
latest: Option<Version>,
}
+// Some registries put non-string values in the `time` map: JFrog Artifactory emits
+// `"unpublished": null`, and npm itself reports `unpublished` as an object when a
+// package has had versions unpublished. Only version keys map to the RFC 3339 strings
+// we read, so keep the string entries and drop the rest rather than failing to parse
+// the entire `npm info` response (which would block language server installation).
+fn deserialize_npm_info_time<'de, D>(deserializer: D) -> Result<HashMap<String, String>, D::Error>
+where
+ D: serde::Deserializer<'de>,
+{
+ let entries = HashMap::<String, serde_json::Value>::deserialize(deserializer)?;
+ Ok(entries
+ .into_iter()
+ .filter_map(|(key, value)| match value {
+ serde_json::Value::String(value) => Some((key, value)),
+ _ => None,
+ })
+ .collect())
+}
+
#[derive(Debug, Deserialize)]
struct NpmConfig {
#[serde(default)]
@@ -1212,6 +1231,31 @@ mod tests {
Ok(())
}
+ #[test]
+ fn test_npm_info_skips_non_string_time_entries() -> Result<()> {
+ // Registries such as JFrog Artifactory include `"unpublished": null` in `time`;
+ // parsing must tolerate this rather than rejecting the whole response.
+ let info: NpmInfo = serde_json::from_str(
+ r#"{
+ "dist-tags": { "latest": "2.0.0" },
+ "versions": ["1.0.0", "2.0.0"],
+ "time": {
+ "unpublished": null,
+ "created": "2024-01-01T00:00:00.000Z",
+ "modified": "2024-02-01T00:00:00.000Z",
+ "1.0.0": "2024-01-01T00:00:00.000Z",
+ "2.0.0": "2024-02-01T00:00:00.000Z"
+ }
+ }"#,
+ )?;
+
+ assert_eq!(
+ select_npm_package_version("test-package", info, Some("2024-02-15T00:00:00.000Z"))?,
+ Version::parse("2.0.0")?
+ );
+ Ok(())
+ }
+
#[test]
fn test_select_npm_package_version_uses_latest_before_npm_before_config() -> Result<()> {
let info: NpmInfo = serde_json::from_str(