Merge pull request github#5205 from erik-krogh/ts42

Approved by asgerf

Author: codeql-ci

javascript/change-notes/2021-02-18-typescript-4.2.md

@@ -0,0 +1,2 @@
+lgtm,codescanning
+* TypeScript 4.2 is now supported.

javascript/extractor/lib/typescript/package.json

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

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

@@ -632,7 +632,14 @@ export class TypeTable {
           ? tupleType.minLength
           : this.typeChecker.getTypeArguments(tupleReference).length;
       let hasRestElement = tupleType.hasRestElement ? 't' : 'f';
-      let prefix = `tuple;${minLength};${hasRestElement}`;
+      let restIndex = -1;
+      for (let i = 0; i < tupleType.elementFlags.length; i++) {
+        if (tupleType.elementFlags[i] & ts.ElementFlags.Rest) {
+          restIndex = i;
+          break;
+        }
+      }
+      let prefix = `tuple;${minLength};${restIndex}`;
       return this.makeTypeStringVectorFromTypeReferenceArguments(prefix, type);
     }
     if (objectFlags & ts.ObjectFlags.Anonymous) {
@@ -940,6 +947,9 @@ export class TypeTable {
    * Returns a unique string for the given call/constructor signature.
    */
   private getSignatureString(kind: ts.SignatureKind, signature: AugmentedSignature): string {
+    let modifiers : ts.ModifiersArray = signature.getDeclaration()?.modifiers;
+    let isAbstract = modifiers && modifiers.filter(modifier => modifier.kind == ts.SyntaxKind.AbstractKeyword).length > 0
+
     let parameters = signature.getParameters();
     let numberOfTypeParameters = signature.typeParameters == null
         ? 0
@@ -971,7 +981,7 @@ export class TypeTable {
     if (returnTypeId == null) {
       return null;
     }
-    let tag = `${kind};${numberOfTypeParameters};${requiredParameters};${restParameterTag};${returnTypeId}`;
+    let tag = `${kind};${isAbstract ? "t" : "f"};${numberOfTypeParameters};${requiredParameters};${restParameterTag};${returnTypeId}`;
     for (let typeParameter of signature.typeParameters || []) {
       tag += ";" + typeParameter.symbol.name;
       let constraint = typeParameter.getConstraint();

javascript/extractor/lib/typescript/yarn.lock

@@ -6,7 +6,7 @@
   version "12.7.11"
   resolved node-12.7.11.tgz#be879b52031cfb5d295b047f5462d8ef1a716446
 
-typescript@4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
-  integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
+typescript@4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.2.tgz#1450f020618f872db0ea17317d16d8da8ddb8c4c"
+  integrity sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ==

javascript/extractor/src/com/semmle/js/extractor/Main.java

@@ -43,7 +43,7 @@ public class Main {
    * A version identifier that should be updated every time the extractor changes in such a way that
    * it may produce different tuples for the same file under the same {@link ExtractorConfig}.
    */
-  public static final String EXTRACTOR_VERSION = "2021-02-05";
+  public static final String EXTRACTOR_VERSION = "2021-02-24";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 

javascript/extractor/src/com/semmle/ts/extractor/TypeExtractor.java

@@ -118,10 +118,11 @@ private void extractType(int id) {
         }
       case tupleKind:
         {
-          // The first two parts denote minimum length and presence of rest element.
+          // The first two parts denote minimum length and index of rest element (or -1 if no rest element).
           trapWriter.addTuple("tuple_type_min_length", lbl, Integer.parseInt(parts[1]));
-          if (parts[2].equals("t")) {
-            trapWriter.addTuple("tuple_type_rest", lbl);
+          int restIndex = Integer.parseInt(parts[2]);
+          if (restIndex != -1) {
+            trapWriter.addTuple("tuple_type_rest_index", lbl, restIndex);
           }
           firstChild += 2;
           break;
@@ -201,18 +202,22 @@ private void extractSymbolNameMapping(String relationName, JsonObject mappings)
 
   private void extractSignature(int index) {
     // Format is:
-    // kind;numTypeParams;requiredParams;restParamType;returnType(;paramName;paramType)*
+    // kind;isAbstract;numTypeParams;requiredParams;restParamType;returnType(;paramName;paramType)*
     String[] parts = split(table.getSignatureString(index));
     Label label = trapWriter.globalID("signature;" + index);
     int kind = Integer.parseInt(parts[0]);
-    int numberOfTypeParameters = Integer.parseInt(parts[1]);
-    int requiredParameters = Integer.parseInt(parts[2]);
-    String restParamTypeTag = parts[3];
+    boolean isAbstract = parts[1].equals("t");
+    if (isAbstract) {
+      trapWriter.addTuple("is_abstract_signature", label);
+    }
+    int numberOfTypeParameters = Integer.parseInt(parts[2]);
+    int requiredParameters = Integer.parseInt(parts[3]);
+    String restParamTypeTag = parts[4];
     if (!restParamTypeTag.isEmpty()) {
       trapWriter.addTuple(
           "signature_rest_parameter", label, trapWriter.globalID("type;" + restParamTypeTag));
     }
-    Label returnType = trapWriter.globalID("type;" + parts[4]);
+    Label returnType = trapWriter.globalID("type;" + parts[5]);
     trapWriter.addTuple(
         "signature_types",
         label,
@@ -221,9 +226,9 @@ private void extractSignature(int index) {
         numberOfTypeParameters,
         requiredParameters);
     trapWriter.addTuple("signature_contains_type", returnType, label, -1);
-    int numberOfParameters = (parts.length - 5) / 2; // includes type parameters
+    int numberOfParameters = (parts.length - 6) / 2; // includes type parameters
     for (int i = 0; i < numberOfParameters; ++i) {
-      int partIndex = 5 + (2 * i);
+      int partIndex = 6 + (2 * i);
       String paramName = parts[partIndex];
       String paramTypeId = parts[partIndex + 1];
       if (paramTypeId.length() > 0) { // Unconstrained type parameters have an empty type ID.

javascript/ql/src/semmle/javascript/TypeScript.qll

@@ -2149,18 +2149,23 @@ class TupleType extends ArrayType, @tuple_type {
   int getMinimumLength() { tuple_type_min_length(this, result) }
 
   /**
-   * Holds if this tuple type ends with a rest element, such as `[number, ...string[]]`.
+   * Gets the index of the rest element.
+   * For example, for a type `[number, ...string[]]` the result is 1,
+   * or for a type `[...number[], string]` the result is 0.
    */
-  predicate hasRestElement() { tuple_type_rest(this) }
+  int getRestElementIndex() { tuple_type_rest_index(this, result) }
+
+  /**
+   * Holds if this tuple type has a rest element, such as `[number, ...string[]]` or `[...number[], string]`.
+   */
+  predicate hasRestElement() { exists(getRestElementIndex()) }
 
   /**
    * Gets the type of the rest element, if there is one.
    *
    * For example, the rest element of `[number, ...string[]]` is `string`.
    */
-  Type getRestElementType() {
-    hasRestElement() and result = getElementType(getNumElementType() - 1)
-  }
+  Type getRestElementType() { result = getElementType(getRestElementIndex()) }
 }
 
 /**
@@ -2789,6 +2794,11 @@ class CallSignatureType extends @signature_type {
    * For example, for the signature `(...y: string[])`, this gets the type `string[]`.
    */
   PlainArrayType getRestParameterArrayType() { signature_rest_parameter(this, result) }
+
+  /**
+   * Holds if this signature is abstract.
+   */
+  predicate isAbstract() { is_abstract_signature(this) }
 }
 
 /**

javascript/ql/src/semmlecode.javascript.dbscheme

@@ -742,6 +742,10 @@ signature_types (
   int required_params: int ref
 );
 
+is_abstract_signature(
+  unique int sig: @signature_type ref
+);
+
 signature_rest_parameter(
   unique int sig: @signature_type ref,
   int rest_param_arra_type: @type ref
@@ -799,8 +803,9 @@ tuple_type_min_length(
   int minLength: int ref
 );
 
-tuple_type_rest(
-  unique int typ: @type ref
+tuple_type_rest_index(
+  unique int typ: @type ref,
+  int index: int ref
 );
 
 // comments

javascript/ql/src/semmlecode.javascript.dbscheme.stats

@@ -14480,6 +14480,17 @@
 </dependencies>
 </relation>
 <relation>
+<name>is_abstract_signature</name>
+<cardinality>12</cardinality>
+<columnsizes>
+<e>
+<k>sig</k>
+<v>12</v>
+</e>
+</columnsizes>
+<dependencies/>
+</relation>
+<relation>
 <name>signature_rest_parameter</name>
 <cardinality>19521</cardinality>
 <columnsizes>
@@ -15891,13 +15902,17 @@
 </dependencies>
 </relation>
 <relation>
-<name>tuple_type_rest</name>
+<name>tuple_type_rest_index</name>
 <cardinality>100</cardinality>
 <columnsizes>
 <e>
 <k>typ</k>
 <v>100</v>
 </e>
+<e>
+<k>index</k>
+<v>100</v>
+</e>
 </columnsizes>
 <dependencies/>
 </relation>

javascript/ql/test/library-tests/TypeScript/Nullability/Types.expected

@@ -3,7 +3,8 @@ exprType
 | tst.ts:2:5:2:21 | stringOrUndefined | string \| undefined |
 | tst.ts:3:5:3:27 | stringO ... defined | string \| null \| undefined |
 | tst.ts:4:5:4:16 | stringOrVoid | string \| void |
-| tst.ts:7:5:7:21 | stringOrNullAlias | string \| null |
+| tst.ts:7:5:7:21 | stringOrNullAlias | StringOrNullAlias |
 | tst.ts:8:5:8:32 | stringO ... defined | string \| null \| undefined |
 | tst.ts:10:5:10:23 | arrayOfStringOrNull | (string \| null)[] |
 unaliasedType
+| StringOrNullAlias | string \| null |