Remove more usage of typescript

Author: Timer

src/IncrementalChecker.ts

@@ -10,42 +10,7 @@ import { NormalizedMessage } from './NormalizedMessage';
 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;
-}
+import { TypeScriptInstance } from './TypeScriptInstance';
 
 // Need some augmentation here - linterOptions.exclude is not (yet) part of the official
 // types for tslint.
@@ -231,9 +196,10 @@ export class IncrementalChecker {
   loadVueProgram() {
     this.programConfig =
       this.programConfig ||
-      VueProgram.loadProgramConfig(this.programConfigFile);
+      VueProgram.loadProgramConfig(this.typescript, this.programConfigFile);
 
     return VueProgram.createProgram(
+      this.typescript,
       this.programConfig,
       path.dirname(this.programConfigFile),
       this.files,

src/TypeScriptInstance.ts

@@ -0,0 +1,67 @@
+import * as ts from 'typescript';
+
+// TODO: keep in sync with TypeScript
+export enum ScriptKind {
+  Unknown = 0,
+  JS = 1,
+  JSX = 2,
+  TS = 3,
+  TSX = 4,
+  External = 5,
+  JSON = 6,
+  /**
+   * Used on extensions that doesn't define the ScriptKind but the content defines it.
+   * Deferred extensions are going to be included in all project contexts.
+   */
+  Deferred = 7
+}
+
+export 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;
+  resolveModuleName(
+    moduleName: string,
+    containingFile: string,
+    compilerOptions: ts.CompilerOptions,
+    host: ts.ModuleResolutionHost,
+    cache?: ts.ModuleResolutionCache
+  ): ts.ResolvedModuleWithFailedLookupLocations;
+  createSourceFile(
+    fileName: string,
+    sourceText: string,
+    languageVersion: ts.ScriptTarget,
+    setParentNodes?: boolean,
+    scriptKind?: ts.ScriptKind
+  ): ts.SourceFile;
+
+  sys: ts.System;
+}

src/VueProgram.ts

@@ -3,6 +3,7 @@ import * as path from 'path';
 import * as ts from 'typescript';
 import { FilesRegister } from './FilesRegister';
 import { FilesWatcher } from './FilesWatcher';
+import { ScriptKind, TypeScriptInstance } from './TypeScriptInstance';
 // tslint:disable-next-line
 import * as vueCompiler from 'vue-template-compiler';
 
@@ -12,15 +13,15 @@ interface ResolvedScript {
 }
 
 export class VueProgram {
-  static loadProgramConfig(configFile: string) {
+  static loadProgramConfig(typescript: TypeScriptInstance, configFile: string) {
     const extraExtensions = ['vue'];
 
     const parseConfigHost: ts.ParseConfigHost = {
-      fileExists: ts.sys.fileExists,
-      readFile: ts.sys.readFile,
-      useCaseSensitiveFileNames: ts.sys.useCaseSensitiveFileNames,
+      fileExists: typescript.sys.fileExists,
+      readFile: typescript.sys.readFile,
+      useCaseSensitiveFileNames: typescript.sys.useCaseSensitiveFileNames,
       readDirectory: (rootDir, extensions, excludes, includes, depth) => {
-        return ts.sys.readDirectory(
+        return typescript.sys.readDirectory(
           rootDir,
           extensions.concat(extraExtensions),
           excludes,
@@ -30,11 +31,14 @@ export class VueProgram {
       }
     };
 
-    const parsed = ts.parseJsonConfigFileContent(
+    const parsed = 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
-      }),
+      Object.assign(
+        typescript.readConfigFile(configFile, typescript.sys.readFile).config,
+        {
+          isolatedModules: false
+        }
+      ),
       parseConfigHost,
       path.dirname(configFile)
     );
@@ -102,13 +106,14 @@ export class VueProgram {
   }
 
   static createProgram(
+    typescript: TypeScriptInstance,
     programConfig: ts.ParsedCommandLine,
     basedir: string,
     files: FilesRegister,
     watcher: FilesWatcher,
     oldProgram: ts.Program
   ) {
-    const host = ts.createCompilerHost(programConfig.options);
+    const host = typescript.createCompilerHost(programConfig.options);
     const realGetSourceFile = host.getSourceFile;
 
     // We need a host that can parse Vue SFCs (single file components).
@@ -137,7 +142,7 @@ export class VueProgram {
       // get typescript contents from Vue file
       if (source && VueProgram.isVue(filePath)) {
         const resolved = VueProgram.resolveScriptBlock(source.text);
-        source = ts.createSourceFile(
+        source = typescript.createSourceFile(
           filePath,
           resolved.content,
           languageVersion,
@@ -155,7 +160,7 @@ export class VueProgram {
 
       for (const moduleName of moduleNames) {
         // Try to use standard resolution.
-        const { resolvedModule } = ts.resolveModuleName(
+        const { resolvedModule } = typescript.resolveModuleName(
           moduleName,
           containingFile,
           programConfig.options,
@@ -221,7 +226,7 @@ export class VueProgram {
       return resolvedModules;
     };
 
-    return ts.createProgram(
+    return typescript.createProgram(
       programConfig.fileNames,
       programConfig.options,
       host,
@@ -231,14 +236,14 @@ export class VueProgram {
 
   private static getScriptKindByLang(lang: string) {
     if (lang === 'ts') {
-      return ts.ScriptKind.TS;
+      return ScriptKind.TS;
     } else if (lang === 'tsx') {
-      return ts.ScriptKind.TSX;
+      return ScriptKind.TSX;
     } else if (lang === 'jsx') {
-      return ts.ScriptKind.JSX;
+      return ScriptKind.JSX;
     } else {
       // when lang is "js" or no lang specified
-      return ts.ScriptKind.JS;
+      return ScriptKind.JS;
     }
   }
 
@@ -264,7 +269,7 @@ export class VueProgram {
     // No <script> block
     if (!script) {
       return {
-        scriptKind: ts.ScriptKind.JS,
+        scriptKind: ScriptKind.JS,
         content: '/* tslint:disable */\nexport default {};\n'
       };
     }