feat(*): implement node-style module resolution

Author: Stanislav Panferov

README.md

@@ -99,11 +99,6 @@ Specify path to a TS config file. Useful when you have multiple config files. Th
 
 Use this setting to force loader to use webpack's way to load files. Useful only with ts-jsx-loader. Builds may become slower.
 
-### rewriteImports *(array)*
-
-Array of modules that must be processed by webpack in imports. Useful if you want to use `some-lib`
-with pure TS files inside your app.
-
 ### externals *(array)*
 
 Array of paths to .d.ts files that must be included in program. Useful with `rewriteImports`.

package.json

@@ -25,13 +25,13 @@
   "homepage": "https://github.com/s-panferov/awesome-typescript-loader",
   "dependencies": {
     "bluebird": "^2.7.1",
+    "colors": "^1.1.2",
+    "deasync": "^0.1.1",
     "loader-utils": "^0.2.6",
     "lodash": "^3.10.0",
-    "object-assign": "^2.0.0",
-    "colors": "^1.1.2"
+    "object-assign": "^2.0.0"
   },
   "devDependencies": {
-    "typescript": "1.6.0-dev.20150801",
     "git-hooks": "0.0.10",
     "grunt": "^0.4.5",
     "grunt-bump": "^0.3.1",
@@ -41,6 +41,7 @@
     "grunt-conventional-changelog": "^1.2.1",
     "grunt-shell": "^1.1.2",
     "grunt-ts": "^3.0.0",
-    "load-grunt-tasks": "^0.6.0"
+    "load-grunt-tasks": "^0.6.0",
+    "typescript": "^1.7.0-dev.20150901"
   }
 }

src/deps.ts

@@ -31,16 +31,6 @@ function pathWithoutExt(fileName) {
     );
 }
 
