Add explicit nodes for globals to ensure export as namespace works even in the presence of other exports

Author: Hendrik van Antwerpen

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

@@ -104,6 +104,7 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
   node @comment.expr_def__ns
   node @comment.expr_ref
   node @comment.expr_ref__ns
+  node @comment.global_defs
   node @comment.lexical_defs
   node @comment.lexical_scope
   node @comment.member
@@ -223,6 +224,7 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
 (program)@prog {
   node @prog.defs
   node @prog.exports
+  node @prog.globals
   node @prog.lexical_scope
 }
 
@@ -258,6 +260,9 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
     set proj_scope = proj_def
   }
 
+  ; expose globals
+  edge proj_scope -> @prog.globals
+
   var mod_scope = proj_scope
   if (not (is-empty @imexs)) {
     ; module definition
@@ -285,6 +290,7 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
     ; expose exports via module definition
     edge mod_scope -> @prog.exports
   } else {
+    ; expose definitions via project scope
     edge mod_scope -> @prog.defs
   }
 }
@@ -358,6 +364,9 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
 
   ; exports are visible via module definition
   edge @prog.exports -> @stmt.exports
+
+  ; globals are visible in the project scope
+  edge @prog.globals -> @stmt.global_defs
 }
 
 
@@ -447,6 +456,7 @@ attribute node_symbol = node            => symbol = (source-text node), source_n
 ]@stmt {
   node @stmt.default_export
   node @stmt.exports
+  node @stmt.global_defs
   node @stmt.lexical_defs
   node @stmt.lexical_scope
   node @stmt.return_type
@@ -921,16 +931,16 @@ if none @is_default {
 
 (program (export_statement
   "as" "namespace" . (_)@name
-)@export_stmt)@program {
+)@export_stmt)@prog {
   ; namespace definitions are specified together with (module) and (internal_module)
 
   ; make definitions global
-  edge ROOT_NODE -> @name.expr_def__ns
-  edge ROOT_NODE -> @name.type_def__ns
+  edge @prog.globals -> @name.expr_def__ns
+  edge @prog.globals -> @name.type_def__ns
 
   ; connect definitions to exports
-  edge @export_stmt.expr_member__ns -> @program.exports
-  edge @export_stmt.type_member__ns -> @program.exports
+  edge @export_stmt.expr_member__ns -> @prog.exports
+  edge @export_stmt.type_member__ns -> @prog.exports
 }
 
 ;; Imports
@@ -2147,10 +2157,11 @@ if none @is_async {
 
 (statement_identifier)@stmt_identifier {
   ; FIXME remove when we bump tree-sitter-typescript version
-  node @stmt_identifier.lexical_scope
+  node @stmt_identifier.global_defs
   node @stmt_identifier.lexical_defs
-  node @stmt_identifier.var_defs
+  node @stmt_identifier.lexical_scope
   node @stmt_identifier.return_type
+  node @stmt_identifier.var_defs
 }
 
 ; FIXME match body: when we bump tree-sitter-typescript version
@@ -2172,24 +2183,17 @@ if none @is_async {
 
 ;; Ambient Declaration
 
-;; We expose the ambient declarations via the statement's .lexical_defs and .var_defs.
-;; Technically this means that the declarations could be scoped in an enclosing block,
-;; or hidden behind a module name.
-;; However, ambient declarations are only allowed at the top-level of script files, so
-;; these cases cannot occur. Therefore, we have not introduced a separate .global_defs
-;; that propagates all the way to the top.
-
 (ambient_declaration
   (declaration)@decl
 )@amb_decl {
   ; propagate lexical scope
   edge @decl.lexical_scope -> @amb_decl.lexical_scope
 
   ; expose lexical definitions
-  edge @amb_decl.lexical_defs -> @decl.lexical_defs
+  edge @amb_decl.global_defs -> @decl.lexical_defs
 
   ; expose variable definitions
-  edge @amb_decl.var_defs -> @decl.var_defs
+  edge @amb_decl.global_defs -> @decl.var_defs
 }
 
 (ambient_declaration
@@ -2200,10 +2204,10 @@ if none @is_async {
   edge @stmt_blk.lexical_scope -> @amb_decl.lexical_scope
 
   ; expose lexical definitions
-  edge @amb_decl.lexical_defs -> @stmt_blk.lexical_defs
+  edge @amb_decl.global_defs -> @stmt_blk.lexical_defs
 
   ; expose variable definitions
-  edge @amb_decl.var_defs -> @stmt_blk.var_defs
+  edge @amb_decl.global_defs -> @stmt_blk.var_defs
 }
 
 ; FIXME what is this? tsc doesn't recognize this syntax