typescript 5.6.0-dev.20240605 → 5.6.0-dev.20240606

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.20240606`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -118218,7 +118218,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 +118239,6 @@ function isIgnoredFileFromWildCardWatching({
     }
   }
 }
-function isBuilderProgram(program) {
-  return !!program.getState;
-}
 function isEmittedFileOfProgram(program, file) {
   if (!program) {
     return false;
@@ -122799,6 +122796,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 +123067,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 +123091,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 +123156,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 +123166,7 @@ function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken
     removeDiagnosticsOfLibraryFiles(state);
     BuilderState.updateShapeSignature(
       state,
-      Debug.checkDefined(state.program),
+      state.program,
       affectedFile,
       cancellationToken,
       host
@@ -123178,12 +123184,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 +123196,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 +123273,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 +123322,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,7 +123332,7 @@ 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);
 }
@@ -123329,7 +123342,7 @@ function isProgramBundleEmitBuildInfo(info) {
 }
 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 = [];
@@ -123671,24 +123684,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 +123719,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 +123732,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 +123773,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 +123824,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 +123891,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 +123904,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 +123925,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 +123934,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 +123972,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 +123983,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;
@@ -124035,7 +124068,7 @@ function createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, hos
     };
   }
   return {
-    getState: () => state,
+    state,
     saveEmitState: noop,
     restoreEmitState: noop,
     getProgram: notImplemented,
@@ -124129,15 +124162,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 +124186,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 +125474,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);

package/lib/typescript.js

@@ -1263,7 +1263,7 @@ __export(typescript_exports, {
   isBreakStatement: () => isBreakStatement,
   isBuild: () => isBuild,
   isBuildInfoFile: () => isBuildInfoFile,
-  isBuilderProgram: () => isBuilderProgram2,
+  isBuilderProgram: () => isBuilderProgram,
   isBundle: () => isBundle,
   isCallChain: () => isCallChain,
   isCallExpression: () => isCallExpression,
@@ -2375,7 +2375,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240605`;
+var version = `${versionMajorMinor}.0-dev.20240606`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -123190,7 +123190,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 (!getScriptKind2) return false;
@@ -123211,9 +123211,6 @@ function isIgnoredFileFromWildCardWatching({
     }
   }
 }
-function isBuilderProgram(program) {
-  return !!program.getState;
-}
 function isEmittedFileOfProgram(program, file) {
   if (!program) {
     return false;
@@ -127837,6 +127834,13 @@ var BuilderFileEmit = /* @__PURE__ */ ((BuilderFileEmit2) => {
   BuilderFileEmit2[BuilderFileEmit2["All"] = 31] = "All";
   return BuilderFileEmit2;
 })(BuilderFileEmit || {});
+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 */;
@@ -128101,7 +128105,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,
@@ -128121,12 +128129,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
@@ -128187,9 +128194,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) {
@@ -128198,7 +128204,7 @@ function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken
     removeDiagnosticsOfLibraryFiles(state);
     BuilderState.updateShapeSignature(
       state,
-      Debug.checkDefined(state.program),
+      state.program,
       affectedFile,
       cancellationToken,
       host
@@ -128216,12 +128222,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,
@@ -128229,9 +128234,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 */
+        );
       }
     }
   }
@@ -128298,7 +128311,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));
         }
       }
@@ -128347,7 +128360,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) {
@@ -128357,7 +128370,7 @@ 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);
 }
@@ -128367,7 +128380,7 @@ function isProgramBundleEmitBuildInfo(info) {
 }
 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 = [];
@@ -128714,24 +128727,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);
@@ -128746,8 +128762,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;
     }
@@ -128755,6 +128775,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;
@@ -128795,7 +128816,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 };
       }
@@ -128843,6 +128867,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;
@@ -128909,6 +128934,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);
     }
@@ -128921,7 +128947,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);
@@ -128937,7 +128968,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,
@@ -128946,6 +128977,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;
@@ -128983,6 +129015,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);
@@ -128993,7 +129026,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;
@@ -129078,7 +129111,7 @@ function createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, hos
     };
   }
   return {
-    getState: () => state,
+    state,
     saveEmitState: noop,
     restoreEmitState: noop,
     getProgram: notImplemented,
@@ -129172,15 +129205,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),
@@ -129196,20 +129229,50 @@ function createRedirectedBuilderProgram(getState, configFileParsingDiagnostics)
     close: noop
   };
   function getProgram() {
-    return Debug.checkDefined(getState().program);
+    return Debug.checkDefined(state.program);
   }
 }
 
 // src/compiler/builderPublic.ts
 function createSemanticDiagnosticsBuilderProgram(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences) {
-  return createBuilderProgram(0 /* SemanticDiagnosticsBuilderProgram */, getBuilderCreationParameters(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences));
+  return createBuilderProgram(
+    0 /* SemanticDiagnosticsBuilderProgram */,
+    getBuilderCreationParameters(
+      newProgramOrRootNames,
+      hostOrOptions,
+      oldProgramOrHost,
+      configFileParsingDiagnosticsOrOldProgram,
+      configFileParsingDiagnostics,
+      projectReferences
+    )
+  );
 }
 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
+    )
+  );
 }
 function createAbstractBuilder(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences) {
-  const { newProgram, configFileParsingDiagnostics: newConfigFileParsingDiagnostics } = getBuilderCreationParameters(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences);
-  return createRedirectedBuilderProgram(() => ({ program: newProgram, compilerOptions: newProgram.getCompilerOptions() }), newConfigFileParsingDiagnostics);
+  const { newProgram, configFileParsingDiagnostics: newConfigFileParsingDiagnostics } = getBuilderCreationParameters(
+    newProgramOrRootNames,
+    hostOrOptions,
+    oldProgramOrHost,
+    configFileParsingDiagnosticsOrOldProgram,
+    configFileParsingDiagnostics,
+    projectReferences
+  );
+  return createRedirectedBuilderProgram(
+    { program: newProgram, compilerOptions: newProgram.getCompilerOptions() },
+    newConfigFileParsingDiagnostics
+  );
 }
 
 // src/compiler/resolutionCache.ts
@@ -130484,13 +130547,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);
@@ -179704,7 +179767,7 @@ __export(ts_exports2, {
   isBreakStatement: () => isBreakStatement,
   isBuild: () => isBuild,
   isBuildInfoFile: () => isBuildInfoFile,
-  isBuilderProgram: () => isBuilderProgram2,
+  isBuilderProgram: () => isBuilderProgram,
   isBundle: () => isBundle,
   isCallChain: () => isCallChain,
   isCallExpression: () => isCallExpression,

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.6.0-dev.20240605",
+    "version": "5.6.0-dev.20240606",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -112,5 +112,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "f5238c328e553df2c0af868173dfd3789d77205f"
+    "gitHead": "b9d96df61f01375da6504f37a31151cfdce0645c"
 }