binary-collections 2.0.11 → 2.0.13

package/lib/package-resolutions-updater.cjs

@@ -42,11 +42,11 @@ 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 argv = require("minimist")(process.argv.slice(2));
+    var fs2 = require("fs");
+    var path2 = require("upath");
+    var minimistLib = require("minimist");
+    var argv = 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() {
@@ -59,7 +59,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("/");
@@ -80,25 +80,20 @@ 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 argv;
     }
     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 +101,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 +119,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 +136,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 +150,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 +205,131 @@ var require_utils = __commonJS({
   }
 });
 
+// src/utils/fetchResponse.cjs
+var require_fetchResponse = __commonJS({
+  "src/utils/fetchResponse.cjs"(exports2, module2) {
+    init_cjs_shims();
+    var axios = require("axios");
+    async function fetchResponse2(url, options = {}) {
+      var _a, _b, _c;
+      const response = await axios.get(url, {
+        maxRedirects: 5,
+        responseType: "arraybuffer",
+        validateStatus: () => true,
+        ...options
+      });
+      const finalUrl = ((_b = (_a = response.request) == null ? void 0 : _a.res) == null ? void 0 : _b.responseUrl) ?? ((_c = response.request) == null ? void 0 : _c.responseURL) ?? url;
+      return {
+        finalUrl,
+        status: response.status,
+        statusText: response.statusText,
+        contentType: response.headers["content-type"],
+        contentLength: response.headers["content-length"],
+        dataLength: Buffer.isBuffer(response.data) ? response.data.length : void 0,
+        data: response.data
+      };
+    }
+    module2.exports = fetchResponse2;
+    module2.exports.fetchResponse = fetchResponse2;
+    module2.exports.default = fetchResponse2;
+  }
+});
+
+// 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,96 +337,24 @@ __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();
 var dotenv = __toESM(require("dotenv"), 1);
 var import_fs = __toESM(require("fs"), 1);
-var import_https = __toESM(require("https"), 1);
 var import_os = __toESM(require("os"), 1);
-var import_path = __toESM(require("path"), 1);
+var import_upath = __toESM(require("upath"), 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_fetchResponse = __toESM(require_fetchResponse(), 1);
+var import_findEnvFiles = __toESM(require_findEnvFiles(), 1);
 var import_git_command_helper = require("git-command-helper");
 var projectDir = process.cwd();
-var envPath = import_path.default.join(projectDir, ".env");
+var envPath = import_upath.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);
   });
