refactor(rstream): update StreamMerge method args

thi-ng · Jul 26, 2020 · da648af · da648af
1 parent 0a182b0
commit da648af
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/packages/rstream/src/stream-merge.ts b/packages/rstream/src/stream-merge.ts
@@ -81,13 +81,8 @@ export class StreamMerge<A, B> extends Subscription<A, B> {
             src,
             src.subscribe(
                 {
-                    next: (x) => {
-                        if (x instanceof Subscription) {
-                            this.add(x);
-                        } else {
-                            this.next(x);
-                        }
-                    },
+                    next: (x) =>
+                        x instanceof Subscription ? this.add(x) : this.next(x),
                     done: () => this.markDone(src),
                     __owner: this,
                 },
@@ -96,7 +91,7 @@ export class StreamMerge<A, B> extends Subscription<A, B> {
         );
     }
 
-    addAll(src: ISubscribable<A>[]) {
+    addAll(src: Iterable<ISubscribable<A>>) {
         for (let s of src) {
             this.add(s);
         }
@@ -121,15 +116,15 @@ export class StreamMerge<A, B> extends Subscription<A, B> {
         return false;
     }
 
-    removeAll(src: ISubscribable<A>[]) {
+    removeAll(src: Iterable<ISubscribable<A>>) {
         let ok = true;
         for (let s of src) {
             ok = this.remove(s) && ok;
         }
         return ok;
     }
 
-    removeAllIDs(ids: string[]) {
+    removeAllIDs(ids: Iterable<string>) {
         let ok = true;
         for (let id of ids) {
             ok = this.removeID(id) && ok;