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

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

@@ -1823,7 +1823,9 @@ function parseFamily(input, options, config) {
     const srcId = entryIds.get(key);
     if (srcId === void 0) continue;
     const srcResolution = asString(value["resolution"]);
-    addEdgesFromBlock(builder, srcId, asMap(value["dependencies"]), "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    const { regular, optional } = splitOptionalDeps(asMap(value["dependencies"]), rawDependenciesMeta.get(srcId));
+    addEdgesFromBlock(builder, srcId, regular, "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    addEdgesFromBlock(builder, srcId, optional, "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
     addEdgesFromBlock(builder, srcId, asMap(value["optionalDependencies"]), "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
   }
   diagnostics.sort((a, b) => {
@@ -2180,6 +2182,27 @@ function rawDependenciesMetaBlockOfNode(graph, nodeId) {
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.dependenciesMeta) == null ? void 0 : _b.get(nodeId);
   return block === void 0 ? void 0 : coerceSymlMap(block);
 }
+function dependenciesMetaWithOptional(graph, node, verbatim) {
+  var _a;
+  const optionalNames = [];
+  for (const edge of graph.out(node.id, "optional")) {
+    const dst = graph.getNode(edge.dst);
+    if (dst === void 0) continue;
+    optionalNames.push(((_a = edge.attrs) == null ? void 0 : _a.alias) ?? dst.name);
+  }
+  if (optionalNames.length === 0) return verbatim;
+  const merged = {};
+  if (verbatim !== void 0) {
+    for (const [name, meta] of Object.entries(verbatim)) merged[name] = meta;
+  }
+  for (const name of optionalNames) {
+    if (name in merged) continue;
+    merged[name] = { optional: "true" };
+  }
+  const sorted = {};
+  for (const name of Object.keys(merged).sort(cmpStr3)) sorted[name] = merged[name];
+  return sorted;
+}
 function rawPeerDependenciesMetaBlockOfNode(graph, nodeId) {
   var _a, _b;
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.peerDependenciesMeta) == null ? void 0 : _b.get(nodeId);
@@ -2356,18 +2379,17 @@ function entryOfNode(graph, node, config, emitDiagnostic, cacheKey) {
     resolution: resolutionOfNode(node, payload == null ? void 0 : payload.resolution, payload == null ? void 0 : payload.nativeResolution, emitDiagnostic)
   };
   const dependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["dep", "dev"], config),
+    edgeBlockOfKinds(graph, node, ["dep", "dev", "optional"], config),
     unresolvedDepRefsOfNode(graph, node.id, "dependencies")
   );
   if (dependencies !== void 0) entry["dependencies"] = dependencies;
-  const optionalDependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["optional"], config),
-    unresolvedDepRefsOfNode(graph, node.id, "optionalDependencies")
-  );
-  if (optionalDependencies !== void 0) entry["optionalDependencies"] = optionalDependencies;
   const peerDependencies = extraBlockOfNode(node, "peerDependencies") ?? rawPeerDependenciesBlockOfNode(graph, node.id) ?? edgeBlockOfKinds(graph, node, ["peer"], config, { skipMissingRange: true });
   if (peerDependencies !== void 0) entry["peerDependencies"] = peerDependencies;
-  const dependenciesMeta = rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta");
+  const dependenciesMeta = dependenciesMetaWithOptional(
+    graph,
+    node,
+    rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta")
+  );
   if (dependenciesMeta !== void 0) entry["dependenciesMeta"] = dependenciesMeta;
   const peerDependenciesMeta = peerDependenciesMetaOfNode(graph, node);
   if (peerDependenciesMeta !== void 0) entry["peerDependenciesMeta"] = peerDependenciesMeta;
@@ -2436,7 +2458,7 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
   const edges = kinds.flatMap((kind) => graph.out(node.id, kind));
   if (edges.length === 0) return void 0;
   const blockEntries = [];
-  const seen = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Map();
   for (const edge of edges) {
     const dst = graph.getNode(edge.dst);
     if (dst === void 0) {
@@ -2456,13 +2478,15 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
     }
     const aliased = edge.attrs.alias !== void 0;
     const depName = aliased ? edge.attrs.alias : dst.name;
-    if (seen.has(depName)) {
+    const prior = seen.get(depName);
+    if (prior !== void 0) {
+      if (prior === edge.dst) continue;
       throw new LockfileError({
         code: "INVARIANT_VIOLATION",
-        message: `cannot emit duplicate ${edge.kind} dependency key ${depName} from ${node.id}`
+        message: `cannot emit duplicate dependency key ${depName} from ${node.id} (targets ${prior} and ${edge.dst})`
       });
     }
-    seen.add(depName);
+    seen.set(depName, edge.dst);
     blockEntries.push([depName, emittedRangeOfEdge(edge.kind, edge.attrs.range, config, aliased)]);
   }
   if (blockEntries.length === 0) return void 0;
@@ -2836,6 +2860,22 @@ function isRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   return !hasExplicitProtocol(range);
 }
