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

JS: support additional import statements for Flow

Browse Source
This commit is contained in:
Esben Sparre Andreasen
2019-01-03 15:48:16 +01:00
parent eabc674bb3
commit c6f9a043ca
7 changed files with 457 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java
View File

@@ -21,6 +21,7 @@ import com.semmle.js.ast.Expression;
import com.semmle.js.ast.ExpressionStatement;
import com.semmle.js.ast.FieldDefinition;
import com.semmle.js.ast.Identifier;
import com.semmle.js.ast.ImportDeclaration;
import com.semmle.js.ast.ImportSpecifier;
import com.semmle.js.ast.MethodDefinition;
import com.semmle.js.ast.Node;
@@ -226,30 +227,21 @@ public class FlowParser extends ESNextParser {
this.expect(TokenType.braceL);
while (this.type != TokenType.braceR) {
Position stmtStart = startLoc;
if (this.eat(TokenType._import)) {
this.flowParseDeclareImport(stmtStart);
} else {
// todo: declare check
this.next();
if (this.eatContextual("declare")) {
this.flowParseDeclare(stmtStart);
} else if (this.eat(TokenType._import)) {
if (peekAtSpecialFlowImportSpecifier() == null) {
this.raise(stmtStart,
"Imports within a `declare module` body must always be `import type` or `import typeof`.");
}
this.parseImportRest(new SourceLocation(stmtStart));
} else {
unexpected();
}
}
this.expect(TokenType.braceR);
}
private void flowParseDeclareImport(Position stmtStart) {
String kind = flowParseImportSpecifiers();
if (kind == null) {
this.raise(stmtStart, "Imports within a `declare module` body must always be `import type` or `import typeof`.");
}
this.expect(TokenType.name);
this.expectContextual("from");
this.expect(TokenType.string);
this.semicolon();
}
private void flowParseDeclareModuleExports() {
this.expectContextual("module");
this.expect(TokenType.dot);
@@ -1004,12 +996,7 @@ public class FlowParser extends ESNextParser {
}
private String flowParseImportSpecifiers() {
String kind = null;
if (this.type == TokenType._typeof) {
kind = "typeof";
} else if (this.isContextual("type")) {
kind = "type";
}
String kind = peekAtSpecialFlowImportSpecifier();
if (kind != null) {
String lh = lookahead(4);
if (!lh.isEmpty()) {
@@ -1022,6 +1009,16 @@ public class FlowParser extends ESNextParser {
return kind;
}
private String peekAtSpecialFlowImportSpecifier() {
String kind = null;
if (this.type == TokenType._typeof) {
kind = "typeof";
} else if (this.isContextual("type")) {
kind = "type";
}
return kind;
}
@Override
protected List<ImportSpecifier> parseImportSpecifiers() {
String kind = null;
@@ -1037,7 +1034,7 @@ public class FlowParser extends ESNextParser {
@Override
protected ImportSpecifier parseImportSpecifier() {
if (this.type == TokenType._typeof || this.isContextual("type")) {
if (peekAtSpecialFlowImportSpecifier() != null) {
String lh = lookahead(2);
if (lh.charAt(0) == ',' || lh.charAt(0) == '}' || lh.equals("as"))
return super.parseImportSpecifier();