Implement rootDirs

Author: Hendrik van Antwerpen

languages/tree-sitter-stack-graphs-typescript/rust/tsconfig.rs

@@ -62,6 +62,13 @@ impl FileAnalyzer for TsConfigAnalyzer {
         self.add_debug_name(graph, root_dir_ref, "root_dir.ref");
         self.add_edge(graph, root_dir_ref, proj_scope, 0);
 
+        // auxiliary root directories
+        for (idx, root_dir) in tsc.root_dirs().iter().enumerate() {
+            let root_dir_ref = self.add_module_pushes(graph, root_dir, proj_scope, &mut ids);
+            self.add_debug_name(graph, root_dir_ref, &format!("root_dirs[{}].ref", idx));
+            self.add_edge(graph, proj_scope, root_dir_ref, 0);
+        }
+
         // base URL
         let base_url = tsc.base_url();
         let base_url_pkg = self.add_pop(graph, proj_scope, "%Pkg", &mut ids);

languages/tree-sitter-stack-graphs-typescript/src/stack-graphs.tsg

@@ -281,7 +281,7 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
   }
 }
 
-;; Project reference
+;; Project and module reference
 (program)@prog {
   ; project reference
   node proj__ns
@@ -305,6 +305,74 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
     }
   }
 
+  ; module reference nodes
+  let mod_path = (path-normalize (path-dir FILE_PATH))
+  ;
+  var mod_scope = proj_scope
+  scan mod_path {
+    "([^/]+)/" {
+      node mod_ref
+      node mod_ref__ns
+      ;
+      edge mod_ref__ns -> mod_scope
+      ;
+      attr (mod_ref__ns) push_symbol = "%M"
+      ;
+      attr (mod_ref) push_symbol = $1
+      edge mod_ref -> mod_ref__ns
+
+      node mod_node
+      edge mod_node -> mod_ref
+
+      node parent_def
+      node parent_def__ns
+      ;
+      attr (parent_def) pop_symbol = ".."
+      edge parent_def -> mod_scope
+      ;
+      attr (parent_def__ns) pop_symbol = "%M"
+      edge parent_def__ns -> parent_def
+      ;
+      edge mod_node -> parent_def__ns
+
+      set mod_scope = mod_node
+    }
+    "index$" {
+      ; expose reference in lexical scope
+      edge @prog.lexical_scope -> mod_scope
+    }
+    "([^/]+)$" {
+      node mod_ref
+      node mod_ref__ns
+      ;
+      edge mod_ref__ns -> mod_scope
+      ;
+      attr (mod_ref__ns) push_symbol = "%M"
+      ;
+      attr (mod_ref) push_symbol = $1
+      edge mod_ref -> mod_ref__ns
+
+      node mod_node
+      edge mod_node -> mod_ref
+
+      node parent_def
+      node parent_def__ns
+      ;
+      attr (parent_def) pop_symbol = ".."
+      edge parent_def -> mod_scope
+      ;
+      attr (parent_def__ns) pop_symbol = "%M"
+      edge parent_def__ns -> parent_def
+      ;
+      edge mod_node -> parent_def__ns
+
+      set mod_scope = mod_node
+
+      ; expose reference in lexical scope
+      edge @prog.lexical_scope -> mod_scope
+    }
+  }
+
   ; compose all packages files by adding edge to the package reference
   edge @prog.lexical_scope -> proj_scope
 }
@@ -493,7 +561,7 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
   scan mod_path {
     "^\\..*$" { ; relative imports
       ; normalized module path
-      let mod_path = (path-normalize (path-join (path-dir FILE_PATH) $0))
+      let mod_path = (path-normalize $0)
 
       ; module references
       var mod_scope = @import_stmt.lexical_scope

languages/tree-sitter-stack-graphs-typescript/test/projects/import-from-rootdirs-subdir.ts

@@ -0,0 +1,20 @@
+/* --- path: ./tsconfig.json --- */
+{
+    "compilerOptions": {
+        "rootDirs": [
+            "src/core",
+            "src/util"
+        ]
+    }
+}
+
+/* --- path: ./src/core/index.ts --- */
+import { bar } from "./foo/baz";
+//       ^ defined: 16
+
+/* --- path: ./src/util/foo/baz.ts --- */
+export const bar = 42;
+
+/* --- path: ./src/util/index.ts --- */
+
+/* --- path: ./src/index.ts --- */