@vltpkg/cli-js 1.3.8 → 1.5.0

package/{access-WLKANIOE.js → access-QPX4QXV4.js}

@@ -9,27 +9,28 @@ globalThis.setInterval = _vlt_setInterval;
 globalThis.clearInterval = _vlt_clearInterval;
 import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
-import {
-  resolveRegistry
-} from "./chunk-A2TSRXZD.js";
 import {
   commandUsage
-} from "./chunk-TLY4VGMH.js";
-import "./chunk-GZ5MYMBT.js";
-import "./chunk-SE2FSMBR.js";
+} from "./chunk-CW56EJIL.js";
+import {
+  resolveRegistry
+} from "./chunk-UZ6ICZE3.js";
+import "./chunk-CMLDLZZ3.js";
+import "./chunk-LUVDMEW4.js";
 import {
   RegistryClient
-} from "./chunk-5KOLUYXH.js";
-import "./chunk-APMYKJI2.js";
+} from "./chunk-35EG6T3J.js";
+import "./chunk-QNHBAGXQ.js";
+import "./chunk-G3FZ2ZJK.js";
 import {
   assertOk
-} from "./chunk-6D54UN4T.js";
-import "./chunk-6BQKR2FM.js";
-import "./chunk-U7TEQCBN.js";
+} from "./chunk-5KW6AOTT.js";
+import "./chunk-SUU2WETN.js";
+import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-IBGFQR23.js";
+import "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{bugs-5Q3QSTWP.js → bugs-TLOECXEM.js}

@@ -14,46 +14,49 @@ import {
 } from "./chunk-CLVRCGOZ.js";
 import {
   openUrl
-} from "./chunk-OWMR2EDW.js";
+} from "./chunk-7UWRR6EE.js";
 import {
   createHostContextsMap
-} from "./chunk-WHLYMMI2.js";
-import "./chunk-XDSZO74H.js";
-import "./chunk-KMOOTBHM.js";
-import "./chunk-G2YT2GWF.js";
-import "./chunk-IHXJVKAE.js";
+} from "./chunk-ARE7FKDG.js";
 import {
-  PackageInfoClient
-} from "./chunk-DL3H4EMY.js";
-import "./chunk-SRWDPPLX.js";
-import "./chunk-WGDTG44V.js";
-import "./chunk-A2TSRXZD.js";
-import {
-  Query,
   actual
-} from "./chunk-NWHKSRO3.js";
+} from "./chunk-4UH3KMTD.js";
+import {
+  Query
+} from "./chunk-2U4PVHP4.js";
 import {
   SecurityArchive
-} from "./chunk-XCDLOQZZ.js";
+} from "./chunk-SMXXFQPI.js";
+import "./chunk-WHWPAYZY.js";
+import "./chunk-X6JKMIOU.js";
+import "./chunk-4TSHLSRK.js";
 import {
   commandUsage
-} from "./chunk-TLY4VGMH.js";
-import "./chunk-CB65DPZ2.js";
+} from "./chunk-CW56EJIL.js";
+import {
+  PackageInfoClient
+} from "./chunk-VR7NRWAD.js";
+import "./chunk-SRWDPPLX.js";
+import "./chunk-IFEZ6BFV.js";
+import "./chunk-C6ZVVEFV.js";
 import "./chunk-4KCU2KZL.js";
-import "./chunk-SV4WK3KX.js";
+import "./chunk-WGDTG44V.js";
+import "./chunk-UZ6ICZE3.js";
+import "./chunk-CMLDLZZ3.js";
+import "./chunk-F7NPYSI2.js";
 import {
   Spec
-} from "./chunk-GZ5MYMBT.js";
-import "./chunk-SE2FSMBR.js";
+} from "./chunk-LUVDMEW4.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-APMYKJI2.js";
-import "./chunk-6D54UN4T.js";
-import "./chunk-6BQKR2FM.js";
-import "./chunk-U7TEQCBN.js";
+import "./chunk-QNHBAGXQ.js";
+import "./chunk-G3FZ2ZJK.js";
+import "./chunk-5KW6AOTT.js";
+import "./chunk-SUU2WETN.js";
+import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-IBGFQR23.js";
+import "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{build-XSFR63AW.js → build-IQOS3LKO.js}

