Support keyof keyword (#91)

* Support keyof keyword * Update src/main/java/org/openrewrite/javascript/tree/JS.java Co-authored-by: Knut Wannheden <[email protected]> * Update --------- Co-authored-by: Knut Wannheden <[email protected]>
openrewrite · Nov 28, 2023 · 6ab4caf · 6ab4caf
1 parent d184d42
commit 6ab4caf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/main/java/org/openrewrite/javascript/internal/JavaScriptPrinter.java b/src/main/java/org/openrewrite/javascript/internal/JavaScriptPrinter.java
@@ -338,6 +338,8 @@ public J visitTypeOperator(JS.TypeOperator typeOperator, PrintOutputCapture<P> p
         String keyword = "";
         if (typeOperator.getOperator() == JS.TypeOperator.Type.ReadOnly) {
             keyword = "readonly";
+        } else if (typeOperator.getOperator() == JS.TypeOperator.Type.KeyOf) {
+            keyword = "keyof";
         }
 
         p.append(keyword);

diff --git a/src/main/java/org/openrewrite/javascript/internal/TypeScriptParserVisitor.java b/src/main/java/org/openrewrite/javascript/internal/TypeScriptParserVisitor.java
@@ -2333,6 +2333,9 @@ private JS.TypeOperator visitTypeOperator(TSCNode node) {
         if (op == TSCSyntaxKind.ReadonlyKeyword) {
             before = sourceBefore(TSCSyntaxKind.ReadonlyKeyword);
             operator = JS.TypeOperator.Type.ReadOnly;
+        } else if (op == TSCSyntaxKind.KeyOfKeyword) {
+            before = sourceBefore(TSCSyntaxKind.KeyOfKeyword);
+            operator = JS.TypeOperator.Type.KeyOf;
         } else {
             implementMe(node);
         }

diff --git a/src/main/java/org/openrewrite/javascript/tree/JS.java b/src/main/java/org/openrewrite/javascript/tree/JS.java
@@ -1678,7 +1678,8 @@ public CoordinateBuilder.Expression getCoordinates() {
         }
 
         public enum Type {
-            ReadOnly
+            ReadOnly,
+            KeyOf,
         }
 
         public JS.TypeOperator.Padding getPadding() {

diff --git a/src/test/java/org/openrewrite/javascript/tree/UnaryTest.java b/src/test/java/org/openrewrite/javascript/tree/UnaryTest.java
@@ -60,20 +60,17 @@ void unaryMinusAndPlus(String arg) {
         );
     }
 
-    @ExpectedToFail
     @Test
     void keyofKeyword() {
         rewriteRun(
           javaScript(
             """
-              type Person = { name: string; age: number };
+              type Person = { name: string , age: number };
               type KeysOfPerson = keyof Person;
-              let person: Person = {
-                  name: "John",
-                  age: 42,
-                };
               """
           )
         );
     }
+
+
 }