Fixing remaining tests (#350)

tomblind · lolleko · commit 44c03be7e2a1 · 2019-01-21T19:47:29.000+01:00
* Fixing remaining tests
- Fixed exporting enum members
- Fixed exporting namespace members in a non-module
- (Re)Fixed recursive functions
- Updated transformation tests with aesthetic changes

* corrected class export transform tests (which re-breaks them right now)
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -853,7 +853,10 @@ export class LuaTransformer {
                     ));
                 }
             } else {
-                const table = this.transformIdentifier(enumDeclaration.name);
+                let table: tstl.Identifier | tstl.TableIndexExpression = this.transformIdentifier(enumDeclaration.name);
+                if (this.isIdentifierExported(enumDeclaration.name.text)) {
+                    table = this.createExportedIdentifier(table);
+                }
                 const property = tstl.createTableIndexExpression(table, memberName, undefined);
                 result.push(tstl.createAssignmentStatement(property, enumMember.value, undefined, enumMember.original));
             }
@@ -2987,7 +2990,7 @@ export class LuaTransformer {
     }
 
     public isIdentifierExported(identifierName: string | ts.__String): boolean {
-        if (!this.isModule) {
+        if (!this.isModule && !this.currentNamespace) {
             return false;
         }
         const currentScope = this.currentNamespace ? this.currentNamespace : this.currentSourceFile;
@@ -3136,7 +3139,9 @@ export class LuaTransformer {
                 statements.push(
                     tstl.createAssignmentStatement(lhs.map(i => this.createExportedIdentifier(i)), rhs, parent));
             } else {
-                statements.push(tstl.createVariableDeclarationStatement(lhs, rhs, parent));
+                // Separate declaration from assignment to allow for recursion
+                statements.push(tstl.createVariableDeclarationStatement(lhs, undefined, parent));
+                statements.push(tstl.createAssignmentStatement(lhs, rhs, parent));
             }
         } else {
             statements.push(tstl.createAssignmentStatement(lhs, rhs, parent, tsOriginal));
diff --git a/test/translation/lua/modulesClassExport.lua b/test/translation/lua/modulesClassExport.lua
@@ -1,12 +1,13 @@
-local exports = exports or {}
-local TestClass = TestClass or {}
-TestClass.__index = TestClass
-function TestClass.new(construct, ...)
-    local self = setmetatable({}, TestClass)
-    if construct and TestClass.constructor then TestClass.constructor(self, ...) end
-    return self
-end
-function TestClass.constructor(self)
-end
-exports.TestClass = TestClass
-return exports
+local exports = exports or {};
+exports.TestClass = exports.TestClass or {};
+exports.TestClass.__index = exports.TestClass;
+exports.TestClass.new = function(construct, ...)
+    local self = setmetatable({}, exports.TestClass);
+    if construct and exports.TestClass.constructor then
+        exports.TestClass.constructor(self, ...);
+    end
+    return self;
+end;
+exports.TestClass.constructor = function(self)
+end;
+return exports;
diff --git a/test/translation/lua/modulesClassWithMemberExport.lua b/test/translation/lua/modulesClassWithMemberExport.lua
@@ -1,14 +1,15 @@
-local exports = exports or {}
-local TestClass = TestClass or {}
-TestClass.__index = TestClass
-function TestClass.new(construct, ...)
-    local self = setmetatable({}, TestClass)
-    if construct and TestClass.constructor then TestClass.constructor(self, ...) end
-    return self
-end
-function TestClass.constructor(self)
-end
-function TestClass.memberFunc(self)
-end
-exports.TestClass = TestClass
-return exports
+local exports = exports or {};
+exports.TestClass = exports.TestClass or {};
+exports.TestClass.__index = exports.TestClass;
+exports.TestClass.new = function(construct, ...)
+    local self = setmetatable({}, exports.TestClass);
+    if construct and exports.TestClass.constructor then
+        exports.TestClass.constructor(self, ...);
+    end
+    return self;
+end;
+exports.TestClass.constructor = function(self)
+end;
+exports.TestClass.memberFunc = function(self)
+end;
+return exports;
diff --git a/test/translation/lua/modulesFunctionExport.lua b/test/translation/lua/modulesFunctionExport.lua
@@ -1,5 +1,4 @@
-local exports = exports or {}
-local function publicFunc()
-end
-exports.publicFunc = publicFunc
-return exports
+local exports = exports or {};
+exports.publicFunc = function()
+end;
+return exports;
diff --git a/test/translation/lua/modulesNamespaceExport.lua b/test/translation/lua/modulesNamespaceExport.lua
@@ -1,5 +1,6 @@
 local exports = exports or {};
 exports.TestSpace = exports.TestSpace or {};
+local TestSpace = exports.TestSpace;
 do
 end
-return exports;
+return exports;
diff --git a/test/translation/lua/modulesNamespaceExportEnum.lua b/test/translation/lua/modulesNamespaceExportEnum.lua
@@ -1,10 +1,9 @@
-local exports = exports or {}
-local test = exports.test or test or {}
+local exports = exports or {};
+exports.test = exports.test or {};
+local test = exports.test;
 do
-    local TestEnum={}
-    TestEnum.foo="foo"
-    TestEnum.bar="bar"
-    test.TestEnum = TestEnum
+    test.TestEnum = {};
+    test.TestEnum.foo = "foo";
+    test.TestEnum.bar = "bar";
 end
-exports.test = test
-return exports
+return exports;
diff --git a/test/translation/lua/modulesNamespaceNestedWithMemberExport.lua b/test/translation/lua/modulesNamespaceNestedWithMemberExport.lua
@@ -1,13 +1,12 @@
-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 TestNestedSpace = TestNestedSpace or {}
+    TestSpace.TestNestedSpace = TestSpace.TestNestedSpace or {};
+    local TestNestedSpace = TestSpace.TestNestedSpace;
     do
-        local function innerFunc()
-        end
-        TestNestedSpace.innerFunc = innerFunc
+        TestNestedSpace.innerFunc = function()
+        end;
     end
-    TestSpace.TestNestedSpace = TestNestedSpace
 end
-exports.TestSpace = TestSpace
-return exports
+return exports;
diff --git a/test/translation/lua/modulesNamespaceWithMemberExport.lua b/test/translation/lua/modulesNamespaceWithMemberExport.lua
@@ -1,9 +1,8 @@
-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
-    TestSpace.innerFunc = innerFunc
+    TestSpace.innerFunc = function()
+    end;
 end
-exports.TestSpace = TestSpace
-return exports
+return exports;
diff --git a/test/translation/lua/modulesNamespaceWithMemberNoExport.lua b/test/translation/lua/modulesNamespaceWithMemberNoExport.lua
@@ -6,4 +6,4 @@ do
     innerFunc = function()
     end;
 end
-return exports;
+return exports;
diff --git a/test/translation/lua/namespace.lua b/test/translation/lua/namespace.lua
@@ -3,4 +3,4 @@ do
     local nsMember;
     nsMember = function()
     end;
-end
+end
diff --git a/test/translation/lua/namespaceMerge.lua b/test/translation/lua/namespaceMerge.lua
@@ -24,12 +24,11 @@ MergedClass.methodB = function(self)
 end;
 MergedClass = MergedClass or {};
 do
-    local namespaceFunc;
-    namespaceFunc = function()
+    MergedClass.namespaceFunc = function()
     end;
 end
 local mergedClass = MergedClass.new(true);
 mergedClass:methodB();
 mergedClass:propertyFunc();
 MergedClass:staticMethodB();
-MergedClass.namespaceFunc();
+MergedClass.namespaceFunc();

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,10 @@ export class LuaTransformer {`
`853`	`853`	`));`
`854`	`854`	`}`
`855`	`855`	`} else {`
`856`		`- const table = this.transformIdentifier(enumDeclaration.name);`
	`856`	`+ let table: tstl.Identifier \| tstl.TableIndexExpression = this.transformIdentifier(enumDeclaration.name);`
	`857`	`+ if (this.isIdentifierExported(enumDeclaration.name.text)) {`
	`858`	`+ table = this.createExportedIdentifier(table);`
	`859`	`+ }`
`857`	`860`	`const property = tstl.createTableIndexExpression(table, memberName, undefined);`
`858`	`861`	`result.push(tstl.createAssignmentStatement(property, enumMember.value, undefined, enumMember.original));`
`859`	`862`	`}`
`@@ -2987,7 +2990,7 @@ export class LuaTransformer {`
`2987`	`2990`	`}`
`2988`	`2991`
`2989`	`2992`	`public isIdentifierExported(identifierName: string \| ts.__String): boolean {`
`2990`		`- if (!this.isModule) {`
	`2993`	`+ if (!this.isModule && !this.currentNamespace) {`
`2991`	`2994`	`return false;`
`2992`	`2995`	`}`
`2993`	`2996`	`const currentScope = this.currentNamespace ? this.currentNamespace : this.currentSourceFile;`
`@@ -3136,7 +3139,9 @@ export class LuaTransformer {`
`3136`	`3139`	`statements.push(`
`3137`	`3140`	`tstl.createAssignmentStatement(lhs.map(i => this.createExportedIdentifier(i)), rhs, parent));`
`3138`	`3141`	`} else {`
`3139`		`- statements.push(tstl.createVariableDeclarationStatement(lhs, rhs, parent));`
	`3142`	`+ // Separate declaration from assignment to allow for recursion`
	`3143`	`+ statements.push(tstl.createVariableDeclarationStatement(lhs, undefined, parent));`
	`3144`	`+ statements.push(tstl.createAssignmentStatement(lhs, rhs, parent));`
`3140`	`3145`	`}`
`3141`	`3146`	`} else {`
`3142`	`3147`	`statements.push(tstl.createAssignmentStatement(lhs, rhs, parent, tsOriginal));`