binary-collections 2.0.11 → 2.0.12

package/lib/package-resolutions-updater-cli.cjs

@@ -38,8 +38,8 @@ var init_cjs_shims = __esm({
 var require_utils = __commonJS({
   "src/utils/index.cjs"(exports2, module2) {
     init_cjs_shims();
-    var fs4 = require("fs");
-    var path4 = require("upath");
+    var fs3 = require("fs");
+    var path3 = require("upath");
     var argv = require("minimist")(process.argv.slice(2));
     var { exec } = require("child_process");
     var { URL: URL2 } = require("url");
@@ -90,11 +90,11 @@ var require_utils = __commonJS({
     module2.exports.getArgs = getArgs2;
     function del(fullPath) {
       try {
-        if (!fs4.existsSync(fullPath)) return;
-        const stat = fs4.lstatSync(fullPath);
+        if (!fs3.existsSync(fullPath)) return;
+        const stat = fs3.lstatSync(fullPath);
         if (stat.isSymbolicLink()) {
           try {
-            fs4.unlinkSync(fullPath);
+            fs3.unlinkSync(fullPath);
             console.log("deleted symlink", fullPath);
           } catch (e) {
             console.log("failed delete symlink", fullPath, e && e.message);
@@ -102,16 +102,16 @@ var require_utils = __commonJS({
           return;
         }
         if (stat.isDirectory()) {
-          const subdir = fs4.readdirSync(fullPath).map((dirPath) => path4.resolve(fullPath, dirPath));
+          const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.resolve(fullPath, dirPath));
           for (let i = 0; i < subdir.length; i++) {
             del(subdir[i]);
           }
           try {
-            fs4.rmdirSync(fullPath);
+            fs3.rmdirSync(fullPath);
             console.log("deleted", fullPath);
-          } catch (e) {
+          } catch (_e) {
             try {
-              fs4.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+              fs3.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
               console.log("deleted", fullPath);
             } catch (ee) {
               console.log("failed delete", fullPath, ee && ee.message);
@@ -120,11 +120,11 @@ var require_utils = __commonJS({
           return;
         }
         try {
-          fs4.unlinkSync(fullPath);
+          fs3.unlinkSync(fullPath);
           console.log("deleted", fullPath);
-        } catch (e) {
+        } catch (_e) {
           try {
-            fs4.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+            fs3.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
             console.log("deleted", fullPath);
           } catch (ee) {
             console.log("failed delete", fullPath, ee && ee.message);
@@ -137,13 +137,13 @@ var require_utils = __commonJS({
     module2.exports.del = del;
     function delStream(globStream) {
       globStream.stream().on("data", (result) => {
-        const fullPath = path4.resolve(process.cwd(), result);
+        const fullPath = path3.resolve(process.cwd(), result);
         try {
-          if (fs4.existsSync(fullPath)) {
-            const stat = fs4.lstatSync(fullPath);
+          if (fs3.existsSync(fullPath)) {
+            const stat = fs3.lstatSync(fullPath);
             if (stat.isSymbolicLink()) {
               try {
-                fs4.unlinkSync(fullPath);
+                fs3.unlinkSync(fullPath);
                 console.log("deleted symlink", fullPath);
               } catch (e) {
                 console.log("failed delete symlink", fullPath, e && e.message);
@@ -151,7 +151,7 @@ var require_utils = __commonJS({
               return;
             }
             if (stat.isDirectory()) {
-              const subdir = fs4.readdirSync(fullPath).map((dirPath) => path4.resolve(fullPath, dirPath));
+              const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.resolve(fullPath, dirPath));
               for (let i = 0; i < subdir.length; i++) {
                 del(subdir[i]);
               }
@@ -206,6 +206,101 @@ var require_utils = __commonJS({
   }
 });
 
+// src/utils/findEnvFiles.cjs
+var require_findEnvFiles = __commonJS({
+  "src/utils/findEnvFiles.cjs"(exports2, module2) {
+    init_cjs_shims();
+    var fs3 = require("fs");
+    var path3 = 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 = path3.normalize(file);
+        if (typeof filter === "function" && !filter(normalized)) {
+          return;
+        }
+        found.add(normalized);
+      }
+      let current = path3.resolve(startDir);
+      while (true) {
+        const envPath2 = path3.join(current, ".env");
+        if (fs3.existsSync(envPath2)) {
+          addFile(envPath2);
+        }
+        const parent = path3.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 = fs3.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-cli.mjs
 init_cjs_shims();
 var import_ansi_colors = __toESM(require("ansi-colors"), 1);
@@ -220,86 +315,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);
   });
@@ -445,10 +468,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, path4] = match;
-  return `https://github.com/${owner}/${repo}/raw/${latestHash}/${path4}`;
+  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 path3 = 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}/${path3}`;
+  }
+  if (parsed.host === "raw.githubusercontent.com") {
+    return `https://raw.githubusercontent.com/${parsed.owner}/${parsed.repo}/${latestHash}/${path3}`;
+  }
+  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;
 }
 
 // src/package-resolutions-updater-cli.mjs
@@ -464,12 +568,6 @@ function replaceRawWithLatestHash(url, latestHash) {
     // Hexo family
     // { pkg: "hexo", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
     // { pkg: "hexo-util", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "warehouse", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-server", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-log", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-front-matter", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-cli", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-asset-link", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
     { pkg: "hexo-post-parser", branch: "pre-release", repo: "hexo-post-parser", owner: "dimaslanjaka" },
     { pkg: "hexo-seo", branch: "pre-release", repo: "hexo-seo", owner: "dimaslanjaka" },
     { pkg: "hexo-is", branch: "master", repo: "hexo-is", owner: "dimaslanjaka" },
@@ -503,38 +601,25 @@ function replaceRawWithLatestHash(url, latestHash) {
     console.log(import_ansi_colors.default.yellow("No resolutions found in package.json"));
     return;
   }
-  console.log(`Processing ${entries.length} resolution(s)...`);
-  const updates = [];
-  for (const [currentPkgName, url] of entries) {
-    let repo;
-    try {
-      repo = (0, import_git_command_helper.parseGitHubUrl)(url);
-    } catch (error) {
-      console.log(`\u23ED\uFE0F  Skipping ${import_ansi_colors.default.yellow(currentPkgName)}: ${error.message}`);
-      continue;
+  console.log(`\u2699\uFE0F  Processing ${entries.length} resolution(s)...`);
+  const updates = await resolvePackageResolutionUpdates(pkg.resolutions, specialPackageOverrides);
+  const validUpdates = updates.filter((u) => !u.skipped && !u.failed);
+  for (const update of updates) {
+    if (update.skipped) {
+      console.log(`\u23ED\uFE0F  Skipping ${import_ansi_colors.default.yellow(update.currentPkgName)}: ${update.error.message}`);
     }
-    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);
-      updates.push({
-        currentPkgName,
-        url,
-        new_url,
-        repo,
-        latest
-      });
-    } catch (error) {
-      console.log(`\u274C Failed to process ${import_ansi_colors.default.red(currentPkgName)}: ${error.message}`);
+    if (update.failed) {
+      console.log(`\u274C Failed to process ${import_ansi_colors.default.red(update.currentPkgName)}: ${update.error.message}`);
     }
   }
-  if (updates.length === 0) {
+  console.log("");
+  if (validUpdates.length === 0) {
     console.log(import_ansi_colors.default.yellow("No GitHub URLs were processed"));
     return;
   }
-  console.log(`\u{1F4DD} Applying updates to ${updates.length} GitHub URL(s)...`);
+  console.log(`\u{1F4DD} Applying updates to ${validUpdates.length} GitHub URL(s)...`);
   let changed = false;
-  for (const { currentPkgName, url, new_url, repo, latest } of updates) {
+  for (const { currentPkgName, url, new_url, repo, latest } of validUpdates) {
     if (url !== new_url) {
       console.log(`${import_ansi_colors.default.cyan(currentPkgName)}:`);
       console.log("  from:", url.replace(repo.branch, import_ansi_colors.default.red(repo.branch)));
@@ -548,7 +633,7 @@ function replaceRawWithLatestHash(url, latestHash) {
   console.log("\n\u{1F4CC} Summary:");
   if (changed) {
     try {
-      import_fs2.default.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "");
+      import_fs2.default.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
       console.log(`\u2705 package.json updated successfully`);
     } catch (e) {
       console.error(import_ansi_colors.default.red(`Failed to write package.json: ${e.message}`));

package/lib/package-resolutions-updater-cli.mjs

@@ -1,12 +1,9 @@
 import { createRequire } from 'module'; const require = createRequire(import.meta.url);
 import {
-  getLatestCommit,
-  getLatestCommitAcrossBranches,
-  parseGitHubUrl,
-  replaceRawWithLatestHash
-} from "./chunk-XA3SNBPA.mjs";
-import "./chunk-ID2WBTE2.mjs";
-import "./chunk-Z6JLYU2J.mjs";
+  resolvePackageResolutionUpdates
+} from "./chunk-66KDU4TX.mjs";
+import "./chunk-H44UWUFY.mjs";
+import "./chunk-5RTXZVCW.mjs";
 import {
   init_esm_shims
 } from "./chunk-QQ4A6DLD.mjs";
@@ -28,12 +25,6 @@ import path from "path";
     // Hexo family
     // { pkg: "hexo", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
     // { pkg: "hexo-util", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "warehouse", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-server", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-log", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-front-matter", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-cli", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-    // { pkg: "hexo-asset-link", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
     { pkg: "hexo-post-parser", branch: "pre-release", repo: "hexo-post-parser", owner: "dimaslanjaka" },
     { pkg: "hexo-seo", branch: "pre-release", repo: "hexo-seo", owner: "dimaslanjaka" },
     { pkg: "hexo-is", branch: "master", repo: "hexo-is", owner: "dimaslanjaka" },
@@ -67,38 +58,25 @@ import path from "path";
     console.log(ansiColors.yellow("No resolutions found in package.json"));
     return;
   }
-  console.log(`Processing ${entries.length} resolution(s)...`);
-  const updates = [];
-  for (const [currentPkgName, url] of entries) {
-    let repo;
-    try {
-      repo = parseGitHubUrl(url);
-    } catch (error) {
-      console.log(`\u23ED\uFE0F  Skipping ${ansiColors.yellow(currentPkgName)}: ${error.message}`);
-      continue;
+  console.log(`\u2699\uFE0F  Processing ${entries.length} resolution(s)...`);
+  const updates = await resolvePackageResolutionUpdates(pkg.resolutions, specialPackageOverrides);
+  const validUpdates = updates.filter((u) => !u.skipped && !u.failed);
+  for (const update of updates) {
+    if (update.skipped) {
+      console.log(`\u23ED\uFE0F  Skipping ${ansiColors.yellow(update.currentPkgName)}: ${update.error.message}`);
     }
-    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);
-      updates.push({
-        currentPkgName,
-        url,
-        new_url,
-        repo,
-        latest
-      });
-    } catch (error) {
-      console.log(`\u274C Failed to process ${ansiColors.red(currentPkgName)}: ${error.message}`);
+    if (update.failed) {
+      console.log(`\u274C Failed to process ${ansiColors.red(update.currentPkgName)}: ${update.error.message}`);
     }
   }
-  if (updates.length === 0) {
+  console.log("");
+  if (validUpdates.length === 0) {
     console.log(ansiColors.yellow("No GitHub URLs were processed"));
     return;
   }
-  console.log(`\u{1F4DD} Applying updates to ${updates.length} GitHub URL(s)...`);
+  console.log(`\u{1F4DD} Applying updates to ${validUpdates.length} GitHub URL(s)...`);
   let changed = false;
-  for (const { currentPkgName, url, new_url, repo, latest } of updates) {
+  for (const { currentPkgName, url, new_url, repo, latest } of validUpdates) {
     if (url !== new_url) {
       console.log(`${ansiColors.cyan(currentPkgName)}:`);
       console.log("  from:", url.replace(repo.branch, ansiColors.red(repo.branch)));
@@ -112,7 +90,7 @@ import path from "path";
   console.log("\n\u{1F4CC} Summary:");
   if (changed) {
     try {
-      fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "");
+      fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
       console.log(`\u2705 package.json updated successfully`);
     } catch (e) {
       console.error(ansiColors.red(`Failed to write package.json: ${e.message}`));