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

TS: Support const type assertions

Browse Source
This commit is contained in:
Asger F
2019-04-10 12:54:42 +01:00
parent d5ae69d40a
commit c1c7ebfc48
9 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,7 +345,7 @@ public class TypeScriptASTConverter {
case "ArrowFunction":
return convertArrowFunction(node, loc);
case "AsExpression":
return convertAsExpression(node, loc);
return convertTypeAssertionExpression(node, loc);
case "AwaitExpression":
return convertAwaitExpression(node, loc);
case "BigIntKeyword":
@@ -797,11 +797,6 @@ public class TypeScriptASTConverter {
convertChildAsType(node, "type"));
}
private Node convertAsExpression(JsonObject node, SourceLocation loc) throws ParseError {
return new TypeAssertion(
loc, convertChild(node, "expression"), convertChildAsType(node, "type"), true);
}
private Node convertAwaitExpression(JsonObject node, SourceLocation loc) throws ParseError {
return new AwaitExpression(loc, convertChild(node, "expression"));
}
@@ -2115,8 +2110,12 @@ public class TypeScriptASTConverter {
private Node convertTypeAssertionExpression(JsonObject node, SourceLocation loc)
throws ParseError {
return new TypeAssertion(
loc, convertChild(node, "expression"), convertChildAsType(node, "type"), false);
ITypeExpression type = convertChildAsType(node, "type");
// `T as const` is extracted as a cast to the keyword type `const`.
if (type instanceof Identifier && ((Identifier) type).getName().equals("const")) {
type = new KeywordTypeExpr(type.getLoc(), "const");
}
return new TypeAssertion(loc, convertChild(node, "expression"), type, false);
}
private Node convertTypeLiteral(JsonObject obj, SourceLocation loc) throws ParseError {