Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always write tsbuildInfo when running tsc -b #58626

Merged
merged 3 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/compiler/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import {
HostForComputeHash,
isArray,
isDeclarationFileName,
isIncrementalCompilation,
isJsonSourceFile,
isNumber,
isString,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -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;
Expand Down Expand Up @@ -1295,7 +1300,7 @@ function getBuildInfo(state: BuilderProgramStateWithDefinedProgram): Incremental
}
}

return {
const buildInfo: IncrementalMultiFileEmitBuildInfo = {
fileNames,
fileIdsList,
fileInfos,
Expand All @@ -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));
Expand Down
4 changes: 4 additions & 0 deletions src/compiler/diagnosticMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 6 additions & 1 deletion src/compiler/emitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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!;
Expand Down
6 changes: 3 additions & 3 deletions src/compiler/program.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
AsExpression,
BuilderProgram,
CancellationToken,
canEmitTsBuildInfo,
canHaveDecorators,
canHaveIllegalDecorators,
chainDiagnosticMessages,
Expand Down Expand Up @@ -195,7 +196,6 @@ import {
isImportEqualsDeclaration,
isImportSpecifier,
isImportTypeNode,
isIncrementalCompilation,
isInJSFile,
isJSDocImportTag,
isLiteralImportTypeNode,
Expand Down Expand Up @@ -4324,8 +4324,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) {
Expand Down
Loading