cross-spawn-cb 0.6.12 → 0.6.13

package/lib/{cross-spawn.js → cross-spawn-6.0.5.js}

@@ -1,25 +1,5 @@
 'use strict';
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, '__esModule', {
@@ -32,6 +12,8 @@ var require$$0$1 = require('path');
 
 var require$$0 = require('fs');
 
+var require$$5 = require('semver');
+
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
@@ -44,10 +26,24 @@ var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 
+var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
+
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 var crossSpawn = {
   exports: {}
 };
+/**
+ * Tries to execute a function and discards any error that occurs.
+ * @param {Function} fn - Function that might or might not throw an error.
+ * @returns {?*} Return-value of the function when no error occurred.
+ */
+
+var src = function src(fn) {
+  try {
+    return fn();
+  } catch (e) {}
+};
+
 var windows;
 var hasRequiredWindows;
 
@@ -203,106 +199,109 @@ function sync$1(path, options) {
   }
 }
 
+var which_1 = which$1;
+which$1.sync = whichSync;
 var isWindows = process.platform === 'win32' || process.env.OSTYPE === 'cygwin' || process.env.OSTYPE === 'msys';
 var path$2 = require$$0__default$1["default"];
 var COLON = isWindows ? ';' : ':';
 var isexe = isexe_1;
 
