@vltpkg/cli-js 1.5.0 → 1.6.1

package/{chunk-XCQCYB6G.js → chunk-AEVT3CHK.js}

@@ -11,12 +11,17 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageInfoClient
-} from "./chunk-VR7NRWAD.js";
+} from "./chunk-IHERL3TA.js";
 import {
   Monorepo,
   PackageJson,
-  PathScurry
-} from "./chunk-C6ZVVEFV.js";
+  PathScurry,
+  workspaceCache
+} from "./chunk-KURQHX54.js";
+import {
+  ensureGlobalProject,
+  globalCommands
+} from "./chunk-MCDLJZXT.js";
 import {
   commands,
   defaultValues,
@@ -25,19 +30,20 @@ import {
   isRecordField,
   recordFields,
   storeLinkers
-} from "./chunk-CMLDLZZ3.js";
+} from "./chunk-EFHOWRKU.js";
 import {
   resetCaches
-} from "./chunk-F7NPYSI2.js";
+} from "./chunk-CAV7FKWQ.js";
 import {
   find,
   load,
   reload,
-  save
+  save,
+  unload
 } from "./chunk-HTOTG4TS.js";
 import {
   storeRoot
-} from "./chunk-5KW6AOTT.js";
+} from "./chunk-4GMNWW4C.js";
 import {
   cloneAvailable
 } from "./chunk-6IF3RJND.js";
@@ -51,14 +57,15 @@ import {
   getOptions,
   isObject,
   isRecordStringString
-} from "./chunk-6LZM3I4Q.js";
+} from "./chunk-BF5DRGRZ.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
 
 // ../../src/cli-sdk/src/config/index.ts
 import { readFile, rm, writeFile } from "node:fs/promises";
