microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-14 02:15:12 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Instead of queueing build for downstream projects right when invalidating project, do it after build for invalidated project is complete

Browse Source
This commit is contained in:
Sheetal Nandi 2018-09-12 12:30:48 -07:00
parent bdf1c782b2
commit 5553f36c9d
2 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/compiler/tsbuild.ts
View File

@ -783,10 +783,7 @@ namespace ts {
diagnostics.removeKey(resolved);
}
if (addProjToQueue(resolved, reloadLevel)) {
// TODO: instead of adding the dependent project to queue right away postpone this
queueBuildForDownstreamReferences(resolved);
}
addProjToQueue(resolved, reloadLevel);
}
/**
@ -797,10 +794,8 @@ namespace ts {
if (value === undefined) {
projectPendingBuild.setValue(proj, reloadLevel || ConfigFileProgramReloadLevel.None);
invalidatedProjectQueue.push(proj);
return true;
}
if (value < (reloadLevel || ConfigFileProgramReloadLevel.None)) {
else if (value < (reloadLevel || ConfigFileProgramReloadLevel.None)) {
projectPendingBuild.setValue(proj, reloadLevel || ConfigFileProgramReloadLevel.None);
}
}
@ -823,20 +818,6 @@ namespace ts {
return !!projectPendingBuild.getSize();
}
// Mark all downstream projects of this one needing to be built "later"
function queueBuildForDownstreamReferences(root: ResolvedConfigFileName) {
const dependencyGraph = getGlobalDependencyGraph();
const referencingProjects = dependencyGraph.referencingProjectsMap.getValue(root);
if (!referencingProjects) return;
// Always use build order to queue projects
for (const project of dependencyGraph.buildQueue) {
// Can skip circular references
if (referencingProjects.hasKey(project) && addProjToQueue(project)) {
queueBuildForDownstreamReferences(project);
}
}
}
function scheduleBuildInvalidatedProject() {
if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
return;
@ -910,7 +891,20 @@ namespace ts {
return;
}
buildSingleProject(resolved);
const buildResult = buildSingleProject(resolved);
// If declaration output changed then only queue in build for downstream projects
if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
const dependencyGraph = getGlobalDependencyGraph();
const referencingProjects = dependencyGraph.referencingProjectsMap.getValue(resolved);
if (!referencingProjects) return;
// Always use build order to queue projects
for (const project of dependencyGraph.buildQueue) {
// Can skip circular references
if (referencingProjects.hasKey(project)) {
addProjToQueue(project);
}
}
}
}
function createDependencyGraph(roots: ResolvedConfigFileName[]): DependencyGraph {
@ -928,7 +922,7 @@ namespace ts {
referencingProjectsMap
};
function visit(projPath: ResolvedConfigFileName, inCircularContext = false) {
function visit(projPath: ResolvedConfigFileName, inCircularContext?: boolean) {
// Already visited
if (permanentMarks.hasKey(projPath)) return;
// Circular
@ -1032,14 +1026,13 @@ namespace ts {
let anyDtsChanged = false;
program.emit(/*targetSourceFile*/ undefined, (fileName, content, writeBom, onError) => {
let priorChangeTime: Date | undefined;
if (!anyDtsChanged && isDeclarationFile(fileName) && host.fileExists(fileName)) {
if (host.readFile(fileName) === content) {
// Check for unchanged .d.ts files
resultFlags &= ~BuildResultFlags.DeclarationOutputUnchanged;
if (!anyDtsChanged && isDeclarationFile(fileName)) {
// Check for unchanged .d.ts files
if (host.fileExists(fileName) && host.readFile(fileName) === content) {
priorChangeTime = host.getModifiedTime(fileName);
}
else {
resultFlags &= ~BuildResultFlags.DeclarationOutputUnchanged;
anyDtsChanged = true;
}
}

18
src/testRunner/unittests/tsbuild.ts
View File

@ -210,10 +210,26 @@ namespace ts {
assert.equal(fs.statSync("/src/logic/index.js").mtimeMs, time(), "JS file should have been rebuilt");
assert.isBelow(fs.statSync("/src/tests/index.js").mtimeMs, time(), "Downstream JS file should *not* have been rebuilt");
// Does not build tests or core because there is no change in declaration file
tick();
builder.buildInvalidatedProject();
assert.isBelow(fs.statSync("/src/tests/index.js").mtimeMs, time(), "Downstream JS file should have been rebuilt");
assert.isBelow(fs.statSync("/src/core/index.js").mtimeMs, time(), "Upstream JS file should not have been rebuilt");
// Rebuild this project
tick();
fs.writeFileSync("/src/logic/index.ts", `${fs.readFileSync("/src/logic/index.ts")}
export class cNew {}`);
builder.invalidateProject("/src/logic");
builder.buildInvalidatedProject();
// The file should be updated
assert.equal(fs.statSync("/src/logic/index.js").mtimeMs, time(), "JS file should have been rebuilt");
assert.isBelow(fs.statSync("/src/tests/index.js").mtimeMs, time(), "Downstream JS file should *not* have been rebuilt");
// Build downstream projects should update 'tests', but not 'core'
tick();
builder.buildInvalidatedProject();
assert.equal(fs.statSync("/src/tests/index.js").mtimeMs, time(), "Downstream JS file should have been rebuilt");
assert.isBelow(fs.statSync("/src/tests/index.js").mtimeMs, time(), "Downstream JS file should have been rebuilt");
assert.isBelow(fs.statSync("/src/core/index.js").mtimeMs, time(), "Upstream JS file should not have been rebuilt");
});
});