Giant blob of minor changes

[dotfiles/.git] / .config / coc / extensions / node_modules / coc-prettier / node_modules / rxjs / _esm2015 / internal / operators / mergeMap.js

diff --git a/.config/coc/extensions/node_modules/coc-prettier/node_modules/rxjs/_esm2015/internal/operators/mergeMap.js b/.config/coc/extensions/node_modules/coc-prettier/node_modules/rxjs/_esm2015/internal/operators/mergeMap.js
index 248e6b8580b36a5476beac6a19109c1c07d16f83..8b0f45867565f6486a8dd3e3e54a9ff0462e500e 100644 (file)
--- a/.config/coc/extensions/node_modules/coc-prettier/node_modules/rxjs/_esm2015/internal/operators/mergeMap.js
+++ b/.config/coc/extensions/node_modules/coc-prettier/node_modules/rxjs/_esm2015/internal/operators/mergeMap.js
@@ -1,8 +1,6 @@
-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));
@@ -21,7 +19,7 @@ export class MergeMapOperator {
         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;
@@ -50,13 +48,13 @@ export class MergeMapSubscriber extends OuterSubscriber {
             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);
         }
@@ -68,12 +66,11 @@ export class MergeMapSubscriber extends OuterSubscriber {
         }
         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());