feat(EffectsSubscription): Add child subscriptions to parent

Parent feature modules using the effects subscription can now stop all child effects

Author: MikeRyanDev

spec/effects-subscription.spec.ts

@@ -0,0 +1,44 @@
+import { ReflectiveInjector } from '@angular/core';
+import { of } from 'rxjs/observable/of';
+import { Effect } from '../src/effects';
+import { EffectsSubscription } from '../src/effects-subscription';
+
+
+describe('Effects Subscription', () => {
+  it('should add itself to a parent subscription if one exists', () => {
+    const observer: any = { next() { } };
+    const root = new EffectsSubscription(observer, null, null);
+
+    spyOn(root, 'add');
+    const child = new EffectsSubscription(observer, root, null);
+
+    expect(root.add).toHaveBeenCalledWith(child);
+  });
+
+  it('should unsubscribe for all effects when destroyed', () => {
+    const observer: any = { next() { } };
+    const subscription = new EffectsSubscription(observer, null, null);
+
+    spyOn(subscription, 'unsubscribe');
+    subscription.ngOnDestroy();
+
+    expect(subscription.unsubscribe).toHaveBeenCalled();
+  });
+
+  it('should merge effects instances and subscribe them to the observer', () => {
+    class Source {
+      @Effect() a$ = of('a');
+      @Effect() b$ = of('b');
+      @Effect() c$ = of('c')
+    }
+    const instance = new Source();
+    const observer: any = { next: jasmine.createSpy('next') };
+
+    const subscription = new EffectsSubscription(observer, null, [ instance ]);
+
+    expect(observer.next).toHaveBeenCalledTimes(3);
+    expect(observer.next).toHaveBeenCalledWith('a');
+    expect(observer.next).toHaveBeenCalledWith('b');
+    expect(observer.next).toHaveBeenCalledWith('c');
+  });
+});

src/effects-subscription.ts

@@ -1,5 +1,6 @@
-import { OpaqueToken, Inject, Optional, Injectable, OnDestroy } from '@angular/core';
+import { OpaqueToken, Inject, SkipSelf, Optional, Injectable, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
+import { Observer } from 'rxjs/Observer';
 import { Subscription } from 'rxjs/Subscription';
 import { merge } from 'rxjs/observable/merge';
 import { mergeEffects } from './effects';
@@ -11,17 +12,22 @@ export const effects = new OpaqueToken('ngrx/effects: Effects');
 @Injectable()
 export class EffectsSubscription extends Subscription implements OnDestroy {
   constructor(
-    private store: Store<any>,
+    @Inject(Store) private store: Observer<Actions>,
+    @Optional() @SkipSelf() public parent: EffectsSubscription,
     @Optional() @Inject(effects) effectInstances?: any[]
   ) {
     super();
 
-    if (effectInstances) {
+    if (Boolean(parent)) {
+      parent.add(this);
+    }
+
+    if (Boolean(effectInstances)) {
       this.addEffects(effectInstances);
     }
   }
 
-  addEffects(effectInstances) {
+  addEffects(effectInstances: any[]) {
     const sources = effectInstances.map(mergeEffects);
     const merged = merge(...sources);