snyk 1.1127.0 → 1.1129.0

package/dist/cli/95.index.js

@@ -153960,7 +153960,7 @@ exports.extractPkgsFromNpmLockV2 = extractPkgsFromNpmLockV2;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.buildDepGraphNpmLockV2 = exports.parseNpmLockV2Project = exports.extractPkgsFromNpmLockV2 = void 0;
+exports.getChildNodeKey = exports.buildDepGraphNpmLockV2 = exports.parseNpmLockV2Project = exports.extractPkgsFromNpmLockV2 = void 0;
 const extract_npm_lock_v2_pkgs_1 = __webpack_require__(61253);
 Object.defineProperty(exports, "extractPkgsFromNpmLockV2", ({ enumerable: true, get: function () { return extract_npm_lock_v2_pkgs_1.extractPkgsFromNpmLockV2; } }));
 const dep_graph_1 = __webpack_require__(53789);
@@ -154010,14 +154010,14 @@ const buildDepGraphNpmLockV2 = (npmLockPkgs, pkgJson, options) => {
         return acc;
     }, new Map());
     const visitedMap = new Set();
-    dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeOptionalDeps, [], pkgKeysByName);
+    dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [], pkgKeysByName);
     return depGraphBuilder.build();
 };
 exports.buildDepGraphNpmLockV2 = buildDepGraphNpmLockV2;
-const dfsVisit = (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeOptionalDeps, ancestry, pkgKeysByName) => {
+const dfsVisit = (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName) => {
     visitedMap.add(node.id);
     for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
-        const childNode = getChildNode(name, depInfo, npmLockPkgs, strictOutOfSync, includeOptionalDeps, [
+        const childNode = getChildNode(name, depInfo, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [
             ...ancestry,
             {
                 name: node.name,
@@ -154027,7 +154027,7 @@ const dfsVisit = (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSyn
         ], pkgKeysByName);
         if (!visitedMap.has(childNode.id)) {
             (0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {});
-            dfsVisit(depGraphBuilder, childNode, visitedMap, npmLockPkgs, strictOutOfSync, includeOptionalDeps, [
+            dfsVisit(depGraphBuilder, childNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [
                 ...ancestry,
                 {
                     name: node.name,
@@ -154039,8 +154039,8 @@ const dfsVisit = (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSyn
         depGraphBuilder.connectDep(node.id, childNode.id);
     }
 };
-const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps, ancestry, pkgKeysByName) => {
-    let childNodeKey = getChildNodeKey(name, ancestry, pkgs, pkgKeysByName); //
+const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName) => {
+    let childNodeKey = (0, exports.getChildNodeKey)(name, ancestry, pkgs, pkgKeysByName); //
     if (!childNodeKey) {
         if (strictOutOfSync) {
             throw new errors_1.OutOfSyncError(`${name}@${depInfo.version}`, parsers_1.LockfileType.npm);
@@ -154073,6 +154073,9 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps,
         depData = pkgs[depData.resolved];
     }
     const dependencies = (0, util_1.getGraphDependencies)(depData.dependencies || {}, depInfo.isDev);
+    const devDependencies = includeDevDeps
+        ? (0, util_1.getGraphDependencies)(depData.devDependencies || {}, depInfo.isDev)
+        : {};
     const optionalDependencies = includeOptionalDeps
         ? (0, util_1.getGraphDependencies)(depData.optionalDependencies || {}, depInfo.isDev)
         : {};
@@ -154080,7 +154083,7 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOptionalDeps,
         id: `${name}@${depData.version}`,
         name: name,
         version: depData.version,
-        dependencies: Object.assign(Object.assign({}, dependencies), optionalDependencies),
+        dependencies: Object.assign(Object.assign(Object.assign({}, dependencies), devDependencies), optionalDependencies),
         isDev: depInfo.isDev,
         inBundle: depData.inBundle,
         key: childNodeKey,
@@ -154134,16 +154137,28 @@ const getChildNodeKey = (name, ancestry, pkgs, pkgKeysByName) => {
             keysFilteredByParentKey = possibleFilteredKeys;
         }
     }
-    // If not in bundle then we can just see if it is scoped by parent
-    // and then just look directly for it
-    if (ancestry.length === 1) {
-        return `node_modules/${name}`;
+    let ancestry_names = ancestry.map((el) => el.name).concat(name);
+    while (ancestry_names.length > 0) {
+        const possible_key = `node_modules/${ancestry_names.join('/node_modules/')}`;
+        if (pkgs[possible_key]) {
+            return possible_key;
+        }
+        ancestry_names.shift();
+    }
+    // This is similar to fetching permutations in the isBundle logic
+    ancestry_names = ancestry.map((el) => el.name).concat(name);
+    const candidateAncestries = candidateKeys.map((el) => el.replace('node_modules/', '').split('/node_modules/'));
+    const filteredCandidates = candidateKeys.filter((candidate, idx) => {
+        return candidateAncestries[idx].every((pkg) => {
+            return ancestry_names.includes(pkg);
+        });
+    });
+    if (filteredCandidates.length === 1) {
+        return filteredCandidates[0];
     }
-    const parentName = ancestry[ancestry.length - 1].name;
-    return pkgs[`node_modules/${parentName}/node_modules/${name}`]
-        ? `node_modules/${parentName}/node_modules/${name}`
-        : `node_modules/${name}`;
+    return undefined;
 };
+exports.getChildNodeKey = getChildNodeKey;
 //# sourceMappingURL=index.js.map
 
 /***/ }),