Merge pull request #2237 from asger-semmle/typescript3.7-rc

TS: Add support for TypeScript 3.7

Author: max-schaefer

change-notes/1.23/analysis-javascript.md

@@ -12,7 +12,7 @@
 
 * The call graph has been improved to resolve method calls in more cases. This may produce more security alerts.
 
-* TypeScript 3.6 features are supported.
+* TypeScript 3.6 and 3.7 features are now supported.
 
 * Automatic classification of generated files has been improved, in particular files generated by Doxygen are now recognized.
 

javascript/extractor/lib/typescript/package.json

@@ -2,7 +2,7 @@
     "name": "typescript-parser-wrapper",
     "private": true,
     "dependencies": {
-        "typescript": "3.6.3"
+        "typescript": "^3.7.2"
     },
     "scripts": {
         "build": "tsc --project tsconfig.json",

javascript/extractor/lib/typescript/src/main.ts

@@ -126,7 +126,7 @@ function checkCycle(root: any) {
 function isBlacklistedProperty(k: string) {
     return k === "parent" || k === "pos" || k === "end"
         || k === "symbol" || k === "localSymbol"
-        || k === "flowNode" || k === "returnFlowNode"
+        || k === "flowNode" || k === "returnFlowNode" || k === "endFlowNode"
         || k === "nextContainer" || k === "locals"
         || k === "bindDiagnostics" || k === "bindSuggestionDiagnostics";
 }

javascript/extractor/lib/typescript/src/type_table.ts

@@ -597,7 +597,7 @@ export class TypeTable {
       let tupleType = tupleReference.target;
       let minLength = tupleType.minLength != null
           ? tupleType.minLength
-          : tupleReference.typeArguments.length;
+          : this.typeChecker.getTypeArguments(tupleReference).length;
       let hasRestElement = tupleType.hasRestElement ? 't' : 'f';
       let prefix = `tuple;${minLength};${hasRestElement}`;
       return this.makeTypeStringVectorFromTypeReferenceArguments(prefix, type);
@@ -714,11 +714,12 @@ export class TypeTable {
     // There can be an extra type argument at the end, denoting an explicit 'this' type argument.
     // We discard the extra argument in our model.
     let target = type.target;
-    if (type.typeArguments == null) return tag;
+    let typeArguments = this.typeChecker.getTypeArguments(type);
+    if (typeArguments == null) return tag;
     if (target.typeParameters != null) {
-      return this.makeTypeStringVector(tag, type.typeArguments, target.typeParameters.length);
+      return this.makeTypeStringVector(tag, typeArguments, target.typeParameters.length);
     } else {
-      return this.makeTypeStringVector(tag, type.typeArguments);
+      return this.makeTypeStringVector(tag, typeArguments);
     }
   }
 
@@ -992,7 +993,7 @@ export class TypeTable {
    * `T` is the type parameter declared on the `Promise` interface.
    */
   private getSelfType(type: ts.Type): ts.TypeReference {
-    if (isTypeReference(type) && type.typeArguments != null && type.typeArguments.length > 0) {
+    if (isTypeReference(type) && this.typeChecker.getTypeArguments(type).length > 0) {
       return type.target;
     }
     return null;
@@ -1181,8 +1182,9 @@ export class TypeTable {
     if (isTypeReference(type)) {
       // Note that this case also handles tuple types, since a tuple type is represented as
       // a reference to a synthetic generic interface.
-      if (type.typeArguments != null) {
-        type.typeArguments.forEach(callback);
+      let typeArguments = this.typeChecker.getTypeArguments(type);
+      if (typeArguments != null) {
+        typeArguments.forEach(callback);
       }
     } else if (type.flags & ts.TypeFlags.UnionOrIntersection) {
       (type as ts.UnionOrIntersectionType).types.forEach(callback);

javascript/extractor/lib/typescript/yarn.lock

@@ -225,9 +225,9 @@ tsutils@^2.12.1:
   dependencies:
     tslib "^1.8.1"
 
-typescript@3.6.3:
-  version "3.6.3"
-  resolved "typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da"
+typescript@^3.7.2:
+  version "3.7.2"
+  resolved "typescript-3.7.2.tgz"
 
 wrappy@1:
   version "1.0.2"

javascript/extractor/src/com/semmle/jcorn/CustomParser.java

@@ -7,6 +7,7 @@
 import com.semmle.js.ast.BlockStatement;
 import com.semmle.js.ast.CallExpression;
 import com.semmle.js.ast.CatchClause;
+import com.semmle.js.ast.Chainable;
 import com.semmle.js.ast.ClassExpression;
 import com.semmle.js.ast.ComprehensionBlock;
 import com.semmle.js.ast.ComprehensionExpression;
@@ -470,7 +471,8 @@ protected Pair<Expression, Boolean> parseSubscript(
 
       Expression property = this.parsePropertyIdentifierOrIdentifier();
       MemberExpression node =
-          new MemberExpression(start, base, property, false, false, isOnOptionalChain(false, base));
+          new MemberExpression(
+              start, base, property, false, false, Chainable.isOnOptionalChain(false, base));
       return Pair.make(this.finishNode(node), true);
     } else if (this.eat(doubleDot)) {
       SourceLocation start = new SourceLocation(startLoc);

javascript/extractor/src/com/semmle/jcorn/Parser.java

@@ -1520,10 +1520,6 @@ protected Expression parseSubscripts(
     }
   }
 
-  protected boolean isOnOptionalChain(boolean optional, Expression base) {
-    return optional || base instanceof Chainable && ((Chainable) base).isOnOptionalChain();
-  }
-
   /**
    * Parse a single subscript {@code s}; if more subscripts could follow, return {@code Pair.make(s,
    * true}, otherwise return {@code Pair.make(s, false)}.
@@ -1544,7 +1540,7 @@ protected Pair<Expression, Boolean> parseSubscript(
               this.parseExpression(false, null),
               true,
               optional,
-              isOnOptionalChain(optional, base));
+              Chainable.isOnOptionalChain(optional, base));
       this.expect(TokenType.bracketR);
       return Pair.make(this.finishNode(node), true);
     } else if (!noCalls && this.eat(TokenType.parenL)) {
@@ -1572,10 +1568,10 @@ protected Pair<Expression, Boolean> parseSubscript(
               new ArrayList<>(),
               exprList,
               optional,
-              isOnOptionalChain(optional, base));
+              Chainable.isOnOptionalChain(optional, base));
       return Pair.make(this.finishNode(node), true);
     } else if (this.type == TokenType.backQuote) {
-      if (isOnOptionalChain(optional, base)) {
+      if (Chainable.isOnOptionalChain(optional, base)) {
         this.raise(base, "An optional chain may not be used in a tagged template expression.");
       }
       TaggedTemplateExpression node =
@@ -1590,7 +1586,7 @@ protected Pair<Expression, Boolean> parseSubscript(
               this.parseIdent(true),
               false,
               optional,
-              isOnOptionalChain(optional, base));
+              Chainable.isOnOptionalChain(optional, base));
       return Pair.make(this.finishNode(node), true);
     } else {
       return Pair.make(base, false);
@@ -1832,7 +1828,7 @@ protected Expression parseNew() {
     Expression callee =
         this.parseSubscripts(this.parseExprAtom(null), innerStartPos, innerStartLoc, true);
 
-    if (isOnOptionalChain(false, callee))
+    if (Chainable.isOnOptionalChain(false, callee))
       this.raise(callee, "An optional chain may not be used in a `new` expression.");
 
     return parseNewArguments(startLoc, callee);
@@ -2314,7 +2310,7 @@ protected INode toAssignable(INode node, boolean isBinding) {
       }
 
       if (node instanceof MemberExpression) {
-        if (isOnOptionalChain(false, (MemberExpression) node))
+        if (Chainable.isOnOptionalChain(false, (MemberExpression) node))
           this.raise(node, "Invalid left-hand side in assignment");
         if (!isBinding) return node;
       }

javascript/extractor/src/com/semmle/js/ast/Chainable.java

@@ -7,4 +7,14 @@ public interface Chainable {
 
   /** Is this on an optional chain? */
   abstract boolean isOnOptionalChain();
+
+  /**
+   * Returns true if a chainable node is on an optional chain.
+   *
+   * @param optional true if the node in question is itself optional (has the ?. token)
+   * @param base the calle or base of the optional access
+   */
+  public static boolean isOnOptionalChain(boolean optional, Expression base) {
+    return optional || base instanceof Chainable && ((Chainable) base).isOnOptionalChain();
+  }
 }

javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java

@@ -17,9 +17,10 @@ public class DeclarationFlags {
   public static final int protected_ = 1 << 6;
   public static final int optional = 1 << 7;
   public static final int definiteAssignmentAssertion = 1 << 8;
+  public static final int declareKeyword = 1 << 9;
 
   public static final int none = 0;
-  public static final int numberOfFlags = 9;
+  public static final int numberOfFlags = 10;
 
   public static final List<String> names =
       Arrays.asList(
@@ -31,7 +32,8 @@ public class DeclarationFlags {
           "private",
           "protected",
           "optional",
-          "definiteAssignmentAssertion");
+          "definiteAssignmentAssertion",
+          "declare");
 
   public static final List<String> relationNames =
       Arrays.asList(
@@ -43,7 +45,8 @@ public class DeclarationFlags {
           "hasPrivateKeyword",
           "hasProtectedKeyword",
           "isOptionalMember",
-          "hasDefiniteAssignmentAssertion");
+          "hasDefiniteAssignmentAssertion",
+          "hasDeclareKeyword");
 
   public static boolean isComputed(int flags) {
     return (flags & computed) != 0;
@@ -81,6 +84,10 @@ public static boolean hasDefiniteAssignmentAssertion(int flags) {
     return (flags & definiteAssignmentAssertion) != 0;
   }
 
+  public static boolean hasDeclareKeyword(int flags) {
+    return (flags & declareKeyword) != 0;
+  }
+
   /** Returns a mask with the computed bit set to the value of <tt>enable</tt>. */
   public static int getComputed(boolean enable) {
     return enable ? computed : 0;
@@ -128,6 +135,11 @@ public static int getDefiniteAssignmentAssertion(boolean enable) {
     return enable ? definiteAssignmentAssertion : 0;
   }
 
+  /** Returns a mask with the declare keyword bit set to the value of <tt>enable</tt>. */
+  public static int getDeclareKeyword(boolean enable) {
+    return enable ? declareKeyword : 0;
+  }
+
   /** Returns true if the <tt>n</tt>th bit is set in <tt>flags</tt>. */
   public static boolean hasNthFlag(int flags, int n) {
     return (flags & (1 << n)) != 0;

javascript/extractor/src/com/semmle/js/ast/DefaultVisitor.java

@@ -34,13 +34,13 @@
 import com.semmle.ts.ast.InterfaceDeclaration;
 import com.semmle.ts.ast.InterfaceTypeExpr;
 import com.semmle.ts.ast.IntersectionTypeExpr;
-import com.semmle.ts.ast.IsTypeExpr;
 import com.semmle.ts.ast.KeywordTypeExpr;
 import com.semmle.ts.ast.MappedTypeExpr;
 import com.semmle.ts.ast.NamespaceDeclaration;
 import com.semmle.ts.ast.NonNullAssertion;
 import com.semmle.ts.ast.OptionalTypeExpr;
 import com.semmle.ts.ast.ParenthesizedTypeExpr;
+import com.semmle.ts.ast.PredicateTypeExpr;
 import com.semmle.ts.ast.RestTypeExpr;
 import com.semmle.ts.ast.TupleTypeExpr;
 import com.semmle.ts.ast.TypeAliasDeclaration;
@@ -634,7 +634,7 @@ public R visit(TypeofTypeExpr nd, C c) {
   }
 
   @Override
-  public R visit(IsTypeExpr nd, C c) {
+  public R visit(PredicateTypeExpr nd, C c) {
     return visit((TypeExpression) nd, c);
   }