@vltpkg/cli-js 1.0.6 → 1.0.8

package/{chunk-XVA4ZRW5.js → chunk-WY4PAM6D.js}

@@ -11,22 +11,23 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageInfoClient
-} from "./chunk-O7OUBUZ3.js";
+} from "./chunk-YCVPEZRM.js";
 import {
   Monorepo,
   PackageJson,
   PathScurry
-} from "./chunk-SVBEF5PK.js";
+} from "./chunk-OWML62W5.js";
 import {
   resetCaches
-} from "./chunk-3OPNZI6G.js";
+} from "./chunk-YOE3VZFX.js";
 import {
   commands,
+  defaultValues,
   definition,
   getCommand,
   isRecordField,
   recordFields
-} from "./chunk-WP6CYBPM.js";
+} from "./chunk-XISRK3R5.js";
 import {
   find,
   load,
@@ -63,6 +64,70 @@ var merge = (base, add) => Object.fromEntries(
   )
 );
 
+// ../../src/cli-sdk/src/config/merge-layers.ts
+var registrySelectors = [
+  "registry",
+  "default-registry-alias"
+];
+var registrySelectionFields = [
+  "registry",
+  "registries",
+  "default-registry-alias"
+];
+var isObj = (v) => !!v && typeof v === "object" && !Array.isArray(v);
+var cloneValue = (v) => Array.isArray(v) ? v.map((x) => cloneValue(x)) : isObj(v) ? Object.fromEntries(
+  Object.entries(v).map(([k, x]) => [k, cloneValue(x)])
+) : v;
+var cloneLayer = (data) => cloneValue(data);
+var mergeRecord = (base, add) => {
+  const result = isObj(base) ? { ...base } : {};
+  for (const [k, v] of Object.entries(add)) {
+    if (v === null) delete result[k];
+    else result[k] = v;
+  }
+  return Object.keys(result).length ? result : void 0;
+};
+var mergeCommands = (base, add) => {
+  const result = isObj(base) ? { ...base } : {};
+  for (const [cmd, opts] of Object.entries(add)) {
+    if (opts === null) delete result[cmd];
+    else if (isObj(opts)) {
+      result[cmd] = mergeLayers([
+        isObj(result[cmd]) ? result[cmd] : void 0,
+        opts
+      ]);
+    }
+  }
+  return Object.keys(result).length ? result : void 0;
+};
+var mergeLayers = (layers) => {
+  const result = {};
+  for (const layer of layers) {
+    if (!isObj(layer)) continue;
+    for (const [k, v] of Object.entries(layer)) {
+      if (k === "command") {
+        const merged = isObj(v) ? mergeCommands(result.command, v) : void 0;
+        if (merged) result.command = merged;
+        else delete result.command;
+      } else if (v === null) {
+        delete result[k];
+      } else if (isRecordField(k) && isObj(v)) {
+        const merged = mergeRecord(result[k], v);
+        if (merged) result[k] = merged;
+        else delete result[k];
+      } else {
+        result[k] = v;
+      }
+    }
+    if (registrySelectionFields.some((f) => f in layer)) {
+      for (const f of registrySelectors) {
+        if (!(f in layer)) delete result[f];
+      }
+    }
+  }
+  return result;
+};
+
 // ../../src/cli-sdk/src/config/index.ts
 var kCustomInspect = /* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom");
 var reducePairs = (pairs) => {
@@ -79,6 +144,18 @@ var reducePairs = (pairs) => {
   return record;
 };
 var isRecordFieldValue = (k, v) => Array.isArray(v) && recordFields.includes(k);
+var assertRegistryKeys = (registries, file) => {
+  if (!registries || typeof registries !== "object") return;
+  const obj = Array.isArray(registries) ? reducePairs(registries) : registries;
+  for (const key of Object.keys(obj)) {
+    if (key === "" || key.includes("~")) {
+      throw error("Reserved character found in registries name", {
+        path: file,
+        found: key
+      });
+    }
+  }
+};
 var pairsToRecords = (obj) => {
   return Object.fromEntries(
     Object.entries(obj).map(([k, v]) => [
@@ -99,7 +176,16 @@ var recordsToPairs = (obj) => {
       ([k]) => !(k === "scurry" || k === "packageJson" || k === "monorepo" || k === "projectRoot" || k === "packageInfo")
     ).map(([k, v]) => [
       k,
-      k === "command" && v && typeof v === "object" ? recordsToPairs(v) : !v || typeof v !== "object" || Array.isArray(v) || !isRecordField(k) ? v : Object.entries(v).map(([k2, v2]) => `${k2}=${v2}`)
+      k === "command" && v && typeof v === "object" ? (
+        // each command's own block gets converted too, mirroring
+        // pairsToRecords
+        Object.fromEntries(
+          Object.entries(v).map(([k2, v2]) => [
+            k2,
+            recordsToPairs(v2)
+          ])
+        )
+      ) : !v || typeof v !== "object" || Array.isArray(v) || !isRecordField(k) ? v : Object.entries(v).map(([k2, v2]) => `${k2}=${v2}`)
     ])
   );
 };
@@ -292,7 +378,12 @@ var Config = class _Config {
   async addConfigToFile(which, values) {
     return this.writeConfigFile(
       which,
-      merge(await this.#maybeLoadConfigFile(which) ?? {}, values)
+      merge(
+        pairsToRecords(
+          await this.#maybeLoadConfigFile(which) ?? {}
+        ),
+        pairsToRecords(values)
+      )
     );
   }
   // called in this weird bound way so that it can be used by the
@@ -308,53 +399,79 @@ var Config = class _Config {
         wanted: "ConfigFileData"
       });
     }
-    const { command, ...values } = recordsToPairs(c);
-    const registries = c.registries;
-    if (registries && typeof registries === "object") {
-      const registriesObj = Array.isArray(registries) ? reducePairs(registries) : registries;
-      for (const key of Object.keys(registriesObj)) {
-        if (key === "" || key.includes("~")) {
-          throw error("Reserved character found in registries name", {
-            path: file,
-            found: key
-          });
+    const { command, ...values } = c;
+    assertRegistryKeys(values.registries, file);
+    if (command && typeof command === "object") {
+      for (const opts of Object.values(command)) {
+        if (opts && typeof opts === "object") {
+          assertRegistryKeys(opts.registries, file);
         }
       }
     }
-    if (command) {
-      for (const [c2, opts] of Object.entries(command)) {
-        const cmd = getCommand(c2);
-        if (cmd && opts && typeof opts === "object") {
-          const cmdRegistries = opts.registries;
-          if (cmdRegistries && typeof cmdRegistries === "object") {
-            const cmdRegistriesObj = Array.isArray(cmdRegistries) ? reducePairs(cmdRegistries) : cmdRegistries;
-            for (const key of Object.keys(cmdRegistriesObj)) {
-              if (key === "" || key.includes("~")) {
-                throw error(
-                  "Reserved character found in registries name",
-                  {
-                    path: file,
-                    found: key
-                  }
-                );
-              }
-            }
-          }
-          this.commandValues[cmd] = merge(
-            this.commandValues[cmd] ?? {},
-            opts
-          );
-        }
+    const layer = cloneLayer(pairsToRecords(c));
+    const { command: _cmd, ...single } = mergeLayers([layer]);
+    try {
+      this.jack.validate(recordsToPairs(single));
+    } catch (er) {
+      if (er instanceof Error) {
+        const cause = typeof er.cause === "object" ? er.cause : {};
+        er.cause = { ...cause, path: file };
+      }
+      throw er;
+    }
+    this.#layers[file === find("user") ? "user" : "project"] = layer;
+    this.#applyLayers();
+  }
+  /**
+   * The raw config data from each `vlt.json` file, normalized to record
+   * form, before the layers are merged together. `undefined` for a layer
+   * with no file, or a file with no `config` field.
+   */
+  get layers() {
+    return this.#layers;
+  }
+  #layers = {};
+  /**
+   * Recompute the jack defaults and {@link Config#commandValues} from
+   * {@link Config#layers}.
+   *
+   * Everything is derived from `#layers`, and every known field is applied,
+   * so this is idempotent: re-reading a config file (which
+   * `addConfigToFile` and `deleteConfigKeys` both do) can't stack the user
+   * layer back on top of the project layer, and a field a layer stopped
+   * setting goes back to its definitional default.
+   */
+  #applyLayers() {
+    const { command, ...values } = mergeLayers([
+      this.#layers.user,
+      this.#layers.project
+    ]);
+    this.commandValues = {};
+    for (const [c, opts] of Object.entries(command ?? {})) {
+      const cmd = getCommand(c);
+      if (cmd && opts && typeof opts === "object") {
+        this.commandValues[cmd] = opts;
       }
     }
