JS: Generalize KeyofTypeExpr to UnaryTypeExpr

Author: asger-semmle

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

@@ -35,7 +35,7 @@
 import com.semmle.ts.ast.InterfaceTypeExpr;
 import com.semmle.ts.ast.IntersectionTypeExpr;
 import com.semmle.ts.ast.IsTypeExpr;
-import com.semmle.ts.ast.KeyofTypeExpr;
+import com.semmle.ts.ast.UnaryTypeExpr;
 import com.semmle.ts.ast.KeywordTypeExpr;
 import com.semmle.ts.ast.MappedTypeExpr;
 import com.semmle.ts.ast.NamespaceDeclaration;
@@ -619,7 +619,7 @@ public R visit(TupleTypeExpr nd, C c) {
   }
 
   @Override
-  public R visit(KeyofTypeExpr nd, C c) {
+  public R visit(UnaryTypeExpr nd, C c) {
     return visit((TypeExpression) nd, c);
   }
 

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

@@ -31,7 +31,7 @@
 import com.semmle.ts.ast.InterfaceTypeExpr;
 import com.semmle.ts.ast.IntersectionTypeExpr;
 import com.semmle.ts.ast.IsTypeExpr;
-import com.semmle.ts.ast.KeyofTypeExpr;
+import com.semmle.ts.ast.UnaryTypeExpr;
 import com.semmle.ts.ast.KeywordTypeExpr;
 import com.semmle.ts.ast.MappedTypeExpr;
 import com.semmle.ts.ast.NamespaceDeclaration;
@@ -700,8 +700,8 @@ public INode visit(TupleTypeExpr nd, Void c) {
   }
 
   @Override
-  public INode visit(KeyofTypeExpr nd, Void c) {
-    return new KeyofTypeExpr(visit(nd.getLoc()), copy(nd.getElementType()));
+  public INode visit(UnaryTypeExpr nd, Void c) {
+    return new UnaryTypeExpr(visit(nd.getLoc()), nd.getKind(), copy(nd.getElementType()));
   }
 
   @Override

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

@@ -31,7 +31,7 @@
 import com.semmle.ts.ast.InterfaceTypeExpr;
 import com.semmle.ts.ast.IntersectionTypeExpr;
 import com.semmle.ts.ast.IsTypeExpr;
-import com.semmle.ts.ast.KeyofTypeExpr;
+import com.semmle.ts.ast.UnaryTypeExpr;
 import com.semmle.ts.ast.KeywordTypeExpr;
 import com.semmle.ts.ast.MappedTypeExpr;
 import com.semmle.ts.ast.NamespaceDeclaration;
@@ -250,7 +250,7 @@ public interface Visitor<C, R> {
 
   public R visit(TupleTypeExpr nd, C c);
 
-  public R visit(KeyofTypeExpr nd, C c);
+  public R visit(UnaryTypeExpr nd, C c);
 
   public R visit(GenericTypeExpr nd, C c);
 

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

@@ -125,7 +125,7 @@
 import com.semmle.ts.ast.InterfaceTypeExpr;
 import com.semmle.ts.ast.IntersectionTypeExpr;
 import com.semmle.ts.ast.IsTypeExpr;
-import com.semmle.ts.ast.KeyofTypeExpr;
+import com.semmle.ts.ast.UnaryTypeExpr;
 import com.semmle.ts.ast.KeywordTypeExpr;
 import com.semmle.ts.ast.MappedTypeExpr;
 import com.semmle.ts.ast.NamespaceDeclaration;
@@ -1672,7 +1672,7 @@ public Label visit(TupleTypeExpr nd, Context c) {
     }
 
     @Override
-    public Label visit(KeyofTypeExpr nd, Context c) {
+    public Label visit(UnaryTypeExpr nd, Context c) {
       Label key = super.visit(nd, c);
       visit(nd.getElementType(), key, 0, IdContext.typeBind);
       return key;

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

@@ -17,7 +17,7 @@
 import com.semmle.ts.ast.InterfaceTypeExpr;
 import com.semmle.ts.ast.IntersectionTypeExpr;
 import com.semmle.ts.ast.IsTypeExpr;
-import com.semmle.ts.ast.KeyofTypeExpr;
+import com.semmle.ts.ast.UnaryTypeExpr;
 import com.semmle.ts.ast.KeywordTypeExpr;
 import com.semmle.ts.ast.MappedTypeExpr;
 import com.semmle.ts.ast.OptionalTypeExpr;
@@ -126,7 +126,7 @@ public Integer visit(TupleTypeExpr nd, Void c) {
               }
 
               @Override
-              public Integer visit(KeyofTypeExpr nd, Void c) {
+              public Integer visit(UnaryTypeExpr nd, Void c) {
                 return keyofTypeExpr;
               }
 

javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java

@@ -126,7 +126,7 @@
 import com.semmle.ts.ast.InterfaceTypeExpr;
 import com.semmle.ts.ast.IntersectionTypeExpr;
 import com.semmle.ts.ast.IsTypeExpr;
-import com.semmle.ts.ast.KeyofTypeExpr;
+import com.semmle.ts.ast.UnaryTypeExpr;
 import com.semmle.ts.ast.KeywordTypeExpr;
 import com.semmle.ts.ast.MappedTypeExpr;
 import com.semmle.ts.ast.NamespaceDeclaration;
@@ -2130,7 +2130,7 @@ private Node convertTypeOfExpression(JsonObject node, SourceLocation loc) throws
   private Node convertTypeOperator(JsonObject node, SourceLocation loc) throws ParseError {
     String operator = syntaxKinds.get("" + node.get("operator").getAsInt()).getAsString();
     if (operator.equals("KeyOfKeyword")) {
-      return new KeyofTypeExpr(loc, convertChildAsType(node, "type"));
+      return new UnaryTypeExpr(loc, UnaryTypeExpr.Kind.Keyof, convertChildAsType(node, "type"));
     }
     if (operator.equals("UniqueKeyword")) {
       return new KeywordTypeExpr(loc, "unique symbol");

…src/com/semmle/ts/ast/KeyofTypeExpr.java …src/com/semmle/ts/ast/UnaryTypeExpr.javajavascript/extractor/src/com/semmle/ts/ast/KeyofTypeExpr.java renamed to javascript/extractor/src/com/semmle/ts/ast/UnaryTypeExpr.java javascript/extractor/src/com/semmle/ts/ast/KeyofTypeExpr.java renamed to javascript/extractor/src/com/semmle/ts/ast/UnaryTypeExpr.java

@@ -4,18 +4,29 @@
 import com.semmle.js.ast.Visitor;
 
 /** A type of form <tt>keyof T</tt> where <tt>T</tt> is a type. */
-public class KeyofTypeExpr extends TypeExpression {
+public class UnaryTypeExpr extends TypeExpression {
   private final ITypeExpression elementType;
+  private final Kind kind;
 
-  public KeyofTypeExpr(SourceLocation loc, ITypeExpression elementType) {
-    super("KeyofTypeExpr", loc);
+  public enum Kind {
+    Keyof,
+    Readonly
+  }
+
+  public UnaryTypeExpr(SourceLocation loc, Kind kind, ITypeExpression elementType) {
+    super("UnaryTypeExpr", loc);
+    this.kind = kind;
     this.elementType = elementType;
   }
 
   public ITypeExpression getElementType() {
     return elementType;
   }
 
+  public Kind getKind() {
+    return kind;
+  }
+
   @Override
   public <C, R> R accept(Visitor<C, R> v, C c) {
     return v.visit(this, c);