Fix bug when external options are changed

Add unit test

Author: barbatus

compile-service-host.js

@@ -47,7 +47,11 @@ SH.getScriptFileNames = function() {
   }
   var typings = this.options.typings;
   if (typings) {
-    rootFilePaths = rootFilePaths.concat(typings);
+    _.each(typings, function(filePath) {
+      if (! this.files[filePath]) {
+        rootFilePaths.push(filePath);
+      }
+    }, this);
   }
   return rootFilePaths;
 };

index.js

@@ -53,23 +53,23 @@ function lazyInit() {
 }
 
 function TSBuild(filePaths, getFileContent, options) {
-  validateAndConvertOptions(options);
+  var resOptions = validateAndConvertOptions(options);
 
   lazyInit();
 
-  if (! options)
-    options = {compilerOptions: getConvertedDefault()};
+  if (! resOptions)
+    resOptions = {compilerOptions: getConvertedDefault()};
 
-  if (! options.compilerOptions) 
-    options.compilerOptions = getConvertedDefault();
+  if (! resOptions.compilerOptions) 
+    resOptions.compilerOptions = getConvertedDefault();
 
-  this.options = options;
+  this.options = resOptions;
 
   sourceHost.setSource(getFileContent);
 
-  serviceHost.setFiles(filePaths, options);
+  serviceHost.setFiles(filePaths, resOptions);
 
-  this.rebuildMap = getRebuildMap(filePaths, options);
+  this.rebuildMap = getRebuildMap(filePaths, resOptions);
 }
 
 function rebuildWithNewTypings(filePath, typings) {
@@ -183,7 +183,7 @@ function checkType(option, optionName) {
 }
 
 function validateAndConvertOptions(options) {
-  if (! options) return;
+  if (! options) return null;
 
   // Validate top level options.
   for (var option in options) {
@@ -200,11 +200,14 @@ function validateAndConvertOptions(options) {
     }
   }
 
+  var resOptions = _.clone(options);
   // Validate and convert compilerOptions.
   if (options.compilerOptions) {
-    options.compilerOptions = convertCompilerOptionsOrThrow(
+    resOptions.compilerOptions = convertCompilerOptionsOrThrow(
       options.compilerOptions);
   }
+
+  return resOptions;
 }
 
 exports.validateAndConvertOptions = validateAndConvertOptions;

tests/ts.spec.js

@@ -271,5 +271,19 @@ describe("meteor-typescript -> ", function() {
 
       expect(result2.diagnostics.semanticErrors.length).toEqual(1);
     });
+
+    it("should handle ambient typings properly", function() {
+      var foo11 = "declare module Foo { interface Test {}};";
+      var foo12 = "var test: Foo.Test";
+
+      var build1 = new TSBuild(["foo11.d.ts", "foo12.ts"], function(filePath) {
+        if (filePath === "foo11.d.ts") return foo11;
+        if (filePath === "foo12.ts") return foo12;
+      });
+
+      var result1 = build1.emit("foo12.ts");
+
+      expect(result1.diagnostics.semanticErrors.length).toEqual(0);
+    });
   });
 });