-    this.jack.setConfigValues(values, file);
+    const pairs = recordsToPairs(values);
+    const applied = {};
+    for (const [field, dflt] of Object.entries(defaultValues)) {
+      applied[field] = field in pairs ? pairs[field] : dflt;
+    }
+    this.jack.setConfigValues(applied);
+    this.#options = void 0;
   }
   /**
    * if the file exists, parse and load it. returns object if data was
    * loaded, or undefined if not.
    */
   async #maybeLoadConfigFile(whichConfig) {
-    return load("config", this.#validator, whichConfig);
+    const data = load("config", this.#validator, whichConfig);
+    if (data === void 0 && this.#layers[whichConfig] !== void 0) {
+      delete this.#layers[whichConfig];
+      this.#applyLayers();
+    }
+    return data;
   }
   /**
    * Deletes the specified config fields from the named file
@@ -482,10 +599,16 @@ var Config = class _Config {
   }
 };
 var isParsed = (c) => !!(c.values && c.positionals && c.command);
+var configWriteTarget = (conf, fallback) => {
+  const which = conf.get("config");
+  return which === "user" || which === "project" ? which : fallback;
+};
 
 export {
+  registrySelectionFields,
   kCustomInspect,
   pairsToRecords,
   recordsToPairs,
-  Config
+  Config,
+  configWriteTarget
 };

package/{chunk-WP6CYBPM.js → chunk-XISRK3R5.js}

@@ -1184,14 +1184,22 @@ j2.description(Object.keys(canonicalCommands).join(", "), {
   "Run `vlt <cmd> --help` for more information about a specific command"
 );
 var definition = j2.heading("Configuration").description(
-  `If a \`vlt.json\` file is present in the root of the current project,
-     then that will be used as a source of configuration information.
+  `The \`vlt.json\` file in the XDG specified config directory is loaded
+     first, and then the \`vlt.json\` file in the root of the current
+     project, if present, is layered on top of it.
 
-     Next, the \`vlt.json\` file in the XDG specified config directory
-     will be checked, and loaded for any fields not set in the local project.
+     Scalar values are overridden by the innermost layer that sets them.
+     Object type values are merged together key by key. Set a field, or a
+     key within an object field, to \`null\` in the JSON configuration to
+     explicitly remove it.
 
-     Object type values will be merged together. Set a field to \`null\` in
-     the JSON configuration to explicitly remove it.
+     Registry *selection* is an exception, since \`--registry\` outranks any
+     \`--registries\` alias. A layer that sets any of \`registry\`,
+     \`registries\`, or \`default-registry-alias\` owns selection: the
+     \`registry\` and \`default-registry-alias\` it does *not* set are
+     dropped, rather than inherited from an outer layer. So a project that
+     configures its own registry is never sent to the user-level one, while
+     the aliases in the user config stay addressable by name.
 
      Command-specific fields may be set in a nested \`command\` object that
      overrides any options defined at the top level.
@@ -1776,6 +1784,12 @@ var definition = j2.heading("Configuration").description(
     description: "Show all commands, bins, and flags"
   }
 });
+var defaultValues = Object.fromEntries(
+  Object.entries(definition.toJSON()).map(([field, def]) => [
+    field,
+    def.default
+  ])
+);
 var getSortedCliOptions = () => {
   const defs = definition.toJSON();
   return getSortedKeys().map((k2) => {
@@ -1796,6 +1810,7 @@ export {
   recordFields,
   isRecordField,
   definition,
+  defaultValues,
   getSortedCliOptions,
   getSortedKeys
 };

package/{chunk-FEIPJIEN.js → chunk-YAIKXFLN.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-WGDTG44V.js";
 import {
   commandAliases
-} from "./chunk-WP6CYBPM.js";
+} from "./chunk-XISRK3R5.js";
 import {
   loadPackageJson
 } from "./chunk-E74WGW5C.js";

package/{chunk-O7OUBUZ3.js → chunk-YCVPEZRM.js}

@@ -20,7 +20,7 @@ import {
   pickManifest,
   resolve,
   revs
-} from "./chunk-SVBEF5PK.js";
+} from "./chunk-OWML62W5.js";
 import {
   Spec
 } from "./chunk-XKVU23NC.js";
@@ -111,7 +111,7 @@ var PackageInfoClient = class {
   #tarPoolPromise;
   async getRegistryClient() {
     if (this.#registryClient) return this.#registryClient;
-    this.#registryClientPromise ??= import("./src-D7FPRPSM.js").then(({ RegistryClient }) => {
+    this.#registryClientPromise ??= import("./src-6PISL6QX.js").then(({ RegistryClient }) => {
       this.#registryClient = new RegistryClient(this.options);
       return this.#registryClient;
     });

package/{chunk-3OPNZI6G.js → chunk-YOE3VZFX.js}

@@ -187,15 +187,14 @@ var splitDepID = (id) => {
   seenSplitDepIDs.set(id, res);
   return res;
 };
+var seenBaseDepIDs = /* @__PURE__ */ new Map();
 var baseDepID = (id) => {
+  const seen = seenBaseDepIDs.get(id);
+  if (seen) return seen;
   const [type, first, second] = splitDepID(id);
-  switch (type) {
-    case "git":
-    case "registry":
-      return joinDepIDTuple([type, first, second]);
-    default:
-      return joinDepIDTuple([type, first]);
-  }
+  const res = type === "git" || type === "registry" ? joinDepIDTuple([type, first, second]) : joinDepIDTuple([type, first]);
+  seenBaseDepIDs.set(id, res);
+  return res;
 };
 var seenHydrated = /* @__PURE__ */ new Map();
 var hydrate = (id, name, options = {}) => {
@@ -411,6 +410,7 @@ var resetCaches = () => {
   seenHydratedTuples.clear();
   seenSplitDepIDs.clear();
   seenTuples.clear();
+  seenBaseDepIDs.clear();
 };
 
 // ../../src/dep-id/src/index.ts
@@ -870,6 +870,7 @@ export {
   splitDepID,
   baseDepID,
   hydrate,
+  getTuple,
   isPackageNameConfused,
   getId,
   joinExtra,

package/{chunk-4LBWNGU6.js → chunk-ZXIF4PVX.js}

@@ -9,18 +9,24 @@ globalThis.setInterval = _vlt_setInterval;
 globalThis.clearInterval = _vlt_clearInterval;
 import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
+import {
+  openUrl
+} from "./chunk-OB73T23B.js";
 import {
   stderr
-} from "./chunk-AL42Z2D3.js";
+} from "./chunk-JXVDCQZF.js";
 import {
   mermaidOutput
-} from "./chunk-3NGV7EC6.js";
+} from "./chunk-7D7SNVBV.js";
 import {
   ViewClass
 } from "./chunk-4KCU2KZL.js";
 import {
-  urlOpen
-} from "./chunk-HAYXR3MW.js";
+  getTokenByURL
+} from "./chunk-AGHW2E24.js";
+
+// ../../src/cli-sdk/src/query-auth.ts
+var createGetAuthHeader = (conf) => async (url) => getTokenByURL(url, conf.options.identity);
 
 // ../../src/cli-sdk/src/mermaid-image-view.ts
 var MermaidImageView = class extends ViewClass {
@@ -36,16 +42,17 @@ var MermaidImageView = class extends ViewClass {
       stderr(`Generating PNG image...`);
       const filePath = await renderMermaidToPng(mermaidText);
       stderr(`Image saved to: ${filePath}`);
-      await urlOpen(filePath);
+      await openUrl(filePath);
     } else {
       stderr(`Generating SVG image...`);
       const filePath = await renderMermaidToFile(mermaidText);
       stderr(`Image saved to: ${filePath}`);
-      await urlOpen(filePath);
+      await openUrl(filePath);
     }
   }
 };
 
 export {
+  createGetAuthHeader,
   MermaidImageView
 };

