JS: Associate symbols with external module decls

Author: asgerf

javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java

@@ -2191,6 +2191,7 @@ public Label visit(ExternalModuleDeclaration nd, Context c) {
       visitAll(nd.getBody(), key);
       contextManager.leaveContainer();
       scopeManager.leaveScope();
+      emitNodeSymbol(nd, key);
       return key;
     }
 

javascript/extractor/src/com/semmle/ts/ast/ExternalModuleDeclaration.java

@@ -7,9 +7,10 @@
 import java.util.List;
 
 /** A statement of form <code>declare module "X" {...}</code>. */
-public class ExternalModuleDeclaration extends Statement {
+public class ExternalModuleDeclaration extends Statement implements INodeWithSymbol {
   private final Literal name;
   private final List<Statement> body;
+  private int symbol = -1;
 
   public ExternalModuleDeclaration(SourceLocation loc, Literal name, List<Statement> body) {
     super("ExternalModuleDeclaration", loc);
@@ -29,4 +30,14 @@ public Literal getName() {
   public List<Statement> getBody() {
     return body;
   }
+
+  @Override
+  public int getSymbol() {
+    return this.symbol;
+  }
+
+  @Override
+  public void setSymbol(int symbol) {
+    this.symbol = symbol;
+  }
 }

javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java

@@ -591,7 +591,7 @@ private Node convertNodeUntyped(JsonObject node, String defaultKind) throws Pars
         return convertTryStatement(node, loc);
       case "TupleType":
         return convertTupleType(node, loc);
-      case "NamedTupleMember": 
+      case "NamedTupleMember":
         return convertNamedTupleMember(node, loc);
       case "TypeAliasDeclaration":
         return convertTypeAliasDeclaration(node, loc);
@@ -1710,7 +1710,10 @@ private Node convertNamespaceDeclaration(JsonObject node, SourceLocation loc) th
     }
     if (nameNode instanceof Literal) {
       // Declaration of form: declare module "X" {...}
-      return new ExternalModuleDeclaration(loc, (Literal) nameNode, body);
+      ExternalModuleDeclaration decl = new ExternalModuleDeclaration(loc, (Literal) nameNode, body);
+      attachSymbolInformation(decl, node);
+      System.out.println("ExternalModuleDeclaration symbol = " + decl.getSymbol());
+      return decl;
     }
     if (hasFlag(node, "GlobalAugmentation")) {
       // Declaration of form: declare global {...}

javascript/ql/lib/semmlecode.javascript.dbscheme

@@ -713,7 +713,7 @@ case @symbol.kind of
 ;
 
 @type_with_symbol = @type_reference | @typevariable_type | @typeof_type | @unique_symbol_type;
-@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference;
+@ast_node_with_symbol = @type_definition | @namespace_definition | @toplevel | @typeaccess | @namespace_access | @var_decl | @function | @invokeexpr | @import_declaration | @external_module_reference | @external_module_declaration;
 
 ast_node_symbol(
   unique int node: @ast_node_with_symbol ref,