pnpm-dedup 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/README.md +218 -0
- package/dist/applyClusterFixes.js +252 -0
- package/dist/applyClusterFixes.js.map +1 -0
- package/dist/applyClusterFixes.test.js +474 -0
- package/dist/applyClusterFixes.test.js.map +1 -0
- package/dist/bin/pnpm-dedupe.js +35 -0
- package/dist/bin/pnpm-dedupe.js.map +1 -0
- package/dist/bin/pnpm-why-duplicate.js +23 -0
- package/dist/bin/pnpm-why-duplicate.js.map +1 -0
- package/dist/bin/pnpm-why-duplicate.test.js +57 -0
- package/dist/bin/pnpm-why-duplicate.test.js.map +1 -0
- package/dist/dedupe.js +86 -0
- package/dist/dedupe.js.map +1 -0
- package/dist/dedupeCheckConsistency.test.js +149 -0
- package/dist/dedupeCheckConsistency.test.js.map +1 -0
- package/dist/dedupeEndToEnd.test.js +121 -0
- package/dist/dedupeEndToEnd.test.js.map +1 -0
- package/dist/dedupePeers.test.js +105 -0
- package/dist/dedupePeers.test.js.map +1 -0
- package/dist/definitions/applyClusterFixes.d.ts +24 -0
- package/dist/definitions/applyClusterFixes.d.ts.map +1 -0
- package/dist/definitions/applyClusterFixes.test.d.ts +2 -0
- package/dist/definitions/applyClusterFixes.test.d.ts.map +1 -0
- package/dist/definitions/bin/pnpm-dedupe.d.ts +3 -0
- package/dist/definitions/bin/pnpm-dedupe.d.ts.map +1 -0
- package/dist/definitions/bin/pnpm-why-duplicate.d.ts +3 -0
- package/dist/definitions/bin/pnpm-why-duplicate.d.ts.map +1 -0
- package/dist/definitions/bin/pnpm-why-duplicate.test.d.ts +2 -0
- package/dist/definitions/bin/pnpm-why-duplicate.test.d.ts.map +1 -0
- package/dist/definitions/dedupe.d.ts +15 -0
- package/dist/definitions/dedupe.d.ts.map +1 -0
- package/dist/definitions/dedupeCheckConsistency.test.d.ts +2 -0
- package/dist/definitions/dedupeCheckConsistency.test.d.ts.map +1 -0
- package/dist/definitions/dedupeEndToEnd.test.d.ts +2 -0
- package/dist/definitions/dedupeEndToEnd.test.d.ts.map +1 -0
- package/dist/definitions/dedupePeers.test.d.ts +2 -0
- package/dist/definitions/dedupePeers.test.d.ts.map +1 -0
- package/dist/definitions/displayMany.d.ts +16 -0
- package/dist/definitions/displayMany.d.ts.map +1 -0
- package/dist/definitions/displayMany.test.d.ts +2 -0
- package/dist/definitions/displayMany.test.d.ts.map +1 -0
- package/dist/definitions/helpers/buildIdentifiedFixesMap.test.d.ts +2 -0
- package/dist/definitions/helpers/buildIdentifiedFixesMap.test.d.ts.map +1 -0
- package/dist/definitions/helpers/buildPnpmPackagesMap.d.ts +13 -0
- package/dist/definitions/helpers/buildPnpmPackagesMap.d.ts.map +1 -0
- package/dist/definitions/helpers/buildPnpmPackagesMap.test.d.ts +2 -0
- package/dist/definitions/helpers/buildPnpmPackagesMap.test.d.ts.map +1 -0
- package/dist/definitions/helpers/collectDependentRanges.d.ts +22 -0
- package/dist/definitions/helpers/collectDependentRanges.d.ts.map +1 -0
- package/dist/definitions/helpers/collectDependentRanges.test.d.ts +2 -0
- package/dist/definitions/helpers/collectDependentRanges.test.d.ts.map +1 -0
- package/dist/definitions/helpers/collectPnpmDependents.d.ts +8 -0
- package/dist/definitions/helpers/collectPnpmDependents.d.ts.map +1 -0
- package/dist/definitions/helpers/collectPnpmDependents.test.d.ts +2 -0
- package/dist/definitions/helpers/collectPnpmDependents.test.d.ts.map +1 -0
- package/dist/definitions/helpers/duplicateSnapshot.d.ts +3 -0
- package/dist/definitions/helpers/duplicateSnapshot.d.ts.map +1 -0
- package/dist/definitions/helpers/parsePnpmLockPackages.d.ts +44 -0
- package/dist/definitions/helpers/parsePnpmLockPackages.d.ts.map +1 -0
- package/dist/definitions/helpers/parsePnpmLockPackages.test.d.ts +2 -0
- package/dist/definitions/helpers/parsePnpmLockPackages.test.d.ts.map +1 -0
- package/dist/definitions/helpers/pnpmProtocol.d.ts +2 -0
- package/dist/definitions/helpers/pnpmProtocol.d.ts.map +1 -0
- package/dist/definitions/helpers/pnpmVersion.d.ts +11 -0
- package/dist/definitions/helpers/pnpmVersion.d.ts.map +1 -0
- package/dist/definitions/helpers/pnpmWorkspaceYaml.d.ts +23 -0
- package/dist/definitions/helpers/pnpmWorkspaceYaml.d.ts.map +1 -0
- package/dist/definitions/helpers/pnpmWorkspaceYaml.test.d.ts +2 -0
- package/dist/definitions/helpers/pnpmWorkspaceYaml.test.d.ts.map +1 -0
- package/dist/definitions/helpers/projectDir.d.ts +3 -0
- package/dist/definitions/helpers/projectDir.d.ts.map +1 -0
- package/dist/definitions/helpers/readInstalledManifest.d.ts +32 -0
- package/dist/definitions/helpers/readInstalledManifest.d.ts.map +1 -0
- package/dist/definitions/helpers/readInstalledManifest.test.d.ts +2 -0
- package/dist/definitions/helpers/readInstalledManifest.test.d.ts.map +1 -0
- package/dist/definitions/helpers/runPnpm.d.ts +11 -0
- package/dist/definitions/helpers/runPnpm.d.ts.map +1 -0
- package/dist/definitions/helpers/tempProjects.d.ts +8 -0
- package/dist/definitions/helpers/tempProjects.d.ts.map +1 -0
- package/dist/definitions/helpers/toLockstepGraph.d.ts +12 -0
- package/dist/definitions/helpers/toLockstepGraph.d.ts.map +1 -0
- package/dist/definitions/helpers/toLockstepGraph.test.d.ts +2 -0
- package/dist/definitions/helpers/toLockstepGraph.test.d.ts.map +1 -0
- package/dist/definitions/helpers/versionsSnapshot.d.ts +3 -0
- package/dist/definitions/helpers/versionsSnapshot.d.ts.map +1 -0
- package/dist/definitions/identifyClusterFixes.d.ts +7 -0
- package/dist/definitions/identifyClusterFixes.d.ts.map +1 -0
- package/dist/definitions/identifyClusterFixes.test.d.ts +2 -0
- package/dist/definitions/identifyClusterFixes.test.d.ts.map +1 -0
- package/dist/definitions/identifyResolutionFixes.test.d.ts +2 -0
- package/dist/definitions/identifyResolutionFixes.test.d.ts.map +1 -0
- package/dist/definitions/index.d.ts +25 -0
- package/dist/definitions/index.d.ts.map +1 -0
- package/dist/definitions/pnpmLockTypes.d.ts +42 -0
- package/dist/definitions/pnpmLockTypes.d.ts.map +1 -0
- package/dist/definitions/readPnpmLock.d.ts +3 -0
- package/dist/definitions/readPnpmLock.d.ts.map +1 -0
- package/dist/displayMany.js +56 -0
- package/dist/displayMany.js.map +1 -0
- package/dist/displayMany.test.js +146 -0
- package/dist/displayMany.test.js.map +1 -0
- package/dist/helpers/buildIdentifiedFixesMap.test.js +27 -0
- package/dist/helpers/buildIdentifiedFixesMap.test.js.map +1 -0
- package/dist/helpers/buildPnpmPackagesMap.js +23 -0
- package/dist/helpers/buildPnpmPackagesMap.js.map +1 -0
- package/dist/helpers/buildPnpmPackagesMap.test.js +68 -0
- package/dist/helpers/buildPnpmPackagesMap.test.js.map +1 -0
- package/dist/helpers/collectDependentRanges.js +118 -0
- package/dist/helpers/collectDependentRanges.js.map +1 -0
- package/dist/helpers/collectDependentRanges.test.js +211 -0
- package/dist/helpers/collectDependentRanges.test.js.map +1 -0
- package/dist/helpers/collectPnpmDependents.js +55 -0
- package/dist/helpers/collectPnpmDependents.js.map +1 -0
- package/dist/helpers/collectPnpmDependents.test.js +78 -0
- package/dist/helpers/collectPnpmDependents.test.js.map +1 -0
- package/dist/helpers/duplicateSnapshot.js +5 -0
- package/dist/helpers/duplicateSnapshot.js.map +1 -0
- package/dist/helpers/parsePnpmLockPackages.js +62 -0
- package/dist/helpers/parsePnpmLockPackages.js.map +1 -0
- package/dist/helpers/parsePnpmLockPackages.test.js +62 -0
- package/dist/helpers/parsePnpmLockPackages.test.js.map +1 -0
- package/dist/helpers/pnpmProtocol.js +2 -0
- package/dist/helpers/pnpmProtocol.js.map +1 -0
- package/dist/helpers/pnpmVersion.js +23 -0
- package/dist/helpers/pnpmVersion.js.map +1 -0
- package/dist/helpers/pnpmWorkspaceYaml.js +48 -0
- package/dist/helpers/pnpmWorkspaceYaml.js.map +1 -0
- package/dist/helpers/pnpmWorkspaceYaml.test.js +91 -0
- package/dist/helpers/pnpmWorkspaceYaml.test.js.map +1 -0
- package/dist/helpers/projectDir.js +10 -0
- package/dist/helpers/projectDir.js.map +1 -0
- package/dist/helpers/readInstalledManifest.js +139 -0
- package/dist/helpers/readInstalledManifest.js.map +1 -0
- package/dist/helpers/readInstalledManifest.test.js +83 -0
- package/dist/helpers/readInstalledManifest.test.js.map +1 -0
- package/dist/helpers/runPnpm.js +16 -0
- package/dist/helpers/runPnpm.js.map +1 -0
- package/dist/helpers/tempProjects.js +85 -0
- package/dist/helpers/tempProjects.js.map +1 -0
- package/dist/helpers/toLockstepGraph.js +34 -0
- package/dist/helpers/toLockstepGraph.js.map +1 -0
- package/dist/helpers/toLockstepGraph.test.js +81 -0
- package/dist/helpers/toLockstepGraph.test.js.map +1 -0
- package/dist/helpers/versionsSnapshot.js +5 -0
- package/dist/helpers/versionsSnapshot.js.map +1 -0
- package/dist/identifyClusterFixes.js +53 -0
- package/dist/identifyClusterFixes.js.map +1 -0
- package/dist/identifyClusterFixes.test.js +307 -0
- package/dist/identifyClusterFixes.test.js.map +1 -0
- package/dist/identifyResolutionFixes.test.js +49 -0
- package/dist/identifyResolutionFixes.test.js.map +1 -0
- package/dist/index.js +86 -0
- package/dist/index.js.map +1 -0
- package/dist/pnpmLockTypes.js +7 -0
- package/dist/pnpmLockTypes.js.map +1 -0
- package/dist/readPnpmLock.js +6 -0
- package/dist/readPnpmLock.js.map +1 -0
- package/package.json +71 -0
- package/src/applyClusterFixes.test.ts +560 -0
- package/src/applyClusterFixes.ts +466 -0
- package/src/bin/pnpm-dedupe.ts +44 -0
- package/src/bin/pnpm-why-duplicate.test.ts +79 -0
- package/src/bin/pnpm-why-duplicate.ts +34 -0
- package/src/dedupe.ts +124 -0
- package/src/dedupeCheckConsistency.test.ts +218 -0
- package/src/dedupeEndToEnd.test.ts +168 -0
- package/src/dedupePeers.test.ts +175 -0
- package/src/displayMany.test.ts +208 -0
- package/src/displayMany.ts +104 -0
- package/src/helpers/buildIdentifiedFixesMap.test.ts +33 -0
- package/src/helpers/buildPnpmPackagesMap.test.ts +119 -0
- package/src/helpers/buildPnpmPackagesMap.ts +53 -0
- package/src/helpers/collectDependentRanges.test.ts +311 -0
- package/src/helpers/collectDependentRanges.ts +185 -0
- package/src/helpers/collectPnpmDependents.test.ts +112 -0
- package/src/helpers/collectPnpmDependents.ts +79 -0
- package/src/helpers/duplicateSnapshot.ts +18 -0
- package/src/helpers/parsePnpmLockPackages.test.ts +93 -0
- package/src/helpers/parsePnpmLockPackages.ts +99 -0
- package/src/helpers/pnpmProtocol.ts +12 -0
- package/src/helpers/pnpmVersion.ts +28 -0
- package/src/helpers/pnpmWorkspaceYaml.test.ts +140 -0
- package/src/helpers/pnpmWorkspaceYaml.ts +77 -0
- package/src/helpers/projectDir.ts +14 -0
- package/src/helpers/readInstalledManifest.test.ts +124 -0
- package/src/helpers/readInstalledManifest.ts +202 -0
- package/src/helpers/runPnpm.ts +34 -0
- package/src/helpers/tempProjects.ts +94 -0
- package/src/helpers/toLockstepGraph.test.ts +98 -0
- package/src/helpers/toLockstepGraph.ts +52 -0
- package/src/helpers/versionsSnapshot.ts +9 -0
- package/src/identifyClusterFixes.test.ts +430 -0
- package/src/identifyClusterFixes.ts +114 -0
- package/src/identifyResolutionFixes.test.ts +82 -0
- package/src/index.ts +159 -0
- package/src/pnpmLockTypes.ts +44 -0
- package/src/readPnpmLock.ts +7 -0
|
@@ -0,0 +1,474 @@
|
|
|
1
|
+
import { afterEach, describe, it } from "bun:test";
|
|
2
|
+
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
3
|
+
import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { fileURLToPath } from "node:url";
|
|
6
|
+
import { applyClusterFixes } from "./applyClusterFixes.js";
|
|
7
|
+
import { createTempProjects } from "./helpers/tempProjects.js";
|
|
8
|
+
const fix = (overrides) => ({
|
|
9
|
+
members: [],
|
|
10
|
+
duplicatedMembers: [],
|
|
11
|
+
memberVersions: {},
|
|
12
|
+
target: null,
|
|
13
|
+
direction: "none",
|
|
14
|
+
convergentMembers: [],
|
|
15
|
+
driverMembers: [],
|
|
16
|
+
excludedMembers: [],
|
|
17
|
+
anchor: null,
|
|
18
|
+
reuseFixes: [],
|
|
19
|
+
floatingMembers: [],
|
|
20
|
+
workspaceChanges: [],
|
|
21
|
+
reResolutionSet: [],
|
|
22
|
+
externalConstraints: [],
|
|
23
|
+
needsRoundTrip: false,
|
|
24
|
+
applicable: false,
|
|
25
|
+
...overrides,
|
|
26
|
+
});
|
|
27
|
+
const manifestContent = [
|
|
28
|
+
"{",
|
|
29
|
+
' "name": "root",',
|
|
30
|
+
' "devDependencies": {',
|
|
31
|
+
' "metro": "0.84.5"',
|
|
32
|
+
" }",
|
|
33
|
+
"}",
|
|
34
|
+
"",
|
|
35
|
+
].join("\n");
|
|
36
|
+
const workspaceYamlContent = "# keep me\nresolutionMode: time-based\n";
|
|
37
|
+
const projects = createTempProjects("pnpm-dedup-apply-");
|
|
38
|
+
const makeProject = (files) => {
|
|
39
|
+
const dir = projects.create();
|
|
40
|
+
for (const [name, content] of Object.entries(files)) {
|
|
41
|
+
writeFileSync(join(dir, name), content);
|
|
42
|
+
}
|
|
43
|
+
return dir;
|
|
44
|
+
};
|
|
45
|
+
afterEach(projects.cleanup);
|
|
46
|
+
const read = (dir, name) => readFileSync(join(dir, name), "utf8");
|
|
47
|
+
const snapshot = (...resolutions) => new Set(resolutions);
|
|
48
|
+
describe("applyClusterFixes", () => {
|
|
49
|
+
const metroFix = fix({
|
|
50
|
+
applicable: true,
|
|
51
|
+
target: "0.87.0",
|
|
52
|
+
convergentMembers: ["metro-config"],
|
|
53
|
+
workspaceChanges: [
|
|
54
|
+
{
|
|
55
|
+
requester: "package.json in devDependencies",
|
|
56
|
+
requesterName: undefined,
|
|
57
|
+
packageName: "metro",
|
|
58
|
+
range: "0.84.5",
|
|
59
|
+
to: "0.87.0",
|
|
60
|
+
workspace: { path: ".", depType: "devDependencies" },
|
|
61
|
+
},
|
|
62
|
+
],
|
|
63
|
+
});
|
|
64
|
+
it("keeps the workspace edit and never writes an override when it is enough", () => {
|
|
65
|
+
const dir = makeProject({
|
|
66
|
+
"package.json": manifestContent,
|
|
67
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
68
|
+
"pnpm-workspace.yaml": workspaceYamlContent,
|
|
69
|
+
});
|
|
70
|
+
let duplicates = snapshot("metro-config@0.84.5", "metro-config@0.87.0");
|
|
71
|
+
const outcome = applyClusterFixes({
|
|
72
|
+
projectDir: dir,
|
|
73
|
+
color: false,
|
|
74
|
+
log: () => undefined,
|
|
75
|
+
pnpmVersion: () => "11.17.0",
|
|
76
|
+
readFixes: () => [metroFix],
|
|
77
|
+
readDuplicates: () => duplicates,
|
|
78
|
+
resolve: () => {
|
|
79
|
+
// pnpm's part: with the pin widened, the 0.84.5 subtree has no reason
|
|
80
|
+
// to exist any more
|
|
81
|
+
if (read(dir, "package.json").includes('"metro": "0.87.0"')) {
|
|
82
|
+
duplicates = snapshot();
|
|
83
|
+
}
|
|
84
|
+
return 0;
|
|
85
|
+
},
|
|
86
|
+
});
|
|
87
|
+
strictEqual(outcome.status, "applied");
|
|
88
|
+
strictEqual(outcome.after.size, 0);
|
|
89
|
+
ok(read(dir, "package.json").includes('"metro": "0.87.0"'));
|
|
90
|
+
strictEqual(read(dir, "pnpm-workspace.yaml"), workspaceYamlContent);
|
|
91
|
+
});
|
|
92
|
+
const leafFix = fix({
|
|
93
|
+
applicable: true,
|
|
94
|
+
target: "2.0.0",
|
|
95
|
+
convergentMembers: ["leaf"],
|
|
96
|
+
});
|
|
97
|
+
it("removes the overrides again once pnpm holds the result on its own", () => {
|
|
98
|
+
const dir = makeProject({
|
|
99
|
+
"package.json": manifestContent,
|
|
100
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
101
|
+
"pnpm-workspace.yaml": workspaceYamlContent,
|
|
102
|
+
});
|
|
103
|
+
let duplicates = snapshot("leaf@1.0.0", "leaf@2.0.0");
|
|
104
|
+
let converged = false;
|
|
105
|
+
const logs = [];
|
|
106
|
+
const outcome = applyClusterFixes({
|
|
107
|
+
projectDir: dir,
|
|
108
|
+
color: false,
|
|
109
|
+
log: (message = "") => logs.push(message),
|
|
110
|
+
pnpmVersion: () => "11.13.0",
|
|
111
|
+
readFixes: () => [leafFix],
|
|
112
|
+
readDuplicates: () => duplicates,
|
|
113
|
+
resolve: () => {
|
|
114
|
+
if (read(dir, "pnpm-workspace.yaml").includes('"leaf@"')) {
|
|
115
|
+
converged = true;
|
|
116
|
+
}
|
|
117
|
+
// sticky: pnpm keeps a locked resolution that still satisfies the range
|
|
118
|
+
duplicates = converged ? snapshot() : duplicates;
|
|
119
|
+
return 0;
|
|
120
|
+
},
|
|
121
|
+
});
|
|
122
|
+
strictEqual(outcome.status, "applied");
|
|
123
|
+
deepStrictEqual(outcome.stickyOverrides, []);
|
|
124
|
+
strictEqual(read(dir, "pnpm-workspace.yaml"), workspaceYamlContent);
|
|
125
|
+
ok(logs.some((line) => line.includes("Removing the overrides")));
|
|
126
|
+
});
|
|
127
|
+
it("keeps the overrides, explaining why in the file and in the result", () => {
|
|
128
|
+
const dir = makeProject({
|
|
129
|
+
"package.json": manifestContent,
|
|
130
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
131
|
+
"pnpm-workspace.yaml": workspaceYamlContent,
|
|
132
|
+
});
|
|
133
|
+
const duplicated = snapshot("leaf@1.0.0", "leaf@2.0.0");
|
|
134
|
+
let duplicates = duplicated;
|
|
135
|
+
const logs = [];
|
|
136
|
+
const outcome = applyClusterFixes({
|
|
137
|
+
projectDir: dir,
|
|
138
|
+
color: false,
|
|
139
|
+
log: (message = "") => logs.push(message),
|
|
140
|
+
pnpmVersion: () => "11.17.0",
|
|
141
|
+
readFixes: () => [leafFix],
|
|
142
|
+
readDuplicates: () => duplicates,
|
|
143
|
+
resolve: () => {
|
|
144
|
+
// the duplicate only stays away while the override is there
|
|
145
|
+
duplicates = read(dir, "pnpm-workspace.yaml").includes('"leaf@"')
|
|
146
|
+
? snapshot()
|
|
147
|
+
: duplicated;
|
|
148
|
+
return 0;
|
|
149
|
+
},
|
|
150
|
+
});
|
|
151
|
+
strictEqual(outcome.status, "kept-overrides");
|
|
152
|
+
deepStrictEqual(outcome.stickyOverrides.map((override) => override.packageName), ["leaf"]);
|
|
153
|
+
const workspaceYaml = read(dir, "pnpm-workspace.yaml");
|
|
154
|
+
ok(workspaceYaml.includes('"leaf@": "2.0.0"'));
|
|
155
|
+
ok(workspaceYaml.includes("# Added by pnpm-dedup."));
|
|
156
|
+
ok(workspaceYaml.includes("# handled without a standing override: https://github.com"));
|
|
157
|
+
// the user's own content survives the write
|
|
158
|
+
ok(workspaceYaml.includes("# keep me"));
|
|
159
|
+
ok(workspaceYaml.includes("resolutionMode: time-based"));
|
|
160
|
+
ok(logs.some((line) => line.includes("github.com/christophehurpeau")));
|
|
161
|
+
ok(logs.some((line) => line.includes("Kept in")));
|
|
162
|
+
});
|
|
163
|
+
it("writes plain overrides and skips the version gate when convergence is disabled", () => {
|
|
164
|
+
const dir = makeProject({
|
|
165
|
+
"package.json": manifestContent,
|
|
166
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
167
|
+
"pnpm-workspace.yaml": workspaceYamlContent,
|
|
168
|
+
});
|
|
169
|
+
let duplicates = snapshot("leaf@1.0.0", "leaf@2.0.0");
|
|
170
|
+
let plainKeyWritten = false;
|
|
171
|
+
const outcome = applyClusterFixes({
|
|
172
|
+
projectDir: dir,
|
|
173
|
+
color: false,
|
|
174
|
+
log: () => undefined,
|
|
175
|
+
convergenceOverrides: false,
|
|
176
|
+
// a pnpm too old for convergence overrides still writes plain ones
|
|
177
|
+
pnpmVersion: () => "11.12.0",
|
|
178
|
+
readFixes: () => [leafFix],
|
|
179
|
+
readDuplicates: () => duplicates,
|
|
180
|
+
resolve: () => {
|
|
181
|
+
if (read(dir, "pnpm-workspace.yaml").includes('"leaf": "2.0.0"')) {
|
|
182
|
+
plainKeyWritten = true;
|
|
183
|
+
duplicates = snapshot();
|
|
184
|
+
}
|
|
185
|
+
return 0;
|
|
186
|
+
},
|
|
187
|
+
});
|
|
188
|
+
strictEqual(outcome.status, "applied");
|
|
189
|
+
ok(plainKeyWritten);
|
|
190
|
+
strictEqual(read(dir, "pnpm-workspace.yaml"), workspaceYamlContent);
|
|
191
|
+
});
|
|
192
|
+
// a plain override has no range condition, so one the detector proposed from
|
|
193
|
+
// a single requester's range cannot be written when another rejects it
|
|
194
|
+
it("drops a plain override a third-party range rejects", () => {
|
|
195
|
+
const dir = makeProject({
|
|
196
|
+
"package.json": manifestContent,
|
|
197
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
198
|
+
});
|
|
199
|
+
const logs = [];
|
|
200
|
+
const outcome = applyClusterFixes({
|
|
201
|
+
projectDir: dir,
|
|
202
|
+
color: false,
|
|
203
|
+
log: (message = "") => logs.push(message),
|
|
204
|
+
convergenceOverrides: false,
|
|
205
|
+
pnpmVersion: () => "11.17.0",
|
|
206
|
+
readFixes: () => [
|
|
207
|
+
fix({
|
|
208
|
+
anchor: "0.84.5",
|
|
209
|
+
reuseFixes: [
|
|
210
|
+
{
|
|
211
|
+
requester: "@tamagui/metro-plugin@1.0.0",
|
|
212
|
+
requesterName: "@tamagui/metro-plugin",
|
|
213
|
+
packageName: "metro-config",
|
|
214
|
+
range: "*",
|
|
215
|
+
from: "0.87.0",
|
|
216
|
+
to: "0.84.5",
|
|
217
|
+
},
|
|
218
|
+
],
|
|
219
|
+
externalConstraints: [
|
|
220
|
+
{
|
|
221
|
+
requester: "@react-native/community-cli-plugin@0.87.0",
|
|
222
|
+
requesterName: "@react-native/community-cli-plugin",
|
|
223
|
+
packageName: "metro-config",
|
|
224
|
+
range: "^0.87.0",
|
|
225
|
+
},
|
|
226
|
+
],
|
|
227
|
+
}),
|
|
228
|
+
],
|
|
229
|
+
readDuplicates: () => snapshot("metro-config@0.84.5"),
|
|
230
|
+
resolve: () => {
|
|
231
|
+
throw new Error("a dropped override must not resolve");
|
|
232
|
+
},
|
|
233
|
+
});
|
|
234
|
+
strictEqual(outcome.status, "nothing-to-do");
|
|
235
|
+
ok(logs.some((line) => line.includes("Skipped override")));
|
|
236
|
+
});
|
|
237
|
+
it("reverts everything when the re-resolution fails", () => {
|
|
238
|
+
const dir = makeProject({
|
|
239
|
+
"package.json": manifestContent,
|
|
240
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
241
|
+
});
|
|
242
|
+
const outcome = applyClusterFixes({
|
|
243
|
+
projectDir: dir,
|
|
244
|
+
color: false,
|
|
245
|
+
log: () => undefined,
|
|
246
|
+
pnpmVersion: () => "11.17.0",
|
|
247
|
+
readFixes: () => [metroFix],
|
|
248
|
+
readDuplicates: () => snapshot("metro-config@0.84.5", "metro-config@0.87.0"),
|
|
249
|
+
resolve: () => 1,
|
|
250
|
+
});
|
|
251
|
+
strictEqual(outcome.status, "reverted");
|
|
252
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
253
|
+
strictEqual(existsSync(join(dir, "pnpm-workspace.yaml")), false);
|
|
254
|
+
});
|
|
255
|
+
const metroFamilyFix = fix({
|
|
256
|
+
...metroFix,
|
|
257
|
+
members: ["metro", "metro-config"],
|
|
258
|
+
duplicatedMembers: ["metro-config"],
|
|
259
|
+
});
|
|
260
|
+
it("skips a cluster the filter only selects part of", () => {
|
|
261
|
+
const dir = makeProject({
|
|
262
|
+
"package.json": manifestContent,
|
|
263
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
264
|
+
});
|
|
265
|
+
const logs = [];
|
|
266
|
+
const outcome = applyClusterFixes({
|
|
267
|
+
projectDir: dir,
|
|
268
|
+
color: false,
|
|
269
|
+
dryRun: true,
|
|
270
|
+
log: (message = "") => logs.push(message),
|
|
271
|
+
pnpmVersion: () => "11.17.0",
|
|
272
|
+
filter: { include: ["metro-config"] },
|
|
273
|
+
readFixes: () => [metroFamilyFix],
|
|
274
|
+
readDuplicates: () => snapshot("metro-config@0.84.5"),
|
|
275
|
+
resolve: () => {
|
|
276
|
+
throw new Error("a dry run must not resolve");
|
|
277
|
+
},
|
|
278
|
+
});
|
|
279
|
+
strictEqual(outcome.plannedChangeCount, 0);
|
|
280
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
281
|
+
ok(logs.some((line) => line.includes("metro not selected by the filter")));
|
|
282
|
+
});
|
|
283
|
+
it("keeps a cluster the filter selects whole", () => {
|
|
284
|
+
const dir = makeProject({
|
|
285
|
+
"package.json": manifestContent,
|
|
286
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
287
|
+
});
|
|
288
|
+
const outcome = applyClusterFixes({
|
|
289
|
+
projectDir: dir,
|
|
290
|
+
color: false,
|
|
291
|
+
dryRun: true,
|
|
292
|
+
log: () => undefined,
|
|
293
|
+
pnpmVersion: () => "11.17.0",
|
|
294
|
+
filter: { include: ["metro*"] },
|
|
295
|
+
readFixes: () => [metroFamilyFix],
|
|
296
|
+
readDuplicates: () => snapshot("metro-config@0.84.5"),
|
|
297
|
+
resolve: () => {
|
|
298
|
+
throw new Error("a dry run must not resolve");
|
|
299
|
+
},
|
|
300
|
+
});
|
|
301
|
+
ok(outcome.plannedChangeCount > 0);
|
|
302
|
+
});
|
|
303
|
+
it("writes nothing on a dry run", () => {
|
|
304
|
+
const dir = makeProject({
|
|
305
|
+
"package.json": manifestContent,
|
|
306
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
307
|
+
});
|
|
308
|
+
const logs = [];
|
|
309
|
+
const outcome = applyClusterFixes({
|
|
310
|
+
projectDir: dir,
|
|
311
|
+
color: false,
|
|
312
|
+
dryRun: true,
|
|
313
|
+
log: (message = "") => logs.push(message),
|
|
314
|
+
pnpmVersion: () => "11.17.0",
|
|
315
|
+
readFixes: () => [metroFix],
|
|
316
|
+
readDuplicates: () => snapshot("metro-config@0.84.5"),
|
|
317
|
+
resolve: () => {
|
|
318
|
+
throw new Error("a dry run must not resolve");
|
|
319
|
+
},
|
|
320
|
+
});
|
|
321
|
+
strictEqual(outcome.status, "dry-run");
|
|
322
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
323
|
+
ok(logs.some((line) => line.includes('"0.84.5" -> "0.87.0"')));
|
|
324
|
+
ok(logs.some((line) => line.startsWith("Would apply:")));
|
|
325
|
+
ok(outcome.plannedChangeCount > 0);
|
|
326
|
+
});
|
|
327
|
+
it("renders repo-relative paths and the transient override file", () => {
|
|
328
|
+
const dir = makeProject({
|
|
329
|
+
"package.json": manifestContent,
|
|
330
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
331
|
+
});
|
|
332
|
+
const logs = [];
|
|
333
|
+
applyClusterFixes({
|
|
334
|
+
projectDir: dir,
|
|
335
|
+
color: false,
|
|
336
|
+
dryRun: true,
|
|
337
|
+
log: (message = "") => logs.push(message),
|
|
338
|
+
pnpmVersion: () => "11.17.0",
|
|
339
|
+
readFixes: () => [metroFix],
|
|
340
|
+
readDuplicates: () => snapshot("metro-config@0.84.5"),
|
|
341
|
+
resolve: () => {
|
|
342
|
+
throw new Error("a dry run must not resolve");
|
|
343
|
+
},
|
|
344
|
+
});
|
|
345
|
+
const output = logs.join("\n");
|
|
346
|
+
ok(output.includes("package.json:"));
|
|
347
|
+
// never the absolute temp path
|
|
348
|
+
ok(!output.includes(dir));
|
|
349
|
+
ok(output.includes("pnpm-workspace.yaml (transient, removed once the result is verified):"));
|
|
350
|
+
ok(output.includes("Run `pnpm-dedupe` to apply."));
|
|
351
|
+
});
|
|
352
|
+
it("names what `pnpm dedupe` itself would still change", () => {
|
|
353
|
+
const dir = makeProject({
|
|
354
|
+
"package.json": manifestContent,
|
|
355
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
356
|
+
});
|
|
357
|
+
const logs = [];
|
|
358
|
+
applyClusterFixes({
|
|
359
|
+
projectDir: dir,
|
|
360
|
+
color: false,
|
|
361
|
+
dryRun: true,
|
|
362
|
+
packageManagerResiduals: "`pnpm dedupe` would also change the lockfile.",
|
|
363
|
+
log: (message = "") => logs.push(message),
|
|
364
|
+
pnpmVersion: () => "11.17.0",
|
|
365
|
+
readFixes: () => [metroFix],
|
|
366
|
+
readDuplicates: () => snapshot("metro-config@0.84.5"),
|
|
367
|
+
resolve: () => {
|
|
368
|
+
throw new Error("a dry run must not resolve");
|
|
369
|
+
},
|
|
370
|
+
});
|
|
371
|
+
ok(logs.includes("`pnpm dedupe` would also change the lockfile."));
|
|
372
|
+
});
|
|
373
|
+
it("reports nothing to dedupe on a dry run with an empty plan", () => {
|
|
374
|
+
const dir = makeProject({
|
|
375
|
+
"package.json": manifestContent,
|
|
376
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
377
|
+
});
|
|
378
|
+
const logs = [];
|
|
379
|
+
const outcome = applyClusterFixes({
|
|
380
|
+
projectDir: dir,
|
|
381
|
+
color: false,
|
|
382
|
+
dryRun: true,
|
|
383
|
+
log: (message = "") => logs.push(message),
|
|
384
|
+
pnpmVersion: () => "11.17.0",
|
|
385
|
+
readFixes: () => [],
|
|
386
|
+
readDuplicates: () => snapshot(),
|
|
387
|
+
resolve: () => {
|
|
388
|
+
throw new Error("a dry run must not resolve");
|
|
389
|
+
},
|
|
390
|
+
});
|
|
391
|
+
strictEqual(outcome.status, "dry-run");
|
|
392
|
+
strictEqual(outcome.plannedChangeCount, 0);
|
|
393
|
+
ok(logs.includes("Nothing to dedupe."));
|
|
394
|
+
});
|
|
395
|
+
it("plans nothing on a dry run when pnpm cannot apply it", () => {
|
|
396
|
+
const dir = makeProject({
|
|
397
|
+
"package.json": manifestContent,
|
|
398
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
399
|
+
});
|
|
400
|
+
const logs = [];
|
|
401
|
+
const outcome = applyClusterFixes({
|
|
402
|
+
projectDir: dir,
|
|
403
|
+
color: false,
|
|
404
|
+
dryRun: true,
|
|
405
|
+
log: (message = "") => logs.push(message),
|
|
406
|
+
pnpmVersion: () => "9.0.0",
|
|
407
|
+
readFixes: () => [metroFix],
|
|
408
|
+
readDuplicates: () => snapshot("metro-config@0.84.5"),
|
|
409
|
+
resolve: () => {
|
|
410
|
+
throw new Error("a dry run must not resolve");
|
|
411
|
+
},
|
|
412
|
+
});
|
|
413
|
+
// nothing is applicable, so `--check` has nothing to fail on
|
|
414
|
+
strictEqual(outcome.plannedChangeCount, 0);
|
|
415
|
+
ok(logs.some((line) => line.includes("Cluster fixes need pnpm >=")));
|
|
416
|
+
ok(logs.includes("Nothing to dedupe."));
|
|
417
|
+
});
|
|
418
|
+
it("does nothing on a pnpm without convergence overrides", () => {
|
|
419
|
+
const dir = makeProject({
|
|
420
|
+
"package.json": manifestContent,
|
|
421
|
+
"pnpm-lock.yaml": "lockfileVersion: '9.0'\n",
|
|
422
|
+
});
|
|
423
|
+
const logs = [];
|
|
424
|
+
const outcome = applyClusterFixes({
|
|
425
|
+
projectDir: dir,
|
|
426
|
+
color: false,
|
|
427
|
+
log: (message = "") => logs.push(message),
|
|
428
|
+
pnpmVersion: () => "11.12.0",
|
|
429
|
+
readFixes: () => [metroFix],
|
|
430
|
+
readDuplicates: () => snapshot("metro-config@0.84.5"),
|
|
431
|
+
resolve: () => {
|
|
432
|
+
throw new Error("an unsupported pnpm must not resolve");
|
|
433
|
+
},
|
|
434
|
+
});
|
|
435
|
+
strictEqual(outcome.status, "not-supported");
|
|
436
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
437
|
+
ok(logs.some((line) => line.includes("11.13.0")));
|
|
438
|
+
});
|
|
439
|
+
// End to end from the committed fixture: the detector, the plan and the file
|
|
440
|
+
// the override would land in, with nothing stubbed but the pnpm version.
|
|
441
|
+
it("plans a convergence override for a lone duplicate", () => {
|
|
442
|
+
const logs = [];
|
|
443
|
+
const outcome = applyClusterFixes({
|
|
444
|
+
projectDir: fileURLToPath(new URL("../test/fixtures/exact-pin-forces-downgrade", import.meta.url)),
|
|
445
|
+
dryRun: true,
|
|
446
|
+
log: (message = "") => logs.push(message),
|
|
447
|
+
pnpmVersion: () => "11.17.0",
|
|
448
|
+
resolve: () => {
|
|
449
|
+
throw new Error("a dry run must not resolve");
|
|
450
|
+
},
|
|
451
|
+
});
|
|
452
|
+
strictEqual(outcome.status, "dry-run");
|
|
453
|
+
strictEqual(outcome.plannedChangeCount, 1);
|
|
454
|
+
ok(logs.some((line) => line.includes("pnpm-workspace.yaml")));
|
|
455
|
+
ok(logs.some((line) => line.includes('"barcode-detector@": "3.0.3" (converge)')));
|
|
456
|
+
// zxing-wasm has no covering version, so nothing is planned for it
|
|
457
|
+
ok(!logs.some((line) => line.includes("zxing-wasm")));
|
|
458
|
+
});
|
|
459
|
+
it("reports having nothing to do when no fix is applicable", () => {
|
|
460
|
+
const dir = makeProject({ "pnpm-lock.yaml": "lockfileVersion: '9.0'\n" });
|
|
461
|
+
strictEqual(applyClusterFixes({
|
|
462
|
+
projectDir: dir,
|
|
463
|
+
color: false,
|
|
464
|
+
log: () => undefined,
|
|
465
|
+
pnpmVersion: () => "11.17.0",
|
|
466
|
+
readFixes: () => [fix({ applicable: false })],
|
|
467
|
+
readDuplicates: () => snapshot("leaf@1.0.0"),
|
|
468
|
+
resolve: () => {
|
|
469
|
+
throw new Error("nothing to apply must not resolve");
|
|
470
|
+
},
|
|
471
|
+
}).status, "nothing-to-do");
|
|
472
|
+
});
|
|
473
|
+
});
|
|
474
|
+
//# sourceMappingURL=applyClusterFixes.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"applyClusterFixes.test.js","sourceRoot":"","sources":["../src/applyClusterFixes.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,GAAG,GAAG,CAAC,SAA8B,EAAc,EAAE,CAAC,CAAC;IAC3D,OAAO,EAAE,EAAE;IACX,iBAAiB,EAAE,EAAE;IACrB,cAAc,EAAE,EAAE;IAClB,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,MAAM;IACjB,iBAAiB,EAAE,EAAE;IACrB,aAAa,EAAE,EAAE;IACjB,eAAe,EAAE,EAAE;IACnB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,EAAE;IACd,eAAe,EAAE,EAAE;IACnB,gBAAgB,EAAE,EAAE;IACpB,eAAe,EAAE,EAAE;IACnB,mBAAmB,EAAE,EAAE;IACvB,cAAc,EAAE,KAAK;IACrB,UAAU,EAAE,KAAK;IACjB,GAAG,SAAS;CACb,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG;IACtB,GAAG;IACH,mBAAmB;IACnB,wBAAwB;IACxB,uBAAuB;IACvB,KAAK;IACL,GAAG;IACH,EAAE;CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,oBAAoB,GAAG,yCAAyC,CAAC;AAEvE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;AAEzD,MAAM,WAAW,GAAG,CAAC,KAA6B,EAAU,EAAE;IAC5D,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAE5B,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,IAAY,EAAU,EAAE,CACjD,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;AAExC,MAAM,QAAQ,GAAG,CAAC,GAAG,WAAqB,EAAqB,EAAE,CAC/D,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;AAEvB,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,MAAM,QAAQ,GAAG,GAAG,CAAC;QACnB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,QAAQ;QAChB,iBAAiB,EAAE,CAAC,cAAc,CAAC;QACnC,gBAAgB,EAAE;YAChB;gBACE,SAAS,EAAE,iCAAiC;gBAC5C,aAAa,EAAE,SAAS;gBACxB,WAAW,EAAE,OAAO;gBACpB,KAAK,EAAE,QAAQ;gBACf,EAAE,EAAE,QAAQ;gBACZ,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,iBAAiB,EAAE;aACrD;SACF;KACF,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QACjF,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;YAC5C,qBAAqB,EAAE,oBAAoB;SAC5C,CAAC,CAAC;QAEH,IAAI,UAAU,GAAG,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAAC;QACxE,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;YACpB,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC3B,cAAc,EAAE,GAAG,EAAE,CAAC,UAAU;YAChC,OAAO,EAAE,GAAG,EAAE;gBACZ,sEAAsE;gBACtE,oBAAoB;gBACpB,IAAI,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;oBAC5D,UAAU,GAAG,QAAQ,EAAE,CAAC;gBAC1B,CAAC;gBACD,OAAO,CAAC,CAAC;YACX,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACvC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACnC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC5D,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,GAAG,CAAC;QAClB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,OAAO;QACf,iBAAiB,EAAE,CAAC,MAAM,CAAC;KAC5B,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;YAC5C,qBAAqB,EAAE,oBAAoB;SAC5C,CAAC,CAAC;QAEH,IAAI,UAAU,GAAG,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACtD,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC;YAC1B,cAAc,EAAE,GAAG,EAAE,CAAC,UAAU;YAChC,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;oBACzD,SAAS,GAAG,IAAI,CAAC;gBACnB,CAAC;gBACD,wEAAwE;gBACxE,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;gBACjD,OAAO,CAAC,CAAC;YACX,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACvC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;QAC7C,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,EAAE,oBAAoB,CAAC,CAAC;QACpE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;YAC5C,qBAAqB,EAAE,oBAAoB;SAC5C,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACxD,IAAI,UAAU,GAAG,UAAU,CAAC;QAC5B,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC;YAC1B,cAAc,EAAE,GAAG,EAAE,CAAC,UAAU;YAChC,OAAO,EAAE,GAAG,EAAE;gBACZ,4DAA4D;gBAC5D,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;oBAC/D,CAAC,CAAC,QAAQ,EAAE;oBACZ,CAAC,CAAC,UAAU,CAAC;gBACf,OAAO,CAAC,CAAC;YACX,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QAC9C,eAAe,CACb,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,EAC/D,CAAC,MAAM,CAAC,CACT,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC;QACvD,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC/C,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACrD,EAAE,CACA,aAAa,CAAC,QAAQ,CACpB,2DAA2D,CAC5D,CACF,CAAC;QACF,4CAA4C;QAC5C,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;QACxC,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAEzD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CAAC,CAAC,CAAC,CAAC;QACvE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;QACxF,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;YAC5C,qBAAqB,EAAE,oBAAoB;SAC5C,CAAC,CAAC;QAEH,IAAI,UAAU,GAAG,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACtD,IAAI,eAAe,GAAG,KAAK,CAAC;QAE5B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;YACpB,oBAAoB,EAAE,KAAK;YAC3B,mEAAmE;YACnE,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC;YAC1B,cAAc,EAAE,GAAG,EAAE,CAAC,UAAU;YAChC,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;oBACjE,eAAe,GAAG,IAAI,CAAC;oBACvB,UAAU,GAAG,QAAQ,EAAE,CAAC;gBAC1B,CAAC;gBACD,OAAO,CAAC,CAAC;YACX,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACvC,EAAE,CAAC,eAAe,CAAC,CAAC;QACpB,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,6EAA6E;IAC7E,uEAAuE;IACvE,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QACH,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,oBAAoB,EAAE,KAAK;YAC3B,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC;gBACf,GAAG,CAAC;oBACF,MAAM,EAAE,QAAQ;oBAChB,UAAU,EAAE;wBACV;4BACE,SAAS,EAAE,6BAA6B;4BACxC,aAAa,EAAE,uBAAuB;4BACtC,WAAW,EAAE,cAAc;4BAC3B,KAAK,EAAE,GAAG;4BACV,IAAI,EAAE,QAAQ;4BACd,EAAE,EAAE,QAAQ;yBACb;qBACF;oBACD,mBAAmB,EAAE;wBACnB;4BACE,SAAS,EAAE,2CAA2C;4BACtD,aAAa,EAAE,oCAAoC;4BACnD,WAAW,EAAE,cAAc;4BAC3B,KAAK,EAAE,SAAS;yBACjB;qBACF;iBACF,CAAC;aACH;YACD,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACrD,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACzD,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC7C,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;YACpB,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC3B,cAAc,EAAE,GAAG,EAAE,CACnB,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;YACxD,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACxC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,eAAe,CAAC,CAAC;QACxD,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,GAAG,CAAC;QACzB,GAAG,QAAQ;QACX,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC;QAClC,iBAAiB,EAAE,CAAC,cAAc,CAAC;KACpC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QACH,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,cAAc,CAAC,EAAE;YACrC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,cAAc,CAAC;YACjC,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACrD,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;QAC3C,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,eAAe,CAAC,CAAC;QACxD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;YACpB,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE;YAC/B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,cAAc,CAAC;YACjC,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACrD,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;QAEH,EAAE,CAAC,OAAO,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QACH,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC3B,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACrD,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACvC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,eAAe,CAAC,CAAC;QACxD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QAC/D,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACzD,EAAE,CAAC,OAAO,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QACH,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,iBAAiB,CAAC;YAChB,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC3B,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACrD,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;QACrC,+BAA+B;QAC/B,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1B,EAAE,CACA,MAAM,CAAC,QAAQ,CACb,uEAAuE,CACxE,CACF,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QACH,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,iBAAiB,CAAC;YAChB,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI;YACZ,uBAAuB,EAAE,+CAA+C;YACxE,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC3B,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACrD,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;QAEH,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,+CAA+C,CAAC,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QACH,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,EAAE;YACnB,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE;YAChC,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACvC,WAAW,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;QAC3C,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QACH,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,OAAO;YAC1B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC3B,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACrD,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;QAEH,6DAA6D;QAC7D,WAAW,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;QAC3C,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC;QACrE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,GAAG,GAAG,WAAW,CAAC;YACtB,cAAc,EAAE,eAAe;YAC/B,gBAAgB,EAAE,0BAA0B;SAC7C,CAAC,CAAC;QACH,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC3B,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACrD,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAC1D,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC7C,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,eAAe,CAAC,CAAC;QACxD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,6EAA6E;IAC7E,yEAAyE;IACzE,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,IAAI,GAAa,EAAE,CAAC;QAE1B,MAAM,OAAO,GAAG,iBAAiB,CAAC;YAChC,UAAU,EAAE,aAAa,CACvB,IAAI,GAAG,CAAC,6CAA6C,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CACxE;YACD,MAAM,EAAE,IAAI;YACZ,GAAG,EAAE,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,CAAC;SACF,CAAC,CAAC;QAEH,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACvC,WAAW,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;QAC3C,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9D,EAAE,CACA,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACjB,IAAI,CAAC,QAAQ,CAAC,yCAAyC,CAAC,CACzD,CACF,CAAC;QACF,mEAAmE;QACnE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,CAAC,CAAC;QAE1E,WAAW,CACT,iBAAiB,CAAC;YAChB,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;YACpB,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7C,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC5C,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;SACF,CAAC,CAAC,MAAM,EACT,eAAe,CAChB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import { packageFilterParseArgsOptions, packageFilterUsage, parseBinArgs, toPackageFilterOptions, } from "pm-dedup-core";
|
|
3
|
+
import { dedupe } from "../dedupe.js";
|
|
4
|
+
const usage = `Usage: pnpm-dedupe [options]
|
|
5
|
+
|
|
6
|
+
--check print the plan, change nothing, exit 1 if anything would change
|
|
7
|
+
-n, --dry-run print the plan, change nothing
|
|
8
|
+
--no-convergence-overrides write plain overrides instead of convergence ones
|
|
9
|
+
|
|
10
|
+
${packageFilterUsage}`;
|
|
11
|
+
const parsed = parseBinArgs(usage, {
|
|
12
|
+
args: process.argv.slice(2),
|
|
13
|
+
options: {
|
|
14
|
+
check: { type: "boolean" },
|
|
15
|
+
"dry-run": { type: "boolean", short: "n" },
|
|
16
|
+
"no-convergence-overrides": { type: "boolean" },
|
|
17
|
+
...packageFilterParseArgsOptions,
|
|
18
|
+
},
|
|
19
|
+
});
|
|
20
|
+
if (parsed !== null) {
|
|
21
|
+
const { values } = parsed;
|
|
22
|
+
const mode = (() => {
|
|
23
|
+
if (values.check)
|
|
24
|
+
return "check";
|
|
25
|
+
if (values["dry-run"])
|
|
26
|
+
return "dry-run";
|
|
27
|
+
return "apply";
|
|
28
|
+
})();
|
|
29
|
+
dedupe({
|
|
30
|
+
mode,
|
|
31
|
+
convergenceOverrides: !values["no-convergence-overrides"],
|
|
32
|
+
filter: toPackageFilterOptions(values),
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=pnpm-dedupe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pnpm-dedupe.js","sourceRoot":"","sources":["../../src/bin/pnpm-dedupe.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,6BAA6B,EAC7B,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,GACvB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtC,MAAM,KAAK,GAAG;;;;;;EAMZ,kBAAkB,EAAE,CAAC;AAEvB,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE;IACjC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3B,OAAO,EAAE;QACP,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC1B,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE;QAC1C,0BAA0B,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC/C,GAAG,6BAA6B;KACjC;CACF,CAAC,CAAC;AAEH,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAE1B,MAAM,IAAI,GAAG,CAAC,GAAe,EAAE;QAC7B,IAAI,MAAM,CAAC,KAAK;YAAE,OAAO,OAAO,CAAC;QACjC,IAAI,MAAM,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAC;QACxC,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,CAAC;QACL,IAAI;QACJ,oBAAoB,EAAE,CAAC,MAAM,CAAC,0BAA0B,CAAC;QACzD,MAAM,EAAE,sBAAsB,CAAC,MAAM,CAAC;KACvC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import { parseBinArgs, toWhyDuplicateRequest, whyDuplicateParseArgsOptions, whyDuplicateUsage, } from "pm-dedup-core";
|
|
3
|
+
import { listDuplicates, whyDuplicate } from "../index.js";
|
|
4
|
+
const usage = `Usage: pnpm-why-duplicate [package] [options]
|
|
5
|
+
|
|
6
|
+
[package] a name or a glob; the short form of --packages
|
|
7
|
+
${whyDuplicateUsage}`;
|
|
8
|
+
const parsed = parseBinArgs(usage, {
|
|
9
|
+
args: process.argv.slice(2),
|
|
10
|
+
options: whyDuplicateParseArgsOptions,
|
|
11
|
+
allowPositionals: true,
|
|
12
|
+
});
|
|
13
|
+
if (parsed !== null) {
|
|
14
|
+
const { values, positionals } = parsed;
|
|
15
|
+
const { filter, explains, all, details } = toWhyDuplicateRequest(values, positionals);
|
|
16
|
+
if (explains) {
|
|
17
|
+
whyDuplicate({ filter, all, details });
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
listDuplicates({ filter, details });
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=pnpm-why-duplicate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pnpm-why-duplicate.js","sourceRoot":"","sources":["../../src/bin/pnpm-why-duplicate.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,4BAA4B,EAC5B,iBAAiB,GAClB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3D,MAAM,KAAK,GAAG;;;EAGZ,iBAAiB,EAAE,CAAC;AAEtB,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE;IACjC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3B,OAAO,EAAE,4BAA4B;IACrC,gBAAgB,EAAE,IAAI;CACvB,CAAC,CAAC;AAEH,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IACvC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,qBAAqB,CAC9D,MAAM,EACN,WAAW,CACZ,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACzC,CAAC;SAAM,CAAC;QACN,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IACtC,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it } from "bun:test";
|
|
2
|
+
import { spawnSync } from "node:child_process";
|
|
3
|
+
import { cpSync, mkdirSync, realpathSync } from "node:fs";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { fileURLToPath } from "node:url";
|
|
6
|
+
import { createTempProjects } from "../helpers/tempProjects.js";
|
|
7
|
+
// The bins run from `src` under the test runtime; the `bin` field points at the
|
|
8
|
+
// built copy in `dist/bin`, which the end-to-end suite covers.
|
|
9
|
+
const binPath = (name) => fileURLToPath(new URL(`./${name}.ts`, import.meta.url));
|
|
10
|
+
const fixtureDir = (name) => fileURLToPath(new URL(`../../test/fixtures/${name}`, import.meta.url));
|
|
11
|
+
const projects = createTempProjects("pnpm-dedup-bin-");
|
|
12
|
+
afterEach(projects.cleanup);
|
|
13
|
+
const runBin = (name, cwd, args) => {
|
|
14
|
+
const result = spawnSync(process.execPath, [binPath(name), ...args], {
|
|
15
|
+
cwd,
|
|
16
|
+
encoding: "utf8",
|
|
17
|
+
timeout: 60_000,
|
|
18
|
+
});
|
|
19
|
+
if (result.error)
|
|
20
|
+
throw result.error;
|
|
21
|
+
return {
|
|
22
|
+
status: result.status,
|
|
23
|
+
stdout: result.stdout,
|
|
24
|
+
stderr: result.stderr,
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
const project = (fixture) => {
|
|
28
|
+
const dir = projects.create();
|
|
29
|
+
cpSync(fixtureDir(fixture), dir, { recursive: true });
|
|
30
|
+
return dir;
|
|
31
|
+
};
|
|
32
|
+
// A spawned bin reads its own cwd back resolved — the temp root is reached
|
|
33
|
+
// through a symlink on macOS — so the paths it prints are the physical ones.
|
|
34
|
+
const lockNotice = (dir) => `using ${join(realpathSync(dir), "pnpm-lock.yaml")}`;
|
|
35
|
+
describe("pnpm-why-duplicate", () => {
|
|
36
|
+
describe("run from a subdirectory", () => {
|
|
37
|
+
it("reports on the project the lockfile is in", () => {
|
|
38
|
+
const dir = project("duplicated-printable-shell-command");
|
|
39
|
+
const nested = join(dir, "packages", "app", "src");
|
|
40
|
+
mkdirSync(nested, { recursive: true });
|
|
41
|
+
const fromRoot = runBin("pnpm-why-duplicate", dir, ["--details"]);
|
|
42
|
+
const fromNested = runBin("pnpm-why-duplicate", nested, ["--details"]);
|
|
43
|
+
expect(fromNested.status).toBe(0);
|
|
44
|
+
expect(fromNested.stdout).toBe(fromRoot.stdout);
|
|
45
|
+
expect(fromNested.stdout).toContain("printable-shell-command");
|
|
46
|
+
expect(fromNested.stderr.trim()).toBe(lockNotice(dir));
|
|
47
|
+
expect(fromRoot.stderr).toBe("");
|
|
48
|
+
});
|
|
49
|
+
it("names the lockfile it could not find and exits 1", () => {
|
|
50
|
+
const dir = projects.create();
|
|
51
|
+
const result = runBin("pnpm-why-duplicate", dir, []);
|
|
52
|
+
expect(result.status).toBe(1);
|
|
53
|
+
expect(result.stderr.trim()).toBe(`No pnpm-lock.yaml found in ${realpathSync(dir)} or any parent directory`);
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
//# sourceMappingURL=pnpm-why-duplicate.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pnpm-why-duplicate.test.js","sourceRoot":"","sources":["../../src/bin/pnpm-why-duplicate.test.ts"],"names":[],"mappings":"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"}
|