snyk-nodejs-lockfile-parser 1.42.0 → 1.43.0

package/dist/dep-graph-builders/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/index.ts"],"names":[],"mappings":";;;AAAA,iDAQwB;AAEtB,uGATA,qCAAsB,OASA;AAKtB,gHAbA,8CAA+B,OAaA;AAH/B,0HATA,wDAAyC,OASA;AACzC,8GATA,4CAA6B,OASA;AAC7B,6HATA,2DAA4C,OASA;AAH5C,iHALA,+CAAgC,OAKA;AAKhC,0GATA,wCAAyB,OASA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/index.ts"],"names":[],"mappings":";;;AAAA,iDAQwB;AAGtB,uGAVA,qCAAsB,OAUA;AAKtB,gHAdA,8CAA+B,OAcA;AAH/B,0HAVA,wDAAyC,OAUA;AACzC,8GAVA,4CAA6B,OAUA;AAC7B,6HAVA,2DAA4C,OAUA;AAH5C,iHANA,+CAAgC,OAMA;AAKhC,0GAVA,wCAAyB,OAUA"}

package/dist/dep-graph-builders/util.d.ts

@@ -33,8 +33,8 @@ export declare function parsePkgJson(pkgJsonContent: string): PackageJsonBase;
 export declare const getChildNode: (name: string, depInfo: {
     version: string;
     isDev: boolean;
-}, pkgs: YarnLockPackages, strictOutOfSync: boolean) => PkgNode;
+}, pkgs: YarnLockPackages, strictOutOfSync: boolean, includeOptionalDeps: boolean) => PkgNode;
 export declare const getChildNodeWorkspace: (name: string, depInfo: {
     version: string;
     isDev: boolean;
-}, workspacePkgNameToVersion: Record<string, string>, pkgs: YarnLockPackages, strictOutOfSync: boolean) => PkgNode;
+}, workspacePkgNameToVersion: Record<string, string>, pkgs: YarnLockPackages, strictOutOfSync: boolean, includeOptionalDeps: boolean) => PkgNode;

package/dist/dep-graph-builders/util.js

@@ -46,10 +46,10 @@ function parsePkgJson(pkgJsonContent) {
     }
 }
 exports.parsePkgJson = parsePkgJson;
-const getChildNode = (name, depInfo, pkgs, strictOutOfSync) => {
+const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps) => {
     const childNodeKey = `${name}@${depInfo.version}`;
     let childNode;
-    if (!pkgs.hasOwnProperty(childNodeKey)) {
+    if (!pkgs[childNodeKey]) {
         if (strictOutOfSync && !/^file:/.test(depInfo.version)) {
             throw new errors_2.OutOfSyncError(childNodeKey, parsers_1.LockfileType.yarn);
         }
@@ -66,18 +66,22 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync) => {
     }
     else {
         const depData = pkgs[childNodeKey];
+        const dependencies = exports.getGraphDependencies(depData.dependencies || {}, depInfo.isDev);
+        const optionalDependencies = includeOptionalDeps
+            ? exports.getGraphDependencies(depData.optionalDependencies || {}, depInfo.isDev)
+            : {};
         childNode = {
             id: `${name}@${depData.version}`,
             name: name,
             version: depData.version,
-            dependencies: exports.getGraphDependencies(depData.dependencies || {}, depInfo.isDev),
+            dependencies: Object.assign(Object.assign({}, dependencies), optionalDependencies),
             isDev: depInfo.isDev,
         };
     }
     return childNode;
 };
 exports.getChildNode = getChildNode;
-const getChildNodeWorkspace = (name, depInfo, workspacePkgNameToVersion, pkgs, strictOutOfSync) => {
+const getChildNodeWorkspace = (name, depInfo, workspacePkgNameToVersion, pkgs, strictOutOfSync, includeOptionalDeps) => {
     let childNode;
     if (workspacePkgNameToVersion[name]) {
         const version = workspacePkgNameToVersion[name];
@@ -95,7 +99,7 @@ const getChildNodeWorkspace = (name, depInfo, workspacePkgNameToVersion, pkgs, s
         };
     }
     else {
-        childNode = exports.getChildNode(name, depInfo, pkgs, strictOutOfSync);
+        childNode = exports.getChildNode(name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps);
     }
     return childNode;
 };

package/dist/dep-graph-builders/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/dep-graph-builders/util.ts"],"names":[],"mappings":"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"}

package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple-pruned.js

@@ -9,7 +9,7 @@ var Color;
     Color[Color["BLACK"] = 1] = "BLACK";
 })(Color || (Color = {}));
 const buildDepGraphYarnLockV1SimpleCyclesPruned = (extractedYarnLockV1Pkgs, pkgJson, options) => {
-    const { includeDevDeps, strictOutOfSync } = options;
+    const { includeDevDeps, strictOutOfSync, includeOptionalDeps } = options;
     const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version });
     const colorMap = {};
     const topLevelDeps = util_1.getTopLevelDeps(pkgJson, { includeDevDeps });
