Merge pull request #7216 from erik-krogh/ts45

JS: Add support for TypeScript 4.5

Author: erik-krogh

docs/codeql/support/reusables/versions-compilers.rst

@@ -23,7 +23,7 @@
    JavaScript,ECMAScript 2021 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [6]_"
    Python,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9",Not applicable,``.py``
    Ruby [7]_,"up to 3.02",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
-   TypeScript [8]_,"2.6-4.4",Standard TypeScript compiler,"``.ts``, ``.tsx``"
+   TypeScript [8]_,"2.6-4.5",Standard TypeScript compiler,"``.ts``, ``.tsx``"
 
 .. container:: footnote-group
 

javascript/change-notes/2021-11-23-typescript-4.5.md

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

javascript/extractor/lib/typescript/package.json

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

javascript/extractor/lib/typescript/yarn.lock

@@ -6,7 +6,7 @@
   version "12.7.11"
   resolved node-12.7.11.tgz#be879b52031cfb5d295b047f5462d8ef1a716446
 
-typescript@4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86"
-  integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==
+typescript@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.2.tgz#8ac1fba9f52256fdb06fb89e4122fa6a346c2998"
+  integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==

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

@@ -1646,6 +1646,15 @@ protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
       node = new ThisExpression(new SourceLocation(this.startLoc));
       this.next();
       return this.finishNode(node);
+    } else if (this.type == TokenType.pound) {
+      Position startLoc = this.startLoc;
+      // there is only one case where this is valid, and that is "Ergonomic brand checks for Private Fields", i.e. `#name in obj`. 
+      Identifier id = parseIdent(true);
+      String op = String.valueOf(this.value);
+      if (!op.equals("in")) {
+        this.unexpected(startLoc);
+      }
+      return this.parseExprOp(id, this.start, startLoc, -1, false); 
     } else if (this.type == TokenType.name) {
       Position startLoc = this.startLoc;
       Identifier id = this.parseIdent(this.type != TokenType.name);
@@ -3314,9 +3323,6 @@ protected MemberDefinition<?> parseClassPropertyBody(
       if (pi.kind.equals("set") && node.getValue().hasRest())
         this.raiseRecoverable(params.get(params.size() - 1), "Setter cannot use rest params");
     }
-    if (pi.key instanceof Identifier && ((Identifier)pi.key).getName().startsWith("#")) {
-      raiseRecoverable(pi.key, "Only fields, not methods, can be declared private.");
-    }
     return node;
   }
 

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

@@ -10,15 +10,25 @@
  */
 public class ImportSpecifier extends Expression {
   private final Identifier imported, local;
+  private final boolean isTypeOnly;
 
   public ImportSpecifier(SourceLocation loc, Identifier imported, Identifier local) {
-    this("ImportSpecifier", loc, imported, local);
+    this(loc, imported, local, false);
+  }
+
+  public ImportSpecifier(SourceLocation loc, Identifier imported, Identifier local, boolean isTypeOnly) {
+    this("ImportSpecifier", loc, imported, local, isTypeOnly);
   }
 
   public ImportSpecifier(String type, SourceLocation loc, Identifier imported, Identifier local) {
+    this(type, loc, imported, local, false);
+  }
+
+  private ImportSpecifier(String type, SourceLocation loc, Identifier imported, Identifier local, boolean isTypeOnly) {
     super(type, loc);
     this.imported = imported;
     this.local = local == imported ? new NodeCopier().copy(local) : local;
+    this.isTypeOnly = isTypeOnly;
   }
 
   public Identifier getImported() {
@@ -33,4 +43,8 @@ public Identifier getLocal() {
   public <C, R> R accept(Visitor<C, R> v, C c) {
     return v.visit(this, c);
   }
+
+  public boolean hasTypeKeyword() {
+    return isTypeOnly;
+  }
 }

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

@@ -847,8 +847,15 @@ public Label visit(AssignmentExpression nd, Context c) {
     @Override
     public Label visit(BinaryExpression nd, Context c) {
       Label key = super.visit(nd, c);
-      visit(nd.getLeft(), key, 0, true);
+      if (nd.getOperator().equals("in") && nd.getLeft() instanceof Identifier && ((Identifier)nd.getLeft()).getName().startsWith("#")) {
+        // this happens with Ergonomic brand checks for Private Fields (see https://github.com/tc39/proposal-private-fields-in-in). 
+        // it's the only case where private field identifiers are used not as a field.
+        visit(nd.getLeft(), key, 0, IdContext.LABEL, true);
+      } else {
+        visit(nd.getLeft(), key, 0, true);
+      }
       visit(nd.getRight(), key, 1, true);
+      
       extractRegxpFromBinop(nd, c);
       return key;
     }
@@ -1805,7 +1812,10 @@ public Label visit(ImportDeclaration nd, Context c) {
     public Label visit(ImportSpecifier nd, Context c) {
       Label lbl = super.visit(nd, c);
       visit(nd.getImported(), lbl, 0, IdContext.LABEL);
-      visit(nd.getLocal(), lbl, 1, c.idcontext);
+      visit(nd.getLocal(), lbl, 1, nd.hasTypeKeyword() ? IdContext.TYPE_ONLY_IMPORT : c.idcontext);
+      if (nd.hasTypeKeyword()) {
+        trapwriter.addTuple("has_type_keyword", lbl);
+      } 
       return lbl;
     }
 

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-10-28";
+  public static final String EXTRACTOR_VERSION = "2021-11-23";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 

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

@@ -1406,7 +1406,8 @@ private Node convertImportSpecifier(JsonObject node, SourceLocation loc) throws
     boolean hasImported = hasChild(node, "propertyName");
     Identifier imported = convertChild(node, hasImported ? "propertyName" : "name");
     Identifier local = convertChild(node, "name");
-    return new ImportSpecifier(loc, imported, local);
+    boolean isTypeOnly = node.get("isTypeOnly").getAsBoolean() == true;
+    return new ImportSpecifier(loc, imported, local, isTypeOnly);
   }
 
   private Node convertImportType(JsonObject node, SourceLocation loc) throws ParseError {