tests: fix

Author: s-panferov

.babelrc

@@ -0,0 +1,3 @@
+{
+    "presets": [ "es2015" ]
+}

.travis.yml

@@ -2,6 +2,6 @@ sudo: false
 language: node_js
 before_script:
   - npm run build
+  - npm run build:babel
 node_js:
-  - "4"
   - "6"

package.json

@@ -5,13 +5,14 @@
   "main": "dist/entry.js",
   "scripts": {
     "prepublish": "npm run build",
-    "pretest": "npm run build",
-    "test": "mocha dist/test",
+    "test": "mocha dist.babel/test",
     "watch": "npm run watch:ts",
     "watch:ts": "npm run build:ts -- --watch --diagnostics",
+    "watch:babel": "babel dist --watch --out-dir dist.babel",
     "prebuild": "npm run lint",
     "build": "npm run build:ts",
     "build:ts": "tsc -p src --pretty",
+    "build:babel": "babel dist --out-dir dist.babel",
     "lint": "tslint src/*.ts"
   },
   "author": "Stanislav Panferov <[email protected]> (http://panferov.me/)",
@@ -39,6 +40,10 @@
     "source-map-support": "^0.4.0"
   },
   "devDependencies": {
+    "babel-cli": "^6.10.1",
+    "babel-core": "^6.10.4",
+    "babel-preset-es2015": "^6.9.0",
+    "bluebird": "^3.4.1",
     "chai": "^3.5.0",
     "git-hooks": "^1.0.2",
     "grunt": "^1.0.1",
@@ -56,8 +61,8 @@
     "rimraf": "^2.5.0",
     "sinon": "^1.17.4",
     "temp": "^0.8.3",
-    "tslint": "3.11.0-dev.0",
-    "typescript": "^1.9.0-dev.20160625-1.0",
+    "tslint": "^3.13.0-dev.0",
+    "typescript": "^2.0.0-dev.20160706",
     "webpack": "2.1.0-beta.4"
   }
 }

src/index.ts

