snyk-nodejs-lockfile-parser 2.5.0 → 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/util.js +29 -0
- package/dist/dep-graph-builders/util.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js +12 -8
- package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js +12 -8
- package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Overrides, PackageJsonBase } from '../dep-graph-builders/types';
|
|
2
2
|
/**
|
|
3
3
|
* Parses a npm alias string (e.g., "npm:package@1.0.0") and returns the package name and version
|
|
4
|
+
* Handles scoped packages correctly (e.g., "npm:@scope/pkg@1.0.0")
|
|
4
5
|
*/
|
|
5
6
|
export declare const parseNpmAlias: (aliasString: string) => {
|
|
6
7
|
packageName: string;
|
|
@@ -4,20 +4,58 @@ exports.rewriteAliasesInOverrides = exports.rewriteAliases = exports.rewriteAlia
|
|
|
4
4
|
const util_1 = require("../dep-graph-builders/util");
|
|
5
5
|
/**
|
|
6
6
|
* Parses a npm alias string (e.g., "npm:package@1.0.0") and returns the package name and version
|
|
7
|
+
* Handles scoped packages correctly (e.g., "npm:@scope/pkg@1.0.0")
|
|
7
8
|
*/
|
|
8
9
|
const parseNpmAlias = (aliasString) => {
|
|
9
10
|
if (!aliasString.startsWith('npm:')) {
|
|
10
11
|
return null;
|
|
11
12
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
// Find the last @ that separates package name from version
|
|
14
|
+
// For scoped packages, we need to skip the first @ in the scope
|
|
15
|
+
const afterNpm = aliasString.substring(4); // Remove "npm:" prefix
|
|
16
|
+
// If it starts with @, it's a scoped package
|
|
17
|
+
if (afterNpm.startsWith('@')) {
|
|
18
|
+
// Find the @ that separates the package name from version
|
|
19
|
+
// It should be after the scope (e.g., @scope/name@version)
|
|
20
|
+
const slashIndex = afterNpm.indexOf('/');
|
|
21
|
+
if (slashIndex === -1) {
|
|
22
|
+
// Malformed scoped package - no slash after @scope
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
// Look for @ after the slash
|
|
26
|
+
const versionSeparatorIndex = afterNpm.indexOf('@', slashIndex);
|
|
27
|
+
if (versionSeparatorIndex === -1) {
|
|
28
|
+
// No version specified - the whole string is the package name
|
|
29
|
+
// This happens with keys like "@typescript/lib-dom@npm:@types/web" where there's no explicit version
|
|
30
|
+
return {
|
|
31
|
+
packageName: afterNpm,
|
|
32
|
+
version: '', // No version specified
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
return {
|
|
36
|
+
packageName: afterNpm.substring(0, versionSeparatorIndex),
|
|
37
|
+
version: afterNpm.substring(versionSeparatorIndex + 1),
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
// Non-scoped package
|
|
42
|
+
const lastAtIndex = afterNpm.lastIndexOf('@');
|
|
43
|
+
if (lastAtIndex === -1) {
|
|
44
|
+
// No version specified
|
|
45
|
+
return {
|
|
46
|
+
packageName: afterNpm,
|
|
47
|
+
version: '',
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
if (lastAtIndex === 0) {
|
|
51
|
+
// Invalid format: starts with @ but not a scoped package
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
return {
|
|
55
|
+
packageName: afterNpm.substring(0, lastAtIndex),
|
|
56
|
+
version: afterNpm.substring(lastAtIndex + 1),
|
|
57
|
+
};
|
|
16
58
|
}
|
|
17
|
-
return {
|
|
18
|
-
packageName: aliasString.substring(4, lastAtIndex),
|
|
19
|
-
version: aliasString.substring(lastAtIndex + 1),
|
|
20
|
-
};
|
|
21
59
|
};
|
|
22
60
|
exports.parseNpmAlias = parseNpmAlias;
|
|
23
61
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pkgJson.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/pkgJson.ts"],"names":[],"mappings":";;;AACA,qDAA0D;AAE1D
|
|
1
|
+
{"version":3,"file":"pkgJson.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/pkgJson.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,12 +73,41 @@ const getTopLevelDeps = (pkgJson, options) => {
|
|
|
73
73
|
}, {});
|
|
74
74
|
};
|
|
75
75
|
exports.getTopLevelDeps = getTopLevelDeps;
|
|
76
|
+
/**
|
|
77
|
+
* Validates if a package name is valid for inclusion in dependency graph.
|
|
78
|
+
* Invalid cases include:
|
|
79
|
+
* - Empty names
|
|
80
|
+
* - Scoped packages with empty names after the scope (e.g., "@types/")
|
|
81
|
+
*/
|
|
82
|
+
function isValidPackageName(name) {
|
|
83
|
+
if (!name || name.trim() === '') {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
// Check for scoped packages with empty names after the scope
|
|
87
|
+
// e.g., "@types/" is invalid (ends with slash after scope)
|
|
88
|
+
if (name.startsWith('@')) {
|
|
89
|
+
const slashIndex = name.indexOf('/');
|
|
90
|
+
if (slashIndex !== -1) {
|
|
91
|
+
// Get the part after the scope
|
|
92
|
+
const afterScope = name.substring(slashIndex + 1);
|
|
93
|
+
// Invalid if nothing after the slash or only whitespace
|
|
94
|
+
if (!afterScope || afterScope.trim() === '') {
|
|
95
|
+
return false;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
return true;
|
|
100
|
+
}
|
|
76
101
|
/**
|
|
77
102
|
* Converts dependencies parsed from the a lock file to a dependencies object required by the graph.
|
|
78
103
|
* For example, { 'mime-db': '~1.12.0' } will be converted to { 'mime-db': { version: '~1.12.0', isDev: true/false } }.
|
|
79
104
|
*/
|
|
80
105
|
const getGraphDependencies = (dependencies, options) => {
|
|
81
106
|
return Object.entries(dependencies).reduce((pnpmDeps, [name, semver]) => {
|
|
107
|
+
// Skip invalid package names to prevent downstream errors
|
|
108
|
+
if (!isValidPackageName(name)) {
|
|
109
|
+
return pnpmDeps;
|
|
110
|
+
}
|
|
82
111
|
pnpmDeps[name] = {
|
|
83
112
|
version: semver,
|
|
84
113
|
isDev: options.isDev,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.buildDepGraphYarnLockV1Simple = void 0;
|
|
|
4
4
|
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
|
+
const pkgJson_1 = require("../../aliasesPreprocessors/pkgJson");
|
|
7
8
|
const buildDepGraphYarnLockV1Simple = async (extractedYarnLockV1Pkgs, pkgJson, options) => {
|
|
8
9
|
const { includeDevDeps, includeOptionalDeps, includePeerDeps, strictOutOfSync, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
9
10
|
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version }, (0, util_1.createNodeInfo)(options));
|
|
@@ -37,14 +38,17 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV1Pkgs, strictOu
|
|
|
37
38
|
}
|
|
38
39
|
const localVisited = visited || new Set();
|
|
39
40
|
if (depInfo.version.startsWith('npm:')) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
41
|
+
const parsed = (0, pkgJson_1.parseNpmAlias)(depInfo.version);
|
|
42
|
+
if (parsed && parsed.packageName) {
|
|
43
|
+
scopeDepInfo = Object.assign(Object.assign({}, scopeDepInfo), {
|
|
44
|
+
alias: {
|
|
45
|
+
aliasName: name,
|
|
46
|
+
aliasTargetDepName: parsed.packageName,
|
|
47
|
+
semver: parsed.version,
|
|
48
|
+
version: null,
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
}
|
|
48
52
|
}
|
|
49
53
|
const childNode = (0, util_1.getChildNode)(name, scopeDepInfo, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
|
|
50
54
|
if (localVisited.has(childNode.id)) {
|
|
@@ -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;
|
|
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;AAE5D,MAAM,6BAA6B,GAAG,KAAK,EAChD,uBAAuC,EACvC,OAAwB,EACxB,OAAkC,EAClC,EAAE;IACF,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,uBAAuB,EACvB,YAAY,GACb,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,YAAY,GAAG,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC5C,cAAc;QACd,eAAe;QACf,mBAAmB;KACpB,CAAC,CAAC;IAEH,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,uBAAuB,EACvB,eAAe,EACf,mBAAmB,EACnB,uBAAuB,EACvB,SAAS,EACT,YAAY,CACb,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AA9CW,QAAA,6BAA6B,iCA8CxC;AAEF;;;;;GAKG;AACH,MAAM,QAAQ,GAAG,KAAK,EACpB,eAAgC,EAChC,IAAa,EACb,uBAAuC,EACvC,eAAwB,EACxB,mBAA4B,EAC5B,mBAA4B,EAC5B,OAAqB,EACrB,YAAsB,EACP,EAAE;IACjB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAC;QACtE,IAAI,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC9C,IAAI,qCAAgB,CAAC,UAAU,EAAE,EAAE,CAAC;YAClC,MAAM,qCAAgB,CAAC,IAAI,EAAE,CAAC;QAChC,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,IAAI,IAAI,GAAG,EAAU,CAAC;QAClD,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,IAAA,uBAAa,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9C,IAAI,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBACjC,YAAY,mCACP,YAAY,GACZ;oBACD,KAAK,EAAE;wBACL,SAAS,EAAE,IAAI;wBACf,kBAAkB,EAAE,MAAM,CAAC,WAAW;wBACtC,MAAM,EAAE,MAAM,CAAC,OAAO;wBACtB,OAAO,EAAE,IAAI;qBACd;iBACF,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,SAAS,GAAG,IAAA,mBAAY,EAC5B,IAAI,EACJ,YAAY,EACZ,uBAAuB,EACvB,eAAe,EACf,mBAAmB,CACpB,CAAC;QAEF,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;YACnC,IAAI,mBAAmB,EAAE,CAAC;gBACxB,MAAM,QAAQ,GAAG,GAAG,SAAS,CAAC,EAAE,SAAS,CAAC;gBAC1C,eAAe,CAAC,UAAU,CACxB,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,EACpD,QAAQ,EACR;oBACE,MAAM,4DACJ,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,IAC/B,CAAC,YAAY,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KACjE,MAAM,EAAE,MAAM,KACX,CAAC,IAAI,CAAC,oBAAoB,IAAI;wBAC/B,oBAAoB,EAAE,MAAM;qBAC7B,CAAC,GACC,CAAC,SAAS,CAAC,KAAK,IAAI;wBACrB,KAAK,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,KAAK,CAAC,kBAAkB,IAAI,SAAS,CAAC,OAAO,EAAE;qBAClG,CAAC,CACH;iBACF,CACF,CAAC;gBACF,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;YACpD,CAAC;YACD,SAAS;QACX,CAAC;QAED,eAAe,CAAC,UAAU,CACxB,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,EACpD,SAAS,CAAC,EAAE,EACZ;YACE,MAAM,8CACJ,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,IAC/B,CAAC,YAAY,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAC9D,CAAC,IAAI,CAAC,oBAAoB,IAAI;gBAC/B,oBAAoB,EAAE,MAAM;aAC7B,CAAC,GACC,CAAC,SAAS,CAAC,KAAK,IAAI;gBACrB,KAAK,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,KAAK,CAAC,kBAAkB,IAAI,SAAS,CAAC,OAAO,EAAE;aAClG,CAAC,CACH;SACF,CACF,CAAC;QACF,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;QAClD,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,QAAQ,CACZ,eAAe,EACf,SAAS,EACT,uBAAuB,EACvB,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ const dep_graph_1 = require("@snyk/dep-graph");
|
|
|
5
5
|
const util_1 = require("../util");
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
7
|
const event_loop_spinner_1 = require("event-loop-spinner");
|
|
8
|
+
const pkgJson_1 = require("../../aliasesPreprocessors/pkgJson");
|
|
8
9
|
const buildDepGraphYarnLockV2Simple = async (extractedYarnLockV2Pkgs, pkgJson, options, workspaceArgs) => {
|
|
9
10
|
const { includeDevDeps, strictOutOfSync, includeOptionalDeps, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
10
11
|
const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version }, (0, util_1.createNodeInfo)(options));
|
|
@@ -39,14 +40,17 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
39
40
|
}
|
|
40
41
|
if (depInfo.version.startsWith('npm:') &&
|
|
41
42
|
depInfo.version.indexOf('@') > -1) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
43
|
+
const parsed = (0, pkgJson_1.parseNpmAlias)(depInfo.version);
|
|
44
|
+
if (parsed && parsed.packageName) {
|
|
45
|
+
scopeDepInfo = Object.assign(Object.assign({}, scopeDepInfo), {
|
|
46
|
+
alias: {
|
|
47
|
+
aliasName: name,
|
|
48
|
+
aliasTargetDepName: parsed.packageName,
|
|
49
|
+
semver: parsed.version,
|
|
50
|
+
version: null,
|
|
51
|
+
},
|
|
52
|
+
});
|
|
53
|
+
}
|
|
50
54
|
}
|
|
51
55
|
const localVisited = visited || new Set();
|
|
52
56
|
const childNode = (0, utils_1.getYarnLockV2ChildNode)(name, scopeDepInfo, extractedYarnLockV2Pkgs, strictOutOfSync, includeOptionalDeps, resolutions, node);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-depgraph-simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAAmE;AAMnE,mCAAiD;AACjD,2DAAsD;
|
|
1
|
+
{"version":3,"file":"build-depgraph-simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED