refactor: add configFileName test and fix getTimes() usage

Author: s-panferov

package.json

@@ -41,26 +41,26 @@
     "source-map-support": "^0.4.11"
   },
   "devDependencies": {
-    "@types/chai": "^3.4.34",
+    "@types/chai": "^3.4.35",
     "@types/colors": "^1.1.1",
-    "@types/lodash": "^4.14.52",
+    "@types/lodash": "^4.14.54",
     "@types/mocha": "^2.2.39",
     "@types/node": "^7.0.5",
     "@types/shelljs": "^0.7.0",
     "@types/sinon": "^1.16.35",
-    "@types/webpack": "^2.2.6",
-    "bluebird": "^3.4.7",
+    "@types/webpack": "^2.2.8",
+    "bluebird": "^3.5.0",
     "chai": "^3.5.0",
     "empty-module": "0.0.2",
     "fs-extra": "^2.0.0",
     "mocha": "^3.2.0",
     "ps-node": "^0.1.1",
-    "rimraf": "^2.5.0",
+    "rimraf": "^2.6.1",
     "shelljs": "^0.7.6",
     "standard-version": "^4.0.0",
     "temp": "^0.8.3",
-    "tslint": "^4.4.2",
-    "typescript": "^2.1.6",
+    "tslint": "^4.5.1",
+    "typescript": "^2.2.1",
     "webpack": "^2.2.1"
   }
 }

src/__test__/config-file-name.ts

@@ -0,0 +1,22 @@
+import {
+    src, webpackConfig, tsconfig,
+    compile, expectErrors, spec, query
+} from './utils';
+
+spec(__filename, async function() {
+    src('index.ts', `
+        const a = {}
+        const b = Object.values(a);
+    `);
+
+    tsconfig({
+        target: 'es2017'
+    }, undefined, './config/tsconfig.json');
+
+    const config = webpackConfig(query({
+        configFileName: './config/tsconfig.json'
+    }));
+
+    let stats = await compile(config);
+    expectErrors(stats, 0);
+});

src/__test__/utils.ts

@@ -247,15 +247,19 @@ export function expectWarnings(stats: any, count: number, warnings: string[] = [
 
 export function tsconfig(
     compilerOptions?: any,
-    config?: any
+    config?: any,
+    fileName = 'tsconfig.json'
 ) {
     const res = _.merge({
         compilerOptions: _.merge({
             target: 'es6',
-            moduleResolution: 'node'
+            moduleResolution: 'node',
+            typeRoots: [
+                './node_modules/@types'
+            ]
         }, compilerOptions)
     }, config);
-    return file('tsconfig.json', json(res));
+    return file(fileName, json(res));
 }
 
 export function install(...name: string[]) {

src/__test__/watch-output.ts

@@ -24,7 +24,7 @@ spec(__filename, async function(env, done) {
         stdout('Webpack is watching the files…'),
         stderr('Checking finished with 1 errors'),
         stdout([
-            'ERROR in [at-loader]',
+            'ERROR in [at-loader] ./src/index.ts',
             `TS2345: Argument of type '"1"' is not assignable to parameter of type 'number'`
         ]),
     );

src/checker/checker.ts

@@ -112,12 +112,13 @@ export class Checker {
         } as EmitFile.Request);
     }
 
-    updateFile(fileName: string, text: string) {
+    updateFile(fileName: string, text: string, ifExist = false) {
         return this.req({
             type: 'UpdateFile',
             payload: {
                 fileName,
-                text
+                text,
+                ifExist
             }
         } as UpdateFile.Request);
     }

src/checker/protocol.ts

@@ -55,6 +55,7 @@ export namespace UpdateFile {
     export interface Payload {
         fileName: string;
         text: string;
+        ifExist: boolean;
     }
 
     export interface Request extends ReqBase {

src/checker/runtime.ts

@@ -261,6 +261,7 @@ function createChecker(receive: (cb: (msg: Req) => void) => void, send: (msg: Re
             };
         });
 
+
         const program = service.getProgram();
         program.getSourceFiles().forEach(file => {
             files[file.fileName] = {
@@ -270,6 +271,7 @@ function createChecker(receive: (cb: (msg: Req) => void) => void, send: (msg: Re
             };
         });
 
+
         if (loaderConfig.debug) {
             console.log(`[${instanceName}] @DEBUG Initial files`, Object.keys(files));
         }
@@ -280,19 +282,18 @@ function createChecker(receive: (cb: (msg: Req) => void) => void, send: (msg: Re
             });
         }
 
-
         replyOk(seq, null);
     }
 
-    function updateFile(fileName: string, text: string) {
+    function updateFile(fileName: string, text: string, ifExist = false) {
         const file = files[fileName];
         if (file) {
             if (file.text === text) { return; }
             projectVersion++;
             file.version++;
             file.text = text;
             file.snapshot = compiler.ScriptSnapshot.fromString(text);
-        } else {
+        } else if (!ifExist) {
             projectVersion++;
             files[fileName] = {
                 text,
@@ -337,7 +338,7 @@ function createChecker(receive: (cb: (msg: Req) => void) => void, send: (msg: Re
     }
 
     function processUpdate({seq, payload}: UpdateFile.Request) {
-        updateFile(payload.fileName, payload.text);
+        updateFile(payload.fileName, payload.text, payload.ifExist);
         replyOk(seq, null);
     }
 
@@ -407,8 +408,12 @@ function createChecker(receive: (cb: (msg: Req) => void) => void, send: (msg: Re
             .filter(diag => !ignoreDiagnostics[diag.code])
             .map(diagnostic => {
                 const message = compiler.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-                const fileName = diagnostic.file && './'+path.relative(context, diagnostic.file.fileName);
-                
+                let fileName = diagnostic.file && path.relative(context, diagnostic.file.fileName);
+
+                if (fileName[0] !== '.') {
+                    fileName = './' + fileName;
+                }
+
                 let pretty = '';
                 let line = 0;
                 let character = 0;

src/instance.ts

@@ -330,13 +330,13 @@ function setupWatchRun(compiler, instanceName: string) {
         const watcher = watching.compiler.watchFileSystem.watcher
             || watching.compiler.watchFileSystem.wfs.watcher;
 
-        const mtimes = watcher.getTimes();
+        const mtimes = watcher.mtimes || (watcher.getTimes && watcher.getTimes()) || {};
         const changedFiles = Object.keys(mtimes).map(toUnix);
         const updates = changedFiles
             .filter(file => EXTENSIONS.test(file))
             .map(changedFile => {
                 if (fs.existsSync(changedFile)) {
-                    checker.updateFile(changedFile, fs.readFileSync(changedFile).toString());
+                    checker.updateFile(changedFile, fs.readFileSync(changedFile).toString(), true);
                 } else {
                     checker.removeFile(changedFile);
                 }