@antongolub/lockfile 0.0.0-snapshot.61 → 0.0.0-snapshot.62

package/README.md

@@ -24,6 +24,13 @@ Published as `0.0.0-snapshot.*` builds — the first stable release is pending.
 [SCHEMAS.md](./SCHEMAS.md) maps each format id to the package-manager versions
 that emit it.
 
+> **ℹ️ Active R&D — snapshot channel.** While the project is under active research &
+> development, every release ships to the **snapshot channel** (`0.0.0-snapshot.N`,
+> published under the `snapshot` npm dist-tag) rather than `latest`. Install the newest
+> snapshot with `npm i @antongolub/lockfile@snapshot`, or pin an exact build
+> (e.g. `npm i @antongolub/lockfile@0.0.0-snapshot.61`). The first stable `latest`
+> release is pending.
+
 | Format | `detect` | `parse` | `stringify` |
 |--------|:-:|:-:|:-:|
 | `npm-1` · `npm-2` · `npm-3`        | ✓ | ✓ | ✓ |

package/dist/{_npm-flat-types-C6TSaidU.d.ts → _npm-flat-types-CNIJpuMe.d.ts}

@@ -1,4 +1,4 @@
-import { D as Diagnostic, O as OverrideConstraint } from './graph-B_G4OKqF.js';
+import { D as Diagnostic, O as OverrideConstraint } from './graph-1poNzYjw.js';
 
 interface NpmFamilyParseOptions {
 }

package/dist/{_pnpm-flat-core-NEg8x-yf.d.ts → _pnpm-flat-core-Bx_-WTrC.d.ts}

