Remove typscript usage from IncrementalChecker

Author: Timer

src/IncrementalChecker.ts

@@ -11,6 +11,42 @@ import { CancellationToken } from './CancellationToken';
 import * as minimatch from 'minimatch';
 import { VueProgram } from './VueProgram';
 
+interface TypeScriptInstance {
+  parseJsonConfigFileContent(
+    json: any,
+    host: ts.ParseConfigHost,
+    basePath: string,
+    existingOptions?: ts.CompilerOptions,
+    configFileName?: string,
+    resolutionStack?: ts.Path[],
+    extraFileExtensions?: ReadonlyArray<ts.FileExtensionInfo>
+  ): ts.ParsedCommandLine;
+  readConfigFile(
+    fileName: string,
+    readFile: (path: string) => string | undefined
+  ): {
+    config?: any;
+    error?: ts.Diagnostic;
+  };
+  createCompilerHost(
+    options: ts.CompilerOptions,
+    setParentNodes?: boolean
+  ): ts.CompilerHost;
+  createProgram(
+    rootNames: ReadonlyArray<string>,
+    options: ts.CompilerOptions,
+    host?: ts.CompilerHost,
+    oldProgram?: ts.Program,
+    configFileParsingDiagnostics?: ReadonlyArray<ts.Diagnostic>
+  ): ts.Program;
+  flattenDiagnosticMessageText(
+    messageText: string | ts.DiagnosticMessageChain | undefined,
+    newLine: string
+  ): string;
+
+  sys: ts.System;
+}
+
 // Need some augmentation here - linterOptions.exclude is not (yet) part of the official
 // types for tslint.
 interface ConfigurationFile extends Configuration.IConfigurationFile {
@@ -33,6 +69,7 @@ export class IncrementalChecker {
   linterConfig: ConfigurationFile;
   linterExclusions: minimatch.IMinimatch[];
 
+  typescript: TypeScriptInstance;
   program: ts.Program;
   programConfig: ts.ParsedCommandLine;
   watcher: FilesWatcher;
@@ -48,6 +85,7 @@ export class IncrementalChecker {
     checkSyntacticErrors: boolean,
     vue: boolean
   ) {
+    // TODO: set `typescript`
     this.programConfigFile = programConfigFile;
     this.linterConfigFile = linterConfigFile;
     this.watchPaths = watchPaths;
@@ -68,13 +106,16 @@ export class IncrementalChecker {
     }));
   }
 
-  static loadProgramConfig(configFile: string) {
-    return ts.parseJsonConfigFileContent(
+  static loadProgramConfig(typescript: TypeScriptInstance, configFile: string) {
+    return typescript.parseJsonConfigFileContent(
       // Regardless of the setting in the tsconfig.json we want isolatedModules to be false
-      Object.assign(ts.readConfigFile(configFile, ts.sys.readFile).config, {
-        isolatedModules: false
-      }),
-      ts.sys,
+      Object.assign(
+        typescript.readConfigFile(configFile, typescript.sys.readFile).config,
+        {
+          isolatedModules: false
+        }
+      ),
+      typescript.sys,
       path.dirname(configFile)
     );
   }
@@ -88,12 +129,13 @@ export class IncrementalChecker {
   }
 
   static createProgram(
+    typescript: TypeScriptInstance,
     programConfig: ts.ParsedCommandLine,
     files: FilesRegister,
     watcher: FilesWatcher,
     oldProgram: ts.Program
   ) {
-    const host = ts.createCompilerHost(programConfig.options);
+    const host = typescript.createCompilerHost(programConfig.options);
     const realGetSourceFile = host.getSourceFile;
 
     host.getSourceFile = (filePath, languageVersion, onError) => {
@@ -119,7 +161,7 @@ export class IncrementalChecker {
       return files.getData(filePath).source;
     };
 
-    return ts.createProgram(
+    return typescript.createProgram(
       programConfig.fileNames,
       programConfig.options,
       host,
@@ -203,9 +245,13 @@ export class IncrementalChecker {
   loadDefaultProgram() {
     this.programConfig =
       this.programConfig ||
-      IncrementalChecker.loadProgramConfig(this.programConfigFile);
+      IncrementalChecker.loadProgramConfig(
+        this.typescript,
+        this.programConfigFile
+      );
 
     return IncrementalChecker.createProgram(
+      this.typescript,
       this.programConfig,
       this.files,
       this.watcher,
@@ -256,7 +302,7 @@ export class IncrementalChecker {
     return NormalizedMessage.deduplicate(
       diagnostics.map(d =>
         NormalizedMessage.createFromDiagnostic(
-          ts.flattenDiagnosticMessageText,
+          this.typescript.flattenDiagnosticMessageText,
           d
         )
       )