@vltpkg/cli-js 1.4.0 → 1.6.0

package/{reporter-5NYOHBO7.js → reporter-N5PAXB26.js}

@@ -11,35 +11,57 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   persistedEntries
-} from "./chunk-2AMOC4DN.js";
+} from "./chunk-ANW36H4T.js";
+import {
+  keptLine,
+  savedLine,
+  unmatchedLines,
+  unscannedLines
+} from "./chunk-W4T5CGCO.js";
+import {
+  isSelfUpdateArgs,
+  selfUpdateLines
+} from "./chunk-DXED4ARV.js";
 import {
   require_emoji_regex
 } from "./chunk-VTEFO2FT.js";
-import "./chunk-5RHABCYI.js";
-import "./chunk-TO23PR7J.js";
+import "./chunk-LP3ORD3D.js";
+import "./chunk-LCLRP64K.js";
 import "./chunk-SRWDPPLX.js";
 import {
-  source_default
-} from "./chunk-WGDTG44V.js";
-import "./chunk-THSYN5EK.js";
-import "./chunk-I7UMHYZX.js";
+  globalBinsLines,
+  offerPathSetup
+} from "./chunk-O6MQ7NN6.js";
+import "./chunk-BH5CVXNY.js";
+import "./chunk-JV5XR5JQ.js";
+import "./chunk-EMTGRCSE.js";
+import "./chunk-TQQO2F56.js";
 import {
   ViewClass
 } from "./chunk-4KCU2KZL.js";
