Merge pull request #1039 from neon-bindings/kv/cp-artifact-hotfix

fix(cargo-cp-artifact): Hotfix for change in cargo diagnostics naming

RELEASES.md

@@ -1,3 +1,7 @@
+# `cargo-cp-artifact`
+
+`0.1.9` supports a [breaking change in `cargo`](https://github.com/rust-lang/cargo/issues/13867) that converts artifact names from `kebab-case` to `snake_case`.
+
 # Version 1.0.0
 
 ## Commitment to Compatibility

pkgs/cargo-cp-artifact/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cargo-cp-artifact",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Copies compiler artifacts emitted by rustc by parsing Cargo metadata",
   "main": "src/index.js",
   "files": [

pkgs/cargo-cp-artifact/src/index.js

@@ -80,8 +80,8 @@ function processCargoBuildLine(options, copied, line) {
   // `kind` and `filenames` zip up as key/value pairs
   kinds.forEach((kind, i) => {
     const filename = filenames[i];
-    const key = getArtifactName({ artifactType: kind, crateName: name });
-    const outputFiles = options.artifacts[key];
+    const { key, outputFiles } =
+      getOutputFiles(kind, name, options.artifacts) || {};
 
     if (!outputFiles || !filename) {
       return;
@@ -100,6 +100,24 @@ function processCargoBuildLine(options, copied, line) {
   });
 }
 
+function getOutputFiles(kind, name, artifacts) {
+  const key = getArtifactName({ artifactType: kind, crateName: name });
+  const outputFiles = artifacts[key];
+
+  if (outputFiles) {
+    return { key, outputFiles };
+  }
+
+  // Cargo started replacing `-` with `_` in artifact names. Reverse the process
+  // and check again. https://github.com/rust-lang/cargo/issues/13867
+  const altKey = key.replace(/_/g, "-");
+
+  return {
+    key: altKey,
+    outputFiles: artifacts[altKey],
+  };
+}
+
 async function isNewer(filename, outputFile) {
   try {
     const prevStats = await stat(outputFile);

test/electron/package.json

@@ -13,7 +13,7 @@
   "repository": "https://github.com/electron/electron-quick-start",
   "devDependencies": {
     "@playwright/test": "^1.40.1",
-    "cargo-cp-artifact": "^0.1.8",
+    "cargo-cp-artifact": "^0.1.9",
     "electron": "^27.1.3",
     "playwright": "^1.40.1"
   }

test/napi/package.json

@@ -10,7 +10,7 @@
     "test": "mocha --v8-expose-gc --timeout 5000 --recursive lib"
   },
   "devDependencies": {
-    "cargo-cp-artifact": "^0.1.8",
+    "cargo-cp-artifact": "^0.1.9",
     "chai": "^4.3.10",
     "mocha": "^10.2.0"
   }