TypeScriptToLua
diff --git a/‎src/LuaTransformer.ts‎
Lines changed: 15 additions & 13 deletions b/‎src/LuaTransformer.ts‎
Lines changed: 15 additions & 13 deletions
diff --git a/‎src/lualib/LuaRequire.ts‎
Lines changed: 3 additions & 3 deletions b/‎src/lualib/LuaRequire.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎test/unit/outFile.spec.ts‎
Lines changed: 6 additions & 2 deletions b/‎test/unit/outFile.spec.ts‎
Lines changed: 6 additions & 2 deletions
@@ -131,6 +131,7 @@ export class LuaTransformer {
         const combinedStatements = bundle.sourceFiles.reduce(
             (statements: tstl.Statement[], sourceFile: ts.SourceFile) => {
                 this.currentSourceFile = sourceFile;
+                this.visitedExportEquals = false;
                 this.isModule = tsHelper.isFileModule(sourceFile);
                 const originalSourceFile = ts.getParseTreeNode(sourceFile, ts.isSourceFile) || sourceFile;
                 this.resolver = this.checker.getEmitResolver(originalSourceFile);
@@ -169,16 +170,18 @@ export class LuaTransformer {
             statements = this.performHoisting(this.transformStatements(sourceFile.statements));
             this.popScope();
 
-            if (this.isModule && !this.isWithinBundle) {
-                // If export equals was not used. Create the exports table.
-                // local exports = {}
-                if (!this.visitedExportEquals) {
-                    statements.unshift(
-                        tstl.createVariableDeclarationStatement(
-                            this.createExportsIdentifier(),
-                            tstl.createTableExpression()
-                        )
-                    );
+            if (this.isModule) {
+                if (!this.isWithinBundle) {
+                    // If export equals was not used. Create the exports table.
+                    // local exports = {}
+                    if (!this.visitedExportEquals) {
+                        statements.unshift(
+                            tstl.createVariableDeclarationStatement(
+                                this.createExportsIdentifier(),
+                                tstl.createTableExpression()
+                            )
+                        );
+                    }
                 }
 
                 // return exports
@@ -192,11 +195,10 @@ export class LuaTransformer {
                 tstl.createStringLiteral("preload")
             );
             const exportPath = tsHelper.getExportPath(sourceFile.fileName, this.options);
+            const moduleParameters = this.visitedExportEquals ? undefined : [this.createExportsIdentifier()];
             const packagePreloadDeclaration = tstl.createAssignmentStatement(
                 tstl.createTableIndexExpression(packagePreload, tstl.createStringLiteral(exportPath)),
-                tstl.createFunctionExpression(tstl.createBlock(statements, sourceFile), [
-                    this.createExportsIdentifier(),
-                ])
+                tstl.createFunctionExpression(tstl.createBlock(statements, sourceFile), moduleParameters)
             );
             return tstl.createBlock([packagePreloadDeclaration], sourceFile);
         }
 
@@ -1,5 +1,5 @@
 const tstlpackage: {
-    preload: Record<string, (this: void, exports: object) => void>;
+    preload: Record<string, (this: void, exports: object) => object>;
     loaded: Record<string, object>;
 } = { preload: {}, loaded: {} };
 
@@ -14,6 +14,6 @@ function __TS__LuaRequire(this: void, moduleName: string): any {
     }
     const moduleExports = {};
     tstlpackage.loaded[moduleName] = moduleExports;
-    loadScript(moduleExports);
-    return moduleExports;
+    tstlpackage.loaded[moduleName] = loadScript(moduleExports);
+    return tstlpackage.loaded[moduleName];
 }
@@ -8,7 +8,7 @@ const reexportValueSource = 'export { value } from "./export";';
 const exportResultSource = "export const result = value;";
 
 function outFileOptionsWithEntry(luaEntry: string): CompilerOptions {
-    return { outFile: "main.lua", noHoisting: true, module: ts.ModuleKind.AMD, luaEntry };
+    return { outFile: "main.lua", module: ts.ModuleKind.AMD, luaEntry };
 }
 
 test("import module -> main", () => {
@@ -112,7 +112,7 @@ test("cyclic imports", () => {
                 export const value = a;
             `
         )
-        .setOptions(outFileOptionsWithEntry("main.ts"))
+        .setOptions({ noHoisting: true, ...outFileOptionsWithEntry("main.ts") })
         .expectToEqual({ a: true, result: true });
 });
 
@@ -129,3 +129,7 @@ test("luaEntry resolved from path specified in tsconfig", () => {
         .setOptions({ rootDir: "src", ...outFileOptionsWithEntry("src/main.ts") })
         .expectToHaveNoDiagnostics();
 });
+
+test("export equals", () => {
+    util.testBundle`export = "result"`.setOptions(outFileOptionsWithEntry("main.ts")).expectToEqual("result");
+});
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`const tstlpackage: {`
`2`		`- preload: Record<string, (this: void, exports: object) => void>;`
	`2`	`+ preload: Record<string, (this: void, exports: object) => object>;`
`3`	`3`	`loaded: Record<string, object>;`
`4`	`4`	`} = { preload: {}, loaded: {} };`
`5`	`5`
`@@ -14,6 +14,6 @@ function __TS__LuaRequire(this: void, moduleName: string): any {`
`14`	`14`	`}`
`15`	`15`	`const moduleExports = {};`
`16`	`16`	`tstlpackage.loaded[moduleName] = moduleExports;`
`17`		`- loadScript(moduleExports);`
`18`		`- return moduleExports;`
	`17`	`+ tstlpackage.loaded[moduleName] = loadScript(moduleExports);`
	`18`	`+ return tstlpackage.loaded[moduleName];`
`19`	`19`	`}`