@pnpm/hooks.read-package-hook 2.0.12 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,16 +4,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.createPeerDependencyPatcher = void 0;
7
- const matcher_1 = require("@pnpm/matcher");
7
+ const semver_1 = __importDefault(require("semver"));
8
8
  const isEmpty_1 = __importDefault(require("ramda/src/isEmpty"));
9
+ const error_1 = require("@pnpm/error");
10
+ const parse_overrides_1 = require("@pnpm/parse-overrides");
11
+ const matcher_1 = require("@pnpm/matcher");
12
+ const isSubRange_1 = require("./isSubRange");
9
13
  function createPeerDependencyPatcher(peerDependencyRules) {
10
14
  const ignoreMissingPatterns = [...new Set(peerDependencyRules.ignoreMissing ?? [])];
11
15
  const ignoreMissingMatcher = (0, matcher_1.createMatcher)(ignoreMissingPatterns);
12
16
  const allowAnyPatterns = [...new Set(peerDependencyRules.allowAny ?? [])];
13
17
  const allowAnyMatcher = (0, matcher_1.createMatcher)(allowAnyPatterns);
18
+ const { allowedVersionsMatchAll, allowedVersionsByParentPkgName } = parseAllowedVersions(peerDependencyRules.allowedVersions ?? {});
19
+ const _getAllowedVersionsByParentPkg = getAllowedVersionsByParentPkg.bind(null, allowedVersionsByParentPkgName);
14
20
  return ((pkg) => {
15
21
  if ((0, isEmpty_1.default)(pkg.peerDependencies))
16
22
  return pkg;
23
+ const allowedVersions = {
24
+ ...allowedVersionsMatchAll,
25
+ ..._getAllowedVersionsByParentPkg(pkg),
26
+ };
17
27
  for (const [peerName, peerVersion] of Object.entries(pkg.peerDependencies ?? {})) {
18
28
  if (ignoreMissingMatcher(peerName) &&
19
29
  !pkg.peerDependenciesMeta?.[peerName]?.optional) {
@@ -33,9 +43,8 @@ function createPeerDependencyPatcher(peerDependencyRules) {
33
43
  pkg.peerDependencies[peerName] = '*';
34
44
  continue;
35
45
  }
36
- const allowedVersions = parseVersions(peerDependencyRules.allowedVersions[peerName]);
37
46
  const currentVersions = parseVersions(pkg.peerDependencies[peerName]);
38
- allowedVersions.forEach(allowedVersion => {
47
+ allowedVersions[peerName].forEach(allowedVersion => {
39
48
  if (!currentVersions.includes(allowedVersion)) {
40
49
  currentVersions.push(allowedVersion);
41
50
  }
@@ -46,6 +55,52 @@ function createPeerDependencyPatcher(peerDependencyRules) {
46
55
  });
47
56
  }
48
57
  exports.createPeerDependencyPatcher = createPeerDependencyPatcher;
58
+ function parseAllowedVersions(allowedVersions) {
59
+ const overrides = tryParseAllowedVersions(allowedVersions);
60
+ const allowedVersionsMatchAll = {};
61
+ const allowedVersionsByParentPkgName = {};
62
+ for (const { parentPkg, targetPkg, newPref } of overrides) {
63
+ const ranges = parseVersions(newPref);
64
+ if (!parentPkg) {
65
+ allowedVersionsMatchAll[targetPkg.name] = ranges;
66
+ continue;
67
+ }
68
+ if (!allowedVersionsByParentPkgName[parentPkg.name]) {
69
+ allowedVersionsByParentPkgName[parentPkg.name] = [];
70
+ }
71
+ allowedVersionsByParentPkgName[parentPkg.name].push({
72
+ parentPkg,
73
+ targetPkg,
74
+ ranges,
75
+ });
76
+ }
77
+ return {
78
+ allowedVersionsMatchAll,
79
+ allowedVersionsByParentPkgName,
80
+ };
81
+ }
82
+ function tryParseAllowedVersions(allowedVersions) {
83
+ try {
84
+ return (0, parse_overrides_1.parseOverrides)(allowedVersions ?? {});
85
+ }
86
+ catch (err) {
87
+ throw new error_1.PnpmError('INVALID_ALLOWED_VERSION_SELECTOR', `${err.message} in pnpm.peerDependencyRules.allowedVersions`);
88
+ }
89
+ }
90
+ function getAllowedVersionsByParentPkg(allowedVersionsByParentPkgName, pkg) {
91
+ if (!pkg.name || !allowedVersionsByParentPkgName[pkg.name])
92
+ return {};
93
+ return allowedVersionsByParentPkgName[pkg.name]
94
+ .reduce((acc, { targetPkg, parentPkg, ranges }) => {
95
+ if (!pkg.peerDependencies[targetPkg.name])
96
+ return acc;
97
+ if (!parentPkg.pref || pkg.version &&
98
+ ((0, isSubRange_1.isSubRange)(parentPkg.pref, pkg.version) || semver_1.default.satisfies(pkg.version, parentPkg.pref))) {
99
+ acc[targetPkg.name] = ranges;
100
+ }
101
+ return acc;
102
+ }, {});
103
+ }
49
104
  function parseVersions(versions) {
50
105
  return versions.split('||').map(v => v.trim());
51
106
  }
@@ -1 +1 @@
1
- {"version":3,"file":"createPeerDependencyPatcher.js","sourceRoot":"","sources":["../src/createPeerDependencyPatcher.ts"],"names":[],"mappings":";;;;;;AACA,2CAA6C;AAC7C,gEAAuC;AAEvC,SAAgB,2BAA2B,CACzC,mBAAwC;IAExC,MAAM,qBAAqB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,mBAAmB,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAA;IACnF,MAAM,oBAAoB,GAAG,IAAA,uBAAa,EAAC,qBAAqB,CAAC,CAAA;IACjE,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,mBAAmB,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAA;IACzE,MAAM,eAAe,GAAG,IAAA,uBAAa,EAAC,gBAAgB,CAAC,CAAA;IACvD,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACd,IAAI,IAAA,iBAAO,EAAC,GAAG,CAAC,gBAAgB,CAAC;YAAE,OAAO,GAAG,CAAA;QAC7C,KAAK,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,EAAE;YAChF,IACE,oBAAoB,CAAC,QAAQ,CAAC;gBAC9B,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAC/C;gBACA,GAAG,CAAC,oBAAoB,GAAG,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAA;gBACzD,GAAG,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG;oBACnC,QAAQ,EAAE,IAAI;iBACf,CAAA;aACF;YACD,IAAI,eAAe,CAAC,QAAQ,CAAC,EAAE;gBAC7B,GAAG,CAAC,gBAAiB,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAA;gBACrC,SAAQ;aACT;YACD,IACE,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC;gBAChD,WAAW,KAAK,GAAG;gBACnB,SAAQ;YACV,IAAI,mBAAmB,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE;gBACzD,GAAG,CAAC,gBAAiB,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAA;gBACrC,SAAQ;aACT;YACD,MAAM,eAAe,GAAG,aAAa,CAAC,mBAAmB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAA;YACpF,MAAM,eAAe,GAAG,aAAa,CAAC,GAAG,CAAC,gBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAA;YAEtE,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;gBACvC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;oBAC7C,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;iBACrC;YACH,CAAC,CAAC,CAAA;YAEF,GAAG,CAAC,gBAAiB,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;SAC/D;QACD,OAAO,GAAG,CAAA;IACZ,CAAC,CAAoB,CAAA;AACvB,CAAC;AA5CD,kEA4CC;AAED,SAAS,aAAa,CAAE,QAAgB;IACtC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AAChD,CAAC"}
1
+ {"version":3,"file":"createPeerDependencyPatcher.js","sourceRoot":"","sources":["../src/createPeerDependencyPatcher.ts"],"names":[],"mappings":"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"}
@@ -5,12 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.createVersionsOverrider = void 0;
7
7
  const path_1 = __importDefault(require("path"));
8
+ const semver_1 = __importDefault(require("semver"));
8
9
  const partition_1 = __importDefault(require("ramda/src/partition"));
10
+ const error_1 = require("@pnpm/error");
9
11
  const parse_overrides_1 = require("@pnpm/parse-overrides");
10
12
  const normalize_path_1 = __importDefault(require("normalize-path"));
11
- const semver_1 = __importDefault(require("semver"));
13
+ const isSubRange_1 = require("./isSubRange");
12
14
  function createVersionsOverrider(overrides, rootDir) {
13
- const [versionOverrides, genericVersionOverrides] = (0, partition_1.default)(({ parentPkg }) => parentPkg != null, (0, parse_overrides_1.parseOverrides)(overrides)
15
+ const parsedOverrides = tryParseOverrides(overrides);
16
+ const [versionOverrides, genericVersionOverrides] = (0, partition_1.default)(({ parentPkg }) => parentPkg != null, parsedOverrides
14
17
  .map((override) => {
15
18
  let linkTarget;
16
19
  if (override.newPref.startsWith('link:')) {
@@ -36,6 +39,14 @@ function createVersionsOverrider(overrides, rootDir) {
36
39
  });
37
40
  }
38
41
  exports.createVersionsOverrider = createVersionsOverrider;
42
+ function tryParseOverrides(overrides) {
43
+ try {
44
+ return (0, parse_overrides_1.parseOverrides)(overrides);
45
+ }
46
+ catch (e) {
47
+ throw new error_1.PnpmError('INVALID_OVERRIDES_SELECTOR', `${e.message} in pnpm.overrides`);
48
+ }
49
+ }
39
50
  function overrideDepsOfPkg({ manifest, dir }, versionOverrides) {
40
51
  if (manifest.dependencies != null)
41
52
  overrideDeps(versionOverrides, manifest.dependencies, dir);
@@ -50,7 +61,7 @@ function overrideDeps(versionOverrides, deps, dir) {
50
61
  const actual = deps[versionOverride.targetPkg.name];
51
62
  if (actual == null)
52
63
  continue;
53
- if (!isSubRange(versionOverride.targetPkg.pref, actual))
64
+ if (!(0, isSubRange_1.isSubRange)(versionOverride.targetPkg.pref, actual))
54
65
  continue;
55
66
  if (versionOverride.linkTarget && dir) {
56
67
  deps[versionOverride.targetPkg.name] = `link:${(0, normalize_path_1.default)(path_1.default.relative(dir, versionOverride.linkTarget))}`;
@@ -63,11 +74,4 @@ function overrideDeps(versionOverrides, deps, dir) {
63
74
  deps[versionOverride.targetPkg.name] = versionOverride.newPref;
64
75
  }
65
76
  }
66
- function isSubRange(superRange, subRange) {
67
- return !superRange ||
68
- subRange === superRange ||
69
- semver_1.default.validRange(subRange) != null &&
70
- semver_1.default.validRange(superRange) != null &&
71
- semver_1.default.subset(subRange, superRange);
72
- }
73
77
  //# sourceMappingURL=createVersionsOverrider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../src/createVersionsOverrider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../src/createVersionsOverrider.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export declare function isSubRange(superRange: string | undefined, subRange: string): boolean;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.isSubRange = void 0;
7
+ const semver_1 = __importDefault(require("semver"));
8
+ function isSubRange(superRange, subRange) {
9
+ return !superRange ||
10
+ subRange === superRange ||
11
+ semver_1.default.validRange(subRange) != null &&
12
+ semver_1.default.validRange(superRange) != null &&
13
+ semver_1.default.subset(subRange, superRange);
14
+ }
15
+ exports.isSubRange = isSubRange;
16
+ //# sourceMappingURL=isSubRange.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"isSubRange.js","sourceRoot":"","sources":["../src/isSubRange.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAE3B,SAAgB,UAAU,CAAE,UAA8B,EAAE,QAAgB;IAC1E,OAAO,CAAC,UAAU;QAClB,QAAQ,KAAK,UAAU;QACvB,gBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,IAAI;YACnC,gBAAM,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI;YACrC,gBAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;AACrC,CAAC;AAND,gCAMC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnpm/hooks.read-package-hook",
3
- "version": "2.0.12",
3
+ "version": "2.1.0",
4
4
  "description": "Creates the default package reader hook used by pnpm",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -25,6 +25,7 @@
25
25
  "normalize-path": "^3.0.0",
26
26
  "ramda": "npm:@pnpm/ramda@0.28.1",
27
27
  "semver": "^7.3.8",
28
+ "@pnpm/error": "4.0.1",
28
29
  "@pnpm/matcher": "4.0.1",
29
30
  "@pnpm/parse-overrides": "3.0.3",
30
31
  "@pnpm/parse-wanted-dependency": "4.1.0",
@@ -35,14 +36,14 @@
35
36
  "@types/ramda": "0.28.20",
36
37
  "@types/semver": "7.3.13",
37
38
  "@yarnpkg/core": "4.0.0-rc.27",
38
- "@pnpm/hooks.read-package-hook": "2.0.12"
39
+ "@pnpm/hooks.read-package-hook": "2.1.0"
39
40
  },
40
41
  "funding": "https://opencollective.com/pnpm",
41
42
  "exports": {
42
43
  ".": "./lib/index.js"
43
44
  },
44
45
  "scripts": {
45
- "lint": "eslint src/**/*.ts test/**/*.ts",
46
+ "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
46
47
  "_test": "jest",
47
48
  "test": "pnpm run compile && pnpm run _test",
48
49
  "compile": "tsc --build && pnpm run lint --fix"