snyk-nodejs-lockfile-parser 1.58.0 → 1.58.2
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/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.js +5 -2
- package/dist/dep-graph-builders/pnpm/parse-workspace.js.map +1 -1
- package/dist/dep-graph-builders/types.d.ts +1 -0
- package/package.json +1 -1
|
@@ -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, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, } = options;
|
|
8
|
+
const { includeDevDeps, includePeerDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, } = options;
|
|
9
9
|
let importer = '';
|
|
10
10
|
const pkgJson = (0, util_1.parsePkgJson)(pkgJsonContent);
|
|
11
11
|
const lockFileParser = (0, index_1.getPnpmLockfileParser)(pnpmLockContent, lockfileVersion);
|
|
@@ -16,6 +16,7 @@ const parsePnpmProject = async (pkgJsonContent, pnpmLockContent, options, lockfi
|
|
|
16
16
|
const depgraph = await (0, build_dep_graph_pnpm_1.buildDepGraphPnpm)(lockFileParser, pkgJson, {
|
|
17
17
|
includeDevDeps,
|
|
18
18
|
strictOutOfSync,
|
|
19
|
+
includePeerDeps,
|
|
19
20
|
includeOptionalDeps,
|
|
20
21
|
pruneWithinTopLevelDeps,
|
|
21
22
|
}, importer);
|
|
@@ -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,eAAuB,EACvB,OAAgC,EAChC,eAAqC,EAClB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,uBAAuB,GACxB,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;QAClD,QAAQ,GAAG,GAAG,CAAC;KAChB;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAiB,EACtC,cAAc,EACd,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,mBAAmB;QACnB,uBAAuB;KACxB,EACD,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;
|
|
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,eAAuB,EACvB,OAAgC,EAChC,eAAqC,EAClB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,GACxB,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;QAClD,QAAQ,GAAG,GAAG,CAAC;KAChB;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAiB,EACtC,cAAc,EACd,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,eAAe;QACf,mBAAmB;QACnB,uBAAuB;KACxB,EACD,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAzCW,QAAA,gBAAgB,oBAyC3B"}
|
|
@@ -33,14 +33,16 @@ function computeProjectVersionMaps(root, targets) {
|
|
|
33
33
|
}
|
|
34
34
|
const parsePnpmWorkspace = async (root, workspaceDir, options) => {
|
|
35
35
|
const scannedProjects = [];
|
|
36
|
-
const { includeDevDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, } = options;
|
|
36
|
+
const { includeDevDeps, includePeerDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, } = options;
|
|
37
37
|
const pnpmLockfileContents = (0, utils_2.getFileContents)(root, path.join(workspaceDir, 'pnpm-lock.yaml')).content;
|
|
38
38
|
const lockfileVersion = (0, utils_1.getPnpmLockfileVersion)(pnpmLockfileContents);
|
|
39
39
|
const lockFileParser = (0, index_1.getPnpmLockfileParser)(pnpmLockfileContents, lockfileVersion);
|
|
40
40
|
const projectVersionsMaps = computeProjectVersionMaps(workspaceDir, Object.keys(lockFileParser.importers));
|
|
41
41
|
for (const importer of Object.keys(lockFileParser.importers)) {
|
|
42
42
|
const resolvedImporterPath = path.join(workspaceDir, importer);
|
|
43
|
-
const
|
|
43
|
+
const packagePath = path.join(resolvedImporterPath, 'package.json');
|
|
44
|
+
debug(`Processing project ${packagePath} as part of a pnpm workspace`);
|
|
45
|
+
const pkgJsonFile = (0, utils_2.getFileContents)(root, packagePath);
|
|
44
46
|
const pkgJson = (0, util_1.parsePkgJson)(pkgJsonFile.content);
|
|
45
47
|
lockFileParser.workspaceArgs = {
|
|
46
48
|
isWorkspace: true,
|
|
@@ -49,6 +51,7 @@ const parsePnpmWorkspace = async (root, workspaceDir, options) => {
|
|
|
49
51
|
try {
|
|
50
52
|
const depGraph = await (0, build_dep_graph_pnpm_1.buildDepGraphPnpm)(lockFileParser, pkgJson, {
|
|
51
53
|
includeDevDeps,
|
|
54
|
+
includePeerDeps,
|
|
52
55
|
strictOutOfSync,
|
|
53
56
|
includeOptionalDeps,
|
|
54
57
|
pruneWithinTopLevelDeps,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-workspace.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-workspace.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,6BAA6B;AAC7B,kCAAuC;AAMvC,iEAA2D;AAE3D,mDAAgE;AAEhE,uCAAqD;AACrD,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;QAC5B,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;YACF,MAAM,aAAa,GAAG,IAAA,mBAAY,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACxD,MAAM,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC;YAC7C,kBAAkB,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;SAC7C;QAAC,OAAO,GAAQ,EAAE;YACjB,KAAK,CACH,sCAAsC,mBAAmB,YAAY,GAAG,EAAE,CAC3E,CAAC;YACF,SAAS;SACV;KACF;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,mBAAmB,EACnB,eAAe,EACf,uBAAuB,GACxB,GAAG,OAAO,CAAC;IAEZ,MAAM,oBAAoB,GAAG,IAAA,uBAAe,EAC1C,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAC1C,CAAC,OAAO,CAAC;IAEV,MAAM,eAAe,GAAG,IAAA,8BAAsB,EAAC,oBAAoB,CAAC,CAAC;IACrE,MAAM,cAAc,GAAuB,IAAA,6BAAqB,EAC9D,oBAAoB,EACpB,eAAe,CAChB,CAAC;IAEF,MAAM,mBAAmB,GAAG,yBAAyB,CACnD,YAAY,EACZ,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CACtC,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;QAC5D,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"parse-workspace.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-workspace.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED