@vltpkg/cli-js 1.4.0 → 1.5.0

package/{access-422UGEWN.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-THSYN5EK.js";
 import {
   commandUsage
-} from "./chunk-LHPEBLOU.js";
-import "./chunk-5IJTPZXP.js";
-import "./chunk-WF6KLKRN.js";
+} from "./chunk-CW56EJIL.js";
+import {
+  resolveRegistry
+} from "./chunk-UZ6ICZE3.js";
+import "./chunk-CMLDLZZ3.js";
+import "./chunk-LUVDMEW4.js";
 import {
   RegistryClient
-} from "./chunk-OAJ3PO3Z.js";
-import "./chunk-APMYKJI2.js";
+} from "./chunk-35EG6T3J.js";
+import "./chunk-QNHBAGXQ.js";
+import "./chunk-G3FZ2ZJK.js";
 import {
   assertOk
-} from "./chunk-SR2VOY5J.js";
-import "./chunk-ZJMJ7MCT.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-FLH4YC6W.js";
+import "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{bugs-RED7Y33Q.js → bugs-TLOECXEM.js}

@@ -14,46 +14,49 @@ import {
 } from "./chunk-CLVRCGOZ.js";
 import {
   openUrl
-} from "./chunk-TPRK6IDA.js";
+} from "./chunk-7UWRR6EE.js";
 import {
   createHostContextsMap
-} from "./chunk-ASLX43R3.js";
-import "./chunk-FZUYGJZU.js";
-import "./chunk-QCSUWACA.js";
-import "./chunk-G2YT2GWF.js";
-import "./chunk-5Y4SYLJ2.js";
+} from "./chunk-ARE7FKDG.js";
 import {
-  PackageInfoClient
-} from "./chunk-TO23PR7J.js";
-import "./chunk-SRWDPPLX.js";
-import "./chunk-WGDTG44V.js";
-import "./chunk-THSYN5EK.js";
-import {
-  Query,
   actual
-} from "./chunk-OVPHE4O7.js";
+} from "./chunk-4UH3KMTD.js";
+import {
+  Query
+} from "./chunk-2U4PVHP4.js";
 import {
   SecurityArchive
-} from "./chunk-5TNXLRW2.js";
+} from "./chunk-SMXXFQPI.js";
+import "./chunk-WHWPAYZY.js";
+import "./chunk-X6JKMIOU.js";
+import "./chunk-4TSHLSRK.js";
 import {
   commandUsage
-} from "./chunk-LHPEBLOU.js";
-import "./chunk-I7UMHYZX.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-PLG3OYCX.js";
+import "./chunk-WGDTG44V.js";
+import "./chunk-UZ6ICZE3.js";
+import "./chunk-CMLDLZZ3.js";
+import "./chunk-F7NPYSI2.js";
 import {
   Spec
-} from "./chunk-5IJTPZXP.js";
-import "./chunk-WF6KLKRN.js";
+} from "./chunk-LUVDMEW4.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-APMYKJI2.js";
-import "./chunk-SR2VOY5J.js";
-import "./chunk-ZJMJ7MCT.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-FLH4YC6W.js";
+import "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{build-IHMPBWRO.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-OVPHE4O7.js";
-import "./chunk-5TNXLRW2.js";
+} from "./chunk-4UH3KMTD.js";
+import "./chunk-2U4PVHP4.js";
+import "./chunk-SMXXFQPI.js";
 import {
   commandUsage
-} from "./chunk-LHPEBLOU.js";
-import "./chunk-I7UMHYZX.js";
-import "./chunk-PLG3OYCX.js";
-import "./chunk-5IJTPZXP.js";
-import "./chunk-WF6KLKRN.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-ZJMJ7MCT.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-FLH4YC6W.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-FJP2RZJX.js → cache-O5IBYYSB.js}

@@ -15,32 +15,32 @@ import {
 import {
   stderr,
   stdout
-} from "./chunk-FZUYGJZU.js";
-import "./chunk-QCSUWACA.js";
-import "./chunk-G2YT2GWF.js";
-import "./chunk-5Y4SYLJ2.js";
-import "./chunk-WGDTG44V.js";
-import "./chunk-THSYN5EK.js";
+} from "./chunk-WHWPAYZY.js";
+import "./chunk-X6JKMIOU.js";
+import "./chunk-4TSHLSRK.js";
 import {
   commandUsage
-} from "./chunk-LHPEBLOU.js";
+} from "./chunk-CW56EJIL.js";
 import {
   ViewClass
 } from "./chunk-4KCU2KZL.js";
-import "./chunk-PLG3OYCX.js";
+import "./chunk-WGDTG44V.js";
+import "./chunk-UZ6ICZE3.js";
+import "./chunk-CMLDLZZ3.js";
+import "./chunk-F7NPYSI2.js";
 import {
   Spec
-} from "./chunk-5IJTPZXP.js";
-import "./chunk-WF6KLKRN.js";
+} from "./chunk-LUVDMEW4.js";
 import {
   CacheEntry
-} from "./chunk-OAJ3PO3Z.js";
-import "./chunk-APMYKJI2.js";
+} from "./chunk-35EG6T3J.js";
+import "./chunk-QNHBAGXQ.js";
+import "./chunk-G3FZ2ZJK.js";
 import {
   assertOk
-} from "./chunk-SR2VOY5J.js";
-import "./chunk-ZJMJ7MCT.js";
-import "./chunk-U7TEQCBN.js";
+} from "./chunk-5KW6AOTT.js";
+import "./chunk-SUU2WETN.js";
+import "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import {
   readStoreIndex,
@@ -51,12 +51,12 @@ import {
   storeEntryNames,
   storeEntryTime,
   verifyStoreEntry
-} from "./chunk-DNRR3XMG.js";
+} from "./chunk-ISAMD2FE.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
 import {
   integrityHex
-} from "./chunk-FLH4YC6W.js";
+} from "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/cache-unzip-src-unzip.js

@@ -1090,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,
@@ -1269,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";
@@ -1597,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);
   }