Merge pull request #32 from tusharmath/composite-subscription-linkedlist

Composite subscription linkedlist

Author: tusharmath

src/lib/CompositeSubscription.ts

@@ -1,26 +1,31 @@
-import {ISubscription} from '../types/core/ISubscription'
 /**
  * Created by tushar.mathur on 12/10/16.
  */
 
+import {ISubscription} from '../types/core/ISubscription'
+import {LinkedList, Node} from './LinkedList'
 
-const propClosed = (x: ISubscription) => x.closed
+const unsubscribe = (x: ISubscription) => x.unsubscribe()
 
 export class CompositeSubscription implements ISubscription {
-  constructor (private subscriptions: ISubscription[] = []) {
+  public closed = false
+  private subscriptions: LinkedList<ISubscription>
+
+  constructor () {
+    this.subscriptions = new LinkedList<ISubscription>()
   }
 
   add (d: ISubscription) {
-    this.subscriptions.push(d)
+    return this.subscriptions.add(d)
   }
 
-  unsubscribe (): void {
-    for (var i = 0; i < this.subscriptions.length; i++) {
-      this.subscriptions[i].unsubscribe()
-    }
+  remove (d: Node<ISubscription>) {
+    d.value.unsubscribe()
+    return this.subscriptions.remove(d)
   }
 
-  get closed (): boolean {
-    return this.subscriptions.map(propClosed).every(Boolean)
+  unsubscribe (): void {
+    this.subscriptions.forEach(unsubscribe)
+    this.closed = true
   }
 }

src/lib/LinkedList.ts

@@ -4,12 +4,12 @@
 
 
 export class Node<T> {
-  public left: Node<T> | null
-  public right: Node<T> | null
+  public left: Node<T> | undefined
+  public right: Node<T> | undefined
 
   constructor (public value: T) {
-    this.right = null
-    this.left = null
+    this.right = undefined
+    this.left = undefined
   }
 
   static of <T> (val: T) {
@@ -19,11 +19,11 @@ export class Node<T> {
 
 export class LinkedList<T> {
   public length: number
-  private __head: Node<T> | null
+  private __head: Node<T> | undefined
 
   constructor () {
     this.length = 0
-    this.__head = null
+    this.__head = undefined
   }
 
   element () {
@@ -58,12 +58,12 @@ export class LinkedList<T> {
     }
     else if (n.left) {
       this.__head = n.left
-      n.left.right = null
+      n.left.right = undefined
     }
     else if (n.right) {
-      n.right.left = null
+      n.right.left = undefined
     } else {
-      this.__head = null
+      this.__head = undefined
     }
     this.length--
   }