@antongolub/lockfile 0.0.0-snapshot.58 → 0.0.0-snapshot.59

package/dist/formats/yarn-classic.d.ts

@@ -1,10 +1,18 @@
 import { O as OverrideConstraint, D as Diagnostic, G as Graph } from '../graph-B_G4OKqF.js';
 
+interface UnresolvedDepRef {
+    block: 'dependencies' | 'optionalDependencies';
+    name: string;
+    range: string;
+}
 interface YarnClassicSidecar {
     entrySpecs: Map<string, string[]>;
     /** Per-NodeId verbatim unknown entry-field lines (see YarnClassicEntry.extras),
      *  for round-trip re-emit. */
     entryExtras?: Map<string, string[]>;
+    /** F8 — per-node verbatim refs to dep targets ABSENT from the lock (genuine
+     *  Rung-4 drops). Same-format round-trip fidelity only (see UnresolvedDepRef). */
+    unresolvedDeps?: Map<string, UnresolvedDepRef[]>;
 }
 interface YarnClassicParseOptions {
     overrides?: OverrideConstraint[];

package/dist/formats/yarn-classic.js

@@ -1168,6 +1168,7 @@ function parse2(input, options = {}) {
   const specIndex = /* @__PURE__ */ new Map();
   const sidecar = /* @__PURE__ */ new Map();
   const entryExtras = /* @__PURE__ */ new Map();
+  const unresolvedDeps = /* @__PURE__ */ new Map();
   const unknownFields = /* @__PURE__ */ new Set();
   const entryNodes = [];
   const seenEntries = /* @__PURE__ */ new Map();
@@ -1268,15 +1269,15 @@ function parse2(input, options = {}) {
     manifestsProvided: options.overrides !== void 0
   };
   for (const { node, entry } of entryNodes) {
-    addEdgesFromMap(builder, diagnostics, node.id, entry.dependencies, "dep", specIndex, ladder);
-    addEdgesFromMap(builder, diagnostics, node.id, entry.optionalDependencies, "optional", specIndex, ladder);
+    addEdgesFromMap(builder, diagnostics, node.id, entry.dependencies, "dep", specIndex, ladder, unresolvedDeps);
+    addEdgesFromMap(builder, diagnostics, node.id, entry.optionalDependencies, "optional", specIndex, ladder, unresolvedDeps);
   }
   for (const diagnostic of diagnostics) {
     builder.diagnostic(diagnostic);
   }
   try {
     const graph = builder.seal();
-    const parsedSidecar = { entrySpecs: sidecar, entryExtras };
+    const parsedSidecar = buildSidecar(sidecar, entryExtras, unresolvedDeps);
     rememberSidecar(graph, parsedSidecar);
     return isEmptySidecar(parsedSidecar) ? graph : withSidecarPropagation(graph, parsedSidecar);
   } catch (error) {
@@ -1337,14 +1338,20 @@ function stringify(graph, options = {}) {
     if (extras !== void 0) {
       for (const raw of extras) lines.push(`  ${raw}`);
     }
-    const dependencies = collectDependencyBlockEntries(graph, node.id, emitDiagnostic);
+    const dependencies = withUnresolvedDepRefs(
+      collectDependencyBlockEntries(graph, node.id, emitDiagnostic),
+      unresolvedDepRefsOfNode(emitSidecar, node.id, "dependencies")
+    );
     if (dependencies.length > 0) {
       lines.push("  dependencies:");
       for (const [name, range] of dependencies) {
         lines.push(`    ${quoteDepName(name)} "${escapeQuoted(range)}"`);
       }
     }
-    const optionalDependencies = collectBlockEntries(graph, graph.out(node.id, "optional"), emitDiagnostic);
+    const optionalDependencies = withUnresolvedDepRefs(
+      collectBlockEntries(graph, graph.out(node.id, "optional"), emitDiagnostic),
+      unresolvedDepRefsOfNode(emitSidecar, node.id, "optionalDependencies")
+    );
     if (optionalDependencies.length > 0) {
       lines.push("  optionalDependencies:");
       for (const [name, range] of optionalDependencies) {
@@ -1450,7 +1457,7 @@ function optimize(graph, _options = {}) {
   return { graph: result.graph, diagnostics: result.unresolved };
 }
 function rememberSidecar(graph, sidecar) {
-  if (sidecar.entrySpecs.size === 0 && (sidecar.entryExtras?.size ?? 0) === 0) return;
+  if (isEmptySidecar(sidecar)) return;
   sidecarByGraph.set(graph, sidecar);
 }
 function pruneSidecar(sidecar, graph) {
@@ -1468,23 +1475,38 @@ function pruneSidecar(sidecar, graph) {
       if (reachableIds.has(nodeId)) entryExtras.set(nodeId, extras.slice());
     }
   }
-  return entryExtras !== void 0 ? { entrySpecs, entryExtras } : { entrySpecs };
+  let unresolvedDeps;
+  if (sidecar.unresolvedDeps !== void 0) {
+    unresolvedDeps = /* @__PURE__ */ new Map();
+    for (const [nodeId, refs] of sidecar.unresolvedDeps) {
+      if (reachableIds.has(nodeId)) unresolvedDeps.set(nodeId, refs.map((r) => ({ ...r })));
+    }
+  }
+  return buildSidecar(entrySpecs, entryExtras, unresolvedDeps);
 }
 function remapSidecar(sidecar, nextNodes, graph) {
-  const remap = (m) => {
+  const remap = (m, clone) => {
     const next = /* @__PURE__ */ new Map();
-    for (const [oldId, lines] of m) {
+    for (const [oldId, vals] of m) {
       const nextId = nextNodes.get(oldId)?.id ?? oldId;
-      if (graph.getNode(nextId) !== void 0) next.set(nextId, lines.slice());
+      if (graph.getNode(nextId) !== void 0) next.set(nextId, vals.map(clone));
     }
     return next;
   };
-  const entrySpecs = remap(sidecar.entrySpecs);
-  const entryExtras = sidecar.entryExtras !== void 0 ? remap(sidecar.entryExtras) : void 0;
-  return entryExtras !== void 0 ? { entrySpecs, entryExtras } : { entrySpecs };
+  const identityStr = (s) => s;
+  const entrySpecs = remap(sidecar.entrySpecs, identityStr);
+  const entryExtras = sidecar.entryExtras !== void 0 ? remap(sidecar.entryExtras, identityStr) : void 0;
+  const unresolvedDeps = sidecar.unresolvedDeps !== void 0 ? remap(sidecar.unresolvedDeps, (r) => ({ ...r })) : void 0;
+  return buildSidecar(entrySpecs, entryExtras, unresolvedDeps);
+}
+function buildSidecar(entrySpecs, entryExtras, unresolvedDeps) {
+  const sidecar = { entrySpecs };
+  if (entryExtras !== void 0 && entryExtras.size > 0) sidecar.entryExtras = entryExtras;
+  if (unresolvedDeps !== void 0 && unresolvedDeps.size > 0) sidecar.unresolvedDeps = unresolvedDeps;
+  return sidecar;
 }
 function isEmptySidecar(sidecar) {
-  return sidecar.entrySpecs.size === 0 && (sidecar.entryExtras?.size ?? 0) === 0;
+  return sidecar.entrySpecs.size === 0 && (sidecar.entryExtras?.size ?? 0) === 0 && (sidecar.unresolvedDeps?.size ?? 0) === 0;
 }
 function withSidecarPropagation(graph, sidecar) {
   const proxy = {
@@ -1745,7 +1767,7 @@ function isClassicRegistryRange(range) {
   if (colonIdx <= 0) return true;
   return !/^[a-z][a-z0-9+.-]*$/i.test(range.slice(0, colonIdx));
 }
-function addEdgesFromMap(builder, diagnostics, srcId, deps, kind, specIndex, ladder) {
+function addEdgesFromMap(builder, diagnostics, srcId, deps, kind, specIndex, ladder, unresolvedDeps) {
   for (const [name, range] of Array.from(deps.entries()).sort((a, b) => cmpUtf16(a[0], b[0]))) {
     let dstId = specIndex.get(`${name}@${range}`);
     if (dstId === void 0 && ladder.overrides.length > 0) {
@@ -1786,6 +1808,15 @@ function addEdgesFromMap(builder, diagnostics, srcId, deps, kind, specIndex, lad
       if (!ladder.manifestsProvided && isClassicRegistryRange(range) && (ladder.candidatesByName.get(name)?.length ?? 0) > 0) {
         diagnostics.push(resolutionPinUnresolvedDiagnostic("YARN_CLASSIC", srcId, name, range));
       }
+      if (unresolvedDeps !== void 0) {
+        const refs = unresolvedDeps.get(srcId) ?? [];
+        refs.push({
+          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          name,
+          range
+        });
+        unresolvedDeps.set(srcId, refs);
+      }
       continue;
     }
     const dstName = nameOf(dstId);
@@ -1985,6 +2016,18 @@ function collectBlockEntries(graph, edges, emitDiagnostic) {
     return [edge.attrs.alias ?? dst.name, edge.attrs.range];
   }).filter((entry) => entry !== void 0).sort((a, b) => cmpUtf16(a[0], b[0]));
 }
+function unresolvedDepRefsOfNode(sidecar, nodeId, block) {
+  const refs = sidecar?.unresolvedDeps?.get(nodeId);
+  return refs === void 0 ? [] : refs.filter((ref) => ref.block === block);
+}
+function withUnresolvedDepRefs(liveBlock, refs) {
+  if (refs.length === 0) return liveBlock;
+  const byName = new Map(liveBlock);
+  for (const ref of refs) {
+    if (!byName.has(ref.name)) byName.set(ref.name, ref.range);
+  }
+  return Array.from(byName.entries()).sort((a, b) => cmpUtf16(a[0], b[0]));
+}
 function warnDroppedPeerEdges(graph, srcId, warned, emitDiagnostic) {
   for (const edge of graph.out(srcId, "peer")) {
     const key = `${edge.src}\0${edge.dst}\0${edge.attrs?.range ?? ""}`;

package/dist/index.js

@@ -7622,6 +7622,7 @@ function parse17(input, options = {}) {
   const specIndex = /* @__PURE__ */ new Map();
   const sidecar = /* @__PURE__ */ new Map();
   const entryExtras = /* @__PURE__ */ new Map();
+  const unresolvedDeps = /* @__PURE__ */ new Map();
   const unknownFields = /* @__PURE__ */ new Set();
   const entryNodes = [];
   const seenEntries = /* @__PURE__ */ new Map();
@@ -7722,15 +7723,15 @@ function parse17(input, options = {}) {
     manifestsProvided: options.overrides !== void 0
   };
   for (const { node, entry } of entryNodes) {
-    addEdgesFromMap(builder, diagnostics, node.id, entry.dependencies, "dep", specIndex, ladder);
-    addEdgesFromMap(builder, diagnostics, node.id, entry.optionalDependencies, "optional", specIndex, ladder);
+    addEdgesFromMap(builder, diagnostics, node.id, entry.dependencies, "dep", specIndex, ladder, unresolvedDeps);
+    addEdgesFromMap(builder, diagnostics, node.id, entry.optionalDependencies, "optional", specIndex, ladder, unresolvedDeps);
   }
   for (const diagnostic of diagnostics) {
     builder.diagnostic(diagnostic);
   }
   try {
     const graph = builder.seal();
-    const parsedSidecar = { entrySpecs: sidecar, entryExtras };
+    const parsedSidecar = buildSidecar(sidecar, entryExtras, unresolvedDeps);
     rememberSidecar6(graph, parsedSidecar);
     return isEmptySidecar2(parsedSidecar) ? graph : withSidecarPropagation2(graph, parsedSidecar);
   } catch (error) {
@@ -7791,14 +7792,20 @@ function stringify16(graph, options = {}) {
     if (extras !== void 0) {
       for (const raw of extras) lines.push(`  ${raw}`);
     }
-    const dependencies = collectDependencyBlockEntries(graph, node.id, emitDiagnostic);
+    const dependencies = withUnresolvedDepRefs2(
+      collectDependencyBlockEntries(graph, node.id, emitDiagnostic),
+      unresolvedDepRefsOfNode2(emitSidecar, node.id, "dependencies")
+    );
     if (dependencies.length > 0) {
       lines.push("  dependencies:");
       for (const [name, range] of dependencies) {
         lines.push(`    ${quoteDepName(name)} "${escapeQuoted2(range)}"`);
       }
     }
-    const optionalDependencies = collectBlockEntries(graph, graph.out(node.id, "optional"), emitDiagnostic);
+    const optionalDependencies = withUnresolvedDepRefs2(
+      collectBlockEntries(graph, graph.out(node.id, "optional"), emitDiagnostic),
+      unresolvedDepRefsOfNode2(emitSidecar, node.id, "optionalDependencies")
+    );
     if (optionalDependencies.length > 0) {
       lines.push("  optionalDependencies:");
       for (const [name, range] of optionalDependencies) {
@@ -7816,24 +7823,32 @@ function stringify16(graph, options = {}) {
   return output;
 }
 function rememberSidecar6(graph, sidecar) {
-  if (sidecar.entrySpecs.size === 0 && (sidecar.entryExtras?.size ?? 0) === 0) return;
+  if (isEmptySidecar2(sidecar)) return;
   sidecarByGraph7.set(graph, sidecar);
 }
 function remapSidecar2(sidecar, nextNodes, graph) {
-  const remap = (m) => {
+  const remap = (m, clone2) => {
     const next = /* @__PURE__ */ new Map();
-    for (const [oldId, lines] of m) {
+    for (const [oldId, vals] of m) {
       const nextId = nextNodes.get(oldId)?.id ?? oldId;
-      if (graph.getNode(nextId) !== void 0) next.set(nextId, lines.slice());
+      if (graph.getNode(nextId) !== void 0) next.set(nextId, vals.map(clone2));
     }
     return next;
   };
-  const entrySpecs = remap(sidecar.entrySpecs);
-  const entryExtras = sidecar.entryExtras !== void 0 ? remap(sidecar.entryExtras) : void 0;
-  return entryExtras !== void 0 ? { entrySpecs, entryExtras } : { entrySpecs };
+  const identityStr = (s) => s;
+  const entrySpecs = remap(sidecar.entrySpecs, identityStr);
+  const entryExtras = sidecar.entryExtras !== void 0 ? remap(sidecar.entryExtras, identityStr) : void 0;
+  const unresolvedDeps = sidecar.unresolvedDeps !== void 0 ? remap(sidecar.unresolvedDeps, (r) => ({ ...r })) : void 0;
+  return buildSidecar(entrySpecs, entryExtras, unresolvedDeps);
+}
+function buildSidecar(entrySpecs, entryExtras, unresolvedDeps) {
+  const sidecar = { entrySpecs };
+  if (entryExtras !== void 0 && entryExtras.size > 0) sidecar.entryExtras = entryExtras;
+  if (unresolvedDeps !== void 0 && unresolvedDeps.size > 0) sidecar.unresolvedDeps = unresolvedDeps;
+  return sidecar;
 }
 function isEmptySidecar2(sidecar) {
-  return sidecar.entrySpecs.size === 0 && (sidecar.entryExtras?.size ?? 0) === 0;
+  return sidecar.entrySpecs.size === 0 && (sidecar.entryExtras?.size ?? 0) === 0 && (sidecar.unresolvedDeps?.size ?? 0) === 0;
 }
 function withSidecarPropagation2(graph, sidecar) {
   const proxy = {
@@ -8094,7 +8109,7 @@ function isClassicRegistryRange(range) {
   if (colonIdx <= 0) return true;
   return !/^[a-z][a-z0-9+.-]*$/i.test(range.slice(0, colonIdx));
 }
-function addEdgesFromMap(builder, diagnostics, srcId, deps, kind, specIndex, ladder) {
+function addEdgesFromMap(builder, diagnostics, srcId, deps, kind, specIndex, ladder, unresolvedDeps) {
   for (const [name, range] of Array.from(deps.entries()).sort((a, b) => cmpUtf16(a[0], b[0]))) {
     let dstId = specIndex.get(`${name}@${range}`);
     if (dstId === void 0 && ladder.overrides.length > 0) {
@@ -8135,6 +8150,15 @@ function addEdgesFromMap(builder, diagnostics, srcId, deps, kind, specIndex, lad
       if (!ladder.manifestsProvided && isClassicRegistryRange(range) && (ladder.candidatesByName.get(name)?.length ?? 0) > 0) {
         diagnostics.push(resolutionPinUnresolvedDiagnostic("YARN_CLASSIC", srcId, name, range));
       }
+      if (unresolvedDeps !== void 0) {
+        const refs = unresolvedDeps.get(srcId) ?? [];
+        refs.push({
+          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          name,
+          range
+        });
+        unresolvedDeps.set(srcId, refs);
+      }
       continue;
     }
     const dstName = nameOf(dstId);
@@ -8201,6 +8225,18 @@ function collectBlockEntries(graph, edges, emitDiagnostic) {
     return [edge.attrs.alias ?? dst.name, edge.attrs.range];
   }).filter((entry) => entry !== void 0).sort((a, b) => cmpUtf16(a[0], b[0]));
 }
+function unresolvedDepRefsOfNode2(sidecar, nodeId, block) {
+  const refs = sidecar?.unresolvedDeps?.get(nodeId);
+  return refs === void 0 ? [] : refs.filter((ref) => ref.block === block);
+}
+function withUnresolvedDepRefs2(liveBlock, refs) {
+  if (refs.length === 0) return liveBlock;
+  const byName = new Map(liveBlock);
+  for (const ref of refs) {
+    if (!byName.has(ref.name)) byName.set(ref.name, ref.range);
+  }
+  return Array.from(byName.entries()).sort((a, b) => cmpUtf16(a[0], b[0]));
+}
 function warnDroppedPeerEdges(graph, srcId, warned, emitDiagnostic) {
   for (const edge of graph.out(srcId, "peer")) {
     const key = `${edge.src}\0${edge.dst}\0${edge.attrs?.range ?? ""}`;

package/package.json

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