@openrewrite/rewrite 8.53.0 → 8.53.1

package/src/javascript/parser.ts

@@ -28,7 +28,7 @@ import {
     TypeTree,
     VariableDeclarator,
 } from '../java';
-import {Asterisk, DelegatedYield, FunctionDeclaration, JS, NonNullAssertion, Optional, Spread} from '.';
+import {Asterisk, DelegatedYield, FunctionDeclaration, JS, JSX, NonNullAssertion, Optional, Spread} from '.';
 import {
     emptyMarkers,
     markers,
@@ -61,6 +61,8 @@ import {JavaScriptTypeMapping} from "./type-mapping";
 import {produce} from "immer";
 import Kind = JS.Kind;
 import ComputedPropertyName = JS.ComputedPropertyName;
+import Attribute = JSX.Attribute;
+import SpreadAttribute = JSX.SpreadAttribute;
 
 export interface JavaScriptParserOptions extends ParserOptions {
     styles?: NamedStyles[]
@@ -72,13 +74,14 @@ export class JavaScriptParser extends Parser {
     private readonly styles?: NamedStyles[];
     private oldProgram?: ts.Program;
 
-    constructor({
-                    ctx,
-                    relativeTo,
-                    styles
-                }: JavaScriptParserOptions = {},
-                private readonly sourceFileCache: Map<String, ts.SourceFile> = new Map()
-                ) {
+    constructor(
+        {
+            ctx,
+            relativeTo,
+            styles
+        }: JavaScriptParserOptions = {},
+        private readonly sourceFileCache: Map<String, ts.SourceFile> = new Map()
+    ) {
         super({ctx, relativeTo});
         this.compilerOptions = {
             target: ts.ScriptTarget.Latest,
@@ -86,7 +89,8 @@ export class JavaScriptParser extends Parser {
             allowJs: true,
             esModuleInterop: true,
             experimentalDecorators: true,
-            emitDecoratorMetadata: true
+            emitDecoratorMetadata: true,
+            jsx: ts.JsxEmit.Preserve
         };
         this.styles = styles;
     }
@@ -634,7 +638,7 @@ export class JavaScriptParserVisitor {
     }
 
     private mapLiteral(node: ts.LiteralExpression | ts.TrueLiteral | ts.FalseLiteral | ts.NullLiteral | ts.Identifier
-        | ts.TemplateHead | ts.TemplateMiddle | ts.TemplateTail, value: any): J.Literal {
+        | ts.TemplateHead | ts.TemplateMiddle | ts.TemplateTail | ts.JsxText, value: any): J.Literal {
 
         let valueSource = node.getText();
         if (!isValidSurrogateRange(valueSource)) {
@@ -661,10 +665,6 @@ export class JavaScriptParserVisitor {
         return this.mapLiteral(node, node.text); // FIXME value not in AST
     }
 
-    visitJsxText(node: ts.JsxText): J.Unknown {
-        return this.visitUnknown(node);
-    }
-
     visitRegularExpressionLiteral(node: ts.RegularExpressionLiteral): J.Literal {
         return this.mapLiteral(node, node.text); // FIXME value not in AST
     }
@@ -746,8 +746,8 @@ export class JavaScriptParserVisitor {
                 kind: J.Kind.JContainer,
                 before: this.prefix(this.findChildNode(node, ts.SyntaxKind.ExtendsKeyword) ?? this.findChildNode(node, ts.SyntaxKind.EqualsToken)!),
                 elements: [
-                    node.constraint ? this.rightPadded(this.visit(node.constraint), this.suffix(node.constraint)) : this.rightPadded(this.newJEmpty(), emptySpace),
-                    node.default ? this.rightPadded(this.visit(node.default), this.suffix(node.default)) : this.rightPadded(this.newJEmpty(), emptySpace)
+                    node.constraint ? this.rightPadded(this.visit(node.constraint), this.suffix(node.constraint)) : this.rightPadded(this.newEmpty(), emptySpace),
+                    node.default ? this.rightPadded(this.visit(node.default), this.suffix(node.default)) : this.rightPadded(this.newEmpty(), emptySpace)
                 ],
                 markers: emptyMarkers
             }
@@ -1207,9 +1207,9 @@ export class JavaScriptParserVisitor {
                 kind: J.Kind.JContainer,
                 before: this.prefix(node.getChildAt(node.getChildren().findIndex(n => n.pos === node.parameters.pos) - 1)),
                 elements: node.parameters.length == 0 ?
-                    [this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!))]
+                    [this.rightPadded(this.newEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!))]
                     : node.parameters.map(p => this.rightPadded(this.visit(p), this.suffix(p)))
-                        .concat(node.parameters.hasTrailingComma ? this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!)) : []),
+                        .concat(node.parameters.hasTrailingComma ? this.rightPadded(this.newEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!)) : []),
                 markers: emptyMarkers
             },
             returnType: this.leftPadded(this.prefix(this.findChildNode(node, ts.SyntaxKind.EqualsGreaterThanToken)!), this.convert(node.type))
@@ -1229,9 +1229,9 @@ export class JavaScriptParserVisitor {
                 kind: J.Kind.JContainer,
                 before: this.prefix(node.getChildAt(node.getChildren().findIndex(n => n.pos === node.parameters.pos) - 1)),
                 elements: node.parameters.length == 0 ?
-                    [this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!))]
+                    [this.rightPadded(this.newEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!))]
                     : node.parameters.map(p => this.rightPadded(this.visit(p), this.suffix(p)))
