@vltpkg/cli-js 1.4.0 → 1.6.0

package/{chunk-FLH4YC6W.js → chunk-BF5DRGRZ.js}

@@ -802,12 +802,31 @@ var Comparator = class {
     );
   }
   #parseCaret(comp) {
-    const min = this.#xInclusiveMin(comp);
-    if (isAny(min)) {
-      this.tuples.push(min);
+    const parsed = this.#parseX(comp);
+    if (isXMajor(parsed)) {
+      this.tuples.push(this.#getComparatorAny());
+      return;
+    }
+    const z = this.includePrerelease ? "0" : void 0;
+    if (isXMinor(parsed)) {
+      const [M2] = parsed;
+      this.tuples.push(
+        [">=", new Version(comp, M2, 0, 0, z, void 0)],
+        ["<", new Version(comp, M2 + 1, 0, 0, "0", void 0)]
+      );
       return;
     }
-    const minv = min[1];
+    if (isXPatch(parsed)) {
+      const [M2, m2] = parsed;
+      this.tuples.push(
+        [">=", new Version(comp, M2, m2, 0, z, void 0)],
+        M2 !== 0 ? ["<", new Version(comp, M2 + 1, 0, 0, "0", void 0)] : ["<", new Version(comp, 0, m2 + 1, 0, "0", void 0)]
+      );
+      return;
+    }
+    const [M, m, p, pr = z, build] = parsed;
+    const minv = new Version(comp, M, m, p, pr, build);
+    const min = [">=", minv];
     if (minv.major !== 0) {
       this.tuples.push(min, [
         "<",
@@ -986,9 +1005,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 +1197,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 +1531,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);
   }
@@ -2299,6 +2342,7 @@ var parseRange = (range, includePrerelease = false) => {
   rangeCache.set(key, parsed);
   return parsed;
 };
+var valid = (version) => !!parse(version);
 var satisfies = (version, range, includePrerelease = false) => {
   if (typeof version === "string") {
     const parsed = parse(version);
@@ -2545,6 +2589,7 @@ export {
   Range,
   parse,
   parseRange,
+  valid,
   satisfies,
   inc,
   rsort,

package/chunk-BH5CVXNY.js

@@ -0,0 +1,115 @@
+var global = globalThis;
+import {Buffer} from "node:buffer";
+import {setTimeout as _vlt_setTimeout,clearTimeout as _vlt_clearTimeout,setImmediate as _vlt_setImmediate,clearImmediate as _vlt_clearImmediate,setInterval as _vlt_setInterval,clearInterval as _vlt_clearInterval} from "node:timers";
+globalThis.setTimeout = _vlt_setTimeout;
+globalThis.clearTimeout = _vlt_clearTimeout;
+globalThis.setImmediate = _vlt_setImmediate;
+globalThis.clearImmediate = _vlt_clearImmediate;
+globalThis.setInterval = _vlt_setInterval;
+globalThis.clearInterval = _vlt_clearInterval;
+import {createRequire as _vlt_createRequire} from "node:module";
+var require = _vlt_createRequire(import.meta.filename);
+
+// ../../src/cli-sdk/src/shell.ts
+import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+var shells = /* @__PURE__ */ new Map([
+  ["bash", "bash"],
+  ["zsh", "zsh"],
+  ["fish", "fish"],
+  ["nu", "nu"],
+  ["pwsh", "pwsh"],
+  ["powershell", "pwsh"],
+  ["sh", "sh"],
+  ["dash", "sh"],
+  ["ksh", "sh"],
+  ["mksh", "sh"],
+  ["ash", "sh"]
+]);
+var isSep = (c, win32) => c === "/" || win32 && c === "\\";
+var homeRest = (path, home, win32) => !home ? void 0 : path === home ? "" : path.startsWith(home) && isSep(path[home.length], win32) ? path.slice(home.length) : void 0;
+var prettyPath = (path, home = homedir(), win32 = process.platform === "win32") => {
+  const rest = homeRest(path, home, win32);
+  return rest === void 0 ? path : `~${rest}`;
+};
+var detectShell = (env = process.env, platform = process.platform) => {
+  const { SHELL } = env;
+  if (SHELL) {
+    const name = SHELL.replace(/^.*[\\/]/, "").replace(/\.exe$/i, "").toLowerCase();
+    return shells.get(name) ?? "unknown";
+  }
+  if (platform !== "win32") return "unknown";
+  const mods = (env.PSModulePath ?? "").split(";").filter(Boolean);
+  return mods.length >= 3 ? "pwsh" : "cmd";
+};
+var opts = ({
+  env = process.env,
+  platform = process.platform,
+  home = homedir()
+}) => ({
+  env,
+  platform,
+  home,
+  win32: platform === "win32"
+});
+var escape = (s, chars, esc = "\\") => s.replace(chars, (c) => esc + c);
+var posixInner = (dir, o, chars) => {
+  const { home, win32 } = opts(o);
+  const slash = (p2) => win32 ? p2.replace(/\\/g, "/") : p2;
+  const rest = homeRest(dir, home, win32);
+  if (rest !== void 0) return "$HOME" + escape(slash(rest), chars);
+  const p = win32 ? slash(dir).replace(
+    /^([a-z]):/i,
+    (_, d) => `/${d.toLowerCase()}`
+  ) : dir;
+  return escape(p, chars);
+};
+var shChars = /[\\"$`]/g;
+var posixPath = (dir, o = {}) => `"${posixInner(dir, o, shChars)}"`;
+var fishPath = (dir, o = {}) => `"${posixInner(dir, o, /[\\"$]/g)}"`;
+var shellPathCommand = (shell, dir, o = {}) => {
+  const { home, win32 } = opts(o);
+  const rest = homeRest(dir, home, win32);
+  switch (shell) {
+    case "fish":
+      return `fish_add_path ${fishPath(dir, o)}`;
+    case "nu":
+      return `$env.PATH = ($env.PATH | prepend "${escape(dir, /[\\"]/g)}")`;
+    case "pwsh": {
+      const p = rest === void 0 ? escape(dir, /[`"$]/g, "`") : "$HOME" + escape(rest, /[`"$]/g, "`");
+      return `$env:PATH += "${win32 ? ";" : ":"}${p}"`;
+    }
+    case "cmd":
+      return `set "PATH=%PATH%;${rest === void 0 ? dir : "%USERPROFILE%" + rest}"`;
+    default:
+      return `export PATH="${posixInner(dir, o, shChars)}:$PATH"`;
+  }
+};
+var shellRcFile = (shell, o = {}) => {
+  const { env, platform, home, win32 } = opts(o);
+  switch (shell) {
+    case "zsh":
+      return prettyPath(`${env.ZDOTDIR || home}/.zshrc`, home, win32);
+    case "bash": {
+      const has = (f2) => existsSync(`${home}/${f2}`);
+      if (platform !== "darwin" && has(".bashrc")) return "~/.bashrc";
+      const f = [".bash_profile", ".bash_login"].find(has);
+      return `~/${f ?? ".profile"}`;
+    }
+    case "sh":
+      return env.ENV ? prettyPath(env.ENV, home, win32) : "~/.profile";
+    case "pwsh":
+      return "$PROFILE";
+    default:
+      return void 0;
+  }
+};
+
+export {
+  prettyPath,
+  detectShell,
+  posixPath,
+  fishPath,
+  shellPathCommand,
+  shellRcFile
+};

package/{chunk-PLG3OYCX.js → chunk-CAV7FKWQ.js}

@@ -11,12 +11,12 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   Spec as Spec2
-} from "./chunk-5IJTPZXP.js";
+} from "./chunk-6D3QAFNZ.js";
 import {
   Spec,
   currentDefaultRegistryName,
   defaultRegistryName
-} from "./chunk-FLH4YC6W.js";
+} from "./chunk-BF5DRGRZ.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -865,6 +865,7 @@ var graphRunSync = (options) => {
 };
 
 export {
+  isDepID,
   asDepID,
   joinDepIDTuple,
   splitDepID,

package/{chunk-C23TDXRG.js → chunk-CYK6I4M6.js}

@@ -34,7 +34,7 @@ var run = async (command) => {
   if (command) {
     process.argv.splice(2, 0, command);
   }
-  const vlt = await import("./src-4CYCUWZL.js");
+  const vlt = await import("./src-FUSTSM4J.js");
   await vlt.default();
 };