@openrewrite/rewrite 8.65.0-20251023-181533 → 8.65.0-20251024-060457

package/dist/javascript/parser.js

@@ -862,11 +862,10 @@ class JavaScriptParserVisitor {
                 methodType: this.mapMethodType(node)
             };
         }
-        let name = !node.name
-            ? this.mapIdentifier(node, "")
-            : typescript_1.default.isStringLiteral(node.name)
-                ? this.mapIdentifier(node.name, node.name.getText())
-                : this.visit(node.name);
+        let name = this.mapMethodName(node);
+        name = (0, immer_1.produce)(name, draft => {
+            draft.markers = this.maybeAddOptionalMarker(draft, node);
+        });
         return {
             kind: java_1.J.Kind.MethodDeclaration,
             id: (0, uuid_1.randomId)(),
@@ -877,9 +876,7 @@ class JavaScriptParserVisitor {
             typeParameters: this.mapTypeParametersAsObject(node),
             returnTypeExpression: this.mapTypeInfo(node),
             nameAnnotations: [],
-            name: (0, immer_1.produce)(name, draft => {
-                draft.markers = this.maybeAddOptionalMarker(draft, node);
-            }),
+            name: name,
             parameters: this.mapCommaSeparatedList(this.getParameterListNodes(node)),
             methodType: this.mapMethodType(node)
         };
@@ -895,7 +892,7 @@ class JavaScriptParserVisitor {
                 });
             }
         });
-        let name = node.name ? this.visit(node.name) : this.mapIdentifier(node, "");
+        let name = this.mapMethodName(node);
         name = (0, immer_1.produce)(name, draft => {
             draft.markers = this.maybeAddOptionalMarker(draft, node);
         });
@@ -931,6 +928,13 @@ class JavaScriptParserVisitor {
             methodType: this.mapMethodType(node)
         };
     }
+    mapMethodName(node) {
+        return !node.name
+            ? this.mapIdentifier(node, "")
+            : typescript_1.default.isStringLiteral(node.name) || typescript_1.default.isNumericLiteral(node.name)
+                ? this.mapIdentifier(node.name, node.name.getText())
+                : this.visit(node.name);
+    }
     mapTypeInfo(node) {
         return node.type && {
             kind: _1.JS.Kind.TypeInfo,
@@ -976,7 +980,7 @@ class JavaScriptParserVisitor {
         };
     }
     visitGetAccessor(node) {
-        const name = this.visit(node.name);
+        const name = this.mapMethodName(node);
         if (typescript_1.default.isComputedPropertyName(node.name)) {
             return {
                 kind: _1.JS.Kind.ComputedPropertyMethodDeclaration,
@@ -1008,7 +1012,7 @@ class JavaScriptParserVisitor {
         };
     }
     visitSetAccessor(node) {
-        const name = this.visit(node.name);
+        const name = this.mapMethodName(node);
         if (typescript_1.default.isComputedPropertyName(node.name)) {
             return {
                 kind: _1.JS.Kind.ComputedPropertyMethodDeclaration,
@@ -2830,16 +2834,7 @@ class JavaScriptParserVisitor {
             leadingAnnotations: [],
             nameAnnotations: [],
             modifiers: this.mapModifiers(node),
-            name: node.name ? this.visit(node.name) : {
-                kind: java_1.J.Kind.Identifier,
-                id: (0, uuid_1.randomId)(),
-                prefix: java_1.emptySpace,
-                markers: markers_1.emptyMarkers,
-                annotations: [],
-                simpleName: "",
-                type: undefined,
-                fieldType: undefined
-            },
+            name: this.mapMethodName(node),
             typeParameters: this.mapTypeParametersAsObject(node),
             parameters: this.mapCommaSeparatedList(this.getParameterListNodes(node)),
             returnTypeExpression: this.mapTypeInfo(node),