Merge pull request #519 from sheetalkamat/builder

Using the new watch api of compiler

src/cache.ts

@@ -1,8 +1,8 @@
-import * as fs from 'fs';
-import * as os from 'os';
-import * as path from 'path';
-import * as zlib from 'zlib';
-import { createHash } from 'crypto';
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import * as zlib from "zlib";
+import { createHash } from "crypto";
 
 export interface CompiledModule {
     fileName: string;
@@ -12,7 +12,7 @@ export interface CompiledModule {
 }
 
 export function findCompiledModule(fileName: string): CompiledModule {
-    let baseFileName = fileName.replace(/(\.ts|\.tsx)$/, '');
+    let baseFileName = fileName.replace(/(\.ts|\.tsx)$/, "");
     let compiledFileName = `${baseFileName}.js`;
 
     if (fs.existsSync(compiledFileName)) {
@@ -64,7 +64,7 @@ function write(filename: string, result: any) {
  * @return {String}
  */
 function filename(source: string, identifier, options) {
-    let hash = createHash('sha512') as any;
+    let hash = createHash("sha512") as any;
     let contents = JSON.stringify({
         identifier: identifier,
         options: options,
@@ -73,7 +73,7 @@ function filename(source: string, identifier, options) {
 
     hash.end(contents);
 
-    return hash.read().toString('hex') + '.json.gzip';
+    return hash.read().toString("hex") + ".json.gzip";
 }
 
 export interface CacheParams<T> {
@@ -94,7 +94,7 @@ export function cache<T>(params: CacheParams<T>): Promise<{cached: boolean, resu
     let options = params.options || {};
     let transform = params.transform;
     let identifier = params.identifier;
-    let directory = (typeof params.directory === 'string') ?
+    let directory = (typeof params.directory === "string") ?
         params.directory :
         os.tmpdir();
 

src/checker/checker.ts

@@ -1,7 +1,7 @@
-import * as _ from 'lodash';
-import * as childProcess from 'child_process';
-import * as path from 'path';
-import { QueuedSender, createQueuedSender } from './send';
+import * as _ from "lodash";
+import * as childProcess from "child_process";
+import * as path from "path";
+import { QueuedSender, createQueuedSender } from "./send";
 
 import {
     CompilerInfo,
@@ -15,7 +15,7 @@ import {
     UpdateFile,
     TsConfig,
     RemoveFile
-} from './protocol';
+} from "./protocol";
 
 export interface Resolve {
     resolve: (...args: any[]) => void;
@@ -44,8 +44,8 @@ export class Checker {
     ) {
         const execArgv = getExecArgv();
         const checker: childProcess.ChildProcess = fork
-            ? childProcess.fork(path.join(__dirname, 'runtime.js'), [], { execArgv })
-            : require('./runtime').run();
+            ? childProcess.fork(path.join(__dirname, "runtime.js"), [], { execArgv })
+            : require("./runtime").run();
 
         this.sender = fork
             ? createQueuedSender(checker)
@@ -57,11 +57,11 @@ export class Checker {
         this.compilerConfig = compilerConfig;
         this.webpackOptions = webpackOptions;
 
-        checker.on('error', (e) => {
-            console.error('Typescript checker error:', e);
+        checker.on("error", (e) => {
+            console.error("Typescript checker error:", e);
         });
 
-        checker.on('message', (res: Res) => {
+        checker.on("message", (res: Res) => {
             const {seq, success, payload} = res;
             if (seq && this.pending.has(seq)) {
                 const resolver = this.pending.get(seq);
@@ -73,14 +73,14 @@ export class Checker {
 
                 this.pending.delete(seq);
             } else {
-                console.warn('Unknown message: ', payload);
+                console.warn("Unknown message: ", payload);
             }
         });
 
         this.req({
-            type: 'Init',
+            type: "Init",
             payload: {
-                compilerInfo: _.omit(compilerInfo, 'tsImpl'),
+                compilerInfo: _.omit(compilerInfo, "tsImpl"),
                 loaderConfig,
                 compilerConfig,
                 webpackOptions,
@@ -104,7 +104,7 @@ export class Checker {
 
     emitFile(fileName: string, text: string): Promise<EmitFile.ResPayload> {
         return this.req({
-            type: 'EmitFile',
+            type: "EmitFile",
             payload: {
                 fileName,
                 text
@@ -114,7 +114,7 @@ export class Checker {
 
     updateFile(fileName: string, text: string, ifExist = false) {
         return this.req({
-            type: 'UpdateFile',
+            type: "UpdateFile",
             payload: {
                 fileName,
                 text,
@@ -125,7 +125,7 @@ export class Checker {
 
     removeFile(fileName: string) {
         return this.req({
-            type: 'RemoveFile',
+            type: "RemoveFile",
             payload: {
                 fileName,
             }
@@ -134,18 +134,18 @@ export class Checker {
 
     getDiagnostics(): Promise<any> {
         return this.req({
-            type: 'Diagnostics'
+            type: "Diagnostics"
         } as Diagnostics.Request);
     }
 
     getFiles(): any {
         return this.req({
-            type: 'Files'
+            type: "Files"
         } as Files.Request);
     }
 
     kill() {
-        this.checker.kill('SIGKILL');
+        this.checker.kill("SIGKILL");
     }
 }
 

src/checker/index.ts

@@ -1 +1 @@
-export { Checker } from './checker';
+export { Checker } from "./checker";

src/checker/protocol.ts

@@ -1,14 +1,14 @@
-import { LoaderConfig, CompilerInfo, TsConfig } from '../interfaces';
+import { LoaderConfig, CompilerInfo, TsConfig } from "../interfaces";
 export { CompilerInfo, LoaderConfig, TsConfig }
 
-export type MessageType = 'Init' | 'UpdateFile' | 'Diagnostics' | 'EmitFile' | 'Files' | 'RemoveFile'
+export type MessageType = "Init" | "UpdateFile" | "Diagnostics" | "EmitFile" | "Files" | "RemoveFile"
 export const MessageType = {
-    Init: 'Init' as 'Init',
-    Files: 'Files' as 'Files',
-    UpdateFile: 'UpdateFile' as 'UpdateFile',
-    RemoveFile: 'RemoveFile' as 'RemoveFile',
-    Diagnostics: 'Diagnostics' as 'Diagnostics',
-    EmitFile: 'EmitFile' as 'EmitFile',
+    Init: "Init" as "Init",
+    Files: "Files" as "Files",
+    UpdateFile: "UpdateFile" as "UpdateFile",
+    RemoveFile: "RemoveFile" as "RemoveFile",
+    Diagnostics: "Diagnostics" as "Diagnostics",
+    EmitFile: "EmitFile" as "EmitFile",
 };
 
 export interface ReqBase {
@@ -44,7 +44,7 @@ export namespace Init {
     }
 
     export interface Request extends ReqBase {
-        type: 'Init';
+        type: "Init";
         payload: Payload;
     }
 
@@ -59,7 +59,7 @@ export namespace UpdateFile {
     }
 
     export interface Request extends ReqBase {
-        type: 'UpdateFile';
+        type: "UpdateFile";
         payload: Payload;
     }
 
@@ -77,7 +77,7 @@ export namespace RemoveFile {
     }
 
     export interface Request extends ReqBase {
-        type: 'RemoveFile';
+        type: "RemoveFile";
         payload: Payload;
     }
 
@@ -94,7 +94,7 @@ export namespace EmitFile {
     }
 
     export interface Request extends ReqBase {
-        type: 'EmitFile';
+        type: "EmitFile";
         payload: ReqPayload;
     }
 
@@ -114,7 +114,7 @@ export namespace EmitFile {
 
 export namespace Files {
     export interface Request extends ReqBase {
-        type: 'Files';
+        type: "Files";
     }
 
     export interface Response {
@@ -126,7 +126,7 @@ export namespace Files {
 
 export namespace Diagnostics {
     export interface Request extends ReqBase {
-        type: 'Diagnostics';
+        type: "Diagnostics";
     }
 
     export interface Response {