add test

dsherret · dsherret · commit a06870cbc7ce · 2025-03-13T12:43:58.000-04:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -596,6 +596,7 @@ impl Lockfile {
     // npm resolution just for that part, so for now, clear out all the npm dependencies
     // if any patch changes
     if has_any_patch_changed {
+      self.has_content_changed = true;
       self.content.packages.npm.clear();
       self
         .content
diff --git a/src/printer.rs b/src/printer.rs
@@ -93,7 +93,7 @@ struct SerializedWorkspaceConfigContent<'a> {
 
 impl SerializedWorkspaceConfigContent<'_> {
   pub fn is_empty(&self) -> bool {
-    self.root.is_empty() && self.members.is_empty()
+    self.root.is_empty() && self.members.is_empty() && self.patches.is_empty()
   }
 }
 
diff --git a/tests/spec_test.rs b/tests/spec_test.rs
@@ -69,6 +69,13 @@ fn config_changes_test(test: &CollectedTest) {
     package_json: LockfilePackageJsonContent,
   }
 
+  #[derive(Debug, Default, Clone, Deserialize, Hash)]
+  #[serde(rename_all = "camelCase")]
+  struct PatchConfigContent {
+    #[serde(default)]
+    dependencies: BTreeSet<JsrDepPackageReq>,
+  }
+
   #[derive(Debug, Default, Clone, Deserialize, Hash)]
   #[serde(rename_all = "camelCase")]
   struct WorkspaceConfigContent {
@@ -77,6 +84,9 @@ fn config_changes_test(test: &CollectedTest) {
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
     #[serde(default)]
     members: BTreeMap<String, WorkspaceMemberConfigContent>,
+    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    #[serde(default)]
+    patches: BTreeMap<String, PatchConfigContent>,
   }
 
   impl WorkspaceConfigContent {
@@ -108,7 +118,11 @@ fn config_changes_test(test: &CollectedTest) {
             )
           })
           .collect(),
-        patches: Default::default(),
+        patches: self
+          .patches
+          .into_iter()
+          .map(|(k, v)| (k, v.dependencies.into_iter().collect()))
+          .collect(),
       }
     }
   }
