feat(checker-runtime): checker now can resolve imports too

s-panferov · Nov 24, 2015 · 99220c1 · 99220c1
1 parent ddca715
commit 99220c1
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 11 deletions.
diff --git a/src/checker-runtime.ts b/src/checker-runtime.ts
@@ -1,5 +1,7 @@
-import { ICompilerOptions, ICompilerInfo, IFile } from './host';
+import { ICompilerOptions, ICompilerInfo, IFile, SyncResolver } from './host';
+import makeResolver from './resolver';
 import * as colors from 'colors';
+import * as path from 'path';
 
 require('babel-polyfill');
 
@@ -16,6 +18,7 @@ export interface IMessage {
 export interface IInitPayload {
     compilerOptions: ICompilerOptions;
     compilerInfo: ICompilerInfo;
+    webpackOptions: any;
 }
 
 export interface ICompilePayload {
@@ -25,6 +28,7 @@ export interface ICompilePayload {
 
 export interface IEnv {
     options?: ICompilerOptions;
+    webpackOptions?: any;
     compiler?: typeof ts;
     compilerInfo?: ICompilerInfo;
     host?: Host;
@@ -36,7 +40,35 @@ export interface IEnv {
 
 let env: IEnv = {};
 
+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 {
+    moduleResolutionHost: ModuleResolutionHost
+    resolver: SyncResolver
+
+    constructor() {
+        this.moduleResolutionHost = new ModuleResolutionHost(this);
+        this.resolver = makeResolver(env.webpackOptions);
+    }
+
+    normalizePath(filePath: string): string {
+        return path.normalize(filePath);
+    }
 
     getScriptFileNames() {
         return Object.keys(env.files);
@@ -71,9 +103,44 @@ export class Host implements ts.LanguageServiceHost {
         let resolvedModules: ts.ResolvedModule[] = [];
 
         for (let moduleName of moduleNames) {
-            resolvedModules.push(
-                env.resolutionCache[`${containingFile}::${moduleName}`]
-            );
+            let cached = env.resolutionCache[`${containingFile}::${moduleName}`];
+            if (cached) {
+                resolvedModules.push(cached);
+            } else {
+                let resolvedFileName: string;
+                let resolvedModule: ts.ResolvedModule;
+
+                try {
+                    resolvedFileName = this.resolver.resolveSync(
+                        this.normalizePath(path.dirname(containingFile)),
+                        moduleName
+                    );
+
+                    if (!resolvedFileName.match(/\.tsx?$/)) {
+                        resolvedFileName = null;
+                    }
+                }
+                catch (e) {
+                    resolvedFileName = null
+                }
+
+                let tsResolved = env.compiler.resolveModuleName(
+                    resolvedFileName || moduleName,
+                    containingFile,
+                    env.options,
+                    this.moduleResolutionHost
+                );
+
+                if (tsResolved.resolvedModule) {
+                    resolvedModule = tsResolved.resolvedModule;
+                } else {
+                    resolvedModule = {
+                        resolvedFileName: resolvedFileName || ''
+                    }
+                }
+
+                resolvedModules.push(resolvedModule);
+            }
         }
 
         return resolvedModules;
@@ -92,9 +159,10 @@ export class Host implements ts.LanguageServiceHost {
 
 function processInit(payload: IInitPayload) {
     env.compiler = require(payload.compilerInfo.compilerName);
-    env.host = new Host();
     env.compilerInfo = payload.compilerInfo;
     env.options = payload.compilerOptions;
+    env.webpackOptions = payload.webpackOptions;
+    env.host = new Host();
     env.service = env.compiler.createLanguageService(env.host, env.compiler.createDocumentRegistry());
 }
 

diff --git a/src/checker.ts b/src/checker.ts
@@ -7,22 +7,29 @@ interface ChildProcess extends childProcess.ChildProcess {
     inProgress?: boolean;
     compilerInfo?: ICompilerInfo;
     compilerOptions?: ICompilerOptions;
+    webpackOptions?: any;
 }
 
-export function createChecker(compilerInfo: ICompilerInfo, compilerOptions: ICompilerOptions): ChildProcess {
+export function createChecker(
+    compilerInfo: ICompilerInfo,
+    compilerOptions: ICompilerOptions,
+    webpackOptions: any
+): ChildProcess {
     let checker: ChildProcess = childProcess.fork(path.join(__dirname, 'checker-runtime.js'));
 
     checker.send({
         messageType: 'init',
         payload: {
             compilerInfo: _.omit(compilerInfo, 'tsImpl'),
-            compilerOptions
+            compilerOptions,
+            webpackOptions
         }
     }, null);
 
     checker.inProgress = false;
     checker.compilerInfo = compilerInfo;
     checker.compilerOptions = compilerOptions;
+    checker.webpackOptions = webpackOptions;
     checker.on('message', function(msg) {
         if (msg.messageType == 'progress') {
             checker.inProgress = msg.payload.inProgress;
@@ -35,7 +42,7 @@ export function createChecker(compilerInfo: ICompilerInfo, compilerOptions: ICom
 export function resetChecker(checker: ChildProcess) {
     if (checker.inProgress) {
         checker.kill('SIGKILL');
-        return createChecker(checker.compilerInfo, checker.compilerOptions);
+        return createChecker(checker.compilerInfo, checker.compilerOptions, checker.webpackOptions);
     } else {
         return checker;
     }

diff --git a/src/instance.ts b/src/instance.ts
@@ -156,7 +156,7 @@ export function ensureInstance(webpack: IWebPack, options: ICompilerOptions, ins
         sourceRoot: process.cwd()
     });
 
-    options = _.omit(options, 'outDir') as any;
+    options = _.omit(options, 'outDir', 'files', 'exclude') as any;
     options.externals.push.apply(options.externals, tsFiles)
 
     let babelImpl: any;
@@ -202,6 +202,8 @@ export function ensureInstance(webpack: IWebPack, options: ICompilerOptions, ins
         setupAfterCompile(compiler, instanceName, forkChecker);
     }
 
+    let webpackOptions = _.pick(webpack._compiler.options, 'resolve');
+
     return getInstanceStore(webpack._compiler)[instanceName] = {
         tsFlow,
         tsState,
@@ -210,7 +212,7 @@ export function ensureInstance(webpack: IWebPack, options: ICompilerOptions, ins
         options,
         externalsInvoked: false,
         checker: forkChecker
-            ? createChecker(compilerInfo, options)
+            ? createChecker(compilerInfo, options, webpackOptions)
             : null,
         cacheIdentifier
     }

diff --git a/src/tsconfig-utils.ts b/src/tsconfig-utils.ts
@@ -6,6 +6,7 @@ function buildEnumMap(tsImpl: typeof ts) {
             'es3': tsImpl.ScriptTarget.ES3,
             'es5': tsImpl.ScriptTarget.ES5,
             'es6': tsImpl.ScriptTarget.ES6,
+            'es2015': tsImpl.ScriptTarget.ES2015,
             'latest': tsImpl.ScriptTarget.Latest
         },
         module: {

diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -5,7 +5,6 @@
         "declaration": false,
         "noImplicitAny": false,
         "removeComments": true,
-        "moduleResolution": "node",
         "noLib": false,
         "preserveConstEnums": true,
         "suppressImplicitAnyIndexErrors": true