snyk-nodejs-lockfile-parser 2.3.3 → 2.4.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.
Files changed (13) hide show
  1. package/dist/aliasesPreprocessors/pkgJson.js +4 -0
  2. package/dist/aliasesPreprocessors/pkgJson.js.map +1 -1
  3. package/dist/dep-graph-builders/npm-lock-v2/index.js +22 -3
  4. package/dist/dep-graph-builders/npm-lock-v2/index.js.map +1 -1
  5. package/dist/dep-graph-builders/pnpm/utils.js +8 -3
  6. package/dist/dep-graph-builders/pnpm/utils.js.map +1 -1
  7. package/dist/dep-graph-builders/util.d.ts +6 -1
  8. package/dist/dep-graph-builders/util.js +77 -15
  9. package/dist/dep-graph-builders/util.js.map +1 -1
  10. package/dist/dep-graph-builders/yarn-lock-v2/utils.d.ts +1 -0
  11. package/dist/dep-graph-builders/yarn-lock-v2/utils.js +14 -4
  12. package/dist/dep-graph-builders/yarn-lock-v2/utils.js.map +1 -1
  13. package/package.json +1 -1
package/dist/aliasesPreprocessors/pkgJson.js CHANGED
@@ -44,6 +44,10 @@ const rewriteAliasesPkgJson = (packageJsonContent) => {
44
44
  if (pkgJsonPreprocessed.overrides) {
45
45
  (0, exports.rewriteAliasesInOverrides)(pkgJsonPreprocessed, pkgJsonPreprocessed.overrides);
46
46
  }
47
+ // Process resolutions field to extract aliases (yarn)
48
+ if (pkgJsonPreprocessed.resolutions) {
49
+ (0, exports.rewriteAliasesInOverrides)(pkgJsonPreprocessed, pkgJsonPreprocessed.resolutions);
50
+ }
47
51
  return JSON.stringify(pkgJsonPreprocessed);
48
52
  };
49
53
  exports.rewriteAliasesPkgJson = rewriteAliasesPkgJson;
package/dist/aliasesPreprocessors/pkgJson.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pkgJson.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/pkgJson.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pkgJson.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/pkgJson.ts"],"names":[],"mappings":"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"}
package/dist/dep-graph-builders/npm-lock-v2/index.js CHANGED
@@ -133,6 +133,18 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, incl
133
133
  }
134
134
  let childNodeKey = (0, exports.getChildNodeKey)(aliasInfo ? aliasInfo.aliasName : name, version, ancestry, pkgs, pkgKeysByName, pruneNpmStrictOutOfSync);
135
135
  if (!childNodeKey) {
136
+ // Handle optional dependencies that don't have separate package entries
137
+ if (depInfo.isOptional) {
138
+ return {
139
+ id: `${name}@${depInfo.version}`,
140
+ name: name,
141
+ version: depInfo.version,
142
+ dependencies: {},
143
+ isDev: depInfo.isDev,
144
+ missingLockFileEntry: true,
145
+ key: '',
146
+ };
147
+ }
136
148
  // https://snyksec.atlassian.net/wiki/spaces/SCA/pages/3785687123/NPM+Bundled+Dependencies+Analysis
137
149
  // Check if this dependency is bundled in the parent package
138
150
  // Bundled dependencies may not have separate lockfile entries when
@@ -192,12 +204,19 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, incl
192
204
  childNodeKey = depData.resolved;
193
205
  depData = pkgs[depData.resolved];
194
206
  }
195
- const dependencies = (0, util_1.getGraphDependencies)(depData.dependencies || {}, depInfo.isDev);
207
+ const dependencies = (0, util_1.getGraphDependencies)(depData.dependencies || {}, {
208
+ isDev: depInfo.isDev,
209
+ });
196
210
  const devDependencies = includeDevDeps
197
- ? (0, util_1.getGraphDependencies)(depData.devDependencies || {}, depInfo.isDev)
211
+ ? (0, util_1.getGraphDependencies)(depData.devDependencies || {}, {
212
+ isDev: depInfo.isDev,
213
+ })
198
214
  : {};
199
215
  const optionalDependencies = includeOptionalDeps
200
- ? (0, util_1.getGraphDependencies)(depData.optionalDependencies || {}, depInfo.isDev)
216
+ ? (0, util_1.getGraphDependencies)(depData.optionalDependencies || {}, {
217
+ isDev: depInfo.isDev,
218
+ isOptional: true,
219
+ })
201
220
  : {};
