snyk-nodejs-lockfile-parser 1.55.0 → 1.56.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/README.md +1 -1
- package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js +1 -0
- package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/index.js +5 -0
- package/dist/dep-graph-builders/pnpm/lockfile-parser/index.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.d.ts +4 -4
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js +33 -21
- 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 -2
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.js +4 -4
- 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 -2
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js +4 -4
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.d.ts +7 -0
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.js +24 -0
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.js.map +1 -0
- package/dist/utils.d.ts +3 -2
- package/dist/utils.js +4 -0
- package/dist/utils.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -9,6 +9,7 @@ const buildDepGraphPnpm = async (lockFileParser, pkgJson, options, workspaceArgs
|
|
|
9
9
|
var _a;
|
|
10
10
|
const { strictOutOfSync, includeOptionalDeps, includeDevDeps, pruneWithinTopLevelDeps, } = options;
|
|
11
11
|
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'pnpm' }, { name: pkgJson.name, version: pkgJson.version });
|
|
12
|
+
lockFileParser.extractedPackages = lockFileParser.extractPackages();
|
|
12
13
|
const extractedPnpmPkgs = lockFileParser.extractedPackages;
|
|
13
14
|
const topLevelDeps = (0, util_1.getTopLevelDeps)(pkgJson, options);
|
|
14
15
|
const extractedTopLevelDeps = lockFileParser.extractTopLevelDependencies(options) || {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-dep-graph-pnpm.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/build-dep-graph-pnpm.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAA0C;AAO1C,mCAA2C;AAC3C,2DAAsD;AAI/C,MAAM,iBAAiB,GAAG,KAAK,EACpC,cAAkC,EAClC,OAAwB,EACxB,OAAgC,EAChC,aAAiC,EACjC,EAAE;;IACF,MAAM,EACJ,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,uBAAuB,GACxB,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,CACjD,CAAC;IAEF,MAAM,iBAAiB,GACrB,cAAc,CAAC,iBAAiB,CAAC;IAEnC,MAAM,YAAY,GAAG,IAAA,sBAAe,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEvD,MAAM,qBAAqB,GACzB,cAAc,CAAC,2BAA2B,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAE5D,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;QAC5C,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;KAClE;IAED,MAAM,QAAQ,GAAa;QACzB,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,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EACnB,cAAc;IACd,yEAAyE;IACzE,+CAA+C;IAC/C,0FAA0F;IAC1F,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,aAAa,MAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,SAAS,CAAA,IAAI,EAAE,EAC7D,uBAAuB,EACvB,cAAc,CACf,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"build-dep-graph-pnpm.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/build-dep-graph-pnpm.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.getPnpmLockfileParser = void 0;
|
|
|
4
4
|
const js_yaml_1 = require("js-yaml");
|
|
5
5
|
const lockfile_v6_1 = require("./lockfile-v6");
|
|
6
6
|
const lockfile_v5_1 = require("./lockfile-v5");
|
|
7
|
+
const lockfile_v9_1 = require("./lockfile-v9");
|
|
7
8
|
const error_catalog_nodejs_public_1 = require("@snyk/error-catalog-nodejs-public");
|
|
8
9
|
const utils_1 = require("../../../utils");
|
|
9
10
|
function getPnpmLockfileParser(pnpmLockContent, lockfileVersion, workspaceArgs) {
|
|
@@ -20,6 +21,10 @@ function getPnpmLockfileParser(pnpmLockContent, lockfileVersion, workspaceArgs)
|
|
|
20
21
|
version.startsWith('6')) {
|
|
21
22
|
return new lockfile_v6_1.LockfileV6Parser(rawPnpmLock, workspaceArgs);
|
|
22
23
|
}
|
|
24
|
+
if (lockfileVersion === utils_1.NodeLockfileVersion.PnpmLockV9 ||
|
|
25
|
+
version.startsWith('9')) {
|
|
26
|
+
return new lockfile_v9_1.LockfileV9Parser(rawPnpmLock, workspaceArgs);
|
|
27
|
+
}
|
|
23
28
|
throw new error_catalog_nodejs_public_1.OpenSourceEcosystems.PnpmUnsupportedLockfileVersionError(`The pnpm-lock.yaml lockfile version ${lockfileVersion} is not supported`);
|
|
24
29
|
}
|
|
25
30
|
exports.getPnpmLockfileParser = getPnpmLockfileParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/index.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAEhD,+CAAiD;AACjD,+CAAiD;AAEjD,mFAAyE;AACzE,0CAAqD;AAErD,SAAgB,qBAAqB,CACnC,eAAuB,EACvB,eAAqC,EACrC,aAAiC;IAEjC,MAAM,WAAW,GAAG,IAAA,cAAI,EAAC,eAAe,EAAE;QACxC,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,yBAAe;KACxB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,WAAW,CAAC,eAAe,CAAC;IAE5C,IACE,eAAe,KAAK,2BAAmB,CAAC,UAAU;QAClD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EACvB;QACA,OAAO,IAAI,8BAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;KACzD;IAED,IACE,eAAe,KAAK,2BAAmB,CAAC,UAAU;QAClD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EACvB;QACA,OAAO,IAAI,8BAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;KACzD;IAED,MAAM,IAAI,kDAAoB,CAAC,mCAAmC,CAChE,uCAAuC,eAAe,mBAAmB,CAC1E,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/index.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAEhD,+CAAiD;AACjD,+CAAiD;AACjD,+CAAiD;AAEjD,mFAAyE;AACzE,0CAAqD;AAErD,SAAgB,qBAAqB,CACnC,eAAuB,EACvB,eAAqC,EACrC,aAAiC;IAEjC,MAAM,WAAW,GAAG,IAAA,cAAI,EAAC,eAAe,EAAE;QACxC,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,yBAAe;KACxB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,WAAW,CAAC,eAAe,CAAC;IAE5C,IACE,eAAe,KAAK,2BAAmB,CAAC,UAAU;QAClD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EACvB;QACA,OAAO,IAAI,8BAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;KACzD;IAED,IACE,eAAe,KAAK,2BAAmB,CAAC,UAAU;QAClD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EACvB;QACA,OAAO,IAAI,8BAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;KACzD;IAED,IACE,eAAe,KAAK,2BAAmB,CAAC,UAAU;QAClD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EACvB;QACA,OAAO,IAAI,8BAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;KACzD;IAED,MAAM,IAAI,kDAAoB,CAAC,mCAAmC,CAChE,uCAAuC,eAAe,mBAAmB,CAC1E,CAAC;AACJ,CAAC;AAnCD,sDAmCC"}
|
|
@@ -20,10 +20,10 @@ export declare abstract class PnpmLockfileParser {
|
|
|
20
20
|
includeOptionalDeps?: boolean;
|
|
21
21
|
includePeerDeps?: boolean;
|
|
22
22
|
}): PnpmDeps;
|
|
23
|
-
normalizeVersion(name: string, version: string, isDev: boolean): string;
|
|
24
|
-
resolveWorkspacesCrossReference(name: string, version: string, isDev: boolean): string;
|
|
25
|
-
abstract normalizePackagesDeps(dependencies: any, isDev: any): Record<string, string>;
|
|
26
|
-
abstract normalizeTopLevelDeps(dependencies: any, isDev: any): PnpmDeps;
|
|
23
|
+
normalizeVersion(name: string, version: string, isDev: boolean, importerName?: string): string;
|
|
24
|
+
resolveWorkspacesCrossReference(name: string, version: string, isDev: boolean, importerName?: string): string;
|
|
25
|
+
abstract normalizePackagesDeps(dependencies: any, isDev: any, importerName?: any): Record<string, string>;
|
|
26
|
+
abstract normalizeTopLevelDeps(dependencies: any, isDev: any, importerName?: any): PnpmDeps;
|
|
27
27
|
abstract parseDepPath(depPath: string): ParsedDepPath;
|
|
28
28
|
abstract excludeTransPeerDepsVersions(fullVersionStr: string): string;
|
|
29
29
|
abstract normaliseImporters(rawPnpmLock: any): PnpmImporters;
|
|
@@ -14,7 +14,7 @@ class PnpmLockfileParser {
|
|
|
14
14
|
this.devDependencies = depsRoot.devDependencies || {};
|
|
15
15
|
this.optionalDependencies = depsRoot.optionalDependencies || {};
|
|
16
16
|
this.peerDependencies = depsRoot.peerDependencies || {};
|
|
17
|
-
this.extractedPackages =
|
|
17
|
+
this.extractedPackages = {};
|
|
18
18
|
this.importers = this.normaliseImporters(rawPnpmLock);
|
|
19
19
|
}
|
|
20
20
|
isWorkspaceLockfile() {
|
|
@@ -39,39 +39,45 @@ class PnpmLockfileParser {
|
|
|
39
39
|
const packages = {};
|
|
40
40
|
Object.entries(this.packages).forEach(([depPath, versionData]) => {
|
|
41
41
|
// name and version are optional in version data - if they don't show up in version data, they can be deducted from the dependency path
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
42
|
+
const { name, version } = versionData;
|
|
43
|
+
let parsedPath = {};
|
|
44
|
+
if (!(version && name)) {
|
|
45
|
+
parsedPath = this.parseDepPath(depPath);
|
|
45
46
|
}
|
|
46
47
|
const pkg = {
|
|
47
48
|
id: depPath,
|
|
48
|
-
name,
|
|
49
|
-
version,
|
|
49
|
+
name: name || parsedPath.name,
|
|
50
|
+
version: version || parsedPath.version || depPath,
|
|
50
51
|
isDev: versionData.dev == 'true',
|
|
51
|
-
dependencies: versionData.dependencies,
|
|
52
|
-
devDependencies: versionData.devDependencies,
|
|
53
|
-
optionalDependencies: versionData.optionalDependencies,
|
|
52
|
+
dependencies: versionData.dependencies || {},
|
|
53
|
+
devDependencies: versionData.devDependencies || {},
|
|
54
|
+
optionalDependencies: versionData.optionalDependencies || {},
|
|
54
55
|
};
|
|
55
56
|
packages[`${pkg.name}@${pkg.version}`] = pkg;
|
|
56
57
|
});
|
|
57
58
|
return packages;
|
|
58
59
|
}
|
|
59
60
|
extractTopLevelDependencies(options) {
|
|
60
|
-
|
|
61
|
+
var _a;
|
|
62
|
+
let importerName;
|
|
63
|
+
if (this.isWorkspaceLockfile()) {
|
|
64
|
+
importerName = (_a = this.workspaceArgs) === null || _a === void 0 ? void 0 : _a.workspacePath;
|
|
65
|
+
}
|
|
66
|
+
const prodDeps = this.normalizeTopLevelDeps(this.dependencies || {}, false, importerName);
|
|
61
67
|
const devDeps = options.includeDevDeps
|
|
62
|
-
? this.normalizeTopLevelDeps(this.devDependencies || {}, true)
|
|
68
|
+
? this.normalizeTopLevelDeps(this.devDependencies || {}, true, importerName)
|
|
63
69
|
: {};
|
|
64
70
|
const optionalDeps = options.includeOptionalDeps
|
|
65
|
-
? this.normalizeTopLevelDeps(this.optionalDependencies || {}, false)
|
|
71
|
+
? this.normalizeTopLevelDeps(this.optionalDependencies || {}, false, importerName)
|
|
66
72
|
: {};
|
|
67
73
|
const peerDeps = options.includePeerDeps
|
|
68
|
-
? this.normalizeTopLevelDeps(this.peerDependencies || {}, false)
|
|
74
|
+
? this.normalizeTopLevelDeps(this.peerDependencies || {}, false, importerName)
|
|
69
75
|
: {};
|
|
70
76
|
return Object.assign(Object.assign(Object.assign(Object.assign({}, prodDeps), devDeps), optionalDeps), peerDeps);
|
|
71
77
|
}
|
|
72
|
-
normalizeVersion(name, version, isDev) {
|
|
78
|
+
normalizeVersion(name, version, isDev, importerName) {
|
|
73
79
|
if (this.isWorkspaceLockfile()) {
|
|
74
|
-
version = this.resolveWorkspacesCrossReference(name, version, isDev);
|
|
80
|
+
version = this.resolveWorkspacesCrossReference(name, version, isDev, importerName);
|
|
75
81
|
}
|
|
76
82
|
if (!(0, semver_1.valid)(version)) {
|
|
77
83
|
version = this.excludeTransPeerDepsVersions(version);
|
|
@@ -80,13 +86,16 @@ class PnpmLockfileParser {
|
|
|
80
86
|
// they show up in packages with keys equal to the version in top level deps
|
|
81
87
|
// e.g. body-parser with version github.com/expressjs/body-parser/263f602e6ae34add6332c1eb4caa808893b0b711
|
|
82
88
|
if (this.packages[version]) {
|
|
83
|
-
return this.packages[version].version;
|
|
89
|
+
return this.packages[version].version || version;
|
|
90
|
+
}
|
|
91
|
+
if (this.packages[`${name}@${version}`]) {
|
|
92
|
+
return this.packages[`${name}@${version}`].version || version;
|
|
84
93
|
}
|
|
85
94
|
}
|
|
86
95
|
}
|
|
87
96
|
return version;
|
|
88
97
|
}
|
|
89
|
-
resolveWorkspacesCrossReference(name, version, isDev) {
|
|
98
|
+
resolveWorkspacesCrossReference(name, version, isDev, importerName) {
|
|
90
99
|
if (!this.workspaceArgs) {
|
|
91
100
|
return version;
|
|
92
101
|
}
|
|
@@ -97,18 +106,21 @@ class PnpmLockfileParser {
|
|
|
97
106
|
// version: link:../pkg-b
|
|
98
107
|
const depPath = version.split('link:')[1];
|
|
99
108
|
const resolvedPathDep = pathUtil
|
|
100
|
-
.join(
|
|
109
|
+
.join(importerName || '.', depPath)
|
|
101
110
|
.replace(/\\/g, '/');
|
|
102
111
|
// cross referenced package, we add it to the extracted packages
|
|
103
112
|
version = this.workspaceArgs.projectsVersionMap[resolvedPathDep];
|
|
113
|
+
if (!version) {
|
|
114
|
+
version = 'undefined';
|
|
115
|
+
}
|
|
104
116
|
const subDeps = this.rawPnpmLock.importers[resolvedPathDep] || {
|
|
105
117
|
dependencies: {},
|
|
106
118
|
devDependencies: {},
|
|
107
119
|
optionalDependencies: {},
|
|
108
120
|
};
|
|
109
|
-
const resolvedDeps = this.normalizePackagesDeps(subDeps.dependencies || {}, isDev);
|
|
110
|
-
const resolvedDevDeps = this.normalizePackagesDeps(subDeps.devDependencies || {}, true);
|
|
111
|
-
const resolvedOptionalDeps = this.normalizePackagesDeps(subDeps.optionalDependencies || {}, true);
|
|
121
|
+
const resolvedDeps = this.normalizePackagesDeps(subDeps.dependencies || {}, isDev, resolvedPathDep);
|
|
122
|
+
const resolvedDevDeps = this.normalizePackagesDeps(subDeps.devDependencies || {}, true, resolvedPathDep);
|
|
123
|
+
const resolvedOptionalDeps = this.normalizePackagesDeps(subDeps.optionalDependencies || {}, true, resolvedPathDep);
|
|
112
124
|
this.extractedPackages[`${name}@${version}`] = {
|
|
113
125
|
name,
|
|
114
126
|
version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfile-parser.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.ts"],"names":[],"mappings":";;;AAUA,mCAA+B;AAC/B,iCAAiC;AAEjC,MAAsB,kBAAkB;IAYtC,YAAmB,WAAgB,EAAE,aAAiC;QACpE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;QACnD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC;QAChD,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC;QACtD,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC,oBAAoB,IAAI,EAAE,CAAC;QAChE,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACxD,IAAI,CAAC,iBAAiB,GAAG,
|
|
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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"}
|
|
@@ -5,8 +5,8 @@ export declare class LockfileV5Parser extends PnpmLockfileParser {
|
|
|
5
5
|
specifiers: Record<string, string>;
|
|
6
6
|
constructor(rawPnpmLock: any, workspaceArgs?: PnpmWorkspaceArgs);
|
|
7
7
|
parseDepPath(depPath: string): ParsedDepPath;
|
|
8
|
-
normalizeTopLevelDeps(dependencies: Record<string, string>, isDev: boolean): PnpmDeps;
|
|
9
|
-
normalizePackagesDeps(dependencies: Record<string, string>, isDev: boolean): Record<string, string>;
|
|
8
|
+
normalizeTopLevelDeps(dependencies: Record<string, string>, isDev: boolean, importerName?: string): PnpmDeps;
|
|
9
|
+
normalizePackagesDeps(dependencies: Record<string, string>, isDev: boolean, importerName?: string): Record<string, string>;
|
|
10
10
|
excludeTransPeerDepsVersions(fullVersionStr: string): string;
|
|
11
11
|
normaliseImporters(rawPnpmLock: any): PnpmImporters;
|
|
12
12
|
}
|
|
@@ -20,9 +20,9 @@ class LockfileV5Parser extends lockfile_parser_1.PnpmLockfileParser {
|
|
|
20
20
|
version: this.excludeTransPeerDepsVersions(version),
|
|
21
21
|
};
|
|
22
22
|
}
|
|
23
|
-
normalizeTopLevelDeps(dependencies, isDev) {
|
|
23
|
+
normalizeTopLevelDeps(dependencies, isDev, importerName) {
|
|
24
24
|
return Object.entries(dependencies).reduce((pnpmDeps, [name, version]) => {
|
|
25
|
-
version = this.normalizeVersion(name, version, isDev);
|
|
25
|
+
version = this.normalizeVersion(name, version, isDev, importerName);
|
|
26
26
|
pnpmDeps[name] = {
|
|
27
27
|
name,
|
|
28
28
|
version,
|
|
@@ -32,9 +32,9 @@ class LockfileV5Parser extends lockfile_parser_1.PnpmLockfileParser {
|
|
|
32
32
|
return pnpmDeps;
|
|
33
33
|
}, {});
|
|
34
34
|
}
|
|
35
|
-
normalizePackagesDeps(dependencies, isDev) {
|
|
35
|
+
normalizePackagesDeps(dependencies, isDev, importerName) {
|
|
36
36
|
return Object.entries(dependencies).reduce((pnpmDeps, [name, version]) => {
|
|
37
|
-
version = this.normalizeVersion(name, version, isDev);
|
|
37
|
+
version = this.normalizeVersion(name, version, isDev, importerName);
|
|
38
38
|
pnpmDeps[name] = version;
|
|
39
39
|
return pnpmDeps;
|
|
40
40
|
}, {});
|
|
@@ -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;
|
|
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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"}
|
|
@@ -5,8 +5,8 @@ export declare class LockfileV6Parser extends PnpmLockfileParser {
|
|
|
5
5
|
settings: any;
|
|
6
6
|
constructor(rawPnpmLock: any, workspaceArgs?: PnpmWorkspaceArgs);
|
|
7
7
|
parseDepPath(depPath: string): ParsedDepPath;
|
|
8
|
-
normalizeTopLevelDeps(dependencies: Record<string, Record<string, string>>, isDev: boolean): PnpmDeps;
|
|
9
|
-
normalizePackagesDeps(dependencies: Record<string, Record<string, string>>, isDev: boolean): Record<string, string>;
|
|
8
|
+
normalizeTopLevelDeps(dependencies: Record<string, Record<string, string>>, isDev: boolean, importerName?: string): PnpmDeps;
|
|
9
|
+
normalizePackagesDeps(dependencies: Record<string, Record<string, string>>, isDev: boolean, importerName?: string): Record<string, string>;
|
|
10
10
|
excludeTransPeerDepsVersions(fullVersionStr: string): string;
|
|
11
11
|
static isAbsoluteDepenencyPath(dependencyPath: string): boolean;
|
|
12
12
|
normaliseImporters(rawPnpmLock: any): PnpmImporters;
|
|
@@ -29,9 +29,9 @@ class LockfileV6Parser extends lockfile_parser_1.PnpmLockfileParser {
|
|
|
29
29
|
version,
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
|
-
normalizeTopLevelDeps(dependencies, isDev) {
|
|
32
|
+
normalizeTopLevelDeps(dependencies, isDev, importerName) {
|
|
33
33
|
return Object.entries(dependencies).reduce((pnpmDeps, [name, depInfo]) => {
|
|
34
|
-
const version = this.normalizeVersion(name, depInfo.version, isDev);
|
|
34
|
+
const version = this.normalizeVersion(name, depInfo.version, isDev, importerName);
|
|
35
35
|
pnpmDeps[name] = {
|
|
36
36
|
name,
|
|
37
37
|
version,
|
|
@@ -41,9 +41,9 @@ class LockfileV6Parser extends lockfile_parser_1.PnpmLockfileParser {
|
|
|
41
41
|
return pnpmDeps;
|
|
42
42
|
}, {});
|
|
43
43
|
}
|
|
44
|
-
normalizePackagesDeps(dependencies, isDev) {
|
|
44
|
+
normalizePackagesDeps(dependencies, isDev, importerName) {
|
|
45
45
|
return Object.entries(dependencies).reduce((pnpmDeps, [name, depInfo]) => {
|
|
46
|
-
const version = this.normalizeVersion(name, depInfo.version, isDev);
|
|
46
|
+
const version = this.normalizeVersion(name, depInfo.version, isDev, importerName);
|
|
47
47
|
pnpmDeps[name] = version;
|
|
48
48
|
return pnpmDeps;
|
|
49
49
|
}, {});
|
|
@@ -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;
|
|
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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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { PnpmWorkspaceArgs } from '../../types';
|
|
2
|
+
import { LockfileV6Parser } from './lockfile-v6';
|
|
3
|
+
export declare class LockfileV9Parser extends LockfileV6Parser {
|
|
4
|
+
settings: any;
|
|
5
|
+
snapshots: any;
|
|
6
|
+
constructor(rawPnpmLock: any, workspaceArgs?: PnpmWorkspaceArgs);
|
|
7
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LockfileV9Parser = void 0;
|
|
4
|
+
const lockfile_v6_1 = require("./lockfile-v6");
|
|
5
|
+
const DEFAULT_WORKSPACE_ARGS = {
|
|
6
|
+
isWorkspacePkg: true,
|
|
7
|
+
isRoot: true,
|
|
8
|
+
workspacePath: '.',
|
|
9
|
+
projectsVersionMap: {},
|
|
10
|
+
rootOverrides: {},
|
|
11
|
+
};
|
|
12
|
+
class LockfileV9Parser extends lockfile_v6_1.LockfileV6Parser {
|
|
13
|
+
constructor(rawPnpmLock, workspaceArgs = DEFAULT_WORKSPACE_ARGS) {
|
|
14
|
+
super(rawPnpmLock, workspaceArgs);
|
|
15
|
+
this.settings = rawPnpmLock.settings;
|
|
16
|
+
this.packages = {};
|
|
17
|
+
Object.entries(rawPnpmLock.snapshots).forEach(([depPath, versionData]) => {
|
|
18
|
+
const normalizedDepPath = this.excludeTransPeerDepsVersions(depPath);
|
|
19
|
+
this.packages[normalizedDepPath] = Object.assign(Object.assign({}, rawPnpmLock.packages[normalizedDepPath]), versionData);
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.LockfileV9Parser = LockfileV9Parser;
|
|
24
|
+
//# sourceMappingURL=lockfile-v9.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lockfile-v9.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.ts"],"names":[],"mappings":";;;AACA,+CAAiD;AAEjD,MAAM,sBAAsB,GAAsB;IAChD,cAAc,EAAE,IAAI;IACpB,MAAM,EAAE,IAAI;IACZ,aAAa,EAAE,GAAG;IAClB,kBAAkB,EAAE,EAAE;IACtB,aAAa,EAAE,EAAE;CAClB,CAAC;AACF,MAAa,gBAAiB,SAAQ,8BAAgB;IAIpD,YACE,WAAgB,EAChB,gBAAmC,sBAAsB;QAEzD,KAAK,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,OAAO,CAC3C,CAAC,CAAC,OAAO,EAAE,WAAW,CAAgB,EAAE,EAAE;YACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;YACrE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,mCAC3B,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GACvC,WAAW,CACf,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;CACF;AArBD,4CAqBC"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -5,9 +5,10 @@ export declare enum NodeLockfileVersion {
|
|
|
5
5
|
YarnLockV1 = "YARN_LOCK_V1",
|
|
6
6
|
YarnLockV2 = "YARN_LOCK_V2",
|
|
7
7
|
PnpmLockV5 = "PNPM_LOCK_V5",
|
|
8
|
-
PnpmLockV6 = "PNPM_LOCK_V6"
|
|
8
|
+
PnpmLockV6 = "PNPM_LOCK_V6",
|
|
9
|
+
PnpmLockV9 = "PNPM_LOCK_V9"
|
|
9
10
|
}
|
|
10
11
|
export declare const getLockfileVersionFromFile: (targetFile: string) => NodeLockfileVersion;
|
|
11
|
-
export declare function getPnpmLockfileVersion(lockFileContents: string): NodeLockfileVersion.PnpmLockV5 | NodeLockfileVersion.PnpmLockV6;
|
|
12
|
+
export declare function getPnpmLockfileVersion(lockFileContents: string): NodeLockfileVersion.PnpmLockV5 | NodeLockfileVersion.PnpmLockV6 | NodeLockfileVersion.PnpmLockV9;
|
|
12
13
|
export declare function getYarnLockfileVersion(lockFileContents: string): NodeLockfileVersion.YarnLockV1 | NodeLockfileVersion.YarnLockV2;
|
|
13
14
|
export declare function getNpmLockfileVersion(lockFileContents: string): NodeLockfileVersion.NpmLockV1 | NodeLockfileVersion.NpmLockV2 | NodeLockfileVersion.NpmLockV3;
|
package/dist/utils.js
CHANGED
|
@@ -14,6 +14,7 @@ var NodeLockfileVersion;
|
|
|
14
14
|
NodeLockfileVersion["YarnLockV2"] = "YARN_LOCK_V2";
|
|
15
15
|
NodeLockfileVersion["PnpmLockV5"] = "PNPM_LOCK_V5";
|
|
16
16
|
NodeLockfileVersion["PnpmLockV6"] = "PNPM_LOCK_V6";
|
|
17
|
+
NodeLockfileVersion["PnpmLockV9"] = "PNPM_LOCK_V9";
|
|
17
18
|
})(NodeLockfileVersion = exports.NodeLockfileVersion || (exports.NodeLockfileVersion = {}));
|
|
18
19
|
const getLockfileVersionFromFile = (targetFile) => {
|
|
19
20
|
const lockFileContents = (0, fs_1.readFileSync)(targetFile, 'utf-8');
|
|
@@ -44,6 +45,9 @@ function getPnpmLockfileVersion(lockFileContents) {
|
|
|
44
45
|
else if (lockfileVersion.startsWith('6')) {
|
|
45
46
|
return NodeLockfileVersion.PnpmLockV6;
|
|
46
47
|
}
|
|
48
|
+
else if (lockfileVersion.startsWith('9')) {
|
|
49
|
+
return NodeLockfileVersion.PnpmLockV9;
|
|
50
|
+
}
|
|
47
51
|
else {
|
|
48
52
|
throw new error_catalog_nodejs_public_1.OpenSourceEcosystems.PnpmUnsupportedLockfileVersionError(`The pnpm-lock.yaml lockfile version ${lockfileVersion} is not supported`);
|
|
49
53
|
}
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../lib/utils.ts"],"names":[],"mappings":";;;AAAA,2BAAkC;AAClC,qCAAgD;AAChD,qCAAiD;AACjD,mFAAyE;AAEzE,IAAY,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../lib/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED