@antongolub/lockfile 0.0.0-snapshot.66 → 0.0.0-snapshot.67

package/dist/complete.js

@@ -146,11 +146,14 @@ async function completeTransitives(graph, registry, options = {}) {
     }).graph;
   };
   const frontier = [];
-  for (const root of currentGraph.roots()) {
-    if (!seed.recentlyOrphaned.has(root)) frontier.push(root);
-  }
-  for (const id of seed.recentlyAdded) {
-    if (!seed.recentlyOrphaned.has(id)) frontier.push(id);
+  if (options.seed === void 0) {
+    for (const root of currentGraph.roots()) {
+      if (!seed.recentlyOrphaned.has(root)) frontier.push(root);
+    }
+  } else {
+    for (const id of seed.recentlyAdded) {
+      if (!seed.recentlyOrphaned.has(id)) frontier.push(id);
+    }
   }
   while (frontier.length > 0) {
     const nodeId = frontier.shift();

package/dist/formats/npm-1.js

@@ -791,8 +791,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

package/dist/formats/npm-2.js

@@ -845,8 +845,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

package/dist/formats/npm-3.js

@@ -845,8 +845,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

package/dist/formats/pnpm-v5.js

@@ -811,8 +811,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);
@@ -1313,10 +1312,7 @@ function emitBlockMap(lines, map, depth, sectionKey) {
     if (pair === void 0) continue;
     const [key, value] = pair;
     const emittedKey = emitScalarKey(key);
-    if (isTopSubsection && i > 0) lines.push("");
-    if (isTopSubsection) {
-      if (i === 0) lines.push("");
-    }
+    if (isTopSubsection) lines.push("");
     if (value === void 0 || value === null) {
       lines.push(`${indent}${emittedKey}:`);
       continue;

package/dist/formats/pnpm-v6.js

@@ -870,8 +870,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);
@@ -1537,10 +1536,7 @@ function emitBlockMap(lines, map, depth, sectionKey) {
     if (pair === void 0) continue;
     const [key, value] = pair;
     const emittedKey = emitScalarKey(key);
-    if (isTopSubsection && i > 0) lines.push("");
-    if (isTopSubsection) {
-      if (i === 0) lines.push("");
-    }
+    if (isTopSubsection) lines.push("");
     if (value === void 0 || value === null) {
       lines.push(`${indent}${emittedKey}:`);
       continue;

package/dist/formats/pnpm-v9.js

@@ -870,8 +870,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);
@@ -1537,10 +1536,7 @@ function emitBlockMap(lines, map, depth, sectionKey) {
     if (pair === void 0) continue;
     const [key, value] = pair;
     const emittedKey = emitScalarKey(key);
-    if (isTopSubsection && i > 0) lines.push("");
-    if (isTopSubsection) {
-      if (i === 0) lines.push("");
-    }
+    if (isTopSubsection) lines.push("");
     if (value === void 0 || value === null) {
       lines.push(`${indent}${emittedKey}:`);
       continue;

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

@@ -1168,8 +1168,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

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

@@ -1168,8 +1168,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

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

@@ -1168,8 +1168,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

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

@@ -1168,8 +1168,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

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

@@ -1168,8 +1168,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

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

@@ -1168,8 +1168,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

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

@@ -1168,8 +1168,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

package/dist/formats/yarn-classic.js

@@ -914,8 +914,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);

package/dist/index.d.ts

@@ -21,7 +21,7 @@ type FormatId = 'yarn-berry-v4' | 'yarn-berry-v5' | 'yarn-berry-v6' | 'yarn-berr
 
 type ParseOptions = {
     /**
-     * Filesystem root для adapter parse hooks that read out-of-lockfile
+     * Filesystem root for adapter parse hooks that read out-of-lockfile
      * sources (yarn-berry / pnpm v6 / pnpm v9 patch byte hashing per
      * ADR-0014 §4.F2). Adapters without out-of-lockfile reads ignore it.
      */

package/dist/index.js

@@ -1134,8 +1134,7 @@ function deriveRegistryUrl(name, spec) {
       return registryUrlOf(aliasName, aliasVersion);
     }
   }
-  const ver = spec;
-  return registryUrlOf(name ?? "", ver);
+  return registryUrlOf(name ?? "", spec);
 }
 function looksLikeNpmName(s) {
   return /^(?:@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(s);
@@ -2701,10 +2700,7 @@ function emitBlockMap(lines, map, depth, sectionKey) {
     if (pair === void 0) continue;
     const [key, value] = pair;
     const emittedKey = emitScalarKey(key);
-    if (isTopSubsection && i > 0) lines.push("");
-    if (isTopSubsection) {
-      if (i === 0) lines.push("");
-    }
+    if (isTopSubsection) lines.push("");
     if (value === void 0 || value === null) {
       lines.push(`${indent}${emittedKey}:`);
       continue;
@@ -10349,10 +10345,8 @@ async function applyPatch(graph, spec, patchBytes, _context, options = {}) {
     });
     currentGraph = tarballResult.graph;
     patched.push({ from: node.id, to: newId });
-    if (newId !== node.id) {
-      recentlyAdded.add(newId);
-      recentlyOrphaned.add(node.id);
-    }
+    recentlyAdded.add(newId);
+    recentlyOrphaned.add(node.id);
     emit(appliedDiag);
   }
   if (normalised && patched.length > 0) {
@@ -10484,7 +10478,7 @@ function gcOrphans(graph, nodeId, removed, recentlyOrphaned, emit) {
   if (node === void 0) return graph;
   if (node.workspacePath !== void 0) return graph;
   if (graph.in(nodeId).length > 0) return graph;
-  const outTargets = graph.out(nodeId).map((e) => ({ dst: e.dst, kind: e.kind }));
+  const outTargets = graph.out(nodeId).map((e) => e.dst);
   const removedDiag = modifyNodeRemoved(nodeId);
   graph = graph.mutate((m) => {
     m.removeNode(nodeId);
@@ -10493,7 +10487,7 @@ function gcOrphans(graph, nodeId, removed, recentlyOrphaned, emit) {
   removed.push(nodeId);
   recentlyOrphaned.add(nodeId);
   emit(removedDiag);
-  for (const { dst } of outTargets) {
+  for (const dst of outTargets) {
     graph = gcOrphans(graph, dst, removed, recentlyOrphaned, emit);
   }
   return graph;
@@ -10724,7 +10718,7 @@ function gcOrphans2(graph, nodeId, removed, recentlyOrphaned, emit) {
   if (node === void 0) return graph;
   if (node.workspacePath !== void 0) return graph;
   if (graph.in(nodeId).length > 0) return graph;
-  const outTargets = graph.out(nodeId).map((e) => ({ dst: e.dst, kind: e.kind }));
+  const outTargets = graph.out(nodeId).map((e) => e.dst);
   const removedDiag = modifyNodeRemoved(nodeId);
   graph = graph.mutate((m) => {
     m.removeNode(nodeId);
@@ -10733,7 +10727,7 @@ function gcOrphans2(graph, nodeId, removed, recentlyOrphaned, emit) {
   removed.push(nodeId);
   recentlyOrphaned.add(nodeId);
   emit(removedDiag);
-  for (const { dst } of outTargets) {
+  for (const dst of outTargets) {
     graph = gcOrphans2(graph, dst, removed, recentlyOrphaned, emit);
   }
   return graph;
@@ -10846,6 +10840,14 @@ function optimizeNoop() {
     message: "optimize: no orphans to collect"
   };
 }
+function optimizeNoRoots() {
+  return {
+    code: "OPTIMIZE_NO_ROOTS",
+    severity: "warning",
+    subject: "graph",
+    message: "optimize: no workspace roots or preserve set on a non-empty graph \u2014 kept all nodes to avoid pruning the whole graph"
+  };
+}
 
 // src/main/ts/optimize/optimize.ts
 function optimize(graph, options = {}) {
@@ -10856,10 +10858,20 @@ function optimize(graph, options = {}) {
     const n = graph.getNode(id);
     if ((n == null ? void 0 : n.workspacePath) !== void 0) live.add(id);
   }
+  let hasNodes = false;
   for (const node of graph.nodes()) {
+    hasNodes = true;
     if (node.workspacePath !== void 0) live.add(node.id);
   }
   for (const id of preserve) live.add(id);
+  if (live.size === 0 && hasNodes) {
+    const diag = optimizeNoRoots();
+    const guarded = graph.mutate((m) => {
+      m.diagnostic(diag);
+    }).graph;
+    if (onDiagnostic !== void 0) onDiagnostic(diag);
+    return { graph: guarded, removed: [], unresolved: [diag] };
+  }
   const frontier = Array.from(live);
   while (frontier.length > 0) {
     const cur = frontier.shift();

package/dist/modify.js

@@ -404,10 +404,8 @@ async function applyPatch(graph, spec, patchBytes, _context, options = {}) {
     });
     currentGraph = tarballResult.graph;
     patched.push({ from: node.id, to: newId });
-    if (newId !== node.id) {
-      recentlyAdded.add(newId);
-      recentlyOrphaned.add(node.id);
-    }
+    recentlyAdded.add(newId);
+    recentlyOrphaned.add(node.id);
     emit(appliedDiag);
   }
   if (normalised && patched.length > 0) {
@@ -539,7 +537,7 @@ function gcOrphans(graph, nodeId, removed, recentlyOrphaned, emit) {
   if (node === void 0) return graph;
   if (node.workspacePath !== void 0) return graph;
   if (graph.in(nodeId).length > 0) return graph;
-  const outTargets = graph.out(nodeId).map((e) => ({ dst: e.dst, kind: e.kind }));
+  const outTargets = graph.out(nodeId).map((e) => e.dst);
   const removedDiag = modifyNodeRemoved(nodeId);
   graph = graph.mutate((m) => {
     m.removeNode(nodeId);
@@ -548,7 +546,7 @@ function gcOrphans(graph, nodeId, removed, recentlyOrphaned, emit) {
   removed.push(nodeId);
   recentlyOrphaned.add(nodeId);
   emit(removedDiag);
-  for (const { dst } of outTargets) {
+  for (const dst of outTargets) {
     graph = gcOrphans(graph, dst, removed, recentlyOrphaned, emit);
   }
   return graph;
@@ -779,7 +777,7 @@ function gcOrphans2(graph, nodeId, removed, recentlyOrphaned, emit) {
   if (node === void 0) return graph;
   if (node.workspacePath !== void 0) return graph;
   if (graph.in(nodeId).length > 0) return graph;
-  const outTargets = graph.out(nodeId).map((e) => ({ dst: e.dst, kind: e.kind }));
+  const outTargets = graph.out(nodeId).map((e) => e.dst);
   const removedDiag = modifyNodeRemoved(nodeId);
   graph = graph.mutate((m) => {
     m.removeNode(nodeId);
@@ -788,7 +786,7 @@ function gcOrphans2(graph, nodeId, removed, recentlyOrphaned, emit) {
   removed.push(nodeId);
   recentlyOrphaned.add(nodeId);
   emit(removedDiag);
-  for (const { dst } of outTargets) {
+  for (const dst of outTargets) {
     graph = gcOrphans2(graph, dst, removed, recentlyOrphaned, emit);
   }
   return graph;

package/dist/optimize.d.ts

@@ -1,7 +1,7 @@
 export { O as OptimizeOptions, a as OptimizeResult, o as optimize } from './optimize-B6TOjYyj.js';
 import { D as Diagnostic, N as NodeId } from './graph-CPo-SvS2.js';
 
-type OptimizeDiagnosticCode = 'OPTIMIZE_NODE_REMOVED' | 'OPTIMIZE_WORKSPACE_UNREACHABLE' | 'OPTIMIZE_NOOP';
+type OptimizeDiagnosticCode = 'OPTIMIZE_NODE_REMOVED' | 'OPTIMIZE_WORKSPACE_UNREACHABLE' | 'OPTIMIZE_NOOP' | 'OPTIMIZE_NO_ROOTS';
 interface OptimizeDiagnostic extends Diagnostic {
     code: OptimizeDiagnosticCode;
 }

package/dist/optimize.js

@@ -59,6 +59,14 @@ function optimizeNoop() {
     message: "optimize: no orphans to collect"
   };
 }
+function optimizeNoRoots() {
+  return {
+    code: "OPTIMIZE_NO_ROOTS",
+    severity: "warning",
+    subject: "graph",
+    message: "optimize: no workspace roots or preserve set on a non-empty graph \u2014 kept all nodes to avoid pruning the whole graph"
+  };
+}
 
 // src/main/ts/optimize/optimize.ts
 function optimize(graph, options = {}) {
@@ -69,10 +77,20 @@ function optimize(graph, options = {}) {
     const n = graph.getNode(id);
     if ((n == null ? void 0 : n.workspacePath) !== void 0) live.add(id);
   }
+  let hasNodes = false;
   for (const node of graph.nodes()) {
+    hasNodes = true;
     if (node.workspacePath !== void 0) live.add(node.id);
   }
   for (const id of preserve) live.add(id);
+  if (live.size === 0 && hasNodes) {
+    const diag = optimizeNoRoots();
+    const guarded = graph.mutate((m) => {
+      m.diagnostic(diag);
+    }).graph;
+    if (onDiagnostic !== void 0) onDiagnostic(diag);
+    return { graph: guarded, removed: [], unresolved: [diag] };
+  }
   const frontier = Array.from(live);
   while (frontier.length > 0) {
     const cur = frontier.shift();

package/package.json

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