fix(rstream): subscription generics if transducer is used

thi-ng · Jan 25, 2018 · 592a242 · 592a242
1 parent 898be34
commit 592a242
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/packages/rstream/src/stream.ts b/packages/rstream/src/stream.ts
@@ -16,9 +16,9 @@ export class Stream<T> extends Subscription<T, T>
         this.src = src;
     }
 
+    subscribe(sub: ISubscriber<T>, id?: string): Subscription<T, T>
     subscribe<C>(xform: Transducer<T, C>, id?: string): Subscription<T, C>;
-    subscribe<C>(sub: ISubscriber<T>, xform: Transducer<T, C>, id?: string): Subscription<T, C>;
-    subscribe(sub: ISubscriber<T>, id?: string): Subscription<T, T>;
+    subscribe<C>(sub: ISubscriber<C>, xform: Transducer<T, C>, id?: string): Subscription<T, C>
     subscribe(...args: any[]) {
         const wrapped = super.subscribe.apply(this, args);
         if (this.subs.length === 1) {
@@ -27,14 +27,6 @@ export class Stream<T> extends Subscription<T, T>
         return wrapped;
     }
 
-    transform<B>(xform: Transducer<T, B>, id?: string): Subscription<T, B> {
-        const wrapped = super.subscribe(xform, id);
-        if (this.subs.length === 1) {
-            this._cancel = (this.src && this.src(this)) || (() => void 0);
-        }
-        return wrapped;
-    }
-
     unsubscribe(sub?: Subscription<T, any>) {
         const res = super.unsubscribe(sub);
         if (res && (!this.subs || !this.subs.length)) {

diff --git a/packages/rstream/src/subscription.ts b/packages/rstream/src/subscription.ts
@@ -36,7 +36,7 @@ export class Subscription<A, B> implements
 
     subscribe(sub: ISubscriber<B>, id?: string): Subscription<B, B>
     subscribe<C>(xform: Transducer<B, C>, id?: string): Subscription<B, C>;
-    subscribe<C>(sub: ISubscriber<B>, xform: Transducer<B, C>, id?: string): Subscription<B, C>
+    subscribe<C>(sub: ISubscriber<C>, xform: Transducer<B, C>, id?: string): Subscription<B, C>
     subscribe(...args: any[]) {
         if (this.state < State.DONE) {
             let sub, xform, id;