pm-dedup-core 2.2.1 → 2.2.2
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/dist/clusterOverrides.js +34 -0
- package/dist/clusterOverrides.js.map +1 -0
- package/dist/clusterOverrides.test.js +84 -0
- package/dist/clusterOverrides.test.js.map +1 -0
- package/dist/createPackageFilter.test.js +0 -1
- package/dist/createPackageFilter.test.js.map +1 -1
- package/dist/definitions/clusterOverrides.d.ts +41 -0
- package/dist/definitions/clusterOverrides.d.ts.map +1 -0
- package/dist/definitions/clusterOverrides.test.d.ts +2 -0
- package/dist/definitions/clusterOverrides.test.d.ts.map +1 -0
- package/dist/definitions/identifyLockstepClusterFixes.d.ts +0 -1
- package/dist/definitions/identifyLockstepClusterFixes.d.ts.map +1 -1
- package/dist/definitions/index.d.ts +2 -0
- package/dist/definitions/index.d.ts.map +1 -1
- package/dist/definitions/planClusterApply.d.ts +6 -2
- package/dist/definitions/planClusterApply.d.ts.map +1 -1
- package/dist/definitions/renderDuplicatesReport.d.ts.map +1 -1
- package/dist/definitions/unconditionalOverrides.d.ts +2 -1
- package/dist/definitions/unconditionalOverrides.d.ts.map +1 -1
- package/dist/identifyLockstepClusterFixes.js +18 -47
- package/dist/identifyLockstepClusterFixes.js.map +1 -1
- package/dist/identifyLockstepClusterFixes.test.js +212 -10
- package/dist/identifyLockstepClusterFixes.test.js.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/planClusterApply.js +7 -5
- package/dist/planClusterApply.js.map +1 -1
- package/dist/planClusterApply.test.js +28 -19
- package/dist/planClusterApply.test.js.map +1 -1
- package/dist/renderDuplicatesReport.js +0 -5
- package/dist/renderDuplicatesReport.js.map +1 -1
- package/dist/renderDuplicatesReport.test.js +0 -8
- package/dist/renderDuplicatesReport.test.js.map +1 -1
- package/dist/unconditionalOverrides.js +2 -1
- package/dist/unconditionalOverrides.js.map +1 -1
- package/dist/unconditionalOverrides.test.js +0 -1
- package/dist/unconditionalOverrides.test.js.map +1 -1
- package/package.json +1 -1
- package/src/clusterOverrides.test.ts +125 -0
- package/src/clusterOverrides.ts +84 -0
- package/src/createPackageFilter.test.ts +0 -1
- package/src/identifyLockstepClusterFixes.test.ts +244 -10
- package/src/identifyLockstepClusterFixes.ts +23 -67
- package/src/index.ts +9 -0
- package/src/planClusterApply.test.ts +31 -19
- package/src/planClusterApply.ts +10 -5
- package/src/renderDuplicatesReport.test.ts +0 -9
- package/src/renderDuplicatesReport.ts +0 -7
- package/src/unconditionalOverrides.test.ts +0 -1
- package/src/unconditionalOverrides.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderDuplicatesReport.test.js","sourceRoot":"","sources":["../src/renderDuplicatesReport.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"renderDuplicatesReport.test.js","sourceRoot":"","sources":["../src/renderDuplicatesReport.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,8 @@ const accepts = (version, range) => semver.validRange(range) === null ||
|
|
|
13
13
|
* dependent onto a version it never allowed.
|
|
14
14
|
*
|
|
15
15
|
* The `converge` overrides are safe by construction: the detector only converges
|
|
16
|
-
* a member no third-party range holds elsewhere
|
|
16
|
+
* a member no third-party range holds elsewhere, and only re-resolves one no
|
|
17
|
+
* in-cluster requester pins elsewhere either. A `reuse` override is derived
|
|
17
18
|
* from a single requester's range, and another requester can still reject it.
|
|
18
19
|
*/
|
|
19
20
|
export const partitionUnconditionalOverrides = (fixes, overrides) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unconditionalOverrides.js","sourceRoot":"","sources":["../src/unconditionalOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAiB5B,iFAAiF;AACjF,+EAA+E;AAC/E,iEAAiE;AACjE,MAAM,OAAO,GAAG,CAAC,OAAe,EAAE,KAAa,EAAW,EAAE,CAC1D,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,IAAI;IACjC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;AAEhE
|
|
1
|
+
{"version":3,"file":"unconditionalOverrides.js","sourceRoot":"","sources":["../src/unconditionalOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAiB5B,iFAAiF;AACjF,+EAA+E;AAC/E,iEAAiE;AACjE,MAAM,OAAO,GAAG,CAAC,OAAe,EAAE,KAAa,EAAW,EAAE,CAC1D,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,IAAI;IACjC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;AAEhE;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC7C,KAAmB,EACnB,SAA4B,EACN,EAAE;IACxB,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACpE,MAAM,IAAI,GAAsB,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CACnC,CAAC,UAAU,EAAE,EAAE,CACb,UAAU,CAAC,WAAW,KAAK,QAAQ,CAAC,WAAW;YAC/C,UAAU,CAAC,aAAa,KAAK,SAAS;YACtC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAC/C,CAAC;QACF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unconditionalOverrides.test.js","sourceRoot":"","sources":["../src/unconditionalOverrides.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAMhD,OAAO,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAE9E,MAAM,UAAU,GAAG,CAAC,KAAa,EAA6B,EAAE,CAAC,CAAC;IAChE,SAAS,EAAE,WAAW;IACtB,aAAa,EAAE,WAAW;IAC1B,WAAW,EAAE,KAAK;IAClB,KAAK;CACN,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,CAAC,KAAa,EAA6B,EAAE,CAAC,CAAC;IACzE,GAAG,UAAU,CAAC,KAAK,CAAC;IACpB,SAAS,EAAE,8BAA8B;IACzC,aAAa,EAAE,SAAS;CACzB,CAAC,CAAC;AAEH,mEAAmE;AACnE,MAAM,OAAO,GAAG,CAAC,WAAwC,EAAc,EAAE,CAAC,CAAC;IACzE,OAAO,EAAE,CAAC,KAAK,CAAC;IAChB,iBAAiB,EAAE,CAAC,KAAK,CAAC;IAC1B,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,
|
|
1
|
+
{"version":3,"file":"unconditionalOverrides.test.js","sourceRoot":"","sources":["../src/unconditionalOverrides.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import { describe, expect, it } from "bun:test";
|
|
2
|
+
import { heldOverrides, outstandingOverrides } from "./clusterOverrides.ts";
|
|
3
|
+
import type { PlannedOverride } from "./planClusterApply.ts";
|
|
4
|
+
|
|
5
|
+
const converge = (packageName: string, version: string): PlannedOverride => ({
|
|
6
|
+
packageName,
|
|
7
|
+
version,
|
|
8
|
+
reason: "converge",
|
|
9
|
+
});
|
|
10
|
+
|
|
11
|
+
const reuse = (packageName: string, version: string): PlannedOverride => ({
|
|
12
|
+
packageName,
|
|
13
|
+
version,
|
|
14
|
+
reason: "reuse",
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
const names = (overrides: PlannedOverride[]): string[] =>
|
|
18
|
+
overrides.map((override) => override.packageName);
|
|
19
|
+
|
|
20
|
+
describe("outstandingOverrides", () => {
|
|
21
|
+
const state = {
|
|
22
|
+
duplicates: new Set(["dup@1.0.0", "dup@2.0.0"]),
|
|
23
|
+
versions: new Map([
|
|
24
|
+
["dup", ["1.0.0", "2.0.0"]],
|
|
25
|
+
["parent", ["8.65.0"]],
|
|
26
|
+
["settled", ["8.63.0"]],
|
|
27
|
+
["anchored", ["1.30.1", "1.33.0"]],
|
|
28
|
+
["repointed", ["1.30.1", "1.33.0"]],
|
|
29
|
+
]),
|
|
30
|
+
reuses: new Set(["plugin>anchored@1.30.1"]),
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
it("keeps a converging member nothing duplicates while it sits elsewhere", () => {
|
|
34
|
+
expect(
|
|
35
|
+
names(outstandingOverrides([converge("parent", "8.63.0")], state)),
|
|
36
|
+
).toEqual(["parent"]);
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it("drops a converging member already on the version", () => {
|
|
40
|
+
expect(
|
|
41
|
+
outstandingOverrides([converge("settled", "8.63.0")], state),
|
|
42
|
+
).toEqual([]);
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
it("keeps an override whose package is duplicated", () => {
|
|
46
|
+
expect(
|
|
47
|
+
names(outstandingOverrides([converge("dup", "1.0.0")], state)),
|
|
48
|
+
).toEqual(["dup"]);
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
it("keeps a reuse override whose edge is still open", () => {
|
|
52
|
+
expect(
|
|
53
|
+
names(outstandingOverrides([reuse("anchored", "1.30.1")], state)),
|
|
54
|
+
).toEqual(["anchored"]);
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
it("drops a reuse override whose edge took, even with other versions left", () => {
|
|
58
|
+
expect(outstandingOverrides([reuse("repointed", "1.30.1")], state)).toEqual(
|
|
59
|
+
[],
|
|
60
|
+
);
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
describe("heldOverrides", () => {
|
|
65
|
+
const start = { duplicates: new Set(["dup@1.0.0", "dup@2.0.0"]) };
|
|
66
|
+
const held = (
|
|
67
|
+
overrides: PlannedOverride[],
|
|
68
|
+
end: { duplicates: string[]; versions: [string, string[]][] },
|
|
69
|
+
reuseHeld = (): boolean => true,
|
|
70
|
+
): string[] =>
|
|
71
|
+
names(
|
|
72
|
+
heldOverrides(overrides, {
|
|
73
|
+
start,
|
|
74
|
+
end: {
|
|
75
|
+
duplicates: new Set(end.duplicates),
|
|
76
|
+
versions: new Map(end.versions),
|
|
77
|
+
},
|
|
78
|
+
reuseHeld,
|
|
79
|
+
}),
|
|
80
|
+
);
|
|
81
|
+
|
|
82
|
+
it("holds a duplicated package that collapsed onto another version", () => {
|
|
83
|
+
expect(
|
|
84
|
+
held([converge("dup", "1.0.0")], {
|
|
85
|
+
duplicates: [],
|
|
86
|
+
versions: [["dup", ["2.0.0"]]],
|
|
87
|
+
}),
|
|
88
|
+
).toEqual(["dup"]);
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
it("does not hold a package still duplicated", () => {
|
|
92
|
+
expect(
|
|
93
|
+
held([converge("dup", "1.0.0")], {
|
|
94
|
+
duplicates: ["dup@1.0.0", "dup@2.0.0"],
|
|
95
|
+
versions: [["dup", ["1.0.0", "2.0.0"]]],
|
|
96
|
+
}),
|
|
97
|
+
).toEqual([]);
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
it("does not hold a member that never moved", () => {
|
|
101
|
+
expect(
|
|
102
|
+
held([converge("parent", "8.63.0")], {
|
|
103
|
+
duplicates: [],
|
|
104
|
+
versions: [["parent", ["8.65.0"]]],
|
|
105
|
+
}),
|
|
106
|
+
).toEqual([]);
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
it("holds a member now on the version alone", () => {
|
|
110
|
+
expect(
|
|
111
|
+
held([converge("parent", "8.63.0")], {
|
|
112
|
+
duplicates: [],
|
|
113
|
+
versions: [["parent", ["8.63.0"]]],
|
|
114
|
+
}),
|
|
115
|
+
).toEqual(["parent"]);
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
it("asks the lockfile about a reuse override", () => {
|
|
119
|
+
const end = { duplicates: [], versions: [] };
|
|
120
|
+
expect(held([reuse("anchored", "1.30.1")], end, () => false)).toEqual([]);
|
|
121
|
+
expect(held([reuse("anchored", "1.30.1")], end, () => true)).toEqual([
|
|
122
|
+
"anchored",
|
|
123
|
+
]);
|
|
124
|
+
});
|
|
125
|
+
});
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import type { DuplicateSnapshot } from "./duplicateSnapshot.ts";
|
|
2
|
+
import type { ClusterFix } from "./identifyLockstepClusterFixes.ts";
|
|
3
|
+
import type { PlannedOverride } from "./planClusterApply.ts";
|
|
4
|
+
import type { VersionsSnapshot } from "./versionsSnapshot.ts";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* One key per open range still resolving away from the version the workspace
|
|
8
|
+
* anchors its family at. A reuse fix removes no duplicate, so the duplicate set
|
|
9
|
+
* cannot tell whether it took; the detector can, by no longer reporting it.
|
|
10
|
+
*/
|
|
11
|
+
export const reuseKeys = (fixes: ClusterFix[]): Set<string> =>
|
|
12
|
+
new Set(
|
|
13
|
+
fixes.flatMap((fix) =>
|
|
14
|
+
fix.reuseFixes.map(
|
|
15
|
+
(reuse) => `${reuse.requesterName}>${reuse.packageName}@${reuse.to}`,
|
|
16
|
+
),
|
|
17
|
+
),
|
|
18
|
+
);
|
|
19
|
+
|
|
20
|
+
const isDuplicated = (
|
|
21
|
+
duplicates: DuplicateSnapshot,
|
|
22
|
+
packageName: string,
|
|
23
|
+
): boolean =>
|
|
24
|
+
[...duplicates].some((resolution) =>
|
|
25
|
+
resolution.startsWith(`${packageName}@`),
|
|
26
|
+
);
|
|
27
|
+
|
|
28
|
+
export interface OverrideTargetState {
|
|
29
|
+
duplicates: DuplicateSnapshot;
|
|
30
|
+
versions: VersionsSnapshot;
|
|
31
|
+
reuses: Set<string>;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* The overrides still worth writing: their package is duplicated, the edge they
|
|
36
|
+
* repoint still resolves elsewhere, or — for a converging member — the package
|
|
37
|
+
* sits on another version. That last case is a member nothing duplicates on its
|
|
38
|
+
* own, yet whose exact pins on its siblings keep the family apart until it moves.
|
|
39
|
+
*/
|
|
40
|
+
export const outstandingOverrides = (
|
|
41
|
+
overrides: PlannedOverride[],
|
|
42
|
+
{ duplicates, versions, reuses }: OverrideTargetState,
|
|
43
|
+
): PlannedOverride[] =>
|
|
44
|
+
overrides.filter(
|
|
45
|
+
(override) =>
|
|
46
|
+
isDuplicated(duplicates, override.packageName) ||
|
|
47
|
+
[...reuses].some((key) =>
|
|
48
|
+
key.endsWith(`>${override.packageName}@${override.version}`),
|
|
49
|
+
) ||
|
|
50
|
+
(override.reason === "converge" &&
|
|
51
|
+
(versions.get(override.packageName) ?? []).some(
|
|
52
|
+
(version) => version !== override.version,
|
|
53
|
+
)),
|
|
54
|
+
);
|
|
55
|
+
|
|
56
|
+
export interface OverrideRoundStates {
|
|
57
|
+
start: { duplicates: DuplicateSnapshot };
|
|
58
|
+
end: { duplicates: DuplicateSnapshot; versions: VersionsSnapshot };
|
|
59
|
+
// whether every edge a reuse override repoints resolves to its version, read
|
|
60
|
+
// from the lockfile: the detector stops reporting a reuse fix as soon as its
|
|
61
|
+
// anchor goes away, which says nothing about the edge. Without it, no reuse
|
|
62
|
+
// override holds.
|
|
63
|
+
reuseHeld?: (override: PlannedOverride) => boolean;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* The overrides whose effect is there in `end`, compared with `start`, the
|
|
68
|
+
* state the round began from. A package duplicated at the start holds once it
|
|
69
|
+
* no longer is, whichever version it collapsed onto, so this never contradicts
|
|
70
|
+
* the dedupe summary. One that was not duplicated only holds once it sits on
|
|
71
|
+
* the override's version alone: not moving is not holding.
|
|
72
|
+
*/
|
|
73
|
+
export const heldOverrides = (
|
|
74
|
+
overrides: PlannedOverride[],
|
|
75
|
+
{ start, end, reuseHeld }: OverrideRoundStates,
|
|
76
|
+
): PlannedOverride[] =>
|
|
77
|
+
overrides.filter((override) => {
|
|
78
|
+
if (override.reason === "reuse") return reuseHeld?.(override) ?? false;
|
|
79
|
+
if (isDuplicated(start.duplicates, override.packageName)) {
|
|
80
|
+
return !isDuplicated(end.duplicates, override.packageName);
|
|
81
|
+
}
|
|
82
|
+
const versions = end.versions.get(override.packageName) ?? [];
|
|
83
|
+
return versions.length === 1 && versions[0] === override.version;
|
|
84
|
+
});
|
|
@@ -346,10 +346,10 @@ describe("identifyLockstepClusterFixes", () => {
|
|
|
346
346
|
expect(fix.workspaceChanges).toEqual([]);
|
|
347
347
|
});
|
|
348
348
|
|
|
349
|
-
it("
|
|
350
|
-
// `holder` sits at 2.0.0 and pins leaf there
|
|
351
|
-
// through
|
|
352
|
-
//
|
|
349
|
+
it("never counts on the resolver moving a member nothing pins", () => {
|
|
350
|
+
// `holder` sits at 2.0.0 and pins leaf there. Its only requester asks
|
|
351
|
+
// through `*`, which 2.0.0 satisfies, so the resolver keeps it: leaf cannot
|
|
352
|
+
// collapse onto 1.0.0, and old's exact pin rules out 2.0.0.
|
|
353
353
|
const fix = identifyLockstepClusterFixes(
|
|
354
354
|
[["holder", "leaf"]],
|
|
355
355
|
{
|
|
@@ -372,12 +372,80 @@ describe("identifyLockstepClusterFixes", () => {
|
|
|
372
372
|
]),
|
|
373
373
|
)[0]!;
|
|
374
374
|
|
|
375
|
-
expect(fix.
|
|
376
|
-
expect(fix.
|
|
377
|
-
expect(fix.
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
375
|
+
expect(fix.applicable).toBe(false);
|
|
376
|
+
expect(fix.target).toBeNull();
|
|
377
|
+
expect(fix.convergentMembers).toEqual([]);
|
|
378
|
+
});
|
|
379
|
+
|
|
380
|
+
it("never repoints an open range at the pin the same fix moves", () => {
|
|
381
|
+
// The metro shape: the workspace pins family at 1.0.0, a third party pulls
|
|
382
|
+
// it to 2.0.0, and a plugin's `*` resolved family-config at 2.0.0 too.
|
|
383
|
+
// Nothing collapses on 1.0.0, so the fix moves the pin to 2.0.0.
|
|
384
|
+
const fix = identifyLockstepClusterFixes(
|
|
385
|
+
[["family", "family-config"]],
|
|
386
|
+
{
|
|
387
|
+
family: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
|
|
388
|
+
"family-config": {
|
|
389
|
+
npmVersions: ["1.0.0", "2.0.0"],
|
|
390
|
+
resolutionCount: 2,
|
|
391
|
+
},
|
|
392
|
+
},
|
|
393
|
+
dependents([
|
|
394
|
+
[
|
|
395
|
+
"family",
|
|
396
|
+
[
|
|
397
|
+
{
|
|
398
|
+
requester: "package.json",
|
|
399
|
+
range: "1.0.0",
|
|
400
|
+
resolvedVersion: "1.0.0",
|
|
401
|
+
workspace: { path: ".", depType: "devDependencies" },
|
|
402
|
+
},
|
|
403
|
+
{ requester: "cli@2.0.0", requesterName: "cli", range: "^2.0.0" },
|
|
404
|
+
{
|
|
405
|
+
requester: "family-config@1.0.0",
|
|
406
|
+
requesterName: "family-config",
|
|
407
|
+
range: "1.0.0",
|
|
408
|
+
},
|
|
409
|
+
{
|
|
410
|
+
requester: "family-config@2.0.0",
|
|
411
|
+
requesterName: "family-config",
|
|
412
|
+
range: "2.0.0",
|
|
413
|
+
},
|
|
414
|
+
],
|
|
415
|
+
],
|
|
416
|
+
[
|
|
417
|
+
"family-config",
|
|
418
|
+
[
|
|
419
|
+
{
|
|
420
|
+
requester: "plugin@1",
|
|
421
|
+
requesterName: "plugin",
|
|
422
|
+
range: "*",
|
|
423
|
+
resolvedVersion: "2.0.0",
|
|
424
|
+
},
|
|
425
|
+
{
|
|
426
|
+
requester: "family@1.0.0",
|
|
427
|
+
requesterName: "family",
|
|
428
|
+
range: "1.0.0",
|
|
429
|
+
},
|
|
430
|
+
{
|
|
431
|
+
requester: "family@2.0.0",
|
|
432
|
+
requesterName: "family",
|
|
433
|
+
range: "2.0.0",
|
|
434
|
+
},
|
|
435
|
+
],
|
|
436
|
+
],
|
|
437
|
+
]),
|
|
438
|
+
)[0]!;
|
|
439
|
+
|
|
440
|
+
expect(fix.target).toBe("2.0.0");
|
|
441
|
+
expect(
|
|
442
|
+
fix.workspaceChanges.map(
|
|
443
|
+
(change) => `${change.packageName} ${change.range} -> ${change.to}`,
|
|
444
|
+
),
|
|
445
|
+
).toEqual(["family 1.0.0 -> 2.0.0"]);
|
|
446
|
+
// plugin already sits on the 2.0.0 the pin moves to: sending it back to
|
|
447
|
+
// 1.0.0 would split the family again
|
|
448
|
+
expect(fix.reuseFixes).toEqual([]);
|
|
381
449
|
});
|
|
382
450
|
|
|
383
451
|
it("proposes the pin upgrade when the family is only pulled forward", () => {
|
|
@@ -447,6 +515,172 @@ describe("identifyLockstepClusterFixes", () => {
|
|
|
447
515
|
).toEqual(["family 1.0.0 -> 2.0.0"]);
|
|
448
516
|
});
|
|
449
517
|
|
|
518
|
+
it("plans no commitlint downgrade the family's own ranges reject", () => {
|
|
519
|
+
// alouette: @pob/root pins @commitlint/types at 21.0.1 while
|
|
520
|
+
// @commitlint/lint's `^21.0.2` ranges resolved is-ignored, parse and rules
|
|
521
|
+
// at 21.1.0, which require `^21.1.0` of it
|
|
522
|
+
const [fix] = identifyLockstepClusterFixes(
|
|
523
|
+
[
|
|
524
|
+
[
|
|
525
|
+
"@commitlint/ensure",
|
|
526
|
+
"@commitlint/is-ignored",
|
|
527
|
+
"@commitlint/parse",
|
|
528
|
+
"@commitlint/rules",
|
|
529
|
+
"@commitlint/types",
|
|
530
|
+
],
|
|
531
|
+
],
|
|
532
|
+
{
|
|
533
|
+
"@commitlint/ensure": { npmVersions: ["21.1.0"], resolutionCount: 1 },
|
|
534
|
+
"@commitlint/is-ignored": {
|
|
535
|
+
npmVersions: ["21.1.0"],
|
|
536
|
+
resolutionCount: 1,
|
|
537
|
+
},
|
|
538
|
+
"@commitlint/parse": { npmVersions: ["21.1.0"], resolutionCount: 1 },
|
|
539
|
+
"@commitlint/rules": { npmVersions: ["21.1.0"], resolutionCount: 1 },
|
|
540
|
+
"@commitlint/types": {
|
|
541
|
+
npmVersions: ["21.0.1", "21.1.0"],
|
|
542
|
+
resolutionCount: 2,
|
|
543
|
+
},
|
|
544
|
+
},
|
|
545
|
+
dependents([
|
|
546
|
+
[
|
|
547
|
+
"@commitlint/types",
|
|
548
|
+
[
|
|
549
|
+
{
|
|
550
|
+
requester: "@commitlint/ensure@21.1.0",
|
|
551
|
+
requesterName: "@commitlint/ensure",
|
|
552
|
+
range: "^21.1.0",
|
|
553
|
+
},
|
|
554
|
+
{
|
|
555
|
+
requester: "@commitlint/is-ignored@21.1.0",
|
|
556
|
+
requesterName: "@commitlint/is-ignored",
|
|
557
|
+
range: "^21.1.0",
|
|
558
|
+
},
|
|
559
|
+
{
|
|
560
|
+
requester: "@commitlint/parse@21.1.0",
|
|
561
|
+
requesterName: "@commitlint/parse",
|
|
562
|
+
range: "^21.1.0",
|
|
563
|
+
},
|
|
564
|
+
{
|
|
565
|
+
requester: "@commitlint/rules@21.1.0",
|
|
566
|
+
requesterName: "@commitlint/rules",
|
|
567
|
+
range: "^21.1.0",
|
|
568
|
+
},
|
|
569
|
+
{
|
|
570
|
+
requester: "@commitlint/format@21.0.1",
|
|
571
|
+
requesterName: "@commitlint/format",
|
|
572
|
+
range: "^21.0.1",
|
|
573
|
+
},
|
|
574
|
+
{
|
|
575
|
+
requester: "@commitlint/lint@21.0.2",
|
|
576
|
+
requesterName: "@commitlint/lint",
|
|
577
|
+
range: "^21.0.1",
|
|
578
|
+
},
|
|
579
|
+
{
|
|
580
|
+
requester: "@pob/root@27.11.0",
|
|
581
|
+
requesterName: "@pob/root",
|
|
582
|
+
range: "21.0.1",
|
|
583
|
+
},
|
|
584
|
+
],
|
|
585
|
+
],
|
|
586
|
+
[
|
|
587
|
+
"@commitlint/ensure",
|
|
588
|
+
[
|
|
589
|
+
{
|
|
590
|
+
requester: "@commitlint/rules@21.1.0",
|
|
591
|
+
requesterName: "@commitlint/rules",
|
|
592
|
+
range: "^21.1.0",
|
|
593
|
+
},
|
|
594
|
+
],
|
|
595
|
+
],
|
|
596
|
+
...(
|
|
597
|
+
[
|
|
598
|
+
"@commitlint/is-ignored",
|
|
599
|
+
"@commitlint/parse",
|
|
600
|
+
"@commitlint/rules",
|
|
601
|
+
] as const
|
|
602
|
+
).map(
|
|
603
|
+
(member) =>
|
|
604
|
+
[
|
|
605
|
+
member,
|
|
606
|
+
[
|
|
607
|
+
{
|
|
608
|
+
requester: "@commitlint/lint@21.0.2",
|
|
609
|
+
requesterName: "@commitlint/lint",
|
|
610
|
+
range: "^21.0.2",
|
|
611
|
+
},
|
|
612
|
+
],
|
|
613
|
+
] as [
|
|
614
|
+
string,
|
|
615
|
+
{ requester: string; requesterName: string; range: string }[],
|
|
616
|
+
],
|
|
617
|
+
),
|
|
618
|
+
]),
|
|
619
|
+
);
|
|
620
|
+
|
|
621
|
+
// the resolver keeps the three 21.1.0 members, whose `^21.1.0` rules out
|
|
622
|
+
// 21.0.1, and @pob/root's exact pin rules out 21.1.0: nothing to plan
|
|
623
|
+
expect(fix!.applicable).toBe(false);
|
|
624
|
+
expect(fix!.target).toBeNull();
|
|
625
|
+
expect(fix!.convergentMembers).toEqual([]);
|
|
626
|
+
});
|
|
627
|
+
|
|
628
|
+
it("never re-resolves a member an excluded sibling still pins elsewhere", () => {
|
|
629
|
+
const familyMembers: ClusterMembersMap = {
|
|
630
|
+
a: { npmVersions: ["8.63.0", "8.65.0"], resolutionCount: 2 },
|
|
631
|
+
b: { npmVersions: ["8.63.0", "8.65.0"], resolutionCount: 2 },
|
|
632
|
+
e: { npmVersions: ["8.63.0", "8.65.0"], resolutionCount: 2 },
|
|
633
|
+
x: { npmVersions: ["8.65.0"], resolutionCount: 1 },
|
|
634
|
+
};
|
|
635
|
+
const [fix] = identifyLockstepClusterFixes(
|
|
636
|
+
[["a", "b", "e", "x"]],
|
|
637
|
+
familyMembers,
|
|
638
|
+
dependents([
|
|
639
|
+
[
|
|
640
|
+
"a",
|
|
641
|
+
[
|
|
642
|
+
{ requester: "old@1", requesterName: "old", range: "^8.63.0" },
|
|
643
|
+
{ requester: "x@8.65.0", requesterName: "x", range: "^8.63.0" },
|
|
644
|
+
],
|
|
645
|
+
],
|
|
646
|
+
[
|
|
647
|
+
"b",
|
|
648
|
+
[
|
|
649
|
+
{ requester: "bpin@1", requesterName: "bpin", range: "8.63.0" },
|
|
650
|
+
{ requester: "bnew@1", requesterName: "bnew", range: "^8.63.0" },
|
|
651
|
+
],
|
|
652
|
+
],
|
|
653
|
+
[
|
|
654
|
+
"e",
|
|
655
|
+
[
|
|
656
|
+
{
|
|
657
|
+
requester: "pinner@1",
|
|
658
|
+
requesterName: "pinner",
|
|
659
|
+
range: "^8.65.0",
|
|
660
|
+
},
|
|
661
|
+
{ requester: "old2@1", requesterName: "old2", range: "8.63.0" },
|
|
662
|
+
],
|
|
663
|
+
],
|
|
664
|
+
[
|
|
665
|
+
"x",
|
|
666
|
+
[
|
|
667
|
+
{ requester: "e@8.65.0", requesterName: "e", range: "8.65.0" },
|
|
668
|
+
{ requester: "app@1", requesterName: "app", range: "^8.63.0" },
|
|
669
|
+
],
|
|
670
|
+
],
|
|
671
|
+
]),
|
|
672
|
+
);
|
|
673
|
+
|
|
674
|
+
expect(fix!.target).toBe("8.63.0");
|
|
675
|
+
expect(fix!.convergentMembers).toEqual(["a", "b"]);
|
|
676
|
+
expect(
|
|
677
|
+
fix!.excludedMembers.map((excluded) => excluded.packageName),
|
|
678
|
+
).toEqual(["e"]);
|
|
679
|
+
// e stays on 8.65.0 and keeps pinning x there: moving x's other edges to
|
|
680
|
+
// 8.63.0 would only add a second x
|
|
681
|
+
expect(fix!.reResolutionSet).toEqual([]);
|
|
682
|
+
});
|
|
683
|
+
|
|
450
684
|
it("skips a cluster with no duplicated member", () => {
|
|
451
685
|
expect(
|
|
452
686
|
identifyLockstepClusterFixes(
|