Merge branch 'main' into disable-57896

Author: andrewbranch

src/compiler/builder.ts

@@ -55,6 +55,7 @@ import {
     HostForComputeHash,
     isArray,
     isDeclarationFileName,
+    isIncrementalCompilation,
     isJsonSourceFile,
     isNumber,
     isString,
@@ -376,7 +377,7 @@ function createBuilderProgramState(
     }
     else {
         // We arent using old state, so atleast emit buildInfo with current information
-        state.buildInfoEmitPending = true;
+        state.buildInfoEmitPending = isIncrementalCompilation(compilerOptions);
     }
 
     // Update changed files and copy semantic diagnostics if we can
@@ -1184,14 +1185,17 @@ export function isIncrementalBuildInfo(info: BuildInfo): info is IncrementalBuil
 /**
  * Gets the program information to be emitted in buildInfo so that we can use it to create new program
  */
-function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): IncrementalBuildInfo {
+function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): BuildInfo {
     const currentDirectory = state.program.getCurrentDirectory();
     const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(state.compilerOptions)!, currentDirectory));
     // Convert the file name to Path here if we set the fileName instead to optimize multiple d.ts file emits and having to compute Canonical path
     const latestChangedDtsFile = state.latestChangedDtsFile ? relativeToBuildInfoEnsuringAbsolutePath(state.latestChangedDtsFile) : undefined;
     const fileNames: string[] = [];
     const fileNameToFileId = new Map<string, IncrementalBuildInfoFileId>();
     const rootFileNames = new Set(state.program.getRootFileNames().map(f => toPath(f, currentDirectory, state.program.getCanonicalFileName)));
+
+    if (!isIncrementalCompilation(state.compilerOptions)) return { version };
+
     const root: IncrementalBuildInfoRoot[] = [];
     if (state.compilerOptions.outFile) {
         // Copy all fileInfo, version and impliedFormat
@@ -1204,7 +1208,7 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): Incremental
                 { version: value.version, impliedFormat: value.impliedFormat, signature: undefined, affectsGlobalScope: undefined } :
                 value.version;
         });
-        return {
+        const buildInfo: IncrementalBundleEmitBuildInfo = {
             fileNames,
             fileInfos,
             root,
@@ -1221,7 +1225,8 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): Incremental
                 false : // Pending emit is same as deteremined by compilerOptions
                 state.programEmitPending, // Actual value
             version,
-        } satisfies IncrementalBundleEmitBuildInfo;
+        };
+        return buildInfo;
     }
 
     let fileIdsList: (readonly IncrementalBuildInfoFileId[])[] | undefined;
@@ -1295,7 +1300,7 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): Incremental
         }
     }
 
