Merge pull request #55 from southworks/issue_51

parameters type inference
southworks · Oct 6, 2022 · c8aa2b7 · c8aa2b7
2 parents 034cef6 + 4e721eb
commit c8aa2b7
Show file tree

Hide file tree

Showing 8 changed files with 180 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@southworks/codeverter",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Convert TypeScript code into different languages",
   "main": "lib/lib.js",
   "bin": {
@@ -67,4 +67,4 @@
       }
     }
   }
-}
+}
diff --git a/src/shared/parameter.ts b/src/shared/parameter.ts
@@ -10,4 +10,12 @@ import { ParameterDeclaration } from "typescript";
 import { TypedClassElement } from "./types/typed-class-element";
 
 export class Parameter extends TypedClassElement<ParameterDeclaration> {
+    public parse(node: ParameterDeclaration): void {
+        super.parse(node);
+        // if still void use any instead
+        if (this.knownType == "void") {
+            this.knownType = "any";
+            this.type = "any";
+        }
+    }
 }
diff --git a/src/shared/type-mapper.ts b/src/shared/type-mapper.ts
@@ -31,7 +31,7 @@ interface InitializerNode extends TypedDeclaration {
 
 export type TypeMapperResult = { knownType: KnownTypes, type: string | KnownTypes };
 
-export type KnownTypes = "number" | "string" | "boolean" | "date" | "reference" | "void" | "array";
+export type KnownTypes = "number" | "string" | "boolean" | "date" | "reference" | "void" | "array" | "any";
 
 export class TypeMapper {
     private static isGenericArray(node?: TypeNode): node is NodeWithTypeArguments {
@@ -78,6 +78,8 @@ export class TypeMapper {
             case SyntaxKind.ArrayType:
             case SyntaxKind.TupleType:
                 return "array";
+            case SyntaxKind.AnyKeyword:
+                return "any";
             default: {
                 const isReference = typeNode?.kind == SyntaxKind.TypeReference
                     || typeNode?.kind == SyntaxKind.Identifier

diff --git a/src/templating/csharp/csharp-helpers.ts b/src/templating/csharp/csharp-helpers.ts
@@ -53,6 +53,7 @@ export function getCSharpHelpers(helpers: TemplateHelper & CSharpHelpers): CShar
                     case "reference": return t;
                     case "void": return "void";
                     case "array": return `${fn(t, "")}[]`;
+                    case "any": return "object";
                     default:
                         return "error";
                 }

diff --git a/src/templating/go/go-helpers.ts b/src/templating/go/go-helpers.ts
@@ -58,6 +58,7 @@ export function getGoHelpers(helpers: TemplateHelper & GoHelpers): GoHelpers {
                     case "reference": return `*${t}`;
                     case "void": return "";
                     case "array": return `[]${fn(t, "")}`;
+                    case "any": return "interface{}";
                     default:
                         return "error";
                 }

diff --git a/src/test/csharp/method.spec.ts b/src/test/csharp/method.spec.ts
@@ -1345,4 +1345,96 @@ describe("CSharp: method", () => {
             expect(strWritter.getString()).toBe(expected.getString());
         });
     });
+
+    describe("parameters", () => {
+        test("explicit", () => {
+            const code = new StringWritter();
+            code.write("export class Test {");
+            code.write("    public method(val: number) {");
+            code.write("        return val + 2;");
+            code.write("    }");
+            code.write("}");
+
+            let compilationResult = compileTypeScriptCode(code.getString(), "test.ts");
+
+            const strWritter = new StringWritter();
+            printFile(compilationResult, new CSharpGenerator(), strWritter);
+
+            const expected = new StringWritter();
+            expected.write("namespace Test");
+            expected.write("{");
+            expected.write("    public class Test");
+            expected.write("    {");
+            expected.write("        public int Method(int val)");
+            expected.write("        {");
+            expected.write("            //         return val + 2;");
+            expected.write("            return 0;");
+            expected.write("        }");
+            expected.write("    }");
+            expected.write("}");
+            expected.write("");
+
+            expect(strWritter.getString()).toBe(expected.getString());
+        });
+
+        test("infer any", () => {
+            const code = new StringWritter();
+            code.write("export class Test {");
+            code.write("    public method(val) {");
+            code.write("        return val + 1;");
+            code.write("    }");
+            code.write("}");
+
+            let compilationResult = compileTypeScriptCode(code.getString(), "test.ts");
+
+            const strWritter = new StringWritter();
+            printFile(compilationResult, new CSharpGenerator(), strWritter);
+
+            const expected = new StringWritter();
+            expected.write("namespace Test");
+            expected.write("{");
+            expected.write("    public class Test");
+            expected.write("    {");
+            expected.write("        public void Method(object val)");
+            expected.write("        {");
+            expected.write("            //         return val + 1;");
+            expected.write("            return;");
+            expected.write("        }");
+            expected.write("    }");
+            expected.write("}");
+            expected.write("");
+
+            expect(strWritter.getString()).toBe(expected.getString());
+        });
+
+        test("explicit any", () => {
+            const code = new StringWritter();
+            code.write("export class Test {");
+            code.write("    public method(val: any) {");
+            code.write("        return val + 1;");
+            code.write("    }");
+            code.write("}");
+
+            let compilationResult = compileTypeScriptCode(code.getString(), "test.ts");
+
+            const strWritter = new StringWritter();
+            printFile(compilationResult, new CSharpGenerator(), strWritter);
+
+            const expected = new StringWritter();
+            expected.write("namespace Test");
+            expected.write("{");
+            expected.write("    public class Test");
+            expected.write("    {");
+            expected.write("        public void Method(object val)");
+            expected.write("        {");
+            expected.write("            //         return val + 1;");
+            expected.write("            return;");
+            expected.write("        }");
+            expected.write("    }");
+            expected.write("}");
+            expected.write("");
+
+            expect(strWritter.getString()).toBe(expected.getString());
+        });
+    });
 });
