binary-collections 2.0.11 → 2.0.12

package/lib/package-resolutions-updater.cjs

@@ -42,8 +42,8 @@ var init_cjs_shims = __esm({
 var require_utils = __commonJS({
   "src/utils/index.cjs"(exports2, module2) {
     init_cjs_shims();
-    var fs3 = require("fs");
-    var path3 = require("upath");
+    var fs2 = require("fs");
+    var path2 = require("upath");
     var argv = require("minimist")(process.argv.slice(2));
     var { exec } = require("child_process");
     var { URL: URL2 } = require("url");
@@ -94,11 +94,11 @@ var require_utils = __commonJS({
     module2.exports.getArgs = getArgs2;
     function del(fullPath) {
       try {
-        if (!fs3.existsSync(fullPath)) return;
-        const stat = fs3.lstatSync(fullPath);
+        if (!fs2.existsSync(fullPath)) return;
+        const stat = fs2.lstatSync(fullPath);
         if (stat.isSymbolicLink()) {
           try {
-            fs3.unlinkSync(fullPath);
+            fs2.unlinkSync(fullPath);
             console.log("deleted symlink", fullPath);
           } catch (e) {
             console.log("failed delete symlink", fullPath, e && e.message);
@@ -106,16 +106,16 @@ var require_utils = __commonJS({
           return;
         }
         if (stat.isDirectory()) {
-          const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.resolve(fullPath, dirPath));
+          const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
           for (let i = 0; i < subdir.length; i++) {
             del(subdir[i]);
           }
           try {
-            fs3.rmdirSync(fullPath);
+            fs2.rmdirSync(fullPath);
             console.log("deleted", fullPath);
-          } catch (e) {
+          } catch (_e) {
             try {
-              fs3.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+              fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
               console.log("deleted", fullPath);
             } catch (ee) {
               console.log("failed delete", fullPath, ee && ee.message);
@@ -124,11 +124,11 @@ var require_utils = __commonJS({
           return;
         }
         try {
-          fs3.unlinkSync(fullPath);
+          fs2.unlinkSync(fullPath);
           console.log("deleted", fullPath);
-        } catch (e) {
+        } catch (_e) {
           try {
-            fs3.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+            fs2.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
             console.log("deleted", fullPath);
           } catch (ee) {
             console.log("failed delete", fullPath, ee && ee.message);
@@ -141,13 +141,13 @@ var require_utils = __commonJS({
     module2.exports.del = del;
     function delStream(globStream) {
       globStream.stream().on("data", (result) => {
-        const fullPath = path3.resolve(process.cwd(), result);
+        const fullPath = path2.resolve(process.cwd(), result);
         try {
-          if (fs3.existsSync(fullPath)) {
-            const stat = fs3.lstatSync(fullPath);
+          if (fs2.existsSync(fullPath)) {
+            const stat = fs2.lstatSync(fullPath);
             if (stat.isSymbolicLink()) {
               try {
-                fs3.unlinkSync(fullPath);
+                fs2.unlinkSync(fullPath);
                 console.log("deleted symlink", fullPath);
               } catch (e) {
                 console.log("failed delete symlink", fullPath, e && e.message);
@@ -155,7 +155,7 @@ var require_utils = __commonJS({
               return;
             }
             if (stat.isDirectory()) {
-              const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.resolve(fullPath, dirPath));
+              const subdir = fs2.readdirSync(fullPath).map((dirPath) => path2.resolve(fullPath, dirPath));
               for (let i = 0; i < subdir.length; i++) {
                 del(subdir[i]);
               }
@@ -210,6 +210,101 @@ var require_utils = __commonJS({
   }
 });
 
+// src/utils/findEnvFiles.cjs
+var require_findEnvFiles = __commonJS({
+  "src/utils/findEnvFiles.cjs"(exports2, module2) {
+    init_cjs_shims();
+    var fs2 = require("fs");
+    var path2 = require("path");
+    var glob = require("glob");
+    var DEFAULT_IGNORES = [
+      "**/node_modules/**",
+      "**/.git/**",
+      "**/.yarn/**",
+      "**/.pnpm/**",
+      "**/dist/**",
+      "**/build/**",
+      "**/coverage/**",
+      "**/vendor/**",
+      "**/tmp/**",
+      "**/.cache/**",
+      "**/assets/**",
+      "**/logs/**",
+      "**/output/**",
+      "**/public/**",
+      "**/static/**",
+      "**/temp/**",
+      "**/backup/**",
+      "**/backups/**",
+      "**/examples/**",
+      "**/docs/**",
+      "**/tests/**",
+      "**/__tests__/**",
+      "**/spec/**",
+      "**/__specs__/**",
+      "**/scripts/**",
+      "**/bin/**",
+      "**/hooks/**",
+      "**/config/**",
+      "**/configs/**",
+      "**/settings/**",
+      "**/.vscode/**",
+      "**/.idea/**"
+    ];
+    function findEnvFiles2(startDir = process.cwd(), filter) {
+      const found = /* @__PURE__ */ new Set();
+      function addFile(file) {
+        const normalized = path2.normalize(file);
+        if (typeof filter === "function" && !filter(normalized)) {
+          return;
+        }
+        found.add(normalized);
+      }
+      let current = path2.resolve(startDir);
+      while (true) {
+        const envPath2 = path2.join(current, ".env");
+        if (fs2.existsSync(envPath2)) {
+          addFile(envPath2);
+        }
+        const parent = path2.dirname(current);
+        if (parent === current) {
+          break;
+        }
+        current = parent;
+      }
+      const files = glob.globSync("**/.env*", {
+        cwd: startDir,
+        absolute: true,
+        nodir: true,
+        ignore: DEFAULT_IGNORES
+      });
+      for (const file of files) {
+        addFile(file);
+      }
+      return [...found];
+    }
+    function findEnvWithToken(startDir = process.cwd(), tokenName = "GITHUB_TOKEN") {
+      const envFiles = findEnvFiles2(startDir);
+      return envFiles.find((file) => {
+        try {
+          const content = fs2.readFileSync(file, "utf-8");
+          const regex = new RegExp(`^\\s*${tokenName}\\s*=`, "m");
+          return regex.test(content);
+        } catch (err) {
+          console.warn(`Failed to read ${file}: ${err instanceof Error ? err.message : String(err)}`);
+          return false;
+        }
+      });
+    }
+    module2.exports = {
+      DEFAULT_IGNORES,
+      findEnvFiles: findEnvFiles2,
+      findEnvWithToken,
+      default: findEnvFiles2
+    };
+  }
+});
+
 // src/package-resolutions-updater.mjs
 var package_resolutions_updater_exports = {};
 __export(package_resolutions_updater_exports, {
@@ -217,7 +312,8 @@ __export(package_resolutions_updater_exports, {
   getLatestCommit: () => getLatestCommit,
   getLatestCommitAcrossBranches: () => getLatestCommitAcrossBranches,
   parseGitHubUrl: () => import_git_command_helper.parseGitHubUrl,
-  replaceRawWithLatestHash: () => replaceRawWithLatestHash
+  replaceRawWithLatestHash: () => replaceRawWithLatestHash,
+  resolvePackageResolutionUpdates: () => resolvePackageResolutionUpdates
 });
 module.exports = __toCommonJS(package_resolutions_updater_exports);
 init_cjs_shims();
@@ -227,86 +323,14 @@ var import_https = __toESM(require("https"), 1);
 var import_os = __toESM(require("os"), 1);
 var import_path = __toESM(require("path"), 1);
 var utils = __toESM(require_utils(), 1);
-
-// src/utils/findEnvFiles.js
-init_cjs_shims();
-var import_node_fs = __toESM(require("fs"), 1);
-var import_node_path = __toESM(require("path"), 1);
-var glob = __toESM(require("glob"), 1);
-var DEFAULT_IGNORES = [
-  "**/node_modules/**",
-  "**/.git/**",
-  "**/.yarn/**",
-  "**/.pnpm/**",
-  "**/dist/**",
-  "**/build/**",
-  "**/coverage/**",
-  "**/vendor/**",
-  "**/tmp/**",
-  "**/.cache/**",
-  "**/assets/**",
-  "**/logs/**",
-  "**/output/**",
-  "**/public/**",
-  "**/static/**",
-  "**/temp/**",
-  "**/backup/**",
-  "**/backups/**",
-  "**/examples/**",
-  "**/docs/**",
-  "**/tests/**",
-  "**/__tests__/**",
-  "**/spec/**",
-  "**/__specs__/**",
-  "**/scripts/**",
-  "**/bin/**",
-  "**/hooks/**",
-  "**/config/**",
-  "**/configs/**",
-  "**/settings/**",
-  "**/.vscode/**",
-  "**/.idea/**"
-];
-function findEnvFiles(startDir = process.cwd(), filter) {
-  const found = /* @__PURE__ */ new Set();
-  function addFile(file) {
-    const normalized = import_node_path.default.normalize(file);
-    if (typeof filter === "function" && !filter(normalized)) {
-      return;
-    }
-    found.add(normalized);
-  }
-  let current = import_node_path.default.resolve(startDir);
-  while (true) {
-    const envPath2 = import_node_path.default.join(current, ".env");
-    if (import_node_fs.default.existsSync(envPath2)) {
-      addFile(envPath2);
-    }
-    const parent = import_node_path.default.dirname(current);
-    if (parent === current) {
-      break;
-    }
-    current = parent;
-  }
-  const files = glob.globSync("**/.env*", {
-    cwd: startDir,
-    absolute: true,
-    nodir: true,
-    ignore: DEFAULT_IGNORES
-  });
-  for (const file of files) {
-    addFile(file);
-  }
-  return [...found];
-}
-
-// src/package-resolutions-updater.mjs
+var import_findEnvFiles = __toESM(require_findEnvFiles(), 1);
 var import_git_command_helper = require("git-command-helper");
+var import_axios = __toESM(require("axios"), 1);
 var projectDir = process.cwd();
 var envPath = import_path.default.join(projectDir, ".env");
 var args = utils.getArgs();
 if (!import_fs.default.existsSync(envPath)) {
-  const envFiles = findEnvFiles(projectDir, (file) => {
+  const envFiles = (0, import_findEnvFiles.findEnvFiles)(projectDir, (file) => {
     const content = import_fs.default.readFileSync(file, "utf-8");
     return /GITHUB_TOKEN|ACCESS_TOKEN/.test(content);
   });
@@ -452,10 +476,91 @@ async function getLatestCommitAcrossBranches(owner, repo) {
   };
 }
 function replaceRawWithLatestHash(url, latestHash) {
-  const match = url.match(/^https:\/\/github\.com\/([^/]+)\/([^/]+)\/raw\/([^/]+)\/(.+)$/);
-  if (!match) throw new Error("Invalid GitHub raw URL");
-  const [, owner, repo, _oldHash, path3] = match;
-  return `https://github.com/${owner}/${repo}/raw/${latestHash}/${path3}`;
+  const parsed = (0, import_git_command_helper.parseGitHubUrl)(url);
+  if (!parsed || !parsed.owner || !parsed.repo || !parsed.branch) {
+    throw new Error("Invalid GitHub raw URL");
+  }
+  const branchPrefix = `${parsed.branch}/`;
+  const rawPrefix = parsed.host === "github.com" ? `raw/${branchPrefix}` : branchPrefix;
+  const refsPrefix = `refs/heads/${branchPrefix}`;
+  const path2 = parsed.path.startsWith(rawPrefix) ? parsed.path.slice(rawPrefix.length) : parsed.path.startsWith(refsPrefix) ? parsed.path.slice(refsPrefix.length) : parsed.path.startsWith(branchPrefix) ? parsed.path.slice(branchPrefix.length) : parsed.path;
+  if (parsed.host === "github.com") {
+    return `https://github.com/${parsed.owner}/${parsed.repo}/raw/${latestHash}/${path2}`;
+  }
+  if (parsed.host === "raw.githubusercontent.com") {
+    return `https://raw.githubusercontent.com/${parsed.owner}/${parsed.repo}/${latestHash}/${path2}`;
+  }
+  throw new Error("Invalid GitHub raw URL");
+}
+async function resolvePackageResolutionUpdates(resolutions, specialPackageOverrides = []) {
+  const updates = [];
+  for (const [currentPkgName, url] of Object.entries(resolutions || {})) {
+    let repo;
+    try {
+      repo = (0, import_git_command_helper.parseGitHubUrl)(url);
+    } catch (error) {
+      updates.push({
+        skipped: true,
+        currentPkgName,
+        url,
+        error
+      });
+      continue;
+    }
+    try {
+      const override = specialPackageOverrides.find((p) => p.pkg === currentPkgName);
+      const latest = override ? await getLatestCommit(override.owner, override.repo, override.branch) : await getLatestCommitAcrossBranches(repo.owner, repo.repo);
+      const new_url = replaceRawWithLatestHash(url, latest.sha);
+      await import_axios.default.head(new_url, {
+        headers: {
+          "User-Agent": selectedUserAgent,
+          Accept: "application/vnd.github.v3+json",
+          "X-GitHub-Api-Version": "2022-11-28",
+          ...ACCESS_TOKEN ? { Authorization: `token ${ACCESS_TOKEN}` } : {}
+        }
+      }).then((response) => {
+        if (response.status < 200 || response.status >= 300) {
+          updates.push({
+            failed: true,
+            currentPkgName,
+            url,
+            new_url,
+            repo,
+            latest,
+            error: new Error(`New URL is not accessible, status code: ${response.status}`)
+          });
+          return;
+        }
+        updates.push({
+          currentPkgName,
+          url,
+          new_url,
+          repo,
+          latest
+        });
+      }).catch((e) => {
+        updates.push({
+          failed: true,
+          currentPkgName,
+          url,
+          new_url,
+          repo,
+          latest,
+          error: new Error(`New URL is not accessible: ${e.message}`)
+        });
+        return null;
+      });
+    } catch (error) {
+      updates.push({
+        failed: true,
+        currentPkgName,
+        url,
+        repo,
+        error
+      });
+    }
+  }
+  return updates;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -463,5 +568,6 @@ function replaceRawWithLatestHash(url, latestHash) {
   getLatestCommit,
   getLatestCommitAcrossBranches,
   parseGitHubUrl,
-  replaceRawWithLatestHash
+  replaceRawWithLatestHash,
+  resolvePackageResolutionUpdates
 });

package/lib/package-resolutions-updater.d.mts

@@ -28,5 +28,24 @@ export function getLatestCommitAcrossBranches(owner: any, repo: any): Promise<{
  * Replace the branch or commit in a GitHub raw URL with the latest hash.
  */
 export function replaceRawWithLatestHash(url: any, latestHash: any): string;
+/**
+ * Resolve all package resolution updates.
+ * Pure logic function for Jest testing.
+ */
+export function resolvePackageResolutionUpdates(resolutions: any, specialPackageOverrides?: any[]): Promise<({
+    skipped: boolean;
+    currentPkgName: string;
+    url: any;
+    error: unknown;
+    failed?: undefined;
+    repo?: undefined;
+} | {
+    failed: boolean;
+    currentPkgName: string;
+    url: any;
+    repo: import("git-command-helper").ParsedGitHubUrl;
+    error: unknown;
+    skipped?: undefined;
+})[]>;
 export { parseGitHubUrl };
-import { parseGitHubUrl } from "git-command-helper";
+import { parseGitHubUrl } from 'git-command-helper';

package/lib/package-resolutions-updater.mjs

@@ -4,15 +4,17 @@ import {
   getLatestCommit,
   getLatestCommitAcrossBranches,
   parseGitHubUrl,
-  replaceRawWithLatestHash
-} from "./chunk-XA3SNBPA.mjs";
-import "./chunk-ID2WBTE2.mjs";
-import "./chunk-Z6JLYU2J.mjs";
+  replaceRawWithLatestHash,
+  resolvePackageResolutionUpdates
+} from "./chunk-66KDU4TX.mjs";
+import "./chunk-H44UWUFY.mjs";
+import "./chunk-5RTXZVCW.mjs";
 import "./chunk-QQ4A6DLD.mjs";
 export {
   fetchJson,
   getLatestCommit,
   getLatestCommitAcrossBranches,
   parseGitHubUrl,
-  replaceRawWithLatestHash
+  replaceRawWithLatestHash,
+  resolvePackageResolutionUpdates
 };

package/lib/print-directory-tree.cjs

@@ -88,7 +88,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);
@@ -101,7 +101,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);

package/lib/print-directory-tree.mjs

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

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;