@vltpkg/cli-js 1.4.0 → 1.5.0

package/{chunk-SR2VOY5J.js → chunk-5KW6AOTT.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   asError,
   isObject
-} from "./chunk-FLH4YC6W.js";
+} from "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-FLH4YC6W.js → chunk-6LZM3I4Q.js}

@@ -986,9 +986,10 @@ var defaultScopeRegistries = {
   "@jsr": "https://npm.jsr.io/"
 };
 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,
@@ -1177,19 +1178,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";
@@ -1505,6 +1512,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(([n]) => `catalog:${n}`);
+    const wanted = defined.filter(
+      ([, c]) => Object.hasOwn(c, this.name) && !!c[this.name]
+    ).map(([n]) => `catalog:${n}`);
+    return this.#error(message, {
+      code: "ECONFIG",
+      ...validOptions.length ? { validOptions } : {},
+      ...wanted.length ? { wanted } : {}
+    });
+  }
   #error(message, extra = {}) {
     return error(message, { spec: this.spec, ...extra }, this.#error);
   }

package/{chunk-X4FVR4R5.js → chunk-6W5XMVIZ.js}

@@ -11,32 +11,34 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   sortScopeLocations
-} from "./chunk-UGCKF5ZE.js";
+} from "./chunk-43EJ4Q42.js";
 import {
   createDiffFilesProvider
 } from "./chunk-RIYFGX27.js";
 import {
   createHostContextsMap
-} from "./chunk-ASLX43R3.js";
+} from "./chunk-ARE7FKDG.js";
+import {
+  actual,
+  isRunResult
+} from "./chunk-4UH3KMTD.js";
+import {
+  Query
+} from "./chunk-2U4PVHP4.js";
 import {
   stderr,
   stdout,
   styleTextStdout
-} from "./chunk-FZUYGJZU.js";
+} from "./chunk-WHWPAYZY.js";
 import {
   require_emoji_regex
 } from "./chunk-VTEFO2FT.js";
-import {
-  Query,
-  actual,
-  isRunResult
-} from "./chunk-OVPHE4O7.js";
 import {
   Monorepo
-} from "./chunk-I7UMHYZX.js";
+} from "./chunk-C6ZVVEFV.js";
 import {
   isErrorWithCause
-} from "./chunk-FLH4YC6W.js";
+} from "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-TPRK6IDA.js → chunk-7UWRR6EE.js}

@@ -11,10 +11,10 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   stderr
-} from "./chunk-FZUYGJZU.js";
+} from "./chunk-WHWPAYZY.js";
 import {
   urlOpen
-} from "./chunk-APMYKJI2.js";
+} from "./chunk-QNHBAGXQ.js";
 
 // ../../src/cli-sdk/src/open-url.ts
 var openUrl = async (url) => {

package/{chunk-ASLX43R3.js → chunk-ARE7FKDG.js}

@@ -11,12 +11,14 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   actual,
-  callLimit,
   createVirtualRoot
-} from "./chunk-OVPHE4O7.js";
+} from "./chunk-4UH3KMTD.js";
+import {
+  callLimit
+} from "./chunk-2U4PVHP4.js";
 import {
   SecurityArchive
-} from "./chunk-5TNXLRW2.js";
+} from "./chunk-SMXXFQPI.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -140,7 +142,7 @@ var reloadConfig = async (folder) => {
     unload("project");
   } catch {
   }
-  const { Config } = await import("./config-CSPCDMR3.js");
+  const { Config } = await import("./config-TMB2X6DW.js");
   return Config.load(folder, process.argv, true);
 };