Update peer dependencies (#5)

* update peerDeps

* add more tests

* more tests

* up version

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.1
+
+Enhancements:
+
+  - Update peer dependencies
+  - Add more tests
+
 ## 1.0.0
 
 Release:

apps/web/src/app/lazy/lazy.component.ts

@@ -26,7 +26,11 @@ export class LazyComponent implements OnDestroy {
       .pipe(takeUntil(this.unsub.destroy$))
       .subscribe(num => console.log(`LazyComponent - takeUntil - ${num}`));
 
-    this.unsub.autoUnsubscribe([this.customSub$]);
+    this.customSub2$ = interval(2000).subscribe(num =>
+      console.log(`LazyComponent - customSub2$ - ${num}`)
+    );
+
+    this.unsub.autoUnsubscribe([this.customSub$, this.customSub2$]);
   }
 
   ngOnDestroy() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nwx/unsub",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/neekware/nwx-unsub.git"

pkgs/unsub/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nwx/unsub",
-  "description": "A simple subscription clean up module for Angular applications",
+  "description": "A simple subscription clean up library for Angular applications",
   "peerDependencies": {
-    "@angular/core": "^6.0.0",
-    "rxjs": "^6.0.0"
+    "@angular/core": ">=5.0.0 <8.0.0",
+    "rxjs": ">=6.0.0 || ^5.6.0-forward-compat.4"
   }
 }

pkgs/unsub/src/unsub.service.ts

@@ -22,11 +22,11 @@ export class UnsubService implements OnDestroy {
   /**
    * Registers all subscriptions that need auto cancellation on destroy
    */
-  autoUnsubscribe(subscriptions: Subscription | Subscription[]) {
-    if (Array.isArray(subscriptions)) {
-      this.subscriptions = [...this.subscriptions, ...subscriptions];
+  autoUnsubscribe(subscription: Subscription | Subscription[]) {
+    if (Array.isArray(subscription)) {
+      this.subscriptions = [...this.subscriptions, ...subscription];
     } else {
-      this.subscriptions.push(subscriptions);
+      this.subscriptions.push(subscription);
     }
   }
 

pkgs/unsub/tst/unsub.decorator.spec.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at http://neekware.com/license/MIT.html
  */
 
-import { Unsubscribable } from '../src/unsub.decorators';
-import { Subject } from 'rxjs';
 import { OnDestroy } from '@angular/core';
+import { Subject } from 'rxjs';
+import { Unsubscribable } from '../src/unsub.decorators';
 
 const mockSub1 = {
   unsubscribe: () => {
@@ -43,6 +43,20 @@ describe('@Unsubscribable', () => {
     expect(destroySpy).toHaveBeenCalled();
   });
 
+  it('should call ngOnDestroy of super if exists', () => {
+    @Unsubscribable()
+    class UnsubComponent implements OnDestroy {
+      ngOnDestroy() {
+        console.log('ngOnDestroy of super called');
+      }
+    }
+
+    const comp = new UnsubComponent();
+    const logSpy = spyOn(console, 'log');
+    comp['ngOnDestroy']();
+    expect(logSpy).toHaveBeenCalled();
+  });
+
   it('should throw on missing destroy$', () => {
     @Unsubscribable({
       takeUntilInputName: 'destroy$'

pkgs/unsub/tst/unsub.service.spec.ts

@@ -18,6 +18,12 @@ const mockSub1 = {
   }
 };
 
+const mockSub2 = {
+  unsubscribe: () => {
+    console.log('Sub2 cancelled');
+  }
+};
+
 describe('UnsubService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -38,22 +44,31 @@ describe('UnsubService', () => {
       expect(service.destroy$).toBeDefined();
       expect(service.subscriptions).toBeDefined();
       expect(service.autoUnsubscribe).toBeDefined();
-      expect(service.autoUnsubscribe).toBeDefined();
       expect(service.ngOnDestroy).toBeDefined();
     })
   );
 
   it(
-    'should have functional autoUnsubscribe',
+    'autoUnsubscribe() should accept subscriptions objects',
     inject([UnsubService], (service: UnsubService) => {
-      const sub$ = mockSub1;
-      service.autoUnsubscribe(<Subscription>sub$);
+      const sub1$ = mockSub1 as Subscription;
+      service.autoUnsubscribe(sub1$);
       expect(service.subscriptions.length).toBe(1);
     })
   );
 
   it(
-    'should complete destroy$ onDestroy',
+    'autoUnsubscribe() should accept a list of subscriptions',
+    inject([UnsubService], (service: UnsubService) => {
+      const sub1$ = mockSub1 as Subscription;
+      const sub2$ = mockSub2 as Subscription;
+      service.autoUnsubscribe([sub1$, sub2$]);
+      expect(service.subscriptions.length).toBe(2);
+    })
+  );
+
+  it(
+    'ngOnDestroy() should complete destroy$',
     inject([UnsubService], (service: UnsubService) => {
       const completeSpy = spyOn(service.destroy$, 'complete');
       service.ngOnDestroy();
@@ -62,14 +77,26 @@ describe('UnsubService', () => {
   );
 
   it(
-    'should have cancelled sub$ onDestroy',
+    'ngOnDestroy() should have cancelled subscriptions',
     inject([UnsubService], (service: UnsubService) => {
-      const sub$ = mockSub1;
-      service.autoUnsubscribe(<Subscription>sub$);
+      const sub1$ = mockSub1 as Subscription;
+      service.autoUnsubscribe(sub1$);
+      const sub2$ = mockSub1 as Subscription;
+      service.autoUnsubscribe(sub2$);
       const logSpy = spyOn(console, 'log');
       service.ngOnDestroy();
       expect(logSpy).toHaveBeenCalled();
     })
   );
 
+  it(
+    'ngOnDestroy() should handle invalid subscriptions',
+    inject([UnsubService], (service: UnsubService) => {
+      const sub1$ = {} as Subscription;
+      service.autoUnsubscribe([sub1$]);
+      const logSpy = spyOn(console, 'log');
+      service.ngOnDestroy();
+      expect(logSpy).not.toHaveBeenCalled();
+    })
+  );
 });