cargdev/angular
1
0
Fork 0
Code Issues 17 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 6606ce69f6
commit c38195f59e
4 changed files with 117 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
packages/compiler-cli/ngcc/src/host/umd_host.ts
View File

@ -12,16 +12,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, stripExtension} from '../utils';
import {FactoryMap, stripExtension} from '../utils';
import {ExportDeclaration, ExportStatement, ReexportStatement, findNamespaceOfIdentifier, findRequireCallReference, isExportStatement, isReexportStatement, isRequireCall} from './commonjs_umd_utils';
import {Esm5ReflectionHost, stripParentheses} from './esm5_host';
export class UmdReflectionHost extends Esm5ReflectionHost {
protected umdModules = new Map<ts.SourceFile, UmdModule|null>();
protected umdExports = new Map<ts.SourceFile, Map<string, Declaration>|null>();
protected umdImportPaths = new Map<ts.ParameterDeclaration, string|null>();
protected umdModules =
new FactoryMap<ts.SourceFile, UmdModule|null>(sf => this.computeUmdModule(sf));
protected umdExports = new FactoryMap<ts.SourceFile, Map<string, Declaration>|null>(
sf => this.computeExportsOfUmdModule(sf));
protected umdImportPaths =
new FactoryMap<ts.ParameterDeclaration, string|null>(param => this.computeImportPath(param));
protected program: ts.Program;
protected compilerHost: ts.CompilerHost;
constructor(logger: Logger, isCore: boolean, src: BundleProgram, dts: BundleProgram|null = null) {
super(logger, isCore, src, dts);
this.program = src.program;
@ -48,7 +52,7 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
}
getExportsOfModule(module: ts.Node): Map<string, Declaration>|null {
return super.getExportsOfModule(module) || this.getUmdExports(module.getSourceFile());
return super.getExportsOfModule(module) || this.umdExports.get(module.getSourceFile());
}
getUmdModule(sourceFile: ts.SourceFile): UmdModule|null {
@ -56,44 +60,11 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
return null;
}
return getOrDefault(this.umdModules, sourceFile, (sf: ts.SourceFile) => {
if (sf.statements.length !== 1) {
throw new Error(
`Expected UMD module file (${sf.fileName}) to contain exactly one statement, but found ${sf.statements.length}.`);
}
return parseStatementForUmdModule(sf.statements[0]);
});
return this.umdModules.get(sourceFile);
}
getUmdImportPath(importParameter: ts.ParameterDeclaration): string|null {
return getOrDefault(this.umdImportPaths, importParameter, (param: ts.ParameterDeclaration) => {
const umdModule = this.getUmdModule(param.getSourceFile());
if (umdModule === null) {
return null;
}
const imports = getImportsOfUmdModule(umdModule);
if (imports === null) {
return null;
}
let importPath: string|null = null;
for (const i of imports) {
// Add all imports to the map to speed up future look ups.
this.umdImportPaths.set(i.parameter, i.path);
if (i.parameter === importParameter) {
importPath = i.path;
}
}
return importPath;
});
}
getUmdExports(sourceFile: ts.SourceFile): Map<string, Declaration>|null {
return getOrDefault(
this.umdExports, sourceFile, (sf: ts.SourceFile) => this.computeExportsOfUmdModule(sf));
return this.umdImportPaths.get(importParameter);
}
/** Get the top level statements for a module.
@ -108,6 +79,16 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
return umdModule !== null ? Array.from(umdModule.factoryFn.body.statements) : [];
}
private computeUmdModule(sourceFile: ts.SourceFile): UmdModule|null {
if (sourceFile.statements.length !== 1) {
throw new Error(
`Expected UMD module file (${sourceFile.fileName}) to contain exactly one statement, ` +
`but found ${sourceFile.statements.length}.`);
}
return parseStatementForUmdModule(sourceFile.statements[0]);
}
private computeExportsOfUmdModule(sourceFile: ts.SourceFile): Map<string, Declaration>|null {
const moduleMap = new Map<string, Declaration>();
for (const statement of this.getModuleStatements(sourceFile)) {
@ -124,6 +105,30 @@ export class UmdReflectionHost extends Esm5ReflectionHost {
return moduleMap;
}
private computeImportPath(param: ts.ParameterDeclaration): string|null {
const umdModule = this.getUmdModule(param.getSourceFile());
if (umdModule === null) {
return null;
}
const imports = getImportsOfUmdModule(umdModule);
if (imports === null) {
return null;
}
let importPath: string|null = null;
for (const i of imports) {
// Add all imports to the map to speed up future look ups.
this.umdImportPaths.set(i.parameter, i.path);
if (i.parameter === param) {
importPath = i.path;
}
}
return importPath;
}
private extractUmdExportDeclaration(statement: ExportStatement): ExportDeclaration {
const exportExpression = statement.expression.right;
const declaration = this.getDeclarationOfExpression(exportExpression);