feat: rework path normalization for new TS

Author: s-panferov

src/checker-runtime.ts

@@ -1,6 +1,5 @@
 import { ICompilerInfo, IFile } from './host';
 import { LoaderPlugin, LoaderPluginDef, LoaderConfig } from './instance';
-import * as path from 'path';
 
 let colors = require('colors/safe');
 
@@ -77,26 +76,20 @@ export class Host implements ts.LanguageServiceHost {
         this.moduleResolutionHost = new ModuleResolutionHost(this);
     }
 
-    normalizePath(filePath: string): string {
-        return path.normalize(filePath);
-    }
-
     getScriptFileNames() {
         return Object.keys(env.files);
     }
 
     getScriptVersion(fileName: string) {
-        let fileName_ = path.normalize(fileName);
-        if (env.files[fileName_]) {
-            return env.files[fileName_].version.toString();
+        if (env.files[fileName]) {
+            return env.files[fileName].version.toString();
         }
     }
 
     getScriptSnapshot(fileName: string) {
-        let fileName_ = path.normalize(fileName);
-        let file = env.files[fileName_];
+        let file = env.files[fileName];
         if (!file) {
-            throw new Error(`Requested file is unknown: ${ fileName_ }`);
+            throw new Error(`Requested file is unknown: ${ fileName }`);
         }
         return env.compiler.ScriptSnapshot.fromString(file.text);
     }

src/helpers.ts

@@ -27,12 +27,12 @@ export function findResultFor(output: host.IEmitOutput, fileName: string) {
     let text;
     let sourceMap;
     let declaration: host.IOutputFile;
-    fileName = withoutExt(path.normalize(fileName));
+    fileName = withoutExt(fileName);
 
     for (let i = 0; i < output.outputFiles.length; i++) {
         let o = output.outputFiles[i];
-        let outputFileName = path.normalize(o.name);
-        let sourceFileName = withoutExt(path.normalize(o.sourceName));
+        let outputFileName = o.name;
+        let sourceFileName = withoutExt(o.sourceName);
         if (isFileEmit(fileName, outputFileName, sourceFileName)) {
             text = o.text;
         }

src/host.ts

@@ -40,17 +40,15 @@ export class Host implements ts.LanguageServiceHost {
     }
 
     getScriptVersion(fileName: string) {
-        let fileName_ = path.normalize(fileName);
-        if (this.state.getFile(fileName_)) {
-            return this.state.getFile(fileName_).version.toString();
+        if (this.state.getFile(fileName)) {
+            return this.state.getFile(fileName).version.toString();
         }
     }
 
     getScriptSnapshot(fileName) {
-        let fileName_ = path.normalize(fileName);
-        let file = this.state.getFile(fileName_);
+        let file = this.state.getFile(fileName);
         if (!file) {
-            throw new Error(`Requested file is unknown: ${ fileName_ }`);
+            throw new Error(`Requested file is unknown: ${ fileName }`);
         }
         return this.state.ts.ScriptSnapshot.fromString(file.text);
     }
@@ -175,8 +173,6 @@ export class State {
     }
 
     emit(fileName: string): IEmitOutput {
-        fileName = this.normalizePath(fileName);
-
         if (!this.program) {
             this.program = this.services.getProgram();
         }
@@ -216,8 +212,6 @@ export class State {
     }
 
     fastEmit(fileName: string) {
-        fileName = this.normalizePath(fileName);
-
         let file = this.getFile(fileName);
         if (!file) {
             throw new Error(`Unknown file ${ fileName }`);
@@ -236,7 +230,6 @@ export class State {
     }
 
     updateFile(fileName: string, text: string, checked: boolean = false): boolean {
-        fileName = this.normalizePath(fileName);
         let prevFile = this.files[fileName];
         let version = 0;
         let changed = true;
@@ -261,7 +254,6 @@ export class State {
     }
 
     addFile(fileName: string, text: string, isDefaultLib = false): IFile {
-        fileName = this.normalizePath(fileName);
         return this.files[fileName] = {
             text,
             isDefaultLib,
@@ -270,36 +262,27 @@ export class State {
     }
 
     getFile(fileName: string): IFile {
-        fileName = this.normalizePath(fileName);
         return this.files[fileName];
     }
 
     hasFile(fileName: string): boolean {
-        fileName = this.normalizePath(fileName);
         return this.files.hasOwnProperty(fileName);
     }
 
     readFile(fileName: string): string {
-        fileName = this.normalizePath(fileName);
         // Use global fs here, because local doesn't contain `readFileSync`
         return fs.readFileSync(fileName, {encoding: 'utf-8'});
     }
 
     readFileAndAdd(fileName: string, isDefaultLib = false) {
-        fileName = this.normalizePath(fileName);
         let text = this.readFile(fileName);
         this.addFile(fileName, text, isDefaultLib);
     }
 
     readFileAndUpdate(fileName: string, checked: boolean = false): boolean {
-        fileName = this.normalizePath(fileName);
         let text = this.readFile(fileName);
         return this.updateFile(fileName, text, checked);
     }
-
-    normalizePath(filePath: string): string {
-        return path.normalize(filePath);
-    }
 }
 
 /**

src/index.ts

@@ -28,6 +28,16 @@ interface Transformation {
     map: any;
 }
 
+const double = /\/\//;
+function toUnix(fileName: string) {
+    let res: string = fileName.replace(/\\/g, '/');
+    while (res.match(double)) {
+        res = res.replace(double, '/');
+    }
+
+    return res;
+}
+
 function compiler(webpack: IWebPack, text: string): void {
     if (webpack.cacheable) {
         webpack.cacheable();
@@ -38,7 +48,7 @@ function compiler(webpack: IWebPack, text: string): void {
     let instance = ensureInstance(webpack, options, instanceName);
     let state = instance.tsState;
     let callback = webpack.async();
-    let fileName = state.normalizePath(webpack.resourcePath);
+    let fileName = toUnix(webpack.resourcePath);
 
     let depsInjector = {
         add: (depFileName) => webpack.addDependency(depFileName),