TypeScriptToLua
diff --git a/‎src/LuaTransformer.ts‎
Lines changed: 4 additions & 2 deletions b/‎src/LuaTransformer.ts‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎src/lualib/LuaRequire.ts‎
Lines changed: 15 additions & 10 deletions b/‎src/lualib/LuaRequire.ts‎
Lines changed: 15 additions & 10 deletions
diff --git a/‎test/unit/outFile.spec.ts‎
Lines changed: 19 additions & 0 deletions b/‎test/unit/outFile.spec.ts‎
Lines changed: 19 additions & 0 deletions
@@ -167,7 +167,7 @@ export class LuaTransformer {
             statements = this.performHoisting(this.transformStatements(sourceFile.statements));
             this.popScope();
 
-            if (this.isModule) {
+            if (this.isModule && !this.isWithinBundle) {
                 // If export equals was not used. Create the exports table.
                 // local exports = {}
                 if (!this.visitedExportEquals) {
@@ -192,7 +192,9 @@ export class LuaTransformer {
             const exportPath = tsHelper.getExportPath(sourceFile.fileName, this.options);
             const packagePreloadDeclaration = tstl.createAssignmentStatement(
                 tstl.createTableIndexExpression(packagePreload, tstl.createStringLiteral(exportPath)),
-                tstl.createFunctionExpression(tstl.createBlock(statements, sourceFile))
+                tstl.createFunctionExpression(tstl.createBlock(statements, sourceFile), [
+                    this.createExportsIdentifier(),
+                ])
             );
             return tstl.createBlock([packagePreloadDeclaration], sourceFile);
         }
 
@@ -1,14 +1,19 @@
-const tstlpackage = { preload: {}, loaded: {} };
+const tstlpackage: {
+    preload: Record<string, (this: void, exports: object) => void>;
+    loaded: Record<string, object>;
+} = { preload: {}, loaded: {} };
 
 function __TS__LuaRequire(this: void, moduleName: string): any {
-    if (!tstlpackage.loaded[moduleName]) {
-        const module: (this: void, module: string) => any = tstlpackage.preload[moduleName];
-        if (module) {
-            tstlpackage.loaded[moduleName] = module(moduleName);
-        } else {
-            // tslint:disable-next-line: no-string-throw
-            throw `module '${moduleName}' not found:`;
-        }
+    if (tstlpackage.loaded[moduleName]) {
+        return tstlpackage.loaded[moduleName];
     }
-    return tstlpackage.loaded[moduleName];
+    const loadScript = tstlpackage.preload[moduleName];
+    if (!loadScript) {
+        // tslint:disable-next-line: no-string-throw
+        throw `module '${moduleName}' not found`;
+    }
+    const moduleExports = {};
+    tstlpackage.loaded[moduleName] = moduleExports;
+    loadScript(moduleExports);
+    return moduleExports;
 }
@@ -150,3 +150,22 @@ test.each<[string, Record<string, string>]>([
 
     testBuilder.expectNoExecutionError();
 });
+
+test("outFile cyclic imports", () => {
+    util.testBundle`
+        export const a = true;
+        import { b } from "./b";
+        if (b !== true) {
+            throw "Did not receive true from module b";
+        }
+    `
+        .addExtraFile(
+            "b.ts",
+            `
+                import { a } from "./main";
+                export const b = a;
+            `
+        )
+        .setOptions({ outFile: "main.lua", noHoisting: true, module: ts.ModuleKind.AMD, luaEntry: ["main.ts"] })
+        .expectNoExecutionError();
+});