feat(*): add babel options, write some tests on babel

Author: s-panferov

README.md

@@ -128,16 +128,22 @@ Less logging from the checker.
 
 ### useBabel *(boolean) (default=false)*
 
-Invoke Babel to transpile files. Useful with ES6 target.
+Invoke Babel to transpile files. Useful with ES6 target. Please see `useCache` option
+which can improve warm-up time.
 
-### usePrecompiledFiles *(boolean) (default=false)*
+### babelOptions *(object) (default=null)*
 
-Use pre-compiled files if any. Files must be named as `{filename}.js` and `{filename}.map`.
+Use this option to pass some options to Babel (e.g. presets). Please note that
+[`.babelrc` file](https://babeljs.io/docs/usage/babelrc/) is more universal way to do this.
 
 ### useCache *(boolean) (default=false)*
 
 Use internal file cache. This is useful with Babel, when processing takes a long time to complete. Improves warm-up time.
 
+### usePrecompiledFiles *(boolean) (default=false)*
+
+Use pre-compiled files if any. Files must be named as `{filename}.js` and `{filename}.map`.
+
 ### cacheDirectory *(string) (default='.awcache')*
 
 Directory when cache is stored.

package.json

@@ -44,6 +44,7 @@
   },
   "devDependencies": {
     "babel-cli": "^6.3.17",
+    "babel-core": "^6.7.4",
     "babel-preset-es2015": "^6.1.2",
     "babel-preset-es2015-node4": "^1.0.0",
     "babel-preset-stage-2": "^6.1.2",

src/host.ts

@@ -44,6 +44,7 @@ export interface ICompilerOptions extends ts.CompilerOptions {
     forkChecker?: boolean;
     forkCheckerSilent?: boolean;
     useBabel?: boolean;
+    babelOptions?: any;
     usePrecompiledFiles?: boolean;
     useCache?: boolean;
     cacheDirectory?: string;

src/index.ts

@@ -36,7 +36,6 @@ async function compiler(webpack: IWebPack, text: string): Promise<void> {
     let instanceName = options.instanceName || 'default';
 
     let instance = ensureInstance(webpack, options, instanceName);
-
     let state = instance.tsState;
 
     let callback = webpack.async();
@@ -140,7 +139,9 @@ async function compiler(webpack: IWebPack, text: string): Promise<void> {
                         sourceMap: true
                     };
 
-                    let babelResult = instance.babelImpl.transform(resultText, defaultOptions);
+                    let babelOptions = Object.assign({}, defaultOptions, options.babelOptions);
+                    let babelResult = instance.babelImpl.transform(resultText, babelOptions);
+
                     resultText = babelResult.code;
                     resultSourceMap = babelResult.map;
                 }

src/test/babel.ts

@@ -0,0 +1,57 @@
+import {
+    cleanAndCompile, expect, readOutputFile,
+    fixturePath, readFixture, expectSource, createConfig
+} from './utils';
+
+describe('main test', function() {
+
+    it('should transpile file with babel', async function() {
+        // babel need some time to init
+        this.timeout(10000);
+
+        let config =  {
+            entry: fixturePath(['babel', 'babel.ts'])
+        };
+
+        let loaderQuery = {
+            useBabel: true,
+            babelOptions: {
+              "presets": ["es2015"]
+            }
+        };
+
+        let stats = await cleanAndCompile(createConfig(config, { loaderQuery }));
+        expect(stats.compilation.errors.length).eq(0);
+
+        let result = await readOutputFile();
+        let expectation = await readFixture(['babel', 'babel.js']);
+
+        expectSource(result, expectation);
+    });
+
+    it('should use options from query', async function() {
+        // babel need some time to init
+        this.timeout(10000);
+
+        let config =  {
+            entry: fixturePath(['babel', 'babel.ts'])
+        };
+
+        let loaderQuery = {
+            useBabel: true,
+            babelOptions: {
+              "presets": ["unknown-preset"]
+            }
+        };
+
+        let throws = false;
+        try {
+            let stats = await cleanAndCompile(createConfig(config, { loaderQuery }));
+            expect(stats.compilation.errors.length).eq(0);
+        } catch (e) {
+            throws = true;
+        }
+
+        expect(throws).to.true;
+    });
+});

src/test/checker.ts

@@ -41,7 +41,9 @@ describe('checker test', function() {
         {
             watch: true,
             forkChecker: true,
-            loaderParams: '&+forkChecker'
+            loaderQuery: {
+                forkChecker: true
+            }
         }
     );
 

src/test/fixtures/babel/babel.js

@@ -0,0 +1,4 @@
+var HiThere = function HiThere(a, b) {
+    _classCallCheck(this, HiThere);
+    var t = a + b;
+}

src/test/fixtures/babel/babel.ts

@@ -0,0 +1,5 @@
+class HiThere {
+    constructor(a: number, b: string) {
+        let t = a + b;
+    }
+}

src/test/index.ts

@@ -29,14 +29,14 @@ describe('main test', function() {
     });
 
     it('should load tsx files and use tsconfig', async function() {
-        let tsConfig = fixturePath(['tsx', 'tsconfig.json']);
+        let tsconfig = fixturePath(['tsx', 'tsconfig.json']);
         let config = {
             entry: fixturePath(['tsx', 'basic.tsx'])
         };
 
-        let loaderParams = `&tsconfig=${tsConfig}`;
+        let loaderQuery = { tsconfig };
 
-        let stats = await cleanAndCompile(createConfig(config, { loaderParams }));
+        let stats = await cleanAndCompile(createConfig(config, { loaderQuery }));
         expect(stats.compilation.errors.length).eq(1);
 
         let result = await readOutputFile();

src/test/salsa.ts

@@ -10,10 +10,10 @@ describe('salsa test', function() {
         };
 
         let tsconfig = fixturePath(['salsa', 'tsconfig.json']);
-        let loaderParams = `&tsconfig=${tsconfig}`;
+        let loaderQuery = { tsconfig };
         let exclude = [ /exclude/ ];
 
-        let stats = await cleanAndCompile(createConfig(config, { loaderParams, exclude }));
+        let stats = await cleanAndCompile(createConfig(config, { loaderQuery, exclude }));
 
         console.log(stats.compilation.errors);
 

src/test/utils.ts

@@ -22,15 +22,14 @@ export const defaultOutputDir = path.join(process.cwd(), 'src', 'test', 'output'
 export const defaultFixturesDir = path.join(process.cwd(), 'src', 'test', 'fixtures');
 
 export interface ConfigOptions {
-    loaderParams?: string;
+    loaderQuery?: any;
     watch?: boolean;
     forkChecker?: boolean;
     include?: (string | RegExp)[];
     exclude?: (string | RegExp)[];
 }
 
 let defaultOptions: ConfigOptions = {
-    loaderParams: '',
     watch: false,
     forkChecker: false,
 };
@@ -50,7 +49,8 @@ export function createConfig(conf, _options: ConfigOptions = defaultOptions) {
             loaders: [
                 {
                     test: /\.(tsx?|jsx?)/,
-                    loader: loaderDir + '?target=es6' + options.loaderParams,
+                    loader: loaderDir,
+                    query: Object.assign({ target: 'es6' }, options.loaderQuery)
                 },
             ],
         },

src/tsconfig.json

@@ -25,7 +25,9 @@
         "./index.ts",
         "./instance.ts",
         "./resolver.ts",
+        "./test/babel.ts",
         "./test/checker.ts",
+        "./test/fixtures/babel/babel.ts",
         "./test/fixtures/basic/basic.ts",
         "./test/fixtures/checker/to-check.ts",
         "./test/fixtures/errors/with-type-errors.ts",