snyk-nodejs-lockfile-parser 2.7.0 → 2.8.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.
Files changed (56) hide show
  1. package/dist/c-map.js +1 -2
  2. package/dist/c-map.js.map +1 -1
  3. package/dist/cli-parsers/index.js +2 -1
  4. package/dist/cli-parsers/index.js.map +1 -1
  5. package/dist/cli-parsers/yarn-info-parser.js +1 -2
  6. package/dist/cli-parsers/yarn-info-parser.js.map +1 -1
  7. package/dist/dep-graph-builders/npm-lock-v2/extract-npm-lock-v2-pkgs.js +2 -1
  8. package/dist/dep-graph-builders/npm-lock-v2/extract-npm-lock-v2-pkgs.js.map +1 -1
  9. package/dist/dep-graph-builders/npm-lock-v2/index.js +31 -7
  10. package/dist/dep-graph-builders/npm-lock-v2/index.js.map +1 -1
  11. package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js +20 -12
  12. package/dist/dep-graph-builders/pnpm/build-dep-graph-pnpm.js.map +1 -1
  13. package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js +11 -6
  14. package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-parser.js.map +1 -1
  15. package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.js +2 -2
  16. package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v5.js.map +1 -1
  17. package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js +4 -4
  18. package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js.map +1 -1
  19. package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.js +6 -1
  20. package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v9.js.map +1 -1
  21. package/dist/dep-graph-builders/pnpm/parse-project.js +1 -2
  22. package/dist/dep-graph-builders/pnpm/parse-project.js.map +1 -1
  23. package/dist/dep-graph-builders/pnpm/utils.js +5 -1
  24. package/dist/dep-graph-builders/pnpm/utils.js.map +1 -1
  25. package/dist/dep-graph-builders/util.js +28 -24
  26. package/dist/dep-graph-builders/util.js.map +1 -1
  27. package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js +31 -17
  28. package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js.map +1 -1
  29. package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js +32 -18
  30. package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js.map +1 -1
  31. package/dist/dep-graph-builders/yarn-lock-v2/utils.js +50 -14
  32. package/dist/dep-graph-builders/yarn-lock-v2/utils.js.map +1 -1
  33. package/dist/errors/invalid-user-input-error.js +2 -2
  34. package/dist/errors/invalid-user-input-error.js.map +1 -1
  35. package/dist/errors/out-of-sync-error.js +4 -2
  36. package/dist/errors/out-of-sync-error.js.map +1 -1
  37. package/dist/errors/tree-size-limit-error.js +3 -2
  38. package/dist/errors/tree-size-limit-error.js.map +1 -1
  39. package/dist/errors/unsupported-error.js +2 -2
  40. package/dist/errors/unsupported-error.js.map +1 -1
  41. package/dist/errors/unsupported-runtime-error.js +2 -2
  42. package/dist/errors/unsupported-runtime-error.js.map +1 -1
  43. package/dist/parsers/index.js +13 -11
  44. package/dist/parsers/index.js.map +1 -1
  45. package/dist/parsers/lock-parser-base.js +40 -15
  46. package/dist/parsers/lock-parser-base.js.map +1 -1
  47. package/dist/parsers/package-lock-parser.js +16 -18
  48. package/dist/parsers/package-lock-parser.js.map +1 -1
  49. package/dist/parsers/yarn-lock-parser.js +12 -3
  50. package/dist/parsers/yarn-lock-parser.js.map +1 -1
  51. package/dist/parsers/yarn2-lock-parser.js +12 -3
  52. package/dist/parsers/yarn2-lock-parser.js.map +1 -1
  53. package/dist/utils.d.ts +17 -0
  54. package/dist/utils.js +58 -15
  55. package/dist/utils.js.map +1 -1
  56. package/package.json +12 -7
@@ -8,6 +8,7 @@ exports.getYarnWorkspaces = getYarnWorkspaces;
8
8
  exports.getPnpmWorkspaces = getPnpmWorkspaces;
9
9
  const errors_1 = require("../errors");
10
10
  const js_yaml_1 = require("js-yaml");
11
+ const utils_1 = require("../utils");
11
12
  var Scope;
