binary-collections 2.0.10 → 2.0.12

package/lib/ps/connected-domain.js

@@ -13,10 +13,10 @@ exports.default = default_1;
 function default_1(tdArray, indicator, hardlink) {
     hardlink = hardlink || false;
     if (!tdArray) {
-        throw new Error("tdArray must be provided");
+        throw new Error('tdArray must be provided');
     }
     if (!indicator) {
-        throw new Error("indicator must be provided");
+        throw new Error('indicator must be provided');
     }
     // clone 一份数据，因为需要对饮用进行修改，方便执行
     tdArray = JSON.parse(JSON.stringify(tdArray));
@@ -34,21 +34,21 @@ function default_1(tdArray, indicator, hardlink) {
             var neighbours = [];
             // top neighbour
             if (tdArray[y - 1] && tdArray[y - 1][x] !== undefined) {
-                neighbours.push(pointsHash[x + "_" + (y - 1)]);
+                neighbours.push(pointsHash[x + '_' + (y - 1)]);
             }
             // left neighbour
             if (row[x - 1] !== undefined) {
-                neighbours.push(pointsHash[x - 1 + "_" + y]);
+                neighbours.push(pointsHash[x - 1 + '_' + y]);
             }
             // soft link will treat corner link as domain link.
             if (!hardlink) {
                 // top left neighbour
                 if (tdArray[y - 1] && tdArray[y - 1][x - 1] !== undefined) {
-                    neighbours.push(pointsHash[x - 1 + "_" + (y - 1)]);
+                    neighbours.push(pointsHash[x - 1 + '_' + (y - 1)]);
                 }
                 // top right neighbour
                 if (tdArray[y - 1] && tdArray[y - 1][x + 1] !== undefined) {
-                    neighbours.push(pointsHash[x + 1 + "_" + (y - 1)]);
+                    neighbours.push(pointsHash[x + 1 + '_' + (y - 1)]);
                 }
             }
             if (neighbours.length) {
@@ -63,7 +63,7 @@ function default_1(tdArray, indicator, hardlink) {
                         // If more than one neighbour matched, check if these neighbours belong to the same domain
                         // If not, merge these domains since they connects to each other.
                         else {
-                            var colItemPoint = pointsHash[x + "_" + y];
+                            var colItemPoint = pointsHash[x + '_' + y];
                             if (neighbour.domainId != colItemPoint.domainId) {
                                 mergeDomains(neighbour.domainId, colItemPoint.domainId);
                             }
@@ -150,7 +150,7 @@ function default_1(tdArray, indicator, hardlink) {
             identifier: identifier,
             domainId: newDomain.domainId
         };
-        pointsHash[x + "_" + y] = {
+        pointsHash[x + '_' + y] = {
             value: point,
             identifier: identifier,
             domainId: newDomain.domainId
@@ -174,7 +174,7 @@ function default_1(tdArray, indicator, hardlink) {
             identifier: domain.identifier,
             domainId: domainId
         };
-        pointsHash[x + "_" + y] = {
+        pointsHash[x + '_' + y] = {
             value: point,
             identifier: domain.identifier,
             domainId: domainId
@@ -194,7 +194,7 @@ function default_1(tdArray, indicator, hardlink) {
             domainB.domainId = domainA.domainId;
             domainB.points.forEach(function (point) {
                 point.domainId = domainA.domainId;
-                pointsHash[point.x + "_" + point.y].domainId = domainA.domainId;
+                pointsHash[point.x + '_' + point.y].domainId = domainA.domainId;
             });
             domainA.points = domainA.points.concat(domainB.points);
             // 删除domainB

package/lib/ps/index.cjs

@@ -394,7 +394,7 @@ var init_table_parser = __esm({
   }
 });
 
-// src/ps/index.js
+// src/ps/index.cjs
 init_cjs_shims();
 var ChildProcess = require("child_process");
 var IS_WIN = (init_isWin(), __toCommonJS(isWin_exports)).default;

package/lib/ps/index.mjs

@@ -9,190 +9,196 @@ import {
   isWin_exports
 } from "../chunk-6S4NXESK.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_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();
+          } 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/isWin.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const isWin = process.platform === "win32";
+const isWin = process.platform === 'win32';
 exports.default = isWin;

package/lib/ps/table-parser.js

@@ -67,7 +67,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.
@@ -210,18 +210,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 +245,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

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -88,31 +89,78 @@ var require_utils = __commonJS({
     }
     module2.exports.getArgs = getArgs2;
     function del(fullPath) {
-      if (fs2.statSync(fullPath).isDirectory()) {
-        const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
-        for (let i = 0; i < subdir.length; i++) {
-          del(subdir[i]);
+      try {
+        if (!fs2.existsSync(fullPath)) return;
+        const stat = fs2.lstatSync(fullPath);
+        if (stat.isSymbolicLink()) {
+          try {
+            fs2.unlinkSync(fullPath);
+            console.log("deleted symlink", fullPath);
+          } catch (e) {
+            console.log("failed delete symlink", fullPath, e && e.message);
+          }
+          return;
+        }
+        if (stat.isDirectory()) {
+          const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
+          for (let i = 0; i < subdir.length; i++) {
+            del(subdir[i]);
+          }
+          try {
+            fs2.rmdirSync(fullPath);
+            console.log("deleted", fullPath);
+          } catch (_e) {
+            try {
+              fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+              console.log("deleted", fullPath);
+            } catch (ee) {
+              console.log("failed delete", fullPath, ee && ee.message);
+            }
+          }
+          return;
         }
-      } else {
         try {
-          fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+          fs2.unlinkSync(fullPath);
           console.log("deleted", fullPath);
-        } catch (_) {
-          console.log("failed delete", fullPath);
+        } catch (_e) {
+          try {
+            fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+            console.log("deleted", fullPath);
+          } catch (ee) {
+            console.log("failed delete", fullPath, ee && ee.message);
+          }
         }
+      } catch (err) {
+        console.log("failed delete", fullPath, err && err.message);
       }
     }
     module2.exports.del = del;
     function delStream(globStream) {
       globStream.stream().on("data", (result) => {
         const fullPath = path2.resolve(process.cwd(), result);
-        if (fs2.statSync(fullPath).isDirectory()) {
-          const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
-          for (let i = 0; i < subdir.length; i++) {
-            del(subdir[i]);
+        try {
+          if (fs2.existsSync(fullPath)) {
+            const stat = fs2.lstatSync(fullPath);
+            if (stat.isSymbolicLink()) {
+              try {
+                fs2.unlinkSync(fullPath);
+                console.log("deleted symlink", fullPath);
+              } catch (e) {
+                console.log("failed delete symlink", fullPath, e && e.message);
+              }
+              return;
+            }
+            if (stat.isDirectory()) {
+              const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
+              for (let i = 0; i < subdir.length; i++) {
+                del(subdir[i]);
+              }
+            }
           }
+          del(fullPath);
+        } catch (err) {
+          console.log("failed processing", fullPath, err && err.message);
         }
-        del(fullPath);
       });
     }
     module2.exports.delStream = delStream;

package/lib/remove-module.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from 'module'; const require = createRequire(import.meta.url);
 import {
   require_utils
-} from "./chunk-V3N3JEUF.mjs";
+} from "./chunk-5RTXZVCW.mjs";
 import {
   __toESM,
   init_esm_shims