snyk-nodejs-lockfile-parser 1.53.2 → 1.54.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/pnpm/lockfile-parser/lockfile-parser.d.ts +3 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js +1 -0
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.d.ts +2 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.js +21 -0
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.d.ts +2 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js +22 -3
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/types.d.ts +5 -0
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PnpmWorkspaceArgs } from '../../types';
|
|
2
|
-
import { NormalisedPnpmPkgs, ParsedDepPath, PnpmDepPath, PnpmDeps, PnpmLockPkg } from '../types';
|
|
2
|
+
import { NormalisedPnpmPkgs, ParsedDepPath, PnpmDepPath, PnpmDeps, PnpmImporters, PnpmLockPkg } from '../types';
|
|
3
3
|
export declare abstract class PnpmLockfileParser {
|
|
4
4
|
lockFileVersion: string;
|
|
5
5
|
rawPnpmLock: any;
|
|
@@ -9,6 +9,7 @@ export declare abstract class PnpmLockfileParser {
|
|
|
9
9
|
optionalDependencies: Record<string, any>;
|
|
10
10
|
peerDependencies: Record<string, any>;
|
|
11
11
|
extractedPackages: NormalisedPnpmPkgs;
|
|
12
|
+
importers: PnpmImporters;
|
|
12
13
|
workspaceArgs?: PnpmWorkspaceArgs;
|
|
13
14
|
constructor(rawPnpmLock: any, workspaceArgs?: PnpmWorkspaceArgs);
|
|
14
15
|
isWorkspaceLockfile(): boolean | undefined;
|
|
@@ -25,4 +26,5 @@ export declare abstract class PnpmLockfileParser {
|
|
|
25
26
|
abstract normalizeTopLevelDeps(dependencies: any, isDev: any): PnpmDeps;
|
|
26
27
|
abstract parseDepPath(depPath: string): ParsedDepPath;
|
|
27
28
|
abstract excludeTransPeerDepsVersions(fullVersionStr: string): string;
|
|
29
|
+
abstract normaliseImporters(rawPnpmLock: any): PnpmImporters;
|
|
28
30
|
}
|
|
@@ -15,6 +15,7 @@ class PnpmLockfileParser {
|
|
|
15
15
|
this.optionalDependencies = depsRoot.optionalDependencies || {};
|
|
16
16
|
this.peerDependencies = depsRoot.peerDependencies || {};
|
|
17
17
|
this.extractedPackages = this.extractPackages();
|
|
18
|
+
this.importers = this.normaliseImporters(rawPnpmLock);
|
|
18
19
|
}
|
|
19
20
|
isWorkspaceLockfile() {
|
|
20
21
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfile-parser.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"lockfile-parser.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ParsedDepPath, PnpmDeps } from '../types';
|
|
1
|
+
import { ParsedDepPath, PnpmDeps, PnpmImporters } from '../types';
|
|
2
2
|
import { PnpmLockfileParser } from './lockfile-parser';
|
|
3
3
|
import { PnpmWorkspaceArgs } from '../../types';
|
|
4
4
|
export declare class LockfileV5Parser extends PnpmLockfileParser {
|
|
@@ -8,4 +8,5 @@ export declare class LockfileV5Parser extends PnpmLockfileParser {
|
|
|
8
8
|
normalizeTopLevelDeps(dependencies: Record<string, string>, isDev: boolean): PnpmDeps;
|
|
9
9
|
normalizePackagesDeps(dependencies: Record<string, string>, isDev: boolean): Record<string, string>;
|
|
10
10
|
excludeTransPeerDepsVersions(fullVersionStr: string): string;
|
|
11
|
+
normaliseImporters(rawPnpmLock: any): PnpmImporters;
|
|
11
12
|
}
|
|
@@ -49,6 +49,27 @@ class LockfileV5Parser extends lockfile_parser_1.PnpmLockfileParser {
|
|
|
49
49
|
excludeTransPeerDepsVersions(fullVersionStr) {
|
|
50
50
|
return fullVersionStr.split('_')[0];
|
|
51
51
|
}
|
|
52
|
+
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
53
|
+
normaliseImporters(rawPnpmLock) {
|
|
54
|
+
if (!('importers' in rawPnpmLock)) {
|
|
55
|
+
return {};
|
|
56
|
+
}
|
|
57
|
+
const rawImporters = rawPnpmLock.importers;
|
|
58
|
+
return Object.entries(rawImporters).reduce(
|
|
59
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
60
|
+
(acc, [key, val]) => {
|
|
61
|
+
// No deps case
|
|
62
|
+
if (!('dependencies' in val)) {
|
|
63
|
+
return Object.assign(Object.assign({}, acc), { [key]: {} });
|
|
64
|
+
}
|
|
65
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
66
|
+
const deps = val.dependencies;
|
|
67
|
+
const depsNormalized = Object.fromEntries(Object.entries(deps).map(([depName, version]) => {
|
|
68
|
+
return [depName, version];
|
|
69
|
+
}));
|
|
70
|
+
return Object.assign(Object.assign({}, acc), { [key]: depsNormalized });
|
|
71
|
+
}, {});
|
|
72
|
+
}
|
|
52
73
|
}
|
|
53
74
|
exports.LockfileV5Parser = LockfileV5Parser;
|
|
54
75
|
//# sourceMappingURL=lockfile-v5.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfile-v5.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.ts"],"names":[],"mappings":";;;AAAA,qDAAwC;AAExC,uDAAuD;AAGvD,MAAa,gBAAiB,SAAQ,oCAAkB;IAGtD,YAAmB,WAAgB,EAAE,aAAiC;QACpE,KAAK,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;IACxC,CAAC;IAEM,YAAY,CAAC,OAAe;QACjC,oEAAoE;QACpE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAA,uBAAK,EAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,EAAE,IAAI,EAAE,CAAC;SACjB;QACD,OAAO;YACL,IAAI;YACJ,OAAO,EAAE,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC;SACpD,CAAC;IACJ,CAAC;IAEM,qBAAqB,CAC1B,YAAoC,EACpC,KAAc;QAEd,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACxC,CAAC,QAAkB,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACtC,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACtD,QAAQ,CAAC,IAAI,CAAC,GAAG;gBACf,IAAI;gBACJ,OAAO;gBACP,KAAK;gBACL,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;aACjC,CAAC;YACF,OAAO,QAAQ,CAAC;QAClB,CAAC,EACD,EAAE,CACH,CAAC;IACJ,CAAC;IAEM,qBAAqB,CAC1B,YAAoC,EACpC,KAAc;QAEd,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACxC,CAAC,QAAgC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACpD,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACtD,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;YACzB,OAAO,QAAQ,CAAC;QAClB,CAAC,EACD,EAAE,CACH,CAAC;IACJ,CAAC;IAED,qFAAqF;IACrF,uBAAuB;IACvB,gBAAgB;IAChB,kCAAkC;IAClC,yBAAyB;IACzB,0DAA0D;IAC1D,8DAA8D;IACvD,4BAA4B,CAAC,cAAsB;QACxD,OAAO,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"lockfile-v5.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PnpmWorkspaceArgs } from '../../types';
|
|
2
|
-
import { ParsedDepPath, PnpmDeps } from '../types';
|
|
2
|
+
import { ParsedDepPath, PnpmDeps, PnpmImporters } from '../types';
|
|
3
3
|
import { PnpmLockfileParser } from './lockfile-parser';
|
|
4
4
|
export declare class LockfileV6Parser extends PnpmLockfileParser {
|
|
5
5
|
settings: any;
|
|
@@ -9,4 +9,5 @@ export declare class LockfileV6Parser extends PnpmLockfileParser {
|
|
|
9
9
|
normalizePackagesDeps(dependencies: Record<string, Record<string, string>>, isDev: boolean): Record<string, string>;
|
|
10
10
|
excludeTransPeerDepsVersions(fullVersionStr: string): string;
|
|
11
11
|
static isAbsoluteDepenencyPath(dependencyPath: string): boolean;
|
|
12
|
+
normaliseImporters(rawPnpmLock: any): PnpmImporters;
|
|
12
13
|
}
|
|
@@ -51,13 +51,32 @@ class LockfileV6Parser extends lockfile_parser_1.PnpmLockfileParser {
|
|
|
51
51
|
// Dependency path and versions include transitive peer dependencies encapsulated in dependencies
|
|
52
52
|
// e.g. '/cdktf-cli@0.20.3(ink@3.2.0)(react@17.0.2)' -> cdktf-cli@0.20.3
|
|
53
53
|
excludeTransPeerDepsVersions(fullVersionStr) {
|
|
54
|
-
|
|
55
|
-
const match = fullVersionStr.match(/([^)]*)\(/);
|
|
56
|
-
return (_a = match === null || match === void 0 ? void 0 : match[1]) !== null && _a !== void 0 ? _a : fullVersionStr;
|
|
54
|
+
return fullVersionStr.split('(')[0];
|
|
57
55
|
}
|
|
58
56
|
static isAbsoluteDepenencyPath(dependencyPath) {
|
|
59
57
|
return dependencyPath[0] !== '/';
|
|
60
58
|
}
|
|
59
|
+
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
60
|
+
normaliseImporters(rawPnpmLock) {
|
|
61
|
+
if (!('importers' in rawPnpmLock)) {
|
|
62
|
+
return {};
|
|
63
|
+
}
|
|
64
|
+
const rawImporters = rawPnpmLock.importers;
|
|
65
|
+
return Object.entries(rawImporters).reduce(
|
|
66
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
67
|
+
(acc, [key, val]) => {
|
|
68
|
+
// No deps case
|
|
69
|
+
if (!('dependencies' in val)) {
|
|
70
|
+
return Object.assign(Object.assign({}, acc), { [key]: {} });
|
|
71
|
+
}
|
|
72
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
73
|
+
const deps = val.dependencies;
|
|
74
|
+
const depsNormalized = Object.fromEntries(Object.entries(deps).map(([depName, depInfo]) => {
|
|
75
|
+
return [depName, depInfo.version];
|
|
76
|
+
}));
|
|
77
|
+
return Object.assign(Object.assign({}, acc), { [key]: depsNormalized });
|
|
78
|
+
}, {});
|
|
79
|
+
}
|
|
61
80
|
}
|
|
62
81
|
exports.LockfileV6Parser = LockfileV6Parser;
|
|
63
82
|
//# sourceMappingURL=lockfile-v6.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfile-v6.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.ts"],"names":[],"mappings":";;;AAEA,uDAAuD;AAEvD,MAAa,gBAAiB,SAAQ,oCAAkB;IAGtD,YAAmB,WAAgB,EAAE,aAAiC;QACpE,KAAK,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;IACvC,CAAC;IAEM,YAAY,CAAC,OAAe;QACjC,4CAA4C;QAC5C,wEAAwE;QACxE,OAAO,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;QAErD,qDAAqD;QACrD,uCAAuC;QACvC,OAAO,GAAG,gBAAgB,CAAC,uBAAuB,CAAC,OAAO,CAAC;YACzD,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAEzB,iEAAiE;QACjE,+EAA+E;QAC/E,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE;YACnB,OAAO,EAAE,CAAC;SACX;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;QAChD,OAAO;YACL,IAAI;YACJ,OAAO;SACR,CAAC;IACJ,CAAC;IAEM,qBAAqB,CAC1B,YAAoD,EACpD,KAAc;QAEd,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACxC,CAAC,QAAkB,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACtC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACpE,QAAQ,CAAC,IAAI,CAAC,GAAG;gBACf,IAAI;gBACJ,OAAO;gBACP,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,KAAK;aACN,CAAC;YACF,OAAO,QAAQ,CAAC;QAClB,CAAC,EACD,EAAE,CACH,CAAC;IACJ,CAAC;IAEM,qBAAqB,CAC1B,YAAoD,EACpD,KAAc;QAEd,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACxC,CAAC,QAAgC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACpD,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACpE,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;YACzB,OAAO,QAAQ,CAAC;QAClB,CAAC,EACD,EAAE,CACH,CAAC;IACJ,CAAC;IAED,iGAAiG;IACjG,wEAAwE;IACjE,4BAA4B,CAAC,cAAsB
|
|
1
|
+
{"version":3,"file":"lockfile-v6.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,3 +48,8 @@ export declare type ParsedDepPath = {
|
|
|
48
48
|
name?: string;
|
|
49
49
|
version?: string;
|
|
50
50
|
};
|
|
51
|
+
export declare type PnpmWorkspacePath = string;
|
|
52
|
+
export declare type DepName = string;
|
|
53
|
+
export declare type DepVersion = string;
|
|
54
|
+
export declare type PnpmImporter = Record<DepName, DepVersion>;
|
|
55
|
+
export declare type PnpmImporters = Record<PnpmWorkspacePath, Record<DepName, DepVersion>>;
|
package/package.json
CHANGED