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

fix(compiler): correctly instantiate eager providers that are used via Injector.get (#19558)

Browse Source 
Closes #15501

PR Close #19558
This commit is contained in:
Tobias Bosch
2017-10-04 09:13:22 -07:00
committed by Chuck Jazdzewski
parent d30ce19231
commit 6ade68cff1
6 changed files with 163 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/src/view/view.ts
View File

@ -284,8 +284,11 @@ function createViewNodes(view: ViewData) {
case NodeFlags.TypeFactoryProvider:
case NodeFlags.TypeUseExistingProvider:
case NodeFlags.TypeValueProvider: {
const instance = createProviderInstance(view, nodeDef);
nodeData = <ProviderData>{instance};
nodeData = nodes[i];
if (!nodeData && !(nodeDef.flags & NodeFlags.LazyProvider)) {
const instance = createProviderInstance(view, nodeDef);
nodeData = <ProviderData>{instance};
}
break;
}
case NodeFlags.TypePipe: {
@ -294,11 +297,14 @@ function createViewNodes(view: ViewData) {
break;
}
case NodeFlags.TypeDirective: {
const instance = createDirectiveInstance(view, nodeDef);
nodeData = <ProviderData>{instance};
nodeData = nodes[i];
if (!nodeData) {
const instance = createDirectiveInstance(view, nodeDef);
nodeData = <ProviderData>{instance};
}
if (nodeDef.flags & NodeFlags.Component) {
const compView = asElementData(view, nodeDef.parent !.nodeIndex).componentView;
initView(compView, instance, instance);
initView(compView, nodeData.instance, nodeData.instance);
}
break;
}