@antongolub/lockfile 0.0.0-snapshot.71 → 0.0.0-snapshot.73

package/dist/formats/yarn-berry-v10.js

@@ -1487,6 +1487,13 @@ function distTagResolve(range, candidates) {
   const ids = eligible.map((c) => c.id).sort(cmpStr2);
   return { kind: "ambiguous", candidateIds: ids };
 }
+function catalogResolve(range, candidates) {
+  if (!range.startsWith("catalog:")) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  return { kind: "ambiguous", candidateIds: eligible.map((c) => c.id).sort(cmpStr2) };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -2941,6 +2948,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = catalogResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") dstId = result.id;
+    }
     if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
       const bound = nodeNameVersion(dstId);
       const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);

package/dist/formats/yarn-berry-v4.js

@@ -1487,6 +1487,13 @@ function distTagResolve(range, candidates) {
   const ids = eligible.map((c) => c.id).sort(cmpStr2);
   return { kind: "ambiguous", candidateIds: ids };
 }
+function catalogResolve(range, candidates) {
+  if (!range.startsWith("catalog:")) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  return { kind: "ambiguous", candidateIds: eligible.map((c) => c.id).sort(cmpStr2) };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -2945,6 +2952,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = catalogResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") dstId = result.id;
+    }
     if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
       const bound = nodeNameVersion(dstId);
       const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);

package/dist/formats/yarn-berry-v5.js

@@ -1487,6 +1487,13 @@ function distTagResolve(range, candidates) {
   const ids = eligible.map((c) => c.id).sort(cmpStr2);
   return { kind: "ambiguous", candidateIds: ids };
 }
+function catalogResolve(range, candidates) {
+  if (!range.startsWith("catalog:")) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  return { kind: "ambiguous", candidateIds: eligible.map((c) => c.id).sort(cmpStr2) };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -2940,6 +2947,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = catalogResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") dstId = result.id;
+    }
     if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
       const bound = nodeNameVersion(dstId);
       const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);

package/dist/formats/yarn-berry-v6.js

@@ -1487,6 +1487,13 @@ function distTagResolve(range, candidates) {
   const ids = eligible.map((c) => c.id).sort(cmpStr2);
   return { kind: "ambiguous", candidateIds: ids };
 }
+function catalogResolve(range, candidates) {
+  if (!range.startsWith("catalog:")) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  return { kind: "ambiguous", candidateIds: eligible.map((c) => c.id).sort(cmpStr2) };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -2940,6 +2947,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = catalogResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") dstId = result.id;
+    }
     if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
       const bound = nodeNameVersion(dstId);
       const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);

package/dist/formats/yarn-berry-v7.js

@@ -1487,6 +1487,13 @@ function distTagResolve(range, candidates) {
   const ids = eligible.map((c) => c.id).sort(cmpStr2);
   return { kind: "ambiguous", candidateIds: ids };
 }
+function catalogResolve(range, candidates) {
+  if (!range.startsWith("catalog:")) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  return { kind: "ambiguous", candidateIds: eligible.map((c) => c.id).sort(cmpStr2) };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -2940,6 +2947,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = catalogResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") dstId = result.id;
+    }
     if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
       const bound = nodeNameVersion(dstId);
       const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);

package/dist/formats/yarn-berry-v8.js

@@ -1487,6 +1487,13 @@ function distTagResolve(range, candidates) {
   const ids = eligible.map((c) => c.id).sort(cmpStr2);
   return { kind: "ambiguous", candidateIds: ids };
 }
+function catalogResolve(range, candidates) {
+  if (!range.startsWith("catalog:")) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  return { kind: "ambiguous", candidateIds: eligible.map((c) => c.id).sort(cmpStr2) };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -2941,6 +2948,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = catalogResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") dstId = result.id;
+    }
     if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
       const bound = nodeNameVersion(dstId);
       const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);

package/dist/formats/yarn-berry-v9.js

@@ -1487,6 +1487,13 @@ function distTagResolve(range, candidates) {
   const ids = eligible.map((c) => c.id).sort(cmpStr2);
   return { kind: "ambiguous", candidateIds: ids };
 }
+function catalogResolve(range, candidates) {
+  if (!range.startsWith("catalog:")) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  return { kind: "ambiguous", candidateIds: eligible.map((c) => c.id).sort(cmpStr2) };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -2941,6 +2948,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = catalogResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") dstId = result.id;
+    }
     if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
       const bound = nodeNameVersion(dstId);
       const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);

