snyk-nodejs-lockfile-parser 2.4.5 → 2.5.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/aliasesPreprocessors/pkgJson.d.ts +1 -0
- package/dist/aliasesPreprocessors/pkgJson.js +46 -8
- package/dist/aliasesPreprocessors/pkgJson.js.map +1 -1
- package/dist/dep-graph-builders/npm-lock-v2/index.js +8 -7
- package/dist/dep-graph-builders/npm-lock-v2/index.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js +11 -7
- package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/parse-project.js +2 -1
- package/dist/dep-graph-builders/pnpm/parse-project.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/parse-workspace-project.js +2 -1
- package/dist/dep-graph-builders/pnpm/parse-workspace-project.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/parse-workspace.js +2 -1
- package/dist/dep-graph-builders/pnpm/parse-workspace.js.map +1 -1
- package/dist/dep-graph-builders/types.d.ts +5 -0
- package/dist/dep-graph-builders/util.d.ts +4 -1
- package/dist/dep-graph-builders/util.js +44 -2
- package/dist/dep-graph-builders/util.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple-pruned.js +10 -7
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple-pruned.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js +19 -15
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package-pruned.js +7 -5
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package-pruned.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package.js +6 -5
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v1/simple.js +3 -1
- package/dist/dep-graph-builders/yarn-lock-v1/simple.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js +19 -15
- package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v2/simple.js +2 -1
- package/dist/dep-graph-builders/yarn-lock-v2/simple.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/parsers/index.d.ts +3 -2
- package/dist/parsers/index.js +2 -4
- package/dist/parsers/index.js.map +1 -1
- package/dist/parsers/lock-parser-base.d.ts +3 -2
- package/dist/parsers/lock-parser-base.js +19 -19
- package/dist/parsers/lock-parser-base.js.map +1 -1
- package/dist/parsers/package-lock-parser.d.ts +3 -3
- package/dist/parsers/package-lock-parser.js +6 -6
- package/dist/parsers/package-lock-parser.js.map +1 -1
- package/dist/parsers/yarn-lock-parser.d.ts +3 -3
- package/dist/parsers/yarn-lock-parser.js +4 -6
- package/dist/parsers/yarn-lock-parser.js.map +1 -1
- package/dist/parsers/yarn2-lock-parser.d.ts +2 -2
- package/dist/parsers/yarn2-lock-parser.js +4 -6
- package/dist/parsers/yarn2-lock-parser.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-depgraph-simple-pruned.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-simple-pruned.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"build-depgraph-simple-pruned.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-simple-pruned.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,10 @@ exports.buildDepGraphYarnLockV1Simple = void 0;
|
|
|
4
4
|
const dep_graph_1 = require("@snyk/dep-graph");
|
|
5
5
|
const util_1 = require("../util");
|
|
6
6
|
const event_loop_spinner_1 = require("event-loop-spinner");
|
|
7
|
+
const pkgJson_1 = require("../../aliasesPreprocessors/pkgJson");
|
|
7
8
|
const buildDepGraphYarnLockV1Simple = async (extractedYarnLockV1Pkgs, pkgJson, options) => {
|
|
8
|
-
const { includeDevDeps, includeOptionalDeps, includePeerDeps, strictOutOfSync, pruneWithinTopLevelDeps, } = options;
|
|
9
|
-
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version });
|
|
9
|
+
const { includeDevDeps, includeOptionalDeps, includePeerDeps, strictOutOfSync, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
10
|
+
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version }, (0, util_1.createNodeInfo)(options));
|
|
10
11
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, {
|
|
11
12
|
includeDevDeps,
|
|
12
13
|
includePeerDeps,
|
|
@@ -19,7 +20,7 @@ const buildDepGraphYarnLockV1Simple = async (extractedYarnLockV1Pkgs, pkgJson, o
|
|
|
19
20
|
dependencies: topLevelDeps,
|
|
20
21
|
isDev: false,
|
|
21
22
|
};
|
|
22
|
-
await dfsVisit(depGraphBuilder, rootNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevelDeps);
|
|
23
|
+
await dfsVisit(depGraphBuilder, rootNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevelDeps, undefined, showNpmScope);
|
|
23
24
|
return depGraphBuilder.build();
|
|
24
25
|
};
|
|
25
26
|
exports.buildDepGraphYarnLockV1Simple = buildDepGraphYarnLockV1Simple;
|
|
@@ -29,7 +30,7 @@ exports.buildDepGraphYarnLockV1Simple = buildDepGraphYarnLockV1Simple;
|
|
|
29
30
|
* - If a node doesn't exist in the map, it means it hasn't been visited.
|
|
30
31
|
* - If a node is already visited, simply connect the new node with this node.
|
|
31
32
|
*/
|
|
32
|
-
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, visited) => {
|
|
33
|
+
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, visited, showNpmScope) => {
|
|
33
34
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
34
35
|
let scopeDepInfo = Object.assign({}, depInfo);
|
|
35
36
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
@@ -37,21 +38,24 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
37
38
|
}
|
|
38
39
|
const localVisited = visited || new Set();
|
|
39
40
|
if (depInfo.version.startsWith('npm:')) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
41
|
+
const parsed = (0, pkgJson_1.parseNpmAlias)(depInfo.version);
|
|
42
|
+
if (parsed && parsed.packageName) {
|
|
43
|
+
scopeDepInfo = Object.assign(Object.assign({}, scopeDepInfo), {
|
|
44
|
+
alias: {
|
|
45
|
+
aliasName: name,
|
|
46
|
+
aliasTargetDepName: parsed.packageName,
|
|
47
|
+
semver: parsed.version,
|
|
48
|
+
version: null,
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
}
|
|
48
52
|
}
|
|
49
53
|
const childNode = (0, util_1.getChildNode)(name, scopeDepInfo, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
|
|
50
54
|
if (localVisited.has(childNode.id)) {
|
|
51
55
|
if (pruneWithinTopLevel) {
|
|
52
56
|
const prunedId = `${childNode.id}:pruned`;
|
|
53
57
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, prunedId, {
|
|
54
|
-
labels: Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod', pruned: 'true' }, (node.missingLockFileEntry && {
|
|
58
|
+
labels: Object.assign(Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' })), { pruned: 'true' }), (node.missingLockFileEntry && {
|
|
55
59
|
missingLockFileEntry: 'true',
|
|
56
60
|
})), (childNode.alias && {
|
|
57
61
|
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
@@ -65,7 +69,7 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
65
69
|
continue;
|
|
66
70
|
}
|
|
67
71
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, childNode.id, {
|
|
68
|
-
labels: Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (node.missingLockFileEntry && {
|
|
72
|
+
labels: Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' })), (node.missingLockFileEntry && {
|
|
69
73
|
missingLockFileEntry: 'true',
|
|
70
74
|
})), (childNode.alias && {
|
|
71
75
|
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
@@ -73,7 +77,7 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
73
77
|
});
|
|
74
78
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
75
79
|
localVisited.add(childNode.id);
|
|
76
|
-
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, localVisited);
|
|
80
|
+
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, localVisited, showNpmScope);
|
|
77
81
|
}
|
|
78
82
|
};
|
|
79
83
|
//# sourceMappingURL=build-depgraph-simple.js.map
|
|
@@ -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,
|
|
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,mCACP,YAAY,GACZ;oBACD,KAAK,EAAE;wBACL,SAAS,EAAE,IAAI;wBACf,kBAAkB,EAAE,MAAM,CAAC,WAAW;wBACtC,MAAM,EAAE,MAAM,CAAC,OAAO;wBACtB,OAAO,EAAE,IAAI;qBACd;iBACF,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,SAAS,GAAG,IAAA,mBAAY,EAC5B,IAAI,EACJ,YAAY,EACZ,uBAAuB,EACvB,eAAe,EACf,mBAAmB,CACpB,CAAC;QAEF,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;YACnC,IAAI,mBAAmB,EAAE,CAAC;gBACxB,MAAM,QAAQ,GAAG,GAAG,SAAS,CAAC,EAAE,SAAS,CAAC;gBAC1C,eAAe,CAAC,UAAU,CACxB,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,EACpD,QAAQ,EACR;oBACE,MAAM,4DACJ,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,IAC/B,CAAC,YAAY,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KACjE,MAAM,EAAE,MAAM,KACX,CAAC,IAAI,CAAC,oBAAoB,IAAI;wBAC/B,oBAAoB,EAAE,MAAM;qBAC7B,CAAC,GACC,CAAC,SAAS,CAAC,KAAK,IAAI;wBACrB,KAAK,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,KAAK,CAAC,kBAAkB,IAAI,SAAS,CAAC,OAAO,EAAE;qBAClG,CAAC,CACH;iBACF,CACF,CAAC;gBACF,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;YACpD,CAAC;YACD,SAAS;QACX,CAAC;QAED,eAAe,CAAC,UAAU,CACxB,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,EACpD,SAAS,CAAC,EAAE,EACZ;YACE,MAAM,8CACJ,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,IAC/B,CAAC,YAAY,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAC9D,CAAC,IAAI,CAAC,oBAAoB,IAAI;gBAC/B,oBAAoB,EAAE,MAAM;aAC7B,CAAC,GACC,CAAC,SAAS,CAAC,KAAK,IAAI;gBACrB,KAAK,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,KAAK,CAAC,kBAAkB,IAAI,SAAS,CAAC,OAAO,EAAE;aAClG,CAAC,CACH;SACF,CACF,CAAC;QACF,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;QAClD,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,QAAQ,CACZ,eAAe,EACf,SAAS,EACT,uBAAuB,EACvB,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -13,8 +13,8 @@ var Color;
|
|
|
13
13
|
// Parse a single workspace package using yarn.lock v1
|
|
14
14
|
// workspaces feature
|
|
15
15
|
const buildDepGraphYarnLockV1WorkspaceCyclesPruned = async (extractedYarnLockV1Pkgs, pkgJson, workspacePkgNameToVersion, options) => {
|
|
16
|
-
const { includeDevDeps, strictOutOfSync, includeOptionalDeps } = options;
|
|
17
|
-
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version });
|
|
16
|
+
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, showNpmScope } = options;
|
|
17
|
+
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version }, (0, util_1.createNodeInfo)(options));
|
|
18
18
|
const colorMap = {};
|
|
19
19
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, { includeDevDeps });
|
|
20
20
|
const rootNode = {
|
|
@@ -24,7 +24,7 @@ const buildDepGraphYarnLockV1WorkspaceCyclesPruned = async (extractedYarnLockV1P
|
|
|
24
24
|
dependencies: topLevelDeps,
|
|
25
25
|
isDev: false,
|
|
26
26
|
};
|
|
27
|
-
await dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps);
|
|
27
|
+
await dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope);
|
|
28
28
|
return depGraphBuilder.build();
|
|
29
29
|
};
|
|
30
30
|
exports.buildDepGraphYarnLockV1WorkspaceCyclesPruned = buildDepGraphYarnLockV1WorkspaceCyclesPruned;
|
|
@@ -38,7 +38,7 @@ exports.buildDepGraphYarnLockV1WorkspaceCyclesPruned = buildDepGraphYarnLockV1Wo
|
|
|
38
38
|
* - A pruned node has id `${originalId}|1`
|
|
39
39
|
* When coming across another workspace package as child node, simply add the node and edge to the graph and mark it as BLACK.
|
|
40
40
|
*/
|
|
41
|
-
const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps) => {
|
|
41
|
+
const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope) => {
|
|
42
42
|
colorMap[node.id] = Color.GRAY;
|
|
43
43
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
44
44
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
@@ -50,9 +50,10 @@ const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs
|
|
|
50
50
|
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {
|
|
51
51
|
isCyclic: false,
|
|
52
52
|
isWorkspacePkg,
|
|
53
|
+
showNpmScope,
|
|
53
54
|
});
|
|
54
55
|
if (!isWorkspacePkg) {
|
|
55
|
-
await dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps);
|
|
56
|
+
await dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope);
|
|
56
57
|
}
|
|
57
58
|
else {
|
|
58
59
|
colorMap[childNode.id] = Color.BLACK;
|
|
@@ -64,6 +65,7 @@ const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs
|
|
|
64
65
|
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {
|
|
65
66
|
isCyclic: true,
|
|
66
67
|
isWorkspacePkg,
|
|
68
|
+
showNpmScope,
|
|
67
69
|
});
|
|
68
70
|
}
|
|
69
71
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-depgraph-workspace-package-pruned.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package-pruned.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"build-depgraph-workspace-package-pruned.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package-pruned.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ const util_1 = require("../util");
|
|
|
6
6
|
const util_2 = require("./util");
|
|
7
7
|
const event_loop_spinner_1 = require("event-loop-spinner");
|
|
8
8
|
const buildDepGraphYarnLockV1Workspace = async (extractedYarnLockV1Pkgs, pkgJson, workspacePkgNameToVersion, options) => {
|
|
9
|
-
const { includeDevDeps, strictOutOfSync, includeOptionalDeps } = options;
|
|
10
|
-
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version });
|
|
9
|
+
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, showNpmScope } = options;
|
|
10
|
+
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version }, (0, util_1.createNodeInfo)(options));
|
|
11
11
|
const visitedMap = new Set();
|
|
12
12
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, { includeDevDeps });
|
|
13
13
|
const rootNode = {
|
|
@@ -17,7 +17,7 @@ const buildDepGraphYarnLockV1Workspace = async (extractedYarnLockV1Pkgs, pkgJson
|
|
|
17
17
|
dependencies: topLevelDeps,
|
|
18
18
|
isDev: false,
|
|
19
19
|
};
|
|
20
|
-
await dfsVisit(depGraphBuilder, rootNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps);
|
|
20
|
+
await dfsVisit(depGraphBuilder, rootNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope);
|
|
21
21
|
return depGraphBuilder.build();
|
|
22
22
|
};
|
|
23
23
|
exports.buildDepGraphYarnLockV1Workspace = buildDepGraphYarnLockV1Workspace;
|
|
@@ -31,7 +31,7 @@ exports.buildDepGraphYarnLockV1Workspace = buildDepGraphYarnLockV1Workspace;
|
|
|
31
31
|
* - A pruned node has id `${originalId}|1`
|
|
32
32
|
* When coming across another workspace package as child node, simply add the node and edge to the graph and mark it as BLACK.
|
|
33
33
|
*/
|
|
34
|
-
const dfsVisit = async (depGraphBuilder, node, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps) => {
|
|
34
|
+
const dfsVisit = async (depGraphBuilder, node, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope) => {
|
|
35
35
|
visitedMap.add(node.id);
|
|
36
36
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
37
37
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
@@ -43,9 +43,10 @@ const dfsVisit = async (depGraphBuilder, node, visitedMap, extractedYarnLockV1Pk
|
|
|
43
43
|
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {
|
|
44
44
|
isCyclic: false,
|
|
45
45
|
isWorkspacePkg,
|
|
46
|
+
showNpmScope,
|
|
46
47
|
});
|
|
47
48
|
if (!isWorkspacePkg) {
|
|
48
|
-
await dfsVisit(depGraphBuilder, childNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps);
|
|
49
|
+
await dfsVisit(depGraphBuilder, childNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope);
|
|
49
50
|
}
|
|
50
51
|
}
|
|
51
52
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-depgraph-workspace-package.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"build-depgraph-workspace-package.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAKiB;AAGjB,iCAAyD;AACzD,2DAAsD;AAE/C,MAAM,gCAAgC,GAAG,KAAK,EACnD,uBAAuC,EACvC,OAAwB,EACxB,yBAAiD,EACjD,OAA6B,EAC7B,EAAE;IACF,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAC1E,OAAO,CAAC;IAEV,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,UAAU,GAAgB,IAAI,GAAG,EAAE,CAAC;IAE1C,MAAM,YAAY,GAAG,IAAA,sBAAe,EAAC,OAAO,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,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,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,eAAe,EACf,mBAAmB,EACnB,YAAY,CACb,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AAvCW,QAAA,gCAAgC,oCAuC3C;AAEF;;;;;;;;;GASG;AACH,MAAM,QAAQ,GAAG,KAAK,EACpB,eAAgC,EAChC,IAAa,EACb,UAAuB,EACvB,uBAAuC,EACvC,yBAAiD,EACjD,eAAwB,EACxB,mBAA4B,EAC5B,YAAsB,EACP,EAAE;IACjB,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAC;QACtE,IAAI,qCAAgB,CAAC,UAAU,EAAE,EAAE,CAAC;YAClC,MAAM,qCAAgB,CAAC,IAAI,EAAE,CAAC;QAChC,CAAC;QACD,MAAM,cAAc,GAAG,CAAC,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,SAAS,GAAG,IAAA,sCAA+B,EAC/C,IAAI,EACJ,OAAO,EACP,yBAAyB,EACzB,uBAAuB,EACvB,eAAe,EACf,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;YAClC,IAAA,wBAAiB,EAAC,eAAe,EAAE,SAAS,EAAE;gBAC5C,QAAQ,EAAE,KAAK;gBACf,cAAc;gBACd,YAAY;aACb,CAAC,CAAC;YACH,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,QAAQ,CACZ,eAAe,EACf,SAAS,EACT,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,eAAe,EACf,mBAAmB,EACnB,YAAY,CACb,CAAC;YACJ,CAAC;QACH,CAAC;QAED,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -7,7 +7,7 @@ const util_1 = require("../util");
|
|
|
7
7
|
const build_depgraph_simple_pruned_1 = require("./build-depgraph-simple-pruned");
|
|
8
8
|
const extract_yarnlock_v1_pkgs_1 = require("./extract-yarnlock-v1-pkgs");
|
|
9
9
|
const parseYarnLockV1Project = async (pkgJsonContent, yarnLockContent, options) => {
|
|
10
|
-
const { includeDevDeps, includeOptionalDeps, includePeerDeps, pruneLevel, strictOutOfSync, honorAliases, } = options;
|
|
10
|
+
const { includeDevDeps, includeOptionalDeps, includePeerDeps, pruneLevel, strictOutOfSync, honorAliases, showNpmScope, } = options;
|
|
11
11
|
const pkgs = (0, extract_yarnlock_v1_pkgs_1.extractPkgsFromYarnLockV1)(yarnLockContent);
|
|
12
12
|
const pkgJson = (0, util_1.parsePkgJson)(honorAliases ? (0, pkgJson_1.rewriteAliasesPkgJson)(pkgJsonContent) : pkgJsonContent);
|
|
13
13
|
const depGraph = pruneLevel === 'cycles'
|
|
@@ -15,6 +15,7 @@ const parseYarnLockV1Project = async (pkgJsonContent, yarnLockContent, options)
|
|
|
15
15
|
includeDevDeps,
|
|
16
16
|
strictOutOfSync,
|
|
17
17
|
includeOptionalDeps,
|
|
18
|
+
showNpmScope,
|
|
18
19
|
})
|
|
19
20
|
: await (0, _1.buildDepGraphYarnLockV1Simple)(pkgs, pkgJson, {
|
|
20
21
|
includeDevDeps,
|
|
@@ -22,6 +23,7 @@ const parseYarnLockV1Project = async (pkgJsonContent, yarnLockContent, options)
|
|
|
22
23
|
includePeerDeps,
|
|
23
24
|
strictOutOfSync,
|
|
24
25
|
pruneWithinTopLevelDeps: pruneLevel === 'withinTopLevelDeps',
|
|
26
|
+
showNpmScope,
|
|
25
27
|
});
|
|
26
28
|
return depGraph;
|
|
27
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/simple.ts"],"names":[],"mappings":";;;AAAA,wBAAkD;AAClD,gEAA2E;AAG3E,kCAAuC;AACvC,iFAA2F;AAC3F,yEAAuE;AAEhE,MAAM,sBAAsB,GAAG,KAAK,EACzC,cAAsB,EACtB,eAAuB,EACvB,OAAsC,EACtC,EAAE;IACF,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,UAAU,EACV,eAAe,EACf,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,MAAM,IAAI,GAAG,IAAA,oDAAyB,EAAC,eAAe,CAAC,CAAC;IAExD,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAC3C,YAAY,CAAC,CAAC,CAAC,IAAA,+BAAqB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CACtE,CAAC;IAEF,MAAM,QAAQ,GACZ,UAAU,KAAK,QAAQ;QACrB,CAAC,CAAC,MAAM,IAAA,wEAAyC,EAAC,IAAI,EAAE,OAAO,EAAE;YAC7D,cAAc;YACd,eAAe;YACf,mBAAmB;
|
|
1
|
+
{"version":3,"file":"simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/simple.ts"],"names":[],"mappings":";;;AAAA,wBAAkD;AAClD,gEAA2E;AAG3E,kCAAuC;AACvC,iFAA2F;AAC3F,yEAAuE;AAEhE,MAAM,sBAAsB,GAAG,KAAK,EACzC,cAAsB,EACtB,eAAuB,EACvB,OAAsC,EACtC,EAAE;IACF,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,UAAU,EACV,eAAe,EACf,YAAY,EACZ,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,MAAM,IAAI,GAAG,IAAA,oDAAyB,EAAC,eAAe,CAAC,CAAC;IAExD,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAC3C,YAAY,CAAC,CAAC,CAAC,IAAA,+BAAqB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CACtE,CAAC;IAEF,MAAM,QAAQ,GACZ,UAAU,KAAK,QAAQ;QACrB,CAAC,CAAC,MAAM,IAAA,wEAAyC,EAAC,IAAI,EAAE,OAAO,EAAE;YAC7D,cAAc;YACd,eAAe;YACf,mBAAmB;YACnB,YAAY;SACb,CAAC;QACJ,CAAC,CAAC,MAAM,IAAA,gCAA6B,EAAC,IAAI,EAAE,OAAO,EAAE;YACjD,cAAc;YACd,mBAAmB;YACnB,eAAe;YACf,eAAe;YACf,uBAAuB,EAAE,UAAU,KAAK,oBAAoB;YAC5D,YAAY;SACb,CAAC,CAAC;IAET,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAvCW,QAAA,sBAAsB,0BAuCjC"}
|
|
@@ -5,9 +5,10 @@ const dep_graph_1 = require("@snyk/dep-graph");
|
|
|
5
5
|
const util_1 = require("../util");
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
7
|
const event_loop_spinner_1 = require("event-loop-spinner");
|
|
8
|
+
const pkgJson_1 = require("../../aliasesPreprocessors/pkgJson");
|
|
8
9
|
const buildDepGraphYarnLockV2Simple = async (extractedYarnLockV2Pkgs, pkgJson, options, workspaceArgs) => {
|
|
9
|
-
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevelDeps, } = options;
|
|
10
|
-
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version });
|
|
10
|
+
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
11
|
+
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version }, (0, util_1.createNodeInfo)(options));
|
|
11
12
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, {
|
|
12
13
|
includeDevDeps,
|
|
13
14
|
});
|
|
@@ -21,7 +22,7 @@ const buildDepGraphYarnLockV2Simple = async (extractedYarnLockV2Pkgs, pkgJson, o
|
|
|
21
22
|
await dfsVisit(depGraphBuilder, rootNode, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps,
|
|
22
23
|
// we have rootWorkspaceResolutions if this is workspace pkg with resolutions
|
|
23
24
|
// at root - therefore it should take precedent
|
|
24
|
-
(workspaceArgs === null || workspaceArgs === void 0 ? void 0 : workspaceArgs.rootResolutions) || pkgJson.resolutions || {}, pruneWithinTopLevelDeps);
|
|
25
|
+
(workspaceArgs === null || workspaceArgs === void 0 ? void 0 : workspaceArgs.rootResolutions) || pkgJson.resolutions || {}, pruneWithinTopLevelDeps, undefined, showNpmScope);
|
|
25
26
|
return depGraphBuilder.build();
|
|
26
27
|
};
|
|
27
28
|
exports.buildDepGraphYarnLockV2Simple = buildDepGraphYarnLockV2Simple;
|
|
@@ -31,7 +32,7 @@ exports.buildDepGraphYarnLockV2Simple = buildDepGraphYarnLockV2Simple;
|
|
|
31
32
|
* - If a node doesn't exist in the map, it means it hasn't been visited.
|
|
32
33
|
* - If a node is already visited, simply connect the new node with this node.
|
|
33
34
|
*/
|
|
34
|
-
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, pruneWithinTopLevel, visited) => {
|
|
35
|
+
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, pruneWithinTopLevel, visited, showNpmScope) => {
|
|
35
36
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
36
37
|
let scopeDepInfo = depInfo;
|
|
37
38
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
@@ -39,14 +40,17 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
39
40
|
}
|
|
40
41
|
if (depInfo.version.startsWith('npm:') &&
|
|
41
42
|
depInfo.version.indexOf('@') > -1) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
43
|
+
const parsed = (0, pkgJson_1.parseNpmAlias)(depInfo.version);
|
|
44
|
+
if (parsed && parsed.packageName) {
|
|
45
|
+
scopeDepInfo = Object.assign(Object.assign({}, scopeDepInfo), {
|
|
46
|
+
alias: {
|
|
47
|
+
aliasName: name,
|
|
48
|
+
aliasTargetDepName: parsed.packageName,
|
|
49
|
+
semver: parsed.version,
|
|
50
|
+
version: null,
|
|
51
|
+
},
|
|
52
|
+
});
|
|
53
|
+
}
|
|
50
54
|
}
|
|
51
55
|
const localVisited = visited || new Set();
|
|
52
56
|
const childNode = (0, utils_1.getYarnLockV2ChildNode)(name, scopeDepInfo, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, node);
|
|
@@ -54,7 +58,7 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
54
58
|
if (pruneWithinTopLevel) {
|
|
55
59
|
const prunedId = `${childNode.id}:pruned`;
|
|
56
60
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, prunedId, {
|
|
57
|
-
labels: Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod', pruned: 'true' }, (node.missingLockFileEntry && {
|
|
61
|
+
labels: Object.assign(Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' })), { pruned: 'true' }), (node.missingLockFileEntry && {
|
|
58
62
|
missingLockFileEntry: 'true',
|
|
59
63
|
})), (childNode.alias && {
|
|
60
64
|
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
@@ -68,7 +72,7 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
68
72
|
continue;
|
|
69
73
|
}
|
|
70
74
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, childNode.id, {
|
|
71
|
-
labels: Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (node.missingLockFileEntry && {
|
|
75
|
+
labels: Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' })), (node.missingLockFileEntry && {
|
|
72
76
|
missingLockFileEntry: 'true',
|
|
73
77
|
})), (childNode.alias && {
|
|
74
78
|
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
@@ -76,7 +80,7 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
76
80
|
});
|
|
77
81
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
78
82
|
localVisited.add(childNode.id);
|
|
79
|
-
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, pruneWithinTopLevel, localVisited);
|
|
83
|
+
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, pruneWithinTopLevel, localVisited, showNpmScope);
|
|
80
84
|
}
|
|
81
85
|
};
|
|
82
86
|
//# 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,
|
|
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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"}
|
|
@@ -6,7 +6,7 @@ const util_1 = require("../util");
|
|
|
6
6
|
const build_depgraph_simple_1 = require("./build-depgraph-simple");
|
|
7
7
|
const pkgJson_1 = require("../../aliasesPreprocessors/pkgJson");
|
|
8
8
|
const parseYarnLockV2Project = async (pkgJsonContent, yarnLockContent, options, workspaceArgs) => {
|
|
9
|
-
const { includeDevDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, honorAliases, } = options;
|
|
9
|
+
const { includeDevDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, honorAliases, showNpmScope, } = options;
|
|
10
10
|
const pkgs = (0, extract_yarnlock_v2_pkgs_1.extractPkgsFromYarnLockV2)(yarnLockContent);
|
|
11
11
|
const pkgJson = (0, util_1.parsePkgJson)(honorAliases ? (0, pkgJson_1.rewriteAliasesPkgJson)(pkgJsonContent) : pkgJsonContent);
|
|
12
12
|
const depgraph = await (0, build_depgraph_simple_1.buildDepGraphYarnLockV2Simple)(pkgs, pkgJson, {
|
|
@@ -14,6 +14,7 @@ const parseYarnLockV2Project = async (pkgJsonContent, yarnLockContent, options,
|
|
|
14
14
|
strictOutOfSync,
|
|
15
15
|
includeOptionalDeps,
|
|
16
16
|
pruneWithinTopLevelDeps,
|
|
17
|
+
showNpmScope,
|
|
17
18
|
}, workspaceArgs);
|
|
18
19
|
return depgraph;
|
|
19
20
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/simple.ts"],"names":[],"mappings":";;;AAAA,yEAAuE;AACvE,kCAAuC;AAMvC,mEAAwE;AAExE,gEAA2E;AAEpE,MAAM,sBAAsB,GAAG,KAAK,EACzC,cAAsB,EACtB,eAAuB,EACvB,OAAsC,EACtC,aAAuC,EACpB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,MAAM,IAAI,GAAG,IAAA,oDAAyB,EAAC,eAAe,CAAC,CAAC;IACxD,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAC3C,YAAY,CAAC,CAAC,CAAC,IAAA,+BAAqB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CACtE,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,qDAA6B,EAClD,IAAI,EACJ,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,mBAAmB;QACnB,uBAAuB;
|
|
1
|
+
{"version":3,"file":"simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/simple.ts"],"names":[],"mappings":";;;AAAA,yEAAuE;AACvE,kCAAuC;AAMvC,mEAAwE;AAExE,gEAA2E;AAEpE,MAAM,sBAAsB,GAAG,KAAK,EACzC,cAAsB,EACtB,eAAuB,EACvB,OAAsC,EACtC,aAAuC,EACpB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,YAAY,EACZ,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,MAAM,IAAI,GAAG,IAAA,oDAAyB,EAAC,eAAe,CAAC,CAAC;IACxD,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAC3C,YAAY,CAAC,CAAC,CAAC,IAAA,+BAAqB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CACtE,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,qDAA6B,EAClD,IAAI,EACJ,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,mBAAmB;QACnB,uBAAuB;QACvB,YAAY;KACb,EACD,aAAa,CACd,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAlCW,QAAA,sBAAsB,0BAkCjC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { getPnpmLockfileParser } from './dep-graph-builders/pnpm/lockfile-parser
|
|
|
7
7
|
import type { PackageJsonBase, NormalisedPkgs, ProjectParseOptions, YarnLockV2ProjectParseOptions } from './dep-graph-builders/types';
|
|
8
8
|
import { getLockfileVersionFromFile, getNpmLockfileVersion, getYarnLockfileVersion, getPnpmLockfileVersion, NodeLockfileVersion } from './utils';
|
|
9
9
|
export { parseNpmLockV2Project, extractPkgsFromYarnLockV1, parseYarnLockV1Project, parseYarnLockV1WorkspaceProject, buildDepGraphYarnLockV1SimpleCyclesPruned, buildDepGraphYarnLockV1Simple, buildDepGraphYarnLockV1WorkspaceCyclesPruned, buildDepGraphYarnLockV1Workspace, extractPkgsFromYarnLockV2, parseYarnLockV2Project, buildDepGraphYarnLockV2Simple, getPnpmLockfileParser, parsePnpmProject, parsePnpmWorkspace, parsePnpmWorkspaceProject, parsePkgJson, PackageJsonBase, ProjectParseOptions, YarnLockV2ProjectParseOptions, NormalisedPkgs, NormalisedPkgs as YarnLockPackages, getLockfileVersionFromFile, getNpmLockfileVersion, getYarnLockfileVersion, getPnpmLockfileVersion, NodeLockfileVersion, };
|
|
10
|
-
declare function buildDepTree(manifestFileContents: string, lockFileContents: string, includeDev?: boolean, lockfileType?: LockfileType, strictOutOfSync?: boolean, defaultManifestFileName?: string): Promise<PkgTree>;
|
|
11
|
-
declare function buildDepTreeFromFiles(root: string, manifestFilePath: string, lockFilePath: string, includeDev?: boolean, strictOutOfSync?: boolean, honorAliases?: boolean): Promise<PkgTree>;
|
|
10
|
+
declare function buildDepTree(manifestFileContents: string, lockFileContents: string, includeDev?: boolean, lockfileType?: LockfileType, strictOutOfSync?: boolean, defaultManifestFileName?: string, showNpmScope?: boolean): Promise<PkgTree>;
|
|
11
|
+
declare function buildDepTreeFromFiles(root: string, manifestFilePath: string, lockFilePath: string, includeDev?: boolean, strictOutOfSync?: boolean, honorAliases?: boolean, showNpmScope?: boolean): Promise<PkgTree>;
|
|
12
12
|
declare function getYarnWorkspacesFromFiles(root: any, manifestFilePath: string): string[] | false;
|
|
13
13
|
export declare function getYarnLockfileType(lockFileContents: string, root?: string, lockFilePath?: string): LockfileType;
|
package/dist/index.js
CHANGED
|
@@ -49,7 +49,7 @@ Object.defineProperty(exports, "getPnpmLockfileVersion", { enumerable: true, get
|
|
|
49
49
|
Object.defineProperty(exports, "NodeLockfileVersion", { enumerable: true, get: function () { return utils_1.NodeLockfileVersion; } });
|
|
50
50
|
const pkgJson_1 = require("./aliasesPreprocessors/pkgJson");
|
|
51
51
|
// **********************************
|
|
52
|
-
async function buildDepTree(manifestFileContents, lockFileContents, includeDev = false, lockfileType, strictOutOfSync = true, defaultManifestFileName = 'package.json') {
|
|
52
|
+
async function buildDepTree(manifestFileContents, lockFileContents, includeDev = false, lockfileType, strictOutOfSync = true, defaultManifestFileName = 'package.json', showNpmScope) {
|
|
53
53
|
if (!lockfileType) {
|
|
54
54
|
lockfileType = parsers_1.LockfileType.npm;
|
|
55
55
|
}
|
|
@@ -79,9 +79,9 @@ async function buildDepTree(manifestFileContents, lockFileContents, includeDev =
|
|
|
79
79
|
: defaultManifestFileName;
|
|
80
80
|
}
|
|
81
81
|
const lockFile = lockfileParser.parseLockFile(lockFileContents);
|
|
82
|
-
return lockfileParser.getDependencyTree(manifestFile, lockFile, includeDev, strictOutOfSync);
|
|
82
|
+
return lockfileParser.getDependencyTree(manifestFile, lockFile, includeDev, strictOutOfSync, showNpmScope);
|
|
83
83
|
}
|
|
84
|
-
async function buildDepTreeFromFiles(root, manifestFilePath, lockFilePath, includeDev = false, strictOutOfSync = true, honorAliases) {
|
|
84
|
+
async function buildDepTreeFromFiles(root, manifestFilePath, lockFilePath, includeDev = false, strictOutOfSync = true, honorAliases, showNpmScope) {
|
|
85
85
|
if (!root || !manifestFilePath || !lockFilePath) {
|
|
86
86
|
throw new Error('Missing required parameters for buildDepTreeFromFiles()');
|
|
87
87
|
}
|
|
@@ -109,7 +109,7 @@ async function buildDepTreeFromFiles(root, manifestFilePath, lockFilePath, inclu
|
|
|
109
109
|
}
|
|
110
110
|
return await buildDepTree(honorAliases
|
|
111
111
|
? (0, pkgJson_1.rewriteAliasesPkgJson)(manifestFileContents)
|
|
112
|
-
: manifestFileContents, lockFileContents, includeDev, lockFileType, strictOutOfSync, manifestFilePath);
|
|
112
|
+
: manifestFileContents, lockFileContents, includeDev, lockFileType, strictOutOfSync, manifestFilePath, showNpmScope);
|
|
113
113
|
}
|
|
114
114
|
function getYarnWorkspacesFromFiles(root, manifestFilePath) {
|
|
115
115
|
if (!root || !manifestFilePath) {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;AAwBE,oCAAY;AACZ,sDAAqB;AAErB,gEAA0B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}
|
package/dist/parsers/index.d.ts
CHANGED
|
@@ -52,6 +52,7 @@ export interface DepTreeDep {
|
|
|
52
52
|
};
|
|
53
53
|
labels?: {
|
|
54
54
|
[key: string]: string | Alias | undefined;
|
|
55
|
+
'npm:scope'?: 'prod' | 'dev' | 'unknown';
|
|
55
56
|
scope?: 'dev' | 'prod';
|
|
56
57
|
pruned?: 'cyclic' | 'true';
|
|
57
58
|
missingLockFileEntry?: 'true';
|
|
@@ -86,7 +87,7 @@ export declare enum LockfileType {
|
|
|
86
87
|
}
|
|
87
88
|
export interface LockfileParser {
|
|
88
89
|
parseLockFile: (lockFileContents: string) => Lockfile;
|
|
89
|
-
getDependencyTree: (manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean) => Promise<PkgTree>;
|
|
90
|
+
getDependencyTree: (manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean, showNpmScope?: boolean) => Promise<PkgTree>;
|
|
90
91
|
}
|
|
91
92
|
export type Lockfile = PackageLock | YarnLock | Yarn2Lock;
|
|
92
93
|
export declare function parseManifestFile(manifestFileContents: string): ManifestFile;
|
|
@@ -96,7 +97,7 @@ export declare function getTopLevelDeps({ targetFile, includeDev, includePeerDep
|
|
|
96
97
|
includePeerDeps?: boolean;
|
|
97
98
|
applyYarn2Resolutions?: boolean;
|
|
98
99
|
}): Dep[];
|
|
99
|
-
export declare function createDepTreeDepFromDep(dep: Dep): DepTreeDep;
|
|
100
|
+
export declare function createDepTreeDepFromDep(dep: Dep, showNpmScope?: boolean): DepTreeDep;
|
|
100
101
|
export declare function getYarnWorkspaces(targetFile: string): string[] | false;
|
|
101
102
|
export declare function getPnpmWorkspaces(workspacesYamlFile: string): string[];
|
|
102
103
|
export {};
|
package/dist/parsers/index.js
CHANGED
|
@@ -62,11 +62,9 @@ function getTopLevelDeps({ targetFile, includeDev, includePeerDeps = false, appl
|
|
|
62
62
|
}
|
|
63
63
|
return dependencies;
|
|
64
64
|
}
|
|
65
|
-
function createDepTreeDepFromDep(dep) {
|
|
65
|
+
function createDepTreeDepFromDep(dep, showNpmScope) {
|
|
66
66
|
return {
|
|
67
|
-
labels: {
|
|
68
|
-
scope: dep.dev ? Scope.dev : Scope.prod,
|
|
69
|
-
},
|
|
67
|
+
labels: Object.assign({ scope: dep.dev ? Scope.dev : Scope.prod }, (showNpmScope && { 'npm:scope': dep.dev ? Scope.dev : Scope.prod })),
|
|
70
68
|
name: dep.name,
|
|
71
69
|
version: dep.version,
|
|
72
70
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/parsers/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/parsers/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export declare abstract class LockParserBase implements LockfileParser {
|
|
|
22
22
|
protected pathDelimiter: string;
|
|
23
23
|
constructor(type: LockfileType, treeSizeLimit: number);
|
|
24
24
|
abstract parseLockFile(lockFileContents: string): Lockfile;
|
|
25
|
-
getDependencyTree(manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean): Promise<PkgTree>;
|
|
25
|
+
getDependencyTree(manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean, showNpmScope?: boolean): Promise<PkgTree>;
|
|
26
26
|
private setDevDepRec;
|
|
27
27
|
private removeCycle;
|
|
28
28
|
private cloneAcyclicNodeEdges;
|
|
@@ -31,6 +31,7 @@ export declare abstract class LockParserBase implements LockfileParser {
|
|
|
31
31
|
private findDepsPath;
|
|
32
32
|
private createDepTrees;
|
|
33
33
|
protected getDepMap(lockfile: Lockfile, // eslint-disable-line @typescript-eslint/no-unused-vars
|
|
34
|
-
resolutions?: ManifestDependencies
|
|
34
|
+
resolutions?: ManifestDependencies, // eslint-disable-line @typescript-eslint/no-unused-vars
|
|
35
|
+
showNpmScope?: boolean): DepMap;
|
|
35
36
|
protected getDepTreeKey(dep: Dep): string;
|
|
36
37
|
}
|