@antongolub/lockfile 0.0.0-snapshot.52 → 0.0.0-snapshot.55

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

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";
@@ -1329,6 +1317,14 @@ function resolutionPinUnresolvedDiagnostic(prefix, subject, depName, range) {
     message: `dependency ${depName}=${range} from ${subject} has no exact or semver-satisfying entry \u2014 likely a resolutions pin to a non-satisfying descriptor; pass ParseOptions.manifests so the override map can bridge it`
   };
 }
+function patchPreferredDiagnostic(prefix, subject, depName, range, patchId) {
+  return {
+    code: `${prefix}_PATCH_PREFERRED`,
+    severity: "info",
+    subject,
+    message: `dependency ${depName}=${range} from ${subject} redirected to sibling patch node ${patchId} (lock-borne patchedDependencies preference); base left GC-able`
+  };
+}
 function emitDropped(nodeId, feature, reason, onDiagnostic) {
   if (onDiagnostic === void 0) return;
   onDiagnostic({
@@ -1380,6 +1376,16 @@ function semverResolve(range, candidates) {
   if (top.length === 1) return { kind: "bound", id: top[0] };
   return { kind: "ambiguous", candidateIds: top };
 }
+function distTagResolve(range, candidates) {
+  const tag = registryRangeOf(range);
+  if (tag === void 0) return { kind: "none" };
+  if (semver.validRange(tag) !== null) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  const ids = eligible.map((c) => c.id).sort(cmpStr2);
+  return { kind: "ambiguous", candidateIds: ids };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -1412,6 +1418,15 @@ function parentPathMatches(parentPath, consumerPath) {
   }
   return true;
 }
+function patchPreferenceFor(_name, _version, patchSiblings, consumerLocator) {
+  if (patchSiblings.length === 0) return void 0;
+  if (patchSiblings.length === 1) return patchSiblings[0].id;
+  if (consumerLocator !== void 0) {
+    const matches = patchSiblings.filter((s) => s.locatorQualifier === consumerLocator);
+    if (matches.length === 1) return matches[0].id;
+  }
+  return void 0;
+}
 var cmpStr2 = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 function readInstalledManifest(workspaceRoot, parentName, consumerNodeId) {
   return readInstalledManifestFrom([workspaceRoot], parentName);
@@ -1552,6 +1567,7 @@ function parseFamily(input, options, config) {
   const specIndex = /* @__PURE__ */ new Map();
   const patchDescriptorIndex = /* @__PURE__ */ new Map();
   const semverCandidatesByName = /* @__PURE__ */ new Map();
+  const patchSiblingsByBase = /* @__PURE__ */ new Map();
   const seenIds = /* @__PURE__ */ new Set();
   const entryIds = /* @__PURE__ */ new Map();
   for (const { key, value, specs } of entries) {
@@ -1617,6 +1633,13 @@ function parseFamily(input, options, config) {
     const candidateList = semverCandidatesByName.get(authoritativeName);
     if (candidateList === void 0) semverCandidatesByName.set(authoritativeName, [semverCandidate]);
     else candidateList.push(semverCandidate);
+    if (effectivePatch !== void 0 && resolution !== void 0 && isNpmBasePatchResolution(resolution, authoritativeName)) {
+      const sibling = { id, locatorQualifier: locatorQualifierOfPatchResolution(resolution) };
+      const baseKey = `${authoritativeName}@${version}`;
+      const siblings = patchSiblingsByBase.get(baseKey);
+      if (siblings === void 0) patchSiblingsByBase.set(baseKey, [sibling]);
+      else siblings.push(sibling);
+    }
     const peerDependencies = stringRecordOfBlock(asMap(value["peerDependencies"]));
     if (peerDependencies !== void 0) {
       rawPeerDependencies.set(id, peerDependencies);
@@ -1680,6 +1703,7 @@ function parseFamily(input, options, config) {
   }
   const ladderCtx = {
     candidatesByName: semverCandidatesByName,
+    patchSiblingsByBase,
     overrides: options.overrides ?? [],
     codePrefix: config.codePrefix,
     manifestsProvided: options.overrides !== void 0
@@ -2618,6 +2642,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
     const normalizedRange = normalizedEdgeRange(kind, depRange);
     const lookup = `${depName}@${normalizedRange}`;
     let dstId = index.get(lookup);
+    let boundViaOverride = false;
     if (dstId === void 0) {
       dstId = resolvePatchAndLinkFallbacks(
         lookup,
@@ -2647,7 +2672,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
           );
           if (viaOverride === null) continue;
         }
-        if (viaOverride !== void 0) dstId = viaOverride;
+        if (viaOverride !== void 0) {
+          dstId = viaOverride;
+          boundViaOverride = true;
+        }
       }
     }
     if (dstId === void 0) {
@@ -2659,6 +2687,30 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = distTagResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") {
+        dstId = result.id;
+      } else if (result.kind === "ambiguous") {
+        diagnostics.push(ambiguousResolutionDiagnostic(ladder.codePrefix, srcId, depName, normalizedRange, result.candidateIds));
+        if (!ladder.manifestsProvided) {
+          diagnostics.push(resolutionPinUnresolvedDiagnostic(ladder.codePrefix, srcId, depName, normalizedRange));
+        }
+        continue;
+      }
+    }
+    if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
+      const bound = nodeNameVersion(dstId);
+      const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);
+      if (siblings !== void 0 && siblings.length > 0) {
+        const consumerLocator = srcResolution !== void 0 ? encodeURIComponent(srcResolution) : void 0;
+        const patchId = patchPreferenceFor(depName, normalizedRange, siblings, consumerLocator);
+        if (patchId !== void 0 && patchId !== dstId) {
+          dstId = patchId;
+          diagnostics.push(patchPreferredDiagnostic(ladder.codePrefix, srcId, depName, normalizedRange, patchId));
+        }
+      }
+    }
     if (!dstId) {
       diagnostics.push({
         code: "YARN_BERRY_UNRESOLVED_DEP",
@@ -2681,6 +2733,16 @@ function normalizedEdgeRange(kind, range) {
   if (kind === "peer") return range;
   return hasExplicitProtocol(range) ? range : `npm:${range}`;
 }
+function nodeNameVersion(id) {
+  const name = nameOf(id);
+  if (name.length >= id.length) return void 0;
+  let rest = id.slice(name.length + 1);
+  const parenIdx = rest.indexOf("(");
+  if (parenIdx >= 0) rest = rest.slice(0, parenIdx);
+  const plusIdx = rest.indexOf("+");
+  if (plusIdx >= 0) rest = rest.slice(0, plusIdx);
+  return rest.length > 0 ? `${name}@${rest}` : void 0;
+}
 function hasExplicitProtocol(range) {
   const colonIdx = range.indexOf(":");
   if (colonIdx <= 0) return false;
@@ -2710,6 +2772,17 @@ function locatorQualifierOfPatchSpec(spec) {
   }
   return void 0;
 }
+function isNpmBasePatchResolution(resolution, name) {
+  const locator = patchLocatorOfResolution(resolution);
+  if (locator === void 0) return false;
+  const base = baseSpecOfPatchLocator(locator);
+  return base !== void 0 && base.startsWith(`${name}@npm:`);
+}
+function locatorQualifierOfPatchResolution(resolution) {
+  const locator = patchLocatorOfResolution(resolution);
+  if (locator === void 0 || !locator.startsWith("patch:")) return void 0;
+  return locatorQualifierOfPatchSpec(locator.slice("patch:".length));
+}
 function resolvePatchDescriptor(candidates, srcResolution, srcId, lookup, diagnostics) {
   if (candidates === void 0 || candidates.length === 0) return void 0;
   if (candidates.length === 1) return candidates[0].id;

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

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";
@@ -1329,6 +1317,14 @@ function resolutionPinUnresolvedDiagnostic(prefix, subject, depName, range) {
     message: `dependency ${depName}=${range} from ${subject} has no exact or semver-satisfying entry \u2014 likely a resolutions pin to a non-satisfying descriptor; pass ParseOptions.manifests so the override map can bridge it`
   };
 }
+function patchPreferredDiagnostic(prefix, subject, depName, range, patchId) {
+  return {
+    code: `${prefix}_PATCH_PREFERRED`,
+    severity: "info",
+    subject,
+    message: `dependency ${depName}=${range} from ${subject} redirected to sibling patch node ${patchId} (lock-borne patchedDependencies preference); base left GC-able`
+  };
+}
 function emitDropped(nodeId, feature, reason, onDiagnostic) {
   if (onDiagnostic === void 0) return;
   onDiagnostic({
@@ -1380,6 +1376,16 @@ function semverResolve(range, candidates) {
   if (top.length === 1) return { kind: "bound", id: top[0] };
   return { kind: "ambiguous", candidateIds: top };
 }
+function distTagResolve(range, candidates) {
+  const tag = registryRangeOf(range);
+  if (tag === void 0) return { kind: "none" };
+  if (semver.validRange(tag) !== null) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  const ids = eligible.map((c) => c.id).sort(cmpStr2);
+  return { kind: "ambiguous", candidateIds: ids };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -1412,6 +1418,15 @@ function parentPathMatches(parentPath, consumerPath) {
   }
   return true;
 }
+function patchPreferenceFor(_name, _version, patchSiblings, consumerLocator) {
+  if (patchSiblings.length === 0) return void 0;
+  if (patchSiblings.length === 1) return patchSiblings[0].id;
+  if (consumerLocator !== void 0) {
+    const matches = patchSiblings.filter((s) => s.locatorQualifier === consumerLocator);
+    if (matches.length === 1) return matches[0].id;
+  }
+  return void 0;
+}
 var cmpStr2 = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 function readInstalledManifest(workspaceRoot, parentName, consumerNodeId) {
   return readInstalledManifestFrom([workspaceRoot], parentName);
@@ -1552,6 +1567,7 @@ function parseFamily(input, options, config) {
   const specIndex = /* @__PURE__ */ new Map();
   const patchDescriptorIndex = /* @__PURE__ */ new Map();
   const semverCandidatesByName = /* @__PURE__ */ new Map();
+  const patchSiblingsByBase = /* @__PURE__ */ new Map();
   const seenIds = /* @__PURE__ */ new Set();
   const entryIds = /* @__PURE__ */ new Map();
   for (const { key, value, specs } of entries) {
@@ -1617,6 +1633,13 @@ function parseFamily(input, options, config) {
     const candidateList = semverCandidatesByName.get(authoritativeName);
     if (candidateList === void 0) semverCandidatesByName.set(authoritativeName, [semverCandidate]);
     else candidateList.push(semverCandidate);
+    if (effectivePatch !== void 0 && resolution !== void 0 && isNpmBasePatchResolution(resolution, authoritativeName)) {
+      const sibling = { id, locatorQualifier: locatorQualifierOfPatchResolution(resolution) };
+      const baseKey = `${authoritativeName}@${version}`;
+      const siblings = patchSiblingsByBase.get(baseKey);
+      if (siblings === void 0) patchSiblingsByBase.set(baseKey, [sibling]);
+      else siblings.push(sibling);
+    }
     const peerDependencies = stringRecordOfBlock(asMap(value["peerDependencies"]));
     if (peerDependencies !== void 0) {
       rawPeerDependencies.set(id, peerDependencies);
@@ -1680,6 +1703,7 @@ function parseFamily(input, options, config) {
   }
   const ladderCtx = {
     candidatesByName: semverCandidatesByName,
+    patchSiblingsByBase,
     overrides: options.overrides ?? [],
     codePrefix: config.codePrefix,
     manifestsProvided: options.overrides !== void 0
@@ -2622,6 +2646,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
     const normalizedRange = normalizedEdgeRange(kind, depRange);
     const lookup = `${depName}@${normalizedRange}`;
     let dstId = index.get(lookup);
+    let boundViaOverride = false;
     if (dstId === void 0) {
       dstId = resolvePatchAndLinkFallbacks(
         lookup,
@@ -2651,7 +2676,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
           );
           if (viaOverride === null) continue;
         }
-        if (viaOverride !== void 0) dstId = viaOverride;
+        if (viaOverride !== void 0) {
+          dstId = viaOverride;
+          boundViaOverride = true;
+        }
       }
     }
     if (dstId === void 0) {
@@ -2663,6 +2691,30 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = distTagResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") {
+        dstId = result.id;
+      } else if (result.kind === "ambiguous") {
+        diagnostics.push(ambiguousResolutionDiagnostic(ladder.codePrefix, srcId, depName, normalizedRange, result.candidateIds));
+        if (!ladder.manifestsProvided) {
+          diagnostics.push(resolutionPinUnresolvedDiagnostic(ladder.codePrefix, srcId, depName, normalizedRange));
+        }
+        continue;
+      }
+    }
+    if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
+      const bound = nodeNameVersion(dstId);
+      const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);
+      if (siblings !== void 0 && siblings.length > 0) {
+        const consumerLocator = srcResolution !== void 0 ? encodeURIComponent(srcResolution) : void 0;
+        const patchId = patchPreferenceFor(depName, normalizedRange, siblings, consumerLocator);
+        if (patchId !== void 0 && patchId !== dstId) {
+          dstId = patchId;
+          diagnostics.push(patchPreferredDiagnostic(ladder.codePrefix, srcId, depName, normalizedRange, patchId));
+        }
+      }
+    }
     if (!dstId) {
       diagnostics.push({
         code: "YARN_BERRY_UNRESOLVED_DEP",
@@ -2685,6 +2737,16 @@ function normalizedEdgeRange(kind, range) {
   if (kind === "peer") return range;
   return hasExplicitProtocol(range) ? range : `npm:${range}`;
 }
+function nodeNameVersion(id) {
+  const name = nameOf(id);
+  if (name.length >= id.length) return void 0;
+  let rest = id.slice(name.length + 1);
+  const parenIdx = rest.indexOf("(");
+  if (parenIdx >= 0) rest = rest.slice(0, parenIdx);
+  const plusIdx = rest.indexOf("+");
+  if (plusIdx >= 0) rest = rest.slice(0, plusIdx);
+  return rest.length > 0 ? `${name}@${rest}` : void 0;
+}
 function hasExplicitProtocol(range) {
   const colonIdx = range.indexOf(":");
   if (colonIdx <= 0) return false;
@@ -2714,6 +2776,17 @@ function locatorQualifierOfPatchSpec(spec) {
   }
   return void 0;
 }
+function isNpmBasePatchResolution(resolution, name) {
+  const locator = patchLocatorOfResolution(resolution);
+  if (locator === void 0) return false;
+  const base = baseSpecOfPatchLocator(locator);
+  return base !== void 0 && base.startsWith(`${name}@npm:`);
+}
+function locatorQualifierOfPatchResolution(resolution) {
+  const locator = patchLocatorOfResolution(resolution);
+  if (locator === void 0 || !locator.startsWith("patch:")) return void 0;
+  return locatorQualifierOfPatchSpec(locator.slice("patch:".length));
+}
 function resolvePatchDescriptor(candidates, srcResolution, srcId, lookup, diagnostics) {
   if (candidates === void 0 || candidates.length === 0) return void 0;
   if (candidates.length === 1) return candidates[0].id;

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

@@ -848,10 +848,7 @@ function codeOf(error) {
 }
 
 // src/main/ts/formats/_yarn-syml.ts
-var YAML_NUMBER_RE = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?$/;
-var YAML_BOOLEAN_RE = /^(true|false|yes|no|on|off)$/i;
-var YAML_NULL_RE = /^(null|~)$/;
-var YAML_SPECIAL_RE = /[ \t:,[\]{}#&*!|>'"%@`]/;
+var SYML_SIMPLE_STRING_RE = /^(?![-?:,\][{}#&*!|>'"%@` \t\r\n]).([ \t]*(?![,\][{}:# \t\r\n]).)*$/;
 var SymlParseError = class extends Error {
   line;
   constructor(message, line) {
@@ -1016,16 +1013,7 @@ function parse(input) {
   return root;
 }
 function needsQuotes(raw) {
-  if (raw === "") return true;
-  if (YAML_SPECIAL_RE.test(raw)) return true;
-  if (raw[0] === "-" || raw[0] === "?") return true;
-  if (YAML_NUMBER_RE.test(raw)) return true;
-  if (YAML_BOOLEAN_RE.test(raw)) return true;
-  if (YAML_NULL_RE.test(raw)) return true;
-  for (let i = 0; i < raw.length; i++) {
-    if (raw.charCodeAt(i) > 127) return true;
-  }
-  return false;
+  return !SYML_SIMPLE_STRING_RE.test(raw);
 }
 function escapeQuoted(raw) {
   let out = "";
@@ -1329,6 +1317,14 @@ function resolutionPinUnresolvedDiagnostic(prefix, subject, depName, range) {
     message: `dependency ${depName}=${range} from ${subject} has no exact or semver-satisfying entry \u2014 likely a resolutions pin to a non-satisfying descriptor; pass ParseOptions.manifests so the override map can bridge it`
   };
 }
+function patchPreferredDiagnostic(prefix, subject, depName, range, patchId) {
+  return {
+    code: `${prefix}_PATCH_PREFERRED`,
+    severity: "info",
+    subject,
+    message: `dependency ${depName}=${range} from ${subject} redirected to sibling patch node ${patchId} (lock-borne patchedDependencies preference); base left GC-able`
+  };
+}
 function emitDropped(nodeId, feature, reason, onDiagnostic) {
   if (onDiagnostic === void 0) return;
   onDiagnostic({
@@ -1380,6 +1376,16 @@ function semverResolve(range, candidates) {
   if (top.length === 1) return { kind: "bound", id: top[0] };
   return { kind: "ambiguous", candidateIds: top };
 }
+function distTagResolve(range, candidates) {
+  const tag = registryRangeOf(range);
+  if (tag === void 0) return { kind: "none" };
+  if (semver.validRange(tag) !== null) return { kind: "none" };
+  const eligible = candidates.filter((c) => c.sourceType === "tarball");
+  if (eligible.length === 0) return { kind: "none" };
+  if (eligible.length === 1) return { kind: "bound", id: eligible[0].id };
+  const ids = eligible.map((c) => c.id).sort(cmpStr2);
+  return { kind: "ambiguous", candidateIds: ids };
+}
 function overrideTargetFor(depName, declaredRange, consumerPath, overrides) {
   let best;
   let bestScore = -1;
@@ -1412,6 +1418,15 @@ function parentPathMatches(parentPath, consumerPath) {
   }
   return true;
 }
+function patchPreferenceFor(_name, _version, patchSiblings, consumerLocator) {
+  if (patchSiblings.length === 0) return void 0;
+  if (patchSiblings.length === 1) return patchSiblings[0].id;
+  if (consumerLocator !== void 0) {
+    const matches = patchSiblings.filter((s) => s.locatorQualifier === consumerLocator);
+    if (matches.length === 1) return matches[0].id;
+  }
+  return void 0;
+}
 var cmpStr2 = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 function readInstalledManifest(workspaceRoot, parentName, consumerNodeId) {
   return readInstalledManifestFrom([workspaceRoot], parentName);
@@ -1552,6 +1567,7 @@ function parseFamily(input, options, config) {
   const specIndex = /* @__PURE__ */ new Map();
   const patchDescriptorIndex = /* @__PURE__ */ new Map();
   const semverCandidatesByName = /* @__PURE__ */ new Map();
+  const patchSiblingsByBase = /* @__PURE__ */ new Map();
   const seenIds = /* @__PURE__ */ new Set();
   const entryIds = /* @__PURE__ */ new Map();
   for (const { key, value, specs } of entries) {
@@ -1617,6 +1633,13 @@ function parseFamily(input, options, config) {
     const candidateList = semverCandidatesByName.get(authoritativeName);
     if (candidateList === void 0) semverCandidatesByName.set(authoritativeName, [semverCandidate]);
     else candidateList.push(semverCandidate);
+    if (effectivePatch !== void 0 && resolution !== void 0 && isNpmBasePatchResolution(resolution, authoritativeName)) {
+      const sibling = { id, locatorQualifier: locatorQualifierOfPatchResolution(resolution) };
+      const baseKey = `${authoritativeName}@${version}`;
+      const siblings = patchSiblingsByBase.get(baseKey);
+      if (siblings === void 0) patchSiblingsByBase.set(baseKey, [sibling]);
+      else siblings.push(sibling);
+    }
     const peerDependencies = stringRecordOfBlock(asMap(value["peerDependencies"]));
     if (peerDependencies !== void 0) {
       rawPeerDependencies.set(id, peerDependencies);
@@ -1680,6 +1703,7 @@ function parseFamily(input, options, config) {
   }
   const ladderCtx = {
     candidatesByName: semverCandidatesByName,
+    patchSiblingsByBase,
     overrides: options.overrides ?? [],
     codePrefix: config.codePrefix,
     manifestsProvided: options.overrides !== void 0
@@ -2617,6 +2641,7 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
     const normalizedRange = normalizedEdgeRange(kind, depRange);
     const lookup = `${depName}@${normalizedRange}`;
     let dstId = index.get(lookup);
+    let boundViaOverride = false;
     if (dstId === void 0) {
       dstId = resolvePatchAndLinkFallbacks(
         lookup,
@@ -2646,7 +2671,10 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
           );
           if (viaOverride === null) continue;
         }
-        if (viaOverride !== void 0) dstId = viaOverride;
+        if (viaOverride !== void 0) {
+          dstId = viaOverride;
+          boundViaOverride = true;
+        }
       }
     }
     if (dstId === void 0) {
@@ -2658,6 +2686,30 @@ function addEdgesFromBlock(builder, srcId, block, kind, index, patchDescriptorIn
         continue;
       }
     }
+    if (dstId === void 0) {
+      const result = distTagResolve(normalizedRange, ladder.candidatesByName.get(depName) ?? []);
+      if (result.kind === "bound") {
+        dstId = result.id;
+      } else if (result.kind === "ambiguous") {
+        diagnostics.push(ambiguousResolutionDiagnostic(ladder.codePrefix, srcId, depName, normalizedRange, result.candidateIds));
+        if (!ladder.manifestsProvided) {
+          diagnostics.push(resolutionPinUnresolvedDiagnostic(ladder.codePrefix, srcId, depName, normalizedRange));
+        }
+        continue;
+      }
+    }
+    if (typeof dstId === "string" && !boundViaOverride && isRegistryRange(normalizedRange)) {
+      const bound = nodeNameVersion(dstId);
+      const siblings = bound === void 0 ? void 0 : ladder.patchSiblingsByBase.get(bound);
+      if (siblings !== void 0 && siblings.length > 0) {
+        const consumerLocator = srcResolution !== void 0 ? encodeURIComponent(srcResolution) : void 0;
+        const patchId = patchPreferenceFor(depName, normalizedRange, siblings, consumerLocator);
+        if (patchId !== void 0 && patchId !== dstId) {
+          dstId = patchId;
+          diagnostics.push(patchPreferredDiagnostic(ladder.codePrefix, srcId, depName, normalizedRange, patchId));
+        }
+      }
+    }
     if (!dstId) {
       diagnostics.push({
         code: "YARN_BERRY_UNRESOLVED_DEP",
@@ -2680,6 +2732,16 @@ function normalizedEdgeRange(kind, range) {
   if (kind === "peer") return range;
   return hasExplicitProtocol(range) ? range : `npm:${range}`;
 }
+function nodeNameVersion(id) {
+  const name = nameOf(id);
+  if (name.length >= id.length) return void 0;
+  let rest = id.slice(name.length + 1);
+  const parenIdx = rest.indexOf("(");
+  if (parenIdx >= 0) rest = rest.slice(0, parenIdx);
+  const plusIdx = rest.indexOf("+");
+  if (plusIdx >= 0) rest = rest.slice(0, plusIdx);
+  return rest.length > 0 ? `${name}@${rest}` : void 0;
+}
 function hasExplicitProtocol(range) {
   const colonIdx = range.indexOf(":");
   if (colonIdx <= 0) return false;
@@ -2709,6 +2771,17 @@ function locatorQualifierOfPatchSpec(spec) {
   }
   return void 0;
 }
+function isNpmBasePatchResolution(resolution, name) {
+  const locator = patchLocatorOfResolution(resolution);
+  if (locator === void 0) return false;
+  const base = baseSpecOfPatchLocator(locator);
+  return base !== void 0 && base.startsWith(`${name}@npm:`);
+}
+function locatorQualifierOfPatchResolution(resolution) {
+  const locator = patchLocatorOfResolution(resolution);
+  if (locator === void 0 || !locator.startsWith("patch:")) return void 0;
+  return locatorQualifierOfPatchSpec(locator.slice("patch:".length));
+}
 function resolvePatchDescriptor(candidates, srcResolution, srcId, lookup, diagnostics) {
   if (candidates === void 0 || candidates.length === 0) return void 0;
   if (candidates.length === 1) return candidates[0].id;