@@ -11,40 +11,45 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   build
-} from "./chunk-NWHKSRO3.js";
-import "./chunk-XCDLOQZZ.js";
+} from "./chunk-4UH3KMTD.js";
+import "./chunk-2U4PVHP4.js";
+import "./chunk-SMXXFQPI.js";
 import {
   commandUsage
-} from "./chunk-TLY4VGMH.js";
-import "./chunk-CB65DPZ2.js";
-import "./chunk-SV4WK3KX.js";
-import "./chunk-GZ5MYMBT.js";
-import "./chunk-SE2FSMBR.js";
+} from "./chunk-CW56EJIL.js";
+import "./chunk-IFEZ6BFV.js";
+import "./chunk-C6ZVVEFV.js";
+import "./chunk-CMLDLZZ3.js";
+import "./chunk-F7NPYSI2.js";
+import "./chunk-LUVDMEW4.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-6BQKR2FM.js";
-import "./chunk-U7TEQCBN.js";
+import "./chunk-G3FZ2ZJK.js";
+import "./chunk-SUU2WETN.js";
+import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
 import {
   isErrorWithCause
-} from "./chunk-IBGFQR23.js";
+} from "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
 import "./chunk-PZLD7RTK.js";
 
 // ../../src/cli-sdk/src/commands/build.ts
