TypeScriptToLua
diff --git a/‎src/transpilation/bundle.ts‎
Lines changed: 3 additions & 3 deletions b/‎src/transpilation/bundle.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/transpilation/transpiler.ts‎
Lines changed: 13 additions & 15 deletions b/‎src/transpilation/transpiler.ts‎
Lines changed: 13 additions & 15 deletions
@@ -33,7 +33,7 @@ export function getBundleResult(
     program: ts.Program,
     emitHost: EmitHost,
     files: ProcessedFile[],
-    getRequirePath: (file: ProcessedFile) => string
+    createModuleId: (file: ProcessedFile) => string
 ): [ts.Diagnostic[], EmitFile] {
     const diagnostics: ts.Diagnostic[] = [];
 
@@ -55,13 +55,13 @@ export function getBundleResult(
     }
 
     // For each file: ["<module path>"] = function() <lua content> end,
-    const moduleTableEntries = files.map(f => moduleSourceNode(f, escapeString(getRequirePath(f))));
+    const moduleTableEntries = files.map(f => moduleSourceNode(f, escapeString(createModuleId(f))));
 
     // Create ____modules table containing all entries from moduleTableEntries
     const moduleTable = createModuleTableNode(moduleTableEntries);
 
     // return require("<entry module path>")
-    const entryPoint = `return require(${escapeString(getRequirePath(entryFile))})\n`;
+    const entryPoint = `return require(${escapeString(createModuleId(entryFile))})\n`;
 
     const bundleNode = joinSourceChunks([requireOverride, moduleTable, entryPoint]);
     const { code, map } = bundleNode.toStringWithSourceMap();
 
@@ -87,16 +87,15 @@ class Transpilation {
 
         if (isBundleEnabled(this.options)) {
             const [bundleDiagnostics, bundleFile] = getBundleResult(this.program, this.emitHost, this.files, file =>
-                this.toRequireParameter(this.toGeneratedFileName(file.fileName))
+                this.createModuleId(file.fileName)
             );
             this.diagnostics.push(...bundleDiagnostics);
             return [bundleFile];
         } else {
-            return this.files.map(file => {
-                const pathInOutDir = this.toAbsoluteOutputPath(this.toGeneratedFileName(file.fileName));
-                const outputPath = normalizeSlashes(trimExtension(pathInOutDir) + ".lua");
-                return { ...file, outputPath };
-            });
+            return this.files.map(file => ({
+                ...file,
+                outputPath: this.moduleIdToOutputPath(this.createModuleId(file.fileName)),
+            }));
         }
     }
 
@@ -130,7 +129,7 @@ class Transpilation {
                 }
             }
 
-            return this.toRequireParameter(this.toGeneratedFileName(resolvedPath));
+            return this.createModuleId(resolvedPath);
         };
 
         if (file.sourceMapNode) {
@@ -153,18 +152,17 @@ class Transpilation {
         useSyncFileSystemCalls: true,
     });
 
-    protected toGeneratedFileName(fileName: string) {
+    protected createModuleId(fileName: string) {
         const result = path.relative(this.rootDir, trimExtension(fileName));
         // TODO: handle files on other drives
         assert(!path.isAbsolute(result), `Invalid path: ${result}`);
-        return result.replace(/\.\.\//g, "_/").replace(/\./g, "__");
+        return result
+            .replace(/\.\.[/\\]/g, "_/")
+            .replace(/\./g, "__")
+            .replace(/[/\\]/g, ".");
     }
 
-    protected toRequireParameter(fileName: string) {
-        return fileName.replace(/[/\\]/g, ".");
-    }
-
-    protected toAbsoluteOutputPath(fileName: string) {
-        return path.resolve(this.outDir, `${fileName}.lua`);
+    protected moduleIdToOutputPath(moduleId: string) {
+        return normalizeSlashes(path.resolve(this.outDir, `${moduleId.replace(/\./g, "/")}.lua`));
     }
 }