package/{ci-ODHEBQNE.js → ci-2666LKEC.js}

@@ -11,15 +11,15 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   install
-} from "./chunk-3NGV7EC6.js";
-import "./chunk-ED2DDTQT.js";
-import "./chunk-SVBEF5PK.js";
-import "./chunk-3OPNZI6G.js";
+} from "./chunk-7D7SNVBV.js";
+import "./chunk-FG633ZKS.js";
+import "./chunk-OWML62W5.js";
+import "./chunk-YOE3VZFX.js";
 import {
   commandUsage
-} from "./chunk-LCDBW6IT.js";
+} from "./chunk-PTR5IGFQ.js";
 import "./chunk-XKVU23NC.js";
-import "./chunk-WP6CYBPM.js";
+import "./chunk-XISRK3R5.js";
 import {
   lazyView
 } from "./chunk-4KCU2KZL.js";
@@ -60,7 +60,7 @@ var usage = () => commandUsage({
 var views = {
   json: (i) => i.graph.toJSON(),
   human: lazyView(
-    async () => (await import("./reporter-Y3LUXPQS.js")).InstallReporter
+    async () => (await import("./reporter-SDMDYYMJ.js")).InstallReporter
   )
 };
 var command = async (conf) => {

package/cli-package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/cli-sdk",
   "description": "The source for the vlt CLI",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",

package/{config-5HCRQACM.js → config-3N7PBEXH.js}

@@ -11,21 +11,22 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   Config,
+  configWriteTarget,
   kCustomInspect,
   pairsToRecords,
   recordsToPairs
-} from "./chunk-XVA4ZRW5.js";
-import "./chunk-O7OUBUZ3.js";
+} from "./chunk-WY4PAM6D.js";
+import "./chunk-YCVPEZRM.js";
 import "./chunk-ZWKI5OSF.js";
-import "./chunk-SVBEF5PK.js";
-import "./chunk-3OPNZI6G.js";
+import "./chunk-OWML62W5.js";
+import "./chunk-YOE3VZFX.js";
 import "./chunk-XKVU23NC.js";
 import {
   commands,
   definition,
   isRecordField,
   recordFields
-} from "./chunk-WP6CYBPM.js";
+} from "./chunk-XISRK3R5.js";
 import "./chunk-HTOTG4TS.js";
 import "./chunk-LPIBYUMT.js";
 import "./chunk-XNLSTHDK.js";
