binary-collections 2.0.12 → 2.0.14

package/lib/package-resolutions-updater.cjs

@@ -38,15 +38,174 @@ var init_cjs_shims = __esm({
   }
 });
 
+// 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 findEnvFiles(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 envPath = path2.join(current, ".env");
+        if (fs2.existsSync(envPath)) {
+          addFile(envPath);
+        }
+        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 = findEnvFiles(startDir);
+      return envFiles.find((file) => {
+        try {
+          const content = fs2.readFileSync(file, "utf-8");
+          if (tokenName instanceof RegExp) {
+            return tokenName.test(content);
+          }
+          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,
+      findEnvWithToken,
+      default: findEnvFiles
+    };
+  }
+});
+
+// src/binary-collections/config.cjs
+var require_config = __commonJS({
+  "src/binary-collections/config.cjs"(exports2, module2) {
+    init_cjs_shims();
+    var path2 = require("upath");
+    var minimistLib = require("minimist");
+    var { findEnvWithToken } = require_findEnvFiles();
+    var dotenv = require("dotenv");
+    var loadDotenv = (tokenKey = /ACCESS_TOKEN|GITHUB_TOKEN/) => dotenv.config({ path: findEnvWithToken(void 0, tokenKey), quiet: true, overwrite: true });
+    loadDotenv();
+    var cliArgv = minimistLib(process.argv.slice(2), {
+      string: ["token"]
+    });
+    var GITHUB_ACCESS_TOKEN = cliArgv.token || process.env.ACCESS_TOKEN || process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+    function getTempDir() {
+      return process.env.TEMP_DIR || path2.join(process.cwd(), "tmp");
+    }
+    function getTempPath(...segments) {
+      return path2.join(getTempDir(), ...segments);
+    }
+    var TEMP_BASE_DIR = getTempDir();
+    module2.exports = {
+      getTempDir,
+      getTempPath,
+      TEMP_BASE_DIR,
+      GITHUB_ACCESS_TOKEN,
+      loadDotenv
+    };
+  }
+});
+
+// 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/index.cjs
 var require_utils = __commonJS({
   "src/utils/index.cjs"(exports2, module2) {
     init_cjs_shims();
     var fs2 = require("fs");
     var path2 = require("upath");
-    var argv = require("minimist")(process.argv.slice(2));
+    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 +218,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,15 +239,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 argv;
     }
     module2.exports.getArgs = getArgs2;
@@ -210,101 +364,6 @@ 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, {
@@ -317,31 +376,14 @@ __export(package_resolutions_updater_exports, {
 });
 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_git_command_helper = require("git-command-helper");
 var import_os = __toESM(require("os"), 1);
-var import_path = __toESM(require("path"), 1);
+var import_upath = __toESM(require("upath"), 1);
+var import_config = __toESM(require_config(), 1);
+var import_fetchResponse = __toESM(require_fetchResponse(), 1);
 var utils = __toESM(require_utils(), 1);
-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 = (0, import_findEnvFiles.findEnvFiles)(projectDir, (file) => {
-    const content = import_fs.default.readFileSync(file, "utf-8");
-    return /GITHUB_TOKEN|ACCESS_TOKEN/.test(content);
-  });
-  if (envFiles.length > 0) {
-    envPath = envFiles[0];
-  }
-}
-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;
 if (args.help || args.h) {
   showHelp();
 }
@@ -365,7 +407,6 @@ Requirements:
   - Node.js v18+ recommended
 Dependencies:
   - ansi-colors \u2013 for styled terminal output
-  - dotenv \u2013 to load GitHub token from .env
 Examples:
   node src/package-resolutions-updater.mjs
   node src/package-resolutions-updater.mjs --help
@@ -381,8 +422,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 });
@@ -399,33 +440,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",
+      ...import_config.GITHUB_ACCESS_TOKEN ? { Authorization: `token ${import_config.GITHUB_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;
@@ -494,15 +525,25 @@ function replaceRawWithLatestHash(url, latestHash) {
 }
 async function resolvePackageResolutionUpdates(resolutions, specialPackageOverrides = []) {
   const updates = [];
-  for (const [currentPkgName, url] of Object.entries(resolutions || {})) {
+  for (const [currentPkgName, version] of Object.entries(resolutions || {})) {
+    const isUrl = typeof version === "string" && (version.startsWith("http://") || version.startsWith("https://"));
+    if (!isUrl) {
+      updates.push({
+        skipped: true,
+        currentPkgName,
+        url: version,
+        error: new Error("Version is not a URL, skipping")
+      });
+      continue;
+    }
     let repo;
     try {
-      repo = (0, import_git_command_helper.parseGitHubUrl)(url);
+      repo = (0, import_git_command_helper.parseGitHubUrl)(version);
     } catch (error) {
       updates.push({
         skipped: true,
         currentPkgName,
-        url,
+        url: version,
         error
       });
       continue;
@@ -510,51 +551,34 @@ async function resolvePackageResolutionUpdates(resolutions, specialPackageOverri
     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) => {
+      const new_url = replaceRawWithLatestHash(version, latest.sha);
+      const response = await (0, import_fetchResponse.default)(new_url);
+      if (response.status < 200 || response.status >= 300) {
         updates.push({
           failed: true,
           currentPkgName,
-          url,
+          url: version,
           new_url,
           repo,
           latest,
-          error: new Error(`New URL is not accessible: ${e.message}`)
+          error: new Error(`New URL not accessible (status ${response.status}).
+original: ${version}
+new: ${new_url}`)
         });
-        return null;
+        continue;
+      }
+      updates.push({
+        currentPkgName,
+        url: version,
+        new_url,
+        repo,
+        latest
       });
     } catch (error) {
       updates.push({
         failed: true,
         currentPkgName,
-        url,
+        url: version,
         repo,
         error
       });

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

@@ -36,16 +36,59 @@ export function resolvePackageResolutionUpdates(resolutions: any, specialPackage
     skipped: boolean;
     currentPkgName: string;
     url: any;
+    error: Error;
+    failed?: undefined;
+    new_url?: undefined;
+    repo?: undefined;
+    latest?: undefined;
+} | {
+    skipped: boolean;
+    currentPkgName: string;
+    url: string;
     error: unknown;
     failed?: undefined;
+    new_url?: undefined;
     repo?: undefined;
+    latest?: undefined;
 } | {
     failed: boolean;
     currentPkgName: string;
-    url: any;
+    url: string;
+    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: string;
+    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: string;
     repo: import("git-command-helper").ParsedGitHubUrl;
     error: unknown;
     skipped?: undefined;
+    new_url?: undefined;
+    latest?: undefined;
 })[]>;
 export { parseGitHubUrl };
 import { parseGitHubUrl } from 'git-command-helper';

package/lib/package-resolutions-updater.mjs

@@ -6,9 +6,11 @@ import {
   parseGitHubUrl,
   replaceRawWithLatestHash,
   resolvePackageResolutionUpdates
-} from "./chunk-66KDU4TX.mjs";
-import "./chunk-H44UWUFY.mjs";
-import "./chunk-5RTXZVCW.mjs";
+} from "./chunk-JK3MG2KF.mjs";
+import "./chunk-KLKAIFKI.mjs";
+import "./chunk-SARIXFHP.mjs";
+import "./chunk-J4M5EL5P.mjs";
+import "./chunk-6RK5UCTP.mjs";
 import "./chunk-QQ4A6DLD.mjs";
 export {
   fetchJson,

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);