@@ -20,7 +20,7 @@ const buildDepGraphYarnLockV1SimpleCyclesPruned = (extractedYarnLockV1Pkgs, pkgJ
         dependencies: topLevelDeps,
         isDev: false,
     };
-    dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync);
+    dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
     return depGraphBuilder.build();
 };
 exports.buildDepGraphYarnLockV1SimpleCyclesPruned = buildDepGraphYarnLockV1SimpleCyclesPruned;
@@ -33,13 +33,13 @@ exports.buildDepGraphYarnLockV1SimpleCyclesPruned = buildDepGraphYarnLockV1Simpl
  *  - When first exploring an edge, if it points to a GRAY node, a cycle is found and the GRAY node is pruned.
  *     - A pruned node has id `${originalId}|1`
  */
-const dfsVisit = (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync) => {
+const dfsVisit = (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps) => {
     colorMap[node.id] = Color.GRAY;
     for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
-        const childNode = util_1.getChildNode(name, depInfo, extractedYarnLockV1Pkgs, strictOutOfSync);
+        const childNode = util_1.getChildNode(name, depInfo, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
         if (!colorMap.hasOwnProperty(childNode.id)) {
             util_1.addPkgNodeToGraph(depGraphBuilder, childNode, {});
-            dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync);
+            dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
         }
         else if (colorMap[childNode.id] === Color.GRAY) {
             // cycle detected

package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple-pruned.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-depgraph-simple-pruned.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-simple-pruned.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAKiB;AAIjB,IAAK,KAGJ;AAHD,WAAK,KAAK;IACR,iCAAI,CAAA;IACJ,mCAAK,CAAA;AACP,CAAC,EAHI,KAAK,KAAL,KAAK,QAGT;AAEM,MAAM,yCAAyC,GAAG,CACvD,uBAAyC,EACzC,OAAwB,EACxB,OAA6B,EAC7B,EAAE;IACF,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAEpD,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,QAAQ,GAA0B,EAAE,CAAC;IAE3C,MAAM,YAAY,GAAG,sBAAe,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,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,QAAQ,CACN,eAAe,EACf,QAAQ,EACR,QAAQ,EACR,uBAAuB,EACvB,eAAe,CAChB,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AAjCW,QAAA,yCAAyC,6CAiCpD;AAEF;;;;;;;;GAQG;AACH,MAAM,QAAQ,GAAG,CACf,eAAgC,EAChC,IAAa,EACb,QAA+B,EAC/B,uBAAyC,EACzC,eAAwB,EAClB,EAAE;IACR,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;IAE/B,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE;QACrE,MAAM,SAAS,GAAG,mBAAY,CAC5B,IAAI,EACJ,OAAO,EACP,uBAAuB,EACvB,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YAC1C,wBAAiB,CAAC,eAAe,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YAClD,QAAQ,CACN,eAAe,EACf,SAAS,EACT,QAAQ,EACR,uBAAuB,EACvB,eAAe,CAChB,CAAC;SACH;aAAM,IAAI,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE;YAChD,iBAAiB;YACjB,SAAS,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,EAAE,IAAI,CAAC;YACnC,wBAAiB,CAAC,eAAe,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;SACnE;QAED,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;KACnD;IAED,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;AAClC,CAAC,CAAC"}
+{"version":3,"file":"build-depgraph-simple-pruned.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-simple-pruned.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAKiB;AAIjB,IAAK,KAGJ;AAHD,WAAK,KAAK;IACR,iCAAI,CAAA;IACJ,mCAAK,CAAA;AACP,CAAC,EAHI,KAAK,KAAL,KAAK,QAGT;AAEM,MAAM,yCAAyC,GAAG,CACvD,uBAAyC,EACzC,OAAwB,EACxB,OAA6B,EAC7B,EAAE;IACF,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC;IAEzE,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,QAAQ,GAA0B,EAAE,CAAC;IAE3C,MAAM,YAAY,GAAG,sBAAe,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,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,QAAQ,CACN,eAAe,EACf,QAAQ,EACR,QAAQ,EACR,uBAAuB,EACvB,eAAe,EACf,mBAAmB,CACpB,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AAlCW,QAAA,yCAAyC,6CAkCpD;AAEF;;;;;;;;GAQG;AACH,MAAM,QAAQ,GAAG,CACf,eAAgC,EAChC,IAAa,EACb,QAA+B,EAC/B,uBAAyC,EACzC,eAAwB,EACxB,mBAA4B,EACtB,EAAE;IACR,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;IAE/B,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE;QACrE,MAAM,SAAS,GAAG,mBAAY,CAC5B,IAAI,EACJ,OAAO,EACP,uBAAuB,EACvB,eAAe,EAEf,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YAC1C,wBAAiB,CAAC,eAAe,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YAClD,QAAQ,CACN,eAAe,EACf,SAAS,EACT,QAAQ,EACR,uBAAuB,EACvB,eAAe,EACf,mBAAmB,CACpB,CAAC;SACH;aAAM,IAAI,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE;YAChD,iBAAiB;YACjB,SAAS,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,EAAE,IAAI,CAAC;YACnC,wBAAiB,CAAC,eAAe,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;SACnE;QAED,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;KACnD;IAED,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;AAClC,CAAC,CAAC"}

package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js

@@ -4,7 +4,7 @@ exports.buildDepGraphYarnLockV1Simple = void 0;
 const dep_graph_1 = require("@snyk/dep-graph");
 const util_1 = require("../util");
 const buildDepGraphYarnLockV1Simple = (extractedYarnLockV1Pkgs, pkgJson, options) => {
-    const { includeDevDeps, strictOutOfSync } = options;
+    const { includeDevDeps, strictOutOfSync, includeOptionalDeps } = options;
     const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version });
     const visitedMap = new Set();
     const topLevelDeps = util_1.getTopLevelDeps(pkgJson, { includeDevDeps });
@@ -15,7 +15,7 @@ const buildDepGraphYarnLockV1Simple = (extractedYarnLockV1Pkgs, pkgJson, options
         dependencies: topLevelDeps,
         isDev: false,
     };
-    dfsVisit(depGraphBuilder, rootNode, visitedMap, extractedYarnLockV1Pkgs, strictOutOfSync);
+    dfsVisit(depGraphBuilder, rootNode, visitedMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
     return depGraphBuilder.build();
 };
 exports.buildDepGraphYarnLockV1Simple = buildDepGraphYarnLockV1Simple;
@@ -25,13 +25,13 @@ exports.buildDepGraphYarnLockV1Simple = buildDepGraphYarnLockV1Simple;
  *  - If a node doesn't exist in the map, it means it hasn't been visited.
  *  - If a node is already visited, simply connect the new node with this node.
  */
-const dfsVisit = (depGraphBuilder, node, visitedMap, extractedYarnLockV1Pkgs, strictOutOfSync) => {
+const dfsVisit = (depGraphBuilder, node, visitedMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps) => {
     visitedMap.add(node.id);
     for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
-        const childNode = util_1.getChildNode(name, depInfo, extractedYarnLockV1Pkgs, strictOutOfSync);
+        const childNode = util_1.getChildNode(name, depInfo, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
         if (!visitedMap.has(childNode.id)) {
             util_1.addPkgNodeToGraph(depGraphBuilder, childNode, {});
-            dfsVisit(depGraphBuilder, childNode, visitedMap, extractedYarnLockV1Pkgs, strictOutOfSync);
+            dfsVisit(depGraphBuilder, childNode, visitedMap, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
         }
         depGraphBuilder.connectDep(node.id, childNode.id);
     }

package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-simple.js.map

@@ -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;AAIV,MAAM,6BAA6B,GAAG,CAC3C,uBAAyC,EACzC,OAAwB,EACxB,OAA6B,EAC7B,EAAE;IACF,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAEpD,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,UAAU,GAAgB,IAAI,GAAG,EAAE,CAAC;IAE1C,MAAM,YAAY,GAAG,sBAAe,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,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,QAAQ,CACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,eAAe,CAChB,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AAjCW,QAAA,6BAA6B,iCAiCxC;AAEF;;;;;GAKG;AACH,MAAM,QAAQ,GAAG,CACf,eAAgC,EAChC,IAAa,EACb,UAAuB,EACvB,uBAAyC,EACzC,eAAwB,EAClB,EAAE;IACR,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE;QACrE,MAAM,SAAS,GAAG,mBAAY,CAC5B,IAAI,EACJ,OAAO,EACP,uBAAuB,EACvB,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YACjC,wBAAiB,CAAC,eAAe,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YAClD,QAAQ,CACN,eAAe,EACf,SAAS,EACT,UAAU,EACV,uBAAuB,EACvB,eAAe,CAChB,CAAC;SACH;QAED,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;KACnD;AACH,CAAC,CAAC"}
+{"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;AAIV,MAAM,6BAA6B,GAAG,CAC3C,uBAAyC,EACzC,OAAwB,EACxB,OAA6B,EAC7B,EAAE;IACF,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC;IAEzE,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,UAAU,GAAgB,IAAI,GAAG,EAAE,CAAC;IAE1C,MAAM,YAAY,GAAG,sBAAe,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,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,QAAQ,CACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,eAAe,EACf,mBAAmB,CACpB,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AAlCW,QAAA,6BAA6B,iCAkCxC;AAEF;;;;;GAKG;AACH,MAAM,QAAQ,GAAG,CACf,eAAgC,EAChC,IAAa,EACb,UAAuB,EACvB,uBAAyC,EACzC,eAAwB,EACxB,mBAA4B,EACtB,EAAE;IACR,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE;QACrE,MAAM,SAAS,GAAG,mBAAY,CAC5B,IAAI,EACJ,OAAO,EACP,uBAAuB,EACvB,eAAe,EACf,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YACjC,wBAAiB,CAAC,eAAe,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YAClD,QAAQ,CACN,eAAe,EACf,SAAS,EACT,UAAU,EACV,uBAAuB,EACvB,eAAe,EACf,mBAAmB,CACpB,CAAC;SACH;QAED,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;KACnD;AACH,CAAC,CAAC"}

package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package-pruned.js

@@ -11,7 +11,7 @@ var Color;
 // Parse a single workspace package using yarn.lock v1
 // workspaces feature
 const buildDepGraphYarnLockV1WorkspaceCyclesPruned = (extractedYarnLockV1Pkgs, pkgJson, workspacePkgNameToVersion, options) => {
-    const { includeDevDeps, strictOutOfSync } = options;
+    const { includeDevDeps, strictOutOfSync, includeOptionalDeps } = options;
     const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version });
     const colorMap = {};
     const topLevelDeps = util_1.getTopLevelDeps(pkgJson, { includeDevDeps });
@@ -22,7 +22,7 @@ const buildDepGraphYarnLockV1WorkspaceCyclesPruned = (extractedYarnLockV1Pkgs, p
         dependencies: topLevelDeps,
         isDev: false,
     };
-    dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync);
+    dfsVisit(depGraphBuilder, rootNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps);
     return depGraphBuilder.build();
 };
 exports.buildDepGraphYarnLockV1WorkspaceCyclesPruned = buildDepGraphYarnLockV1WorkspaceCyclesPruned;
@@ -36,18 +36,18 @@ exports.buildDepGraphYarnLockV1WorkspaceCyclesPruned = buildDepGraphYarnLockV1Wo
  *     - A pruned node has id `${originalId}|1`
  * When coming across another workspace package as child node, simply add the node and edge to the graph and mark it as BLACK.
  */
-const dfsVisit = (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync) => {
+const dfsVisit = (depGraphBuilder, node, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps) => {
     colorMap[node.id] = Color.GRAY;
     for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
         const isWorkspacePkg = !!workspacePkgNameToVersion[name];
-        const childNode = util_1.getChildNodeWorkspace(name, depInfo, workspacePkgNameToVersion, extractedYarnLockV1Pkgs, strictOutOfSync);
+        const childNode = util_1.getChildNodeWorkspace(name, depInfo, workspacePkgNameToVersion, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
         if (!colorMap.hasOwnProperty(childNode.id)) {
             util_1.addPkgNodeToGraph(depGraphBuilder, childNode, {
                 isCyclic: false,
                 isWorkspacePkg,
             });
             if (!isWorkspacePkg) {
-                dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync);
+                dfsVisit(depGraphBuilder, childNode, colorMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps);
             }
             else {
                 colorMap[childNode.id] = Color.BLACK;

package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package-pruned.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-depgraph-workspace-package-pruned.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package-pruned.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-depgraph-workspace-package-pruned.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package-pruned.ts"],"names":[],"mappings":"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"}

package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package.js

@@ -4,7 +4,7 @@ exports.buildDepGraphYarnLockV1Workspace = void 0;
 const dep_graph_1 = require("@snyk/dep-graph");
 const util_1 = require("../util");
 const buildDepGraphYarnLockV1Workspace = (extractedYarnLockV1Pkgs, pkgJson, workspacePkgNameToVersion, options) => {
-    const { includeDevDeps, strictOutOfSync } = options;
+    const { includeDevDeps, strictOutOfSync, includeOptionalDeps } = options;
     const depGraphBuilder = new dep_graph_1.DepGraphBuilder({ name: 'yarn' }, { name: pkgJson.name, version: pkgJson.version });
     const visitedMap = new Set();
     const topLevelDeps = util_1.getTopLevelDeps(pkgJson, { includeDevDeps });
@@ -15,7 +15,7 @@ const buildDepGraphYarnLockV1Workspace = (extractedYarnLockV1Pkgs, pkgJson, work
         dependencies: topLevelDeps,
         isDev: false,
     };
-    dfsVisit(depGraphBuilder, rootNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync);
+    dfsVisit(depGraphBuilder, rootNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps);
     return depGraphBuilder.build();
 };
 exports.buildDepGraphYarnLockV1Workspace = buildDepGraphYarnLockV1Workspace;
@@ -29,18 +29,18 @@ exports.buildDepGraphYarnLockV1Workspace = buildDepGraphYarnLockV1Workspace;
  *     - A pruned node has id `${originalId}|1`
  * When coming across another workspace package as child node, simply add the node and edge to the graph and mark it as BLACK.
  */
-const dfsVisit = (depGraphBuilder, node, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync) => {
+const dfsVisit = (depGraphBuilder, node, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps) => {
     visitedMap.add(node.id);
     for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
         const isWorkspacePkg = !!workspacePkgNameToVersion[name];
-        const childNode = util_1.getChildNodeWorkspace(name, depInfo, workspacePkgNameToVersion, extractedYarnLockV1Pkgs, strictOutOfSync);
+        const childNode = util_1.getChildNodeWorkspace(name, depInfo, workspacePkgNameToVersion, extractedYarnLockV1Pkgs, strictOutOfSync, includeOptionalDeps);
         if (!visitedMap.has(childNode.id)) {
             util_1.addPkgNodeToGraph(depGraphBuilder, childNode, {
                 isCyclic: false,
                 isWorkspacePkg,
             });
             if (!isWorkspacePkg) {
-                dfsVisit(depGraphBuilder, childNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync);
+                dfsVisit(depGraphBuilder, childNode, visitedMap, extractedYarnLockV1Pkgs, workspacePkgNameToVersion, strictOutOfSync, includeOptionalDeps);
             }
         }
         depGraphBuilder.connectDep(node.id, childNode.id);

package/dist/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-depgraph-workspace-package.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAKiB;AAIV,MAAM,gCAAgC,GAAG,CAC9C,uBAAyC,EACzC,OAAwB,EACxB,yBAAiD,EACjD,OAA6B,EAC7B,EAAE;IACF,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAEpD,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,UAAU,GAAgB,IAAI,GAAG,EAAE,CAAC;IAE1C,MAAM,YAAY,GAAG,sBAAe,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,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,QAAQ,CACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,eAAe,CAChB,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AAnCW,QAAA,gCAAgC,oCAmC3C;AAEF;;;;;;;;;GASG;AACH,MAAM,QAAQ,GAAG,CACf,eAAgC,EAChC,IAAa,EACb,UAAuB,EACvB,uBAAyC,EACzC,yBAAiD,EACjD,eAAwB,EAClB,EAAE;IACR,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE;QACrE,MAAM,cAAc,GAAG,CAAC,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,SAAS,GAAG,4BAAqB,CACrC,IAAI,EACJ,OAAO,EACP,yBAAyB,EACzB,uBAAuB,EACvB,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YACjC,wBAAiB,CAAC,eAAe,EAAE,SAAS,EAAE;gBAC5C,QAAQ,EAAE,KAAK;gBACf,cAAc;aACf,CAAC,CAAC;YACH,IAAI,CAAC,cAAc,EAAE;gBACnB,QAAQ,CACN,eAAe,EACf,SAAS,EACT,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,eAAe,CAChB,CAAC;aACH;SACF;QAED,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;KACnD;AACH,CAAC,CAAC"}
+{"version":3,"file":"build-depgraph-workspace-package.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/build-depgraph-workspace-package.ts"],"names":[],"mappings":";;;AAAA,+CAAkD;AAClD,kCAKiB;AAIV,MAAM,gCAAgC,GAAG,CAC9C,uBAAyC,EACzC,OAAwB,EACxB,yBAAiD,EACjD,OAA6B,EAC7B,EAAE;IACF,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC;IAEzE,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,UAAU,GAAgB,IAAI,GAAG,EAAE,CAAC;IAE1C,MAAM,YAAY,GAAG,sBAAe,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,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,QAAQ,CACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,eAAe,EACf,mBAAmB,CACpB,CAAC;IAEF,OAAO,eAAe,CAAC,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AApCW,QAAA,gCAAgC,oCAoC3C;AAEF;;;;;;;;;GASG;AACH,MAAM,QAAQ,GAAG,CACf,eAAgC,EAChC,IAAa,EACb,UAAuB,EACvB,uBAAyC,EACzC,yBAAiD,EACjD,eAAwB,EACxB,mBAA4B,EACtB,EAAE;IACR,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE;QACrE,MAAM,cAAc,GAAG,CAAC,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,SAAS,GAAG,4BAAqB,CACrC,IAAI,EACJ,OAAO,EACP,yBAAyB,EACzB,uBAAuB,EACvB,eAAe,EACf,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YACjC,wBAAiB,CAAC,eAAe,EAAE,SAAS,EAAE;gBAC5C,QAAQ,EAAE,KAAK;gBACf,cAAc;aACf,CAAC,CAAC;YACH,IAAI,CAAC,cAAc,EAAE;gBACnB,QAAQ,CACN,eAAe,EACf,SAAS,EACT,UAAU,EACV,uBAAuB,EACvB,yBAAyB,EACzB,eAAe,EACf,mBAAmB,CACpB,CAAC;aACH;SACF;QAED,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;KACnD;AACH,CAAC,CAAC"}

package/dist/dep-graph-builders/yarn-lock-v1/extract-yarnlock-v1-pkgs.d.ts

@@ -1,2 +1,2 @@
-import type { LockFileParseOptions, YarnLockPackages } from './types';
-export declare const extractPkgsFromYarnLockV1: (yarnLockContent: string, options: LockFileParseOptions) => Promise<YarnLockPackages>;
+import type { YarnLockPackages } from './types';
+export declare const extractPkgsFromYarnLockV1: (yarnLockContent: string) => YarnLockPackages;

package/dist/dep-graph-builders/yarn-lock-v1/extract-yarnlock-v1-pkgs.js

@@ -1,119 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractPkgsFromYarnLockV1 = void 0;
-const event_loop_spinner_1 = require("event-loop-spinner");
-const extractPkgsFromYarnLockV1 = async (yarnLockContent, options) => {
-    const { includeOptionalDeps } = options;
-    let allDeps = {};
-    for (const newDeps of pkgDependencyGenerator(yarnLockContent, {
-        includeOptionalDeps,
-    })) {
-        if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
-            await event_loop_spinner_1.eventLoopSpinner.spin();
-        }
-        allDeps = Object.assign(Object.assign({}, allDeps), newDeps);
-    }
-    return allDeps;
+const yarnLockfileParser = require("@yarnpkg/lockfile");
+const extractPkgsFromYarnLockV1 = (yarnLockContent) => {
+    return yarnLockfileParser.parse(yarnLockContent).object;
 };
 exports.extractPkgsFromYarnLockV1 = extractPkgsFromYarnLockV1;
-function* pkgDependencyGenerator(yarnLockContent, options) {
-    const lines = yarnLockContent.split('\n');
-    /*
-      This checks three things to make sure this is the
-      first line of the dep definition:
-        1. Line is non empty
-        2. Line does not start with white space
-        3. Line is not a comment (they are present in lockfiles)
-    */
-    const isLineStartOfDepBlock = (line) => {
-        return line && !/\s/.test(line[0]) && line[0] !== '#';
-    };
-    /*
-      This checks if we are on the version line
-    */
-    const isLineContainingVersion = (line) => {
-        return line.trimStart().startsWith('version');
-    };
-    /*
-      This checks if we are on the line starting the dependency
-      definitions
-    */
-    const isLineStartOfDependencies = (line) => {
-        return line.includes('dependencies:');
-    };
-    /*
-      This checks if we are on the line starting the optional dependency
-      definitions
-    */
-    const isLineStartOfOptDependencies = (line) => {
-        return line.includes('optionalDependencies:');
-    };
-    /*
-      This checks if current line has a matching indent size
-    */
-    const matchesFrontWhitespace = (line, whitespaceCount) => {
-        return line.search(/\S/) === whitespaceCount;
-    };
-    while (lines.length) {
-        const line = lines.shift();
-        // Once we find a block we look at the next lines until we
-        // get to the next dep block. We also store the keys from
-        // the line itself
-        if (isLineStartOfDepBlock(line)) {
-            const dependencyKeys = line.split(',').map((key) => {
-                return key
-                    .trim()
-                    .replace(new RegExp(':', 'g'), (_match, offset, string) => {
-                    if (offset === string.length - 1) {
-                        return '';
-                    }
-                    return ':';
-                })
-                    .replace(new RegExp('"', 'g'), '');
-            });
-            let version = '';
-            const dependencies = {};
-            while (lines.length && !isLineStartOfDepBlock(lines[0])) {
-                const lineInDepBlock = lines.shift();
-                if (isLineContainingVersion(lineInDepBlock)) {
-                    const resolvedVersion = lineInDepBlock
-                        .replace(new RegExp('version', 'g'), '')
-                        .replace(new RegExp('"', 'g'), '')
-                        .trim();
-                    version = resolvedVersion;
-                }
-                if (isLineStartOfDependencies(lineInDepBlock)) {
-                    const dependencyFrontWhitespaceCount = lines[0].search(/\S/);
-                    while (lines.length &&
-                        matchesFrontWhitespace(lines[0], dependencyFrontWhitespaceCount)) {
-                        const dependencyLine = lines.shift();
-                        const [dependencyName, dependencyVersionWithQualifiers] = dependencyLine
-                            .trimStart()
-                            .replace(new RegExp('"', 'g'), '')
-                            .split(/(?<=^\S+)\s/);
-                        dependencies[dependencyName] = dependencyVersionWithQualifiers;
-                    }
-                }
-                if (options.includeOptionalDeps &&
-                    isLineStartOfOptDependencies(lineInDepBlock)) {
-                    const dependencyFrontWhitespaceCount = lines[0].search(/\S/);
-                    while (lines.length &&
-                        matchesFrontWhitespace(lines[0], dependencyFrontWhitespaceCount)) {
-                        const dependencyLine = lines.shift();
-                        const [dependencyName, dependencyVersionWithQualifiers] = dependencyLine
-                            .trimStart()
-                            .replace(new RegExp('"', 'g'), '')
-                            .split(/(?<=^\S+)\s/);
-                        dependencies[dependencyName] = dependencyVersionWithQualifiers;
-                    }
-                }
-            }
-            const uniqueDepEntries = dependencyKeys.reduce((acc, key) => {
-                return Object.assign(Object.assign({}, acc), { [key]: { version, dependencies } });
-            }, {});
-            yield uniqueDepEntries;
-            continue;
-        }
-    }
-}
 //# sourceMappingURL=extract-yarnlock-v1-pkgs.js.map

package/dist/dep-graph-builders/yarn-lock-v1/extract-yarnlock-v1-pkgs.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract-yarnlock-v1-pkgs.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/extract-yarnlock-v1-pkgs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extract-yarnlock-v1-pkgs.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/extract-yarnlock-v1-pkgs.ts"],"names":[],"mappings":";;;AAAA,wDAAwD;AAGjD,MAAM,yBAAyB,GAAG,CACvC,eAAuB,EACL,EAAE;IACpB,OAAO,kBAAkB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC;AAC1D,CAAC,CAAC;AAJW,QAAA,yBAAyB,6BAIpC"}

package/dist/dep-graph-builders/yarn-lock-v1/simple.js

@@ -7,18 +7,18 @@ const build_depgraph_simple_pruned_1 = require("./build-depgraph-simple-pruned")
 const extract_yarnlock_v1_pkgs_1 = require("./extract-yarnlock-v1-pkgs");
 const parseYarnLockV1Project = async (pkgJsonContent, yarnLockContent, options) => {
     const { includeDevDeps, includeOptionalDeps, pruneCycles, strictOutOfSync } = options;
-    const pkgs = await extract_yarnlock_v1_pkgs_1.extractPkgsFromYarnLockV1(yarnLockContent, {
-        includeOptionalDeps,
-    });
+    const pkgs = extract_yarnlock_v1_pkgs_1.extractPkgsFromYarnLockV1(yarnLockContent);
     const pkgJson = util_1.parsePkgJson(pkgJsonContent);
     const depGraph = pruneCycles
         ? build_depgraph_simple_pruned_1.buildDepGraphYarnLockV1SimpleCyclesPruned(pkgs, pkgJson, {
             includeDevDeps,
             strictOutOfSync,
+            includeOptionalDeps,
         })
         : _1.buildDepGraphYarnLockV1Simple(pkgs, pkgJson, {
             includeDevDeps,
             strictOutOfSync,
+            includeOptionalDeps,
         });
     return depGraph;
 };

package/dist/dep-graph-builders/yarn-lock-v1/simple.js.map

@@ -1 +1 @@
-{"version":3,"file":"simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/simple.ts"],"names":[],"mappings":";;;AAAA,wBAAkD;AAElD,kCAAuC;AACvC,iFAA2F;AAC3F,yEAAuE;AAGhE,MAAM,sBAAsB,GAAG,KAAK,EACzC,cAAsB,EACtB,eAAuB,EACvB,OAA4B,EAC5B,EAAE;IACF,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,GACzE,OAAO,CAAC;IAEV,MAAM,IAAI,GAAG,MAAM,oDAAyB,CAAC,eAAe,EAAE;QAC5D,mBAAmB;KACpB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAoB,mBAAY,CAAC,cAAc,CAAC,CAAC;IAE9D,MAAM,QAAQ,GAAG,WAAW;QAC1B,CAAC,CAAC,wEAAyC,CAAC,IAAI,EAAE,OAAO,EAAE;YACvD,cAAc;YACd,eAAe;SAChB,CAAC;QACJ,CAAC,CAAC,gCAA6B,CAAC,IAAI,EAAE,OAAO,EAAE;YAC3C,cAAc;YACd,eAAe;SAChB,CAAC,CAAC;IAEP,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAzBW,QAAA,sBAAsB,0BAyBjC"}
+{"version":3,"file":"simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/simple.ts"],"names":[],"mappings":";;;AAAA,wBAAkD;AAElD,kCAAuC;AACvC,iFAA2F;AAC3F,yEAAuE;AAGhE,MAAM,sBAAsB,GAAG,KAAK,EACzC,cAAsB,EACtB,eAAuB,EACvB,OAA4B,EAC5B,EAAE;IACF,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,GACzE,OAAO,CAAC;IAEV,MAAM,IAAI,GAAG,oDAAyB,CAAC,eAAe,CAAC,CAAC;IAExD,MAAM,OAAO,GAAoB,mBAAY,CAAC,cAAc,CAAC,CAAC;IAE9D,MAAM,QAAQ,GAAG,WAAW;QAC1B,CAAC,CAAC,wEAAyC,CAAC,IAAI,EAAE,OAAO,EAAE;YACvD,cAAc;YACd,eAAe;YACf,mBAAmB;SACpB,CAAC;QACJ,CAAC,CAAC,gCAA6B,CAAC,IAAI,EAAE,OAAO,EAAE;YAC3C,cAAc;YACd,eAAe;YACf,mBAAmB;SACpB,CAAC,CAAC;IAEP,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAzBW,QAAA,sBAAsB,0BAyBjC"}

package/dist/dep-graph-builders/yarn-lock-v1/types.d.ts

@@ -1,9 +1,11 @@
 export declare type YarnLockPackages = Record<string, {
     version: string;
     dependencies: Record<string, string>;
+    optionalDependencies: Record<string, string>;
 }>;
 export declare type DepGraphBuildOptions = {
     includeDevDeps: boolean;
+    includeOptionalDeps: boolean;
     strictOutOfSync: boolean;
 };
 export declare type LockFileParseOptions = {

package/dist/dep-graph-builders/yarn-lock-v1/workspaces.js

@@ -7,9 +7,7 @@ const extract_yarnlock_v1_pkgs_1 = require("./extract-yarnlock-v1-pkgs");
 const util_1 = require("../util");
 const parseYarnLockV1WorkspaceProject = async (yarnLockContent, workspacePackagesPkgJsons, options) => {
     const { includeDevDeps, includeOptionalDeps, pruneCycles, strictOutOfSync } = options;
-    const extractedYarnLockV1Pkgs = await extract_yarnlock_v1_pkgs_1.extractPkgsFromYarnLockV1(yarnLockContent, {
-        includeOptionalDeps,
-    });
+    const extractedYarnLockV1Pkgs = extract_yarnlock_v1_pkgs_1.extractPkgsFromYarnLockV1(yarnLockContent);
     // Parse all package.json files and also extract names cross referencing later
     const workspacePkgNameToVersion = {};
     const parsedWorkspacePkgJsons = workspacePackagesPkgJsons.map((wsPkgJsonContent) => {
@@ -22,10 +20,12 @@ const parseYarnLockV1WorkspaceProject = async (yarnLockContent, workspacePackage
             ? build_depgraph_workspace_package_pruned_1.buildDepGraphYarnLockV1WorkspaceCyclesPruned(extractedYarnLockV1Pkgs, parsedPkgJson, workspacePkgNameToVersion, {
                 includeDevDeps,
                 strictOutOfSync,
+                includeOptionalDeps,
             })
             : build_depgraph_workspace_package_1.buildDepGraphYarnLockV1Workspace(extractedYarnLockV1Pkgs, parsedPkgJson, workspacePkgNameToVersion, {
                 includeDevDeps,
                 strictOutOfSync,
+                includeOptionalDeps,
             });
     });
     return depGraphs;

package/dist/dep-graph-builders/yarn-lock-v1/workspaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/workspaces.ts"],"names":[],"mappings":";;;AAEA,uGAAyG;AACzG,yFAAsF;AACtF,yEAAuE;AACvE,kCAAuC;AAGhC,MAAM,+BAA+B,GAAG,KAAK,EAClD,eAAuB,EACvB,yBAAmC,EACnC,OAA4B,EACP,EAAE;IACvB,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,GACzE,OAAO,CAAC;IAEV,MAAM,uBAAuB,GAAG,MAAM,oDAAyB,CAC7D,eAAe,EACf;QACE,mBAAmB;KACpB,CACF,CAAC;IAEF,8EAA8E;IAC9E,MAAM,yBAAyB,GAAG,EAAE,CAAC;IACrC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,GAAG,CAC3D,CAAC,gBAAgB,EAAE,EAAE;QACnB,MAAM,aAAa,GAAoB,mBAAY,CAAC,gBAAgB,CAAC,CAAC;QACtE,yBAAyB,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC;QACtE,OAAO,aAAa,CAAC;IACvB,CAAC,CACF,CAAC;IAEF,MAAM,SAAS,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QAC9D,OAAO,WAAW;YAChB,CAAC,CAAC,sFAA4C,CAC1C,uBAAuB,EACvB,aAAa,EACb,yBAAyB,EACzB;gBACE,cAAc;gBACd,eAAe;aAChB,CACF;YACH,CAAC,CAAC,mEAAgC,CAC9B,uBAAuB,EACvB,aAAa,EACb,yBAAyB,EACzB;gBACE,cAAc;gBACd,eAAe;aAChB,CACF,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAhDW,QAAA,+BAA+B,mCAgD1C"}
+{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v1/workspaces.ts"],"names":[],"mappings":";;;AAEA,uGAAyG;AACzG,yFAAsF;AACtF,yEAAuE;AACvE,kCAAuC;AAGhC,MAAM,+BAA+B,GAAG,KAAK,EAClD,eAAuB,EACvB,yBAAmC,EACnC,OAA4B,EACP,EAAE;IACvB,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,GACzE,OAAO,CAAC;IAEV,MAAM,uBAAuB,GAAG,oDAAyB,CAAC,eAAe,CAAC,CAAC;IAE3E,8EAA8E;IAC9E,MAAM,yBAAyB,GAAG,EAAE,CAAC;IACrC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,GAAG,CAC3D,CAAC,gBAAgB,EAAE,EAAE;QACnB,MAAM,aAAa,GAAoB,mBAAY,CAAC,gBAAgB,CAAC,CAAC;QACtE,yBAAyB,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC;QACtE,OAAO,aAAa,CAAC;IACvB,CAAC,CACF,CAAC;IAEF,MAAM,SAAS,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QAC9D,OAAO,WAAW;YAChB,CAAC,CAAC,sFAA4C,CAC1C,uBAAuB,EACvB,aAAa,EACb,yBAAyB,EACzB;gBACE,cAAc;gBACd,eAAe;gBACf,mBAAmB;aACpB,CACF;YACH,CAAC,CAAC,mEAAgC,CAC9B,uBAAuB,EACvB,aAAa,EACb,yBAAyB,EACzB;gBACE,cAAc;gBACd,eAAe;gBACf,mBAAmB;aACpB,CACF,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AA7CW,QAAA,+BAA+B,mCA6C1C"}

package/package.json

@@ -57,11 +57,11 @@
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "jest": "^26.6.3",
-    "prettier": "^2.3.2",
+    "prettier": "^2.7.1",
     "tap": "^15.0.4",
     "ts-jest": "^26.5.6",
     "ts-node": "^9.1.1",
     "typescript": "4.1.*"
   },
-  "version": "1.42.0"
+  "version": "1.43.0"
 }