-function needRewrite(rewriteImports, importPath): boolean {
-    return rewriteImports && _.any(rewriteImports, (i) => {
-        return importPath.split('/')[0] == i
-    })
-}
-
-function updateText(text, pos, end, newText): string {
-    return text.slice(0, pos) + ` '${newText}'` + text.slice(end, text.length);
-}
-
 function isImportOrExportDeclaration(node: ts.Node) {
     return (!!(<any>node).exportClause || !!(<any>node).importClause)
         && (<any>node).moduleSpecifier;
@@ -128,7 +118,6 @@ export class FileAnalyzer {
 
         let isDeclaration = isTypeDeclaration(fileName);
 
-        let rewrites: {pos: number, end: number, module: string}[] = [];
         let resolves: Promise<void>[] = [];
 
         let result = [];
@@ -137,23 +126,13 @@ export class FileAnalyzer {
                 // we need this check to ensure that we have an external import
                 let importPath = (<any>node).moduleReference.expression.text;
                 resolves.push(this.resolve(resolver, fileName, importPath).then((absolutePath) => {
-                    if (needRewrite(this.state.options.rewriteImports, importPath)) {
-                        let { pos, end } = (<any>node).moduleReference.expression;
-                        let module = pathWithoutExt(absolutePath);
-                        rewrites.push({ pos, end, module });
-                    }
                     if (!isIgnoreDependency(absolutePath)) {
                         result.push(absolutePath);
                     }
                 }));
             } else if (!isDeclaration && isImportOrExportDeclaration(node)) {
                 let importPath = (<any>node).moduleSpecifier.text;
                 resolves.push(this.resolve(resolver, fileName, importPath).then((absolutePath) => {
-                    if (needRewrite(this.state.options.rewriteImports, importPath)) {
-                        let module = pathWithoutExt(absolutePath);
-                        let { pos, end } = (<any>node).moduleSpecifier;
-                        rewrites.push({ pos, end, module });
-                    }
                     if (!isIgnoreDependency(absolutePath)) {
                         result.push(absolutePath);
                     }
@@ -168,11 +147,6 @@ export class FileAnalyzer {
 
         visit(sourceFile);
         return Promise.all(resolves).then(() => {
-            let orderedRewrites = (<any>_).sortByAll(rewrites, 'pos', 'end').reverse();
-            orderedRewrites.forEach(({ pos, end, module }) => {
-                scriptSnapshot = updateText(scriptSnapshot, pos, end, module)
-            });
-            this.state.updateFile(fileName, scriptSnapshot);
             return result;
         });
     }

src/helpers.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import * as host from 'host';
+import * as host from './host';
 
 function isFileEmit(fileName, outputFileName, sourceFileName) {
     return sourceFileName === fileName

src/host.ts

@@ -24,6 +24,10 @@ export interface ICompilerInfo {
     lib6: { fileName: string, text: string };
 }
 
+export interface SyncResolver {
+    (context: string, fileName: string): string;
+}
+
 export interface ICompilerOptions extends ts.CompilerOptions {
     noLib?: boolean;
     instanceName?: string;
@@ -34,7 +38,6 @@ export interface ICompilerOptions extends ts.CompilerOptions {
     reEmitDependentFiles?: boolean;
     tsconfig?: string;
     useWebpackText?: boolean;
-    rewriteImports?: any;
     externals?: any;
     doTypeCheck?: boolean;
     forkChecker?: boolean;
@@ -53,12 +56,31 @@ export interface IEmitOutput extends ts.EmitOutput {
     outputFiles: IOutputFile[]
 }
 
+export class ModuleResolutionHost implements ts.ModuleResolutionHost {
+    servicesHost: Host;
+
+    constructor(servicesHost: Host) {
+        this.servicesHost = servicesHost;
+    }
+
+    fileExists(fileName: string)  {
+        return this.servicesHost.getScriptSnapshot(fileName) !== undefined;
+    }
+
+    readFile(fileName: string): string {
+        let snapshot = this.servicesHost.getScriptSnapshot(fileName);
+        return snapshot && snapshot.getText(0, snapshot.getLength());
+    }
+}
+
 export class Host implements ts.LanguageServiceHost {
 
     state: State;
+    moduleResolutionHost: ModuleResolutionHost
 
     constructor(state: State) {
         this.state = state;
+        this.moduleResolutionHost = new ModuleResolutionHost(this);
     }
 
     getScriptFileNames() {
@@ -96,6 +118,32 @@ export class Host implements ts.LanguageServiceHost {
             this.state.compilerInfo.lib5.fileName;
     }
 
+    resolveModuleNames(moduleNames: string[], containingFile: string) {
+        let resolvedFileNames: string[] = [];
+
+        for (let moduleName of moduleNames) {
+            let resolvedFileName: string;
+            try {
+                resolvedFileName = this.state.resolver(containingFile, moduleName)
+                if (!resolvedFileName.match(/\.tsx?$/)) resolvedFileName = null;
+            }
+            catch (e) { resolvedFileName = null }
+
+            if (!resolvedFileName) {
+                resolvedFileName = this.state.ts.resolveModuleName(
+                    moduleName,
+                    containingFile,
+                    this.state.options,
+                    this.moduleResolutionHost
+                ).resolvedFileName
+            }
+
+            resolvedFileNames.push(resolvedFileName);
+        }
+
+        return resolvedFileNames;
+    }
+
     log(message) {
         //console.log(message);
     }
@@ -113,14 +161,17 @@ export class State {
     options: ICompilerOptions;
     program: ts.Program;
     fileAnalyzer: FileAnalyzer;
+    resolver: SyncResolver;
 
     constructor(
         options: ICompilerOptions,
         fsImpl: typeof fs,
-        compilerInfo: ICompilerInfo
+        compilerInfo: ICompilerInfo,
+        resolver: SyncResolver
     ) {
         this.ts = compilerInfo.tsImpl;
         this.compilerInfo = compilerInfo;
+        this.resolver = resolver;
         this.fs = fsImpl;
         this.host = new Host(this);
         this.services = this.ts.createLanguageService(this.host, this.ts.createDocumentRegistry());

src/index.ts

@@ -15,6 +15,7 @@ import * as helpers from './helpers';
 import { loadLib } from './helpers';
 
 let loaderUtils = require('loader-utils');
+let deasync = require('deasync');
 
 let pkg = require('../package.json');
 let cachePromise = Promise.promisify(cache);
@@ -225,10 +226,6 @@ function ensureInstance(webpack: IWebPack, options: ICompilerOptions, instanceNa
         }
     }
 
-    if (typeof options.rewriteImports == 'undefined') {
-        options.rewriteImports = [];
-    }
-
     if (typeof options.externals == 'undefined') {
         options.externals = [];
     }
@@ -276,7 +273,9 @@ function ensureInstance(webpack: IWebPack, options: ICompilerOptions, instanceNa
         }
     }
 
-    let tsState = new State(options, webpack._compiler.inputFileSystem, compilerInfo);
+    let syncResolver = deasync(webpack.resolve);
+
+    let tsState = new State(options, webpack._compiler.inputFileSystem, compilerInfo, syncResolver);
     let compiler = (<any>webpack._compiler);
 
     compiler.plugin('watch-run', (watching, callback) => {