pm-dedup-core 2.1.0

package/dist/identifyLockstepClusterFixes.test.js

@@ -0,0 +1,372 @@
+import { describe, expect, it } from "bun:test";
+import { identifyLockstepClusterFixes } from "./identifyLockstepClusterFixes.js";
+// A family published in lockstep: `root` is requested from outside and resolved
+// high, `leaf` is duplicated because of it.
+const members = {
+    root: { npmVersions: ["2.0.0"], resolutionCount: 1 },
+    leaf: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
+};
+const dependents = (entries) => new Map(entries.map(([name, list]) => [
+    name,
+    list.map((dependent) => ({
+        requester: dependent.requester,
+        requesterName: dependent.requesterName,
+        range: dependent.range,
+        isAlias: dependent.isAlias,
+        resolvedVersion: dependent.resolvedVersion,
+        workspace: dependent.workspace,
+    })),
+]));
+const fixFor = (dependentsMap, map = members) => identifyLockstepClusterFixes([["leaf", "root"]], map, dependentsMap)[0];
+describe("identifyLockstepClusterFixes", () => {
+    it("collapses the duplicate onto the version its external range still accepts", () => {
+        const fix = fixFor(dependents([
+            [
+                "root",
+                [
+                    {
+                        requester: "outside@1",
+                        requesterName: "outside",
+                        range: "^1.0.0",
+                    },
+                ],
+            ],
+            [
+                "leaf",
+                [
+                    // derived internal pin: discarded, it only exists because
+                    // root@2.0.0 did
+                    { requester: "root@2.0.0", requesterName: "root", range: "2.0.0" },
+                    // the real reason leaf@1.0.0 is installed
+                    { requester: "old@1", requesterName: "old", range: "^1.0.0" },
+                ],
+            ],
+        ]));
+        expect(fix.target).toBe("1.0.0");
+        expect(fix.direction).toBe("down");
+        expect(fix.duplicatedMembers).toEqual(["leaf"]);
+        expect(fix.convergentMembers).toEqual(["leaf"]);
+        expect(fix.excludedMembers).toEqual([]);
+        expect(fix.externalConstraints).toEqual([
+            {
+                requester: "old@1",
+                requesterName: "old",
+                packageName: "leaf",
+                range: "^1.0.0",
+            },
+            {
+                requester: "outside@1",
+                requesterName: "outside",
+                packageName: "root",
+                range: "^1.0.0",
+            },
+        ]);
+        // root carries the external dependent and has no 1.0.0 installed
+        expect(fix.reResolutionSet).toEqual(["root"]);
+        expect(fix.needsRoundTrip).toBe(true);
+        expect(fix.applicable).toBe(true);
+    });
+    it("treats an exact workspace pin as binding, never as an edit to propose", () => {
+        const fix = fixFor(dependents([
+            [
+                "leaf",
+                [
+                    {
+                        requester: "package.json",
+                        range: "1.0.0",
+                        resolvedVersion: "1.0.0",
+                        workspace: { path: ".", depType: "devDependencies" },
+                    },
+                ],
+            ],
+        ]));
+        // the pin is a decision: 2.0.0 is off the table for leaf, and 1.0.0 cannot
+        // collapse either because root@2.0.0 is not asked to move by anyone
+        expect(fix.workspaceChanges).toEqual([]);
+        expect(fix.target).toBe("1.0.0");
+        expect(fix.convergentMembers).toEqual(["leaf"]);
+    });
+    it("repoints an open range that ignored the pinned version", () => {
+        const fix = fixFor(dependents([
+            [
+                "leaf",
+                [
+                    {
+                        requester: "package.json",
+                        range: "1.0.0",
+                        resolvedVersion: "1.0.0",
+                        workspace: { path: ".", depType: "devDependencies" },
+                    },
+                    {
+                        requester: "plugin@1",
+                        requesterName: "plugin",
+                        range: "*",
+                        resolvedVersion: "2.0.0",
+                    },
+                ],
+            ],
+        ]));
+        expect(fix.anchor).toBe("1.0.0");
+        expect(fix.reuseFixes).toEqual([
+            {
+                requester: "plugin@1",
+                requesterName: "plugin",
+                packageName: "leaf",
+                range: "*",
+                from: "2.0.0",
+                to: "1.0.0",
+            },
+        ]);
+    });
+    it("excludes the member a third-party range rejects, keeping the rest", () => {
+        const fix = identifyLockstepClusterFixes([["other", "leaf", "root"]], {
+            ...members,
+            other: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
+        }, dependents([
+            [
+                "leaf",
+                [{ requester: "user@1", requesterName: "user", range: "^2.0.0" }],
+            ],
+            [
+                "other",
+                [{ requester: "pinner@1", requesterName: "pinner", range: "~1.0.0" }],
+            ],
+        ]))[0];
+        expect(fix.target).toBe("2.0.0");
+        expect(fix.convergentMembers).toEqual(["leaf"]);
+        expect(fix.excludedMembers).toEqual([
+            {
+                packageName: "other",
+                blockedBy: [
+                    {
+                        requester: "pinner@1",
+                        requesterName: "pinner",
+                        packageName: "other",
+                        range: "~1.0.0",
+                    },
+                ],
+            },
+        ]);
+        expect(fix.applicable).toBe(true);
+    });
+    it("does not collapse a member an unmovable sibling pins elsewhere", () => {
+        // `root` cannot leave 2.0.0 (exact third-party pin), and it requests leaf at
+        // 2.0.0, so leaf's 1.0.0 copy cannot be collapsed onto 2.0.0 either.
+        const fix = fixFor(dependents([
+            [
+                "root",
+                [
+                    {
+                        requester: "outside@1",
+                        requesterName: "outside",
+                        range: "2.0.0",
+                    },
+                ],
+            ],
+            [
+                "leaf",
+                [
+                    { requester: "root@2.0.0", requesterName: "root", range: "2.0.0" },
+                    { requester: "old@1", requesterName: "old", range: "1.0.0" },
+                ],
+            ],
+        ]));
+        expect(fix.applicable).toBe(false);
+        expect(fix.target).toBeNull();
+        expect(fix.direction).toBe("none");
+        expect(fix.convergentMembers).toEqual([]);
+    });
+    it("never targets a version the duplicated member does not carry", () => {
+        const fix = fixFor(dependents([["leaf", []]]), {
+            root: { npmVersions: ["3.0.0"], resolutionCount: 1 },
+            leaf: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
+        });
+        // 3.0.0 is installed for root only: copying it over leaf is impossible
+        expect(fix.target).toBe("2.0.0");
+        expect(fix.direction).toBe("up");
+    });
+    it("proposes the pin change only when nothing else deduplicates", () => {
+        // `other` is exactly pinned at 2.0.0 by a third party and requests leaf at
+        // 2.0.0, so 1.0.0 collapses nothing; the workspace's own `~1.0.0` on leaf is
+        // the only thing standing between the family and 2.0.0, so it is proposed.
+        const fix = identifyLockstepClusterFixes([["leaf", "other"]], {
+            leaf: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
+            other: { npmVersions: ["2.0.0"], resolutionCount: 1 },
+        }, dependents([
+            [
+                "leaf",
+                [
+                    {
+                        requester: "package.json",
+                        range: "~1.0.0",
+                        resolvedVersion: "1.0.0",
+                        workspace: { path: ".", depType: "devDependencies" },
+                    },
+                    {
+                        requester: "other@2.0.0",
+                        requesterName: "other",
+                        range: "2.0.0",
+                    },
+                ],
+            ],
+            [
+                "other",
+                [{ requester: "app@1", requesterName: "app", range: "2.0.0" }],
+            ],
+        ]))[0];
+        expect(fix.target).toBe("2.0.0");
+        expect(fix.convergentMembers).toEqual(["leaf"]);
+        expect(fix.workspaceChanges.map((change) => `${change.range} -> ${change.to}`)).toEqual(["~1.0.0 -> 2.0.0"]);
+    });
+    it("never proposes editing a workspace range declared under an alias key", () => {
+        // Same shape as above, with the workspace declaring leaf through a key of
+        // its own (`"leaf-1": "npm:leaf@~1.0.0"`). Moving that range to 2.0.0 would
+        // not converge the family, it would repoint the alias at the copy it was
+        // created to sit beside — so the range blocks 2.0.0 like a third party's,
+        // and the cluster is reported as not dedupable.
+        const fix = identifyLockstepClusterFixes([["leaf", "other"]], {
+            leaf: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
+            other: { npmVersions: ["2.0.0"], resolutionCount: 1 },
+        }, dependents([
+            [
+                "leaf",
+                [
+                    {
+                        requester: "package.json",
+                        range: "~1.0.0",
+                        isAlias: true,
+                        resolvedVersion: "1.0.0",
+                        workspace: { path: ".", depType: "devDependencies" },
+                    },
+                    {
+                        requester: "other@2.0.0",
+                        requesterName: "other",
+                        range: "2.0.0",
+                    },
+                ],
+            ],
+            [
+                "other",
+                [{ requester: "app@1", requesterName: "app", range: "2.0.0" }],
+            ],
+        ]))[0];
+        expect(fix.target).toBe(null);
+        expect(fix.applicable).toBe(false);
+        expect(fix.workspaceChanges).toEqual([]);
+    });
+    it("prefers a target that respects the workspace range over one that edits it", () => {
+        // 1.0.0 collapses leaf without touching the workspace range, so the 2.0.0
+        // candidate — which would need it widened — must not win.
+        const fix = identifyLockstepClusterFixes([["leaf", "other"]], {
+            leaf: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
+            other: { npmVersions: ["1.0.0"], resolutionCount: 1 },
+        }, dependents([
+            [
+                "leaf",
+                [
+                    {
+                        requester: "package.json",
+                        range: "~1.0.0",
+                        resolvedVersion: "1.0.0",
+                        workspace: { path: ".", depType: "devDependencies" },
+                    },
+                    { requester: "old@1", requesterName: "old", range: "^1.0.0" },
+                ],
+            ],
+        ]))[0];
+        expect(fix.target).toBe("1.0.0");
+        expect(fix.workspaceChanges).toEqual([]);
+    });
+    it("lets the resolver move a member nothing pins, without naming a version", () => {
+        // `holder` sits at 2.0.0 and pins leaf there, but its only requester asks
+        // through `*`: it has to move for leaf to collapse onto 1.0.0, and which
+        // version it lands on is the resolver's call.
+        const fix = identifyLockstepClusterFixes([["holder", "leaf"]], {
+            holder: { npmVersions: ["2.0.0"], resolutionCount: 1 },
+            leaf: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
+        }, dependents([
+            ["holder", [{ requester: "app@1", requesterName: "app", range: "*" }]],
+            [
+                "leaf",
+                [
+                    {
+                        requester: "holder@2.0.0",
+                        requesterName: "holder",
+                        range: "2.0.0",
+                    },
+                    { requester: "old@1", requesterName: "old", range: "1.0.0" },
+                ],
+            ],
+        ]))[0];
+        expect(fix.target).toBe("1.0.0");
+        expect(fix.convergentMembers).toEqual(["leaf"]);
+        expect(fix.floatingMembers).toEqual(["holder"]);
+        // no version is claimed for a floating member
+        expect(fix.reResolutionSet).toEqual([]);
+        expect(fix.needsRoundTrip).toBe(true);
+    });
+    it("proposes the pin upgrade when the family is only pulled forward", () => {
+        // The shape of a metro family under a pinned metro: a third party outside
+        // the cluster requires `^2.0.0`, the workspace pins 1.0.0, and every member
+        // carries both. Nothing collapses on 1.0.0 (the third party rules it out),
+        // so the only solution left edits the pin.
+        const fix = identifyLockstepClusterFixes([["family", "family-config"]], {
+            family: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
+            "family-config": {
+                npmVersions: ["1.0.0", "2.0.0"],
+                resolutionCount: 2,
+            },
+        }, dependents([
+            [
+                "family",
+                [
+                    {
+                        requester: "package.json",
+                        range: "1.0.0",
+                        resolvedVersion: "1.0.0",
+                        workspace: { path: ".", depType: "devDependencies" },
+                    },
+                    { requester: "cli@2.0.0", requesterName: "cli", range: "^2.0.0" },
+                    {
+                        requester: "family-config@1.0.0",
+                        requesterName: "family-config",
+                        range: "1.0.0",
+                    },
+                    {
+                        requester: "family-config@2.0.0",
+                        requesterName: "family-config",
+                        range: "2.0.0",
+                    },
+                ],
+            ],
+            [
+                "family-config",
+                [
+                    { requester: "plugin@1", requesterName: "plugin", range: "*" },
+                    {
+                        requester: "family@1.0.0",
+                        requesterName: "family",
+                        range: "1.0.0",
+                    },
+                    {
+                        requester: "family@2.0.0",
+                        requesterName: "family",
+                        range: "2.0.0",
+                    },
+                ],
+            ],
+        ]))[0];
+        expect(fix.target).toBe("2.0.0");
+        expect(fix.direction).toBe("up");
+        expect(fix.convergentMembers).toEqual(["family", "family-config"]);
+        expect(fix.driverMembers).toEqual(["family"]);
+        expect(fix.workspaceChanges.map((change) => `${change.packageName} ${change.range} -> ${change.to}`)).toEqual(["family 1.0.0 -> 2.0.0"]);
+    });
+    it("skips a cluster with no duplicated member", () => {
+        expect(identifyLockstepClusterFixes([["a", "b"]], {
+            a: { npmVersions: ["1.0.0"], resolutionCount: 1 },
+            b: { npmVersions: ["1.0.0"], resolutionCount: 1 },
+        }, new Map())).toEqual([]);
+    });
+});
+//# sourceMappingURL=identifyLockstepClusterFixes.test.js.map

