@vltpkg/cli-js 1.0.0-rc.16 → 1.0.0-rc.18

package/{bugs-IGIQNM4N.js → bugs-MT76XIOD.js}

@@ -14,33 +14,33 @@ import {
 } from "./chunk-KUJV76HM.js";
 import {
   createHostContextsMap
-} from "./chunk-45WTKOLQ.js";
-import "./chunk-B3DPXOMO.js";
+} from "./chunk-JE6ZOEEP.js";
+import "./chunk-IBW3EL3Y.js";
 import {
   Query,
   SecurityArchive,
   actual
-} from "./chunk-BJMBQQ3J.js";
-import "./chunk-OQTWFFSY.js";
+} from "./chunk-5X2WSPMY.js";
+import "./chunk-2EMJN5HZ.js";
 import "./chunk-U2GJETZN.js";
 import {
   commandUsage
-} from "./chunk-B3GNQ2FK.js";
-import "./chunk-FAX3DNQ3.js";
+} from "./chunk-GL7NFF2G.js";
+import "./chunk-W5PSVOWK.js";
 import {
   PackageInfoClient
-} from "./chunk-4JSPJENW.js";
+} from "./chunk-AUPYDXOM.js";
 import {
   urlOpen
 } from "./chunk-2274LLVT.js";
-import "./chunk-H6XDJTOC.js";
+import "./chunk-7C2OYDBJ.js";
 import {
   Spec2 as Spec
-} from "./chunk-H2PBLKND.js";
+} from "./chunk-L42EDHWQ.js";
 import "./chunk-XENEIRAC.js";
 import "./chunk-XGSKO6BL.js";
 import "./chunk-DPPLE4IX.js";
-import "./chunk-AAE7LVEY.js";
+import "./chunk-ZCSV76RY.js";
 import "./chunk-4LVU5YJD.js";
 import "./chunk-6JQYXXBQ.js";
 import "./chunk-REP7WICP.js";
@@ -199,4 +199,4 @@ export {
   usage,
   views
 };
-//# sourceMappingURL=bugs-IGIQNM4N.js.map
+//# sourceMappingURL=bugs-MT76XIOD.js.map

package/{build-M5FA4FNJ.js → build-UFY3CKGG.js}

@@ -11,17 +11,17 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   build
-} from "./chunk-BJMBQQ3J.js";
-import "./chunk-OQTWFFSY.js";
+} from "./chunk-5X2WSPMY.js";
+import "./chunk-2EMJN5HZ.js";
 import {
   commandUsage
-} from "./chunk-B3GNQ2FK.js";
-import "./chunk-H6XDJTOC.js";
-import "./chunk-H2PBLKND.js";
+} from "./chunk-GL7NFF2G.js";
+import "./chunk-7C2OYDBJ.js";
+import "./chunk-L42EDHWQ.js";
 import "./chunk-XENEIRAC.js";
 import "./chunk-XGSKO6BL.js";
 import "./chunk-DPPLE4IX.js";
-import "./chunk-AAE7LVEY.js";
+import "./chunk-ZCSV76RY.js";
 import "./chunk-4LVU5YJD.js";
 import {
   isErrorWithCause
@@ -127,4 +127,4 @@ export {
   usage,
   views
 };
-//# sourceMappingURL=build-M5FA4FNJ.js.map
+//# sourceMappingURL=build-UFY3CKGG.js.map

package/{cache-743RRCJY.js → cache-HHUVJK7J.js}

@@ -15,7 +15,7 @@ import {
 import {
   stderr,
   stdout
-} from "./chunk-DDMTKADC.js";
+} from "./chunk-HYJNXJHA.js";
 import "./chunk-TNOFUQ55.js";
 import {
   ViewClass
@@ -24,17 +24,17 @@ import "./chunk-2JA5GDCD.js";
 import "./chunk-U2GJETZN.js";
 import {
   commandUsage
-} from "./chunk-B3GNQ2FK.js";
+} from "./chunk-GL7NFF2G.js";
 import {
   CacheEntry
 } from "./chunk-2274LLVT.js";
 import {
   Spec2 as Spec
-} from "./chunk-H2PBLKND.js";
+} from "./chunk-L42EDHWQ.js";
 import "./chunk-XENEIRAC.js";
 import "./chunk-XGSKO6BL.js";
 import "./chunk-DPPLE4IX.js";