@@ -317,7 +365,7 @@ if (!import_fs.default.existsSync(envPath)) {
 if (import_fs.default.existsSync(envPath)) {
   dotenv.config({ path: envPath, quiet: true, override: true });
 }
-var ACCESS_TOKEN = process.env.GITHUB_TOKEN || process.env.ACCESS_TOKEN;
+var ACCESS_TOKEN = process.env.ACCESS_TOKEN || process.env.GITHUB_TOKEN;
 if (args.help || args.h) {
   showHelp();
 }
@@ -357,8 +405,8 @@ var GITHUB_USER_AGENTS = [
   "PostmanRuntime/7.32.3",
   "binary-collections-resolver/1.0 (+https://github.com/dimaslanjaka/bin)"
 ];
-var userAgentDir = import_path.default.join(import_os.default.tmpdir(), "nodejs");
-var userAgentFile = import_path.default.join(userAgentDir, "useragent.txt");
+var userAgentDir = import_upath.default.join(import_os.default.tmpdir(), "nodejs");
+var userAgentFile = import_upath.default.join(userAgentDir, "useragent.txt");
 var selectedUserAgent;
 try {
   if (!import_fs.default.existsSync(userAgentDir)) import_fs.default.mkdirSync(userAgentDir, { recursive: true });
@@ -375,33 +423,23 @@ try {
 } catch (_e) {
   selectedUserAgent = GITHUB_USER_AGENTS[Math.floor(Math.random() * GITHUB_USER_AGENTS.length)];
 }
-function fetchJson(url) {
-  const headers = {
-    "User-Agent": selectedUserAgent,
-    Accept: "application/vnd.github.v3+json",
-    "X-GitHub-Api-Version": "2022-11-28",
-    ...ACCESS_TOKEN ? { Authorization: `token ${ACCESS_TOKEN}` } : {}
-  };
-  return new Promise((resolve, reject) => {
-    import_https.default.get(url, { headers }, (res) => {
-      let data = "";
-      res.on("data", (chunk) => data += chunk);
-      res.on("end", () => {
-        try {
-          const json = JSON.parse(data);
-          if (res.statusCode < 200 || res.statusCode >= 300) {
-            return reject(
-              new Error(`GitHub API Error ${res.statusCode}: ${json.message || "Unknown error"}
-URL: ${url}`)
-            );
-          }
-          resolve(json);
-        } catch {
-          reject(new Error(`Invalid JSON from: ${url}`));
-        }
-      });
-    }).on("error", reject);
+async function fetchJson(url) {
+  var _a;
+  const response = await (0, import_fetchResponse.default)(url, {
+    headers: {
+      "User-Agent": selectedUserAgent,
+      Accept: "application/vnd.github.v3+json",
+      "X-GitHub-Api-Version": "2022-11-28",
+      ...ACCESS_TOKEN ? { Authorization: `token ${ACCESS_TOKEN}` } : {}
+    },
+    responseType: "json"
   });
+  if (response.status < 200 || response.status >= 300) {
+    const message = ((_a = response.data) == null ? void 0 : _a.message) || "Unknown error";
+    throw new Error(`GitHub API Error ${response.status}: ${message}
+URL: ${url}`);
+  }
+  return response.data;
 }
 async function getLatestCommit(owner, repo, branch = "main") {
   var _a, _b, _c, _d;
@@ -452,10 +490,74 @@ 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);
+      const response = await (0, import_fetchResponse.default)(new_url);
+      if (response.status < 200 || response.status >= 300) {
+        updates.push({
+          failed: true,
+          currentPkgName,
+          url,
+          new_url,
+          repo,
+          latest,
+          error: new Error(`New URL not accessible (status ${response.status}).
+original: ${url}
+new: ${new_url}`)
+        });
+        continue;
+      }
+      updates.push({
+        currentPkgName,
+        url,
+        new_url,
+        repo,
+        latest
+      });
+    } 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 +565,6 @@ function replaceRawWithLatestHash(url, latestHash) {
   getLatestCommit,
   getLatestCommitAcrossBranches,
   parseGitHubUrl,
-  replaceRawWithLatestHash
+  replaceRawWithLatestHash,
+  resolvePackageResolutionUpdates
 });

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

@@ -28,5 +28,58 @@ 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;
+    new_url?: undefined;
+    repo?: undefined;
+    latest?: undefined;
+} | {
+    failed: boolean;
+    currentPkgName: string;
+    url: any;
+    new_url: string;
+    repo: import("git-command-helper").ParsedGitHubUrl;
+    latest: {
+        owner: any;
+        repo: any;
+        branch: any;
+        sha: any;
+        date: any;
+    };
+    error: Error;
+    skipped?: undefined;
+} | {
+    currentPkgName: string;
+    url: any;
+    new_url: string;
+    repo: import("git-command-helper").ParsedGitHubUrl;
+    latest: {
+        owner: any;
+        repo: any;
+        branch: any;
+        sha: any;
+        date: any;
+    };
+    skipped?: undefined;
+    error?: undefined;
+    failed?: undefined;
+} | {
+    failed: boolean;
+    currentPkgName: string;
+    url: any;
+    repo: import("git-command-helper").ParsedGitHubUrl;
+    error: unknown;
+    skipped?: undefined;
+    new_url?: undefined;
+    latest?: undefined;
+})[]>;
 export { parseGitHubUrl };
-import { parseGitHubUrl } from "git-command-helper";
+import { parseGitHubUrl } from 'git-command-helper';

package/lib/package-resolutions-updater.mjs

@@ -4,15 +4,18 @@ import {
   getLatestCommit,
   getLatestCommitAcrossBranches,
   parseGitHubUrl,
-  replaceRawWithLatestHash
-} from "./chunk-XA3SNBPA.mjs";
-import "./chunk-ID2WBTE2.mjs";
-import "./chunk-Z6JLYU2J.mjs";
+  replaceRawWithLatestHash,
+  resolvePackageResolutionUpdates
+} from "./chunk-TBWXE7ST.mjs";
+import "./chunk-KLKAIFKI.mjs";
+import "./chunk-H44UWUFY.mjs";
+import "./chunk-6RK5UCTP.mjs";
 import "./chunk-QQ4A6DLD.mjs";
 export {
   fetchJson,
   getLatestCommit,
   getLatestCommitAcrossBranches,
   parseGitHubUrl,
-  replaceRawWithLatestHash
+  replaceRawWithLatestHash,
+  resolvePackageResolutionUpdates
 };

package/lib/php-cs-fixer-staged.cjs

@@ -4,7 +4,7 @@ var { exec } = require("child_process");
 var { spawn, spawnSync } = require("child_process");
 var util = require("util");
 var fs = require("fs");
-var path = require("path");
+var path = require("upath");
 var execP = util.promisify(exec);
 function log(...args) {
   console.log("[php-cs-fixer-staged]", ...args);

package/lib/php-cs-fixer-staged.mjs

@@ -13,7 +13,7 @@ var require_php_cs_fixer_staged = __commonJS({
     var { spawn, spawnSync } = __require("child_process");
     var util = __require("util");
     var fs = __require("fs");
-    var path = __require("path");
+    var path = __require("upath");
     var execP = util.promisify(exec);
     function log(...args) {
       console.log("[php-cs-fixer-staged]", ...args);