@antongolub/lockfile 0.0.0-snapshot.68 → 0.0.0-snapshot.69

package/dist/complete.js

@@ -58,6 +58,25 @@ function resolveFindUp(graph, consumerId, name, range, depKind) {
   }
   return void 0;
 }
+function bestExistingSatisfying(graph, name, range) {
+  const candidates = [];
+  for (const id of graph.byName(name)) {
+    const node = graph.getNode(id);
+    if (node === void 0) continue;
+    if (node.peerContext.length > 0) continue;
+    if (node.patch !== void 0) continue;
+    if (node.source !== void 0) continue;
+    if (node.workspacePath !== void 0) continue;
+    if (safeSatisfies(node.version, range)) candidates.push(node);
+  }
+  if (candidates.length === 0) return void 0;
+  candidates.sort((a, b) => {
+    const v = semverRcompareSafe(a.version, b.version);
+    if (v !== 0) return v;
+    return cmpStr2(a.id, b.id);
+  });
+  return candidates[0].id;
+}
 function safeSatisfies(version, range) {
   try {
     return semver.satisfies(version, range);
@@ -212,6 +231,22 @@ async function completeTransitives(graph, registry, options = {}) {
           if (!visited.has(targetId)) frontier.push(targetId);
           continue;
         }
+        if (kind !== "peer") {
+          const reuseId = bestExistingSatisfying(currentGraph, depName, depRange);
+          if (reuseId !== void 0 && reuseId !== nodeId) {
+            const triple2 = { src: nodeId, dst: reuseId, kind };
+            const resolvedDiag = completionEdgeResolved(triple2);
+            const result2 = currentGraph.mutate((m) => {
+              m.addEdge(nodeId, reuseId, kind, { range: depRange });
+              m.diagnostic(resolvedDiag);
+            });
+            currentGraph = result2.graph;
+            wired.push(triple2);
+            emit(resolvedDiag);
+            if (!visited.has(reuseId)) frontier.push(reuseId);
+            continue;
+          }
+        }
         const resolved = await registry.resolve(depName, depRange);
         if (resolved === void 0) {
           if (kind === "peer") {

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

@@ -2490,7 +2490,7 @@ function withUnresolvedDepRefs(liveBlock, refs) {
 function emittedRangeOfEdge(kind, range, config, aliased = false) {
   if (kind === "peer") return range;
   if (aliased) return range;
-  return range;
+  return entryKeyRangeOf(range);
 }
 var DEFAULT_CACHEKEY_V8_V9 = "10c0";
 function checksumOfPayload(payload, config, cacheKey, nodeId, emitDiagnostic) {

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

@@ -2490,7 +2490,7 @@ function withUnresolvedDepRefs(liveBlock, refs) {
 function emittedRangeOfEdge(kind, range, config, aliased = false) {
   if (kind === "peer") return range;
   if (aliased) return range;
-  return range;
+  return entryKeyRangeOf(range);
 }
 function checksumOfPayload(payload, config, cacheKey, nodeId, emitDiagnostic) {
   const integrity = payload == null ? void 0 : payload.integrity;

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

@@ -2490,7 +2490,7 @@ function withUnresolvedDepRefs(liveBlock, refs) {
 function emittedRangeOfEdge(kind, range, config, aliased = false) {
   if (kind === "peer") return range;
   if (aliased) return range;
-  return range;
+  return entryKeyRangeOf(range);
 }
 var DEFAULT_CACHEKEY_V8_V9 = "10c0";
 function checksumOfPayload(payload, config, cacheKey, nodeId, emitDiagnostic) {

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

@@ -2490,7 +2490,7 @@ function withUnresolvedDepRefs(liveBlock, refs) {
 function emittedRangeOfEdge(kind, range, config, aliased = false) {
   if (kind === "peer") return range;
   if (aliased) return range;
-  return range;
+  return entryKeyRangeOf(range);
 }
 var DEFAULT_CACHEKEY_V8_V9 = "10c0";
 function checksumOfPayload(payload, config, cacheKey, nodeId, emitDiagnostic) {

package/dist/index.js

@@ -7111,7 +7111,7 @@ function withUnresolvedDepRefs(liveBlock, refs) {
 function emittedRangeOfEdge(kind, range, config, aliased = false) {
   if (kind === "peer") return range;
   if (aliased) return range;
-  if (config.rangeEmit !== "bare") return range;
+  if (config.rangeEmit !== "bare") return entryKeyRangeOf(range);
   return range.startsWith("npm:") ? range.slice("npm:".length) : range;
 }
 var DEFAULT_CACHEKEY_V8_V9 = "10c0";
@@ -10564,6 +10564,12 @@ async function replaceVersion(graph, selector, toRange, context, options = {}) {
       currentGraph = currentGraph.mutate((m) => {
         m.setTarball({ name: target.name, version: target.version, patch: node.patch }, payload);
       }).graph;
+      const staleOut = [...currentGraph.out(targetId)].filter((e) => e.kind === "dep" || e.kind === "optional");
+      if (staleOut.length > 0) {
+        currentGraph = currentGraph.mutate((m) => {
+          for (const e of staleOut) m.removeEdge(targetId, e.dst, e.kind);
+        }).graph;
+      }
       replaced.push({ from: node.id, to: targetId });
       recentlyAdded.add(targetId);
       added.push(targetId);

package/dist/modify.js

@@ -623,6 +623,12 @@ async function replaceVersion(graph, selector, toRange, context, options = {}) {
       currentGraph = currentGraph.mutate((m) => {
         m.setTarball({ name: target.name, version: target.version, patch: node.patch }, payload);
       }).graph;
+      const staleOut = [...currentGraph.out(targetId)].filter((e) => e.kind === "dep" || e.kind === "optional");
+      if (staleOut.length > 0) {
+        currentGraph = currentGraph.mutate((m) => {
+          for (const e of staleOut) m.removeEdge(targetId, e.dst, e.kind);
+        }).graph;
+      }
       replaced.push({ from: node.id, to: targetId });
       recentlyAdded.add(targetId);
       added.push(targetId);

package/package.json

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