+var skippedMessage = (count, reason) => `${count} package${count === 1 ? "" : "s"} not built, ${reason === "unscanned" ? "Socket has not scanned them yet" : "security data timed out"}. Run "vlt build" again later.`;
 var views = {
   human: (result) => {
     const successCount = result.success.length;
     const failureCount = result.failure.length;
+    const skippedCount = result.skipped?.length ?? 0;
     const messages = [];
     if (successCount > 0) {
       messages.push(
         `\u{1F528} Built ${successCount} package${successCount === 1 ? "" : "s"} successfully.`
       );
-    } else {
+    } else if (!skippedCount) {
       messages.push("\u{1F4E6} All packages are already built.");
     }
     if (failureCount > 0) {
@@ -53,23 +58,27 @@ var views = {
         failureCount === 1 ? "" : "s"} failed to build.`
       );
     }
+    if (skippedCount > 0) {
+      messages.push(
+        `\u23F3 ${skippedMessage(skippedCount, result.skippedReason)}`
+      );
+    }
     return messages.join("\n");
   },
   json: (result) => {
-    const successList = result.success.map((node) => ({
+    const toJSON = (node) => ({
       id: node.id,
       name: node.name,
       version: node.version
-    }));
-    const failureList = result.failure.map((node) => ({
-      id: node.id,
-      name: node.name,
-      version: node.version
-    }));
+    });
+    const successList = result.success.map(toJSON);
+    const failureList = result.failure.map(toJSON);
+    const skippedList = result.skipped?.map(toJSON) ?? [];
     return {
       success: successList,
       failure: failureList,
-      message: successList.length > 0 ? `Built ${successList.length} package${successList.length === 1 ? "" : "s"}.` : "No packages needed building."
+      ...skippedList.length ? { skipped: skippedList, skippedReason: result.skippedReason } : {},
+      message: successList.length > 0 ? `Built ${successList.length} package${successList.length === 1 ? "" : "s"}.` : skippedList.length ? skippedMessage(skippedList.length, result.skippedReason) : "No packages needed building."
     };
   }
 };

package/{cache-UVPK5J5A.js → cache-O5IBYYSB.js}

@@ -15,47 +15,48 @@ import {
 import {
   stderr,
   stdout
-} from "./chunk-XDSZO74H.js";
-import "./chunk-KMOOTBHM.js";
-import "./chunk-G2YT2GWF.js";
-import "./chunk-IHXJVKAE.js";
-import "./chunk-WGDTG44V.js";
-import "./chunk-A2TSRXZD.js";
+} from "./chunk-WHWPAYZY.js";
+import "./chunk-X6JKMIOU.js";
+import "./chunk-4TSHLSRK.js";
 import {
   commandUsage
-} from "./chunk-TLY4VGMH.js";
+} from "./chunk-CW56EJIL.js";
 import {
   ViewClass
 } from "./chunk-4KCU2KZL.js";
-import "./chunk-SV4WK3KX.js";
+import "./chunk-WGDTG44V.js";
+import "./chunk-UZ6ICZE3.js";
+import "./chunk-CMLDLZZ3.js";
+import "./chunk-F7NPYSI2.js";
 import {
   Spec
-} from "./chunk-GZ5MYMBT.js";
-import "./chunk-SE2FSMBR.js";
+} from "./chunk-LUVDMEW4.js";
 import {
   CacheEntry
-} from "./chunk-5KOLUYXH.js";
-import "./chunk-APMYKJI2.js";
+} from "./chunk-35EG6T3J.js";
+import "./chunk-QNHBAGXQ.js";
+import "./chunk-G3FZ2ZJK.js";
 import {
   assertOk
-} from "./chunk-6D54UN4T.js";
-import "./chunk-6BQKR2FM.js";
-import "./chunk-U7TEQCBN.js";
+} from "./chunk-5KW6AOTT.js";
+import "./chunk-SUU2WETN.js";
+import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import {
   readStoreIndex,
   removeStoreEntry,
   storeEntryCopied,
+  storeEntryLastCopied,
   storeEntryLinked,
   storeEntryNames,
   storeEntryTime,
   verifyStoreEntry
-} from "./chunk-H77JYU7F.js";
+} from "./chunk-ISAMD2FE.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
 import {
   integrityHex
-} from "./chunk-IBGFQR23.js";
+} from "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -78,6 +79,7 @@ var CacheView = class extends ViewClass {
 var views = {
   human: CacheView
 };
+var pruneDays = 30;
 var usageDef = {
   command: "cache",
   usage: "<command> [flags]",
@@ -130,11 +132,14 @@ var usageDef = {
                     a file in \`node_modules\` was edited in place.`
     },
     "prune-store": {
-      usage: "",
+      usage: "[<date>]",
       description: `Remove global store entries that no \`node_modules\`
-                    folder links to. Entries ever copied from (install
-                    scripts, \`store-linker=copy\`, a cache on another
-                    drive) stay: copies do not show use.`
+                    folder links to. Copies do not show use: an entry
+                    copied or cloned from (install scripts,
+                    \`store-linker=copy\`, macOS, a cache on another
+                    drive) stays if that last happened after
+                    \`<date>\`, or in the last ${pruneDays} days
+                    without one.`
     }
   },
   examples: {
@@ -398,14 +403,21 @@ var verify = async (conf, specs, view2) => {
     ...!all && { missing }
   };
 };
-var pruneStore = async (conf, _, view2) => {
+var pruneStore = async (conf, args, view2) => {
+  const since = args.length ? new Date(args.join(" ")).getTime() : Date.now() - pruneDays * 24 * 60 * 60 * 1e3;
+  if (Number.isNaN(since)) {
+    throw error("Invalid date", {
+      code: "EUSAGE",
+      found: args.join(" ")
+    });
+  }
   const { storeRoot } = conf.options;
   const names = storeEntryNames(storeRoot);
   const removed = {};
   for (const hex of names) {
     const entry = resolve(storeRoot, hex);
     const index = readStoreIndex(entry);
-    if (storeEntryCopied(entry, index) || storeEntryLinked(entry, index)) {
+    if (storeEntryCopied(entry, index) && storeEntryLastCopied(entry) >= since || storeEntryLinked(entry, index)) {
       continue;
     }
     removeStoreEntry(entry);

package/cache-unzip-src-unzip.js

@@ -34,7 +34,27 @@ function syntaxError(message, cause, from) {
 }
 
 // ../../src/fast-split/src/index.ts
+var splitTwo = (str, delim) => {
+  const a = str.indexOf(delim);
+  return a === -1 ? [str] : [str.substring(0, a), str.substring(a + delim.length)];
+};
+var splitThree = (str, delim) => {
+  const a = str.indexOf(delim);
+  if (a === -1) return [str];
+  const l = delim.length;
+  const b = str.indexOf(delim, a + l);
+  return b === -1 ? [str.substring(0, a), str.substring(a + l)] : [
+    str.substring(0, a),
+    str.substring(a + l, b),
+    str.substring(b + l)
+  ];
+};
 function fastSplit(str, delim, limit = -1, onPart) {
+  if (onPart === void 0) {
+    if (limit === 2) return splitTwo(str, delim);
+    if (limit === 3)
+      return splitThree(str, delim);
+  }
   let i = 0;
   let p = 0;
   const l = delim.length;
@@ -1070,9 +1090,10 @@ var gitHostWebsites = {
   gitlab: "https://gitlab.com/"
 };
 var getOptions = (options) => ({
-  catalog: {},
   catalogs: {},
   ...options,
+  // after spread: explicit `catalog: undefined` gets default too
+  catalog: options?.catalog ?? {},
   // built-in aliases are user/service-overridable: user config wins
   "jsr-registries": {
     ...defaultJsrRegistries,
@@ -1249,19 +1270,25 @@ var Spec = class _Spec {
     }
     if (this.bareSpec.startsWith("catalog:")) {
       this.catalog = this.bareSpec.substring("catalog:".length);
-      const catalog = this.catalog ? this.options.catalogs?.[this.catalog] : this.options.catalog;
+      const { catalog: defaultCatalog, catalogs = {} } = this.options;
+      const catalog = this.catalog ? Object.hasOwn(catalogs, this.catalog) ? catalogs[this.catalog] : void 0 : Object.keys(defaultCatalog).length ? defaultCatalog : void 0;
       if (!catalog) {
-        throw this.#error("Named catalog not found", {
-          name: this.catalog,
-          validOptions: this.options.catalogs && Object.keys(this.options.catalogs)
-        });
+        throw this.#catalogError(
+          this.catalog ? `Catalog "${this.catalog}" not found for ${this.spec}` : `Default catalog not found for ${this.spec}`
+        );
       }
-      const sub = catalog[this.name];
+      const catalogName = this.catalog ? `catalog "${this.catalog}"` : "default catalog";
+      const sub = Object.hasOwn(catalog, this.name) ? catalog[this.name] : void 0;
       if (!sub) {
-        throw this.#error("Name not found in catalog", {
-          name: this.name,
-          validOptions: Object.keys(catalog)
-        });
+        throw this.#catalogError(
+          `Package "${this.name}" not found in ${catalogName}`
+        );
+      }
+      if (sub.startsWith("catalog:")) {
+        throw this.#error(
+          `Catalog entry "${this.name}" in ${catalogName} cannot be a catalog: spec`,
+          { code: "ECONFIG", found: sub }
+        );
       }
       this.subspec = _Spec.parse(this.name, sub, this.options);
       this.type = "catalog";
@@ -1577,6 +1604,23 @@ var Spec = class _Spec {
       ].map((p) => `${p}:`)
     });
   }
+  /** ECONFIG error listing defined catalogs & ones defining this dep */
+  #catalogError(message) {
+    const { catalog, catalogs = {} } = this.options;
+    const defined = [
+      ...Object.keys(catalog).length ? [["", catalog]] : [],
+      ...Object.entries(catalogs)
+    ];
+    const validOptions = defined.map(([n7]) => `catalog:${n7}`);
+    const wanted = defined.filter(
+      ([, c]) => Object.hasOwn(c, this.name) && !!c[this.name]
+    ).map(([n7]) => `catalog:${n7}`);
+    return this.#error(message, {
+      code: "ECONFIG",
+      ...validOptions.length ? { validOptions } : {},
+      ...wanted.length ? { wanted } : {}
+    });
+  }
   #error(message, extra = {}) {
     return error(message, { spec: this.spec, ...extra }, this.#error);
   }
@@ -7182,7 +7226,7 @@ import { join as join2 } from "node:path";
 import { performance as performance2 } from "node:perf_hooks";
 import { debuglog as debuglog3 } from "node:util";
 var debug3 = debuglog3("vlt");
-var linkers = /* @__PURE__ */ new Set(["auto", "hardlink", "copy"]);
+var linkers = /* @__PURE__ */ new Set(["auto", "hardlink", "clone", "copy"]);
 var storeEnabled = () => linkers.has(process.env.VLT_STORE_LINKER ?? "");
 var STALE_MS = 60 * 60 * 1e3;
 var parseConcurrency = (raw) => {