@pnpm/plugin-commands-installation 7.3.2 → 7.4.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.
File without changes
@@ -1,4 +1,23 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
14
+ var __importStar = (this && this.__importStar) || function (mod) {
15
+ if (mod && mod.__esModule) return mod;
16
+ var result = {};
17
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
+ __setModuleDefault(result, mod);
19
+ return result;
20
+ };
2
21
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
22
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
23
  };
@@ -19,8 +38,16 @@ const rimraf_1 = __importDefault(require("@zkochan/rimraf"));
19
38
  const load_json_file_1 = __importDefault(require("load-json-file"));
20
39
  const render_help_1 = __importDefault(require("render-help"));
21
40
  const lockfile_1 = require("@yarnpkg/lockfile");
41
+ const yarnCore = __importStar(require("@yarnpkg/core"));
42
+ const parsers_1 = require("@yarnpkg/parsers");
22
43
  const path_exists_1 = __importDefault(require("path-exists"));
23
- const recursive_1 = __importDefault(require("./recursive"));
44
+ const recursive_1 = __importDefault(require("../recursive"));
45
+ const yarnUtil_1 = require("./yarnUtil");
46
+ var YarnLockType;
47
+ (function (YarnLockType) {
48
+ YarnLockType["yarn"] = "yarn";
49
+ YarnLockType["yarn2"] = "yarn2";
50
+ })(YarnLockType || (YarnLockType = {}));
24
51
  exports.rcOptionsTypes = cliOptionsTypes;
