snyk 1.1253.0 → 1.1255.0

package/dist/cli/245.index.js

@@ -221410,11 +221410,11 @@ const buildDepGraphNpmLockV2 = async (npmLockPkgs, pkgJson, options) => {
         return acc;
     }, new Map());
     const visitedMap = new Set();
-    await dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [], pkgKeysByName);
+    await dfsVisit(depGraphBuilder, rootNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [], pkgKeysByName, pkgJson.overrides);
     return depGraphBuilder.build();
 };
 exports.buildDepGraphNpmLockV2 = buildDepGraphNpmLockV2;
-const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName) => {
+const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName, overrides) => {
     visitedMap.add(node.id);
     for (const [name, depInfo] of Object.entries(node.dependencies || {})) {
         if (event_loop_spinner_1.eventLoopSpinner.isStarving()) {
@@ -221424,26 +221424,30 @@ const dfsVisit = async (depGraphBuilder, node, visitedMap, npmLockPkgs, strictOu
             ...ancestry,
             {
                 name: node.name,
+                version: node.version,
                 key: node.key || '',
                 inBundle: node.inBundle || false,
             },
-        ], pkgKeysByName);
+        ], pkgKeysByName, overrides);
         if (!visitedMap.has(childNode.id)) {
             (0, util_1.addPkgNodeToGraph)(depGraphBuilder, childNode, {});
             await dfsVisit(depGraphBuilder, childNode, visitedMap, npmLockPkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, [
                 ...ancestry,
                 {
                     name: node.name,
+                    version: node.version,
                     key: node.key,
                     inBundle: node.inBundle || false,
                 },
-            ], pkgKeysByName);
+            ], pkgKeysByName, overrides);
         }
         depGraphBuilder.connectDep(node.id, childNode.id);
     }
 };
-const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName) => {
-    let childNodeKey = (0, exports.getChildNodeKey)(name, depInfo.version, ancestry, pkgs, pkgKeysByName);
+const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, includeOptionalDeps, ancestry, pkgKeysByName, overrides) => {
+    const override = overrides &&
+        checkOverrides([...ancestry, { name, version: depInfo.version }], overrides);
+    let childNodeKey = (0, exports.getChildNodeKey)(name, override ? override : depInfo.version, ancestry, pkgs, pkgKeysByName);
     if (!childNodeKey) {
         if (strictOutOfSync) {
             throw new errors_1.OutOfSyncError(`${name}@${depInfo.version}`, parsers_1.LockfileType.npm);
@@ -221585,6 +221589,35 @@ const getChildNodeKey = (name, version, ancestry, pkgs, pkgKeysByName) => {
     return undefined;
 };
 exports.getChildNodeKey = getChildNodeKey;
+const checkOverrides = (ancestry, overrides) => {
+    const ancestryWithoutRoot = ancestry.slice(1);
+    // First traverse into overrides from root down
+    for (const [idx, pkg] of ancestryWithoutRoot.entries()) {
+        // Do we have this in overrides
+        const override = overrides[pkg.name] || overrides[`${pkg.name}@${pkg.version}`];
+        // If we dont find current element move down the ancestry
+        if (!override) {
+            continue;
+        }
+        // If we find a string as override we know we found what we want
+        if (typeof override === 'string') {
+            return override;
+        }
+        // If we don't find a string we might have a dotted reference
+        // we only care about this if we are the final element in the ancestry.
+        if (idx + 1 === ancestryWithoutRoot.length && override['.']) {
+            return override['.'];
+        }
+        // If we don't find a string or a dotted reference we need to recurse
+        // to find the override
+        const recursiveOverride = checkOverrides(ancestryWithoutRoot, override);
+        // If we get a non-undefined result, it is our answer
+        if (recursiveOverride) {
+            return recursiveOverride;
+        }
+    }
+    return;
+};
 //# sourceMappingURL=index.js.map
 
 /***/ }),