@rushstack/heft-typescript-plugin 0.1.0-rc.2 → 0.1.0-rc.3

package/lib/EmitFilesPatch.d.ts

@@ -17,7 +17,7 @@ export interface ICachedEmitModuleKind {
 export declare class EmitFilesPatch {
     private static _patchedTs;
     private static _baseEmitFiles;
-    static install(ts: ExtendedTypeScript, tsconfig: TTypescript.ParsedCommandLine, moduleKindsToEmit: ICachedEmitModuleKind[], changedFiles?: Set<TTypescript.SourceFile>): void;
+    static install(ts: ExtendedTypeScript, baseCompilerOptions: TTypescript.CompilerOptions, moduleKindsToEmit: ICachedEmitModuleKind[], changedFiles?: Set<TTypescript.SourceFile>): void;
     static get isInstalled(): boolean;
     /**
      * Wraps the writeFile callback on the IEmitHost to override the .js extension, if applicable

package/lib/EmitFilesPatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmitFilesPatch.d.ts","sourceRoot":"","sources":["../src/EmitFilesPatch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,WAAW,MAAM,YAAY,CAAC;AAC/C,OAAO,EACL,kBAAkB,EAInB,MAAM,uCAAuC,CAAC;AAE/C,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC;IAEnC,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IAExC;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,UAAU,CAA6C;IAEtE,OAAO,CAAC,MAAM,CAAC,cAAc,CAA8B;WAE7C,OAAO,CACnB,EAAE,EAAE,kBAAkB,EACtB,QAAQ,EAAE,WAAW,CAAC,iBAAiB,EACvC,iBAAiB,EAAE,qBAAqB,EAAE,EAC1C,YAAY,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,GACzC,IAAI;IAsHP,WAAkB,WAAW,IAAI,OAAO,CAEvC;IAED;;OAEG;WACW,aAAa,CACzB,aAAa,EAAE,WAAW,CAAC,iBAAiB,EAC5C,mBAAmB,EAAE,MAAM,GAAG,SAAS,GACtC,WAAW,CAAC,iBAAiB;WAuBlB,SAAS,CAAC,EAAE,EAAE,kBAAkB,GAAG,IAAI;CAatD"}
+{"version":3,"file":"EmitFilesPatch.d.ts","sourceRoot":"","sources":["../src/EmitFilesPatch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,WAAW,MAAM,YAAY,CAAC;AAC/C,OAAO,EACL,kBAAkB,EAInB,MAAM,uCAAuC,CAAC;AAE/C,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC;IAEnC,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IAExC;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,UAAU,CAA6C;IAEtE,OAAO,CAAC,MAAM,CAAC,cAAc,CAA8B;WAE7C,OAAO,CACnB,EAAE,EAAE,kBAAkB,EACtB,mBAAmB,EAAE,WAAW,CAAC,eAAe,EAChD,iBAAiB,EAAE,qBAAqB,EAAE,EAC1C,YAAY,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,GACzC,IAAI;IAsHP,WAAkB,WAAW,IAAI,OAAO,CAEvC;IAED;;OAEG;WACW,aAAa,CACzB,aAAa,EAAE,WAAW,CAAC,iBAAiB,EAC5C,mBAAmB,EAAE,MAAM,GAAG,SAAS,GACtC,WAAW,CAAC,iBAAiB;WAuBlB,SAAS,CAAC,EAAE,EAAE,kBAAkB,GAAG,IAAI;CAatD"}

package/lib/EmitFilesPatch.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmitFilesPatch = void 0;
 const node_core_library_1 = require("@rushstack/node-core-library");
 class EmitFilesPatch {
-    static install(ts, tsconfig, moduleKindsToEmit, changedFiles) {
+    static install(ts, baseCompilerOptions, moduleKindsToEmit, changedFiles) {
         if (EmitFilesPatch._patchedTs === ts) {
             // We already patched this instance of TS
             return;
@@ -42,7 +42,7 @@ class EmitFilesPatch {
                 let emitSkipped = false;
                 for (const moduleKindToEmit of moduleKindsToEmit) {
                     const compilerOptions = moduleKindToEmit.isPrimary
-                        ? Object.assign({}, tsconfig.options) : Object.assign(Object.assign({}, tsconfig.options), { module: moduleKindToEmit.moduleKind, outDir: moduleKindToEmit.outFolderPath, 
+                        ? Object.assign({}, baseCompilerOptions) : Object.assign(Object.assign({}, baseCompilerOptions), { module: moduleKindToEmit.moduleKind, outDir: moduleKindToEmit.outFolderPath, 
                         // Don't emit declarations for secondary module kinds
                         declaration: false, declarationMap: false });
                     if (!compilerOptions.outDir) {

package/lib/EmitFilesPatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmitFilesPatch.js","sourceRoot":"","sources":["../src/EmitFilesPatch.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.\n// See LICENSE in the project root for license information.\n\nimport { InternalError } from '@rushstack/node-core-library';\nimport type * as TTypescript from 'typescript';\nimport {\n  ExtendedTypeScript,\n  IEmitResolver,\n  IEmitHost,\n  IEmitTransformers\n} from './internalTypings/TypeScriptInternals';\n\nexport interface ICachedEmitModuleKind {\n  moduleKind: TTypescript.ModuleKind;\n\n  outFolderPath: string;\n\n  /**\n   * File extension to use instead of '.js' for emitted ECMAScript files.\n   * For example, '.cjs' to indicate commonjs content, or '.mjs' to indicate ECMAScript modules.\n   */\n  jsExtensionOverride: string | undefined;\n\n  /**\n   * Set to true if this is the emit kind that is specified in the tsconfig.json.\n   * Declarations are only emitted for the primary module kind.\n   */\n  isPrimary: boolean;\n}\n\nexport class EmitFilesPatch {\n  private static _patchedTs: ExtendedTypeScript | undefined = undefined;\n\n  private static _baseEmitFiles: any | undefined = undefined; // eslint-disable-line\n\n  public static install(\n    ts: ExtendedTypeScript,\n    tsconfig: TTypescript.ParsedCommandLine,\n    moduleKindsToEmit: ICachedEmitModuleKind[],\n    changedFiles?: Set<TTypescript.SourceFile>\n  ): void {\n    if (EmitFilesPatch._patchedTs === ts) {\n      // We already patched this instance of TS\n      return;\n    }\n\n    if (EmitFilesPatch._patchedTs !== undefined) {\n      throw new InternalError(\n        'EmitFilesPatch.install() cannot be called without first uninstalling the existing patch'\n      );\n    }\n\n    EmitFilesPatch._patchedTs = ts;\n    EmitFilesPatch._baseEmitFiles = ts.emitFiles;\n\n    let foundPrimary: boolean = false;\n    let defaultModuleKind: TTypescript.ModuleKind;\n\n    for (const moduleKindToEmit of moduleKindsToEmit) {\n      if (moduleKindToEmit.isPrimary) {\n        if (foundPrimary) {\n          throw new Error('Multiple primary module emit kinds encountered.');\n        } else {\n          foundPrimary = true;\n        }\n\n        defaultModuleKind = moduleKindToEmit.moduleKind;\n      }\n    }\n\n    const patchedEmitFiles = (\n      resolver: IEmitResolver,\n      host: IEmitHost,\n      targetSourceFile: TTypescript.SourceFile | undefined,\n      emitTransformers: IEmitTransformers,\n      emitOnlyDtsFiles?: boolean,\n      onlyBuildInfo?: boolean,\n      forceDtsEmit?: boolean\n    ): TTypescript.EmitResult => {\n      if (onlyBuildInfo || emitOnlyDtsFiles) {\n        // There should only be one tsBuildInfo and one set of declaration files\n        return EmitFilesPatch._baseEmitFiles(\n          resolver,\n          host,\n          targetSourceFile,\n          emitTransformers,\n          emitOnlyDtsFiles,\n          onlyBuildInfo,\n          forceDtsEmit\n        );\n      } else {\n        if (targetSourceFile && changedFiles) {\n          changedFiles.add(targetSourceFile);\n        }\n\n        let defaultModuleKindResult: TTypescript.EmitResult;\n        const diagnostics: TTypescript.Diagnostic[] = [];\n        let emitSkipped: boolean = false;\n        for (const moduleKindToEmit of moduleKindsToEmit) {\n          const compilerOptions: TTypescript.CompilerOptions = moduleKindToEmit.isPrimary\n            ? {\n                ...tsconfig.options\n              }\n            : {\n                ...tsconfig.options,\n                module: moduleKindToEmit.moduleKind,\n                outDir: moduleKindToEmit.outFolderPath,\n\n                // Don't emit declarations for secondary module kinds\n                declaration: false,\n                declarationMap: false\n              };\n\n          if (!compilerOptions.outDir) {\n            throw new InternalError('Expected compilerOptions.outDir to be assigned');\n          }\n\n          const flavorResult: TTypescript.EmitResult = EmitFilesPatch._baseEmitFiles(\n            resolver,\n            {\n              ...host,\n              writeFile: EmitFilesPatch.wrapWriteFile(host.writeFile, moduleKindToEmit.jsExtensionOverride),\n              getCompilerOptions: () => compilerOptions\n            },\n            targetSourceFile,\n            ts.getTransformers(compilerOptions, undefined, emitOnlyDtsFiles),\n            emitOnlyDtsFiles,\n            onlyBuildInfo,\n            forceDtsEmit\n          );\n\n          emitSkipped = emitSkipped || flavorResult.emitSkipped;\n          for (const diagnostic of flavorResult.diagnostics) {\n            diagnostics.push(diagnostic);\n          }\n\n          if (moduleKindToEmit.moduleKind === defaultModuleKind) {\n            defaultModuleKindResult = flavorResult;\n          }\n          // Should results be aggregated, in case for whatever reason the diagnostics are not the same?\n        }\n\n        const mergedDiagnostics: readonly TTypescript.Diagnostic[] =\n          ts.sortAndDeduplicateDiagnostics(diagnostics);\n\n        return {\n          ...defaultModuleKindResult!,\n          diagnostics: mergedDiagnostics,\n          emitSkipped\n        };\n      }\n    };\n\n    // Override the underlying file emitter to run itself once for each flavor\n    // This is a rather inelegant way to convince the TypeScript compiler not to duplicate parse/link/check\n    ts.emitFiles = patchedEmitFiles;\n  }\n\n  public static get isInstalled(): boolean {\n    return this._patchedTs !== undefined;\n  }\n\n  /**\n   * Wraps the writeFile callback on the IEmitHost to override the .js extension, if applicable\n   */\n  public static wrapWriteFile(\n    baseWriteFile: TTypescript.WriteFileCallback,\n    jsExtensionOverride: string | undefined\n  ): TTypescript.WriteFileCallback {\n    if (!jsExtensionOverride) {\n      return baseWriteFile;\n    }\n\n    const replacementExtension: string = `${jsExtensionOverride}$1`;\n    return (\n      fileName: string,\n      data: string,\n      writeBOM: boolean,\n      onError?: ((message: string) => void) | undefined,\n      sourceFiles?: readonly TTypescript.SourceFile[] | undefined\n    ) => {\n      return baseWriteFile(\n        fileName.replace(/\\.js(\\.map)?$/g, replacementExtension),\n        data,\n        writeBOM,\n        onError,\n        sourceFiles\n      );\n    };\n  }\n\n  public static uninstall(ts: ExtendedTypeScript): void {\n    if (EmitFilesPatch._patchedTs === undefined) {\n      throw new InternalError('EmitFilesPatch.uninstall() cannot be called if no patch was installed');\n    }\n    if (ts !== EmitFilesPatch._patchedTs) {\n      throw new InternalError('EmitFilesPatch.uninstall() called for the wrong object');\n    }\n\n    ts.emitFiles = EmitFilesPatch._baseEmitFiles;\n\n    EmitFilesPatch._patchedTs = undefined;\n    EmitFilesPatch._baseEmitFiles = undefined;\n  }\n}\n"]}
+{"version":3,"file":"EmitFilesPatch.js","sourceRoot":"","sources":["../src/EmitFilesPatch.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.\n// See LICENSE in the project root for license information.\n\nimport { InternalError } from '@rushstack/node-core-library';\nimport type * as TTypescript from 'typescript';\nimport {\n  ExtendedTypeScript,\n  IEmitResolver,\n  IEmitHost,\n  IEmitTransformers\n} from './internalTypings/TypeScriptInternals';\n\nexport interface ICachedEmitModuleKind {\n  moduleKind: TTypescript.ModuleKind;\n\n  outFolderPath: string;\n\n  /**\n   * File extension to use instead of '.js' for emitted ECMAScript files.\n   * For example, '.cjs' to indicate commonjs content, or '.mjs' to indicate ECMAScript modules.\n   */\n  jsExtensionOverride: string | undefined;\n\n  /**\n   * Set to true if this is the emit kind that is specified in the tsconfig.json.\n   * Declarations are only emitted for the primary module kind.\n   */\n  isPrimary: boolean;\n}\n\nexport class EmitFilesPatch {\n  private static _patchedTs: ExtendedTypeScript | undefined = undefined;\n\n  private static _baseEmitFiles: any | undefined = undefined; // eslint-disable-line\n\n  public static install(\n    ts: ExtendedTypeScript,\n    baseCompilerOptions: TTypescript.CompilerOptions,\n    moduleKindsToEmit: ICachedEmitModuleKind[],\n    changedFiles?: Set<TTypescript.SourceFile>\n  ): void {\n    if (EmitFilesPatch._patchedTs === ts) {\n      // We already patched this instance of TS\n      return;\n    }\n\n    if (EmitFilesPatch._patchedTs !== undefined) {\n      throw new InternalError(\n        'EmitFilesPatch.install() cannot be called without first uninstalling the existing patch'\n      );\n    }\n\n    EmitFilesPatch._patchedTs = ts;\n    EmitFilesPatch._baseEmitFiles = ts.emitFiles;\n\n    let foundPrimary: boolean = false;\n    let defaultModuleKind: TTypescript.ModuleKind;\n\n    for (const moduleKindToEmit of moduleKindsToEmit) {\n      if (moduleKindToEmit.isPrimary) {\n        if (foundPrimary) {\n          throw new Error('Multiple primary module emit kinds encountered.');\n        } else {\n          foundPrimary = true;\n        }\n\n        defaultModuleKind = moduleKindToEmit.moduleKind;\n      }\n    }\n\n    const patchedEmitFiles = (\n      resolver: IEmitResolver,\n      host: IEmitHost,\n      targetSourceFile: TTypescript.SourceFile | undefined,\n      emitTransformers: IEmitTransformers,\n      emitOnlyDtsFiles?: boolean,\n      onlyBuildInfo?: boolean,\n      forceDtsEmit?: boolean\n    ): TTypescript.EmitResult => {\n      if (onlyBuildInfo || emitOnlyDtsFiles) {\n        // There should only be one tsBuildInfo and one set of declaration files\n        return EmitFilesPatch._baseEmitFiles(\n          resolver,\n          host,\n          targetSourceFile,\n          emitTransformers,\n          emitOnlyDtsFiles,\n          onlyBuildInfo,\n          forceDtsEmit\n        );\n      } else {\n        if (targetSourceFile && changedFiles) {\n          changedFiles.add(targetSourceFile);\n        }\n\n        let defaultModuleKindResult: TTypescript.EmitResult;\n        const diagnostics: TTypescript.Diagnostic[] = [];\n        let emitSkipped: boolean = false;\n        for (const moduleKindToEmit of moduleKindsToEmit) {\n          const compilerOptions: TTypescript.CompilerOptions = moduleKindToEmit.isPrimary\n            ? {\n                ...baseCompilerOptions\n              }\n            : {\n                ...baseCompilerOptions,\n                module: moduleKindToEmit.moduleKind,\n                outDir: moduleKindToEmit.outFolderPath,\n\n                // Don't emit declarations for secondary module kinds\n                declaration: false,\n                declarationMap: false\n              };\n\n          if (!compilerOptions.outDir) {\n            throw new InternalError('Expected compilerOptions.outDir to be assigned');\n          }\n\n          const flavorResult: TTypescript.EmitResult = EmitFilesPatch._baseEmitFiles(\n            resolver,\n            {\n              ...host,\n              writeFile: EmitFilesPatch.wrapWriteFile(host.writeFile, moduleKindToEmit.jsExtensionOverride),\n              getCompilerOptions: () => compilerOptions\n            },\n            targetSourceFile,\n            ts.getTransformers(compilerOptions, undefined, emitOnlyDtsFiles),\n            emitOnlyDtsFiles,\n            onlyBuildInfo,\n            forceDtsEmit\n          );\n\n          emitSkipped = emitSkipped || flavorResult.emitSkipped;\n          for (const diagnostic of flavorResult.diagnostics) {\n            diagnostics.push(diagnostic);\n          }\n\n          if (moduleKindToEmit.moduleKind === defaultModuleKind) {\n            defaultModuleKindResult = flavorResult;\n          }\n          // Should results be aggregated, in case for whatever reason the diagnostics are not the same?\n        }\n\n        const mergedDiagnostics: readonly TTypescript.Diagnostic[] =\n          ts.sortAndDeduplicateDiagnostics(diagnostics);\n\n        return {\n          ...defaultModuleKindResult!,\n          diagnostics: mergedDiagnostics,\n          emitSkipped\n        };\n      }\n    };\n\n    // Override the underlying file emitter to run itself once for each flavor\n    // This is a rather inelegant way to convince the TypeScript compiler not to duplicate parse/link/check\n    ts.emitFiles = patchedEmitFiles;\n  }\n\n  public static get isInstalled(): boolean {\n    return this._patchedTs !== undefined;\n  }\n\n  /**\n   * Wraps the writeFile callback on the IEmitHost to override the .js extension, if applicable\n   */\n  public static wrapWriteFile(\n    baseWriteFile: TTypescript.WriteFileCallback,\n    jsExtensionOverride: string | undefined\n  ): TTypescript.WriteFileCallback {\n    if (!jsExtensionOverride) {\n      return baseWriteFile;\n    }\n\n    const replacementExtension: string = `${jsExtensionOverride}$1`;\n    return (\n      fileName: string,\n      data: string,\n      writeBOM: boolean,\n      onError?: ((message: string) => void) | undefined,\n      sourceFiles?: readonly TTypescript.SourceFile[] | undefined\n    ) => {\n      return baseWriteFile(\n        fileName.replace(/\\.js(\\.map)?$/g, replacementExtension),\n        data,\n        writeBOM,\n        onError,\n        sourceFiles\n      );\n    };\n  }\n\n  public static uninstall(ts: ExtendedTypeScript): void {\n    if (EmitFilesPatch._patchedTs === undefined) {\n      throw new InternalError('EmitFilesPatch.uninstall() cannot be called if no patch was installed');\n    }\n    if (ts !== EmitFilesPatch._patchedTs) {\n      throw new InternalError('EmitFilesPatch.uninstall() called for the wrong object');\n    }\n\n    ts.emitFiles = EmitFilesPatch._baseEmitFiles;\n\n    EmitFilesPatch._patchedTs = undefined;\n    EmitFilesPatch._baseEmitFiles = undefined;\n  }\n}\n"]}

package/lib/TypeScriptBuilder.d.ts

@@ -1,6 +1,6 @@
 import type * as TTypescript from 'typescript';
-import type { IChangedFileState, IScopedLogger } from '@rushstack/heft';
-import type { ExtendedTypeScript } from './internalTypings/TypeScriptInternals';
+import type { IScopedLogger } from '@rushstack/heft';
+import type { ExtendedTypeScript, IExtendedSolutionBuilder } from './internalTypings/TypeScriptInternals';
 import type { ITypeScriptConfigurationJson } from './TypeScriptPlugin';
 import type { PerformanceMeasurer, PerformanceMeasurerAsync } from './Performance';
 export interface ITypeScriptBuilderConfiguration extends ITypeScriptConfigurationJson {
@@ -34,13 +34,23 @@ export interface ITypeScriptBuilderConfiguration extends ITypeScriptConfiguratio
      */
     emitChangedFilesCallback: (program: TTypescript.Program, changedFiles?: Set<TTypescript.SourceFile>) => void;
 }
+declare type TWatchProgram = TTypescript.WatchOfFilesAndCompilerOptions<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram>;
+interface IPendingWork {
+    (): void;
+}
 interface ITypeScriptTool {
     ts: ExtendedTypeScript;
     measureSync: PerformanceMeasurer;
     measureAsync: PerformanceMeasurerAsync;
     sourceFileCache: Map<string, TTypescript.SourceFile>;
-    oldBuilderProgram: TTypescript.EmitAndSemanticDiagnosticsBuilderProgram | undefined;
-    oldProgram: TTypescript.Program | undefined;
+    watchProgram: TWatchProgram | undefined;
+    solutionBuilder: IExtendedSolutionBuilder | undefined;
+    rawDiagnostics: TTypescript.Diagnostic[];
+    pendingOperations: Set<IPendingWork>;
+    executing: boolean;
+    reportDiagnostic: TTypescript.DiagnosticReporter;
+    clearTimeout: (timeout: IPendingWork) => void;
+    setTimeout: <T extends unknown[]>(timeout: (...args: T) => void, ms: number, ...args: T) => IPendingWork;
 }
 export declare class TypeScriptBuilder {
     private readonly _configuration;
@@ -57,7 +67,8 @@ export declare class TypeScriptBuilder {
     private _tool;
     private get _tsCacheFilePath();
     constructor(configuration: ITypeScriptBuilderConfiguration);
-    invokeAsync(changedFiles?: ReadonlyMap<string, IChangedFileState> | undefined): Promise<void>;
+    invokeAsync(onChangeDetected?: () => void): Promise<void>;
+    _runWatch(tool: ITypeScriptTool): void;
     _runBuildAsync(tool: ITypeScriptTool): Promise<void>;
     _runSolutionBuild(tool: ITypeScriptTool): void;
     private _logDiagnostics;
@@ -69,9 +80,12 @@ export declare class TypeScriptBuilder {
     private _validateTsconfig;
     private _addModuleKindToEmit;
     private _loadTsconfig;
+    private _getCreateBuilderProgram;
     private _buildSolutionBuilderHost;
     private _buildIncrementalCompilerHost;
-    private _getCachingTypeScriptSystem;
+    private _buildWatchCompilerHost;
+    private _changeCompilerHostToUseCache;
+    private _buildWatchSolutionBuilderHost;
     private _overrideTypeScriptReadJson;
     private _parseModuleKind;
 }

package/lib/TypeScriptBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeScriptBuilder.d.ts","sourceRoot":"","sources":["../src/TypeScriptBuilder.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,KAAK,WAAW,MAAM,YAAY,CAAC;AAW/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAEnF,MAAM,WAAW,+BAAgC,SAAQ,4BAA4B;IACnF;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAEhC;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAI3B;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,YAAY,EAAE,aAAa,CAAC;IAE5B;;OAEG;IACH,wBAAwB,EAAE,CACxB,OAAO,EAAE,WAAW,CAAC,OAAO,EAC5B,YAAY,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,KACvC,IAAI,CAAC;CACX;AA+CD,UAAU,eAAe;IACvB,EAAE,EAAE,kBAAkB,CAAC;IACvB,WAAW,EAAE,mBAAmB,CAAC;IACjC,YAAY,EAAE,wBAAwB,CAAC;IAEvC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAErD,iBAAiB,EAAE,WAAW,CAAC,wCAAwC,GAAG,SAAS,CAAC;IACpF,UAAU,EAAE,WAAW,CAAC,OAAO,GAAG,SAAS,CAAC;CAC7C;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkC;IACjE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAgB;IAClD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAY;IAEhD,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,wBAAwB,CAAiB;IAEjD,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,mBAAmB,CAAW;IAEtC,OAAO,CAAC,kBAAkB,CAA2B;IAErD,OAAO,CAAC,iBAAiB,CAAiC;IAC1D,OAAO,CAAC,gBAAgB,CAAkD;IAC1E,OAAO,CAAC,iBAAiB,CAAgE;IAEzF,OAAO,CAAC,KAAK,CAA0C;IAEvD,OAAO,KAAK,gBAAgB,GAuB3B;gBAEkB,aAAa,EAAE,+BAA+B;IAMpD,WAAW,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAyK7F,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAkH1D,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAkErD,OAAO,CAAC,eAAe;IA2BvB,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,mBAAmB;IAc3B,OAAO,CAAC,uBAAuB;IA0C/B,OAAO,CAAC,8BAA8B;IA2BtC,OAAO,CAAC,KAAK;IA8Bb,OAAO,CAAC,iBAAiB;IAyHzB,OAAO,CAAC,oBAAoB;IA8D5B,OAAO,CAAC,aAAa;IA6CrB,OAAO,CAAC,yBAAyB;IAqBjC,OAAO,CAAC,6BAA6B;IAiDrC,OAAO,CAAC,2BAA2B;IAiGnC,OAAO,CAAC,2BAA2B;IAgCnC,OAAO,CAAC,gBAAgB;CAwBzB"}
+{"version":3,"file":"TypeScriptBuilder.d.ts","sourceRoot":"","sources":["../src/TypeScriptBuilder.ts"],"names":[],"mappings":"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"}

package/lib/TypeScriptBuilder.js

@@ -32,10 +32,6 @@ const semver = __importStar(require("semver"));
 const node_core_library_1 = require("@rushstack/node-core-library");
 const EmitFilesPatch_1 = require("./EmitFilesPatch");
 const TypeScriptCachedFileSystem_1 = require("./fileSystem/TypeScriptCachedFileSystem");
-// type TWatchCompilerHost =
-//   TTypescript.WatchCompilerHostOfFilesAndCompilerOptions<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram>;
-// type TWatchSolutionHost =
-//   TTypescript.SolutionBuilderWithWatchHost<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram>;
 const EMPTY_JSON = {};
 const OLDEST_SUPPORTED_TS_MAJOR_VERSION = 2;
 const OLDEST_SUPPORTED_TS_MINOR_VERSION = 9;
@@ -70,7 +66,7 @@ class TypeScriptBuilder {
         }
         return this.__tsCacheFilePath;
     }
-    async invokeAsync(changedFiles) {
+    async invokeAsync(onChangeDetected) {
         if (!this._tool) {
             // Determine the compiler version
             const compilerPackageJsonFilename = path.join(this._configuration.typeScriptToolPath, 'package.json');
@@ -135,61 +131,85 @@ class TypeScriptBuilder {
                 return Object.assign(Object.assign({}, result), { duration: ts.performance.getDuration(measurementName) });
             };
             this._typescriptTerminal.writeLine(`Using TypeScript version ${ts.version}`);
+            const rawDiagnostics = [];
+            const pendingOperations = new Set();
             this._tool = {
                 ts,
                 measureSync: measureTsPerformance,
                 measureAsync: measureTsPerformanceAsync,
                 sourceFileCache: new Map(),
-                oldBuilderProgram: undefined,
-                oldProgram: undefined
+                watchProgram: undefined,
+                solutionBuilder: undefined,
+                rawDiagnostics,
+                pendingOperations,
+                executing: false,
+                reportDiagnostic: (diagnostic) => {
+                    rawDiagnostics.push(diagnostic);
+                },
+                clearTimeout(timeout) {
+                    pendingOperations.delete(timeout);
+                },
+                setTimeout(fn, ms, ...args) {
+                    const timeout = () => {
+                        fn(...args);
+                    };
+                    pendingOperations.add(timeout);
+                    if (!this.executing && onChangeDetected) {
+                        onChangeDetected();
+                    }
+                    return timeout;
+                }
             };
         }
         const { performance } = this._tool.ts;
         // Reset the performance counters to 0 to avoid contamination from previous runs
         performance.disable();
         performance.enable();
-        if (changedFiles) {
-            const { sourceFileCache } = this._tool;
-            for (const file of changedFiles.keys()) {
-                // There might need to be a transform to the format of `file` here.
-                sourceFileCache.delete(file);
-            }
+        if (onChangeDetected !== undefined) {
+            this._runWatch(this._tool);
         }
-        // if (this._configuration.watchMode) {
-        //   await this._runWatch(ts, measureTsPerformance);
-        // } else if (this._useSolutionBuilder) {
-        if (this._useSolutionBuilder) {
+        else if (this._useSolutionBuilder) {
             this._runSolutionBuild(this._tool);
         }
         else {
             await this._runBuildAsync(this._tool);
         }
     }
-    // public async _runWatch(ts: ExtendedTypeScript, measureTsPerformance: PerformanceMeasurer): Promise<void> {
-    //   //#region CONFIGURE
-    //   const { duration: configureDurationMs, tsconfig } = measureTsPerformance('Configure', () => {
-    //     const _tsconfig: TTypescript.ParsedCommandLine = this._loadTsconfig(ts);
-    //     this._validateTsconfig(ts, _tsconfig);
-    //     EmitFilesPatch.install(ts, _tsconfig, this._moduleKindsToEmit);
-    //     return {
-    //       tsconfig: _tsconfig
-    //     };
-    //   });
-    //   this._typescriptTerminal.writeVerboseLine(`Configure: ${configureDurationMs}ms`);
-    //   //#endregion
-    //   if (this._useSolutionBuilder) {
-    //     const solutionHost: TWatchSolutionHost = this._buildWatchSolutionBuilderHost(ts);
-    //     const watchBuilder: TTypescript.SolutionBuilder<TTypescript.EmitAndSemanticDiagnosticsBuilderProgram> =
-    //       ts.createSolutionBuilderWithWatch(solutionHost, [this._configuration.tsconfigPath], {});
-    //     watchBuilder.build();
-    //   } else {
-    //     const compilerHost: TWatchCompilerHost = this._buildWatchCompilerHost(ts, tsconfig);
-    //     ts.createWatchProgram(compilerHost);
-    //   }
-    //   return new Promise(() => {
-    //     /* never terminate */
-    //   });
-    // }
+    _runWatch(tool) {
+        const { ts, measureSync: measureTsPerformance, pendingOperations, rawDiagnostics } = tool;
+        if (!tool.solutionBuilder && !tool.watchProgram) {
+            //#region CONFIGURE
+            const { duration: configureDurationMs, tsconfig } = measureTsPerformance('Configure', () => {
+                const _tsconfig = this._loadTsconfig(ts);
+                this._validateTsconfig(ts, _tsconfig);
+                return {
+                    tsconfig: _tsconfig
+                };
+            });
+            this._typescriptTerminal.writeVerboseLine(`Configure: ${configureDurationMs}ms`);
+            //#endregion
+            if (this._useSolutionBuilder) {
+                const solutionHost = this._buildWatchSolutionBuilderHost(tool);
+                const builder = ts.createSolutionBuilderWithWatch(solutionHost, [this._configuration.tsconfigPath], {});
+                tool.solutionBuilder = builder;
+                builder.build();
+            }
+            else {
+                const compilerHost = this._buildWatchCompilerHost(tool, tsconfig);
+                tool.watchProgram = ts.createWatchProgram(compilerHost);
+            }
+        }
+        if (pendingOperations.size > 0) {
+            rawDiagnostics.length = 0;
+            tool.executing = true;
+            for (const operation of pendingOperations) {
+                pendingOperations.delete(operation);
+                operation();
+            }
+            tool.executing = false;
+        }
+        this._logDiagnostics(ts, rawDiagnostics);
+    }
     async _runBuildAsync(tool) {
         const { ts, measureSync: measureTsPerformance, measureAsync: measureTsPerformanceAsync } = tool;
         //#region CONFIGURE
@@ -210,11 +230,7 @@ class TypeScriptBuilder {
         let builderProgram = undefined;
         let tsProgram;
         if (tsconfig.options.incremental) {
-            if (!tool.oldBuilderProgram) {
-                tool.oldBuilderProgram = ts.readBuilderProgram(tsconfig.options, compilerHost);
-            }
-            builderProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram(tsconfig.fileNames, tsconfig.options, compilerHost, tool.oldBuilderProgram, ts.getConfigFileParsingDiagnostics(tsconfig), tsconfig.projectReferences);
-            tool.oldBuilderProgram = builderProgram;
+            builderProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram(tsconfig.fileNames, tsconfig.options, compilerHost, ts.readBuilderProgram(tsconfig.options, compilerHost), ts.getConfigFileParsingDiagnostics(tsconfig), tsconfig.projectReferences);
             tsProgram = builderProgram.getProgram();
         }
         else {
@@ -223,10 +239,9 @@ class TypeScriptBuilder {
                 options: tsconfig.options,
                 projectReferences: tsconfig.projectReferences,
                 host: compilerHost,
-                oldProgram: tool.oldProgram,
+                oldProgram: undefined,
                 configFileParsingDiagnostics: ts.getConfigFileParsingDiagnostics(tsconfig)
             });
-            tool.oldProgram = tsProgram;
         }
         // Prefer the builder program, since it is what gives us incremental builds
         const genericProgram = builderProgram || tsProgram;
@@ -246,7 +261,7 @@ class TypeScriptBuilder {
         this._typescriptTerminal.writeVerboseLine(`Analyze: ${diagnosticsDurationMs}ms`);
         //#endregion
         //#region EMIT
-        const emitResult = this._emit(ts, tsconfig, genericProgram);
+        const emitResult = this._emit(ts, genericProgram);
         //#endregion
         this._logEmitPerformance(ts);
         //#region FINAL_ANALYSIS
@@ -268,64 +283,43 @@ class TypeScriptBuilder {
     }
     _runSolutionBuild(tool) {
         this._typescriptTerminal.writeVerboseLine(`Using solution mode`);
-        const { ts, measureSync } = tool;
-        try {
+        const { ts, measureSync, rawDiagnostics } = tool;
+        rawDiagnostics.length = 0;
+        if (!tool.solutionBuilder) {
             //#region CONFIGURE
-            const { duration: configureDurationMs, rawDiagnostics, solutionBuilderHost } = measureSync('Configure', () => {
-                this._overrideTypeScriptReadJson(ts);
+            const { duration: configureDurationMs, solutionBuilderHost } = measureSync('Configure', () => {
                 const _tsconfig = this._loadTsconfig(ts);
                 this._validateTsconfig(ts, _tsconfig);
-                const _rawDiagnostics = [];
-                const reportDiagnostic = (diagnostic) => {
-                    _rawDiagnostics.push(diagnostic);
-                };
-                // TypeScript doesn't have a way to find out when a given program starts emitting in solution mode
-                EmitFilesPatch_1.EmitFilesPatch.install(ts, _tsconfig, this._moduleKindsToEmit);
-                const _solutionBuilderHost = this._buildSolutionBuilderHost(ts, reportDiagnostic);
-                _solutionBuilderHost.afterProgramEmitAndDiagnostics = (program) => {
-                    const tsProgram = program.getProgram();
-                    if (tsProgram) {
-                        this._configuration.emitChangedFilesCallback(tsProgram);
-                    }
-                };
+                const _solutionBuilderHost = this._buildSolutionBuilderHost(tool);
                 return {
-                    rawDiagnostics: _rawDiagnostics,
                     solutionBuilderHost: _solutionBuilderHost
                 };
             });
             this._typescriptTerminal.writeVerboseLine(`Configure: ${configureDurationMs}ms`);
             //#endregion
-            const solutionBuilder = ts.createSolutionBuilder(solutionBuilderHost, [this._configuration.tsconfigPath], {});
-            //#region EMIT
-            // Ignoring the exit status because we only care about presence of diagnostics
-            solutionBuilder.build();
-            //#endregion
-            this._logReadPerformance(ts);
-            this._logEmitPerformance(ts);
-            // Use the native metric since we aren't overwriting the writer
-            this._typescriptTerminal.writeVerboseLine(`I/O Write: ${ts.performance.getDuration('I/O Write')}ms (${ts.performance.getCount('beforeIOWrite')} files)`);
-            this._logDiagnostics(ts, rawDiagnostics);
+            tool.solutionBuilder = ts.createSolutionBuilder(solutionBuilderHost, [this._configuration.tsconfigPath], {});
         }
-        finally {
-            EmitFilesPatch_1.EmitFilesPatch.uninstall(ts);
+        else {
+            // Force reload everything from disk
+            for (const project of tool.solutionBuilder.getBuildOrder()) {
+                tool.solutionBuilder.invalidateProject(project, 1);
+            }
         }
+        //#region EMIT
+        // Ignoring the exit status because we only care about presence of diagnostics
+        tool.solutionBuilder.build();
+        //#endregion
+        this._logDiagnostics(ts, rawDiagnostics);
     }
     _logDiagnostics(ts, rawDiagnostics) {
         const diagnostics = ts.sortAndDeduplicateDiagnostics(rawDiagnostics);
-        let typeScriptErrorCount = 0;
         if (diagnostics.length > 0) {
             this._typescriptTerminal.writeLine(`Encountered ${diagnostics.length} TypeScript issue${diagnostics.length > 1 ? 's' : ''}:`);
             for (const diagnostic of diagnostics) {
                 const diagnosticCategory = this._getAdjustedDiagnosticCategory(diagnostic, ts);
-                if (diagnosticCategory === ts.DiagnosticCategory.Error) {
-                    typeScriptErrorCount++;
-                }
                 this._printDiagnosticMessage(ts, diagnostic, diagnosticCategory);
             }
         }
-        if (typeScriptErrorCount > 0) {
-            throw new Error(`Encountered TypeScript error${typeScriptErrorCount > 1 ? 's' : ''}`);
-        }
     }
     _logEmitPerformance(ts) {
         this._typescriptTerminal.writeVerboseLine(`Bind: ${ts.performance.getDuration('Bind')}ms`);
@@ -397,10 +391,10 @@ class TypeScriptBuilder {
         }
         return diagnostic.category;
     }
-    _emit(ts, tsconfig, genericProgram) {
+    _emit(ts, genericProgram) {
         const filesToWrite = [];
         const changedFiles = new Set();
-        EmitFilesPatch_1.EmitFilesPatch.install(ts, tsconfig, this._moduleKindsToEmit, changedFiles);
+        EmitFilesPatch_1.EmitFilesPatch.install(ts, genericProgram.getCompilerOptions(), this._moduleKindsToEmit, changedFiles);
         const writeFileCallback = (filePath, data) => {
             filesToWrite.push({ filePath, data });
         };
@@ -558,24 +552,83 @@ class TypeScriptBuilder {
         }
         return tsconfig;
     }
-    _buildSolutionBuilderHost(ts, reportDiagnostic) {
-        const reportSolutionBuilderStatus = reportDiagnostic;
+    _getCreateBuilderProgram(tool) {
+        const { _moduleKindsToEmit: moduleKindsToEmit, _configuration: { emitChangedFilesCallback } } = this;
+        const { ts } = tool;
+        const createMultiEmitProgram = (fileNames, compilerOptions, host, oldProgram, configFileParsingDiagnostics, projectReferences) => {
+            // Reset performance counters
+            ts.performance.disable();
+            ts.performance.enable();
+            this._typescriptTerminal.writeVerboseLine(`Reading program "${compilerOptions.configFilePath}"`);
+            const newProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram(fileNames, compilerOptions, host, oldProgram, configFileParsingDiagnostics, projectReferences);
+            this._logReadPerformance(ts);
+            const { emit: originalEmit } = newProgram;
+            if (!compilerOptions) {
+                throw new Error(`Expected compilerOptions!`);
+            }
+            const emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
+                const changedFiles = new Set();
+                try {
+                    EmitFilesPatch_1.EmitFilesPatch.install(ts, compilerOptions, moduleKindsToEmit, changedFiles);
+                    const result = originalEmit.call(newProgram, targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+                    this._typescriptTerminal.writeVerboseLine(`Emitting program "${compilerOptions.configFilePath}"`);
+                    this._logEmitPerformance(ts);
+                    // Reset performance counters
+                    ts.performance.disable();
+                    ts.performance.enable();
+                    emitChangedFilesCallback(newProgram.getProgram(), changedFiles);
+                    return result;
+                }
+                finally {
+                    EmitFilesPatch_1.EmitFilesPatch.uninstall(ts);
+                }
+            };
+            newProgram.emit = emit;
+            return newProgram;
+        };
+        return createMultiEmitProgram;
+    }
+    _buildSolutionBuilderHost(tool) {
+        const reportSolutionBuilderStatus = tool.reportDiagnostic;
         const reportEmitErrorSummary = (errorCount) => {
             // Do nothing
         };
-        const compilerHost = ts.createSolutionBuilderHost(this._getCachingTypeScriptSystem(ts), ts.createEmitAndSemanticDiagnosticsBuilderProgram, reportDiagnostic, reportSolutionBuilderStatus, reportEmitErrorSummary);
-        return compilerHost;
+        const { ts } = tool;
+        const solutionBuilderHost = ts.createSolutionBuilderHost(ts.sys, this._getCreateBuilderProgram(tool), tool.reportDiagnostic, reportSolutionBuilderStatus, reportEmitErrorSummary);
+        solutionBuilderHost.afterProgramEmitAndDiagnostics = (program) => {
+            // Use the native metric since we aren't overwriting the writer
+            this._typescriptTerminal.writeVerboseLine(`I/O Write: ${ts.performance.getDuration('I/O Write')}ms (${ts.performance.getCount('beforeIOWrite')} files)`);
+        };
+        return solutionBuilderHost;
     }
     _buildIncrementalCompilerHost(tool, tsconfig) {
-        const { ts, sourceFileCache } = tool;
+        const { ts } = tool;
         let compilerHost;
         if (tsconfig.options.incremental) {
-            compilerHost = ts.createIncrementalCompilerHost(tsconfig.options, this._getCachingTypeScriptSystem(ts));
+            compilerHost = ts.createIncrementalCompilerHost(tsconfig.options, ts.sys);
         }
         else {
             compilerHost = ts.createCompilerHost(tsconfig.options);
         }
+        this._changeCompilerHostToUseCache(compilerHost, tool);
+        return compilerHost;
+    }
+    _buildWatchCompilerHost(tool, tsconfig) {
+        const { ts } = tool;
+        const reportWatchStatus = (diagnostic) => {
+            this._printDiagnosticMessage(ts, diagnostic);
+        };
+        const compilerHost = ts.createWatchCompilerHost(tsconfig.fileNames, tsconfig.options, ts.sys, this._getCreateBuilderProgram(tool), tool.reportDiagnostic, reportWatchStatus, tsconfig.projectReferences);
+        compilerHost.clearTimeout = tool.clearTimeout;
+        compilerHost.setTimeout = tool.setTimeout;
+        return compilerHost;
+    }
+    _changeCompilerHostToUseCache(compilerHost, tool) {
+        const { sourceFileCache } = tool;
         const { getSourceFile: innerGetSourceFile } = compilerHost;
+        if (innerGetSourceFile.cache === sourceFileCache) {
+            return;
+        }
         // Enable source file persistence
         const getSourceFile = (fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile) => {
             if (!shouldCreateNewSourceFile) {
@@ -593,97 +646,16 @@ class TypeScriptBuilder {
             }
             return result;
         };
+        getSourceFile.cache = sourceFileCache;
         compilerHost.getSourceFile = getSourceFile;
-        return compilerHost;
     }
-    _getCachingTypeScriptSystem(ts) {
-        const sys = Object.assign(Object.assign({}, ts.sys), { deleteFile: this._cachedFileSystem.deleteFile.bind(this._cachedFileSystem), 
-            /** Check if the path exists and is a directory */
-            directoryExists: (directoryPath) => {
-                try {
-                    const stats = this._cachedFileSystem.getStatistics(directoryPath);
-                    return stats.isDirectory() || stats.isSymbolicLink();
-                }
-                catch (error) {
-                    if (node_core_library_1.FileSystem.isNotExistError(error)) {
-                        return false;
-                    }
-                    else {
-                        throw error;
-                    }
-                }
-            }, 
-            /** Check if the path exists and is a file */
-            fileExists: (filePath) => {
-                try {
-                    const stats = this._cachedFileSystem.getStatistics(filePath);
-                    return stats.isFile();
-                }
-                catch (error) {
-                    if (node_core_library_1.FileSystem.isNotExistError(error)) {
-                        return false;
-                    }
-                    else {
-                        throw error;
-                    }
-                }
-            }, 
-            /* Use the Heft config's build folder because it has corrected casing */
-            getCurrentDirectory: () => this._configuration.buildFolderPath, getDirectories: (folderPath) => {
-                return this._cachedFileSystem.readFolderFilesAndDirectories(folderPath).directories;
-            }, realpath: this._cachedFileSystem.getRealPath.bind(this._cachedFileSystem) });
-        return sys;
+    _buildWatchSolutionBuilderHost(tool) {
+        const { reportDiagnostic, ts } = tool;
+        const host = ts.createSolutionBuilderWithWatchHost(ts.sys, this._getCreateBuilderProgram(tool), reportDiagnostic, reportDiagnostic, reportDiagnostic);
+        host.clearTimeout = tool.clearTimeout;
+        host.setTimeout = tool.setTimeout;
+        return host;
     }
-    // private _buildWatchCompilerHost(
-    //   ts: ExtendedTypeScript,
-    //   tsconfig: TTypescript.ParsedCommandLine
-    // ): TWatchCompilerHost {
-    //   const reportDiagnostic: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic): void => {
-    //     this._printDiagnosticMessage(ts, diagnostic);
-    //   };
-    //   const reportWatchStatus: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic) => {
-    //     this._printDiagnosticMessage(ts, diagnostic);
-    //     // In watch mode, notify EmitCompletedCallbackManager every time we finish recompiling.
-    //     if (
-    //       diagnostic.code === ts.Diagnostics.Found_0_errors_Watching_for_file_changes.code ||
-    //       diagnostic.code === ts.Diagnostics.Found_1_error_Watching_for_file_changes.code
-    //     ) {
-    //       this._emitCompletedCallbackManager.callback();
-    //     }
-    //   };
-    //   return ts.createWatchCompilerHost(
-    //     tsconfig.fileNames,
-    //     tsconfig.options,
-    //     this._getCachingTypeScriptSystem(ts),
-    //     ts.createEmitAndSemanticDiagnosticsBuilderProgram,
-    //     reportDiagnostic,
-    //     reportWatchStatus,
-    //     tsconfig.projectReferences
-    //   );
-    // }
-    // private _buildWatchSolutionBuilderHost(ts: ExtendedTypeScript): TWatchSolutionHost {
-    //   const reportDiagnostic: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic): void => {
-    //     this._printDiagnosticMessage(ts, diagnostic);
-    //   };
-    //   const reportSolutionBuilderStatus: TTypescript.DiagnosticReporter = reportDiagnostic;
-    //   const reportWatchStatus: TTypescript.DiagnosticReporter = (diagnostic: TTypescript.Diagnostic) => {
-    //     this._printDiagnosticMessage(ts, diagnostic);
-    //     // In watch mode, notify EmitCompletedCallbackManager every time we finish recompiling.
-    //     if (
-    //       diagnostic.code === ts.Diagnostics.Found_0_errors_Watching_for_file_changes.code ||
-    //       diagnostic.code === ts.Diagnostics.Found_1_error_Watching_for_file_changes.code
-    //     ) {
-    //       this._emitCompletedCallbackManager.callback();
-    //     }
-    //   };
-    //   return ts.createSolutionBuilderWithWatchHost(
-    //     this._getCachingTypeScriptSystem(ts),
-    //     ts.createEmitAndSemanticDiagnosticsBuilderProgram,
-    //     reportDiagnostic,
-    //     reportSolutionBuilderStatus,
-    //     reportWatchStatus
-    //   );
-    // }
     _overrideTypeScriptReadJson(ts) {
         const cachedReadJson = (filePath) => {
             let jsonData = this._tsReadJsonCache.get(filePath);