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

fix(compiler): do not consider a reference with members as a reference (#19454)

Browse Source 
Fixes: #18170
This commit is contained in:
Chuck Jazdzewski
2017-09-28 10:52:52 -07:00
committed by Victor Berchet
parent 2b84b86fc0
commit b3db3f80ba
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/compiler/src/aot/static_reflector.ts
View File

@ -417,7 +417,9 @@ export class StaticReflector implements CompileReflector {
for (const item of (<any>expression)) {
// Check for a spread expression
if (item && item.__symbolic === 'spread') {
const spreadArray = simplify(item.expression);
// We call with references as 0 because we require the actual value and cannot
// tolerate a reference here.
const spreadArray = simplifyInContext(context, item.expression, depth, 0);
if (Array.isArray(spreadArray)) {
for (const spreadItem of spreadArray) {
result.push(spreadItem);
@ -434,9 +436,10 @@ export class StaticReflector implements CompileReflector {
return result;
}
if (expression instanceof StaticSymbol) {
// Stop simplification at builtin symbols or if we are in a reference context
// Stop simplification at builtin symbols or if we are in a reference context and
// the symbol doesn't have members.
if (expression === self.injectionToken || self.conversionMap.has(expression) ||
references > 0) {
(references > 0 && !expression.members.length)) {
return expression;
} else {
const staticSymbol = expression;