-import { dirname } from "node:path";
+import { homedir } from "node:os";
+import { dirname, isAbsolute, resolve } from "node:path";
 
 // ../../src/cli-sdk/src/config/merge.ts
 var merge = (base, add) => Object.fromEntries(
@@ -252,6 +259,7 @@ var recordsToPairs = (obj) => {
 };
 var kRecord = /* @__PURE__ */ Symbol("parsed key=value record");
 var envKey = (k) => `VLT_${k.replace(/[^a-zA-Z0-9]+/g, "_").toUpperCase()}`;
+var expandHome = (p) => p.replace(/^~(?=$|[\\/])/, homedir());
 var kParentEnv = "__VLT_INTERNAL_EXPLICIT";
 var parentEnv = () => {
   try {
@@ -292,7 +300,9 @@ var Config = class _Config {
     if (this.#options) return this.#options;
     const scurry = new PathScurry(this.projectRoot);
     const packageJson = new PackageJson();
-    const asRecords = pairsToRecords(this.parse().values);
+    const { path: _, ...asRecords } = pairsToRecords(
+      this.parse().values
+    );
     const extras = {
       projectRoot: this.projectRoot,
       signal: this.#abort.signal,
@@ -350,6 +360,7 @@ var Config = class _Config {
     this.projectRoot = projectRoot;
     this.#options = void 0;
     resetCaches();
+    workspaceCache.clear();
   }
   // memoized options() getter value
   #options;
@@ -376,6 +387,28 @@ var Config = class _Config {
    * `~/projects/xyz`, then the highest dir it will check is `~/projects`
    */
   projectRoot;
+  /**
+   * Global project root, set when `--global` switched to it.
+   */
+  globalRoot;
+  /**
+   * `--global-bin-dir` from cli, env or user config, set with
+   * `globalRoot`.
+   */
+  globalBinDir;
+  // the global project of the `setup` wizard, not switched to
+  #setupGlobal;
+  /**
+   * The global project (`--global-dir`, `--global-bin-dir`: cli > env >
+   * user config, never a project `vlt.json`): the one switched to by
+   * `--global`, or the one `vlt setup` offers PATH setup for.
+   */
+  globalProject() {
+    if (this.globalRoot) {
+      return { root: this.globalRoot, binDir: this.globalBinDir };
+    }
+    return this.#setupGlobal;
+  }
   /**
    * `Record<alias, canonical name>` to dereference command aliases.
    */
@@ -399,6 +432,10 @@ var Config = class _Config {
     const badLinker = process.env.VLT_STORE_LINKER;
     const fixLinker = badLinker !== void 0 && !storeLinkers.includes(badLinker);
     if (fixLinker) process.env.VLT_STORE_LINKER = "unpack";
+    const noModifyPath = process.env.VLT_NO_MODIFY_PATH;
+    if (noModifyPath !== void 0) {
+      process.env.VLT_NO_MODIFY_PATH = noModifyPath === "" || noModifyPath === "0" ? "0" : "1";
+    }
     const envKeys = Object.keys(defaultValues).filter(
       (k) => process.env[envKey(k)] !== void 0
     );
@@ -447,7 +484,20 @@ var Config = class _Config {
     if (cmdOrFallback !== "config") {
       assertSpecAliases(pairsToRecords(p.values));
     }
+    const binDirKey = envKey("global-bin-dir");
+    const keepBinDir = !this.globalRoot && !cliKeys.includes("global-bin-dir");
+    const binDirEnv = process.env[binDirKey];
     this.jack.writeEnv(p);
+    delete process.env[envKey("global")];
+    if (this.globalRoot) {
+      process.env[envKey("global-dir")] = this.globalRoot;
+      if (this.globalBinDir)
+        process.env[binDirKey] = this.globalBinDir;
+      else delete process.env[binDirKey];
+    } else if (keepBinDir) {
+      if (binDirEnv === void 0) delete process.env[binDirKey];
+      else process.env[binDirKey] = binDirEnv;
+    }
     process.env[kParentEnv] = JSON.stringify({
       explicit,
       env: Object.fromEntries(
@@ -724,13 +774,89 @@ var Config = class _Config {
   /**
    * Find the local config file and load both it and the user-level config in
    * the XDG config home.
+   *
+   * When `args` select a `--global` command, the global project is used
+   * instead of the current one.
    */
-  async loadConfigFile() {
+  async loadConfigFile(args) {
     await this.#maybeLoadConfigFile("user");
+    const g = args && this.#globalProject(args);
+    if (g?.switch) {
+      const { root } = g;
+      try {
+        ensureGlobalProject(root);
+      } catch (cause) {
+        throw error("Could not create the global project", {
+          code: "ECONFIG",
+          found: root,
+          cause
+        });
+      }
+      this.globalBinDir = g.binDir;
+      unload("project");
+      this.globalRoot = this.projectRoot = root;
+    } else if (g) {
+      this.#setupGlobal = { root: g.root, binDir: g.binDir };
+    }
     this.projectRoot = dirname(find("project", this.projectRoot));
     await this.#maybeLoadConfigFile("project");
     return this;
   }
+  // global project if `args` run a global command with --global, or
+  // `setup`. cli > env > user config, project config is not loaded yet.
+  // `switch`: use it as the project (not for the setup wizard)
+  #globalProject(args) {
+    const { values, positionals } = this.jack.parseRaw(args);
+    const cmd = getCommand(positionals[0]);
+    if (values.help || !cmd) return;
+    const setup = cmd === "setup";
+    if (!setup && !globalCommands.has(cmd)) return;
+    if (!setup) {
+      const env = process.env[envKey("global")];
+      const global = values.global ?? (env !== void 0 ? env === "1" : this.#defaults().global === true);
+      if (!global) return;
+    }
+    return {
+      root: this.#globalDir(values["global-dir"]),
+      binDir: this.#globalBinDir(args),
+      switch: !setup || values.path === true
+    };
+  }
+  #globalDir(cli) {
+    const dir = cli || process.env[envKey("global-dir")];
+    if (dir) return resolve(expandHome(dir));
+    const user = expandHome(
+      String(
+        this.#defaults()["global-dir"] || defaultValues["global-dir"]
+      )
+    );
+    if (!isAbsolute(user)) {
+      throw error("global-dir in the user config must be absolute", {
+        code: "ECONFIG",
+        found: user
+      });
+    }
+    return resolve(user);
+  }
+  // cli > env > user config, like `#globalProject`
+  #globalBinDir(args) {
+    const { values } = this.jack.parseRaw(args);
+    const dir = values["global-bin-dir"] || process.env[envKey("global-bin-dir")];
+    if (dir) return resolve(expandHome(dir));
+    const user = this.#defaults()["global-bin-dir"];
+    if (typeof user !== "string" || !user) return;
+    const p = expandHome(user);
+    if (!isAbsolute(p)) {
+      throw error(
+        "global-bin-dir in the user config must be absolute",
+        {
+          code: "ECONFIG",
+          found: p
+        }
+      );
+    }
+    return resolve(p);
+  }
   /**
    * Clear cached config values to force re-reading from updated files.
    * @internal
@@ -748,9 +874,9 @@ var Config = class _Config {
     this.values = void 0;
     this.positionals = void 0;
     this.command = void 0;
-    const { unload } = await import("./src-JC3ZUYWO.js");
-    unload("user");
-    unload("project");
+    const { unload: unload2 } = await import("./src-JC3ZUYWO.js");
+    unload2("user");
+    unload2("project");
     await this.#maybeLoadConfigFile("user");
     await this.#maybeLoadConfigFile("project");
     this.parse(this.#originalArgs);
@@ -763,10 +889,10 @@ var Config = class _Config {
    * Load the configuration and return a Promise to a
    * {@link Config} object
    */
-  static async load(projectRoot = process.cwd(), argv = process.argv, reload2 = false) {
+  static async load(projectRoot = process.cwd(), argv = process.argv, reload2 = false, allowGlobal = true) {
     if (this.#loaded && !reload2) return this.#loaded;
     const a = new _Config(definition, projectRoot);
-    const b = await a.loadConfigFile();
+    const b = await a.loadConfigFile(allowGlobal ? argv : void 0);
     this.#loaded = b.parse(argv);
     return this.#loaded;
   }

package/{chunk-SMXXFQPI.js → chunk-AHLBPSGQ.js}

@@ -13,10 +13,10 @@ import {
   asDepID,
   baseDepID,
   splitDepID
-} from "./chunk-F7NPYSI2.js";
+} from "./chunk-CAV7FKWQ.js";
 import {
   userAgent
-} from "./chunk-G3FZ2ZJK.js";
+} from "./chunk-M242QVJS.js";
 import {
   I
 } from "./chunk-B6RIGNEO.js";
@@ -25,7 +25,7 @@ import {
 } from "./chunk-XNLSTHDK.js";
 import {
   defaultRegistryName
-} from "./chunk-6LZM3I4Q.js";
+} from "./chunk-BF5DRGRZ.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-6LZM3I4Q.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 minv = min[1];
+    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;
+    }
+    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, [
         "<",
@@ -2323,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);
@@ -2569,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-CS6AYPY5.js → chunk-BQMHDAYL.js}

@@ -12,17 +12,17 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   addKey,
   asDependency
-} from "./chunk-2U4PVHP4.js";
+} from "./chunk-C4RJ4NNS.js";
 import {
-  asUnknownSpecPrefix
-} from "./chunk-UZ6ICZE3.js";
+  parseSpecArg
+} from "./chunk-7M2VTFLP.js";
 import {
   joinDepIDTuple,
   splitDepID
-} from "./chunk-F7NPYSI2.js";
+} from "./chunk-CAV7FKWQ.js";
 import {
   Spec
-} from "./chunk-LUVDMEW4.js";
+} from "./chunk-6D3QAFNZ.js";
 
 // ../../src/cli-sdk/src/parse-add-remove-args.ts
 import { isAbsolute, relative, resolve } from "node:path";
@@ -68,13 +68,6 @@ var rebaseFileSpec = (spec, importerPath, scurryCwd, specOptions, monorepo) => {
   if (rebasedPath === spec.file) return spec;
   return Spec.parseArgs(rebasedPath, specOptions);
 };
-var parseArg = (item, options) => {
-  try {
-    return Spec.parseArgs(item, options);
-  } catch (er) {
-    throw asUnknownSpecPrefix(er);
-  }
-};
 var parseAddArgs = (config, scurry, monorepo) => {
   const add = new AddImportersDependenciesMapImpl();
   const items = config.positionals;
@@ -84,7 +77,7 @@ var parseAddArgs = (config, scurry, monorepo) => {
   const parsedItems = [];
   let hasFileSpecs = false;
   for (const item of items) {
-    const spec = parseArg(item, specOptions);
+    const spec = parseSpecArg(item, specOptions);
     parsedItems.push({ spec, type });
     if (spec.type === "file") hasFileSpecs = true;
     add.modifiedDependencies = true;