202
221
  return Object.assign({ id: `${name}@${depData.version}`, name: (_a = aliasInfo === null || aliasInfo === void 0 ? void 0 : aliasInfo.aliasTargetDepName) !== null && _a !== void 0 ? _a : name, version: depData.version, dependencies: Object.assign(Object.assign(Object.assign({}, dependencies), devDependencies), optionalDependencies), isDev: depInfo.isDev, inBundle: depData.inBundle, key: childNodeKey }, (aliasInfo ? { alias: Object.assign(Object.assign({}, aliasInfo), { version: depData.version }) } : {}));
203
222
  };
package/dist/dep-graph-builders/npm-lock-v2/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/npm-lock-v2/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/npm-lock-v2/index.ts"],"names":[],"mappings":"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"}
package/dist/dep-graph-builders/pnpm/utils.js CHANGED
@@ -44,12 +44,17 @@ const getPnpmChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalD
44
44
  }
45
45
  else {
46
46
  const depData = pkgs[childNodeKey];
47
- const dependencies = (0, util_1.getGraphDependencies)(depData.dependencies || {}, depInfo.isDev);
47
+ const dependencies = (0, util_1.getGraphDependencies)(depData.dependencies || {}, {
48
+ isDev: depInfo.isDev,
49
+ });
48
50
  const devDependencies = includeDevDeps
49
- ? (0, util_1.getGraphDependencies)(depData.devDependencies || {}, true)
51
+ ? (0, util_1.getGraphDependencies)(depData.devDependencies || {}, { isDev: true })
50
52
  : {};
51
53
  const optionalDependencies = includeOptionalDeps
52
- ? (0, util_1.getGraphDependencies)(depData.optionalDependencies || {}, depInfo.isDev)
54
+ ? (0, util_1.getGraphDependencies)(depData.optionalDependencies || {}, {
55
+ isDev: depInfo.isDev,
56
+ isOptional: true,
57
+ })
53
58
  : {};
54
59
  return {
55
60
  id: `${depData.name}@${depData.version}`,
package/dist/dep-graph-builders/pnpm/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/utils.ts"],"names":[],"mappings":"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"}
package/dist/dep-graph-builders/util.d.ts CHANGED
@@ -4,6 +4,7 @@ import { NormalisedPkgs } from './types';
4
4
  export type Dependencies = Record<string, {
5
5
  version: string;
6
6
  isDev: boolean;
7
+ isOptional?: boolean;
7
8
  }>;
8
9
  export interface PkgNode {
9
10
  id: string;
@@ -38,11 +39,15 @@ export declare const getTopLevelDeps: (pkgJson: PackageJsonBase, options: {
38
39
  * Converts dependencies parsed from the a lock file to a dependencies object required by the graph.
39
40
  * For example, { 'mime-db': '~1.12.0' } will be converted to { 'mime-db': { version: '~1.12.0', isDev: true/false } }.
40
41
  */
41
- export declare const getGraphDependencies: (dependencies: Record<string, string>, isDev: any) => Dependencies;
42
+ export declare const getGraphDependencies: (dependencies: Record<string, string>, options: {
43
+ isDev: boolean;
44
+ isOptional?: boolean;
45
+ }) => Dependencies;
42
46
  export declare function parsePkgJson(pkgJsonContent: string): PackageJsonBase;
43
47
  export declare const getChildNode: (name: string, depInfo: {
44
48
  version: string;
45
49
  isDev: boolean;
50
+ isOptional?: boolean;
46
51
  alias?: {
47
52
  aliasName: string;
48
53
  aliasTargetDepName: string;
package/dist/dep-graph-builders/util.js CHANGED
@@ -5,6 +5,7 @@ exports.parsePkgJson = parsePkgJson;
5
5
  const errors_1 = require("../errors");
6
6
  const errors_2 = require("../errors");
7
7
  const parsers_1 = require("../parsers");
8
+ const pkgJson_1 = require("../aliasesPreprocessors/pkgJson");
8
9
  const addPkgNodeToGraph = (depGraphBuilder, node, options) => {
9
10
  return depGraphBuilder.addPkgNode({ name: node.name, version: node.version }, node.id, {
10
11
  labels: Object.assign(Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (options.isCyclic && { pruned: 'cyclic' })), (options.isWorkspacePkg && { pruned: 'true' })), (node.missingLockFileEntry && { missingLockFileEntry: 'true' })), (node.alias && {
@@ -18,18 +19,28 @@ exports.addPkgNodeToGraph = addPkgNodeToGraph;
18
19
  * This includes both prod dependencies and dev dependencies supposing includeDevDeps is supported.
19
20
  */
20
21
  const getTopLevelDeps = (pkgJson, options) => {
21
- const prodDeps = (0, exports.getGraphDependencies)(pkgJson.dependencies || {}, false);
22
- const devDeps = (0, exports.getGraphDependencies)(pkgJson.devDependencies || {}, true);
22
+ const prodDeps = (0, exports.getGraphDependencies)(pkgJson.dependencies || {}, {
23
+ isDev: false,
24
+ });
25
+ const devDeps = (0, exports.getGraphDependencies)(pkgJson.devDependencies || {}, {
26
+ isDev: true,
27
+ });
23
28
  const optionalDeps = options.includeOptionalDeps
24
- ? (0, exports.getGraphDependencies)(pkgJson.optionalDependencies || {}, false)
29
+ ? (0, exports.getGraphDependencies)(pkgJson.optionalDependencies || {}, {
30
+ isDev: false,
31
+ isOptional: true,
32
+ })
25
33
  : {};
26
34
  const peerDeps = options.includePeerDeps
27
- ? (0, exports.getGraphDependencies)(pkgJson.peerDependencies || {}, false)
35
+ ? (0, exports.getGraphDependencies)(pkgJson.peerDependencies || {}, { isDev: false })
28
36
  : {};
29
37
  const deps = Object.assign(Object.assign(Object.assign({}, prodDeps), optionalDeps), peerDeps);
30
38
  if (pkgJson.aliases) {
31
39
  for (const alias of Object.keys(pkgJson.aliases)) {
32
- deps[alias] = Object.assign(Object.assign({}, deps[alias]), { alias: Object.assign({}, pkgJson.aliases[alias]) });
40
+ // Only add alias metadata to dependencies that are actually in deps
41
+ if (deps[alias]) {
42
+ deps[alias] = Object.assign(Object.assign({}, deps[alias]), { alias: Object.assign({}, pkgJson.aliases[alias]) });
43
+ }
33
44
  }
34
45
  }
35
46
  if (options.includeDevDeps) {
@@ -53,9 +64,13 @@ exports.getTopLevelDeps = getTopLevelDeps;
53
64
  * Converts dependencies parsed from the a lock file to a dependencies object required by the graph.
54
65
  * For example, { 'mime-db': '~1.12.0' } will be converted to { 'mime-db': { version: '~1.12.0', isDev: true/false } }.
55
66
  */
56
- const getGraphDependencies = (dependencies, isDev) => {
67
+ const getGraphDependencies = (dependencies, options) => {
57
68
  return Object.entries(dependencies).reduce((pnpmDeps, [name, semver]) => {
58
- pnpmDeps[name] = { version: semver, isDev: isDev };
69
+ pnpmDeps[name] = {
70
+ version: semver,
71
+ isDev: options.isDev,
72
+ isOptional: options.isOptional || false,
73
+ };
59
74
  return pnpmDeps;
60
75
  }, {});
61
76
  };
@@ -73,38 +88,85 @@ function parsePkgJson(pkgJsonContent) {
73
88
  }
74
89
  }
75
90
  const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps) => {
76
- var _a, _b, _c, _d;
91
+ var _a, _b, _c;
77
92
  const childNodeKey = `${name}@${depInfo.version}`;
78
93
  let childNode;
94
+ // Check if this lockfile entry is for an aliased package
95
+ // by looking for a corresponding npm: entry in the lockfile
96
+ let aliasInfo = depInfo.alias;
97
+ if (!aliasInfo && pkgs[childNodeKey]) {
98
+ // Look for any key in pkgs that matches the pattern: name@npm:*
99
+ // and has the same version as our current entry
100
+ for (const key in pkgs) {
101
+ if (key.startsWith(`${name}@npm:`)) {
102
+ const pkgEntry = pkgs[key];
103
+ if (pkgEntry.version === pkgs[childNodeKey].version) {
104
+ // Extract the npm: portion and parse it using the shared helper
105
+ const npmPortion = key.substring(name.length + 1); // Remove "name@" prefix
106
+ const parsed = (0, pkgJson_1.parseNpmAlias)(npmPortion);
107
+ if (parsed) {
108
+ const targetPkgName = parsed.packageName;
109
+ // Only add alias info if the alias name is different from the target name
110
+ if (targetPkgName !== name) {
111
+ aliasInfo = {
112
+ aliasName: name,
113
+ aliasTargetDepName: targetPkgName,
114
+ semver: parsed.version,
115
+ version: parsed.version,
116
+ };
117
+ }
118
+ break;
119
+ }
120
+ }
121
+ }
122
+ }
123
+ }
79
124
  if (!pkgs[childNodeKey]) {
80
- if (strictOutOfSync && !/^file:/.test(depInfo.version)) {
125
+ // Handle optional dependencies that don't have separate package entries
126
+ if (depInfo.isOptional) {
127
+ childNode = {
128
+ id: childNodeKey,
129
+ name: (_a = aliasInfo === null || aliasInfo === void 0 ? void 0 : aliasInfo.aliasTargetDepName) !== null && _a !== void 0 ? _a : name,
130
+ version: depInfo.version,
131
+ dependencies: {},
132
+ isDev: depInfo.isDev,
133
+ missingLockFileEntry: true,
134
+ alias: aliasInfo,
135
+ };
136
+ }
137
+ else if (strictOutOfSync && !/^file:/.test(depInfo.version)) {
81
138
  throw new errors_2.OutOfSyncError(childNodeKey, parsers_1.LockfileType.yarn);
82
139
  }
83
140
  else {
84
141
  childNode = {
85
142
  id: childNodeKey,
86
- name: (_b = (_a = depInfo.alias) === null || _a === void 0 ? void 0 : _a.aliasTargetDepName) !== null && _b !== void 0 ? _b : name,
143
+ name: (_b = aliasInfo === null || aliasInfo === void 0 ? void 0 : aliasInfo.aliasTargetDepName) !== null && _b !== void 0 ? _b : name,
87
144
  version: depInfo.version,
88
145
  dependencies: {},
89
146
  isDev: depInfo.isDev,
90
147
  missingLockFileEntry: true,
91
- alias: depInfo.alias,
148
+ alias: aliasInfo,
92
149
  };
93
150
  }
94
151
  }
95
152
  else {
96
153
  const depData = pkgs[childNodeKey];
97
- const dependencies = (0, exports.getGraphDependencies)(depData.dependencies || {}, depInfo.isDev);
154
+ const dependencies = (0, exports.getGraphDependencies)(depData.dependencies || {}, {
155
+ isDev: depInfo.isDev,
156
+ });
98
157
  const optionalDependencies = includeOptionalDeps
99
- ? (0, exports.getGraphDependencies)(depData.optionalDependencies || {}, depInfo.isDev)
158
+ ? (0, exports.getGraphDependencies)(depData.optionalDependencies || {}, {
159
+ isDev: depInfo.isDev,
160
+ isOptional: true,
161
+ })
100
162
  : {};
101
163
  childNode = {
102
164
  id: `${name}@${depData.version}`,
103
- name: (_d = (_c = depInfo.alias) === null || _c === void 0 ? void 0 : _c.aliasTargetDepName) !== null && _d !== void 0 ? _d : name,
165
+ name: (_c = aliasInfo === null || aliasInfo === void 0 ? void 0 : aliasInfo.aliasTargetDepName) !== null && _c !== void 0 ? _c : name,
104
166
  version: depData.version,
105
167
  dependencies: Object.assign(Object.assign({}, dependencies), optionalDependencies),
106
168
  isDev: depInfo.isDev,
107
- alias: depInfo.alias,
169
+ alias: aliasInfo,
108
170
  };
109
171
  }
110
172
  return childNode;
package/dist/dep-graph-builders/util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":";;;AA8IA,oCAYC;AAxJD,sCAAkD;AAElD,sCAA2C;AAC3C,wCAA0C;AAC1C,6DAAgE;AAwBzD,MAAM,iBAAiB,GAAG,CAC/B,eAAgC,EAChC,IAAa,EACb,OAGC,EACgB,EAAE;IACnB,OAAO,eAAe,CAAC,UAAU,CAC/B,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAC1C,IAAI,CAAC,EAAE,EACP;QACE,MAAM,4DACJ,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,IAC/B,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAC1C,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAC9C,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,GAC/D,CAAC,IAAI,CAAC,KAAK,IAAI;YAChB,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,CAAC,kBAAkB,IAAI,IAAI,CAAC,OAAO,EAAE;SACnF,CAAC,CACH;KACF,CACF,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B;AAEF;;;GAGG;AACI,MAAM,eAAe,GAAG,CAC7B,OAAwB,EACxB,OAIC,EACa,EAAE;IAChB,MAAM,QAAQ,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,YAAY,IAAI,EAAE,EAAE;QAChE,KAAK,EAAE,KAAK;KACb,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,eAAe,IAAI,EAAE,EAAE;QAClE,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB;QAC9C,CAAC,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC,oBAAoB,IAAI,EAAE,EAAE;YACvD,KAAK,EAAE,KAAK;YACZ,UAAU,EAAE,IAAI;SACjB,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe;QACtC,CAAC,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACxE,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,IAAI,iDAAQ,QAAQ,GAAK,YAAY,GAAK,QAAQ,CAAE,CAAC;IAE3D,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACjD,oEAAoE;YACpE,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChB,IAAI,CAAC,KAAK,CAAC,mCACN,IAAI,CAAC,KAAK,CAAC,GACX,EAAE,KAAK,oBAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAE,EAAE,CAC5C,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,yDAAyD;QACzD,uFAAuF;QACvF,uCAAY,IAAI,GAAK,OAAO,EAAG;IACjC,CAAC;IAED,uEAAuE;IACvE,oCAAoC;IACpC,2DAA2D;IAC3D,wCAAwC;IACxC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;SACrB,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SAC7D,MAAM,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;QAC9B,MAAM,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC,CAAC;AAzDW,QAAA,eAAe,mBAyD1B;AAEF;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAClC,YAAoC,EACpC,OAGC,EACa,EAAE;IAChB,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACxC,CAAC,QAAsB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE;QACzC,QAAQ,CAAC,IAAI,CAAC,GAAG;YACf,OAAO,EAAE,MAAM;YACf,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,KAAK;SACxC,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC,EACD,EAAE,CACH,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,oBAAoB,wBAkB/B;AAEF,SAAgB,YAAY,CAAC,cAAsB;IACjD,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YACxB,aAAa,CAAC,IAAI,GAAG,cAAc,CAAC;QACtC,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,8BAAqB,CAC7B,yCAAyC,GAAI,CAAW,CAAC,OAAO,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,MAAM,YAAY,GAAG,CAC1B,IAAY,EACZ,OAUC,EACD,IAAoB,EACpB,eAAwB,EACxB,mBAA4B,EAC5B,EAAE;;IACF,MAAM,YAAY,GAAG,GAAG,IAAI,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAClD,IAAI,SAAkB,CAAC;IAEvB,yDAAyD;IACzD,4DAA4D;IAC5D,IAAI,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;IAC9B,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACrC,gEAAgE;QAChE,gDAAgD;QAChD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,IAAI,OAAO,CAAC,EAAE,CAAC;gBACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3B,IAAI,QAAQ,CAAC,OAAO,KAAK,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;oBACpD,gEAAgE;oBAChE,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAwB;oBAC3E,MAAM,MAAM,GAAG,IAAA,uBAAa,EAAC,UAAU,CAAC,CAAC;oBACzC,IAAI,MAAM,EAAE,CAAC;wBACX,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC;wBACzC,0EAA0E;wBAC1E,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;4BAC3B,SAAS,GAAG;gCACV,SAAS,EAAE,IAAI;gCACf,kBAAkB,EAAE,aAAa;gCACjC,MAAM,EAAE,MAAM,CAAC,OAAO;gCACtB,OAAO,EAAE,MAAM,CAAC,OAAO;6BACxB,CAAC;wBACJ,CAAC;wBACD,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACxB,wEAAwE;QACxE,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,SAAS,GAAG;gBACV,EAAE,EAAE,YAAY;gBAChB,IAAI,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,kBAAkB,mCAAI,IAAI;gBAC3C,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,YAAY,EAAE,EAAE;gBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,oBAAoB,EAAE,IAAI;gBAC1B,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;aAAM,IAAI,eAAe,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9D,MAAM,IAAI,uBAAc,CAAC,YAAY,EAAE,sBAAY,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,SAAS,GAAG;gBACV,EAAE,EAAE,YAAY;gBAChB,IAAI,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,kBAAkB,mCAAI,IAAI;gBAC3C,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,YAAY,EAAE,EAAE;gBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,oBAAoB,EAAE,IAAI;gBAC1B,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QACnC,MAAM,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,YAAY,IAAI,EAAE,EAAE;YACpE,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,mBAAmB;YAC9C,CAAC,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC,oBAAoB,IAAI,EAAE,EAAE;gBACvD,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,UAAU,EAAE,IAAI;aACjB,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC;QACP,SAAS,GAAG;YACV,EAAE,EAAE,GAAG,IAAI,IAAI,OAAO,CAAC,OAAO,EAAE;YAChC,IAAI,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,kBAAkB,mCAAI,IAAI;YAC3C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,YAAY,kCAAO,YAAY,GAAK,oBAAoB,CAAE;YAC1D,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,KAAK,EAAE,SAAS;SACjB,CAAC;IACJ,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAlGW,QAAA,YAAY,gBAkGvB"}
package/dist/dep-graph-builders/yarn-lock-v2/utils.d.ts CHANGED
@@ -41,6 +41,7 @@ export declare const getYarnLockV2ChildNode: (name: string, depInfo: {
41
41
  [x: string]: {
42
42
  version: string;
43
43
  isDev: boolean;
44
+ isOptional?: boolean;
44
45
  };
45
46
  };
46
47
  isDev: boolean;
package/dist/dep-graph-builders/yarn-lock-v2/utils.js CHANGED
@@ -129,9 +129,14 @@ const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOpt
129
129
  }
130
130
  }
131
131
  const { version: versionFromResolution, dependencies, optionalDependencies, } = pkgs[childNodeKeyFromResolution];
132
- const formattedDependencies = (0, util_1.getGraphDependencies)(dependencies || {}, depInfo.isDev);
132
+ const formattedDependencies = (0, util_1.getGraphDependencies)(dependencies || {}, {
133
+ isDev: depInfo.isDev,
134
+ });
133
135
  const formattedOptionalDependencies = includeOptionalDeps
134
- ? (0, util_1.getGraphDependencies)(optionalDependencies || {}, depInfo.isDev)
136
+ ? (0, util_1.getGraphDependencies)(optionalDependencies || {}, {
137
+ isDev: depInfo.isDev,
138
+ isOptional: true,
139
+ })
135
140
  : {};
136
141
  return Object.assign({ id: childNodeKeyFromResolution, name: depInfo.alias ? depInfo.alias.aliasTargetDepName : name, version: versionFromResolution, dependencies: Object.assign(Object.assign({}, formattedOptionalDependencies), formattedDependencies), isDev: depInfo.isDev }, (depInfo.alias
137
142
  ? { alias: Object.assign(Object.assign({}, depInfo.alias), { version: versionFromResolution }) }
@@ -151,9 +156,14 @@ const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOpt
151
156
  }
152
157
  else {
153
158
  const depData = pkgs[childNodeKey];
154
- const dependencies = (0, util_1.getGraphDependencies)(depData.dependencies || {}, depInfo.isDev);
159
+ const dependencies = (0, util_1.getGraphDependencies)(depData.dependencies || {}, {
160
+ isDev: depInfo.isDev,
161
+ });
155
162
  const optionalDependencies = includeOptionalDeps
156
- ? (0, util_1.getGraphDependencies)(depData.optionalDependencies || {}, depInfo.isDev)
163
+ ? (0, util_1.getGraphDependencies)(depData.optionalDependencies || {}, {
164
+ isDev: depInfo.isDev,
165
+ isOptional: true,
166
+ })
157
167
  : {};
158
168
  return Object.assign({ id: `${name}@${depData.version}`, name: depInfo.alias ? depInfo.alias.aliasTargetDepName : name, version: depData.version, dependencies: Object.assign(Object.assign({}, dependencies), optionalDependencies), isDev: depInfo.isDev }, (depInfo.alias
159
169
  ? { alias: Object.assign(Object.assign({}, depInfo.alias), { version: depData.version }) }
package/dist/dep-graph-builders/yarn-lock-v2/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -68,5 +68,5 @@
68
68
  "typescript": "^5.4.5"
69
69
  },
70
70
  "packageManager": "yarn@2.4.1",
71
- "version": "2.3.3"
71
+ "version": "2.4.1"
72
72
  }