@@ -1,4 +1,4 @@
-import { D as Diagnostic, O as OverrideConstraint } from './graph-B_G4OKqF.js';
+import { D as Diagnostic, O as OverrideConstraint } from './graph-1poNzYjw.js';
 
 interface PnpmFamilyParseOptions {
     /**

package/dist/{_yarn-berry-core-CLT-3m_j.d.ts → _yarn-berry-core-B56PpQ7F.d.ts}

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

package/dist/complete.d.ts

@@ -1,5 +1,5 @@
-import { N as NodeId, D as Diagnostic, G as Graph, E as EdgeTriple, a as Node, b as EdgeKind } from './graph-B_G4OKqF.js';
-import { R as RegistryAdapter } from './types-CGeGAM7Z.js';
+import { N as NodeId, D as Diagnostic, G as Graph, E as EdgeTriple, a as Node, b as EdgeKind } from './graph-1poNzYjw.js';
+import { R as RegistryAdapter } from './types-DC8j2G_4.js';
 
 interface CompletionSeed {
     /** NodeIds the modifier added in the just-completed mutate phase. */

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

@@ -1,9 +1,18 @@
-import { D as Diagnostic, G as Graph } from '../graph-B_G4OKqF.js';
+import { O as OverrideConstraint, D as Diagnostic, G as Graph } from '../graph-1poNzYjw.js';
 
 interface BunTextParseOptions {
 }
 interface BunTextStringifyOptions {
     lineEnding?: 'lf' | 'crlf';
+    /**
+     * Caller-supplied canonical override constraints (ADR-0025). bun's `overrides`
+     * block is npm-shaped, so these project through the npm grammar
+     * (`projectOverrides(_, 'npm')`). An explicit `[]` suppresses the verbatim
+     * carrier captured at parse; `undefined` falls back to it. This is the
+     * audit-fix write path — `pinOverride` results land here as a forced
+     * resolution into bun's top-level `overrides`.
+     */
+    overrides?: OverrideConstraint[];
     onDiagnostic?: (diagnostic: Diagnostic) => void;
 }
 interface BunTextManifest {
@@ -19,6 +28,14 @@ interface BunTextEnrichOptions {
 }
 interface BunTextOptimizeOptions {
 }
+/**
+ * Canonical override constraints captured from a bun-text graph's top-level
+ * `overrides` block (ADR-0025 §6, A2). Mirrors `getPnpmOverridesCanonical` /
+ * npm's `rootMeta.overrides` so `index.ts` `overridesOf` can fold a bun source's
+ * overrides into a cross-PM conversion. Returns undefined when the graph carries
+ * no overrides block (or the sidecar was lost to a bare `mutate`).
+ */
+declare function getBunOverridesCanonical(graph: Graph): OverrideConstraint[] | undefined;
 declare function check(input: string): boolean;
 declare function parse(input: string, _options?: BunTextParseOptions): Graph;
 declare function stringify(graph: Graph, options?: BunTextStringifyOptions): string;
@@ -31,4 +48,4 @@ declare function optimize(graph: Graph, _options?: BunTextOptimizeOptions): {
     diagnostics: Diagnostic[];
 };
 
-export { type BunTextEnrichOptions, type BunTextManifest, type BunTextOptimizeOptions, type BunTextParseOptions, type BunTextStringifyOptions, check, enrich, optimize, parse, stringify };
+export { type BunTextEnrichOptions, type BunTextManifest, type BunTextOptimizeOptions, type BunTextParseOptions, type BunTextStringifyOptions, check, enrich, getBunOverridesCanonical, optimize, parse, stringify };

package/dist/formats/bun-text.js

@@ -723,6 +723,13 @@ function emitWorkspaceCollapsed(edge, fromSpecifier, onDiagnostic) {
   if (onDiagnostic === void 0) return;
   onDiagnostic(workspaceCollapsedDiagnostic(edge, fromSpecifier));
 }
+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/workspace.ts
 function isWorkspaceSpecifier(s) {
@@ -771,11 +778,168 @@ function nodeVersionOf(id) {
   return paren < 0 ? rest : rest.slice(0, paren);
 }
 
+// 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;
+    }
+  }
+  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/bun-text.ts
 var sidecarByGraph = /* @__PURE__ */ new WeakMap();
 function rememberSidecar(graph, sidecar) {
   sidecarByGraph.set(graph, sidecar);
 }
+function getBunOverridesCanonical(graph) {
+  return sidecarByGraph.get(graph)?.canonicalOverrides;
+}
 function check(input) {
   if (!/"lockfileVersion"\s*:\s*1\b/.test(input)) return false;
   if (!/"workspaces"\s*:\s*\{/.test(input)) return false;
@@ -950,6 +1114,17 @@ function parse(input, _options = {}) {
     const consumerScope = buildConsumerScope(packagesKey, packages, packageByName);
     addBlockEdges(builder, diagnostics, entry.id, entry.inner, consumerScope, void 0, peerDeclarations);
   }
+  let nativeOverrides;
+  let canonicalOverrides;
+  if (lf.overrides !== void 0 && lf.overrides !== null && typeof lf.overrides === "object") {
+    nativeOverrides = lf.overrides;
+    const captured = captureOverrides(lf.overrides, "npm");
+    if (captured.canonical.length > 0) canonicalOverrides = captured.canonical;
+  }
+  const trustedDependencies = Array.isArray(lf.trustedDependencies) ? lf.trustedDependencies.filter((v) => typeof v === "string") : void 0;
+  const patchedDependencies = lf.patchedDependencies !== void 0 && lf.patchedDependencies !== null && typeof lf.patchedDependencies === "object" ? Object.fromEntries(
+    Object.entries(lf.patchedDependencies).filter((e) => typeof e[1] === "string")
+  ) : void 0;
   for (const diagnostic of diagnostics) {
     builder.diagnostic(diagnostic);
   }
@@ -961,7 +1136,11 @@ function parse(input, _options = {}) {
       workspaces: workspaceSidecar,
       workspaceByPath,
       nodes: nodeSidecar,
-      peerDeclarations
+      peerDeclarations,
+      nativeOverrides,
+      canonicalOverrides,
+      trustedDependencies,
+      patchedDependencies
     };
     rememberSidecar(graph, sidecar);
     return graph;
@@ -1013,13 +1192,34 @@ function stringify(graph, options = {}) {
     const key = chooseNodeEmitKey(node, sidecar, packagesBlock);
     packagesBlock[key] = [`${node.name}@${node.version}`, "", inner, integrity];
   }
-  const json = renderJsonc({
+  const overridesBlock = resolveOverridesBlock(options.overrides, sidecar, emitDiagnostic);
+  const out = {
     lockfileVersion: 1,
-    workspaces: workspacesBlock,
-    packages: packagesBlock
-  });
+    workspaces: workspacesBlock
+  };
+  if (overridesBlock !== void 0 && Object.keys(overridesBlock).length > 0) {
+    out.overrides = overridesBlock;
+  }
+  out.packages = packagesBlock;
+  if (sidecar?.patchedDependencies !== void 0 && Object.keys(sidecar.patchedDependencies).length > 0) {
+    out.patchedDependencies = sortRecord(sidecar.patchedDependencies);
+  }
+  if (sidecar?.trustedDependencies !== void 0 && sidecar.trustedDependencies.length > 0) {
+    out.trustedDependencies = [...sidecar.trustedDependencies].sort(cmpStr2);
+  }
+  const json = renderJsonc(out);
   return options.lineEnding === "crlf" ? json.replace(/\n/g, "\r\n") : json;
 }
+function resolveOverridesBlock(callerOverrides, sidecar, emitDiagnostic) {
+  if (callerOverrides !== void 0) {
+    return callerOverrides.length > 0 ? projectOverrides(callerOverrides, "npm", emitDiagnostic) : void 0;
+  }
+  if (sidecar?.nativeOverrides !== void 0) return sidecar.nativeOverrides;
+  if (sidecar?.canonicalOverrides !== void 0 && sidecar.canonicalOverrides.length > 0) {
+    return projectOverrides(sidecar.canonicalOverrides, "npm", emitDiagnostic);
+  }
+  return void 0;
+}
 function enrich(graph, options = {}) {
   const sidecar = sidecarByGraph.get(graph);
   const diagnostics = [];
@@ -1489,8 +1689,15 @@ function pruneSidecar(sidecar, graph) {
         const [srcId] = key.split("|");
         return srcId !== void 0 && reachableIds.has(srcId);
       })
-    )
+    ),
+    // Top-level fidelity blocks are project-global (not per-node), so they
+    // survive an orphan-prune verbatim — pruning unreachable nodes never
+    // invalidates a declared override / trusted / patched entry.
+    nativeOverrides: sidecar.nativeOverrides,
+    canonicalOverrides: sidecar.canonicalOverrides,
+    trustedDependencies: sidecar.trustedDependencies,
+    patchedDependencies: sidecar.patchedDependencies
   };
 }
 
