@antongolub/lockfile 0.0.0-snapshot.46 → 0.0.0-snapshot.47

package/dist/{_npm-flat-types-C3oOIC0o.d.ts → _npm-flat-types-BtjAgSy6.d.ts}

@@ -1,10 +1,14 @@
-import { D as Diagnostic } from './graph-XpDkFSjz.js';
+import { D as Diagnostic, O as OverrideConstraint } from './graph-DlYNIpXt.js';
 
 interface NpmFamilyParseOptions {
 }
 interface NpmFamilyStringifyOptions {
     lineEnding?: 'lf' | 'crlf';
     onDiagnostic?: (diagnostic: Diagnostic) => void;
+    /** Caller-declared overrides (ADR-0025 §4) projected into the root entry's
+     *  `overrides` block at `packages[""]`. npm-1 (no packages block) cannot
+     *  carry them — a loss diagnostic fires instead. */
+    overrides?: OverrideConstraint[];
 }
 interface NpmFamilyEnrichOptions {
 }

package/dist/{_pnpm-flat-core-C5VUToQP.d.ts → _pnpm-flat-core-u9QE3m8R.d.ts}

@@ -1,4 +1,4 @@
-import { D as Diagnostic } from './graph-XpDkFSjz.js';
+import { D as Diagnostic, O as OverrideConstraint } from './graph-DlYNIpXt.js';
 
 interface PnpmFamilyParseOptions {
     /**
@@ -15,6 +15,10 @@ interface PnpmFamilyStringifyOptions {
     lineEnding?: 'lf' | 'crlf';
     settings?: PnpmSettings;
     onDiagnostic?: (diagnostic: Diagnostic) => void;
+    /** Caller-declared overrides (ADR-0025 §4) overlaid onto the pnpm
+     *  `overrides:` block. Caller wins per key; pre-existing `patch:` directives
+     *  (F2) survive on collision. */
+    overrides?: OverrideConstraint[];
 }
 interface PnpmManifest {
     name?: string;

package/dist/{_yarn-berry-core-sjtp6At6.d.ts → _yarn-berry-core-tgctDDH2.d.ts}

@@ -1,4 +1,4 @@
-import { D as Diagnostic } from './graph-XpDkFSjz.js';
+import { D as Diagnostic } from './graph-DlYNIpXt.js';
 
 interface YarnBerryFamilyParseOptions {
     workspaceRoot?: string;

package/dist/complete.d.ts

@@ -1,4 +1,4 @@
-import { N as NodeId, D as Diagnostic, G as Graph, E as EdgeTriple, a as Node, b as EdgeKind } from './graph-XpDkFSjz.js';
+import { N as NodeId, D as Diagnostic, G as Graph, E as EdgeTriple, a as Node, b as EdgeKind } from './graph-DlYNIpXt.js';
 import { R as RegistryAdapter } from './types-Ci06KZkZ.js';
 
 interface CompletionSeed {

package/dist/formats/bun-text.d.ts

@@ -1,4 +1,4 @@
-import { D as Diagnostic, G as Graph } from '../graph-XpDkFSjz.js';
+import { D as Diagnostic, G as Graph } from '../graph-DlYNIpXt.js';
 
 interface BunTextParseOptions {
 }

package/dist/formats/bun-text.js

@@ -225,8 +225,8 @@ function validate(s) {
     if (!expected.includes(id)) {
       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) => e.dst).sort();
-    const peerCtx = node.peerContext.slice().sort();
+    const peerEdgeTargets = (s.outgoing.get(id) ?? []).filter((e) => e.kind === "peer").map((e) => stripPeerContextFromNodeId(e.dst)).sort();
+    const peerCtx = node.peerContext.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`);
     }
@@ -890,8 +890,11 @@ function parse(input, _options = {}) {
     if (srcId === void 0) continue;
     addBlockEdges(builder, diagnostics, srcId, ws.manifest, packageByName, workspaceByPath, peerDeclarations);
   }
+  const emittedSrc = /* @__PURE__ */ new Set();
   for (const [packagesKey, entry] of entriesByKey) {
     if (entry.inner === void 0) continue;
+    if (emittedSrc.has(entry.id)) continue;
+    emittedSrc.add(entry.id);
     const consumerScope = buildConsumerScope(packagesKey, packages, packageByName);
     addBlockEdges(builder, diagnostics, entry.id, entry.inner, consumerScope, void 0, peerDeclarations);
   }

package/dist/formats/npm-1.d.ts

@@ -1,4 +1,4 @@
-import { D as Diagnostic, G as Graph } from '../graph-XpDkFSjz.js';
+import { D as Diagnostic, G as Graph } from '../graph-DlYNIpXt.js';
 
 interface Npm1ParseOptions {
 }

package/dist/formats/npm-1.js

@@ -226,8 +226,8 @@ function validate(s) {
     if (!expected.includes(id)) {
       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) => e.dst).sort();
-    const peerCtx = node.peerContext.slice().sort();
+    const peerEdgeTargets = (s.outgoing.get(id) ?? []).filter((e) => e.kind === "peer").map((e) => stripPeerContextFromNodeId(e.dst)).sort();
+    const peerCtx = node.peerContext.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.d.ts

@@ -1,5 +1,5 @@
-import { G as Graph, D as Diagnostic } from '../graph-XpDkFSjz.js';
-import { N as NpmFamilyEnrichOptions, a as NpmFamilyOptimizeOptions, b as NpmFamilyParseOptions, c as NpmFamilyStringifyOptions } from '../_npm-flat-types-C3oOIC0o.js';
+import { G as Graph, D as Diagnostic } from '../graph-DlYNIpXt.js';
+import { N as NpmFamilyEnrichOptions, a as NpmFamilyOptimizeOptions, b as NpmFamilyParseOptions, c as NpmFamilyStringifyOptions } from '../_npm-flat-types-BtjAgSy6.js';
 
 interface Npm2ParseOptions extends NpmFamilyParseOptions {
 }

package/dist/formats/npm-2.js

@@ -239,8 +239,8 @@ function validate(s) {
     if (!expected.includes(id)) {
       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) => e.dst).sort();
-    const peerCtx = node.peerContext.slice().sort();
+    const peerEdgeTargets = (s.outgoing.get(id) ?? []).filter((e) => e.kind === "peer").map((e) => stripPeerContextFromNodeId(e.dst)).sort();
+    const peerCtx = node.peerContext.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`);
     }
@@ -706,6 +706,20 @@ function emitWorkspaceUnresolved(edge, onDiagnostic) {
   if (onDiagnostic === void 0) return;
   onDiagnostic(workspaceUnresolvedDiagnostic(edge));
 }
+function recipeOverrideNormalised(pm, count) {
+  return {
+    code: "RECIPE_OVERRIDE_NORMALISED",
+    severity: "info",
+    message: `captured ${count} ${pm} override${count === 1 ? "" : "s"} into canonical form`
+  };
+}
+function overrideParentRefDropped(pkg, to) {
+  return {
+    code: "OVERRIDE_PARENT_REF_DROPPED",
+    severity: "warning",
+    message: `override ${pkg}=${to}: npm $name self-ref has no yarn/pnpm equivalent; emitted verbatim`
+  };
+}
 
 // src/main/ts/recipe/resolution.ts
 var HEX40_RE = /^[0-9a-f]{40}$/i;
@@ -929,6 +943,161 @@ function workspaceRangeOfEdge(edge, dst) {
   return { specifier: canonicalSpecifier, resolvedVersion: dst.version };
 }
 
+// src/main/ts/recipe/overrides.ts
+function splitNameVersion(selector) {
+  let depth = 0;
+  let lastAt = -1;
+  for (let i = 0; i < selector.length; i++) {
+    const c = selector[i];
+    if (c === "(") depth++;
+    else if (c === ")") depth--;
+    else if (c === "@" && depth === 0 && i >= 1) lastAt = i;
+  }
+  if (lastAt <= 0) return { package: selector };
+  const name = selector.slice(0, lastAt);
+  const version = selector.slice(lastAt + 1);
+  if (name.length === 0 || version.length === 0) return { package: selector };
+  return { package: name, versionCondition: version };
+}
+function captureOverrides(block, pm, onDiagnostic) {
+  if (block === null || typeof block !== "object") {
+    return { canonical: [], native: {} };
+  }
+  let canonical;
+  const native = {};
+  switch (pm) {
+    case "npm": {
+      native.npmOverrides = block;
+      canonical = captureNpm(block, []);
+      break;
+    }
+    case "yarn": {
+      const flat = asStringRecord(block);
+      native.yarnResolutions = flat;
+      canonical = captureFlat(flat, splitYarnKey);
+      break;
+    }
+    case "pnpm": {
+      const flat = asStringRecord(block);
+      native.pnpmOverrides = flat;
+      canonical = captureFlat(flat, splitPnpmKey);
+      break;
+    }
+  }
+  onDiagnostic?.(recipeOverrideNormalised(pm, canonical.length));
+  return { canonical, native };
+}
+function captureNpm(block, parentPath) {
+  const out = [];
+  for (const [key, value] of Object.entries(block)) {
+    if (key === ".") {
+      if (parentPath.length === 0) continue;
+      const pkg2 = parentPath[parentPath.length - 1];
+      const ancestors = parentPath.slice(0, -1);
+      if (typeof value === "string") out.push(constraint(pkg2, ancestors, value));
+      continue;
+    }
+    const { package: pkg } = splitNameVersion(key);
+    if (typeof value === "string") {
+      out.push(constraint(pkg, parentPath, value));
+    } else if (value !== null && typeof value === "object") {
+      out.push(...captureNpm(value, [...parentPath, pkg]));
+    }
+  }
+  return out;
+}
+function captureFlat(flat, splitKey) {
+  const out = [];
+  for (const [key, to] of Object.entries(flat)) {
+    const { package: pkg, parentPath, versionCondition } = splitKey(key);
+    out.push(constraint(pkg, parentPath, to, versionCondition));
+  }
+  return out;
+}
+function splitYarnKey(key) {
+  const segments = splitYarnPathSegments(key);
+  const leaf = segments[segments.length - 1];
+  const { package: pkg, versionCondition } = splitNameVersion(leaf);
+  const parentPath = segments.slice(0, -1).filter((s) => s !== "**");
+  return versionCondition !== void 0 ? { package: pkg, parentPath, versionCondition } : { package: pkg, parentPath };
+}
+function splitYarnPathSegments(key) {
+  const raw = key.split("/");
+  const segments = [];
+  for (let i = 0; i < raw.length; i++) {
+    const piece = raw[i];
+    if (piece.startsWith("@") && i + 1 < raw.length) {
+      segments.push(`${piece}/${raw[i + 1]}`);
+      i++;
+    } else {
+      segments.push(piece);
+    }
+  }
+  return segments;
+}
+function splitPnpmKey(key) {
+  const segments = key.split(">").filter((s) => s.length > 0);
+  const leaf = segments[segments.length - 1];
+  const { package: pkg, versionCondition } = splitNameVersion(leaf);
+  const parentPath = segments.slice(0, -1).map((s) => splitNameVersion(s).package);
+  return versionCondition !== void 0 ? { package: pkg, parentPath, versionCondition } : { package: pkg, parentPath };
+}
+function constraint(pkg, parentPath, to, versionCondition) {
+  const c = { package: pkg, to };
+  if (parentPath.length > 0) c.parentPath = parentPath;
+  if (versionCondition !== void 0 && versionCondition !== "") {
+    c.versionCondition = versionCondition;
+  }
+  if (to.startsWith("$")) c.selfRef = true;
+  return c;
+}
+function asStringRecord(block) {
+  const out = {};
+  for (const [k, v] of Object.entries(block)) {
+    if (typeof v === "string") out[k] = v;
+  }
+  return out;
+}
+function projectOverrides(canonical, pm, onDiagnostic) {
+  return pm === "npm" ? projectNpm(canonical) : projectPnpm(canonical, onDiagnostic);
+}
+function projectNpm(canonical) {
+  const root = {};
+  for (const c of canonical) {
+    const leafKey = c.versionCondition ? `${c.package}@${c.versionCondition}` : c.package;
+    let node = root;
+    for (const seg of c.parentPath ?? []) {
+      const existing = node[seg];
+      if (typeof existing === "object" && existing !== null) {
+        node = existing;
+      } else {
+        const nested = typeof existing === "string" ? { ".": existing } : {};
+        node[seg] = nested;
+        node = nested;
+      }
+    }
+    const existingLeaf = node[leafKey];
+    if (existingLeaf !== null && typeof existingLeaf === "object") {
+      existingLeaf["."] = c.to;
+    } else {
+      node[leafKey] = c.to;
+    }
+  }
+  return root;
+}
+function projectPnpm(canonical, onDiagnostic) {
+  const out = {};
+  for (const c of canonical) {
+    const leaf = c.versionCondition ? `${c.package}@${c.versionCondition}` : c.package;
+    const key = c.parentPath && c.parentPath.length > 0 ? `${c.parentPath.join(">")}>${leaf}` : leaf;
+    if (c.selfRef && onDiagnostic !== void 0) {
+      onDiagnostic(overrideParentRefDropped(c.package, c.to));
+    }
+    out[key] = c.to;
+  }
+  return out;
+}
+
 // src/main/ts/formats/_npm-flat-types.ts
 var cmpStr2 = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 function sortRecord(record) {
@@ -984,10 +1153,15 @@ function parseFamily(input, _options, config) {
   const workspaceByPath = /* @__PURE__ */ new Map();
   const pathToId = /* @__PURE__ */ new Map();
   const idToEntry = /* @__PURE__ */ new Map();
-  const rootName = rootEntry.name ?? lf.name;
-  const rootVersion = rootEntry.version ?? lf.version;
-  if (rootName === void 0 || rootVersion === void 0) {
-    throw parseFailed(config, "root entry must carry name and version");
+  const rootName = rootEntry.name ?? lf.name ?? ".";
+  const rootVersion = rootEntry.version ?? lf.version ?? "0.0.0";
+  if (rootEntry.version === void 0 && lf.version === void 0) {
+    builder.diagnostic({
+      code: `${config.diagnosticPrefix}_ROOT_VERSION_SYNTHESIZED`,
+      severity: "info",
+      subject: "graph",
+      message: `private root entry carries no version; synthesised '${rootVersion}'`
+    });
   }
   const rootId = `${rootName}@${rootVersion}`;
   pathToId.set("", rootId);
@@ -999,15 +1173,30 @@ function parseFamily(input, _options, config) {
     peerContext: [],
     workspacePath: ""
   });
+  const linkNameByPath = /* @__PURE__ */ new Map();
+  for (const [key, entry] of Object.entries(packages)) {
+    if (entry.link !== true || typeof entry.resolved !== "string") continue;
+    const at = key.lastIndexOf("node_modules/");
+    if (at < 0) continue;
+    const linkName = key.slice(at + "node_modules/".length);
+    if (!linkNameByPath.has(entry.resolved)) linkNameByPath.set(entry.resolved, linkName);
+  }
   for (const [path, entry] of Object.entries(packages)) {
     if (path === "" || path.startsWith("node_modules/")) continue;
     if (path.includes("/node_modules/")) continue;
     if (entry.link === true) continue;
-    const name = entry.name;
-    const version = entry.version;
-    if (name === void 0 || version === void 0) {
-      throw parseFailed(config, `workspace entry ${JSON.stringify(path)} missing name/version`);
+    const synthName = entry.name ?? linkNameByPath.get(path) ?? path.slice(path.lastIndexOf("/") + 1);
+    const synthVersion = entry.version ?? "0.0.0";
+    if (entry.name === void 0 || entry.version === void 0) {
+      builder.diagnostic({
+        code: `${config.diagnosticPrefix}_WORKSPACE_MEMBER_SYNTHESIZED`,
+        severity: "info",
+        subject: "graph",
+        message: `private workspace member ${JSON.stringify(path)} omits ${entry.name === void 0 ? "name" : ""}${entry.name === void 0 && entry.version === void 0 ? "/" : ""}${entry.version === void 0 ? "version" : ""}; synthesised ${synthName}@${synthVersion}`
+      });
     }
+    const name = synthName;
+    const version = synthVersion;
     const id = `${name}@${version}`;
     if (idToEntry.has(id) && idToEntry.get(id) !== entry) {
       throw new LockfileError({
@@ -1040,6 +1229,9 @@ function parseFamily(input, _options, config) {
       pathToId.set(path, targetId);
       continue;
     }
+    if (entry.version === void 0 && entry.resolved === void 0 && entry.optional === true) {
+      continue;
+    }
     const tailName = nameFromInstallPath(config, path, entry);
     const version = entry.version;
     if (version === void 0) {
@@ -1103,6 +1295,13 @@ function parseFamily(input, _options, config) {
   if (rootEntry.devDependencies !== void 0) rootMeta.devDependencies = { ...rootEntry.devDependencies };
   if (rootEntry.peerDependencies !== void 0) rootMeta.peerDependencies = { ...rootEntry.peerDependencies };
   if (rootEntry.optionalDependencies !== void 0) rootMeta.optionalDependencies = { ...rootEntry.optionalDependencies };
+  if (rootEntry.overrides !== void 0) {
+    const captured = captureOverrides(rootEntry.overrides, "npm", (d) => diagnostics.push(d));
+    if (captured.canonical.length > 0) rootMeta.overrides = captured.canonical;
+    if (captured.native.npmOverrides !== void 0) {
+      rootMeta.nativeOverrides = captured.native.npmOverrides;
+    }
+  }
   for (const sc of nodeSidecar.values()) {
     sc.installPaths = Array.from(new Set(sc.installPaths)).sort(cmpStr2);
   }
@@ -1159,6 +1358,28 @@ function stringifyFamily(graph, config, options = {}) {
   } else {
     packages[""] = { name: rootName, version: rootVersion };
   }
+  let overrideBlock;
+  if (options.overrides !== void 0) {
+    if (options.overrides.length > 0) {
+      overrideBlock = projectOverrides(options.overrides, "npm", emitDiagnostic);
+    }
+  } else if (rootMeta?.nativeOverrides !== void 0) {
+    overrideBlock = rootMeta.nativeOverrides;
+  } else if (rootMeta?.overrides !== void 0 && rootMeta.overrides.length > 0) {
+    overrideBlock = projectOverrides(rootMeta.overrides, "npm", emitDiagnostic);
+  }
+  if (overrideBlock !== void 0) {
+    const rootEntry = packages[""];
+    if (config.lockfileVersion >= 2 && typeof rootEntry === "object" && rootEntry !== null) {
+      rootEntry.overrides = overrideBlock;
+    } else {
+      emitDiagnostic({
+        code: `${config.diagnosticPrefix}_OVERRIDES_UNSUPPORTED`,
+        severity: "warning",
+        message: `lockfileVersion ${config.lockfileVersion} has no packages[""].overrides slot; ${Object.keys(overrideBlock).length} override key(s) not projected`
+      });
+    }
+  }
   const workspaceMembers = [];
   for (const node of graph.nodes()) {
     warnPatchDrop(config, node, warnedPatches, emitDiagnostic);
@@ -1541,8 +1762,9 @@ function deriveInstallPathsForStringify(graph, sidecar, rootNode) {
       for (const edge of edges) {
         const dst = graph.getNode(edge.dst);
         if (dst === void 0 || dst.workspacePath !== void 0) continue;
-        if (resolveDepTarget(current.path, dst.name, pathToId) === dst.id) continue;
-        const installPath = current.path === "" ? `node_modules/${dst.name}` : `${current.path}/node_modules/${dst.name}`;
+        const segment = edge.attrs?.alias ?? dst.name;
+        if (resolveDepTarget(current.path, segment, pathToId) === dst.id) continue;
+        const installPath = current.path === "" ? `node_modules/${segment}` : `${current.path}/node_modules/${segment}`;
         addPlacement(dst.id, installPath);
       }
     }

package/dist/formats/npm-3.d.ts

@@ -1,5 +1,5 @@
-import { G as Graph, D as Diagnostic } from '../graph-XpDkFSjz.js';
-import { N as NpmFamilyEnrichOptions, a as NpmFamilyOptimizeOptions, b as NpmFamilyParseOptions, c as NpmFamilyStringifyOptions } from '../_npm-flat-types-C3oOIC0o.js';
+import { G as Graph, D as Diagnostic } from '../graph-DlYNIpXt.js';
+import { N as NpmFamilyEnrichOptions, a as NpmFamilyOptimizeOptions, b as NpmFamilyParseOptions, c as NpmFamilyStringifyOptions } from '../_npm-flat-types-BtjAgSy6.js';
 
 interface Npm3ParseOptions extends NpmFamilyParseOptions {
 }