package/dist/identifyLockstepClusterFixes.test.js.map

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

package/dist/identifyResolutionFixes.js

@@ -0,0 +1,102 @@
+import semver from "semver";
+import { createCandidateVersionComparator } from "./compareCandidateVersions.js";
+const isNpmResolution = (resolution) => resolution.package.type === "npm";
+/**
+ * Dedupe opportunities reachable one package at a time. A family of co-versioned
+ * packages whose duplicate survives only because a few members resolve high is
+ * invisible here and is handled by `identifyLockstepClusterFixes`.
+ */
+export const identifyResolutionFixes = (resolutions, dependents) => {
+    if (resolutions.length <= 1) {
+        return [];
+    }
+    const onlyNpmResolutions = resolutions.filter(isNpmResolution);
+    const fixes = [];
+    const packageNames = new Set(resolutions.map((resolution) => resolution.package.name));
+    for (const packageName of packageNames) {
+        const npmVersions = onlyNpmResolutions
+            .filter((resolution) => resolution.package.name === packageName)
+            .map((resolution) => ({
+            resolution,
+            version: resolution.package.version,
+            satisfies: new Set(),
+        }));
+        // Every requester can declare the package through something semver cannot
+        // read — a git url, `file:`, `workspace:` — and such a declaration is
+        // dropped here rather than treated as a range nothing satisfies, which
+        // would suppress the merges the real dependents allow. Once they are gone
+        // nothing may vouch for a merge at all, and the "one candidate covers every
+        // dependent" test below would read the empty set as full coverage.
+        const packageDependents = dependents
+            .get(packageName)
+            ?.filter((dependent) => !dependent.nonSemver);
+        if (!packageDependents || packageDependents.length === 0)
+            continue;
+        packageDependents.forEach((dependent) => {
+            for (const { version, satisfies } of npmVersions) {
+                if (semver.satisfies(version, dependent.version, {
+                    includePrerelease: true,
+                })) {
+                    satisfies.add(dependent);
+                }
+            }
+        });
+        const byVersionAscending = (resolutionA, resolutionB) => {
+            const versionA = npmVersions.find((candidate) => candidate.resolution.resolution === resolutionA)?.version;
+            const versionB = npmVersions.find((candidate) => candidate.resolution.resolution === resolutionB)?.version;
+            return versionA && versionB ? semver.compare(versionA, versionB) : 0;
+        };
+        const satisfiedCountByVersion = new Map(npmVersions.map(({ version, satisfies }) => [version, satisfies.size]));
+        const compareCandidates = createCandidateVersionComparator({
+            satisfiedCountOf: (version) => satisfiedCountByVersion.get(version) ?? 0,
+        });
+        // the best-ranked candidate satisfies everyone whenever any candidate does
+        const [bestCandidate] = npmVersions.toSorted((candidateA, candidateB) => compareCandidates(candidateA.version, candidateB.version));
+        if (bestCandidate?.satisfies.size === packageDependents.length) {
+            const mergeableResolutions = npmVersions
+                .map((candidate) => candidate.resolution.resolution)
+                .toSorted(byVersionAscending);
+            if (mergeableResolutions.length > 1) {
+                fixes.push({
+                    mergeableResolutions,
+                    to: bestCandidate.resolution.resolution,
+                });
+            }
+            continue;
+        }
+        // no single candidate satisfies all dependents — do greedy assignment from highest -> lowest
+        npmVersions.sort((candidateA, candidateB) => semver.rcompare(candidateA.version, candidateB.version));
+        const unassigned = new Set(packageDependents);
+        for (const candidate of npmVersions) {
+            const newlyAssigned = new Set([...candidate.satisfies].filter((dependent) => unassigned.has(dependent)));
+            if (newlyAssigned.size === 0)
+                continue;
+            const mergeable = npmVersions.filter((other) => {
+                if (other === candidate)
+                    return false;
+                const intersects = [...other.satisfies].some((dependent) => newlyAssigned.has(dependent));
+                if (!intersects)
+                    return false;
+                // merging is safe only when the candidate satisfies every dependent the
+                // resolution being merged away was serving
+                return [...other.satisfies].every((dependent) => candidate.satisfies.has(dependent));
+            });
+            const mergeableResolutions = [
+                candidate.resolution.resolution,
+                ...mergeable.map((other) => other.resolution.resolution),
+            ].toSorted(byVersionAscending);
+            if (mergeableResolutions.length > 1) {
+                fixes.push({
+                    mergeableResolutions,
+                    to: candidate.resolution.resolution,
+                });
+            }
+            for (const dependent of newlyAssigned)
+                unassigned.delete(dependent);
+            if (unassigned.size === 0)
+                break;
+        }
+    }
+    return fixes;
+};
+//# sourceMappingURL=identifyResolutionFixes.js.map