+function splitOptionalDeps(deps, meta) {
+  if (deps === void 0) return { regular: void 0, optional: void 0 };
+  if (meta === void 0) return { regular: deps, optional: void 0 };
+  let regular;
+  let optional;
+  for (const [name, range] of Object.entries(deps)) {
+    if (isOptionalDepFlag(meta, name)) (optional ?? (optional = {}))[name] = range;
+    else (regular ?? (regular = {}))[name] = range;
+  }
+  return { regular, optional };
+}
+function isOptionalDepFlag(meta, name) {
+  const entry = meta[name];
+  if (entry === void 0 || typeof entry === "string") return false;
+  return entry["optional"] === "true";
+}
 function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIndex, diagnostics, ladder, srcResolution, unresolvedDeps) {
   var _a;
   if (!block) return;
@@ -2926,7 +2966,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
       if (unresolvedDeps !== void 0 && (kind === "dep" || kind === "optional")) {
         const refs = unresolvedDeps.get(srcId) ?? [];
         refs.push({
-          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          block: "dependencies",
           name: depName,
           range: depRange
         });

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

@@ -1823,7 +1823,9 @@ function parseFamily(input, options, config) {
     const srcId = entryIds.get(key);
     if (srcId === void 0) continue;
     const srcResolution = asString(value["resolution"]);
-    addEdgesFromBlock(builder, srcId, asMap(value["dependencies"]), "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    const { regular, optional } = splitOptionalDeps(asMap(value["dependencies"]), rawDependenciesMeta.get(srcId));
+    addEdgesFromBlock(builder, srcId, regular, "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    addEdgesFromBlock(builder, srcId, optional, "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
     addEdgesFromBlock(builder, srcId, asMap(value["optionalDependencies"]), "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
   }
   diagnostics.sort((a, b) => {
@@ -2180,6 +2182,27 @@ function rawDependenciesMetaBlockOfNode(graph, nodeId) {
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.dependenciesMeta) == null ? void 0 : _b.get(nodeId);
   return block === void 0 ? void 0 : coerceSymlMap(block);
 }
+function dependenciesMetaWithOptional(graph, node, verbatim) {
+  var _a;
+  const optionalNames = [];
+  for (const edge of graph.out(node.id, "optional")) {
+    const dst = graph.getNode(edge.dst);
+    if (dst === void 0) continue;
+    optionalNames.push(((_a = edge.attrs) == null ? void 0 : _a.alias) ?? dst.name);
+  }
+  if (optionalNames.length === 0) return verbatim;
+  const merged = {};
+  if (verbatim !== void 0) {
+    for (const [name, meta] of Object.entries(verbatim)) merged[name] = meta;
+  }
+  for (const name of optionalNames) {
+    if (name in merged) continue;
+    merged[name] = { optional: "true" };
+  }
+  const sorted = {};
+  for (const name of Object.keys(merged).sort(cmpStr3)) sorted[name] = merged[name];
+  return sorted;
+}
 function rawPeerDependenciesMetaBlockOfNode(graph, nodeId) {
   var _a, _b;
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.peerDependenciesMeta) == null ? void 0 : _b.get(nodeId);
@@ -2356,18 +2379,17 @@ function entryOfNode(graph, node, config, emitDiagnostic, cacheKey) {
     resolution: resolutionOfNode(node, payload == null ? void 0 : payload.resolution, payload == null ? void 0 : payload.nativeResolution, emitDiagnostic)
   };
   const dependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["dep", "dev"], config),
+    edgeBlockOfKinds(graph, node, ["dep", "dev", "optional"], config),
     unresolvedDepRefsOfNode(graph, node.id, "dependencies")
   );
   if (dependencies !== void 0) entry["dependencies"] = dependencies;
-  const optionalDependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["optional"], config),
-    unresolvedDepRefsOfNode(graph, node.id, "optionalDependencies")
-  );
-  if (optionalDependencies !== void 0) entry["optionalDependencies"] = optionalDependencies;
   const peerDependencies = extraBlockOfNode(node, "peerDependencies") ?? rawPeerDependenciesBlockOfNode(graph, node.id) ?? edgeBlockOfKinds(graph, node, ["peer"], config, { skipMissingRange: true });
   if (peerDependencies !== void 0) entry["peerDependencies"] = peerDependencies;
-  const dependenciesMeta = rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta");
+  const dependenciesMeta = dependenciesMetaWithOptional(
+    graph,
+    node,
+    rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta")
+  );
   if (dependenciesMeta !== void 0) entry["dependenciesMeta"] = dependenciesMeta;
   const peerDependenciesMeta = peerDependenciesMetaOfNode(graph, node);
   if (peerDependenciesMeta !== void 0) entry["peerDependenciesMeta"] = peerDependenciesMeta;
@@ -2441,7 +2463,7 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
   const edges = kinds.flatMap((kind) => graph.out(node.id, kind));
   if (edges.length === 0) return void 0;
   const blockEntries = [];
-  const seen = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Map();
   for (const edge of edges) {
     const dst = graph.getNode(edge.dst);
     if (dst === void 0) {
@@ -2461,13 +2483,15 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
     }
     const aliased = edge.attrs.alias !== void 0;
     const depName = aliased ? edge.attrs.alias : dst.name;
-    if (seen.has(depName)) {
+    const prior = seen.get(depName);
+    if (prior !== void 0) {
+      if (prior === edge.dst) continue;
       throw new LockfileError({
         code: "INVARIANT_VIOLATION",
-        message: `cannot emit duplicate ${edge.kind} dependency key ${depName} from ${node.id}`
+        message: `cannot emit duplicate dependency key ${depName} from ${node.id} (targets ${prior} and ${edge.dst})`
       });
     }
-    seen.add(depName);
+    seen.set(depName, edge.dst);
     blockEntries.push([depName, emittedRangeOfEdge(edge.kind, edge.attrs.range, config, aliased)]);
   }
   if (blockEntries.length === 0) return void 0;
@@ -2840,6 +2864,22 @@ function isRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   return !hasExplicitProtocol(range);
 }
+function splitOptionalDeps(deps, meta) {
+  if (deps === void 0) return { regular: void 0, optional: void 0 };
+  if (meta === void 0) return { regular: deps, optional: void 0 };
+  let regular;
+  let optional;
+  for (const [name, range] of Object.entries(deps)) {
+    if (isOptionalDepFlag(meta, name)) (optional ?? (optional = {}))[name] = range;
+    else (regular ?? (regular = {}))[name] = range;
+  }
+  return { regular, optional };
+}
+function isOptionalDepFlag(meta, name) {
+  const entry = meta[name];
+  if (entry === void 0 || typeof entry === "string") return false;
+  return entry["optional"] === "true";
+}
 function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIndex, diagnostics, ladder, srcResolution, unresolvedDeps) {
   var _a;
   if (!block) return;
@@ -2930,7 +2970,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
       if (unresolvedDeps !== void 0 && (kind === "dep" || kind === "optional")) {
         const refs = unresolvedDeps.get(srcId) ?? [];
         refs.push({
-          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          block: "dependencies",
           name: depName,
           range: depRange
         });

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

@@ -1823,7 +1823,9 @@ function parseFamily(input, options, config) {
     const srcId = entryIds.get(key);
     if (srcId === void 0) continue;
     const srcResolution = asString(value["resolution"]);
-    addEdgesFromBlock(builder, srcId, asMap(value["dependencies"]), "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    const { regular, optional } = splitOptionalDeps(asMap(value["dependencies"]), rawDependenciesMeta.get(srcId));
+    addEdgesFromBlock(builder, srcId, regular, "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    addEdgesFromBlock(builder, srcId, optional, "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
     addEdgesFromBlock(builder, srcId, asMap(value["optionalDependencies"]), "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
   }
   diagnostics.sort((a, b) => {
@@ -2180,6 +2182,27 @@ function rawDependenciesMetaBlockOfNode(graph, nodeId) {
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.dependenciesMeta) == null ? void 0 : _b.get(nodeId);
   return block === void 0 ? void 0 : coerceSymlMap(block);
 }
+function dependenciesMetaWithOptional(graph, node, verbatim) {
+  var _a;
+  const optionalNames = [];
+  for (const edge of graph.out(node.id, "optional")) {
+    const dst = graph.getNode(edge.dst);
+    if (dst === void 0) continue;
+    optionalNames.push(((_a = edge.attrs) == null ? void 0 : _a.alias) ?? dst.name);
+  }
+  if (optionalNames.length === 0) return verbatim;
+  const merged = {};
+  if (verbatim !== void 0) {
+    for (const [name, meta] of Object.entries(verbatim)) merged[name] = meta;
+  }
+  for (const name of optionalNames) {
+    if (name in merged) continue;
+    merged[name] = { optional: "true" };
+  }
+  const sorted = {};
+  for (const name of Object.keys(merged).sort(cmpStr3)) sorted[name] = merged[name];
+  return sorted;
+}
 function rawPeerDependenciesMetaBlockOfNode(graph, nodeId) {
   var _a, _b;
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.peerDependenciesMeta) == null ? void 0 : _b.get(nodeId);
@@ -2356,18 +2379,17 @@ function entryOfNode(graph, node, config, emitDiagnostic, cacheKey) {
     resolution: resolutionOfNode(node, payload == null ? void 0 : payload.resolution, payload == null ? void 0 : payload.nativeResolution, emitDiagnostic)
   };
   const dependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["dep", "dev"], config),
+    edgeBlockOfKinds(graph, node, ["dep", "dev", "optional"], config),
     unresolvedDepRefsOfNode(graph, node.id, "dependencies")
   );
   if (dependencies !== void 0) entry["dependencies"] = dependencies;
-  const optionalDependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["optional"], config),
-    unresolvedDepRefsOfNode(graph, node.id, "optionalDependencies")
-  );
-  if (optionalDependencies !== void 0) entry["optionalDependencies"] = optionalDependencies;
   const peerDependencies = extraBlockOfNode(node, "peerDependencies") ?? rawPeerDependenciesBlockOfNode(graph, node.id) ?? edgeBlockOfKinds(graph, node, ["peer"], config, { skipMissingRange: true });
   if (peerDependencies !== void 0) entry["peerDependencies"] = peerDependencies;
-  const dependenciesMeta = rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta");
+  const dependenciesMeta = dependenciesMetaWithOptional(
+    graph,
+    node,
+    rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta")
+  );
   if (dependenciesMeta !== void 0) entry["dependenciesMeta"] = dependenciesMeta;
   const peerDependenciesMeta = peerDependenciesMetaOfNode(graph, node);
   if (peerDependenciesMeta !== void 0) entry["peerDependenciesMeta"] = peerDependenciesMeta;
@@ -2436,7 +2458,7 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
   const edges = kinds.flatMap((kind) => graph.out(node.id, kind));
   if (edges.length === 0) return void 0;
   const blockEntries = [];
-  const seen = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Map();
   for (const edge of edges) {
     const dst = graph.getNode(edge.dst);
     if (dst === void 0) {
@@ -2456,13 +2478,15 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
     }
     const aliased = edge.attrs.alias !== void 0;
     const depName = aliased ? edge.attrs.alias : dst.name;
-    if (seen.has(depName)) {
+    const prior = seen.get(depName);
+    if (prior !== void 0) {
+      if (prior === edge.dst) continue;
       throw new LockfileError({
         code: "INVARIANT_VIOLATION",
-        message: `cannot emit duplicate ${edge.kind} dependency key ${depName} from ${node.id}`
+        message: `cannot emit duplicate dependency key ${depName} from ${node.id} (targets ${prior} and ${edge.dst})`
       });
     }
-    seen.add(depName);
+    seen.set(depName, edge.dst);
     blockEntries.push([depName, emittedRangeOfEdge(edge.kind, edge.attrs.range, config, aliased)]);
   }
   if (blockEntries.length === 0) return void 0;
@@ -2835,6 +2859,22 @@ function isRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   return !hasExplicitProtocol(range);
 }
+function splitOptionalDeps(deps, meta) {
+  if (deps === void 0) return { regular: void 0, optional: void 0 };
+  if (meta === void 0) return { regular: deps, optional: void 0 };
+  let regular;
+  let optional;
+  for (const [name, range] of Object.entries(deps)) {
+    if (isOptionalDepFlag(meta, name)) (optional ?? (optional = {}))[name] = range;
+    else (regular ?? (regular = {}))[name] = range;
+  }
+  return { regular, optional };
+}
+function isOptionalDepFlag(meta, name) {
+  const entry = meta[name];
+  if (entry === void 0 || typeof entry === "string") return false;
+  return entry["optional"] === "true";
+}
 function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIndex, diagnostics, ladder, srcResolution, unresolvedDeps) {
   var _a;
   if (!block) return;
@@ -2925,7 +2965,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
       if (unresolvedDeps !== void 0 && (kind === "dep" || kind === "optional")) {
         const refs = unresolvedDeps.get(srcId) ?? [];
         refs.push({
-          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          block: "dependencies",
           name: depName,
           range: depRange
         });

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

@@ -1823,7 +1823,9 @@ function parseFamily(input, options, config) {
     const srcId = entryIds.get(key);
     if (srcId === void 0) continue;
     const srcResolution = asString(value["resolution"]);
-    addEdgesFromBlock(builder, srcId, asMap(value["dependencies"]), "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    const { regular, optional } = splitOptionalDeps(asMap(value["dependencies"]), rawDependenciesMeta.get(srcId));
+    addEdgesFromBlock(builder, srcId, regular, "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    addEdgesFromBlock(builder, srcId, optional, "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
     addEdgesFromBlock(builder, srcId, asMap(value["optionalDependencies"]), "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
   }
   diagnostics.sort((a, b) => {
@@ -2180,6 +2182,27 @@ function rawDependenciesMetaBlockOfNode(graph, nodeId) {
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.dependenciesMeta) == null ? void 0 : _b.get(nodeId);
   return block === void 0 ? void 0 : coerceSymlMap(block);
 }
+function dependenciesMetaWithOptional(graph, node, verbatim) {
+  var _a;
+  const optionalNames = [];
+  for (const edge of graph.out(node.id, "optional")) {
+    const dst = graph.getNode(edge.dst);
+    if (dst === void 0) continue;
+    optionalNames.push(((_a = edge.attrs) == null ? void 0 : _a.alias) ?? dst.name);
+  }
+  if (optionalNames.length === 0) return verbatim;
+  const merged = {};
+  if (verbatim !== void 0) {
+    for (const [name, meta] of Object.entries(verbatim)) merged[name] = meta;
+  }
+  for (const name of optionalNames) {
+    if (name in merged) continue;
+    merged[name] = { optional: "true" };
+  }
+  const sorted = {};
+  for (const name of Object.keys(merged).sort(cmpStr3)) sorted[name] = merged[name];
+  return sorted;
+}
 function rawPeerDependenciesMetaBlockOfNode(graph, nodeId) {
   var _a, _b;
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.peerDependenciesMeta) == null ? void 0 : _b.get(nodeId);
@@ -2356,18 +2379,17 @@ function entryOfNode(graph, node, config, emitDiagnostic, cacheKey) {
     resolution: resolutionOfNode(node, payload == null ? void 0 : payload.resolution, payload == null ? void 0 : payload.nativeResolution, emitDiagnostic)
   };
   const dependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["dep", "dev"], config),
+    edgeBlockOfKinds(graph, node, ["dep", "dev", "optional"], config),
     unresolvedDepRefsOfNode(graph, node.id, "dependencies")
   );
   if (dependencies !== void 0) entry["dependencies"] = dependencies;
-  const optionalDependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["optional"], config),
-    unresolvedDepRefsOfNode(graph, node.id, "optionalDependencies")
-  );
-  if (optionalDependencies !== void 0) entry["optionalDependencies"] = optionalDependencies;
   const peerDependencies = extraBlockOfNode(node, "peerDependencies") ?? rawPeerDependenciesBlockOfNode(graph, node.id) ?? edgeBlockOfKinds(graph, node, ["peer"], config, { skipMissingRange: true });
   if (peerDependencies !== void 0) entry["peerDependencies"] = peerDependencies;
-  const dependenciesMeta = rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta");
+  const dependenciesMeta = dependenciesMetaWithOptional(
+    graph,
+    node,
+    rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta")
+  );
   if (dependenciesMeta !== void 0) entry["dependenciesMeta"] = dependenciesMeta;
   const peerDependenciesMeta = peerDependenciesMetaOfNode(graph, node);
   if (peerDependenciesMeta !== void 0) entry["peerDependenciesMeta"] = peerDependenciesMeta;
@@ -2436,7 +2458,7 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
   const edges = kinds.flatMap((kind) => graph.out(node.id, kind));
   if (edges.length === 0) return void 0;
   const blockEntries = [];
-  const seen = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Map();
   for (const edge of edges) {
     const dst = graph.getNode(edge.dst);
     if (dst === void 0) {
@@ -2456,13 +2478,15 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
     }
     const aliased = edge.attrs.alias !== void 0;
     const depName = aliased ? edge.attrs.alias : dst.name;
-    if (seen.has(depName)) {
+    const prior = seen.get(depName);
+    if (prior !== void 0) {
+      if (prior === edge.dst) continue;
       throw new LockfileError({
         code: "INVARIANT_VIOLATION",
-        message: `cannot emit duplicate ${edge.kind} dependency key ${depName} from ${node.id}`
+        message: `cannot emit duplicate dependency key ${depName} from ${node.id} (targets ${prior} and ${edge.dst})`
       });
     }
-    seen.add(depName);
+    seen.set(depName, edge.dst);
     blockEntries.push([depName, emittedRangeOfEdge(edge.kind, edge.attrs.range, config, aliased)]);
   }
   if (blockEntries.length === 0) return void 0;
@@ -2835,6 +2859,22 @@ function isRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   return !hasExplicitProtocol(range);
 }
+function splitOptionalDeps(deps, meta) {
+  if (deps === void 0) return { regular: void 0, optional: void 0 };
+  if (meta === void 0) return { regular: deps, optional: void 0 };
+  let regular;
+  let optional;
+  for (const [name, range] of Object.entries(deps)) {
+    if (isOptionalDepFlag(meta, name)) (optional ?? (optional = {}))[name] = range;
+    else (regular ?? (regular = {}))[name] = range;
+  }
+  return { regular, optional };
+}
+function isOptionalDepFlag(meta, name) {
+  const entry = meta[name];
+  if (entry === void 0 || typeof entry === "string") return false;
+  return entry["optional"] === "true";
+}
 function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIndex, diagnostics, ladder, srcResolution, unresolvedDeps) {
   var _a;
   if (!block) return;
@@ -2925,7 +2965,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
       if (unresolvedDeps !== void 0 && (kind === "dep" || kind === "optional")) {
         const refs = unresolvedDeps.get(srcId) ?? [];
         refs.push({
-          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          block: "dependencies",
           name: depName,
           range: depRange
         });

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

@@ -1823,7 +1823,9 @@ function parseFamily(input, options, config) {
     const srcId = entryIds.get(key);
     if (srcId === void 0) continue;
     const srcResolution = asString(value["resolution"]);
-    addEdgesFromBlock(builder, srcId, asMap(value["dependencies"]), "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    const { regular, optional } = splitOptionalDeps(asMap(value["dependencies"]), rawDependenciesMeta.get(srcId));
+    addEdgesFromBlock(builder, srcId, regular, "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    addEdgesFromBlock(builder, srcId, optional, "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
     addEdgesFromBlock(builder, srcId, asMap(value["optionalDependencies"]), "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
   }
   diagnostics.sort((a, b) => {
@@ -2180,6 +2182,27 @@ function rawDependenciesMetaBlockOfNode(graph, nodeId) {
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.dependenciesMeta) == null ? void 0 : _b.get(nodeId);
   return block === void 0 ? void 0 : coerceSymlMap(block);
 }
+function dependenciesMetaWithOptional(graph, node, verbatim) {
+  var _a;
+  const optionalNames = [];
+  for (const edge of graph.out(node.id, "optional")) {
+    const dst = graph.getNode(edge.dst);
+    if (dst === void 0) continue;
+    optionalNames.push(((_a = edge.attrs) == null ? void 0 : _a.alias) ?? dst.name);
+  }
+  if (optionalNames.length === 0) return verbatim;
+  const merged = {};
+  if (verbatim !== void 0) {
+    for (const [name, meta] of Object.entries(verbatim)) merged[name] = meta;
+  }
+  for (const name of optionalNames) {
+    if (name in merged) continue;
+    merged[name] = { optional: "true" };
+  }
+  const sorted = {};
+  for (const name of Object.keys(merged).sort(cmpStr3)) sorted[name] = merged[name];
+  return sorted;
+}
 function rawPeerDependenciesMetaBlockOfNode(graph, nodeId) {
   var _a, _b;
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.peerDependenciesMeta) == null ? void 0 : _b.get(nodeId);
@@ -2356,18 +2379,17 @@ function entryOfNode(graph, node, config, emitDiagnostic, cacheKey) {
     resolution: resolutionOfNode(node, payload == null ? void 0 : payload.resolution, payload == null ? void 0 : payload.nativeResolution, emitDiagnostic)
   };
   const dependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["dep", "dev"], config),
+    edgeBlockOfKinds(graph, node, ["dep", "dev", "optional"], config),
     unresolvedDepRefsOfNode(graph, node.id, "dependencies")
   );
   if (dependencies !== void 0) entry["dependencies"] = dependencies;
-  const optionalDependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["optional"], config),
-    unresolvedDepRefsOfNode(graph, node.id, "optionalDependencies")
-  );
-  if (optionalDependencies !== void 0) entry["optionalDependencies"] = optionalDependencies;
   const peerDependencies = extraBlockOfNode(node, "peerDependencies") ?? rawPeerDependenciesBlockOfNode(graph, node.id) ?? edgeBlockOfKinds(graph, node, ["peer"], config, { skipMissingRange: true });
   if (peerDependencies !== void 0) entry["peerDependencies"] = peerDependencies;
-  const dependenciesMeta = rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta");
+  const dependenciesMeta = dependenciesMetaWithOptional(
+    graph,
+    node,
+    rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta")
+  );
   if (dependenciesMeta !== void 0) entry["dependenciesMeta"] = dependenciesMeta;
   const peerDependenciesMeta = peerDependenciesMetaOfNode(graph, node);
   if (peerDependenciesMeta !== void 0) entry["peerDependenciesMeta"] = peerDependenciesMeta;
@@ -2436,7 +2458,7 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
   const edges = kinds.flatMap((kind) => graph.out(node.id, kind));
   if (edges.length === 0) return void 0;
   const blockEntries = [];
-  const seen = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Map();
   for (const edge of edges) {
     const dst = graph.getNode(edge.dst);
     if (dst === void 0) {
@@ -2456,13 +2478,15 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
     }
     const aliased = edge.attrs.alias !== void 0;
     const depName = aliased ? edge.attrs.alias : dst.name;
-    if (seen.has(depName)) {
+    const prior = seen.get(depName);
+    if (prior !== void 0) {
+      if (prior === edge.dst) continue;
       throw new LockfileError({
         code: "INVARIANT_VIOLATION",
-        message: `cannot emit duplicate ${edge.kind} dependency key ${depName} from ${node.id}`
+        message: `cannot emit duplicate dependency key ${depName} from ${node.id} (targets ${prior} and ${edge.dst})`
       });
     }
-    seen.add(depName);
+    seen.set(depName, edge.dst);
     blockEntries.push([depName, emittedRangeOfEdge(edge.kind, edge.attrs.range, config, aliased)]);
   }
   if (blockEntries.length === 0) return void 0;
@@ -2835,6 +2859,22 @@ function isRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   return !hasExplicitProtocol(range);
 }
+function splitOptionalDeps(deps, meta) {
+  if (deps === void 0) return { regular: void 0, optional: void 0 };
+  if (meta === void 0) return { regular: deps, optional: void 0 };
+  let regular;
+  let optional;
+  for (const [name, range] of Object.entries(deps)) {
+    if (isOptionalDepFlag(meta, name)) (optional ?? (optional = {}))[name] = range;
+    else (regular ?? (regular = {}))[name] = range;
+  }
+  return { regular, optional };
+}
+function isOptionalDepFlag(meta, name) {
+  const entry = meta[name];
+  if (entry === void 0 || typeof entry === "string") return false;
+  return entry["optional"] === "true";
+}
 function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIndex, diagnostics, ladder, srcResolution, unresolvedDeps) {
   var _a;
   if (!block) return;
@@ -2925,7 +2965,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
       if (unresolvedDeps !== void 0 && (kind === "dep" || kind === "optional")) {
         const refs = unresolvedDeps.get(srcId) ?? [];
         refs.push({
-          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          block: "dependencies",
           name: depName,
           range: depRange
         });

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

@@ -1823,7 +1823,9 @@ function parseFamily(input, options, config) {
     const srcId = entryIds.get(key);
     if (srcId === void 0) continue;
     const srcResolution = asString(value["resolution"]);
-    addEdgesFromBlock(builder, srcId, asMap(value["dependencies"]), "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    const { regular, optional } = splitOptionalDeps(asMap(value["dependencies"]), rawDependenciesMeta.get(srcId));
+    addEdgesFromBlock(builder, srcId, regular, "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    addEdgesFromBlock(builder, srcId, optional, "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
     addEdgesFromBlock(builder, srcId, asMap(value["optionalDependencies"]), "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
   }
   diagnostics.sort((a, b) => {
@@ -2180,6 +2182,27 @@ function rawDependenciesMetaBlockOfNode(graph, nodeId) {
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.dependenciesMeta) == null ? void 0 : _b.get(nodeId);
   return block === void 0 ? void 0 : coerceSymlMap(block);
 }
+function dependenciesMetaWithOptional(graph, node, verbatim) {
+  var _a;
+  const optionalNames = [];
+  for (const edge of graph.out(node.id, "optional")) {
+    const dst = graph.getNode(edge.dst);
+    if (dst === void 0) continue;
+    optionalNames.push(((_a = edge.attrs) == null ? void 0 : _a.alias) ?? dst.name);
+  }
+  if (optionalNames.length === 0) return verbatim;
+  const merged = {};
+  if (verbatim !== void 0) {
+    for (const [name, meta] of Object.entries(verbatim)) merged[name] = meta;
+  }
+  for (const name of optionalNames) {
+    if (name in merged) continue;
+    merged[name] = { optional: "true" };
+  }
+  const sorted = {};
+  for (const name of Object.keys(merged).sort(cmpStr3)) sorted[name] = merged[name];
+  return sorted;
+}
 function rawPeerDependenciesMetaBlockOfNode(graph, nodeId) {
   var _a, _b;
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.peerDependenciesMeta) == null ? void 0 : _b.get(nodeId);
@@ -2356,18 +2379,17 @@ function entryOfNode(graph, node, config, emitDiagnostic, cacheKey) {
     resolution: resolutionOfNode(node, payload == null ? void 0 : payload.resolution, payload == null ? void 0 : payload.nativeResolution, emitDiagnostic)
   };
   const dependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["dep", "dev"], config),
+    edgeBlockOfKinds(graph, node, ["dep", "dev", "optional"], config),
     unresolvedDepRefsOfNode(graph, node.id, "dependencies")
   );
   if (dependencies !== void 0) entry["dependencies"] = dependencies;
-  const optionalDependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["optional"], config),
-    unresolvedDepRefsOfNode(graph, node.id, "optionalDependencies")
-  );
-  if (optionalDependencies !== void 0) entry["optionalDependencies"] = optionalDependencies;
   const peerDependencies = extraBlockOfNode(node, "peerDependencies") ?? rawPeerDependenciesBlockOfNode(graph, node.id) ?? edgeBlockOfKinds(graph, node, ["peer"], config, { skipMissingRange: true });
   if (peerDependencies !== void 0) entry["peerDependencies"] = peerDependencies;
-  const dependenciesMeta = rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta");
+  const dependenciesMeta = dependenciesMetaWithOptional(
+    graph,
+    node,
+    rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta")
+  );
   if (dependenciesMeta !== void 0) entry["dependenciesMeta"] = dependenciesMeta;
   const peerDependenciesMeta = peerDependenciesMetaOfNode(graph, node);
   if (peerDependenciesMeta !== void 0) entry["peerDependenciesMeta"] = peerDependenciesMeta;
@@ -2436,7 +2458,7 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
   const edges = kinds.flatMap((kind) => graph.out(node.id, kind));
   if (edges.length === 0) return void 0;
   const blockEntries = [];
-  const seen = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Map();
   for (const edge of edges) {
     const dst = graph.getNode(edge.dst);
     if (dst === void 0) {
@@ -2456,13 +2478,15 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
     }
     const aliased = edge.attrs.alias !== void 0;
     const depName = aliased ? edge.attrs.alias : dst.name;
-    if (seen.has(depName)) {
+    const prior = seen.get(depName);
+    if (prior !== void 0) {
+      if (prior === edge.dst) continue;
       throw new LockfileError({
         code: "INVARIANT_VIOLATION",
-        message: `cannot emit duplicate ${edge.kind} dependency key ${depName} from ${node.id}`
+        message: `cannot emit duplicate dependency key ${depName} from ${node.id} (targets ${prior} and ${edge.dst})`
       });
     }
-    seen.add(depName);
+    seen.set(depName, edge.dst);
     blockEntries.push([depName, emittedRangeOfEdge(edge.kind, edge.attrs.range, config, aliased)]);
   }
   if (blockEntries.length === 0) return void 0;
@@ -2836,6 +2860,22 @@ function isRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   return !hasExplicitProtocol(range);
 }
+function splitOptionalDeps(deps, meta) {
+  if (deps === void 0) return { regular: void 0, optional: void 0 };
+  if (meta === void 0) return { regular: deps, optional: void 0 };
+  let regular;
+  let optional;
+  for (const [name, range] of Object.entries(deps)) {
+    if (isOptionalDepFlag(meta, name)) (optional ?? (optional = {}))[name] = range;
+    else (regular ?? (regular = {}))[name] = range;
+  }
+  return { regular, optional };
+}
+function isOptionalDepFlag(meta, name) {
+  const entry = meta[name];
+  if (entry === void 0 || typeof entry === "string") return false;
+  return entry["optional"] === "true";
+}
 function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIndex, diagnostics, ladder, srcResolution, unresolvedDeps) {
   var _a;
   if (!block) return;
@@ -2926,7 +2966,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
       if (unresolvedDeps !== void 0 && (kind === "dep" || kind === "optional")) {
         const refs = unresolvedDeps.get(srcId) ?? [];
         refs.push({
-          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          block: "dependencies",
           name: depName,
           range: depRange
         });

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

@@ -1823,7 +1823,9 @@ function parseFamily(input, options, config) {
     const srcId = entryIds.get(key);
     if (srcId === void 0) continue;
     const srcResolution = asString(value["resolution"]);
-    addEdgesFromBlock(builder, srcId, asMap(value["dependencies"]), "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    const { regular, optional } = splitOptionalDeps(asMap(value["dependencies"]), rawDependenciesMeta.get(srcId));
+    addEdgesFromBlock(builder, srcId, regular, "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    addEdgesFromBlock(builder, srcId, optional, "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
     addEdgesFromBlock(builder, srcId, asMap(value["optionalDependencies"]), "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
   }
   diagnostics.sort((a, b) => {
@@ -2180,6 +2182,27 @@ function rawDependenciesMetaBlockOfNode(graph, nodeId) {
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.dependenciesMeta) == null ? void 0 : _b.get(nodeId);
   return block === void 0 ? void 0 : coerceSymlMap(block);
 }
+function dependenciesMetaWithOptional(graph, node, verbatim) {
+  var _a;
+  const optionalNames = [];
+  for (const edge of graph.out(node.id, "optional")) {
+    const dst = graph.getNode(edge.dst);
+    if (dst === void 0) continue;
+    optionalNames.push(((_a = edge.attrs) == null ? void 0 : _a.alias) ?? dst.name);
+  }
+  if (optionalNames.length === 0) return verbatim;
+  const merged = {};
+  if (verbatim !== void 0) {
+    for (const [name, meta] of Object.entries(verbatim)) merged[name] = meta;
+  }
+  for (const name of optionalNames) {
+    if (name in merged) continue;
+    merged[name] = { optional: "true" };
+  }
+  const sorted = {};
+  for (const name of Object.keys(merged).sort(cmpStr3)) sorted[name] = merged[name];
+  return sorted;
+}
 function rawPeerDependenciesMetaBlockOfNode(graph, nodeId) {
   var _a, _b;
   const block = (_b = (_a = sidecarByGraph.get(graph)) == null ? void 0 : _a.peerDependenciesMeta) == null ? void 0 : _b.get(nodeId);
@@ -2356,18 +2379,17 @@ function entryOfNode(graph, node, config, emitDiagnostic, cacheKey) {
     resolution: resolutionOfNode(node, payload == null ? void 0 : payload.resolution, payload == null ? void 0 : payload.nativeResolution, emitDiagnostic)
   };
   const dependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["dep", "dev"], config),
+    edgeBlockOfKinds(graph, node, ["dep", "dev", "optional"], config),
     unresolvedDepRefsOfNode(graph, node.id, "dependencies")
   );
   if (dependencies !== void 0) entry["dependencies"] = dependencies;
-  const optionalDependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["optional"], config),
-    unresolvedDepRefsOfNode(graph, node.id, "optionalDependencies")
-  );
-  if (optionalDependencies !== void 0) entry["optionalDependencies"] = optionalDependencies;
   const peerDependencies = extraBlockOfNode(node, "peerDependencies") ?? rawPeerDependenciesBlockOfNode(graph, node.id) ?? edgeBlockOfKinds(graph, node, ["peer"], config, { skipMissingRange: true });
   if (peerDependencies !== void 0) entry["peerDependencies"] = peerDependencies;
-  const dependenciesMeta = rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta");
+  const dependenciesMeta = dependenciesMetaWithOptional(
+    graph,
+    node,
+    rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta")
+  );
   if (dependenciesMeta !== void 0) entry["dependenciesMeta"] = dependenciesMeta;
   const peerDependenciesMeta = peerDependenciesMetaOfNode(graph, node);
   if (peerDependenciesMeta !== void 0) entry["peerDependenciesMeta"] = peerDependenciesMeta;
@@ -2436,7 +2458,7 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
   const edges = kinds.flatMap((kind) => graph.out(node.id, kind));
   if (edges.length === 0) return void 0;
   const blockEntries = [];
-  const seen = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Map();
   for (const edge of edges) {
     const dst = graph.getNode(edge.dst);
     if (dst === void 0) {
@@ -2456,13 +2478,15 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
     }
     const aliased = edge.attrs.alias !== void 0;
     const depName = aliased ? edge.attrs.alias : dst.name;
-    if (seen.has(depName)) {
+    const prior = seen.get(depName);
+    if (prior !== void 0) {
+      if (prior === edge.dst) continue;
       throw new LockfileError({
         code: "INVARIANT_VIOLATION",
-        message: `cannot emit duplicate ${edge.kind} dependency key ${depName} from ${node.id}`
+        message: `cannot emit duplicate dependency key ${depName} from ${node.id} (targets ${prior} and ${edge.dst})`
       });
     }
-    seen.add(depName);
+    seen.set(depName, edge.dst);
     blockEntries.push([depName, emittedRangeOfEdge(edge.kind, edge.attrs.range, config, aliased)]);
   }
   if (blockEntries.length === 0) return void 0;
@@ -2836,6 +2860,22 @@ function isRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   return !hasExplicitProtocol(range);
 }
+function splitOptionalDeps(deps, meta) {
+  if (deps === void 0) return { regular: void 0, optional: void 0 };
+  if (meta === void 0) return { regular: deps, optional: void 0 };
+  let regular;
+  let optional;
+  for (const [name, range] of Object.entries(deps)) {
+    if (isOptionalDepFlag(meta, name)) (optional ?? (optional = {}))[name] = range;
+    else (regular ?? (regular = {}))[name] = range;
+  }
+  return { regular, optional };
+}
+function isOptionalDepFlag(meta, name) {
+  const entry = meta[name];
+  if (entry === void 0 || typeof entry === "string") return false;
+  return entry["optional"] === "true";
+}
 function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIndex, diagnostics, ladder, srcResolution, unresolvedDeps) {
   var _a;
   if (!block) return;
@@ -2926,7 +2966,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
       if (unresolvedDeps !== void 0 && (kind === "dep" || kind === "optional")) {
         const refs = unresolvedDeps.get(srcId) ?? [];
         refs.push({
-          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          block: "dependencies",
           name: depName,
           range: depRange
         });

package/dist/index.js

@@ -6637,7 +6637,9 @@ function parseFamily3(input, options, config) {
     const srcId = entryIds.get(key);
     if (srcId === void 0) continue;
     const srcResolution = asString(value["resolution"]);
-    addEdgesFromBlock(builder, srcId, asMap(value["dependencies"]), "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    const { regular, optional } = splitOptionalDeps(asMap(value["dependencies"]), rawDependenciesMeta.get(srcId));
+    addEdgesFromBlock(builder, srcId, regular, "dep", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
+    addEdgesFromBlock(builder, srcId, optional, "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
     addEdgesFromBlock(builder, srcId, asMap(value["optionalDependencies"]), "optional", specIndex, patchDescriptorIndex, diagnostics, ladderCtx, srcResolution, rawUnresolvedDeps);
   }
   diagnostics.sort((a, b) => {
@@ -6794,6 +6796,27 @@ function rawDependenciesMetaBlockOfNode(graph, nodeId) {
   const block = (_b = (_a = sidecarByGraph6.get(graph)) == null ? void 0 : _a.dependenciesMeta) == null ? void 0 : _b.get(nodeId);
   return block === void 0 ? void 0 : coerceSymlMap(block);
 }
+function dependenciesMetaWithOptional(graph, node, verbatim) {
+  var _a;
+  const optionalNames = [];
+  for (const edge of graph.out(node.id, "optional")) {
+    const dst = graph.getNode(edge.dst);
+    if (dst === void 0) continue;
+    optionalNames.push(((_a = edge.attrs) == null ? void 0 : _a.alias) ?? dst.name);
+  }
+  if (optionalNames.length === 0) return verbatim;
+  const merged = {};
+  if (verbatim !== void 0) {
+    for (const [name, meta] of Object.entries(verbatim)) merged[name] = meta;
+  }
+  for (const name of optionalNames) {
+    if (name in merged) continue;
+    merged[name] = { optional: "true" };
+  }
+  const sorted = {};
+  for (const name of Object.keys(merged).sort(cmpStr5)) sorted[name] = merged[name];
+  return sorted;
+}
 function rawPeerDependenciesMetaBlockOfNode(graph, nodeId) {
   var _a, _b;
   const block = (_b = (_a = sidecarByGraph6.get(graph)) == null ? void 0 : _a.peerDependenciesMeta) == null ? void 0 : _b.get(nodeId);
@@ -6970,18 +6993,17 @@ function entryOfNode(graph, node, config, emitDiagnostic, cacheKey) {
     resolution: resolutionOfNode(node, payload == null ? void 0 : payload.resolution, payload == null ? void 0 : payload.nativeResolution, emitDiagnostic)
   };
   const dependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["dep", "dev"], config),
+    edgeBlockOfKinds(graph, node, ["dep", "dev", "optional"], config),
     unresolvedDepRefsOfNode(graph, node.id, "dependencies")
   );
   if (dependencies !== void 0) entry["dependencies"] = dependencies;
-  const optionalDependencies = withUnresolvedDepRefs(
-    edgeBlockOfKinds(graph, node, ["optional"], config),
-    unresolvedDepRefsOfNode(graph, node.id, "optionalDependencies")
-  );
-  if (optionalDependencies !== void 0) entry["optionalDependencies"] = optionalDependencies;
   const peerDependencies = extraBlockOfNode(node, "peerDependencies") ?? rawPeerDependenciesBlockOfNode(graph, node.id) ?? edgeBlockOfKinds(graph, node, ["peer"], config, { skipMissingRange: true });
   if (peerDependencies !== void 0) entry["peerDependencies"] = peerDependencies;
-  const dependenciesMeta = rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta");
+  const dependenciesMeta = dependenciesMetaWithOptional(
+    graph,
+    node,
+    rawDependenciesMetaBlockOfNode(graph, node.id) ?? extraBlockOfNode(node, "dependenciesMeta")
+  );
   if (dependenciesMeta !== void 0) entry["dependenciesMeta"] = dependenciesMeta;
   const peerDependenciesMeta = peerDependenciesMetaOfNode(graph, node);
   if (peerDependenciesMeta !== void 0) entry["peerDependenciesMeta"] = peerDependenciesMeta;
@@ -7057,7 +7079,7 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
   const edges = kinds.flatMap((kind) => graph.out(node.id, kind));
   if (edges.length === 0) return void 0;
   const blockEntries = [];
-  const seen = /* @__PURE__ */ new Set();
+  const seen = /* @__PURE__ */ new Map();
   for (const edge of edges) {
     const dst = graph.getNode(edge.dst);
     if (dst === void 0) {
@@ -7077,13 +7099,15 @@ function edgeBlockOfKinds(graph, node, kinds, config, options = {}) {
     }
     const aliased = edge.attrs.alias !== void 0;
     const depName = aliased ? edge.attrs.alias : dst.name;
-    if (seen.has(depName)) {
+    const prior = seen.get(depName);
+    if (prior !== void 0) {
+      if (prior === edge.dst) continue;
       throw new LockfileError({
         code: "INVARIANT_VIOLATION",
-        message: `cannot emit duplicate ${edge.kind} dependency key ${depName} from ${node.id}`
+        message: `cannot emit duplicate dependency key ${depName} from ${node.id} (targets ${prior} and ${edge.dst})`
       });
     }
-    seen.add(depName);
+    seen.set(depName, edge.dst);
     blockEntries.push([depName, emittedRangeOfEdge(edge.kind, edge.attrs.range, config, aliased)]);
   }
   if (blockEntries.length === 0) return void 0;
@@ -7346,6 +7370,22 @@ function isRegistryRange(range) {
   if (range.startsWith("npm:")) return true;
   return !hasExplicitProtocol(range);
 }
+function splitOptionalDeps(deps, meta) {
+  if (deps === void 0) return { regular: void 0, optional: void 0 };
+  if (meta === void 0) return { regular: deps, optional: void 0 };
+  let regular;
+  let optional;
+  for (const [name, range] of Object.entries(deps)) {
+    if (isOptionalDepFlag(meta, name)) (optional ?? (optional = {}))[name] = range;
+    else (regular ?? (regular = {}))[name] = range;
+  }
+  return { regular, optional };
+}
+function isOptionalDepFlag(meta, name) {
+  const entry = meta[name];
+  if (entry === void 0 || typeof entry === "string") return false;
+  return entry["optional"] === "true";
+}
 function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIndex, diagnostics, ladder, srcResolution, unresolvedDeps) {
   var _a;
   if (!block) return;
@@ -7436,7 +7476,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
       if (unresolvedDeps !== void 0 && (kind === "dep" || kind === "optional")) {
         const refs = unresolvedDeps.get(srcId) ?? [];
         refs.push({
-          block: kind === "optional" ? "optionalDependencies" : "dependencies",
+          block: "dependencies",
           name: depName,
           range: depRange
         });
@@ -10813,6 +10853,14 @@ async function modify(graph, primitive, options) {
 
 // src/main/ts/optimize/diagnostics.ts
 function optimizeNodeRemoved(nodeId) {
+  return {
+    code: "OPTIMIZE_NODE_REMOVED",
+    severity: "info",
+    subject: nodeId,
+    message: `removed orphan ${nodeLabel(nodeId)} (${nodeId})`
+  };
+}
+function nodeLabel(nodeId) {
   const name = nameOf(nodeId);
   const tail = nodeId.slice(name.length + 1);
   let depth = 0;
@@ -10827,13 +10875,7 @@ function optimizeNodeRemoved(nodeId) {
     else if (c === ")") depth--;
   }
   const version3 = tail.slice(0, cut);
-  const label = name.length > 0 && version3.length > 0 ? `${name}@${version3}` : nodeId;
-  return {
-    code: "OPTIMIZE_NODE_REMOVED",
-    severity: "info",
-    subject: nodeId,
-    message: `removed orphan ${label} (${nodeId})`
-  };
+  return name.length > 0 && version3.length > 0 ? `${name}@${version3}` : nodeId;
 }
 function optimizeNoop() {
   return {

package/dist/optimize.d.ts

@@ -1,5 +1,36 @@
 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';
+import { D as Diagnostic, N as NodeId, G as Graph } from './graph-CPo-SvS2.js';
+
+interface PruneOrphansOptions {
+    /** Stream diagnostics as they fire (mirrors the modify / optimize channel). */
+    onDiagnostic?: (d: Diagnostic) => void;
+    /** NodeIds to keep even at in-degree 0 (intentional roots; rare). */
+    preserve?: ReadonlySet<NodeId>;
+    /**
+     * Bound the sweep to a candidate set. When provided, ONLY these NodeIds (and
+     * the closure they transitively strand) are removal candidates — any OTHER
+     * pre-existing in-degree-0 node is left untouched. Pass the mutation's removed
+     * / orphaned NodeIds (e.g. `replaceVersion`'s `recentlyOrphaned`) for a purely
+     * differential GC. Omit for a whole-graph sweep.
+     */
+    seed?: ReadonlySet<NodeId>;
+}
+interface PruneOrphansResult {
+    graph: Graph;
+    /** NodeIds removed by this call, in removal order. */
+    removed: NodeId[];
+    /** All diagnostics this call emitted, in emission order. */
+    unresolved: Diagnostic[];
+}
+/**
+ * Remove every non-workspace node that has lost its last incoming edge, plus
+ * the closure such removals strand. See the module header for why this is
+ * reference-counting, not reachability (and how it differs from `optimize`).
+ *
+ * Synchronous + deterministic (worklist seeded in `graph.nodes()` content-sort
+ * order). Idempotent: a second call on the result removes nothing.
+ */
+declare function pruneOrphans(graph: Graph, options?: PruneOrphansOptions): PruneOrphansResult;
 
 type OptimizeDiagnosticCode = 'OPTIMIZE_NODE_REMOVED' | 'OPTIMIZE_WORKSPACE_UNREACHABLE' | 'OPTIMIZE_NOOP' | 'OPTIMIZE_NO_ROOTS';
 interface OptimizeDiagnostic extends Diagnostic {
@@ -11,6 +42,14 @@ interface OptimizeDiagnostic extends Diagnostic {
  * rationale — the NodeId alone may carry a long peerContext suffix.
  */
 declare function optimizeNodeRemoved(nodeId: NodeId): OptimizeDiagnostic;
+type PruneDiagnosticCode = 'PRUNE_NODE_REMOVED' | 'PRUNE_NOOP';
+interface PruneDiagnostic extends Diagnostic {
+    code: PruneDiagnosticCode;
+}
+/** Fires once per node retired because it lost its last incoming edge. */
+declare function pruneNodeRemoved(nodeId: NodeId): PruneDiagnostic;
+/** Fires once per `pruneOrphans(graph)` call when nothing was removed. */
+declare function pruneNoop(): PruneDiagnostic;
 declare function optimizeWorkspaceUnreachable(nodeId: NodeId): OptimizeDiagnostic;
 /**
  * Fires once per `optimize(graph)` call when `removed.length === 0`. The
@@ -21,4 +60,4 @@ declare function optimizeWorkspaceUnreachable(nodeId: NodeId): OptimizeDiagnosti
  */
 declare function optimizeNoop(): OptimizeDiagnostic;
 
-export { type OptimizeDiagnostic, type OptimizeDiagnosticCode, optimizeNodeRemoved, optimizeNoop, optimizeWorkspaceUnreachable };
+export { type OptimizeDiagnostic, type OptimizeDiagnosticCode, type PruneDiagnostic, type PruneDiagnosticCode, type PruneOrphansOptions, type PruneOrphansResult, optimizeNodeRemoved, optimizeNoop, optimizeWorkspaceUnreachable, pruneNodeRemoved, pruneNoop, pruneOrphans };

package/dist/optimize.js

@@ -18,6 +18,14 @@ function nameOf(id) {
 
 // src/main/ts/optimize/diagnostics.ts
 function optimizeNodeRemoved(nodeId) {
+  return {
+    code: "OPTIMIZE_NODE_REMOVED",
+    severity: "info",
+    subject: nodeId,
+    message: `removed orphan ${nodeLabel(nodeId)} (${nodeId})`
+  };
+}
+function nodeLabel(nodeId) {
   const name = nameOf(nodeId);
   const tail = nodeId.slice(name.length + 1);
   let depth = 0;
@@ -32,12 +40,22 @@ function optimizeNodeRemoved(nodeId) {
     else if (c === ")") depth--;
   }
   const version = tail.slice(0, cut);
-  const label = name.length > 0 && version.length > 0 ? `${name}@${version}` : nodeId;
+  return name.length > 0 && version.length > 0 ? `${name}@${version}` : nodeId;
+}
+function pruneNodeRemoved(nodeId) {
   return {
-    code: "OPTIMIZE_NODE_REMOVED",
+    code: "PRUNE_NODE_REMOVED",
     severity: "info",
     subject: nodeId,
-    message: `removed orphan ${label} (${nodeId})`
+    message: `pruned unreferenced ${nodeLabel(nodeId)} (${nodeId})`
+  };
+}
+function pruneNoop() {
+  return {
+    code: "PRUNE_NOOP",
+    severity: "info",
+    subject: "graph",
+    message: "pruneOrphans: no unreferenced nodes to collect"
   };
 }
 function optimizeWorkspaceUnreachable(nodeId) {
@@ -147,4 +165,65 @@ function optimize(graph, options = {}) {
 }
 var EMPTY_PRESERVE = /* @__PURE__ */ new Set();
 
-export { optimize, optimizeNodeRemoved, optimizeNoop, optimizeWorkspaceUnreachable };
+// src/main/ts/optimize/prune.ts
+var EMPTY = /* @__PURE__ */ new Set();
+function pruneOrphans(graph, options = {}) {
+  const preserve = options.preserve ?? EMPTY;
+  const onDiagnostic = options.onDiagnostic;
+  const removed = [];
+  const unresolved = [];
+  const emit = (d) => {
+    unresolved.push(d);
+    if (onDiagnostic !== void 0) onDiagnostic(d);
+  };
+  let current = graph;
+  const collectable = (id) => {
+    const node = current.getNode(id);
+    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;
+  };
+  const queue = [];
+  if (options.seed !== void 0) {
+    for (const id of options.seed) if (collectable(id)) queue.push(id);
+  } else {
+    for (const node of current.nodes()) if (collectable(node.id)) queue.push(node.id);
+  }
+  while (queue.length > 0) {
+    const id = queue.shift();
+    if (!collectable(id)) continue;
+    const node = current.getNode(id);
+    const children = current.out(id).map((e) => e.dst);
+    const tarballInputs = { name: node.name, version: node.version, patch: node.patch };
+    const diag = pruneNodeRemoved(id);
+    current = current.mutate((m) => {
+      m.removeNode(id);
+      if (current.tarball(tarballInputs) !== void 0 && !tarballSharedByOther(current, id, tarballInputs)) {
+        m.removeTarball(tarballInputs);
+      }
+      m.diagnostic(diag);
+    }).graph;
+    removed.push(id);
+    emit(diag);
+    for (const child of children) if (collectable(child)) queue.push(child);
+  }
+  if (removed.length === 0) {
+    const noop = pruneNoop();
+    current = current.mutate((m) => {
+      m.diagnostic(noop);
+    }).graph;
+    emit(noop);
+  }
+  return { graph: current, removed, unresolved };
+}
+function tarballSharedByOther(graph, removingId, key) {
+  for (const id of graph.byName(key.name)) {
+    if (id === removingId) continue;
+    const n = graph.getNode(id);
+    if (n !== void 0 && n.version === key.version && n.patch === key.patch) return true;
+  }
+  return false;
+}
+
+export { optimize, optimizeNodeRemoved, optimizeNoop, optimizeWorkspaceUnreachable, pruneNodeRemoved, pruneNoop, pruneOrphans };

package/package.json

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