@@ -36,6 +37,7 @@ import "./chunk-PZLD7RTK.js";
 export {
   Config,
   commands,
+  configWriteTarget,
   definition,
   isRecordField,
   kCustomInspect,

package/{config-35TJIXFF.js → config-WMYY5J37.js}

@@ -16,22 +16,22 @@ import {
 import {
   pairsToRecords,
   recordsToPairs
-} from "./chunk-XVA4ZRW5.js";
-import "./chunk-O7OUBUZ3.js";
+} from "./chunk-WY4PAM6D.js";
+import "./chunk-YCVPEZRM.js";
 import "./chunk-ZWKI5OSF.js";
 import {
   asRootError
 } from "./chunk-GDJ7JT2R.js";
-import "./chunk-SVBEF5PK.js";
-import "./chunk-3OPNZI6G.js";
+import "./chunk-OWML62W5.js";
+import "./chunk-YOE3VZFX.js";
 import {
   commandUsage
-} from "./chunk-LCDBW6IT.js";
+} from "./chunk-PTR5IGFQ.js";
 import "./chunk-XKVU23NC.js";
 import {
   getSortedKeys,
   isRecordField
-} from "./chunk-WP6CYBPM.js";
+} from "./chunk-XISRK3R5.js";
 import {
   find,
   load

package/{create-5BESMSRT.js → create-AEQSO6KX.js}

@@ -11,19 +11,19 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   vlxResolve
-} from "./chunk-AHTQ5ADD.js";
+} from "./chunk-5QAFAGO5.js";
 import {
   ExecCommand,
   views
-} from "./chunk-G7BEW32U.js";
+} from "./chunk-UYIA44HE.js";
 import "./chunk-RIYFGX27.js";
