@typescript-deploys/pr-build 5.6.0-pr-57196-3 → 5.6.0-pr-58760-2

package/lib/tsc.js

@@ -19329,6 +19329,12 @@ function unwrapParenthesizedExpression(o) {
   }
   return o;
 }
+function unwrapParenthesizedType(o) {
+  while (o.kind === 196 /* ParenthesizedType */) {
+    o = o.type;
+  }
+  return o;
+}
 function hasInferredType(node) {
   Debug.type(node);
   switch (node.kind) {
@@ -51615,6 +51621,57 @@ function createTypeChecker(host) {
       function onEnterNewScope(node) {
         return enterNewScope(context, node, getParametersInScope(node), getTypeParametersInScope(node));
       }
+      function tryVisitSimpleTypeNode(node) {
+        const innerNode = unwrapParenthesizedType(node);
+        switch (innerNode.kind) {
+          case 183 /* TypeReference */:
+            return tryVisitTypeReference(innerNode);
+          case 186 /* TypeQuery */:
+            return tryVisitTypeQuery(innerNode);
+          case 199 /* IndexedAccessType */:
+            return tryVisitIndexedAccess(innerNode);
+          case 198 /* TypeOperator */:
+            const typeOperatorNode = innerNode;
+            if (typeOperatorNode.operator === 143 /* KeyOfKeyword */) {
+              return tryVisitKeyOf(typeOperatorNode);
+            }
+        }
+        return visitNode(node, visitExistingNodeTreeSymbols, isTypeNode);
+      }
+      function tryVisitIndexedAccess(node) {
+        const resultObjectType = tryVisitSimpleTypeNode(node.objectType);
+        if (resultObjectType === void 0) {
+          return void 0;
+        }
+        return factory.updateIndexedAccessTypeNode(node, resultObjectType, visitNode(node.indexType, visitExistingNodeTreeSymbols, isTypeNode));
+      }
+      function tryVisitKeyOf(node) {
+        Debug.assertEqual(node.operator, 143 /* KeyOfKeyword */);
+        const type = tryVisitSimpleTypeNode(node.type);
+        if (type === void 0) {
+          return void 0;
+        }
+        return factory.updateTypeOperatorNode(node, type);
+      }
+      function tryVisitTypeQuery(node) {
+        const { introducesError, node: exprName } = trackExistingEntityName(node.exprName, context);
+        if (!introducesError) {
+          return factory.updateTypeQueryNode(
+            node,
+            exprName,
+            visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode)
+          );
+        }
+        const serializedName = serializeTypeName(
+          context,
+          node.exprName,
+          /*isTypeOf*/
+          true
+        );
+        if (serializedName) {
+          return setTextRange2(context, serializedName, node.exprName);
+        }
+      }
       function tryVisitTypeReference(node) {
         if (canReuseTypeNode(context, node)) {
           const { introducesError, node: newName } = trackExistingEntityName(node.typeName, context);
@@ -51748,13 +51805,13 @@ function createTypeChecker(host) {
             visitNode(node.default, visitExistingNodeTreeSymbols, isTypeNode)
           );
         }
-        if (isIndexedAccessTypeNode(node) && isTypeReferenceNode(node.objectType)) {
-          const objectType = tryVisitTypeReference(node.objectType);
-          if (!objectType) {
+        if (isIndexedAccessTypeNode(node)) {
+          const result = tryVisitIndexedAccess(node);
+          if (!result) {
             hadError = true;
             return node;
           }
-          return factory.updateIndexedAccessTypeNode(node, objectType, visitNode(node.indexType, visitExistingNodeTreeSymbols, isTypeNode));
+          return result;
         }
         if (isTypeReferenceNode(node)) {
           const result = tryVisitTypeReference(node);
@@ -51797,25 +51854,12 @@ function createTypeChecker(host) {
           return visited;
         }
         if (isTypeQueryNode(node)) {
-          const { introducesError, node: exprName } = trackExistingEntityName(node.exprName, context);
-          if (introducesError) {
-            const serializedName = serializeTypeName(
-              context,
-              node.exprName,
-              /*isTypeOf*/
-              true
-            );
-            if (serializedName) {
-              return setTextRange2(context, serializedName, node.exprName);
-            }
+          const result = tryVisitTypeQuery(node);
+          if (!result) {
             hadError = true;
             return node;
           }
-          return factory.updateTypeQueryNode(
-            node,
-            exprName,
-            visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode)
-          );
+          return result;
         }
         if (isComputedPropertyName(node) && isEntityNameExpression(node.expression)) {
           const { node: result, introducesError } = trackExistingEntityName(node.expression, context);
@@ -51880,14 +51924,12 @@ function createTypeChecker(host) {
               return node;
             }
           } else if (node.operator === 143 /* KeyOfKeyword */) {
-            if (isTypeReferenceNode(node.type)) {
-              const type = tryVisitTypeReference(node.type);
-              if (!type) {
-                hadError = true;
-                return node;
-              }
-              return factory.updateTypeOperatorNode(node, type);
+            const result = tryVisitKeyOf(node);
+            if (!result) {
+              hadError = true;
+              return node;
             }
+            return result;
           }
         }
         return visitEachChild2(node, visitExistingNodeTreeSymbols);
@@ -112755,16 +112797,16 @@ function isBuildInfoFile(file) {
 function forEachEmittedFile(host, action, sourceFilesOrTargetSourceFile, forceDtsEmit = false, onlyBuildInfo, includeBuildInfo) {
   const sourceFiles = isArray(sourceFilesOrTargetSourceFile) ? sourceFilesOrTargetSourceFile : getSourceFilesToEmit(host, sourceFilesOrTargetSourceFile, forceDtsEmit);
   const options = host.getCompilerOptions();
-  if (options.outFile) {
-    if (sourceFiles.length) {
-      const bundle = factory.createBundle(sourceFiles);
-      const result = action(getOutputPathsFor(bundle, host, forceDtsEmit), bundle);
-      if (result) {
-        return result;
+  if (!onlyBuildInfo) {
+    if (options.outFile) {
+      if (sourceFiles.length) {
+        const bundle = factory.createBundle(sourceFiles);
+        const result = action(getOutputPathsFor(bundle, host, forceDtsEmit), bundle);
+        if (result) {
+          return result;
+        }
       }
-    }
-  } else {
-    if (!onlyBuildInfo) {
+    } else {
       for (const sourceFile of sourceFiles) {
         const result = action(getOutputPathsFor(sourceFile, host, forceDtsEmit), sourceFile);
         if (result) {
@@ -112772,14 +112814,14 @@ function forEachEmittedFile(host, action, sourceFilesOrTargetSourceFile, forceDt
         }
       }
     }
-    if (includeBuildInfo) {
-      const buildInfoPath = getTsBuildInfoEmitOutputFilePath(options);
-      if (buildInfoPath) return action(
-        { buildInfoPath },
-        /*sourceFileOrBundle*/
-        void 0
-      );
-    }
+  }
+  if (includeBuildInfo) {
+    const buildInfoPath = getTsBuildInfoEmitOutputFilePath(options);
+    if (buildInfoPath) return action(
+      { buildInfoPath },
+      /*sourceFileOrBundle*/
+      void 0
+    );
   }
 }
 function getTsBuildInfoEmitOutputFilePath(options) {
@@ -112808,8 +112850,7 @@ function getOutputPathsForBundle(options, forceDtsPaths) {
   const sourceMapFilePath = jsFilePath && getSourceMapFilePath(jsFilePath, options);
   const declarationFilePath = forceDtsPaths || getEmitDeclarations(options) ? removeFileExtension(outPath) + ".d.ts" /* Dts */ : void 0;
   const declarationMapPath = declarationFilePath && getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : void 0;
-  const buildInfoPath = getTsBuildInfoEmitOutputFilePath(options);
-  return { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath };
+  return { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath };
 }
 function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
   const options = host.getCompilerOptions();
@@ -112823,7 +112864,7 @@ function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
     const sourceMapFilePath = !jsFilePath || isJsonSourceFile(sourceFile) ? void 0 : getSourceMapFilePath(jsFilePath, options);
     const declarationFilePath = forceDtsPaths || getEmitDeclarations(options) && !isJsonFile ? getDeclarationEmitOutputFilePath(sourceFile.fileName, host) : void 0;
     const declarationMapPath = declarationFilePath && getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : void 0;
-    return { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath: void 0 };
+    return { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath };
   }
 }
 function getSourceMapFilePath(jsFilePath, options) {
@@ -112872,7 +112913,7 @@ function createAddOutput() {
   }
 }
 function getSingleOutputFileNames(configFile, addOutput) {
-  const { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath } = getOutputPathsForBundle(
+  const { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath } = getOutputPathsForBundle(
     configFile.options,
     /*forceDtsPaths*/
     false
@@ -112881,7 +112922,6 @@ function getSingleOutputFileNames(configFile, addOutput) {
   addOutput(sourceMapFilePath);
   addOutput(declarationFilePath);
   addOutput(declarationMapPath);
-  addOutput(buildInfoPath);
 }
 function getOwnOutputFileNames(configFile, inputFileName, ignoreCase, addOutput, getCommonSourceDirectory2) {
   if (isDeclarationFileName(inputFileName)) return;
@@ -112932,8 +112972,8 @@ function getAllProjectOutputs(configFile, ignoreCase) {
     for (const inputFileName of configFile.fileNames) {
       getOwnOutputFileNames(configFile, inputFileName, ignoreCase, addOutput, getCommonSourceDirectory2);
     }
-    addOutput(getTsBuildInfoEmitOutputFilePath(configFile.options));
   }
+  addOutput(getTsBuildInfoEmitOutputFilePath(configFile.options));
   return getOutputs();
 }
 function getFirstProjectOutput(configFile, ignoreCase) {
@@ -112962,7 +113002,7 @@ function getFirstProjectOutput(configFile, ignoreCase) {
 function emitResolverSkipsTypeChecking(emitOnly, forceDtsEmit) {
   return !!forceDtsEmit && !!emitOnly;
 }
-function emitFiles(resolver, host, targetSourceFile, { scriptTransformers, declarationTransformers }, emitOnly, onlyBuildInfo, forceDtsEmit) {
+function emitFiles(resolver, host, targetSourceFile, { scriptTransformers, declarationTransformers }, emitOnly, onlyBuildInfo, forceDtsEmit, skipBuildInfo) {
   var compilerOptions = host.getCompilerOptions();
   var sourceMapDataList = compilerOptions.sourceMap || compilerOptions.inlineSourceMap || getAreDeclarationMapsEnabled(compilerOptions) ? [] : void 0;
   var emittedFilesList = compilerOptions.listEmittedFiles ? [] : void 0;
@@ -112978,7 +113018,7 @@ function emitFiles(resolver, host, targetSourceFile, { scriptTransformers, decla
     getSourceFilesToEmit(host, targetSourceFile, forceDtsEmit),
     forceDtsEmit,
     onlyBuildInfo,
-    !targetSourceFile
+    !targetSourceFile && !skipBuildInfo
   );
   exit();
   return {
@@ -113000,7 +113040,7 @@ function emitFiles(resolver, host, targetSourceFile, { scriptTransformers, decla
     (_f = tracing) == null ? void 0 : _f.pop();
   }
   function emitBuildInfo(buildInfoPath) {
-    if (!buildInfoPath || targetSourceFile || emitSkipped) return;
+    if (!buildInfoPath || targetSourceFile) return;
     if (host.isEmitBlocked(buildInfoPath)) {
       emitSkipped = true;
       return;
@@ -119953,7 +119993,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   }
   function emitBuildInfo(writeFileCallback) {
     var _a2, _b2;
-    Debug.assert(!options.outFile);
     (_a2 = tracing) == null ? void 0 : _a2.push(
       tracing.Phase.Emit,
       "emitBuildInfo",
@@ -120008,7 +120047,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   function getTypeChecker() {
     return typeChecker || (typeChecker = createTypeChecker(program));
   }
-  function emit(sourceFile, writeFileCallback, cancellationToken, emitOnly, transformers, forceDtsEmit) {
+  function emit(sourceFile, writeFileCallback, cancellationToken, emitOnly, transformers, forceDtsEmit, skipBuildInfo) {
     var _a2, _b2;
     (_a2 = tracing) == null ? void 0 : _a2.push(
       tracing.Phase.Emit,
@@ -120017,14 +120056,25 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       /*separateBeginAndEnd*/
       true
     );
-    const result = runWithCancellationToken(() => emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnly, transformers, forceDtsEmit));
+    const result = runWithCancellationToken(
+      () => emitWorker(
+        program,
+        sourceFile,
+        writeFileCallback,
+        cancellationToken,
+        emitOnly,
+        transformers,
+        forceDtsEmit,
+        skipBuildInfo
+      )
+    );
     (_b2 = tracing) == null ? void 0 : _b2.pop();
     return result;
   }
   function isEmitBlocked(emitFileName) {
     return hasEmitBlockingDiagnostics.has(toPath3(emitFileName));
   }
-  function emitWorker(program2, sourceFile, writeFileCallback, cancellationToken, emitOnly, customTransformers, forceDtsEmit) {
+  function emitWorker(program2, sourceFile, writeFileCallback, cancellationToken, emitOnly, customTransformers, forceDtsEmit, skipBuildInfo) {
     if (!forceDtsEmit) {
       const result = handleNoEmitOptions(program2, sourceFile, writeFileCallback, cancellationToken);
       if (result) return result;
@@ -120046,7 +120096,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         emitOnly,
         /*onlyBuildInfo*/
         false,
-        forceDtsEmit
+        forceDtsEmit,
+        skipBuildInfo
       )
     );
     mark("afterEmit");
@@ -122178,7 +122229,7 @@ function handleNoEmitOptions(program, sourceFile, writeFile2, cancellationToken)
   const options = program.getCompilerOptions();
   if (options.noEmit) {
     program.getSemanticDiagnostics(sourceFile, cancellationToken);
-    return sourceFile || options.outFile ? emitSkippedWithNoDiagnostics : program.emitBuildInfo(writeFile2, cancellationToken);
+    return sourceFile ? emitSkippedWithNoDiagnostics : program.emitBuildInfo(writeFile2, cancellationToken);
   }
   if (!options.noEmitOnError) return void 0;
   let diagnostics = [
@@ -122196,7 +122247,7 @@ function handleNoEmitOptions(program, sourceFile, writeFile2, cancellationToken)
   }
   if (!diagnostics.length) return void 0;
   let emittedFiles;
-  if (!sourceFile && !options.outFile) {
+  if (!sourceFile) {
     const emitResult = program.emitBuildInfo(writeFile2, cancellationToken);
     if (emitResult.diagnostics) diagnostics = [...diagnostics, ...emitResult.diagnostics];
     emittedFiles = emitResult.emittedFiles;
@@ -122678,17 +122729,17 @@ function createBuilderProgramState(newProgram, oldState) {
   const compilerOptions = newProgram.getCompilerOptions();
   state.compilerOptions = compilerOptions;
   const outFilePath = compilerOptions.outFile;
-  if (!outFilePath) {
-    state.semanticDiagnosticsPerFile = /* @__PURE__ */ new Map();
-  } else if (compilerOptions.composite && (oldState == null ? void 0 : oldState.outSignature) && outFilePath === oldState.compilerOptions.outFile) {
+  state.semanticDiagnosticsPerFile = /* @__PURE__ */ new Map();
+  if (outFilePath && compilerOptions.composite && (oldState == null ? void 0 : oldState.outSignature) && outFilePath === oldState.compilerOptions.outFile) {
     state.outSignature = oldState.outSignature && getEmitSignatureFromOldSignature(compilerOptions, oldState.compilerOptions, oldState.outSignature);
   }
   state.changedFilesSet = /* @__PURE__ */ new Set();
   state.latestChangedDtsFile = compilerOptions.composite ? oldState == null ? void 0 : oldState.latestChangedDtsFile : void 0;
   const useOldState = BuilderState.canReuseOldState(state.referencedMap, oldState);
   const oldCompilerOptions = useOldState ? oldState.compilerOptions : void 0;
-  const canCopySemanticDiagnostics = useOldState && oldState.semanticDiagnosticsPerFile && !!state.semanticDiagnosticsPerFile && !compilerOptionsAffectSemanticDiagnostics(compilerOptions, oldCompilerOptions);
+  let canCopySemanticDiagnostics = useOldState && !compilerOptionsAffectSemanticDiagnostics(compilerOptions, oldCompilerOptions);
   const canCopyEmitSignatures = compilerOptions.composite && (oldState == null ? void 0 : oldState.emitSignatures) && !outFilePath && !compilerOptionsAffectDeclarationPath(compilerOptions, oldState.compilerOptions);
+  let canCopyEmitDiagnostics = true;
   if (useOldState) {
     (_a = oldState.changedFilesSet) == null ? void 0 : _a.forEach((value) => state.changedFilesSet.add(value));
     if (!outFilePath && ((_b = oldState.affectedFilesPendingEmit) == null ? void 0 : _b.size)) {
@@ -122696,6 +122747,10 @@ function createBuilderProgramState(newProgram, oldState) {
       state.seenAffectedFiles = /* @__PURE__ */ new Set();
     }
     state.programEmitPending = oldState.programEmitPending;
+    if (outFilePath && state.changedFilesSet.size) {
+      canCopySemanticDiagnostics = false;
+      canCopyEmitDiagnostics = false;
+    }
   } else {
     state.buildInfoEmitPending = true;
   }
@@ -122713,10 +122768,10 @@ function createBuilderProgramState(newProgram, oldState) {
     oldInfo.impliedFormat !== info.impliedFormat || // Referenced files changed
     !hasSameKeys(newReferences = referencedMap && referencedMap.getValues(sourceFilePath), oldReferencedMap && oldReferencedMap.getValues(sourceFilePath)) || // Referenced file was deleted in the new program
     newReferences && forEachKey(newReferences, (path) => !state.fileInfos.has(path) && oldState.fileInfos.has(path))) {
-      addFileToChangeSet(state, sourceFilePath);
+      addFileToChangeSet(sourceFilePath);
     } else {
       const sourceFile = newProgram.getSourceFileByPath(sourceFilePath);
-      const emitDiagnostics = (_a2 = oldState.emitDiagnosticsPerFile) == null ? void 0 : _a2.get(sourceFilePath);
+      const emitDiagnostics = canCopyEmitDiagnostics ? (_a2 = oldState.emitDiagnosticsPerFile) == null ? void 0 : _a2.get(sourceFilePath) : void 0;
       if (emitDiagnostics) {
         (state.emitDiagnosticsPerFile ?? (state.emitDiagnosticsPerFile = /* @__PURE__ */ new Map())).set(
           sourceFilePath,
@@ -122745,16 +122800,16 @@ function createBuilderProgramState(newProgram, oldState) {
   });
   if (useOldState && forEachEntry(oldState.fileInfos, (info, sourceFilePath) => {
     if (state.fileInfos.has(sourceFilePath)) return false;
-    if (outFilePath || info.affectsGlobalScope) return true;
+    if (info.affectsGlobalScope) return true;
     state.buildInfoEmitPending = true;
-    return false;
+    return !!outFilePath;
   })) {
     BuilderState.getAllFilesExcludingDefaultLibraryFile(
       state,
       newProgram,
       /*firstSourceFile*/
       void 0
-    ).forEach((file) => addFileToChangeSet(state, file.resolvedPath));
+    ).forEach((file) => addFileToChangeSet(file.resolvedPath));
   } else if (oldCompilerOptions) {
     const pendingEmitKind = compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions) ? getBuilderFileEmit(compilerOptions) : getPendingEmitKind(compilerOptions, oldCompilerOptions);
     if (pendingEmitKind !== 0 /* None */) {
@@ -122770,18 +122825,25 @@ function createBuilderProgramState(newProgram, oldState) {
         });
         Debug.assert(!state.seenAffectedFiles || !state.seenAffectedFiles.size);
         state.seenAffectedFiles = state.seenAffectedFiles || /* @__PURE__ */ new Set();
-        state.buildInfoEmitPending = true;
-      } else {
+      } else if (!state.changedFilesSet.size) {
         state.programEmitPending = state.programEmitPending ? state.programEmitPending | pendingEmitKind : pendingEmitKind;
       }
+      state.buildInfoEmitPending = true;
     }
   }
   return state;
-}
-function addFileToChangeSet(state, path) {
-  state.changedFilesSet.add(path);
-  state.buildInfoEmitPending = true;
-  state.programEmitPending = void 0;
+  function addFileToChangeSet(path) {
+    state.changedFilesSet.add(path);
+    if (outFilePath) {
+      canCopySemanticDiagnostics = false;
+      canCopyEmitDiagnostics = false;
+      state.semanticDiagnosticsFromOldState = void 0;
+      state.semanticDiagnosticsPerFile.clear();
+      state.emitDiagnosticsPerFile = void 0;
+    }
+    state.buildInfoEmitPending = true;
+    state.programEmitPending = void 0;
+  }
 }
 function getEmitSignatureFromOldSignature(options, oldOptions, oldEmitSignature) {
   return !!options.declarationMap === !!oldOptions.declarationMap ? (
@@ -122854,6 +122916,7 @@ function backupBuilderProgramEmitState(state) {
   return {
     affectedFilesPendingEmit: state.affectedFilesPendingEmit && new Map(state.affectedFilesPendingEmit),
     seenEmittedFiles: state.seenEmittedFiles && new Map(state.seenEmittedFiles),
+    seenProgramEmit: state.seenProgramEmit,
     programEmitPending: state.programEmitPending,
     emitSignatures: state.emitSignatures && new Map(state.emitSignatures),
     outSignature: state.outSignature,
@@ -122867,6 +122930,7 @@ function backupBuilderProgramEmitState(state) {
 function restoreBuilderProgramEmitState(state, savedEmitState) {
   state.affectedFilesPendingEmit = savedEmitState.affectedFilesPendingEmit;
   state.seenEmittedFiles = savedEmitState.seenEmittedFiles;
+  state.seenProgramEmit = savedEmitState.seenProgramEmit;
   state.programEmitPending = savedEmitState.programEmitPending;
   state.emitSignatures = savedEmitState.emitSignatures;
   state.outSignature = savedEmitState.outSignature;
@@ -122875,6 +122939,10 @@ function restoreBuilderProgramEmitState(state, savedEmitState) {
   state.buildInfoEmitPending = savedEmitState.buildInfoEmitPending;
   state.emitDiagnosticsPerFile = savedEmitState.emitDiagnosticsPerFile;
   if (savedEmitState.changedFilesSet) state.changedFilesSet = savedEmitState.changedFilesSet;
+  if (state.compilerOptions.outFile && state.changedFilesSet.size) {
+    state.semanticDiagnosticsPerFile.clear();
+    state.emitDiagnosticsPerFile = void 0;
+  }
 }
 function assertSourceFileOkWithoutNextAffectedCall(state, sourceFile) {
   Debug.assert(!sourceFile || !state.affectedFiles || state.affectedFiles[state.affectedFilesIndex - 1] !== sourceFile || !state.semanticDiagnosticsPerFile.has(sourceFile.resolvedPath));
@@ -122912,10 +122980,7 @@ function getNextAffectedFile(state, cancellationToken, host) {
     }
     const program = Debug.checkDefined(state.program);
     const compilerOptions = program.getCompilerOptions();
-    if (compilerOptions.outFile) {
-      Debug.assert(!state.semanticDiagnosticsPerFile);
-      return program;
-    }
+    if (compilerOptions.outFile) return program;
     state.affectedFiles = BuilderState.getFilesAffectedByWithOldState(
       state,
       program,
@@ -122929,14 +122994,22 @@ function getNextAffectedFile(state, cancellationToken, host) {
   }
 }
 function clearAffectedFilesPendingEmit(state, emitOnlyDtsFiles) {
-  var _a;
-  if (!((_a = state.affectedFilesPendingEmit) == null ? void 0 : _a.size)) return;
-  if (!emitOnlyDtsFiles) return state.affectedFilesPendingEmit = void 0;
-  state.affectedFilesPendingEmit.forEach((emitKind, path) => {
+  var _a, _b;
+  if (!((_a = state.affectedFilesPendingEmit) == null ? void 0 : _a.size) && !state.programEmitPending) return;
+  if (!emitOnlyDtsFiles) {
+    state.affectedFilesPendingEmit = void 0;
+    state.programEmitPending = void 0;
+  }
+  (_b = state.affectedFilesPendingEmit) == null ? void 0 : _b.forEach((emitKind, path) => {
     const pending = emitKind & 7 /* AllJs */;
     if (!pending) state.affectedFilesPendingEmit.delete(path);
     else state.affectedFilesPendingEmit.set(path, pending);
   });
+  if (state.programEmitPending) {
+    const pending = state.programEmitPending & 7 /* AllJs */;
+    if (!pending) state.programEmitPending = void 0;
+    else state.programEmitPending = pending;
+  }
 }
 function getNextAffectedFilePendingEmit(state, emitOnlyDtsFiles) {
   var _a;
@@ -123128,24 +123201,21 @@ function handleDtsMayChangeOfFileAndExportsOfFile(state, filePath, invalidateJsF
   );
   return void 0;
 }
-function getSemanticDiagnosticsOfFile(state, sourceFile, cancellationToken) {
+function getSemanticDiagnosticsOfFile(state, sourceFile, cancellationToken, semanticDiagnosticsPerFile) {
   return concatenate(
-    getBinderAndCheckerDiagnosticsOfFile(state, sourceFile, cancellationToken),
+    getBinderAndCheckerDiagnosticsOfFile(state, sourceFile, cancellationToken, semanticDiagnosticsPerFile),
     Debug.checkDefined(state.program).getProgramDiagnostics(sourceFile)
   );
 }
-function getBinderAndCheckerDiagnosticsOfFile(state, sourceFile, cancellationToken) {
+function getBinderAndCheckerDiagnosticsOfFile(state, sourceFile, cancellationToken, semanticDiagnosticsPerFile) {
+  semanticDiagnosticsPerFile ?? (semanticDiagnosticsPerFile = state.semanticDiagnosticsPerFile);
   const path = sourceFile.resolvedPath;
-  if (state.semanticDiagnosticsPerFile) {
-    const cachedDiagnostics = state.semanticDiagnosticsPerFile.get(path);
-    if (cachedDiagnostics) {
-      return filterSemanticDiagnostics(cachedDiagnostics, state.compilerOptions);
-    }
+  const cachedDiagnostics = semanticDiagnosticsPerFile.get(path);
+  if (cachedDiagnostics) {
+    return filterSemanticDiagnostics(cachedDiagnostics, state.compilerOptions);
   }
   const diagnostics = Debug.checkDefined(state.program).getBindAndCheckDiagnostics(sourceFile, cancellationToken);
-  if (state.semanticDiagnosticsPerFile) {
-    state.semanticDiagnosticsPerFile.set(path, diagnostics);
-  }
+  semanticDiagnosticsPerFile.set(path, diagnostics);
   return filterSemanticDiagnostics(diagnostics, state.compilerOptions);
 }
 function isProgramBundleEmitBuildInfo(info) {
@@ -123173,6 +123243,9 @@ function getBuildInfo2(state) {
       root,
       resolvedRoot: toResolvedRoot(),
       options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions),
+      semanticDiagnosticsPerFile: convertToProgramBuildInfoDiagnostics(),
+      emitDiagnosticsPerFile: convertToProgramBuildInfoEmitDiagnostics(),
+      changeFileSet: toChangeFileSet(),
       outSignature: state.outSignature,
       latestChangedDtsFile,
       pendingEmit: !state.programEmitPending ? void 0 : (
@@ -123263,13 +123336,6 @@ function getBuildInfo2(state) {
       }
     }
   }
-  let changeFileSet;
-  if (state.changedFilesSet.size) {
-    for (const path of arrayFrom(state.changedFilesSet.keys()).sort(compareStringsCaseSensitive)) {
-      changeFileSet = append(changeFileSet, toFileId(path));
-    }
-  }
-  const emitDiagnosticsPerFile = convertToProgramBuildInfoEmitDiagnostics();
   const program = {
     fileNames,
     fileInfos,
@@ -123279,9 +123345,9 @@ function getBuildInfo2(state) {
     fileIdsList,
     referencedMap,
     semanticDiagnosticsPerFile,
-    emitDiagnosticsPerFile,
+    emitDiagnosticsPerFile: convertToProgramBuildInfoEmitDiagnostics(),
     affectedFilesPendingEmit,
-    changeFileSet,
+    changeFileSet: toChangeFileSet(),
     emitSignatures,
     latestChangedDtsFile
   };
@@ -123364,8 +123430,7 @@ function getBuildInfo2(state) {
   function convertToProgramBuildInfoDiagnostics() {
     let result;
     state.fileInfos.forEach((_value, key) => {
-      var _a2;
-      const value = (_a2 = state.semanticDiagnosticsPerFile) == null ? void 0 : _a2.get(key);
+      const value = state.semanticDiagnosticsPerFile.get(key);
       if (!value) {
         if (!state.changedFilesSet.has(key)) result = append(result, toFileId(key));
       } else if (value.length) {
@@ -123434,6 +123499,15 @@ function getBuildInfo2(state) {
       return result;
     }) || array;
   }
+  function toChangeFileSet() {
+    let changeFileSet;
+    if (state.changedFilesSet.size) {
+      for (const path of arrayFrom(state.changedFilesSet.keys()).sort(compareStringsCaseSensitive)) {
+        changeFileSet = append(changeFileSet, toFileId(path));
+      }
+    }
+    return changeFileSet;
+  }
 }
 function getBuilderCreationParameters(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences) {
   let host;
@@ -123532,14 +123606,16 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
     return emitSkippedWithNoDiagnostics;
   }
   function emitNextAffectedFile(writeFile2, cancellationToken, emitOnlyDtsFiles, customTransformers) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let affected = getNextAffectedFile(state, cancellationToken, host);
     const programEmitKind = getBuilderFileEmit(state.compilerOptions);
     let emitKind = emitOnlyDtsFiles ? programEmitKind & 24 /* AllDts */ : programEmitKind;
     if (!affected) {
       if (!state.compilerOptions.outFile) {
         const pendingAffectedFile = getNextAffectedFilePendingEmit(state, emitOnlyDtsFiles);
-        if (!pendingAffectedFile) {
+        if (pendingAffectedFile) {
+          ({ affectedFile: affected, emitKind } = pendingAffectedFile);
+        } else {
           const pendingForDiagnostics = getNextPendingEmitDiagnosticsFile(state);
           if (pendingForDiagnostics) {
             (state.seenEmittedFiles ?? (state.seenEmittedFiles = /* @__PURE__ */ new Map())).set(pendingForDiagnostics.affectedFile.resolvedPath, pendingForDiagnostics.seenKind | 24 /* AllDts */);
@@ -123548,48 +123624,73 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
               affected: pendingForDiagnostics.affectedFile
             };
           }
-          if (!state.buildInfoEmitPending) return void 0;
-          const affected2 = state.program;
-          const result2 = affected2.emitBuildInfo(writeFile2 || maybeBind(host, host.writeFile), cancellationToken);
-          state.buildInfoEmitPending = false;
-          return { result: result2, affected: affected2 };
         }
-        ({ affectedFile: affected, emitKind } = pendingAffectedFile);
       } else {
-        if (!state.programEmitPending) return void 0;
-        emitKind = state.programEmitPending;
-        if (emitOnlyDtsFiles) emitKind = emitKind & 24 /* AllDts */;
-        if (!emitKind) return void 0;
-        affected = state.program;
+        if (state.programEmitPending) {
+          emitKind = state.programEmitPending;
+          if (emitOnlyDtsFiles) emitKind = emitKind & 24 /* AllDts */;
+          if (emitKind) affected = state.program;
+        }
+        if (!affected && ((_a = state.emitDiagnosticsPerFile) == null ? void 0 : _a.size)) {
+          const seenKind = state.seenProgramEmit || 0 /* None */;
+          if (!(seenKind & 24 /* AllDts */)) {
+            state.seenProgramEmit = 24 /* AllDts */ | seenKind;
+            const diagnostics = [];
+            state.emitDiagnosticsPerFile.forEach((d) => addRange(diagnostics, d));
+            return {
+              result: { emitSkipped: true, diagnostics },
+              affected: state.program
+            };
+          }
+        }
+      }
+      if (!affected) {
+        if (!state.buildInfoEmitPending) return void 0;
+        const affected2 = state.program;
+        const result2 = affected2.emitBuildInfo(writeFile2 || maybeBind(host, host.writeFile), cancellationToken);
+        state.buildInfoEmitPending = false;
+        return { result: result2, affected: affected2 };
       }
     }
     let emitOnly;
     if (emitKind & 7 /* AllJs */) emitOnly = 0 /* Js */;
     if (emitKind & 24 /* AllDts */) emitOnly = emitOnly === void 0 ? 1 /* Dts */ : void 0;
-    if (affected === state.program) {
-      state.programEmitPending = state.changedFilesSet.size ? getPendingEmitKind(programEmitKind, emitKind) : state.programEmitPending ? getPendingEmitKind(state.programEmitPending, emitKind) : void 0;
-    }
     const result = state.program.emit(
       affected === state.program ? void 0 : affected,
       getWriteFileCallback(writeFile2, customTransformers),
       cancellationToken,
       emitOnly,
-      customTransformers
+      customTransformers,
+      /*forceDtsEmit*/
+      void 0,
+      /*skipBuildInfo*/
+      true
     );
     if (affected !== state.program) {
       const affectedSourceFile = affected;
       state.seenAffectedFiles.add(affectedSourceFile.resolvedPath);
       if (state.affectedFilesIndex !== void 0) state.affectedFilesIndex++;
       state.buildInfoEmitPending = true;
-      const existing = ((_a = state.seenEmittedFiles) == null ? void 0 : _a.get(affectedSourceFile.resolvedPath)) || 0 /* None */;
+      const existing = ((_b = state.seenEmittedFiles) == null ? void 0 : _b.get(affectedSourceFile.resolvedPath)) || 0 /* None */;
       (state.seenEmittedFiles ?? (state.seenEmittedFiles = /* @__PURE__ */ new Map())).set(affectedSourceFile.resolvedPath, emitKind | existing);
-      const existingPending = ((_b = state.affectedFilesPendingEmit) == null ? void 0 : _b.get(affectedSourceFile.resolvedPath)) || programEmitKind;
+      const existingPending = ((_c = state.affectedFilesPendingEmit) == null ? void 0 : _c.get(affectedSourceFile.resolvedPath)) || programEmitKind;
       const pendingKind = getPendingEmitKind(existingPending, emitKind | existing);
       if (pendingKind) (state.affectedFilesPendingEmit ?? (state.affectedFilesPendingEmit = /* @__PURE__ */ new Map())).set(affectedSourceFile.resolvedPath, pendingKind);
-      else (_c = state.affectedFilesPendingEmit) == null ? void 0 : _c.delete(affectedSourceFile.resolvedPath);
+      else (_d = state.affectedFilesPendingEmit) == null ? void 0 : _d.delete(affectedSourceFile.resolvedPath);
       if (result.diagnostics.length) (state.emitDiagnosticsPerFile ?? (state.emitDiagnosticsPerFile = /* @__PURE__ */ new Map())).set(affectedSourceFile.resolvedPath, result.diagnostics);
     } else {
       state.changedFilesSet.clear();
+      state.programEmitPending = state.changedFilesSet.size ? getPendingEmitKind(programEmitKind, emitKind) : state.programEmitPending ? getPendingEmitKind(state.programEmitPending, emitKind) : void 0;
+      state.seenProgramEmit = emitKind | (state.seenProgramEmit || 0 /* None */);
+      let emitDiagnosticsPerFile;
+      result.diagnostics.forEach((d) => {
+        if (!d.file) return;
+        let diagnostics = emitDiagnosticsPerFile == null ? void 0 : emitDiagnosticsPerFile.get(d.file.resolvedPath);
+        if (!diagnostics) (emitDiagnosticsPerFile ?? (emitDiagnosticsPerFile = /* @__PURE__ */ new Map())).set(d.file.resolvedPath, diagnostics = []);
+        diagnostics.push(d);
+      });
+      if (emitDiagnosticsPerFile) state.emitDiagnosticsPerFile = emitDiagnosticsPerFile;
+      state.buildInfoEmitPending = true;
     }
     return { result, affected };
   }
@@ -123711,28 +123812,37 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
         state.buildInfoEmitPending = true;
         if (!result) continue;
       } else {
-        result = state.program.getSemanticDiagnostics(
-          /*sourceFile*/
-          void 0,
-          cancellationToken
+        let diagnostics;
+        const semanticDiagnosticsPerFile = /* @__PURE__ */ new Map();
+        state.program.getSourceFiles().forEach(
+          (sourceFile) => diagnostics = addRange(
+            diagnostics,
+            getSemanticDiagnosticsOfFile(
+              state,
+              sourceFile,
+              cancellationToken,
+              semanticDiagnosticsPerFile
+            )
+          )
         );
+        state.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile;
+        result = diagnostics || emptyArray;
         state.changedFilesSet.clear();
         state.programEmitPending = getBuilderFileEmit(state.compilerOptions);
+        state.buildInfoEmitPending = true;
       }
       return { result, affected };
     }
   }
   function getSemanticDiagnostics(sourceFile, cancellationToken) {
     assertSourceFileOkWithoutNextAffectedCall(state, sourceFile);
-    const compilerOptions = Debug.checkDefined(state.program).getCompilerOptions();
-    if (compilerOptions.outFile) {
-      Debug.assert(!state.semanticDiagnosticsPerFile);
-      return Debug.checkDefined(state.program).getSemanticDiagnostics(sourceFile, cancellationToken);
-    }
     if (sourceFile) {
       return getSemanticDiagnosticsOfFile(state, sourceFile, cancellationToken);
     }
-    while (getSemanticDiagnosticsOfNextAffectedFile(cancellationToken)) {
+    while (true) {
+      const affectedResult = getSemanticDiagnosticsOfNextAffectedFile(cancellationToken);
+      if (!affectedResult) break;
+      if (affectedResult.affected === state.program) return affectedResult.result;
     }
     let diagnostics;
     for (const sourceFile2 of Debug.checkDefined(state.program).getSourceFiles()) {
@@ -123765,8 +123875,9 @@ function createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, hos
   const filePaths = (_a = program.fileNames) == null ? void 0 : _a.map(toPathInBuildInfoDirectory);
   let filePathsSetList;
   const latestChangedDtsFile = program.latestChangedDtsFile ? toAbsolutePath(program.latestChangedDtsFile) : void 0;
+  const fileInfos = /* @__PURE__ */ new Map();
+  const changedFilesSet = new Set(map(program.changeFileSet, toFilePath));
   if (isProgramBundleEmitBuildInfo(program)) {
-    const fileInfos = /* @__PURE__ */ new Map();
     program.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);
@@ -123774,13 +123885,16 @@ function createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, hos
     state = {
       fileInfos,
       compilerOptions: program.options ? convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath) : {},
+      semanticDiagnosticsPerFile: toPerFileSemanticDiagnostics(program.semanticDiagnosticsPerFile),
+      emitDiagnosticsPerFile: toPerFileEmitDiagnostics(program.emitDiagnosticsPerFile),
+      hasReusableDiagnostic: true,
+      changedFilesSet,
       latestChangedDtsFile,
       outSignature: program.outSignature,
       programEmitPending: program.pendingEmit === void 0 ? void 0 : toProgramEmitPending(program.pendingEmit, program.options)
     };
   } else {
     filePathsSetList = (_b = program.fileIdsList) == null ? void 0 : _b.map((fileIds) => new Set(fileIds.map(toFilePath)));
-    const fileInfos = /* @__PURE__ */ new Map();
     const emitSignatures = ((_c = program.options) == null ? void 0 : _c.composite) && !program.options.outFile ? /* @__PURE__ */ new Map() : void 0;
     program.fileInfos.forEach((fileInfo, index) => {
       const path = toFilePath(index + 1);
@@ -123801,13 +123915,12 @@ function createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, hos
         );
       }
     });
-    const changedFilesSet = new Set(map(program.changeFileSet, toFilePath));
     const fullEmitForOptions = program.affectedFilesPendingEmit ? getBuilderFileEmit(program.options || {}) : void 0;
     state = {
       fileInfos,
       compilerOptions: program.options ? convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath) : {},
       referencedMap: toManyToManyPathMap(program.referencedMap, program.options ?? {}),
-      semanticDiagnosticsPerFile: toPerFileSemanticDiagnostics(program.semanticDiagnosticsPerFile, fileInfos, changedFilesSet),
+      semanticDiagnosticsPerFile: toPerFileSemanticDiagnostics(program.semanticDiagnosticsPerFile),
       emitDiagnosticsPerFile: toPerFileEmitDiagnostics(program.emitDiagnosticsPerFile),
       hasReusableDiagnostic: true,
       affectedFilesPendingEmit: program.affectedFilesPendingEmit && arrayToMap(program.affectedFilesPendingEmit, (value) => toFilePath(isNumber(value) ? value : value[0]), (value) => toBuilderFileEmit(value, fullEmitForOptions)),
@@ -123859,7 +123972,7 @@ function createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, hos
     referenceMap.forEach(([fileId, fileIdListId]) => map2.set(toFilePath(fileId), toFilePathsSet(fileIdListId)));
     return map2;
   }
-  function toPerFileSemanticDiagnostics(diagnostics, fileInfos, changedFilesSet) {
+  function toPerFileSemanticDiagnostics(diagnostics) {
     const semanticDiagnostics = new Map(
       mapDefinedIterator(
         fileInfos.keys(),
@@ -123870,7 +123983,7 @@ function createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, hos
       if (isNumber(value)) semanticDiagnostics.delete(toFilePath(value));
       else semanticDiagnostics.set(toFilePath(value[0]), value[1]);
     });
-    return semanticDiagnostics.size ? semanticDiagnostics : void 0;
+    return semanticDiagnostics;
   }
   function toPerFileEmitDiagnostics(diagnostics) {
     return diagnostics && arrayToMap(diagnostics, (value) => toFilePath(value[0]), (value) => value[1]);
@@ -126986,8 +127099,6 @@ function createBuildOrUpdateInvalidedProject(state, project, projectPath, projec
       ({ buildResult, step } = buildErrors(
         state,
         projectPath,
-        program,
-        config,
         diagnostics,
         errorFlags,
         errorType
@@ -127050,8 +127161,6 @@ function createBuildOrUpdateInvalidedProject(state, project, projectPath, projec
       ({ buildResult, step } = buildErrors(
         state,
         projectPath,
-        program,
-        config,
         declDiagnostics,
         32 /* DeclarationEmitErrors */,
         "Declaration file"
@@ -127114,8 +127223,6 @@ function createBuildOrUpdateInvalidedProject(state, project, projectPath, projec
       ({ buildResult, step } = buildErrors(
         state,
         projectPath,
-        program,
-        config,
         emitDiagnostics,
         64 /* EmitErrors */,
         "Emit"
@@ -127295,13 +127402,10 @@ function afterProgramDone(state, program) {
   }
   state.projectCompilerOptions = state.baseCompilerOptions;
 }
-function buildErrors(state, resolvedPath, program, config, diagnostics, buildResult, errorType) {
-  const canEmitBuildInfo = program && !program.getCompilerOptions().outFile;
+function buildErrors(state, resolvedPath, diagnostics, buildResult, errorType) {
   reportAndStoreErrors(state, resolvedPath, diagnostics);
   state.projectStatus.set(resolvedPath, { type: 0 /* Unbuildable */, reason: `${errorType} errors` });
-  if (canEmitBuildInfo) return { buildResult, step: 4 /* EmitBuildInfo */ };
-  afterProgramDone(state, program);
-  return { buildResult, step: 5 /* QueueReferencingProjects */ };
+  return { buildResult, step: 4 /* EmitBuildInfo */ };
 }
 function isFileWatcherWithModifiedTime(value) {
   return !!value.watcher;
@@ -127476,7 +127580,7 @@ function getUpToDateStatusWorker(state, project, resolvedPath) {
       };
     }
     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) : (_d = buildInfo.program.semanticDiagnosticsPerFile) == null ? void 0 : _d.length)) {
+      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)) {
         return {
           type: 7 /* OutOfDateBuildInfo */,
           buildInfoFile: buildInfoPath