-import "./chunk-AAE7LVEY.js";
+import "./chunk-ZCSV76RY.js";
 import "./chunk-4LVU5YJD.js";
 import "./chunk-6JQYXXBQ.js";
 import "./chunk-REP7WICP.js";
@@ -310,4 +310,4 @@ export {
   usage,
   views
 };
-//# sourceMappingURL=cache-743RRCJY.js.map
+//# sourceMappingURL=cache-HHUVJK7J.js.map

package/{chunk-OQTWFFSY.js → chunk-2EMJN5HZ.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageJson,
   getUser
-} from "./chunk-H6XDJTOC.js";
+} from "./chunk-7C2OYDBJ.js";
 import {
   asError,
   normalizeManifest
@@ -73,4 +73,4 @@ var init = async ({
 export {
   init
 };
-//# sourceMappingURL=chunk-OQTWFFSY.js.map
+//# sourceMappingURL=chunk-2EMJN5HZ.js.map

package/{chunk-BJMBQQ3J.js → chunk-5X2WSPMY.js}

@@ -11,12 +11,12 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   init
-} from "./chunk-OQTWFFSY.js";
+} from "./chunk-2EMJN5HZ.js";
 import {
   Monorepo,
   PackageJson,
   platformCheck
-} from "./chunk-H6XDJTOC.js";
+} from "./chunk-7C2OYDBJ.js";
 import {
   Spec,
   Spec2,
@@ -40,7 +40,7 @@ import {
   joinExtra,
   splitDepID,
   splitExtra
-} from "./chunk-H2PBLKND.js";
+} from "./chunk-L42EDHWQ.js";
 import {
   rimraf
 } from "./chunk-XENEIRAC.js";