-                        .concat(node.parameters.hasTrailingComma ? this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!)) : []),
+                        .concat(node.parameters.hasTrailingComma ? this.rightPadded(this.newEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!)) : []),
                 markers: emptyMarkers
             },
             returnType: this.leftPadded(this.prefix(this.findChildNode(node, ts.SyntaxKind.EqualsGreaterThanToken)!), this.convert(node.type))
@@ -1297,8 +1297,8 @@ export class JavaScriptParserVisitor {
                 before: emptySpace,
                 elements: node.elements.length > 0 ?
                     node.elements.map(p => this.rightPadded(this.convert(p), this.suffix(p)))
-                        .concat(node.elements.hasTrailingComma ? this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseBracketToken)!)) : [])
-                    : [this.rightPadded(this.newJEmpty(this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseBracketToken)!)), emptySpace)],
+                        .concat(node.elements.hasTrailingComma ? this.rightPadded(this.newEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseBracketToken)!)) : [])
+                    : [this.rightPadded(this.newEmpty(this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseBracketToken)!)), emptySpace)],
                 markers: emptyMarkers
             },
             type: this.mapType(node)
@@ -1339,7 +1339,7 @@ export class JavaScriptParserVisitor {
             prefix: this.prefix(node),
             markers: emptyMarkers,
             types: [
-                ...(initialBar?.kind === ts.SyntaxKind.BarToken ? [this.rightPadded<Expression>(this.newJEmpty(), this.prefix(initialBar))] : []),
+                ...(initialBar?.kind === ts.SyntaxKind.BarToken ? [this.rightPadded<Expression>(this.newEmpty(), this.prefix(initialBar))] : []),
                 ...this.rightPaddedList<ts.Node, Expression>([...node.types], (n) => this.keywordPrefix(ts.SyntaxKind.BarToken, getNextSibling)(n))
             ],
             type: this.mapType(node)
@@ -1354,7 +1354,7 @@ export class JavaScriptParserVisitor {
             prefix: this.prefix(node),
             markers: emptyMarkers,
             types: [
-                ...(initialAmpersand?.kind === ts.SyntaxKind.AmpersandToken ? [this.rightPadded<Expression>(this.newJEmpty(), this.prefix(initialAmpersand))] : []),
+                ...(initialAmpersand?.kind === ts.SyntaxKind.AmpersandToken ? [this.rightPadded<Expression>(this.newEmpty(), this.prefix(initialAmpersand))] : []),
                 ...this.rightPaddedList<ts.Node, Expression>([...node.types], (n) => this.keywordPrefix(ts.SyntaxKind.AmpersandToken, getNextSibling)(n))
             ],
             type: this.mapType(node)
@@ -1522,22 +1522,22 @@ export class JavaScriptParserVisitor {
                 before: this.prefix(this.findChildNode(node, ts.SyntaxKind.ColonToken)!),
                 elements: [this.rightPadded(this.visit(node.type), this.suffix(node.type)),
                     this.findChildNode(node, ts.SyntaxKind.SemicolonToken) ?
-                        this.rightPadded(this.newJEmpty(emptySpace, markers({
+                        this.rightPadded(this.newEmpty(emptySpace, markers({
                             kind: J.Markers.Semicolon,
                             id: randomId()
                         })), this.prefix(node.getLastToken()!))
-                        : this.rightPadded(this.newJEmpty(), this.prefix(node.getLastToken()!))
+                        : this.rightPadded(this.newEmpty(), this.prefix(node.getLastToken()!))
                 ],
                 markers: emptyMarkers
             } : {
                 kind: J.Kind.JContainer,
                 before: emptySpace,
                 elements: [this.findChildNode(node, ts.SyntaxKind.SemicolonToken) ?
-                    this.rightPadded(this.newJEmpty(this.prefix(this.findChildNode(node, ts.SyntaxKind.SemicolonToken)!), markers({
+                    this.rightPadded(this.newEmpty(this.prefix(this.findChildNode(node, ts.SyntaxKind.SemicolonToken)!), markers({
                         kind: J.Markers.Semicolon,
                         id: randomId()
                     })), this.prefix(node.getLastToken()!))
-                    : this.rightPadded(this.newJEmpty(), this.prefix(node.getLastToken()!))
+                    : this.rightPadded(this.newEmpty(), this.prefix(node.getLastToken()!))
                 ],
                 markers: emptyMarkers
             },
@@ -1947,8 +1947,8 @@ export class JavaScriptParserVisitor {
                     parenthesized: isParenthesized,
                     parameters: node.parameters.length > 0 ?
                         node.parameters.map(p => this.rightPadded(this.convert(p), this.suffix(p)))
-                            .concat(node.parameters.hasTrailingComma ? this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!)) : []) :
-                        isParenthesized ? [this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!))] : [],
+                            .concat(node.parameters.hasTrailingComma ? this.rightPadded(this.newEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!)) : []) :
+                        isParenthesized ? [this.rightPadded(this.newEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!))] : [],
                 },
                 arrow: this.prefix(node.equalsGreaterThanToken),
                 body: this.convert(node.body),
@@ -2385,7 +2385,7 @@ export class JavaScriptParserVisitor {
     }
 
     visitOmittedExpression(node: ts.OmittedExpression) {
-        return this.newJEmpty(this.prefix(node));
+        return this.newEmpty(this.prefix(node));
     }
 
     visitExpressionWithTypeArguments(node: ts.ExpressionWithTypeArguments) {
@@ -2467,7 +2467,7 @@ export class JavaScriptParserVisitor {
     }
 
     visitSemicolonClassElement(node: ts.SemicolonClassElement): J.Empty {
-        return this.newJEmpty(this.semicolonPrefix(node));
+        return this.newEmpty(this.semicolonPrefix(node));
     }
 
     visitBlock(node: ts.Block): J.Block {
@@ -2483,7 +2483,7 @@ export class JavaScriptParserVisitor {
     }
 
     visitEmptyStatement(node: ts.EmptyStatement): J.Empty {
-        return this.newJEmpty(this.prefix(node));
+        return this.newEmpty(this.prefix(node));
     }
 
     visitVariableStatement(node: ts.VariableStatement) {
@@ -2610,9 +2610,9 @@ export class JavaScriptParserVisitor {
                             markers: emptyMarkers,
                             expression: this.visit(node.initializer)
                         }, this.suffix(node.initializer))) :
-                    this.rightPadded(this.newJEmpty(), this.suffix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)!))],
+                    this.rightPadded(this.newEmpty(), this.suffix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)!))],
                 condition: node.condition ? this.rightPadded(this.visit(node.condition), this.suffix(node.condition)) :
