Watch for changes on elided imports. (#156) (#169)

* Watch for changes on elided imports. (#156) * Fix bug and update tests
TypeStrong · Apr 11, 2016 · 397942b · 397942b
1 parent 6356367
commit 397942b
Show file tree

Hide file tree

Showing 22 changed files with 62 additions and 24 deletions.
diff --git a/index.ts b/index.ts
@@ -51,6 +51,7 @@ interface TSInstance {
     files: TSFiles;
     languageService?: typescript.LanguageService;
     version?: number;
+    dependencyGraph: any;
 }
 
 interface TSInstances {
@@ -193,7 +194,8 @@ function ensureTypeScriptInstance(loaderOptions: LoaderOptions, loader: any): {
         loaderOptions,
         files,
         languageService: null,
-        version: 0
+        version: 0,
+        dependencyGraph: {}
     };
 
     var compilerOptions: typescript.CompilerOptions = {
@@ -293,7 +295,7 @@ function ensureTypeScriptInstance(loaderOptions: LoaderOptions, loader: any): {
             loader._module.errors,
             formatErrors(diagnostics, instance, {file: configFilePath || 'tsconfig.json'}));
 
-        return { instance: instances[loaderOptions.instance] = { compiler, compilerOptions, loaderOptions, files }};
+        return { instance: instances[loaderOptions.instance] = { compiler, compilerOptions, loaderOptions, files, dependencyGraph: {} }};
     }
 
     // Load initial files (core lib files, any files specified in tsconfig.json)
@@ -395,6 +397,9 @@ function ensureTypeScriptInstance(loaderOptions: LoaderOptions, loader: any): {
 
                 resolvedModules.push(resolutionResult);
             }
+
+            instance.dependencyGraph[containingFile] = resolvedModules.filter(m => m != null).map(m => m.resolvedFileName);
+
             return resolvedModules;
         }
     };
@@ -501,11 +506,11 @@ function ensureTypeScriptInstance(loaderOptions: LoaderOptions, loader: any): {
         callback();
     });
 