-import "./chunk-LQGUEFV6.js";
-import "./chunk-O7OUBUZ3.js";
+import "./chunk-NC3QYZPW.js";
+import "./chunk-YCVPEZRM.js";
 import "./chunk-ZWKI5OSF.js";
 import {
   styleTextStdout
-} from "./chunk-AL42Z2D3.js";
-import "./chunk-FEIPJIEN.js";
+} from "./chunk-JXVDCQZF.js";
+import "./chunk-YAIKXFLN.js";
 import "./chunk-G2YT2GWF.js";
 import "./chunk-GDJ7JT2R.js";
 import "./chunk-5JFRXIK2.js";
@@ -32,15 +32,15 @@ import "./chunk-WGDTG44V.js";
 import {
   exec,
   execFG
-} from "./chunk-3NGV7EC6.js";
-import "./chunk-ED2DDTQT.js";
-import "./chunk-SVBEF5PK.js";
-import "./chunk-3OPNZI6G.js";
+} from "./chunk-7D7SNVBV.js";
+import "./chunk-FG633ZKS.js";
+import "./chunk-OWML62W5.js";
+import "./chunk-YOE3VZFX.js";
 import {
   commandUsage
-} from "./chunk-LCDBW6IT.js";
+} from "./chunk-PTR5IGFQ.js";
 import "./chunk-XKVU23NC.js";
