Fix for arrow functions

Perryvw · Perryvw · commit 791f13674630 · 2018-01-14T13:50:36.000+01:00
diff --git a/dist/Transpiler.js b/dist/Transpiler.js
@@ -33,7 +33,7 @@ var LuaTranspiler = /** @class */ (function () {
     // Transpile a source file
     LuaTranspiler.transpileSourceFile = function (node, checker) {
         var transpiler = new LuaTranspiler(checker);
-        return transpiler.transpileBlock(node);
+        return "require(\"lib.typescript\")\n" + transpiler.transpileBlock(node);
     };
     LuaTranspiler.prototype.pushIndent = function () {
         this.indent = this.indent + "    ";
@@ -311,7 +311,7 @@ var LuaTranspiler = /** @class */ (function () {
                 return this.transpileObjectLiteral(node);
             case ts.SyntaxKind.FunctionExpression:
             case ts.SyntaxKind.ArrowFunction:
-                return this.transpileFunctionExpression(node);
+                return this.transpileArrowFunction(node);
             case ts.SyntaxKind.NewExpression:
                 return this.transpileNewExpression(node);
             case ts.SyntaxKind.ComputedPropertyName:
@@ -365,7 +365,7 @@ var LuaTranspiler = /** @class */ (function () {
         var condition = this.transpileExpression(node.condition);
         var val1 = this.transpileExpression(node.whenTrue);
         var val2 = this.transpileExpression(node.whenFalse);
-        return "ITE(" + condition + ",function() return " + val1 + " end, function() return " + val2 + " end)";
+        return "TS_ITE(" + condition + ",function() return " + val1 + " end, function() return " + val2 + " end)";
     };
     // Replace some missmatching operators
     LuaTranspiler.prototype.transpileOperator = function (operator) {
@@ -699,6 +699,23 @@ var LuaTranspiler = /** @class */ (function () {
         this.popIndent();
         return result + this.indent + "end ";
     };
+    LuaTranspiler.prototype.transpileArrowFunction = function (node) {
+        // Build parameter string
+        var paramNames = [];
+        node.parameters.forEach(function (param) {
+            paramNames.push(param.name.escapedText);
+        });
+        if (ts.isBlock(node.body)) {
+            var result = "function(" + paramNames.join(",") + ")\n";
+            this.pushIndent();
+            result += this.transpileBlock(node.body);
+            this.popIndent();
+            return result + this.indent + "end ";
+        }
+        else {
+            return "function(" + paramNames.join(",") + ") return " + this.transpileExpression(node.body) + " end";
+        }
+    };
     return LuaTranspiler;
 }());
 exports.LuaTranspiler = LuaTranspiler;
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -15,7 +15,7 @@ export class LuaTranspiler {
     // Transpile a source file
     static transpileSourceFile(node: ts.SourceFile, checker: ts.TypeChecker): string {
         let transpiler = new LuaTranspiler(checker);
-        return transpiler.transpileBlock(node);
+        return "require(\"lib.typescript\")\n" + transpiler.transpileBlock(node);
     }
 
     indent: string;
@@ -343,7 +343,7 @@ export class LuaTranspiler {
                 return this.transpileObjectLiteral(<ts.ObjectLiteralExpression>node);
             case ts.SyntaxKind.FunctionExpression:
             case ts.SyntaxKind.ArrowFunction:
-                return this.transpileFunctionExpression(<ts.FunctionExpression>node);
+                return this.transpileArrowFunction(<ts.ArrowFunction>node);
             case ts.SyntaxKind.NewExpression:
                 return this.transpileNewExpression(<ts.NewExpression>node);
             case ts.SyntaxKind.ComputedPropertyName:
@@ -401,7 +401,7 @@ export class LuaTranspiler {
         let val1 = this.transpileExpression(node.whenTrue);
         let val2 = this.transpileExpression(node.whenFalse);
 
-        return `ITE(${condition},function() return ${val1} end, function() return ${val2} end)`;
+        return `TS_ITE(${condition},function() return ${val1} end, function() return ${val2} end)`;
     }
 
     // Replace some missmatching operators
@@ -786,4 +786,22 @@ export class LuaTranspiler {
         this.popIndent();
         return result + this.indent + "end ";
     }
+
+    transpileArrowFunction(node: ts.ArrowFunction): string {
+        // Build parameter string
+        let paramNames: string[] = [];
+        node.parameters.forEach(param => {
+            paramNames.push(<string>(<ts.Identifier>param.name).escapedText);
+        });
+
+        if (ts.isBlock(node.body)) {
+            let result = `function(${paramNames.join(",")})\n`;
+            this.pushIndent();
+            result += this.transpileBlock(node.body);
+            this.popIndent();
+            return result + this.indent + "end ";
+        } else {
+            return `function(${paramNames.join(",")}) return ` + this.transpileExpression(node.body) + " end";
+        }
+    }
 }
