Variable declaration with using keyword (#188)

Co-authored-by: Andrii Rodionov <[email protected]>

Author: arodionov

openrewrite/src/javascript/parser.ts

@@ -1331,7 +1331,9 @@ export class JavaScriptParserVisitor {
             this.mapTypeParametersAsObject(node),
             new JContainer(
                 this.prefix(node.getChildAt(node.getChildren().findIndex(n => n.pos === node.parameters.pos) - 1)),
-                node.parameters.map(p => this.rightPadded(this.visit(p), this.suffix(p)))
+                node.parameters.length == 0 ?
+                    [this.rightPadded(this.newJEmpty(), 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)!)) : []),
                 Markers.EMPTY),
             this.prefix(this.findChildNode(node, ts.SyntaxKind.EqualsGreaterThanToken)!),
@@ -2123,7 +2125,7 @@ export class JavaScriptParserVisitor {
             randomId(),
             this.prefix(node),
             Markers.EMPTY,
-            this.leftPadded(this.prefix(node.getFirstToken()!), unaryOperator),
+            this.leftPadded(this.suffix(node.operand), unaryOperator),
             this.convert(node.operand),
             this.mapType(node)
         );
@@ -2608,7 +2610,7 @@ export class JavaScriptParserVisitor {
            this.rightPadded(
                this.convert(node.statement),
                this.semicolonPrefix(node.statement),
-               node.statement.getLastToken()?.kind == ts.SyntaxKind.SemicolonToken ? Markers.build([new Semicolon(randomId())]) : Markers.EMPTY
+               node.statement.getChildAt(node.statement.getChildCount() - 1)?.kind == ts.SyntaxKind.SemicolonToken ? Markers.build([new Semicolon(randomId())]) : Markers.EMPTY
            )
         );
     }
@@ -2823,6 +2825,8 @@ export class JavaScriptParserVisitor {
                     ? JS.ScopedVariableDeclarations.Scope.Let
                     : kind?.kind === ts.SyntaxKind.ConstKeyword
                     ? JS.ScopedVariableDeclarations.Scope.Const
+                    : kind?.kind === ts.SyntaxKind.UsingKeyword
+                    ? JS.ScopedVariableDeclarations.Scope.Using
                     : JS.ScopedVariableDeclarations.Scope.Var
             ),
             node.declarations.map((declaration) => {
@@ -3785,7 +3789,7 @@ export class JavaScriptParserVisitor {
     private mapTypeParametersAsJContainer(node: ts.ClassDeclaration | ts.InterfaceDeclaration | ts.ClassExpression): JContainer<J.TypeParameter> | null {
         return node.typeParameters
             ? JContainer.build(
-                this.suffix(this.findChildNode(node, ts.SyntaxKind.Identifier)!),
+                this.prefix(this.findChildNode(node, ts.SyntaxKind.LessThanToken)!),
                 this.mapTypeParametersList(node.typeParameters)
                     .concat(node.typeParameters.hasTrailingComma ? this.rightPadded(
                         new J.TypeParameter(randomId(), Space.EMPTY, Markers.EMPTY, [], [], this.newJEmpty(), null),
@@ -3802,10 +3806,12 @@ export class JavaScriptParserVisitor {
 
         return new J.TypeParameters(
             randomId(),
-            this.prefix(node.getChildAt(node.getChildren().findIndex(n => n.pos === typeParameters[0].pos) - 1)),
+            this.prefix(this.findChildNode(node, ts.SyntaxKind.LessThanToken)!),
             Markers.EMPTY,
             [],
-            typeParameters.map(tp => this.rightPadded(this.visit(tp), this.suffix(tp)))
+            typeParameters.length == 0 ?
+                [this.rightPadded(new J.TypeParameter(randomId(), Space.EMPTY, Markers.EMPTY, [], [], this.newJEmpty(), null), this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken)!))]
+                : typeParameters.map(tp => this.rightPadded(this.visit(tp), this.suffix(tp)))
                 .concat(typeParameters.hasTrailingComma ? this.rightPadded(
                     new J.TypeParameter(randomId(), Space.EMPTY, Markers.EMPTY, [], [], this.newJEmpty(), null),
                     this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken)!)) : []),

openrewrite/src/javascript/tree/tree.ts

@@ -2477,6 +2477,7 @@ export namespace ScopedVariableDeclarations {
             Const = 0,
             Let = 1,
             Var = 2,
+            Using = 3,
 
     }
 

openrewrite/test/javascript/parser/class.test.ts

@@ -553,4 +553,15 @@ describe('class mapping', () => {
         );
     });
 
+    test('new anonymous class with type params', () => {
+        rewriteRun(
+            //language=typescript
+            typeScript(`
+                new (class/*a*/<T extends object> extends WeakRef<T> {
+                    foo = "bar";
+                })({hello: "world"});
+            `)
+        );
+    });
+
 });

openrewrite/test/javascript/parser/interface.test.ts

@@ -389,4 +389,15 @@ describe('interface mapping', () => {
         );
     });
 
+    test('function type with empty args', () => {
+        rewriteRun(
+            //language=typescript
+            typeScript(`
+                export interface ProxyCursorHooks {
+                    getValue?: (/*a*/)=> any;
+                }
+            `)
+        );
+    });
+
 });

openrewrite/test/javascript/parser/typeAlias.test.ts

@@ -261,4 +261,13 @@ describe('type alias mapping', () => {
         );
     });
 
+    test('type with empty type argument', () => {
+        rewriteRun(
+            //language=typescript
+            typeScript(`
+                type A/*a*/</*b*/>/*c*/ = {/*d*/}
+            `)
+        );
+    });
+
 });

openrewrite/test/javascript/parser/unary.test.ts

@@ -64,4 +64,11 @@ describe('postfix operator mapping', () => {
           typeScript('a--;')
         );
     });
+
+    test('unary with comments', () => {
+        rewriteRun(
+            //language=typescript
+            typeScript('/*a*/a/*b*/++/*c*/;')
+        );
+    });
 });

openrewrite/test/javascript/parser/variableDeclarations.test.ts

@@ -178,4 +178,13 @@ describe('variable declaration mapping', () => {
           `)
         );
     });
+
+    test('variable with using keyword', () => {
+        rewriteRun(
+            //language=typescript
+            typeScript(`
+                using unrefTimer = stub(Deno, 'unrefTimer');
+            `)
+        );
+    });
 });

openrewrite/test/javascript/parser/while.test.ts

@@ -52,4 +52,13 @@ describe('while mapping', () => {
             `)
         );
     });
+
+
+    test('while-if with semicolon', () => {
+        rewriteRun(
+            //language=typescript
+            typeScript('while (i--) if (nodeList[i] == elem) return true;')
+        );
+    });
+
 });

rewrite-javascript-remote/src/main/java/org/openrewrite/javascript/remote/JavaScriptReceiver.java

@@ -1,11 +1,11 @@
 /*
  * Copyright 2024 the original author or authors.
  * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Moderne Source Available License (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
+ * https://docs.moderne.io/licensing/moderne-source-available-license
  * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

rewrite-javascript-remote/src/main/java/org/openrewrite/javascript/remote/JavaScriptSender.java

@@ -1,11 +1,11 @@
 /*
  * Copyright 2024 the original author or authors.
  * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Moderne Source Available License (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
+ * https://docs.moderne.io/licensing/moderne-source-available-license
  * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,