binary-collections 2.0.12 → 2.0.13

package/lib/clean-github-actions-caches-cli.cjs

@@ -13,6 +13,173 @@ var init_cjs_shims = __esm({
   }
 });
 
+// src/utils/index.cjs
+var require_utils = __commonJS({
+  "src/utils/index.cjs"(exports2, module2) {
+    init_cjs_shims();
+    var fs = require("fs");
+    var path = require("upath");
+    var minimistLib = require("minimist");
+    var argv2 = minimistLib(process.argv.slice(2));
+    var { exec } = require("child_process");
+    var { promisify } = require("util");
+    var execAsync = promisify(exec);
+    async function parseGitRemotes2() {
+      try {
+        const { stdout } = await execAsync("git remote -v");
+        const lines = stdout.split("\n");
+        const remotes = {};
+        lines.forEach((line) => {
+          const [name, url] = line.split("	");
+          if (name && url) {
+            const [repoUrl] = url.split(" ");
+            try {
+              const parsedUrl = new URL(repoUrl);
+              const pathParts = parsedUrl.pathname.split("/").filter(Boolean);
+              if (parsedUrl.hostname === "github.com" && pathParts.length === 2) {
+                let repoPath = pathParts.join("/");
+                if (repoPath.endsWith(".git")) {
+                  repoPath = repoPath.slice(0, -4);
+                }
+                remotes[name] = repoPath;
+              }
+            } catch (e) {
+              console.error("URL Parsing Error:", e.message);
+            }
+          }
+        });
+        return remotes;
+      } catch (error) {
+        console.error("Error:", error.message);
+        return {};
+      }
+    }
+    module2.exports.parseGitRemotes = parseGitRemotes2;
+    function getArgs2(opts) {
+      if (opts) {
+        return minimistLib(process.argv.slice(2), opts);
+      }
+      return argv2;
+    }
+    module2.exports.getArgs = getArgs2;
+    function del(fullPath) {
+      try {
+        if (!fs.existsSync(fullPath)) return;
+        const stat = fs.lstatSync(fullPath);
+        if (stat.isSymbolicLink()) {
+          try {
+            fs.unlinkSync(fullPath);
+            console.log("deleted symlink", fullPath);
+          } catch (e) {
+            console.log("failed delete symlink", fullPath, e && e.message);
+          }
+          return;
+        }
+        if (stat.isDirectory()) {
+          const subdir = fs.readdirSync(fullPath).map((dirPath) => path.resolve(fullPath, dirPath));
+          for (let i = 0; i < subdir.length; i++) {
+            del(subdir[i]);
+          }
+          try {
+            fs.rmdirSync(fullPath);
+            console.log("deleted", fullPath);
+          } catch (_e) {
+            try {
+              fs.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
+              console.log("deleted", fullPath);
+            } catch (ee) {
+              console.log("failed delete", fullPath, ee && ee.message);
+            }
+          }
+          return;
+        }
+        try {
+          fs.unlinkSync(fullPath);
+          console.log("deleted", fullPath);
+        } catch (_e) {
+          try {
+            fs.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 = path.resolve(process.cwd(), result);
+        try {
+          if (fs.existsSync(fullPath)) {
+            const stat = fs.lstatSync(fullPath);
+            if (stat.isSymbolicLink()) {
+              try {
+                fs.unlinkSync(fullPath);
+                console.log("deleted symlink", fullPath);
+              } catch (e) {
+                console.log("failed delete symlink", fullPath, e && e.message);
+              }
+              return;
+            }
+            if (stat.isDirectory()) {
+              const subdir = fs.readdirSync(fullPath).map((dirPath) => path.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);
+        }
+      });
+    }
+    module2.exports.delStream = delStream;
+    function getFileTreeString(hashArray) {
+      const tree = {};
+      const hashMap = {};
+      for (const entry of hashArray) {
+        const [filePath, hash] = entry.split(" ");
+        hashMap[filePath] = hash;
+        const parts = filePath.split("/");
+        let current = tree;
+        for (let i = 0; i < parts.length; i++) {
+          const part = parts[i];
+          if (i === parts.length - 1) {
+            current[part] = null;
+          } else {
+            current[part] = current[part] || {};
+            current = current[part];
+          }
+        }
+      }
+      function printNode(node, prefix = "", parentPath = "") {
+        const keys = Object.keys(node).sort();
+        let lines = [];
+        keys.forEach((key, idx) => {
+          const isLast = idx === keys.length - 1;
+          const branch = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
+          const currentPath = parentPath ? parentPath + "/" + key : key;
+          if (node[key] === null) {
+            lines.push(prefix + branch + key + " [" + (hashMap[currentPath] || "") + "]");
+          } else {
+            lines.push(prefix + branch + key + "/");
+            lines = lines.concat(printNode(node[key], prefix + (isLast ? "    " : "\u2502   "), currentPath));
+          }
+        });
+        return lines;
+      }
+      return printNode(tree, "", "").join("\n");
+    }
+    module2.exports.getFileTreeString = getFileTreeString;
+    var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+    module2.exports.delay = delay;
+  }
+});
+
 // src/utils/findEnvFiles.cjs
 var require_findEnvFiles = __commonJS({
   "src/utils/findEnvFiles.cjs"(exports2, module2) {
@@ -113,14 +280,14 @@ var require_clean_github_actions_caches = __commonJS({
   "src/clean-github-actions-caches.cjs"(exports2, module2) {
     init_cjs_shims();
     var axios = require("axios");
-    var minimist = require("minimist");
+    var { getArgs: getArgs2 } = require_utils();
     var { findEnvWithToken } = require_findEnvFiles();
     require("dotenv").config({
       path: findEnvWithToken(),
       quiet: true,
       overwrite: true
     });
-    var ACCESS_TOKEN = process.env.GITHUB_TOKEN || process.env.ACCESS_TOKEN;
+    var ACCESS_TOKEN = process.env.ACCESS_TOKEN || process.env.GITHUB_TOKEN;
     if (!ACCESS_TOKEN) {
       throw new Error(
         "Access token is not provided. Please set ACCESS_TOKEN or GITHUB_TOKEN in your environment variables."
@@ -143,6 +310,9 @@ Options:
   -r, --repo <repo>    GitHub repository (owner/repo). If omitted, the tool will
                        attempt to infer the repository from the current working
                        directory's git remotes.
+    -p, --prefix-depth <n>
+                         Number of leading cache key segments to use as the
+                         grouping prefix when splitting on /[-_]/. Default: 3.
 
 Environment Variables:
   ACCESS_TOKEN         GitHub access token (preferred)
@@ -159,25 +329,26 @@ Examples:
   clean-github-actions-caches --repo octocat/hello-world
 
   # Run via npx without installing
-  npx -y binary-collections@https://raw.githubusercontent.com/dimaslanjaka/bin/master/releases/bin.tgz clean-github-actions-caches --repo owner/repo
+    npx --legacy-peer-deps -y binary-collections@https://raw.githubusercontent.com/dimaslanjaka/bin/master/releases/bin.tgz clean-github-actions-caches --repo owner/repo --prefix-depth 3
 
   # Run via yarn dlx
-  yarn dlx binary-collections@https://raw.githubusercontent.com/dimaslanjaka/bin/master/releases/bin.tgz clean-github-actions-caches
+    yarn dlx binary-collections@https://raw.githubusercontent.com/dimaslanjaka/bin/master/releases/bin.tgz clean-github-actions-caches --prefix-depth 3
 
 Notes:
   - Ensure ACCESS_TOKEN or GITHUB_TOKEN is set and has permissions to manage Actions caches.
   - Intended for repository maintainers with appropriate permissions.
 `);
     }
-    var argv = minimist(process.argv.slice(2), {
+    var argv2 = getArgs2({
       alias: {
         h: "help",
+        p: "prefix-depth",
         r: "repo"
       },
-      string: ["repo"],
+      string: ["prefix-depth", "repo"],
       boolean: ["help"]
     });
-    if (argv.help) {
+    if (argv2.help) {
       printHelp();
       process.exit(0);
     }
@@ -203,7 +374,53 @@ Notes:
         });
       });
     }
-    function get_caches2(GH_REPO) {
+    function normalizePrefixDepth(prefixDepth) {
+      const parsed = Number(prefixDepth);
+      if (!Number.isFinite(parsed) || parsed < 1) {
+        return 3;
+      }
+      return Math.floor(parsed);
+    }
+    function isChecksumSegment(segment) {
+      return /^[a-f0-9]{32,}$/i.test(segment);
+    }
+    function getMeaningfulCacheKeyParts(key) {
+      return String(key).split(/[-_]/).filter(Boolean).filter((segment) => !isChecksumSegment(segment));
+    }
+    function getCachePrefix(key, prefixDepth = 3) {
+      const normalizedDepth = normalizePrefixDepth(prefixDepth);
+      const parts = String(key).split(/[-_]/).filter(Boolean);
+      const meaningfulParts = getMeaningfulCacheKeyParts(key);
+      if (meaningfulParts.length !== parts.length) {
+        if (meaningfulParts.length < normalizedDepth) {
+          return `${meaningfulParts.join("-")}-`;
+        }
+        return meaningfulParts.join("-");
+      }
+      if (parts.length <= normalizedDepth) {
+        return parts.join("-");
+      }
+      return parts.slice(0, normalizedDepth).join("-");
+    }
+    function groupCachesByPrefix(caches, prefixDepth = 3) {
+      return caches.reduce(
+        /**
+         * @param {Record<string, Record<string, any>[]>} acc
+         * @param {Record<string, any>} item
+         * @returns {Record<string, Record<string, any>[]>}
+         */
+        (acc, item) => {
+          const prefix = getCachePrefix(item.key, prefixDepth);
+          if (!acc[prefix]) {
+            acc[prefix] = [];
+          }
+          acc[prefix].push(item);
+          return acc;
+        },
+        {}
+      );
+    }
+    function get_caches2(GH_REPO, prefixDepth = 3) {
       const url = `https://api.github.com/repos/${GH_REPO}/actions/caches`;
       return new Promise((resolve, reject) => {
         axios.get(url, {
@@ -213,227 +430,45 @@ Notes:
           }
         }).then((response) => {
           const data = response.data.actions_caches;
-          const getPrefix = (key) => {
-            const split = key.split(/[-_]/);
-            if (split.length === 3) {
-              return `${split[0]}-${split[1]}`;
-            }
-            if (split.length > 3) {
-              return `${split[0]}-${split[1]}-${split[2]}`;
-            }
-            return split[0];
-          };
-          const grouped = data.reduce(
-            /**
-             * @param {Record<string, Record<string, any>[]>} acc
-             * @param {Record<string, any>} item
-             * @returns {Record<string, Record<string, any>[]>}
-             */
-            (acc, item) => {
-              const prefix = getPrefix(item.key);
-              if (!acc[prefix]) {
-                acc[prefix] = [];
-              }
-              acc[prefix].push(item);
-              return acc;
-            },
-            {}
-          );
+          const grouped = groupCachesByPrefix(data, prefixDepth);
           resolve(grouped);
         }).catch((error) => {
-          console.error("Error fetching data:", error);
           reject(error);
         });
       });
     }
     module2.exports = {
       deleteGitHubActionsCache: deleteGitHubActionsCache2,
-      get_caches: get_caches2
+      getCachePrefix,
+      getMeaningfulCacheKeyParts,
+      get_caches: get_caches2,
+      groupCachesByPrefix,
+      isChecksumSegment,
+      normalizePrefixDepth
     };
   }
 });
 
-// src/utils/index.cjs
-var require_utils = __commonJS({
-  "src/utils/index.cjs"(exports2, module2) {
-    init_cjs_shims();
-    var fs = require("fs");
-    var path = require("upath");
-    var argv = require("minimist")(process.argv.slice(2));
-    var { exec } = require("child_process");
-    var { URL: URL2 } = require("url");
-    var { promisify } = require("util");
-    var execAsync = promisify(exec);
-    async function parseGitRemotes2() {
-      try {
-        const { stdout } = await execAsync("git remote -v");
-        const lines = stdout.split("\n");
-        const remotes = {};
-        lines.forEach((line) => {
-          const [name, url] = line.split("	");
-          if (name && url) {
-            const [repoUrl] = url.split(" ");
-            try {
-              const parsedUrl = new URL2(repoUrl);
-              const pathParts = parsedUrl.pathname.split("/").filter(Boolean);
-              if (parsedUrl.hostname === "github.com" && pathParts.length === 2) {
-                let repoPath = pathParts.join("/");
-                if (repoPath.endsWith(".git")) {
-                  repoPath = repoPath.slice(0, -4);
-                }
-                remotes[name] = repoPath;
-              }
-            } catch (e) {
-              console.error("URL Parsing Error:", e.message);
-            }
-          }
-        });
-        return remotes;
-      } catch (error) {
-        console.error("Error:", error.message);
-        return {};
-      }
-    }
-    module2.exports.parseGitRemotes = parseGitRemotes2;
-    function joinPathPreserveDriveLetter(...segments) {
-      let fullPath = require("path").join(...segments);
-      if (/^[a-z]:\\/.test(fullPath)) {
-        fullPath = fullPath.charAt(0).toUpperCase() + fullPath.slice(1);
-      }
-      return fullPath;
-    }
-    module2.exports.joinPathPreserveDriveLetter = joinPathPreserveDriveLetter;
-    function getArgs() {
-      return argv;
-    }
-    module2.exports.getArgs = getArgs;
-    function del(fullPath) {
-      try {
-        if (!fs.existsSync(fullPath)) return;
-        const stat = fs.lstatSync(fullPath);
-        if (stat.isSymbolicLink()) {
-          try {
-            fs.unlinkSync(fullPath);
-            console.log("deleted symlink", fullPath);
-          } catch (e) {
-            console.log("failed delete symlink", fullPath, e && e.message);
-          }
-          return;
-        }
-        if (stat.isDirectory()) {
-          const subdir = fs.readdirSync(fullPath).map((dirPath) => path.resolve(fullPath, dirPath));
-          for (let i = 0; i < subdir.length; i++) {
-            del(subdir[i]);
-          }
-          try {
-            fs.rmdirSync(fullPath);
-            console.log("deleted", fullPath);
-          } catch (_e) {
-            try {
-              fs.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7e3 });
-              console.log("deleted", fullPath);
-            } catch (ee) {
-              console.log("failed delete", fullPath, ee && ee.message);
-            }
-          }
-          return;
-        }
-        try {
-          fs.unlinkSync(fullPath);
-          console.log("deleted", fullPath);
-        } catch (_e) {
-          try {
-            fs.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 = path.resolve(process.cwd(), result);
-        try {
-          if (fs.existsSync(fullPath)) {
-            const stat = fs.lstatSync(fullPath);
-            if (stat.isSymbolicLink()) {
-              try {
-                fs.unlinkSync(fullPath);
-                console.log("deleted symlink", fullPath);
-              } catch (e) {
-                console.log("failed delete symlink", fullPath, e && e.message);
-              }
-              return;
-            }
-            if (stat.isDirectory()) {
-              const subdir = fs.readdirSync(fullPath).map((dirPath) => path.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);
-        }
-      });
-    }
-    module2.exports.delStream = delStream;
-    function getFileTreeString(hashArray) {
-      const tree = {};
-      const hashMap = {};
-      for (const entry of hashArray) {
-        const [filePath, hash] = entry.split(" ");
-        hashMap[filePath] = hash;
-        const parts = filePath.split("/");
-        let current = tree;
-        for (let i = 0; i < parts.length; i++) {
-          const part = parts[i];
-          if (i === parts.length - 1) {
-            current[part] = null;
-          } else {
-            current[part] = current[part] || {};
-            current = current[part];
-          }
-        }
-      }
-      function printNode(node, prefix = "", parentPath = "") {
-        const keys = Object.keys(node).sort();
-        let lines = [];
-        keys.forEach((key, idx) => {
-          const isLast = idx === keys.length - 1;
-          const branch = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
-          const currentPath = parentPath ? parentPath + "/" + key : key;
-          if (node[key] === null) {
-            lines.push(prefix + branch + key + " [" + (hashMap[currentPath] || "") + "]");
-          } else {
-            lines.push(prefix + branch + key + "/");
-            lines = lines.concat(printNode(node[key], prefix + (isLast ? "    " : "\u2502   "), currentPath));
-          }
-        });
-        return lines;
-      }
-      return printNode(tree, "", "").join("\n");
-    }
-    module2.exports.getFileTreeString = getFileTreeString;
-    var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-    module2.exports.delay = delay;
-  }
-});
-
 // src/clean-github-actions-caches-cli.cjs
 init_cjs_shims();
 var { get_caches, deleteGitHubActionsCache } = require_clean_github_actions_caches();
-var { parseGitRemotes } = require_utils();
+var { getArgs, parseGitRemotes } = require_utils();
+var argv = getArgs({
+  alias: {
+    p: "prefix-depth",
+    r: "repo"
+  },
+  string: ["prefix-depth", "repo"]
+});
 (async () => {
+  var _a, _b, _c, _d;
   try {
     const remotes = await parseGitRemotes();
-    const GH_REPO = remotes.origin;
-    const caches = await get_caches(GH_REPO);
+    const GH_REPO = argv.repo || remotes.origin;
+    if (!GH_REPO) {
+      throw new Error("Repository is not provided and origin remote could not be inferred. Use --repo owner/repo.");
+    }
+    const caches = await get_caches(GH_REPO, argv["prefix-depth"]);
     for (const key in caches) {
       if (Object.hasOwnProperty.call(caches, key)) {
         const items = caches[key].sort((a, b) => new Date(b.created_at) - new Date(a.created_at)).map((item) => ({
@@ -448,7 +483,10 @@ var { parseGitRemotes } = require_utils();
               try {
                 await deleteGitHubActionsCache(GH_REPO, id);
               } catch (err) {
-                console.error(`Error deleting cache ${id}:`, err);
+                const code = ((_a = err.response) == null ? void 0 : _a.status) || err.code || "UNKNOWN";
+                const message = ((_b = err.response) == null ? void 0 : _b.statusText) || err.message || "Unknown error";
+                console.error(`Error deleting cache ${id}: [${code}] [${message}]
+${err.stack}`);
               }
             }
           } else {
@@ -460,6 +498,10 @@ var { parseGitRemotes } = require_utils();
       }
     }
   } catch (e) {
-    console.error(`Error: ${e}`);
+    const code = ((_c = e.response) == null ? void 0 : _c.status) || e.code || "UNKNOWN";
+    const message = ((_d = e.response) == null ? void 0 : _d.statusText) || e.message || "Unknown error";
+    console.error(`[${code}] [${message}]
+${e.stack}`);
+    process.exit(1);
   }
 })();

package/lib/clean-github-actions-caches-cli.mjs

@@ -1,11 +1,11 @@
 import { createRequire } from 'module'; const require = createRequire(import.meta.url);
 import {
   require_clean_github_actions_caches
-} from "./chunk-FB2WKVJD.mjs";
+} from "./chunk-CD3HF3LK.mjs";
 import "./chunk-H44UWUFY.mjs";
 import {
   require_utils
-} from "./chunk-5RTXZVCW.mjs";
+} from "./chunk-6RK5UCTP.mjs";
 import {
   __commonJS,
   init_esm_shims
@@ -16,12 +16,23 @@ var require_clean_github_actions_caches_cli = __commonJS({
   "src/clean-github-actions-caches-cli.cjs"() {
     init_esm_shims();
     var { get_caches, deleteGitHubActionsCache } = require_clean_github_actions_caches();
-    var { parseGitRemotes } = require_utils();
+    var { getArgs, parseGitRemotes } = require_utils();
+    var argv = getArgs({
+      alias: {
+        p: "prefix-depth",
+        r: "repo"
+      },
+      string: ["prefix-depth", "repo"]
+    });
     (async () => {
+      var _a, _b, _c, _d;
       try {
         const remotes = await parseGitRemotes();
-        const GH_REPO = remotes.origin;
-        const caches = await get_caches(GH_REPO);
+        const GH_REPO = argv.repo || remotes.origin;
+        if (!GH_REPO) {
+          throw new Error("Repository is not provided and origin remote could not be inferred. Use --repo owner/repo.");
+        }
+        const caches = await get_caches(GH_REPO, argv["prefix-depth"]);
         for (const key in caches) {
           if (Object.hasOwnProperty.call(caches, key)) {
             const items = caches[key].sort((a, b) => new Date(b.created_at) - new Date(a.created_at)).map((item) => ({
@@ -36,7 +47,10 @@ var require_clean_github_actions_caches_cli = __commonJS({
                   try {
                     await deleteGitHubActionsCache(GH_REPO, id);
                   } catch (err) {
-                    console.error(`Error deleting cache ${id}:`, err);
+                    const code = ((_a = err.response) == null ? void 0 : _a.status) || err.code || "UNKNOWN";
+                    const message = ((_b = err.response) == null ? void 0 : _b.statusText) || err.message || "Unknown error";
+                    console.error(`Error deleting cache ${id}: [${code}] [${message}]
+${err.stack}`);
                   }
                 }
               } else {
@@ -48,7 +62,11 @@ var require_clean_github_actions_caches_cli = __commonJS({
           }
         }
       } catch (e) {
-        console.error(`Error: ${e}`);
+        const code = ((_c = e.response) == null ? void 0 : _c.status) || e.code || "UNKNOWN";
+        const message = ((_d = e.response) == null ? void 0 : _d.statusText) || e.message || "Unknown error";
+        console.error(`[${code}] [${message}]
+${e.stack}`);
+        process.exit(1);
       }
     })();
   }