Skip to content

Commit 9d033e7

Browse files
hanslhansl
authored
perf(@ngtools/webpack): Improve rebuild performance (#4145)
Keep the TypeScript SourceFile around so we don't regenerate all of them when we rebuild the Program. The rebuild time is now 40-50% faster for hello world. This means all the files which haven't changed are not reparsed. Mentions: #1980, #4020, #3315
1 parent 4b9af62 commit 9d033e7

3 files changed

Lines changed: 60 additions & 21 deletions

File tree

‎packages/@ngtools/webpack/src/compiler_host.ts‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ export class VirtualFileStats extends VirtualStats {
6868
set content(v: string) {
6969
this._content = v;
7070
this._mtime = new Date();
71+
this._sourceFile = null;
72+
}
73+
setSourceFile(sourceFile: ts.SourceFile) {
74+
this._sourceFile = sourceFile;
7175
}
7276
getSourceFile(languageVersion: ts.ScriptTarget, setParentNodes: boolean) {
7377
if (!this._sourceFile) {
@@ -96,6 +100,8 @@ export class WebpackCompilerHost implements ts.CompilerHost {
96100
private _basePath: string;
97101
private _setParentNodes: boolean;
98102

103+
private _cache: boolean = false;
104+
99105
constructor(private _options: ts.CompilerOptions, basePath: string) {
100106
this._setParentNodes = true;
101107
this._delegate = ts.createCompilerHost(this._options, this._setParentNodes);
@@ -129,6 +135,10 @@ export class WebpackCompilerHost implements ts.CompilerHost {
129135
this._changed = true;
130136
}
131137

138+
enableCaching() {
139+
this._cache = true;
140+
}
141+
132142
populateWebpackResolver(resolver: any) {
133143
const fs = resolver.fileSystem;
134144
if (!this._changed) {
@@ -156,21 +166,33 @@ export class WebpackCompilerHost implements ts.CompilerHost {
156166
this._changed = false;
157167
}
158168

169+
invalidate(fileName: string): void {
170+
this._files[fileName] = null;
171+
}
172+
159173
fileExists(fileName: string): boolean {
160174
fileName = this._resolve(fileName);
161-
return fileName in this._files || this._delegate.fileExists(fileName);
175+
return this._files[fileName] != null || this._delegate.fileExists(fileName);
162176
}
163177

164178
readFile(fileName: string): string {
165179
fileName = this._resolve(fileName);
166-
return (fileName in this._files)
167-
? this._files[fileName].content
168-
: this._delegate.readFile(fileName);
180+
if (this._files[fileName] == null) {
181+
const result = this._delegate.readFile(fileName);
182+
if (result !== undefined && this._cache) {
183+
this._setFileContent(fileName, result);
184+
return result;
185+
} else {
186+
return result;
187+
}
188+
}
189+
return this._files[fileName].content;
169190
}
170191

171192
directoryExists(directoryName: string): boolean {
172193
directoryName = this._resolve(directoryName);
173-
return (directoryName in this._directories) || this._delegate.directoryExists(directoryName);
194+
return (this._directories[directoryName] != null)
195+
|| this._delegate.directoryExists(directoryName);
174196
}
175197

176198
getFiles(path: string): string[] {
@@ -198,8 +220,11 @@ export class WebpackCompilerHost implements ts.CompilerHost {
198220
getSourceFile(fileName: string, languageVersion: ts.ScriptTarget, onError?: OnErrorFn) {
199221
fileName = this._resolve(fileName);
200222

201-
if (!(fileName in this._files)) {
202-
return this._delegate.getSourceFile(fileName, languageVersion, onError);
223+
if (this._files[fileName] == null) {
224+
const content = this.readFile(fileName);
225+
if (!this._cache) {
226+
return ts.createSourceFile(fileName, content, languageVersion, this._setParentNodes);
227+
}
203228
}
204229

205230
return this._files[fileName].getSourceFile(languageVersion, this._setParentNodes);

‎packages/@ngtools/webpack/src/plugin.ts‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ export class AotPlugin implements Tapable {
165165
this._program = ts.createProgram(
166166
this._rootFilePath, this._compilerOptions, this._compilerHost);
167167

168+
// We enable caching of the filesystem in compilerHost _after_ the program has been created,
169+
// because we don't want SourceFile instances to be cached past this point.
170+
this._compilerHost.enableCaching();
171+
168172
if (options.entryModule) {
169173
this._entryModule = options.entryModule;
170174
} else if ((tsConfig.raw['angularCompilerOptions'] as any)
@@ -194,6 +198,10 @@ export class AotPlugin implements Tapable {
194198
apply(compiler: any) {
195199
this._compiler = compiler;
196200

201+
compiler.plugin('invalid', (fileName: string, timestamp: number) => {
202+
this._compilerHost.invalidate(fileName);
203+
});
204+
197205
// Add lazy modules to the context module for @angular/core/src/linker
198206
compiler.plugin('context-module-factory', (cmf: any) => {
199207
cmf.plugin('after-resolve', (result: any, callback: (err?: any, request?: any) => void) => {
@@ -251,6 +259,7 @@ export class AotPlugin implements Tapable {
251259
if (this._compilation._ngToolsWebpackPluginInstance) {
252260
return cb(new Error('An @ngtools/webpack plugin already exist for this compilation.'));
253261
}
262+
254263
this._compilation._ngToolsWebpackPluginInstance = this;
255264

256265
this._resourceLoader = new WebpackResourceLoader(compilation);
@@ -284,18 +293,20 @@ export class AotPlugin implements Tapable {
284293
this._rootFilePath, this._compilerOptions, this._compilerHost, this._program);
285294
})
286295
.then(() => {
287-
const diagnostics = this._program.getGlobalDiagnostics();
288-
if (diagnostics.length > 0) {
289-
const message = diagnostics
290-
.map(diagnostic => {
291-
const {line, character} = diagnostic.file.getLineAndCharacterOfPosition(
292-
diagnostic.start);
293-
const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
294-
return `${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message})`;
295-
})
296-
.join('\n');
297-
298-
throw new Error(message);
296+
if (this._typeCheck) {
297+
const diagnostics = this._program.getGlobalDiagnostics();
298+
if (diagnostics.length > 0) {
299+
const message = diagnostics
300+
.map(diagnostic => {
301+
const {line, character} = diagnostic.file.getLineAndCharacterOfPosition(
302+
diagnostic.start);
303+
const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
304+
return `${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message})`;
305+
})
306+
.join('\n');
307+
308+
throw new Error(message);
309+
}
299310
}
300311
})
301312
.then(() => {

‎packages/@ngtools/webpack/src/refactor.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,15 @@ export class TypeScriptFileRefactor {
6060
if (!this._program) {
6161
return [];
6262
}
63-
let diagnostics: ts.Diagnostic[] = this._program.getSyntacticDiagnostics(this._sourceFile)
64-
.concat(this._program.getSemanticDiagnostics(this._sourceFile));
63+
let diagnostics: ts.Diagnostic[] = [];
6564
// only concat the declaration diagnostics if the tsconfig config sets it to true.
6665
if (this._program.getCompilerOptions().declaration == true) {
6766
diagnostics = diagnostics.concat(this._program.getDeclarationDiagnostics(this._sourceFile));
6867
}
68+
diagnostics = diagnostics.concat(
69+
this._program.getSyntacticDiagnostics(this._sourceFile),
70+
this._program.getSemanticDiagnostics(this._sourceFile));
71+
6972
return diagnostics;
7073
}
7174

0 commit comments

Comments
 (0)