-var getNotFoundError = function getNotFoundError(cmd) {
-  return Object.assign(new Error("not found: ".concat(cmd)), {
-    code: 'ENOENT'
-  });
-};
-
-var getPathInfo = function getPathInfo(cmd, opt) {
-  var colon = opt.colon || COLON; // If it has a slash, then we don't bother searching the pathenv.
-  // just check the file itself, and that's it.
+function getNotFoundError(cmd) {
+  var er = new Error('not found: ' + cmd);
+  er.code = 'ENOENT';
+  return er;
+}
 
-  var pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? [''] : [].concat(_toConsumableArray(isWindows ? [process.cwd()] : []), _toConsumableArray((opt.path || process.env.PATH ||
-  /* istanbul ignore next: very unusual */
-  '').split(colon)));
-  var pathExtExe = isWindows ? opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM' : '';
-  var pathExt = isWindows ? pathExtExe.split(colon) : [''];
+function getPathInfo(cmd, opt) {
+  var colon = opt.colon || COLON;
+  var pathEnv = opt.path || process.env.PATH || '';
+  var pathExt = [''];
+  pathEnv = pathEnv.split(colon);
+  var pathExtExe = '';
 
   if (isWindows) {
+    pathEnv.unshift(process.cwd());
+    pathExtExe = opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM';
+    pathExt = pathExtExe.split(colon); // Always test the cmd itself first.  isexe will check to make sure
+    // it's found in the pathExt set.
+
     if (cmd.indexOf('.') !== -1 && pathExt[0] !== '') pathExt.unshift('');
-  }
+  } // If it has a slash, then we don't bother searching the pathenv.
+  // just check the file itself, and that's it.
+
 
+  if (cmd.match(/\//) || isWindows && cmd.match(/\\/)) pathEnv = [''];
   return {
-    pathEnv: pathEnv,
-    pathExt: pathExt,
-    pathExtExe: pathExtExe
+    env: pathEnv,
+    ext: pathExt,
+    extExe: pathExtExe
   };
-};
+}
 
-var which$1 = function which$1(cmd, opt, cb) {
+function which$1(cmd, opt, cb) {
   if (typeof opt === 'function') {
     cb = opt;
     opt = {};
   }
 
-  if (!opt) opt = {};
+  var info = getPathInfo(cmd, opt);
+  var pathEnv = info.env;
+  var pathExt = info.ext;
+  var pathExtExe = info.extExe;
+  var found = [];
 
-  var _getPathInfo = getPathInfo(cmd, opt),
-      pathEnv = _getPathInfo.pathEnv,
-      pathExt = _getPathInfo.pathExt,
-      pathExtExe = _getPathInfo.pathExtExe;
+  (function F(i, l) {
+    if (i === l) {
+      if (opt.all && found.length) return cb(null, found);else return cb(getNotFoundError(cmd));
+    }
 
-  var found = [];
+    var pathPart = pathEnv[i];
+    if (pathPart.charAt(0) === '"' && pathPart.slice(-1) === '"') pathPart = pathPart.slice(1, -1);
+    var p = path$2.join(pathPart, cmd);
 
-  var step = function step(i) {
-    return new Promise(function (resolve, reject) {
-      if (i === pathEnv.length) return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
-      var ppRaw = pathEnv[i];
-      var pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-      var pCmd = path$2.join(pathPart, cmd);
-      var p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-      resolve(subStep(p, i, 0));
-    });
-  };
+    if (!pathPart && /^\.[\\\/]/.test(cmd)) {
+      p = cmd.slice(0, 2) + p;
+    }
 
-  var subStep = function subStep(p, i, ii) {
-    return new Promise(function (resolve, reject) {
-      if (ii === pathExt.length) return resolve(step(i + 1));
+    (function E(ii, ll) {
+      if (ii === ll) return F(i + 1, l);
       var ext = pathExt[ii];
       isexe(p + ext, {
         pathExt: pathExtExe
       }, function (er, is) {
         if (!er && is) {
-          if (opt.all) found.push(p + ext);else return resolve(p + ext);
+          if (opt.all) found.push(p + ext);else return cb(null, p + ext);
         }
 
-        return resolve(subStep(p, i, ii + 1));
+        return E(ii + 1, ll);
       });
-    });
-  };
-
-  return cb ? step(0).then(function (res) {
-    return cb(null, res);
-  }, cb) : step(0);
-};
+    })(0, pathExt.length);
+  })(0, pathEnv.length);
+}
 
-var whichSync = function whichSync(cmd, opt) {
+function whichSync(cmd, opt) {
   opt = opt || {};
-
-  var _getPathInfo2 = getPathInfo(cmd, opt),
-      pathEnv = _getPathInfo2.pathEnv,
-      pathExt = _getPathInfo2.pathExt,
-      pathExtExe = _getPathInfo2.pathExtExe;
-
+  var info = getPathInfo(cmd, opt);
+  var pathEnv = info.env;
+  var pathExt = info.ext;
+  var pathExtExe = info.extExe;
   var found = [];
 
-  for (var i = 0; i < pathEnv.length; i++) {
-    var ppRaw = pathEnv[i];
-    var pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-    var pCmd = path$2.join(pathPart, cmd);
-    var p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
+  for (var i = 0, l = pathEnv.length; i < l; i++) {
+    var pathPart = pathEnv[i];
+    if (pathPart.charAt(0) === '"' && pathPart.slice(-1) === '"') pathPart = pathPart.slice(1, -1);
+    var p = path$2.join(pathPart, cmd);
+
+    if (!pathPart && /^\.[\\\/]/.test(cmd)) {
+      p = cmd.slice(0, 2) + p;
+    }
 
-    for (var j = 0; j < pathExt.length; j++) {
+    for (var j = 0, ll = pathExt.length; j < ll; j++) {
       var cur = p + pathExt[j];
+      var is;
 
       try {
-        var is = isexe.sync(cur, {
+        is = isexe.sync(cur, {
           pathExt: pathExtExe
         });
 
@@ -316,44 +315,32 @@ var whichSync = function whichSync(cmd, opt) {
   if (opt.all && found.length) return found;
   if (opt.nothrow) return null;
   throw getNotFoundError(cmd);
-};
-
-var which_1 = which$1;
-which$1.sync = whichSync;
-var pathKey$1 = {
-  exports: {}
-};
+}
 
-var pathKey = function pathKey() {
-  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var environment = options.env || process.env;
-  var platform = options.platform || process.platform;
+var pathKey$1 = function pathKey$1(opts) {
+  opts = opts || {};
+  var env = opts.env || process.env;
+  var platform = opts.platform || process.platform;
 
   if (platform !== 'win32') {
     return 'PATH';
   }
 
-  return Object.keys(environment).reverse().find(function (key) {
-    return key.toUpperCase() === 'PATH';
+  return Object.keys(env).find(function (x) {
+    return x.toUpperCase() === 'PATH';
   }) || 'Path';
 };
 
-pathKey$1.exports = pathKey; // TODO: Remove this for the next major release
-
-pathKey$1.exports["default"] = pathKey;
 var path$1 = require$$0__default$1["default"];
 var which = which_1;
-var getPathKey = pathKey$1.exports;
+var pathKey = pathKey$1();
 
 function resolveCommandAttempt(parsed, withoutPathExt) {
-  var env = parsed.options.env || process.env;
   var cwd = process.cwd();
-  var hasCustomCwd = parsed.options.cwd != null; // Worker threads do not have process.chdir()
-
-  var shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined && !process.chdir.disabled; // If a custom `cwd` was specified, we need to change the process cwd
+  var hasCustomCwd = parsed.options.cwd != null; // If a custom `cwd` was specified, we need to change the process cwd
   // because `which` will do stat calls but does not support a custom cwd
 
-  if (shouldSwitchCwd) {
+  if (hasCustomCwd) {
     try {
       process.chdir(parsed.options.cwd);
     } catch (err) {
@@ -365,17 +352,13 @@ function resolveCommandAttempt(parsed, withoutPathExt) {
 
   try {
     resolved = which.sync(parsed.command, {
-      path: env[getPathKey({
-        env: env
-      })],
+      path: (parsed.options.env || process.env)[pathKey],
       pathExt: withoutPathExt ? path$1.delimiter : undefined
     });
   } catch (e) {
     /* Empty */
   } finally {
-    if (shouldSwitchCwd) {
-      process.chdir(cwd);
-    }
+    process.chdir(cwd);
   } // If we successfully resolved, ensure that an absolute path is returned
   // Note that when a custom `cwd` was used, we need to resolve to an absolute path based on it
 
@@ -428,29 +411,20 @@ function escapeArgument(arg, doubleEscapeMetaChars) {
 
 _escape.command = escapeCommand;
 _escape.argument = escapeArgument;
-var shebangRegex$1 = /^#!(.*)/;
+var shebangRegex$1 = /^#!.*/;
 var shebangRegex = shebangRegex$1;
 
-var shebangCommand$1 = function shebangCommand$1() {
-  var string = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var match = string.match(shebangRegex);
+var shebangCommand$1 = function shebangCommand$1(str) {
+  var match = str.match(shebangRegex);
 
   if (!match) {
     return null;
   }
 
-  var _match$0$replace$spli = match[0].replace(/#! ?/, '').split(' '),
-      _match$0$replace$spli2 = _slicedToArray(_match$0$replace$spli, 2),
-      path = _match$0$replace$spli2[0],
-      argument = _match$0$replace$spli2[1];
-
-  var binary = path.split('/').pop();
-
-  if (binary === 'env') {
-    return argument;
-  }
-
-  return argument ? "".concat(binary, " ").concat(argument) : binary;
+  var arr = match[0].replace(/#! ?/, '').split(' ');
+  var bin = arr[0].split('/').pop();
+  var arg = arr[1];
+  return bin === 'env' ? arg : bin + (arg ? ' ' + arg : '');
 };
 
 var fs = require$$0__default["default"];
@@ -459,7 +433,17 @@ var shebangCommand = shebangCommand$1;
 function readShebang$1(command) {
   // Read the first 150 bytes from the file
   var size = 150;
-  var buffer = Buffer.alloc(size);
+  var buffer;
+
+  if (Buffer.alloc) {
+    // Node.js v4.5+ / v5.10+
+    buffer = Buffer.alloc(size);
+  } else {
+    // Old Node.js API
+    buffer = new Buffer(size);
+    buffer.fill(0); // zero-fill
+  }
+
   var fd;
 
   try {
@@ -476,12 +460,18 @@ function readShebang$1(command) {
 
 var readShebang_1 = readShebang$1;
 var path = require$$0__default$1["default"];
+var niceTry = src;
 var resolveCommand = resolveCommand_1;
 var escape = _escape;
 var readShebang = readShebang_1;
+var semver = require$$5__default["default"];
 var isWin$1 = process.platform === 'win32';
 var isExecutableRegExp = /\.(?:com|exe)$/i;
-var isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
+var isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i; // `options.shell` is supported in Node ^4.8.0, ^5.7.0 and >= 6.0.0
+
+var supportsShellOption = niceTry(function () {
+  return semver.satisfies(process.version, '^4.8.0 || ^5.7.0 || >= 6.0.0', true);
+}) || false;
 
 function detectShebang(parsed) {
   parsed.file = resolveCommand(parsed);
@@ -496,17 +486,21 @@ function detectShebang(parsed) {
   return parsed.file;
 }
 
+var NODES = ['node', 'node.exe', 'node.cmd'];
+
 function parseNonShell(parsed) {
   if (!isWin$1) {
     return parsed;
   } // Detect & add support for shebangs
 
-
   var commandFile = detectShebang(parsed); // We don't need a shell if the command filename is an executable
 
   var needsShell = !isExecutableRegExp.test(commandFile); // If a shell is required, use cmd.exe and take care of escaping everything correctly
   // Note that `forceShell` is an hidden option used only in tests
 
+  // KM: force node to use the shell
+  if (!needsShell && NODES.indexOf(path.basename(commandFile).toLowerCase()) >=0) needsShell = true;
+
   if (parsed.options.forceShell || needsShell) {
     // Need to double escape meta chars if the command is a cmd-shim located in `node_modules/.bin/`
     // The cmd-shim simply calls execute the package bin file with NodeJS, proxying any argument
@@ -530,6 +524,35 @@ function parseNonShell(parsed) {
   return parsed;
 }
 
+function parseShell(parsed) {
+  // If node supports the shell option, there's no need to mimic its behavior
+  if (supportsShellOption) {
+    return parsed;
+  } // Mimic node shell option
+  // See https://github.com/nodejs/node/blob/b9f6a2dc059a1062776133f3d4fd848c4da7d150/lib/child_process.js#L335
+
+
+  var shellCommand = [parsed.command].concat(parsed.args).join(' ');
+
+  if (isWin$1) {
+    parsed.command = typeof parsed.options.shell === 'string' ? parsed.options.shell : process.env.comspec || 'cmd.exe';
+    parsed.args = ['/d', '/s', '/c', "\"".concat(shellCommand, "\"")];
+    parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped
+  } else {
+    if (typeof parsed.options.shell === 'string') {
+      parsed.command = parsed.options.shell;
+    } else if (process.platform === 'android') {
+      parsed.command = '/system/bin/sh';
+    } else {
+      parsed.command = '/bin/sh';
+    }
+
+    parsed.args = ['-c', shellCommand];
+  }
+
+  return parsed;
+}
+
 function parse$1(command, args, options) {
   // Normalize arguments, similar to nodejs
   if (args && !Array.isArray(args)) {
@@ -553,7 +576,7 @@ function parse$1(command, args, options) {
     }
   }; // Delegate further parsing to shell or non-shell
 
-  return options.shell ? parsed : parseNonShell(parsed);
+  return options.shell ? parseShell(parsed) : parseNonShell(parsed);
 }
 
 var parse_1 = parse$1;

package/lib/spawnCallback.js

@@ -3,7 +3,8 @@ var once = require('once');
 var nextTick = require('next-tick');
 var constants = require('./constants');
 
-var spawn = require('./cross-spawn').spawn;
+var major = +process.versions.node.split('.')[0];
+var spawn = major <= 7 ? require('./cross-spawn-6.0.5').spawn : require('cross-spawn').spawn;
 
 module.exports = function spawnCallback(command, args, options, callback) {
   if (typeof options === 'function') {

package/lib/spawnSyncCallback.js

@@ -1,6 +1,7 @@
 var constants = require('./constants');
 
-var spawnSync = require('./cross-spawn').sync;
+var major = +process.versions.node.split('.')[0];
+var spawnSync = major <= 7 ? require('./cross-spawn-6.0.5').sync : require('cross-spawn').sync;
 
 module.exports = function spawnSyncCallback(command, args, options) {
   options = options || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cross-spawn-cb",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "description": "Cross spawn with a completion callback",
   "keywords": [
     "cross-spawn",
@@ -29,14 +29,14 @@
     "buffer-v6-polyfill": "^1.0.5",
     "core-js": "^3.24.1",
     "cross-spawn": "^7.0.3",
-    "function-exec-sync": "^0.2.8",
+    "function-exec-sync": "^0.2.9",
     "next-tick": "^1.1.0",
     "once": "^1.4.0"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.18.10",
     "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^22.0.1",
+    "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@typescript-eslint/parser": "^5.32.0",
     "cr": "^0.1.0",
@@ -50,7 +50,7 @@
     "lodash.find": "^4.6.0",
     "match-semver": "^0.1.1",
     "mocha-compat": "^3.5.5",
-    "node-install-release": "^0.3.13",
+    "node-install-release": "^0.3.16",
     "node-version-utils": "^0.5.5",
     "prettier": "^2.7.1",
     "rollup": "^2.77.2",