package/dist/identifyResolutionFixes.js.map

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

package/dist/identifyResolutionFixes.test.js

@@ -0,0 +1,70 @@
+import { describe, expect, it } from "bun:test";
+import { identifyResolutionFixes } from "./identifyResolutionFixes.js";
+const npm = (name, version) => ({
+    resolution: `${name}@${version}`,
+    package: { type: "npm", name, version },
+});
+const workspace = (name) => ({
+    resolution: `${name}@workspace`,
+    package: { type: "workspace", name },
+});
+const dependentsOf = (name, ranges) => new Map([[name, ranges.map((version) => ({ version }))]]);
+describe("identifyResolutionFixes", () => {
+    it("ignores a dependent whose declaration semver cannot read", () => {
+        // read as a range, `workspace:*` satisfies neither candidate and the merge
+        // the real dependent allows would be suppressed
+        const dependents = new Map([
+            [
+                "lib",
+                [{ version: "^1.0.0" }, { version: "workspace:*", nonSemver: true }],
+            ],
+        ]);
+        expect(identifyResolutionFixes([npm("lib", "1.0.0"), npm("lib", "1.2.0")], dependents)).toEqual([
+            { mergeableResolutions: ["lib@1.0.0", "lib@1.2.0"], to: "lib@1.2.0" },
+        ]);
+    });
+    it("vouches for no merge when every dependent is unreadable", () => {
+        const dependents = new Map([
+            ["lib", [{ version: "workspace:*", nonSemver: true }]],
+        ]);
+        expect(identifyResolutionFixes([npm("lib", "1.0.0"), npm("lib", "1.2.0")], dependents)).toEqual([]);
+    });
+    it("returns nothing for fewer than two resolutions", () => {
+        expect(identifyResolutionFixes([], new Map())).toEqual([]);
+        expect(identifyResolutionFixes([npm("lib", "1.0.0")], new Map())).toEqual([]);
+    });
+    it("merges every resolution onto the highest version satisfying all dependents", () => {
+        const fixes = identifyResolutionFixes([npm("lib", "1.0.0"), npm("lib", "1.2.0")], dependentsOf("lib", ["^1.0.0", "^1.2.0"]));
+        expect(fixes).toEqual([
+            { mergeableResolutions: ["lib@1.0.0", "lib@1.2.0"], to: "lib@1.2.0" },
+        ]);
+    });
+    it("partitions greedily when no version satisfies every dependent", () => {
+        const fixes = identifyResolutionFixes([npm("lib", "1.0.0"), npm("lib", "1.2.0"), npm("lib", "2.0.0")], dependentsOf("lib", ["^1.0.0", "^1.2.0", "^2.0.0"]));
+        expect(fixes).toEqual([
+            { mergeableResolutions: ["lib@1.0.0", "lib@1.2.0"], to: "lib@1.2.0" },
+        ]);
+    });
+    it("refuses a merge that would drop a dependent the merged resolution served", () => {
+        // `>=1.0.0` accepts 2.0.0, but merging 1.2.0 into it would strand `^1.0.0`
+        const fixes = identifyResolutionFixes([npm("lib", "1.0.0"), npm("lib", "1.2.0"), npm("lib", "2.0.0")], dependentsOf("lib", [">=1.0.0", "^1.0.0", "2.0.0"]));
+        expect(fixes).toEqual([
+            { mergeableResolutions: ["lib@1.0.0", "lib@1.2.0"], to: "lib@1.2.0" },
+        ]);
+    });
+    it("ignores resolutions that are not npm packages", () => {
+        const fixes = identifyResolutionFixes([npm("lib", "1.0.0"), workspace("lib"), npm("lib", "1.2.0")], dependentsOf("lib", ["^1.0.0", "^1.2.0"]));
+        expect(fixes).toEqual([
+            { mergeableResolutions: ["lib@1.0.0", "lib@1.2.0"], to: "lib@1.2.0" },
+        ]);
+    });
+    // Reachable as soon as every requester declares the package through something
+    // semver cannot read: those declarations are left out of the map, and no range
+    // is left to vouch for a merge. Reading the empty set as "one candidate covers
+    // every dependent" would merge the whole package on no evidence at all.
+    it("proposes nothing for a package with no collected dependents", () => {
+        expect(identifyResolutionFixes([npm("lib", "1.0.0"), npm("lib", "1.2.0")], new Map())).toEqual([]);
+        expect(identifyResolutionFixes([npm("lib", "1.0.0"), npm("lib", "1.2.0")], new Map([["lib", []]]))).toEqual([]);
+    });
+});
+//# sourceMappingURL=identifyResolutionFixes.test.js.map

