fix: correctly prune within top level deps only

snyk · May 15, 2023 · e8af954 · e8af954
1 parent 6d70e90
commit e8af954
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/lib/index.ts b/lib/index.ts
@@ -603,7 +603,7 @@ function buildGraph(
   const depPackagesLen = depPackages.length;
 
   for (let i = depPackagesLen - 1; i >= 0; i--) {
-    visited = visited || new Set<string>();
+    const localVisited = visited || new Set<string>();
     const packageImport = depPackages[i];
     let version = 'unknown';
     if (isBuiltinPackage(packageImport)) {
@@ -639,7 +639,7 @@ function buildGraph(
         continue;
       }
 
-      if (visited.has(packageImport)) {
+      if (localVisited.has(packageImport)) {
         const prunedId = `${packageImport}:pruned`;
         depGraphBuilder.addPkgNode(newNode, prunedId, {
           labels: { pruned: 'true' },
@@ -650,7 +650,7 @@ function buildGraph(
 
       depGraphBuilder.addPkgNode(newNode, packageImport);
       depGraphBuilder.connectDep(currentParent, packageImport);
-      visited.add(packageImport);
+      localVisited.add(packageImport);
 
       childrenChain.set(currentParent, [...currentChildren, packageImport]);
       ancestorsChain.set(packageImport, [...currentAncestors, currentParent]);
@@ -664,7 +664,7 @@ function buildGraph(
           packageImport,
           childrenChain,
           ancestorsChain,
-          visited,
+          localVisited,
         );
       }
     }

diff --git a/test/fixtures/gomod-small/expected-gomodules-depgraph.json b/test/fixtures/gomod-small/expected-gomodules-depgraph.json
@@ -117,7 +117,7 @@
             "nodeId": "github.com/rivo/tview"
           },
           {
-            "nodeId": "github.com/gdamore/tcell:pruned"
+            "nodeId": "github.com/gdamore/tcell"
           },
           {
             "nodeId": "github.com/antlr/antlr4/runtime/Go/antlr"
@@ -186,6 +186,12 @@
           },
           {
             "nodeId": "github.com/gdamore/encoding"
+          },
+          {
+            "nodeId": "github.com/mattn/go-runewidth"
+          },
+          {
+            "nodeId": "github.com/lucasb-eyer/go-colorful"
           }
         ]
       },
@@ -268,16 +274,6 @@
           }
         }
       },
-      {
-        "nodeId": "github.com/gdamore/tcell:pruned",
-        "pkgId": "github.com/gdamore/[email protected]",
-        "deps": [],
-        "info": {
-          "labels": {
-            "pruned": "true"
-          }
-        }
-      },
       {
         "nodeId": "github.com/antlr/antlr4/runtime/Go/antlr",
         "pkgId": "github.com/antlr/antlr4/runtime/Go/antlr@#edae2a1c9b4b",
@@ -288,7 +284,7 @@
         "pkgId": "golang.org/x/text/[email protected]",
         "deps": [
           {
-            "nodeId": "golang.org/x/text/transform:pruned"
+            "nodeId": "golang.org/x/text/transform"
           }
         ]
       }