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

package/SCHEMAS.md

@@ -33,6 +33,7 @@ berry's `__metadata`.
 | `yarn-berry-v6`   | `__metadata.version: 6`      | yarn `>=3.2 <4`      | yarn `>=3.2` |
 | `yarn-berry-v8`   | `__metadata.version: 8`      | yarn `>=4.0 <4.14`   | yarn `>=4` |
 | `yarn-berry-v9`   | `__metadata.version: 9`      | yarn `>=4.14`        | yarn `>=4.14` |
+| `yarn-berry-v10`  | `__metadata.version: 10`     | yarn 5 (dev branch)  | yarn 5+ (preview — reverse-engineered from yarnpkg/berry master) |
 
 **Schema numbers that don't exist:**
 - `__metadata.version: 1` and `2` were never used by berry.

package/dist/{_npm-flat-types-5XRp-_Te.d.ts → _npm-flat-types-BtjAgSy6.d.ts}

@@ -1,10 +1,14 @@
-import { D as Diagnostic } from './graph-DbCmOfBk.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-DtT-PfX-.d.ts → _pnpm-flat-core-u9QE3m8R.d.ts}

@@ -1,4 +1,4 @@
-import { D as Diagnostic } from './graph-DbCmOfBk.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-nexIf1L1.d.ts → _yarn-berry-core-tgctDDH2.d.ts}

@@ -1,4 +1,4 @@
-import { D as Diagnostic } from './graph-DbCmOfBk.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-DbCmOfBk.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-DbCmOfBk.js';
+import { D as Diagnostic, G as Graph } from '../graph-DlYNIpXt.js';
 
 interface BunTextParseOptions {
 }

package/dist/formats/bun-text.js

@@ -98,9 +98,13 @@ function tarballKeyInputsOfNode(node) {
   };
 }
 var cmpStr = (a, b) => a < b ? -1 : a > b ? 1 : 0;
