Merge pull request #14484 from aibaars/ts53-js

JS: Support import attributes

Author: aibaars

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

@@ -314,8 +314,9 @@ protected ExportDeclaration parseExportRest(SourceLocation exportStart, Set<Stri
         this.parseExportSpecifiersMaybe(specifiers, exports);
       }
       Literal source = (Literal) this.parseExportFrom(specifiers, null, true);
-      Expression assertion = this.parseImportOrExportAssertionAndSemicolon();
-      return this.finishNode(new ExportNamedDeclaration(exportStart, null, specifiers, source, assertion));
+      Expression attributes = this.parseImportOrExportAttributesAndSemicolon();
+      return this.finishNode(
+          new ExportNamedDeclaration(exportStart, null, specifiers, source, attributes));
     }
 
     return super.parseExportRest(exportStart, exports);
@@ -331,8 +332,9 @@ protected ExportDeclaration parseExportAll(
       List<ExportSpecifier> specifiers = CollectionUtil.makeList(nsSpec);
       this.parseExportSpecifiersMaybe(specifiers, exports);
       Literal source = (Literal) this.parseExportFrom(specifiers, null, true);
-      Expression assertion = this.parseImportOrExportAssertionAndSemicolon();
-      return this.finishNode(new ExportNamedDeclaration(exportStart, null, specifiers, source, assertion));
+      Expression attributes = this.parseImportOrExportAttributesAndSemicolon();
+      return this.finishNode(
+          new ExportNamedDeclaration(exportStart, null, specifiers, source, attributes));
     }
 
     return super.parseExportAll(exportStart, starLoc, exports);

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

@@ -3447,7 +3447,7 @@ protected ExportDeclaration parseExportRest(SourceLocation loc, Set<String> expo
     Statement declaration;
     List<ExportSpecifier> specifiers;
     Expression source = null;
-    Expression assertion = null;
+    Expression attributes = null;
     if (this.shouldParseExportStatement()) {
       declaration = this.parseStatement(true, false);
       if (declaration == null) return null;
@@ -3463,10 +3463,10 @@ protected ExportDeclaration parseExportRest(SourceLocation loc, Set<String> expo
       declaration = null;
       specifiers = this.parseExportSpecifiers(exports);
       source = parseExportFrom(specifiers, source, false);
-      assertion = parseImportOrExportAssertionAndSemicolon();
+      attributes = parseImportOrExportAttributesAndSemicolon();
     }
     return this.finishNode(
-        new ExportNamedDeclaration(loc, declaration, specifiers, (Literal) source, assertion));
+        new ExportNamedDeclaration(loc, declaration, specifiers, (Literal) source, attributes));
   }
 
   /** Parses the 'from' clause of an export, not including the assertion or semicolon. */
