-import { subscribeToResult } from '../util/subscribeToResult';
-import { OuterSubscriber } from '../OuterSubscriber';
-import { InnerSubscriber } from '../InnerSubscriber';
import { map } from './map';
import { from } from '../observable/from';
+import { SimpleOuterSubscriber, SimpleInnerSubscriber, innerSubscribe } from '../innerSubscribe';
export function mergeMap(project, resultSelector, concurrent = Number.POSITIVE_INFINITY) {
if (typeof resultSelector === 'function') {
return (source) => source.pipe(mergeMap((a, i) => from(project(a, i)).pipe(map((b, ii) => resultSelector(a, b, i, ii))), concurrent));
return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent));
}
}
-export class MergeMapSubscriber extends OuterSubscriber {
+export class MergeMapSubscriber extends SimpleOuterSubscriber {
constructor(destination, project, concurrent = Number.POSITIVE_INFINITY) {
super(destination);
this.project = project;
return;
}
this.active++;
- this._innerSub(result, value, index);
+ this._innerSub(result);
}
- _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) {
this.destination.next(innerValue);
}
- notifyComplete(innerSub) {
+ notifyComplete() {
const buffer = this.buffer;
- this.remove(innerSub);
this.active--;
if (buffer.length > 0) {
this._next(buffer.shift());