@openrewrite/rewrite 8.57.0-SNAPSHOT → 8.57.0

package/dist/src/javascript/parser.js

@@ -175,7 +175,10 @@ class JavaScriptParserVisitor {
             };
         };
         this.semicolonPrefix = (node) => {
-            const last = node.getChildren(this.sourceFile).slice(-1)[0];
+            let last = node.getChildren(this.sourceFile).slice(-1)[0];
+            if (last && (last.kind === typescript_1.default.SyntaxKind.ExpressionStatement || last.kind == typescript_1.default.SyntaxKind.DoStatement)) {
+                last = last.getLastToken(this.sourceFile);
+            }
             return (last === null || last === void 0 ? void 0 : last.kind) === typescript_1.default.SyntaxKind.SemicolonToken ? this.prefix(last) : java_1.emptySpace;
         };
         this.keywordPrefix = (token, findSibling) => (node) => {
@@ -243,8 +246,11 @@ class JavaScriptParserVisitor {
             if (j.kind === java_1.J.Kind.Unknown) {
                 return this.rightPadded(j, java_1.emptySpace, __1.emptyMarkers);
             }
+            let last = n.getChildAt(n.getChildCount(this.sourceFile) - 1, this.sourceFile);
+            if (last && (last.kind === typescript_1.default.SyntaxKind.ExpressionStatement || last.kind == typescript_1.default.SyntaxKind.DoStatement) && n.kind === typescript_1.default.SyntaxKind.LabeledStatement) {
+                last = last.getLastToken(this.sourceFile);
+            }
             return this.rightPadded(j, this.semicolonPrefix(n), (_a = (n => {
-                const last = n.getChildAt(n.getChildCount(this.sourceFile) - 1, this.sourceFile);
                 return (last === null || last === void 0 ? void 0 : last.kind) === typescript_1.default.SyntaxKind.SemicolonToken ? (0, __1.markers)({
                     kind: java_1.J.Markers.Semicolon,
                     id: (0, __1.randomId)()
@@ -780,7 +786,7 @@ class JavaScriptParserVisitor {
         const markers = (0, immer_1.produce)(__1.emptyMarkers, draft => {
             if (node.asteriskToken) {
                 draft.markers.push({
-                    kind: _1.JS.Markers.Asterisk,
+                    kind: _1.JS.Markers.Generator,
                     id: (0, __1.randomId)(),
                     prefix: this.prefix(node.asteriskToken)
                 });
@@ -1570,29 +1576,54 @@ class JavaScriptParserVisitor {
         }
         else if (node.questionDotToken) {
             select = this.rightPadded((0, immer_1.produce)(this.convert(node.expression), draft => {
-                if (node.questionDotToken) {
-                    draft.markers.markers.push({
+                draft.markers.markers.push({
+                    kind: _1.JS.Markers.Optional,
+                    id: (0, __1.randomId)(),
+                    prefix: java_1.emptySpace,
+                });
+            }), this.suffix(node.expression));
+        }
+        else if (typescript_1.default.isPropertyAccessExpression(node.expression)) {
+            select = this.rightPadded(this.visit(node.expression.expression), this.suffix(node.expression.expression));
+            if (node.expression.questionDotToken) {
+                select = (0, immer_1.produce)(select, draft => {
+                    draft.element.markers.markers.push({
                         kind: _1.JS.Markers.Optional,
                         id: (0, __1.randomId)(),
-                        prefix: this.suffix(node.expression)
+                        prefix: java_1.emptySpace
                     });
-                }
-            }), java_1.emptySpace);
+                });
+            }
+            name = this.visit(node.expression.name);
         }
         else {
             select = this.rightPadded(this.visit(node.expression), this.suffix(node.expression));
         }
-        return {
-            kind: java_1.J.Kind.MethodInvocation,
-            id: (0, __1.randomId)(),
-            prefix,
-            markers: __1.emptyMarkers,
-            select,
-            typeParameters: typeArguments,
-            name,
-            arguments: this.mapCommaSeparatedList(node.getChildren(this.sourceFile).slice(-3)),
-            methodType: this.mapMethodType(node)
-        };
+        if (name && name.simpleName.length > 0) {
+            return {
+                kind: java_1.J.Kind.MethodInvocation,
+                id: (0, __1.randomId)(),
+                prefix,
+                markers: __1.emptyMarkers,
+                select,
+                typeParameters: typeArguments,
+                name,
+                arguments: this.mapCommaSeparatedList(node.getChildren(this.sourceFile).slice(-3)),
+                methodType: this.mapMethodType(node)
+            };
+        }
+        else {
+            return {
+                kind: _1.JS.Kind.FunctionCall,
+                id: (0, __1.randomId)(),
+                prefix,
+                markers: __1.emptyMarkers,
+                function: select,
+                typeParameters: typeArguments,
+                arguments: this.mapCommaSeparatedList(node.getChildren(this.sourceFile).slice(-3)),
+                functionType: this.mapMethodType(node)
+            };
+        }
     }
     visitSuperKeyword(node) {
         return this.mapIdentifier(node, node.getText());
@@ -2101,12 +2132,11 @@ class JavaScriptParserVisitor {
     }
     visitAsExpression(node) {
         return {
-            kind: _1.JS.Kind.Binary,
+            kind: _1.JS.Kind.As,
             id: (0, __1.randomId)(),
             prefix: this.prefix(node),
             markers: __1.emptyMarkers,
-            left: this.convert(node.expression),
-            operator: this.leftPadded(this.prefix(node.getChildAt(1, this.sourceFile)), _1.JS.Binary.Type.As),
+            left: this.rightPadded(this.convert(node.expression), this.prefix(node.getChildAt(1, this.sourceFile))),
             right: this.convert(node.type),
             type: this.mapType(node),
         };
@@ -2364,16 +2394,22 @@ class JavaScriptParserVisitor {
                         }
                         else if (typescript_1.default.isArrayLiteralExpression(node.initializer)) {
                             return this.rightPadded({
-                                kind: _1.JS.Kind.ArrayBindingPattern,
+                                kind: _1.JS.Kind.ExpressionStatement,
                                 id: (0, __1.randomId)(),
-                                elements: {
-                                    kind: java_1.J.Kind.Container,
-                                    before: java_1.emptySpace,
-                                    elements: node.initializer.elements.map(e => this.rightPadded(this.visit(e), this.suffix(e))),
-                                    markers: __1.emptyMarkers
-                                },
+                                prefix: java_1.emptySpace,
                                 markers: __1.emptyMarkers,
-                                prefix: java_1.emptySpace
+                                expression: {
+                                    kind: _1.JS.Kind.ArrayBindingPattern,
+                                    id: (0, __1.randomId)(),
+                                    elements: {
+                                        kind: java_1.J.Kind.Container,
+                                        before: java_1.emptySpace,
+                                        elements: node.initializer.elements.map(e => this.rightPadded(this.visit(e), this.suffix(e))),
+                                        markers: __1.emptyMarkers
+                                    },
+                                    markers: __1.emptyMarkers,
+                                    prefix: java_1.emptySpace
+                                },
                             }, this.suffix(node.initializer));
                         }
                         else if (typescript_1.default.isObjectLiteralExpression(node.initializer)) {
@@ -2471,24 +2507,13 @@ class JavaScriptParserVisitor {
         };
     }
     visitLabeledStatement(node) {
-        var _a;
         return {
             kind: java_1.J.Kind.Label,
             id: (0, __1.randomId)(),
             prefix: this.prefix(node),
             markers: __1.emptyMarkers,
             label: this.rightPadded(this.visit(node.label), this.suffix(node.label)),
-            statement: {
-                kind: _1.JS.Kind.TrailingTokenStatement,
-                id: (0, __1.randomId)(),
-                prefix: java_1.emptySpace,
-                markers: __1.emptyMarkers,
-                expression: this.rightPadded(this.visit(node.statement), this.semicolonPrefix(node.statement), ((_a = node.statement.getChildAt(node.statement.getChildCount() - 1)) === null || _a === void 0 ? void 0 : _a.kind) === typescript_1.default.SyntaxKind.SemicolonToken ? (0, __1.markers)({
-                    kind: java_1.J.Markers.Semicolon,
-                    id: (0, __1.randomId)()
-                }) : __1.emptyMarkers),
-                type: this.mapType(node.statement)
-            }
+            statement: this.visit(node.statement),
         };
     }
     visitThrowStatement(node) {
@@ -2655,7 +2680,7 @@ class JavaScriptParserVisitor {
                 });
                 if (node.asteriskToken) {
                     draft.markers.push({
-                        kind: _1.JS.Markers.Asterisk,
+                        kind: _1.JS.Markers.Generator,
                         id: (0, __1.randomId)(),
                         prefix: this.prefix(node.asteriskToken)
                     });