-import "./chunk-PLG3OYCX.js";
-import "./chunk-5IJTPZXP.js";
-import "./chunk-WF6KLKRN.js";
+import {
+  source_default
+} from "./chunk-WGDTG44V.js";
+import "./chunk-E74WGW5C.js";
+import "./chunk-GCTREKA4.js";
+import "./chunk-MCDLJZXT.js";
+import "./chunk-7M2VTFLP.js";
+import "./chunk-EFHOWRKU.js";
+import "./chunk-CAV7FKWQ.js";
+import "./chunk-6D3QAFNZ.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-SR2VOY5J.js";
+import "./chunk-4GMNWW4C.js";
+import "./chunk-SUU2WETN.js";
 import {
   emitter
-} from "./chunk-U7TEQCBN.js";
+} from "./chunk-B6RIGNEO.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-6IF3RJND.js";
+import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
 import {
   asError
-} from "./chunk-FLH4YC6W.js";
+} from "./chunk-BF5DRGRZ.js";
 import "./chunk-WZWDS3W4.js";
 import {
   __commonJS,
@@ -18620,19 +18642,77 @@ var App2 = ({ trailer }) => {
 };
 var InstallReporter = class extends ViewClass {
   #instance = null;
+  #plain = false;
   start() {
+    if (!process.stdout.isTTY) {
+      const cols = Number(process.env.COLUMNS);
+      process.stdout.columns ||= Number.isInteger(cols) && cols > 0 ? cols : 80;
+    }
+    if (isSelfUpdateArgs(this.config)) {
+      this.#plain = true;
+      return;
+    }
     this.#instance = render_default((0, import_react30.createElement)(App2));
   }
   async done(_result, { time }) {
-    let out = `Done in ${time}ms`;
+    const { self } = _result;
+    let out = self && !_result.graph ? "" : `Done in ${time}ms`;
+    const g = _result.global ? " -g" : "";
     if (_result.buildQueue?.length) {
       out += `
 
 \u{1F4E6} ${_result.buildQueue.length} packages have install scripts defined & were not fully built
 `;
-      out += "\u{1F50E} Run `vlt query :scripts` to list them\n";
-      out += "\u{1F528} Run `vlt build` to run all required scripts to build installed packages.\n";
+      out += `\u{1F50E} Run \`vlt query${g} :scripts\` to list them
+`;
+      out += `\u{1F528} Run \`vlt build${g}\` to run all required scripts to build installed packages.
+`;
+    }
+    if (self) {
+      for (const l of selfUpdateLines(self)) out += out ? `
+${l}` : l;
     }
+    if (_result.global) {
+      const bins = self?.status === "updated" && self.case === "bootstrap" ? { ..._result.global, notWritable: void 0 } : _result.global;
+      for (const l of globalBinsLines(bins)) out += `
+${l}`;
+    }
+    const {
+      linked = [],
+      removed = [],
+      conflicts = [],
+      skipped = [],
+      gitignore = [],
+      unmatched = []
+    } = _result.skills ?? {};
+    const s = (n) => n === 1 ? "" : "s";
+    const skills = [];
+    if (linked.length) {
+      const n = new Set(linked.map((r) => `${r.id}\0${r.skill}`)).size;
+      const dirs = [...new Set(linked.map((r) => r.dir))].join(", ");
+      skills.push(`\u{1F517} Linked ${n} agent skill${s(n)} into ${dirs}`);
+    }
+    if (removed.length) {
+      skills.push(
+        `\u{1F9F9} Removed ${removed.length} stale skill link${s(removed.length)}: ${removed.join(", ")}`
+      );
+    }
+    if (conflicts.length) {
+      skills.push(
+        `\u26A0\uFE0F ${conflicts.length} skill link${s(conflicts.length)} skipped, path in use or taken by another package: ${conflicts.join(", ")}`
+      );
+    }
+    skills.push(...unmatchedLines(unmatched));
+    if (skipped.length) {
+      skills.push(`\u26A0\uFE0F Skipped ${skipped.join(", ")}`);
+    }
+    if (gitignore.length) {
+      skills.push(`\u26A0\uFE0F Could not update ${gitignore.join(", ")}`);
+    }
+    skills.push(...unscannedLines(_result.skills ?? {}));
+    if (skills.length) out += `
+${skills.join("\n")}
+`;
     const saved = _result.persistedConfig;
     if (saved) {
       for (const e of persistedEntries(saved.values)) {
@@ -18640,7 +18720,31 @@ var InstallReporter = class extends ViewClass {
 Saved ${e} to ${saved.which} vlt.json`;
       }
     }
-    this.#instance?.rerender((0, import_react30.createElement)(App2, { trailer: out }));
+    const migrated = _result.migratedWorkspaces;
+    if (migrated) {
+      out += `
+Saved workspaces from ${migrated.source} to vlt.json`;
+    }
+    const a = _result.allowSkills;
+    if (a?.stored) out += `
+${keptLine(a.stored)}`;
+    else if (a) out += `
+${savedLine(a.query, "project")}`;
+    if (!out) return void 0;
+    if (this.#plain) this.#instance = render_default((0, import_react30.createElement)(Text, null, out));
+    else this.#instance?.rerender((0, import_react30.createElement)(App2, { trailer: out }));
+    if (_result.global) {
+      await offerPathSetup(_result.global, {
+        globalDir: this.config.projectRoot,
+        yes: !!this.config.get("yes"),
+        noModifyPath: !!this.config.get("no-modify-path"),
+        // ink owns the terminal until unmounted
+        beforeOutput: () => {
+          this.#instance?.unmount();
+          this.#instance = null;
+        }
+      });
+    }
     return void 0;
   }
   error(err) {

package/{run-AMUUVLTI.js → run-IPARVIIQ.js}

@@ -12,37 +12,43 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   ExecCommand,
   views
-} from "./chunk-X4FVR4R5.js";
-import "./chunk-UGCKF5ZE.js";
+} from "./chunk-75HGJVNG.js";
+import "./chunk-3JIN46K5.js";
 import "./chunk-RIYFGX27.js";
-import "./chunk-ASLX43R3.js";
-import "./chunk-FZUYGJZU.js";
-import "./chunk-QCSUWACA.js";
-import "./chunk-G2YT2GWF.js";
-import "./chunk-5Y4SYLJ2.js";
-import "./chunk-VTEFO2FT.js";
-import "./chunk-WGDTG44V.js";
-import "./chunk-THSYN5EK.js";
+import "./chunk-JCNI6ZHH.js";
 import {
   run,
   runFG
-} from "./chunk-OVPHE4O7.js";
-import "./chunk-5TNXLRW2.js";
+} from "./chunk-36UIE654.js";
+import "./chunk-F5LZMLAQ.js";
+import "./chunk-YTDABXPD.js";
+import "./chunk-KVWGMSPW.js";
+import "./chunk-LGQVZTYR.js";
+import "./chunk-EYGOEAJM.js";
 import {
   commandUsage
-} from "./chunk-LHPEBLOU.js";
-import "./chunk-I7UMHYZX.js";
+} from "./chunk-HT6FS4VB.js";
+import "./chunk-VTEFO2FT.js";
+import "./chunk-JV5XR5JQ.js";
+import "./chunk-EMTGRCSE.js";
+import "./chunk-TQQO2F56.js";
 import "./chunk-4KCU2KZL.js";
-import "./chunk-PLG3OYCX.js";
-import "./chunk-5IJTPZXP.js";
-import "./chunk-WF6KLKRN.js";
+import "./chunk-WGDTG44V.js";
+import "./chunk-E74WGW5C.js";
+import "./chunk-GCTREKA4.js";
+import "./chunk-MCDLJZXT.js";
+import "./chunk-7M2VTFLP.js";
+import "./chunk-EFHOWRKU.js";
+import "./chunk-CAV7FKWQ.js";
+import "./chunk-6D3QAFNZ.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-ZJMJ7MCT.js";
-import "./chunk-U7TEQCBN.js";
+import "./chunk-GEQFMH5M.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-BF5DRGRZ.js";
 import "./chunk-WZWDS3W4.js";
 import "./chunk-PZLD7RTK.js";
 

package/{run-exec-5W3XWQZA.js → run-exec-C4RTREEW.js}

@@ -12,37 +12,43 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   ExecCommand,
   views
-} from "./chunk-X4FVR4R5.js";
-import "./chunk-UGCKF5ZE.js";
+} from "./chunk-75HGJVNG.js";
+import "./chunk-3JIN46K5.js";
 import "./chunk-RIYFGX27.js";
-import "./chunk-ASLX43R3.js";
-import "./chunk-FZUYGJZU.js";
-import "./chunk-QCSUWACA.js";
-import "./chunk-G2YT2GWF.js";
-import "./chunk-5Y4SYLJ2.js";
-import "./chunk-VTEFO2FT.js";
-import "./chunk-WGDTG44V.js";
-import "./chunk-THSYN5EK.js";
+import "./chunk-JCNI6ZHH.js";
 import {
   runExec,
   runExecFG
-} from "./chunk-OVPHE4O7.js";
-import "./chunk-5TNXLRW2.js";
+} from "./chunk-36UIE654.js";
+import "./chunk-F5LZMLAQ.js";
+import "./chunk-YTDABXPD.js";
+import "./chunk-KVWGMSPW.js";
+import "./chunk-LGQVZTYR.js";
+import "./chunk-EYGOEAJM.js";
 import {
   commandUsage
-} from "./chunk-LHPEBLOU.js";
-import "./chunk-I7UMHYZX.js";
+} from "./chunk-HT6FS4VB.js";
+import "./chunk-VTEFO2FT.js";
+import "./chunk-JV5XR5JQ.js";
+import "./chunk-EMTGRCSE.js";
+import "./chunk-TQQO2F56.js";
 import "./chunk-4KCU2KZL.js";
-import "./chunk-PLG3OYCX.js";
-import "./chunk-5IJTPZXP.js";
-import "./chunk-WF6KLKRN.js";
+import "./chunk-WGDTG44V.js";
+import "./chunk-E74WGW5C.js";
+import "./chunk-GCTREKA4.js";
+import "./chunk-MCDLJZXT.js";
+import "./chunk-7M2VTFLP.js";
+import "./chunk-EFHOWRKU.js";
+import "./chunk-CAV7FKWQ.js";
+import "./chunk-6D3QAFNZ.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-ZJMJ7MCT.js";
-import "./chunk-U7TEQCBN.js";
+import "./chunk-GEQFMH5M.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-BF5DRGRZ.js";
 import "./chunk-WZWDS3W4.js";
 import "./chunk-PZLD7RTK.js";
 

package/security-archive-src-update-expired.js

@@ -1027,12 +1027,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;
+    }
+    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 minv = min[1];
+    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, [
         "<",
@@ -1312,9 +1331,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,
@@ -1491,19 +1511,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";
@@ -1819,6 +1845,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);
   }
@@ -2166,7 +2209,7 @@ var baseDepID = (id) => {
 var package_default = {
   name: "@vltpkg/user-agent",
   description: "The User-Agent string that vlt sends with every outbound request",
-  version: "1.4.0",
+  version: "1.6.0",
   repository: {
     type: "git",
     url: "git+https://github.com/vltpkg/vltpkg.git",
@@ -2270,7 +2313,8 @@ var __CODE_SPLIT_SCRIPT_NAME = import.meta.filename;
 var SOCKET_API_V0_URL = "https://api.socket.dev/v0/purl?alerts=true";
 var SOCKET_PUBLIC_API_TOKEN = "sktsec_t_--RAN5U4ivauy4w37-6aoKyYPDt5ZbaT5JBVMqiwKo_api";
 var isMain = (path) => path === __CODE_SPLIT_SCRIPT_NAME || path === pathToFileURL(__CODE_SPLIT_SCRIPT_NAME).toString();
-var retrieveRemoteData = async (queue, retries) => {
+var retrieveRemoteData = async (queue, retries, timeout) => {
+  const signal = AbortSignal.timeout(timeout);
   return pRetry(
     async () => {
       const req = await fetch(SOCKET_API_V0_URL, {
@@ -2281,7 +2325,8 @@ var retrieveRemoteData = async (queue, retries) => {
         },
         body: JSON.stringify({
           components: Array.from(queue)
-        })
+        }),
+        signal
       });
       if (req.status === 404) {
         throw new AbortError("Missing API");
@@ -2294,7 +2339,7 @@ var retrieveRemoteData = async (queue, retries) => {
       const str = await req.text();
       return str.trim() + "\n";
     },
-    { retries }
+    { retries, signal }
   );
 };
 var main = async (input = process.stdin) => {
@@ -2317,7 +2362,7 @@ var main = async (input = process.stdin) => {
       input.on("error", reject);
     }
   );
-  const { dbPath, retries, ttl, expired } = payload;
+  const { dbPath, retries, timeout, ttl, expired } = payload;
   if (!expired.length) {
     return false;
   }
@@ -2328,7 +2373,7 @@ var main = async (input = process.stdin) => {
     expiredQueue.add({ purl });
     entryByNameVersion.set(`${entry.name}@${entry.version}`, entry);
   }
-  const res = await retrieveRemoteData(expiredQueue, retries);
+  const res = await retrieveRemoteData(expiredQueue, retries, timeout);
   const now = Date.now();
   const results = [];
   const json = res.split("}\n");