@@ -144,7 +144,7 @@ function transform(webpack: IWebPack, instance: ICompilerInstance, fileName: str
     let resultSourceMap = null;
     let state = instance.tsState;
 
-    let useSlowEmit = state.compilerConfig.options.declaration || state.loaderConfig.disableFastEmit
+    let useSlowEmit = state.compilerConfig.options.declaration || state.loaderConfig.disableFastEmit;
     if (useSlowEmit) {
         let output = state.emit(fileName);
         let result = helpers.findResultFor(output, fileName);

src/instance.ts

@@ -69,6 +69,7 @@ export interface LoaderConfig {
     emitRequireType?: boolean;
     reEmitDependentFiles?: boolean;
     tsconfig?: string;
+    tsconfigContent?: string;
     useWebpackText?: boolean;
     externals?: string[];
     doTypeCheck?: boolean;
@@ -306,13 +307,13 @@ export function readConfigFile(baseDir: string, query: QueryOptions, tsImpl: typ
         configFilePath = tsImpl.findConfigFile(process.cwd(), tsImpl.sys.fileExists);
     }
 
-     let existingOptions = tsImpl.convertCompilerOptionsFromJson(query, process.cwd(), 'atl.query');
+    let existingOptions = tsImpl.convertCompilerOptionsFromJson(query, process.cwd(), 'atl.query');
 
-    if (!configFilePath) {
+    if (!configFilePath || query.tsconfigContent) {
         return {
-            configFilePath: process.cwd(),
+            configFilePath: configFilePath || process.cwd(),
             compilerConfig: tsImpl.parseJsonConfigFileContent(
-                {},
+                query.tsconfigContent || {},
                 tsImpl.sys,
                 process.cwd(),
                 _.extend({}, tsImpl.getDefaultCompilerOptions(), existingOptions.options) as ts.CompilerOptions,

src/paths-plugin.ts

@@ -106,7 +106,6 @@ export class PathsPlugin implements ResolverPlugin {
             resolver.apply(new ModulesInRootPlugin("module", this.absoluteBaseUrl, "resolve"));
         }
 
-
         mappings.forEach(mapping => {
             resolver.plugin(this.source, this.createPlugin(resolver, mapping));
         });

src/test/fixtures/salsa/exclude/ignored.js

@@ -0,0 +1,3 @@
+import { sum } from './lib';
+
+sum('asdf', /asdf/);

src/test/fixtures/salsa/index.js

@@ -1,7 +1,3 @@
 import { sum } from './lib';
-import { mul } from './exclude/ignored';
 
 sum('asdf', /asdf/);
-
-// should be any
-mul('asdf', /asdf/);

src/test/fixtures/salsa/index.ts

@@ -5,8 +5,6 @@
         "allowJs": true
     },
     "exclude": [
-        "exclude",
-        "node_modules",
-        "bower_components"
+        "*"
     ]
 }

src/test/fixtures/salsa/tsconfig.json

@@ -13,7 +13,6 @@
         "experimentalAsyncFunctions": true
     },
     "exclude": [
-        "node_modules",
-        "bower_components"
+        "*"
     ]
 }

src/test/fixtures/tsx/tsconfig.json

@@ -45,7 +45,7 @@ describe('main test', function() {
             entry: fixturePath(['tsx', 'basic.tsx'])
         };
 
-        let loaderQuery = { tsconfig };
+        let loaderQuery = { tsconfig, tsconfigContent: null };
 
         let stats = await cleanAndCompile(createConfig(config, { loaderQuery }));
         expect(stats.compilation.errors.length).eq(1);

src/test/index.ts

@@ -4,21 +4,29 @@ import {
 } from './utils';
 
 describe('salsa test', function() {
-    it('should compile js file', async function() {
+    it('should compile ts file with js invoke', async function() {
         let config =  {
             entry: fixturePath(['salsa', 'index.ts'])
         };
 
         let tsconfig = fixturePath(['salsa', 'tsconfig.json']);
-        let loaderQuery = { tsconfig };
-        let exclude = [ /exclude/ ];
+        let loaderQuery = { tsconfig, tsconfigContent: null };
 
-        let stats = await cleanAndCompile(createConfig(config, { loaderQuery, exclude }));
+        let stats = await cleanAndCompile(createConfig(config, { loaderQuery }));
+        console.log(stats.compilation.errors)
+        expect(stats.compilation.errors.length).eq(1);
+    });
 
-        console.log(stats.compilation.errors);
+    xit('should compile js file as entry point', async function() {
+        let config =  {
+            entry: fixturePath(['salsa', 'index.js'])
+        };
+
+        let tsconfig = fixturePath(['salsa', 'tsconfig.json']);
+        let loaderQuery = { tsconfig, tsconfigContent: null };
 
-        expect(stats.compilation.errors.length).eq(2);
-        expect(stats.compilation.errors[0].toString()).include('Cannot find module');
-        expect(stats.compilation.errors[1].toString()).include(`Argument of type 'string'`);
+        let stats = await cleanAndCompile(createConfig(config, { loaderQuery }));
+        console.log(stats.compilation.errors)
+        expect(stats.compilation.errors.length).eq(1);
     });
 });

src/test/salsa.ts

@@ -0,0 +1,11 @@
+{
+    "compilerOptions": {
+        "target": "es6",
+        "moduleResolution": "node",
+        "sourceMap": true,
+        "lib": [ "es6", "dom" ]
+    },
+    "exclude": [
+        "*"
+    ]
+}

src/test/tsconfig.json

@@ -3,7 +3,6 @@ import * as fs from 'fs';
 import * as _ from 'lodash';
 
 const temp = require('temp').track();
-
 require('babel-polyfill');
 require('source-map-support').install();
 
@@ -52,19 +51,31 @@ export function createConfig(conf, _options: ConfigOptions = defaultOptions) {
                 {
                     test: /\.(tsx?|jsx?)/,
                     loader: loaderDir,
-                    query: Object.assign({ target: 'es6' }, options.loaderQuery)
+                    query: Object.assign(
+                        {
+                            target: 'es6',
+                        },
+                        {
+                            tsconfigContent: {
+                                exclude: ["*"]
+                            }
+                        },
+                        options.loaderQuery
+                    )
                 },
             ],
         },
         plugins: []
     };
 
+    let loader = defaultConfig.module.loaders[0] as any;
+
     if (options.include) {
-        (defaultConfig.module.loaders[0] as any).include = options.include;
+        loader.include = (loader.include || []).concat(options.include);
     }
 
     if (options.exclude) {
-        (defaultConfig.module.loaders[0] as any).exclude = options.exclude;
+        loader.exclude = (loader.exclude || []).concat(options.exclude);
     }
 
     if (options.watch) {

src/test/utils.ts

@@ -14,7 +14,6 @@
     },
     "compileOnSave": false,
     "exclude": [
-        "test",
         "test/fixtures",
         "test/output/*"
     ]