@vltpkg/cli-js 1.0.2 → 1.0.3

package/{chunk-47IR6Z6C.js → chunk-LZGKX7JI.js}

@@ -13,14 +13,14 @@ import {
   AbortError,
   SecurityArchive,
   pRetry
-} from "./chunk-3MBSXZ62.js";
+} from "./chunk-5B23EKN4.js";
 import {
   Monorepo,
   PackageJson,
   getUser,
   minimatch,
   platformCheck
-} from "./chunk-F2GLBPGQ.js";
+} from "./chunk-FFOXTPQA.js";
 import {
   asDepID,
   getId,
@@ -33,21 +33,26 @@ import {
   joinExtra,
   splitDepID,
   splitExtra
-} from "./chunk-FM5DQZVN.js";
+} from "./chunk-OCJDISSI.js";
+import {
+  Spec as Spec2
+} from "./chunk-XU5SMHXP.js";
 import {
   load,
   walkUp
 } from "./chunk-HTOTG4TS.js";
 import {
-  promiseSpawn,
-  rimraf
-} from "./chunk-7NHXV6AH.js";
-import {
-  Spec as Spec2
-} from "./chunk-NS4VFXHX.js";
+  promiseSpawn
+} from "./chunk-LPIBYUMT.js";
 import {
   graphStep
 } from "./chunk-UBLFPJHV.js";
