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

fix(ivy): provided Injector should be instantiated by its factory (#27456)

Browse Source 
(FW-777)

When an Injector is provided, R3Injector instantiates it by calling its
constructor instead of its factory, not resolving dependencies.
With this fix, the ngInjectorDef is checked and the factory is correctly
used if it is found.

PR Close #27456
This commit is contained in:
Marc Laval
2018-12-04 14:34:43 +01:00
committed by Igor Minar
parent 486f69fcac
commit 8973f12ee4
6 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/src/di/r3_injector.ts
View File

@ -166,7 +166,7 @@ export class R3Injector {
if (def && this.injectableDefInScope(def)) {
// Found an ngInjectableDef and it's scoped to this injector. Pretend as if it was here
// all along.
record = makeRecord(injectableDefFactory(token), NOT_YET);
record = makeRecord(injectableDefOrInjectorDefFactory(token), NOT_YET);
this.records.set(token, record);
}
}
@ -339,9 +339,14 @@ export class R3Injector {
}
}
function injectableDefFactory(token: Type<any>| InjectionToken<any>): () => any {
function injectableDefOrInjectorDefFactory(token: Type<any>| InjectionToken<any>): () => any {
const injectableDef = getInjectableDef(token as InjectableType<any>);
if (injectableDef === null) {
const injectorDef = getInjectorDef(token as InjectorType<any>);
if (injectorDef !== null) {
return injectorDef.factory;
}
if (token instanceof InjectionToken) {
throw new Error(`Token ${stringify(token)} is missing an ngInjectableDef definition.`);
}
@ -369,7 +374,7 @@ function providerToRecord(provider: SingleProvider): Record<any> {
export function providerToFactory(provider: SingleProvider): () => any {
let factory: (() => any)|undefined = undefined;
if (isTypeProvider(provider)) {
return injectableDefFactory(resolveForwardRef(provider));
return injectableDefOrInjectorDefFactory(resolveForwardRef(provider));
} else {
if (isValueProvider(provider)) {
factory = () => resolveForwardRef(provider.useValue);
@ -383,7 +388,7 @@ export function providerToFactory(provider: SingleProvider): () => any {
if (hasDeps(provider)) {
factory = () => new (classRef)(...injectArgs(provider.deps));
} else {
return injectableDefFactory(classRef);
return injectableDefOrInjectorDefFactory(classRef);
}
}
}