TS: Handle export * as ns

asgerf · asgerf · commit 9b52acc62ac1 · 2020-02-24T11:40:27.000Z
diff --git a/javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java b/javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java
@@ -34,6 +34,7 @@
 import com.semmle.js.ast.ExportDeclaration;
 import com.semmle.js.ast.ExportDefaultDeclaration;
 import com.semmle.js.ast.ExportNamedDeclaration;
+import com.semmle.js.ast.ExportNamespaceSpecifier;
 import com.semmle.js.ast.ExportSpecifier;
 import com.semmle.js.ast.Expression;
 import com.semmle.js.ast.ExpressionStatement;
@@ -507,6 +508,8 @@ private Node convertNodeUntyped(JsonObject node, String defaultKind) throws Pars
         return convertNamespaceDeclaration(node, loc);
       case "ModuleBlock":
         return convertModuleBlock(node, loc);
+      case "NamespaceExport":
+        return convertNamespaceExport(node, loc);
       case "NamespaceExportDeclaration":
         return convertNamespaceExportDeclaration(node, loc);
       case "NamespaceImport":
@@ -1170,11 +1173,11 @@ private Node convertExportAssignment(JsonObject node, SourceLocation loc) throws
   private Node convertExportDeclaration(JsonObject node, SourceLocation loc) throws ParseError {
     Literal source = tryConvertChild(node, "moduleSpecifier", Literal.class);
     if (hasChild(node, "exportClause")) {
-      return new ExportNamedDeclaration(
-          loc,
-          null,
-          convertChildren(node.get("exportClause").getAsJsonObject(), "elements"),
-          source);
+      List<ExportSpecifier> specifiers =
+          hasKind(node.get("exportClause"), "NamespaceExport")
+              ? Collections.singletonList(convertChild(node, "exportClause"))
+              : convertChildren(node.get("exportClause").getAsJsonObject(), "elements");
+      return new ExportNamedDeclaration(loc, null, specifiers, source);
     } else {
       return new ExportAllDeclaration(loc, source);
     }
@@ -1187,6 +1190,11 @@ private Node convertExportSpecifier(JsonObject node, SourceLocation loc) throws
         convertChild(node, "name"));
   }
 
+  private Node convertNamespaceExport(JsonObject node, SourceLocation loc) throws ParseError {
+    // Convert the "* as ns" from an export declaration.
+    return new ExportNamespaceSpecifier(loc, convertChild(node, "name"));
+  }
+
   private Node convertExpressionStatement(JsonObject node, SourceLocation loc) throws ParseError {
     Expression expression = convertChild(node, "expression");
     return new ExpressionStatement(loc, expression);
diff --git a/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/client.ts b/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/client.ts
@@ -0,0 +1,3 @@
+import { ns } from "./reexport";
+
+ns.foo();
diff --git a/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/lib.ts b/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/lib.ts
@@ -0,0 +1 @@
+export function foo() {}
diff --git a/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/reexport.ts b/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/reexport.ts
@@ -0,0 +1 @@
+export * as ns from "./lib";
diff --git a/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/test.expected b/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/test.expected
@@ -0,0 +1 @@
+| reexport.ts:1:13:1:14 | ns |
diff --git a/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/test.ql b/javascript/ql/test/library-tests/TypeScript/ExportNamespaceSpecifier/test.ql
@@ -0,0 +1,3 @@
+import javascript
+
+query ExportNamespaceSpecifier test_ExportNamespaceSpecifier() { any() }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { ns } from "./reexport";`
	`2`	`+`
	`3`	`+ns.foo();`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import javascript`
	`2`	`+`
	`3`	`+query ExportNamespaceSpecifier test_ExportNamespaceSpecifier() { any() }`