refactor: dont track node depth

nestjs · Feb 10, 2025 · 3179609 · 3179609
1 parent c743c74
commit 3179609
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/packages/core/injector/topology-tree/topology-tree.ts b/packages/core/injector/topology-tree/topology-tree.ts
@@ -3,23 +3,15 @@ import { TreeNode } from './tree-node';
 
 export class TopologyTree {
   private root: TreeNode<Module>;
-  private links: Map<
-    Module,
-    {
-      node: TreeNode<Module>;
-      depth: number;
-    }
-  > = new Map();
+  private links: Map<Module, TreeNode<Module>> = new Map();
 
-  static from(root: Module) {
-    const tree = new TopologyTree();
-    tree.root = new TreeNode<Module>({
-      value: root,
+  constructor(moduleRef: Module) {
+    this.root = new TreeNode<Module>({
+      value: moduleRef,
       parent: null,
     });
-
-    tree.traverseAndCloneTree(tree.root);
-    return tree;
+    this.links.set(moduleRef, this.root);
+    this.traverseAndCloneTree(this.root);
   }
 
   public walk(callback: (value: Module, depth: number) => void) {
@@ -37,9 +29,9 @@ export class TopologyTree {
       }
       if (this.links.has(child)) {
         const existingSubtree = this.links.get(child)!;
-        if (existingSubtree.depth < depth) {
-          existingSubtree.node.relink(node);
-          existingSubtree.depth = depth;
+        const existingDepth = existingSubtree.getDepth({ stopOn: node.value });
+        if (existingDepth < depth) {
+          existingSubtree.relink(node);
         }
         return;
       }
@@ -49,10 +41,8 @@ export class TopologyTree {
         parent: node,
       });
       node.addChild(childNode);
-      this.links.set(child, {
-        node: childNode,
-        depth,
-      });
+
+      this.links.set(child, childNode);
 
       this.traverseAndCloneTree(childNode, depth + 1);
     });

diff --git a/packages/core/scanner.ts b/packages/core/scanner.ts
@@ -402,7 +402,7 @@ export class DependenciesScanner {
     const rootModule = modulesGenerator.next().value!;
 
     // Convert modules to an acyclic connected graph
-    const tree = TopologyTree.from(rootModule);
+    const tree = new TopologyTree(rootModule);
     tree.walk((moduleRef, depth) => {
       if (moduleRef.isGlobal) {
         return;