Merge pull request #5 from power-assert-js/tsconfig

feat(tsconfig): load tsconfig.json

Author: teppeis

README.md

@@ -41,9 +41,11 @@ $ mocha --compilers ts:espower-typescript/guess spec/**/*.ts
 
 Note: `'espower-typescript/guess'` is inspired by [intelli-espower-loader](https://github.com/azu/intelli-espower-loader)
 
-### tsconfig.json
+### tsconfig.json and CompilerOptions
 
-TODO
+If [tsconfig.json](https://github.com/Microsoft/TypeScript/wiki/tsconfig.json) is in cwd, `guess` load it automatically.
+
+Note: only `compilerOptions` field is applied.
 
 ## License
 

guess.js

@@ -1,7 +1,11 @@
+var fs = require('fs');
 var path = require('path');
 
+var ts = require('typescript');
+
 var pattern = 'test/**/*.ts';
-var packageData = require(path.join(process.cwd(), 'package.json'));
+var cwd = process.cwd();
+var packageData = require(path.join(cwd, 'package.json'));
 
 if (packageData &&
     typeof packageData.directories === 'object' &&
@@ -10,7 +14,30 @@ if (packageData &&
   pattern = testDir + ((testDir.lastIndexOf('/', 0) === 0) ? '' : '/') + '**/*.ts';
 }
 
+var tsconfigPath = ts.findConfigFile(cwd);
+var tsconfigBasepath = null;
+var compilerOptions = null;
+if (tsconfigPath) {
+  compilerOptions = parseTsConfig(tsconfigPath);
+  tsconfigBasepath = path.dirname(tsconfigPath);
+}
+
 require('./index')({
-    cwd: process.cwd(),
-    pattern: pattern
+    cwd: cwd,
+    pattern: pattern,
+    compilerOptions: compilerOptions,
+    basepath: tsconfigBasepath
 });
+
+function parseTsConfig(tsconfigPath) {
+  var parsed = ts.parseConfigFileTextToJson(tsconfigPath, fs.readFileSync(tsconfigPath, 'utf8'));
+  if (parsed.error) {
+    throw new Error(parsed.error.messageText);
+  }
+
+  if (!parsed.config || !parsed.config.compilerOptions) {
+    return null;
+  }
+
+  return parsed.config.compilerOptions;
+}

index.js

@@ -4,14 +4,13 @@ var fs = require('fs');
 
 var espowerSource = require('espower-source');
 var minimatch = require('minimatch');
+var ts = require('typescript');
 var TypeScriptSimple = require('typescript-simple').TypeScriptSimple;
 
 function espowerTypeScript(options) {
   var separator = (options.pattern.lastIndexOf('/', 0) === 0) ? '' : '/';
   var pattern = options.cwd + separator + options.pattern;
-  // TODO: load tsconfig.json
-  var tsconfig = options.tsconfig || {};
-  var compilerOptions = tsconfig.compilerOptions || {};
+  var compilerOptions = convertCompilerOptions(options.compilerOptions, options.basepath);
   var tss = new TypeScriptSimple(compilerOptions, false);
 
   require.extensions['.ts'] = function(localModule, filepath) {
@@ -23,4 +22,18 @@ function espowerTypeScript(options) {
   };
 }
 
+function convertCompilerOptions(compilerOptions, basepath) {
+  if (!compilerOptions) {
+    return null;
+  }
+
+  var basepath = basepath || process.cwd();
+  var converted = ts.convertCompilerOptionsFromJson(compilerOptions, basepath);
+  if (converted.errors && converted.errors.length > 0) {
+    var msg = converted.errors.map(function(e) {return e.messageText}).join(', ');
+    throw new Error(msg);
+  }
+  return converted.options;
+}
+
 module.exports = espowerTypeScript;

package.json

@@ -28,6 +28,7 @@
   "dependencies": {
     "espower-source": "^1.0.0",
     "minimatch": "^3.0.0",
+    "typescript": "1.8.0-dev.20151106",
     "typescript-simple": "^3.0.2"
   }
 }

test/demo-es6-import.ts

@@ -0,0 +1,30 @@
+import hello from './lib/hello';
+
+let assert = require('power-assert');
+
+class Person {
+  constructor(public name: string, public age: number) {
+  }
+  getAge(): string {
+    return this.age;
+  }
+}
+
+describe('Person', () => {
+  let alice = new Person('alice', 3);
+  let bob = new Person('bob', 5);
+  it('#getAge', () => {
+    assert(alice.getAge() === 3)
+  })
+  it('#name', () => {
+    assert(alice.name === 'alice')
+  })
+  // failed
+  it('#mistake', () => {
+    assert(alice.name === bob.name)
+  })
+  // failed
+  it('hello', () => {
+    assert(hello() === 'whoa!');
+  });
+})

test/demo.ts

@@ -1,4 +1,6 @@
-import hello from './lib/hello';
+// Run with Node.js v5+
+
+'use strict';
 
 let assert = require('power-assert');
 
@@ -14,17 +16,17 @@ describe('Person', () => {
   let alice = new Person('alice', 3);
   let bob = new Person('bob', 5);
   it('#getAge', () => {
-    assert(alice.getAge() === 3)
-  })
+    assert(alice.getAge() === 3);
+  });
   it('#name', () => {
-    assert(alice.name === 'alice')
-  })
+    assert(alice.name === 'alice');
+  });
   // failed
   it('#mistake', () => {
-    assert(alice.name === bob.name)
-  })
+    assert(alice.name === bob.name);
+  });
   // failed
-  it('hello', () => {
-    assert(hello() === 'whoa!');
+  it('arrow function', () => {
+    assert(alice.name === (() => 1));
   });
-})
+});

test/to_be_instrumented_test.ts

@@ -1,3 +1,5 @@
+'use strict';
+
 let assert = require('power-assert')
 let expect = require('expect.js')
 

tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "target": "ES5",
+    "noImplicitAny": true
+  }
+}