Merge pull request #52 from s-panferov/feature/fix-checker

feat(*): checker in sep. process now runs only with ForkCheckerPlugin

Author: s-panferov

README.md

@@ -111,6 +111,20 @@ Use this setting to disable type checking if you want.
 
 Do type checking in a separate process, so webpack don't need to wait. **Significantly** improves development workflow with tools like [react-hot-loader](https://github.com/gaearon/react-hot-loader).
 
+Works only with `ForkCheckerPlugin`:
+
+```js
+var ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
+
+plugins: [
+    new ForkCheckerPlugin(),
+]
+```
+
+### forkCheckerSilent *(boolean) (default=false)*
+
+Less logging from the checker.
+
 ### useBabel *(boolean) (default=false)*
 
 Invoke Babel to traspile files. Useful with ES6 target.

package.json

@@ -42,6 +42,6 @@
     "grunt-shell": "^1.1.2",
     "grunt-ts": "^3.0.0",
     "load-grunt-tasks": "^0.6.0",
-    "typescript": "^1.7.0-dev.20150901"
+    "typescript": "^1.6.0-dev.20150910"
   }
 }

src/checker.ts

@@ -2,36 +2,6 @@ import { ICompilerOptions, ICompilerInfo, IFile } from './host';
 import * as colors from 'colors';
 import * as _ from 'lodash';
 
