pnpm-dedup 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/README.md +15 -5
- package/dist/applyClusterFixes.js +103 -80
- package/dist/applyClusterFixes.js.map +1 -1
- package/dist/applyClusterFixes.test.js +257 -29
- package/dist/applyClusterFixes.test.js.map +1 -1
- package/dist/bin/pnpm-why-duplicate.test.js +17 -8
- package/dist/bin/pnpm-why-duplicate.test.js.map +1 -1
- package/dist/dedupe.js +15 -4
- package/dist/dedupe.js.map +1 -1
- package/dist/dedupeCheckConsistency.test.js +53 -59
- package/dist/dedupeCheckConsistency.test.js.map +1 -1
- package/dist/dedupeEndToEnd.test.js +3 -3
- package/dist/dedupeEndToEnd.test.js.map +1 -1
- package/dist/dedupePeers.test.js +1 -1
- package/dist/dedupePeers.test.js.map +1 -1
- package/dist/definitions/applyClusterFixes.d.ts +6 -3
- package/dist/definitions/applyClusterFixes.d.ts.map +1 -1
- package/dist/definitions/dedupe.d.ts.map +1 -1
- package/dist/definitions/helpers/describeUnheldOverride.d.ts +10 -0
- package/dist/definitions/helpers/describeUnheldOverride.d.ts.map +1 -0
- package/dist/definitions/helpers/describeUnheldOverride.test.d.ts +2 -0
- package/dist/definitions/helpers/describeUnheldOverride.test.d.ts.map +1 -0
- package/dist/definitions/helpers/pnpmWorkspaceYaml.d.ts +1 -5
- package/dist/definitions/helpers/pnpmWorkspaceYaml.d.ts.map +1 -1
- package/dist/definitions/pnpmLockTypes.d.ts +1 -0
- package/dist/definitions/pnpmLockTypes.d.ts.map +1 -1
- package/dist/definitions/readPnpmLock.d.ts +7 -0
- package/dist/definitions/readPnpmLock.d.ts.map +1 -1
- package/dist/definitions/readPnpmLock.test.d.ts +2 -0
- package/dist/definitions/readPnpmLock.test.d.ts.map +1 -0
- package/dist/displayMany.test.js +3 -4
- package/dist/displayMany.test.js.map +1 -1
- package/dist/helpers/buildIdentifiedFixesMap.test.js +1 -1
- package/dist/helpers/buildIdentifiedFixesMap.test.js.map +1 -1
- package/dist/helpers/buildPnpmPackagesMap.test.js +1 -1
- package/dist/helpers/buildPnpmPackagesMap.test.js.map +1 -1
- package/dist/helpers/collectDependentRanges.test.js +1 -1
- package/dist/helpers/collectDependentRanges.test.js.map +1 -1
- package/dist/helpers/collectPnpmDependents.test.js +1 -1
- package/dist/helpers/collectPnpmDependents.test.js.map +1 -1
- package/dist/helpers/describeUnheldOverride.js +30 -0
- package/dist/helpers/describeUnheldOverride.js.map +1 -0
- package/dist/helpers/describeUnheldOverride.test.js +80 -0
- package/dist/helpers/describeUnheldOverride.test.js.map +1 -0
- package/dist/helpers/parsePnpmLockPackages.test.js +1 -1
- package/dist/helpers/parsePnpmLockPackages.test.js.map +1 -1
- package/dist/helpers/pnpmWorkspaceYaml.js +2 -17
- package/dist/helpers/pnpmWorkspaceYaml.js.map +1 -1
- package/dist/helpers/pnpmWorkspaceYaml.test.js +3 -5
- package/dist/helpers/pnpmWorkspaceYaml.test.js.map +1 -1
- package/dist/helpers/readInstalledManifest.test.js +1 -1
- package/dist/helpers/readInstalledManifest.test.js.map +1 -1
- package/dist/helpers/toLockstepGraph.test.js +1 -1
- package/dist/helpers/toLockstepGraph.test.js.map +1 -1
- package/dist/identifyClusterFixes.test.js +22 -41
- package/dist/identifyClusterFixes.test.js.map +1 -1
- package/dist/identifyResolutionFixes.test.js +8 -7
- package/dist/identifyResolutionFixes.test.js.map +1 -1
- package/dist/readPnpmLock.js +21 -2
- package/dist/readPnpmLock.js.map +1 -1
- package/dist/readPnpmLock.test.js +43 -0
- package/dist/readPnpmLock.test.js.map +1 -0
- package/package.json +4 -3
- package/src/applyClusterFixes.test.ts +398 -36
- package/src/applyClusterFixes.ts +178 -125
- package/src/bin/pnpm-why-duplicate.test.ts +31 -8
- package/src/dedupe.ts +22 -7
- package/src/dedupeCheckConsistency.test.ts +84 -100
- package/src/dedupeEndToEnd.test.ts +84 -77
- package/src/dedupePeers.test.ts +1 -1
- package/src/displayMany.test.ts +4 -4
- package/src/helpers/buildIdentifiedFixesMap.test.ts +1 -1
- package/src/helpers/buildPnpmPackagesMap.test.ts +1 -1
- package/src/helpers/collectDependentRanges.test.ts +1 -1
- package/src/helpers/collectPnpmDependents.test.ts +1 -1
- package/src/helpers/describeUnheldOverride.test.ts +100 -0
- package/src/helpers/describeUnheldOverride.ts +53 -0
- package/src/helpers/parsePnpmLockPackages.test.ts +1 -1
- package/src/helpers/pnpmWorkspaceYaml.test.ts +2 -5
- package/src/helpers/pnpmWorkspaceYaml.ts +5 -20
- package/src/helpers/readInstalledManifest.test.ts +1 -1
- package/src/helpers/toLockstepGraph.test.ts +1 -1
- package/src/identifyClusterFixes.test.ts +27 -58
- package/src/identifyResolutionFixes.test.ts +8 -7
- package/src/pnpmLockTypes.ts +1 -0
- package/src/readPnpmLock.test.ts +65 -0
- package/src/readPnpmLock.ts +26 -2
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import semver from "semver";
|
|
2
|
+
const rejects = (version, range) => semver.validRange(range) !== null &&
|
|
3
|
+
!semver.satisfies(version, range, { includePrerelease: true });
|
|
4
|
+
const describeDependent = (dependent, version) => {
|
|
5
|
+
const declared = `${dependent.key} requires "${dependent.range}"`;
|
|
6
|
+
if (rejects(version, dependent.range)) {
|
|
7
|
+
return dependent.peer ? `${declared} (peer)` : declared;
|
|
8
|
+
}
|
|
9
|
+
// pnpm provides a peer from the parent's context rather than resolving it
|
|
10
|
+
return dependent.peer
|
|
11
|
+
? `${declared} (peer), is provided ${dependent.resolvedVersion}`
|
|
12
|
+
: `${declared}, resolves ${dependent.resolvedVersion} without an override`;
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* Why an override did not hold, as one line per edge still resolving away from
|
|
16
|
+
* its version, the ranges that reject it first: those are what blocks the merge.
|
|
17
|
+
*
|
|
18
|
+
* Several peer contexts of one requester share a key, so lines are counted once.
|
|
19
|
+
*/
|
|
20
|
+
export const describeUnheldOverride = (override, dependents) => {
|
|
21
|
+
const offVersion = dependents.filter((dependent) => dependent.resolvedVersion !== undefined &&
|
|
22
|
+
dependent.resolvedVersion !== override.version);
|
|
23
|
+
const blockersFirst = offVersion.toSorted((a, b) => Number(rejects(override.version, b.range)) -
|
|
24
|
+
Number(rejects(override.version, a.range)) ||
|
|
25
|
+
a.key.localeCompare(b.key));
|
|
26
|
+
return [
|
|
27
|
+
...new Set(blockersFirst.map((dependent) => describeDependent(dependent, override.version))),
|
|
28
|
+
];
|
|
29
|
+
};
|
|
30
|
+
//# sourceMappingURL=describeUnheldOverride.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"describeUnheldOverride.js","sourceRoot":"","sources":["../../src/helpers/describeUnheldOverride.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,MAAM,OAAO,GAAG,CAAC,OAAe,EAAE,KAAa,EAAW,EAAE,CAC1D,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,IAAI;IACjC,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;AAEjE,MAAM,iBAAiB,GAAG,CACxB,SAAuD,EACvD,OAAe,EACP,EAAE;IACV,MAAM,QAAQ,GAAG,GAAG,SAAS,CAAC,GAAG,cAAc,SAAS,CAAC,KAAK,GAAG,CAAC;IAClE,IAAI,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,QAAQ,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC1D,CAAC;IACD,0EAA0E;IAC1E,OAAO,SAAS,CAAC,IAAI;QACnB,CAAC,CAAC,GAAG,QAAQ,wBAAwB,SAAS,CAAC,eAAe,EAAE;QAChE,CAAC,CAAC,GAAG,QAAQ,cAAc,SAAS,CAAC,eAAe,sBAAsB,CAAC;AAC/E,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,QAAyB,EACzB,UAA4B,EAClB,EAAE;IACZ,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAClC,CAAC,SAAS,EAA6D,EAAE,CACvE,SAAS,CAAC,eAAe,KAAK,SAAS;QACvC,SAAS,CAAC,eAAe,KAAK,QAAQ,CAAC,OAAO,CACjD,CAAC;IAEF,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CACvC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAC7B,CAAC;IAEF,OAAO;QACL,GAAG,IAAI,GAAG,CACR,aAAa,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAC9B,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,CAC/C,CACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import { deepStrictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
|
+
import { describeUnheldOverride } from "./describeUnheldOverride.js";
|
|
4
|
+
describe("describeUnheldOverride", () => {
|
|
5
|
+
it("names a requester once, whatever its peer contexts", () => {
|
|
6
|
+
deepStrictEqual(describeUnheldOverride({ packageName: "lightningcss", version: "1.30.1", reason: "converge" }, [
|
|
7
|
+
// two installations of one requester, one already repointed
|
|
8
|
+
{
|
|
9
|
+
key: "react-native-css@3.1.0-rc.0",
|
|
10
|
+
range: ">=1.27.0",
|
|
11
|
+
resolvedVersion: "1.30.1",
|
|
12
|
+
requesterName: "react-native-css",
|
|
13
|
+
peer: true,
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
key: "react-native-css@3.1.0-rc.0",
|
|
17
|
+
range: ">=1.27.0",
|
|
18
|
+
resolvedVersion: "1.33.0",
|
|
19
|
+
requesterName: "react-native-css",
|
|
20
|
+
peer: true,
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
key: "react-native-css@3.1.0-rc.0",
|
|
24
|
+
range: ">=1.27.0",
|
|
25
|
+
resolvedVersion: "1.33.0",
|
|
26
|
+
requesterName: "react-native-css",
|
|
27
|
+
peer: true,
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
key: "vite@8.3.0",
|
|
31
|
+
range: "^1.33.0",
|
|
32
|
+
resolvedVersion: "1.33.0",
|
|
33
|
+
requesterName: "vite",
|
|
34
|
+
},
|
|
35
|
+
]), [
|
|
36
|
+
'vite@8.3.0 requires "^1.33.0"',
|
|
37
|
+
'react-native-css@3.1.0-rc.0 requires ">=1.27.0" (peer), is provided 1.33.0',
|
|
38
|
+
]);
|
|
39
|
+
});
|
|
40
|
+
it("lists the ranges that reject the version first", () => {
|
|
41
|
+
deepStrictEqual(describeUnheldOverride({
|
|
42
|
+
packageName: "@commitlint/types",
|
|
43
|
+
version: "21.0.1",
|
|
44
|
+
reason: "converge",
|
|
45
|
+
}, [
|
|
46
|
+
{
|
|
47
|
+
key: "@commitlint/format@21.0.1",
|
|
48
|
+
range: "^21.0.1",
|
|
49
|
+
resolvedVersion: "21.1.0",
|
|
50
|
+
requesterName: "@commitlint/format",
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
key: "@commitlint/rules@21.1.0",
|
|
54
|
+
range: "^21.1.0",
|
|
55
|
+
resolvedVersion: "21.1.0",
|
|
56
|
+
requesterName: "@commitlint/rules",
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
key: "@pob/root@27.11.0",
|
|
60
|
+
range: "21.0.1",
|
|
61
|
+
resolvedVersion: "21.0.1",
|
|
62
|
+
requesterName: "@pob/root",
|
|
63
|
+
},
|
|
64
|
+
]), [
|
|
65
|
+
'@commitlint/rules@21.1.0 requires "^21.1.0"',
|
|
66
|
+
'@commitlint/format@21.0.1 requires "^21.0.1", resolves 21.1.0 without an override',
|
|
67
|
+
]);
|
|
68
|
+
});
|
|
69
|
+
it("names an importer by its manifest and dependency type", () => {
|
|
70
|
+
deepStrictEqual(describeUnheldOverride({ packageName: "leaf", version: "2.0.0", reason: "converge" }, [
|
|
71
|
+
{
|
|
72
|
+
key: "package.json in devDependencies",
|
|
73
|
+
range: "1.0.0",
|
|
74
|
+
resolvedVersion: "1.0.0",
|
|
75
|
+
workspace: { path: ".", depType: "devDependencies" },
|
|
76
|
+
},
|
|
77
|
+
]), ['package.json in devDependencies requires "1.0.0"']);
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
//# sourceMappingURL=describeUnheldOverride.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"describeUnheldOverride.test.js","sourceRoot":"","sources":["../../src/helpers/describeUnheldOverride.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,eAAe,CACb,sBAAsB,CACpB,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,EACtE;YACE,4DAA4D;YAC5D;gBACE,GAAG,EAAE,6BAA6B;gBAClC,KAAK,EAAE,UAAU;gBACjB,eAAe,EAAE,QAAQ;gBACzB,aAAa,EAAE,kBAAkB;gBACjC,IAAI,EAAE,IAAI;aACX;YACD;gBACE,GAAG,EAAE,6BAA6B;gBAClC,KAAK,EAAE,UAAU;gBACjB,eAAe,EAAE,QAAQ;gBACzB,aAAa,EAAE,kBAAkB;gBACjC,IAAI,EAAE,IAAI;aACX;YACD;gBACE,GAAG,EAAE,6BAA6B;gBAClC,KAAK,EAAE,UAAU;gBACjB,eAAe,EAAE,QAAQ;gBACzB,aAAa,EAAE,kBAAkB;gBACjC,IAAI,EAAE,IAAI;aACX;YACD;gBACE,GAAG,EAAE,YAAY;gBACjB,KAAK,EAAE,SAAS;gBAChB,eAAe,EAAE,QAAQ;gBACzB,aAAa,EAAE,MAAM;aACtB;SACF,CACF,EACD;YACE,+BAA+B;YAC/B,4EAA4E;SAC7E,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,eAAe,CACb,sBAAsB,CACpB;YACE,WAAW,EAAE,mBAAmB;YAChC,OAAO,EAAE,QAAQ;YACjB,MAAM,EAAE,UAAU;SACnB,EACD;YACE;gBACE,GAAG,EAAE,2BAA2B;gBAChC,KAAK,EAAE,SAAS;gBAChB,eAAe,EAAE,QAAQ;gBACzB,aAAa,EAAE,oBAAoB;aACpC;YACD;gBACE,GAAG,EAAE,0BAA0B;gBAC/B,KAAK,EAAE,SAAS;gBAChB,eAAe,EAAE,QAAQ;gBACzB,aAAa,EAAE,mBAAmB;aACnC;YACD;gBACE,GAAG,EAAE,mBAAmB;gBACxB,KAAK,EAAE,QAAQ;gBACf,eAAe,EAAE,QAAQ;gBACzB,aAAa,EAAE,WAAW;aAC3B;SACF,CACF,EACD;YACE,6CAA6C;YAC7C,mFAAmF;SACpF,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,eAAe,CACb,sBAAsB,CACpB,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,EAC7D;YACE;gBACE,GAAG,EAAE,iCAAiC;gBACtC,KAAK,EAAE,OAAO;gBACd,eAAe,EAAE,OAAO;gBACxB,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,iBAAiB,EAAE;aACrD;SACF,CACF,EACD,CAAC,kDAAkD,CAAC,CACrD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
4
|
import { readPnpmLock } from "../readPnpmLock.js";
|
|
5
5
|
import { parsePackageId, parsePnpmLockPackages, } from "./parsePnpmLockPackages.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parsePnpmLockPackages.test.js","sourceRoot":"","sources":["../../src/helpers/parsePnpmLockPackages.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"parsePnpmLockPackages.test.js","sourceRoot":"","sources":["../../src/helpers/parsePnpmLockPackages.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,12 +7,6 @@ import { Scalar, parseDocument } from "yaml";
|
|
|
7
7
|
* The plain key is the unconditional one: every requester gets the version.
|
|
8
8
|
*/
|
|
9
9
|
export const overrideKey = (packageName, convergence) => (convergence ? `${packageName}@` : packageName);
|
|
10
|
-
// `yaml` writes `commentBefore` straight after the `#`, so the leading space
|
|
11
|
-
// that makes it read as prose has to be part of every line.
|
|
12
|
-
const spaced = (comment) => comment
|
|
13
|
-
.split("\n")
|
|
14
|
-
.map((line) => (line.startsWith(" ") ? line : ` ${line}`))
|
|
15
|
-
.join("\n");
|
|
16
10
|
const quoted = (value) => {
|
|
17
11
|
const scalar = new Scalar(value);
|
|
18
12
|
scalar.type = Scalar.QUOTE_DOUBLE;
|
|
@@ -22,20 +16,11 @@ const quoted = (value) => {
|
|
|
22
16
|
* Add overrides to a `pnpm-workspace.yaml`, editing the document rather than
|
|
23
17
|
* reserializing it: the user's comments, key order and formatting have to
|
|
24
18
|
* survive. Pass `undefined` for a file that does not exist yet.
|
|
25
|
-
*
|
|
26
|
-
* `comment` is attached above the first entry added, not above the `overrides`
|
|
27
|
-
* key, so an existing block and whatever the user wrote about it stay untouched.
|
|
28
19
|
*/
|
|
29
|
-
export const addOverrides = (content, overrides, { convergence = true
|
|
20
|
+
export const addOverrides = (content, overrides, { convergence = true } = {}) => {
|
|
30
21
|
const doc = parseDocument(content ?? "");
|
|
31
|
-
let isFirst = true;
|
|
32
22
|
for (const [packageName, version] of overrides) {
|
|
33
|
-
|
|
34
|
-
if (isFirst && comment !== undefined) {
|
|
35
|
-
key.commentBefore = spaced(comment);
|
|
36
|
-
}
|
|
37
|
-
doc.setIn(["overrides", key], quoted(version));
|
|
38
|
-
isFirst = false;
|
|
23
|
+
doc.setIn(["overrides", quoted(overrideKey(packageName, convergence))], quoted(version));
|
|
39
24
|
}
|
|
40
25
|
return doc.toString();
|
|
41
26
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpmWorkspaceYaml.js","sourceRoot":"","sources":["../../src/helpers/pnpmWorkspaceYaml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAE7C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,WAAmB,EACnB,WAAoB,EACZ,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AAE7D,
|
|
1
|
+
{"version":3,"file":"pnpmWorkspaceYaml.js","sourceRoot":"","sources":["../../src/helpers/pnpmWorkspaceYaml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAE7C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,WAAmB,EACnB,WAAoB,EACZ,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AAE7D,MAAM,MAAM,GAAG,CAAC,KAAa,EAAkB,EAAE;IAC/C,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC;IAClC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAOF;;;;GAIG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,OAA2B,EAC3B,SAA8B,EAC9B,EAAE,WAAW,GAAG,IAAI,EAAE,GAAwB,EAAE,EACxC,EAAE;IACV,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAEzC,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,SAAS,EAAE,CAAC;QAC/C,GAAG,CAAC,KAAK,CACP,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAC5D,MAAM,CAAC,OAAO,CAAC,CAChB,CAAC;IACJ,CAAC;IAED,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,OAAe,EACM,EAAE;IACvB,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAElC,CAAC;IAET,OAAO,IAAI,GAAG,CACZ,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAC/D,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAC5C,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAqB,CAAC;QACjD,CAAC,CAAC,EAAE,CACP,CACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, strictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
3
|
import { addOverrides, overrideKey, readConvergenceOverrides, } from "./pnpmWorkspaceYaml.js";
|
|
4
4
|
const overrides = (entries) => new Map(entries);
|
|
5
5
|
describe("pnpmWorkspaceYaml", () => {
|
|
@@ -63,16 +63,14 @@ describe("pnpmWorkspaceYaml", () => {
|
|
|
63
63
|
"",
|
|
64
64
|
].join("\n"));
|
|
65
65
|
});
|
|
66
|
-
it("
|
|
66
|
+
it("appends to an existing block, leaving the user's comment in place", () => {
|
|
67
67
|
strictEqual(addOverrides('overrides:\n # a decision taken elsewhere\n "foo@": "1.0.0"\n', overrides([
|
|
68
68
|
["leaf", "2.0.0"],
|
|
69
69
|
["other", "1.0.0"],
|
|
70
|
-
])
|
|
70
|
+
])), [
|
|
71
71
|
"overrides:",
|
|
72
72
|
" # a decision taken elsewhere",
|
|
73
73
|
' "foo@": "1.0.0"',
|
|
74
|
-
" # Added by pnpm-dedup.",
|
|
75
|
-
" # see https://example.test/issues",
|
|
76
74
|
' "leaf@": "2.0.0"',
|
|
77
75
|
' "other@": "1.0.0"',
|
|
78
76
|
"",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpmWorkspaceYaml.test.js","sourceRoot":"","sources":["../../src/helpers/pnpmWorkspaceYaml.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"pnpmWorkspaceYaml.test.js","sourceRoot":"","sources":["../../src/helpers/pnpmWorkspaceYaml.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, strictEqual } from "node:assert/strict";
|
|
3
2
|
import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
|
|
4
3
|
import { tmpdir } from "node:os";
|
|
5
4
|
import { join } from "node:path";
|
|
5
|
+
import { describe, it } from "node:test";
|
|
6
6
|
import { fileURLToPath } from "node:url";
|
|
7
7
|
import { createManifestReaderWithStats } from "./readInstalledManifest.js";
|
|
8
8
|
const hoistedFixture = fileURLToPath(new URL("../../test/fixtures/hoisted-node-linker", import.meta.url));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readInstalledManifest.test.js","sourceRoot":"","sources":["../../src/helpers/readInstalledManifest.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"readInstalledManifest.test.js","sourceRoot":"","sources":["../../src/helpers/readInstalledManifest.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
4
|
import { readPnpmLock } from "../readPnpmLock.js";
|
|
5
5
|
import { buildPnpmPackagesMap } from "./buildPnpmPackagesMap.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toLockstepGraph.test.js","sourceRoot":"","sources":["../../src/helpers/toLockstepGraph.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"toLockstepGraph.test.js","sourceRoot":"","sources":["../../src/helpers/toLockstepGraph.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
3
2
|
import { join } from "node:path";
|
|
3
|
+
import { describe, it } from "node:test";
|
|
4
4
|
import { fileURLToPath } from "node:url";
|
|
5
5
|
import { buildPnpmPackagesMap } from "./helpers/buildPnpmPackagesMap.js";
|
|
6
6
|
import { parsePnpmLockPackages } from "./helpers/parsePnpmLockPackages.js";
|
|
@@ -214,57 +214,38 @@ describe("identifyClusterFixes", () => {
|
|
|
214
214
|
strictEqual(requesterNames.has("metro"), false);
|
|
215
215
|
strictEqual(requesterNames.has("metro-config"), false);
|
|
216
216
|
});
|
|
217
|
-
it("
|
|
217
|
+
it("proposes the metro pin upgrade, since nothing moves react-native", () => {
|
|
218
218
|
const fix = metroCluster();
|
|
219
|
-
//
|
|
220
|
-
//
|
|
221
|
-
// 0.
|
|
219
|
+
// react-native@0.87.0 and @react-native/metro-config@0.87.0 hold the 0.87.0
|
|
220
|
+
// metro subtree. Nothing pins them exactly — they arrive through `*` /
|
|
221
|
+
// `0.83 - 0.86` peer ranges — but a resolver keeps a locked version its
|
|
222
|
+
// requesters accept, so they stay, and their `^0.87.0` on metro keeps the
|
|
223
|
+
// family off 0.84.5. The root's pin is the only thing left to move: a last
|
|
224
|
+
// resort, proposed because nothing else deduplicates the family.
|
|
222
225
|
strictEqual(fix.applicable, true);
|
|
223
|
-
strictEqual(fix.target, "0.
|
|
224
|
-
strictEqual(fix.direction, "
|
|
226
|
+
strictEqual(fix.target, "0.87.0");
|
|
227
|
+
strictEqual(fix.direction, "up");
|
|
225
228
|
strictEqual(fix.convergentMembers.length, 15);
|
|
226
|
-
deepStrictEqual(fix.workspaceChanges, []);
|
|
229
|
+
deepStrictEqual(fix.workspaceChanges.map((change) => `${change.packageName} ${change.range} -> ${change.to}`), ["metro 0.84.5 -> 0.87.0"]);
|
|
230
|
+
strictEqual(fix.needsRoundTrip, true);
|
|
231
|
+
// react-native is only asked for through open ranges: it is never planned
|
|
232
|
+
// onto a version number that only metro carries
|
|
233
|
+
deepStrictEqual(fix.reResolutionSet, []);
|
|
227
234
|
// metro is the only member a real range applies to (the pin): the 14
|
|
228
235
|
// metro-* packages are requested through `*` or through metro's own exact
|
|
229
236
|
// pins, so they carry no decision and follow it.
|
|
230
237
|
deepStrictEqual(fix.driverMembers, ["metro"]);
|
|
231
238
|
});
|
|
232
|
-
it("leaves
|
|
239
|
+
it("leaves the wildcards alone once the pin they ignored moves to them", () => {
|
|
233
240
|
const fix = metroCluster();
|
|
234
|
-
//
|
|
235
|
-
// the 0.87.0 metro subtree, and nothing pins either of them there — both
|
|
236
|
-
// arrive through `*` / `0.83 - 0.86` peer ranges (0.87.0 does not even
|
|
237
|
-
// satisfy the latter). They have to move, but which version they land on is
|
|
238
|
-
// the resolver's call, so no version is asserted for them.
|
|
239
|
-
deepStrictEqual(fix.floatingMembers, [
|
|
240
|
-
"@react-native/metro-config",
|
|
241
|
-
"react-native",
|
|
242
|
-
]);
|
|
243
|
-
deepStrictEqual(fix.reResolutionSet, []);
|
|
244
|
-
strictEqual(fix.needsRoundTrip, true);
|
|
245
|
-
});
|
|
246
|
-
it("repoints the wildcards that ignored the pinned version", () => {
|
|
247
|
-
const fix = metroCluster();
|
|
248
|
-
// What the fixture is actually about: `@tamagui/metro-plugin` declares
|
|
241
|
+
// What the fixture is about: `@tamagui/metro-plugin` declares
|
|
249
242
|
// `metro-config: "*"` / `metro-transform-worker: "*"`, and pnpm resolved
|
|
250
|
-
// both to 0.87.0
|
|
251
|
-
//
|
|
252
|
-
// app's.
|
|
243
|
+
// both to 0.87.0 beside the pinned 0.84.5 — the plugin runs against a
|
|
244
|
+
// different metro than the app's. The fix moves the pin to 0.87.0, which
|
|
245
|
+
// puts the app on the plugin's copy: sending the plugin back to 0.84.5
|
|
246
|
+
// would split the family again.
|
|
253
247
|
strictEqual(fix.anchor, "0.84.5");
|
|
254
|
-
deepStrictEqual(fix.reuseFixes
|
|
255
|
-
'@tamagui/metro-plugin>metro-config "*" 0.87.0 -> 0.84.5',
|
|
256
|
-
'@tamagui/metro-plugin>metro-transform-worker "*" 0.87.0 -> 0.84.5',
|
|
257
|
-
]);
|
|
258
|
-
});
|
|
259
|
-
it("leaves alone the ranges that cannot accept the pinned version", () => {
|
|
260
|
-
const repointed = new Set(metroCluster().reuseFixes.map((reuse) => reuse.packageName));
|
|
261
|
-
// `@react-native/metro-config` requires `metro-config: ^0.87.0`, and
|
|
262
|
-
// `react-native-web` requires `@react-native/normalize-colors: ^0.74.1`:
|
|
263
|
-
// neither accepts 0.84.5, so neither is repointed.
|
|
264
|
-
strictEqual(repointed.has("@react-native/normalize-colors"), false);
|
|
265
|
-
deepStrictEqual(metroCluster()
|
|
266
|
-
.reuseFixes.filter((reuse) => reuse.requesterName === "@react-native/metro-config")
|
|
267
|
-
.map((reuse) => reuse.packageName), []);
|
|
248
|
+
deepStrictEqual(fix.reuseFixes, []);
|
|
268
249
|
});
|
|
269
250
|
// `aliased-swapped-names`: the importer pins the real `typescript` at 7.0.2
|
|
270
251
|
// through the `@typescript/native` key while `tool` needs 5.9.3, and the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identifyClusterFixes.test.js","sourceRoot":"","sources":["../src/identifyClusterFixes.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CACnC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/C,6EAA6E;AAC7E,wEAAwE;AACxE,qDAAqD;AACrD,MAAM,SAAS,GAA2C;IACxD,+BAA+B,EAAE;QAC/B,cAAc,EAAE,GAAG;QACnB,wBAAwB,EAAE,GAAG;KAC9B;IACD,2CAA2C,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;IACjE,mCAAmC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE;IAClE,yBAAyB,EAAE,EAAE,gCAAgC,EAAE,SAAS,EAAE;IAC1E,+BAA+B,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE;IAClE,8BAA8B,EAAE;QAC9B,cAAc,EAAE,aAAa;QAC7B,4BAA4B,EAAE,GAAG;KAClC;IACD,2BAA2B,EAAE;QAC3B,kCAAkC,EAAE,SAAS;QAC7C,2BAA2B,EAAE,SAAS;QACtC,mBAAmB,EAAE,SAAS;KAC/B;IACD,2BAA2B,EAAE,EAAE,0BAA0B,EAAE,QAAQ,EAAE;IACrE,+BAA+B,EAAE;QAC/B,0BAA0B,EAAE,SAAS;QACrC,0BAA0B,EAAE,SAAS;KACtC;CACF,CAAC;AAEF,8EAA8E;AAC9E,6EAA6E;AAC7E,6EAA6E;AAC7E,2DAA2D;AAC3D,MAAM,mBAAmB,GAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IAC5D,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC,CAAC;IACrD,IAAI,YAAY;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IAC1C,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QACrE,OAAO,EAAE,gBAAgB,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,EAAE,CAAC;IACvD,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CACtB,QAAgB,EAChB,YAAY,GAAmB,mBAAmB,EACpC,EAAE;IAChB,MAAM,IAAI,GAAG,YAAY,CACvB,YAAY,CAAC,oBAAoB,QAAQ,iBAAiB,CAAC,CAC5D,CAAC;IACF,OAAO,oBAAoB,CACzB,IAAI,EACJ,oBAAoB,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,EACjD,YAAY,CACb,CAAC;AACJ,CAAC,CAAC;AAEF,2EAA2E;AAC3E,+DAA+D;AAC/D,MAAM,gBAAgB,GAAG,CACvB,QAAgB,EAChB,YAAY,GAAmB,mBAAmB,EACpC,EAAE,CAChB,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAChC,CAAC;AAEJ,MAAM,YAAY,GAAG,GAAe,EAAE;IACpC,MAAM,GAAG,GAAG,eAAe,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CACpE,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CACpC,CAAC;IACF,EAAE,CAAC,GAAG,EAAE,qCAAqC,CAAC,CAAC;IAC/C,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,mEAAmE;IACnE,0EAA0E;IAC1E,2DAA2D;IAC3D,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,KAAK,GAAG,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;QAC/D,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QAEtB,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAClC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QACtC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC9C,eAAe,CAAC,GAAG,CAAC,iBAAiB,EAAE;YACrC,oCAAoC;YACpC,kCAAkC;YAClC,mCAAmC;YACnC,0BAA0B;YAC1B,sCAAsC;YACtC,0BAA0B;YAC1B,iCAAiC;SAClC,CAAC,CAAC;QACH,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE;YACnC,kCAAkC;YAClC,2BAA2B;YAC3B,mBAAmB;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,uEAAuE;QACvE,qEAAqE;QACrE,4EAA4E;QAC5E,mCAAmC;QACnC,MAAM,KAAK,GAAG,gBAAgB,CAC5B,8BAA8B,EAC9B,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;QACF,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QACtB,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9B,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,4EAA4E;IAC5E,4EAA4E;IAC5E,4EAA4E;IAC5E,4EAA4E;IAC5E,MAAM,iBAAiB,GAAG,YAAY,CACpC,sCAAsC,CACvC,CAAC;IAEF,MAAM,iBAAiB,GAAG,CAAC,YAA4B,EAAc,EAAE;QACrE,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC,CAAC;QACrE,MAAM,KAAK,GAAG,oBAAoB,CAChC,IAAI,EACJ,oBAAoB,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,EACjD,YAAY,CACb,CAAC;QACF,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7B,OAAO,KAAK,CAAC,CAAC,CAAE,CAAC;IACnB,CAAC,CAAC;IAEF,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,GAAG,GAAG,iBAAiB,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAEvE,0EAA0E;QAC1E,4CAA4C;QAC5C,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAClC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACnC,eAAe,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC,CAAC;QAC5E,eAAe,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QACnD,eAAe,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QAC1C,WAAW,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACvC,eAAe,CACb,GAAG,CAAC,UAAU,CAAC,GAAG,CAChB,CAAC,KAAK,EAAE,EAAE,CACR,GAAG,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE,EAAE,CAC7E,EACD;YACE,qEAAqE;YACrE,8CAA8C;YAC9C,gDAAgD;SACjD,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,oEAAoE;QACpE,qEAAqE;QACrE,4EAA4E;QAC5E,gEAAgE;QAChE,MAAM,GAAG,GAAG,iBAAiB,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAE/C,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACjC,eAAe,CACb,GAAG,CAAC,gBAAgB,CAAC,GAAG,CACtB,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,OAAO,MAAM,CAAC,EAAE,EAAE,CACpE,EACD,CAAC,6BAA6B,CAAC,CAChC,CAAC;QACF,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,eAAe,CAAC,gBAAgB,CAAC,oCAAoC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,6EAA6E;IAC7E,0EAA0E;IAC1E,4DAA4D;IAC5D,MAAM,mBAAmB,GAAG,YAAY,CACtC,6CAA6C,CAC9C,CAAC;IAEF,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,KAAK,GAAG,eAAe,CAC3B,4BAA4B,EAC5B,oBAAoB,CAAC,mBAAmB,CAAC,CAC1C,CAAC;QACF,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CACnC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAC/C,CAAC;QACF,EAAE,CAAC,GAAG,EAAE,qCAAqC,CAAC,CAAC;QAE/C,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACnD,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAClC,2EAA2E;QAC3E,iDAAiD;QACjD,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACnC,eAAe,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC7D,eAAe,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACzD,eAAe,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QAC1C,eAAe,CACb,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC;YAC1C,UAAU,CAAC,aAAa;YACxB,UAAU,CAAC,KAAK;SACjB,CAAC,EACF;YACE,CAAC,0BAA0B,EAAE,OAAO,CAAC;YACrC,CAAC,aAAa,EAAE,QAAQ,CAAC;SAC1B,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,KAAK,GAAG,eAAe,CAC3B,4BAA4B,EAC5B,oBAAoB,CAAC,mBAAmB,CAAC,CAC1C,CAAC;QACF,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CACnC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CACzC,CAAC;QACF,EAAE,CAAC,GAAG,EAAE,sCAAsC,CAAC,CAAC;QAEhD,oEAAoE;QACpE,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,uEAAuE;QACvE,4EAA4E;QAC5E,qDAAqD;QACrD,eAAe,CAAC,eAAe,CAAC,oCAAoC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,KAAK,MAAM,GAAG,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAC1D,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;QAE3B,KAAK,MAAM,MAAM,IAAI;YACnB,OAAO;YACP,cAAc;YACd,wBAAwB;YACxB,KAAK;SACN,EAAE,CAAC;YACF,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,MAAM,EAAE,CAAC,CAAC;QACnE,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,WAAW,GAAG,YAAY,EAAE,CAAC,mBAAmB,CAAC,GAAG,CACxD,CAAC,UAAU,EAAE,EAAE,CACb,GAAG,UAAU,CAAC,aAAa,IAAI,WAAW,OAAO,UAAU,CAAC,WAAW,MAAM,UAAU,CAAC,KAAK,EAAE,CAClG,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI;YACrB,6BAA6B;YAC7B,2CAA2C;YAC3C,qDAAqD;YACrD,8DAA8D;SAC/D,EAAE,CAAC;YACF,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,uBAAuB,QAAQ,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,wEAAwE;QACxE,kDAAkD;QAClD,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,YAAY,EAAE,CAAC,mBAAmB,CAAC,GAAG,CACpC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CACzC,CACF,CAAC;QACF,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;QAE3B,0EAA0E;QAC1E,sEAAsE;QACtE,6CAA6C;QAC7C,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAClC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9C,eAAe,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QAE1C,qEAAqE;QACrE,0EAA0E;QAC1E,iDAAiD;QACjD,eAAe,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;QAE3B,0EAA0E;QAC1E,yEAAyE;QACzE,uEAAuE;QACvE,4EAA4E;QAC5E,2DAA2D;QAC3D,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE;YACnC,4BAA4B;YAC5B,cAAc;SACf,CAAC,CAAC;QACH,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;QACzC,WAAW,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;QAE3B,uEAAuE;QACvE,yEAAyE;QACzE,4EAA4E;QAC5E,2EAA2E;QAC3E,SAAS;QACT,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClC,eAAe,CACb,GAAG,CAAC,UAAU,CAAC,GAAG,CAChB,CAAC,KAAK,EAAE,EAAE,CACR,GAAG,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE,EAAE,CAC9F,EACD;YACE,yDAAyD;YACzD,mEAAmE;SACpE,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,YAAY,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAC5D,CAAC;QAEF,qEAAqE;QACrE,yEAAyE;QACzE,mDAAmD;QACnD,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,gCAAgC,CAAC,EAAE,KAAK,CAAC,CAAC;QACpE,eAAe,CACb,YAAY,EAAE;aACX,UAAU,CAAC,MAAM,CAChB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,KAAK,4BAA4B,CAChE;aACA,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,EACpC,EAAE,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,4EAA4E;IAC5E,yEAAyE;IACzE,8EAA8E;IAC9E,oEAAoE;IACpE,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,KAAK,GAAG,eAAe,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACxE,eAAe,CACb,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAC/B,CAAC,CAAC,YAAY,CAAC,CAAC,CACjB,CAAC;QACF,WAAW,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACzC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,6EAA6E;IAC7E,4EAA4E;IAC5E,+EAA+E;IAC/E,4EAA4E;IAC5E,+EAA+E;IAC/E,4CAA4C;IAC5C,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,GAAG,GAAG,eAAe,CACzB,+BAA+B,EAC/B,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAChB,IAAI,KAAK,yBAAyB,IAAI,OAAO,KAAK,OAAO;YACvD,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE;YACxC,CAAC,CAAC,SAAS,CAChB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;QAEhE,EAAE,CAAC,GAAG,CAAC,CAAC;QACR,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACnC,eAAe,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QACvD,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9B,eAAe,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,4EAA4E;QAC5E,0EAA0E;QAC1E,gBAAgB;QAChB,MAAM,GAAG,GAAG,eAAe,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CACpE,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAC5C,CAAC;QACF,EAAE,CAAC,GAAG,CAAC,CAAC;QACR,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9B,eAAe,CAAC,GAAG,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"identifyClusterFixes.test.js","sourceRoot":"","sources":["../src/identifyClusterFixes.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { deepStrictEqual } from "node:assert/strict";
|
|
2
2
|
import fs from "node:fs";
|
|
3
|
+
import { describe, it } from "node:test";
|
|
3
4
|
import { fileURLToPath } from "node:url";
|
|
4
5
|
import { identifyResolutionFixes } from "pm-dedup-core";
|
|
5
6
|
const loadResolutionsFixture = (fileName) => {
|
|
6
7
|
return JSON.parse(fs.readFileSync(fileURLToPath(new URL(`../test/fixtures/resolutions/${fileName}`, import.meta.url)),
|
|
7
|
-
//
|
|
8
|
+
// oxlint-disable-next-line unicorn-js/prefer-json-parse-buffer
|
|
8
9
|
"utf8"));
|
|
9
10
|
};
|
|
10
11
|
const loadDependentsFixture = (fileName) => {
|
|
11
12
|
return JSON.parse(fs.readFileSync(fileURLToPath(new URL(`../test/fixtures/dependents/${fileName}`, import.meta.url)),
|
|
12
|
-
//
|
|
13
|
+
// oxlint-disable-next-line unicorn-js/prefer-json-parse-buffer
|
|
13
14
|
"utf8"));
|
|
14
15
|
};
|
|
15
16
|
const objetToMap = (obj) => new Map(Object.entries(obj));
|
|
@@ -17,25 +18,25 @@ describe("identifyResolutionFixes", () => {
|
|
|
17
18
|
it("should return an empty array when there are no resolutions", () => {
|
|
18
19
|
const resolutions = [];
|
|
19
20
|
const fixes = identifyResolutionFixes(resolutions, objetToMap({}));
|
|
20
|
-
|
|
21
|
+
deepStrictEqual(fixes, []);
|
|
21
22
|
});
|
|
22
23
|
it("should return an empty array when there is only one resolution", () => {
|
|
23
24
|
const resolutions = loadResolutionsFixture("semver-7.7.3.json");
|
|
24
25
|
const dependents = loadDependentsFixture("semver-7.7.3.json");
|
|
25
26
|
const fixes = identifyResolutionFixes(resolutions, objetToMap(dependents));
|
|
26
|
-
|
|
27
|
+
deepStrictEqual(fixes, []);
|
|
27
28
|
});
|
|
28
29
|
it("should not identify fixes when dependencies are not compatible", () => {
|
|
29
30
|
const resolutions = loadResolutionsFixture("babel-code-frame-7.26.2-7.27.1.json");
|
|
30
31
|
const dependents = loadDependentsFixture("babel-code-frame-7.26.2-7.27.1.json");
|
|
31
32
|
const fixes = identifyResolutionFixes(resolutions, objetToMap(dependents));
|
|
32
|
-
|
|
33
|
+
deepStrictEqual(fixes, []);
|
|
33
34
|
});
|
|
34
35
|
it("should identify resolution fixes when dependencies are compatible", () => {
|
|
35
36
|
const resolutions = loadResolutionsFixture("printable-shell-command-5.0.7-5.0.8.json");
|
|
36
37
|
const dependents = loadDependentsFixture("printable-shell-command-5.0.7-5.0.8.json");
|
|
37
38
|
const fixes = identifyResolutionFixes(resolutions, objetToMap(dependents));
|
|
38
|
-
|
|
39
|
+
deepStrictEqual(fixes, [
|
|
39
40
|
{
|
|
40
41
|
mergeableResolutions: [
|
|
41
42
|
"printable-shell-command@5.0.7",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identifyResolutionFixes.test.js","sourceRoot":"","sources":["../src/identifyResolutionFixes.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"identifyResolutionFixes.test.js","sourceRoot":"","sources":["../src/identifyResolutionFixes.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAIxD,MAAM,sBAAsB,GAAG,CAAC,QAAgB,EAAuB,EAAE;IACvE,OAAO,IAAI,CAAC,KAAK,CACf,EAAE,CAAC,YAAY,CACb,aAAa,CACX,IAAI,GAAG,CAAC,gCAAgC,QAAQ,EAAE,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CACrE;IACD,+DAA+D;IAC/D,MAAM,CACP,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC5B,QAAgB,EACa,EAAE;IAC/B,OAAO,IAAI,CAAC,KAAK,CACf,EAAE,CAAC,YAAY,CACb,aAAa,CACX,IAAI,GAAG,CAAC,+BAA+B,QAAQ,EAAE,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CACpE;IACD,+DAA+D;IAC/D,MAAM,CACP,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAsB,GAAiB,EAAa,EAAE,CACvE,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAa,CAAC,CAAC;AAE3C,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,WAAW,GAAwB,EAAE,CAAC;QAE5C,MAAM,KAAK,GAAG,uBAAuB,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QACnE,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,WAAW,GAAG,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,qBAAqB,CAAC,mBAAmB,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,uBAAuB,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAC3E,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,WAAW,GAAG,sBAAsB,CACxC,qCAAqC,CACtC,CAAC;QACF,MAAM,UAAU,GAAG,qBAAqB,CACtC,qCAAqC,CACtC,CAAC;QACF,MAAM,KAAK,GAAG,uBAAuB,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAC3E,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,WAAW,GAAG,sBAAsB,CACxC,0CAA0C,CAC3C,CAAC;QACF,MAAM,UAAU,GAAG,qBAAqB,CACtC,0CAA0C,CAC3C,CAAC;QAEF,MAAM,KAAK,GAAG,uBAAuB,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAC3E,eAAe,CAAC,KAAK,EAAE;YACrB;gBACE,oBAAoB,EAAE;oBACpB,+BAA+B;oBAC/B,+BAA+B;iBAChC;gBACD,EAAE,EAAE,+BAA+B;aACpC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/readPnpmLock.js
CHANGED
|
@@ -1,6 +1,25 @@
|
|
|
1
1
|
import { readFileSync } from "node:fs";
|
|
2
|
-
import {
|
|
2
|
+
import { parseAllDocuments } from "yaml";
|
|
3
|
+
const isPackageManagerDocument = (lock) => Object.values(lock.importers ?? {}).some((importer) => importer.packageManagerDependencies !== undefined);
|
|
4
|
+
/**
|
|
5
|
+
* A project declaring `devEngines.packageManager` gets a lockfile of two YAML
|
|
6
|
+
* documents from pnpm 12: the first resolves pnpm itself
|
|
7
|
+
* (`packageManagerDependencies`, `@pnpm/exe.*`), the second is the project's.
|
|
8
|
+
* Only the project document is returned — the other one would report pnpm as a
|
|
9
|
+
* dependency of the project.
|
|
10
|
+
*/
|
|
3
11
|
export const readPnpmLock = (filepath) => {
|
|
4
|
-
|
|
12
|
+
const documents = parseAllDocuments(readFileSync(filepath, "utf8"));
|
|
13
|
+
const locks = documents.map((document) => {
|
|
14
|
+
const [error] = document.errors;
|
|
15
|
+
if (error)
|
|
16
|
+
throw error;
|
|
17
|
+
return document.toJS();
|
|
18
|
+
});
|
|
19
|
+
const projectLock = locks.findLast((lock) => lock !== null && !isPackageManagerDocument(lock));
|
|
20
|
+
if (!projectLock) {
|
|
21
|
+
throw new Error(`No project lockfile document found in ${filepath}`);
|
|
22
|
+
}
|
|
23
|
+
return projectLock;
|
|
5
24
|
};
|
|
6
25
|
//# sourceMappingURL=readPnpmLock.js.map
|
package/dist/readPnpmLock.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readPnpmLock.js","sourceRoot":"","sources":["../src/readPnpmLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"readPnpmLock.js","sourceRoot":"","sources":["../src/readPnpmLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAGzC,MAAM,wBAAwB,GAAG,CAAC,IAAkB,EAAW,EAAE,CAC/D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,CACtC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,0BAA0B,KAAK,SAAS,CAChE,CAAC;AAEJ;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAgB,EAAE;IAC7D,MAAM,SAAS,GAAG,iBAAiB,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACvC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;QAChC,IAAI,KAAK;YAAE,MAAM,KAAK,CAAC;QACvB,OAAO,QAAQ,CAAC,IAAI,EAAyB,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAChC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAC3D,CAAC;IACF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,yCAAyC,QAAQ,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { deepStrictEqual, ok, throws } from "node:assert/strict";
|
|
2
|
+
import { writeFileSync } from "node:fs";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { afterEach, describe, it } from "node:test";
|
|
5
|
+
import { fileURLToPath } from "node:url";
|
|
6
|
+
import { createTempProjects } from "./helpers/tempProjects.js";
|
|
7
|
+
import { readPnpmLock } from "./readPnpmLock.js";
|
|
8
|
+
const fixtureLock = (scenario) => fileURLToPath(new URL(`../test/fixtures/${scenario}/pnpm-lock.yaml`, import.meta.url));
|
|
9
|
+
const projects = createTempProjects("pnpm-dedup-read-lock-");
|
|
10
|
+
afterEach(projects.cleanup);
|
|
11
|
+
const writeLock = (content) => {
|
|
12
|
+
const path = join(projects.create(), "pnpm-lock.yaml");
|
|
13
|
+
writeFileSync(path, content);
|
|
14
|
+
return path;
|
|
15
|
+
};
|
|
16
|
+
describe("readPnpmLock", () => {
|
|
17
|
+
it("returns the project document of a lockfile that also resolves the package manager", () => {
|
|
18
|
+
const lock = readPnpmLock(fixtureLock("package-manager-document"));
|
|
19
|
+
deepStrictEqual(Object.keys(lock.importers?.["."] ?? {}), ["dependencies"]);
|
|
20
|
+
const packageIds = Object.keys(lock.packages ?? {});
|
|
21
|
+
ok(packageIds.includes("printable-shell-command@5.0.7"));
|
|
22
|
+
ok(!packageIds.some((id) => id.startsWith("@pnpm/exe")));
|
|
23
|
+
});
|
|
24
|
+
it("reads the same project as the single-document lockfile", () => {
|
|
25
|
+
deepStrictEqual(readPnpmLock(fixtureLock("package-manager-document")), readPnpmLock(fixtureLock("duplicated-printable-shell-command")));
|
|
26
|
+
});
|
|
27
|
+
it("throws on malformed yaml", () => {
|
|
28
|
+
throws(() => readPnpmLock(writeLock("lockfileVersion: '9.0'\nimporters: [\n")), { name: "YAMLParseError" });
|
|
29
|
+
});
|
|
30
|
+
it("throws when only the package-manager document is present", () => {
|
|
31
|
+
const path = writeLock("lockfileVersion: '9.0'\n\nimporters:\n\n .:\n packageManagerDependencies:\n pnpm:\n specifier: ^12.0.0\n version: 12.10.1\n");
|
|
32
|
+
throws(() => readPnpmLock(path), {
|
|
33
|
+
message: `No project lockfile document found in ${path}`,
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
it("throws on an empty file", () => {
|
|
37
|
+
const path = writeLock("");
|
|
38
|
+
throws(() => readPnpmLock(path), {
|
|
39
|
+
message: `No project lockfile document found in ${path}`,
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
//# sourceMappingURL=readPnpmLock.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readPnpmLock.test.js","sourceRoot":"","sources":["../src/readPnpmLock.test.ts"],"names":[],"mappings":"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"}
|