-                    this.rightPadded(this.newJEmpty(), this.suffix(this.findChildNode(node, ts.SyntaxKind.SemicolonToken)!)),
+                    this.rightPadded(this.newEmpty(), this.suffix(this.findChildNode(node, ts.SyntaxKind.SemicolonToken)!)),
                 update: [node.incrementor ? this.rightPadded(ts.isStatement(node.incrementor) ? this.visit(node.incrementor) : {
                         kind: JS.Kind.ExpressionStatement,
                         id: randomId(),
@@ -2620,7 +2620,7 @@ export class JavaScriptParserVisitor {
                         markers: emptyMarkers,
                         expression: this.visit(node.incrementor)
                     }, this.suffix(node.incrementor)) :
-                    this.rightPadded(this.newJEmpty(this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!)), emptySpace)]
+                    this.rightPadded(this.newEmpty(this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)!)), emptySpace)]
             },
             body: this.rightPadded(
                 this.convert(node.statement),
@@ -3413,52 +3413,148 @@ export class JavaScriptParserVisitor {
         }
     }
 
-    visitJsxElement(node: ts.JsxElement) {
-        return this.visitUnknown(node);
-    }
-
-    visitJsxSelfClosingElement(node: ts.JsxSelfClosingElement) {
-        return this.visitUnknown(node);
-    }
-
-    visitJsxOpeningElement(node: ts.JsxOpeningElement) {
-        return this.visitUnknown(node);
-    }
-
-    visitJsxClosingElement(node: ts.JsxClosingElement) {
-        return this.visitUnknown(node);
-    }
-
-    visitJsxFragment(node: ts.JsxFragment) {
-        return this.visitUnknown(node);
+    visitJsxText(node: ts.JsxText): J.Literal {
+        return this.mapLiteral(node, node.text);
     }
 
-    visitJsxOpeningFragment(node: ts.JsxOpeningFragment) {
-        return this.visitUnknown(node);
+    visitJsxElement(node: ts.JsxElement): JSX.Tag {
+        const attrs = node.openingElement.attributes.properties;
+        return {
+            kind: JS.Kind.JsxTag,
+            id: randomId(),
+            prefix: this.prefix(node),
+            markers: emptyMarkers,
+            openName: this.leftPadded(this.prefix(node.openingElement), this.visit(node.openingElement.tagName)),
+            afterName: attrs.length === 0 ?
+                this.prefix(this.findChildNode(node.openingElement, ts.SyntaxKind.GreaterThanToken)!) :
+                emptySpace,
+            attributes: attrs.length === 0 ?
+                [] :
+                this.mapJsxChildren<Attribute | SpreadAttribute>(
+                    attrs,
+                    this.prefix(this.findChildNode(node.openingElement, ts.SyntaxKind.GreaterThanToken)!),
+                    () => emptyMarkers
+                ),
+            children: node.children.length > 0 ?
+                this.mapJsxChildren<JSX.EmbeddedExpression | JSX.Tag | J.Identifier | J.Literal>(
+                    node.children,
+                    this.prefix(this.findChildNode(node.closingElement, ts.SyntaxKind.LessThanToken)!),
+                    () => emptyMarkers
+                ) :
+                [
+                    this.rightPadded(
+                        this.newEmpty(),
+                        this.prefix(this.findChildNode(node.closingElement, ts.SyntaxKind.LessThanToken)!)
+                    )
+                ],
+            closingName: this.leftPadded(this.prefix(node.closingElement.tagName), this.visit(node.closingElement.tagName)),
+            afterClosingName: this.suffix(node.closingElement.tagName)
+        };
     }
 
-    visitJsxClosingFragment(node: ts.JsxClosingFragment) {
-        return this.visitUnknown(node);
+    visitJsxSelfClosingElement(node: ts.JsxSelfClosingElement): JSX.Tag {
+        const attrs = node.attributes.properties;
+        return {
+            kind: JS.Kind.JsxTag,
+            id: randomId(),
+            prefix: this.prefix(node),
+            markers: emptyMarkers,
+            openName: this.leftPadded(this.prefix(node.tagName), this.visit(node.tagName)),
+            afterName: attrs.length === 0 ?
+                this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken)!) :
+                emptySpace,
+            attributes: attrs.length === 0 ?
+                [] :
+                this.mapJsxChildren<Attribute | SpreadAttribute>(
+                    attrs,
+                    this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken)!),
+                    () => emptyMarkers
+                ),
+            selfClosing: this.prefix(this.findChildNode(node, ts.SyntaxKind.SlashToken)!),
+        };
     }
 
