Fix windows tests

ark120202 · ark120202 · commit dd66b881e751 · 2020-10-19T14:36:11.000Z
diff --git a/src/transpilation/transpilation.ts b/src/transpilation/transpilation.ts
@@ -5,7 +5,7 @@ import { SourceNode } from "source-map";
 import * as ts from "typescript";
 import { CompilerOptions, isBundleEnabled, LuaTarget } from "../CompilerOptions";
 import { getLuaLibBundle } from "../LuaLib";
-import { assert, cast, isNonNull, trimExtension } from "../utils";
+import { assert, cast, isNonNull, normalizeSlashes, trimExtension } from "../utils";
 import { Chunk, modulesToBundleChunks, modulesToChunks } from "./chunk";
 import { createResolutionErrorDiagnostic } from "./diagnostics";
 import { buildModule, Module } from "./module";
@@ -88,7 +88,7 @@ export class Transpilation {
             const result = this.resolver.resolveSync({}, path.dirname(issuer), request);
             assert(typeof result === "string", `Invalid resolution result: ${result}`);
             // https://github.com/webpack/enhanced-resolve#escaping
-            resolvedPath = result.replace(/\0#/g, "#");
+            resolvedPath = normalizeSlashes(result.replace(/\0#/g, "#"));
         } catch (error) {
             if (!isResolveError(error)) throw error;
             return { error: error.message };
@@ -98,6 +98,10 @@ export class Transpilation {
         if (!module) {
             if (!resolvedPath.endsWith(".lua")) {
                 const messageText = `Resolved source file '${resolvedPath}' is not a part of the project.`;
+                console.log(
+                    resolvedPath,
+                    this.modules.map(m => m.request)
+                );
                 return { error: messageText };
             }
 
diff --git a/src/transpilation/transpile/index.ts b/src/transpilation/transpile/index.ts
@@ -3,7 +3,7 @@ import * as ts from "typescript";
 import { CompilerOptions, validateOptions } from "../../CompilerOptions";
 import { LuaPrinter } from "../../LuaPrinter";
 import { createVisitorMap, transformSourceFile } from "../../transformation";
-import { assert, isNonNull } from "../../utils";
+import { assert, isNonNull, normalizeSlashes } from "../../utils";
 import { applySinglePlugin } from "../plugins";
 import { Transpilation } from "../transpilation";
 import { getTransformers } from "./transformers";
@@ -65,7 +65,7 @@ export function emitProgramModules(
                 const currentDirectory = transpilation.host.getCurrentDirectory();
                 // Having no absolute path in path.resolve would make it fallback to real cwd
                 assert(path.isAbsolute(currentDirectory), `Invalid path: ${currentDirectory}`);
-                request = path.resolve(currentDirectory, sourceFile.fileName);
+                request = normalizeSlashes(path.resolve(currentDirectory, sourceFile.fileName));
             }
 
             transpilation.modules.push({ request, isBuilt: false, source, sourceFiles: [sourceFile] });
diff --git a/test/util.ts b/test/util.ts
@@ -256,11 +256,12 @@ export abstract class TestBuilder {
 
         const host: tstl.TranspilerHost = { ...ts.sys };
         if (!this.nativeFileSystem) {
-            const virtualFS = Volume.fromJSON({ ...this.extraRawFiles, ...this.getSourceFiles() }, "/");
+            const cwd = process.platform === "win32" ? path.parse(__dirname).root : "/";
+            const virtualFS = Volume.fromJSON({ ...this.extraRawFiles, ...this.getSourceFiles() }, cwd);
             host.resolutionFileSystem = virtualFS;
-            host.getCurrentDirectory = () => "/";
+            host.getCurrentDirectory = () => cwd;
             host.readFile = (fileName, encoding = "utf8") =>
-                fileName.includes("/lualib/")
+                /[\\/]lualib[\\/]/.test(fileName)
                     ? ts.sys.readFile(fileName, encoding)
                     : (virtualFS.readFileSync(fileName, encoding) as string);
         }