-const AWESOME_SYNONYMS = [
-    'awesome',
-    'impressive',
-    'amazing',
-    'grand',
-    'majestic',
-    'magnificent',
-    'wonderful',
-    'great',
-    'marvellous',
-    'incredible',
-    'fabulous',
-    'outstanding',
-    'unbelievable',
-    'beautiful',
-    'excellent',
-    'mind-blowing',
-    'superb',
-    'badass',
-    'brilliant',
-    'exciting',
-    'eye-opening',
-    'fucking good',
-    'fine',
-    'perfect',
-    'cool',
-    'fantastical',
-    'five-star'
-];
-
 export enum MessageType {
     Init = <any>'init',
     Compile = <any>'compile'
@@ -129,7 +99,12 @@ function processInit(payload: IInitPayload) {
 }
 
 function processCompile(payload: ICompilePayload) {
-    console.log(colors.cyan(`[${ env.options.instanceName || '' }] Checking started...`));
+    let instanceName = env.options.instanceName || 'default';
+    let silent = !!env.options.forkCheckerSilent;
+    if (!silent) {
+        console.log(colors.cyan(`[${ instanceName }] Checking started in a separate process...`));
+    }
+
     let timeStart = +new Date();
     process.send({
         messageType: 'progress',
@@ -143,23 +118,22 @@ function processCompile(payload: ICompilePayload) {
     let program = env.program = env.service.getProgram();
     let allDiagnostics = env.compiler.getPreEmitDiagnostics(program);
     if (allDiagnostics.length) {
-        console.error(colors.yellow('Checker diagnostics:'))
         allDiagnostics.forEach(diagnostic => {
             let message = env.compiler.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-
             if (diagnostic.file) {
                 let { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
-                console.error(`${colors.cyan(diagnostic.file.fileName)} (${line + 1},${character + 1}):\n    ${colors.red(message)}`);
+                console.error(`[${ instanceName }] ${colors.red(diagnostic.file.fileName)} (${line + 1},${character + 1}):\n    ${colors.red(message)}`);
             } else {
-                console.error(colors.red(message));
+                console.error(colors.red(`[${ instanceName }] ${ message }`));
             }
         });
     } else {
-        let timeEnd = +new Date();
-        console.error(
-            colors.green(`[${ env.options.instanceName || '' }] Program is `
-                + AWESOME_SYNONYMS[_.random(AWESOME_SYNONYMS.length - 1)] + `! ${(timeEnd - timeStart) / 1000} sec.`)
-        );
+        if (!silent) {
+            let timeEnd = +new Date();
+            console.log(
+                colors.green(`[${ instanceName }] Ok, ${(timeEnd - timeStart) / 1000} sec.`)
+            );
+        }
     }
 
     process.send({

src/helpers.ts

@@ -55,14 +55,14 @@ export function codegenErrorReport(errors) {
         .join('\n');
 }
 
-export function formatErrors(errors: ts.Diagnostic[]) {
+export function formatErrors(instanceName: string, errors: ts.Diagnostic[]) {
     return errors.map(function (diagnostic) {
         let lineChar;
         if (diagnostic.file) {
             lineChar = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
         }
         return (
-            (diagnostic.file ? diagnostic.file.fileName : '')
+            `[${ instanceName }] ` + (diagnostic.file ? diagnostic.file.fileName : '')
             + (lineChar ? formatLineChar(lineChar) + ' ' : '') + "\n"
             + (typeof diagnostic.messageText == "string" ?
                 diagnostic.messageText :

src/host.ts

@@ -41,6 +41,7 @@ export interface ICompilerOptions extends ts.CompilerOptions {
     externals?: any;
     doTypeCheck?: boolean;
     forkChecker?: boolean;
+    forkCheckerSilent?: boolean;
     useBabel?: boolean;
     usePrecompiledFiles?: boolean;
     useCache?: boolean;

src/index.ts

@@ -23,6 +23,7 @@ let cachePromise = Promise.promisify(cache);
 interface ICompiler {
     inputFileSystem: typeof fs;
     _tsInstances: {[key:string]: ICompilerInstance};
+    _tsFork: boolean;
     options: {
         externals: {
             [ key: string ]: string
@@ -192,7 +193,7 @@ function ensureInstance(webpack: IWebPack, options: ICompilerOptions, instanceNa
 
     let tsConfigFiles = [];
     if (configFileName) {
-        configFile = tsImpl.readConfigFile(configFileName);
+        configFile = tsImpl.readConfigFile(configFileName, (path) => fs.readFileSync(path).toString());
         if (configFile.error) {
             throw configFile.error;
         }
@@ -297,12 +298,14 @@ function ensureInstance(webpack: IWebPack, options: ICompilerOptions, instanceNa
         }
     }
 
+    let forkChecker = options.forkChecker && getRootCompiler(webpack._compiler)._tsFork;
     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) => {
+
         let resolver = createResolver(watching.compiler, watching.compiler.resolvers.normal.resolve);
         let instance: ICompilerInstance = resolveInstance(watching.compiler, instanceName);
         let state = instance.tsState;
@@ -335,7 +338,7 @@ function ensureInstance(webpack: IWebPack, options: ICompilerOptions, instanceNa
             let instance: ICompilerInstance = resolveInstance(compilation.compiler, instanceName);
             let state = instance.tsState;
 
-            if (options.forkChecker) {
+            if (forkChecker) {
                 let payload = {
                     files: state.files,
                     resolutionCache: state.host.moduleResolutionHost.resolutionCache
@@ -355,7 +358,7 @@ function ensureInstance(webpack: IWebPack, options: ICompilerOptions, instanceNa
                     compilation.errors.push(new Error(err))
                 };
 
-                let errors = helpers.formatErrors(diagnostics);
+                let errors = helpers.formatErrors(instanceName, diagnostics);
                 errors.forEach(emitError);
             }
 
@@ -380,7 +383,7 @@ function ensureInstance(webpack: IWebPack, options: ICompilerOptions, instanceNa
         compiledFiles: {},
         options,
         externalsInvoked: false,
-        checker: options.forkChecker
+        checker: forkChecker
             ? createChecker(compilerInfo, options)
             : null,
         cacheIdentifier
@@ -540,4 +543,15 @@ function compiler(webpack: IWebPack, text: string): void {
         .catch((err) => { callback(err) })
 }
 
+class ForkCheckerPlugin {
+    apply(compiler) {
+        compiler.plugin("watch-run", function(params, callback) {
+            compiler._tsFork = true;
+            callback();
+        });
+    }
+}
+
+(loader as any).ForkCheckerPlugin = ForkCheckerPlugin;
+
 export = loader;