-    visitJsxAttribute(node: ts.JsxAttribute) {
-        return this.visitUnknown(node);
+    visitJsxFragment(node: ts.JsxFragment): JSX.Tag {
+        return {
+            kind: JS.Kind.JsxTag,
+            id: randomId(),
+            prefix: this.prefix(node),
+            markers: emptyMarkers,
+            openName: this.leftPadded(this.prefix(node.openingFragment), this.newEmpty()),
+            afterName: this.prefix(this.findChildNode(node.openingFragment, ts.SyntaxKind.GreaterThanToken)!),
+            attributes: [],
+            children: node.children.length > 0 ?
+                this.mapJsxChildren<JSX.EmbeddedExpression | JSX.Tag | J.Identifier | J.Literal>(
+                    node.children,
+                    this.prefix(this.findChildNode(node.closingFragment, ts.SyntaxKind.LessThanToken)!),
+                    () => emptyMarkers
+                ) :
+                [
+                    this.rightPadded(
+                        this.newEmpty(),
+                        this.prefix(this.findChildNode(node.closingFragment, ts.SyntaxKind.LessThanToken)!)
+                    )
+                ],
+            closingName: this.leftPadded(emptySpace, this.newEmpty()),
+            afterClosingName: emptySpace
+        };
     }
 
-    visitJsxAttributes(node: ts.JsxAttributes) {
-        return this.visitUnknown(node);
+    visitJsxAttribute(node: ts.JsxAttribute): JSX.Attribute {
+        return {
+            kind: JS.Kind.JsxAttribute,
+            id: randomId(),
+            prefix: this.prefix(node),
+            markers: emptyMarkers,
+            key: this.visit(node.name),
+            value: node.initializer
+                ? this.leftPadded(
+                    this.prefix(this.findChildNode(node, ts.SyntaxKind.EqualsToken)!),
+                    this.visit(node.initializer)
+                )
+                : undefined
+        };
     }
 
-    visitJsxSpreadAttribute(node: ts.JsxSpreadAttribute) {
-        return this.visitUnknown(node);
+    visitJsxSpreadAttribute(node: ts.JsxSpreadAttribute): JSX.SpreadAttribute {
+        return {
+            kind: JS.Kind.JsxSpreadAttribute,
+            id: randomId(),
+            prefix: this.prefix(node),
+            markers: emptyMarkers,
+            dots: this.prefix(this.findChildNode(node, ts.SyntaxKind.DotDotDotToken)!),
+            expression: this.rightPadded(this.visit(node.expression),
+                this.suffix(node.expression))
+        };
     }
 
-    visitJsxExpression(node: ts.JsxExpression) {
-        return this.visitUnknown(node);
+    visitJsxExpression(node: ts.JsxExpression): JSX.EmbeddedExpression {
+        return {
+            kind: JS.Kind.JsxEmbeddedExpression,
+            id: randomId(),
+            prefix: this.prefix(node),
+            markers: emptyMarkers,
+            expression: this.rightPadded(
+                node.expression ?
+                    this.convert<Expression>(node.expression) :
+                    this.newEmpty(),
+                this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseBraceToken)!)
+            )
+        };
     }
 
-    visitJsxNamespacedName(node: ts.JsxNamespacedName) {
-        return this.visitUnknown(node);
+    visitJsxNamespacedName(node: ts.JsxNamespacedName): JSX.NamespacedName {
+        return {
+            kind: JS.Kind.JsxNamespacedName,
+            id: randomId(),
+            prefix: this.prefix(node),
+            markers: emptyMarkers,
+            namespace: this.mapIdentifier(node.namespace, node.namespace.getText()),
+            name: this.leftPadded(
+                this.prefix(this.findChildNode(node, ts.SyntaxKind.ColonToken)!),
+                this.mapIdentifier(node.name, node.name.getText())
+            )
+        };
     }
 
     visitCaseClause(node: ts.CaseClause): J.Case {
@@ -3928,7 +4024,7 @@ export class JavaScriptParserVisitor {
             return emptyContainer();
         }
         const prefix = this.prefix(nodes[0]);
-        const args: J.RightPadded<T>[] = this.mapToRightPaddedList(nodes[1] as ts.SyntaxList, this.prefix(nodes[2]), markers);
+        const args: J.RightPadded<T>[] = this.mapToRightPaddedList(nodes[1].getChildren(this.sourceFile), this.prefix(nodes[2]), markers);
         return {
             kind: J.Kind.JContainer,
             before: prefix,
@@ -3937,14 +4033,13 @@ export class JavaScriptParserVisitor {
         };
     }
 
-    private mapToRightPaddedList<T extends J>(node: ts.SyntaxList, lastAfter: J.Space, markers?: (ns: readonly ts.Node[], i: number) => Markers): J.RightPadded<T>[] {
-        let elementList = node.getChildren(this.sourceFile);
+    private mapToRightPaddedList<T extends J>(elementList: readonly ts.Node[], lastAfter: J.Space, markers?: (ns: readonly ts.Node[], i: number) => Markers): J.RightPadded<T>[] {
         let childCount = elementList.length;
 
         const args: J.RightPadded<T>[] = [];
         if (childCount === 0) {
             args.push(this.rightPadded(
-                this.newJEmpty() as T,
+                this.newEmpty() as T,
                 lastAfter,
                 emptyMarkers
             ));
@@ -3965,6 +4060,30 @@ export class JavaScriptParserVisitor {
         return args;
     }
 
+    private mapJsxChildren<T extends J>(elementList: readonly ts.Node[], lastAfter: J.Space, markers?: (ns: readonly ts.Node[], i: number) => Markers): J.RightPadded<T>[] {
+        let childCount = elementList.length;
+
+        const args: J.RightPadded<T>[] = [];
+        if (childCount === 0) {
+            args.push(this.rightPadded(
+                this.newEmpty() as T,
+                lastAfter,
+                emptyMarkers
+            ));
+        } else {
+            for (let i = 0; i < childCount; i++) {
+                const node = elementList[i];
+                const isLast = i === childCount - 1;
+                args.push(this.rightPadded(
+                    this.visit(node),
+                    isLast ? lastAfter : emptySpace,
+                    markers ? markers(elementList, i) : emptyMarkers
+                ));
+            }
+        }
+        return args;
+    }
+
     private mapDecorators(node: ts.ClassDeclaration | ts.FunctionDeclaration | ts.MethodDeclaration | ts.ConstructorDeclaration | ts.ParameterDeclaration | ts.PropertyDeclaration | ts.SetAccessorDeclaration | ts.GetAccessorDeclaration | ts.ClassExpression): J.Annotation[] {
         return node.modifiers?.filter(ts.isDecorator)?.map(this.convert<J.Annotation>) ?? [];
     }
@@ -3983,7 +4102,7 @@ export class JavaScriptParserVisitor {
                             markers: emptyMarkers,
                             annotations: [],
                             modifiers: [],
-                            name: this.newJEmpty(),
+                            name: this.newEmpty(),
                         },
                         this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken)!)) : []),
                 markers: emptyMarkers
@@ -4009,7 +4128,7 @@ export class JavaScriptParserVisitor {
                     markers: emptyMarkers,
                     annotations: [],
                     modifiers: [],
-                    name: this.newJEmpty(),
+                    name: this.newEmpty(),
                 }, this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken)!))]
                 : typeParameters.map(tp => this.rightPadded(this.visit(tp), this.suffix(tp)))
                     .concat(typeParameters.hasTrailingComma ? this.rightPadded(
@@ -4020,7 +4139,7 @@ export class JavaScriptParserVisitor {
                             markers: emptyMarkers,
                             annotations: [],
                             modifiers: [],
-                            name: this.newJEmpty(),
+                            name: this.newEmpty(),
                         },
                         this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken)!)) : []),
         };
@@ -4051,7 +4170,7 @@ export class JavaScriptParserVisitor {
         return undefined;
     }
 
-    private newJEmpty(prefix: J.Space = emptySpace, markers?: Markers): J.Empty {
+    private newEmpty(prefix: J.Space = emptySpace, markers?: Markers): J.Empty {
         return {kind: J.Kind.Empty, id: randomId(), prefix: prefix, markers: markers ?? emptyMarkers};
     }