Rename "additionalFiles" to just "files" in preparation for tsconfig.json support. (#9)

Author: jbrantly

README.md

@@ -62,7 +62,7 @@ Specify whether or not TypeScript will allow inferring the `any` type.
 Allows use of TypeScript compilers other than the official one. Should be
 set to the NPM name of the compiler.
 
-##### additionalFiles *(array of string) (default=[])*
+##### files *(array of string) (default=[])*
 
 Allows additional files to be manually passed to the TypeScript compiler.
 For example, if you want to make a declaration file available without

index.ts

@@ -27,7 +27,7 @@ interface Options {
     noImplicitAny: boolean;
     target: string;
     module: string;
-    additionalFiles: string[];
+    files: string[];
 }
 
 interface TSFile {
@@ -78,8 +78,8 @@ function ensureTypeScriptInstance(options: Options, loader: any): TSInstance {
         var instance = instances[options.instance];
         files = instance.files;
 
-        options.additionalFiles.forEach(filePath => {
-            if (!Object.prototype.hasOwnProperty.call(options.additionalFiles, filePath)) {
+        options.files.forEach(filePath => {
+            if (!Object.prototype.hasOwnProperty.call(options.files, filePath)) {
                 files[filePath] = {
                     text: fs.readFileSync(filePath, 'utf-8'),
                     version: 0
@@ -113,9 +113,9 @@ function ensureTypeScriptInstance(options: Options, loader: any): TSInstance {
         noImplicitAny: !!options.noImplicitAny
     }
 
-    options.additionalFiles.push(path.join(path.dirname(require.resolve('typescript')), libFileName));
+    options.files.push(path.join(path.dirname(require.resolve('typescript')), libFileName));
 
-    options.additionalFiles.forEach(filePath => {
+    options.files.forEach(filePath => {
         files[filePath] = {
             text: fs.readFileSync(filePath, 'utf-8'),
             version: 0
@@ -186,10 +186,10 @@ function loader(contents) {
         instance: 'default',
         compiler: 'typescript',
         sourceMap: false,
-        additionalFiles: []
+        files: []
     }, options);
 
-    options.additionalFiles = options.additionalFiles.map(filePath => path.resolve(this.context, filePath));
+    options.files = options.files.map(filePath => path.resolve(this.context, filePath));
 
     var instance = ensureTypeScriptInstance(options, this);
 

test/additionalFiles/app.ts renamed to test/files/app.ts

@@ -1,8 +1,8 @@
 var path = require('path')
 
 var tsLoaderOptions = {
-	instance: 'additionalFiles',
-	additionalFiles: [
+	instance: 'files',
+	files: [
 		path.join(__dirname, "./lib/externalLib.d.ts")
 	]
 }

test/additionalFiles/lib/externalLib.d.ts renamed to test/files/lib/externalLib.d.ts

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