Add support for tsconfig.json files (#9)

Author: jbrantly

index.ts

@@ -69,6 +69,21 @@ function handleErrors(diagnostics: typescript.Diagnostic[], compiler: typeof typ
     });
 }
 
+function findConfigFile(compiler: typeof typescript, searchPath: string): string {
+    while (true) {
+        var fileName = path.join(searchPath, "tsconfig.json");
+        if (compiler.sys.fileExists(fileName)) {
+            return fileName;
+        }
+        var parentPath = path.dirname(searchPath);
+        if (parentPath === searchPath) {
+            break;
+        }
+        searchPath = parentPath;
+    }
+    return undefined;
+}
+
 function ensureTypeScriptInstance(options: Options, loader: any): TSInstance {
 
     var compiler = require(options.compiler);
@@ -112,6 +127,25 @@ function ensureTypeScriptInstance(options: Options, loader: any): TSInstance {
         sourceMap: !!options.sourceMap,
         noImplicitAny: !!options.noImplicitAny
     }
+
+    var configFilePath = findConfigFile(compiler, path.dirname(loader.resourcePath));
+    if (configFilePath) {
+        var configFile = compiler.readConfigFile(configFilePath);
+        // TODO: when 1.5 stable comes out, this will never be undefined. Instead it will
+        // have an 'error' property
+        if (!configFile) {
+            throw new Error('tsconfig.json file found but not parsable');
+        }
+        
+        var configParseResult = compiler.parseConfigFile(configFile, path.dirname(configFilePath));
+        if (configParseResult.errors.length) {
+            handleErrors(languageService.getCompilerOptionsDiagnostics(), compiler, consoleError);
+            throw new Error('error while parsing tsconfig.json');
+        }
+        
+        objectAssign(compilerOptions, configParseResult.options);
+        options.files = options.files.concat(configParseResult.fileNames);
+    }
 
     options.files.push(path.join(path.dirname(require.resolve('typescript')), libFileName));
 
@@ -224,7 +258,7 @@ function loader(contents) {
     if (output.outputFiles.length == 0) throw new Error(`Typescript emitted no output for ${filePath}`);
 
     var sourceMap: any;
-    if (options.sourceMap) {
+    if (output.outputFiles.length == 2) {
         sourceMap = JSON.parse(output.outputFiles[0].text);
         sourceMap.sources = [loaderUtils.getRemainingRequest(this)];
         sourceMap.file = loaderUtils.getCurrentRequest(this);

test/run.js

@@ -264,3 +264,21 @@ describe('module', function() {
     })
 
 })
+
+describe('tsconfig', function() {
+    it('should not error', function(done) {
+        webpack(require('./tsconfig/webpack.config')).run(function(err, stats) {
+            if (!handleErrors(err, stats, done)) {
+                done()
+            }
+        })
+    })
+    
+    it('should not error when using parent dir', function(done) {
+        webpack(require('./tsconfig/parentDir.config')).run(function(err, stats) {
+            if (!handleErrors(err, stats, done)) {
+                done()
+            }
+        })
+    })
+})

test/tsconfig/app.ts

@@ -0,0 +1,3 @@
+import submodule = require('./submodule/submodule');
+import externalLib = require('externalLib');
+externalLib.doSomething(submodule);

test/tsconfig/lib/externalLib.d.ts

@@ -0,0 +1,7 @@
+declare module externalLib {
+  export function doSomething(arg: any): void;
+}
+
+declare module 'externalLib' {
+    export = externalLib
+}

test/tsconfig/lib/externalLib.js

@@ -0,0 +1,3 @@
+module.exports = {
+    doSomething: function() { }   
+}

test/tsconfig/parentDir.config.js

@@ -0,0 +1,19 @@
+var path = require('path')
+
+module.exports = {
+    context: __dirname,
+    entry: './submodule/submodule.ts',
+    output: {
+        path: __dirname,
+        filename: 'bundle.js'
+    },
+    resolve: {
+        alias: { externalLib: path.join(__dirname, "./lib/externalLib.js") },
+        extensions: ['', '.js', '.ts']
+    },
+    module: {
+        loaders: [
+            { test: /\.ts$/, loader: '../../index.js?instance=tsconfigParentDir' }
+        ]
+    }
+}

test/tsconfig/submodule/submodule.ts

@@ -0,0 +1,4 @@
+import externalLib = require('externalLib');
+var message = "Hello from submodule"
+externalLib.doSomething(message);
+export = message

test/tsconfig/tsconfig.json

@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "sourceMap": true
+    },
+    "files": [
+        "lib/externalLib.d.ts"
+    ]
+}

test/tsconfig/webpack.config.js

@@ -0,0 +1,19 @@
+var path = require('path')
+
+module.exports = {
+    context: __dirname,
+    entry: './app.ts',
+    output: {
+        path: __dirname,
+        filename: 'bundle.js'
+    },
+    resolve: {
+        alias: { externalLib: path.join(__dirname, "./lib/externalLib.js") },
+        extensions: ['', '.js', '.ts']
+    },
+    module: {
+        loaders: [
+            { test: /\.ts$/, loader: '../../index.js?instance=tsconfig' }
+        ]
+    }
+}