binary-collections 2.0.11 → 2.0.13

package/lib/ps/index.mjs

@@ -5,194 +5,200 @@ import {
 } from "../chunk-XVBFFVCJ.mjs";
 import "../chunk-FKI7IEB5.mjs";
 import {
-  init_isWin,
-  isWin_exports
-} from "../chunk-6S4NXESK.mjs";
+  init_isWindows,
+  isWindows_exports
+} from "../chunk-QII2EKCS.mjs";
 import {
+  __commonJS,
   __require,
   __toCommonJS,
   init_esm_shims
 } from "../chunk-QQ4A6DLD.mjs";
 
-// src/ps/index.js
-init_esm_shims();
-var ChildProcess = __require("child_process");
-var IS_WIN = (init_isWin(), __toCommonJS(isWin_exports)).default;
-var TableParser = (init_table_parser(), __toCommonJS(table_parser_exports));
-var EOL = /(\r\n)|(\n\r)|\n|\r/;
-var SystemEOL = __require("os").EOL;
-var Exec = module.exports = exports = function(args, callback) {
-  var spawn = ChildProcess.spawn;
-  if (IS_WIN) {
-    var CMD = spawn("cmd");
-    var stdout = "";
-    var stderr = null;
-    CMD.stdout.on("data", function(data) {
-      stdout += data.toString();
-    });
-    CMD.stderr.on("data", function(data) {
-      if (stderr === null) {
-        stderr = data.toString();
+// src/ps/index.cjs
+var require_ps = __commonJS({
+  "src/ps/index.cjs"(exports, module) {
+    init_esm_shims();
+    var ChildProcess = __require("child_process");
+    var IS_WIN = (init_isWindows(), __toCommonJS(isWindows_exports)).isWindows();
+    var TableParser = (init_table_parser(), __toCommonJS(table_parser_exports));
+    var EOL = /(\r\n)|(\n\r)|\n|\r/;
+    var SystemEOL = __require("os").EOL;
+    var Exec = module.exports = exports = function(args, callback) {
+      var spawn = ChildProcess.spawn;
+      if (IS_WIN) {
+        var CMD = spawn("cmd");
+        var stdout = "";
+        var stderr = null;
+        CMD.stdout.on("data", function(data) {
+          stdout += data.toString();
+        });
+        CMD.stderr.on("data", function(data) {
+          if (stderr === null) {
+            stderr = data.toString();
+          } else {
+            stderr += data.toString();
+          }
+        });
+        CMD.on("exit", function() {
+          var beginRow;
+          stdout = stdout.split(EOL);
+          stdout.forEach(function(out, index) {
+            if (out && typeof beginRow == "undefined" && out.indexOf("CommandLine") === 0) {
+              beginRow = index;
+            }
+          });
+          stdout.splice(stdout.length - 1, 1);
+          stdout.splice(0, beginRow);
+          callback(stderr, stdout.join(SystemEOL) || false);
+        });
+        CMD.stdin.write("wmic process get ProcessId,ParentProcessId,CommandLine \n");
+        CMD.stdin.end();
       } else {
-        stderr += data.toString();
+        if (typeof args === "string") {
+          args = args.split(/\s+/);
+        }
+        const child = spawn("ps", args);
+        stdout = "";
+        stderr = null;
+        child.stdout.on("data", function(data) {
+          stdout += data.toString();
+        });
+        child.stderr.on("data", function(data) {
+          if (stderr === null) {
+            stderr = data.toString();
+          } else {
+            stderr += data.toString();
+          }
+        });
+        child.on("exit", function() {
+          if (stderr) {
+            return callback(stderr.toString());
+          } else {
+            callback(null, stdout || false);
+          }
+        });
       }
-    });
-    CMD.on("exit", function() {
-      var beginRow;
-      stdout = stdout.split(EOL);
-      stdout.forEach(function(out, index) {
-        if (out && typeof beginRow == "undefined" && out.indexOf("CommandLine") === 0) {
-          beginRow = index;
+    };
+    exports.lookup = function(query, callback) {
+      var exeArgs = query.psargs || ["lx"];
+      var filter = {};
+      var idList;
+      if (query.pid) {
+        if (Array.isArray(query.pid)) {
+          idList = query.pid;
+        } else {
+          idList = [query.pid];
         }
-      });
-      stdout.splice(stdout.length - 1, 1);
-      stdout.splice(0, beginRow);
-      callback(stderr, stdout.join(SystemEOL) || false);
-    });
-    CMD.stdin.write("wmic process get ProcessId,ParentProcessId,CommandLine \n");
-    CMD.stdin.end();
-  } else {
-    if (typeof args === "string") {
-      args = args.split(/\s+/);
-    }
-    const child = spawn("ps", args);
-    stdout = "";
-    stderr = null;
-    child.stdout.on("data", function(data) {
-      stdout += data.toString();
-    });
-    child.stderr.on("data", function(data) {
-      if (stderr === null) {
-        stderr = data.toString();
-      } else {
-        stderr += data.toString();
+        idList = idList.map(function(v) {
+          return String(v);
+        });
       }
-    });
-    child.on("exit", function() {
-      if (stderr) {
-        return callback(stderr.toString());
-      } else {
-        callback(null, stdout || false);
+      if (query.command) {
+        filter["command"] = new RegExp(query.command, "i");
       }
-    });
-  }
-};
-exports.lookup = function(query, callback) {
-  var exeArgs = query.psargs || ["lx"];
-  var filter = {};
-  var idList;
-  if (query.pid) {
-    if (Array.isArray(query.pid)) {
-      idList = query.pid;
-    } else {
-      idList = [query.pid];
-    }
-    idList = idList.map(function(v) {
-      return String(v);
-    });
-  }
-  if (query.command) {
-    filter["command"] = new RegExp(query.command, "i");
-  }
-  if (query.arguments) {
-    filter["arguments"] = new RegExp(query.arguments, "i");
-  }
-  if (query.ppid) {
-    filter["ppid"] = new RegExp(query.ppid);
-  }
-  return Exec(exeArgs, function(err, output) {
-    if (err) {
-      return callback(err);
-    } else {
-      var processList = parseGrid(output);
-      var resultList = [];
-      processList.forEach(function(p) {
-        var flt;
-        var type;
-        var result = true;
-        if (idList && idList.indexOf(String(p.pid)) < 0) {
-          return;
-        }
-        for (type in filter) {
-          flt = filter[type];
-          result = flt.test(p[type]) ? result : false;
-        }
-        if (result) {
-          resultList.push(p);
-        }
-      });
-      callback(null, resultList);
-    }
-  });
-};
-exports.kill = function(pid, signal, next) {
-  if (arguments.length == 2 && typeof signal == "function") {
-    next = signal;
-    signal = void 0;
-  }
-  var checkTimeoutSeconds = signal && signal.timeout || 30;
-  if (typeof signal === "object") {
-    signal = signal.signal;
-  }
-  try {
-    process.kill(pid, signal);
-  } catch (e) {
-    return next && next(e);
-  }
-  var checkConfident = 0;
-  var checkTimeoutTimer = null;
-  var checkIsTimeout = false;
-  function checkKilled(finishCallback) {
-    exports.lookup({ pid }, function(err, list) {
-      if (checkIsTimeout) return;
-      if (err) {
-        clearTimeout(checkTimeoutTimer);
-        if (finishCallback) finishCallback(err);
-      } else if (list.length > 0) {
-        checkConfident = checkConfident - 1 || 0;
-        checkKilled(finishCallback);
-      } else {
-        checkConfident++;
-        if (checkConfident === 5) {
-          clearTimeout(checkTimeoutTimer);
-          if (finishCallback) finishCallback();
+      if (query.arguments) {
+        filter["arguments"] = new RegExp(query.arguments, "i");
+      }
+      if (query.ppid) {
+        filter["ppid"] = new RegExp(query.ppid);
+      }
+      return Exec(exeArgs, function(err, output) {
+        if (err) {
+          return callback(err);
         } else {
-          checkKilled(finishCallback);
+          var processList = parseGrid(output);
+          var resultList = [];
+          processList.forEach(function(p) {
+            var flt;
+            var type;
+            var result = true;
+            if (idList && idList.indexOf(String(p.pid)) < 0) {
+              return;
+            }
+            for (type in filter) {
+              flt = filter[type];
+              result = flt.test(p[type]) ? result : false;
+            }
+            if (result) {
+              resultList.push(p);
+            }
+          });
+          callback(null, resultList);
         }
+      });
+    };
+    exports.kill = function(pid, signal, next) {
+      if (arguments.length == 2 && typeof signal == "function") {
+        next = signal;
+        signal = void 0;
       }
-    });
-  }
-  if (next) checkKilled(next);
-  checkTimeoutTimer = next && setTimeout(function() {
-    checkIsTimeout = true;
-    next(new Error("Kill process timeout"));
-  }, checkTimeoutSeconds * 1e3);
-};
-function parseGrid(output) {
-  if (!output) {
-    return [];
-  }
-  return formatOutput(TableParser.parse(output));
-}
-function formatOutput(data) {
-  var formatedData = [];
-  data.forEach(function(d) {
-    var pid = d.PID && d.PID[0] || d.ProcessId && d.ProcessId[0] || void 0;
-    var cmd = d.CMD || d.CommandLine || d.COMMAND || void 0;
-    var ppid = d.PPID && d.PPID[0] || d.ParentProcessId && d.ParentProcessId[0] || void 0;
-    if (pid && cmd) {
-      var command = cmd[0];
-      var args = "";
-      if (cmd.length > 1) {
-        args = cmd.slice(1);
+      var checkTimeoutSeconds = signal && signal.timeout || 30;
+      if (typeof signal === "object") {
+        signal = signal.signal;
+      }
+      try {
+        process.kill(pid, signal);
+      } catch (e) {
+        return next && next(e);
+      }
+      var checkConfident = 0;
+      var checkTimeoutTimer = null;
+      var checkIsTimeout = false;
+      function checkKilled(finishCallback) {
+        exports.lookup({ pid }, function(err, list) {
+          if (checkIsTimeout) return;
+          if (err) {
+            clearTimeout(checkTimeoutTimer);
+            if (finishCallback) finishCallback(err);
+          } else if (list.length > 0) {
+            checkConfident = checkConfident - 1 || 0;
+            checkKilled(finishCallback);
+          } else {
+            checkConfident++;
+            if (checkConfident === 5) {
+              clearTimeout(checkTimeoutTimer);
+              if (finishCallback) finishCallback();
+            } else {
+              checkKilled(finishCallback);
+            }
+          }
+        });
       }
-      formatedData.push({
-        pid,
-        command,
-        arguments: args,
-        ppid
+      if (next) checkKilled(next);
+      checkTimeoutTimer = next && setTimeout(function() {
+        checkIsTimeout = true;
+        next(new Error("Kill process timeout"));
+      }, checkTimeoutSeconds * 1e3);
+    };
+    function parseGrid(output) {
+      if (!output) {
+        return [];
+      }
+      return formatOutput(TableParser.parse(output));
+    }
+    function formatOutput(data) {
+      var formatedData = [];
+      data.forEach(function(d) {
+        var pid = d.PID && d.PID[0] || d.ProcessId && d.ProcessId[0] || void 0;
+        var cmd = d.CMD || d.CommandLine || d.COMMAND || void 0;
+        var ppid = d.PPID && d.PPID[0] || d.ParentProcessId && d.ParentProcessId[0] || void 0;
+        if (pid && cmd) {
+          var command = cmd[0];
+          var args = "";
+          if (cmd.length > 1) {
+            args = cmd.slice(1);
+          }
+          formatedData.push({
+            pid,
+            command,
+            arguments: args,
+            ppid
+          });
+        }
       });
+      return formatedData;
     }
-  });
-  return formatedData;
-}
+  }
+});
+export default require_ps();

package/lib/ps/table-parser.d.ts

@@ -1,6 +1,5 @@
 /**
- * The output sting of cmd to parse
- * @param output
- * @returns {Array}
+ * @param {string} output
+ * @returns {Array<Object>}
  */
-export function parse(output: any): any[];
+export function parse(output: string): Array<Object>;

package/lib/ps/table-parser.js

@@ -4,8 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = parse;
-/**
- *
+/*
  * 1, define the edge ( begin and end ) of every title field
  * 2, parse all the lines except the title line, get all the connected-domains
  * 3, group all the connected-domains vertically overlapped.
@@ -15,9 +14,8 @@ exports.parse = parse;
 const connected_domain_1 = __importDefault(require("./connected-domain"));
 var EMPTY_EX = /\s/;
 /**
- * The output sting of cmd to parse
- * @param output
- * @returns {Array}
+ * @param {string} output
+ * @returns {Array<Object>}
  */
 function parse(output) {
     // Split into lines
@@ -67,7 +65,7 @@ function parse(output) {
             });
         }
         else {
-            twoDimArray[index - 1] = line.split("");
+            twoDimArray[index - 1] = line.split('');
         }
     });
     // In the connected-domain aspect of view, all the blanks are connected, and all the non-blanks are connected.
@@ -175,11 +173,10 @@ function parse(output) {
     return result;
 }
 /**
- * Test if two bounding overlapped vertically
- * @param begin1
- * @param end1
- * @param begin2
- * @param end2
+ * @param {number} begin1
+ * @param {number} end1
+ * @param {number} begin2
+ * @param {number} end2
  * @returns {boolean}
  */
 function overlap(begin1, end1, begin2, end2) {
@@ -188,12 +185,8 @@ function overlap(begin1, end1, begin2, end2) {
         (begin1 <= begin2 && end1 >= end2)); // 21--12 or 1--2--2--1
 }
 /**
- * transform a string value into array. It's not just split(), but also to consider some chunk that wrapped with `"`, like below:
- *      "C:\Program Files\Google\Chrome\Application\chrome.exe" --type=renderer --lang=zh-CN, `C:\Program Files\Google\Chrome\Application\chrome.exe` should be treated as a whole,
- *      also, be careful don't be mislead by format like `--name="neekey"`, even more complicated: `--name="Neekey Ni"`
- * so, `"C:\Program Files\Internet Explorer\iexplore.exe" --name="Jack Neekey"` should split into:
- *  - C:\Program Files\Internet Explorer\iexplore.exe  // without `"`
- *  - --name="Jack Neekey"                             // with `"`
+ * @param {string} value
+ * @returns {string[]}
  */
 function splitValue(value) {
     var match = value.match(/"/g);
@@ -210,18 +203,18 @@ function splitValue(value) {
         // If the match length is a even, than nothing special, if a odd, ignore the last one.
         var maxQuotaCount = match.length % 2 == 0 ? match.length : match.length - 1;
         var previousItem = null;
-        var values = value.split("");
+        var values = value.split('');
         values.forEach(function (item, index) {
-            if (item !== " ") {
+            if (item !== ' ') {
                 if (item === '"') {
                     // quota chunk begin
                     if (ifInWrappedChunk === false && quotaCount <= maxQuotaCount) {
                         ifInWrappedChunk = true;
                         quotaCount++;
                         // pure quota chunk begin
-                        if (previousItem === " " || previousItem === null) {
+                        if (previousItem === ' ' || previousItem === null) {
                             ifInPureWrappedChunk = true;
-                            chunk = "";
+                            chunk = '';
                         }
                         // normal continue
                         else {
@@ -245,7 +238,7 @@ function splitValue(value) {
                     }
                 }
                 // normal begin
-                else if (ifInWrappedChunk === false && (previousItem === " " || previousItem === null)) {
+                else if (ifInWrappedChunk === false && (previousItem === ' ' || previousItem === null)) {
                     chunk = item;
                 }
                 // normal or quota chunk continue.

package/lib/remove-module.cjs

@@ -40,9 +40,9 @@ var require_utils = __commonJS({
     init_cjs_shims();
     var fs2 = require("fs");
     var path2 = require("upath");
-    var argv2 = require("minimist")(process.argv.slice(2));
+    var minimistLib = require("minimist");
+    var argv2 = minimistLib(process.argv.slice(2));
     var { exec } = require("child_process");
-    var { URL: URL2 } = require("url");
     var { promisify } = require("util");
     var execAsync = promisify(exec);
     async function parseGitRemotes() {
@@ -55,7 +55,7 @@ var require_utils = __commonJS({
           if (name && url) {
             const [repoUrl] = url.split(" ");
             try {
-              const parsedUrl = new URL2(repoUrl);
+              const parsedUrl = new URL(repoUrl);
               const pathParts = parsedUrl.pathname.split("/").filter(Boolean);
               if (parsedUrl.hostname === "github.com" && pathParts.length === 2) {
                 let repoPath = pathParts.join("/");
@@ -76,15 +76,10 @@ var require_utils = __commonJS({
       }
     }
     module2.exports.parseGitRemotes = parseGitRemotes;
-    function joinPathPreserveDriveLetter(...segments) {
-      let fullPath = require("path").join(...segments);
-      if (/^[a-z]:\\/.test(fullPath)) {
-        fullPath = fullPath.charAt(0).toUpperCase() + fullPath.slice(1);
+    function getArgs2(opts) {
+      if (opts) {
+        return minimistLib(process.argv.slice(2), opts);
       }
-      return fullPath;
-    }
-    module2.exports.joinPathPreserveDriveLetter = joinPathPreserveDriveLetter;
-    function getArgs2() {
       return argv2;
     }
     module2.exports.getArgs = getArgs2;
@@ -109,7 +104,7 @@ var require_utils = __commonJS({
           try {
             fs2.rmdirSync(fullPath);
             console.log("deleted", fullPath);
-          } catch (e) {
+          } catch (_e) {
             try {
               fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
               console.log("deleted", fullPath);
@@ -122,7 +117,7 @@ var require_utils = __commonJS({
         try {
           fs2.unlinkSync(fullPath);
           console.log("deleted", fullPath);
-        } catch (e) {
+        } catch (_e) {
           try {
             fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
             console.log("deleted", fullPath);
@@ -210,7 +205,7 @@ var require_utils = __commonJS({
 init_cjs_shims();
 var import_utils = __toESM(require_utils(), 1);
 var import_fs = __toESM(require("fs"), 1);
-var import_path = __toESM(require("path"), 1);
+var import_upath = __toESM(require("upath"), 1);
 var glob = __toESM(require("glob"), 1);
 var argv = (0, import_utils.getArgs)();
 var positional = argv._ || [];
@@ -243,7 +238,7 @@ if (positional.length === 0) {
 }
 for (const moduleName of positional) {
   if (argv.node) {
-    const modulePath = import_path.default.resolve("node_modules", moduleName);
+    const modulePath = import_upath.default.resolve("node_modules", moduleName);
     if (import_fs.default.existsSync(modulePath)) {
       try {
         import_fs.default.rmSync(modulePath, { recursive: true, force: true });
@@ -258,7 +253,7 @@ for (const moduleName of positional) {
     }
   }
   if (argv.composer) {
-    const vendorPath = import_path.default.resolve("vendor", "composer", moduleName);
+    const vendorPath = import_upath.default.resolve("vendor", "composer", moduleName);
     if (import_fs.default.existsSync(vendorPath)) {
       try {
         import_fs.default.rmSync(vendorPath, { recursive: true, force: true });
@@ -275,21 +270,21 @@ for (const moduleName of positional) {
   if (argv.venv) {
     const venvs = [".venv", "venv"];
     for (const venv of venvs) {
-      const sitePackages = import_path.default.resolve(venv, "Lib", "site-packages");
+      const sitePackages = import_upath.default.resolve(venv, "Lib", "site-packages");
       const venvModulePaths = [
         // main package directory (for packages)
-        import_path.default.resolve(sitePackages, moduleName),
+        import_upath.default.resolve(sitePackages, moduleName),
         // main module file (for single-file modules)
-        import_path.default.resolve(sitePackages, moduleName + ".py"),
+        import_upath.default.resolve(sitePackages, moduleName + ".py"),
         // dist-info metadata directories
-        ...glob.sync(`${moduleName}-*.dist-info`, { cwd: sitePackages }).map((p) => import_path.default.resolve(sitePackages, p)),
+        ...glob.sync(`${moduleName}-*.dist-info`, { cwd: sitePackages }).map((p) => import_upath.default.resolve(sitePackages, p)),
         // egg-info metadata directories
-        ...glob.sync(`${moduleName}-*.egg-info`, { cwd: sitePackages }).map((p) => import_path.default.resolve(sitePackages, p)),
+        ...glob.sync(`${moduleName}-*.egg-info`, { cwd: sitePackages }).map((p) => import_upath.default.resolve(sitePackages, p)),
         // compiled extension files (.pyd for Windows, .so for Linux)
-        ...glob.sync(`${moduleName}*.pyd`, { cwd: sitePackages }).map((p) => import_path.default.resolve(sitePackages, p)),
-        ...glob.sync(`${moduleName}*.so`, { cwd: sitePackages }).map((p) => import_path.default.resolve(sitePackages, p)),
+        ...glob.sync(`${moduleName}*.pyd`, { cwd: sitePackages }).map((p) => import_upath.default.resolve(sitePackages, p)),
+        ...glob.sync(`${moduleName}*.so`, { cwd: sitePackages }).map((p) => import_upath.default.resolve(sitePackages, p)),
         // editable install directories (legacy pattern)
-        ...glob.sync(`_*editable_*${moduleName}*`, { cwd: sitePackages }).map((p) => import_path.default.resolve(sitePackages, p))
+        ...glob.sync(`_*editable_*${moduleName}*`, { cwd: sitePackages }).map((p) => import_upath.default.resolve(sitePackages, p))
       ];
       for (const venvModulePath of venvModulePaths) {
         if (import_fs.default.existsSync(venvModulePath)) {

package/lib/remove-module.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from 'module'; const require = createRequire(import.meta.url);
 import {
   require_utils
-} from "./chunk-Z6JLYU2J.mjs";
+} from "./chunk-6RK5UCTP.mjs";
 import {
   __toESM,
   init_esm_shims
@@ -11,7 +11,7 @@ import {
 init_esm_shims();
 var import_utils = __toESM(require_utils(), 1);
 import fs from "fs";
-import path from "path";
+import path from "upath";
 import * as glob from "glob";
 var argv = (0, import_utils.getArgs)();
 var positional = argv._ || [];