make type literal to extend TypeTree

openrewrite · Nov 21, 2024 · 4e4740d · 4e4740d
1 parent 6ce9ada
commit 4e4740d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/openrewrite/src/javascript/tree/tree.ts b/openrewrite/src/javascript/tree/tree.ts
@@ -3426,7 +3426,7 @@ export class FunctionDeclaration extends JSMixin(Object) implements Statement, E
 }
 
 @LstType("org.openrewrite.javascript.tree.JS$TypeLiteral")
-export class TypeLiteral extends JSMixin(Object) implements Expression, TypedTree {
+export class TypeLiteral extends JSMixin(Object) implements Expression, TypeTree {
     public constructor(id: UUID, prefix: Space, markers: Markers, members: Java.Block, _type: JavaType | null) {
         super();
         this._id = id;

diff --git a/openrewrite/test/javascript/parser/function.test.ts b/openrewrite/test/javascript/parser/function.test.ts
@@ -152,14 +152,14 @@ describe('function mapping', () => {
         );
     });
 
-    test.skip('parameter with anonymous type', () => {
+    test('parameter with anonymous type', () => {
         rewriteRun(
             //language=typescript
             typeScript(`
-           function create<Type>(c: { new (): Type }): Type {
-              return new c();
-           }
-        `)
+               function create<Type>(c: { new (): Type }): Type {
+                  return new c();
+               }
+            `)
         );
     });
 
@@ -170,7 +170,7 @@ describe('function mapping', () => {
                 (function() {
                     console.log('IIFE');
                 })();
-        `)
+            `)
         );
     });
 
@@ -183,7 +183,7 @@ describe('function mapping', () => {
                 var hello = function hello() {
                     return helloString;
                 };
-        `)
+            `)
         );
     });
 
@@ -196,7 +196,7 @@ describe('function mapping', () => {
                 var hello = /*a*/function/*b*/ hello /*c*/(/*d*/) {
                     return helloString;
                 };
-        `)
+            `)
         );
     });
 });
diff --git a/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JS.java b/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JS.java
@@ -3105,31 +3105,27 @@ public FunctionDeclaration withParameters(JContainer<Statement> parameters) {
     }
 
 
+    @Getter
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
     @EqualsAndHashCode(callSuper = false, onlyExplicitlyIncluded = true)
     @RequiredArgsConstructor
-    final class TypeLiteral implements JS, Expression, TypedTree {
+    final class TypeLiteral implements JS, Expression, TypeTree {
 
         @With
         @EqualsAndHashCode.Include
-        @Getter
         UUID id;
 
         @With
-        @Getter
         Space prefix;
 
         @With
-        @Getter
         Markers markers;
 
         @With
-        @Getter
         J.Block members;
 
         @Nullable
         @With
-        @Getter
         JavaType type;
 
         @Override