12
13
  (function (Scope) {
13
14
  Scope["prod"] = "prod";
@@ -22,17 +23,15 @@ var LockfileType;
22
23
  LockfileType["pnpm"] = "pnpm";
23
24
  })(LockfileType || (exports.LockfileType = LockfileType = {}));
24
25
  function parseManifestFile(manifestFileContents) {
25
- try {
26
- return JSON.parse(manifestFileContents);
27
- }
28
- catch (e) {
29
- throw new errors_1.InvalidUserInputError('package.json parsing failed with error ' + e.message);
30
- }
26
+ return (0, utils_1.parseJsonFile)(manifestFileContents, 'package.json');
31
27
  }
32
28
  function getTopLevelDeps({ targetFile, includeDev, includePeerDeps = false, applyYarn2Resolutions = false, }) {
33
- var _a, _b;
34
29
  let dependencies = [];
35
- const dependenciesIterator = Object.entries(Object.assign(Object.assign(Object.assign({}, targetFile.dependencies), (includeDev ? targetFile.devDependencies : null)), (targetFile.optionalDependencies || {})));
30
+ const dependenciesIterator = Object.entries({
31
+ ...targetFile.dependencies,
32
+ ...(includeDev ? targetFile.devDependencies : null),
33
+ ...(targetFile.optionalDependencies || {}),
34
+ });
36
35
  for (const [name, version] of dependenciesIterator) {
37
36
  dependencies.push({
38
37
  dev: includeDev && targetFile.devDependencies
@@ -44,7 +43,7 @@ function getTopLevelDeps({ targetFile, includeDev, includePeerDeps = false, appl
44
43
  }
45
44
  if (includePeerDeps && targetFile.peerDependencies) {
46
45
  for (const [name, version] of Object.entries(targetFile.peerDependencies)) {
47
- if ((_b = (_a = targetFile === null || targetFile === void 0 ? void 0 : targetFile.peerDependenciesMeta) === null || _a === void 0 ? void 0 : _a[name]) === null || _b === void 0 ? void 0 : _b.optional) {
46
+ if (targetFile?.peerDependenciesMeta?.[name]?.optional) {
48
47
  continue;
49
48
  }
50
49
  dependencies.push({
@@ -66,13 +65,16 @@ function getTopLevelDeps({ targetFile, includeDev, includePeerDeps = false, appl
66
65
  }
67
66
  return [key, resVersion];
68
67
  }));
69
- dependencies = dependencies.map((dep) => resMap.has(dep.name) ? Object.assign(Object.assign({}, dep), { version: resMap.get(dep.name) }) : dep);
68
+ dependencies = dependencies.map((dep) => resMap.has(dep.name) ? { ...dep, version: resMap.get(dep.name) } : dep);
70
69
  }
71
70
  return dependencies;
72
71
  }
73
72
  function createDepTreeDepFromDep(dep, showNpmScope) {
74
73
  return {
75
- labels: Object.assign({ scope: dep.dev ? Scope.dev : Scope.prod }, (showNpmScope && { 'npm:scope': dep.dev ? Scope.dev : Scope.prod })),
74
+ labels: {
75
+ scope: dep.dev ? Scope.dev : Scope.prod,
76
+ ...(showNpmScope && { 'npm:scope': dep.dev ? Scope.dev : Scope.prod }),
77
+ },
76
78
  name: dep.name,
77
79
  version: dep.version,
78
80
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/parsers/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/parsers/index.ts"],"names":[],"mappings":"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"}
@@ -13,24 +13,32 @@ const _1 = require("./");
13
13
  const errors_1 = require("../errors");
14
14
  const debug = baseDebug('snyk-nodejs-parser');
15
15
  class LockParserBase {
16
+ type;
17
+ treeSizeLimit;
18
+ pathDelimiter = '|';
16
19
  constructor(type, treeSizeLimit) {
17
20
  this.type = type;
18
21
  this.treeSizeLimit = treeSizeLimit;
19
- this.pathDelimiter = '|';
20
22
  }
21
23
  async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope) {
22
- var _a, _b;
23
24
  if (lockfile.type !== this.type) {
24
25
  throw new errors_1.InvalidUserInputError('Unsupported lockfile provided. Please ' +
25
26
  'provide `package-lock.json`.');
26
27
  }
27
28
  const yarnLock = lockfile;
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
- }));
33
- const nodeVersion = (_a = manifestFile === null || manifestFile === void 0 ? void 0 : manifestFile.engines) === null || _a === void 0 ? void 0 : _a.node;
29
+ const depTree = {
30
+ dependencies: {},
31
+ hasDevDependencies: !_isEmpty(manifestFile.devDependencies),
32
+ name: manifestFile.name,
33
+ size: 1,
34
+ version: manifestFile.version || '',
35
+ ...(showNpmScope && {
36
+ labels: {
37
+ 'npm:scope': 'unknown',
38
+ },
39
+ }),
40
+ };
41
+ const nodeVersion = manifestFile?.engines?.node;
34
42
  if (nodeVersion) {
35
43
  if (!depTree.meta) {
36
44
  depTree.meta = {};
@@ -55,7 +63,10 @@ class LockParserBase {
55
63
  // Since one of top level dependencies can be a start of cycle and that node
56
64
  // will be duplicated, we need to store a link between original node
57
65
  // and the new one in order to identify those duplicated top level dependencies
58
- cycleStarts = Object.assign(Object.assign({}, cycleStarts), this.removeCycle(cycle, depMap, depGraph));
66
+ cycleStarts = {
67
+ ...cycleStarts,
68
+ ...this.removeCycle(cycle, depMap, depGraph),
69
+ };
59
70
  }
60
71
  }
61
72
  // transform depMap to a map of PkgTrees
@@ -69,9 +80,16 @@ class LockParserBase {
69
80
  includePeerDeps: lockfile.type === _1.LockfileType.npm7,
70
81
  applyYarn2Resolutions: lockfile.type === _1.LockfileType.yarn2,
71
82
  });
72
- for (const alias of Object.keys((_b = manifestFile.aliases) !== null && _b !== void 0 ? _b : [])) {
83
+ for (const alias of Object.keys(manifestFile.aliases ?? [])) {
73
84
  const aliasInfo = manifestFile.aliases[alias];
74
- depTrees[aliasInfo.aliasName] = Object.assign(Object.assign({}, depTrees[aliasInfo.aliasName]), { name: aliasInfo.aliasTargetDepName, labels: Object.assign(Object.assign({}, depTrees[aliasInfo.aliasName].labels), { alias: aliasInfo }) });
85
+ depTrees[aliasInfo.aliasName] = {
86
+ ...depTrees[aliasInfo.aliasName],
87
+ name: aliasInfo.aliasTargetDepName,
88
+ labels: {
89
+ ...depTrees[aliasInfo.aliasName].labels,
90
+ ...{ alias: aliasInfo },
91
+ },
92
+ };
75
93
  }
76
94
  // number of dependencies including root one
77
95
  let treeSize = 1;
@@ -118,7 +136,11 @@ class LockParserBase {
118
136
  for (const [name, subTree] of _toPairs(pkgTree.dependencies)) {
119
137
  pkgTree.dependencies[name] = this.setDevDepRec(subTree, showNpmScope);
120
138
  }
121
- pkgTree.labels = Object.assign(Object.assign(Object.assign({}, pkgTree.labels), { scope: _1.Scope.dev }), (showNpmScope && { 'npm:scope': _1.Scope.dev }));
139
+ pkgTree.labels = {
140
+ ...pkgTree.labels,
141
+ scope: _1.Scope.dev,
142
+ ...(showNpmScope && { 'npm:scope': _1.Scope.dev }),
143
+ };
122
144
  return pkgTree;
123
145
  }
124
146
  /* Algorithm for cycle removal:
@@ -253,7 +275,6 @@ class LockParserBase {
253
275
  // Algorithm is based on dynamic programming technique and tries to build
254
276
  // "more simple" trees and compose them into bigger ones.
255
277
  async createDepTrees(depMap, depGraph, showNpmScope) {
256
- var _a, _b;
257
278
  // Graph has to be acyclic
258
279
  if (!graphlib.alg.isAcyclic(depGraph)) {
259
280
  throw new Error('Cycles were not removed from graph.');
@@ -286,8 +307,12 @@ class LockParserBase {
286
307
  name: name,
287
308
  version: identifier,
288
309
  dependencies: {},
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 })),
310
+ labels: {
311
+ missingLockFileEntry: 'true',
312
+ ...(dep.labels?.scope && { scope: dep.labels.scope }),
313
+ ...(showNpmScope &&
314
+ dep.labels?.scope && { 'npm:scope': dep.labels.scope }),
315
+ },
291
316
  };
292
317
  treeSize += 1;
293
318
  }
@@ -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":"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"}
@@ -2,27 +2,19 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PackageLockParser = void 0;
4
4
  const index_1 = require("./index");
5
- const errors_1 = require("../errors");
6
5
  const lock_parser_base_1 = require("./lock-parser-base");
7
6
  const config_1 = require("../config");
7
+ const utils_1 = require("../utils");
8
8
  class PackageLockParser extends lock_parser_base_1.LockParserBase {
9
9
  constructor() {
10
10
  super(index_1.LockfileType.npm, config_1.config.NPM_TREE_SIZE_LIMIT);
11
11
  }
12
12
  parseLockFile(lockFileContents) {
13
- try {
14
- const packageLock = JSON.parse(lockFileContents);
15
- packageLock.type =
16
- packageLock.lockfileVersion === 1
17
- ? index_1.LockfileType.npm
18
- : index_1.LockfileType.npm7;
19
- this.type = packageLock.type;
20
- return packageLock;
21
- }
22
- catch (e) {
23
- throw new errors_1.InvalidUserInputError('package-lock.json parsing failed with ' +
24
- `error ${e.message}`);
25
- }
13
+ const packageLock = (0, utils_1.parseJsonFile)(lockFileContents, 'package-lock.json');
14
+ packageLock.type =
15
+ packageLock.lockfileVersion === 1 ? index_1.LockfileType.npm : index_1.LockfileType.npm7;
16
+ this.type = packageLock.type;
17
+ return packageLock;
26
18
  }
27
19
  async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope) {
28
20
  const dependencyTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync, showNpmScope);
@@ -30,7 +22,10 @@ class PackageLockParser extends lock_parser_base_1.LockParserBase {
30
22
  lockfileVersion: lockfile.lockfileVersion,
31
23
  packageManager: 'npm',
32
24
  };
33
- const depTreeWithMeta = Object.assign(Object.assign({}, dependencyTree), { meta: Object.assign(Object.assign({}, dependencyTree.meta), meta) });
25
+ const depTreeWithMeta = {
26
+ ...dependencyTree,
27
+ meta: { ...dependencyTree.meta, ...meta },
28
+ };
34
29
  return depTreeWithMeta;
35
30
  }
36
31
  getDepMap(lockfile, resolutions, showNpmScope) {
@@ -39,9 +34,12 @@ class PackageLockParser extends lock_parser_base_1.LockParserBase {
39
34
  const flattenLockfileRec = (lockfileDeps, path) => {
40
35
  for (const [depName, dep] of Object.entries(lockfileDeps)) {
41
36
  const depNode = {
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
- })),
37
+ labels: {
38
+ scope: dep.dev ? index_1.Scope.dev : index_1.Scope.prod,
39
+ ...(showNpmScope && {
40
+ 'npm:scope': dep.dev ? index_1.Scope.dev : index_1.Scope.prod,
41
+ }),
42
+ },
45
43
  name: depName,
46
44
  requires: [],
47
45
  version: dep.version,
@@ -1 +1 @@
1
- {"version":3,"file":"package-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/package-lock-parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/package-lock-parser.ts"],"names":[],"mappings":"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"}
@@ -24,16 +24,25 @@ class YarnLockParser extends lock_parser_base_1.LockParserBase {
24
24
  async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope) {
25
25
  const depTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync, showNpmScope);
26
26
  const meta = { lockfileVersion: 1, packageManager: 'yarn' };
27
- const depTreeWithMeta = Object.assign(Object.assign({}, depTree), { meta: Object.assign(Object.assign({}, depTree.meta), meta) });
27
+ const depTreeWithMeta = {
28
+ ...depTree,
29
+ meta: { ...depTree.meta, ...meta },
30
+ };
28
31
  return depTreeWithMeta;
29
32
  }
30
33
  getDepMap(lockfile, resolutions, showNpmScope) {
31
34
  const yarnLockfile = lockfile;
32
35
  const depMap = {};
33
36
  for (const [depName, dep] of Object.entries(yarnLockfile.object)) {
34
- const subDependencies = Object.entries(Object.assign(Object.assign({}, (dep.dependencies || {})), (dep.optionalDependencies || {})));
37
+ const subDependencies = Object.entries({
38
+ ...(dep.dependencies || {}),
39
+ ...(dep.optionalDependencies || {}),
40
+ });
35
41
  depMap[depName] = {
36
- labels: Object.assign({ scope: index_1.Scope.prod }, (showNpmScope && { 'npm:scope': index_1.Scope.prod })),
42
+ labels: {
43
+ scope: index_1.Scope.prod,
44
+ ...(showNpmScope && { 'npm:scope': index_1.Scope.prod }),
45
+ },
37
46
  name: getName(depName),
38
47
  requires: subDependencies.map(([key, ver]) => `${key}@${ver}`),
39
48
  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,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"}
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,GAAG;YACtB,GAAG,OAAO;YACV,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE;SACnC,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,CAAC;gBACrC,GAAG,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;gBAC3B,GAAG,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC;aACpC,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,CAAC,GAAG;gBAChB,MAAM,EAAE;oBACN,KAAK,EAAE,aAAK,CAAC,IAAI;oBACjB,GAAG,CAAC,YAAY,IAAI,EAAE,WAAW,EAAE,aAAK,CAAC,IAAI,EAAE,CAAC;iBACjD;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"}
@@ -43,7 +43,10 @@ class Yarn2LockParser extends lock_parser_base_1.LockParserBase {
43
43
  async getDependencyTree(manifestFile, lockfile, includeDev = false, strictOutOfSync = true, showNpmScope) {
44
44
  const depTree = await super.getDependencyTree(manifestFile, lockfile, includeDev, strictOutOfSync, showNpmScope);
45
45
  const meta = { lockfileVersion: 2, packageManager: 'yarn' };
46
- const depTreeWithMeta = Object.assign(Object.assign({}, depTree), { meta: Object.assign(Object.assign({}, depTree.meta), meta) });
46
+ const depTreeWithMeta = {
47
+ ...depTree,
48
+ meta: { ...depTree.meta, ...meta },
49
+ };
47
50
  return depTreeWithMeta;
48
51
  }
49
52
  getDepMap(lockfile, resolutions, showNpmScope) {
@@ -54,10 +57,16 @@ class Yarn2LockParser extends lock_parser_base_1.LockParserBase {
54
57
  if (depName.endsWith('@workspace:.')) {
55
58
  continue;
56
59
  }
57
- const subDependencies = Object.entries(Object.assign(Object.assign({}, (dep.dependencies || {})), (dep.optionalDependencies || {}))).map(([key, ver]) => findResolutions(dependencies, depName, key, resolutions) ||
60
+ const subDependencies = Object.entries({
61
+ ...(dep.dependencies || {}),
62
+ ...(dep.optionalDependencies || {}),
63
+ }).map(([key, ver]) => findResolutions(dependencies, depName, key, resolutions) ||
58
64
  `${key}@${ver}`);
59
65
  depMap[depName] = {
60
- labels: Object.assign({ scope: _1.Scope.prod }, (showNpmScope && { 'npm:scope': _1.Scope.prod })),
66
+ labels: {
67
+ scope: _1.Scope.prod,
68
+ ...(showNpmScope && { 'npm:scope': _1.Scope.prod }),
69
+ },
61
70
  name: getName(depName),
62
71
  requires: subDependencies,
63
72
  version: dep.version,
@@ -1 +1 @@
1
- {"version":3,"file":"yarn2-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn2-lock-parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"yarn2-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn2-lock-parser.ts"],"names":[],"mappings":"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"}
package/dist/utils.d.ts CHANGED
@@ -12,3 +12,20 @@ export declare const getLockfileVersionFromFile: (targetFile: string) => NodeLoc
12
12
  export declare function getPnpmLockfileVersion(lockFileContents: string): NodeLockfileVersion.PnpmLockV5 | NodeLockfileVersion.PnpmLockV6 | NodeLockfileVersion.PnpmLockV9;
13
13
  export declare function getYarnLockfileVersion(lockFileContents: string): NodeLockfileVersion.YarnLockV1 | NodeLockfileVersion.YarnLockV2;
14
14
  export declare function getNpmLockfileVersion(lockFileContents: string): NodeLockfileVersion.NpmLockV1 | NodeLockfileVersion.NpmLockV2 | NodeLockfileVersion.NpmLockV3;
15
+ /**
16
+ * Parse JSON from a manifest or lockfile. On failure throws an
17
+ * InvalidUserInputError that preserves the underlying parser message
18
+ * (including the position of the syntax error) and appends a best-effort hint
19
+ * about the likely cause.
20
+ *
21
+ * `fileLabel` is the file kind shown in the error, e.g. 'package.json' or
22
+ * 'package-lock.json'.
23
+ */
24
+ export declare function parseJsonFile<T = any>(content: string, fileLabel: string): T;
25
+ /**
26
+ * Best-effort, allocation-light hint describing the most likely reason a JSON
27
+ * parse failed. Inspects only the leading characters of the content, never
28
+ * throws, and returns '' when nothing recognisable is found - so it is always
29
+ * safe to append to a parse-error message.
30
+ */
31
+ export declare function describeLikelyJsonCause(content: string): string;
package/dist/utils.js CHANGED
@@ -4,6 +4,8 @@ exports.getLockfileVersionFromFile = exports.NodeLockfileVersion = void 0;
4
4
  exports.getPnpmLockfileVersion = getPnpmLockfileVersion;
5
5
  exports.getYarnLockfileVersion = getYarnLockfileVersion;
6
6
  exports.getNpmLockfileVersion = getNpmLockfileVersion;
7
+ exports.parseJsonFile = parseJsonFile;
8
+ exports.describeLikelyJsonCause = describeLikelyJsonCause;
7
9
  const fs_1 = require("fs");
8
10
  const js_yaml_1 = require("js-yaml");
9
11
  const errors_1 = require("./errors");
@@ -64,24 +66,65 @@ function getYarnLockfileVersion(lockFileContents) {
64
66
  }
65
67
  }
66
68
  function getNpmLockfileVersion(lockFileContents) {
69
+ // Parse first; surfacing the real JSON error happens inside parseJsonFile.
70
+ const lockfileJson = parseJsonFile(lockFileContents, 'package-lock.json');
71
+ // The version check runs *outside* the parse try/catch so that an
72
+ // unsupported (but otherwise valid JSON) lockfile is not mis-reported as a
73
+ // JSON syntax error.
74
+ const lockfileVersion = lockfileJson.lockfileVersion || null;
75
+ switch (lockfileVersion) {
76
+ case null:
77
+ case 1:
78
+ return NodeLockfileVersion.NpmLockV1;
79
+ case 2:
80
+ return NodeLockfileVersion.NpmLockV2;
81
+ case 3:
82
+ return NodeLockfileVersion.NpmLockV3;
83
+ default:
84
+ throw new errors_1.InvalidUserInputError(`Unsupported npm lockfile version "${lockfileVersion}" in package-lock.json. ` +
85
+ 'Please provide a package-lock.json with lockfileVersion 1, 2 or 3');
86
+ }
87
+ }
88
+ /**
89
+ * Parse JSON from a manifest or lockfile. On failure throws an
90
+ * InvalidUserInputError that preserves the underlying parser message
91
+ * (including the position of the syntax error) and appends a best-effort hint
92
+ * about the likely cause.
93
+ *
94
+ * `fileLabel` is the file kind shown in the error, e.g. 'package.json' or
95
+ * 'package-lock.json'.
96
+ */
97
+ function parseJsonFile(content, fileLabel) {
67
98
  try {
68
- const lockfileJson = JSON.parse(lockFileContents);
69
- const lockfileVersion = lockfileJson.lockfileVersion || null;
70
- switch (lockfileVersion) {
71
- case null:
72
- case 1:
73
- return NodeLockfileVersion.NpmLockV1;
74
- case 2:
75
- return NodeLockfileVersion.NpmLockV2;
76
- case 3:
77
- return NodeLockfileVersion.NpmLockV3;
78
- default:
79
- throw new errors_1.InvalidUserInputError(`Unsupported npm lockfile version in package-lock.json. ` +
80
- 'Please provide a package-lock.json with lockfileVersion 1, 2 or 3');
81
- }
99
+ return JSON.parse(content);
82
100
  }
83
101
  catch (e) {
84
- throw new errors_1.InvalidUserInputError(`Problem parsing package-lock.json - make sure the package-lock.json is a valid JSON file`);
102
+ throw new errors_1.InvalidUserInputError(`${fileLabel} parsing failed with error ${e.message}` +
103
+ describeLikelyJsonCause(content));
104
+ }
105
+ }
106
+ /**
107
+ * Best-effort, allocation-light hint describing the most likely reason a JSON
108
+ * parse failed. Inspects only the leading characters of the content, never
109
+ * throws, and returns '' when nothing recognisable is found - so it is always
110
+ * safe to append to a parse-error message.
111
+ */
112
+ function describeLikelyJsonCause(content) {
113
+ if (!content) {
114
+ return ' The file is empty.';
115
+ }
116
+ // A byte-order mark (UTF-8/UTF-16/UTF-32) decoded into the string.
117
+ if (content.charCodeAt(0) === 0xfeff) {
118
+ return ' The file begins with a byte-order mark (BOM); re-save it as UTF-8 without a BOM.';
119
+ }
120
+ // NUL bytes strongly suggest the file is UTF-16/UTF-32 encoded.
121
+ if (content.includes('\x00')) {
122
+ return ' The file contains NUL bytes; it may be UTF-16/UTF-32 encoded. Re-save it as UTF-8.';
123
+ }
124
+ // Unresolved git merge-conflict markers.
125
+ if (/^(<{7}|={7}|>{7})( |$)/m.test(content)) {
126
+ return ' The file appears to contain unresolved git merge-conflict markers.';
85
127
  }
128
+ return '';
86
129
  }
87
130
  //# sourceMappingURL=utils.js.map
package/dist/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../lib/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../lib/utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -22,8 +22,13 @@
22
22
  },
23
23
  "author": "snyk.io",
24
24
  "license": "Apache-2.0",
25
+ "publishConfig": {
26
+ "registry": "https://registry.npmjs.org/",
27
+ "access": "public"
28
+ },
25
29
  "engines": {
26
- "node": ">=18"
30
+ "node": "^20.19.0 || ^22.13.0 || >=24.0.0",
31
+ "npm": ">=10"
27
32
  },
28
33
  "files": [
29
34
  "bin",
@@ -53,13 +58,13 @@
53
58
  "devDependencies": {
54
59
  "@types/jest": "^28.1.3",
55
60
  "@types/lodash": "^4.17.20",
56
- "@types/node": "^18.19.127",
61
+ "@types/node": "^24",
57
62
  "@types/semver": "^7.3.6",
58
63
  "@types/uuid": "^8.3.0",
59
- "@typescript-eslint/eslint-plugin": "^4.33.0",
60
- "@typescript-eslint/parser": "^4.33.0",
61
- "eslint": "7.32.0",
62
- "eslint-config-prettier": "^8.3.0",
64
+ "@typescript-eslint/eslint-plugin": "^8.60.0",
65
+ "@typescript-eslint/parser": "^8.60.0",
66
+ "eslint": "^8.57.1",
67
+ "eslint-config-prettier": "^9.1.0",
63
68
  "jest": "^28.1.3",
64
69
  "prettier": "^2.7.1",
65
70
  "tap": "^15.0.4",
@@ -71,5 +76,5 @@
71
76
  "tar": "7.5.11"
72
77
  },
73
78
  "packageManager": "yarn@2.4.1",
74
- "version": "2.7.0"
79
+ "version": "2.8.0"
75
80
  }