pm-dedup-core 2.1.0 → 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
|
@@ -277,10 +277,10 @@ describe("identifyLockstepClusterFixes", () => {
|
|
|
277
277
|
expect(fix.target).toBe("1.0.0");
|
|
278
278
|
expect(fix.workspaceChanges).toEqual([]);
|
|
279
279
|
});
|
|
280
|
-
it("
|
|
281
|
-
// `holder` sits at 2.0.0 and pins leaf there
|
|
282
|
-
// through
|
|
283
|
-
//
|
|
280
|
+
it("never counts on the resolver moving a member nothing pins", () => {
|
|
281
|
+
// `holder` sits at 2.0.0 and pins leaf there. Its only requester asks
|
|
282
|
+
// through `*`, which 2.0.0 satisfies, so the resolver keeps it: leaf cannot
|
|
283
|
+
// collapse onto 1.0.0, and old's exact pin rules out 2.0.0.
|
|
284
284
|
const fix = identifyLockstepClusterFixes([["holder", "leaf"]], {
|
|
285
285
|
holder: { npmVersions: ["2.0.0"], resolutionCount: 1 },
|
|
286
286
|
leaf: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
|
|
@@ -298,12 +298,70 @@ describe("identifyLockstepClusterFixes", () => {
|
|
|
298
298
|
],
|
|
299
299
|
],
|
|
300
300
|
]))[0];
|
|
301
|
-
expect(fix.
|
|
302
|
-
expect(fix.
|
|
303
|
-
expect(fix.
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
301
|
+
expect(fix.applicable).toBe(false);
|
|
302
|
+
expect(fix.target).toBeNull();
|
|
303
|
+
expect(fix.convergentMembers).toEqual([]);
|
|
304
|
+
});
|
|
305
|
+
it("never repoints an open range at the pin the same fix moves", () => {
|
|
306
|
+
// The metro shape: the workspace pins family at 1.0.0, a third party pulls
|
|
307
|
+
// it to 2.0.0, and a plugin's `*` resolved family-config at 2.0.0 too.
|
|
308
|
+
// Nothing collapses on 1.0.0, so the fix moves the pin to 2.0.0.
|
|
309
|
+
const fix = identifyLockstepClusterFixes([["family", "family-config"]], {
|
|
310
|
+
family: { npmVersions: ["1.0.0", "2.0.0"], resolutionCount: 2 },
|
|
311
|
+
"family-config": {
|
|
312
|
+
npmVersions: ["1.0.0", "2.0.0"],
|
|
313
|
+
resolutionCount: 2,
|
|
314
|
+
},
|
|
315
|
+
}, dependents([
|
|
316
|
+
[
|
|
317
|
+
"family",
|
|
318
|
+
[
|
|
319
|
+
{
|
|
320
|
+
requester: "package.json",
|
|
321
|
+
range: "1.0.0",
|
|
322
|
+
resolvedVersion: "1.0.0",
|
|
323
|
+
workspace: { path: ".", depType: "devDependencies" },
|
|
324
|
+
},
|
|
325
|
+
{ requester: "cli@2.0.0", requesterName: "cli", range: "^2.0.0" },
|
|
326
|
+
{
|
|
327
|
+
requester: "family-config@1.0.0",
|
|
328
|
+
requesterName: "family-config",
|
|
329
|
+
range: "1.0.0",
|
|
330
|
+
},
|
|
331
|
+
{
|
|
332
|
+
requester: "family-config@2.0.0",
|
|
333
|
+
requesterName: "family-config",
|
|
334
|
+
range: "2.0.0",
|
|
335
|
+
},
|
|
336
|
+
],
|
|
337
|
+
],
|
|
338
|
+
[
|
|
339
|
+
"family-config",
|
|
340
|
+
[
|
|
341
|
+
{
|
|
342
|
+
requester: "plugin@1",
|
|
343
|
+
requesterName: "plugin",
|
|
344
|
+
range: "*",
|
|
345
|
+
resolvedVersion: "2.0.0",
|
|
346
|
+
},
|
|
347
|
+
{
|
|
348
|
+
requester: "family@1.0.0",
|
|
349
|
+
requesterName: "family",
|
|
350
|
+
range: "1.0.0",
|
|
351
|
+
},
|
|
352
|
+
{
|
|
353
|
+
requester: "family@2.0.0",
|
|
354
|
+
requesterName: "family",
|
|
355
|
+
range: "2.0.0",
|
|
356
|
+
},
|
|
357
|
+
],
|
|
358
|
+
],
|
|
359
|
+
]))[0];
|
|
360
|
+
expect(fix.target).toBe("2.0.0");
|
|
361
|
+
expect(fix.workspaceChanges.map((change) => `${change.packageName} ${change.range} -> ${change.to}`)).toEqual(["family 1.0.0 -> 2.0.0"]);
|
|
362
|
+
// plugin already sits on the 2.0.0 the pin moves to: sending it back to
|
|
363
|
+
// 1.0.0 would split the family again
|
|
364
|
+
expect(fix.reuseFixes).toEqual([]);
|
|
307
365
|
});
|
|
308
366
|
it("proposes the pin upgrade when the family is only pulled forward", () => {
|
|
309
367
|
// The shape of a metro family under a pinned metro: a third party outside
|
|
@@ -362,6 +420,150 @@ describe("identifyLockstepClusterFixes", () => {
|
|
|
362
420
|
expect(fix.driverMembers).toEqual(["family"]);
|
|
363
421
|
expect(fix.workspaceChanges.map((change) => `${change.packageName} ${change.range} -> ${change.to}`)).toEqual(["family 1.0.0 -> 2.0.0"]);
|
|
364
422
|
});
|
|
423
|
+
it("plans no commitlint downgrade the family's own ranges reject", () => {
|
|
424
|
+
// alouette: @pob/root pins @commitlint/types at 21.0.1 while
|
|
425
|
+
// @commitlint/lint's `^21.0.2` ranges resolved is-ignored, parse and rules
|
|
426
|
+
// at 21.1.0, which require `^21.1.0` of it
|
|
427
|
+
const [fix] = identifyLockstepClusterFixes([
|
|
428
|
+
[
|
|
429
|
+
"@commitlint/ensure",
|
|
430
|
+
"@commitlint/is-ignored",
|
|
431
|
+
"@commitlint/parse",
|
|
432
|
+
"@commitlint/rules",
|
|
433
|
+
"@commitlint/types",
|
|
434
|
+
],
|
|
435
|
+
], {
|
|
436
|
+
"@commitlint/ensure": { npmVersions: ["21.1.0"], resolutionCount: 1 },
|
|
437
|
+
"@commitlint/is-ignored": {
|
|
438
|
+
npmVersions: ["21.1.0"],
|
|
439
|
+
resolutionCount: 1,
|
|
440
|
+
},
|
|
441
|
+
"@commitlint/parse": { npmVersions: ["21.1.0"], resolutionCount: 1 },
|
|
442
|
+
"@commitlint/rules": { npmVersions: ["21.1.0"], resolutionCount: 1 },
|
|
443
|
+
"@commitlint/types": {
|
|
444
|
+
npmVersions: ["21.0.1", "21.1.0"],
|
|
445
|
+
resolutionCount: 2,
|
|
446
|
+
},
|
|
447
|
+
}, dependents([
|
|
448
|
+
[
|
|
449
|
+
"@commitlint/types",
|
|
450
|
+
[
|
|
451
|
+
{
|
|
452
|
+
requester: "@commitlint/ensure@21.1.0",
|
|
453
|
+
requesterName: "@commitlint/ensure",
|
|
454
|
+
range: "^21.1.0",
|
|
455
|
+
},
|
|
456
|
+
{
|
|
457
|
+
requester: "@commitlint/is-ignored@21.1.0",
|
|
458
|
+
requesterName: "@commitlint/is-ignored",
|
|
459
|
+
range: "^21.1.0",
|
|
460
|
+
},
|
|
461
|
+
{
|
|
462
|
+
requester: "@commitlint/parse@21.1.0",
|
|
463
|
+
requesterName: "@commitlint/parse",
|
|
464
|
+
range: "^21.1.0",
|
|
465
|
+
},
|
|
466
|
+
{
|
|
467
|
+
requester: "@commitlint/rules@21.1.0",
|
|
468
|
+
requesterName: "@commitlint/rules",
|
|
469
|
+
range: "^21.1.0",
|
|
470
|
+
},
|
|
471
|
+
{
|
|
472
|
+
requester: "@commitlint/format@21.0.1",
|
|
473
|
+
requesterName: "@commitlint/format",
|
|
474
|
+
range: "^21.0.1",
|
|
475
|
+
},
|
|
476
|
+
{
|
|
477
|
+
requester: "@commitlint/lint@21.0.2",
|
|
478
|
+
requesterName: "@commitlint/lint",
|
|
479
|
+
range: "^21.0.1",
|
|
480
|
+
},
|
|
481
|
+
{
|
|
482
|
+
requester: "@pob/root@27.11.0",
|
|
483
|
+
requesterName: "@pob/root",
|
|
484
|
+
range: "21.0.1",
|
|
485
|
+
},
|
|
486
|
+
],
|
|
487
|
+
],
|
|
488
|
+
[
|
|
489
|
+
"@commitlint/ensure",
|
|
490
|
+
[
|
|
491
|
+
{
|
|
492
|
+
requester: "@commitlint/rules@21.1.0",
|
|
493
|
+
requesterName: "@commitlint/rules",
|
|
494
|
+
range: "^21.1.0",
|
|
495
|
+
},
|
|
496
|
+
],
|
|
497
|
+
],
|
|
498
|
+
...[
|
|
499
|
+
"@commitlint/is-ignored",
|
|
500
|
+
"@commitlint/parse",
|
|
501
|
+
"@commitlint/rules",
|
|
502
|
+
].map((member) => [
|
|
503
|
+
member,
|
|
504
|
+
[
|
|
505
|
+
{
|
|
506
|
+
requester: "@commitlint/lint@21.0.2",
|
|
507
|
+
requesterName: "@commitlint/lint",
|
|
508
|
+
range: "^21.0.2",
|
|
509
|
+
},
|
|
510
|
+
],
|
|
511
|
+
]),
|
|
512
|
+
]));
|
|
513
|
+
// the resolver keeps the three 21.1.0 members, whose `^21.1.0` rules out
|
|
514
|
+
// 21.0.1, and @pob/root's exact pin rules out 21.1.0: nothing to plan
|
|
515
|
+
expect(fix.applicable).toBe(false);
|
|
516
|
+
expect(fix.target).toBeNull();
|
|
517
|
+
expect(fix.convergentMembers).toEqual([]);
|
|
518
|
+
});
|
|
519
|
+
it("never re-resolves a member an excluded sibling still pins elsewhere", () => {
|
|
520
|
+
const familyMembers = {
|
|
521
|
+
a: { npmVersions: ["8.63.0", "8.65.0"], resolutionCount: 2 },
|
|
522
|
+
b: { npmVersions: ["8.63.0", "8.65.0"], resolutionCount: 2 },
|
|
523
|
+
e: { npmVersions: ["8.63.0", "8.65.0"], resolutionCount: 2 },
|
|
524
|
+
x: { npmVersions: ["8.65.0"], resolutionCount: 1 },
|
|
525
|
+
};
|
|
526
|
+
const [fix] = identifyLockstepClusterFixes([["a", "b", "e", "x"]], familyMembers, dependents([
|
|
527
|
+
[
|
|
528
|
+
"a",
|
|
529
|
+
[
|
|
530
|
+
{ requester: "old@1", requesterName: "old", range: "^8.63.0" },
|
|
531
|
+
{ requester: "x@8.65.0", requesterName: "x", range: "^8.63.0" },
|
|
532
|
+
],
|
|
533
|
+
],
|
|
534
|
+
[
|
|
535
|
+
"b",
|
|
536
|
+
[
|
|
537
|
+
{ requester: "bpin@1", requesterName: "bpin", range: "8.63.0" },
|
|
538
|
+
{ requester: "bnew@1", requesterName: "bnew", range: "^8.63.0" },
|
|
539
|
+
],
|
|
540
|
+
],
|
|
541
|
+
[
|
|
542
|
+
"e",
|
|
543
|
+
[
|
|
544
|
+
{
|
|
545
|
+
requester: "pinner@1",
|
|
546
|
+
requesterName: "pinner",
|
|
547
|
+
range: "^8.65.0",
|
|
548
|
+
},
|
|
549
|
+
{ requester: "old2@1", requesterName: "old2", range: "8.63.0" },
|
|
550
|
+
],
|
|
551
|
+
],
|
|
552
|
+
[
|
|
553
|
+
"x",
|
|
554
|
+
[
|
|
555
|
+
{ requester: "e@8.65.0", requesterName: "e", range: "8.65.0" },
|
|
556
|
+
{ requester: "app@1", requesterName: "app", range: "^8.63.0" },
|
|
557
|
+
],
|
|
558
|
+
],
|
|
559
|
+
]));
|
|
560
|
+
expect(fix.target).toBe("8.63.0");
|
|
561
|
+
expect(fix.convergentMembers).toEqual(["a", "b"]);
|
|
562
|
+
expect(fix.excludedMembers.map((excluded) => excluded.packageName)).toEqual(["e"]);
|
|
563
|
+
// e stays on 8.65.0 and keeps pinning x there: moving x's other edges to
|
|
564
|
+
// 8.63.0 would only add a second x
|
|
565
|
+
expect(fix.reResolutionSet).toEqual([]);
|
|
566
|
+
});
|
|
365
567
|
it("skips a cluster with no duplicated member", () => {
|
|
366
568
|
expect(identifyLockstepClusterFixes([["a", "b"]], {
|
|
367
569
|
a: { npmVersions: ["1.0.0"], resolutionCount: 1 },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identifyLockstepClusterFixes.test.js","sourceRoot":"","sources":["../src/identifyLockstepClusterFixes.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"identifyLockstepClusterFixes.test.js","sourceRoot":"","sources":["../src/identifyLockstepClusterFixes.test.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -20,5 +20,6 @@ export { captureFiles, restoreFiles } from "./fileSnapshot.js";
|
|
|
20
20
|
export { applyWorkspaceRangeEdit, nextSelector } from "./workspaceManifest.js";
|
|
21
21
|
export { planClusterApply } from "./planClusterApply.js";
|
|
22
22
|
export { diffDuplicates } from "./duplicateSnapshot.js";
|
|
23
|
+
export { heldOverrides, outstandingOverrides, reuseKeys, } from "./clusterOverrides.js";
|
|
23
24
|
export { partitionUnconditionalOverrides } from "./unconditionalOverrides.js";
|
|
24
25
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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"}
|
|
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,EACL,aAAa,EACb,oBAAoB,EACpB,SAAS,GACV,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC"}
|
package/dist/planClusterApply.js
CHANGED
|
@@ -13,9 +13,11 @@
|
|
|
13
13
|
* `excludedMembers` lists.
|
|
14
14
|
*
|
|
15
15
|
* `reuseFixes` come first: they converge on `anchor`, the version the user
|
|
16
|
-
* pinned, and a pin outranks a version the detector merely computed.
|
|
16
|
+
* pinned, and a pin outranks a version the detector merely computed. A package
|
|
17
|
+
* manager that cannot hold a reuse without an override passes `reuse: false`,
|
|
18
|
+
* so they are left out before they can outrank a convergence.
|
|
17
19
|
*/
|
|
18
|
-
export const planClusterApply = (fixes) => {
|
|
20
|
+
export const planClusterApply = (fixes, { reuse = true } = {}) => {
|
|
19
21
|
const manifestEdits = [];
|
|
20
22
|
const unresolvableChanges = [];
|
|
21
23
|
const conflicts = [];
|
|
@@ -34,9 +36,9 @@ export const planClusterApply = (fixes) => {
|
|
|
34
36
|
}
|
|
35
37
|
overrides.set(packageName, { packageName, version, reason });
|
|
36
38
|
};
|
|
37
|
-
for (const fix of fixes) {
|
|
38
|
-
for (const
|
|
39
|
-
addOverride(
|
|
39
|
+
for (const fix of reuse ? fixes : []) {
|
|
40
|
+
for (const reuseFix of fix.reuseFixes) {
|
|
41
|
+
addOverride(reuseFix.packageName, reuseFix.to, "reuse");
|
|
40
42
|
}
|
|
41
43
|
}
|
|
42
44
|
for (const fix of fixes) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"planClusterApply.js","sourceRoot":"","sources":["../src/planClusterApply.ts"],"names":[],"mappings":"AAwBA
|
|
1
|
+
{"version":3,"file":"planClusterApply.js","sourceRoot":"","sources":["../src/planClusterApply.ts"],"names":[],"mappings":"AAwBA;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,KAAmB,EACnB,EAAE,KAAK,GAAG,IAAI,EAAE,GAAwB,EAAE,EACxB,EAAE;IACpB,MAAM,aAAa,GAA0B,EAAE,CAAC;IAChD,MAAM,mBAAmB,GAAa,EAAE,CAAC;IACzC,MAAM,SAAS,GAAkC,EAAE,CAAC;IACpD,MAAM,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAC;IAErD,MAAM,WAAW,GAAG,CAClB,WAAmB,EACnB,OAAe,EACf,MAAiC,EAC3B,EAAE;QACR,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,QAAQ,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;gBACjC,SAAS,CAAC,IAAI,CAAC;oBACb,WAAW;oBACX,IAAI,EAAE,QAAQ,CAAC,OAAO;oBACtB,OAAO,EAAE,OAAO;iBACjB,CAAC,CAAC;YACL,CAAC;YACD,OAAO;QACT,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACrC,KAAK,MAAM,QAAQ,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACtC,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI;YAAE,SAAS;QAErD,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBACtB,mBAAmB,CAAC,IAAI,CACtB,GAAG,MAAM,CAAC,WAAW,OAAO,MAAM,CAAC,SAAS,EAAE,CAC/C,CAAC;gBACF,SAAS;YACX,CAAC;YACD,aAAa,CAAC,IAAI,CAAC;gBACjB,YAAY,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI;gBACnC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO;gBACjC,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,EAAE,EAAE,MAAM,CAAC,EAAE;aACd,CAAC,CAAC;QACL,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,CAAC,GAAG,GAAG,CAAC,iBAAiB,EAAE,GAAG,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;YACxE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,OAAO;QACL,aAAa;QACb,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACnD,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAC3C;QACD,SAAS;QACT,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -12,7 +12,6 @@ const fix = (overrides) => ({
|
|
|
12
12
|
excludedMembers: [],
|
|
13
13
|
anchor: null,
|
|
14
14
|
reuseFixes: [],
|
|
15
|
-
floatingMembers: [],
|
|
16
15
|
workspaceChanges: [],
|
|
17
16
|
reResolutionSet: [],
|
|
18
17
|
externalConstraints: [],
|
|
@@ -97,25 +96,35 @@ describe("planClusterApply", () => {
|
|
|
97
96
|
},
|
|
98
97
|
]);
|
|
99
98
|
});
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
99
|
+
const anchoredFix = fix({
|
|
100
|
+
applicable: true,
|
|
101
|
+
target: "0.87.0",
|
|
102
|
+
convergentMembers: ["mini-metro-config"],
|
|
103
|
+
anchor: "0.84.5",
|
|
104
|
+
reuseFixes: [
|
|
105
|
+
{
|
|
106
|
+
requester: "mini-plugin@1.0.0",
|
|
107
|
+
requesterName: "mini-plugin",
|
|
108
|
+
packageName: "mini-metro-config",
|
|
109
|
+
range: "*",
|
|
110
|
+
from: "0.87.0",
|
|
111
|
+
to: "0.84.5",
|
|
112
|
+
},
|
|
113
|
+
],
|
|
114
|
+
});
|
|
115
|
+
it("leaves the reuse out when asked, before it can outrank the target", () => {
|
|
116
|
+
const plan = planClusterApply([anchoredFix], { reuse: false });
|
|
117
|
+
deepStrictEqual(plan.overrides, [
|
|
118
|
+
{
|
|
119
|
+
packageName: "mini-metro-config",
|
|
120
|
+
version: "0.87.0",
|
|
121
|
+
reason: "converge",
|
|
122
|
+
},
|
|
118
123
|
]);
|
|
124
|
+
deepStrictEqual(plan.conflicts, []);
|
|
125
|
+
});
|
|
126
|
+
it("lets the anchored reuse win over a computed target", () => {
|
|
127
|
+
const plan = planClusterApply([anchoredFix]);
|
|
119
128
|
deepStrictEqual(plan.overrides, [
|
|
120
129
|
{
|
|
121
130
|
packageName: "mini-metro-config",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"planClusterApply.test.js","sourceRoot":"","sources":["../src/planClusterApply.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,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,
|
|
1
|
+
{"version":3,"file":"planClusterApply.test.js","sourceRoot":"","sources":["../src/planClusterApply.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -266,11 +266,6 @@ const renderCluster = (fix, index, color, log) => {
|
|
|
266
266
|
: "";
|
|
267
267
|
log(` ${color("dim", "Driven by:")} ${nameList(color, fix.driverMembers)}${follow}`);
|
|
268
268
|
}
|
|
269
|
-
// nothing pins these, so the package manager picks their version: the
|
|
270
|
-
// fixable count above is not a guarantee for them
|
|
271
|
-
if (fix.floatingMembers.length > 0) {
|
|
272
|
-
log(` ${color("dim", "Resolver picks:")} ${nameList(color, fix.floatingMembers)}`);
|
|
273
|
-
}
|
|
274
269
|
}
|
|
275
270
|
if (fix.excludedMembers.length > 0) {
|
|
276
271
|
log(` ${color("dim", "Remaining duplicates:")}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderDuplicatesReport.js","sourceRoot":"","sources":["../src/renderDuplicatesReport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"renderDuplicatesReport.js","sourceRoot":"","sources":["../src/renderDuplicatesReport.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,6 @@ const clusterFix = (overrides = {}) => ({
|
|
|
24
24
|
excludedMembers: [],
|
|
25
25
|
anchor: null,
|
|
26
26
|
reuseFixes: [],
|
|
27
|
-
floatingMembers: [],
|
|
28
27
|
workspaceChanges: [],
|
|
29
28
|
reResolutionSet: ["metro"],
|
|
30
29
|
externalConstraints: [metroPin],
|
|
@@ -362,12 +361,6 @@ describe("renderDuplicatesReport", () => {
|
|
|
362
361
|
it("uses the singular when one member follows", () => {
|
|
363
362
|
ok(render({ clusterFixes: [clusterFix()] }).includes("(1 member follows)"));
|
|
364
363
|
});
|
|
365
|
-
it("names the members whose version the resolver picks", () => {
|
|
366
|
-
const output = render({
|
|
367
|
-
clusterFixes: [clusterFix({ floatingMembers: ["metro-config"] })],
|
|
368
|
-
});
|
|
369
|
-
ok(output.includes(" Resolver picks: metro-config"));
|
|
370
|
-
});
|
|
371
364
|
it("has no Dedupe section for an unfixable cluster", () => {
|
|
372
365
|
const output = render({
|
|
373
366
|
clusterFixes: [
|
|
@@ -559,7 +552,6 @@ describe("renderDuplicatesReport", () => {
|
|
|
559
552
|
nonNpmCount: 0,
|
|
560
553
|
},
|
|
561
554
|
},
|
|
562
|
-
floatingMembers: ["metro-config-long-name"],
|
|
563
555
|
anchor: "0.84.5",
|
|
564
556
|
reuseFixes: [
|
|
565
557
|
{
|