A bit more type mapping support

openrewrite · Sep 29, 2024 · 3fc2553 · 3fc2553
1 parent 12ff035
commit 3fc2553
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/openrewrite/src/javascript/typeMapping.ts b/openrewrite/src/javascript/typeMapping.ts
@@ -52,14 +52,18 @@ export class JavaScriptTypeMapping {
     private createType(node: ts.Node, type: ts.Type, signature: string): JavaType {
         if (type.isLiteral()) {
             if (type.isNumberLiteral()) {
-                return JavaType.Primitive.of(JavaType.PrimitiveKind.Long);
+                return JavaType.Primitive.of(JavaType.PrimitiveKind.Double);
             } else if (type.isStringLiteral()) {
                 return JavaType.Primitive.of(JavaType.PrimitiveKind.String);
             }
         }
 
         if (type.flags === ts.TypeFlags.Null) {
             return JavaType.Primitive.of(JavaType.PrimitiveKind.Null);
+        } else if (type.flags === ts.TypeFlags.Number) {
+            return JavaType.Primitive.of(JavaType.PrimitiveKind.Double);
+        } else if (type.flags === ts.TypeFlags.String) {
+            return JavaType.Primitive.of(JavaType.PrimitiveKind.String);
         } else if (type.flags === ts.TypeFlags.BooleanLiteral) {
             return JavaType.Primitive.of(JavaType.PrimitiveKind.Boolean);
         } else if (type.flags === ts.TypeFlags.Void) {

diff --git a/openrewrite/test/javascript/parser/binary.test.ts b/openrewrite/test/javascript/parser/binary.test.ts
@@ -1,3 +1,6 @@
+import * as J from "../../../dist/src/java/tree";
+import {JavaType} from "../../../dist/src/java";
+import * as JS from "../../../dist/src/javascript";
 import {connect, disconnect, rewriteRun, typeScript} from '../testHarness';
 
 describe('arithmetic operator mapping', () => {
@@ -7,7 +10,25 @@ describe('arithmetic operator mapping', () => {
     test('plus', () => {
         rewriteRun(
           //language=typescript
-          typeScript('1 + 2')
+          typeScript(
+            '1 + 2',
+            cu => {
+                const binary = <J.Binary>(<JS.ExpressionStatement>cu.statements[0]).expression;
+                expect((<JavaType.Primitive>binary.type).kind).toBe(JavaType.PrimitiveKind.Double);
+            }
+          )
+        );
+    });
+    test('concat', () => {
+        rewriteRun(
+          //language=typescript
+          typeScript(
+            '"1" + 2',
+            cu => {
+                const binary = <J.Binary>(<JS.ExpressionStatement>cu.statements[0]).expression;
+                expect((<JavaType.Primitive>binary.type).kind).toBe(JavaType.PrimitiveKind.String);
+            }
+          )
         );
     });
 

diff --git a/openrewrite/test/javascript/parser/literal.test.ts b/openrewrite/test/javascript/parser/literal.test.ts
@@ -11,7 +11,7 @@ describe('identifier mapping', () => {
         rewriteRunWithOptions(
           {normalizeIndent: false},
           typeScript(' 1', sourceFile => {
-              assertLiteralLst(sourceFile, '1', JavaType.PrimitiveKind.Long);
+              assertLiteralLst(sourceFile, '1', JavaType.PrimitiveKind.Double);
           }));
     });
     test('string', () => {