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

refactor(ngcc): move logic for identifying known declarations to method (#36284)

Browse Source 
The `NgccReflectionHost`s have logic for detecting certain known
declarations (such as `Object.assign()` and TypeScript helpers), which
allows the `PartialEvaluator` to evaluate expressions it would not be
able to statically evaluate otherwise.

This commit moves the logic for identifying these known declarations to
dedicated methods. This is in preparation of allowing ngcc's
`DelegatingReflectionHost` (introduced in #36089) to also apply the
known declaration detection logic when reflecting on TypeScript sources.

PR Close #36284
This commit is contained in:
George Kalpakas 2020-04-03 16:37:43 +03:00 committed by Kara Erickson
parent 008e12edda
commit 0af6e9fcbb
2 changed files with 102 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
packages/compiler-cli/ngcc/src/host/esm2015_host.ts
View File

@ -8,13 +8,13 @@
import * as ts from 'typescript'; import * as ts from 'typescript';
import {ClassDeclaration, ClassMember, ClassMemberKind, ConcreteDeclaration, CtorParameter, Declaration, Decorator, KnownDeclaration, TypeScriptReflectionHost, TypeValueReference, isDecoratorIdentifier, reflectObjectLiteral,} from '../../../src/ngtsc/reflection'; import {ClassDeclaration, ClassMember, ClassMemberKind, ConcreteDeclaration, CtorParameter, Declaration, Decorator, isDecoratorIdentifier, KnownDeclaration, reflectObjectLiteral, TypeScriptReflectionHost, TypeValueReference,} from '../../../src/ngtsc/reflection';
import {isWithinPackage} from '../analysis/util'; import {isWithinPackage} from '../analysis/util';
import {Logger} from '../logging/logger'; import {Logger} from '../logging/logger';
import {BundleProgram} from '../packages/bundle_program'; import {BundleProgram} from '../packages/bundle_program';
import {findAll, getNameText, hasNameIdentifier, isDefined, stripDollarSuffix} from '../utils'; import {findAll, getNameText, hasNameIdentifier, isDefined, stripDollarSuffix} from '../utils';
import {ClassSymbol, ModuleWithProvidersFunction, NgccClassSymbol, NgccReflectionHost, PRE_R3_MARKER, SwitchableVariableDeclaration, isSwitchableVariableDeclaration} from './ngcc_host'; import {ClassSymbol, isSwitchableVariableDeclaration, ModuleWithProvidersFunction, NgccClassSymbol, NgccReflectionHost, PRE_R3_MARKER, SwitchableVariableDeclaration} from './ngcc_host';
export const DECORATORS = 'decorators' as ts.__String; export const DECORATORS = 'decorators' as ts.__String;
export const PROP_DECORATORS = 'propDecorators' as ts.__String; export const PROP_DECORATORS = 'propDecorators' as ts.__String;
@ -346,24 +346,14 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
// The identifier may have been of an additional class assignment such as `MyClass_1` that was // The identifier may have been of an additional class assignment such as `MyClass_1` that was
// present as alias for `MyClass`. If so, resolve such aliases to their original declaration. // present as alias for `MyClass`. If so, resolve such aliases to their original declaration.
if (superDeclaration !== null && superDeclaration.node !== null) { if (superDeclaration !== null && superDeclaration.node !== null &&
superDeclaration.known === null) {
const aliasedIdentifier = this.resolveAliasedClassIdentifier(superDeclaration.node); const aliasedIdentifier = this.resolveAliasedClassIdentifier(superDeclaration.node);
if (aliasedIdentifier !== null) { if (aliasedIdentifier !== null) {
return this.getDeclarationOfIdentifier(aliasedIdentifier); return this.getDeclarationOfIdentifier(aliasedIdentifier);
} }
} }
// If the identifier resolves to the global JavaScript `Object`, return a
// declaration that denotes it as the known `JsGlobalObject` declaration.
if (superDeclaration !== null && this.isJavaScriptObjectDeclaration(superDeclaration)) {
return {
known: KnownDeclaration.JsGlobalObject,
expression: id,
viaModule: null,
node: null,
};
}
return superDeclaration; return superDeclaration;
} }
@ -511,8 +501,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
return null; return null;
} }
if (!isNamedDeclaration(declaration)) { if (!isNamedDeclaration(declaration)) {
throw new Error( throw new Error(`Cannot get the dts file for a declaration that has no name: ${
`Cannot get the dts file for a declaration that has no name: ${declaration.getText()} in ${declaration.getSourceFile().fileName}`); declaration.getText()} in ${declaration.getSourceFile().fileName}`);
} }
// Try to retrieve the dts declaration from the public map // Try to retrieve the dts declaration from the public map
@ -520,7 +510,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
this.publicDtsDeclarationMap = this.computePublicDtsDeclarationMap(this.src, this.dts); this.publicDtsDeclarationMap = this.computePublicDtsDeclarationMap(this.src, this.dts);
} }
if (this.publicDtsDeclarationMap.has(declaration)) { if (this.publicDtsDeclarationMap.has(declaration)) {
return this.publicDtsDeclarationMap.get(declaration) !; return this.publicDtsDeclarationMap.get(declaration)!;
} }
// No public export, try the private map // No public export, try the private map
@ -528,7 +518,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
this.privateDtsDeclarationMap = this.computePrivateDtsDeclarationMap(this.src, this.dts); this.privateDtsDeclarationMap = this.computePrivateDtsDeclarationMap(this.src, this.dts);
} }
if (this.privateDtsDeclarationMap.has(declaration)) { if (this.privateDtsDeclarationMap.has(declaration)) {
return this.privateDtsDeclarationMap.get(declaration) !; return this.privateDtsDeclarationMap.get(declaration)!;
} }
// No declaration found at all // No declaration found at all
@ -602,8 +592,38 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
return last; return last;
} }
/**
* Check whether a `Declaration` corresponds with a known declaration, such as `Object`, and set
* its `known` property to the appropriate `KnownDeclaration`.
*
* @param decl The `Declaration` to check.
* @return The passed in `Declaration` (potentially enhanced with a `KnownDeclaration`).
*/
detectKnownDeclaration(decl: null): null;
detectKnownDeclaration<T extends Declaration>(decl: T): T;
detectKnownDeclaration<T extends Declaration>(decl: T|null): T|null;
detectKnownDeclaration<T extends Declaration>(decl: T|null): T|null {
if (decl !== null && decl.known === null && this.isJavaScriptObjectDeclaration(decl)) {
// If the identifier resolves to the global JavaScript `Object`, update the declaration to
// denote it as the known `JsGlobalObject` declaration.
decl.known = KnownDeclaration.JsGlobalObject;
}
return decl;
}
///////////// Protected Helpers ///////////// ///////////// Protected Helpers /////////////
/**
* Resolve a `ts.Symbol` to its declaration and detect whether it corresponds with a known
* declaration.
*/
protected getDeclarationOfSymbol(symbol: ts.Symbol, originalId: ts.Identifier|null): Declaration
|null {
return this.detectKnownDeclaration(super.getDeclarationOfSymbol(symbol, originalId));
}
/** /**
* Finds the identifier of the actual class declaration for a potentially aliased declaration of a * Finds the identifier of the actual class declaration for a potentially aliased declaration of a
* class. * class.
@ -618,7 +638,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
protected resolveAliasedClassIdentifier(declaration: ts.Declaration): ts.Identifier|null { protected resolveAliasedClassIdentifier(declaration: ts.Declaration): ts.Identifier|null {
this.ensurePreprocessed(declaration.getSourceFile()); this.ensurePreprocessed(declaration.getSourceFile());
return this.aliasedClassDeclarations.has(declaration) ? return this.aliasedClassDeclarations.has(declaration) ?
this.aliasedClassDeclarations.get(declaration) ! : this.aliasedClassDeclarations.get(declaration)! :
null; null;
} }
@ -674,7 +694,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
this.aliasedClassDeclarations.set(aliasedDeclaration.node, declaration.name); this.aliasedClassDeclarations.set(aliasedDeclaration.node, declaration.name);
} }
/** Get the top level statements for a module. /**
* Get the top level statements for a module.
* *
* In ES5 and ES2015 this is just the top level statements of the file. * In ES5 and ES2015 this is just the top level statements of the file.
* @param sourceFile The module whose statements we want. * @param sourceFile The module whose statements we want.
@ -728,7 +749,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
protected acquireDecoratorInfo(classSymbol: NgccClassSymbol): DecoratorInfo { protected acquireDecoratorInfo(classSymbol: NgccClassSymbol): DecoratorInfo {
const decl = classSymbol.declaration.valueDeclaration; const decl = classSymbol.declaration.valueDeclaration;
if (this.decoratorCache.has(decl)) { if (this.decoratorCache.has(decl)) {
return this.decoratorCache.get(decl) !; return this.decoratorCache.get(decl)!;
} }
// Extract decorators from static properties and `__decorate` helper calls, then merge them // Extract decorators from static properties and `__decorate` helper calls, then merge them
@ -757,7 +778,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
* none of the static properties exist. * none of the static properties exist.
*/ */
protected computeDecoratorInfoFromStaticProperties(classSymbol: NgccClassSymbol): { protected computeDecoratorInfoFromStaticProperties(classSymbol: NgccClassSymbol): {
classDecorators: Decorator[] | null; memberDecorators: Map<string, Decorator[]>| null; classDecorators: Decorator[]|null; memberDecorators: Map<string, Decorator[]>| null;
constructorParamInfo: ParamInfo[] | null; constructorParamInfo: ParamInfo[] | null;
} { } {
let classDecorators: Decorator[]|null = null; let classDecorators: Decorator[]|null = null;
@ -1026,7 +1047,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
// The helper arg was reflected to represent an actual decorator. // The helper arg was reflected to represent an actual decorator.
if (this.isFromCore(entry.decorator)) { if (this.isFromCore(entry.decorator)) {
const decorators = const decorators =
memberDecorators.has(memberName) ? memberDecorators.get(memberName) ! : []; memberDecorators.has(memberName) ? memberDecorators.get(memberName)! : [];
decorators.push(entry.decorator); decorators.push(entry.decorator);
memberDecorators.set(memberName, decorators); memberDecorators.set(memberName, decorators);
} }
@ -1193,7 +1214,6 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
if (ts.isArrayLiteralExpression(decoratorsArray)) { if (ts.isArrayLiteralExpression(decoratorsArray)) {
// Add each decorator that is imported from `@angular/core` into the `decorators` array // Add each decorator that is imported from `@angular/core` into the `decorators` array
decoratorsArray.elements.forEach(node => { decoratorsArray.elements.forEach(node => {
// If the decorator is not an object literal expression then we are not interested // If the decorator is not an object literal expression then we are not interested
if (ts.isObjectLiteralExpression(node)) { if (ts.isObjectLiteralExpression(node)) {
// We are only interested in objects of the form: `{ type: DecoratorType, args: [...] }` // We are only interested in objects of the form: `{ type: DecoratorType, args: [...] }`
@ -1201,14 +1221,15 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
// Is the value of the `type` property an identifier? // Is the value of the `type` property an identifier?
if (decorator.has('type')) { if (decorator.has('type')) {
let decoratorType = decorator.get('type') !; let decoratorType = decorator.get('type')!;
if (isDecoratorIdentifier(decoratorType)) { if (isDecoratorIdentifier(decoratorType)) {
const decoratorIdentifier = const decoratorIdentifier =
ts.isIdentifier(decoratorType) ? decoratorType : decoratorType.name; ts.isIdentifier(decoratorType) ? decoratorType : decoratorType.name;
decorators.push({ decorators.push({
name: decoratorIdentifier.text, name: decoratorIdentifier.text,
identifier: decoratorType, identifier: decoratorType,
import: this.getImportOfIdentifier(decoratorIdentifier), node, import: this.getImportOfIdentifier(decoratorIdentifier),
node,
args: getDecoratorArgs(node), args: getDecoratorArgs(node),
}); });
} }
@ -1347,7 +1368,13 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
const type: ts.TypeNode = (node as any).type || null; const type: ts.TypeNode = (node as any).type || null;
return { return {
node, node,
implementation: node, kind, type, name, nameNode, value, isStatic, implementation: node,
kind,
type,
name,
nameNode,
value,
isStatic,
decorators: decorators || [] decorators: decorators || []
}; };
} }
@ -1362,7 +1389,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
ts.ParameterDeclaration[]|null { ts.ParameterDeclaration[]|null {
const members = classSymbol.implementation.members; const members = classSymbol.implementation.members;
if (members && members.has(CONSTRUCTOR)) { if (members && members.has(CONSTRUCTOR)) {
const constructorSymbol = members.get(CONSTRUCTOR) !; const constructorSymbol = members.get(CONSTRUCTOR)!;
// For some reason the constructor does not have a `valueDeclaration` ?!? // For some reason the constructor does not have a `valueDeclaration` ?!?
const constructor = constructorSymbol.declarations && const constructor = constructorSymbol.declarations &&
constructorSymbol.declarations[0] as ts.ConstructorDeclaration | undefined; constructorSymbol.declarations[0] as ts.ConstructorDeclaration | undefined;
@ -1424,7 +1451,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
name: getNameText(nameNode), name: getNameText(nameNode),
nameNode, nameNode,
typeValueReference, typeValueReference,
typeNode: null, decorators typeNode: null,
decorators
}; };
}); });
} }
@ -1473,9 +1501,9 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
ts.isObjectLiteralExpression(element) ? reflectObjectLiteral(element) : null) ts.isObjectLiteralExpression(element) ? reflectObjectLiteral(element) : null)
.map(paramInfo => { .map(paramInfo => {
const typeExpression = const typeExpression =
paramInfo && paramInfo.has('type') ? paramInfo.get('type') ! : null; paramInfo && paramInfo.has('type') ? paramInfo.get('type')! : null;
const decoratorInfo = const decoratorInfo =
paramInfo && paramInfo.has('decorators') ? paramInfo.get('decorators') ! : null; paramInfo && paramInfo.has('decorators') ? paramInfo.get('decorators')! : null;
const decorators = decoratorInfo && const decorators = decoratorInfo &&
this.reflectDecorators(decoratorInfo) this.reflectDecorators(decoratorInfo)
.filter(decorator => this.isFromCore(decorator)); .filter(decorator => this.isFromCore(decorator));
@ -1619,7 +1647,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
if (fileExports !== null) { if (fileExports !== null) {
for (const [exportName, {node: declaration}] of fileExports) { for (const [exportName, {node: declaration}] of fileExports) {
if (declaration !== null && dtsDeclarationMap.has(exportName)) { if (declaration !== null && dtsDeclarationMap.has(exportName)) {
declarationMap.set(declaration, dtsDeclarationMap.get(exportName) !); declarationMap.set(declaration, dtsDeclarationMap.get(exportName)!);
} }
} }
} }
@ -1670,15 +1698,17 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
const ngModuleDeclaration = this.getDeclarationOfExpression(ngModuleValue); const ngModuleDeclaration = this.getDeclarationOfExpression(ngModuleValue);
if (!ngModuleDeclaration || ngModuleDeclaration.node === null) { if (!ngModuleDeclaration || ngModuleDeclaration.node === null) {
throw new Error( throw new Error(`Cannot find a declaration for NgModule ${
`Cannot find a declaration for NgModule ${ngModuleValue.getText()} referenced in "${declaration!.getText()}"`); ngModuleValue.getText()} referenced in "${declaration!.getText()}"`);
} }
if (!hasNameIdentifier(ngModuleDeclaration.node)) { if (!hasNameIdentifier(ngModuleDeclaration.node)) {
return null; return null;
} }
return { return {
name, name,
ngModule: ngModuleDeclaration as ConcreteDeclaration<ClassDeclaration>, declaration, container ngModule: ngModuleDeclaration as ConcreteDeclaration<ClassDeclaration>,
declaration,
container
}; };
} }
@ -1705,7 +1735,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
return null; return null;
} }
const exportDecl = namespaceExports.get(expression.name.text) !; const exportDecl = namespaceExports.get(expression.name.text)!;
return {...exportDecl, viaModule: namespaceDecl.viaModule}; return {...exportDecl, viaModule: namespaceDecl.viaModule};
} }
@ -1737,8 +1767,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
///////////// Exported Helpers ///////////// ///////////// Exported Helpers /////////////
export type ParamInfo = { export type ParamInfo = {
decorators: Decorator[] | null, decorators: Decorator[]|null,
typeExpression: ts.Expression | null typeExpression: ts.Expression|null
}; };
/** /**
@ -1782,7 +1812,7 @@ export interface DecoratorCall {
* ], SomeDirective); * ], SomeDirective);
* ``` * ```
*/ */
export type DecorateHelperEntry = ParameterTypes | ParameterDecorators | DecoratorCall; export type DecorateHelperEntry = ParameterTypes|ParameterDecorators|DecoratorCall;
/** /**
* The recorded decorator information of a single class. This information is cached in the host. * The recorded decorator information of a single class. This information is cached in the host.
@ -1811,7 +1841,7 @@ interface DecoratorInfo {
* A statement node that represents an assignment. * A statement node that represents an assignment.
*/ */
export type AssignmentStatement = export type AssignmentStatement =
ts.ExpressionStatement & {expression: {left: ts.Identifier, right: ts.Expression}}; ts.ExpressionStatement&{expression: {left: ts.Identifier, right: ts.Expression}};
/** /**
* Test whether a statement node is an assignment statement. * Test whether a statement node is an assignment statement.

56
packages/compiler-cli/ngcc/src/host/esm5_host.ts
View File

@ -8,10 +8,10 @@
import * as ts from 'typescript'; import * as ts from 'typescript';
import {ClassDeclaration, ClassMember, ClassMemberKind, Declaration, Decorator, FunctionDefinition, Parameter, isNamedVariableDeclaration, reflectObjectLiteral} from '../../../src/ngtsc/reflection'; import {ClassDeclaration, ClassMember, ClassMemberKind, Declaration, Decorator, FunctionDefinition, isNamedVariableDeclaration, Parameter, reflectObjectLiteral} from '../../../src/ngtsc/reflection';
import {getNameText, getTsHelperFnFromDeclaration, hasNameIdentifier} from '../utils'; import {getNameText, getTsHelperFnFromDeclaration, hasNameIdentifier} from '../utils';
import {Esm2015ReflectionHost, ParamInfo, getPropertyValueFromSymbol, isAssignment, isAssignmentStatement} from './esm2015_host'; import {Esm2015ReflectionHost, getPropertyValueFromSymbol, isAssignment, isAssignmentStatement, ParamInfo} from './esm2015_host';
import {NgccClassSymbol} from './ngcc_host'; import {NgccClassSymbol} from './ngcc_host';
@ -81,12 +81,13 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
getInternalNameOfClass(clazz: ClassDeclaration): ts.Identifier { getInternalNameOfClass(clazz: ClassDeclaration): ts.Identifier {
const innerClass = this.getInnerFunctionDeclarationFromClassDeclaration(clazz); const innerClass = this.getInnerFunctionDeclarationFromClassDeclaration(clazz);
if (innerClass === undefined) { if (innerClass === undefined) {
throw new Error( throw new Error(`getInternalNameOfClass() called on a non-ES5 class: expected ${
`getInternalNameOfClass() called on a non-ES5 class: expected ${clazz.name.text} to have an inner class declaration`); clazz.name.text} to have an inner class declaration`);
} }
if (innerClass.name === undefined) { if (innerClass.name === undefined) {
throw new Error( throw new Error(
`getInternalNameOfClass() called on a class with an anonymous inner declaration: expected a name on:\n${innerClass.getText()}`); `getInternalNameOfClass() called on a class with an anonymous inner declaration: expected a name on:\n${
innerClass.getText()}`);
} }
return innerClass.name; return innerClass.name;
} }
@ -98,14 +99,15 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
getEndOfClass(classSymbol: NgccClassSymbol): ts.Node { getEndOfClass(classSymbol: NgccClassSymbol): ts.Node {
const iifeBody = getIifeBody(classSymbol.declaration.valueDeclaration); const iifeBody = getIifeBody(classSymbol.declaration.valueDeclaration);
if (!iifeBody) { if (!iifeBody) {
throw new Error( throw new Error(`Compiled class declaration is not inside an IIFE: ${classSymbol.name} in ${
`Compiled class declaration is not inside an IIFE: ${classSymbol.name} in ${classSymbol.declaration.valueDeclaration.getSourceFile().fileName}`); classSymbol.declaration.valueDeclaration.getSourceFile().fileName}`);
} }
const returnStatementIndex = iifeBody.statements.findIndex(ts.isReturnStatement); const returnStatementIndex = iifeBody.statements.findIndex(ts.isReturnStatement);
if (returnStatementIndex === -1) { if (returnStatementIndex === -1) {
throw new Error( throw new Error(
`Compiled class wrapper IIFE does not have a return statement: ${classSymbol.name} in ${classSymbol.declaration.valueDeclaration.getSourceFile().fileName}`); `Compiled class wrapper IIFE does not have a return statement: ${classSymbol.name} in ${
classSymbol.declaration.valueDeclaration.getSourceFile().fileName}`);
} }
// Return the statement before the IIFE return statement // Return the statement before the IIFE return statement
@ -190,7 +192,8 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
getDeclarationOfIdentifier(id: ts.Identifier): Declaration|null { getDeclarationOfIdentifier(id: ts.Identifier): Declaration|null {
const superDeclaration = super.getDeclarationOfIdentifier(id); const superDeclaration = super.getDeclarationOfIdentifier(id);
if (superDeclaration === null || superDeclaration.node === null) { if (superDeclaration === null || superDeclaration.node === null ||
superDeclaration.known !== null) {
return superDeclaration; return superDeclaration;
} }
@ -200,7 +203,7 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
super.getDeclarationOfIdentifier(outerClassNode.name) : super.getDeclarationOfIdentifier(outerClassNode.name) :
superDeclaration; superDeclaration;
if (!declaration || declaration.node === null) { if (declaration === null || declaration.node === null || declaration.known !== null) {
return declaration; return declaration;
} }
@ -257,24 +260,29 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
return {node, body: statements || null, parameters}; return {node, body: statements || null, parameters};
} }
///////////// Protected Helpers /////////////
/** /**
* Resolve a `ts.Symbol` to its declaration and detect whether it corresponds with a known * Check whether a `Declaration` corresponds with a known declaration, such as a TypeScript helper
* TypeScript helper function. * function, and set its `known` property to the appropriate `KnownDeclaration`.
*
* @param decl The `Declaration` to check.
* @return The passed in `Declaration` (potentially enhanced with a `KnownDeclaration`).
*/ */
protected getDeclarationOfSymbol(symbol: ts.Symbol, originalId: ts.Identifier|null): Declaration detectKnownDeclaration(decl: null): null;
|null { detectKnownDeclaration<T extends Declaration>(decl: T): T;
const superDeclaration = super.getDeclarationOfSymbol(symbol, originalId); detectKnownDeclaration<T extends Declaration>(decl: T|null): T|null;
detectKnownDeclaration<T extends Declaration>(decl: T|null): T|null {
decl = super.detectKnownDeclaration(decl);
if (superDeclaration !== null && superDeclaration.node !== null && if (decl !== null && decl.known === null && decl.node !== null) {
superDeclaration.known === null) { decl.known = getTsHelperFnFromDeclaration(decl.node);
superDeclaration.known = getTsHelperFnFromDeclaration(superDeclaration.node);
} }
return superDeclaration; return decl;
} }
///////////// Protected Helpers /////////////
/** /**
* Get the inner function declaration of an ES5-style class. * Get the inner function declaration of an ES5-style class.
* *
@ -368,9 +376,9 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
if (expression && ts.isArrayLiteralExpression(expression)) { if (expression && ts.isArrayLiteralExpression(expression)) {
const elements = expression.elements; const elements = expression.elements;
return elements.map(reflectArrayElement).map(paramInfo => { return elements.map(reflectArrayElement).map(paramInfo => {
const typeExpression = paramInfo && paramInfo.has('type') ? paramInfo.get('type') ! : null; const typeExpression = paramInfo && paramInfo.has('type') ? paramInfo.get('type')! : null;
const decoratorInfo = const decoratorInfo =
paramInfo && paramInfo.has('decorators') ? paramInfo.get('decorators') ! : null; paramInfo && paramInfo.has('decorators') ? paramInfo.get('decorators')! : null;
const decorators = decoratorInfo && this.reflectDecorators(decoratorInfo); const decorators = decoratorInfo && this.reflectDecorators(decoratorInfo);
return {typeExpression, decorators}; return {typeExpression, decorators};
}); });
@ -634,7 +642,7 @@ function getReturnIdentifier(body: ts.Block): ts.Identifier|undefined {
return undefined; return undefined;
} }
function getReturnStatement(declaration: ts.Expression | undefined): ts.ReturnStatement|undefined { function getReturnStatement(declaration: ts.Expression|undefined): ts.ReturnStatement|undefined {
return declaration && ts.isFunctionExpression(declaration) ? return declaration && ts.isFunctionExpression(declaration) ?
declaration.body.statements.find(ts.isReturnStatement) : declaration.body.statements.find(ts.isReturnStatement) :
undefined; undefined;