-    return {
+    const buildInfo: IncrementalMultiFileEmitBuildInfo = {
         fileNames,
         fileIdsList,
         fileInfos,
@@ -1310,7 +1315,8 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): Incremental
         emitSignatures,
         latestChangedDtsFile,
         version,
-    } satisfies IncrementalMultiFileEmitBuildInfo;
+    };
+    return buildInfo;
 
     function relativeToBuildInfoEnsuringAbsolutePath(path: string) {
         return relativeToBuildInfo(getNormalizedAbsolutePath(path, currentDirectory));

src/compiler/checker.ts

@@ -62,7 +62,7 @@ import {
     canHaveModifiers,
     canHaveModuleSpecifier,
     canHaveSymbol,
-    canIncludeBindAndCheckDiagnsotics,
+    canIncludeBindAndCheckDiagnostics,
     canUsePropertyAccess,
     cartesianProduct,
     CaseBlock,
@@ -49205,7 +49205,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function calculateNodeCheckFlagWorker(node: Node, flag: LazyNodeCheckFlags) {
-        if (!compilerOptions.noCheck && canIncludeBindAndCheckDiagnsotics(getSourceFileOfNode(node), compilerOptions)) {
+        if (!compilerOptions.noCheck && canIncludeBindAndCheckDiagnostics(getSourceFileOfNode(node), compilerOptions)) {
             // Unless noCheck is passed, assume calculation of node check flags has been done eagerly.
             // This saves needing to mark up where in the eager traversal certain results are "done",
             // just to reconcile the eager and lazy results. This wouldn't be hard if an eager typecheck

src/compiler/diagnosticMessages.json

@@ -4617,6 +4617,10 @@
         "category": "Error",
         "code": 5110
     },
+    "Option 'tsBuildInfoFile' cannot be specified without specifying option 'incremental' or 'composite' or if not running 'tsc -b'.": {
+        "category": "Error",
+        "code": 5111
+    },
 
     "Generates a sourcemap for each corresponding '.d.ts' file.": {
         "category": "Message",

src/compiler/emitter.ts

@@ -21,7 +21,7 @@ import {
     CallExpression,
     CallSignatureDeclaration,
     canHaveLocals,
-    canIncludeBindAndCheckDiagnsotics,
+    canIncludeBindAndCheckDiagnostics,
     CaseBlock,
     CaseClause,
     CaseOrDefaultClause,
@@ -479,7 +479,7 @@ export function forEachEmittedFile<T>(
 
 export function getTsBuildInfoEmitOutputFilePath(options: CompilerOptions) {
     const configFile = options.configFilePath;
-    if (!isIncrementalCompilation(options)) return undefined;
+    if (!canEmitTsBuildInfo(options)) return undefined;
     if (options.tsBuildInfoFile) return options.tsBuildInfoFile;
     const outPath = options.outFile;
     let buildInfoExtensionLess: string;
@@ -498,6 +498,11 @@ export function getTsBuildInfoEmitOutputFilePath(options: CompilerOptions) {
     return buildInfoExtensionLess + Extension.TsBuildInfo;
 }
 
+/** @internal */
+export function canEmitTsBuildInfo(options: CompilerOptions) {
+    return isIncrementalCompilation(options) || !!options.tscBuild;
+}
+
 /** @internal */
 export function getOutputPathsForBundle(options: CompilerOptions, forceDtsPaths: boolean): EmitFileNames {
     const outPath = options.outFile!;
@@ -811,7 +816,7 @@ export function emitFiles(
             sourceFile => {
                 if (
                     compilerOptions.noCheck ||
-                    !canIncludeBindAndCheckDiagnsotics(sourceFile, compilerOptions)
+                    !canIncludeBindAndCheckDiagnostics(sourceFile, compilerOptions)
                 ) markLinkedReferences(sourceFile);
             },
         );
@@ -878,7 +883,7 @@ export function emitFiles(
                 (emitOnly && !getEmitDeclarations(compilerOptions)) ||
                 compilerOptions.noCheck ||
                 emitResolverSkipsTypeChecking(emitOnly, forceDtsEmit) ||
-                !canIncludeBindAndCheckDiagnsotics(sourceFile, compilerOptions)
+                !canIncludeBindAndCheckDiagnostics(sourceFile, compilerOptions)
             ) {
                 collectLinkedAliases(sourceFile);
             }

src/compiler/program.ts

@@ -8,6 +8,7 @@ import {
     AsExpression,
     BuilderProgram,
     CancellationToken,
+    canEmitTsBuildInfo,
     canHaveDecorators,
     canHaveIllegalDecorators,
     chainDiagnosticMessages,
@@ -195,7 +196,6 @@ import {
     isImportEqualsDeclaration,
     isImportSpecifier,
     isImportTypeNode,
-    isIncrementalCompilation,
     isInJSFile,
     isJSDocImportTag,
     isLiteralImportTypeNode,
@@ -4330,8 +4330,8 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
 
         const outputFile = options.outFile;
         if (options.tsBuildInfoFile) {
-            if (!isIncrementalCompilation(options)) {
-                createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
+            if (!canEmitTsBuildInfo(options)) {
+                createDiagnosticForOptionName(Diagnostics.Option_tsBuildInfoFile_cannot_be_specified_without_specifying_option_incremental_or_composite_or_if_not_running_tsc_b, "tsBuildInfoFile");
             }
         }
         else if (options.incremental && !outputFile && !options.configFilePath) {