maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve handling of container projects and issue relative filename messages

Browse source
This commit is contained in:
Ryan Cavanaugh 2018-06-06 13:47:59 -07:00
parent 291289f8c2
commit b107849a3a
2 changed files with 103 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/compiler/diagnosticMessages.json
View file

@ -3632,78 +3632,82 @@
"category": "Message",
"code": 6352
},
"Project '{0}' is up to date with .d.ts files from its dependencies": {
"Project '{0}' is out of date because its dependency '{1}' is out of date": {
"category": "Message",
"code": 6353
},
"Projects in this build: {0}": {
"Project '{0}' is up to date with .d.ts files from its dependencies": {
"category": "Message",
"code": 6354
},
"A non-dry build would delete the following files: {0}": {
"Projects in this build: {0}": {
"category": "Message",
"code": 6355
},
"A non-dry build would build project '{0}'": {
"A non-dry build would delete the following files: {0}": {
"category": "Message",
"code": 6356
},
"Building project '{0}'...": {
"A non-dry build would build project '{0}'": {
"category": "Message",
"code": 6357
},
"Updating output timestamps of project '{0}'...": {
"Building project '{0}'...": {
"category": "Message",
"code": 6358
},
"delete this - Project '{0}' is up to date because it was previously built": {
"Updating output timestamps of project '{0}'...": {
"category": "Message",
"code": 6359
},
"Project '{0}' is up to date": {
"delete this - Project '{0}' is up to date because it was previously built": {
"category": "Message",
"code": 6360
},
"Skipping build of project '{0}' because its dependency '{1}' has errors": {
"Project '{0}' is up to date": {
"category": "Message",
"code": 6361
},
"Project '{0}' can't be built because its dependency '{1}' has errors": {
"Skipping build of project '{0}' because its dependency '{1}' has errors": {
"category": "Message",
"code": 6362
},
"Build one or more projects and their dependencies, if out of date": {
"Project '{0}' can't be built because its dependency '{1}' has errors": {
"category": "Message",
"code": 6363
},
"Delete the outputs of all projects": {
"Build one or more projects and their dependencies, if out of date": {
"category": "Message",
"code": 6364
},
"Enable verbose logging": {
"Delete the outputs of all projects": {
"category": "Message",
"code": 6365
},
"Show what would be built (or deleted, if specified with '--clean')": {
"Enable verbose logging": {
"category": "Message",
"code": 6366
},
"Build all projects, including those that appear to be up to date": {
"Show what would be built (or deleted, if specified with '--clean')": {
"category": "Message",
"code": 6367
},
"Option '--build' must be the first command line argument.": {
"category": "Error",
"Build all projects, including those that appear to be up to date": {
"category": "Message",
"code": 6368
},
"Options '{0}' and '{1}' cannot be combined.": {
"Option '--build' must be the first command line argument.": {
"category": "Error",
"code": 6369
},
"Options '{0}' and '{1}' cannot be combined.": {
"category": "Error",
"code": 6370
},
"Skipping clean because not all projects could be located": {
"category": "Error",
"code": 6340
"code": 6371
},
"Variable '{0}' implicitly has an '{1}' type.": {

106
src/compiler/tsbuild.ts
View file

@ -90,7 +90,12 @@ namespace ts {
OutOfDateWithSelf,
OutOfDateWithUpstream,
UpstreamOutOfDate,
UpstreamBlocked
UpstreamBlocked,
/**
* Projects with no outputs (i.e. "solution" files)
*/
ContainerOnly
}
export type UpToDateStatus =
@ -100,7 +105,8 @@ namespace ts {
| Status.OutOfDateWithSelf
| Status.OutOfDateWithUpstream
| Status.UpstreamOutOfDate
| Status.UpstreamBlocked;
| Status.UpstreamBlocked
| Status.ContainerOnly;
export namespace Status {
/**
@ -112,6 +118,13 @@ namespace ts {
reason: string;
}
/**
* This project doesn't have any outputs, so "is it up to date" is a meaningless question.
*/
export interface ContainerOnly {
type: UpToDateStatusType.ContainerOnly;
}
/**
* The project is up to date with respect to its inputs.
* We track what the newest input file is.
@ -119,8 +132,11 @@ namespace ts {
export interface UpToDate {
type: UpToDateStatusType.UpToDate | UpToDateStatusType.UpToDateWithUpstreamTypes;
newestInputFileTime: Date;
newestInputFileName: string;
newestDeclarationFileContentChangedTime: Date;
newestOutputFileTime: Date;
newestOutputFileName: string;
oldestOutputFileName: string;
}
/**
@ -684,12 +700,19 @@ namespace ts {
// Collect the expected outputs of this project
const outputs = getAllProjectOutputs(project);
if (outputs.length === 0) {
return {
type: UpToDateStatusType.ContainerOnly
};
}
// Now see if all outputs are newer than the newest input
let oldestOutputFileName: string | undefined;
let oldestOutputFileTime: Date = maximumDate;
let newestOutputFileTime: Date = minimumDate;
let newestDeclarationFileContentChangedTime: Date = minimumDate;
let oldestOutputFileName = "(none)";
let oldestOutputFileTime = maximumDate;
let newestOutputFileName = "(none)";
let newestOutputFileTime = minimumDate;
let missingOutputFileName: string | undefined;
let newestDeclarationFileContentChangedTime = minimumDate;
let isOutOfDateWithInputs = false;
for (const output of outputs) {
// Output is missing; can stop checking
@ -712,7 +735,10 @@ namespace ts {
break;
}
newestOutputFileTime = newer(newestOutputFileTime, outputTime);
if (outputTime > newestOutputFileTime) {
newestOutputFileTime = outputTime;
newestOutputFileName = output;
}
// Keep track of when the most recent time a .d.ts file was changed.
// In addition to file timestamps, we also keep track of when a .d.ts file
@ -768,7 +794,7 @@ namespace ts {
Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
return {
type: UpToDateStatusType.OutOfDateWithUpstream,
outOfDateOutputFileName: oldestOutputFileName!,
outOfDateOutputFileName: oldestOutputFileName,
newerProjectName: ref.path
};
}
@ -784,7 +810,7 @@ namespace ts {
if (isOutOfDateWithInputs) {
return {
type: UpToDateStatusType.OutOfDateWithSelf,
outOfDateOutputFileName: oldestOutputFileName!,
outOfDateOutputFileName: oldestOutputFileName,
newerInputFileName: newestInputFileName
};
}
@ -794,7 +820,10 @@ namespace ts {
type: pseudoUpToDate ? UpToDateStatusType.UpToDateWithUpstreamTypes : UpToDateStatusType.UpToDate,
newestDeclarationFileContentChangedTime,
newestInputFileTime,
newestOutputFileTime
newestOutputFileTime,
newestInputFileName,
newestOutputFileName,
oldestOutputFileName
};
}
@ -1087,6 +1116,11 @@ namespace ts {
continue;
}
if (status.type === UpToDateStatusType.ContainerOnly) {
// Do nothing
continue;
}
buildSingleProject(next);
}
}
@ -1101,7 +1135,11 @@ namespace ts {
for (const name of graph.buildQueue) {
names.push(name);
}
context.verbose(Diagnostics.Projects_in_this_build_Colon_0, names.map(s => "\r\n * " + s).join(""));
context.verbose(Diagnostics.Projects_in_this_build_Colon_0, names.map(s => "\r\n * " + relName(s)).join(""));
}
function relName(path: string): string {
return convertToRelativePath(path, host.getCurrentDirectory(), f => host.getCanonicalFileName(f));
}
/**
@ -1111,32 +1149,46 @@ namespace ts {
if (!context.options.verbose) return;
switch (status.type) {
case UpToDateStatusType.OutOfDateWithSelf:
context.verbose(Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, configFileName, status.outOfDateOutputFileName, status.newerInputFileName);
return;
return context.verbose(Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2,
relName(configFileName),
relName(status.outOfDateOutputFileName),
relName(status.newerInputFileName));
case UpToDateStatusType.OutOfDateWithUpstream:
context.verbose(Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, configFileName, status.outOfDateOutputFileName, status.newerProjectName);
return;
return context.verbose(Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2,
relName(configFileName),
relName(status.outOfDateOutputFileName),
relName(status.newerProjectName));
case UpToDateStatusType.OutputMissing:
context.verbose(Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, configFileName, status.missingOutputFileName);
return;
return context.verbose(Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist,
relName(configFileName),
relName(status.missingOutputFileName));
case UpToDateStatusType.UpToDate:
if (status.newestInputFileTime !== undefined) {
context.verbose(Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, configFileName, status.newestInputFileTime, status.newestOutputFileTime);
return context.verbose(Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2,
relName(configFileName),
relName(status.newestInputFileName),
relName(status.oldestOutputFileName));
}
// Don't report anything for "up to date because it was already built" -- too verbose
return;
break;
case UpToDateStatusType.UpToDateWithUpstreamTypes:
context.verbose(Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, configFileName);
return;
return context.verbose(Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies,
relName(configFileName));
case UpToDateStatusType.UpstreamOutOfDate:
context.verbose(Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, configFileName);
return;
return context.verbose(Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date,
relName(configFileName),
relName(status.upstreamProjectName));
case UpToDateStatusType.UpstreamBlocked:
context.verbose(Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, configFileName, status.upstreamProjectName);
return;
return context.verbose(Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors,
relName(configFileName),
relName(status.upstreamProjectName));
case UpToDateStatusType.Unbuildable:
context.verbose(Diagnostics.Failed_to_parse_file_0_Colon_1, configFileName, status.reason);
return;
return context.verbose(Diagnostics.Failed_to_parse_file_0_Colon_1,
relName(configFileName),
status.reason);
case UpToDateStatusType.ContainerOnly:
// Don't report status on "solution" projects
break;
default:
assertTypeIsNever(status);
}