binary-collections 2.0.10 → 2.0.11

package/lib/package-resolutions-updater.cjs

@@ -10,6 +10,10 @@ var __esm = (fn, res) => function __init() {
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -26,6 +30,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
@@ -37,8 +42,8 @@ var init_cjs_shims = __esm({
 var require_utils = __commonJS({
   "src/utils/index.cjs"(exports2, module2) {
     init_cjs_shims();
-    var fs2 = require("fs");
-    var path2 = 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");
@@ -88,31 +93,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 (!fs3.existsSync(fullPath)) return;
+        const stat = fs3.lstatSync(fullPath);
+        if (stat.isSymbolicLink()) {
+          try {
+            fs3.unlinkSync(fullPath);
+            console.log("deleted symlink", fullPath);
+          } catch (e) {
+            console.log("failed delete symlink", fullPath, e && e.message);
+          }
+          return;
+        }
+        if (stat.isDirectory()) {
+          const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.resolve(fullPath, dirPath));
+          for (let i = 0; i < subdir.length; i++) {
+            del(subdir[i]);
+          }
+          try {
+            fs3.rmdirSync(fullPath);
+            console.log("deleted", fullPath);
+          } catch (e) {
+            try {
+              fs3.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 });
+          fs3.unlinkSync(fullPath);
           console.log("deleted", fullPath);
-        } catch (_) {
-          console.log("failed delete", fullPath);
+        } catch (e) {
+          try {
+            fs3.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]);
+        const fullPath = path3.resolve(process.cwd(), result);
+        try {
+          if (fs3.existsSync(fullPath)) {
+            const stat = fs3.lstatSync(fullPath);
+            if (stat.isSymbolicLink()) {
+              try {
+                fs3.unlinkSync(fullPath);
+                console.log("deleted symlink", fullPath);
+              } catch (e) {
+                console.log("failed delete symlink", fullPath, e && e.message);
+              }
+              return;
+            }
+            if (stat.isDirectory()) {
+              const subdir = fs3.readdirSync(fullPath).map((dirPath) => path3.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;
@@ -159,18 +211,112 @@ var require_utils = __commonJS({
 });
 
 // src/package-resolutions-updater.mjs
+var package_resolutions_updater_exports = {};
+__export(package_resolutions_updater_exports, {
+  fetchJson: () => fetchJson,
+  getLatestCommit: () => getLatestCommit,
+  getLatestCommitAcrossBranches: () => getLatestCommitAcrossBranches,
+  parseGitHubUrl: () => import_git_command_helper.parseGitHubUrl,
+  replaceRawWithLatestHash: () => replaceRawWithLatestHash
+});
+module.exports = __toCommonJS(package_resolutions_updater_exports);
 init_cjs_shims();
-var import_ansi_colors = __toESM(require("ansi-colors"), 1);
 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 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_git_command_helper = require("git-command-helper");
 var projectDir = process.cwd();
 var envPath = import_path.default.join(projectDir, ".env");
 var args = utils.getArgs();
-if (import_fs.default.existsSync(envPath)) dotenv.config({ path: envPath });
+if (!import_fs.default.existsSync(envPath)) {
+  const envFiles = 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();
@@ -204,51 +350,6 @@ Examples:
   console.log(helpText);
   process.exit(0);
 }
-var specialPackageOverrides = [
-  // SBG packages
-  { pkg: "sbg-utility", branch: "sbg-utility", repo: "static-blog-generator", owner: "dimaslanjaka" },
-  { pkg: "sbg-api", branch: "sbg-api", repo: "static-blog-generator", owner: "dimaslanjaka" },
-  { pkg: "instant-indexing", branch: "instant-indexing", repo: "static-blog-generator", owner: "dimaslanjaka" },
-  { pkg: "sbg-server", branch: "master", repo: "static-blog-generator", owner: "dimaslanjaka" },
-  { pkg: "sbg-cli", branch: "master", repo: "static-blog-generator", owner: "dimaslanjaka" },
-  { pkg: "static-blog-generator", branch: "master", repo: "static-blog-generator", owner: "dimaslanjaka" },
-  // 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" },
-  { pkg: "markdown-it", branch: "master", repo: "markdown-it", owner: "dimaslanjaka" },
-  { pkg: "hexo-renderers", branch: "pre-release", repo: "hexo-renderers", owner: "dimaslanjaka" },
-  { pkg: "hexo-shortcodes", branch: "pre-release", repo: "hexo-shortcodes", owner: "dimaslanjaka" },
-  { pkg: "google-news-sitemap", branch: "master", repo: "google-news-sitemap", owner: "dimaslanjaka" },
-  { pkg: "git-command-helper", branch: "pre-release", repo: "git-command-helper", owner: "dimaslanjaka" },
-  {
-    pkg: "nodejs-package-types",
-    branch: "main",
-    repo: "nodejs-package-types",
-    owner: "dimaslanjaka"
-  },
-  { pkg: "cross-spawn", branch: "private", repo: "node-cross-spawn", owner: "dimaslanjaka" },
-  { pkg: "hexo-generator-redirect", branch: "master", repo: "hexo-generator-redirect", owner: "dimaslanjaka" },
-  { pkg: "binary-collections", branch: "master", repo: "bin", owner: "dimaslanjaka" },
-  { pkg: "@types/hexo", branch: "monorepo-v7", repo: "hexo", owner: "dimaslanjaka" },
-  { pkg: "@types/git-command-helper", branch: "pre-release", repo: "git-command-helper", owner: "dimaslanjaka" }
-];
-var pkgPath = import_path.default.join(process.cwd(), "package.json");
-var pkg;
-try {
-  pkg = JSON.parse(import_fs.default.readFileSync(pkgPath, "utf-8"));
-} catch (e) {
-  console.error(import_ansi_colors.default.red(`Failed to read package.json: ${e.message}`));
-  process.exit(1);
-}
 var GITHUB_USER_AGENTS = [
   "octokit-rest.js/19.0.7",
   "GitHub CLI/2.40.0",
@@ -353,95 +454,14 @@ 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, path2] = match;
-  return `https://github.com/${owner}/${repo}/raw/${latestHash}/${path2}`;
+  const [, owner, repo, _oldHash, path3] = match;
+  return `https://github.com/${owner}/${repo}/raw/${latestHash}/${path3}`;
 }
-function parseGitHubUrl(url) {
-  const ghRepoRoot = /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/?$/;
-  const ghTreeOrBlob = /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/(tree|blob)\/([^/]+(?:\/[^/]+)*)/;
-  const ghRaw = /^https:\/\/raw\.githubusercontent\.com\/([^/]+)\/([^/]+)\/([^/]+)(\/.+)?$/;
-  const ghDotComRaw = /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/raw\/([^/]+)\/.+/;
-  let match;
-  if (match = url.match(ghRaw)) {
-    const [, owner, repo, branch] = match;
-    return { owner, repo, branch, url };
-  }
-  if (match = url.match(ghDotComRaw)) {
-    const [, owner, repo, branch] = match;
-    return { owner, repo, branch, url };
-  }
-  if (match = url.match(ghTreeOrBlob)) {
-    const [, owner, repo, , branchPath] = match;
-    return { owner, repo, branch: branchPath, url };
-  }
-  if (match = url.match(ghRepoRoot)) {
-    const [, owner, repo] = match;
-    return { owner, repo, url };
-  }
-  throw new Error(`Unsupported GitHub URL: ${url}`);
-}
-(async () => {
-  const entries = Object.entries(pkg.resolutions || {});
-  if (entries.length === 0) {
-    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 = parseGitHubUrl(url);
-      console.log(`\u2705 Valid GitHub URL for ${import_ansi_colors.default.cyan(currentPkgName)}: ${url}`);
-    } catch (error) {
-      console.log(`\u23ED\uFE0F  Skipping ${import_ansi_colors.default.yellow(currentPkgName)}: ${error.message}`);
-      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);
-      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 (updates.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)...`);
-  let changed = false;
-  for (const { currentPkgName, url, new_url, repo, latest } of updates) {
-    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)));
-      console.log("    to:", new_url.replace(latest.sha, import_ansi_colors.default.green(latest.sha)));
-      pkg.resolutions[currentPkgName] = new_url;
-      changed = true;
-    } else {
-      console.log(`
-${import_ansi_colors.default.cyan(currentPkgName)}: ${import_ansi_colors.default.gray("already up-to-date")}`);
-    }
-  }
-  if (changed) {
-    try {
-      import_fs.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}`));
-      process.exit(1);
-    }
-  } else {
-    console.log(import_ansi_colors.default.green("No changes to package.json were necessary."));
-  }
-})();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fetchJson,
+  getLatestCommit,
+  getLatestCommitAcrossBranches,
+  parseGitHubUrl,
+  replaceRawWithLatestHash
+});

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

@@ -1 +1,32 @@
-export {};
+/**
+ * Fetch JSON from a URL with GitHub headers.
+ * @param {string} url
+ * @returns {Promise<any>}
+ */
+export function fetchJson(url: string): Promise<any>;
+/**
+ * Get latest commit SHA from a specific branch.
+ */
+export function getLatestCommit(owner: any, repo: any, branch?: string): Promise<{
+    owner: any;
+    repo: any;
+    branch: string;
+    sha: any;
+    date: string;
+}>;
+/**
+ * Get latest commit SHA from all branches and pick the latest.
+ */
+export function getLatestCommitAcrossBranches(owner: any, repo: any): Promise<{
+    owner: any;
+    repo: any;
+    branch: any;
+    sha: any;
+    date: any;
+}>;
+/**
+ * Replace the branch or commit in a GitHub raw URL with the latest hash.
+ */
+export function replaceRawWithLatestHash(url: any, latestHash: any): string;
+export { parseGitHubUrl };
+import { parseGitHubUrl } from "git-command-helper";