package/dist/index.js

@@ -6382,6 +6382,13 @@ function distTagResolve(range, candidates) {
   const ids = eligible.map((c) => c.id).sort(cmpStr4);
   return { kind: "ambiguous", candidateIds: ids };
 }
+function catalogResolve(range, candidates) {
+  if (!range.startsWith("catalog:")) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  return { kind: "ambiguous", candidateIds: eligible.map((c) => c.id).sort(cmpStr4) };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -7451,6 +7458,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = catalogResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") dstId = result.id;
+    }
     if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
       const bound = nodeNameVersion(dstId);
       const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);
@@ -10945,6 +10956,12 @@ function optimize(graph, options = {}) {
       }
     }
   }
+  for (const node of graph.nodes()) {
+    if (!live.has(node.id)) continue;
+    if (node.patch === void 0 && node.source === void 0) continue;
+    const baseId = serializeNodeId(node.name, node.version, node.peerContext, void 0, void 0);
+    if (baseId !== node.id && graph.getNode(baseId) !== void 0) live.add(baseId);
+  }
   const removed = [];
   const unresolved = [];
   let next = graph;

package/dist/optimize.js

@@ -1,7 +1,7 @@
 import 'crypto';
 import 'buffer';
 
-// src/main/ts/recipe/patch.ts
+// src/main/ts/errors.ts
 
 // src/main/ts/graph.ts
 function nameOf(id) {
@@ -15,6 +15,16 @@ function nameOf(id) {
   }
   return lastAt < 0 ? id : id.slice(0, lastAt);
 }
+function serializeNodeId(name, version, peerContext, patch, source) {
+  const base = toTarballKey({ name, version});
+  if (peerContext.length === 0) return base;
+  return base + peerContext.map((p) => `(${p})`).join("");
+}
+function toTarballKey(inputs) {
+  const slots = [];
+  return slots.length === 0 ? `${inputs.name}@${inputs.version}` : `${inputs.name}@${inputs.version}+${slots.sort(cmpStr).join("+")}`;
+}
+var cmpStr = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 
 // src/main/ts/optimize/diagnostics.ts
 function optimizeNodeRemoved(nodeId) {
@@ -136,6 +146,12 @@ function optimize(graph, options = {}) {
       }
     }
   }
+  for (const node of graph.nodes()) {
+    if (!live.has(node.id)) continue;
+    if (node.patch === void 0 && node.source === void 0) continue;
+    const baseId = serializeNodeId(node.name, node.version, node.peerContext);
+    if (baseId !== node.id && graph.getNode(baseId) !== void 0) live.add(baseId);
+  }
   const removed = [];
   const unresolved = [];
   let next = graph;
@@ -209,7 +225,9 @@ function pruneOrphans(graph, options = {}) {
     if (node === void 0) return false;
     if (node.workspacePath !== void 0) return false;
     if (preserve.has(id)) return false;
-    return current.in(id).length === 0;
+    if (current.in(id).length > 0) return false;
+    if (hasLivePatchedVariant(current, node)) return false;
+    return true;
   };
   const queue = [];
   if (options.seed !== void 0) {
@@ -244,6 +262,18 @@ function pruneOrphans(graph, options = {}) {
   }
   return { graph: current, removed, unresolved };
 }
+function hasLivePatchedVariant(graph, node) {
+  if (node.patch !== void 0 || node.source !== void 0) return false;
+  for (const id of graph.byName(node.name)) {
+    if (id === node.id) continue;
+    const other = graph.getNode(id);
+    if (other === void 0) continue;
+    if (other.patch === void 0 && other.source === void 0) continue;
+    if (other.version !== node.version) continue;
+    if (serializeNodeId(other.name, other.version, other.peerContext) === node.id) return true;
+  }
+  return false;
+}
 function tarballSharedByOther(graph, removingId, key) {
   for (const id of graph.byName(key.name)) {
     if (id === removingId) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antongolub/lockfile",
-  "version": "0.0.0-snapshot.71",
+  "version": "0.0.0-snapshot.73",
   "private": false,
   "description": "Universal lockfile model and converter for npm, yarn, pnpm, bun",
   "type": "module",