Basic support for if

The `else` part is not yet covered.
openrewrite · Sep 30, 2024 · 7046854 · 7046854
1 parent 413949a
commit 7046854
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/openrewrite/src/javascript/parser.ts b/openrewrite/src/javascript/parser.ts
@@ -215,7 +215,7 @@ export class JavaScriptParserVisitor {
 
     private semicolonPaddedStatementList(statements: ts.NodeArray<ts.Statement>) {
         return this.rightPaddedList([...statements], this.semicolonPrefix, n => {
-            const last = n.getLastToken();
+            const last = n.getChildAt(n.getChildCount(this.sourceFile) - 1, this.sourceFile);
             return last?.kind == ts.SyntaxKind.SemicolonToken ? Markers.build([new Semicolon(randomId())]) : Markers.EMPTY;
         });
     }
@@ -1193,7 +1193,24 @@ export class JavaScriptParserVisitor {
     }
 
     visitIfStatement(node: ts.IfStatement) {
-        return this.visitUnknown(node);
+        const semicolonAfterThen = node.thenStatement.getLastToken()?.kind == ts.SyntaxKind.SemicolonToken;
+        return new J.If(
+            randomId(),
+            this.prefix(node),
+            Markers.EMPTY,
+            new J.ControlParentheses(
+                randomId(),
+                this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)!),
+                Markers.EMPTY,
+                this.rightPadded(this.visit(node.expression), this.suffix(node.expression))
+            ),
+            this.rightPadded(
+                this.convert(node.thenStatement),
+                semicolonAfterThen ? this.prefix(node.thenStatement.getLastToken()!) : Space.EMPTY,
+                semicolonAfterThen ? Markers.build([new Semicolon(randomId())]) : Markers.EMPTY
+            ),
+            node.elseStatement ? this.visit(node.elseStatement) : null
+        );
     }
 
     visitDoStatement(node: ts.DoStatement) {
@@ -1828,6 +1845,15 @@ export class JavaScriptParserVisitor {
             this.prefix(nodes[nodes.length - 1])
         );
     }
+
+    private findChildNode(node: ts.Node, kind: ts.SyntaxKind): ts.Node | undefined {
+        for (let i = 0; i < node.getChildCount(); i++) {
+            if (node.getChildAt(i).kind == kind) {
+                return node.getChildAt(i);
+            }
+        }
+        return undefined;
+    }
 }
 
 function prefixFromNode(node: ts.Node, sourceFile: ts.SourceFile): Space {

diff --git a/openrewrite/test/javascript/parser/if.test.ts b/openrewrite/test/javascript/parser/if.test.ts
@@ -0,0 +1,13 @@
+import {connect, disconnect, rewriteRun, typeScript} from '../testHarness';
+
+describe('if mapping', () => {
+    beforeAll(() => connect());
+    afterAll(() => disconnect());
+
+    test('simple', () => {
+        rewriteRun(
+          //language=typescript
+          typeScript('if (true) console.log("foo");')
+        );
+    });
+});