Fixed namespace translation test and almsot every other translation tes

lolleko · lolleko · commit 2cd0859a7f4c · 2019-01-20T20:51:00.000+01:00
diff --git a/src/LuaPrinter.ts b/src/LuaPrinter.ts
@@ -308,7 +308,7 @@ export class LuaPrinter {
             paramterArr.push(this.printDotsLiteral(expression.dots));
         }
 
-        let result = `function (${paramterArr.join(", ")})\n`;
+        let result = `function(${paramterArr.join(", ")})\n`;
         this.pushIndent();
         result += this.printBlock(expression.body);
         this.popIndent();
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -80,6 +80,20 @@ export class LuaTransformer {
         this.isModule = tsHelper.isFileModule(node);
 
         const statements = this.transformStatements(node.statements);
+        if (this.isModule) {
+            statements.unshift(
+                tstl.createVariableDeclarationStatement(
+                    tstl.createIdentifier("exports"),
+                    tstl.createBinaryExpression(
+                        tstl.createIdentifier("exports"),
+                        tstl.createTableExpression(),
+                        tstl.SyntaxKind.OrOperator
+                    )));
+            statements.push(
+                tstl.createReturnStatement(
+                    [tstl.createIdentifier("exports")]
+                ));
+        }
 
         return [tstl.createBlock(statements, undefined, node), this.luaLibFeatureSet];
     }
@@ -738,11 +752,11 @@ export class LuaTransformer {
             const namespaceDeclaration = tstl.createAssignmentStatement(
                 tstl.createTableIndexExpression(
                     this.transformIdentifier(this.currentNamespace.name as ts.Identifier),
-                    this.transformIdentifier(statement.name as ts.Identifier)),
+                    tstl.createStringLiteral(this.transformIdentifier(statement.name as ts.Identifier).text)),
                 tstl.createBinaryExpression(
                     tstl.createTableIndexExpression(
                         this.transformIdentifier(this.currentNamespace.name as ts.Identifier),
-                        this.transformIdentifier(statement.name as ts.Identifier)),
+                        tstl.createStringLiteral(this.transformIdentifier(statement.name as ts.Identifier).text)),
                     tstl.createTableExpression(),
                     tstl.SyntaxKind.OrOperator));
 
