yarn-berry-deduplicate 6.1.2 → 7.0.1

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2024 Christophe Hurpeau <christophe@hurpeau.com> (https://christophe.hurpeau.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/README.md

@@ -1,178 +1,199 @@
-# yarn-berry-deduplicate
+<h1 align="center">
+  yarn-berry-deduplicate
+</h1>
 
-_This is a fork of [yarn-deduplicate](https://www.npmjs.com/package/yarn-deduplicate) for yarn
-berry. _
+<p align="center">
+  List duplicates and dedupe yarn berry lock file
+</p>
 
-Cleans up `yarn.lock` by removing duplicates.
-
-Yarn berry includes [`yarn dedupe`](https://yarnpkg.com/cli/dedupe) that currently only supports
-"highest" strategy. Follow this issue: https://github.com/yarnpkg/berry/issues/2297.
-
-In the meantime, this is a fork of
-[yarn-deduplicate](https://www.npmjs.com/package/yarn-deduplicate) that works with both highest and
-fewer (renamed "mostCommon") strategies as well as a new "fewerHighest" strategy which combines
-"mostCommon" and "highest".
+<p align="center">
+  <a href="https://npmjs.org/package/yarn-berry-deduplicate"><img src="https://img.shields.io/npm/v/yarn-berry-deduplicate.svg?style=flat-square" alt="npm version"></a>
+  <a href="https://npmjs.org/package/yarn-berry-deduplicate"><img src="https://img.shields.io/npm/dw/yarn-berry-deduplicate.svg?style=flat-square" alt="npm downloads"></a>
+  <a href="https://npmjs.org/package/yarn-berry-deduplicate"><img src="https://img.shields.io/node/v/yarn-berry-deduplicate.svg?style=flat-square" alt="node version"></a>
+  <a href="https://npmjs.org/package/yarn-berry-deduplicate"><img src="https://img.shields.io/npm/types/yarn-berry-deduplicate.svg?style=flat-square" alt="types"></a>
+</p>
 
 ## Usage
 
-```sh
-yarn dlx yarn-berry-deduplicate
-```
+Requires yarn berry (>= 2). Nothing needs to be installed: `yarn dlx` fetches the
+package. The dedupe bin carries the package's own name, so it runs bare; the
+report bin does not, and `-p yarn-berry-deduplicate` is what tells `yarn dlx`
+which package to fetch for it.
 
-This will use the fewest then highest strategy to remove duplicated packages in `yarn.lock`.
+Installing it (`yarn add -D yarn-berry-deduplicate`) is only worth it to pin a
+version — for a CI gate, say. `yarn exec <bin>` then runs the local one.
 
-If you do not specify the yarn.lock path, it defaults to `yarn.lock`.
+Both bins may be run from any subdirectory of the project: they walk up to the
+nearest `yarn.lock` and operate on that project, naming the lockfile they found
+on stderr when it is not the working directory.
 
-Check all available options with:
+### List duplicates, or explain one
 
-```sh
-yarn dlx yarn-berry-deduplicate --help
+```
+yarn dlx -p yarn-berry-deduplicate yarn-berry-why-duplicate                   # one line per duplicated package
+yarn dlx -p yarn-berry-deduplicate yarn-berry-why-duplicate --details         # every dependent, and the lockstep clusters
+yarn dlx -p yarn-berry-deduplicate yarn-berry-why-duplicate <dependencyName>  # explains the matching packages, detailed
+yarn dlx -p yarn-berry-deduplicate yarn-berry-why-duplicate <dependencyName> --all
 ```
 
-Note: you can apply multiple times deduplication and each time dedupe more. To prevent issues, try
-running `yarn dedupe` after each `yarn-berry-deduplicate`.
-
----
-
-## Duplicated packages
-
-`yarn.lock` contains a list of all the dependencies required by your project (including transitive
-dependencies), and the actual package version installed to satisfy those dependencies.
-
-For the context of this project, a "duplicated package" is a package that appears on multiple nodes
-of the dependency tree with overlapping version ranges but resolved to different versions.
-
-For example, imagine that your project directly depends on `lodash` and `babel`, and `babel` depends
-on `lodash` as well. Specifically, your project depends on `lodash@^1.0.0` and `babel` depends on
-`lodash@^1.1.0`. Because how the resolution algorithm works in Yarn, you might end up with two
-different copies of `lodash` (for example, version `1.0.1` and `1.2.0`) in your project, even when
-`1.2.0` will suffice to satisfy both requirements for `lodash`. That's a "duplicated package".
-
-It is important to note that we do not consider duplicated packages when the version ranges don't
-overlap. For example, if your project depends on `underscore@^1.0.0` and `underscore@^2.0.0`. Your
-project will end up with two versions of `underscore`, and `yarn-deduplicate` won't change that.
-
-When using `yarn-deduplicate` remember that **it will change your dependency tree**. There are
-certain code paths that now will run with a different set of dependencies. It is highly recommended
-that you review each change to `yarn.lock`. If the change is too big, use the flag `--packages` to
-deduplicate them gradually.
-
-### Why is this necessary?
-
-Yarn documentation seems to suggest this package shouldn't be necessary. For example, in
-https://classic.yarnpkg.com/en/docs/cli/dedupe/, it says
-
-> The dedupe command isn’t necessary. `yarn install` will already dedupe.
-
-This is, however, not exactly true. There are cases where yarn will _not_ deduplicate existing
-packages. For example, this scenario:
-
-- Install `libA`. It depends on `libB ^1.1.0`. At this point, the latest version of `libB` is
-  `1.1.2`, so it gets installed as a transitive dependency in your repo
+`<dependencyName>` is a glob, so `@babel/*` works, and several may be named.
+`--all` (`-a`) keeps packages that are not duplicated.
 
-- After a few days, install `libC`. It also depends on `libB ^1.1.0`. But this time, the latest
-  `libB` version is `1.1.3`.
+A named package that is not duplicated still gets its dependents listed —
+"nothing found" is not an answer to "why is this duplicated". `--all` is only
+needed to keep single-version matches next to duplicated ones.
 
-In the above scenario, you'll end up with `libB@1.1.2` and `libB@1.1.3` in your repo.
+By default the report is one line per duplicated package — the versions it
+resolved to, and what it can be deduped to:
 
-Find more examples in:
+```
+- @eslint/plugin-kit  resolved to 2 versions (0.7.1, 0.6.1)
+- picomatch           resolved to 3 versions (4.0.4, 4.0.3, 2.3.1), can be deduped to 2 versions
+```
 
-- [yarn-deduplicate — The Hero We Need](https://medium.com/@bnaya/yarn-deduplicate-the-hero-we-need-f4497a362128)
-- [De-duplicating yarn.lock](https://medium.com/@scinos/de-duplicating-yarn-lock-ae30be4aa41a)
-- https://github.com/yarnpkg/yarn/issues/3778
+`can be deduped to N versions` always means N remain, never N merged away.
 
-### Deduplication strategies
+`--details` (`-d`), implied when a package is named, files every dependent under
+the version it resolved to, so the range that keeps each copy alive is read off
+the version it sits under:
 
-`--strategy <strategy>`
+```
+@eslint/plugin-kit — 2 versions
+  0.7.1
+    - check-package-dependencies  requires "^0.7.1"
+    - eslint                      requires "^0.7.1"
+  0.6.1
+    - @eslint/json                requires "^0.6.1"
+```
 
-`highest` will try to use the highest installed version. For example, with the following
-`yarn.lock`:
+After the packages come the lockstep clusters — families published together,
+whose duplicates only go away when the whole family moves. A package a cluster
+converges carries the family's target and a `(cluster N)` reference.
 
-```text
-library@^1.1.0:
-  version "1.2.0"
+The dedupable count is a floor: merging a package collapses its own dependency
+edges too, so a run can remove copies no per-package fix predicted.
 
-library@^1.2.0:
-  version "1.2.0"
+### Dedupe
 
-library@^1.3.0:
-  version "1.3.0"
+```
+yarn dlx yarn-berry-deduplicate              # apply
+yarn dlx yarn-berry-deduplicate --dry-run    # print the plan, change nothing, exit 0
+yarn dlx yarn-berry-deduplicate --check      # print the plan, change nothing, exit 1 if anything would change
 ```
 
-It will deduplicate `library@^1.1.0` and `library@^1.2.0` to `1.3.0`
+`--check` is the CI gate; `--dry-run` (`-n`) is the same output without the
+failing exit code.
 
-`fewer` will try to minimize the number of installed versions by trying to deduplicate to the
-version that satisfies most of the ranges first. For example, with the following `yarn.lock`:
+Two passes run: the cluster pass edits `package.json` and runs `yarn install`,
+reaching versions the lockfile does not carry; the pure-lock pass then collapses
+the leaves yarn did not merge on its own, by merging descriptors onto one entry.
+`--no-clusters` runs only the second.
 
-```text
-library@*:
-  version "2.0.0"
+The cluster pass writes `resolutions` in the workspace root `package.json` as
+scaffolding only: it re-resolves without them, and a fix that yarn resolves back
+away from once the resolution is gone is reverted rather than applied. A dedupe
+that needs a standing `resolutions` entry is not one this tool makes.
 
-library@>=1.1.0:
-  version "3.0.0"
+A run that changes something ends with what it merged, one line per package:
 
-library@^1.2.0:
-  version "1.2.0"
+```
+Deduped 2 packages, 2 copies merged:
+  barcode-detector: 2 versions (3.0.3, 3.2.2) -> 1 version (3.0.3)
+  zxing-wasm:       2 versions (2.2.4, 3.1.3) -> 1 version (2.2.4)
+No duplicate left.
 ```
 
-It will deduplicate `library@*` and `library@>=1.1.0` to `1.2.0`.
-
-Note that this may cause some packages to be **downgraded**. Be sure to check the changelogs between
-all versions and understand the consequences of that downgrade. If unsure, don't use this strategy.
+Both passes are covered by that one summary. Both sides of a line are counted
+and named, so a family converging onto an older release reads as two copies
+becoming one rather than as a downgrade; a package only partly collapsed lists
+the versions it still has. The last line counts the duplicates left, as
+`yarn-berry-why-duplicate` counts them.
 
-It is not recommended to use different strategies for different packages. There is no guarantee that
-the strategy will be honored in subsequent runs of `yarn-deduplicate` unless the same set of flags
-is specified again.
+A rewritten lockfile is not an installed one: the run says `yarn.lock updated`
+and asks for a `yarn install` to bring the project in line with it.
 
 ### Progressive deduplication
 
-`--packages <package1> <package2> <packageN>`
-
-Receives a list of packages to deduplicate. It will ignore any other duplicated package not in the
-list. This option is recommended when the number of duplicated packages in `yarn.lock` is too big to
-be easily reviewed by a human. This will allow for a more controlled and progressive deduplication
-of `yarn.lock`.
-
-`--scopes <scope1> <scope2> <scopeN>`
-
-Receives a list of scopes to deduplicate. It will ignore any other duplicated package not in the
-list. This option is recommended when deduplicating a large number of inter-dependent packages from
-a single scope, such as @babel. This will allow for a more controlled and progressive deduplication
-of `yarn.lock` without specifying each package individually.
-
-### Excluding packages
-
-`--exclude <package1> <package2> <packageN`
-
-`--exclude-scopes <scope1> <scope2> <scopeN>`
+Deduping the whole lockfile is the default: a run told nothing takes everything
+it can. In case you only need to dedupe part of it, these flags bound a run to
+the packages you name, and work on both commands:
 
-With these commands you can exclude certain packages/scopes from the deduplication process. This is
-specially useful if you want to apply a different strategy for a scope, for example.
-
-### Pre-release versions
-
-By default, `yarn-deduplicate` will only match pre-release versions if they share they share the
-same `major`, `minor` and `patch` versions (example: `^1.2.3-alpha.1` and `1.2.3-alpha.2` can be
-deduplicated, but `^1.2.3` and `1.2.4-alpha.1` can't). This matches the behaviour of
-[semver](https://docs.npmjs.com/misc/semver#prerelease-tags).
-
-To change this behaviour you can use the flag `--includePrerelease`. This will treat all pre-release
-versionas as if they were normal versions (`^1.2.3` and `1.2.4-alpha.1` can be deduplicated).
-
-### Usage in CI
-
-This tool can be used as part of a CI workflow. Adding the flag `--fail` will force the process to
-exit with status 1 if there are duplicated packages. Example:
-
-```sh
-# Print the list of duplicated packages and exit with status 1
-yarn dlx yarn-berry-deduplicate --list --fail
-
-# Deduplicate yarn.lock and exit with status 1 if changes were required
-yarn dlx yarn-berry-deduplicate --fail
+```
+yarn dlx yarn-berry-deduplicate --dry-run --scopes @babel        # one scope
+yarn dlx yarn-berry-deduplicate --dry-run --packages 'lodash,@babel/**'  # names or globs
+yarn dlx yarn-berry-deduplicate --dry-run --exclude lodash       # everything but these
+yarn dlx yarn-berry-deduplicate --dry-run --exclude-scopes @types
 ```
 
-## License
+Each flag takes a comma list or is repeated (`--packages a --packages b`).
+Selecting nothing selects everything. `--packages`/`--scopes` say what may be
+touched; `--exclude`/`--exclude-scopes` win over them, so a scope can be taken
+minus a few of its packages. Patterns are globs whose `*` stops at `/`, so
+`@babel/*` matches `@babel/core` and a bare `*` matches only unscoped names.
+
+A lockstep cluster moves as one, so a fix is kept only when the filter selects
+every member of its family — otherwise it is skipped and the plan names the
+members that blocked it. Widen the filter to take the family, or leave it for
+another run.
+
+`yarn install` still runs during the cluster pass, and it may move entries the
+filter did not select if it considers them stale.
+
+Colors follow the terminal: `NO_COLOR` and a piped stdout turn them off,
+`FORCE_COLOR` turns them on.
+
+## Peer dependencies
+
+A `peerDependencies` range constrains its requester's resolved version exactly
+as a dependency range does, and `yarn.lock` is where the _edge_ goes missing:
+yarn folds a peer provision into the virtual package's `dependencies`, and
+virtual packages are not written to the lockfile. So peer ranges sit in a block
+of their own, with nothing saying who provided them.
+
+Peer requesters are therefore read from `peerDependencies` directly, optional
+ones included: whether a peer was actually provided cannot be told from the
+lockfile, and a constraint that may not bind costs a suppressed merge, where a
+missing one costs a merge that breaks a peer. Such a dependent is marked with a
+dim `(peer)` after its range in the report.
+
+A peer range never explains why a second version exists — yarn resolves peers
+against what is already in the tree and warns instead of backtracking. It is an
+extra constraint on a package duplicated for other reasons, which is why keeping
+it changes the fixes.
+
+Cluster membership is built from `dependencies` only. Adding peers there would
+union unrelated packages into a family: `eslint-plugin-x@9.0.0` peer-depending on
+`eslint@^9.0.0` is co-versioned by coincidence, not published in lockstep.
+
+## Notes
+
+- `nodeLinker` never reaches the lockfile. Resolution runs before linking, so
+  `yarn.lock` is byte-identical under `pnp` and `node-modules`, and nothing here
+  reads an installed tree — the same fixes apply either way.
+- Non-npm protocols (`workspace:`, `patch:`, `portal:`, git…) are parsed and
+  reported but never merged: only `npm:` resolutions are semver-comparable.
+- The bins run on node (`>=22.18.0`), not on bun.
+
+## API
+
+```js
+import {
+  fixDuplicates,
+  listDuplicates,
+  whyDuplicate,
+} from "yarn-berry-deduplicate";
+
+listDuplicates({ details: true });
+whyDuplicate({ filter: { include: ["@babel/*"] }, all: true, details: true });
+fixDuplicates({
+  mode: "dry-run",
+  clusters: true,
+  filter: { includeScopes: ["@babel"] },
+});
+```
 
-Copyright (c) 2022 Sergio Cinos and others. Apache 2.0 licensed, see [LICENSE.txt](LICENSE.txt)
-file.
+`mode` is `"apply"`, `"dry-run"` or `"check"` — the same three the CLI exposes.
+The lockfile parsing and graph building steps are exported too
+(`readAndParseYarnLock`, `parseYarnLockPackages`, `buildYarnPackagesMap`,
+`collectYarnDependents`, `toLockstepGraph`, `writeYarnLockFile`), for building
+something else on top; the algorithm itself lives in [pm-dedup-core](../pm-dedup-core).

package/dist/applyClusterFixes.js

@@ -0,0 +1,246 @@
+import { readFileSync, writeFileSync } from "node:fs";
+import { join, relative } from "node:path";
+import { applyWorkspaceRangeEdit, captureFiles, createPackageFilter, describeSkippedClusterFix, diffDuplicates, partitionUnconditionalOverrides, planClusterApply, renderApplyPlan, restoreFiles, selectClusterFixes, shouldColorize, } from "pm-dedup-core";
+import { buildYarnPackagesMap } from "./helpers/buildYarnPackagesMap.js";
+import { collectWorkspaces, createManifestReader, } from "./helpers/collectWorkspaces.js";
+import { readDuplicateSnapshot } from "./helpers/duplicateSnapshot.js";
+import { addResolutions } from "./helpers/packageJsonResolutions.js";
+import { parseYarnLockPackages } from "./helpers/parseYarnLockPackages.js";
+import { lockPathOf } from "./helpers/projectDir.js";
+import { runYarn } from "./helpers/runYarn.js";
+import { identifyClusterFixes } from "./identifyClusterFixes.js";
+import { readAndParseYarnLock } from "./readYarnLock.js";
+const issuesUrl = "https://github.com/christophehurpeau/pm-tools/issues";
+const defaultReadFixes = (projectDir) => {
+    const entries = readAndParseYarnLock(lockPathOf(projectDir));
+    const packages = parseYarnLockPackages(entries);
+    return identifyClusterFixes(buildYarnPackagesMap(packages), packages, collectWorkspaces(packages, createManifestReader(projectDir)));
+};
+// the root workspace is keyed "", which `join` already treats as the project
+// directory itself
+const manifestPathOf = (projectDir, importerPath) => join(projectDir, importerPath, "package.json");
+const describeOverride = (override) => `"${override.packageName}": "${override.version}"`;
+/**
+ * A yarn resolution is matched against the package a descriptor resolves to, so
+ * an edge declared through an npm alias
+ * (`"psc-pinned": "npm:printable-shell-command@~5.0.0"`) is repointed by a
+ * resolution on the *target* name. The resolution is still written, because an
+ * in-cluster requester declaring the package directly is repointed by it too,
+ * but naming the alias-only requesters keeps a revert from saying nothing.
+ */
+const aliasOnlyRequesters = (fixes, packageName) => {
+    const constraints = fixes
+        .flatMap((fix) => fix.externalConstraints)
+        .filter((constraint) => constraint.packageName === packageName);
+    return constraints.length > 0 && constraints.every((c) => c.isAlias === true)
+        ? constraints.map((constraint) => constraint.requester)
+        : [];
+};
+const reuseKeys = (fixes) => new Set(fixes.flatMap((fix) => fix.reuseFixes.map((reuse) => `${reuse.requesterName}>${reuse.packageName}@${reuse.to}`)));
+export const applyClusterFixes = ({ projectDir, dryRun = false, log = console.log, 
+// `yarn install` is the only way to reach a version whose manifest the
+// lockfile does not carry, and the only thing that cascades a family's
+// internal pins
+resolve = () => runYarn(["install"], { cwd: projectDir }).status, 
+// the result has to be what CI would install from the manifests alone
+verifyFrozen = () => runYarn(["install", "--immutable"], { cwd: projectDir }).status, readFixes = defaultReadFixes, readDuplicates = readDuplicateSnapshot, filter, packageManagerResiduals, color = shouldColorize(), }) => {
+    const packageFilter = createPackageFilter(filter);
+    const readSelectedFixes = (dir) => selectClusterFixes(readFixes(dir), packageFilter);
+    const lockPath = lockPathOf(projectDir);
+    const rootManifestPath = join(projectDir, "package.json");
+    const before = readDuplicates(lockPath);
+    const unchanged = (status, plannedChangeCount = 0) => ({
+        status,
+        before,
+        after: before,
+        stickyOverrides: [],
+        plannedChangeCount,
+    });
+    const { selected: fixes, skipped: filteredOut } = readSelectedFixes(projectDir);
+    const plan = planClusterApply(fixes);
+    // a yarn resolution applies to every requester of the package, so one a
+    // third-party range rejects would force that dependent too
+    const { safe: plannedOverrides, rejected } = partitionUnconditionalOverrides(fixes, plan.overrides);
+    const skipped = [
+        ...filteredOut.map(describeSkippedClusterFix),
+        ...plan.unresolvableChanges.map((unresolvable) => `${unresolvable}: no workspace file recorded for it`),
+        ...plan.conflicts.map((conflict) => `${conflict.packageName}: keeping ${conflict.kept}, ignoring ${conflict.dropped} asked by another cluster`),
+        ...rejected.flatMap(({ override, rejectedBy }) => rejectedBy.map((constraint) => `resolution ${describeOverride(override)}: ${constraint.requesterName ?? "workspace"} requires "${constraint.range}", and a yarn resolution would force it too`)),
+    ];
+    const changeCount = plan.manifestEdits.length + plannedOverrides.length;
+    const relativeManifestPath = (importerPath) => relative(projectDir, manifestPathOf(projectDir, importerPath));
+    const planFileChanges = () => [
+        ...[
+            ...new Set(plan.manifestEdits.map((edit) => relativeManifestPath(edit.importerPath))),
+        ].map((path) => ({
+            path,
+            changes: plan.manifestEdits
+                .filter((edit) => relativeManifestPath(edit.importerPath) === path)
+                .map((edit) => `"${edit.packageName}": "${edit.range}" -> "${edit.to}" (${edit.depType})`),
+        })),
+        {
+            path: `${relative(projectDir, rootManifestPath)} resolutions`,
+            transient: "removed once the result is verified",
+            changes: plannedOverrides.map((override) => `${describeOverride(override)} (${override.reason})`),
+        },
+    ];
+    // A dry run prints the plan through the shared renderer and stops.
+    const reportPlan = () => {
+        renderApplyPlan({
+            fileChanges: changeCount === 0 ? [] : planFileChanges(),
+            skipped,
+            packageManagerResiduals,
+            dedupeCommand: "yarn-berry-deduplicate",
+            log,
+            color,
+        });
+        return unchanged("dry-run", changeCount);
+    };
+    if (!dryRun) {
+        for (const entry of skipped) {
+            log(`  Skipped ${entry}`);
+        }
+    }
+    if (changeCount === 0) {
+        return dryRun ? reportPlan() : unchanged("nothing-to-do");
+    }
+    if (dryRun) {
+        return reportPlan();
+    }
+    const touchedPaths = [
+        ...new Set([
+            ...plan.manifestEdits.map((edit) => manifestPathOf(projectDir, edit.importerPath)),
+            rootManifestPath,
+        ]),
+        lockPath,
+    ];
+    const originalSnapshot = captureFiles(touchedPaths);
+    const revertTo = (snapshot) => {
+        restoreFiles(snapshot);
+        resolve();
+    };
+    const editManifests = (edits) => edits.every((edit) => {
+        const path = manifestPathOf(projectDir, edit.importerPath);
+        const updated = applyWorkspaceRangeEdit(readFileSync(path, "utf8"), edit);
+        if (updated === undefined) {
+            log(`  ${path} no longer declares "${edit.packageName}": "${edit.range}" — the lockfile is out of date`);
+            return false;
+        }
+        log(`  ${path}: "${edit.packageName}" ${edit.range} -> ${edit.to} in ${edit.depType}`);
+        writeFileSync(path, updated);
+        return true;
+    });
+    // A reuse fix removes no duplicate — both copies keep their dependents — so
+    // the duplicate set cannot tell whether it took. The detector can: the fix is
+    // gone from its output once the edge points at the anchored version.
+    const readState = () => ({
+        duplicates: readDuplicates(lockPath),
+        reuses: reuseKeys(readSelectedFixes(projectDir).selected),
+    });
+    // A step keeps its edits as long as it broke nothing: a widened range often
+    // deduplicates nothing on its own and only makes the resolutions applicable.
+    const resolveAndCheck = (label) => {
+        if (resolve() !== 0) {
+            log(`  \`yarn install\` failed after ${label} — reverting`);
+            return null;
+        }
+        const state = readState();
+        const { added } = diffDuplicates(before, state.duplicates);
+        if (added.length > 0) {
+            log(`  ${label} introduced ${added.length} new duplicate(s) — reverting`);
+            return null;
+        }
+        return state;
+    };
+    if (plan.manifestEdits.length > 0) {
+        log("Editing workspace ranges:");
+        if (!editManifests(plan.manifestEdits)) {
+            revertTo(originalSnapshot);
+            return unchanged("reverted", changeCount);
+        }
+        if (resolveAndCheck("the workspace range edits") === null) {
+            revertTo(originalSnapshot);
+            return unchanged("reverted", changeCount);
+        }
+    }
+    const withoutOverridesSnapshot = captureFiles(touchedPaths);
+    const rootManifestBefore = withoutOverridesSnapshot.find((snapshot) => snapshot.path === rootManifestPath);
+    const remaining = readState();
+    // A resolution is still worth writing while its package is duplicated, or
+    // while the edge it repoints is still resolving elsewhere.
+    const outstanding = plannedOverrides.filter((override) => [...remaining.duplicates].some((resolution) => resolution.startsWith(`${override.packageName}@`)) ||
+        [...remaining.reuses].some((key) => key.endsWith(`>${override.packageName}@${override.version}`)));
+    // The result is only a fix if CI can install it from the manifests as they
+    // stand, resolutions removed and all.
+    const frozenFailure = () => {
+        if (verifyFrozen() === 0)
+            return null;
+        log("  `yarn install --immutable` rejects the result — reverting, the lockfile it produced is not one CI can reuse");
+        revertTo(withoutOverridesSnapshot);
+        return {
+            status: "reverted",
+            before,
+            after: readDuplicates(lockPath),
+            stickyOverrides: [],
+            plannedChangeCount: changeCount,
+        };
+    };
+    if (outstanding.length === 0) {
+        return (frozenFailure() ?? {
+            status: "applied",
+            before,
+            after: remaining.duplicates,
+            stickyOverrides: [],
+            plannedChangeCount: changeCount,
+        });
+    }
+    log(`Adding resolutions to ${rootManifestPath}:`);
+    for (const override of outstanding) {
+        log(`  ${describeOverride(override)} (${override.reason})`);
+        const aliased = aliasOnlyRequesters(fixes, override.packageName);
+        if (aliased.length > 0) {
+            log(`    every requester of ${override.packageName} declares it through an alias (${aliased.join(", ")}); a yarn resolution repoints the target, not those keys`);
+        }
+    }
+    writeFileSync(rootManifestPath, addResolutions(rootManifestBefore.content ?? "{}", new Map(outstanding.map((override) => [override.packageName, override.version]))));
+    const withOverrides = resolveAndCheck("the resolutions");
+    if (withOverrides === null) {
+        revertTo(withoutOverridesSnapshot);
+        return unchanged("reverted", changeCount);
+    }
+    // The resolutions are scaffolding: yarn has to hold the deduplicated result
+    // on its own, or the fix is not one we can ship.
+    log("Removing the resolutions and re-resolving to check the result holds:");
+    restoreFiles([rootManifestBefore]);
+    if (resolve() !== 0) {
+        log("  `yarn install` failed without the resolutions — reverting");
+        revertTo(withoutOverridesSnapshot);
+        return unchanged("reverted", changeCount);
+    }
+    const after = readState();
+    const returnedDuplicates = diffDuplicates(withOverrides.duplicates, after.duplicates).added;
+    const returnedReuses = [...after.reuses].filter((key) => !withOverrides.reuses.has(key));
+    if (returnedDuplicates.length > 0 || returnedReuses.length > 0) {
+        log("  The resolutions were the only thing holding the result: yarn resolves back without them. A fix that needs a standing resolution is not one this tool applies.");
+        log(`  Please report this cluster at ${issuesUrl}:`);
+        for (const override of outstanding) {
+            log(`    ${describeOverride(override)}`);
+        }
+        revertTo(withoutOverridesSnapshot);
+        return {
+            status: "reverted",
+            before,
+            after: readDuplicates(lockPath),
+            stickyOverrides: outstanding,
+            plannedChangeCount: changeCount,
+        };
+    }
+    return (frozenFailure() ?? {
+        status: "applied",
+        before,
+        after: after.duplicates,
+        stickyOverrides: [],
+        plannedChangeCount: changeCount,
+    });
+};
+//# sourceMappingURL=applyClusterFixes.js.map

package/dist/applyClusterFixes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"applyClusterFixes.js","sourceRoot":"","sources":["../src/applyClusterFixes.ts"],"names":[],"mappings":"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"}