25
52
  function cliOptionsTypes() {
26
53
  return {};
@@ -99,12 +126,22 @@ exports.handler = handler;
99
126
  async function readYarnLockFile(dir) {
100
127
  try {
101
128
  const yarnLockFile = await graceful_fs_1.default.readFile(path_1.default.join(dir, 'yarn.lock'), 'utf8');
102
- const lockJsonFile = await (0, lockfile_1.parse)(yarnLockFile);
103
- if (lockJsonFile.type === 'success') {
104
- return lockJsonFile.object;
129
+ let lockJsonFile;
130
+ const yarnLockFileType = getYarnLockfileType(yarnLockFile);
131
+ if (yarnLockFileType === YarnLockType.yarn) {
132
+ lockJsonFile = await (0, lockfile_1.parse)(yarnLockFile);
133
+ if (lockJsonFile.type === 'success') {
134
+ return lockJsonFile.object;
135
+ }
136
+ else {
137
+ throw new error_1.default('YARN_LOCKFILE_PARSE_FAILED', `Yarn.lock file was ${lockJsonFile.type}`);
138
+ }
105
139
  }
106
- else {
107
- throw new error_1.default('GET_YARN_LOCKFILE_ERR', `Failed With ${lockJsonFile.type}`);
140
+ else if (yarnLockFileType === YarnLockType.yarn2) {
141
+ lockJsonFile = parseYarn2Lock(yarnLockFile);
142
+ if (lockJsonFile.type === YarnLockType.yarn2) {
143
+ return lockJsonFile.object;
144
+ }
108
145
  }
109
146
  }
110
147
  catch (err) { // eslint-disable-line
@@ -113,6 +150,26 @@ async function readYarnLockFile(dir) {
113
150
  }
114
151
  throw new error_1.default('YARN_LOCKFILE_NOT_FOUND', 'No yarn.lock found');
115
152
  }
153
+ function parseYarn2Lock(lockFileContents) {
154
+ // eslint-disable-next-line
155
+ const parseYarnLock = (0, parsers_1.parseSyml)(lockFileContents);
156
+ delete parseYarnLock.__metadata;
157
+ const dependencies = {};
158
+ const { structUtils } = yarnCore;
159
+ const { parseDescriptor, parseRange } = structUtils;
160
+ const keyNormalizer = (0, yarnUtil_1.yarnLockFileKeyNormalizer)(parseDescriptor, parseRange);
161
+ Object.entries(parseYarnLock).forEach(
162
+ // eslint-disable-next-line
163
+ ([fullDescriptor, versionData]) => {
164
+ keyNormalizer(fullDescriptor).forEach((descriptor) => {
165
+ dependencies[descriptor] = versionData;
166
+ });
167
+ });
168
+ return {
169
+ object: dependencies,
170
+ type: YarnLockType.yarn2,
171
+ };
172
+ }
116
173
  async function readNpmLockfile(dir) {
117
174
  try {
118
175
  return await (0, load_json_file_1.default)(path_1.default.join(dir, 'package-lock.json'));
@@ -168,4 +225,9 @@ function selectProjectByDir(projects, searchedDir) {
168
225
  return undefined;
169
226
  return { [searchedDir]: { dependencies: [], package: project } };
170
227
  }
171
- //# sourceMappingURL=import.js.map
228
+ function getYarnLockfileType(lockFileContents) {
229
+ return lockFileContents.includes('__metadata')
230
+ ? YarnLockType.yarn2
231
+ : YarnLockType.yarn;
232
+ }
233
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/import/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,8 @@
1
+ /**
2
+ * https://github.com/snyk/nodejs-lockfile-parser/blob/master/lib/parsers/yarn-utils.ts
3
+ */
4
+ import { structUtils } from '@yarnpkg/core';
5
+ export declare type ParseDescriptor = typeof structUtils.parseDescriptor;
6
+ export declare type ParseRange = typeof structUtils.parseRange;
7
+ export declare type YarnLockFileKeyNormalizer = (fullDescriptor: string) => Set<string>;
8
+ export declare const yarnLockFileKeyNormalizer: (parseDescriptor: ParseDescriptor, parseRange: ParseRange) => YarnLockFileKeyNormalizer;
@@ -0,0 +1,71 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.yarnLockFileKeyNormalizer = void 0;
4
+ const BUILTIN_PLACEHOLDER = 'builtin';
5
+ const MULTIPLE_KEYS_REGEXP = / *, */g;
6
+ const keyNormalizer = (parseDescriptor, parseRange) => (rawDescriptor) => {
7
+ // See https://yarnpkg.com/features/protocols
8
+ const descriptors = [rawDescriptor];
9
+ const descriptor = parseDescriptor(rawDescriptor);
10
+ const name = `${descriptor.scope ? '@' + descriptor.scope + '/' : ''}${descriptor.name}`;
11
+ const range = parseRange(descriptor.range);
12
+ const protocol = range.protocol;
13
+ switch (protocol) {
14
+ case 'npm:':
15
+ case 'file:':
16
+ descriptors.push(`${name}@${range.selector}`);
17
+ descriptors.push(`${name}@${protocol}${range.selector}`);
18
+ break;
19
+ case 'git:':
20
+ case 'git+ssh:':
21
+ case 'git+http:':
22
+ case 'git+https:':
23
+ case 'github:':
24
+ if (range.source) {
25
+ descriptors.push(`${name}@${protocol}${range.source}${range.selector ? '#' + range.selector : ''}`);
26
+ }
27
+ else {
28
+ descriptors.push(`${name}@${protocol}${range.selector}`);
29
+ }
30
+ break;
31
+ case 'patch:':
32
+ if (range.source && range.selector.indexOf(BUILTIN_PLACEHOLDER) === 0) {
33
+ descriptors.push(range.source);
34
+ }
35
+ else {
36
+ descriptors.push(
37
+ // eslint-disable-next-line
38
+ `${name}@${protocol}${range.source}${range.selector ? '#' + range.selector : ''}`);
39
+ }
40
+ break;
41
+ case null:
42
+ case undefined:
43
+ if (range.source) {
44
+ descriptors.push(`${name}@${range.source}#${range.selector}`);
45
+ }
46
+ else {
47
+ descriptors.push(`${name}@${range.selector}`);
48
+ }
49
+ break;
50
+ case 'http:':
51
+ case 'https:':
52
+ case 'link:':
53
+ case 'portal:':
54
+ case 'exec:':
55
+ case 'workspace:':
56
+ case 'virtual:':
57
+ default:
58
+ // For user defined plugins
59
+ descriptors.push(`${name}@${protocol}${range.selector}`);
60
+ break;
61
+ }
62
+ return descriptors;
63
+ };
64
+ const yarnLockFileKeyNormalizer = (parseDescriptor, parseRange) => (fullDescriptor) => {
65
+ const allKeys = fullDescriptor
66
+ .split(MULTIPLE_KEYS_REGEXP)
67
+ .map(keyNormalizer(parseDescriptor, parseRange));
68
+ return new Set(allKeys.flat(5));
69
+ };
70
+ exports.yarnLockFileKeyNormalizer = yarnLockFileKeyNormalizer;
71
+ //# sourceMappingURL=yarnUtil.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"yarnUtil.js","sourceRoot":"","sources":["../../src/import/yarnUtil.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnpm/plugin-commands-installation",
3
- "version": "7.3.2",
3
+ "version": "7.4.0",
4
4
  "description": "Commands for installation",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -47,7 +47,7 @@
47
47
  "write-yaml-file": "^4.2.0"
48
48
  },
49
49
  "dependencies": {
50
- "@pnpm/cli-utils": "0.6.33",
50
+ "@pnpm/cli-utils": "0.6.34",
51
51
  "@pnpm/colorize-semver-diff": "^1.0.1",
52
52
  "@pnpm/command": "2.0.0",
53
53
  "@pnpm/common-cli-options-help": "0.7.1",
@@ -55,23 +55,25 @@
55
55
  "@pnpm/constants": "5.0.0",
56
56
  "@pnpm/core": "1.3.2",
57
57
  "@pnpm/error": "2.0.0",
58
- "@pnpm/filter-workspace-packages": "4.4.5",
58
+ "@pnpm/filter-workspace-packages": "4.4.6",
59
59
  "@pnpm/find-workspace-dir": "3.0.1",
60
- "@pnpm/find-workspace-packages": "3.1.25",
60
+ "@pnpm/find-workspace-packages": "3.1.26",
61
61
  "@pnpm/graceful-fs": "1.0.0",
62
62
  "@pnpm/manifest-utils": "2.1.2",
63
- "@pnpm/outdated": "9.0.17",
63
+ "@pnpm/outdated": "9.0.18",
64
64
  "@pnpm/package-store": "12.1.3",
65
65
  "@pnpm/parse-wanted-dependency": "2.0.0",
66
- "@pnpm/plugin-commands-rebuild": "5.3.1",
66
+ "@pnpm/plugin-commands-rebuild": "5.3.2",
67
67
  "@pnpm/pnpmfile": "1.2.0",
68
68
  "@pnpm/read-project-manifest": "2.0.7",
69
69
  "@pnpm/resolver-base": "8.1.1",
70
70
  "@pnpm/semver-diff": "^1.0.2",
71
71
  "@pnpm/sort-packages": "2.1.3",
72
- "@pnpm/store-connection-manager": "3.1.10",
72
+ "@pnpm/store-connection-manager": "3.1.11",
73
73
  "@pnpm/types": "7.6.0",
74
+ "@yarnpkg/core": "^3.2.0-rc.4",
74
75
  "@yarnpkg/lockfile": "^1.1.0",
76
+ "@yarnpkg/parsers": "^2.5.0-rc.3",
75
77
  "@zkochan/rimraf": "^2.1.1",
76
78
  "@zkochan/table": "^1.0.0",
77
79
  "@zkochan/which": "^2.0.3",
@@ -96,6 +98,7 @@
96
98
  },
97
99
  "funding": "https://opencollective.com/pnpm",
98
100
  "scripts": {
101
+ "start": "pnpm tsc --watch",
99
102
  "lint": "eslint src/**/*.ts test/**/*.ts",
100
103
  "registry-mock": "registry-mock",
101
104
  "test:jest": "jest",
package/lib/import.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"import.js","sourceRoot":"","sources":["../src/import.ts"],"names":[],"mappings":"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"}