Merge pull request #55 from Perryvw/feature/alias-calls

Perryvw · web-flow · commit 5467e7d4a638 · 2018-02-25T21:00:04.000+01:00
Alias call first draft
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -790,7 +790,19 @@ export class LuaTranspiler {
             // Include context parameter if present
             if (expType && expType.symbol) {
                 const funcName = node.expression.name.escapedText;
-                const funcHolder = tsEx.findMemberHolder(expType, funcName, this.checker);
+                let funcHolder = tsEx.findMemberHolder(expType, funcName, this.checker);
+
+                // ===== EXPERIMENTAL https://github.com/Perryvw/TypescriptToLua/issues/56
+                if (ts.isParenthesizedExpression(node.expression.expression) 
+                    && (ts.isAsExpression(node.expression.expression.expression) 
+                     || ts.isTypeAssertion(node.expression.expression.expression))
+                    && ts.isTypeReferenceNode(node.expression.expression.expression.type)) {
+                    const castTypeNode = node.expression.expression.expression.type;
+                    if (this.checker.getTypeFromTypeNode(castTypeNode).symbol.name == funcHolder) {
+                        funcHolder = castTypeNode.getText();
+                    }
+                }
+                // ===== END EXPERIMENTAL
 
                 if (funcHolder === undefined) {
                     throw new TranspileError(`Could not find func ${funcName} on ${expType.symbol.name}`, node);
diff --git a/test/integration/classInstanceCalls.spec.ts b/test/integration/classInstanceCalls.spec.ts
@@ -34,4 +34,16 @@ export class ClassInstanceCallTests {
         const lua = util.transpileFile("test/integration/testfiles/classInstanceCall4.ts");
         this.ExpectEqualToFile(lua, "test/integration/testfiles/classInstanceCall4.lua");
     }
+
+    @Test("aliasCastCall")
+    public aliasCastCall() {
+        const lua = util.transpileFile("test/integration/testfiles/aliasCastCall.ts");
+        this.ExpectEqualToFile(lua, "test/integration/testfiles/aliasCall.lua");
+    }
+
+    @Test("aliasAsCall")
+    public aliasAsCall() {
+        const lua = util.transpileFile("test/integration/testfiles/aliasAsCall.ts");
+        this.ExpectEqualToFile(lua, "test/integration/testfiles/aliasCall.lua");
+    }
 }
diff --git a/test/integration/testfiles/aliasAsCall.ts b/test/integration/testfiles/aliasAsCall.ts
@@ -0,0 +1,8 @@
+declare class ClassA {
+    myFunc();
+}
+declare type MyAlias = ClassA;
+declare var x: ClassA;
+
+x.myFunc();
+(x as MyAlias).myFunc();
diff --git a/test/integration/testfiles/aliasCall.lua b/test/integration/testfiles/aliasCall.lua
@@ -0,0 +1,2 @@
+ClassA.myFunc(x)
+MyAlias.myFunc((x))
diff --git a/test/integration/testfiles/aliasCastCall.ts b/test/integration/testfiles/aliasCastCall.ts
@@ -0,0 +1,8 @@
+declare class ClassA {
+    myFunc();
+}
+declare type MyAlias = ClassA;
+declare var x: ClassA;
+
+x.myFunc();
+(<MyAlias>x).myFunc();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ClassA.myFunc(x)`
	`2`	`+MyAlias.myFunc((x))`