-/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber PURE_IMPORTS_END */
+/** PURE_IMPORTS_START tslib,_innerSubscribe PURE_IMPORTS_END */
import * as tslib_1 from "tslib";
-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) {
if (concurrent === void 0) {
concurrent = Number.POSITIVE_INFINITY;
return destination.error(e);
}
this.active++;
- this._innerSub(ish, value, index);
+ this._innerSub(ish);
}
else {
this.buffer.push(value);
}
};
- MergeScanSubscriber.prototype._innerSub = function (ish, value, index) {
- var innerSubscriber = new InnerSubscriber(this, value, index);
+ MergeScanSubscriber.prototype._innerSub = function (ish) {
+ var innerSubscriber = new SimpleInnerSubscriber(this);
var destination = this.destination;
destination.add(innerSubscriber);
- var innerSubscription = subscribeToResult(this, ish, undefined, undefined, innerSubscriber);
+ var innerSubscription = innerSubscribe(ish, innerSubscriber);
if (innerSubscription !== innerSubscriber) {
destination.add(innerSubscription);
}
}
this.unsubscribe();
};
- MergeScanSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+ MergeScanSubscriber.prototype.notifyNext = function (innerValue) {
var destination = this.destination;
this.acc = innerValue;
this.hasValue = true;
destination.next(innerValue);
};
- MergeScanSubscriber.prototype.notifyComplete = function (innerSub) {
+ MergeScanSubscriber.prototype.notifyComplete = function () {
var buffer = this.buffer;
- var destination = this.destination;
- destination.remove(innerSub);
this.active--;
if (buffer.length > 0) {
this._next(buffer.shift());
}
};
return MergeScanSubscriber;
-}(OuterSubscriber));
+}(SimpleOuterSubscriber));
export { MergeScanSubscriber };
//# sourceMappingURL=mergeScan.js.map