+var cmpAlias = (a, b) => a === b ? 0 : a === void 0 ? -1 : b === void 0 ? 1 : cmpStr(a, b);
 var cmpEdgeBy = (end) => (a, b) => {
   const c = cmpStr(end === "dst" ? a.dst : a.src, end === "dst" ? b.dst : b.src);
-  return c !== 0 ? c : cmpStr(a.kind, b.kind);
+  if (c !== 0) return c;
+  const k = cmpStr(a.kind, b.kind);
+  if (k !== 0) return k;
+  return cmpAlias(a.attrs?.alias, b.attrs?.alias);
 };
 function emptyState() {
   return {
@@ -136,7 +140,7 @@ function removeMatching(arr, pred) {
   arr.splice(i, 1);
   return true;
 }
-var tripleKey = (e) => `${e.src}\0${e.kind}\0${e.dst}`;
+var tripleKey = (e) => `${e.src}\0${e.kind}\0${e.dst}\0${e.attrs?.alias ?? ""}`;
 function rebindNodeId(s, oldId, newId, newNode) {
   s.nodes.set(newId, newNode);
   s.nodes.delete(oldId);
@@ -146,7 +150,9 @@ function rebindNodeId(s, oldId, newId, newNode) {
   for (const e of outs) {
     const peerInc = s.incoming.get(e.dst);
     if (peerInc) {
-      const idx = peerInc.findIndex((x) => x.src === oldId && x.kind === e.kind && x.dst === e.dst);
+      const idx = peerInc.findIndex(
+        (x) => x.src === oldId && x.kind === e.kind && x.dst === e.dst && x.attrs?.alias === e.attrs?.alias
+      );
       if (idx >= 0) peerInc[idx] = e;
     }
   }
@@ -156,11 +162,25 @@ function rebindNodeId(s, oldId, newId, newNode) {
   for (const e of ins) {
     const peerOut = s.outgoing.get(e.src);
     if (peerOut) {
-      const idx = peerOut.findIndex((x) => x.src === e.src && x.kind === e.kind && x.dst === oldId);
+      const idx = peerOut.findIndex(
+        (x) => x.src === e.src && x.kind === e.kind && x.dst === oldId && x.attrs?.alias === e.attrs?.alias
+      );
       if (idx >= 0) peerOut[idx] = e;
     }
   }
 }
+function protocolOf(range) {
+  const colonIdx = range.indexOf(":");
+  if (colonIdx <= 0) return void 0;
+  const prefix = range.slice(0, colonIdx);
+  return /^[a-z][a-z0-9+.-]*$/i.test(prefix) ? prefix : void 0;
+}
+function isPublishedSelfLink(edge) {
+  const range = edge.attrs?.range;
+  if (range === void 0) return false;
+  const proto = protocolOf(range);
+  return proto === void 0 || proto === "npm";
+}
 function validate(s) {
   for (const d of s.diagnostics) {
     if (d.severity === "error") {
@@ -178,16 +198,26 @@ function validate(s) {
       }
       const k = tripleKey(e);
       if (seen.has(k)) {
-        throw new GraphError("INVARIANT_VIOLATION", `duplicate edge: ${e.src} \u2192${e.kind} ${e.dst}`);
+        const aliasSuffix = e.attrs?.alias !== void 0 ? ` (alias=${e.attrs.alias})` : "";
+        throw new GraphError("INVARIANT_VIOLATION", `duplicate edge: ${e.src} \u2192${e.kind} ${e.dst}${aliasSuffix}`);
       }
       seen.add(k);
     }
   }
   for (const [id, node] of s.nodes) {
     if (node.workspacePath !== void 0) {
-      const inc = s.incoming.get(id);
-      const hasNonWorkspaceIncoming = inc?.some((edge) => s.nodes.get(edge.src)?.workspacePath === void 0) ?? false;
-      if (hasNonWorkspaceIncoming) {
+      const inc = s.incoming.get(id) ?? [];
+      for (const edge of inc) {
+        if (s.nodes.get(edge.src)?.workspacePath !== void 0) continue;
+        if (isPublishedSelfLink(edge)) {
+          s.diagnostics.push({
+            code: "SEAL_PUBLISHED_SELF_LINK",
+            subject: id,
+            severity: "info",
+            message: `published self-link: ${edge.src} \u2192${edge.kind} ${id} (range ${edge.attrs?.range}) \u2014 published dependency resolved to co-located workspace`
+          });
+          continue;
+        }
         throw new GraphError("INVARIANT_VIOLATION", `workspace node has incoming edges: ${id}`);
       }
     }
@@ -195,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`);
     }
@@ -468,8 +498,10 @@ var GraphImpl = class _GraphImpl {
         if (!next.nodes.has(src)) throw new GraphError("PATCH_REJECTED", `addEdge: src ${src} missing`);
         if (!next.nodes.has(dst)) throw new GraphError("PATCH_REJECTED", `addEdge: dst ${dst} missing`);
         const existing = next.outgoing.get(src) ?? [];
-        if (existing.some((e2) => e2.dst === dst && e2.kind === kind)) {
-          throw new GraphError("PATCH_REJECTED", `addEdge: duplicate ${src} \u2192${kind} ${dst}`);
+        const newAlias = attrs?.alias;
+        if (existing.some((e2) => e2.dst === dst && e2.kind === kind && e2.attrs?.alias === newAlias)) {
+          const aliasSuffix = newAlias !== void 0 ? ` (alias=${newAlias})` : "";
+          throw new GraphError("PATCH_REJECTED", `addEdge: duplicate ${src} \u2192${kind} ${dst}${aliasSuffix}`);
         }
         const e = attrs ? { src, dst, kind, attrs } : { src, dst, kind };
         pushTo(next.outgoing, src, e);
@@ -478,11 +510,15 @@ var GraphImpl = class _GraphImpl {
       },
       removeEdge(src, dst, kind) {
         const outs = next.outgoing.get(src);
-        if (!outs || !removeMatching(outs, (e) => e.dst === dst && e.kind === kind)) {
+        let removedAlias;
+        const found = outs?.findIndex((e) => e.dst === dst && e.kind === kind) ?? -1;
+        if (!outs || found < 0) {
           throw new GraphError("PATCH_REJECTED", `removeEdge: ${src} \u2192${kind} ${dst} missing`);
         }
+        removedAlias = outs[found]?.attrs?.alias;
+        outs.splice(found, 1);
         const ins = next.incoming.get(dst);
-        if (ins) removeMatching(ins, (e) => e.src === src && e.kind === kind);
+        if (ins) removeMatching(ins, (e) => e.src === src && e.kind === kind && e.attrs?.alias === removedAlias);
         applied.push({ kind: "edge-removed", subject: { src, dst, kind } });
       },
       replacePeerContext(id, peers) {
@@ -854,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-DbCmOfBk.js';
+import { D as Diagnostic, G as Graph } from '../graph-DlYNIpXt.js';
 
 interface Npm1ParseOptions {
 }

package/dist/formats/npm-1.js

@@ -99,9 +99,13 @@ function tarballKeyInputsOfNode(node) {
   };
 }
 var cmpStr = (a, b) => a < b ? -1 : a > b ? 1 : 0;
+var cmpAlias = (a, b) => a === b ? 0 : a === void 0 ? -1 : b === void 0 ? 1 : cmpStr(a, b);
 var cmpEdgeBy = (end) => (a, b) => {
   const c = cmpStr(end === "dst" ? a.dst : a.src, end === "dst" ? b.dst : b.src);
-  return c !== 0 ? c : cmpStr(a.kind, b.kind);
+  if (c !== 0) return c;
+  const k = cmpStr(a.kind, b.kind);
+  if (k !== 0) return k;
+  return cmpAlias(a.attrs?.alias, b.attrs?.alias);
 };
 function emptyState() {
   return {
@@ -137,7 +141,7 @@ function removeMatching(arr, pred) {
   arr.splice(i, 1);
   return true;
 }
-var tripleKey = (e) => `${e.src}\0${e.kind}\0${e.dst}`;
+var tripleKey = (e) => `${e.src}\0${e.kind}\0${e.dst}\0${e.attrs?.alias ?? ""}`;
 function rebindNodeId(s, oldId, newId, newNode) {
   s.nodes.set(newId, newNode);
   s.nodes.delete(oldId);
@@ -147,7 +151,9 @@ function rebindNodeId(s, oldId, newId, newNode) {
   for (const e of outs) {
     const peerInc = s.incoming.get(e.dst);
     if (peerInc) {
-      const idx = peerInc.findIndex((x) => x.src === oldId && x.kind === e.kind && x.dst === e.dst);
+      const idx = peerInc.findIndex(
+        (x) => x.src === oldId && x.kind === e.kind && x.dst === e.dst && x.attrs?.alias === e.attrs?.alias
+      );
       if (idx >= 0) peerInc[idx] = e;
     }
   }
@@ -157,11 +163,25 @@ function rebindNodeId(s, oldId, newId, newNode) {
   for (const e of ins) {
     const peerOut = s.outgoing.get(e.src);
     if (peerOut) {
-      const idx = peerOut.findIndex((x) => x.src === e.src && x.kind === e.kind && x.dst === oldId);
+      const idx = peerOut.findIndex(
+        (x) => x.src === e.src && x.kind === e.kind && x.dst === oldId && x.attrs?.alias === e.attrs?.alias
+      );
       if (idx >= 0) peerOut[idx] = e;
     }
   }
 }
+function protocolOf(range) {
+  const colonIdx = range.indexOf(":");
+  if (colonIdx <= 0) return void 0;
+  const prefix = range.slice(0, colonIdx);
+  return /^[a-z][a-z0-9+.-]*$/i.test(prefix) ? prefix : void 0;
+}
+function isPublishedSelfLink(edge) {
+  const range = edge.attrs?.range;
+  if (range === void 0) return false;
+  const proto = protocolOf(range);
+  return proto === void 0 || proto === "npm";
+}
 function validate(s) {
   for (const d of s.diagnostics) {
     if (d.severity === "error") {
@@ -179,16 +199,26 @@ function validate(s) {
       }
       const k = tripleKey(e);
       if (seen.has(k)) {
-        throw new GraphError("INVARIANT_VIOLATION", `duplicate edge: ${e.src} \u2192${e.kind} ${e.dst}`);
+        const aliasSuffix = e.attrs?.alias !== void 0 ? ` (alias=${e.attrs.alias})` : "";
+        throw new GraphError("INVARIANT_VIOLATION", `duplicate edge: ${e.src} \u2192${e.kind} ${e.dst}${aliasSuffix}`);
       }
       seen.add(k);
     }
   }
   for (const [id, node] of s.nodes) {
     if (node.workspacePath !== void 0) {
-      const inc = s.incoming.get(id);
-      const hasNonWorkspaceIncoming = inc?.some((edge) => s.nodes.get(edge.src)?.workspacePath === void 0) ?? false;
-      if (hasNonWorkspaceIncoming) {
+      const inc = s.incoming.get(id) ?? [];
+      for (const edge of inc) {
+        if (s.nodes.get(edge.src)?.workspacePath !== void 0) continue;
+        if (isPublishedSelfLink(edge)) {
+          s.diagnostics.push({
+            code: "SEAL_PUBLISHED_SELF_LINK",
+            subject: id,
+            severity: "info",
+            message: `published self-link: ${edge.src} \u2192${edge.kind} ${id} (range ${edge.attrs?.range}) \u2014 published dependency resolved to co-located workspace`
+          });
+          continue;
+        }
         throw new GraphError("INVARIANT_VIOLATION", `workspace node has incoming edges: ${id}`);
       }
     }
@@ -196,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`);
     }
@@ -469,8 +499,10 @@ var GraphImpl = class _GraphImpl {
         if (!next.nodes.has(src)) throw new GraphError("PATCH_REJECTED", `addEdge: src ${src} missing`);
         if (!next.nodes.has(dst)) throw new GraphError("PATCH_REJECTED", `addEdge: dst ${dst} missing`);
         const existing = next.outgoing.get(src) ?? [];
-        if (existing.some((e2) => e2.dst === dst && e2.kind === kind)) {
-          throw new GraphError("PATCH_REJECTED", `addEdge: duplicate ${src} \u2192${kind} ${dst}`);
+        const newAlias = attrs?.alias;
+        if (existing.some((e2) => e2.dst === dst && e2.kind === kind && e2.attrs?.alias === newAlias)) {
+          const aliasSuffix = newAlias !== void 0 ? ` (alias=${newAlias})` : "";
+          throw new GraphError("PATCH_REJECTED", `addEdge: duplicate ${src} \u2192${kind} ${dst}${aliasSuffix}`);
         }
         const e = attrs ? { src, dst, kind, attrs } : { src, dst, kind };
         pushTo(next.outgoing, src, e);
@@ -479,11 +511,15 @@ var GraphImpl = class _GraphImpl {
       },
       removeEdge(src, dst, kind) {
         const outs = next.outgoing.get(src);
-        if (!outs || !removeMatching(outs, (e) => e.dst === dst && e.kind === kind)) {
+        let removedAlias;
+        const found = outs?.findIndex((e) => e.dst === dst && e.kind === kind) ?? -1;
+        if (!outs || found < 0) {
           throw new GraphError("PATCH_REJECTED", `removeEdge: ${src} \u2192${kind} ${dst} missing`);
         }
+        removedAlias = outs[found]?.attrs?.alias;
+        outs.splice(found, 1);
         const ins = next.incoming.get(dst);
-        if (ins) removeMatching(ins, (e) => e.src === src && e.kind === kind);
+        if (ins) removeMatching(ins, (e) => e.src === src && e.kind === kind && e.attrs?.alias === removedAlias);
         applied.push({ kind: "edge-removed", subject: { src, dst, kind } });
       },
       replacePeerContext(id, peers) {

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

@@ -1,5 +1,5 @@
-import { G as Graph, D as Diagnostic } from '../graph-DbCmOfBk.js';
-import { N as NpmFamilyEnrichOptions, a as NpmFamilyOptimizeOptions, b as NpmFamilyParseOptions, c as NpmFamilyStringifyOptions } from '../_npm-flat-types-5XRp-_Te.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 {
 }