fix(core): avoid eager providers re-initialization

vikerman · vikerman · commit 63754eb2f3ac · 2018-04-26T06:32:52.000-07:00
Fix a corner case where eager providers were getting constructed twice if the provider was requested before the initialization of the NgModule is complete.
diff --git a/packages/core/src/view/ng_module.ts b/packages/core/src/view/ng_module.ts
@@ -68,7 +68,9 @@ export function initNgModule(data: NgModuleData) {
   for (let i = 0; i < def.providers.length; i++) {
     const provDef = def.providers[i];
     if (!(provDef.flags & NodeFlags.LazyProvider)) {
-      providers[i] = _createProviderInstance(data, provDef);
+      if (providers[i] === undefined) {
+        providers[i] = _createProviderInstance(data, provDef);
+      }
     }
   }
 }
diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts
@@ -883,6 +883,35 @@ function declareTests({useJit}: {useJit: boolean}) {
 
           expect(createModule(MyModule).injector.get('eager1')).toBe('v1: v2');
         });
+
+        it('eager providers should get initialized only once', () => {
+          @Injectable()
+          class MyService1 {
+            public innerService: MyService2;
+            constructor(injector: Injector) {
+              // Create MyService2 before it it's initialized by TestModule.
+              this.innerService = injector.get(MyService2);
+            }
+          }
+
+          @Injectable()
+          class MyService2 {
+            constructor() {}
+          }
+
+          @NgModule({
+            providers: [MyService1, MyService2],
+          })
+          class TestModule {
+            constructor(public service1: MyService1, public service2: MyService2) {}
+          }
+
+          const moduleRef = createModule(TestModule, injector);
+          const module = moduleRef.instance;
+
+          // MyService2 should not get initialized twice.
+          expect(module.service1.innerService).toBe(module.service2);
+        });
       });
 
       it('should throw when no provider defined', () => {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,9 @@ export function initNgModule(data: NgModuleData) {`
`68`	`68`	`for (let i = 0; i < def.providers.length; i++) {`
`69`	`69`	`const provDef = def.providers[i];`
`70`	`70`	`if (!(provDef.flags & NodeFlags.LazyProvider)) {`
`71`		`- providers[i] = _createProviderInstance(data, provDef);`
	`71`	`+ if (providers[i] === undefined) {`
	`72`	`+ providers[i] = _createProviderInstance(data, provDef);`
	`73`	`+ }`
`72`	`74`	`}`
`73`	`75`	`}`
`74`	`76`	`}`