typescript 5.6.0-dev.20240605 → 5.6.0-dev.20240607

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240605`;
+var version = `${versionMajorMinor}.0-dev.20240607`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -113149,10 +113149,7 @@ function emitFiles(resolver, host, targetSourceFile, { scriptTransformers, decla
       emitSkipped = true;
       return;
     }
-    const buildInfo = host.getBuildInfo() || createBuildInfo(
-      /*program*/
-      void 0
-    );
+    const buildInfo = host.getBuildInfo() || { version };
     writeFile(
       host,
       emitterDiagnostics,
@@ -113435,9 +113432,6 @@ function emitFiles(resolver, host, targetSourceFile, { scriptTransformers, decla
     return encodeURI(sourceMapFile);
   }
 }
-function createBuildInfo(program) {
-  return { program, version };
-}
 function getBuildInfoText(buildInfo) {
   return JSON.stringify(buildInfo);
 }
@@ -118218,7 +118212,7 @@ function isIgnoredFileFromWildCardWatching({
   }
   return false;
   function hasSourceFile(file) {
-    return realProgram ? !!realProgram.getSourceFileByPath(file) : builderProgram ? builderProgram.getState().fileInfos.has(file) : !!find(program, (rootFile) => toPath3(rootFile) === file);
+    return realProgram ? !!realProgram.getSourceFileByPath(file) : builderProgram ? builderProgram.state.fileInfos.has(file) : !!find(program, (rootFile) => toPath3(rootFile) === file);
   }
   function isSupportedScriptKind() {
     if (!getScriptKind) return false;
@@ -118239,9 +118233,6 @@ function isIgnoredFileFromWildCardWatching({
     }
   }
 }
-function isBuilderProgram(program) {
-  return !!program.getState;
-}
 function isEmittedFileOfProgram(program, file) {
   if (!program) {
     return false;
@@ -122799,6 +122790,13 @@ var BuilderState;
 })(BuilderState || (BuilderState = {}));
 
 // src/compiler/builder.ts
+function isBuilderProgramStateWithDefinedProgram(state) {
+  return state.program !== void 0;
+}
+function toBuilderProgramStateWithDefinedProgram(state) {
+  Debug.assert(isBuilderProgramStateWithDefinedProgram(state));
+  return state;
+}
 function getBuilderFileEmit(options) {
   let result = 1 /* Js */;
   if (options.sourceMap) result = result | 2 /* JsMap */;
@@ -123063,7 +123061,11 @@ function getNextAffectedFile(state, cancellationToken, host) {
         const affectedFile = affectedFiles[affectedFilesIndex];
         if (!seenAffectedFiles.has(affectedFile.resolvedPath)) {
           state.affectedFilesIndex = affectedFilesIndex;
-          addToAffectedFilesPendingEmit(state, affectedFile.resolvedPath, getBuilderFileEmit(state.compilerOptions));
+          addToAffectedFilesPendingEmit(
+            state,
+            affectedFile.resolvedPath,
+            getBuilderFileEmit(state.compilerOptions)
+          );
           handleDtsMayChangeOfAffectedFile(
             state,
             affectedFile,
@@ -123083,12 +123085,11 @@ function getNextAffectedFile(state, cancellationToken, host) {
     if (nextKey.done) {
       return void 0;
     }
-    const program = Debug.checkDefined(state.program);
-    const compilerOptions = program.getCompilerOptions();
-    if (compilerOptions.outFile) return program;
+    const compilerOptions = state.program.getCompilerOptions();
+    if (compilerOptions.outFile) return state.program;
     state.affectedFiles = BuilderState.getFilesAffectedByWithOldState(
       state,
-      program,
+      state.program,
       nextKey.value,
       cancellationToken,
       host
@@ -123149,9 +123150,8 @@ function getNextPendingEmitDiagnosticsFile(state) {
 function removeDiagnosticsOfLibraryFiles(state) {
   if (!state.cleanedDiagnosticsOfLibFiles) {
     state.cleanedDiagnosticsOfLibFiles = true;
-    const program = Debug.checkDefined(state.program);
-    const options = program.getCompilerOptions();
-    forEach(program.getSourceFiles(), (f) => program.isSourceFileDefaultLibrary(f) && !skipTypeChecking(f, options, program) && removeSemanticDiagnosticsOf(state, f.resolvedPath));
+    const options = state.program.getCompilerOptions();
+    forEach(state.program.getSourceFiles(), (f) => state.program.isSourceFileDefaultLibrary(f) && !skipTypeChecking(f, options, state.program) && removeSemanticDiagnosticsOf(state, f.resolvedPath));
   }
 }
 function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, host) {
@@ -123160,7 +123160,7 @@ function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken
     removeDiagnosticsOfLibraryFiles(state);
     BuilderState.updateShapeSignature(
       state,
-      Debug.checkDefined(state.program),
+      state.program,
       affectedFile,
       cancellationToken,
       host
@@ -123178,12 +123178,11 @@ function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken
 function handleDtsMayChangeOf(state, path, invalidateJsFiles, cancellationToken, host) {
   removeSemanticDiagnosticsOf(state, path);
   if (!state.changedFilesSet.has(path)) {
-    const program = Debug.checkDefined(state.program);
-    const sourceFile = program.getSourceFileByPath(path);
+    const sourceFile = state.program.getSourceFileByPath(path);
     if (sourceFile) {
       BuilderState.updateShapeSignature(
         state,
-        program,
+        state.program,
         sourceFile,
         cancellationToken,
         host,
@@ -123191,9 +123190,17 @@ function handleDtsMayChangeOf(state, path, invalidateJsFiles, cancellationToken,
         true
       );
       if (invalidateJsFiles) {
-        addToAffectedFilesPendingEmit(state, path, getBuilderFileEmit(state.compilerOptions));
+        addToAffectedFilesPendingEmit(
+          state,
+          path,
+          getBuilderFileEmit(state.compilerOptions)
+        );
       } else if (getEmitDeclarations(state.compilerOptions)) {
-        addToAffectedFilesPendingEmit(state, path, state.compilerOptions.declarationMap ? 24 /* AllDts */ : 8 /* Dts */);
+        addToAffectedFilesPendingEmit(
+          state,
+          path,
+          state.compilerOptions.declarationMap ? 24 /* AllDts */ : 8 /* Dts */
+        );
       }
     }
   }
@@ -123260,7 +123267,7 @@ function handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile
           host
         );
         if (isChangedSignature(state, currentPath)) {
-          const currentSourceFile = Debug.checkDefined(state.program).getSourceFileByPath(currentPath);
+          const currentSourceFile = state.program.getSourceFileByPath(currentPath);
           queue.push(...BuilderState.getReferencedByPaths(state, currentSourceFile.resolvedPath));
         }
       }
@@ -123309,7 +123316,7 @@ function handleDtsMayChangeOfFileAndExportsOfFile(state, filePath, invalidateJsF
 function getSemanticDiagnosticsOfFile(state, sourceFile, cancellationToken, semanticDiagnosticsPerFile) {
   return concatenate(
     getBinderAndCheckerDiagnosticsOfFile(state, sourceFile, cancellationToken, semanticDiagnosticsPerFile),
-    Debug.checkDefined(state.program).getProgramDiagnostics(sourceFile)
+    state.program.getProgramDiagnostics(sourceFile)
   );
 }
 function getBinderAndCheckerDiagnosticsOfFile(state, sourceFile, cancellationToken, semanticDiagnosticsPerFile) {
@@ -123319,17 +123326,20 @@ function getBinderAndCheckerDiagnosticsOfFile(state, sourceFile, cancellationTok
   if (cachedDiagnostics) {
     return filterSemanticDiagnostics(cachedDiagnostics, state.compilerOptions);
   }
-  const diagnostics = Debug.checkDefined(state.program).getBindAndCheckDiagnostics(sourceFile, cancellationToken);
+  const diagnostics = state.program.getBindAndCheckDiagnostics(sourceFile, cancellationToken);
   semanticDiagnosticsPerFile.set(path, diagnostics);
   return filterSemanticDiagnostics(diagnostics, state.compilerOptions);
 }
-function isProgramBundleEmitBuildInfo(info) {
+function isIncrementalBundleEmitBuildInfo(info) {
   var _a;
   return !!((_a = info.options) == null ? void 0 : _a.outFile);
 }
+function isIncrementalBuildInfo(info) {
+  return !!info.fileNames;
+}
 function getBuildInfo2(state) {
   var _a, _b;
-  const currentDirectory = Debug.checkDefined(state.program).getCurrentDirectory();
+  const currentDirectory = state.program.getCurrentDirectory();
   const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(state.compilerOptions), currentDirectory));
   const latestChangedDtsFile = state.latestChangedDtsFile ? relativeToBuildInfoEnsuringAbsolutePath(state.latestChangedDtsFile) : void 0;
   const fileNames = [];
@@ -123342,14 +123352,14 @@ function getBuildInfo2(state) {
       tryAddRoot(key, fileId);
       return value.impliedFormat ? { version: value.version, impliedFormat: value.impliedFormat, signature: void 0, affectsGlobalScope: void 0 } : value.version;
     });
-    const program2 = {
+    return {
       fileNames,
       fileInfos: fileInfos2,
       root,
       resolvedRoot: toResolvedRoot(),
-      options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions),
-      semanticDiagnosticsPerFile: convertToProgramBuildInfoDiagnostics(),
-      emitDiagnosticsPerFile: convertToProgramBuildInfoEmitDiagnostics(),
+      options: toIncrementalBuildInfoCompilerOptions(state.compilerOptions),
+      semanticDiagnosticsPerFile: toIncrementalBuildInfoDiagnostics(),
+      emitDiagnosticsPerFile: toIncrementalBuildInfoEmitDiagnostics(),
       changeFileSet: toChangeFileSet(),
       outSignature: state.outSignature,
       latestChangedDtsFile,
@@ -123359,10 +123369,10 @@ function getBuildInfo2(state) {
           // Pending emit is same as deteremined by compilerOptions
           state.programEmitPending
         )
-      )
+      ),
       // Actual value
+      version
     };
-    return createBuildInfo(program2);
   }
   let fileIdsList;
   let fileNamesToFileIdListId;
@@ -123417,7 +123427,7 @@ function getBuildInfo2(state) {
       toFileIdListId(state.referencedMap.getValues(key))
     ]);
   }
-  const semanticDiagnosticsPerFile = convertToProgramBuildInfoDiagnostics();
+  const semanticDiagnosticsPerFile = toIncrementalBuildInfoDiagnostics();
   let affectedFilesPendingEmit;
   if ((_b = state.affectedFilesPendingEmit) == null ? void 0 : _b.size) {
     const fullEmitForOptions = getBuilderFileEmit(state.compilerOptions);
@@ -123441,22 +123451,22 @@ function getBuildInfo2(state) {
       }
     }
   }
-  const program = {
+  return {
     fileNames,
+    fileIdsList,
     fileInfos,
     root,
     resolvedRoot: toResolvedRoot(),
-    options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions),
-    fileIdsList,
+    options: toIncrementalBuildInfoCompilerOptions(state.compilerOptions),
     referencedMap,
     semanticDiagnosticsPerFile,
-    emitDiagnosticsPerFile: convertToProgramBuildInfoEmitDiagnostics(),
+    emitDiagnosticsPerFile: toIncrementalBuildInfoEmitDiagnostics(),
     affectedFilesPendingEmit,
     changeFileSet: toChangeFileSet(),
     emitSignatures,
-    latestChangedDtsFile
+    latestChangedDtsFile,
+    version
   };
-  return createBuildInfo(program);
   function relativeToBuildInfoEnsuringAbsolutePath(path) {
     return relativeToBuildInfo(getNormalizedAbsolutePath(path, currentDirectory));
   }
@@ -123504,13 +123514,13 @@ function getBuildInfo2(state) {
     });
     return result;
   }
-  function convertToProgramBuildInfoCompilerOptions(options) {
+  function toIncrementalBuildInfoCompilerOptions(options) {
     let result;
     const { optionsNameMap } = getOptionsNameMap();
     for (const name of getOwnKeys(options).sort(compareStringsCaseSensitive)) {
       const optionInfo = optionsNameMap.get(name.toLowerCase());
       if (optionInfo == null ? void 0 : optionInfo.affectsBuildInfo) {
-        (result || (result = {}))[name] = convertToReusableCompilerOptionValue(
+        (result || (result = {}))[name] = toReusableCompilerOptionValue(
           optionInfo,
           options[name]
         );
@@ -123518,7 +123528,7 @@ function getBuildInfo2(state) {
     }
     return result;
   }
-  function convertToReusableCompilerOptionValue(option, value) {
+  function toReusableCompilerOptionValue(option, value) {
     if (option) {
       Debug.assert(option.type !== "listOrElement");
       if (option.type === "list") {
@@ -123532,7 +123542,7 @@ function getBuildInfo2(state) {
     }
     return value;
   }
-  function convertToProgramBuildInfoDiagnostics() {
+  function toIncrementalBuildInfoDiagnostics() {
     let result;
     state.fileInfos.forEach((_value, key) => {
       const value = state.semanticDiagnosticsPerFile.get(key);
@@ -123541,13 +123551,13 @@ function getBuildInfo2(state) {
       } else if (value.length) {
         result = append(result, [
           toFileId(key),
-          convertToReusableDiagnostics(value, key)
+          toReusableDiagnostic(value, key)
         ]);
       }
     });
     return result;
   }
-  function convertToProgramBuildInfoEmitDiagnostics() {
+  function toIncrementalBuildInfoEmitDiagnostics() {
     var _a2;
     let result;
     if (!((_a2 = state.emitDiagnosticsPerFile) == null ? void 0 : _a2.size)) return result;
@@ -123555,51 +123565,51 @@ function getBuildInfo2(state) {
       const value = state.emitDiagnosticsPerFile.get(key);
       result = append(result, [
         toFileId(key),
-        convertToReusableDiagnostics(value, key)
+        toReusableDiagnostic(value, key)
       ]);
     }
     return result;
   }
-  function convertToReusableDiagnostics(diagnostics, diagnosticFilePath) {
+  function toReusableDiagnostic(diagnostics, diagnosticFilePath) {
     Debug.assert(!!diagnostics.length);
     return diagnostics.map((diagnostic) => {
-      const result = convertToReusableDiagnosticRelatedInformation(diagnostic, diagnosticFilePath);
+      const result = toReusableDiagnosticRelatedInformation(diagnostic, diagnosticFilePath);
       result.reportsUnnecessary = diagnostic.reportsUnnecessary;
       result.reportDeprecated = diagnostic.reportsDeprecated;
       result.source = diagnostic.source;
       result.skippedOn = diagnostic.skippedOn;
       const { relatedInformation } = diagnostic;
-      result.relatedInformation = relatedInformation ? relatedInformation.length ? relatedInformation.map((r) => convertToReusableDiagnosticRelatedInformation(r, diagnosticFilePath)) : [] : void 0;
+      result.relatedInformation = relatedInformation ? relatedInformation.length ? relatedInformation.map((r) => toReusableDiagnosticRelatedInformation(r, diagnosticFilePath)) : [] : void 0;
       return result;
     });
   }
-  function convertToReusableDiagnosticRelatedInformation(diagnostic, diagnosticFilePath) {
+  function toReusableDiagnosticRelatedInformation(diagnostic, diagnosticFilePath) {
     const { file } = diagnostic;
     return {
       ...diagnostic,
       file: file ? file.resolvedPath === diagnosticFilePath ? void 0 : relativeToBuildInfo(file.resolvedPath) : false,
-      messageText: isString(diagnostic.messageText) ? diagnostic.messageText : convertToReusableDiagnosticMessageChain(diagnostic.messageText)
+      messageText: isString(diagnostic.messageText) ? diagnostic.messageText : toReusableDiagnosticMessageChain(diagnostic.messageText)
     };
   }
-  function convertToReusableDiagnosticMessageChain(chain) {
+  function toReusableDiagnosticMessageChain(chain) {
     if (chain.repopulateInfo) {
       return {
         info: chain.repopulateInfo(),
-        next: convertToReusableDiagnosticMessageChainArray(chain.next)
+        next: toReusableDiagnosticMessageChainArray(chain.next)
       };
     }
-    const next = convertToReusableDiagnosticMessageChainArray(chain.next);
+    const next = toReusableDiagnosticMessageChainArray(chain.next);
     return next === chain.next ? chain : { ...chain, next };
   }
-  function convertToReusableDiagnosticMessageChainArray(array) {
+  function toReusableDiagnosticMessageChainArray(array) {
     if (!array) return array;
     return forEach(array, (chain, index) => {
-      const reusable = convertToReusableDiagnosticMessageChain(chain);
+      const reusable = toReusableDiagnosticMessageChain(chain);
       if (chain === reusable) return void 0;
       const result = index > 0 ? array.slice(0, index - 1) : [];
       result.push(reusable);
       for (let i = index + 1; i < array.length; i++) {
-        result.push(convertToReusableDiagnosticMessageChain(array[i]));
+        result.push(toReusableDiagnosticMessageChain(array[i]));
       }
       return result;
     }) || array;
@@ -123671,24 +123681,27 @@ function computeSignature(text, host, data) {
   return (host.createHash ?? generateDjb2Hash)(getTextHandlingSourceMapForSignature(text, data));
 }
 function createBuilderProgram(kind, { newProgram, host, oldProgram, configFileParsingDiagnostics }) {
-  let oldState = oldProgram && oldProgram.getState();
+  let oldState = oldProgram && oldProgram.state;
   if (oldState && newProgram === oldState.program && configFileParsingDiagnostics === newProgram.getConfigFileParsingDiagnostics()) {
     newProgram = void 0;
     oldState = void 0;
     return oldProgram;
   }
   const state = createBuilderProgramState(newProgram, oldState);
-  newProgram.getBuildInfo = () => getBuildInfo2(state);
+  newProgram.getBuildInfo = () => getBuildInfo2(toBuilderProgramStateWithDefinedProgram(state));
   newProgram = void 0;
   oldProgram = void 0;
   oldState = void 0;
-  const getState = () => state;
-  const builderProgram = createRedirectedBuilderProgram(getState, configFileParsingDiagnostics);
-  builderProgram.getState = getState;
+  const builderProgram = createRedirectedBuilderProgram(state, configFileParsingDiagnostics);
+  builderProgram.state = state;
   builderProgram.saveEmitState = () => backupBuilderProgramEmitState(state);
   builderProgram.restoreEmitState = (saved) => restoreBuilderProgramEmitState(state, saved);
   builderProgram.hasChangedEmitSignature = () => !!state.hasChangedEmitSignature;
-  builderProgram.getAllDependencies = (sourceFile) => BuilderState.getAllDependencies(state, Debug.checkDefined(state.program), sourceFile);
+  builderProgram.getAllDependencies = (sourceFile) => BuilderState.getAllDependencies(
+    state,
+    Debug.checkDefined(state.program),
+    sourceFile
+  );
   builderProgram.getSemanticDiagnostics = getSemanticDiagnostics;
   builderProgram.emit = emit;
   builderProgram.releaseProgram = () => releaseCache(state);
@@ -123703,8 +123716,12 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
   }
   return builderProgram;
   function emitBuildInfo(writeFile2, cancellationToken) {
+    Debug.assert(isBuilderProgramStateWithDefinedProgram(state));
     if (state.buildInfoEmitPending) {
-      const result = Debug.checkDefined(state.program).emitBuildInfo(writeFile2 || maybeBind(host, host.writeFile), cancellationToken);
+      const result = state.program.emitBuildInfo(
+        writeFile2 || maybeBind(host, host.writeFile),
+        cancellationToken
+      );
       state.buildInfoEmitPending = false;
       return result;
     }
@@ -123712,6 +123729,7 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
   }
   function emitNextAffectedFile(writeFile2, cancellationToken, emitOnlyDtsFiles, customTransformers) {
     var _a, _b, _c, _d;
+    Debug.assert(isBuilderProgramStateWithDefinedProgram(state));
     let affected = getNextAffectedFile(state, cancellationToken, host);
     const programEmitKind = getBuilderFileEmit(state.compilerOptions);
     let emitKind = emitOnlyDtsFiles ? programEmitKind & 24 /* AllDts */ : programEmitKind;
@@ -123752,7 +123770,10 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
       if (!affected) {
         if (!state.buildInfoEmitPending) return void 0;
         const affected2 = state.program;
-        const result2 = affected2.emitBuildInfo(writeFile2 || maybeBind(host, host.writeFile), cancellationToken);
+        const result2 = affected2.emitBuildInfo(
+          writeFile2 || maybeBind(host, host.writeFile),
+          cancellationToken
+        );
         state.buildInfoEmitPending = false;
         return { result: result2, affected: affected2 };
       }
@@ -123800,6 +123821,7 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
     return { result, affected };
   }
   function getWriteFileCallback(writeFile2, customTransformers) {
+    Debug.assert(isBuilderProgramStateWithDefinedProgram(state));
     if (!getEmitDeclarations(state.compilerOptions)) return writeFile2 || maybeBind(host, host.writeFile);
     return (fileName, text, writeByteOrderMark, onError, sourceFiles, data) => {
       var _a, _b, _c;
@@ -123866,6 +123888,7 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
     };
   }
   function emit(targetSourceFile, writeFile2, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+    Debug.assert(isBuilderProgramStateWithDefinedProgram(state));
     if (kind === 1 /* EmitAndSemanticDiagnosticsBuilderProgram */) {
       assertSourceFileOkWithoutNextAffectedCall(state, targetSourceFile);
     }
@@ -123878,7 +123901,12 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
         let diagnostics;
         let emittedFiles = [];
         let affectedEmitResult;
-        while (affectedEmitResult = emitNextAffectedFile(writeFile2, cancellationToken, emitOnlyDtsFiles, customTransformers)) {
+        while (affectedEmitResult = emitNextAffectedFile(
+          writeFile2,
+          cancellationToken,
+          emitOnlyDtsFiles,
+          customTransformers
+        )) {
           emitSkipped = emitSkipped || affectedEmitResult.result.emitSkipped;
           diagnostics = addRange(diagnostics, affectedEmitResult.result.diagnostics);
           emittedFiles = addRange(emittedFiles, affectedEmitResult.result.emittedFiles);
@@ -123894,7 +123922,7 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
         clearAffectedFilesPendingEmit(state, emitOnlyDtsFiles);
       }
     }
-    return Debug.checkDefined(state.program).emit(
+    return state.program.emit(
       targetSourceFile,
       getWriteFileCallback(writeFile2, customTransformers),
       cancellationToken,
@@ -123903,6 +123931,7 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
     );
   }
   function getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile) {
+    Debug.assert(isBuilderProgramStateWithDefinedProgram(state));
     while (true) {
       const affected = getNextAffectedFile(state, cancellationToken, host);
       let result;
@@ -123940,6 +123969,7 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
     }
   }
   function getSemanticDiagnostics(sourceFile, cancellationToken) {
+    Debug.assert(isBuilderProgramStateWithDefinedProgram(state));
     assertSourceFileOkWithoutNextAffectedCall(state, sourceFile);
     if (sourceFile) {
       return getSemanticDiagnosticsOfFile(state, sourceFile, cancellationToken);
@@ -123950,7 +123980,7 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
       if (affectedResult.affected === state.program) return affectedResult.result;
     }
     let diagnostics;
-    for (const sourceFile2 of Debug.checkDefined(state.program).getSourceFiles()) {
+    for (const sourceFile2 of state.program.getSourceFiles()) {
       diagnostics = addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile2, cancellationToken));
     }
     return diagnostics || emptyArray;
@@ -123971,43 +124001,42 @@ function toBuilderFileEmit(value, fullEmitForOptions) {
 function toProgramEmitPending(value, options) {
   return !value ? getBuilderFileEmit(options || {}) : value;
 }
-function createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, host) {
+function createBuilderProgramUsingIncrementalBuildInfo(buildInfo, buildInfoPath, host) {
   var _a, _b, _c, _d;
-  const program = buildInfo.program;
   const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
   const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames());
   let state;
-  const filePaths = (_a = program.fileNames) == null ? void 0 : _a.map(toPathInBuildInfoDirectory);
+  const filePaths = (_a = buildInfo.fileNames) == null ? void 0 : _a.map(toPathInBuildInfoDirectory);
   let filePathsSetList;
-  const latestChangedDtsFile = program.latestChangedDtsFile ? toAbsolutePath(program.latestChangedDtsFile) : void 0;
+  const latestChangedDtsFile = buildInfo.latestChangedDtsFile ? toAbsolutePath(buildInfo.latestChangedDtsFile) : void 0;
   const fileInfos = /* @__PURE__ */ new Map();
-  const changedFilesSet = new Set(map(program.changeFileSet, toFilePath));
-  if (isProgramBundleEmitBuildInfo(program)) {
-    program.fileInfos.forEach((fileInfo, index) => {
+  const changedFilesSet = new Set(map(buildInfo.changeFileSet, toFilePath));
+  if (isIncrementalBundleEmitBuildInfo(buildInfo)) {
+    buildInfo.fileInfos.forEach((fileInfo, index) => {
       const path = toFilePath(index + 1);
       fileInfos.set(path, isString(fileInfo) ? { version: fileInfo, signature: void 0, affectsGlobalScope: void 0, impliedFormat: void 0 } : fileInfo);
     });
     state = {
       fileInfos,
-      compilerOptions: program.options ? convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath) : {},
-      semanticDiagnosticsPerFile: toPerFileSemanticDiagnostics(program.semanticDiagnosticsPerFile),
-      emitDiagnosticsPerFile: toPerFileEmitDiagnostics(program.emitDiagnosticsPerFile),
+      compilerOptions: buildInfo.options ? convertToOptionsWithAbsolutePaths(buildInfo.options, toAbsolutePath) : {},
+      semanticDiagnosticsPerFile: toPerFileSemanticDiagnostics(buildInfo.semanticDiagnosticsPerFile),
+      emitDiagnosticsPerFile: toPerFileEmitDiagnostics(buildInfo.emitDiagnosticsPerFile),
       hasReusableDiagnostic: true,
       changedFilesSet,
       latestChangedDtsFile,
-      outSignature: program.outSignature,
-      programEmitPending: program.pendingEmit === void 0 ? void 0 : toProgramEmitPending(program.pendingEmit, program.options)
+      outSignature: buildInfo.outSignature,
+      programEmitPending: buildInfo.pendingEmit === void 0 ? void 0 : toProgramEmitPending(buildInfo.pendingEmit, buildInfo.options)
     };
   } else {
-    filePathsSetList = (_b = program.fileIdsList) == null ? void 0 : _b.map((fileIds) => new Set(fileIds.map(toFilePath)));
-    const emitSignatures = ((_c = program.options) == null ? void 0 : _c.composite) && !program.options.outFile ? /* @__PURE__ */ new Map() : void 0;
-    program.fileInfos.forEach((fileInfo, index) => {
+    filePathsSetList = (_b = buildInfo.fileIdsList) == null ? void 0 : _b.map((fileIds) => new Set(fileIds.map(toFilePath)));
+    const emitSignatures = ((_c = buildInfo.options) == null ? void 0 : _c.composite) && !buildInfo.options.outFile ? /* @__PURE__ */ new Map() : void 0;
+    buildInfo.fileInfos.forEach((fileInfo, index) => {
       const path = toFilePath(index + 1);
       const stateFileInfo = toBuilderStateFileInfoForMultiEmit(fileInfo);
       fileInfos.set(path, stateFileInfo);
       if (emitSignatures && stateFileInfo.signature) emitSignatures.set(path, stateFileInfo.signature);
     });
-    (_d = program.emitSignatures) == null ? void 0 : _d.forEach((value) => {
+    (_d = buildInfo.emitSignatures) == null ? void 0 : _d.forEach((value) => {
       if (isNumber(value)) emitSignatures.delete(toFilePath(value));
       else {
         const key = toFilePath(value[0]);
@@ -124020,22 +124049,22 @@ function createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, hos
         );
       }
     });
-    const fullEmitForOptions = program.affectedFilesPendingEmit ? getBuilderFileEmit(program.options || {}) : void 0;
+    const fullEmitForOptions = buildInfo.affectedFilesPendingEmit ? getBuilderFileEmit(buildInfo.options || {}) : void 0;
     state = {
       fileInfos,
-      compilerOptions: program.options ? convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath) : {},
-      referencedMap: toManyToManyPathMap(program.referencedMap, program.options ?? {}),
-      semanticDiagnosticsPerFile: toPerFileSemanticDiagnostics(program.semanticDiagnosticsPerFile),
-      emitDiagnosticsPerFile: toPerFileEmitDiagnostics(program.emitDiagnosticsPerFile),
+      compilerOptions: buildInfo.options ? convertToOptionsWithAbsolutePaths(buildInfo.options, toAbsolutePath) : {},
+      referencedMap: toManyToManyPathMap(buildInfo.referencedMap, buildInfo.options ?? {}),
+      semanticDiagnosticsPerFile: toPerFileSemanticDiagnostics(buildInfo.semanticDiagnosticsPerFile),
+      emitDiagnosticsPerFile: toPerFileEmitDiagnostics(buildInfo.emitDiagnosticsPerFile),
       hasReusableDiagnostic: true,
-      affectedFilesPendingEmit: program.affectedFilesPendingEmit && arrayToMap(program.affectedFilesPendingEmit, (value) => toFilePath(isNumber(value) ? value : value[0]), (value) => toBuilderFileEmit(value, fullEmitForOptions)),
+      affectedFilesPendingEmit: buildInfo.affectedFilesPendingEmit && arrayToMap(buildInfo.affectedFilesPendingEmit, (value) => toFilePath(isNumber(value) ? value : value[0]), (value) => toBuilderFileEmit(value, fullEmitForOptions)),
       changedFilesSet,
       latestChangedDtsFile,
       emitSignatures: (emitSignatures == null ? void 0 : emitSignatures.size) ? emitSignatures : void 0
     };
   }
   return {
-    getState: () => state,
+    state,
     saveEmitState: noop,
     restoreEmitState: noop,
     getProgram: notImplemented,
@@ -124129,15 +124158,15 @@ function getBuildInfoFileVersionMap(program, buildInfoPath, host) {
     }
   }
 }
-function createRedirectedBuilderProgram(getState, configFileParsingDiagnostics) {
+function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
   return {
-    getState: notImplemented,
+    state: void 0,
     saveEmitState: noop,
     restoreEmitState: noop,
     getProgram,
-    getProgramOrUndefined: () => getState().program,
-    releaseProgram: () => getState().program = void 0,
-    getCompilerOptions: () => getState().compilerOptions,
+    getProgramOrUndefined: () => state.program,
+    releaseProgram: () => state.program = void 0,
+    getCompilerOptions: () => state.compilerOptions,
     getSourceFile: (fileName) => getProgram().getSourceFile(fileName),
     getSourceFiles: () => getProgram().getSourceFiles(),
     getOptionsDiagnostics: (cancellationToken) => getProgram().getOptionsDiagnostics(cancellationToken),
@@ -124153,13 +124182,23 @@ function createRedirectedBuilderProgram(getState, configFileParsingDiagnostics)
     close: noop
   };
   function getProgram() {
-    return Debug.checkDefined(getState().program);
+    return Debug.checkDefined(state.program);
   }
 }
 
 // src/compiler/builderPublic.ts
 function createEmitAndSemanticDiagnosticsBuilderProgram(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences) {
-  return createBuilderProgram(1 /* EmitAndSemanticDiagnosticsBuilderProgram */, getBuilderCreationParameters(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences));
+  return createBuilderProgram(
+    1 /* EmitAndSemanticDiagnosticsBuilderProgram */,
+    getBuilderCreationParameters(
+      newProgramOrRootNames,
+      hostOrOptions,
+      oldProgramOrHost,
+      configFileParsingDiagnosticsOrOldProgram,
+      configFileParsingDiagnostics,
+      projectReferences
+    )
+  );
 }
 
 // src/compiler/resolutionCache.ts
@@ -125431,13 +125470,13 @@ function createTabularErrorsDisplay(filesInError, host) {
   });
   return tabularData;
 }
-function isBuilderProgram2(program) {
-  return !!program.getState;
+function isBuilderProgram(program) {
+  return !!program.state;
 }
 function listFiles(program, write) {
   const options = program.getCompilerOptions();
   if (options.explainFiles) {
-    explainFiles(isBuilderProgram2(program) ? program.getProgram() : program, write);
+    explainFiles(isBuilderProgram(program) ? program.getProgram() : program, write);
   } else if (options.listFiles || options.listFilesOnly) {
     forEach(program.getSourceFiles(), (file) => {
       write(file.fileName);
@@ -125937,8 +125976,8 @@ function readBuilderProgram(compilerOptions, host) {
     if (!content) return void 0;
     buildInfo = getBuildInfo(buildInfoPath, content);
   }
-  if (!buildInfo || buildInfo.version !== version || !buildInfo.program) return void 0;
-  return createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, host);
+  if (!buildInfo || buildInfo.version !== version || !isIncrementalBuildInfo(buildInfo)) return void 0;
+  return createBuilderProgramUsingIncrementalBuildInfo(buildInfo, buildInfoPath, host);
 }
 function createIncrementalCompilerHost(options, system = sys) {
   const host = createCompilerHostWorker(
@@ -127653,7 +127692,7 @@ function getUpToDateStatusWorker(state, project, resolvedPath) {
   let oldestOutputFileName;
   let oldestOutputFileTime = maximumDate;
   let buildInfoTime;
-  let buildInfoProgram;
+  let incrementalBuildInfo;
   let buildInfoVersionMap;
   if (buildInfoPath) {
     const buildInfoCacheEntry2 = getBuildInfoCacheEntry(state, buildInfoPath, resolvedPath);
@@ -127678,26 +127717,26 @@ function getUpToDateStatusWorker(state, project, resolvedPath) {
         fileName: buildInfoPath
       };
     }
-    if (buildInfo.program && buildInfo.version !== version) {
+    if (isIncrementalBuildInfo(buildInfo) && buildInfo.version !== version) {
       return {
         type: 13 /* TsVersionOutputOfDate */,
         version: buildInfo.version
       };
     }
-    if (buildInfo.program) {
-      if (((_a = buildInfo.program.changeFileSet) == null ? void 0 : _a.length) || (!project.options.noEmit ? ((_b = buildInfo.program.affectedFilesPendingEmit) == null ? void 0 : _b.length) || ((_c = buildInfo.program.emitDiagnosticsPerFile) == null ? void 0 : _c.length) || buildInfo.program.pendingEmit !== void 0 : (_d = buildInfo.program.semanticDiagnosticsPerFile) == null ? void 0 : _d.length)) {
+    if (isIncrementalBuildInfo(buildInfo)) {
+      if (((_a = buildInfo.changeFileSet) == null ? void 0 : _a.length) || (!project.options.noEmit ? ((_b = buildInfo.affectedFilesPendingEmit) == null ? void 0 : _b.length) || ((_c = buildInfo.emitDiagnosticsPerFile) == null ? void 0 : _c.length) || buildInfo.pendingEmit !== void 0 : (_d = buildInfo.semanticDiagnosticsPerFile) == null ? void 0 : _d.length)) {
         return {
           type: 7 /* OutOfDateBuildInfo */,
           buildInfoFile: buildInfoPath
         };
       }
-      if (!project.options.noEmit && getPendingEmitKind(project.options, buildInfo.program.options || {})) {
+      if (!project.options.noEmit && getPendingEmitKind(project.options, buildInfo.options || {})) {
         return {
           type: 8 /* OutOfDateOptions */,
           buildInfoFile: buildInfoPath
         };
       }
-      buildInfoProgram = buildInfo.program;
+      incrementalBuildInfo = buildInfo;
     }
     oldestOutputFileTime = buildInfoTime;
     oldestOutputFileName = buildInfoPath;
@@ -127714,12 +127753,12 @@ function getUpToDateStatusWorker(state, project, resolvedPath) {
         reason: `${inputFile} does not exist`
       };
     }
-    const inputPath = buildInfoProgram ? toPath2(state, inputFile) : void 0;
+    const inputPath = incrementalBuildInfo ? toPath2(state, inputFile) : void 0;
     if (buildInfoTime && buildInfoTime < inputTime) {
       let version2;
       let currentVersion;
-      if (buildInfoProgram) {
-        if (!buildInfoVersionMap) buildInfoVersionMap = getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath, host);
+      if (incrementalBuildInfo) {
+        if (!buildInfoVersionMap) buildInfoVersionMap = getBuildInfoFileVersionMap(incrementalBuildInfo, buildInfoPath, host);
         const resolvedInputPath = buildInfoVersionMap.roots.get(inputPath);
         version2 = buildInfoVersionMap.fileInfos.get(resolvedInputPath ?? inputPath);
         const text = version2 ? state.readFileWithCache(resolvedInputPath ?? inputFile) : void 0;
@@ -127738,10 +127777,10 @@ function getUpToDateStatusWorker(state, project, resolvedPath) {
       newestInputFileName = inputFile;
       newestInputFileTime = inputTime;
     }
-    if (buildInfoProgram) seenRoots.add(inputPath);
+    if (incrementalBuildInfo) seenRoots.add(inputPath);
   }
-  if (buildInfoProgram) {
-    if (!buildInfoVersionMap) buildInfoVersionMap = getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath, host);
+  if (incrementalBuildInfo) {
+    if (!buildInfoVersionMap) buildInfoVersionMap = getBuildInfoFileVersionMap(incrementalBuildInfo, buildInfoPath, host);
     const existingRoot = forEachEntry(
       buildInfoVersionMap.roots,
       // File was root file when project was built but its not any more
@@ -127888,7 +127927,7 @@ function getLatestChangedDtsTime(state, options, resolvedConfigPath) {
   if (!options.composite) return void 0;
   const entry = Debug.checkDefined(state.buildInfoCache.get(resolvedConfigPath));
   if (entry.latestChangedDtsTime !== void 0) return entry.latestChangedDtsTime || void 0;
-  const latestChangedDtsTime = entry.buildInfo && entry.buildInfo.program && entry.buildInfo.program.latestChangedDtsFile ? state.host.getModifiedTime(getNormalizedAbsolutePath(entry.buildInfo.program.latestChangedDtsFile, getDirectoryPath(entry.path))) : void 0;
+  const latestChangedDtsTime = entry.buildInfo && isIncrementalBuildInfo(entry.buildInfo) && entry.buildInfo.latestChangedDtsFile ? state.host.getModifiedTime(getNormalizedAbsolutePath(entry.buildInfo.latestChangedDtsFile, getDirectoryPath(entry.path))) : void 0;
   entry.latestChangedDtsTime = latestChangedDtsTime || false;
   return latestChangedDtsTime;
 }