-export { check, enrich, optimize, parse, stringify };
+export { check, enrich, getBunOverridesCanonical, optimize, parse, stringify };

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

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

package/dist/formats/npm-1.js

@@ -1057,7 +1057,6 @@ function parse2(input, _options = {}) {
           version,
           peerContext: []
         };
-        if (resolved !== void 0) node.resolution = resolved;
         if (source !== void 0) node.source = source;
         builder.addNode(node);
         const payload = {};
@@ -1066,6 +1065,7 @@ function parse2(input, _options = {}) {
           if (!isEmptyIntegrity(integrity)) payload.integrity = integrity;
         }
         if (resolved !== void 0) {
+          payload.nativeResolution = resolved;
           const canonical = parse(resolved, { sourceKind: "npm-resolved" });
           if (canonical.type === "unknown") {
             diagnostics.push({
@@ -1521,7 +1521,7 @@ function buildEntry(node, installPath, graph, sidecar, treeByParent) {
   const entry = { version: node.version };
   const nodeSide = sidecar?.nodes.get(node.id);
   const tarball = graph.tarballOf(node.id);
-  const resolutionStr = node.resolution ?? deriveResolvedFromCanonical(tarball?.resolution);
+  const resolutionStr = tarball?.nativeResolution ?? deriveResolvedFromCanonical(tarball?.resolution);
   if (resolutionStr !== void 0) {
     if (/^(git[+:]|github:)/.test(resolutionStr)) {
       entry.version = resolutionStr;

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

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

package/dist/formats/npm-2.js

@@ -1941,7 +1941,7 @@ function buildNodeModulesEntry(graph, node, nodeSide, config, emitDiagnostic = (
   }
   body.version = node.version;
   const tarball = graph.tarballOf(node.id);
-  const resolved = node.resolution ?? config.hooks?.recoverResolvedForNode?.(graph, node) ?? deriveResolvedFromCanonical(tarball?.resolution);
+  const resolved = tarball?.nativeResolution ?? config.hooks?.recoverResolvedForNode?.(graph, node) ?? deriveResolvedFromCanonical(tarball?.resolution);
   if (resolved !== void 0) body.resolved = resolved;
   if (tarball?.integrity !== void 0) {
     const sri = emitSri(tarball.integrity);
@@ -2233,15 +2233,16 @@ function buildLegacyNodeEntry(ctx, node, parentInstallPrefix) {
   const entry = {};
   if (node.version !== void 0) entry.version = node.version;
   const tarball = ctx.graph.tarballOf(node.id);
+  const native = tarball?.nativeResolution;
   const sourceResolved = sidecarResolvedFor(ctx, node) ?? deriveLegacyResolvedFromCanonical(tarball?.resolution);
-  if (node.resolution !== void 0) {
-    const looksLikeGit = /^git[+@]/.test(node.resolution);
+  if (native !== void 0) {
+    const looksLikeGit = /^git[+@]/.test(native);
     if (looksLikeGit) {
-      entry.version = node.resolution;
+      entry.version = native;
       const fromSpec = synthesizeFromSpec(ctx, node);
       if (fromSpec !== void 0) entry.from = fromSpec;
     } else {
-      entry.resolved = node.resolution;
+      entry.resolved = native;
     }
   } else if (sourceResolved !== void 0) {
     const looksLikeGit = /^git[+@]/.test(sourceResolved);

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

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

package/dist/formats/npm-3.js

@@ -1941,7 +1941,7 @@ function buildNodeModulesEntry(graph, node, nodeSide, config, emitDiagnostic = (
   }
   body.version = node.version;
   const tarball = graph.tarballOf(node.id);
-  const resolved = node.resolution ?? config.hooks?.recoverResolvedForNode?.(graph, node) ?? deriveResolvedFromCanonical(tarball?.resolution);
+  const resolved = tarball?.nativeResolution ?? config.hooks?.recoverResolvedForNode?.(graph, node) ?? deriveResolvedFromCanonical(tarball?.resolution);
   if (resolved !== void 0) body.resolved = resolved;
   if (tarball?.integrity !== void 0) {
     const sri = emitSri(tarball.integrity);

package/dist/formats/pnpm-v5.d.ts

@@ -1,4 +1,4 @@
-import { D as Diagnostic, G as Graph } from '../graph-B_G4OKqF.js';
+import { D as Diagnostic, G as Graph } from '../graph-1poNzYjw.js';
 
 interface PnpmV5ParseOptions {
 }

package/dist/formats/pnpm-v5.js

@@ -1412,6 +1412,7 @@ function tarballPayloadOf(entry, subject, diagnostics) {
   }
   if (isPlainObject2(resolution)) {
     if (typeof resolution.tarball === "string") {
+      payload.nativeResolution = resolution.tarball;
       const canonical = parse(resolution.tarball, { sourceKind: "pnpm-tarball" });
       if (canonical.type === "unknown") {
         diagnostics.push(unknownResolutionDiagnostic(subject, resolution.tarball));
@@ -2044,12 +2045,6 @@ function addPackageNode(builder, sidecar, name, version, peerContext, nodeId, pk
     version,
     peerContext
   };
-  if (isPlainObject2(pkgEntry)) {
-    const resolution = pkgEntry.resolution;
-    if (isPlainObject2(resolution) && typeof resolution.tarball === "string") {
-      node.resolution = resolution.tarball;
-    }
-  }
   builder.addNode(node);
   const payload = tarballPayloadOf(pkgEntry, nodeId, diagnostics);
   if (payload !== void 0) {
@@ -2201,7 +2196,8 @@ function buildImporterEntry(graph, sidecar, node, importerPath) {
 function buildPackageEntry(graph, sidecar, representative) {
   const entry = {};
   const tarball = graph.tarballOf(representative.id);
-  const nativeIsPnpmUrl = representative.resolution !== void 0 && (representative.resolution.startsWith("http://") || representative.resolution.startsWith("https://"));
+  const nativeResolution = tarball?.nativeResolution;
+  const nativeIsPnpmUrl = nativeResolution !== void 0 && (nativeResolution.startsWith("http://") || nativeResolution.startsWith("https://"));
   const derivedPnpm = derivePnpmResolutionFromCanonical(tarball?.resolution);
   const derivedTarballIsRegistryDefault = tarball?.resolution?.type === "tarball" && tarball.resolution.url === `https://registry.npmjs.org/${representative.name}/-/${tailOfName(representative.name)}-${representative.version}.tgz`;
   if (tarball !== void 0) {
@@ -2210,12 +2206,12 @@ function buildPackageEntry(graph, sidecar, representative) {
       const integ = emitSri(tarball.integrity);
       if (integ !== void 0) resolution.integrity = integ;
     }
-    if (nativeIsPnpmUrl) resolution.tarball = representative.resolution;
+    if (nativeIsPnpmUrl) resolution.tarball = nativeResolution;
     else if (derivedPnpm?.tarball !== void 0 && !derivedTarballIsRegistryDefault) resolution.tarball = derivedPnpm.tarball;
     else if (derivedPnpm?.directory !== void 0) resolution.directory = derivedPnpm.directory;
     if (Object.keys(resolution).length > 0) entry.resolution = flowMap(resolution);
   } else if (nativeIsPnpmUrl) {
-    entry.resolution = flowMap({ tarball: representative.resolution });
+    entry.resolution = flowMap({ tarball: nativeResolution });
   } else if (derivedPnpm?.tarball !== void 0 && !derivedTarballIsRegistryDefault) {
     entry.resolution = flowMap({ tarball: derivedPnpm.tarball });
   } else if (derivedPnpm?.directory !== void 0) {

package/dist/formats/pnpm-v6.d.ts

@@ -1,5 +1,5 @@
-import { G as Graph, D as Diagnostic } from '../graph-B_G4OKqF.js';
-import { P as PnpmFamilyEnrichOptions, a as PnpmManifest, b as PnpmFamilyOptimizeOptions, c as PnpmFamilyParseOptions, d as PnpmSettings, e as PnpmFamilyStringifyOptions } from '../_pnpm-flat-core-NEg8x-yf.js';
+import { G as Graph, D as Diagnostic } from '../graph-1poNzYjw.js';
+import { P as PnpmFamilyEnrichOptions, a as PnpmManifest, b as PnpmFamilyOptimizeOptions, c as PnpmFamilyParseOptions, d as PnpmSettings, e as PnpmFamilyStringifyOptions } from '../_pnpm-flat-core-Bx_-WTrC.js';
 
 interface PnpmV6ParseOptions extends PnpmFamilyParseOptions {
 }

package/dist/formats/pnpm-v6.js

@@ -2318,12 +2318,6 @@ function addPackageNode(builder, sidecar, name, version, peerContext, nodeId, pk
     version,
     peerContext
   };
-  if (isPlainObject2(pkgEntry)) {
-    const resolution = pkgEntry.resolution;
-    if (isPlainObject2(resolution) && typeof resolution.tarball === "string") {
-      node.resolution = resolution.tarball;
-    }
-  }
   if (patch !== void 0) node.patch = patch;
   builder.addNode(node);
   const payload = tarballPayloadOf(pkgEntry, nodeId, diagnostics);
@@ -2536,6 +2530,7 @@ function tarballPayloadOf(entry, subject, diagnostics) {
   }
   if (isPlainObject2(resolution)) {
     if (typeof resolution.tarball === "string") {
+      payload.nativeResolution = resolution.tarball;
       const canonical = parse(resolution.tarball, { sourceKind: "pnpm-tarball" });
       if (canonical.type === "unknown") {
         diagnostics.push(unknownResolutionDiagnostic(subject, resolution.tarball));
@@ -2677,7 +2672,8 @@ function relativeImporterPath(importerPath, targetPath) {
 function buildPackageEntry(graph, sidecar, representative, shape) {
   const entry = {};
   const tarball = graph.tarballOf(representative.id);
-  const nativeIsPnpmUrl = representative.resolution !== void 0 && (representative.resolution.startsWith("http://") || representative.resolution.startsWith("https://"));
+  const nativeResolution = tarball?.nativeResolution;
+  const nativeIsPnpmUrl = nativeResolution !== void 0 && (nativeResolution.startsWith("http://") || nativeResolution.startsWith("https://"));
   const derivedPnpm = derivePnpmResolutionFromCanonical(tarball?.resolution);
   const derivedTarballIsRegistryDefault = tarball?.resolution?.type === "tarball" && isNpmRegistryDefault(tarball.resolution.url, representative.name, representative.version);
   if (tarball !== void 0) {
@@ -2686,12 +2682,12 @@ function buildPackageEntry(graph, sidecar, representative, shape) {
       const sri = emitSri(tarball.integrity);
       if (sri !== void 0) resolution.integrity = sri;
     }
-    if (nativeIsPnpmUrl) resolution.tarball = representative.resolution;
+    if (nativeIsPnpmUrl) resolution.tarball = nativeResolution;
     else if (derivedPnpm?.tarball !== void 0 && !derivedTarballIsRegistryDefault) resolution.tarball = derivedPnpm.tarball;
     else if (derivedPnpm?.directory !== void 0) resolution.directory = derivedPnpm.directory;
     if (Object.keys(resolution).length > 0) entry.resolution = flowMap(resolution);
   } else if (nativeIsPnpmUrl) {
-    entry.resolution = flowMap({ tarball: representative.resolution });
+    entry.resolution = flowMap({ tarball: nativeResolution });
   } else if (derivedPnpm?.tarball !== void 0 && !derivedTarballIsRegistryDefault) {
     entry.resolution = flowMap({ tarball: derivedPnpm.tarball });
   } else if (derivedPnpm?.directory !== void 0) {
@@ -2882,7 +2878,7 @@ function synthesiseOverridePatches(graph, sidecar) {
       return m !== void 0 && matcherMatches(m, node.name, node.version);
     })) continue;
     const overrideKey = `${node.name}@npm:${node.version}`;
-    const sourcePath = patchPathOfResolution(node.resolution) ?? `./.lockfile-patches/${node.patch}.patch`;
+    const sourcePath = patchPathOfResolution(graph.tarballOf(node.id)?.nativeResolution) ?? `./.lockfile-patches/${node.patch}.patch`;
     const encodedSpec = `${encodeURIComponent(node.name)}@npm%3A${encodeURIComponent(node.version)}`;
     out[overrideKey] = `patch:${encodedSpec}#${sourcePath}`;
   }

package/dist/formats/pnpm-v9.d.ts

@@ -1,5 +1,5 @@
-import { G as Graph, D as Diagnostic } from '../graph-B_G4OKqF.js';
-import { P as PnpmFamilyEnrichOptions, a as PnpmManifest, b as PnpmFamilyOptimizeOptions, c as PnpmFamilyParseOptions, d as PnpmSettings, e as PnpmFamilyStringifyOptions } from '../_pnpm-flat-core-NEg8x-yf.js';
+import { G as Graph, D as Diagnostic } from '../graph-1poNzYjw.js';
+import { P as PnpmFamilyEnrichOptions, a as PnpmManifest, b as PnpmFamilyOptimizeOptions, c as PnpmFamilyParseOptions, d as PnpmSettings, e as PnpmFamilyStringifyOptions } from '../_pnpm-flat-core-Bx_-WTrC.js';
 
 interface PnpmV9ParseOptions extends PnpmFamilyParseOptions {
 }

package/dist/formats/pnpm-v9.js

@@ -2318,12 +2318,6 @@ function addPackageNode(builder, sidecar, name, version, peerContext, nodeId, pk
     version,
     peerContext
   };
-  if (isPlainObject2(pkgEntry)) {
-    const resolution = pkgEntry.resolution;
-    if (isPlainObject2(resolution) && typeof resolution.tarball === "string") {
-      node.resolution = resolution.tarball;
-    }
-  }
   if (patch !== void 0) node.patch = patch;
   builder.addNode(node);
   const payload = tarballPayloadOf(pkgEntry, nodeId, diagnostics);
@@ -2536,6 +2530,7 @@ function tarballPayloadOf(entry, subject, diagnostics) {
   }
   if (isPlainObject2(resolution)) {
     if (typeof resolution.tarball === "string") {
+      payload.nativeResolution = resolution.tarball;
       const canonical = parse(resolution.tarball, { sourceKind: "pnpm-tarball" });
       if (canonical.type === "unknown") {
         diagnostics.push(unknownResolutionDiagnostic(subject, resolution.tarball));
@@ -2677,7 +2672,8 @@ function relativeImporterPath(importerPath, targetPath) {
 function buildPackageEntry(graph, sidecar, representative, shape) {
   const entry = {};
   const tarball = graph.tarballOf(representative.id);
-  const nativeIsPnpmUrl = representative.resolution !== void 0 && (representative.resolution.startsWith("http://") || representative.resolution.startsWith("https://"));
+  const nativeResolution = tarball?.nativeResolution;
+  const nativeIsPnpmUrl = nativeResolution !== void 0 && (nativeResolution.startsWith("http://") || nativeResolution.startsWith("https://"));
   const derivedPnpm = derivePnpmResolutionFromCanonical(tarball?.resolution);
   const derivedTarballIsRegistryDefault = tarball?.resolution?.type === "tarball" && isNpmRegistryDefault(tarball.resolution.url, representative.name, representative.version);
   if (tarball !== void 0) {
@@ -2686,12 +2682,12 @@ function buildPackageEntry(graph, sidecar, representative, shape) {
       const sri = emitSri(tarball.integrity);
       if (sri !== void 0) resolution.integrity = sri;
     }
-    if (nativeIsPnpmUrl) resolution.tarball = representative.resolution;
+    if (nativeIsPnpmUrl) resolution.tarball = nativeResolution;
     else if (derivedPnpm?.tarball !== void 0 && !derivedTarballIsRegistryDefault) resolution.tarball = derivedPnpm.tarball;
     else if (derivedPnpm?.directory !== void 0) resolution.directory = derivedPnpm.directory;
     if (Object.keys(resolution).length > 0) entry.resolution = flowMap(resolution);
   } else if (nativeIsPnpmUrl) {
-    entry.resolution = flowMap({ tarball: representative.resolution });
+    entry.resolution = flowMap({ tarball: nativeResolution });
   } else if (derivedPnpm?.tarball !== void 0 && !derivedTarballIsRegistryDefault) {
     entry.resolution = flowMap({ tarball: derivedPnpm.tarball });
   } else if (derivedPnpm?.directory !== void 0) {
@@ -2882,7 +2878,7 @@ function synthesiseOverridePatches(graph, sidecar) {
       return m !== void 0 && matcherMatches(m, node.name, node.version);
     })) continue;
     const overrideKey = `${node.name}@npm:${node.version}`;
-    const sourcePath = patchPathOfResolution(node.resolution) ?? `./.lockfile-patches/${node.patch}.patch`;
+    const sourcePath = patchPathOfResolution(graph.tarballOf(node.id)?.nativeResolution) ?? `./.lockfile-patches/${node.patch}.patch`;
     const encodedSpec = `${encodeURIComponent(node.name)}@npm%3A${encodeURIComponent(node.version)}`;
     out[overrideKey] = `patch:${encodedSpec}#${sourcePath}`;
   }

package/dist/formats/yarn-berry-v10.d.ts

@@ -1,5 +1,5 @@
-import { G as Graph, D as Diagnostic } from '../graph-B_G4OKqF.js';
-import { Y as YarnBerryFamilyEnrichOptions, a as YarnBerryFamilyOptimizeOptions, b as YarnBerryFamilyParseOptions, c as YarnBerryFamilyStringifyOptions } from '../_yarn-berry-core-CLT-3m_j.js';
+import { G as Graph, D as Diagnostic } from '../graph-1poNzYjw.js';
+import { Y as YarnBerryFamilyEnrichOptions, a as YarnBerryFamilyOptimizeOptions, b as YarnBerryFamilyParseOptions, c as YarnBerryFamilyStringifyOptions } from '../_yarn-berry-core-B56PpQ7F.js';
 
 interface YarnBerryParseOptions extends YarnBerryFamilyParseOptions {
 }