package/dist/identifyResolutionFixes.test.js.map

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

package/dist/index.js

@@ -0,0 +1,24 @@
+export { PackageDescriptorNameUtils, PackageDependencyDescriptorUtils, isNpmProtocol, isSemverComparable, } from "./packageDependenciesUtils.js";
+export { buildLockstepClusters } from "./buildLockstepClusters.js";
+export { identifyLockstepClusterFixes } from "./identifyLockstepClusterFixes.js";
+export { identifyResolutionFixes } from "./identifyResolutionFixes.js";
+export { buildIdentifiedFixesMap } from "./buildIdentifiedFixesMap.js";
+export { createPackageFilter, describeSkippedClusterFix, selectClusterFixes, selectPackages, } from "./createPackageFilter.js";
+export { packageFilterParseArgsOptions, packageFilterUsage, toPackageFilterOptions, toWhyDuplicateRequest, whyDuplicateParseArgsOptions, whyDuplicateUsage, } from "./packageFilterArgs.js";
+export { parseBinArgs } from "./parseBinArgs.js";
+export { findProjectRoot, resolveProjectDir } from "./findProjectRoot.js";
+export { createCandidateVersionComparator } from "./compareCandidateVersions.js";
+export { clusterLabel } from "./clusterLabel.js";
+export { createColorize, shouldColorize } from "./reportColors.js";
+export { stylePackageName, stylePackageReference } from "./packageStyles.js";
+export { renderDuplicatesReport } from "./renderDuplicatesReport.js";
+export { selectExplainedPackages } from "./selectExplainedPackages.js";
+export { renderApplyPlan } from "./renderApplyPlan.js";
+export { renderDedupeSummary } from "./renderDedupeSummary.js";
+export { buildVersionsSnapshot, countDuplicatedPackages, diffVersionsSnapshots, } from "./versionsSnapshot.js";
+export { captureFiles, restoreFiles } from "./fileSnapshot.js";
+export { applyWorkspaceRangeEdit, nextSelector } from "./workspaceManifest.js";
+export { planClusterApply } from "./planClusterApply.js";
+export { diffDuplicates } from "./duplicateSnapshot.js";
+export { partitionUnconditionalOverrides } from "./unconditionalOverrides.js";
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,gCAAgC,EAChC,aAAa,EACb,kBAAkB,GACnB,MAAM,+BAA+B,CAAC;AAKvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAcjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AASvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,kBAAkB,EAClB,cAAc,GACf,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EACL,6BAA6B,EAC7B,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,4BAA4B,EAC5B,iBAAiB,GAClB,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AASrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAKvE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAMvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE/D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAMzD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC"}