snyk 1.1289.0 → 1.1291.0

package/dist/cli/245.index.js

@@ -216365,13 +216365,13 @@ function buildDepGraph(mavenGraph, includeTestScope = false, verboseEnabled = fa
     const builder = new dep_graph_1.DepGraphBuilder({ name: 'maven' }, parsedRoot.pkgInfo);
     const visitedMap = {};
     const queue = [];
-    queue.push(...getItems(rootId, nodes[rootId]));
+    queue.push(...getItems(rootId, [], nodes[rootId]));
     // breadth first search
     while (queue.length > 0) {
         const item = queue.shift();
         if (!item)
             continue;
-        const { id, parentId } = item;
+        const { id, ancestry, parentId } = item;
         const parsed = parseId(id);
         const node = nodes[id];
         if (!includeTestScope && parsed.scope === 'test' && !node.reachesProdDep) {
@@ -216386,6 +216386,16 @@ function buildDepGraph(mavenGraph, includeTestScope = false, verboseEnabled = fa
             builder.connectDep(parentId, prunedId);
             continue; // don't queue any more children
         }
+        // If verbose is enabled and our ancestry includes ourselves
+        // we are cyclic and should be pruned :)
+        if (verboseEnabled && ancestry.includes(id)) {
+            const prunedId = visited.id + ':pruned-cycle';
+            builder.addPkgNode(visited.pkgInfo, prunedId, {
+                labels: { pruned: 'cyclic' },
+            });
+            builder.connectDep(parentId, prunedId);
+            continue; // don't queue any more children
+        }
         const parentNodeId = parentId === rootId ? builder.rootNodeId : parentId;
         if (verboseEnabled && visited) {
             // use visited node when omited dependencies found (verbose)
@@ -216397,15 +216407,16 @@ function buildDepGraph(mavenGraph, includeTestScope = false, verboseEnabled = fa
             builder.connectDep(parentNodeId, id);
             visitedMap[parsed.key] = parsed;
         }
-        queue.push(...getItems(id, node));
+        // Remember to push updated ancestry here
+        queue.push(...getItems(id, [...ancestry, id], node));
     }
     return builder.build();
 }
 exports.buildDepGraph = buildDepGraph;
-function getItems(parentId, node) {
+function getItems(parentId, ancestry, node) {
     const items = [];
     for (const id of node?.dependsOn || []) {
-        items.push({ id, parentId });
+        items.push({ id, ancestry, parentId });
     }
     return items;
 }