@@ -9159,7 +9159,7 @@ var lockfileData = ({
       ...hasItems(cleanScopeRegistries) ? { "scope-registries": cleanScopeRegistries } : void 0,
       ...hasItems(cleanJsrRegistries) ? { "jsr-registries": cleanJsrRegistries } : void 0,
       ...registry !== void 0 && registry !== defaultRegistry ? { registry } : void 0,
-      ...hasItems(registries) ? { registries: cleanRegistries } : void 0,
+      ...hasItems(cleanRegistries) ? { registries: cleanRegistries } : void 0,
       ...hasItems(cleanGitHosts) ? { "git-hosts": cleanGitHosts } : void 0,
       ...hasItems(cleanGitHostArchives) ? { "git-host-archives": cleanGitHostArchives } : void 0
     },
@@ -11802,18 +11802,44 @@ var checkPeerEdgesCompatible = (existingNode, fromNode, peerContext, graph) => {
   if (!peerDeps || Object.keys(peerDeps).length === 0) {
     return { compatible: true };
   }
-  for (const [peerName, peerBareSpec] of Object.entries(peerDeps)) {
+  const parseOpts = {
+    ...graph.mainImporter.options,
+    registry: fromNode.registry
+  };
+  const fromLocation = fromNode.location;
+  const projectRoot = fromNode.projectRoot;
+  const monorepo = graph.monorepo;
+  const satisfiesMemo = /* @__PURE__ */ new Map();
+  const satisfiesNodeSpec = (node, spec2) => {
+    const key = `${node.id}\0${spec2.type}\0${spec2.bareSpec}\0${String(spec2.final)}`;
+    let result = satisfiesMemo.get(key);
+    if (result === void 0) {
+      result = satisfies2(
+        node.id,
+        spec2,
+        fromLocation,
+        projectRoot,
+        monorepo
+      );
+      satisfiesMemo.set(key, result);
+    }
+    return result;
+  };
+  const nodeSatisfiesAll = (node, specs) => {
+    for (const s of specs) {
+      if (!satisfiesNodeSpec(node, s)) return false;
+    }
+    return true;
+  };
+  for (const peerName in peerDeps) {
+    const peerBareSpec = peerDeps[peerName];
+    if (!peerBareSpec) continue;
     const existingEdge = existingNode.edgesOut.get(peerName);
     if (existingEdge === void 0) {
       return { compatible: false };
     }
     if (!existingEdge.to) continue;
-    const peerSpec = parseSpec(
-      peerName,
-      peerBareSpec,
-      fromNode,
-      graph
-    );
+    const peerSpec = Spec2.parse(peerName, peerBareSpec, parseOpts);
     const contextEntry = peerContext.get(peerName);
     if (contextEntry?.target && contextEntry.target.id !== existingEdge.to.id && !shouldIgnoreContextMismatch(
       peerName,
@@ -11821,6 +11847,14 @@ var checkPeerEdgesCompatible = (existingNode, fromNode, peerContext, graph) => {
       fromNode,
       graph
     )) {
+      const existingTarget = existingEdge.to;
+      const existingTargetSatisfiesPeer = satisfiesNodeSpec(
+        existingTarget,
+        peerSpec
+      );
+      if (existingTargetSatisfiesPeer && nodeSatisfiesAll(existingTarget, contextEntry.specs)) {
+        continue;
+      }
       const result = buildIncompatibleResult(
         contextEntry.target,
         peerSpec,
@@ -11832,6 +11866,14 @@ var checkPeerEdgesCompatible = (existingNode, fromNode, peerContext, graph) => {
     }
     const siblingEdge = fromNode.edgesOut.get(peerName);
     if (siblingEdge?.to && siblingEdge.to.id !== existingEdge.to.id) {
+      const existingTarget = existingEdge.to;
+      const existingTargetSatisfiesPeer = satisfiesNodeSpec(
+        existingTarget,
+        peerSpec
+      );
+      if (existingTargetSatisfiesPeer && satisfiesNodeSpec(existingTarget, siblingEdge.spec)) {
+        continue;
+      }
       const result = buildIncompatibleResult(
         siblingEdge.to,
         peerSpec,
@@ -11855,27 +11897,23 @@ var checkPeerEdgesCompatible = (existingNode, fromNode, peerContext, graph) => {
       }
     }
     if (declared && declaredType) {
-      const parentSpec = parseSpec(
-        peerName,
-        declared,
-        fromNode,
-        graph
-      );
-      for (const candidateNode of graph.nodes.values()) {
-        if (candidateNode.name === peerName && candidateNode.id !== existingEdge.to.id && nodeSatisfiesSpec(
-          candidateNode,
-          parentSpec,
-          fromNode,
-          graph
-        ) && nodeSatisfiesSpec(candidateNode, peerSpec, fromNode, graph)) {
-          return {
-            compatible: false,
-            forkEntry: {
-              spec: peerSpec,
-              target: candidateNode,
-              type: shorten(declaredType)
-            }
-          };
+      const parentSpec = Spec2.parse(peerName, declared, parseOpts);
+      if (satisfiesNodeSpec(existingEdge.to, parentSpec)) {
+        continue;
+      }
+      const candidates = graph.nodesByName.get(peerName);
+      if (candidates) {
+        for (const candidateNode of candidates) {
+          if (candidateNode.id !== existingEdge.to.id && satisfiesNodeSpec(candidateNode, parentSpec) && satisfiesNodeSpec(candidateNode, peerSpec)) {
+            return {
+              compatible: false,
+              forkEntry: {
+                spec: peerSpec,
+                target: candidateNode,
+                type: shorten(declaredType)
+              }
+            };
+          }
         }
       }
     }
@@ -12213,41 +12251,58 @@ var getFileTypeInfo = (spec2, fromNode, scurry) => {
 };
 var isStringArray2 = (a) => Array.isArray(a) && !a.some((b) => typeof b !== "string");
 var findCompatibleResolution = (spec2, fromNode, graph, peerContext, queryModifier, _peer) => {
-  const candidates = graph.nodesByName.get(spec2.final.name);
-  let existingNode = graph.findResolution(
-    spec2,
-    fromNode,
-    queryModifier
-  );
+  const fromLoc = fromNode.location;
+  const projectRoot = graph.projectRoot;
+  const monorepo = graph.monorepo;
+  const final = spec2.final;
+  const satisfiesCache = /* @__PURE__ */ new Map();
+  const satisfiesFinal = (n) => {
+    const key = n.id;
+    const cached = satisfiesCache.get(key);
+    if (cached !== void 0) {
+      return cached;
+    }
+    const result = satisfies2(
+      key,
+      final,
+      fromLoc,
+      projectRoot,
+      monorepo
+    );
+    satisfiesCache.set(key, result);
+    return result;
+  };
+  const existingEdge = fromNode.edgesOut.get(spec2.name);
+  let existingNode;
+  if (existingEdge?.to && !existingEdge.to.detached && satisfiesFinal(existingEdge.to)) {
+    existingNode = existingEdge.to;
+  } else {
+    existingNode = graph.findResolution(spec2, fromNode, queryModifier);
+  }
   let peerCompatResult = existingNode ? checkPeerEdgesCompatible(
     existingNode,
     fromNode,
     peerContext,
     graph
   ) : { compatible: true };
-  if (existingNode && !peerCompatResult.compatible && candidates && candidates.size > 1) {
-    for (const candidate of candidates) {
-      if (candidate === existingNode) continue;
-      if (candidate.detached) continue;
-      if (!satisfies2(
-        candidate.id,
-        spec2.final,
-        fromNode.location,
-        graph.projectRoot,
-        graph.monorepo
-      )) {
-        continue;
-      }
-      const compat = checkPeerEdgesCompatible(
-        candidate,
-        fromNode,
-        peerContext,
-        graph
-      );
-      if (compat.compatible) {
-        existingNode = candidate;
-        peerCompatResult = compat;
-        break;
+  if (existingNode && !peerCompatResult.compatible) {
+    const candidates = graph.nodesByName.get(final.name);
+    if (candidates && candidates.size > 1) {
+      for (const candidate of candidates) {
+        if (candidate === existingNode) continue;
+        if (candidate.detached) continue;
+        if (!satisfiesFinal(candidate)) continue;
+        const compat = checkPeerEdgesCompatible(
+          candidate,
+          fromNode,
+          peerContext,
+          graph
+        );
+        if (compat.compatible) {
+          existingNode = candidate;
+          peerCompatResult = compat;
+          break;
+        }
       }
     }
   }
@@ -12407,7 +12462,9 @@ var processPlacementTasks = async (graph, options, placementTasks, add, modifier
     if (fileTypeInfo?.path && fileTypeInfo.isDirectory) {
       node.location = fileTypeInfo.path;
     }
-    node.setResolved();
+    if (!node.resolved) {
+      node.setResolved();
+    }
     const nextPeerDeps = /* @__PURE__ */ new Map();
     const bundleDeps = manifest.bundleDependencies;
     const bundled = new Set(
@@ -14082,4 +14139,4 @@ export {
 cssesc/cssesc.js:
   (*! https://mths.be/cssesc v3.0.0 by @mathias *)
 */
-//# sourceMappingURL=chunk-BJMBQQ3J.js.map
+//# sourceMappingURL=chunk-5X2WSPMY.js.map