hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-08 04:00:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

TS: Handle export * as ns

Browse Source
This commit is contained in:
Asger Feldthaus
2020-02-06 16:26:16 +00:00
parent 7f939fe1e4
commit 9b52acc62a
6 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java
View File

@@ -34,6 +34,7 @@ import com.semmle.js.ast.ExportAllDeclaration;
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 @@ public class TypeScriptASTConverter {
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 @@ public class TypeScriptASTConverter {
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 @@ public class TypeScriptASTConverter {
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);