fix: refactor tests, add angular-webpack-starter test, also fixes #286

Author: s-panferov

README.md

@@ -64,7 +64,7 @@ After that, you will be able to build TypeScript files with webpack.
 
 ## NodeJS versions
 
-The loader supports NodeJS 4 and newer.
+**The loader supports NodeJS 4 and newer.**
 
 ## tsconfig.json
 

package.json

@@ -37,23 +37,25 @@
     "loader-utils": "^0.2.16",
     "lodash": "^4.17.4",
     "object-assign": "^4.1.1",
-    "source-map-support": "^0.4.11"
+    "source-map-support": "^0.4.11",
+    "mkdirp": "^0.5.1"
   },
   "devDependencies": {
     "@types/chai": "^3.4.34",
     "@types/colors": "^1.1.1",
     "@types/lodash": "^4.14.52",
     "@types/mocha": "^2.2.39",
     "@types/node": "^7.0.5",
+    "@types/shelljs": "^0.6.0",
     "@types/sinon": "^1.16.34",
     "bluebird": "^3.4.7",
     "chai": "^3.5.0",
     "empty-module": "0.0.2",
     "fs-extra": "^2.0.0",
-    "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "ps-node": "^0.1.1",
     "rimraf": "^2.5.0",
+    "shelljs": "^0.7.6",
     "standard-version": "^4.0.0",
     "temp": "^0.8.3",
     "tslint": "^4.4.2",

src/__test__/angular-webpack-starter.ts

@@ -0,0 +1,26 @@
+import {
+    exec as run, spec, expect, stdout
+} from './utils';
+
+import { exec, ln } from 'shelljs';
+
+spec(__filename, async function(_env, done) {
+    this.timeout(5 * 60 * 1000);
+
+    exec('rimraf package.json');
+    exec('git clone --depth 1 https://github.com/angularclass/angular2-webpack-starter.git .');
+    exec('yarn install');
+    exec('rimraf node_modules/awesome-typescript-loader');
+    ln('-s', _env.LOADER, './node_modules/awesome-typescript-loader');
+
+    const wp = run('npm', ['run', 'webpack']);
+
+    await wp.wait(
+        stdout('[at-loader] Ok')
+    );
+
+    const code = await wp.alive();
+    expect(code).eq(0);
+
+    done();
+});

src/__test__/compile-output.ts

@@ -1,6 +1,6 @@
 import {
     src, tsconfig, stdout, stderr,
-    spec, file, exec
+    spec, file, execWebpack
 } from './utils';
 
 export function config(env) {
@@ -43,7 +43,8 @@ spec(__filename, async function(env, done) {
     tsconfig();
     config(env);
 
-    const webpack = exec('webpack');
+    const webpack = execWebpack();
+    webpack.strictOutput();
 
     await webpack.wait(
         stderr('Checking finished with 1 errors'),

src/__test__/create-cache-dir.ts

@@ -0,0 +1,30 @@
+import {
+    src, webpackConfig, tsconfig, compile, expect,
+    query, spec
+} from './utils';
+
+import * as path from 'path';
+import * as fs from 'fs';
+
+spec(__filename, async function() {
+    src('index.ts', `
+        class HiThere {
+            constructor(a: number, b: string) {
+                const t = a + b;
+            }
+        }
+    `);
+
+    tsconfig();
+
+    const config = webpackConfig(query({
+        useCache: true,
+        // test that we create cache dir
+        cacheDirectory: path.join(process.cwd(), 'cache', '.cache'),
+    }));
+
+    await compile(config);
+
+    const exists = fs.existsSync(path.join(process.cwd(), 'cache', '.cache'));
+    expect(exists).false;
+});

src/__test__/utils.ts

@@ -99,10 +99,17 @@ export class Exec {
         matchers: OutputMatcher[],
     }[] = [];
 
+    exitCode: number | null;
+    private _strictOutput = false;
+
     close() {
         this.process.kill();
     }
 
+    strictOutput() {
+        this._strictOutput = true;
+    }
+
     invoke({stdout, stderr}) {
         this.watchers = this.watchers.filter(watcher => {
             const output: Output  = {
@@ -112,7 +119,7 @@ export class Exec {
 
             const index = watcher.matchers.findIndex(m => m(output));
 
-            if (index === -1) {
+            if (this._strictOutput && index === -1) {
                 watcher.reject(new Error(`Unexpected ${output.type}:\n${output.data}`));
                 return false;
             }
@@ -141,7 +148,11 @@ export class Exec {
 
     alive(): Promise<any> {
         return new Promise((resolve, reject) => {
-            this.process.on('exit', resolve);
+            if (this.exitCode != null) {
+                resolve(this.exitCode);
+            } else {
+                this.process.on('exit', resolve);
+            }
         });
     }
 }
@@ -177,8 +188,16 @@ export function streamTest(stream = 'stdout', test: Test) {
 export const stdout = (test: Test) => streamTest('stdout', test);
 export const stderr = (test: Test) => streamTest('stderr', test);
 
-export function exec(command: string, args?: string[], options?: child.SpawnOptions) {
-    const p = child.spawn('node', [WEBPACK].concat(args), {
+export function execWebpack(args?: string[]) {
+    return execNode(WEBPACK, args);
+}
+
+export function execNode(command: string, args: string[] = []) {
+    return exec('node', [command].concat(args));
+}
+
+export function exec(command: string, args?: string[]) {
+    const p = child.spawn(command, args, {
         shell: false,
         stdio: 'pipe',
         env: process.env
@@ -200,7 +219,8 @@ export function exec(command: string, args?: string[], options?: child.SpawnOpti
         p.kill();
     });
 
-    process.on('exit', () => {
+    process.on('exit', (code) => {
+        waiter.exitCode = code;
         p.kill();
     });
 
@@ -275,7 +295,7 @@ export interface TestEnv {
 }
 
 export function spec<T>(name: string, cb: (env: TestEnv, done?: () => void) => Promise<T>, disable = false) {
-    const runner = (done?) => {
+    const runner = function (done?) {
         const temp = path.join(
             TEST_DIR,
             path.basename(name).replace('.', '') + '-' +
@@ -297,7 +317,7 @@ export function spec<T>(name: string, cb: (env: TestEnv, done?: () => void) => P
             WEBPACK
         };
 
-        const promise = cb(env, done);
+        const promise = cb.call(this, env, done);
         return promise
             .then(a => {
                 process.chdir(cwd);
@@ -310,8 +330,8 @@ export function spec<T>(name: string, cb: (env: TestEnv, done?: () => void) => P
     };
 
     const asyncRunner = cb.length === 2
-        ? (done) => { runner(done).catch(done); return; }
-        : () => runner();
+        ? function (done) { runner.call(this, done).catch(done); return; }
+        : function () { return runner.call(this); };
 
     if (disable) {
         xit(name, asyncRunner);
@@ -320,7 +340,7 @@ export function spec<T>(name: string, cb: (env: TestEnv, done?: () => void) => P
     }
 }
 
-export function xspec<T>(name: string, cb: () => Promise<T>) {
+export function xspec<T>(name: string, cb: (env: TestEnv, done?: () => void) => Promise<T>) {
     return spec(name, cb, true);
 }
 

src/__test__/watch-output.ts

@@ -1,6 +1,6 @@
 import {
     src, tsconfig, stdout, stderr,
-    spec, exec
+    spec, execWebpack
 } from './utils';
 
 import { config } from './compile-output';
@@ -17,14 +17,15 @@ spec(__filename, async function(env, done) {
     tsconfig();
     config(env);
 
-    const webpack = exec('webpack', ['--watch']);
+    const webpack = execWebpack([ '--watch' ]);
+    webpack.strictOutput();
 
     await webpack.wait(
         stdout('Webpack is watching the files…'),
         stderr('Checking finished with 1 errors'),
         stdout([
             'ERROR in [at-loader]',
-            `Argument of type '"1"' is not assignable to parameter of type 'number'`
+            `TS2345: Argument of type '"1"' is not assignable to parameter of type 'number'`
         ]),
     );
 

src/checker/runtime.ts

@@ -401,14 +401,15 @@ function createChecker(receive: (cb: (msg: Req) => void) => void, send: (msg: Re
                 let pretty = '';
                 let line = 0;
                 let character = 0;
+                let code = diagnostic.code;
 
                 if (diagnostic.file) {
                     const pos = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
                     line = pos.line;
                     character = pos.character;
-                    pretty = (`[${ instanceName }] ${colors.red(fileName)}:${line + 1}:${character + 1} \n    ${colors.red(message)}`);
+                    pretty = (`[${ instanceName }] ${colors.red(fileName)}:${line + 1}:${character + 1} \n    TS${code}: ${colors.red(message)}`);
                 } else {
-                    pretty = (colors.red(`[${ instanceName }] ${ message }`));
+                    pretty = (colors.red(`[${ instanceName }] TS${code}: ${ message }`));
                 }
 
                 return {

src/instance.ts

@@ -9,6 +9,7 @@ import { WatchModeSymbol } from './watch-mode';
 
 let colors = require('colors/safe');
 let pkg = require('../package.json');
+let mkdirp = require('mkdirp');
 
 export interface Instance {
     id: number;
@@ -185,7 +186,7 @@ function setupCache(
         }
 
         if (!fs.existsSync(loaderConfig.cacheDirectory)) {
-            fs.mkdirSync(loaderConfig.cacheDirectory);
+            mkdirp.sync(loaderConfig.cacheDirectory);
         }
 
         cacheIdentifier = {

yarn.lock

@@ -18,10 +18,16 @@
   version "2.2.39"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.39.tgz#f68d63db8b69c38e9558b4073525cf96c4f7a829"
 
-"@types/node@^7.0.5":
+"@types/node@*", "@types/node@^7.0.5":
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.5.tgz#96a0f0a618b7b606f1ec547403c00650210bfbb7"
 
+"@types/shelljs@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.6.0.tgz#090b705c102ce7fc5c0c5ea9b524418ff15840df"
+  dependencies:
+    "@types/node" "*"
+
 "@types/sinon@^1.16.34":
   version "1.16.34"
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-1.16.34.tgz#a9761fff33d0f7b3fe61875b577778a2576a9a03"
@@ -1106,7 +1112,7 @@ [email protected], glob@^7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.1:
+glob@^7.0.0, glob@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
@@ -2049,22 +2055,22 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@~2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.1.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
   dependencies:
+    buffer-shims "^1.0.0"
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.1.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@~2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
-    buffer-shims "^1.0.0"
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "~1.0.0"
@@ -2093,6 +2099,12 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -2166,7 +2178,7 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
-resolve@^1.1.7:
+resolve@^1.1.6, resolve@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
@@ -2218,6 +2230,14 @@ sha.js@^2.3.6:
   dependencies:
     inherits "^2.0.1"
 
+shelljs@^0.7.6:
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
 signal-exit@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.1.tgz#5a4c884992b63a7acd9badb7894c3ee9cfccad81"