unwrap-npm-cmd 1.1.1 → 1.1.2

package/lib/index.js

@@ -43,7 +43,7 @@ function unwrapExe(exe, options) {
   return [quote(process.execPath), quote(jsFile)].join(" ");
 }
 
-module.exports = function(cmd, options = { path: process.env.PATH }) {
+module.exports = function (cmd, options = { path: process.env.PATH }) {
   /* istanbul ignore next */
   if (process.platform !== "win32") {
     return cmd;

package/lib/resolve-npm-cmd.js

@@ -4,7 +4,8 @@ const Fs = require("fs");
 const which = require("which");
 const Path = require("path");
 
-const { quote } = require("./utils");
+const { quote, unquote } = require("./utils");
+const nodeJsVer = parseInt(process.versions.node.split(".")[0]);
 
 module.exports = function resolveNpmCmd(exe, options) {
   // look for the windows CMD batch npm generates for JS
@@ -18,33 +19,35 @@ module.exports = function resolveNpmCmd(exe, options) {
   const script = Fs.readFileSync(resolvedExe)
     .toString()
     .split("\n")
-    .map(x => x.trim());
+    .map((x) => x.trim());
 
   const binName = Path.basename(resolvedExe).toLowerCase();
   const resolvedDir = Path.dirname(resolvedExe);
   // handle npm
   let nodeCmd;
   if (binName === "npm.cmd") {
-    nodeCmd = script.find(l => l.startsWith(`SET "NPM_CLI_JS=`)).replace(/NPM_CLI_JS=/, "");
+    nodeCmd = script.find((l) => l.startsWith(`SET "NPM_CLI_JS=`)).replace(/NPM_CLI_JS=/, "");
   } else if (binName === "npx.cmd") {
-    nodeCmd = script.find(l => l.startsWith(`SET "NPX_CLI_JS=`)).replace(/NPX_CLI_JS=/, "");
+    nodeCmd = script.find((l) => l.startsWith(`SET "NPX_CLI_JS=`)).replace(/NPX_CLI_JS=/, "");
   } else {
     nodeCmd =
-      script.find(l => l.startsWith(`"%~dp0\\node.exe"`)) ||
-      script.find(l => l.startsWith(`"%_prog%"`));
+      script.find((l) => l.startsWith(`"%~dp0\\node.exe"`)) ||
+      script.find((l) => l.startsWith(`"%_prog%"`));
   }
 
   if (!nodeCmd) {
     return quote(resolvedExe);
   }
   // update JS script from batch file
-  const jsFile = Path.normalize(
-    nodeCmd
-      .split(" ")
-      .filter(x => x)[1]
-      .replace(`%~dp0`, resolvedDir)
-      .replace(`%dp0%`, resolvedDir)
-  );
+  const a = nodeCmd.split(" ").filter((x) => x)[1];
+  const b = a.replace(`%~dp0`, resolvedDir).replace(`%dp0%`, resolvedDir);
+  let jsFile;
+  if (nodeJsVer < 18) {
+    jsFile = Path.normalize(b);
+  } else {
+    // starting with version 18, the behavior changed when there're escaping quotes
+    jsFile = quote(Path.normalize(unquote(b)));
+  }
 
   return { jsFile };
 };

package/lib/utils.js

@@ -2,8 +2,8 @@
 
 const Path = require("path");
 
-const unquote = x => (x.startsWith(`"`) ? x.substring(1, x.length - 1) : x);
-const quote = x => (!x.startsWith(`"`) ? `"${x}"` : x);
+const unquote = (x) => x.trim().replace(/^['"]+|['"]+$/g, "");
+const quote = (x) => (!x.startsWith(`"`) ? `"${x}"` : x);
 const relative = (x, cwd) => {
   const r = Path.relative(cwd || process.cwd(), unquote(x));
   return r.startsWith(".") ? r : `.\\${r}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unwrap-npm-cmd",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Unwrap npm's node.js bin CMD batch for js files on Windows",
   "main": "lib/index.js",
   "scripts": {