-import { subscribeToResult } from '../util/subscribeToResult';
-import { OuterSubscriber } from '../OuterSubscriber';
-import { InnerSubscriber } from '../InnerSubscriber';
+import { SimpleOuterSubscriber, SimpleInnerSubscriber, innerSubscribe } from '../innerSubscribe';
export function mergeScan(accumulator, seed, concurrent = Number.POSITIVE_INFINITY) {
return (source) => source.lift(new MergeScanOperator(accumulator, seed, concurrent));
}
return source.subscribe(new MergeScanSubscriber(subscriber, this.accumulator, this.seed, this.concurrent));
}
}
-export class MergeScanSubscriber extends OuterSubscriber {
+export class MergeScanSubscriber extends SimpleOuterSubscriber {
constructor(destination, accumulator, acc, concurrent) {
super(destination);
this.accumulator = accumulator;
return destination.error(e);
}
this.active++;
- this._innerSub(ish, value, index);
+ this._innerSub(ish);
}
else {
this.buffer.push(value);
}
}
- _innerSub(ish, value, index) {
- const innerSubscriber = new InnerSubscriber(this, value, index);
+ _innerSub(ish) {
+ const innerSubscriber = new SimpleInnerSubscriber(this);
const destination = this.destination;
destination.add(innerSubscriber);
- const innerSubscription = subscribeToResult(this, ish, undefined, undefined, innerSubscriber);
+ const innerSubscription = innerSubscribe(ish, innerSubscriber);
if (innerSubscription !== innerSubscriber) {
destination.add(innerSubscription);
}
}
this.unsubscribe();
}
- notifyNext(outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+ notifyNext(innerValue) {
const { destination } = this;
this.acc = innerValue;
this.hasValue = true;
destination.next(innerValue);
}
- notifyComplete(innerSub) {
+ notifyComplete() {
const buffer = this.buffer;
- const destination = this.destination;
- destination.remove(innerSub);
this.active--;
if (buffer.length > 0) {
this._next(buffer.shift());