snyk-nodejs-lockfile-parser 2.4.4 → 2.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- 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 +15 -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 +7 -7
- 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 +7 -7
- 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/dep-graph-builders/yarn-lock-v2/utils.js +11 -3
- package/dist/dep-graph-builders/yarn-lock-v2/utils.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
|
@@ -15,7 +15,7 @@ const event_loop_spinner_1 = require("event-loop-spinner");
|
|
|
15
15
|
const pkgJson_2 = require("../../aliasesPreprocessors/pkgJson");
|
|
16
16
|
const ROOT_NODE_ID = 'root-node';
|
|
17
17
|
const parseNpmLockV2Project = async (pkgJsonContent, pkgLockContent, options) => {
|
|
18
|
-
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, pruneNpmStrictOutOfSync, } = options;
|
|
18
|
+
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, pruneNpmStrictOutOfSync, showNpmScope, } = options;
|
|
19
19
|
const pkgJson = (0, util_1.parsePkgJson)(options.honorAliases
|
|
20
20
|
? (0, pkgJson_2.rewriteAliasesPkgJson)(pkgJsonContent)
|
|
21
21
|
: pkgJsonContent);
|
|
@@ -25,13 +25,14 @@ const parseNpmLockV2Project = async (pkgJsonContent, pkgLockContent, options) =>
|
|
|
25
25
|
includeOptionalDeps,
|
|
26
26
|
strictOutOfSync,
|
|
27
27
|
pruneNpmStrictOutOfSync,
|
|
28
|
+
showNpmScope,
|
|
28
29
|
});
|
|
29
30
|
return depgraph;
|
|
30
31
|
};
|
|
31
32
|
exports.parseNpmLockV2Project = parseNpmLockV2Project;
|
|
32
33
|
const buildDepGraphNpmLockV2 = async (npmLockPkgs, pkgJson, options) => {
|
|
33
|
-
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, pruneNpmStrictOutOfSync, } = options;
|
|
34
|
-
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'npm' }, { name: pkgJson.name, version: pkgJson.version });
|
|
34
|
+
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, pruneNpmStrictOutOfSync, showNpmScope, } = options;
|
|
35
|
+
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'npm' }, { name: pkgJson.name, version: pkgJson.version }, (0, util_1.createNodeInfo)(options));
|
|
35
36
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, {
|
|
36
37
|
includeDevDeps,
|
|
37
38
|
includeOptionalDeps,
|
|
@@ -58,11 +59,11 @@ const buildDepGraphNpmLockV2 = async (npmLockPkgs, pkgJson, options) => {
|
|
|
58
59
|
return acc;
|
|
59
60
|
}, new Map());
|
|
60
61
|
const visitedMap = new Set();
|
|
61
|
-
await dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [], pkgKeysByName, pkgJson.overrides, pruneNpmStrictOutOfSync);
|
|
62
|
+
await dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [], pkgKeysByName, pkgJson.overrides, pruneNpmStrictOutOfSync, showNpmScope);
|
|
62
63
|
return depGraphBuilder.build();
|
|
63
64
|
};
|
|
64
65
|
exports.buildDepGraphNpmLockV2 = buildDepGraphNpmLockV2;
|
|
65
|
-
const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName, overrides, pruneNpmStrictOutOfSync) => {
|
|
66
|
+
const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName, overrides, pruneNpmStrictOutOfSync, showNpmScope) => {
|
|
66
67
|
visitedMap.add(node.id);
|
|
67
68
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
68
69
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
@@ -79,7 +80,7 @@ const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOu
|
|
|
79
80
|
},
|
|
80
81
|
], pkgKeysByName, overrides, pruneNpmStrictOutOfSync);
|
|
81
82
|
if (!visitedMap.has(childNode.id)) {
|
|
82
|
-
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {});
|
|
83
|
+
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, { showNpmScope });
|
|
83
84
|
await dfsVisit(depGraphBuilder, childNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [
|
|
84
85
|
...ancestry,
|
|
85
86
|
{
|
|
@@ -89,7 +90,7 @@ const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOu
|
|
|
89
90
|
key: node.key,
|
|
90
91
|
inBundle: node.inBundle || false,
|
|
91
92
|
},
|
|
92
|
-
], pkgKeysByName, overrides);
|
|
93
|
+
], pkgKeysByName, overrides, undefined, showNpmScope);
|
|
93
94
|
}
|
|
94
95
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
95
96
|
}
|
|
@@ -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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"}
|
|
@@ -13,8 +13,8 @@ const constants_1 = require("./constants");
|
|
|
13
13
|
const debug = debugModule('snyk-pnpm-workspaces');
|
|
14
14
|
const buildDepGraphPnpm = async (lockFileParser, pkgJson, options, importer) => {
|
|
15
15
|
var _a;
|
|
16
|
-
const { strictOutOfSync, includeOptionalDeps, includeDevDeps, pruneWithinTopLevelDeps, } = options;
|
|
17
|
-
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'pnpm' }, { name: pkgJson.name, version: pkgJson.version || constants_1.UNDEFINED_VERSION });
|
|
16
|
+
const { strictOutOfSync, includeOptionalDeps, includeDevDeps, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
17
|
+
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'pnpm' }, { name: pkgJson.name, version: pkgJson.version || constants_1.UNDEFINED_VERSION }, (0, util_1.createNodeInfo)(options));
|
|
18
18
|
lockFileParser.extractedPackages = lockFileParser.extractPackages();
|
|
19
19
|
const extractedPnpmPkgs = lockFileParser.extractedPackages;
|
|
20
20
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, options);
|
|
@@ -41,7 +41,7 @@ const buildDepGraphPnpm = async (lockFileParser, pkgJson, options, importer) =>
|
|
|
41
41
|
isDev: false,
|
|
42
42
|
};
|
|
43
43
|
const rootNodeId = `${pkgJson.name}@${pkgJson.version}`;
|
|
44
|
-
await dfsVisit(depGraphBuilder, rootNodeId, rootNode, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, ((_a = pkgJson.pnpm) === null || _a === void 0 ? void 0 : _a.overrides) || {}, pruneWithinTopLevelDeps, lockFileParser);
|
|
44
|
+
await dfsVisit(depGraphBuilder, rootNodeId, rootNode, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, ((_a = pkgJson.pnpm) === null || _a === void 0 ? void 0 : _a.overrides) || {}, pruneWithinTopLevelDeps, lockFileParser, undefined, showNpmScope);
|
|
45
45
|
return depGraphBuilder.build();
|
|
46
46
|
};
|
|
47
47
|
exports.buildDepGraphPnpm = buildDepGraphPnpm;
|
|
@@ -51,7 +51,7 @@ exports.buildDepGraphPnpm = buildDepGraphPnpm;
|
|
|
51
51
|
* - If a node doesn't exist in the map, it means it hasn't been visited.
|
|
52
52
|
* - If a node is already visited, simply connect the new node with this node.
|
|
53
53
|
*/
|
|
54
|
-
const dfsVisit = async (depGraphBuilder, rootNodeId, node, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, overrides, pruneWithinTopLevel, lockFileParser, visited) => {
|
|
54
|
+
const dfsVisit = async (depGraphBuilder, rootNodeId, node, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, overrides, pruneWithinTopLevel, lockFileParser, visited, showNpmScope) => {
|
|
55
55
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
56
56
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
57
57
|
await event_loop_spinner_1.eventLoopSpinner.spin();
|
|
@@ -62,7 +62,9 @@ const dfsVisit = async (depGraphBuilder, rootNodeId, node, extractedPnpmPkgs, st
|
|
|
62
62
|
if (pruneWithinTopLevel) {
|
|
63
63
|
const prunedId = `${childNode.id}:pruned`;
|
|
64
64
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, prunedId, {
|
|
65
|
-
labels: Object.assign({ scope: childNode.isDev ? 'dev' : 'prod'
|
|
65
|
+
labels: Object.assign(Object.assign(Object.assign({ scope: childNode.isDev ? 'dev' : 'prod' }, (showNpmScope && {
|
|
66
|
+
'npm:scope': childNode.isDev ? 'dev' : 'prod',
|
|
67
|
+
})), { pruned: 'true' }), (node.missingLockFileEntry && {
|
|
66
68
|
missingLockFileEntry: 'true',
|
|
67
69
|
})),
|
|
68
70
|
});
|
|
@@ -74,13 +76,15 @@ const dfsVisit = async (depGraphBuilder, rootNodeId, node, extractedPnpmPkgs, st
|
|
|
74
76
|
continue;
|
|
75
77
|
}
|
|
76
78
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, childNode.id, {
|
|
77
|
-
labels: Object.assign({ scope: childNode.isDev ? 'dev' : 'prod' }, (
|
|
79
|
+
labels: Object.assign(Object.assign({ scope: childNode.isDev ? 'dev' : 'prod' }, (showNpmScope && {
|
|
80
|
+
'npm:scope': childNode.isDev ? 'dev' : 'prod',
|
|
81
|
+
})), (node.missingLockFileEntry && {
|
|
78
82
|
missingLockFileEntry: 'true',
|
|
79
83
|
})),
|
|
80
84
|
});
|
|
81
85
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
82
86
|
localVisited.add(childNode.id);
|
|
83
|
-
await dfsVisit(depGraphBuilder, rootNodeId, childNode, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, overrides, pruneWithinTopLevel, lockFileParser, localVisited);
|
|
87
|
+
await dfsVisit(depGraphBuilder, rootNodeId, childNode, extractedPnpmPkgs, strictOutOfSync, includeOptionalDeps, includeDevDeps, overrides, pruneWithinTopLevel, lockFileParser, localVisited, showNpmScope);
|
|
84
88
|
}
|
|
85
89
|
};
|
|
86
90
|
//# 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,
|
|
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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"}
|
|
@@ -5,7 +5,7 @@ const util_1 = require("../util");
|
|
|
5
5
|
const build_dep_graph_pnpm_1 = require("./build-dep-graph-pnpm");
|
|
6
6
|
const index_1 = require("./lockfile-parser/index");
|
|
7
7
|
const parsePnpmProject = async (pkgJsonContent, pnpmLockContent, options, lockfileVersion) => {
|
|
8
|
-
const { includeDevDeps, includePeerDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, } = options;
|
|
8
|
+
const { includeDevDeps, includePeerDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
9
9
|
let importer = '';
|
|
10
10
|
const pkgJson = (0, util_1.parsePkgJson)(pkgJsonContent);
|
|
11
11
|
const lockFileParser = (0, index_1.getPnpmLockfileParser)(pnpmLockContent, lockfileVersion);
|
|
@@ -25,6 +25,7 @@ const parsePnpmProject = async (pkgJsonContent, pnpmLockContent, options, lockfi
|
|
|
25
25
|
includePeerDeps,
|
|
26
26
|
includeOptionalDeps,
|
|
27
27
|
pruneWithinTopLevelDeps,
|
|
28
|
+
showNpmScope,
|
|
28
29
|
}, importer);
|
|
29
30
|
return depgraph;
|
|
30
31
|
};
|
|
@@ -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,eAAmC,EACnC,OAAgC,EAChC,eAAqC,EAClB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,
|
|
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,eAAmC,EACnC,OAAgC,EAChC,eAAqC,EAClB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,YAAY,GACb,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,CAAC;QACnD,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;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAiB,EACtC,cAAc,EACd,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,eAAe;QACf,mBAAmB;QACnB,uBAAuB;QACvB,YAAY;KACb,EACD,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAjDW,QAAA,gBAAgB,oBAiD3B"}
|
|
@@ -6,7 +6,7 @@ const build_dep_graph_pnpm_1 = require("./build-dep-graph-pnpm");
|
|
|
6
6
|
const index_1 = require("./lockfile-parser/index");
|
|
7
7
|
const constants_1 = require("./constants");
|
|
8
8
|
const parsePnpmWorkspaceProject = async (pkgJsonContent, pnpmLockfileContents, options, importer, lockfileVersion) => {
|
|
9
|
-
const { includeDevDeps, includePeerDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, } = options;
|
|
9
|
+
const { includeDevDeps, includePeerDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
10
10
|
const lockFileParser = (0, index_1.getPnpmLockfileParser)(pnpmLockfileContents, lockfileVersion);
|
|
11
11
|
const pkgJson = (0, util_1.parsePkgJson)(pkgJsonContent);
|
|
12
12
|
lockFileParser.workspaceArgs = {
|
|
@@ -24,6 +24,7 @@ const parsePnpmWorkspaceProject = async (pkgJsonContent, pnpmLockfileContents, o
|
|
|
24
24
|
strictOutOfSync,
|
|
25
25
|
includeOptionalDeps,
|
|
26
26
|
pruneWithinTopLevelDeps,
|
|
27
|
+
showNpmScope,
|
|
27
28
|
}, importer);
|
|
28
29
|
return depGraph;
|
|
29
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-workspace-project.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-workspace-project.ts"],"names":[],"mappings":";;;AAAA,kCAAuC;AAEvC,iEAA2D;AAE3D,mDAAgE;AAGhE,2CAAgD;AAEzC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,cAAsB,EACtB,oBAA4B,EAC5B,OAAgC,EAChC,QAAgB,EAChB,eAAqC,EACrC,EAAE;IACF,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,
|
|
1
|
+
{"version":3,"file":"parse-workspace-project.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-workspace-project.ts"],"names":[],"mappings":";;;AAAA,kCAAuC;AAEvC,iEAA2D;AAE3D,mDAAgE;AAGhE,2CAAgD;AAEzC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,cAAsB,EACtB,oBAA4B,EAC5B,OAAgC,EAChC,QAAgB,EAChB,eAAqC,EACrC,EAAE;IACF,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,MAAM,cAAc,GAAuB,IAAA,6BAAqB,EAC9D,oBAAoB,EACpB,eAAe,CAChB,CAAC;IAEF,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAAC,cAAc,CAAC,CAAC;IAE9D,cAAc,CAAC,aAAa,GAAG;QAC7B,WAAW,EAAE,IAAI;QACjB,kBAAkB,EAAE;YAClB,CAAC,QAAQ,CAAC,EAAE;gBACV,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,6BAAiB;aAC9C;SACF;KACF,CAAC;IACF,MAAM,QAAQ,GAAa,MAAM,IAAA,wCAAiB,EAChD,cAAc,EACd,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,eAAe;QACf,mBAAmB;QACnB,uBAAuB;QACvB,YAAY;KACb,EACD,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA/CW,QAAA,yBAAyB,6BA+CpC"}
|
|
@@ -36,7 +36,7 @@ function computeProjectVersionMaps(root, targets) {
|
|
|
36
36
|
}
|
|
37
37
|
const parsePnpmWorkspace = async (root, workspaceDir, options) => {
|
|
38
38
|
const scannedProjects = [];
|
|
39
|
-
const { includeDevDeps, includePeerDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, exclude, } = options;
|
|
39
|
+
const { includeDevDeps, includePeerDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, exclude, showNpmScope, } = options;
|
|
40
40
|
const pnpmLockfileContents = (0, utils_2.getFileContents)(root, path.join(workspaceDir, 'pnpm-lock.yaml')).content;
|
|
41
41
|
const lockfileVersion = (0, utils_1.getPnpmLockfileVersion)(pnpmLockfileContents);
|
|
42
42
|
const lockFileParser = (0, index_1.getPnpmLockfileParser)(pnpmLockfileContents, lockfileVersion);
|
|
@@ -67,6 +67,7 @@ const parsePnpmWorkspace = async (root, workspaceDir, options) => {
|
|
|
67
67
|
strictOutOfSync,
|
|
68
68
|
includeOptionalDeps,
|
|
69
69
|
pruneWithinTopLevelDeps,
|
|
70
|
+
showNpmScope,
|
|
70
71
|
}, importer);
|
|
71
72
|
const project = {
|
|
72
73
|
packageManager: 'pnpm',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-workspace.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-workspace.ts"],"names":[],"mappings":";;;AACA,qCAAqC;AACrC,6BAA6B;AAC7B,uCAAqD;AAMrD,kCAAuC;AACvC,iEAA2D;AAC3D,2CAAgD;AAChD,mDAAgE;AAEhE,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,CAAC;QAC7B,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,CAAC;YACH,MAAM,aAAa,GAAG,IAAA,mBAAY,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACxD,kBAAkB,CAAC,MAAM,CAAC,GAAG;gBAC3B,OAAO,EAAE,aAAa,CAAC,OAAO,IAAI,6BAAiB;gBACnD,IAAI,EAAE,aAAa,CAAC,IAAI;aACzB,CAAC;QACJ,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,KAAK,CACH,sCAAsC,mBAAmB,YAAY,GAAG,EAAE,CAC3E,CAAC;YACF,SAAS;QACX,CAAC;IACH,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAEM,MAAM,kBAAkB,GAAG,KAAK,EACrC,IAAY,EACZ,YAAoB,EACpB,OAAgC,EAChC,EAAE;IACF,MAAM,eAAe,GAAyB,EAAE,CAAC;IACjD,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,OAAO,
|
|
1
|
+
{"version":3,"file":"parse-workspace.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ export type DepGraphBuildOptions = {
|
|
|
35
35
|
includePeerDeps?: boolean;
|
|
36
36
|
pruneNpmStrictOutOfSync?: boolean;
|
|
37
37
|
honorAliases?: boolean;
|
|
38
|
+
showNpmScope?: boolean;
|
|
38
39
|
};
|
|
39
40
|
export type LockFileParseOptions = {
|
|
40
41
|
includeOptionalDeps: boolean;
|
|
@@ -53,6 +54,7 @@ export type YarnLockV2ProjectParseOptions = {
|
|
|
53
54
|
strictOutOfSync: boolean;
|
|
54
55
|
pruneWithinTopLevelDeps: boolean;
|
|
55
56
|
honorAliases?: boolean;
|
|
57
|
+
showNpmScope?: boolean;
|
|
56
58
|
};
|
|
57
59
|
export type PruneLevel = 'cycles' | 'withinTopLevelDeps' | 'none';
|
|
58
60
|
export type YarnLockV1ProjectParseOptions = {
|
|
@@ -62,6 +64,7 @@ export type YarnLockV1ProjectParseOptions = {
|
|
|
62
64
|
strictOutOfSync: boolean;
|
|
63
65
|
pruneLevel: PruneLevel;
|
|
64
66
|
honorAliases?: boolean;
|
|
67
|
+
showNpmScope?: boolean;
|
|
65
68
|
};
|
|
66
69
|
export type Yarn1DepGraphBuildOptions = {
|
|
67
70
|
includeDevDeps: boolean;
|
|
@@ -69,6 +72,7 @@ export type Yarn1DepGraphBuildOptions = {
|
|
|
69
72
|
includePeerDeps: boolean;
|
|
70
73
|
strictOutOfSync: boolean;
|
|
71
74
|
pruneWithinTopLevelDeps: boolean;
|
|
75
|
+
showNpmScope?: boolean;
|
|
72
76
|
};
|
|
73
77
|
export type PnpmWorkspaceArgs = {
|
|
74
78
|
isWorkspace: boolean;
|
|
@@ -85,6 +89,7 @@ export type PnpmProjectParseOptions = {
|
|
|
85
89
|
strictOutOfSync: boolean;
|
|
86
90
|
pruneWithinTopLevelDeps: boolean;
|
|
87
91
|
exclude?: string;
|
|
92
|
+
showNpmScope?: boolean;
|
|
88
93
|
};
|
|
89
94
|
type NodePkgManagers = 'npm' | 'yarn' | 'pnpm';
|
|
90
95
|
export type ScannedNodeProject = {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { PackageJsonBase } from './types';
|
|
1
|
+
import { DepGraphBuildOptions, PackageJsonBase } from './types';
|
|
2
2
|
import { DepGraphBuilder } from '@snyk/dep-graph';
|
|
3
|
+
import type { NodeInfo } from '@snyk/dep-graph/dist/core/types';
|
|
3
4
|
import { NormalisedPkgs } from './types';
|
|
4
5
|
export type Dependencies = Record<string, {
|
|
5
6
|
version: string;
|
|
@@ -22,9 +23,11 @@ export interface PkgNode {
|
|
|
22
23
|
version: string;
|
|
23
24
|
};
|
|
24
25
|
}
|
|
26
|
+
export declare const createNodeInfo: (options: DepGraphBuildOptions, scope?: string) => NodeInfo | undefined;
|
|
25
27
|
export declare const addPkgNodeToGraph: (depGraphBuilder: DepGraphBuilder, node: PkgNode, options: {
|
|
26
28
|
isCyclic?: boolean;
|
|
27
29
|
isWorkspacePkg?: boolean;
|
|
30
|
+
showNpmScope?: boolean;
|
|
28
31
|
}) => DepGraphBuilder;
|
|
29
32
|
/**
|
|
30
33
|
* Get top level dependencies from the given package json object which is parsed from a package.json file.
|
|
@@ -1,14 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getChildNode = exports.getGraphDependencies = exports.getTopLevelDeps = exports.addPkgNodeToGraph = void 0;
|
|
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
6
|
const errors_2 = require("../errors");
|
|
7
7
|
const parsers_1 = require("../parsers");
|
|
8
8
|
const pkgJson_1 = require("../aliasesPreprocessors/pkgJson");
|
|
9
|
+
const createNodeInfo = (options, scope = 'unknown') => {
|
|
10
|
+
if (options.showNpmScope) {
|
|
11
|
+
return {
|
|
12
|
+
labels: {
|
|
13
|
+
'npm:scope': scope,
|
|
14
|
+
},
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
return;
|
|
18
|
+
};
|
|
19
|
+
exports.createNodeInfo = createNodeInfo;
|
|
9
20
|
const addPkgNodeToGraph = (depGraphBuilder, node, options) => {
|
|
10
21
|
return depGraphBuilder.addPkgNode({ name: node.name, version: node.version }, node.id, {
|
|
11
|
-
labels: Object.assign(Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (options.
|
|
22
|
+
labels: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (options.showNpmScope && {
|
|
23
|
+
'npm:scope': node.isDev ? 'dev' : 'prod',
|
|
24
|
+
})), (options.isCyclic && { pruned: 'cyclic' })), (options.isWorkspacePkg && { pruned: 'true' })), (node.missingLockFileEntry && { missingLockFileEntry: 'true' })), (node.alias && {
|
|
12
25
|
alias: `${node.alias.aliasName}=>${node.alias.aliasTargetDepName}@${node.version}`,
|
|
13
26
|
})),
|
|
14
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,8 @@ var Color;
|
|
|
10
10
|
Color[Color["BLACK"] = 1] = "BLACK";
|
|
11
11
|
})(Color || (Color = {}));
|
|
12
12
|
const buildDepGraphYarnLockV1SimpleCyclesPruned = async (extractedYarnLockV1Pkgs, pkgJson, options) => {
|
|
13
|
-
const { includeDevDeps, strictOutOfSync, includeOptionalDeps } = options;
|
|
14
|
-
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version });
|
|
13
|
+
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, showNpmScope } = options;
|
|
14
|
+
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version }, (0, util_1.createNodeInfo)(options));
|
|
15
15
|
const colorMap = {};
|
|
16
16
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, { includeDevDeps });
|
|
17
17
|
const rootNode = {
|
|
@@ -21,7 +21,7 @@ const buildDepGraphYarnLockV1SimpleCyclesPruned = async (extractedYarnLockV1Pkgs
|
|
|
21
21
|
dependencies: topLevelDeps,
|
|
22
22
|
isDev: false,
|
|
23
23
|
};
|
|
24
|
-
await dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
|
|
24
|
+
await dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, showNpmScope);
|
|
25
25
|
return depGraphBuilder.build();
|
|
26
26
|
};
|
|
27
27
|
exports.buildDepGraphYarnLockV1SimpleCyclesPruned = buildDepGraphYarnLockV1SimpleCyclesPruned;
|
|
@@ -34,7 +34,7 @@ exports.buildDepGraphYarnLockV1SimpleCyclesPruned = buildDepGraphYarnLockV1Simpl
|
|
|
34
34
|
* - When first exploring an edge, if it points to a GRAY node, a cycle is found and the GRAY node is pruned.
|
|
35
35
|
* - A pruned node has id `${originalId}|1`
|
|
36
36
|
*/
|
|
37
|
-
const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps) => {
|
|
37
|
+
const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, showNpmScope) => {
|
|
38
38
|
colorMap[node.id] = Color.GRAY;
|
|
39
39
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
40
40
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
@@ -42,13 +42,16 @@ const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs
|
|
|
42
42
|
}
|
|
43
43
|
const childNode = (0, util_1.getChildNode)(name, depInfo, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
|
|
44
44
|
if (!colorMap.hasOwnProperty(childNode.id)) {
|
|
45
|
-
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {});
|
|
46
|
-
await dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
|
|
45
|
+
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, { showNpmScope });
|
|
46
|
+
await dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, showNpmScope);
|
|
47
47
|
}
|
|
48
48
|
else if (colorMap[childNode.id] === Color.GRAY) {
|
|
49
49
|
// cycle detected
|
|
50
50
|
childNode.id = `${childNode.id}:pruned`;
|
|
51
|
-
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {
|
|
51
|
+
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {
|
|
52
|
+
isCyclic: true,
|
|
53
|
+
showNpmScope,
|
|
54
|
+
});
|
|
52
55
|
}
|
|
53
56
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
54
57
|
}
|
|
@@ -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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"}
|
|
@@ -5,8 +5,8 @@ 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
7
|
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 });
|
|
8
|
+
const { includeDevDeps, includeOptionalDeps, includePeerDeps, strictOutOfSync, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
9
|
+
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version }, (0, util_1.createNodeInfo)(options));
|
|
10
10
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, {
|
|
11
11
|
includeDevDeps,
|
|
12
12
|
includePeerDeps,
|
|
@@ -19,7 +19,7 @@ const buildDepGraphYarnLockV1Simple = async (extractedYarnLockV1Pkgs, pkgJson, o
|
|
|
19
19
|
dependencies: topLevelDeps,
|
|
20
20
|
isDev: false,
|
|
21
21
|
};
|
|
22
|
-
await dfsVisit(depGraphBuilder, rootNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevelDeps);
|
|
22
|
+
await dfsVisit(depGraphBuilder, rootNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevelDeps, undefined, showNpmScope);
|
|
23
23
|
return depGraphBuilder.build();
|
|
24
24
|
};
|
|
25
25
|
exports.buildDepGraphYarnLockV1Simple = buildDepGraphYarnLockV1Simple;
|
|
@@ -29,7 +29,7 @@ exports.buildDepGraphYarnLockV1Simple = buildDepGraphYarnLockV1Simple;
|
|
|
29
29
|
* - If a node doesn't exist in the map, it means it hasn't been visited.
|
|
30
30
|
* - If a node is already visited, simply connect the new node with this node.
|
|
31
31
|
*/
|
|
32
|
-
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, visited) => {
|
|
32
|
+
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, visited, showNpmScope) => {
|
|
33
33
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
34
34
|
let scopeDepInfo = Object.assign({}, depInfo);
|
|
35
35
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
@@ -51,7 +51,7 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
51
51
|
if (pruneWithinTopLevel) {
|
|
52
52
|
const prunedId = `${childNode.id}:pruned`;
|
|
53
53
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, prunedId, {
|
|
54
|
-
labels: Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod', pruned: 'true' }, (node.missingLockFileEntry && {
|
|
54
|
+
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
55
|
missingLockFileEntry: 'true',
|
|
56
56
|
})), (childNode.alias && {
|
|
57
57
|
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
@@ -65,7 +65,7 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
65
65
|
continue;
|
|
66
66
|
}
|
|
67
67
|
depGraphBuilder.addPkgNode({ name: childNode.name, version: childNode.version }, childNode.id, {
|
|
68
|
-
labels: Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (node.missingLockFileEntry && {
|
|
68
|
+
labels: Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' })), (node.missingLockFileEntry && {
|
|
69
69
|
missingLockFileEntry: 'true',
|
|
70
70
|
})), (childNode.alias && {
|
|
71
71
|
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
@@ -73,7 +73,7 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
73
73
|
});
|
|
74
74
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
75
75
|
localVisited.add(childNode.id);
|
|
76
|
-
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, localVisited);
|
|
76
|
+
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, localVisited, showNpmScope);
|
|
77
77
|
}
|
|
78
78
|
};
|
|
79
79
|
//# 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":"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"}
|
|
@@ -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);
|