diff --git a/tests/specs/config_changes/PatchChangingRemovesNpmDeps.txt b/tests/specs/config_changes/PatchChangingRemovesNpmDeps.txt
@@ -0,0 +1,186 @@
+# original
+{
+  "version": "4",
+  "specifiers": {
+    "jsr:@scope/package_a@*": "0.0.1",
+    "npm:ts-morph@*": "21.0.1"
+  },
+  "jsr": {
+    "@scope/package_a@0.0.1": {
+      "integrity": "09154a97e18c4d6a1692e3b3c8a3b1ec2934f00b7c1caf7491d762d963ada045"
+    }
+  },
+  "npm": {
+    "@nodelib/fs.scandir@2.1.5": {
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dependencies": [
+        "@nodelib/fs.stat",
+        "run-parallel"
+      ]
+    },
+    "@nodelib/fs.stat@2.0.5": {
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
+    },
+    "@nodelib/fs.walk@1.2.8": {
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dependencies": [
+        "@nodelib/fs.scandir",
+        "fastq"
+      ]
+    },
+    "@ts-morph/common@0.22.0": {
+      "integrity": "sha512-HqNBuV/oIlMKdkLshXd1zKBqNQCsuPEsgQOkfFQ/eUKjRlwndXW1AjN9LVkBEIukm00gGXSRmfkl0Wv5VXLnlw==",
+      "dependencies": [
+        "fast-glob",
+        "minimatch",
+        "mkdirp",
+        "path-browserify"
+      ]
+    },
+    "balanced-match@1.0.2": {
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "brace-expansion@2.0.1": {
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": [
+        "balanced-match"
+      ]
+    },
+    "braces@3.0.2": {
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": [
+        "fill-range"
+      ]
+    },
+    "code-block-writer@12.0.0": {
+      "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w=="
+    },
+    "fast-glob@3.3.2": {
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "dependencies": [
+        "@nodelib/fs.stat",
+        "@nodelib/fs.walk",
+        "glob-parent",
+        "merge2",
+        "micromatch"
+      ]
+    },
+    "fastq@1.16.0": {
+      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+      "dependencies": [
+        "reusify"
+      ]
+    },
+    "fill-range@7.0.1": {
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": [
+        "to-regex-range"
+      ]
+    },
+    "glob-parent@5.1.2": {
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dependencies": [
+        "is-glob"
+      ]
+    },
+    "is-extglob@2.1.1": {
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
+    },
+    "is-glob@4.0.3": {
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dependencies": [
+        "is-extglob"
+      ]
+    },
+    "is-number@7.0.0": {
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+    },
+    "merge2@1.4.1": {
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+    },
+    "micromatch@4.0.5": {
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dependencies": [
+        "braces",
+        "picomatch"
+      ]
+    },
+    "minimatch@9.0.3": {
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dependencies": [
+        "brace-expansion"
+      ]
+    },
+    "mkdirp@3.0.1": {
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="
+    },
+    "path-browserify@1.0.1": {
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
+    },
+    "picomatch@2.3.1": {
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+    },
+    "queue-microtask@1.2.3": {
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+    },
+    "reusify@1.0.4": {
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+    },
+    "run-parallel@1.2.0": {
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dependencies": [
+        "queue-microtask"
+      ]
+    },
+    "to-regex-range@5.0.1": {
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": [
+        "is-number"
+      ]
+    },
+    "ts-morph@21.0.1": {
+      "integrity": "sha512-dbDtVdEAncKctzrVZ+Nr7kHpHkv+0JDJb2MjjpBaj8bFeCkePU9rHfMklmhuLFnpeq/EJZk2IhStY6NzqgjOkg==",
+      "dependencies": [
+        "@ts-morph/common",
+        "code-block-writer"
+      ]
+    }
+  },
+  "workspace": {
+    "patches": {
+      "npm:ts-morph@21.0.1": {
+        "dependencies": [
+          "npm:code-block-writer@12"
+        ]
+      }
+    }
+  }
+}
+
+# remove
+{
+  "patches": {
+    "npm:ts-morph@21.0.1": {
+      "dependencies": [
+      ]
+    }
+  }
+}
+
+# output
+{
+  "version": "4",
+  "specifiers": {
+    "jsr:@scope/package_a@*": "0.0.1"
+  },
+  "jsr": {
+    "@scope/package_a@0.0.1": {
+      "integrity": "09154a97e18c4d6a1692e3b3c8a3b1ec2934f00b7c1caf7491d762d963ada045"
+    }
+  },
+  "workspace": {
+    "patches": {
+      "npm:ts-morph@21.0.1": {}
+    }
+  }
+}
diff --git a/tests/specs/config_changes/PatchNotChangingKeepsNpmDeps.txt b/tests/specs/config_changes/PatchNotChangingKeepsNpmDeps.txt

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ struct SerializedWorkspaceConfigContent<'a> {`
`93`	`93`
`94`	`94`	`impl SerializedWorkspaceConfigContent<'_> {`
`95`	`95`	`pub fn is_empty(&self) -> bool {`
`96`		`- self.root.is_empty() && self.members.is_empty()`
	`96`	`+ self.root.is_empty() && self.members.is_empty() && self.patches.is_empty()`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,13 @@ fn config_changes_test(test: &CollectedTest) {`
`69`	`69`	`package_json: LockfilePackageJsonContent,`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ #[derive(Debug, Default, Clone, Deserialize, Hash)]`
	`73`	`+ #[serde(rename_all = "camelCase")]`
	`74`	`+ struct PatchConfigContent {`
	`75`	`+ #[serde(default)]`
	`76`	`+ dependencies: BTreeSet<JsrDepPackageReq>,`
	`77`	`+ }`
	`78`	`+`
`72`	`79`	`#[derive(Debug, Default, Clone, Deserialize, Hash)]`
`73`	`80`	`#[serde(rename_all = "camelCase")]`
`74`	`81`	`struct WorkspaceConfigContent {`
`@@ -77,6 +84,9 @@ fn config_changes_test(test: &CollectedTest) {`
`77`	`84`	`#[serde(skip_serializing_if = "BTreeMap::is_empty")]`
`78`	`85`	`#[serde(default)]`
`79`	`86`	`members: BTreeMap<String, WorkspaceMemberConfigContent>,`
	`87`	`+ #[serde(skip_serializing_if = "BTreeMap::is_empty")]`
	`88`	`+ #[serde(default)]`
	`89`	`+ patches: BTreeMap<String, PatchConfigContent>,`
`80`	`90`	`}`
`81`	`91`
`82`	`92`	`impl WorkspaceConfigContent {`
`@@ -108,7 +118,11 @@ fn config_changes_test(test: &CollectedTest) {`
`108`	`118`	`)`
`109`	`119`	`})`
`110`	`120`	`.collect(),`
`111`		`- patches: Default::default(),`
	`121`	`+ patches: self`
	`122`	`+ .patches`
	`123`	`+ .into_iter()`
	`124`	`+ .map(\|(k, v)\| (k, v.dependencies.into_iter().collect()))`
	`125`	`+ .collect(),`
`112`	`126`	`}`
`113`	`127`	`}`
`114`	`128`	`}`