diff --git a/src/test/go/method.spec.ts b/src/test/go/method.spec.ts
@@ -1200,4 +1200,75 @@ describe("GO: method", () => {
             expect(strWritter.getString()).toBe(expected.getString());
         });
     });
+
+    describe("parameters", () => {
+        test("explicit", () => {
+            const code = new StringWritter();
+            code.write("function method(val: number) {");
+            code.write("    return val + 2;");
+            code.write("}");
+
+            let compilationResult = compileTypeScriptCode(code.getString(), "test.ts");
+
+            const strWritter = new StringWritter();
+            printFile(compilationResult, new GoGenerator(), strWritter);
+
+            const expected = new StringWritter();
+            expected.write("package test");
+            expected.write("");
+            expected.write("func Method(val int) int {");
+            expected.write("\t//    return val + 2;");
+            expected.write("\treturn 0");
+            expected.write("}");
+            expected.write("");
+
+            expect(strWritter.getString()).toBe(expected.getString());
+        });
+
+        test("infer any", () => {
+            const code = new StringWritter();
+            code.write("function method(val) {");
+            code.write("    return val + 1;");
+            code.write("}");
+
+            let compilationResult = compileTypeScriptCode(code.getString(), "test.ts");
+
+            const strWritter = new StringWritter();
+            printFile(compilationResult, new GoGenerator(), strWritter);
+
+            const expected = new StringWritter();
+            expected.write("package test");
+            expected.write("");
+            expected.write("func Method(val interface{}) {");
+            expected.write("\t//    return val + 1;");
+            expected.write("\treturn");
+            expected.write("}");
+            expected.write("");
+
+            expect(strWritter.getString()).toBe(expected.getString());
+        });
+
+        test("explicit any", () => {
+            const code = new StringWritter();
+            code.write("function method(val: any) {");
+            code.write("    return val + 1;");
+            code.write("}");
+
+            let compilationResult = compileTypeScriptCode(code.getString(), "test.ts");
+
+            const strWritter = new StringWritter();
+            printFile(compilationResult, new GoGenerator(), strWritter);
+
+            const expected = new StringWritter();
+            expected.write("package test");
+            expected.write("");
+            expected.write("func Method(val interface{}) {");
+            expected.write("\t//    return val + 1;");
+            expected.write("\treturn");
+            expected.write("}");
+            expected.write("");
+
+            expect(strWritter.getString()).toBe(expected.getString());
+        });
+    });
 });