unwrap-npm-cmd 1.1.0 → 1.1.2

package/README.md

@@ -10,17 +10,17 @@ console.log(unwrapNpmCmd("npm test"));
 console.log(unwrapNpmCmd("npx mocha", { relative: true }));
 console.log(unwrapNpmCmd("mocha test", { jsOnly: true }));
 console.log(unwrapNpmCmd(`find "name" package.json`));
-console.log(unwrapNpmCmd("hello world", { relative: true, path: __dirname }));
+console.log(unwrapNpmCmd("hello world", { path: __dirname }));
 ```
 
 Output:
 
 ```cmd
 "C:\Users\userid\nvm\nodejs\bin\node.exe" "C:\Users\userid\nvm\nodejs\bin\node_modules\npm\bin\npm-cli.js" test
-"C:\Users\userid\nvm\nodejs\bin\node.exe" ..\nvm\nodejs\bin\node_modules\npm\bin\npx-cli.js mocha
+"C:\Users\userid\nvm\nodejs\bin\node.exe" "..\nvm\nodejs\bin\node_modules\npm\bin\npx-cli.js" mocha
 "C:\Users\userid\unwrap-npm-cmd\node_modules\mocha\bin\mocha" test
 "C:\WINDOWS\system32\find.EXE" "name" package.json
-".\test\fixtures\hello.CMD" world
+"C:\Users\userid\unwrap-npm-cmd\test\fixtures\hello.CMD" world
 ```
 
 ## Usage

package/lib/index.js

@@ -1,59 +1,59 @@
-"use strict";
-
-const resolveNmpCmd = require("./resolve-npm-cmd");
-const { quote, relative } = require("./utils");
-
-const RESOLVE_CACHE = {};
-
-function unwrapExe(exe, options) {
-  let pathCache = RESOLVE_CACHE[options.path];
-
-  if (!pathCache) {
-    pathCache = RESOLVE_CACHE[options.path] = {};
-  }
-
-  let newExe;
-
-  if (pathCache[exe]) {
-    newExe = pathCache[exe];
-  } else {
-    try {
-      newExe = resolveNmpCmd(exe, options);
-      pathCache[exe] = newExe;
-    } catch (err) {
-      pathCache[exe] = exe;
-      return exe;
-    }
-  }
-
-  if (typeof newExe === "string") {
-    return newExe;
-  }
-
-  let { jsFile } = newExe;
-
-  if (options && options.relative) {
-    jsFile = relative(jsFile, options.cwd);
-  }
-
-  if (options && options.jsOnly) {
-    return quote(jsFile);
-  }
-
-  return [quote(process.execPath), quote(jsFile)].join(" ");
-}
-
-module.exports = function(cmd, options = { path: process.env.PATH }) {
-  /* istanbul ignore next */
-  if (process.platform !== "win32") {
-    return cmd;
-  }
-
-  const cmdParts = cmd.split(" ");
-  const exe = unwrapExe(cmdParts[0], options);
-  if (exe !== cmdParts[0]) {
-    return [exe].concat(cmdParts.slice(1)).join(" ");
-  } else {
-    return cmd;
-  }
-};
+"use strict";
+
+const resolveNmpCmd = require("./resolve-npm-cmd");
+const { quote, relative } = require("./utils");
+
+const RESOLVE_CACHE = {};
+
+function unwrapExe(exe, options) {
+  let pathCache = RESOLVE_CACHE[options.path];
+
+  if (!pathCache) {
+    pathCache = RESOLVE_CACHE[options.path] = {};
+  }
+
+  let newExe;
+
+  if (pathCache[exe]) {
+    newExe = pathCache[exe];
+  } else {
+    try {
+      newExe = resolveNmpCmd(exe, options);
+      pathCache[exe] = newExe;
+    } catch (err) {
+      pathCache[exe] = exe;
+      return exe;
+    }
+  }
+
+  if (typeof newExe === "string") {
+    return newExe;
+  }
+
+  let { jsFile } = newExe;
+
+  if (options && options.relative) {
+    jsFile = relative(jsFile, options.cwd);
+  }
+
+  if (options && options.jsOnly) {
+    return quote(jsFile);
+  }
+
+  return [quote(process.execPath), quote(jsFile)].join(" ");
+}
+
+module.exports = function (cmd, options = { path: process.env.PATH }) {
+  /* istanbul ignore next */
+  if (process.platform !== "win32") {
+    return cmd;
+  }
+
+  const cmdParts = cmd.split(" ");
+  const exe = unwrapExe(cmdParts[0], options);
+  if (exe !== cmdParts[0]) {
+    return [exe].concat(cmdParts.slice(1)).join(" ");
+  } else {
+    return cmd;
+  }
+};

package/lib/resolve-npm-cmd.js

@@ -1,47 +1,53 @@
-"use strict";
-
-const Fs = require("fs");
-const which = require("which");
-const Path = require("path");
-
-const { quote } = require("./utils");
-
-module.exports = function resolveNpmCmd(exe, options) {
-  // look for the windows CMD batch npm generates for JS
-  const resolvedExe = which.sync(exe, options);
-  if (Path.extname(resolvedExe).toLowerCase() !== ".cmd") {
-    // since we already did the work to find it, use found full path
-    return quote(resolvedExe);
-  }
-
-  // read the batch and find the node.exe execution line
-  const script = Fs.readFileSync(resolvedExe)
-    .toString()
-    .split("\n")
-    .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=/, "");
-  } else if (binName === "npx.cmd") {
-    nodeCmd = script.find(l => l.startsWith(`SET "NPX_CLI_JS=`)).replace(/NPX_CLI_JS=/, "");
-  } else {
-    nodeCmd = script.find(l => l.startsWith(`"%~dp0\\node.exe"`));
-  }
-
-  if (!nodeCmd) {
-    return quote(resolvedExe);
-  }
-  // update JS script from batch file
-  const jsFile = Path.normalize(
-    nodeCmd
-      .split(" ")
-      .filter(x => x)[1]
-      .replace(`%~dp0`, resolvedDir)
-  );
-
-  return { jsFile };
-};
+"use strict";
+
+const Fs = require("fs");
+const which = require("which");
+const Path = require("path");
+
+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
+  const resolvedExe = which.sync(exe, options);
+  if (Path.extname(resolvedExe).toLowerCase() !== ".cmd") {
+    // since we already did the work to find it, use found full path
+    return quote(resolvedExe);
+  }
+
+  // read the batch and find the node.exe execution line
+  const script = Fs.readFileSync(resolvedExe)
+    .toString()
+    .split("\n")
+    .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=/, "");
+  } else if (binName === "npx.cmd") {
+    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%"`));
+  }
+
+  if (!nodeCmd) {
+    return quote(resolvedExe);
+  }
+  // update JS script from batch file
+  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

@@ -1,12 +1,12 @@
-"use strict";
-
-const Path = require("path");
-
-const unquote = x => (x.startsWith(`"`) ? x.substring(1, x.length - 1) : x);
-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}`;
-};
-
-module.exports = { unquote, quote, relative };
+"use strict";
+
+const Path = require("path");
+
+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}`;
+};
+
+module.exports = { unquote, quote, relative };

package/package.json

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