honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ivy): handle the case where no base factory is found (#25425) 

When an Angular decorated class is inherited, it might be the case that
the entire inheritance chain actually has no constructor defined. In
that event, a factory which simply instantiates the type without any
arguments should be used.

PR Close #25425
This commit is contained in:
Alex Rickabaugh 2018-08-10 11:15:59 +01:00 committed by Ben Lesh
parent c13901f4c8
commit 82e2725154
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core/src/render3/di.ts
View File

@ -777,13 +777,17 @@ export function getFactoryOf<T>(type: Type<any>): ((type?: Type<T>) => T)|null {
} }
export function getInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T { export function getInheritedFactory<T>(type: Type<any>): (type: Type<T>) => T {
debugger;
const proto = Object.getPrototypeOf(type.prototype).constructor as Type<any>; const proto = Object.getPrototypeOf(type.prototype).constructor as Type<any>;
const factory = getFactoryOf<T>(proto); const factory = getFactoryOf<T>(proto);
if (factory === null) { if (factory !== null) {
throw new Error(`Type ${proto.name} does not support inheritance`); return factory;
} else {
// There is no factory defined. Either this was improper usage of inheritance
// (no Angular decorator on the superclass) or there is no constructor at all
// in the inheritance chain. Since the two cases cannot be distinguished, the
// latter has to be assumed.
return (t) => new t();
} }
return factory;
} }
class TemplateRef<T> implements viewEngine.TemplateRef<T> { class TemplateRef<T> implements viewEngine.TemplateRef<T> {