refactor(tsconfig): move converting json from guess to index

Author: teppeis

guess.js

@@ -4,7 +4,8 @@ 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' &&
@@ -13,21 +14,22 @@ if (packageData &&
   pattern = testDir + ((testDir.lastIndexOf('/', 0) === 0) ? '' : '/') + '**/*.ts';
 }
 
-var compilerOptions = findAndParseTsConfig(process.cwd());
+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(),
+    cwd: cwd,
     pattern: pattern,
-    compilerOptions: compilerOptions
+    compilerOptions: compilerOptions,
+    basepath: tsconfigBasepath
 });
 
-function findAndParseTsConfig(cwd) {
-  var tsconfigPath = ts.findConfigFile(process.cwd());
-  if (!tsconfigPath) {
-    return null;
-  }
-
-  var compilerOptions = null;
+function parseTsConfig(tsconfigPath) {
   var parsed = ts.parseConfigFileTextToJson(tsconfigPath, fs.readFileSync(tsconfigPath, 'utf8'));
   if (parsed.error) {
     throw new Error(parsed.error.messageText);
@@ -37,10 +39,5 @@ function findAndParseTsConfig(cwd) {
     return null;
   }
 
-  var converted = ts.convertCompilerOptionsFromJson(parsed.config.compilerOptions, process.cwd());
-  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;
+  return parsed.config.compilerOptions;
 }

index.js

@@ -4,12 +4,14 @@ 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;
-  var tss = new TypeScriptSimple(options.compilerOptions, false);
+  var compilerOptions = convertCompilerOptions(options.compilerOptions, options.basepath);
+  var tss = new TypeScriptSimple(compilerOptions, false);
 
   require.extensions['.ts'] = function(localModule, filepath) {
     var result = tss.compile(fs.readFileSync(filepath, 'utf-8'));
@@ -20,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;