cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ngcc): use a special map for memoizing expensive-to-compute values (#34512)

Browse Source 
Previously, in cases were values were expensive to compute and would be
used multiple times, a combination of a regular `Map` and a helper
function (`getOrDefault()`) was used to ensure values were only computed
once.

This commit uses a special `Map`-like structure to compute and memoize
such expensive values without the need to a helper function.

PR Close #34512
This commit is contained in:
George Kalpakas
2019-12-25 02:10:01 +02:00
committed by Alex Rickabaugh
parent 619e68b95b
commit 7ddf794274
4 changed files with 117 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/compiler-cli/ngcc/src/host/commonjs_host.ts
View File

@ -11,15 +11,20 @@ import {absoluteFrom} from '../../../src/ngtsc/file_system';
import {Declaration, Import} from '../../../src/ngtsc/reflection';
import {Logger} from '../logging/logger';
import {BundleProgram} from '../packages/bundle_program';
import {getOrDefault, isDefined, stripExtension} from '../utils';
import {FactoryMap, isDefined, stripExtension} from '../utils';
import {ExportDeclaration, ExportStatement, ReexportStatement, RequireCall, findNamespaceOfIdentifier, findRequireCallReference, isExportStatement, isReexportStatement, isRequireCall} from './commonjs_umd_utils';
import {Esm5ReflectionHost} from './esm5_host';
import {NgccClassSymbol} from './ngcc_host';
export class CommonJsReflectionHost extends Esm5ReflectionHost {
protected commonJsExports = new Map<ts.SourceFile, Map<string, Declaration>|null>();
protected topLevelHelperCalls = new Map<string, Map<ts.SourceFile, ts.CallExpression[]>>();
protected commonJsExports = new FactoryMap<ts.SourceFile, Map<string, Declaration>|null>(
sf => this.computeExportsOfCommonJsModule(sf));
protected topLevelHelperCalls =
new FactoryMap<string, FactoryMap<ts.SourceFile, ts.CallExpression[]>>(
helperName => new FactoryMap<ts.SourceFile, ts.CallExpression[]>(
sf => sf.statements.map(stmt => this.getHelperCall(stmt, [helperName]))
.filter(isDefined)));
protected program: ts.Program;
protected compilerHost: ts.CompilerHost;
constructor(logger: Logger, isCore: boolean, src: BundleProgram, dts: BundleProgram|null = null) {
@ -46,12 +51,7 @@ export class CommonJsReflectionHost extends Esm5ReflectionHost {
}
getExportsOfModule(module: ts.Node): Map<string, Declaration>|null {
return super.getExportsOfModule(module) || this.getCommonJsExports(module.getSourceFile());
}
getCommonJsExports(sourceFile: ts.SourceFile): Map<string, Declaration>|null {
return getOrDefault(
this.commonJsExports, sourceFile, () => this.computeExportsOfCommonJsModule(sourceFile));
return super.getExportsOfModule(module) || this.commonJsExports.get(module.getSourceFile());
}
/**
@ -63,7 +63,8 @@ export class CommonJsReflectionHost extends Esm5ReflectionHost {
* no helpers are found.
*
* @param classSymbol the class whose helper calls we are interested in.
* @param helperName the name of the helper (e.g. `__decorate`) whose calls we are interested in.
* @param helperNames the names of the helpers (e.g. `__decorate`) whose calls we are interested
* in.
* @returns an array of nodes of calls to the helper with the given name.
*/
protected getHelperCallsForClass(classSymbol: NgccClassSymbol, helperNames: string[]):
@ -92,11 +93,8 @@ export class CommonJsReflectionHost extends Esm5ReflectionHost {
ts.CallExpression[] {
const calls: ts.CallExpression[] = [];
helperNames.forEach(helperName => {
const helperCallsMap = getOrDefault(this.topLevelHelperCalls, helperName, () => new Map());
calls.push(...getOrDefault(
helperCallsMap, sourceFile,
() => sourceFile.statements.map(statement => this.getHelperCall(statement, [helperName]))
.filter(isDefined)));
const helperCallsMap = this.topLevelHelperCalls.get(helperName);
calls.push(...helperCallsMap.get(sourceFile));
});
return calls;
}