@antongolub/lockfile 0.0.0-snapshot.48 → 0.0.0-snapshot.49

package/dist/formats/bun-text.js

@@ -12,12 +12,17 @@ var LockfileError = class extends Error {
 };
 var CANONICAL_HASH_RE = /^[0-9a-f]{128}$/;
 var SENTINEL_RE = /^unresolved-[0-9a-f]{64}$/;
+var HASHED_PEER_SET_RE = /^[0-9a-f]{16,}$/;
 function isCanonicalHash(s) {
   return CANONICAL_HASH_RE.test(s);
 }
 function isSentinelPatch(s) {
   return SENTINEL_RE.test(s);
 }
+function isHashedPeerSetToken(seg) {
+  if (seg.startsWith("patch_hash=")) return false;
+  return HASHED_PEER_SET_RE.test(seg);
+}
 
 // src/main/ts/graph.ts
 var GraphError = class extends Error {
@@ -226,7 +231,7 @@ function validate(s) {
       throw new GraphError("INVARIANT_VIOLATION", `node id ${id} disagrees with derived id ${expected.join(" or ")}`);
     }
     const peerEdgeTargets = (s.outgoing.get(id) ?? []).filter((e) => e.kind === "peer").map((e) => stripPeerContextFromNodeId(e.dst)).sort();
-    const peerCtx = node.peerContext.map(stripPeerContextFromNodeId).sort();
+    const peerCtx = node.peerContext.filter((p) => !isHashedPeerSetToken(stripPeerContextFromNodeId(p))).map(stripPeerContextFromNodeId).sort();
     if (peerEdgeTargets.length !== peerCtx.length || peerEdgeTargets.some((t, i) => t !== peerCtx[i])) {
       throw new GraphError("INVARIANT_VIOLATION", `peer edges of ${id} disagree with peerContext`);
     }

package/dist/formats/npm-1.js

@@ -13,12 +13,17 @@ var LockfileError = class extends Error {
 };
 var CANONICAL_HASH_RE = /^[0-9a-f]{128}$/;
 var SENTINEL_RE = /^unresolved-[0-9a-f]{64}$/;
+var HASHED_PEER_SET_RE = /^[0-9a-f]{16,}$/;
 function isCanonicalHash(s) {
   return CANONICAL_HASH_RE.test(s);
 }
 function isSentinelPatch(s) {
   return SENTINEL_RE.test(s);
 }
+function isHashedPeerSetToken(seg) {
+  if (seg.startsWith("patch_hash=")) return false;
+  return HASHED_PEER_SET_RE.test(seg);
+}
 
 // src/main/ts/graph.ts
 var GraphError = class extends Error {
@@ -227,7 +232,7 @@ function validate(s) {
       throw new GraphError("INVARIANT_VIOLATION", `node id ${id} disagrees with derived id ${expected.join(" or ")}`);
     }
     const peerEdgeTargets = (s.outgoing.get(id) ?? []).filter((e) => e.kind === "peer").map((e) => stripPeerContextFromNodeId(e.dst)).sort();
-    const peerCtx = node.peerContext.map(stripPeerContextFromNodeId).sort();
+    const peerCtx = node.peerContext.filter((p) => !isHashedPeerSetToken(stripPeerContextFromNodeId(p))).map(stripPeerContextFromNodeId).sort();
     if (peerEdgeTargets.length !== peerCtx.length || peerEdgeTargets.some((t, i) => t !== peerCtx[i])) {
       throw new GraphError("INVARIANT_VIOLATION", `peer edges of ${id} disagree with peerContext`);
     }

package/dist/formats/npm-2.js

@@ -15,12 +15,17 @@ var LockfileError = class extends Error {
 };
 var CANONICAL_HASH_RE = /^[0-9a-f]{128}$/;
 var SENTINEL_RE = /^unresolved-[0-9a-f]{64}$/;
+var HASHED_PEER_SET_RE = /^[0-9a-f]{16,}$/;
 function isCanonicalHash(s) {
   return CANONICAL_HASH_RE.test(s);
 }
 function isSentinelPatch(s) {
   return SENTINEL_RE.test(s);
 }
+function isHashedPeerSetToken(seg) {
+  if (seg.startsWith("patch_hash=")) return false;
+  return HASHED_PEER_SET_RE.test(seg);
+}
 
 // src/main/ts/graph.ts
 var GraphError = class extends Error {
@@ -240,7 +245,7 @@ function validate(s) {
       throw new GraphError("INVARIANT_VIOLATION", `node id ${id} disagrees with derived id ${expected.join(" or ")}`);
     }
     const peerEdgeTargets = (s.outgoing.get(id) ?? []).filter((e) => e.kind === "peer").map((e) => stripPeerContextFromNodeId(e.dst)).sort();
-    const peerCtx = node.peerContext.map(stripPeerContextFromNodeId).sort();
+    const peerCtx = node.peerContext.filter((p) => !isHashedPeerSetToken(stripPeerContextFromNodeId(p))).map(stripPeerContextFromNodeId).sort();
     if (peerEdgeTargets.length !== peerCtx.length || peerEdgeTargets.some((t, i) => t !== peerCtx[i])) {
       throw new GraphError("INVARIANT_VIOLATION", `peer edges of ${id} disagree with peerContext`);
     }
@@ -1262,6 +1267,7 @@ function parseFamily(input, _options, config) {
     if (entry.dev === true) nodeSide.dev = true;
     if (entry.optional === true) nodeSide.optional = true;
     if (entry.peer === true) nodeSide.peer = true;
+    if (entry.extraneous === true) nodeSide.extraneous = true;
     config.hooks?.captureEntry?.(srcId, entry);
     const isRoot = path === "";
     const isWorkspaceMember = workspaceByPath.has(path);
@@ -1391,10 +1397,13 @@ function stringifyFamily(graph, config, options = {}) {
   }
   for (const node of workspaceMembers) {
     packages[node.workspacePath] = buildWorkspaceMemberEntry(graph, node, sidecar, emitDiagnostic);
-    packages[`node_modules/${node.name}`] = {
-      resolved: node.workspacePath,
-      link: true
-    };
+    const extraneous = sidecar?.nodes.get(node.id)?.extraneous === true;
+    if (!extraneous) {
+      packages[`node_modules/${node.name}`] = {
+        resolved: node.workspacePath,
+        link: true
+      };
+    }
   }
   for (const node of graph.nodes()) {
     if (rootNode !== void 0 && node.id === rootNode.id) continue;

package/dist/formats/npm-3.js

@@ -15,12 +15,17 @@ var LockfileError = class extends Error {
 };
 var CANONICAL_HASH_RE = /^[0-9a-f]{128}$/;
 var SENTINEL_RE = /^unresolved-[0-9a-f]{64}$/;
+var HASHED_PEER_SET_RE = /^[0-9a-f]{16,}$/;
 function isCanonicalHash(s) {
   return CANONICAL_HASH_RE.test(s);
 }
 function isSentinelPatch(s) {
   return SENTINEL_RE.test(s);
 }
+function isHashedPeerSetToken(seg) {
+  if (seg.startsWith("patch_hash=")) return false;
+  return HASHED_PEER_SET_RE.test(seg);
+}
 
 // src/main/ts/graph.ts
 var GraphError = class extends Error {
@@ -240,7 +245,7 @@ function validate(s) {
       throw new GraphError("INVARIANT_VIOLATION", `node id ${id} disagrees with derived id ${expected.join(" or ")}`);
     }
     const peerEdgeTargets = (s.outgoing.get(id) ?? []).filter((e) => e.kind === "peer").map((e) => stripPeerContextFromNodeId(e.dst)).sort();
-    const peerCtx = node.peerContext.map(stripPeerContextFromNodeId).sort();
+    const peerCtx = node.peerContext.filter((p) => !isHashedPeerSetToken(stripPeerContextFromNodeId(p))).map(stripPeerContextFromNodeId).sort();
     if (peerEdgeTargets.length !== peerCtx.length || peerEdgeTargets.some((t, i) => t !== peerCtx[i])) {
       throw new GraphError("INVARIANT_VIOLATION", `peer edges of ${id} disagree with peerContext`);
     }
@@ -1262,6 +1267,7 @@ function parseFamily(input, _options, config) {
     if (entry.dev === true) nodeSide.dev = true;
     if (entry.optional === true) nodeSide.optional = true;
     if (entry.peer === true) nodeSide.peer = true;
+    if (entry.extraneous === true) nodeSide.extraneous = true;
     config.hooks?.captureEntry?.(srcId, entry);
     const isRoot = path === "";
     const isWorkspaceMember = workspaceByPath.has(path);
@@ -1391,10 +1397,13 @@ function stringifyFamily(graph, config, options = {}) {
   }
   for (const node of workspaceMembers) {
     packages[node.workspacePath] = buildWorkspaceMemberEntry(graph, node, sidecar, emitDiagnostic);
-    packages[`node_modules/${node.name}`] = {
-      resolved: node.workspacePath,
-      link: true
-    };
+    const extraneous = sidecar?.nodes.get(node.id)?.extraneous === true;
+    if (!extraneous) {
+      packages[`node_modules/${node.name}`] = {
+        resolved: node.workspacePath,
+        link: true
+      };
+    }
   }
   for (const node of graph.nodes()) {
     if (rootNode !== void 0 && node.id === rootNode.id) continue;

package/dist/formats/pnpm-v5.js

@@ -15,12 +15,17 @@ var LockfileError = class extends Error {
 };
 var CANONICAL_HASH_RE = /^[0-9a-f]{128}$/;
 var SENTINEL_RE = /^unresolved-[0-9a-f]{64}$/;
+var HASHED_PEER_SET_RE = /^[0-9a-f]{16,}$/;
 function isCanonicalHash(s) {
   return CANONICAL_HASH_RE.test(s);
 }
 function isSentinelPatch(s) {
   return SENTINEL_RE.test(s);
 }
+function isHashedPeerSetToken(seg) {
+  if (seg.startsWith("patch_hash=")) return false;
+  return HASHED_PEER_SET_RE.test(seg);
+}
 
 // src/main/ts/graph.ts
 var GraphError = class extends Error {
@@ -229,7 +234,7 @@ function validate(s) {
       throw new GraphError("INVARIANT_VIOLATION", `node id ${id} disagrees with derived id ${expected.join(" or ")}`);
     }
     const peerEdgeTargets = (s.outgoing.get(id) ?? []).filter((e) => e.kind === "peer").map((e) => stripPeerContextFromNodeId(e.dst)).sort();
-    const peerCtx = node.peerContext.map(stripPeerContextFromNodeId).sort();
+    const peerCtx = node.peerContext.filter((p) => !isHashedPeerSetToken(stripPeerContextFromNodeId(p))).map(stripPeerContextFromNodeId).sort();
     if (peerEdgeTargets.length !== peerCtx.length || peerEdgeTargets.some((t, i) => t !== peerCtx[i])) {
       throw new GraphError("INVARIANT_VIOLATION", `peer edges of ${id} disagree with peerContext`);
     }
@@ -973,8 +978,7 @@ function readBlockMap(reader, baseIndent) {
     const restValue = restClean.replace(/^ +/, "");
     reader.pos++;
     if (restValue === "") {
-      const child = readBlockMap(reader, baseIndent + 2);
-      out[key] = child;
+      out[key] = peekIsBlockSequence(reader, baseIndent) ? readBlockSequence(reader, baseIndent) : readBlockMap(reader, baseIndent + 2);
     } else if (restValue === "|" || restValue === ">") {
       while (reader.pos < reader.lines.length) {
         const next = reader.lines[reader.pos];
@@ -990,6 +994,40 @@ function readBlockMap(reader, baseIndent) {
   }
   return out;
 }
+function peekIsBlockSequence(reader, baseIndent) {
+  for (let i = reader.pos; i < reader.lines.length; i++) {
+    const line = reader.lines[i];
+    if (line === void 0) continue;
+    if (isBlankOrComment(line)) continue;
+    const indent = leadingSpaces(line);
+    if (indent < baseIndent) return false;
+    const content = line.slice(indent);
+    return content === "-" || content.startsWith("- ");
+  }
+  return false;
+}
+function readBlockSequence(reader, baseIndent) {
+  const out = [];
+  while (reader.pos < reader.lines.length) {
+    const line = reader.lines[reader.pos];
+    if (line === void 0) {
+      reader.pos++;
+      continue;
+    }
+    if (isBlankOrComment(line)) {
+      reader.pos++;
+      continue;
+    }
+    const indent = leadingSpaces(line);
+    if (indent < baseIndent) break;
+    const content = line.slice(indent);
+    if (content !== "-" && !content.startsWith("- ")) break;
+    const itemRaw = content === "-" ? "" : content.slice(2);
+    out.push(parseInlineValue(stripInlineComment(itemRaw).trim()));
+    reader.pos++;
+  }
+  return out;
+}
 function findKeyColon(content) {
   let inQuote = null;
   let depth = 0;
@@ -1289,12 +1327,18 @@ function isPlainObject2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function resolvePeerTargetById(seenIds, peerName, peerVersion) {
-  const bareId = `${peerName}@${peerVersion}`;
-  if (seenIds.has(bareId)) return bareId;
+  const fullId = `${peerName}@${peerVersion}`;
+  if (seenIds.has(fullId)) return fullId;
+  const suffixStart = peerVersion.indexOf("(");
+  const bareVersion = suffixStart === -1 ? peerVersion : peerVersion.slice(0, suffixStart);
+  const bareId = `${peerName}@${bareVersion}`;
+  if (bareId !== fullId && seenIds.has(bareId)) return bareId;
+  const prefix = bareId + "(";
+  let best;
   for (const id of seenIds) {
-    if (id.startsWith(bareId + "(")) return id;
+    if (id.startsWith(prefix) && (best === void 0 || id < best)) best = id;
   }
-  return void 0;
+  return best;
 }
 function resolveLinkPath(importerPath, relTarget) {
   if (importerPath === "." || importerPath === "") {
@@ -1340,6 +1384,7 @@ function tarballPayloadOf(entry, subject, diagnostics) {
   }
   if (Array.isArray(entry.cpu)) payload.cpu = entry.cpu.slice();
   if (Array.isArray(entry.os)) payload.os = entry.os.slice();
+  if (Array.isArray(entry.libc)) payload.libc = entry.libc.slice();
   if (entry.hasBin === true) payload.bin = "true";
   if (typeof entry.deprecated === "string") payload.deprecated = entry.deprecated;
   return Object.keys(payload).length === 0 ? void 0 : payload;
@@ -1725,12 +1770,67 @@ function stringify(graph, options = {}) {
     packages[key] = buildPackageEntry(graph, sidecar, node);
   }
   out.packages = packages;
+  assertResolveValid(graph, out, rootNode, resolvedNodes, emitDiagnostic);
   const text = emitYaml(out, {
     topLevelOrder: TOP_LEVEL_ORDER,
     topLevelSectionKeys: TOP_LEVEL_SECTION_KEYS
   });
   return options.lineEnding === "crlf" ? text.replace(/\n/g, "\r\n") : text;
 }
+function assertResolveValid(graph, out, rootNode, resolvedNodes, onDiagnostic) {
+  const seenIds = new Set(resolvedNodes.map((n) => n.id));
+  const importersMap = isPlainObject2(out.importers) ? out.importers : void 0;
+  const consumerBlockOf = (consumer) => {
+    const path2 = consumer.id === rootNode?.id ? "." : consumer.workspacePath ?? consumer.name;
+    if (importersMap !== void 0) {
+      const block = importersMap[path2];
+      return isPlainObject2(block) ? block : void 0;
+    }
+    return consumer.id === rootNode?.id ? out : void 0;
+  };
+  const packagesMap = isPlainObject2(out.packages) ? out.packages : void 0;
+  const packageBlockOf = (pkg) => {
+    const entry = packagesMap?.[packagesKeyForNode(pkg)];
+    return isPlainObject2(entry) ? entry : void 0;
+  };
+  const slotValue = (block, blockNames, seg) => {
+    for (const blockName of blockNames) {
+      const sub = block[blockName];
+      if (!isPlainObject2(sub)) continue;
+      const raw = sub[seg];
+      if (typeof raw === "string") return raw;
+    }
+    return void 0;
+  };
+  const isImporter = (node) => node.id === rootNode?.id || node.workspacePath !== void 0 && node.workspacePath !== "";
+  const consumerBlockNames = ["dependencies", "devDependencies", "optionalDependencies"];
+  const packageBlockNames = ["dependencies", "optionalDependencies"];
+  for (const consumer of graph.nodes()) {
+    const consumerIsImporter = isImporter(consumer);
+    if (!consumerIsImporter && !seenIds.has(consumer.id)) continue;
+    const block = consumerIsImporter ? consumerBlockOf(consumer) : packageBlockOf(consumer);
+    if (block === void 0) continue;
+    const blockNames = consumerIsImporter ? consumerBlockNames : packageBlockNames;
+    for (const edge of graph.out(consumer.id)) {
+      if (edge.kind !== "dep" && edge.kind !== "dev" && edge.kind !== "optional") continue;
+      const dst = graph.getNode(edge.dst);
+      if (dst === void 0) continue;
+      if (dst.workspacePath !== void 0 && dst.workspacePath !== "") continue;
+      if (!consumerIsImporter && (dst.id === consumer.id || dst.id === rootNode?.id)) continue;
+      const seg = edge.attrs?.alias ?? dst.name;
+      const value = slotValue(block, blockNames, seg);
+      const resolved = value === void 0 ? void 0 : resolveDependencyTarget(seenIds, seg, value) ?? resolveAliasedDependencyTarget(seenIds, value);
+      if (resolved !== dst.id) {
+        onDiagnostic({
+          code: "LAYOUT_RESOLVE_VIOLATION",
+          severity: "error",
+          subject: { src: edge.src, dst: edge.dst, kind: edge.kind },
+          message: `INV-RESOLVE violated: ${consumer.id} resolves ${JSON.stringify(seg)} to ${value === void 0 ? "(no slot)" : resolved === void 0 ? `${JSON.stringify(value)} \u2192 (nothing)` : resolved}, expected ${dst.id} (pnpm-v5 encoding defect \u2014 ADR-0028 INV-RESOLVE)`
+        });
+      }
+    }
+  }
+}
 function enrich(graph, options = {}) {
   const sidecar = sidecarByGraph.get(graph);
   const diagnostics = [];
@@ -2001,6 +2101,12 @@ function nodeIdToDependencyValue(node) {
   const tail = node.peerContext.length === 0 ? "" : node.peerContext.map((p) => `_${p}`).join("");
   return `${node.version}${tail}`;
 }
+function aliasedDependencySlot(edge, dst) {
+  const bareValue = nodeIdToDependencyValue(dst);
+  const alias = edge.attrs?.alias;
+  if (alias === void 0) return { key: dst.name, value: bareValue };
+  return { key: alias, value: `${dst.name}@${bareValue}` };
+}
 function buildImporterEntry(graph, sidecar, node, importerPath) {
   const entry = {};
   if (node === void 0) return entry;
@@ -2020,12 +2126,15 @@ function buildImporterEntry(graph, sidecar, node, importerPath) {
     const isWorkspaceTarget = dst.workspacePath !== void 0 && dst.workspacePath !== "";
     const edgeKey = `${edge.src}\0${edge.kind}\0${edge.dst}`;
     const edgeSc = sidecar?.importerEdges.get(edgeKey);
+    const slot = aliasedDependencySlot(edge, dst);
+    const isAliased = edge.attrs?.alias !== void 0;
     const range = edge.attrs?.range;
-    const specifierFromSidecar = importerSpecs?.[dst.name];
-    const specifier = edgeSc?.specifier ?? specifierFromSidecar ?? range ?? dst.version;
-    const version = isWorkspaceTarget ? `link:${relativeImporterPath(importerPath, dst.workspacePath ?? dst.name)}` : edgeSc?.resolvedVersion ?? nodeIdToDependencyValue(dst);
-    blocks[edge.kind][dst.name] = version;
-    specifiers[dst.name] = specifier;
+    const specifierFromSidecar = importerSpecs?.[slot.key];
+    const captureIsAliasConsistent = edgeSc?.resolvedVersion?.startsWith(`${dst.name}@`) === true;
+    const specifier = isAliased ? range ?? specifierFromSidecar ?? edgeSc?.specifier ?? dst.version : edgeSc?.specifier ?? specifierFromSidecar ?? range ?? dst.version;
+    const version = isWorkspaceTarget ? `link:${relativeImporterPath(importerPath, dst.workspacePath ?? dst.name)}` : isAliased ? captureIsAliasConsistent ? edgeSc.resolvedVersion : slot.value : edgeSc?.resolvedVersion ?? slot.value;
+    blocks[edge.kind][slot.key] = version;
+    specifiers[slot.key] = specifier;
   }
   if (Object.keys(specifiers).length > 0) {
     entry.specifiers = sortRecord(specifiers);
@@ -2084,7 +2193,8 @@ function buildPackageEntry(graph, sidecar, representative) {
     if (dst.workspacePath !== void 0 && dst.workspacePath !== "") continue;
     if (dst.id === sidecar?.rootId) continue;
     const block = blocks[edge.kind];
-    block[dst.name] = nodeIdToDependencyValue(dst);
+    const slot = aliasedDependencySlot(edge, dst);
+    block[slot.key] = slot.value;
   }
   for (const [kind, blockName] of [["dep", "dependencies"], ["optional", "optionalDependencies"]]) {
     const block = blocks[kind];