Fix --project path resolution on Windows

ark120202 · ark120202 · commit 0586aee95403 · 2019-10-29T14:02:07.000Z
diff --git a/src/Emit.ts b/src/Emit.ts
@@ -1,10 +1,10 @@
 import * as path from "path";
 import * as ts from "typescript";
 import { CompilerOptions, LuaLibImportKind } from "./CompilerOptions";
-import { TranspiledFile, EmitHost } from "./Transpile";
+import { EmitHost, TranspiledFile } from "./Transpile";
+import { normalizeSlashes } from "./utils";
 
 const trimExt = (filePath: string) => filePath.slice(0, -path.extname(filePath).length);
-const normalizeSlashes = (filePath: string) => filePath.replace(/\\/g, "/");
 
 export interface OutputFile {
     name: string;
diff --git a/src/tstl.ts b/src/tstl.ts
@@ -4,6 +4,7 @@ import * as ts from "typescript";
 import * as tstl from ".";
 import * as CommandLineParser from "./CommandLineParser";
 import * as diagnosticFactories from "./diagnostics";
+import { normalizeSlashes } from "./utils";
 
 function createWatchStatusReporter(options?: ts.CompilerOptions): ts.WatchStatusReporter {
     return (ts as any).createWatchStatusReporter(ts.sys, shouldBePretty(options));
@@ -24,7 +25,7 @@ function locateConfigFile(commandLine: tstl.ParsedCommandLine): string | undefin
     const { project } = commandLine.options;
     if (!project) {
         if (commandLine.fileNames.length === 0) {
-            const searchPath = path.posix.normalize(ts.sys.getCurrentDirectory());
+            const searchPath = normalizeSlashes(ts.sys.getCurrentDirectory());
             return ts.findConfigFile(searchPath, ts.sys.fileExists);
         }
         return;
@@ -36,18 +37,13 @@ function locateConfigFile(commandLine: tstl.ParsedCommandLine): string | undefin
         return;
     }
 
-    let fileOrDirectory = path.posix.normalize(project);
-    if (!path.isAbsolute(fileOrDirectory)) {
-        fileOrDirectory = path.posix.join(ts.sys.getCurrentDirectory(), fileOrDirectory);
-    }
-
+    const fileOrDirectory = normalizeSlashes(path.resolve(ts.sys.getCurrentDirectory(), project));
     if (!fileOrDirectory || ts.sys.directoryExists(fileOrDirectory)) {
         const configFileName = path.posix.join(fileOrDirectory, "tsconfig.json");
         if (ts.sys.fileExists(configFileName)) {
             return configFileName;
         } else {
             reportDiagnostic(diagnosticFactories.cannotFindATsconfigJsonAtTheSpecifiedDirectory(project));
-
             ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
         }
     } else {
diff --git a/src/utils.ts b/src/utils.ts
@@ -0,0 +1 @@
+export const normalizeSlashes = (filePath: string) => filePath.replace(/\\/g, "/");

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export const normalizeSlashes = (filePath: string) => filePath.replace(/\\/g, "/");`