snyk-nodejs-lockfile-parser 2.7.1 → 2.8.1
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/c-map.js +1 -2
- package/dist/c-map.js.map +1 -1
- package/dist/cli-parsers/index.js +2 -1
- package/dist/cli-parsers/index.js.map +1 -1
- package/dist/cli-parsers/yarn-info-parser.js +1 -2
- package/dist/cli-parsers/yarn-info-parser.js.map +1 -1
- package/dist/dep-graph-builders/npm-lock-v2/extract-npm-lock-v2-pkgs.js +2 -1
- 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 +15 -3
- package/dist/dep-graph-builders/npm-lock-v2/index.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js +20 -12
- package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js +11 -6
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.js +2 -2
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js +4 -4
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.js +6 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/parse-project.js +1 -2
- package/dist/dep-graph-builders/pnpm/parse-project.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/utils.js +5 -1
- package/dist/dep-graph-builders/pnpm/utils.js.map +1 -1
- package/dist/dep-graph-builders/types.d.ts +7 -0
- package/dist/dep-graph-builders/util.js +28 -24
- package/dist/dep-graph-builders/util.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js +31 -17
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js +35 -21
- package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v2/utils.d.ts +2 -2
- package/dist/dep-graph-builders/yarn-lock-v2/utils.js +95 -17
- package/dist/dep-graph-builders/yarn-lock-v2/utils.js.map +1 -1
- package/dist/errors/invalid-user-input-error.js +2 -2
- package/dist/errors/invalid-user-input-error.js.map +1 -1
- package/dist/errors/out-of-sync-error.js +4 -2
- package/dist/errors/out-of-sync-error.js.map +1 -1
- package/dist/errors/tree-size-limit-error.js +3 -2
- package/dist/errors/tree-size-limit-error.js.map +1 -1
- package/dist/errors/unsupported-error.js +2 -2
- package/dist/errors/unsupported-error.js.map +1 -1
- package/dist/errors/unsupported-runtime-error.js +2 -2
- package/dist/errors/unsupported-runtime-error.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js.map +1 -1
- package/dist/parsers/index.js +13 -11
- package/dist/parsers/index.js.map +1 -1
- package/dist/parsers/lock-parser-base.js +40 -15
- package/dist/parsers/lock-parser-base.js.map +1 -1
- package/dist/parsers/package-lock-parser.js +16 -18
- package/dist/parsers/package-lock-parser.js.map +1 -1
- package/dist/parsers/yarn-lock-parser.js +12 -3
- package/dist/parsers/yarn-lock-parser.js.map +1 -1
- package/dist/parsers/yarn2-lock-parser.js +12 -3
- package/dist/parsers/yarn2-lock-parser.js.map +1 -1
- package/dist/utils.d.ts +17 -0
- package/dist/utils.js +58 -15
- package/dist/utils.js.map +1 -1
- package/package.json +12 -7
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getChildNode = exports.getGraphDependencies = exports.getTopLevelDeps = exports.addPkgNodeToGraph = exports.createNodeInfo = void 0;
|
|
4
4
|
exports.parsePkgJson = parsePkgJson;
|
|
5
5
|
const errors_1 = require("../errors");
|
|
6
|
-
const
|
|
6
|
+
const utils_1 = require("../utils");
|
|
7
7
|
const parsers_1 = require("../parsers");
|
|
8
8
|
const pkgJson_1 = require("../aliasesPreprocessors/pkgJson");
|
|
9
9
|
const createNodeInfo = (options, scope = 'unknown') => {
|
|
@@ -19,11 +19,18 @@ const createNodeInfo = (options, scope = 'unknown') => {
|
|
|
19
19
|
exports.createNodeInfo = createNodeInfo;
|
|
20
20
|
const addPkgNodeToGraph = (depGraphBuilder, node, options) => {
|
|
21
21
|
return depGraphBuilder.addPkgNode({ name: node.name, version: node.version }, node.id, {
|
|
22
|
-
labels:
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
labels: {
|
|
23
|
+
scope: node.isDev ? 'dev' : 'prod',
|
|
24
|
+
...(options.showNpmScope && {
|
|
25
|
+
'npm:scope': node.isDev ? 'dev' : 'prod',
|
|
26
|
+
}),
|
|
27
|
+
...(options.isCyclic && { pruned: 'cyclic' }),
|
|
28
|
+
...(options.isWorkspacePkg && { pruned: 'true' }),
|
|
29
|
+
...(node.missingLockFileEntry && { missingLockFileEntry: 'true' }),
|
|
30
|
+
...(node.alias && {
|
|
31
|
+
alias: `${node.alias.aliasName}=>${node.alias.aliasTargetDepName}@${node.version}`,
|
|
32
|
+
}),
|
|
33
|
+
},
|
|
27
34
|
});
|
|
28
35
|
};
|
|
29
36
|
exports.addPkgNodeToGraph = addPkgNodeToGraph;
|
|
@@ -47,19 +54,22 @@ const getTopLevelDeps = (pkgJson, options) => {
|
|
|
47
54
|
const peerDeps = options.includePeerDeps
|
|
48
55
|
? (0, exports.getGraphDependencies)(pkgJson.peerDependencies || {}, { isDev: false })
|
|
49
56
|
: {};
|
|
50
|
-
const deps =
|
|
57
|
+
const deps = { ...prodDeps, ...optionalDeps, ...peerDeps };
|
|
51
58
|
if (pkgJson.aliases) {
|
|
52
59
|
for (const alias of Object.keys(pkgJson.aliases)) {
|
|
53
60
|
// Only add alias metadata to dependencies that are actually in deps
|
|
54
61
|
if (deps[alias]) {
|
|
55
|
-
deps[alias] =
|
|
62
|
+
deps[alias] = {
|
|
63
|
+
...deps[alias],
|
|
64
|
+
...{ alias: { ...pkgJson.aliases[alias] } },
|
|
65
|
+
};
|
|
56
66
|
}
|
|
57
67
|
}
|
|
58
68
|
}
|
|
59
69
|
if (options.includeDevDeps) {
|
|
60
70
|
// Ensure dev dependency 'isDev' flags are correctly set.
|
|
61
71
|
// Dev dependencies are applied last to override shared keys with regular dependencies.
|
|
62
|
-
return
|
|
72
|
+
return { ...deps, ...devDeps };
|
|
63
73
|
}
|
|
64
74
|
// For includeDevDeps option set to false, simulate pnpm install --prod
|
|
65
75
|
// by excluding all devDependencies,
|
|
@@ -118,19 +128,13 @@ const getGraphDependencies = (dependencies, options) => {
|
|
|
118
128
|
};
|
|
119
129
|
exports.getGraphDependencies = getGraphDependencies;
|
|
120
130
|
function parsePkgJson(pkgJsonContent) {
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
parsedPkgJson.name = 'package.json';
|
|
125
|
-
}
|
|
126
|
-
return parsedPkgJson;
|
|
127
|
-
}
|
|
128
|
-
catch (e) {
|
|
129
|
-
throw new errors_1.InvalidUserInputError('package.json parsing failed with error ' + e.message);
|
|
131
|
+
const parsedPkgJson = (0, utils_1.parseJsonFile)(pkgJsonContent, 'package.json');
|
|
132
|
+
if (!parsedPkgJson.name) {
|
|
133
|
+
parsedPkgJson.name = 'package.json';
|
|
130
134
|
}
|
|
135
|
+
return parsedPkgJson;
|
|
131
136
|
}
|
|
132
137
|
const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps) => {
|
|
133
|
-
var _a, _b, _c;
|
|
134
138
|
const childNodeKey = `${name}@${depInfo.version}`;
|
|
135
139
|
let childNode;
|
|
136
140
|
// Check if this lockfile entry is for an aliased package
|
|
@@ -168,7 +172,7 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps)
|
|
|
168
172
|
if (depInfo.isOptional) {
|
|
169
173
|
childNode = {
|
|
170
174
|
id: childNodeKey,
|
|
171
|
-
name:
|
|
175
|
+
name: aliasInfo?.aliasTargetDepName ?? name,
|
|
172
176
|
version: depInfo.version,
|
|
173
177
|
dependencies: {},
|
|
174
178
|
isDev: depInfo.isDev,
|
|
@@ -177,12 +181,12 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps)
|
|
|
177
181
|
};
|
|
178
182
|
}
|
|
179
183
|
else if (strictOutOfSync && !/^file:/.test(depInfo.version)) {
|
|
180
|
-
throw new
|
|
184
|
+
throw new errors_1.OutOfSyncError(childNodeKey, parsers_1.LockfileType.yarn);
|
|
181
185
|
}
|
|
182
186
|
else {
|
|
183
187
|
childNode = {
|
|
184
188
|
id: childNodeKey,
|
|
185
|
-
name:
|
|
189
|
+
name: aliasInfo?.aliasTargetDepName ?? name,
|
|
186
190
|
version: depInfo.version,
|
|
187
191
|
dependencies: {},
|
|
188
192
|
isDev: depInfo.isDev,
|
|
@@ -204,9 +208,9 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps)
|
|
|
204
208
|
: {};
|
|
205
209
|
childNode = {
|
|
206
210
|
id: `${name}@${depData.version}`,
|
|
207
|
-
name:
|
|
211
|
+
name: aliasInfo?.aliasTargetDepName ?? name,
|
|
208
212
|
version: depData.version,
|
|
209
|
-
dependencies:
|
|
213
|
+
dependencies: { ...dependencies, ...optionalDependencies },
|
|
210
214
|
isDev: depInfo.isDev,
|
|
211
215
|
alias: aliasInfo,
|
|
212
216
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":";;;AAkMA,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,14 +40,17 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
40
40
|
if (depInfo.version.startsWith('npm:')) {
|
|
41
41
|
const parsed = (0, pkgJson_1.parseNpmAlias)(depInfo.version);
|
|
42
42
|
if (parsed && parsed.packageName) {
|
|
43
|
-
scopeDepInfo =
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
43
|
+
scopeDepInfo = {
|
|
44
|
+
...scopeDepInfo,
|
|
45
|
+
...{
|
|
46
|
+
alias: {
|
|
47
|
+
aliasName: name,
|
|
48
|
+
aliasTargetDepName: parsed.packageName,
|
|
49
|
+
semver: parsed.version,
|
|
50
|
+
version: null,
|
|
51
|
+
},
|
|
49
52
|
},
|
|
50
|
-
}
|
|
53
|
+
};
|
|
51
54
|
}
|
|
52
55
|
}
|
|
53
56
|
const childNode = (0, util_1.getChildNode)(name, scopeDepInfo, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
|
|
@@ -55,11 +58,17 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
55
58
|
if (pruneWithinTopLevel) {
|
|
56
59
|
const prunedId = `${childNode.id}:pruned`;
|
|
57
60
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, prunedId, {
|
|
58
|
-
labels:
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
labels: {
|
|
62
|
+
scope: node.isDev ? 'dev' : 'prod',
|
|
63
|
+
...(showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' }),
|
|
64
|
+
pruned: 'true',
|
|
65
|
+
...(node.missingLockFileEntry && {
|
|
66
|
+
missingLockFileEntry: 'true',
|
|
67
|
+
}),
|
|
68
|
+
...(childNode.alias && {
|
|
69
|
+
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
70
|
+
}),
|
|
71
|
+
},
|
|
63
72
|
});
|
|
64
73
|
depGraphBuilder.connectDep(node.id, prunedId);
|
|
65
74
|
}
|
|
@@ -69,11 +78,16 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
69
78
|
continue;
|
|
70
79
|
}
|
|
71
80
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, childNode.id, {
|
|
72
|
-
labels:
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
81
|
+
labels: {
|
|
82
|
+
scope: node.isDev ? 'dev' : 'prod',
|
|
83
|
+
...(showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' }),
|
|
84
|
+
...(node.missingLockFileEntry && {
|
|
85
|
+
missingLockFileEntry: 'true',
|
|
86
|
+
}),
|
|
87
|
+
...(childNode.alias && {
|
|
88
|
+
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
89
|
+
}),
|
|
90
|
+
},
|
|
77
91
|
});
|
|
78
92
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
79
93
|
localVisited.add(childNode.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-depgraph-simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAKiB;AAGjB,2DAAsD;AACtD,gEAAmE;AAE5D,MAAM,6BAA6B,GAAG,KAAK,EAChD,uBAAuC,EACvC,OAAwB,EACxB,OAAkC,EAClC,EAAE;IACF,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,uBAAuB,EACvB,YAAY,GACb,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,EAChD,IAAA,qBAAc,EAAC,OAAO,CAAC,CACxB,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC5C,cAAc;QACd,eAAe;QACf,mBAAmB;KACpB,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAY;QACxB,EAAE,EAAE,WAAW;QACf,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,YAAY,EAAE,YAAY;QAC1B,KAAK,EAAE,KAAK;KACb,CAAC;IAEF,MAAM,QAAQ,CACZ,eAAe,EACf,QAAQ,EACR,uBAAuB,EACvB,eAAe,EACf,mBAAmB,EACnB,uBAAuB,EACvB,SAAS,EACT,YAAY,CACb,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AA9CW,QAAA,6BAA6B,iCA8CxC;AAEF;;;;;GAKG;AACH,MAAM,QAAQ,GAAG,KAAK,EACpB,eAAgC,EAChC,IAAa,EACb,uBAAuC,EACvC,eAAwB,EACxB,mBAA4B,EAC5B,mBAA4B,EAC5B,OAAqB,EACrB,YAAsB,EACP,EAAE;IACjB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAC;QACtE,IAAI,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC9C,IAAI,qCAAgB,CAAC,UAAU,EAAE,EAAE,CAAC;YAClC,MAAM,qCAAgB,CAAC,IAAI,EAAE,CAAC;QAChC,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,IAAI,IAAI,GAAG,EAAU,CAAC;QAClD,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9C,IAAI,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBACjC,YAAY,
|
|
1
|
+
{"version":3,"file":"build-depgraph-simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ const buildDepGraphYarnLockV2Simple = async (extractedYarnLockV2Pkgs, pkgJson, o
|
|
|
22
22
|
await dfsVisit(depGraphBuilder, rootNode, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps,
|
|
23
23
|
// we have rootWorkspaceResolutions if this is workspace pkg with resolutions
|
|
24
24
|
// at root - therefore it should take precedent
|
|
25
|
-
|
|
25
|
+
workspaceArgs?.rootResolutions || pkgJson.resolutions || {}, pruneWithinTopLevelDeps, undefined, showNpmScope, includeDevDeps, workspaceArgs?.workspacePackages);
|
|
26
26
|
return depGraphBuilder.build();
|
|
27
27
|
};
|
|
28
28
|
exports.buildDepGraphYarnLockV2Simple = buildDepGraphYarnLockV2Simple;
|
|
@@ -32,7 +32,7 @@ exports.buildDepGraphYarnLockV2Simple = buildDepGraphYarnLockV2Simple;
|
|
|
32
32
|
* - If a node doesn't exist in the map, it means it hasn't been visited.
|
|
33
33
|
* - If a node is already visited, simply connect the new node with this node.
|
|
34
34
|
*/
|
|
35
|
-
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, pruneWithinTopLevel, visited, showNpmScope) => {
|
|
35
|
+
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, pruneWithinTopLevel, visited, showNpmScope, includeDevDeps = false, workspacePackages) => {
|
|
36
36
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
37
37
|
let scopeDepInfo = depInfo;
|
|
38
38
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
@@ -42,18 +42,21 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
42
42
|
depInfo.version.indexOf('@') > -1) {
|
|
43
43
|
const parsed = (0, pkgJson_1.parseNpmAlias)(depInfo.version);
|
|
44
44
|
if (parsed && parsed.packageName) {
|
|
45
|
-
scopeDepInfo =
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
45
|
+
scopeDepInfo = {
|
|
46
|
+
...scopeDepInfo,
|
|
47
|
+
...{
|
|
48
|
+
alias: {
|
|
49
|
+
aliasName: name,
|
|
50
|
+
aliasTargetDepName: parsed.packageName,
|
|
51
|
+
semver: parsed.version,
|
|
52
|
+
version: null,
|
|
53
|
+
},
|
|
51
54
|
},
|
|
52
|
-
}
|
|
55
|
+
};
|
|
53
56
|
}
|
|
54
57
|
}
|
|
55
58
|
const localVisited = visited || new Set();
|
|
56
|
-
const childNode = (0, utils_1.getYarnLockV2ChildNode)(name, scopeDepInfo, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, node);
|
|
59
|
+
const childNode = (0, utils_1.getYarnLockV2ChildNode)(name, scopeDepInfo, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, node, includeDevDeps, workspacePackages);
|
|
57
60
|
if (localVisited.has(childNode.id)) {
|
|
58
61
|
if (pruneWithinTopLevel) {
|
|
59
62
|
const prunedId = `${childNode.id}:pruned`;
|
|
@@ -61,11 +64,17 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
61
64
|
name: childNode.alias ? childNode.alias.aliasName : childNode.name,
|
|
62
65
|
version: childNode.version,
|
|
63
66
|
}, prunedId, {
|
|
64
|
-
labels:
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
labels: {
|
|
68
|
+
scope: node.isDev ? 'dev' : 'prod',
|
|
69
|
+
...(showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' }),
|
|
70
|
+
pruned: 'true',
|
|
71
|
+
...(node.missingLockFileEntry && {
|
|
72
|
+
missingLockFileEntry: 'true',
|
|
73
|
+
}),
|
|
74
|
+
...(childNode.alias && {
|
|
75
|
+
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
76
|
+
}),
|
|
77
|
+
},
|
|
69
78
|
});
|
|
70
79
|
depGraphBuilder.connectDep(node.id, prunedId);
|
|
71
80
|
}
|
|
@@ -78,15 +87,20 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
78
87
|
name: childNode.alias ? childNode.alias.aliasName : childNode.name,
|
|
79
88
|
version: childNode.version,
|
|
80
89
|
}, childNode.id, {
|
|
81
|
-
labels:
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
90
|
+
labels: {
|
|
91
|
+
scope: node.isDev ? 'dev' : 'prod',
|
|
92
|
+
...(showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' }),
|
|
93
|
+
...(node.missingLockFileEntry && {
|
|
94
|
+
missingLockFileEntry: 'true',
|
|
95
|
+
}),
|
|
96
|
+
...(childNode.alias && {
|
|
97
|
+
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
98
|
+
}),
|
|
99
|
+
},
|
|
86
100
|
});
|
|
87
101
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
88
102
|
localVisited.add(childNode.id);
|
|
89
|
-
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, pruneWithinTopLevel, localVisited, showNpmScope);
|
|
103
|
+
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, pruneWithinTopLevel, localVisited, showNpmScope, includeDevDeps, workspacePackages);
|
|
90
104
|
}
|
|
91
105
|
};
|
|
92
106
|
//# sourceMappingURL=build-depgraph-simple.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-depgraph-simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAAmE;AAMnE,mCAAiD;AACjD,2DAAsD;AACtD,gEAAmE;AAE5D,MAAM,6BAA6B,GAAG,KAAK,EAChD,uBAAuC,EACvC,OAAwB,EACxB,OAAsC,EACtC,aAAuC,EACvC,EAAE;IACF,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,uBAAuB,EACvB,YAAY,GACb,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,EAChD,IAAA,qBAAc,EAAC,OAAO,CAAC,CACxB,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC5C,cAAc;KACf,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAY;QACxB,EAAE,EAAE,WAAW;QACf,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,YAAY,EAAE,YAAY;QAC1B,KAAK,EAAE,KAAK;KACb,CAAC;IAEF,MAAM,QAAQ,CACZ,eAAe,EACf,QAAQ,EACR,uBAAuB,EACvB,eAAe,EACf,mBAAmB;IACnB,6EAA6E;IAC7E,+CAA+C;IAC/C,
|
|
1
|
+
{"version":3,"file":"build-depgraph-simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { structUtils } from '@yarnpkg/core';
|
|
2
|
-
import { NormalisedPkgs } from '../types';
|
|
2
|
+
import { NormalisedPkgs, WorkspacePackageManifest } from '../types';
|
|
3
3
|
import { PkgNode } from '../util';
|
|
4
4
|
export type ParseDescriptor = typeof structUtils.parseDescriptor;
|
|
5
5
|
export type ParseRange = typeof structUtils.parseRange;
|
|
@@ -14,7 +14,7 @@ export declare const getYarnLockV2ChildNode: (name: string, depInfo: {
|
|
|
14
14
|
semver: string;
|
|
15
15
|
version: string;
|
|
16
16
|
};
|
|
17
|
-
}, pkgs: NormalisedPkgs, strictOutOfSync: boolean, includeOptionalDeps: boolean, resolutions: Record<string, string>, parentNode: PkgNode) => {
|
|
17
|
+
}, pkgs: NormalisedPkgs, strictOutOfSync: boolean, includeOptionalDeps: boolean, resolutions: Record<string, string>, parentNode: PkgNode, includeDevDeps?: boolean, workspacePackages?: Record<string, WorkspacePackageManifest>) => {
|
|
18
18
|
alias?: {
|
|
19
19
|
version: string;
|
|
20
20
|
aliasName: string;
|
|
@@ -78,7 +78,33 @@ const yarnLockFileKeyNormalizer = (parseDescriptor, parseRange) => (fullDescript
|
|
|
78
78
|
return new Set(_flatMap(allKeys));
|
|
79
79
|
};
|
|
80
80
|
exports.yarnLockFileKeyNormalizer = yarnLockFileKeyNormalizer;
|
|
81
|
-
|
|
81
|
+
/**
|
|
82
|
+
* Yarn Berry merges a workspace package's dependencies, devDependencies and peerDependencies
|
|
83
|
+
* into a single `dependencies` block in yarn.lock, so the dev marker is lost. When such a
|
|
84
|
+
* workspace package is consumed as a production dependency, walking that merged block would
|
|
85
|
+
* promote its dev-only tooling (e.g. webpack, babel) into the production graph.
|
|
86
|
+
*
|
|
87
|
+
* Given the consumed workspace member's own package.json (via `workspaceManifest`), drop the
|
|
88
|
+
* dev-only entries: names that appear in devDependencies but not in dependencies /
|
|
89
|
+
* optionalDependencies / peerDependencies (prod wins on overlap).
|
|
90
|
+
*/
|
|
91
|
+
const pruneWorkspaceDevDependencies = (deps, workspaceManifest) => {
|
|
92
|
+
const nonDev = new Set([
|
|
93
|
+
...Object.keys(workspaceManifest.dependencies || {}),
|
|
94
|
+
...Object.keys(workspaceManifest.optionalDependencies || {}),
|
|
95
|
+
...Object.keys(workspaceManifest.peerDependencies || {}),
|
|
96
|
+
]);
|
|
97
|
+
const dev = new Set(Object.keys(workspaceManifest.devDependencies || {}));
|
|
98
|
+
return Object.entries(deps).reduce((acc, [name, depInfo]) => {
|
|
99
|
+
// Drop only names that are exclusively devDependencies of the workspace member.
|
|
100
|
+
if (dev.has(name) && !nonDev.has(name)) {
|
|
101
|
+
return acc;
|
|
102
|
+
}
|
|
103
|
+
acc[name] = depInfo;
|
|
104
|
+
return acc;
|
|
105
|
+
}, {});
|
|
106
|
+
};
|
|
107
|
+
const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps, resolutions, parentNode, includeDevDeps = false, workspacePackages) => {
|
|
82
108
|
// First, check if a resolution would be used
|
|
83
109
|
const resolvedVersionFromResolution = (() => {
|
|
84
110
|
// Check for scoped resolution (e.g., "parentPackageName/dependencyName")
|
|
@@ -169,16 +195,27 @@ const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOpt
|
|
|
169
195
|
throw new errors_1.OutOfSyncError(childNodeKeyFromResolution, parsers_1.LockfileType.yarn2);
|
|
170
196
|
}
|
|
171
197
|
else {
|
|
172
|
-
return
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
: {}
|
|
198
|
+
return {
|
|
199
|
+
id: childNodeKeyFromResolution,
|
|
200
|
+
name: depInfo.alias ? depInfo.alias.aliasTargetDepName : name,
|
|
201
|
+
version: decodedResolution,
|
|
202
|
+
dependencies: {},
|
|
203
|
+
isDev: depInfo.isDev,
|
|
204
|
+
missingLockFileEntry: true,
|
|
205
|
+
...(depInfo.alias
|
|
206
|
+
? {
|
|
207
|
+
alias: {
|
|
208
|
+
...depInfo.alias,
|
|
209
|
+
version: decodedResolution,
|
|
210
|
+
},
|
|
211
|
+
}
|
|
212
|
+
: {}),
|
|
213
|
+
};
|
|
177
214
|
}
|
|
178
215
|
}
|
|
179
216
|
const pkgData = pkgs[childNodeKeyFromResolution];
|
|
180
217
|
const { version: versionFromResolution, dependencies, optionalDependencies, } = pkgData;
|
|
181
|
-
|
|
218
|
+
let formattedDependencies = (0, util_1.getGraphDependencies)(dependencies || {}, {
|
|
182
219
|
isDev: depInfo.isDev,
|
|
183
220
|
});
|
|
184
221
|
const formattedOptionalDependencies = includeOptionalDeps
|
|
@@ -187,9 +224,27 @@ const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOpt
|
|
|
187
224
|
isOptional: true,
|
|
188
225
|
})
|
|
189
226
|
: {};
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
227
|
+
// Key by the resolved package name, not the parent's name, so npm aliases
|
|
228
|
+
// (e.g. "alias": "npm:@scope/real-pkg@1") still match the workspace manifest.
|
|
229
|
+
const workspaceManifestFromResolution = workspacePackages?.[depInfo.alias ? depInfo.alias.aliasTargetDepName : name];
|
|
230
|
+
if (!includeDevDeps &&
|
|
231
|
+
workspaceManifestFromResolution &&
|
|
232
|
+
pkgData.resolution?.includes('@workspace:')) {
|
|
233
|
+
formattedDependencies = pruneWorkspaceDevDependencies(formattedDependencies, workspaceManifestFromResolution);
|
|
234
|
+
}
|
|
235
|
+
return {
|
|
236
|
+
id: `${name}@${versionFromResolution}`,
|
|
237
|
+
name: depInfo.alias ? depInfo.alias.aliasTargetDepName : name,
|
|
238
|
+
version: versionFromResolution,
|
|
239
|
+
dependencies: {
|
|
240
|
+
...formattedOptionalDependencies,
|
|
241
|
+
...formattedDependencies,
|
|
242
|
+
},
|
|
243
|
+
isDev: depInfo.isDev,
|
|
244
|
+
...(depInfo.alias
|
|
245
|
+
? { alias: { ...depInfo.alias, version: versionFromResolution } }
|
|
246
|
+
: {}),
|
|
247
|
+
};
|
|
193
248
|
}
|
|
194
249
|
// No resolutions
|
|
195
250
|
const childNodeKey = `${name}@${depInfo.version}`;
|
|
@@ -198,14 +253,22 @@ const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOpt
|
|
|
198
253
|
throw new errors_1.OutOfSyncError(childNodeKey, parsers_1.LockfileType.yarn2);
|
|
199
254
|
}
|
|
200
255
|
else {
|
|
201
|
-
return
|
|
202
|
-
|
|
203
|
-
:
|
|
256
|
+
return {
|
|
257
|
+
id: childNodeKey,
|
|
258
|
+
name: depInfo.alias ? depInfo.alias.aliasTargetDepName : name,
|
|
259
|
+
version: depInfo.version,
|
|
260
|
+
dependencies: {},
|
|
261
|
+
isDev: depInfo.isDev,
|
|
262
|
+
missingLockFileEntry: true,
|
|
263
|
+
...(depInfo.alias
|
|
264
|
+
? { alias: { ...depInfo.alias, version: depInfo.version } }
|
|
265
|
+
: {}),
|
|
266
|
+
};
|
|
204
267
|
}
|
|
205
268
|
}
|
|
206
269
|
else {
|
|
207
270
|
const depData = pkgs[childNodeKey];
|
|
208
|
-
|
|
271
|
+
let dependencies = (0, util_1.getGraphDependencies)(depData.dependencies || {}, {
|
|
209
272
|
isDev: depInfo.isDev,
|
|
210
273
|
});
|
|
211
274
|
const optionalDependencies = includeOptionalDeps
|
|
@@ -214,9 +277,24 @@ const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOpt
|
|
|
214
277
|
isOptional: true,
|
|
215
278
|
})
|
|
216
279
|
: {};
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
280
|
+
// Key by the resolved package name, not the parent's name, so npm aliases
|
|
281
|
+
// (e.g. "alias": "npm:@scope/real-pkg@1") still match the workspace manifest.
|
|
282
|
+
const workspaceManifest = workspacePackages?.[depInfo.alias ? depInfo.alias.aliasTargetDepName : name];
|
|
283
|
+
if (!includeDevDeps &&
|
|
284
|
+
workspaceManifest &&
|
|
285
|
+
depData.resolution?.includes('@workspace:')) {
|
|
286
|
+
dependencies = pruneWorkspaceDevDependencies(dependencies, workspaceManifest);
|
|
287
|
+
}
|
|
288
|
+
return {
|
|
289
|
+
id: `${name}@${depData.version}`,
|
|
290
|
+
name: depInfo.alias ? depInfo.alias.aliasTargetDepName : name,
|
|
291
|
+
version: depData.version,
|
|
292
|
+
dependencies: { ...dependencies, ...optionalDependencies },
|
|
293
|
+
isDev: depInfo.isDev,
|
|
294
|
+
...(depInfo.alias
|
|
295
|
+
? { alias: { ...depInfo.alias, version: depData.version } }
|
|
296
|
+
: {}),
|
|
297
|
+
};
|
|
220
298
|
}
|
|
221
299
|
};
|
|
222
300
|
exports.getYarnLockV2ChildNode = getYarnLockV2ChildNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/utils.ts"],"names":[],"mappings":";;;AAAA,wCAA4C;AAC5C,2CAA2C;AAC3C,yCAA8C;AAC9C,2CAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InvalidUserInputError = void 0;
|
|
4
4
|
class InvalidUserInputError extends Error {
|
|
5
|
+
code = 422;
|
|
6
|
+
name = 'InvalidUserInputError';
|
|
5
7
|
constructor(...args) {
|
|
6
8
|
super(...args);
|
|
7
|
-
this.code = 422;
|
|
8
|
-
this.name = 'InvalidUserInputError';
|
|
9
9
|
Error.captureStackTrace(this, InvalidUserInputError);
|
|
10
10
|
}
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invalid-user-input-error.js","sourceRoot":"","sources":["../../lib/errors/invalid-user-input-error.ts"],"names":[],"mappings":";;;AAAA,MAAa,qBAAsB,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"invalid-user-input-error.js","sourceRoot":"","sources":["../../lib/errors/invalid-user-input-error.ts"],"names":[],"mappings":";;;AAAA,MAAa,qBAAsB,SAAQ,KAAK;IACvC,IAAI,GAAG,GAAG,CAAC;IACX,IAAI,GAAG,uBAAuB,CAAC;IAEtC,YAAY,GAAG,IAAI;QACjB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACf,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IACvD,CAAC;CACF;AARD,sDAQC"}
|