snyk-nodejs-lockfile-parser 1.58.2 → 1.58.4
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/dep-graph-builders/npm-lock-v2/extract-npm-lock-v2-pkgs.d.ts +1 -0
- package/dist/dep-graph-builders/npm-lock-v2/extract-npm-lock-v2-pkgs.js.map +1 -1
- package/dist/dep-graph-builders/npm-lock-v2/index.js +27 -8
- package/dist/dep-graph-builders/npm-lock-v2/index.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js +6 -5
- package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.d.ts +4 -2
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js +54 -2
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/parse-project.js +6 -0
- package/dist/dep-graph-builders/pnpm/parse-project.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/parse-workspace.js +4 -2
- package/dist/dep-graph-builders/pnpm/parse-workspace.js.map +1 -1
- package/dist/dep-graph-builders/types.d.ts +6 -2
- package/dist/dep-graph-builders/util.d.ts +2 -1
- package/dist/dep-graph-builders/util.js +2 -2
- package/dist/dep-graph-builders/util.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v2/utils.d.ts +1 -0
- package/package.json +1 -1
|
@@ -4,6 +4,7 @@ export declare type NpmLockPkg = {
|
|
|
4
4
|
dependencies?: Record<string, string>;
|
|
5
5
|
devDependencies?: Record<string, string>;
|
|
6
6
|
optionalDependencies?: Record<string, string>;
|
|
7
|
+
peerDependencies?: Record<string, string>;
|
|
7
8
|
dev?: boolean;
|
|
8
9
|
optional?: boolean;
|
|
9
10
|
resolved?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-npm-lock-v2-pkgs.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/npm-lock-v2/extract-npm-lock-v2-pkgs.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"extract-npm-lock-v2-pkgs.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/npm-lock-v2/extract-npm-lock-v2-pkgs.ts"],"names":[],"mappings":";;;AAgBO,MAAM,wBAAwB,GAAG,CACtC,cAAsB,EACM,EAAE;IAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC;AAC7C,CAAC,CAAC;AAJW,QAAA,wBAAwB,4BAInC"}
|
|
@@ -52,17 +52,17 @@ const buildDepGraphNpmLockV2 = async (npmLockPkgs, pkgJson, options) => {
|
|
|
52
52
|
return acc;
|
|
53
53
|
}, new Map());
|
|
54
54
|
const visitedMap = new Set();
|
|
55
|
-
await dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [], pkgKeysByName, pkgJson.overrides);
|
|
55
|
+
await dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, true, [], pkgKeysByName, pkgJson.overrides);
|
|
56
56
|
return depGraphBuilder.build();
|
|
57
57
|
};
|
|
58
58
|
exports.buildDepGraphNpmLockV2 = buildDepGraphNpmLockV2;
|
|
59
|
-
const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName, overrides) => {
|
|
59
|
+
const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, includePeerDeps, ancestry, pkgKeysByName, overrides) => {
|
|
60
60
|
visitedMap.add(node.id);
|
|
61
61
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
62
62
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
63
63
|
await event_loop_spinner_1.eventLoopSpinner.spin();
|
|
64
64
|
}
|
|
65
|
-
const childNode = getChildNode(name, depInfo, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [
|
|
65
|
+
const childNode = getChildNode(name, depInfo, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, includePeerDeps, [
|
|
66
66
|
...ancestry,
|
|
67
67
|
{
|
|
68
68
|
name: node.name,
|
|
@@ -71,9 +71,12 @@ const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOu
|
|
|
71
71
|
inBundle: node.inBundle || false,
|
|
72
72
|
},
|
|
73
73
|
], pkgKeysByName, overrides);
|
|
74
|
+
if (!childNode) {
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
74
77
|
if (!visitedMap.has(childNode.id)) {
|
|
75
78
|
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {});
|
|
76
|
-
await dfsVisit(depGraphBuilder, childNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [
|
|
79
|
+
await dfsVisit(depGraphBuilder, childNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, includePeerDeps, [
|
|
77
80
|
...ancestry,
|
|
78
81
|
{
|
|
79
82
|
name: node.name,
|
|
@@ -86,7 +89,7 @@ const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOu
|
|
|
86
89
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
87
90
|
}
|
|
88
91
|
};
|
|
89
|
-
const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName, overrides) => {
|
|
92
|
+
const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, includePeerDeps, ancestry, pkgKeysByName, overrides) => {
|
|
90
93
|
let version = depInfo.version;
|
|
91
94
|
const override = overrides &&
|
|
92
95
|
checkOverrides([...ancestry, { name, version }], overrides);
|
|
@@ -98,7 +101,14 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, incl
|
|
|
98
101
|
}
|
|
99
102
|
let childNodeKey = (0, exports.getChildNodeKey)(name, version, ancestry, pkgs, pkgKeysByName);
|
|
100
103
|
if (!childNodeKey) {
|
|
101
|
-
|
|
104
|
+
// If it is a peerdep and is not in lockfile then...
|
|
105
|
+
// Ignore the dependency as it has not been installed by the developer,
|
|
106
|
+
// if these dependencies are wanted in the parsing, then they should be locked
|
|
107
|
+
// in the lockfile
|
|
108
|
+
if (depInfo.isPeer) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
else if (strictOutOfSync) {
|
|
102
112
|
throw new errors_1.OutOfSyncError(`${name}@${depInfo.version}`, parsers_1.LockfileType.npm);
|
|
103
113
|
}
|
|
104
114
|
else {
|
|
@@ -143,11 +153,14 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, incl
|
|
|
143
153
|
const optionalDependencies = includeOptionalDeps
|
|
144
154
|
? (0, util_1.getGraphDependencies)(depData.optionalDependencies || {}, depInfo.isDev)
|
|
145
155
|
: {};
|
|
156
|
+
const peerDeps = includePeerDeps
|
|
157
|
+
? (0, util_1.getGraphDependencies)(depData.peerDependencies || {}, depInfo.isDev, true)
|
|
158
|
+
: {};
|
|
146
159
|
return {
|
|
147
160
|
id: `${name}@${depData.version}`,
|
|
148
161
|
name: name,
|
|
149
162
|
version: depData.version,
|
|
150
|
-
dependencies: Object.assign(Object.assign(Object.assign({}, dependencies), devDependencies), optionalDependencies),
|
|
163
|
+
dependencies: Object.assign(Object.assign(Object.assign(Object.assign({}, dependencies), devDependencies), optionalDependencies), peerDeps),
|
|
151
164
|
isDev: depInfo.isDev,
|
|
152
165
|
inBundle: depData.inBundle,
|
|
153
166
|
key: childNodeKey,
|
|
@@ -160,8 +173,14 @@ const getChildNodeKey = (name, version, ancestry, pkgs, pkgKeysByName) => {
|
|
|
160
173
|
if (!candidateKeys) {
|
|
161
174
|
return undefined;
|
|
162
175
|
}
|
|
163
|
-
// If we only have one candidate then we just take it
|
|
176
|
+
// If we only have one candidate then we just take it...
|
|
164
177
|
if (candidateKeys.length === 1) {
|
|
178
|
+
// ... though we should still check if the version is viable
|
|
179
|
+
if (semver.validRange(version) &&
|
|
180
|
+
pkgs[candidateKeys[0]].version &&
|
|
181
|
+
!semver.satisfies(pkgs[candidateKeys[0]].version, version)) {
|
|
182
|
+
return undefined;
|
|
183
|
+
}
|
|
165
184
|
return candidateKeys[0];
|
|
166
185
|
}
|
|
167
186
|
// If we are bundled we assume we are scoped by the bundle root at least
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/npm-lock-v2/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/npm-lock-v2/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const buildDepGraphPnpm = async (lockFileParser, pkgJson, options, importer) =>
|
|
|
12
12
|
lockFileParser.extractedPackages = lockFileParser.extractPackages();
|
|
13
13
|
const extractedPnpmPkgs = lockFileParser.extractedPackages;
|
|
14
14
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, options);
|
|
15
|
-
const extractedTopLevelDeps = lockFileParser.extractTopLevelDependencies(options, importer) || {};
|
|
15
|
+
const extractedTopLevelDeps = lockFileParser.extractTopLevelDependencies(options, pkgJson.name, pkgJson.version, importer) || {};
|
|
16
16
|
for (const name of Object.keys(topLevelDeps)) {
|
|
17
17
|
topLevelDeps[name].version = extractedTopLevelDeps[name].version;
|
|
18
18
|
}
|
|
@@ -23,7 +23,8 @@ const buildDepGraphPnpm = async (lockFileParser, pkgJson, options, importer) =>
|
|
|
23
23
|
dependencies: topLevelDeps,
|
|
24
24
|
isDev: false,
|
|
25
25
|
};
|
|
26
|
-
|
|
26
|
+
const rootNodeId = `${pkgJson.name}@${pkgJson.version}`;
|
|
27
|
+
await dfsVisit(depGraphBuilder, rootNodeId, rootNode, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, ((_a = pkgJson.pnpm) === null || _a === void 0 ? void 0 : _a.overrides) || {}, pruneWithinTopLevelDeps, lockFileParser);
|
|
27
28
|
return depGraphBuilder.build();
|
|
28
29
|
};
|
|
29
30
|
exports.buildDepGraphPnpm = buildDepGraphPnpm;
|
|
@@ -33,14 +34,14 @@ exports.buildDepGraphPnpm = buildDepGraphPnpm;
|
|
|
33
34
|
* - If a node doesn't exist in the map, it means it hasn't been visited.
|
|
34
35
|
* - If a node is already visited, simply connect the new node with this node.
|
|
35
36
|
*/
|
|
36
|
-
const dfsVisit = async (depGraphBuilder, node, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, overrides, pruneWithinTopLevel, lockFileParser, visited) => {
|
|
37
|
+
const dfsVisit = async (depGraphBuilder, rootNodeId, node, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, overrides, pruneWithinTopLevel, lockFileParser, visited) => {
|
|
37
38
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
38
39
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
39
40
|
await event_loop_spinner_1.eventLoopSpinner.spin();
|
|
40
41
|
}
|
|
41
42
|
const localVisited = visited || new Set();
|
|
42
43
|
const childNode = (0, utils_1.getPnpmChildNode)(name, depInfo, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, lockFileParser);
|
|
43
|
-
if (localVisited.has(childNode.id)) {
|
|
44
|
+
if (localVisited.has(childNode.id) || childNode.id == rootNodeId) {
|
|
44
45
|
if (pruneWithinTopLevel) {
|
|
45
46
|
const prunedId = `${childNode.id}:pruned`;
|
|
46
47
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, prunedId, {
|
|
@@ -62,7 +63,7 @@ const dfsVisit = async (depGraphBuilder, node, extractedPnpmPkgs, strictOutOfSyn
|
|
|
62
63
|
});
|
|
63
64
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
64
65
|
localVisited.add(childNode.id);
|
|
65
|
-
await dfsVisit(depGraphBuilder, childNode, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, overrides, pruneWithinTopLevel, lockFileParser, localVisited);
|
|
66
|
+
await dfsVisit(depGraphBuilder, rootNodeId, childNode, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, overrides, pruneWithinTopLevel, lockFileParser, localVisited);
|
|
66
67
|
}
|
|
67
68
|
};
|
|
68
69
|
//# sourceMappingURL=build-dep-graph-pnpm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-dep-graph-pnpm.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/build-dep-graph-pnpm.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAA0C;AAG1C,mCAA2C;AAC3C,2DAAsD;AAI/C,MAAM,iBAAiB,GAAG,KAAK,EACpC,cAAkC,EAClC,OAAwB,EACxB,OAAgC,EAChC,QAAiB,EACjB,EAAE;;IACF,MAAM,EACJ,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,uBAAuB,GACxB,GAAG,OAAO,CAAC;IAEZ,MAAM,eAAe,GAAG,IAAI,2BAAe,CACzC,EAAE,IAAI,EAAE,MAAM,EAAE,EAChB,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CACjD,CAAC;IAEF,cAAc,CAAC,iBAAiB,GAAG,cAAc,CAAC,eAAe,EAAE,CAAC;IAEpE,MAAM,iBAAiB,GACrB,cAAc,CAAC,iBAAiB,CAAC;IAEnC,MAAM,YAAY,GAAG,IAAA,sBAAe,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEvD,MAAM,qBAAqB,GACzB,cAAc,CAAC,2BAA2B,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"build-dep-graph-pnpm.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/build-dep-graph-pnpm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PnpmWorkspaceArgs } from '../../types';
|
|
2
|
-
import { NormalisedPnpmPkgs, ParsedDepPath, PnpmDepPath, PnpmDeps, PnpmImporters, PnpmLockPkg } from '../types';
|
|
2
|
+
import { NormalisedPnpmPkg, NormalisedPnpmPkgs, ParsedDepPath, PnpmDepPath, PnpmDeps, PnpmImporters, PnpmLockPkg } from '../types';
|
|
3
3
|
export declare abstract class PnpmLockfileParser {
|
|
4
4
|
lockFileVersion: string;
|
|
5
5
|
rawPnpmLock: any;
|
|
@@ -14,7 +14,9 @@ export declare abstract class PnpmLockfileParser {
|
|
|
14
14
|
includeDevDeps: boolean;
|
|
15
15
|
includeOptionalDeps?: boolean;
|
|
16
16
|
includePeerDeps?: boolean;
|
|
17
|
-
}, importer?: string): PnpmDeps;
|
|
17
|
+
}, pkgName: string, pkgVersion: string, importer?: string): PnpmDeps;
|
|
18
|
+
normalizedPkgToTopLevel(pkg: NormalisedPnpmPkg): PnpmDeps;
|
|
19
|
+
topLevelDepsToNormalizedPkgs(deps: PnpmDeps): Record<string, string>;
|
|
18
20
|
normalizeVersion(name: string, version: string, isDev: boolean, importerName?: string): string;
|
|
19
21
|
resolveWorkspacesCrossReference(name: string, version: string, isDev: boolean, importerName?: string): string;
|
|
20
22
|
abstract normalizePackagesDeps(dependencies: any, isDev: any, importerName?: any): Record<string, string>;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PnpmLockfileParser = void 0;
|
|
4
4
|
const semver_1 = require("semver");
|
|
5
5
|
const pathUtil = require("path");
|
|
6
|
+
const lodash_1 = require("lodash");
|
|
6
7
|
class PnpmLockfileParser {
|
|
7
8
|
constructor(rawPnpmLock, workspaceArgs) {
|
|
8
9
|
this.rawPnpmLock = rawPnpmLock;
|
|
@@ -42,9 +43,16 @@ class PnpmLockfileParser {
|
|
|
42
43
|
});
|
|
43
44
|
return packages;
|
|
44
45
|
}
|
|
45
|
-
extractTopLevelDependencies(options, importer) {
|
|
46
|
+
extractTopLevelDependencies(options, pkgName, pkgVersion, importer) {
|
|
46
47
|
let root = this.rawPnpmLock;
|
|
47
48
|
if (importer) {
|
|
49
|
+
if (
|
|
50
|
+
// Return early because dependencies were already normalized for this importer
|
|
51
|
+
// as part of another's importer dependency and stored in extractedPackages
|
|
52
|
+
this.extractedPackages[`${pkgName}@${pkgVersion}`] &&
|
|
53
|
+
!(0, lodash_1.isEmpty)(this.extractedPackages[`${pkgName}@${pkgVersion}`].dependencies)) {
|
|
54
|
+
return this.normalizedPkgToTopLevel(this.extractedPackages[`${pkgName}@${pkgVersion}`]);
|
|
55
|
+
}
|
|
48
56
|
root = this.rawPnpmLock.importers[importer];
|
|
49
57
|
}
|
|
50
58
|
const prodDeps = this.normalizeTopLevelDeps(root.dependencies || {}, false, importer);
|
|
@@ -57,8 +65,38 @@ class PnpmLockfileParser {
|
|
|
57
65
|
const peerDeps = options.includePeerDeps
|
|
58
66
|
? this.normalizeTopLevelDeps(root.peerDependencies || {}, false, importer)
|
|
59
67
|
: {};
|
|
68
|
+
if (importer) {
|
|
69
|
+
this.extractedPackages[`${pkgName}@${pkgVersion}`] = {
|
|
70
|
+
id: `${pkgName}@${pkgVersion}`,
|
|
71
|
+
name: pkgName,
|
|
72
|
+
version: pkgVersion,
|
|
73
|
+
dependencies: this.topLevelDepsToNormalizedPkgs(prodDeps),
|
|
74
|
+
devDependencies: this.topLevelDepsToNormalizedPkgs(devDeps),
|
|
75
|
+
optionalDependencies: this.topLevelDepsToNormalizedPkgs(optionalDeps),
|
|
76
|
+
isDev: false,
|
|
77
|
+
};
|
|
78
|
+
}
|
|
60
79
|
return Object.assign(Object.assign(Object.assign(Object.assign({}, prodDeps), devDeps), optionalDeps), peerDeps);
|
|
61
80
|
}
|
|
81
|
+
normalizedPkgToTopLevel(pkg) {
|
|
82
|
+
const topLevel = {};
|
|
83
|
+
Object.keys(pkg.dependencies).forEach((depName) => (topLevel[depName] = {
|
|
84
|
+
name: depName,
|
|
85
|
+
version: pkg.dependencies[depName],
|
|
86
|
+
isDev: false,
|
|
87
|
+
}));
|
|
88
|
+
Object.keys(pkg.devDependencies).forEach((depName) => (topLevel[depName] = {
|
|
89
|
+
name: depName,
|
|
90
|
+
version: pkg.dependencies[depName],
|
|
91
|
+
isDev: false,
|
|
92
|
+
}));
|
|
93
|
+
return topLevel;
|
|
94
|
+
}
|
|
95
|
+
topLevelDepsToNormalizedPkgs(deps) {
|
|
96
|
+
const normalizedPkgs = {};
|
|
97
|
+
Object.values(deps).forEach((dep) => (normalizedPkgs[dep.name] = dep.version));
|
|
98
|
+
return normalizedPkgs;
|
|
99
|
+
}
|
|
62
100
|
normalizeVersion(name, version, isDev, importerName) {
|
|
63
101
|
if (this.isWorkspaceLockfile()) {
|
|
64
102
|
version = this.resolveWorkspacesCrossReference(name, version, isDev, importerName);
|
|
@@ -93,10 +131,24 @@ class PnpmLockfileParser {
|
|
|
93
131
|
.join(importerName || '.', depPath)
|
|
94
132
|
.replace(/\\/g, '/');
|
|
95
133
|
// cross referenced package, we add it to the extracted packages
|
|
96
|
-
version = this.workspaceArgs.projectsVersionMap[resolvedPathDep];
|
|
134
|
+
version = this.workspaceArgs.projectsVersionMap[resolvedPathDep].version;
|
|
97
135
|
if (!version) {
|
|
98
136
|
version = 'undefined';
|
|
99
137
|
}
|
|
138
|
+
// Stop recursion here if this package was already normalized and stored in extractedPackages
|
|
139
|
+
if (this.extractedPackages[`${name}@${version}`]) {
|
|
140
|
+
return version;
|
|
141
|
+
}
|
|
142
|
+
// Initialize this package before recursive calls to avoid inifinte recursion in cycles
|
|
143
|
+
// We can avoid keeping a visited arrat this way
|
|
144
|
+
this.extractedPackages[`${name}@${version}`] = {
|
|
145
|
+
name,
|
|
146
|
+
version,
|
|
147
|
+
id: `${name}@${version}`,
|
|
148
|
+
isDev,
|
|
149
|
+
dependencies: {},
|
|
150
|
+
devDependencies: {},
|
|
151
|
+
};
|
|
100
152
|
const subDeps = this.rawPnpmLock.importers[resolvedPathDep] || {
|
|
101
153
|
dependencies: {},
|
|
102
154
|
devDependencies: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfile-parser.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"lockfile-parser.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,12 @@ const parsePnpmProject = async (pkgJsonContent, pnpmLockContent, options, lockfi
|
|
|
12
12
|
// Lockfile V9 simple project has the root importer
|
|
13
13
|
if (lockFileParser.lockFileVersion.startsWith('9')) {
|
|
14
14
|
importer = '.';
|
|
15
|
+
lockFileParser.workspaceArgs = {
|
|
16
|
+
projectsVersionMap: {
|
|
17
|
+
'.': { name: pkgJson.name, version: pkgJson.version },
|
|
18
|
+
},
|
|
19
|
+
isWorkspace: true,
|
|
20
|
+
};
|
|
15
21
|
}
|
|
16
22
|
const depgraph = await (0, build_dep_graph_pnpm_1.buildDepGraphPnpm)(lockFileParser, pkgJson, {
|
|
17
23
|
includeDevDeps,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-project.ts"],"names":[],"mappings":";;;AAAA,kCAAuC;AAEvC,iEAA2D;AAE3D,mDAAgE;AAGzD,MAAM,gBAAgB,GAAG,KAAK,EACnC,cAAsB,EACtB,eAAuB,EACvB,OAAgC,EAChC,eAAqC,EAClB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,GACxB,GAAG,OAAO,CAAC;IACZ,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAAC,cAAc,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,IAAA,6BAAqB,EAC1C,eAAe,EACf,eAAe,CAChB,CAAC;IAEF,mDAAmD;IACnD,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAClD,QAAQ,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-project.ts"],"names":[],"mappings":";;;AAAA,kCAAuC;AAEvC,iEAA2D;AAE3D,mDAAgE;AAGzD,MAAM,gBAAgB,GAAG,KAAK,EACnC,cAAsB,EACtB,eAAuB,EACvB,OAAgC,EAChC,eAAqC,EAClB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,GACxB,GAAG,OAAO,CAAC;IACZ,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAAC,cAAc,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,IAAA,6BAAqB,EAC1C,eAAe,EACf,eAAe,CAChB,CAAC;IAEF,mDAAmD;IACnD,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAClD,QAAQ,GAAG,GAAG,CAAC;QACf,cAAc,CAAC,aAAa,GAAG;YAC7B,kBAAkB,EAAE;gBAClB,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;aACtD;YACD,WAAW,EAAE,IAAI;SAClB,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAiB,EACtC,cAAc,EACd,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,eAAe;QACf,mBAAmB;QACnB,uBAAuB;KACxB,EACD,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA/CW,QAAA,gBAAgB,oBA+C3B"}
|
|
@@ -21,8 +21,10 @@ function computeProjectVersionMaps(root, targets) {
|
|
|
21
21
|
const packageJson = (0, utils_2.getFileContents)(root, packageJsonFileName);
|
|
22
22
|
try {
|
|
23
23
|
const parsedPkgJson = (0, util_1.parsePkgJson)(packageJson.content);
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
projectsVersionMap[target] = {
|
|
25
|
+
version: parsedPkgJson.version,
|
|
26
|
+
name: parsedPkgJson.name,
|
|
27
|
+
};
|
|
26
28
|
}
|
|
27
29
|
catch (err) {
|
|
28
30
|
debug(`Error getting version for project: ${packageJsonFileName}. ERROR: ${err}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-workspace.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-workspace.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,6BAA6B;AAC7B,kCAAuC;AAMvC,iEAA2D;AAE3D,mDAAgE;AAEhE,uCAAqD;AACrD,mCAA0C;AAE1C,MAAM,KAAK,GAAG,WAAW,CAAC,sBAAsB,CAAC,CAAC;AAElD,+BAA+B;AAC/B,qEAAqE;AACrE,oEAAoE;AACpE,iCAAiC;AACjC,SAAS,yBAAyB,CAAC,IAAY,EAAE,OAAiB;IAChE,MAAM,kBAAkB,GAAG,EAAE,CAAC;IAC9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,IAAA,uBAAe,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAE/D,IAAI;YACF,MAAM,aAAa,GAAG,IAAA,mBAAY,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACxD,MAAM,
|
|
1
|
+
{"version":3,"file":"parse-workspace.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,12 +61,16 @@ export declare type Yarn1DepGraphBuildOptions = {
|
|
|
61
61
|
};
|
|
62
62
|
export declare type PnpmWorkspaceArgs = {
|
|
63
63
|
isWorkspace: boolean;
|
|
64
|
-
projectsVersionMap: Record<string,
|
|
64
|
+
projectsVersionMap: Record<string, PnpmProject>;
|
|
65
|
+
};
|
|
66
|
+
export declare type PnpmProject = {
|
|
67
|
+
name: string;
|
|
68
|
+
version: string;
|
|
65
69
|
};
|
|
66
70
|
export declare type PnpmProjectParseOptions = {
|
|
67
71
|
includeDevDeps: boolean;
|
|
68
|
-
includeOptionalDeps: boolean;
|
|
69
72
|
includePeerDeps?: boolean;
|
|
73
|
+
includeOptionalDeps: boolean;
|
|
70
74
|
strictOutOfSync: boolean;
|
|
71
75
|
pruneWithinTopLevelDeps: boolean;
|
|
72
76
|
};
|
|
@@ -4,6 +4,7 @@ import { NormalisedPkgs } from './types';
|
|
|
4
4
|
export declare type Dependencies = Record<string, {
|
|
5
5
|
version: string;
|
|
6
6
|
isDev: boolean;
|
|
7
|
+
isPeer: boolean;
|
|
7
8
|
}>;
|
|
8
9
|
export interface PkgNode {
|
|
9
10
|
id: string;
|
|
@@ -32,7 +33,7 @@ export declare const getTopLevelDeps: (pkgJson: PackageJsonBase, options: {
|
|
|
32
33
|
* Converts dependencies parsed from the a lock file to a dependencies object required by the graph.
|
|
33
34
|
* For example, { 'mime-db': '~1.12.0' } will be converted to { 'mime-db': { version: '~1.12.0', isDev: true/false } }.
|
|
34
35
|
*/
|
|
35
|
-
export declare const getGraphDependencies: (dependencies: Record<string, string>, isDev: any) => Dependencies;
|
|
36
|
+
export declare const getGraphDependencies: (dependencies: Record<string, string>, isDev: any, isPeer?: boolean) => Dependencies;
|
|
36
37
|
export declare function parsePkgJson(pkgJsonContent: string): PackageJsonBase;
|
|
37
38
|
export declare const getChildNode: (name: string, depInfo: {
|
|
38
39
|
version: string;
|
|
@@ -32,9 +32,9 @@ exports.getTopLevelDeps = getTopLevelDeps;
|
|
|
32
32
|
* Converts dependencies parsed from the a lock file to a dependencies object required by the graph.
|
|
33
33
|
* For example, { 'mime-db': '~1.12.0' } will be converted to { 'mime-db': { version: '~1.12.0', isDev: true/false } }.
|
|
34
34
|
*/
|
|
35
|
-
const getGraphDependencies = (dependencies, isDev) => {
|
|
35
|
+
const getGraphDependencies = (dependencies, isDev, isPeer) => {
|
|
36
36
|
return Object.entries(dependencies).reduce((pnpmDeps, [name, semver]) => {
|
|
37
|
-
pnpmDeps[name] = { version: semver, isDev: isDev };
|
|
37
|
+
pnpmDeps[name] = { version: semver, isDev: isDev, isPeer: !!isPeer };
|
|
38
38
|
return pnpmDeps;
|
|
39
39
|
}, {});
|
|
40
40
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":";;;AAEA,sCAAkD;AAElD,sCAA2C;AAC3C,wCAA0C;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED