Use createProgram api of the watch compiler host

TypeStrong · Jan 19, 2018 · 42e04a5 · 42e04a5
1 parent b2d6c2a
commit 42e04a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/instances.ts b/src/instances.ts
@@ -40,7 +40,7 @@ export function getTypeScriptInstance(
                 instance.watchHost.updateRootFileNames();
             }
             if (instance.watchOfFilesAndCompilerOptions) {
-                instance.program = instance.watchOfFilesAndCompilerOptions.getProgram();
+                instance.program = instance.watchOfFilesAndCompilerOptions.getProgram().getProgram();
             }
         }
         return { instance: instances[loaderOptions.instance] };
@@ -168,7 +168,7 @@ function successfulTypeScriptInstance(
         // If there is api available for watch, use it instead of language service
         const watchHost = makeWatchHost(scriptRegex, log, loader, instance, loaderOptions.appendTsSuffixTo, loaderOptions.appendTsxSuffixTo);
         instance.watchOfFilesAndCompilerOptions = compiler.createWatchProgram(watchHost);
-        instance.program = instance.watchOfFilesAndCompilerOptions.getProgram();
+        instance.program = instance.watchOfFilesAndCompilerOptions.getProgram().getProgram();
     }
     else {
         const servicesHost = makeServicesHost(scriptRegex, log, loader, instance, loaderOptions.appendTsSuffixTo, loaderOptions.appendTsxSuffixTo);

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -214,7 +214,7 @@ export interface ModuleResolutionHost {
     readFile(fileName: string, encoding?: string | undefined): string | undefined;
 }
 
-export interface WatchHost extends typescript.WatchCompilerHostOfFilesAndCompilerOptions {
+export interface WatchHost extends typescript.WatchCompilerHostOfFilesAndCompilerOptions<typescript.BuilderProgram> {
     invokeFileWatcher(fileName: string, eventKind: typescript.FileWatcherEventKind): void;
     invokeDirectoryWatcher(directory: string, fileAddedOrRemoved: string): void;
     updateRootFileNames(): void;
@@ -242,7 +242,7 @@ export interface TSInstance {
 
     otherFiles: TSFiles;
     watchHost?: WatchHost;
-    watchOfFilesAndCompilerOptions?: typescript.WatchOfFilesAndCompilerOptions<typescript.Program>;
+    watchOfFilesAndCompilerOptions?: typescript.WatchOfFilesAndCompilerOptions<typescript.BuilderProgram>;
     program?: typescript.Program;
     changedFilesList?: boolean;
 }

diff --git a/src/servicesHost.ts b/src/servicesHost.ts
@@ -204,7 +204,8 @@ export function makeWatchHost(
             if (instance.watchOfFilesAndCompilerOptions) {
                 instance.watchOfFilesAndCompilerOptions.updateRootFileNames(getRootFileNames());
             }
-        }
+        },
+        createProgram: compiler.createAbstractBuilder
     };
     return watchHost;