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
|
@@ -18,20 +18,18 @@ class LockParserBase {
|
|
|
18
18
|
this.treeSizeLimit = treeSizeLimit;
|
|
19
19
|
this.pathDelimiter = '|';
|
|
20
20
|
}
|
|
21
|
-
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true) {
|
|
21
|
+
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope) {
|
|
22
22
|
var _a, _b;
|
|
23
23
|
if (lockfile.type !== this.type) {
|
|
24
24
|
throw new errors_1.InvalidUserInputError('Unsupported lockfile provided. Please ' +
|
|
25
25
|
'provide `package-lock.json`.');
|
|
26
26
|
}
|
|
27
27
|
const yarnLock = lockfile;
|
|
28
|
-
const depTree = {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
version: manifestFile.version || '',
|
|
34
|
-
};
|
|
28
|
+
const depTree = Object.assign({ dependencies: {}, hasDevDependencies: !_isEmpty(manifestFile.devDependencies), name: manifestFile.name, size: 1, version: manifestFile.version || '' }, (showNpmScope && {
|
|
29
|
+
labels: {
|
|
30
|
+
'npm:scope': 'unknown',
|
|
31
|
+
},
|
|
32
|
+
}));
|
|
35
33
|
const nodeVersion = (_a = manifestFile === null || manifestFile === void 0 ? void 0 : manifestFile.engines) === null || _a === void 0 ? void 0 : _a.node;
|
|
36
34
|
if (nodeVersion) {
|
|
37
35
|
if (!depTree.meta) {
|
|
@@ -46,7 +44,7 @@ class LockParserBase {
|
|
|
46
44
|
// prepare a flat map, where dependency path is a key to dependency object
|
|
47
45
|
// path is an unique identifier for each dependency and corresponds to the
|
|
48
46
|
// relative path on disc
|
|
49
|
-
const depMap = this.getDepMap(yarnLock, manifestFile.resolutions);
|
|
47
|
+
const depMap = this.getDepMap(yarnLock, manifestFile.resolutions, showNpmScope);
|
|
50
48
|
// all paths are identified, we can create a graph representing what depends on what
|
|
51
49
|
const depGraph = this.createGraphOfDependencies(depMap, strictOutOfSync);
|
|
52
50
|
// topological sort will be applied and it requires acyclic graphs
|
|
@@ -61,7 +59,7 @@ class LockParserBase {
|
|
|
61
59
|
}
|
|
62
60
|
}
|
|
63
61
|
// transform depMap to a map of PkgTrees
|
|
64
|
-
const { depTrees, depTreesSizes } = await this.createDepTrees(depMap, depGraph);
|
|
62
|
+
const { depTrees, depTreesSizes } = await this.createDepTrees(depMap, depGraph, showNpmScope);
|
|
65
63
|
// Only include peerDependencies if using npm and npm is at least
|
|
66
64
|
// version 7 as npm v7 automatically installs peerDependencies
|
|
67
65
|
// get trees for dependencies from manifest file
|
|
@@ -96,7 +94,7 @@ class LockParserBase {
|
|
|
96
94
|
}
|
|
97
95
|
}
|
|
98
96
|
else if (/^file:/.test(dep.version)) {
|
|
99
|
-
depTree.dependencies[dep.name] = (0, _1.createDepTreeDepFromDep)(dep);
|
|
97
|
+
depTree.dependencies[dep.name] = (0, _1.createDepTreeDepFromDep)(dep, showNpmScope);
|
|
100
98
|
treeSize++;
|
|
101
99
|
}
|
|
102
100
|
else {
|
|
@@ -105,7 +103,7 @@ class LockParserBase {
|
|
|
105
103
|
if (strictOutOfSync) {
|
|
106
104
|
throw new errors_1.OutOfSyncError(dep.name, this.type);
|
|
107
105
|
}
|
|
108
|
-
depTree.dependencies[dep.name] = (0, _1.createDepTreeDepFromDep)(dep);
|
|
106
|
+
depTree.dependencies[dep.name] = (0, _1.createDepTreeDepFromDep)(dep, showNpmScope);
|
|
109
107
|
if (!depTree.dependencies[dep.name].labels) {
|
|
110
108
|
depTree.dependencies[dep.name].labels = {};
|
|
111
109
|
}
|
|
@@ -116,11 +114,11 @@ class LockParserBase {
|
|
|
116
114
|
depTree.size = treeSize;
|
|
117
115
|
return depTree;
|
|
118
116
|
}
|
|
119
|
-
setDevDepRec(pkgTree) {
|
|
117
|
+
setDevDepRec(pkgTree, showNpmScope) {
|
|
120
118
|
for (const [name, subTree] of _toPairs(pkgTree.dependencies)) {
|
|
121
|
-
pkgTree.dependencies[name] = this.setDevDepRec(subTree);
|
|
119
|
+
pkgTree.dependencies[name] = this.setDevDepRec(subTree, showNpmScope);
|
|
122
120
|
}
|
|
123
|
-
pkgTree.labels = Object.assign(Object.assign({}, pkgTree.labels), { scope: _1.Scope.dev });
|
|
121
|
+
pkgTree.labels = Object.assign(Object.assign(Object.assign({}, pkgTree.labels), { scope: _1.Scope.dev }), (showNpmScope && { 'npm:scope': _1.Scope.dev }));
|
|
124
122
|
return pkgTree;
|
|
125
123
|
}
|
|
126
124
|
/* Algorithm for cycle removal:
|
|
@@ -254,8 +252,8 @@ class LockParserBase {
|
|
|
254
252
|
}
|
|
255
253
|
// Algorithm is based on dynamic programming technique and tries to build
|
|
256
254
|
// "more simple" trees and compose them into bigger ones.
|
|
257
|
-
async createDepTrees(depMap, depGraph) {
|
|
258
|
-
var _a;
|
|
255
|
+
async createDepTrees(depMap, depGraph, showNpmScope) {
|
|
256
|
+
var _a, _b;
|
|
259
257
|
// Graph has to be acyclic
|
|
260
258
|
if (!graphlib.alg.isAcyclic(depGraph)) {
|
|
261
259
|
throw new Error('Cycles were not removed from graph.');
|
|
@@ -288,7 +286,8 @@ class LockParserBase {
|
|
|
288
286
|
name: name,
|
|
289
287
|
version: identifier,
|
|
290
288
|
dependencies: {},
|
|
291
|
-
labels: Object.assign({ missingLockFileEntry: 'true' }, (((_a = dep.labels) === null || _a === void 0 ? void 0 : _a.scope) && { scope: dep.labels.scope })),
|
|
289
|
+
labels: Object.assign(Object.assign({ missingLockFileEntry: 'true' }, (((_a = dep.labels) === null || _a === void 0 ? void 0 : _a.scope) && { scope: dep.labels.scope })), (showNpmScope &&
|
|
290
|
+
((_b = dep.labels) === null || _b === void 0 ? void 0 : _b.scope) && { 'npm:scope': dep.labels.scope })),
|
|
292
291
|
};
|
|
293
292
|
treeSize += 1;
|
|
294
293
|
}
|
|
@@ -316,7 +315,8 @@ class LockParserBase {
|
|
|
316
315
|
return { depTrees, depTreesSizes };
|
|
317
316
|
}
|
|
318
317
|
getDepMap(lockfile, // eslint-disable-line @typescript-eslint/no-unused-vars
|
|
319
|
-
resolutions
|
|
318
|
+
resolutions, // eslint-disable-line @typescript-eslint/no-unused-vars
|
|
319
|
+
showNpmScope) {
|
|
320
320
|
throw new Error('Not implemented');
|
|
321
321
|
}
|
|
322
322
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock-parser-base.js","sourceRoot":"","sources":["../../lib/parsers/lock-parser-base.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"lock-parser-base.js","sourceRoot":"","sources":["../../lib/parsers/lock-parser-base.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,2CAA2C;AAC3C,2CAA2C;AAC3C,2CAA2C;AAC3C,+BAAkC;AAClC,2DAAsD;AACtD,mCAAmC;AACnC,sEAA2E;AAE3E,yBAYY;AACZ,sCAImB;AAEnB,MAAM,KAAK,GAAG,SAAS,CAAC,oBAAoB,CAAC,CAAC;AAgC9C,MAAsB,cAAc;IAGlC,YAAsB,IAAkB,EAAY,aAAqB;QAAnD,SAAI,GAAJ,IAAI,CAAc;QAAY,kBAAa,GAAb,aAAa,CAAQ;QAF/D,kBAAa,GAAG,GAAG,CAAC;IAE8C,CAAC;IAItE,KAAK,CAAC,iBAAiB,CAC5B,YAA0B,EAC1B,QAAkB,EAClB,UAAU,GAAG,KAAK,EAClB,eAAe,GAAG,IAAI,EACtB,YAAsB;;QAEtB,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YAChC,MAAM,IAAI,8BAAqB,CAC7B,wCAAwC;gBACtC,8BAA8B,CACjC,CAAC;QACJ,CAAC;QACD,MAAM,QAAQ,GAAG,QAAoB,CAAC;QAEtC,MAAM,OAAO,mBACX,YAAY,EAAE,EAAE,EAChB,kBAAkB,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,eAAe,CAAC,EAC3D,IAAI,EAAE,YAAY,CAAC,IAAI,EACvB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,YAAY,CAAC,OAAO,IAAI,EAAE,IAChC,CAAC,YAAY,IAAI;YAClB,MAAM,EAAE;gBACN,WAAW,EAAE,SAAS;aACvB;SACF,CAAC,CACH,CAAC;QAEF,MAAM,WAAW,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,IAAI,CAAC;QAEhD,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAClB,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC;YACpB,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QACzC,CAAC;QAED,8BAA8B;QAC9B,IAAI,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACvD,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,0EAA0E;QAC1E,0EAA0E;QAC1E,wBAAwB;QACxB,MAAM,MAAM,GAAW,IAAI,CAAC,SAAS,CACnC,QAAQ,EACR,YAAY,CAAC,WAAW,EACxB,YAAY,CACb,CAAC;QAEF,oFAAoF;QACpF,MAAM,QAAQ,GAAmB,IAAI,CAAC,yBAAyB,CAC7D,MAAM,EACN,eAAe,CAChB,CAAC;QAEF,kEAAkE;QAClE,IAAI,WAAW,GAAkB,EAAE,CAAC;QACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,MAAM,MAAM,GAAe,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC7D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,4EAA4E;gBAC5E,oEAAoE;gBACpE,+EAA+E;gBAC/E,WAAW,mCACN,WAAW,GACX,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAC7C,CAAC;YACJ,CAAC;QACH,CAAC;QAED,wCAAwC;QACxC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAC3D,MAAM,EACN,QAAQ,EACR,YAAY,CACb,CAAC;QAEF,iEAAiE;QACjE,8DAA8D;QAC9D,gDAAgD;QAChD,MAAM,YAAY,GAAU,IAAA,kBAAe,EAAC;YAC1C,UAAU,EAAE,YAAY;YACxB,UAAU;YACV,eAAe,EAAE,QAAQ,CAAC,IAAI,KAAK,eAAY,CAAC,IAAI;YACpD,qBAAqB,EAAE,QAAQ,CAAC,IAAI,KAAK,eAAY,CAAC,KAAK;SAC5D,CAAC,CAAC;QACH,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,MAAA,YAAY,CAAC,OAAO,mCAAI,EAAE,CAAC,EAAE,CAAC;YAC5D,MAAM,SAAS,GAAG,YAAY,CAAC,OAAQ,CAAC,KAAK,CAAC,CAAC;YAC/C,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,mCACxB,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,KAChC,IAAI,EAAE,SAAS,CAAC,kBAAkB,EAClC,MAAM,kCACD,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,GACpC,EAAE,KAAK,EAAE,SAAS,EAAE,IAE1B,CAAC;QACJ,CAAC;QACD,4CAA4C;QAC5C,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,IAAI,QAAQ,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;gBAClC,MAAM,IAAI,2BAAkB,EAAE,CAAC;YACjC,CAAC;YACD,sDAAsD;YACtD,yCAAyC;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;YACxC,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtB,2DAA2D;gBAC3D,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG;oBACtC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;oBAClD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACtB,QAAQ,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC;gBACnC,IAAI,qCAAgB,CAAC,UAAU,EAAE,EAAE,CAAC;oBAClC,MAAM,qCAAgB,CAAC,IAAI,EAAE,CAAC;gBAChC,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAA,0BAAuB,EACtD,GAAG,EACH,YAAY,CACb,CAAC;gBACF,QAAQ,EAAE,CAAC;YACb,CAAC;iBAAM,CAAC;gBACN,uCAAuC;gBACvC,uBAAuB;gBACvB,IAAI,eAAe,EAAE,CAAC;oBACpB,MAAM,IAAI,uBAAc,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChD,CAAC;gBACD,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAA,0BAAuB,EACtD,GAAG,EACH,YAAY,CACb,CAAC;gBACF,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;oBAC3C,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC;gBAC7C,CAAC;gBACD,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAO,CAAC,oBAAoB,GAAG,MAAM,CAAC;gBACrE,QAAQ,EAAE,CAAC;YACb,CAAC;QACH,CAAC;QAED,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC;QACxB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,YAAY,CAAC,OAAmB,EAAE,YAAsB;QAC9D,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7D,OAAO,CAAC,YAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,CAAC,MAAM,iDACT,OAAO,CAAC,MAAM,KACjB,KAAK,EAAE,QAAK,CAAC,GAAG,KACb,CAAC,YAAY,IAAI,EAAE,WAAW,EAAE,QAAK,CAAC,GAAG,EAAE,CAAC,CAChD,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;;;;;;;;;MAcE;IACM,WAAW,CACjB,KAAe,EACf,MAAc,EACd,QAAwB;QAExB;;;UAGE;QACF,MAAM,qBAAqB,GAAG,CAC5B,IAAI,EACJ,SAAmB,EACnB,YAAsB,EACtB,QAAQ,EACR,EAAE;YACF,kDAAkD;YAClD,MAAM,cAAc,GAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAqB,CAAC,MAAM,CACvE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAClC,CAAC;YACF,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;gBAClC,8CAA8C;gBAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;gBACrB,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAC/C,KAAK,EACL,MAAM,EACN,QAAQ,CACT,CAAC;gBACF,mDAAmD;gBACnD,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;gBAC3C,yEAAyE;gBACzE,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9B,4DAA4D;oBAC5D,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC;wBACnC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC;oBACrC,CAAC;oBACD,MAAM,CAAC,cAAc,CAAC,CAAC,MAAO,CAAC,MAAM,GAAG,QAAQ,CAAC;gBACnD,CAAC;qBAAM,CAAC;oBACN,+EAA+E;oBAC/E,qBAAqB,CACnB,KAAK,EACL,CAAC,GAAG,SAAS,EAAE,IAAI,CAAC,EACpB,YAAY,EACZ,cAAc,CACf,CAAC;oBACF,qEAAqE;oBACrE,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAE;wBACjE,OAAO,EAAE,IAAI;wBACb,QAAQ,EAAE,KAAK;qBAChB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,WAAW,GAAkB,EAAE,CAAC;QACtC,6BAA6B;QAC7B,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;YAC1B,4DAA4D;YAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACvE,WAAW,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;YAEhC,sCAAsC;YACtC,qBAAqB,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YACpD,2EAA2E;YAC3E,oDAAoD;YACpD,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE;gBAC7D,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;QACL,CAAC;QAED,qEAAqE;QACrE,cAAc;QACd,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;YAC1B,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,qBAAqB,CAC3B,QAAQ,EACR,MAAM,EACN,KAAe,EACf,QAAQ,EACR,EAAE,OAAO,EAAE,QAAQ,EAAiB;QAEpC,yBAAyB;QACzB,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAoB,CAAC;QAC9D,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9D,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;gBACtB,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;gBAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;gBACrB,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAEO,qBAAqB,CAC3B,IAAY,EACZ,MAAc,EACd,QAAwB;QAExB,MAAM,OAAO,GAAG,IAAI,GAAG,IAAA,SAAI,GAAE,CAAC;QAC9B,8BAA8B;QAC9B,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,4BAA4B;QAC5B,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,yBAAyB,CAC/B,MAAc,EACd,eAAe,GAAG,IAAI;QAEtB,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACzC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QACD,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACpD,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACnC,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAClC,OAAO,EACP,OAAO,EACP,MAAM,EACN,eAAe,CAChB,CAAC;gBACF,+DAA+D;gBAC/D,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,iFAAiF;IACjF,sDAAsD;IAC9C,YAAY,CAClB,SAAiB,EACjB,OAAe,EACf,MAAc,EACd,eAAe,GAAG,IAAI;QAEtB,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACpD,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;YACtB,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACrE,IAAI,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;gBACxB,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACrB,KAAK,CAAC,cAAc,OAAO,YAAY,CAAC,CAAC;YACzC,IAAI,eAAe,EAAE,CAAC;gBACpB,MAAM,IAAI,uBAAc,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,yEAAyE;IACzE,yDAAyD;IACjD,KAAK,CAAC,cAAc,CAC1B,MAAc,EACd,QAAQ,EACR,YAAsB;;QAKtB,0BAA0B;QAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,QAAQ,GAAsC,EAAE,CAAC;QACvD,MAAM,aAAa,GAAkC,EAAE,CAAC;QACxD,wEAAwE;QACxE,uEAAuE;QACvE,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEhD,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAY,CAAC;YAC1C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,QAAQ,GAAG,CAAC,CAAC;YACjB,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,KAAK,CAAC,qBAAqB,MAAM,EAAE,CAAC,CAAC;gBACrC,SAAS;YACX,CAAC;YACD,0EAA0E;YAC1E,2BAA2B;YAC3B,KAAK,MAAM,UAAU,IAAI,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;gBACvD,IAAI,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAClC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;oBACtB,GAAG,CAAC,YAAY,GAAG,EAAE,CAAC;gBACxB,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,KAAK,CAAC,qBAAqB,UAAU,EAAE,CAAC,CAAC;oBAEzC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,2CAAwB,EAAC,UAAU,CAAC,CAAC;oBAElE,MAAM,GAAG;wBACP,IAAI,EAAE,IAAI;wBACV,OAAO,EAAE,UAAU;wBACnB,YAAY,EAAE,EAAE;wBAChB,MAAM,gCACJ,oBAAoB,EAAE,MAAM,IACzB,CAAC,CAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,KAAK,KAAI,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAClD,CAAC,YAAY;6BACd,MAAA,GAAG,CAAC,MAAM,0CAAE,KAAK,CAAA,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAC1D;qBACF,CAAC;oBAEF,QAAQ,IAAI,CAAC,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,QAAQ,IAAI,aAAa,CAAC,UAAU,CAAC,CAAC;gBACxC,CAAC;gBACD,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,IAAK,CAAC,GAAG,MAAM,CAAC;YAC1C,CAAC;YACD,MAAM,UAAU,GAAe;gBAC7B,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,OAAO,EAAE,GAAG,CAAC,OAAO;aACrB,CAAC;YAEF,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;gBACrB,UAAU,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;YAC7C,CAAC;YACD,QAAQ,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC;YAC9B,aAAa,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC;YACjC,sEAAsE;YACtE,uEAAuE;YACvE,IAAI,qCAAgB,CAAC,UAAU,EAAE,EAAE,CAAC;gBAClC,MAAM,qCAAgB,CAAC,IAAI,EAAE,CAAC;YAChC,CAAC;QACH,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;IACrC,CAAC;IAES,SAAS,CACjB,QAAkB,EAAE,wDAAwD;IAC5E,WAAkC,EAAE,wDAAwD;IAC5F,YAAsB;QAEtB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAED,6DAA6D;IACnD,aAAa,CAAC,GAAQ;QAC9B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;CACF;AA3bD,wCA2bC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Dep, Lockfile, LockfileType, ManifestFile, PkgTree } from './index';
|
|
1
|
+
import { Dep, Lockfile, LockfileType, ManifestDependencies, ManifestFile, PkgTree } from './index';
|
|
2
2
|
import { DepMap, LockParserBase } from './lock-parser-base';
|
|
3
3
|
export interface PackageLock {
|
|
4
4
|
name: string;
|
|
@@ -21,7 +21,7 @@ export interface PackageLockDep {
|
|
|
21
21
|
export declare class PackageLockParser extends LockParserBase {
|
|
22
22
|
constructor();
|
|
23
23
|
parseLockFile(lockFileContents: string): PackageLock;
|
|
24
|
-
getDependencyTree(manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean): Promise<PkgTree>;
|
|
25
|
-
protected getDepMap(lockfile: Lockfile): DepMap;
|
|
24
|
+
getDependencyTree(manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean, showNpmScope?: boolean): Promise<PkgTree>;
|
|
25
|
+
protected getDepMap(lockfile: Lockfile, resolutions?: ManifestDependencies, showNpmScope?: boolean): DepMap;
|
|
26
26
|
protected getDepTreeKey(dep: Dep): string;
|
|
27
27
|
}
|
|
@@ -24,8 +24,8 @@ class PackageLockParser extends lock_parser_base_1.LockParserBase {
|
|
|
24
24
|
`error ${e.message}`);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true) {
|
|
28
|
-
const dependencyTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync);
|
|
27
|
+
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope) {
|
|
28
|
+
const dependencyTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync, showNpmScope);
|
|
29
29
|
const meta = {
|
|
30
30
|
lockfileVersion: lockfile.lockfileVersion,
|
|
31
31
|
packageManager: 'npm',
|
|
@@ -33,15 +33,15 @@ class PackageLockParser extends lock_parser_base_1.LockParserBase {
|
|
|
33
33
|
const depTreeWithMeta = Object.assign(Object.assign({}, dependencyTree), { meta: Object.assign(Object.assign({}, dependencyTree.meta), meta) });
|
|
34
34
|
return depTreeWithMeta;
|
|
35
35
|
}
|
|
36
|
-
getDepMap(lockfile) {
|
|
36
|
+
getDepMap(lockfile, resolutions, showNpmScope) {
|
|
37
37
|
const packageLock = lockfile;
|
|
38
38
|
const depMap = {};
|
|
39
39
|
const flattenLockfileRec = (lockfileDeps, path) => {
|
|
40
40
|
for (const [depName, dep] of Object.entries(lockfileDeps)) {
|
|
41
41
|
const depNode = {
|
|
42
|
-
labels: {
|
|
43
|
-
scope: dep.dev ? index_1.Scope.dev : index_1.Scope.prod,
|
|
44
|
-
},
|
|
42
|
+
labels: Object.assign({ scope: dep.dev ? index_1.Scope.dev : index_1.Scope.prod }, (showNpmScope && {
|
|
43
|
+
'npm:scope': dep.dev ? index_1.Scope.dev : index_1.Scope.prod,
|
|
44
|
+
})),
|
|
45
45
|
name: depName,
|
|
46
46
|
requires: [],
|
|
47
47
|
version: dep.version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/package-lock-parser.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"package-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/package-lock-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Dep, Lockfile, LockfileType, ManifestFile, PkgTree } from './index';
|
|
1
|
+
import { Dep, Lockfile, LockfileType, ManifestDependencies, ManifestFile, PkgTree } from './index';
|
|
2
2
|
import { DepMap, LockParserBase } from './lock-parser-base';
|
|
3
3
|
export type YarnLockFileTypes = LockfileType.yarn | LockfileType.yarn2;
|
|
4
4
|
export interface YarnLock {
|
|
@@ -22,7 +22,7 @@ export interface YarnLockDep {
|
|
|
22
22
|
export declare class YarnLockParser extends LockParserBase {
|
|
23
23
|
constructor();
|
|
24
24
|
parseLockFile(lockFileContents: string): YarnLock;
|
|
25
|
-
getDependencyTree(manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean): Promise<PkgTree>;
|
|
26
|
-
protected getDepMap(lockfile: Lockfile): DepMap;
|
|
25
|
+
getDependencyTree(manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean, showNpmScope?: boolean): Promise<PkgTree>;
|
|
26
|
+
protected getDepMap(lockfile: Lockfile, resolutions?: ManifestDependencies, showNpmScope?: boolean): DepMap;
|
|
27
27
|
protected getDepTreeKey(dep: Dep): string;
|
|
28
28
|
}
|
|
@@ -21,21 +21,19 @@ class YarnLockParser extends lock_parser_base_1.LockParserBase {
|
|
|
21
21
|
throw new errors_1.InvalidUserInputError(`yarn.lock parsing failed with an error: ${e.message}`);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true) {
|
|
25
|
-
const depTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync);
|
|
24
|
+
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope) {
|
|
25
|
+
const depTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync, showNpmScope);
|
|
26
26
|
const meta = { lockfileVersion: 1, packageManager: 'yarn' };
|
|
27
27
|
const depTreeWithMeta = Object.assign(Object.assign({}, depTree), { meta: Object.assign(Object.assign({}, depTree.meta), meta) });
|
|
28
28
|
return depTreeWithMeta;
|
|
29
29
|
}
|
|
30
|
-
getDepMap(lockfile) {
|
|
30
|
+
getDepMap(lockfile, resolutions, showNpmScope) {
|
|
31
31
|
const yarnLockfile = lockfile;
|
|
32
32
|
const depMap = {};
|
|
33
33
|
for (const [depName, dep] of Object.entries(yarnLockfile.object)) {
|
|
34
34
|
const subDependencies = Object.entries(Object.assign(Object.assign({}, (dep.dependencies || {})), (dep.optionalDependencies || {})));
|
|
35
35
|
depMap[depName] = {
|
|
36
|
-
labels: {
|
|
37
|
-
scope: index_1.Scope.prod,
|
|
38
|
-
},
|
|
36
|
+
labels: Object.assign({ scope: index_1.Scope.prod }, (showNpmScope && { 'npm:scope': index_1.Scope.prod })),
|
|
39
37
|
name: getName(depName),
|
|
40
38
|
requires: subDependencies.map(([key, ver]) => `${key}@${ver}`),
|
|
41
39
|
version: dep.version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn-lock-parser.ts"],"names":[],"mappings":";;;AAAA,wDAAwD;AAExD,
|
|
1
|
+
{"version":3,"file":"yarn-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn-lock-parser.ts"],"names":[],"mappings":";;;AAAA,wDAAwD;AAExD,mCAQiB;AACjB,sCAAkD;AAClD,yDAA4D;AAC5D,sCAAmC;AAyBnC,MAAa,cAAe,SAAQ,iCAAc;IAChD;QACE,KAAK,CAAC,oBAAY,CAAC,IAAI,EAAE,eAAM,CAAC,oBAAoB,CAAC,CAAC;IACxD,CAAC;IAEM,aAAa,CAAC,gBAAwB;QAC3C,IAAI,CAAC;YACH,MAAM,QAAQ,GAAa,kBAAkB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACtE,QAAQ,CAAC,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC;YACxC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YAC1B,OAAO,QAAQ,CAAC;QAClB,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;QAEtB,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAC3C,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,eAAe,EACf,YAAY,CACb,CAAC;QAEF,MAAM,IAAI,GAAG,EAAE,eAAe,EAAE,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;QAC5D,MAAM,eAAe,mCAChB,OAAO,KACV,IAAI,kCAAO,OAAO,CAAC,IAAI,GAAK,IAAI,IACjC,CAAC;QAEF,OAAO,eAAe,CAAC;IACzB,CAAC;IAES,SAAS,CACjB,QAAkB,EAClB,WAAkC,EAClC,YAAsB;QAEtB,MAAM,YAAY,GAAG,QAAoB,CAAC;QAC1C,MAAM,MAAM,GAAW,EAAE,CAAC;QAE1B,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YACjE,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,iCACjC,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,GACxB,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,EACnC,CAAC;YACH,MAAM,CAAC,OAAO,CAAC,GAAG;gBAChB,MAAM,kBACJ,KAAK,EAAE,aAAK,CAAC,IAAI,IACd,CAAC,YAAY,IAAI,EAAE,WAAW,EAAE,aAAK,CAAC,IAAI,EAAE,CAAC,CACjD;gBACD,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC;gBACtB,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;gBAC9D,OAAO,EAAE,GAAG,CAAC,OAAO;aACrB,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,aAAa,CAAC,GAAQ;QAC9B,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;CACF;AAxED,wCAwEC;AAED,SAAS,OAAO,CAAC,OAAe;IAC9B,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -10,7 +10,7 @@ export interface Yarn2Lock {
|
|
|
10
10
|
export declare class Yarn2LockParser extends LockParserBase {
|
|
11
11
|
constructor();
|
|
12
12
|
parseLockFile(lockFileContents: string): Yarn2Lock;
|
|
13
|
-
getDependencyTree(manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean): Promise<PkgTree>;
|
|
14
|
-
protected getDepMap(lockfile: Lockfile, resolutions?: ManifestDependencies): DepMap;
|
|
13
|
+
getDependencyTree(manifestFile: ManifestFile, lockfile: Lockfile, includeDev?: boolean, strictOutOfSync?: boolean, showNpmScope?: boolean): Promise<PkgTree>;
|
|
14
|
+
protected getDepMap(lockfile: Lockfile, resolutions?: ManifestDependencies, showNpmScope?: boolean): DepMap;
|
|
15
15
|
protected getDepTreeKey(dep: Dep): string;
|
|
16
16
|
}
|
|
@@ -40,13 +40,13 @@ class Yarn2LockParser extends lock_parser_base_1.LockParserBase {
|
|
|
40
40
|
throw new errors_1.InvalidUserInputError(`yarn.lock parsing failed with an error: ${e.message}`);
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
-
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true) {
|
|
44
|
-
const depTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync);
|
|
43
|
+
async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope) {
|
|
44
|
+
const depTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync, showNpmScope);
|
|
45
45
|
const meta = { lockfileVersion: 2, packageManager: 'yarn' };
|
|
46
46
|
const depTreeWithMeta = Object.assign(Object.assign({}, depTree), { meta: Object.assign(Object.assign({}, depTree.meta), meta) });
|
|
47
47
|
return depTreeWithMeta;
|
|
48
48
|
}
|
|
49
|
-
getDepMap(lockfile, resolutions) {
|
|
49
|
+
getDepMap(lockfile, resolutions, showNpmScope) {
|
|
50
50
|
const yarnLockfile = lockfile;
|
|
51
51
|
const depMap = {};
|
|
52
52
|
const dependencies = lockfile.dependencies || {};
|
|
@@ -54,9 +54,7 @@ class Yarn2LockParser extends lock_parser_base_1.LockParserBase {
|
|
|
54
54
|
const subDependencies = Object.entries(Object.assign(Object.assign({}, (dep.dependencies || {})), (dep.optionalDependencies || {}))).map(([key, ver]) => findResolutions(dependencies, depName, key, resolutions) ||
|
|
55
55
|
`${key}@${ver}`);
|
|
56
56
|
depMap[depName] = {
|
|
57
|
-
labels: {
|
|
58
|
-
scope: _1.Scope.prod,
|
|
59
|
-
},
|
|
57
|
+
labels: Object.assign({ scope: _1.Scope.prod }, (showNpmScope && { 'npm:scope': _1.Scope.prod })),
|
|
60
58
|
name: getName(depName),
|
|
61
59
|
requires: subDependencies,
|
|
62
60
|
version: dep.version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn2-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn2-lock-parser.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,0CAA0C;AAE1C,yDAA4D;AAC5D,wBAQW;AACX,sCAAmC;AAEnC,sCAAkD;AAClD,6CAAyD;AASzD,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;QAEtB,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAC3C,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,eAAe,
|
|
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,7 +31,7 @@
|
|
|
31
31
|
],
|
|
32
32
|
"homepage": "https://github.com/snyk/nodejs-lockfile-parser#readme",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@snyk/dep-graph": "^2.
|
|
34
|
+
"@snyk/dep-graph": "^2.12.0",
|
|
35
35
|
"@snyk/error-catalog-nodejs-public": "^5.16.0",
|
|
36
36
|
"@snyk/graphlib": "2.1.9-patch.3",
|
|
37
37
|
"@yarnpkg/core": "^4.4.1",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"typescript": "^5.4.5"
|
|
69
69
|
},
|
|
70
70
|
"packageManager": "yarn@2.4.1",
|
|
71
|
-
"version": "2.
|
|
71
|
+
"version": "2.5.1"
|
|
72
72
|
}
|