@@ -753,7 +767,7 @@ export class LuaTransformer {
                 this.transformIdentifier(statement.name as ts.Identifier),
                 tstl.createTableIndexExpression(
                     this.transformIdentifier(this.currentNamespace.name as ts.Identifier),
-                    this.transformIdentifier(statement.name as ts.Identifier)));
+                    tstl.createStringLiteral(this.transformIdentifier(statement.name as ts.Identifier).text)));
 
             result.push(localDeclaration);
         } else if (this.isModule && (ts.getCombinedModifierFlags(statement) & ts.ModifierFlags.Export)) {
@@ -775,16 +789,17 @@ export class LuaTransformer {
             result.push(localDeclaration);
         } else {
             // local NS = NS or {}
-            const localDeclaration = tstl.createVariableDeclarationStatement(
+            // TODO this is somewhat redundant since createLocalOrGlobalDeclaration also handles exports
+            const localDeclaration = this.createLocalOrGlobalDeclaration(
                 this.transformIdentifier(statement.name as ts.Identifier),
                 tstl.createBinaryExpression(
-                    tstl.createIdentifier("NS"),
+                    this.transformIdentifier(statement.name as ts.Identifier),
                     tstl.createTableExpression(),
                     tstl.SyntaxKind.OrOperator
                 )
             );
 
-            result.push(localDeclaration);
+            result.push(...localDeclaration);
         }
 
         // Set current namespace for nested NS
@@ -794,7 +809,7 @@ export class LuaTransformer {
 
         // Transform moduleblock to block and visit it
         if (statement.body && ts.isModuleBlock(statement.body)) {
-            result.push(...this.transformStatements(statement.body.statements));
+            result.push(tstl.createDoStatement(this.transformStatements(statement.body.statements)));
         }
 
         this.currentNamespace = previousNamespace;
diff --git a/test/translation/lua/classExtension1.lua b/test/translation/lua/classExtension1.lua
@@ -1,2 +1,2 @@
-MyClass.myFunction = function (self)
+MyClass.myFunction = function(self)
 end;
diff --git a/test/translation/lua/classExtension2.lua b/test/translation/lua/classExtension2.lua
@@ -1,2 +1,2 @@
-TestClass.myFunction = function (self)
+TestClass.myFunction = function(self)
 end;
diff --git a/test/translation/lua/classExtension3.lua b/test/translation/lua/classExtension3.lua
@@ -1,4 +1,4 @@
-RenamedTestClass.myFunction = function (self)
+RenamedTestClass.myFunction = function(self)
 end;
-RenamedMyClass.myFunction = function (self)
+RenamedMyClass.myFunction = function(self)
 end;
diff --git a/test/translation/lua/classExtension4.lua b/test/translation/lua/classExtension4.lua
@@ -1,4 +1,4 @@
 MyClass.test = "test";
 MyClass.testP = "testP";
-MyClass.myFunction = function (self)
+MyClass.myFunction = function(self)
 end;
diff --git a/test/translation/lua/classPureAbstract.lua b/test/translation/lua/classPureAbstract.lua
@@ -1,11 +1,11 @@
 ClassB = ClassB or {};
 ClassB.__index = ClassB;
-ClassB.new = function (construct, ...)
+ClassB.new = function(construct, ...)
     local self = setmetatable({}, ClassB);
     if construct and ClassB.constructor then
         ClassB.constructor(self, ...);
     end
     return self;
 end;
-ClassB.constructor = function (self)
+ClassB.constructor = function(self)
 end;
diff --git a/test/translation/lua/functionRestArguments.lua b/test/translation/lua/functionRestArguments.lua
@@ -1,3 +1,3 @@
-varargsFunction = function (a, ...)
+varargsFunction = function(a, ...)
     local b = ({...});
 end;
diff --git a/test/translation/lua/getSetAccessors.lua b/test/translation/lua/getSetAccessors.lua
@@ -1,18 +1,18 @@
 MyClass = MyClass or {};
 MyClass.__index = MyClass;
-MyClass.new = function (construct, ...)
+MyClass.new = function(construct, ...)
     local self = setmetatable({}, MyClass);
     if construct and MyClass.constructor then
         MyClass.constructor(self, ...);
     end
     return self;
 end;
-MyClass.constructor = function (self)
+MyClass.constructor = function(self)
 end;
-MyClass.get__field = function (self)
+MyClass.get__field = function(self)
     return self._field + 4;
 end;
-MyClass.set__field = function (self, v)
+MyClass.set__field = function(self, v)
     self._field = v * 2;
 end;
 local instance = MyClass.new(true);
diff --git a/test/translation/lua/methodRestArguments.lua b/test/translation/lua/methodRestArguments.lua
@@ -1,14 +1,14 @@
 MyClass = MyClass or {};
 MyClass.__index = MyClass;
-MyClass.new = function (construct, ...)
+MyClass.new = function(construct, ...)
     local self = setmetatable({}, MyClass);
     if construct and MyClass.constructor then
         MyClass.constructor(self, ...);
     end
     return self;
 end;
-MyClass.constructor = function (self)
+MyClass.constructor = function(self)
 end;
-MyClass.varargsFunction = function (self, a, ...)
+MyClass.varargsFunction = function(self, a, ...)
     local b = ({...});
 end;
diff --git a/test/translation/lua/modulesChangedVariableExport.lua b/test/translation/lua/modulesChangedVariableExport.lua
@@ -1,5 +1,4 @@
-local exports = exports or {}
-local test = nil;
-test = 1;
-exports.test = test
-return exports
+local exports = exports or {};
+exports.test = nil;
+exports.test = 1;
+return exports;
diff --git a/test/translation/lua/modulesFunctionNoExport.lua b/test/translation/lua/modulesFunctionNoExport.lua
@@ -1,2 +1,2 @@
-publicFunc = function ()
+publicFunc = function()
 end;
diff --git a/test/translation/lua/modulesNamespaceExport.lua b/test/translation/lua/modulesNamespaceExport.lua
@@ -1,6 +1,5 @@
-local exports = exports or {}
-local TestSpace = exports.TestSpace or TestSpace or {}
+local exports = exports or {};
+exports.TestSpace = exports.TestSpace or {};
 do
 end
-exports.TestSpace = TestSpace
-return exports
+return exports;
diff --git a/test/translation/lua/modulesNamespaceNoExport.lua b/test/translation/lua/modulesNamespaceNoExport.lua
@@ -1,3 +1,3 @@
-TestSpace = TestSpace or {}
+TestSpace = TestSpace or {};
 do
 end
diff --git a/test/translation/lua/modulesNamespaceWithMemberNoExport.lua b/test/translation/lua/modulesNamespaceWithMemberNoExport.lua
@@ -1,8 +1,9 @@
-local exports = exports or {}
-local TestSpace = exports.TestSpace or TestSpace or {}
+local exports = exports or {};
+exports.TestSpace = exports.TestSpace or {};
+local TestSpace = exports.TestSpace;
 do
-    local function innerFunc()
-    end
+    local innerFunc;
+    innerFunc = function()
+    end;
 end
-exports.TestSpace = TestSpace
-return exports
+return exports;
diff --git a/test/translation/lua/modulesVariableExport.lua b/test/translation/lua/modulesVariableExport.lua
@@ -1,4 +1,3 @@
-local exports = exports or {}
-local test = "test";
-exports.test = test
-return exports
+local exports = exports or {};
+exports.test = "test";
+return exports;
diff --git a/test/translation/lua/namespace.lua b/test/translation/lua/namespace.lua
@@ -1,5 +1,6 @@
-myNamespace = myNamespace or {}
+myNamespace = myNamespace or {};
 do
-    local function nsMember()
-    end
-end
+    local nsMember;
+    nsMember = function()
+    end;
+end
diff --git a/test/translation/lua/namespaceMerge.lua b/test/translation/lua/namespaceMerge.lua
@@ -1,33 +1,35 @@
-MergedClass = MergedClass or {}
-MergedClass.__index = MergedClass
-function MergedClass.new(construct, ...)
-    local self = setmetatable({}, MergedClass)
+MergedClass = MergedClass or {};
+MergedClass.__index = MergedClass;
+MergedClass.new = function(construct, ...)
+    local self =setmetatable({}, MergedClass);
     self.propertyFunc = function(____)
-end
-    if construct and MergedClass.constructor then MergedClass.constructor(self, ...) end
-    return self
-end
-function MergedClass.constructor(self)
-end
-function MergedClass.staticMethodA(self)
-end
-function MergedClass.staticMethodB(self)
+    end;
+    if construct and MergedClass.constructor then
+        MergedClass.constructor(self, ...);
+    end
+    return self;
+end;
+MergedClass.constructor = function(self)
+end;
+MergedClass.staticMethodA = function(self)
+end;
+MergedClass.staticMethodB = function(self)
     self:staticMethodA();
-end
-function MergedClass.methodA(self)
-end
-function MergedClass.methodB(self)
+end;
+MergedClass.methodA = function(self)
+end;
+MergedClass.methodB = function(self)
     self:methodA();
     self:propertyFunc();
-end
-MergedClass = MergedClass or {}
+end;
+MergedClass = MergedClass or {};
 do
-    local function namespaceFunc()
-    end
-    MergedClass.namespaceFunc = namespaceFunc
+    local namespaceFunc;
+    namespaceFunc = function()
+    end;
 end
 local mergedClass = MergedClass.new(true);
 mergedClass:methodB();
 mergedClass:propertyFunc();
 MergedClass:staticMethodB();
-MergedClass.namespaceFunc();
+MergedClass.namespaceFunc();
diff --git a/test/translation/lua/namespaceNested.lua b/test/translation/lua/namespaceNested.lua
@@ -1,8 +1,10 @@
-myNamespace = myNamespace or {}
+myNamespace = myNamespace or {};
 do
-    local myNestedNamespace = myNestedNamespace or {}
+    myNamespace.myNestedNamespace = myNamespace.myNestedNamespace or {};
+    local myNestedNamespace = myNamespace.myNestedNamespace;
     do
-        local function nsMember()
-        end
+        local nsMember;
+        nsMember = function()
+        end;
     end
 end
diff --git a/test/translation/lua/namespacePhantom.lua b/test/translation/lua/namespacePhantom.lua
@@ -1,2 +1,2 @@
-nsMember = function ()
+nsMember = function()
 end;
diff --git a/test/translation/lua/returnDefault.lua b/test/translation/lua/returnDefault.lua
@@ -1,3 +1,3 @@
-myFunc = function ()
+myFunc = function()
     return;
 end;
diff --git a/test/translation/lua/shorthandPropertyAssignment.lua b/test/translation/lua/shorthandPropertyAssignment.lua
@@ -1,4 +1,4 @@
 local f;
-f = function (x)
+f = function(x)
     return ({x = x});
 end;
diff --git a/test/translation/lua/tryCatch.lua b/test/translation/lua/tryCatch.lua
@@ -1,5 +1,5 @@
 do
-    local ____TS_try, er = pcall(function ()
+    local ____TS_try, er = pcall(function()
         local a = 42;
     end);
     if not ____TS_try then
diff --git a/test/translation/lua/tryCatchFinally.lua b/test/translation/lua/tryCatchFinally.lua
@@ -1,5 +1,5 @@
 do
-    local ____TS_try, er = pcall(function ()
+    local ____TS_try, er = pcall(function()
         local a = 42;
     end);
     if not ____TS_try then
diff --git a/test/translation/lua/tryFinally.lua b/test/translation/lua/tryFinally.lua
@@ -1,5 +1,5 @@
 do
-    pcall(function ()
+    pcall(function()
         local a = 42;
     end);
     do
diff --git a/test/translation/lua/tupleReturn.lua b/test/translation/lua/tupleReturn.lua
@@ -1,4 +1,4 @@
-tupleReturn = function ()
+tupleReturn = function()
     return 0, "foobar";
 end;
 tupleReturn();
@@ -13,16 +13,16 @@ e = ({tupleReturn()});
 f = noTupleReturn();
 foo(({tupleReturn()}));
 foo(noTupleReturn());
-tupleReturnFromVar = function ()
+tupleReturnFromVar = function()
     local r = {1, "baz"};
     return table.unpack(r);
 end;
-tupleReturnForward = function ()
+tupleReturnForward = function()
     return tupleReturn();
 end;
-tupleNoForward = function ()
+tupleNoForward = function()
     return ({tupleReturn()});
 end;
-tupleReturnUnpack = function ()
+tupleReturnUnpack = function()
     return table.unpack(tupleNoForward());
 end;

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ export class LuaPrinter {`
`308`	`308`	`paramterArr.push(this.printDotsLiteral(expression.dots));`
`309`	`309`	`}`
`310`	`310`
`311`		- let result = `function (${paramterArr.join(", ")})\n`;
	`311`	+ let result = `function(${paramterArr.join(", ")})\n`;
`312`	`312`	`this.pushIndent();`
`313`	`313`	`result += this.printBlock(expression.body);`
`314`	`314`	`this.popIndent();`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-MyClass.myFunction = function (self)`
	`1`	`+MyClass.myFunction = function(self)`
`2`	`2`	`end;`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-TestClass.myFunction = function (self)`
	`1`	`+TestClass.myFunction = function(self)`
`2`	`2`	`end;`