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

package/dist/index.js

@@ -10945,6 +10945,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.72",
   "private": false,
   "description": "Universal lockfile model and converter for npm, yarn, pnpm, bun",
   "type": "module",