-    // manually update changed declaration files
+    // manually update changed files
     loader._compiler.plugin("watch-run", (watching, cb) => {
         var mtimes = watching.compiler.watchFileSystem.watcher.mtimes;
         Object.keys(mtimes)
-            .filter(filePath => !!filePath.match(/\.d\.ts$/))
+            .filter(filePath => !!filePath.match(/\.tsx?$|\.jsx?$/))
             .forEach(filePath => {
                 filePath = path.normalize(filePath);
                 var file = instance.files[filePath];
@@ -582,16 +587,25 @@ function loader(contents) {
     else {
         let langService = instance.languageService;
 
+        // Emit Javascript
+        var output = langService.getEmitOutput(filePath);
+
         // Make this file dependent on *all* definition files in the program
         this.clearDependencies();
         this.addDependency(filePath);
 
         let allDefinitionFiles = Object.keys(instance.files).filter(filePath => /\.d\.ts$/.test(filePath));
         allDefinitionFiles.forEach(this.addDependency.bind(this));
-        this._module.meta.tsLoaderDefinitionFileVersions = allDefinitionFiles.map(filePath => filePath+'@'+instance.files[filePath].version);
 
-        // Emit Javascript
-        var output = langService.getEmitOutput(filePath);
+        // Additionally make this file dependent on all imported files
+        let additionalDependencies = instance.dependencyGraph[filePath];
+        if (additionalDependencies) {
+            additionalDependencies.forEach(this.addDependency.bind(this))  
+        }
+
+        this._module.meta.tsLoaderDefinitionFileVersions = allDefinitionFiles
+            .concat(additionalDependencies)
+            .map(filePath => filePath+'@'+(instance.files[filePath] || {version: '?'}).version);
 
         var outputFile = output.outputFiles.filter(file => !!file.name.match(/\.js(x?)$/)).pop();
         if (outputFile) { outputText = outputFile.text }

diff --git a/test/aliasResolution/expectedOutput-1.6/patch0/output.txt b/test/aliasResolution/expectedOutput-1.6/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.56 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 110 bytes [rendered]
-    [0] ./.test/aliasResolution/app.ts 79 bytes {0} [1 error]
+    [0] ./.test/aliasResolution/app.ts 79 bytes {0} [built] [1 error]
     [1] ./.test/aliasResolution/common/components/myComponent.ts 31 bytes {0} [built]
 
 ERROR in ./.test/aliasResolution/app.ts

diff --git a/test/aliasResolution/expectedOutput-1.7/patch0/output.txt b/test/aliasResolution/expectedOutput-1.7/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.56 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 110 bytes [rendered]
-    [0] ./.test/aliasResolution/app.ts 79 bytes {0} [1 error]
+    [0] ./.test/aliasResolution/app.ts 79 bytes {0} [built] [1 error]
     [1] ./.test/aliasResolution/common/components/myComponent.ts 31 bytes {0} [built]
 
 ERROR in ./.test/aliasResolution/app.ts

diff --git a/test/aliasResolution/expectedOutput-1.8/patch0/output.txt b/test/aliasResolution/expectedOutput-1.8/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.59 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 138 bytes [rendered]
-    [0] ./.test/aliasResolution/app.ts 93 bytes {0} [1 error]
+    [0] ./.test/aliasResolution/app.ts 93 bytes {0} [built] [1 error]
     [1] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} [built]
 
 ERROR in ./.test/aliasResolution/app.ts

diff --git a/test/aliasResolution/expectedOutput-1.9/patch0/output.txt b/test/aliasResolution/expectedOutput-1.9/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.59 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 138 bytes [rendered]
-    [0] ./.test/aliasResolution/app.ts 93 bytes {0} [1 error]
+    [0] ./.test/aliasResolution/app.ts 93 bytes {0} [built] [1 error]
     [1] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} [built]
 
 ERROR in ./.test/aliasResolution/app.ts

diff --git a/test/dependencyErrors/expectedOutput-1.6/patch0/output.txt b/test/dependencyErrors/expectedOutput-1.6/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 204 bytes [rendered]
-    [0] ./.test/dependencyErrors/app.ts 80 bytes {0} [1 error]
+    [0] ./.test/dependencyErrors/app.ts 80 bytes {0} [built] [1 error]
     [1] ./.test/dependencyErrors/dep1.ts 62 bytes {0} [built]
     [2] ./.test/dependencyErrors/dep2.ts 62 bytes {0}
 

diff --git a/test/dependencyErrors/expectedOutput-1.7/patch0/output.txt b/test/dependencyErrors/expectedOutput-1.7/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.74 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 204 bytes [rendered]
-    [0] ./.test/dependencyErrors/app.ts 80 bytes {0} [1 error]
+    [0] ./.test/dependencyErrors/app.ts 80 bytes {0} [built] [1 error]
     [1] ./.test/dependencyErrors/dep1.ts 62 bytes {0} [built]
     [2] ./.test/dependencyErrors/dep2.ts 62 bytes {0}
 

diff --git a/test/dependencyErrors/expectedOutput-1.8/patch0/output.txt b/test/dependencyErrors/expectedOutput-1.8/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.78 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 246 bytes [rendered]
-    [0] ./.test/dependencyErrors/app.ts 94 bytes {0} [1 error]
+    [0] ./.test/dependencyErrors/app.ts 94 bytes {0} [built] [1 error]
     [1] ./.test/dependencyErrors/dep1.ts 76 bytes {0} [built]
     [2] ./.test/dependencyErrors/dep2.ts 76 bytes {0}
 

diff --git a/test/dependencyErrors/expectedOutput-1.9/patch0/output.txt b/test/dependencyErrors/expectedOutput-1.9/patch0/output.txt
@@ -1,7 +1,7 @@
     Asset     Size  Chunks             Chunk Names
 bundle.js  1.78 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 246 bytes [rendered]
-    [0] ./.test/dependencyErrors/app.ts 94 bytes {0} [1 error]
+    [0] ./.test/dependencyErrors/app.ts 94 bytes {0} [built] [1 error]
     [1] ./.test/dependencyErrors/dep1.ts 76 bytes {0} [built]
     [2] ./.test/dependencyErrors/dep2.ts 76 bytes {0}
 

diff --git a/test/issue81/expectedOutput-1.8/bundle.js.map b/test/issue81/expectedOutput-1.8/bundle.js.map
diff --git a/test/simpleDependency/expectedOutput-1.6/patch0/output.txt b/test/simpleDependency/expectedOutput-1.6/patch0/output.txt
@@ -2,7 +2,7 @@
 bundle.js  1.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 155 bytes [rendered]
     [0] ./.test/simpleDependency/app.ts 37 bytes {0} [1 error]
-    [1] ./.test/simpleDependency/dep.ts 56 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 56 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 62 bytes {0} [built]
 
 ERROR in ./.test/simpleDependency/app.ts

diff --git a/test/simpleDependency/expectedOutput-1.6/patch1/output.transpiled.txt b/test/simpleDependency/expectedOutput-1.6/patch1/output.transpiled.txt
@@ -0,0 +1,6 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  1.71 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 155 bytes [rendered]
+    [0] ./.test/simpleDependency/app.ts 37 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 56 bytes {0}
+    [2] ./.test/simpleDependency/deeperDep.ts 62 bytes {0} [built]
diff --git a/test/simpleDependency/expectedOutput-1.6/patch1/output.txt b/test/simpleDependency/expectedOutput-1.6/patch1/output.txt
@@ -2,5 +2,5 @@
 bundle.js  1.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 155 bytes [rendered]
     [0] ./.test/simpleDependency/app.ts 37 bytes {0}
-    [1] ./.test/simpleDependency/dep.ts 56 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 56 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 62 bytes {0} [built]
diff --git a/test/simpleDependency/expectedOutput-1.7/patch0/output.txt b/test/simpleDependency/expectedOutput-1.7/patch0/output.txt
@@ -2,7 +2,7 @@
 bundle.js  1.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 155 bytes [rendered]
     [0] ./.test/simpleDependency/app.ts 37 bytes {0} [1 error]
-    [1] ./.test/simpleDependency/dep.ts 56 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 56 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 62 bytes {0} [built]
 
 ERROR in ./.test/simpleDependency/app.ts

diff --git a/test/simpleDependency/expectedOutput-1.7/patch1/output.transpiled.txt b/test/simpleDependency/expectedOutput-1.7/patch1/output.transpiled.txt
@@ -0,0 +1,6 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  1.71 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 155 bytes [rendered]
+    [0] ./.test/simpleDependency/app.ts 37 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 56 bytes {0}
+    [2] ./.test/simpleDependency/deeperDep.ts 62 bytes {0} [built]
diff --git a/test/simpleDependency/expectedOutput-1.7/patch1/output.txt b/test/simpleDependency/expectedOutput-1.7/patch1/output.txt
@@ -2,5 +2,5 @@
 bundle.js  1.71 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 155 bytes [rendered]
     [0] ./.test/simpleDependency/app.ts 37 bytes {0}
-    [1] ./.test/simpleDependency/dep.ts 56 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 56 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 62 bytes {0} [built]
diff --git a/test/simpleDependency/expectedOutput-1.8/patch0/output.txt b/test/simpleDependency/expectedOutput-1.8/patch0/output.txt
@@ -2,7 +2,7 @@
 bundle.js  1.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [rendered]
     [0] ./.test/simpleDependency/app.ts 51 bytes {0} [1 error]
-    [1] ./.test/simpleDependency/dep.ts 70 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
 
 ERROR in ./.test/simpleDependency/app.ts

diff --git a/test/simpleDependency/expectedOutput-1.8/patch1/output.transpiled.txt b/test/simpleDependency/expectedOutput-1.8/patch1/output.transpiled.txt
@@ -0,0 +1,6 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  1.75 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 197 bytes [rendered]
+    [0] ./.test/simpleDependency/app.ts 51 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 70 bytes {0}
+    [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
diff --git a/test/simpleDependency/expectedOutput-1.8/patch1/output.txt b/test/simpleDependency/expectedOutput-1.8/patch1/output.txt
@@ -2,5 +2,5 @@
 bundle.js  1.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [rendered]
     [0] ./.test/simpleDependency/app.ts 51 bytes {0}
-    [1] ./.test/simpleDependency/dep.ts 70 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
diff --git a/test/simpleDependency/expectedOutput-1.9/patch0/output.txt b/test/simpleDependency/expectedOutput-1.9/patch0/output.txt
@@ -2,7 +2,7 @@
 bundle.js  1.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [rendered]
     [0] ./.test/simpleDependency/app.ts 51 bytes {0} [1 error]
-    [1] ./.test/simpleDependency/dep.ts 70 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
 
 ERROR in ./.test/simpleDependency/app.ts

diff --git a/test/simpleDependency/expectedOutput-1.9/patch1/output.transpiled.txt b/test/simpleDependency/expectedOutput-1.9/patch1/output.transpiled.txt
@@ -0,0 +1,6 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  1.75 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 197 bytes [rendered]
+    [0] ./.test/simpleDependency/app.ts 51 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 70 bytes {0}
+    [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]
diff --git a/test/simpleDependency/expectedOutput-1.9/patch1/output.txt b/test/simpleDependency/expectedOutput-1.9/patch1/output.txt
@@ -2,5 +2,5 @@
 bundle.js  1.75 kB       0  [emitted]  main
 chunk    {0} bundle.js (main) 197 bytes [rendered]
     [0] ./.test/simpleDependency/app.ts 51 bytes {0}
-    [1] ./.test/simpleDependency/dep.ts 70 bytes {0}
+    [1] ./.test/simpleDependency/dep.ts 70 bytes {0} [built]
     [2] ./.test/simpleDependency/deeperDep.ts 76 bytes {0} [built]