@@ -3494,8 +3494,8 @@ protected Expression parseExportFrom(
   protected ExportDeclaration parseExportAll(
       SourceLocation loc, Position starLoc, Set<String> exports) {
     Expression source = parseExportFrom(null, null, true);
-    Expression assertion = parseImportOrExportAssertionAndSemicolon();
-    return this.finishNode(new ExportAllDeclaration(loc, (Literal) source, assertion));
+    Expression attributes = parseImportOrExportAttributesAndSemicolon();
+    return this.finishNode(new ExportAllDeclaration(loc, (Literal) source, attributes));
   }
 
   private void checkExport(Set<String> exports, String name, Position pos) {
@@ -3560,10 +3560,12 @@ protected Statement parseImport(Position startLoc) {
     return parseImportRest(loc);
   }
 
-  protected Expression parseImportOrExportAssertionAndSemicolon() {
+  protected Expression parseImportOrExportAttributesAndSemicolon() {
     Expression result = null;
     if (!this.eagerlyTrySemicolon()) {
-      this.expectContextual("assert");
+      if (!this.eatContextual("assert")) {
+        this.expect(TokenType._with);
+      }
       result = this.parseObj(false, null);
       this.semicolon();
     }
@@ -3583,9 +3585,9 @@ protected ImportDeclaration parseImportRest(SourceLocation loc) {
       if (this.type != TokenType.string) this.unexpected();
       source = (Literal) this.parseExprAtom(null);
     }
-    Expression assertion = this.parseImportOrExportAssertionAndSemicolon();
+    Expression attributes = this.parseImportOrExportAttributesAndSemicolon();
     if (specifiers == null) return null;
-    return this.finishNode(new ImportDeclaration(loc, specifiers, source, assertion));
+    return this.finishNode(new ImportDeclaration(loc, specifiers, source, attributes));
   }
 
   // Parses a comma-separated list of module imports.

javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java

@@ -943,12 +943,12 @@ protected ExportDeclaration parseExportRest(SourceLocation loc, Set<String> expo
           // `export type { foo, bar };`
           List<ExportSpecifier> specifiers = this.parseExportSpecifiers(exports);
           this.parseExportFrom(specifiers, null, false);
-          this.parseImportOrExportAssertionAndSemicolon();
+          this.parseImportOrExportAttributesAndSemicolon();
           return null;
         } else if (this.eat(TokenType.star)) {
           if (this.eatContextual("as")) this.parseIdent(true);
           this.parseExportFrom(null, null, true);
-          this.parseImportOrExportAssertionAndSemicolon();
+          this.parseImportOrExportAttributesAndSemicolon();
           return null;
         } else {
           // `export type Foo = Bar;`

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

@@ -14,7 +14,10 @@ public Expression getSource() {
     return source;
   }
 
-  /** Returns the second "argument" provided to the import, such as <code>{ assert: { type: "json" }}</code>. */
+  /**
+   * Returns the second "argument" provided to the import, such as <code>{ "with": { type: "json" }}
+   * </code>.
+   */
   public Expression getAttributes() {
     return attributes;
   }

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

@@ -9,20 +9,20 @@
  */
 public class ExportAllDeclaration extends ExportDeclaration {
   private final Literal source;
-  private final Expression assertion;
+  private final Expression attributes;
 
-  public ExportAllDeclaration(SourceLocation loc, Literal source, Expression assertion) {
+  public ExportAllDeclaration(SourceLocation loc, Literal source, Expression attributes) {
     super("ExportAllDeclaration", loc);
     this.source = source;
-    this.assertion = assertion;
+    this.attributes = attributes;
   }
 
   public Literal getSource() {
     return source;
   }
 
-  public Expression getAssertion() {
-    return assertion;
+  public Expression getAttributes() {
+    return attributes;
   }
 
   @Override

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

@@ -15,22 +15,30 @@ public class ExportNamedDeclaration extends ExportDeclaration {
   private final Statement declaration;
   private final List<ExportSpecifier> specifiers;
   private final Literal source;
-  private final Expression assertion;
+  private final Expression attributes;
   private final boolean hasTypeKeyword;
 
   public ExportNamedDeclaration(
-      SourceLocation loc, Statement declaration, List<ExportSpecifier> specifiers, Literal source, Expression assertion) {
-    this(loc, declaration, specifiers, source, assertion, false);
+      SourceLocation loc,
+      Statement declaration,
+      List<ExportSpecifier> specifiers,
+      Literal source,
+      Expression attributes) {
+    this(loc, declaration, specifiers, source, attributes, false);
   }
 
   public ExportNamedDeclaration(
-      SourceLocation loc, Statement declaration, List<ExportSpecifier> specifiers, Literal source,
-      Expression assertion, boolean hasTypeKeyword) {
+      SourceLocation loc,
+      Statement declaration,
+      List<ExportSpecifier> specifiers,
+      Literal source,
+      Expression attributes,
+      boolean hasTypeKeyword) {
     super("ExportNamedDeclaration", loc);
     this.declaration = declaration;
     this.specifiers = specifiers;
     this.source = source;
-    this.assertion = assertion;
+    this.attributes = attributes;
     this.hasTypeKeyword = hasTypeKeyword;
   }
 
@@ -59,9 +67,12 @@ public <C, R> R accept(Visitor<C, R> v, C c) {
     return v.visit(this, c);
   }
 
-  /** Returns the expression after the <code>assert</code> keyword, if any, such as <code>{ type: "json" }</code>. */
-  public Expression getAssertion() {
-    return assertion;
+  /**
+   * Returns the expression after the <code>with</code> keyword, if any, such as <code>
+   * { type: "json" }</code>.
+   */
+  public Expression getAttributes() {
+    return attributes;
   }
 
   /** Returns true if this is an <code>export type</code> declaration. */

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

@@ -1,8 +1,7 @@
 package com.semmle.js.ast;
 
-import java.util.List;
-
 import com.semmle.ts.ast.INodeWithSymbol;
+import java.util.List;
 
 /**
  * An import declaration, which can be of one of the following forms:
@@ -23,21 +22,27 @@ public class ImportDeclaration extends Statement implements INodeWithSymbol {
   /** The module from which declarations are imported. */
   private final Literal source;
 
-  private final Expression assertion;
+  private final Expression attributes;
 
   private int symbol = -1;
 
   private boolean hasTypeKeyword;
 
-  public ImportDeclaration(SourceLocation loc, List<ImportSpecifier> specifiers, Literal source, Expression assertion) {
-    this(loc, specifiers, source, assertion, false);
+  public ImportDeclaration(
+      SourceLocation loc, List<ImportSpecifier> specifiers, Literal source, Expression attributes) {
+    this(loc, specifiers, source, attributes, false);
   }
 
-  public ImportDeclaration(SourceLocation loc, List<ImportSpecifier> specifiers, Literal source, Expression assertion, boolean hasTypeKeyword) {
+  public ImportDeclaration(
+      SourceLocation loc,
+      List<ImportSpecifier> specifiers,
+      Literal source,
+      Expression attributes,
+      boolean hasTypeKeyword) {
     super("ImportDeclaration", loc);
     this.specifiers = specifiers;
     this.source = source;
-    this.assertion = assertion;
+    this.attributes = attributes;
     this.hasTypeKeyword = hasTypeKeyword;
   }
 
@@ -49,9 +54,12 @@ public List<ImportSpecifier> getSpecifiers() {
     return specifiers;
   }
 
-  /** Returns the expression after the <code>assert</code> keyword, if any, such as <code>{ type: "json" }</code>. */
-  public Expression getAssertion() {
-    return assertion;
+  /**
+   * Returns the expression after the <code>with</code> keyword, if any, such as <code>
+   * { type: "json" }</code>.
+   */
+  public Expression getAttributes() {
+    return attributes;
   }
 
   @Override

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

@@ -1,8 +1,5 @@
 package com.semmle.js.ast;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.semmle.js.ast.jsx.JSXAttribute;
 import com.semmle.js.ast.jsx.JSXClosingElement;
 import com.semmle.js.ast.jsx.JSXElement;
@@ -42,16 +39,18 @@
 import com.semmle.ts.ast.ParenthesizedTypeExpr;
 import com.semmle.ts.ast.PredicateTypeExpr;
 import com.semmle.ts.ast.RestTypeExpr;
+import com.semmle.ts.ast.SatisfiesExpr;
 import com.semmle.ts.ast.TemplateLiteralTypeExpr;
 import com.semmle.ts.ast.TupleTypeExpr;
 import com.semmle.ts.ast.TypeAliasDeclaration;
 import com.semmle.ts.ast.TypeAssertion;
-import com.semmle.ts.ast.SatisfiesExpr;
 import com.semmle.ts.ast.TypeParameter;
 import com.semmle.ts.ast.TypeofTypeExpr;
 import com.semmle.ts.ast.UnaryTypeExpr;
 import com.semmle.ts.ast.UnionTypeExpr;
 import com.semmle.util.data.IntList;
+import java.util.ArrayList;
+import java.util.List;
 
 /** Deep cloning of AST nodes. */
 public class NodeCopier implements Visitor<Void, INode> {
@@ -429,7 +428,8 @@ public TemplateLiteral visit(TemplateLiteral nd, Void q) {
 
   @Override
   public TemplateLiteralTypeExpr visit(TemplateLiteralTypeExpr nd, Void q) {
-    return new TemplateLiteralTypeExpr(visit(nd.getLoc()), copy(nd.getExpressions()), copy(nd.getQuasis()));
+    return new TemplateLiteralTypeExpr(
+        visit(nd.getLoc()), copy(nd.getExpressions()), copy(nd.getQuasis()));
   }
 
   @Override
@@ -523,7 +523,8 @@ public MetaProperty visit(MetaProperty nd, Void c) {
 
   @Override
   public ExportAllDeclaration visit(ExportAllDeclaration nd, Void c) {
-    return new ExportAllDeclaration(visit(nd.getLoc()), copy(nd.getSource()), copy(nd.getAssertion()));
+    return new ExportAllDeclaration(
+        visit(nd.getLoc()), copy(nd.getSource()), copy(nd.getAttributes()));
   }
 
   @Override
@@ -538,7 +539,7 @@ public ExportNamedDeclaration visit(ExportNamedDeclaration nd, Void c) {
         copy(nd.getDeclaration()),
         copy(nd.getSpecifiers()),
         copy(nd.getSource()),
-        copy(nd.getAssertion()));
+        copy(nd.getAttributes()));
   }
 
   @Override
@@ -559,7 +560,11 @@ public ExportSpecifier visit(ExportSpecifier nd, Void c) {
   @Override
   public ImportDeclaration visit(ImportDeclaration nd, Void c) {
     return new ImportDeclaration(
-        visit(nd.getLoc()), copy(nd.getSpecifiers()), copy(nd.getSource()), copy(nd.getAssertion()), nd.hasTypeKeyword());
+        visit(nd.getLoc()),
+        copy(nd.getSpecifiers()),
+        copy(nd.getSource()),
+        copy(nd.getAttributes()),
+        nd.hasTypeKeyword());
   }
 
   @Override
@@ -725,7 +730,8 @@ public INode visit(ParenthesizedTypeExpr nd, Void c) {
 
   @Override
   public INode visit(TupleTypeExpr nd, Void c) {
-    return new TupleTypeExpr(visit(nd.getLoc()), copy(nd.getElementTypes()), copy(nd.getElementNames()));
+    return new TupleTypeExpr(
+        visit(nd.getLoc()), copy(nd.getElementTypes()), copy(nd.getElementNames()));
   }
 
   @Override
@@ -787,9 +793,7 @@ public INode visit(TypeAssertion nd, Void c) {
   @Override
   public INode visit(SatisfiesExpr nd, Void c) {
     return new SatisfiesExpr(
-        visit(nd.getLoc()),
-        copy(nd.getExpression()),
-        copy(nd.getTypeAnnotation()));
+        visit(nd.getLoc()), copy(nd.getExpression()), copy(nd.getTypeAnnotation()));
   }
 
   @Override
@@ -907,7 +911,8 @@ public INode visit(XMLDotDotExpression nd, Void c) {
 
   @Override
   public INode visit(GeneratedCodeExpr nd, Void c) {
-    return new GeneratedCodeExpr(visit(nd.getLoc()), nd.getOpeningDelimiter(), nd.getClosingDelimiter(), nd.getBody());
+    return new GeneratedCodeExpr(
+        visit(nd.getLoc()), nd.getOpeningDelimiter(), nd.getClosingDelimiter(), nd.getBody());
   }
 
   @Override