+import {
+  XDG
+} from "./chunk-XNLSTHDK.js";
+import {
+  rimraf
+} from "./chunk-BJBFEQRR.js";
 import {
   Spec,
   Version,
@@ -87,10 +92,7 @@ import {
   satisfies,
   shortDependencyTypes,
   subset
-} from "./chunk-Q46JRSZU.js";
-import {
-  XDG
-} from "./chunk-XNLSTHDK.js";
+} from "./chunk-IITIX4ID.js";
 import {
   error,
   typeError
@@ -4551,6 +4553,11 @@ var Node = class _Node {
    * The manifest integrity value.
    */
   integrity;
+  /**
+   * True when `integrity` and `resolved` came from a lockfile, i.e. they were
+   * verified by the install that wrote them.
+   */
+  resolvedFromLockfile = false;
   /**
    * The manifest this node represents in the graph.
    */
@@ -7658,7 +7665,7 @@ var severity = async (state) => {
     if (report) {
       if (comparator) {
         const kindLevel = kindLevelMap.get(kind);
-        if (!kindLevel) break;
+        if (kindLevel == null) break;
         for (const alert of report.alerts) {
           const alertType = alert.type;
           const currentAlertLevelKey = [...kindsMap2.entries()].find(
@@ -9604,7 +9611,18 @@ var retrieveNodeFromGraph = (key, value, graph, fromId, seenNodes) => {
   }
   return foundNode;
 };
-var loadEdges = (graph, edges, options) => {
+var parseEdgeSpec = (specName, bareSpec, options, cache) => {
+  if (!cache || specName === "(unknown)") {
+    return Spec.parse(specName, bareSpec, options);
+  }
+  const key = `${cache.prefix}\0${specName}\0${bareSpec}`;
+  const cached = cache.specCache.get(key);
+  if (cached) return cached;
+  const spec2 = Spec.parse(specName, bareSpec, options);
+  cache.specCache.set(key, spec2);
+  return spec2;
+};
+var loadEdges = (graph, edges, options, cache) => {
   const entries = Object.entries(edges);
   const edgeCount = entries.length;
   const useOptimizations = edgeCount > 50;
@@ -9657,10 +9675,11 @@ var loadEdges = (graph, edges, options) => {
         toNode = graph.nodes.get(asDepID(toId));
       }
     }
-    const spec2 = Spec.parse(
+    const spec2 = parseEdgeSpec(
       specName,
       valRest.substring(0, vrSplit),
-      options
+      options,
+      cache
     );
     if (useOptimizations) {
       edgeProcessingQueue.push({
@@ -9753,6 +9772,7 @@ var loadNodes = (graph, nodes, options, actual2, throwOnMissingManifest) => {
     node.optional = optional2;
     node.integrity = integrity ?? referenceNode?.integrity;
     node.resolved = type2 === "remote" ? filepath : resolved ?? referenceNode?.resolved;
+    node.resolvedFromLockfile = !!(node.integrity && node.resolved);
     node.projectRoot = graph.projectRoot;
     if (!node.resolved) node.setResolved();
     if (location) {
@@ -9783,11 +9803,12 @@ var loadLockfile = (projectRoot, lockfilePath) => JSON.parse(
     encoding: "utf8"
   })
 );
+var loadData = (projectRoot, lockfilePath = "vlt-lock.json") => loadLockfile(projectRoot, lockfilePath);
 var load3 = (options) => {
   const { projectRoot } = options;
   return loadObject(
     options,
-    loadLockfile(projectRoot, "vlt-lock.json")
+    options.lockfileData ?? loadLockfile(projectRoot, "vlt-lock.json")
   );
 };
 var loadHidden = (options) => {
@@ -9900,7 +9921,11 @@ var loadObject = (options, lockfileData2) => {
     options.actual,
     options.throwOnMissingManifest
   );
-  loadEdges(graph, lockfileData2.edges, mergedOptions);
+  const specCache = options.modifiers || !options.specCache ? void 0 : {
+    specCache: options.specCache,
+    prefix: JSON.stringify(lockfileOptions)
+  };
+  loadEdges(graph, lockfileData2.edges, mergedOptions, specCache);
   for (const node of graph.nodes.values()) {
     const [firstEdge] = node.edgesIn;
     if (firstEdge?.spec.registry) {
@@ -11811,15 +11836,21 @@ var extractNode = async (node, scurry, remover, options, packageInfo, diff2) =>
       error: new Error("Platform check failed or package deprecated")
     };
   }
+  const extractOptions = {
+    from,
+    integrity,
+    resolved,
+    fromLockfile: node.resolvedFromLockfile
+  };
   try {
     await remover.rm(target);
     if (removeOptionalFailedNode) {
       try {
-        const result = await packageInfo.extract(spec2, target, {
-          from,
-          integrity,
-          resolved
-        });
+        const result = await packageInfo.extract(
+          spec2,
+          target,
+          extractOptions
+        );
         if (result.integrity && !node.integrity) {
           node.integrity = result.integrity;
         }
@@ -11829,11 +11860,11 @@ var extractNode = async (node, scurry, remover, options, packageInfo, diff2) =>
         return { success: false, node, error: error2 };
       }
     } else {
-      const result = await packageInfo.extract(spec2, target, {
-        from,
-        integrity,
-        resolved
-      });
+      const result = await packageInfo.extract(
+        spec2,
+        target,
+        extractOptions
+      );
       if (result.integrity && !node.integrity) {
         node.integrity = result.integrity;
       }
@@ -11987,7 +12018,7 @@ var checkPeerEdgesCompatible = (existingNode, fromNode, peerContext, graph) => {
         existingTarget,
         peerSpec
       );
-      if (existingTargetSatisfiesPeer && nodeSatisfiesAll(existingTarget, contextEntry.specs)) {
+      if (existingTargetSatisfiesPeer && nodeSatisfiesAll(existingTarget, contextEntry.specs.values())) {
         continue;
       }
       const result = buildIncompatibleResult(
@@ -12059,9 +12090,13 @@ var retrievePeerContextHash = (peerContext) => {
   if (!peerContext?.index) return void 0;
   return `peer.${peerContext.index}`;
 };
+var peerSpecKey = (spec2) => {
+  const f = spec2.final;
+  return `${f.type}\0${String(f)}\0${f.registry ?? ""}`;
+};
 var incompatibleSpecs = (spec2, entry) => {
   if (entry.specs.size > 0) {
-    for (const s_ of entry.specs) {
+    for (const s_ of entry.specs.values()) {
       const s = s_.final;
       if (
         // Registry types: check semver range intersection
@@ -12094,7 +12129,7 @@ var addEntriesToPeerContext = (peerContext, entries, fromNode, monorepo) => {
     if (!entry) {
       entry = {
         active: true,
-        specs: /* @__PURE__ */ new Set([spec2]),
+        specs: /* @__PURE__ */ new Map([[peerSpecKey(spec2), spec2]]),
         target,
         type: type2,
         contextDependents: /* @__PURE__ */ new Set()
@@ -12104,7 +12139,7 @@ var addEntriesToPeerContext = (peerContext, entries, fromNode, monorepo) => {
       continue;
     }
     if (incompatibleSpecs(spec2.final, entry)) return true;
-    if (target && [...entry.specs].every(
+    if (target && [...entry.specs.values()].every(
       (s) => satisfies2(
         target.id,
         s,
@@ -12126,7 +12161,8 @@ var addEntriesToPeerContext = (peerContext, entries, fromNode, monorepo) => {
       }
       entry.target ??= target;
     }
-    entry.specs.add(spec2);
+    const specKey = peerSpecKey(spec2);
+    if (!entry.specs.has(specKey)) entry.specs.set(specKey, spec2);
     if (dependent) entry.contextDependents.add(dependent);
   }
   return false;
@@ -12144,7 +12180,7 @@ var forkPeerContext = (graph, peerContext, entries) => {
   for (const [name, entry] of peerContext.entries()) {
     nextPeerContext.set(name, {
       active: false,
-      specs: new Set(entry.specs),
+      specs: new Map(entry.specs),
       target: void 0,
       type: entry.type,
       contextDependents: new Set(entry.contextDependents)
@@ -12155,7 +12191,7 @@ var forkPeerContext = (graph, peerContext, entries) => {
     const name = target?.name ?? spec2.final.name;
     const newEntry = {
       active: true,
-      specs: /* @__PURE__ */ new Set([spec2]),
+      specs: /* @__PURE__ */ new Map([[peerSpecKey(spec2), spec2]]),
       target,
       type: type2,
       contextDependents: dependent ? /* @__PURE__ */ new Set([dependent]) : /* @__PURE__ */ new Set()
@@ -12313,7 +12349,10 @@ var endPeerPlacement = (peerContext, nextDeps, nextPeerDeps, graph, spec2, fromN
       const entry = peerContext.get(name);
       if (!node.edgesOut.has(name) && entry?.target && nodeSatisfiesSpec(entry.target, spec3, fromNode, graph)) {
         graph.addEdge(type3, spec3, node, entry.target);
-        entry.specs.add(spec3.final);
+        const finalKey = peerSpecKey(spec3.final);
+        if (!entry.specs.has(finalKey)) {
+          entry.specs.set(finalKey, spec3.final);
+        }
         continue;
       }
       if (type3 === "peerOptional") {
@@ -14072,6 +14111,7 @@ var createVirtualRoot = (name = "virtual-root", options, mainImporters) => {
 var actual = { load: load4 };
 var lockfile = {
   load: load3,
+  loadData,
   loadEdges,
   loadNodes,
   save
@@ -14112,6 +14152,8 @@ var install = async (options, add) => {
     packageJson: options.packageJson,
     scurry: options.scurry
   });
+  const specCache = /* @__PURE__ */ new Map();
+  const lockfileData2 = options.frozenLockfile ? loadData(options.projectRoot) : void 0;
   if (options.frozenLockfile) {
     if (add?.modifiedDependencies) {
       const dependencies = [];
@@ -14128,7 +14170,9 @@ var install = async (options, add) => {
     const lockfileGraph = load3({
       ...options,
       mainManifest,
-      monorepo: fullMonorepo
+      monorepo: fullMonorepo,
+      specCache,
+      lockfileData: lockfileData2
     });
     const emptyAdd = Object.assign(
       /* @__PURE__ */ new Map(),
@@ -14228,7 +14272,8 @@ var install = async (options, add) => {
       loadManifests: true,
       modifiers: void 0,
       // modifiers should not be used here
-      monorepo: fullMonorepo
+      monorepo: fullMonorepo,
+      specCache
     });
     if (act.importers.size === act.nodes.size) {
       act = void 0;
@@ -14242,7 +14287,9 @@ var install = async (options, add) => {
       modifiers,
       remove,
       remover,
-      monorepo: fullMonorepo
+      monorepo: fullMonorepo,
+      specCache,
+      lockfileData: lockfileData2
     });
     if (options.lockfileOnly) {
       lockfile.save({ ...options, graph, modifiers });

package/{chunk-5PFGKHIS.js → chunk-NXEH3NQZ.js}

@@ -11,21 +11,15 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageInfoClient
-} from "./chunk-WAFERMRI.js";
+} from "./chunk-G7UPIJAP.js";
 import {
   Monorepo,
   PackageJson,
   PathScurry
-} from "./chunk-F2GLBPGQ.js";
+} from "./chunk-FFOXTPQA.js";
 import {
   resetCaches
-} from "./chunk-FM5DQZVN.js";
-import {
-  find,
-  load,
-  reload,
-  save
-} from "./chunk-HTOTG4TS.js";
+} from "./chunk-OCJDISSI.js";
 import {
   commands,
   definition,
@@ -33,12 +27,18 @@ import {
   isRecordField,
   recordFields
 } from "./chunk-WP6CYBPM.js";
+import {
+  find,
+  load,
+  reload,
+  save
+} from "./chunk-HTOTG4TS.js";
 import {
   assertRecordStringString,
   assertRecordStringT,
   getOptions,
   isRecordStringString
-} from "./chunk-Q46JRSZU.js";
+} from "./chunk-IITIX4ID.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-FM5DQZVN.js → chunk-OCJDISSI.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-NS4VFXHX.js";
+} from "./chunk-XU5SMHXP.js";
 import {
   Spec,
   currentDefaultRegistryName,
   defaultRegistryName
-} from "./chunk-Q46JRSZU.js";
+} from "./chunk-IITIX4ID.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/chunk-RNJSI3NZ.js

@@ -0,0 +1,75 @@
+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);
+import {
+  error
+} from "./chunk-WZWDS3W4.js";
+import {
+  __glob
+} from "./chunk-PZLD7RTK.js";
+
+// import("./commands/**/*.ts") in ../../src/cli-sdk/src/load-command.ts
+var globImport_commands_ts = __glob({
+  "./commands/access.ts": () => import("./access-5WETTBDZ.js"),
+  "./commands/bugs.ts": () => import("./bugs-KONFLIQQ.js"),
+  "./commands/build.ts": () => import("./build-S7G2DU7I.js"),
+  "./commands/cache.ts": () => import("./cache-Z4OIMLXQ.js"),
+  "./commands/ci.ts": () => import("./ci-RZZE375O.js"),
+  "./commands/config.ts": () => import("./config-MDFY3ORD.js"),
+  "./commands/create.ts": () => import("./create-GVSDTOGQ.js"),
+  "./commands/deprecate.ts": () => import("./deprecate-T4TQLGXQ.js"),
+  "./commands/dist-tag.ts": () => import("./dist-tag-GO46UQUN.js"),
+  "./commands/docs.ts": () => import("./docs-FJME563T.js"),
+  "./commands/exec-cache.ts": () => import("./exec-cache-3UNLDUAP.js"),
+  "./commands/exec-local.ts": () => import("./exec-local-YHVO5RLU.js"),
+  "./commands/exec.ts": () => import("./exec-M22KBPCK.js"),
+  "./commands/help.ts": () => import("./help-ZEWMLOJX.js"),
+  "./commands/init.ts": () => import("./init-4HPZY2KN.js"),
+  "./commands/install.ts": () => import("./install-2TZIP4PJ.js"),
+  "./commands/install/reporter.ts": () => import("./reporter-DKZTTACW.js"),
+  "./commands/list.ts": () => import("./list-NFFXER43.js"),
+  "./commands/login.ts": () => import("./login-KV5YC5Z2.js"),
+  "./commands/logout.ts": () => import("./logout-I2VT3NAR.js"),
+  "./commands/pack.ts": () => import("./pack-47ZKFSHI.js"),
+  "./commands/ping.ts": () => import("./ping-Q7Y7QV63.js"),
+  "./commands/pkg.ts": () => import("./pkg-VTJS2ISJ.js"),
+  "./commands/profile.ts": () => import("./profile-YXZYVEUX.js"),
+  "./commands/publish.ts": () => import("./publish-CBN67KN2.js"),
+  "./commands/query.ts": () => import("./query-U3QHF3ZE.js"),
+  "./commands/registry.ts": () => import("./registry-CZPFR3OF.js"),
+  "./commands/repo.ts": () => import("./repo-4UIQRBI7.js"),
+  "./commands/run-exec.ts": () => import("./run-exec-HPNBVAXH.js"),
+  "./commands/run.ts": () => import("./run-5DUYI6GL.js"),
+  "./commands/setup.ts": () => import("./setup-23W5FQVW.js"),
+  "./commands/token.ts": () => import("./token-SRCS5CRU.js"),
+  "./commands/uninstall.ts": () => import("./uninstall-JXHAFXZ2.js"),
+  "./commands/unpublish.ts": () => import("./unpublish-GRYB5KQH.js"),
+  "./commands/update.ts": () => import("./update-GDLL4ER6.js"),
+  "./commands/version.ts": () => import("./version-JVG4CI4L.js"),
+  "./commands/view.ts": () => import("./view-ABQLVL4L.js"),
+  "./commands/whoami.ts": () => import("./whoami-RCCZ7BXI.js")
+});
+
+// ../../src/cli-sdk/src/load-command.ts
+var loadCommand = async (command) => {
+  try {
+    return await globImport_commands_ts(`./commands/${command}.ts`);
+  } catch (e) {
+    throw error("Could not load command", {
+      found: command,
+      cause: e
+    });
+  }
+};
+
+export {
+  loadCommand
+};

package/{chunk-ONVLPT73.js → chunk-T4GYDWUJ.js}

@@ -11,7 +11,7 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   defaultRegistries
-} from "./chunk-Q46JRSZU.js";
+} from "./chunk-IITIX4ID.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-YDUHQU7N.js → chunk-TMBNGWXK.js}

@@ -13,10 +13,10 @@ import {
   actual,
   callLimit,
   createVirtualRoot
-} from "./chunk-47IR6Z6C.js";
+} from "./chunk-LZGKX7JI.js";
 import {
   SecurityArchive
-} from "./chunk-3MBSXZ62.js";
+} from "./chunk-5B23EKN4.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -115,7 +115,7 @@ var reloadConfig = async (folder) => {
     unload("project");
   } catch {
   }
-  const { Config } = await import("./config-JL4TW2AV.js");
+  const { Config } = await import("./config-LL3RLMZG.js");
   return Config.load(folder, process.argv, true);
 };
 

package/{chunk-CTDFRLS4.js → chunk-UAAZW4N6.js}

@@ -16,14 +16,14 @@ import {
 } from "./chunk-FWKQ7YDF.js";
 import {
   minimatch
-} from "./chunk-F2GLBPGQ.js";
+} from "./chunk-FFOXTPQA.js";
+import {
+  Spec
+} from "./chunk-XU5SMHXP.js";
 import {
   parse,
   stringify
 } from "./chunk-HTOTG4TS.js";
-import {
-  Spec
-} from "./chunk-NS4VFXHX.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-TM4LHSZV.js → chunk-UXIRAU5T.js}

@@ -11,14 +11,14 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   asDependency
-} from "./chunk-47IR6Z6C.js";
+} from "./chunk-LZGKX7JI.js";
 import {
   joinDepIDTuple,
   splitDepID
-} from "./chunk-FM5DQZVN.js";
+} from "./chunk-OCJDISSI.js";
 import {
   Spec
-} from "./chunk-NS4VFXHX.js";
+} from "./chunk-XU5SMHXP.js";
 
 // ../../src/cli-sdk/src/parse-add-remove-args.ts
 import { isAbsolute, relative, resolve } from "node:path";

package/{chunk-BSB4XGBB.js → chunk-VB3IWNHX.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   isError,
   isObject
-} from "./chunk-Q46JRSZU.js";
+} from "./chunk-IITIX4ID.js";
 
 // ../../src/output/src/error.ts
 var parseError = (err) => {