-import "./chunk-WP6CYBPM.js";
+import "./chunk-XISRK3R5.js";
 import "./chunk-4KCU2KZL.js";
 import "./chunk-HTOTG4TS.js";
 import "./chunk-E74WGW5C.js";

package/{deprecate-6YTC2E2E.js → deprecate-MW76DAZ5.js}

@@ -11,24 +11,24 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageInfoClient
-} from "./chunk-O7OUBUZ3.js";
+} from "./chunk-YCVPEZRM.js";
 import "./chunk-ZWKI5OSF.js";
 import {
   resolveRegistry
 } from "./chunk-5JFRXIK2.js";
-import "./chunk-SVBEF5PK.js";
-import "./chunk-3OPNZI6G.js";
+import "./chunk-OWML62W5.js";
+import "./chunk-YOE3VZFX.js";
 import {
   commandUsage
-} from "./chunk-LCDBW6IT.js";
+} from "./chunk-PTR5IGFQ.js";
 import {
   Spec
 } from "./chunk-XKVU23NC.js";
-import "./chunk-WP6CYBPM.js";
+import "./chunk-XISRK3R5.js";
 import "./chunk-HTOTG4TS.js";
 import {
   RegistryClient
-} from "./chunk-PND2URIT.js";
+} from "./chunk-AGHW2E24.js";
 import "./chunk-HAYXR3MW.js";
 import "./chunk-E74WGW5C.js";
 import "./chunk-LPIBYUMT.js";