snyk-nodejs-lockfile-parser 2.9.0 → 2.10.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/component-metadata-labels.d.ts +7 -0
- package/dist/component-metadata-labels.js +41 -1
- package/dist/component-metadata-labels.js.map +1 -1
- package/dist/dep-graph-builders/types.d.ts +6 -0
- package/dist/dep-graph-builders/util.js +3 -0
- package/dist/dep-graph-builders/util.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple-pruned.js +9 -5
- 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 +9 -4
- 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 +6 -4
- 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 +5 -4
- 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-v1/workspaces.js +3 -1
- package/dist/dep-graph-builders/yarn-lock-v1/workspaces.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v2/simple.js +9 -1
- package/dist/dep-graph-builders/yarn-lock-v2/simple.js.map +1 -1
- package/dist/parsers/yarn-lock-parser.d.ts +3 -1
- package/dist/parsers/yarn-lock-parser.js +11 -9
- package/dist/parsers/yarn-lock-parser.js.map +1 -1
- package/dist/parsers/yarn2-lock-parser.js +3 -1
- package/dist/parsers/yarn2-lock-parser.js.map +1 -1
- package/package.json +4 -2
|
@@ -10,6 +10,13 @@ export declare function hashLabelsFromIntegrity(integrity: string | undefined, n
|
|
|
10
10
|
* those are debug-logged and skipped.
|
|
11
11
|
*/
|
|
12
12
|
export declare function distributionUrlLabel(resolved: string | undefined, nodeId: string): Record<string, string>;
|
|
13
|
+
/**
|
|
14
|
+
* yarn v1 `resolved` values embed the npm-registry tarball shasum as a URL fragment
|
|
15
|
+
* (`…-1.0.0.tgz#<40-hex-sha1>`). For older lockfiles that carry no `integrity` line this is the
|
|
16
|
+
* only available hash, so surface it as `hash:sha-1`. Restricted to http(s) tarball URLs: a
|
|
17
|
+
* `#<40-hex>` fragment on a `git:`/`git+ssh:` resolution is a commit SHA, not a package hash.
|
|
18
|
+
*/
|
|
19
|
+
export declare function hashLabelFromResolvedFragment(resolved: string | undefined, nodeId: string): Record<string, string>;
|
|
13
20
|
/**
|
|
14
21
|
* Build the full set of component-metadata labels (package hashes + distribution URL) for a
|
|
15
22
|
* node, sourced from its lockfile `integrity` / `resolved` values.
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.hashLabelsFromIntegrity = hashLabelsFromIntegrity;
|
|
4
4
|
exports.distributionUrlLabel = distributionUrlLabel;
|
|
5
|
+
exports.hashLabelFromResolvedFragment = hashLabelFromResolvedFragment;
|
|
5
6
|
exports.getComponentMetadataLabels = getComponentMetadataLabels;
|
|
6
7
|
const debugModule = require("debug");
|
|
7
8
|
const debug = debugModule('snyk-nodejs-lockfile-parser:component-metadata');
|
|
@@ -93,16 +94,55 @@ function distributionUrlLabel(resolved, nodeId) {
|
|
|
93
94
|
url.username = '';
|
|
94
95
|
debug(`Stripped credentials from resolved URL for ${nodeId}`);
|
|
95
96
|
}
|
|
97
|
+
// yarn v1 appends the tarball shasum as a URL fragment (`…-1.0.0.tgz#<sha1>`); npm does not.
|
|
98
|
+
// Drop it so distribution:url is a clean tarball URL — the shasum is surfaced separately as a
|
|
99
|
+
// hash:sha-1 label (see hashLabelFromResolvedFragment).
|
|
100
|
+
if (url.hash) {
|
|
101
|
+
url.hash = '';
|
|
102
|
+
}
|
|
96
103
|
return { 'distribution:url': url.toString() };
|
|
97
104
|
}
|
|
105
|
+
/**
|
|
106
|
+
* yarn v1 `resolved` values embed the npm-registry tarball shasum as a URL fragment
|
|
107
|
+
* (`…-1.0.0.tgz#<40-hex-sha1>`). For older lockfiles that carry no `integrity` line this is the
|
|
108
|
+
* only available hash, so surface it as `hash:sha-1`. Restricted to http(s) tarball URLs: a
|
|
109
|
+
* `#<40-hex>` fragment on a `git:`/`git+ssh:` resolution is a commit SHA, not a package hash.
|
|
110
|
+
*/
|
|
111
|
+
function hashLabelFromResolvedFragment(resolved, nodeId) {
|
|
112
|
+
if (!resolved) {
|
|
113
|
+
return {};
|
|
114
|
+
}
|
|
115
|
+
let url;
|
|
116
|
+
try {
|
|
117
|
+
url = new URL(resolved);
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
return {};
|
|
121
|
+
}
|
|
122
|
+
if (url.protocol !== 'http:' && url.protocol !== 'https:') {
|
|
123
|
+
// git/file/etc. — a fragment here is a commit-ish, not a package shasum.
|
|
124
|
+
return {};
|
|
125
|
+
}
|
|
126
|
+
const fragment = url.hash.replace(/^#/, '');
|
|
127
|
+
if (!/^[0-9a-f]{40}$/i.test(fragment)) {
|
|
128
|
+
if (fragment) {
|
|
129
|
+
debug(`resolved fragment "${fragment}" for ${nodeId} is not a sha1 shasum; skipping`);
|
|
130
|
+
}
|
|
131
|
+
return {};
|
|
132
|
+
}
|
|
133
|
+
return { 'hash:sha-1': fragment.toLowerCase() };
|
|
134
|
+
}
|
|
98
135
|
/**
|
|
99
136
|
* Build the full set of component-metadata labels (package hashes + distribution URL) for a
|
|
100
137
|
* node, sourced from its lockfile `integrity` / `resolved` values.
|
|
101
138
|
*/
|
|
102
139
|
function getComponentMetadataLabels(node) {
|
|
103
140
|
return {
|
|
104
|
-
...hashLabelsFromIntegrity(node.integrity, node.id),
|
|
105
141
|
...distributionUrlLabel(node.resolved, node.id),
|
|
142
|
+
// Fragment-derived sha1 first so an explicit `integrity` sha1 wins on overlap (they describe
|
|
143
|
+
// the same digest for npm-registry tarballs).
|
|
144
|
+
...hashLabelFromResolvedFragment(node.resolved, node.id),
|
|
145
|
+
...hashLabelsFromIntegrity(node.integrity, node.id),
|
|
106
146
|
};
|
|
107
147
|
}
|
|
108
148
|
//# sourceMappingURL=component-metadata-labels.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-metadata-labels.js","sourceRoot":"","sources":["../lib/component-metadata-labels.ts"],"names":[],"mappings":";;AAkCA,0DAoCC;AAOD,
|
|
1
|
+
{"version":3,"file":"component-metadata-labels.js","sourceRoot":"","sources":["../lib/component-metadata-labels.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,9 @@ export type NormalisedPkgs = Record<PkgIdentifier, {
|
|
|
27
27
|
resolution?: string;
|
|
28
28
|
dependencies: Record<string, string>;
|
|
29
29
|
optionalDependencies: Record<string, string>;
|
|
30
|
+
resolved?: string;
|
|
31
|
+
integrity?: string;
|
|
32
|
+
checksum?: string;
|
|
30
33
|
}>;
|
|
31
34
|
export type DepGraphBuildOptions = {
|
|
32
35
|
includeDevDeps: boolean;
|
|
@@ -63,6 +66,7 @@ export type YarnLockV2ProjectParseOptions = {
|
|
|
63
66
|
pruneWithinTopLevelDeps: boolean;
|
|
64
67
|
honorAliases?: boolean;
|
|
65
68
|
showNpmScope?: boolean;
|
|
69
|
+
includeComponentMetadata?: boolean;
|
|
66
70
|
};
|
|
67
71
|
export type PruneLevel = 'cycles' | 'withinTopLevelDeps' | 'none';
|
|
68
72
|
export type YarnLockV1ProjectParseOptions = {
|
|
@@ -73,6 +77,7 @@ export type YarnLockV1ProjectParseOptions = {
|
|
|
73
77
|
pruneLevel: PruneLevel;
|
|
74
78
|
honorAliases?: boolean;
|
|
75
79
|
showNpmScope?: boolean;
|
|
80
|
+
includeComponentMetadata?: boolean;
|
|
76
81
|
};
|
|
77
82
|
export type Yarn1DepGraphBuildOptions = {
|
|
78
83
|
includeDevDeps: boolean;
|
|
@@ -81,6 +86,7 @@ export type Yarn1DepGraphBuildOptions = {
|
|
|
81
86
|
strictOutOfSync: boolean;
|
|
82
87
|
pruneWithinTopLevelDeps: boolean;
|
|
83
88
|
showNpmScope?: boolean;
|
|
89
|
+
includeComponentMetadata?: boolean;
|
|
84
90
|
};
|
|
85
91
|
export type PnpmWorkspaceArgs = {
|
|
86
92
|
isWorkspace: boolean;
|
|
@@ -216,6 +216,9 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps)
|
|
|
216
216
|
dependencies: { ...dependencies, ...optionalDependencies },
|
|
217
217
|
isDev: depInfo.isDev,
|
|
218
218
|
alias: aliasInfo,
|
|
219
|
+
// Raw lockfile metadata, emitted as component-metadata labels when requested (yarn v1).
|
|
220
|
+
integrity: depData.integrity,
|
|
221
|
+
resolved: depData.resolved,
|
|
219
222
|
};
|
|
220
223
|
}
|
|
221
224
|
return childNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ 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, showNpmScope } = options;
|
|
13
|
+
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata, } = options;
|
|
14
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 });
|
|
@@ -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, showNpmScope);
|
|
24
|
+
await dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata);
|
|
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, showNpmScope) => {
|
|
37
|
+
const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata) => {
|
|
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,8 +42,11 @@ 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
|
-
|
|
45
|
+
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {
|
|
46
|
+
showNpmScope,
|
|
47
|
+
includeComponentMetadata,
|
|
48
|
+
});
|
|
49
|
+
await dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata);
|
|
47
50
|
}
|
|
48
51
|
else if (colorMap[childNode.id] === Color.GRAY) {
|
|
49
52
|
// cycle detected
|
|
@@ -51,6 +54,7 @@ const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs
|
|
|
51
54
|
(0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {
|
|
52
55
|
isCyclic: true,
|
|
53
56
|
showNpmScope,
|
|
57
|
+
includeComponentMetadata,
|
|
54
58
|
});
|
|
55
59
|
}
|
|
56
60
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
@@ -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,kCAMiB;AAGjB,2DAAsD;AAEtD,IAAK,KAGJ;AAHD,WAAK,KAAK;IACR,iCAAI,CAAA;IACJ,mCAAK,CAAA;AACP,CAAC,EAHI,KAAK,KAAL,KAAK,QAGT;AAEM,MAAM,yCAAyC,GAAG,KAAK,EAC5D,uBAAuC,EACvC,OAAwB,EACxB,OAA6B,EAC7B,EAAE;IACF,MAAM,
|
|
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,kCAMiB;AAGjB,2DAAsD;AAEtD,IAAK,KAGJ;AAHD,WAAK,KAAK;IACR,iCAAI,CAAA;IACJ,mCAAK,CAAA;AACP,CAAC,EAHI,KAAK,KAAL,KAAK,QAGT;AAEM,MAAM,yCAAyC,GAAG,KAAK,EAC5D,uBAAuC,EACvC,OAAwB,EACxB,OAA6B,EAC7B,EAAE;IACF,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,wBAAwB,GACzB,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,QAAQ,GAA0B,EAAE,CAAC;IAE3C,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,QAAQ,EACR,uBAAuB,EACvB,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,wBAAwB,CACzB,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AA3CW,QAAA,yCAAyC,6CA2CpD;AAEF;;;;;;;;GAQG;AACH,MAAM,QAAQ,GAAG,KAAK,EACpB,eAAgC,EAChC,IAAa,EACb,QAA+B,EAC/B,uBAAuC,EACvC,eAAwB,EACxB,mBAA4B,EAC5B,YAAsB,EACtB,wBAAkC,EACnB,EAAE;IACjB,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;IAE/B,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;QAED,MAAM,SAAS,GAAG,IAAA,mBAAY,EAC5B,IAAI,EACJ,OAAO,EACP,uBAAuB,EACvB,eAAe,EAEf,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;YAC3C,IAAA,wBAAiB,EAAC,eAAe,EAAE,SAAS,EAAE;gBAC5C,YAAY;gBACZ,wBAAwB;aACzB,CAAC,CAAC;YACH,MAAM,QAAQ,CACZ,eAAe,EACf,SAAS,EACT,QAAQ,EACR,uBAAuB,EACvB,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,wBAAwB,CACzB,CAAC;QACJ,CAAC;aAAM,IAAI,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YACjD,iBAAiB;YACjB,SAAS,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,EAAE,SAAS,CAAC;YACxC,IAAA,wBAAiB,EAAC,eAAe,EAAE,SAAS,EAAE;gBAC5C,QAAQ,EAAE,IAAI;gBACd,YAAY;gBACZ,wBAAwB;aACzB,CAAC,CAAC;QACL,CAAC;QAED,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;AAClC,CAAC,CAAC"}
|
|
@@ -5,8 +5,9 @@ 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 pkgJson_1 = require("../../aliasesPreprocessors/pkgJson");
|
|
8
|
+
const component_metadata_labels_1 = require("../../component-metadata-labels");
|
|
8
9
|
const buildDepGraphYarnLockV1Simple = async (extractedYarnLockV1Pkgs, pkgJson, options) => {
|
|
9
|
-
const { includeDevDeps, includeOptionalDeps, includePeerDeps, strictOutOfSync, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
10
|
+
const { includeDevDeps, includeOptionalDeps, includePeerDeps, strictOutOfSync, pruneWithinTopLevelDeps, showNpmScope, includeComponentMetadata, } = options;
|
|
10
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,
|
|
@@ -20,7 +21,7 @@ const buildDepGraphYarnLockV1Simple = async (extractedYarnLockV1Pkgs, pkgJson, o
|
|
|
20
21
|
dependencies: topLevelDeps,
|
|
21
22
|
isDev: false,
|
|
22
23
|
};
|
|
23
|
-
await dfsVisit(depGraphBuilder, rootNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevelDeps, undefined, showNpmScope);
|
|
24
|
+
await dfsVisit(depGraphBuilder, rootNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevelDeps, undefined, showNpmScope, includeComponentMetadata);
|
|
24
25
|
return depGraphBuilder.build();
|
|
25
26
|
};
|
|
26
27
|
exports.buildDepGraphYarnLockV1Simple = buildDepGraphYarnLockV1Simple;
|
|
@@ -30,7 +31,7 @@ exports.buildDepGraphYarnLockV1Simple = buildDepGraphYarnLockV1Simple;
|
|
|
30
31
|
* - If a node doesn't exist in the map, it means it hasn't been visited.
|
|
31
32
|
* - If a node is already visited, simply connect the new node with this node.
|
|
32
33
|
*/
|
|
33
|
-
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, visited, showNpmScope) => {
|
|
34
|
+
const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, visited, showNpmScope, includeComponentMetadata) => {
|
|
34
35
|
for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
|
|
35
36
|
let scopeDepInfo = Object.assign({}, depInfo);
|
|
36
37
|
if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
|
|
@@ -68,6 +69,8 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
68
69
|
...(childNode.alias && {
|
|
69
70
|
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
70
71
|
}),
|
|
72
|
+
...(includeComponentMetadata &&
|
|
73
|
+
(0, component_metadata_labels_1.getComponentMetadataLabels)(childNode)),
|
|
71
74
|
},
|
|
72
75
|
});
|
|
73
76
|
depGraphBuilder.connectDep(node.id, prunedId);
|
|
@@ -87,11 +90,13 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
87
90
|
...(childNode.alias && {
|
|
88
91
|
alias: `${childNode.alias.aliasName}=>${childNode.alias.aliasTargetDepName}@${childNode.version}`,
|
|
89
92
|
}),
|
|
93
|
+
...(includeComponentMetadata &&
|
|
94
|
+
(0, component_metadata_labels_1.getComponentMetadataLabels)(childNode)),
|
|
90
95
|
},
|
|
91
96
|
});
|
|
92
97
|
depGraphBuilder.connectDep(node.id, childNode.id);
|
|
93
98
|
localVisited.add(childNode.id);
|
|
94
|
-
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, localVisited, showNpmScope);
|
|
99
|
+
await dfsVisit(depGraphBuilder, childNode, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevel, localVisited, showNpmScope, includeComponentMetadata);
|
|
95
100
|
}
|
|
96
101
|
};
|
|
97
102
|
//# 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,kCAKiB;AAGjB,2DAAsD;AACtD,gEAAmE;
|
|
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,7 +13,7 @@ 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, showNpmScope } = options;
|
|
16
|
+
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata, } = options;
|
|
17
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 });
|
|
@@ -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, showNpmScope);
|
|
27
|
+
await dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata);
|
|
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, showNpmScope) => {
|
|
41
|
+
const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata) => {
|
|
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()) {
|
|
@@ -51,9 +51,10 @@ const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs
|
|
|
51
51
|
isCyclic: false,
|
|
52
52
|
isWorkspacePkg,
|
|
53
53
|
showNpmScope,
|
|
54
|
+
includeComponentMetadata,
|
|
54
55
|
});
|
|
55
56
|
if (!isWorkspacePkg) {
|
|
56
|
-
await dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope);
|
|
57
|
+
await dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata);
|
|
57
58
|
}
|
|
58
59
|
else {
|
|
59
60
|
colorMap[childNode.id] = Color.BLACK;
|
|
@@ -66,6 +67,7 @@ const dfsVisit = async (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs
|
|
|
66
67
|
isCyclic: true,
|
|
67
68
|
isWorkspacePkg,
|
|
68
69
|
showNpmScope,
|
|
70
|
+
includeComponentMetadata,
|
|
69
71
|
});
|
|
70
72
|
}
|
|
71
73
|
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,kCAKiB;AAIjB,iCAAyD;AACzD,2DAAsD;AAEtD,IAAK,KAGJ;AAHD,WAAK,KAAK;IACR,iCAAI,CAAA;IACJ,mCAAK,CAAA;AACP,CAAC,EAHI,KAAK,KAAL,KAAK,QAGT;AAED,sDAAsD;AACtD,qBAAqB;AACd,MAAM,4CAA4C,GAAG,KAAK,EAC/D,uBAAuC,EACvC,OAAwB,EACxB,yBAAiD,EACjD,OAA6B,EAC7B,EAAE;IACF,MAAM,
|
|
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,7 +6,7 @@ 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, showNpmScope } = options;
|
|
9
|
+
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata, } = options;
|
|
10
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 });
|
|
@@ -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, showNpmScope);
|
|
20
|
+
await dfsVisit(depGraphBuilder, rootNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata);
|
|
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, showNpmScope) => {
|
|
34
|
+
const dfsVisit = async (depGraphBuilder, node, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata) => {
|
|
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()) {
|
|
@@ -44,9 +44,10 @@ const dfsVisit = async (depGraphBuilder, node, visitedMap, extractedYarnLockV1Pk
|
|
|
44
44
|
isCyclic: false,
|
|
45
45
|
isWorkspacePkg,
|
|
46
46
|
showNpmScope,
|
|
47
|
+
includeComponentMetadata,
|
|
47
48
|
});
|
|
48
49
|
if (!isWorkspacePkg) {
|
|
49
|
-
await dfsVisit(depGraphBuilder, childNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope);
|
|
50
|
+
await dfsVisit(depGraphBuilder, childNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps, showNpmScope, includeComponentMetadata);
|
|
50
51
|
}
|
|
51
52
|
}
|
|
52
53
|
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,kCAKiB;AAGjB,iCAAyD;AACzD,2DAAsD;AAE/C,MAAM,gCAAgC,GAAG,KAAK,EACnD,uBAAuC,EACvC,OAAwB,EACxB,yBAAiD,EACjD,OAA6B,EAC7B,EAAE;IACF,MAAM,
|
|
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,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,wBAAwB,GACzB,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,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,EACZ,wBAAwB,CACzB,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AA7CW,QAAA,gCAAgC,oCA6C3C;AAEF;;;;;;;;;GASG;AACH,MAAM,QAAQ,GAAG,KAAK,EACpB,eAAgC,EAChC,IAAa,EACb,UAAuB,EACvB,uBAAuC,EACvC,yBAAiD,EACjD,eAAwB,EACxB,mBAA4B,EAC5B,YAAsB,EACtB,wBAAkC,EACnB,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;gBACZ,wBAAwB;aACzB,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,EACZ,wBAAwB,CACzB,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, showNpmScope, } = options;
|
|
10
|
+
const { includeDevDeps, includeOptionalDeps, includePeerDeps, pruneLevel, strictOutOfSync, honorAliases, showNpmScope, includeComponentMetadata, } = 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'
|
|
@@ -16,6 +16,7 @@ const parseYarnLockV1Project = async (pkgJsonContent, yarnLockContent, options)
|
|
|
16
16
|
strictOutOfSync,
|
|
17
17
|
includeOptionalDeps,
|
|
18
18
|
showNpmScope,
|
|
19
|
+
includeComponentMetadata,
|
|
19
20
|
})
|
|
20
21
|
: await (0, _1.buildDepGraphYarnLockV1Simple)(pkgs, pkgJson, {
|
|
21
22
|
includeDevDeps,
|
|
@@ -24,6 +25,7 @@ const parseYarnLockV1Project = async (pkgJsonContent, yarnLockContent, options)
|
|
|
24
25
|
strictOutOfSync,
|
|
25
26
|
pruneWithinTopLevelDeps: pruneLevel === 'withinTopLevelDeps',
|
|
26
27
|
showNpmScope,
|
|
28
|
+
includeComponentMetadata,
|
|
27
29
|
});
|
|
28
30
|
return depGraph;
|
|
29
31
|
};
|
|
@@ -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,EACZ,YAAY,
|
|
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,EACZ,wBAAwB,GACzB,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;YACZ,wBAAwB;SACzB,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;YACZ,wBAAwB;SACzB,CAAC,CAAC;IAET,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA1CW,QAAA,sBAAsB,0BA0CjC"}
|
|
@@ -7,7 +7,7 @@ const extract_yarnlock_v1_pkgs_1 = require("./extract-yarnlock-v1-pkgs");
|
|
|
7
7
|
const util_1 = require("../util");
|
|
8
8
|
const c_map_1 = require("../../c-map");
|
|
9
9
|
const parseYarnLockV1WorkspaceProject = async (yarnLockContent, workspacePackagesPkgJsons, options) => {
|
|
10
|
-
const { includeDevDeps, includeOptionalDeps, pruneCycles, strictOutOfSync } = options;
|
|
10
|
+
const { includeDevDeps, includeOptionalDeps, pruneCycles, strictOutOfSync, includeComponentMetadata, } = options;
|
|
11
11
|
const extractedYarnLockV1Pkgs = (0, extract_yarnlock_v1_pkgs_1.extractPkgsFromYarnLockV1)(yarnLockContent);
|
|
12
12
|
// Parse all package.json files and also extract names cross referencing later
|
|
13
13
|
const workspacePkgNameToVersion = {};
|
|
@@ -22,11 +22,13 @@ const parseYarnLockV1WorkspaceProject = async (yarnLockContent, workspacePackage
|
|
|
22
22
|
includeDevDeps,
|
|
23
23
|
strictOutOfSync,
|
|
24
24
|
includeOptionalDeps,
|
|
25
|
+
includeComponentMetadata,
|
|
25
26
|
})
|
|
26
27
|
: await (0, build_depgraph_workspace_package_1.buildDepGraphYarnLockV1Workspace)(extractedYarnLockV1Pkgs, parsedPkgJson, workspacePkgNameToVersion, {
|
|
27
28
|
includeDevDeps,
|
|
28
29
|
strictOutOfSync,
|
|
29
30
|
includeOptionalDeps,
|
|
31
|
+
includeComponentMetadata,
|
|
30
32
|
});
|
|
31
33
|
});
|
|
32
34
|
return depGraphs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/workspaces.ts"],"names":[],"mappings":";;;AAEA,uGAAyG;AACzG,yFAAsF;AACtF,yEAAuE;AACvE,kCAAuC;AAEvC,uCAAmC;AAE5B,MAAM,+BAA+B,GAAG,KAAK,EAClD,eAAuB,EACvB,yBAAmC,EACnC,OAA4B,EACP,EAAE;IACvB,MAAM,
|
|
1
|
+
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/workspaces.ts"],"names":[],"mappings":";;;AAEA,uGAAyG;AACzG,yFAAsF;AACtF,yEAAuE;AACvE,kCAAuC;AAEvC,uCAAmC;AAE5B,MAAM,+BAA+B,GAAG,KAAK,EAClD,eAAuB,EACvB,yBAAmC,EACnC,OAA4B,EACP,EAAE;IACvB,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,WAAW,EACX,eAAe,EACf,wBAAwB,GACzB,GAAG,OAAO,CAAC;IAEZ,MAAM,uBAAuB,GAAG,IAAA,oDAAyB,EAAC,eAAe,CAAC,CAAC;IAE3E,8EAA8E;IAC9E,MAAM,yBAAyB,GAAG,EAAE,CAAC;IACrC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,GAAG,CAC3D,CAAC,gBAAgB,EAAE,EAAE;QACnB,MAAM,aAAa,GAAoB,IAAA,mBAAY,EAAC,gBAAgB,CAAC,CAAC;QACtE,yBAAyB,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC;QACtE,OAAO,aAAa,CAAC;IACvB,CAAC,CACF,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,YAAI,EAAC,uBAAuB,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE;QACtE,OAAO,WAAW;YAChB,CAAC,CAAC,MAAM,IAAA,sFAA4C,EAChD,uBAAuB,EACvB,aAAa,EACb,yBAAyB,EACzB;gBACE,cAAc;gBACd,eAAe;gBACf,mBAAmB;gBACnB,wBAAwB;aACzB,CACF;YACH,CAAC,CAAC,MAAM,IAAA,mEAAgC,EACpC,uBAAuB,EACvB,aAAa,EACb,yBAAyB,EACzB;gBACE,cAAc;gBACd,eAAe;gBACf,mBAAmB;gBACnB,wBAAwB;aACzB,CACF,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AApDW,QAAA,+BAA+B,mCAoD1C"}
|
|
@@ -5,8 +5,16 @@ const extract_yarnlock_v2_pkgs_1 = require("./extract-yarnlock-v2-pkgs");
|
|
|
5
5
|
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
|
+
const debugModule = require("debug");
|
|
9
|
+
const debug = debugModule('snyk-nodejs-lockfile-parser:component-metadata');
|
|
8
10
|
const parseYarnLockV2Project = async (pkgJsonContent, yarnLockContent, options, workspaceArgs) => {
|
|
9
|
-
const { includeDevDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, honorAliases, showNpmScope, } = options;
|
|
11
|
+
const { includeDevDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, honorAliases, showNpmScope, includeComponentMetadata, } = options;
|
|
12
|
+
if (includeComponentMetadata) {
|
|
13
|
+
// Berry lockfiles store no tarball URL and only a `checksum` over yarn's cache artifact
|
|
14
|
+
// (not the published tarball SRI), so component-metadata labels are deferred for yarn berry.
|
|
15
|
+
debug('includeComponentMetadata is set but component-metadata labels are not yet produced ' +
|
|
16
|
+
'for yarn berry (v2-4) lockfiles; skipping');
|
|
17
|
+
}
|
|
10
18
|
const pkgs = (0, extract_yarnlock_v2_pkgs_1.extractPkgsFromYarnLockV2)(yarnLockContent);
|
|
11
19
|
const pkgJson = (0, util_1.parsePkgJson)(honorAliases ? (0, pkgJson_1.rewriteAliasesPkgJson)(pkgJsonContent) : pkgJsonContent);
|
|
12
20
|
const depgraph = await (0, build_depgraph_simple_1.buildDepGraphYarnLockV2Simple)(pkgs, pkgJson, {
|
|
@@ -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;
|
|
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;AAC3E,qCAAqC;AAErC,MAAM,KAAK,GAAG,WAAW,CAAC,gDAAgD,CAAC,CAAC;AAErE,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,EACZ,wBAAwB,GACzB,GAAG,OAAO,CAAC;IAEZ,IAAI,wBAAwB,EAAE,CAAC;QAC7B,wFAAwF;QACxF,6FAA6F;QAC7F,KAAK,CACH,qFAAqF;YACnF,2CAA2C,CAC9C,CAAC;IACJ,CAAC;IAED,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;AA5CW,QAAA,sBAAsB,0BA4CjC"}
|
|
@@ -12,6 +12,8 @@ export interface YarnLockDeps {
|
|
|
12
12
|
}
|
|
13
13
|
export interface YarnLockDep {
|
|
14
14
|
version: string;
|
|
15
|
+
resolved?: string;
|
|
16
|
+
integrity?: string;
|
|
15
17
|
dependencies?: {
|
|
16
18
|
[depName: string]: string;
|
|
17
19
|
};
|
|
@@ -23,6 +25,6 @@ export declare class YarnLockParser extends LockParserBase {
|
|
|
23
25
|
constructor();
|
|
24
26
|
parseLockFile(lockFileContents: string): YarnLock;
|
|
25
27
|
getDependencyTree(manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean, showNpmScope?: boolean, includeComponentMetadata?: boolean): Promise<PkgTree>;
|
|
26
|
-
protected getDepMap(lockfile: Lockfile, resolutions?: ManifestDependencies, showNpmScope?: boolean): DepMap;
|
|
28
|
+
protected getDepMap(lockfile: Lockfile, resolutions?: ManifestDependencies, showNpmScope?: boolean, includeComponentMetadata?: boolean): DepMap;
|
|
27
29
|
protected getDepTreeKey(dep: Dep): string;
|
|
28
30
|
}
|
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.YarnLockParser = void 0;
|
|
4
4
|
const yarnLockfileParser = require("@yarnpkg/lockfile");
|
|
5
|
-
const debugModule = require("debug");
|
|
6
5
|
const index_1 = require("./index");
|
|
7
6
|
const errors_1 = require("../errors");
|
|
8
7
|
const lock_parser_base_1 = require("./lock-parser-base");
|
|
9
8
|
const config_1 = require("../config");
|
|
10
|
-
const
|
|
9
|
+
const component_metadata_labels_1 = require("../component-metadata-labels");
|
|
11
10
|
class YarnLockParser extends lock_parser_base_1.LockParserBase {
|
|
12
11
|
constructor() {
|
|
13
12
|
super(index_1.LockfileType.yarn, config_1.config.YARN_TREE_SIZE_LIMIT);
|
|
@@ -24,11 +23,7 @@ class YarnLockParser extends lock_parser_base_1.LockParserBase {
|
|
|
24
23
|
}
|
|
25
24
|
}
|
|
26
25
|
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope, includeComponentMetadata) {
|
|
27
|
-
|
|
28
|
-
debug('includeComponentMetadata is not yet supported for yarn lockfiles; ' +
|
|
29
|
-
'no hash:* / distribution:url labels will be emitted');
|
|
30
|
-
}
|
|
31
|
-
const depTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync, showNpmScope);
|
|
26
|
+
const depTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync, showNpmScope, includeComponentMetadata);
|
|
32
27
|
const meta = { lockfileVersion: 1, packageManager: 'yarn' };
|
|
33
28
|
const depTreeWithMeta = {
|
|
34
29
|
...depTree,
|
|
@@ -36,7 +31,7 @@ class YarnLockParser extends lock_parser_base_1.LockParserBase {
|
|
|
36
31
|
};
|
|
37
32
|
return depTreeWithMeta;
|
|
38
33
|
}
|
|
39
|
-
getDepMap(lockfile, resolutions, showNpmScope) {
|
|
34
|
+
getDepMap(lockfile, resolutions, showNpmScope, includeComponentMetadata) {
|
|
40
35
|
const yarnLockfile = lockfile;
|
|
41
36
|
const depMap = {};
|
|
42
37
|
for (const [depName, dep] of Object.entries(yarnLockfile.object)) {
|
|
@@ -44,12 +39,19 @@ class YarnLockParser extends lock_parser_base_1.LockParserBase {
|
|
|
44
39
|
...(dep.dependencies || {}),
|
|
45
40
|
...(dep.optionalDependencies || {}),
|
|
46
41
|
});
|
|
42
|
+
const name = getName(depName);
|
|
47
43
|
depMap[depName] = {
|
|
48
44
|
labels: {
|
|
49
45
|
scope: index_1.Scope.prod,
|
|
50
46
|
...(showNpmScope && { 'npm:scope': index_1.Scope.prod }),
|
|
47
|
+
...(includeComponentMetadata &&
|
|
48
|
+
(0, component_metadata_labels_1.getComponentMetadataLabels)({
|
|
49
|
+
id: `${name}@${dep.version}`,
|
|
50
|
+
integrity: dep.integrity,
|
|
51
|
+
resolved: dep.resolved,
|
|
52
|
+
})),
|
|
51
53
|
},
|
|
52
|
-
name
|
|
54
|
+
name,
|
|
53
55
|
requires: subDependencies.map(([key, ver]) => `${key}@${ver}`),
|
|
54
56
|
version: dep.version,
|
|
55
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn-lock-parser.ts"],"names":[],"mappings":";;;AAAA,wDAAwD;
|
|
1
|
+
{"version":3,"file":"yarn-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn-lock-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,9 @@ class Yarn2LockParser extends lock_parser_base_1.LockParserBase {
|
|
|
44
44
|
}
|
|
45
45
|
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope, includeComponentMetadata) {
|
|
46
46
|
if (includeComponentMetadata) {
|
|
47
|
-
|
|
47
|
+
// Berry lockfiles store no tarball URL and only a `checksum` over yarn's cache artifact
|
|
48
|
+
// (not the published tarball SRI), so component-metadata labels are deferred for berry.
|
|
49
|
+
debug('includeComponentMetadata is not yet supported for yarn berry (v2-4) lockfiles; ' +
|
|
48
50
|
'no hash:* / distribution:url labels will be emitted');
|
|
49
51
|
}
|
|
50
52
|
const depTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync, showNpmScope);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn2-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn2-lock-parser.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,0CAA0C;AAC1C,qCAAqC;AAErC,yDAA4D;AAC5D,wBAQW;AACX,sCAAmC;AAEnC,sCAAkD;AAClD,6CAAyD;AAEzD,MAAM,KAAK,GAAG,WAAW,CAAC,gDAAgD,CAAC,CAAC;AAS5E,MAAa,eAAgB,SAAQ,iCAAc;IACjD;QACE,KAAK,CAAC,eAAY,CAAC,KAAK,EAAE,eAAM,CAAC,oBAAoB,CAAC,CAAC;IACzD,CAAC;IAEM,aAAa,CAAC,gBAAwB;QAC3C,IAAI,CAAC;YACH,MAAM,WAAW,GAAQ,IAAA,cAAI,EAAC,gBAAgB,EAAE;gBAC9C,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,yBAAe;aACxB,CAAC,CAAC;YAEH,OAAO,WAAW,CAAC,UAAU,CAAC;YAC9B,MAAM,YAAY,GAAiB,EAAE,CAAC;YAEtC,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;YACzC,MAAM,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;YACpD,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;YAE1C,MAAM,aAAa,GAAG,IAAA,sCAAyB,EAC7C,eAAe,EACf,UAAU,CACX,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CACjC,CAAC,CAAC,cAAc,EAAE,WAAW,CAAgB,EAAE,EAAE;gBAC/C,aAAa,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBACnD,YAAY,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;gBACzC,CAAC,CAAC,CAAC;YACL,CAAC,CACF,CAAC;YAEF,OAAO;gBACL,YAAY;gBACZ,YAAY,EAAE,eAAY,CAAC,KAAK;gBAChC,MAAM,EAAE,YAAY;gBACpB,IAAI,EAAE,eAAY,CAAC,KAAK;aACzB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,8BAAqB,CAC7B,2CAA4C,CAAW,CAAC,OAAO,EAAE,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,YAA0B,EAC1B,QAAkB,EAClB,UAAU,GAAG,KAAK,EAClB,eAAe,GAAG,IAAI,EACtB,YAAsB,EACtB,wBAAkC;QAElC,IAAI,wBAAwB,EAAE,CAAC;YAC7B,KAAK,CACH,
|
|
1
|
+
{"version":3,"file":"yarn2-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn2-lock-parser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -31,9 +31,11 @@
|
|
|
31
31
|
"npm": ">=10"
|
|
32
32
|
},
|
|
33
33
|
"files": [
|
|
34
|
-
"bin",
|
|
35
34
|
"dist"
|
|
36
35
|
],
|
|
36
|
+
"bugs": {
|
|
37
|
+
"url": "https://github.com/snyk/nodejs-lockfile-parser/issues"
|
|
38
|
+
},
|
|
37
39
|
"homepage": "https://github.com/snyk/nodejs-lockfile-parser#readme",
|
|
38
40
|
"dependencies": {
|
|
39
41
|
"@snyk/dep-graph": "^2.12.0",
|
|
@@ -76,5 +78,5 @@
|
|
|
76
78
|
"tar": "7.5.11"
|
|
77
79
|
},
|
|
78
80
|
"packageManager": "yarn@2.4.1",
|
|
79
|
-
"version": "2.
|
|
81
|
+
"version": "2.10.0"
|
|
80
82
|
}
|