Add support for manually adding additional files to the TypeScript compiler. (#6)

Author: jbrantly

index.ts

@@ -28,6 +28,7 @@ interface Options {
     noImplicitAny: boolean;
     target: string;
     module: string;
+    additionalFiles: string[];
 }
 
 interface TSFile {
@@ -55,9 +56,23 @@ var instances = <TSInstances>{};
 function ensureTypeScriptInstance(options: Options): TSInstance {
 
     var compiler = require(options.compiler);
-
-    if (Object.prototype.hasOwnProperty.call(instances, options.instance))
-        return instances[options.instance]
+    var files = <TSFiles>{};
+    
+    if (Object.prototype.hasOwnProperty.call(instances, options.instance)) {
+        var instance = instances[options.instance];
+        files = instance.files;
+        
+        options.additionalFiles.forEach(filePath => {
+            if (!Object.prototype.hasOwnProperty.call(options.additionalFiles, filePath)) {
+                files[filePath] = {
+                    text: fs.readFileSync(filePath, 'utf-8'),
+                    version: 0
+                }
+            }
+        });
+        
+        return instance;
+    }
 
     var target: typescript.ScriptTarget;
     switch (options.target) {
@@ -72,14 +87,15 @@ function ensureTypeScriptInstance(options: Options): TSInstance {
         sourceMap: !!options.sourceMap,
         noImplicitAny: !!options.noImplicitAny
     }
-    
-    var files = <TSFiles>{};
 
-    var libPath = path.join(path.dirname(require.resolve('typescript')), 'lib.d.ts');
-    files[libPath] = {
-        text: fs.readFileSync(libPath, 'utf-8'),
-        version: 0
-    }
+    options.additionalFiles.push(path.join(path.dirname(require.resolve('typescript')), 'lib.d.ts'));
+    
+    options.additionalFiles.forEach(filePath => {
+        files[filePath] = {
+            text: fs.readFileSync(filePath, 'utf-8'),
+            version: 0
+        }
+    });
 
     var servicesHost = {
         getScriptFileNames: () => Object.keys(files),
@@ -122,9 +138,12 @@ function loader(contents) {
     options = objectAssign<Options>({}, {
         instance: 'default',
         compiler: 'typescript',
-        sourceMap: false
+        sourceMap: false,
+        additionalFiles: []
     }, options);
 
+    options.additionalFiles = options.additionalFiles.map(filePath => path.resolve(this.context, filePath));
+    
     var instance = ensureTypeScriptInstance(options);
 
     if (!Object.prototype.hasOwnProperty.call(instance.files, filePath)) {

test/additionalFiles/app.ts

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

test/additionalFiles/lib/externalLib.d.ts

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

test/additionalFiles/lib/externalLib.js

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

test/additionalFiles/submodule/submodule.ts

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

test/additionalFiles/webpack.config.js

@@ -0,0 +1,26 @@
+var path = require('path')
+
+var tsLoaderOptions = {
+	instance: 'additionalFiles',
+	additionalFiles: [
+		path.join(__dirname, "./lib/externalLib.d.ts")
+	]
+}
+
+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?"+JSON.stringify(tsLoaderOptions) }
+        ]
+    }
+}

test/run.js

@@ -30,6 +30,16 @@ function assertModuleCount(stats, expectedNumberOfModules) {
     assert.equal(statsJson.modules.length, expectedNumberOfModules, 'wrong number of modules found')
 }
 
+describe('additionalFiles', function() {
+    it('should not error', function(done) {
+        webpack(require('./additionalFiles/webpack.config')).run(function(err, stats) {
+            if (!handleErrors(err, stats, done)) {
+                done()
+            }
+        })
+    })
+})
+
 describe('basic', function() {
 
     it('should have the correct output', function(done) {