@fncts/io 0.0.21 → 0.0.22

package/_mjs/Channel/internal/ChannelExecutor.mjs

@@ -6,26 +6,26 @@ import * as tsplus_module_4 from "@fncts/base/internal/Stack";
 import * as tsplus_module_5 from "@fncts/base/data/Exit/constructors";
 import * as tsplus_module_6 from "@fncts/base/collection/immutable/List/constructors";
 import * as tsplus_module_7 from "@fncts/io/Fiber/api/interrupt";
-import * as tsplus_module_8 from "@fncts/io/IO/api/environment";
-import * as tsplus_module_9 from "@fncts/io/Channel/core-api";
-import * as tsplus_module_10 from "@fncts/base/collection/immutable/Queue/constructors";
-import * as tsplus_module_11 from "@fncts/base/collection/immutable/List/api";
-import * as tsplus_module_12 from "@fncts/base/data/Cause/api";
-import * as tsplus_module_13 from "@fncts/base/collection/immutable/List/definition";
-import * as tsplus_module_14 from "@fncts/base/collection/immutable/List/api/unsafeTail";
-import * as tsplus_module_15 from "@fncts/base/collection/mutable/ListBuffer";
-import * as tsplus_module_16 from "@fncts/io/IO/api/sequenceT";
+import * as tsplus_module_8 from "@fncts/io/IO/api/fork";
+import * as tsplus_module_9 from "@fncts/io/IO/api/environment";
+import * as tsplus_module_10 from "@fncts/io/Channel/core-api";
+import * as tsplus_module_11 from "@fncts/base/collection/immutable/Queue/constructors";
+import * as tsplus_module_12 from "@fncts/base/collection/immutable/List/api";
+import * as tsplus_module_13 from "@fncts/base/data/Cause/api";
+import * as tsplus_module_14 from "@fncts/base/collection/immutable/List/definition";
+import * as tsplus_module_15 from "@fncts/base/collection/immutable/List/api/unsafeTail";
+import * as tsplus_module_16 from "@fncts/base/collection/mutable/ListBuffer";
 import * as tsplus_module_17 from "@fncts/io/IO/api/interrupt";
-import * as tsplus_module_18 from "@fncts/base/data/Maybe/api";
-import * as tsplus_module_19 from "@fncts/base/data/Maybe/destructors";
-import * as tsplus_module_20 from "@fncts/io/Channel/UpstreamPullRequest/api";
-import * as tsplus_module_21 from "@fncts/base/data/Maybe/definition";
-import * as tsplus_module_22 from "@fncts/io/Channel/ChildExecutorDecision/api";
-import * as tsplus_module_23 from "@fncts/io/Channel/api";
+import * as tsplus_module_18 from "@fncts/io/IO/api/sequenceT";
+import * as tsplus_module_19 from "@fncts/base/data/Maybe/api";
+import * as tsplus_module_20 from "@fncts/base/data/Maybe/destructors";
+import * as tsplus_module_21 from "@fncts/io/Channel/UpstreamPullRequest/api";
+import * as tsplus_module_22 from "@fncts/base/data/Maybe/definition";
+import * as tsplus_module_23 from "@fncts/io/Channel/ChildExecutorDecision/api";
+import * as tsplus_module_24 from "@fncts/io/Channel/api";
 import { identity } from "@fncts/base/data/function";
 import { concrete, concreteContinuation, ContinuationFinalizer } from "@fncts/io/Channel/definition";
 import * as State from "@fncts/io/Channel/internal/ChannelState";
-
 class PullFromUpstream {
   constructor(upstreamExecutor, createChild, lastDone, activeChildExecutors, combineChildResults, combineWithChildResult, onPull, onEmit) {
     this.upstreamExecutor = upstreamExecutor;
@@ -36,9 +36,7 @@ class PullFromUpstream {
     this.combineWithChildResult = combineWithChildResult;
     this.onPull = onPull;
     this.onEmit = onEmit;
-    this._tag = "PullFromUpstream"
-    /* SubexecutorStackTag.PullFromUpstream */
-    ;
+    this._tag = "PullFromUpstream" /* SubexecutorStackTag.PullFromUpstream */;
   }
 
   close(ex) {
@@ -55,38 +53,31 @@ class PullFromUpstream {
         if (next === null) {
           return acc;
         } else {
-          return tsplus_module_2.zipWith(tsplus_module_2.result(next, fileName_1 + ":63:36"), (a, b) => tsplus_module_3.apSecond(b)(a), fileName_1 + ":63:31")(acc);
+          return tsplus_module_2.zipWith(tsplus_module_2.result(next, fileName_1 + ":63:36"), (a, b) => tsplus_module_3.zipRight(b)(a), fileName_1 + ":63:31")(acc);
         }
       }
     })(fins);
-
     if (finalizer) {
       return tsplus_module_2.flatMap(tsplus_module_2.fromExitNow, fileName_1 + ":69:31")(finalizer);
     } else {
       return null;
     }
   }
-
   enqueuePullFromChild(child) {
     return new PullFromUpstream(this.upstreamExecutor, this.createChild, this.lastDone, tsplus_module_1.enqueue(child)(this.activeChildExecutors), this.combineChildResults, this.combineWithChildResult, this.onPull, this.onEmit);
   }
-
 }
-
 class PullFromChild {
   constructor(childExecutor, parentSubexecutor, onEmit) {
     this.childExecutor = childExecutor;
     this.parentSubexecutor = parentSubexecutor;
     this.onEmit = onEmit;
-    this._tag = "PullFromChild"
-    /* SubexecutorStackTag.PullFromChild */
-    ;
+    this._tag = "PullFromChild" /* SubexecutorStackTag.PullFromChild */;
   }
 
   close(ex) {
     const fin1 = this.childExecutor.close(ex);
     const fin2 = this.parentSubexecutor.close(ex);
-
     if (fin1 === null) {
       if (fin2 === null) {
         return null;
@@ -97,17 +88,14 @@ class PullFromChild {
       if (fin2 === null) {
         return fin1;
       } else {
-        return tsplus_module_2.flatMap(tsplus_module_2.fromExitNow, fileName_1 + ":110:81")(tsplus_module_2.zipWith(tsplus_module_2.result(fin2, fileName_1 + ":110:40"), (a, b) => tsplus_module_3.apSecond(b)(a), fileName_1 + ":110:35")(tsplus_module_2.result(fin1, fileName_1 + ":110:20")));
+        return tsplus_module_2.flatMap(tsplus_module_2.fromExitNow, fileName_1 + ":110:81")(tsplus_module_2.zipWith(tsplus_module_2.result(fin2, fileName_1 + ":110:40"), (a, b) => tsplus_module_3.zipRight(b)(a), fileName_1 + ":110:35")(tsplus_module_2.result(fin1, fileName_1 + ":110:20")));
       }
     }
   }
-
   enqueuePullFromChild(_child) {
     return this;
   }
-
 }
-
 class DrainChildExecutors {
   constructor(upstreamExecutor, lastDone, activeChildExecutors, upstreamDone, combineChildResults, combineWithChildResult, onPull) {
     this.upstreamExecutor = upstreamExecutor;
@@ -117,9 +105,7 @@ class DrainChildExecutors {
     this.combineChildResults = combineChildResults;
     this.combineWithChildResult = combineWithChildResult;
     this.onPull = onPull;
-    this._tag = "DrainChildExecutors"
-    /* SubexecutorStackTag.DrainChildExecutors */
-    ;
+    this._tag = "DrainChildExecutors" /* SubexecutorStackTag.DrainChildExecutors */;
   }
 
   close(ex) {
@@ -136,62 +122,46 @@ class DrainChildExecutors {
         if (next === null) {
           return acc;
         } else {
-          return tsplus_module_2.zipWith(tsplus_module_2.result(next, fileName_1 + ":150:36"), (a, b) => tsplus_module_3.apSecond(b)(a), fileName_1 + ":150:31")(acc);
+          return tsplus_module_2.zipWith(tsplus_module_2.result(next, fileName_1 + ":150:36"), (a, b) => tsplus_module_3.zipRight(b)(a), fileName_1 + ":150:31")(acc);
         }
       }
     })(fins);
   }
-
   enqueuePullFromChild(child) {
     return new DrainChildExecutors(this.upstreamExecutor, this.lastDone, tsplus_module_1.enqueue(child)(this.activeChildExecutors), this.upstreamDone, this.combineChildResults, this.combineWithChildResult, this.onPull);
   }
-
 }
-
 class Emit {
   constructor(value, next) {
     this.value = value;
     this.next = next;
-    this._tag = "Emit"
-    /* SubexecutorStackTag.Emit */
-    ;
+    this._tag = "Emit" /* SubexecutorStackTag.Emit */;
   }
 
   close(ex) {
     return this.next !== null ? this.next.close(ex) : null;
   }
-
   enqueuePullFromChild(_child) {
     return this;
   }
-
 }
 /*
  * -------------------------------------------------------------------------------------------------
  * ChannelExecutor
  * -------------------------------------------------------------------------------------------------
  */
-
-
 export function readUpstream(r, cont) {
   const readStack = tsplus_module_4.single(r);
-
   const read = () => {
     const current = readStack.pop();
-
     if (current.upstream === null) {
       return tsplus_module_2.defer(cont, fileName_1 + ":192:22");
     }
-
     const state = current.upstream.run();
-
     switch (state._tag) {
-      case "Emit"
-      /* State.ChannelStateTag.Emit */
-      :
+      case "Emit" /* State.ChannelStateTag.Emit */:
         {
           const emitEffect = current.onEmit(current.upstream.getEmit());
-
           if (readStack.isEmpty) {
             if (emitEffect === null) {
               return tsplus_module_2.defer(() => cont(), fileName_1 + ":200:28");
@@ -206,13 +176,9 @@ export function readUpstream(r, cont) {
             }
           }
         }
-
-      case "Done"
-      /* State.ChannelStateTag.Done */
-      :
+      case "Done" /* State.ChannelStateTag.Done */:
         {
           const doneEffect = current.onDone(current.upstream.getDone());
-
           if (readStack.isEmpty) {
             if (doneEffect === null) {
               return tsplus_module_2.defer(() => cont(), fileName_1 + ":216:28");
@@ -227,10 +193,7 @@ export function readUpstream(r, cont) {
             }
           }
         }
-
-      case "Effect"
-      /* State.ChannelStateTag.Effect */
-      :
+      case "Effect" /* State.ChannelStateTag.Effect */:
         {
           readStack.push(current);
           return tsplus_module_2.flatMap(() => read(), fileName_1 + ":238:19")(tsplus_module_2.catchAllCause(cause => tsplus_module_2.defer(() => {
@@ -238,10 +201,7 @@ export function readUpstream(r, cont) {
             return doneEffect === null ? tsplus_module_2.unit : doneEffect;
           }, fileName_1 + ":233:21"), fileName_1 + ":232:25")(current.onEffect(state.io)));
         }
-
-      case "Read"
-      /* State.ChannelStateTag.Read */
-      :
+      case "Read" /* State.ChannelStateTag.Read */:
         {
           readStack.push(current);
           readStack.push(state);
@@ -249,7 +209,6 @@ export function readUpstream(r, cont) {
         }
     }
   };
-
   return read();
 }
 export class ChannelExecutor {
@@ -265,22 +224,17 @@ export class ChannelExecutor {
     this.closeLastSubstream = null;
     this.currentChannel = initialChannel();
   }
-
   getDone() {
     return this.done;
   }
-
   getEmit() {
     return this.emitted;
   }
-
   cancelWith(exit) {
     this.cancelled = exit;
   }
-
   run() {
     let result = null;
-
     while (result === null) {
       if (this.cancelled !== null) {
         result = this.processCancellation();
@@ -293,68 +247,48 @@ export class ChannelExecutor {
           try {
             void 0;
             const currentChannel = this.currentChannel;
-
             switch (currentChannel._tag) {
-              case "Bridge"
-              /* ChannelTag.Bridge */
-              :
+              case "Bridge" /* ChannelTag.Bridge */:
                 {
                   if (this.input !== null) {
                     const inputExecutor = this.input;
                     this.input = null;
-                    const drainer = tsplus_module_2.apSecond(tsplus_module_2.defer(() => {
+                    const drainer = tsplus_module_2.zipRight(tsplus_module_2.defer(() => {
                       const state = inputExecutor.run();
-
                       switch (state._tag) {
-                        case "Done"
-                        /* State.ChannelStateTag.Done */
-                        :
+                        case "Done" /* State.ChannelStateTag.Done */:
                           {
                             const done = inputExecutor.getDone();
                             return tsplus_module_3.match(cause => currentChannel.input.error(cause), value => currentChannel.input.done(value))(done);
                           }
-
-                        case "Emit"
-                        /* State.ChannelStateTag.Emit */
-                        :
+                        case "Emit" /* State.ChannelStateTag.Emit */:
                           {
                             return tsplus_module_2.flatMap(() => drainer, fileName_1 + ":315:92")(currentChannel.input.emit(inputExecutor.getEmit()));
                           }
-
-                        case "Effect"
-                        /* State.ChannelStateTag.Effect */
-                        :
+                        case "Effect" /* State.ChannelStateTag.Effect */:
                           {
                             return tsplus_module_2.matchCauseIO(cause => currentChannel.input.error(cause), () => drainer, fileName_1 + ":318:59")(state.effect);
                           }
-
-                        case "Read"
-                        /* State.ChannelStateTag.Read */
-                        :
+                        case "Read" /* State.ChannelStateTag.Read */:
                           {
                             return tsplus_module_2.catchAllCause(cause => currentChannel.input.error(cause), fileName_1 + ":324:82")(readUpstream(state, () => drainer));
                           }
                       }
                     }, fileName_1 + ":303:29"), fileName_1 + ":302:94")(currentChannel.input.awaitRead);
                     result = new State.Effect(tsplus_module_2.flatMap(fiber => tsplus_module_2.succeed(() => {
-                      this.addFinalizer(exit => tsplus_module_2.apSecond(tsplus_module_2.defer(() => {
+                      this.addFinalizer(exit => tsplus_module_2.zipRight(tsplus_module_2.defer(() => {
                         const effect = this.restorePipe(exit, inputExecutor);
-
                         if (effect !== null) {
                           return effect;
                         } else {
                           return tsplus_module_2.unit;
                         }
-                      }, fileName_1 + ":336:37"), fileName_1 + ":335:51")(tsplus_module_7.interrupt(fiber, fileName_1 + ":335:32")));
-                    }, fileName_1 + ":333:33"), fileName_1 + ":332:41")(tsplus_module_2.fork(drainer, fileName_1 + ":332:28")));
+                      }, fileName_1 + ":336:37"), fileName_1 + ":335:51")(tsplus_module_7.interrupt(fiber)));
+                    }, fileName_1 + ":333:33"), fileName_1 + ":332:41")(tsplus_module_8.fork(drainer, fileName_1 + ":332:28")));
                   }
-
                   break;
                 }
-
-              case "PipeTo"
-              /* ChannelTag.PipeTo */
-              :
+              case "PipeTo" /* ChannelTag.PipeTo */:
                 {
                   const previousInput = this.input;
                   const leftExec = new ChannelExecutor(currentChannel.left, this.providedEnv, _ => this.executeCloseLastSubstream(_));
@@ -362,7 +296,6 @@ export class ChannelExecutor {
                   this.input = leftExec;
                   this.addFinalizer(exit => {
                     const effect = this.restorePipe(exit, previousInput);
-
                     if (effect !== null) {
                       return effect;
                     } else {
@@ -372,10 +305,7 @@ export class ChannelExecutor {
                   this.currentChannel = currentChannel.right();
                   break;
                 }
-
-              case "Read"
-              /* ChannelTag.Read */
-              :
+              case "Read" /* ChannelTag.Read */:
                 {
                   const read = currentChannel;
                   result = new State.Read(this.input, identity, out => {
@@ -387,44 +317,29 @@ export class ChannelExecutor {
                   });
                   break;
                 }
-
-              case "Done"
-              /* ChannelTag.Done */
-              :
+              case "Done" /* ChannelTag.Done */:
                 {
                   result = this.doneSucceed(currentChannel.terminal());
                   break;
                 }
-
-              case "Halt"
-              /* ChannelTag.Halt */
-              :
+              case "Halt" /* ChannelTag.Halt */:
                 {
                   result = this.doneHalt(currentChannel.cause());
                   break;
                 }
-
-              case "FromIO"
-              /* ChannelTag.FromIO */
-              :
+              case "FromIO" /* ChannelTag.FromIO */:
                 {
-                  const pio = this.providedEnv === null ? currentChannel.io : tsplus_module_8.provideEnvironment(this.providedEnv, fileName_1 + ":398:59")(currentChannel.io);
+                  const pio = this.providedEnv === null ? currentChannel.io : tsplus_module_9.provideEnvironment(this.providedEnv, fileName_1 + ":398:59")(currentChannel.io);
                   result = new State.Effect(tsplus_module_2.matchCauseIO(cause => {
                     const state = this.doneHalt(cause);
-
-                    if (state !== null && state._tag === "Effect"
-                    /* State.ChannelStateTag.Effect */
-                    ) {
+                    if (state !== null && state._tag === "Effect" /* State.ChannelStateTag.Effect */) {
                       return state.effect;
                     } else {
                       return tsplus_module_2.unit;
                     }
                   }, z => {
                     const state = this.doneSucceed(z);
-
-                    if (state !== null && state._tag === "Effect"
-                    /* State.ChannelStateTag.Effect */
-                    ) {
+                    if (state !== null && state._tag === "Effect" /* State.ChannelStateTag.Effect */) {
                       return state.effect;
                     } else {
                       return tsplus_module_2.unit;
@@ -432,70 +347,48 @@ export class ChannelExecutor {
                   }, fileName_1 + ":400:35")(pio));
                   break;
                 }
-
-              case "Defer"
-              /* ChannelTag.Defer */
-              :
+              case "Defer" /* ChannelTag.Defer */:
                 {
                   this.currentChannel = currentChannel.effect();
                   break;
                 }
-
-              case "Emit"
-              /* ChannelTag.Emit */
-              :
+              case "Emit" /* ChannelTag.Emit */:
                 {
                   this.emitted = currentChannel.out();
-                  this.currentChannel = this.activeSubexecutor !== null ? null : tsplus_module_9.endNow(undefined);
+                  this.currentChannel = this.activeSubexecutor !== null ? null : tsplus_module_10.endNow(undefined);
                   result = State._Emit;
                   break;
                 }
-
-              case "Ensuring"
-              /* ChannelTag.Ensuring */
-              :
+              case "Ensuring" /* ChannelTag.Ensuring */:
                 {
                   this.runEnsuring(currentChannel);
                   break;
                 }
-
-              case "ConcatAll"
-              /* ChannelTag.ConcatAll */
-              :
+              case "ConcatAll" /* ChannelTag.ConcatAll */:
                 {
                   const innerExecuteLastClose = f => tsplus_module_2.succeed(() => {
                     const prevLastClose = this.closeLastSubstream === null ? tsplus_module_2.unit : this.closeLastSubstream;
                     this.closeLastSubstream = tsplus_module_2.flatMap(() => f, fileName_1 + ":439:68")(prevLastClose);
                   }, fileName_1 + ":437:29");
-
                   const exec = new ChannelExecutor(() => currentChannel.value, this.providedEnv, innerExecuteLastClose);
                   exec.input = this.input;
-                  this.activeSubexecutor = new PullFromUpstream(exec, currentChannel.k, null, tsplus_module_10.empty(), currentChannel.combineInners, currentChannel.combineAll, currentChannel.onPull, currentChannel.onEmit);
+                  this.activeSubexecutor = new PullFromUpstream(exec, currentChannel.k, null, tsplus_module_11.empty(), currentChannel.combineInners, currentChannel.combineAll, currentChannel.onPull, currentChannel.onEmit);
                   this.closeLastSubstream = null;
                   this.currentChannel = null;
                   break;
                 }
-
-              case "Fold"
-              /* ChannelTag.Fold */
-              :
+              case "Fold" /* ChannelTag.Fold */:
                 {
-                  this.doneStack = tsplus_module_11.prepend(currentChannel.k)(this.doneStack);
+                  this.doneStack = tsplus_module_12.prepend(currentChannel.k)(this.doneStack);
                   this.currentChannel = currentChannel.value;
                   break;
                 }
-
-              case "BracketOut"
-              /* ChannelTag.BracketOut */
-              :
+              case "BracketOut" /* ChannelTag.BracketOut */:
                 {
                   result = this.runBracketOut(currentChannel);
                   break;
                 }
-
-              case "Provide"
-              /* ChannelTag.Provide */
-              :
+              case "Provide" /* ChannelTag.Provide */:
                 {
                   const previousEnv = this.providedEnv;
                   this.providedEnv = currentChannel.environment;
@@ -507,112 +400,91 @@ export class ChannelExecutor {
                 }
             }
           } catch (e) {
-            this.currentChannel = tsplus_module_9.failCauseNow(tsplus_module_12.halt(e));
+            this.currentChannel = tsplus_module_10.failCauseNow(tsplus_module_13.halt(e));
           }
         }
       }
     }
-
     return result;
   }
-
   restorePipe(exit, prev) {
     const currInput = this.input;
     this.input = prev;
     return currInput !== null ? currInput.close(exit) : tsplus_module_2.unit;
   }
-
   popAllFinalizers(exit) {
     /**
      * @tsplus tailrec
      */
     const unwind = (acc, conts) => {
-      if (tsplus_module_13.isEmpty(conts)) {
+      if (tsplus_module_14.isEmpty(conts)) {
         return acc;
       } else {
-        const head = tsplus_module_11.unsafeHead(conts);
+        const head = tsplus_module_12.unsafeHead(conts);
         concreteContinuation(head);
-
-        if (head._tag === "ContinuationK"
-        /* ChannelTag.ContinuationK */
-        ) {
-          return unwind(acc, tsplus_module_14.unsafeTail(conts));
+        if (head._tag === "ContinuationK" /* ChannelTag.ContinuationK */) {
+          return unwind(acc, tsplus_module_15.unsafeTail(conts));
         } else {
-          return unwind(tsplus_module_2.apSecond(tsplus_module_2.result(head.finalizer(exit), fileName_1 + ":509:58"), fileName_1 + ":509:37")(acc), tsplus_module_14.unsafeTail(conts));
+          return unwind(tsplus_module_2.zipRight(tsplus_module_2.result(head.finalizer(exit), fileName_1 + ":509:58"), fileName_1 + ":509:37")(acc), tsplus_module_15.unsafeTail(conts));
         }
       }
     };
-
     const effect = tsplus_module_2.flatMap(tsplus_module_2.fromExitNow, fileName_1 + ":513:92")(unwind(tsplus_module_2.succeedNow(tsplus_module_5.succeed(undefined), fileName_1 + ":513:42"), this.doneStack));
     this.doneStack = tsplus_module_6.nil();
     this.storeInProgressFinalizer(effect);
     return effect;
   }
-
   popNextFinalizers() {
-    const builder = new tsplus_module_15.ListBuffer();
+    const builder = new tsplus_module_16.ListBuffer();
     /**
      * @tsplus tailrec
      */
-
     const go = stack => {
-      if (tsplus_module_13.isEmpty(stack)) {
+      if (tsplus_module_14.isEmpty(stack)) {
         return tsplus_module_6.nil();
       } else {
-        const head = tsplus_module_11.unsafeHead(stack);
+        const head = tsplus_module_12.unsafeHead(stack);
         concreteContinuation(head);
-
-        if (head._tag === "ContinuationK"
-        /* ChannelTag.ContinuationK */
-        ) {
+        if (head._tag === "ContinuationK" /* ChannelTag.ContinuationK */) {
           return stack;
         } else {
           builder.append(head);
-          return go(tsplus_module_14.unsafeTail(stack));
+          return go(tsplus_module_15.unsafeTail(stack));
         }
       }
     };
-
     this.doneStack = go(this.doneStack);
     return builder.toList;
   }
-
   storeInProgressFinalizer(finalizer) {
     this.inProgressFinalizer = finalizer;
   }
-
   clearInProgressFinalizer() {
     this.inProgressFinalizer = null;
   }
-
   ifNotNull(io) {
     return io !== null ? io : tsplus_module_2.unit;
   }
-
   close(exit) {
-    const runInProgressFinalizers = this.inProgressFinalizer !== null ? tsplus_module_2.ensuring(tsplus_module_2.succeed(() => this.clearInProgressFinalizer(), fileName_1 + ":557:55"), fileName_1 + ":557:44")(this.inProgressFinalizer) : null;
+    const runInProgressFinalizers = this.inProgressFinalizer !== null ? tsplus_module_17.ensuring(tsplus_module_2.succeed(() => this.clearInProgressFinalizer(), fileName_1 + ":557:55"), fileName_1 + ":557:44")(this.inProgressFinalizer) : null;
     const closeSubexecutors = this.activeSubexecutor === null ? null : this.activeSubexecutor.close(exit);
     let closeSelf = null;
     const selfFinalizers = this.popAllFinalizers(exit);
-
     if (selfFinalizers !== null) {
-      closeSelf = tsplus_module_2.ensuring(tsplus_module_2.succeed(() => this.clearInProgressFinalizer(), fileName_1 + ":566:53"), fileName_1 + ":566:42")(selfFinalizers);
+      closeSelf = tsplus_module_17.ensuring(tsplus_module_2.succeed(() => this.clearInProgressFinalizer(), fileName_1 + ":566:53"), fileName_1 + ":566:42")(selfFinalizers);
     }
-
     if (closeSubexecutors === null && runInProgressFinalizers === null && closeSelf === null) {
       return null;
     } else {
-      return tsplus_module_2.flatMap(tsplus_module_2.fromExitNow, fileName_1 + ":578:33")(tsplus_module_17.uninterruptible(tsplus_module_2.map(([a, b, c]) => tsplus_module_3.apSecond(c)(tsplus_module_3.apSecond(b)(a)), fileName_1 + ":577:13")(tsplus_module_16.sequenceT(tsplus_module_2.result(this.ifNotNull(closeSubexecutors), fileName_1 + ":573:42"), tsplus_module_2.result(this.ifNotNull(runInProgressFinalizers), fileName_1 + ":574:48"), tsplus_module_2.result(this.ifNotNull(closeSelf), fileName_1 + ":575:34"))), fileName_1 + ":577:55"));
+      return tsplus_module_2.flatMap(tsplus_module_2.fromExitNow, fileName_1 + ":578:33")(tsplus_module_17.uninterruptible(tsplus_module_2.map(([a, b, c]) => tsplus_module_3.zipRight(c)(tsplus_module_3.zipRight(b)(a)), fileName_1 + ":577:13")(tsplus_module_18.sequenceT(tsplus_module_2.result(this.ifNotNull(closeSubexecutors), fileName_1 + ":573:42"), tsplus_module_2.result(this.ifNotNull(runInProgressFinalizers), fileName_1 + ":574:48"), tsplus_module_2.result(this.ifNotNull(closeSelf), fileName_1 + ":575:34"))), fileName_1 + ":577:55"));
     }
   }
-
   processCancellation() {
     this.currentChannel = null;
     this.done = this.cancelled;
     this.cancelled = null;
     return State._Done;
   }
-
   finishSubexecutorWithCloseEffect(subexecDone, ...closeFns) {
     this.addFinalizer(() => tsplus_module_2.foreachDiscard(closeFns, closeFn => tsplus_module_2.flatMap(closeEffect => {
       if (closeEffect !== null) {
@@ -625,41 +497,27 @@ export class ChannelExecutor {
     this.activeSubexecutor = null;
     return state;
   }
-
   runFinalizers(finalizers, exit) {
-    if (tsplus_module_13.isEmpty(finalizers)) {
+    if (tsplus_module_14.isEmpty(finalizers)) {
       return tsplus_module_2.unit;
     }
-
-    return tsplus_module_2.flatMap(tsplus_module_2.fromExitNow, fileName_1 + ":621:15")(tsplus_module_2.map(results => tsplus_module_18.getOrElse(() => tsplus_module_5.unit)(tsplus_module_3.collectAll(results)), fileName_1 + ":620:11")(tsplus_module_2.foreach(finalizers, cont => tsplus_module_2.result(cont(exit), fileName_1 + ":619:55"), fileName_1 + ":619:22")));
+    return tsplus_module_2.flatMap(tsplus_module_2.fromExitNow, fileName_1 + ":621:15")(tsplus_module_2.map(results => tsplus_module_19.getOrElse(() => tsplus_module_5.unit)(tsplus_module_3.collectAll(results)), fileName_1 + ":620:11")(tsplus_module_2.foreach(finalizers, cont => tsplus_module_2.result(cont(exit), fileName_1 + ":619:55"), fileName_1 + ":619:22")));
   }
-
   runSubexecutor() {
     switch (this.activeSubexecutor._tag) {
-      case "PullFromUpstream"
-      /* SubexecutorStackTag.PullFromUpstream */
-      :
+      case "PullFromUpstream" /* SubexecutorStackTag.PullFromUpstream */:
         {
           return this.pullFromUpstream(this.activeSubexecutor);
         }
-
-      case "DrainChildExecutors"
-      /* SubexecutorStackTag.DrainChildExecutors */
-      :
+      case "DrainChildExecutors" /* SubexecutorStackTag.DrainChildExecutors */:
         {
           return this.drainChildExecutors(this.activeSubexecutor);
         }
-
-      case "PullFromChild"
-      /* SubexecutorStackTag.PullFromChild */
-      :
+      case "PullFromChild" /* SubexecutorStackTag.PullFromChild */:
         {
           return this.pullFromChild(this.activeSubexecutor.childExecutor, this.activeSubexecutor.parentSubexecutor, this.activeSubexecutor.onEmit, this.activeSubexecutor);
         }
-
-      case "Emit"
-      /* SubexecutorStackTag.Emit */
-      :
+      case "Emit" /* SubexecutorStackTag.Emit */:
         {
           this.emitted = this.activeSubexecutor.value;
           this.activeSubexecutor = this.activeSubexecutor.next;
@@ -667,28 +525,24 @@ export class ChannelExecutor {
         }
     }
   }
-
   replaceSubexecutor(nextSubExec) {
     this.currentChannel = null;
     this.activeSubexecutor = nextSubExec;
   }
-
   applyUpstreamPullStrategy(upstreamFinished, queue, strategy) {
     switch (strategy._tag) {
       case "PullAfterNext":
         {
-          return [strategy.emitSeparator, !upstreamFinished || tsplus_module_1.exists(_ => _ !== null)(queue) ? tsplus_module_1.prepend(null)(queue) : queue];
+          return [strategy.emitSeparator, !upstreamFinished || tsplus_module_1.some(_ => _ !== null)(queue) ? tsplus_module_1.prepend(null)(queue) : queue];
         }
-
       case "PullAfterAllEnqueued":
         {
-          return [strategy.emitSeparator, !upstreamFinished || tsplus_module_1.exists(_ => _ !== null)(queue) ? tsplus_module_1.enqueue(null)(queue) : queue];
+          return [strategy.emitSeparator, !upstreamFinished || tsplus_module_1.some(_ => _ !== null)(queue) ? tsplus_module_1.enqueue(null)(queue) : queue];
         }
     }
   }
-
   pullFromUpstream(subexec) {
-    return tsplus_module_19.match(() => this.performPullFromUpstream(subexec), ([activeChild, rest]) => {
+    return tsplus_module_20.match(() => this.performPullFromUpstream(subexec), ([activeChild, rest]) => {
       if (activeChild === null) {
         return this.performPullFromUpstream(new PullFromUpstream(subexec.upstreamExecutor, subexec.createChild, subexec.lastDone, rest, subexec.combineChildResults, subexec.combineWithChildResult, subexec.onPull, subexec.onEmit));
       } else {
@@ -697,12 +551,11 @@ export class ChannelExecutor {
       }
     })(tsplus_module_1.dequeue(subexec.activeChildExecutors));
   }
-
   performPullFromUpstream(subexec) {
     return new State.Read(subexec.upstreamExecutor, effect => {
       const closeLast = this.closeLastSubstream === null ? tsplus_module_2.unit : this.closeLastSubstream;
       this.closeLastSubstream = null;
-      return tsplus_module_2.apSecond(effect, fileName_1 + ":720:66")(this.executeCloseLastSubstream(closeLast));
+      return tsplus_module_2.zipRight(effect, fileName_1 + ":720:66")(this.executeCloseLastSubstream(closeLast));
     }, emitted => {
       if (this.closeLastSubstream !== null) {
         const closeLast = this.closeLastSubstream;
@@ -710,29 +563,25 @@ export class ChannelExecutor {
         return tsplus_module_2.map(() => {
           const childExecutor = new ChannelExecutor(() => subexec.createChild(emitted), this.providedEnv, _ => this.executeCloseLastSubstream(_));
           childExecutor.input = this.input;
-          const [emitSeparator, updatedChildExecutors] = this.applyUpstreamPullStrategy(false, subexec.activeChildExecutors, subexec.onPull(tsplus_module_20.pulled(emitted)));
+          const [emitSeparator, updatedChildExecutors] = this.applyUpstreamPullStrategy(false, subexec.activeChildExecutors, subexec.onPull(tsplus_module_21.pulled(emitted)));
           this.activeSubexecutor = new PullFromChild(childExecutor, new PullFromUpstream(subexec.upstreamExecutor, subexec.createChild, subexec.lastDone, updatedChildExecutors, subexec.combineChildResults, subexec.combineWithChildResult, subexec.onPull, subexec.onEmit), subexec.onEmit);
-
-          if (tsplus_module_21.isJust(emitSeparator)) {
+          if (tsplus_module_22.isJust(emitSeparator)) {
             this.activeSubexecutor = new Emit(emitSeparator.value, this.activeSubexecutor);
           }
         }, fileName_1 + ":726:63")(this.executeCloseLastSubstream(closeLast));
       } else {
         const childExecutor = new ChannelExecutor(() => subexec.createChild(emitted), this.providedEnv, _ => this.executeCloseLastSubstream(_));
         childExecutor.input = this.input;
-        const [emitSeparator, updatedChildExecutors] = this.applyUpstreamPullStrategy(false, subexec.activeChildExecutors, subexec.onPull(tsplus_module_20.pulled(emitted)));
+        const [emitSeparator, updatedChildExecutors] = this.applyUpstreamPullStrategy(false, subexec.activeChildExecutors, subexec.onPull(tsplus_module_21.pulled(emitted)));
         this.activeSubexecutor = new PullFromChild(childExecutor, new PullFromUpstream(subexec.upstreamExecutor, subexec.createChild, subexec.lastDone, updatedChildExecutors, subexec.combineChildResults, subexec.combineWithChildResult, subexec.onPull, subexec.onEmit), subexec.onEmit);
-
-        if (tsplus_module_21.isJust(emitSeparator)) {
+        if (tsplus_module_22.isJust(emitSeparator)) {
           this.activeSubexecutor = new Emit(emitSeparator.value, this.activeSubexecutor);
         }
-
         return null;
       }
     }, exit => {
-      if (tsplus_module_1.exists(_ => _ !== null)(subexec.activeChildExecutors)) {
+      if (tsplus_module_1.some(_ => _ !== null)(subexec.activeChildExecutors)) {
         const drain = new DrainChildExecutors(subexec.upstreamExecutor, subexec.lastDone, tsplus_module_1.enqueue(null)(subexec.activeChildExecutors), subexec.upstreamExecutor.getDone(), subexec.combineChildResults, subexec.combineWithChildResult, subexec.onPull);
-
         if (this.closeLastSubstream !== null) {
           const closeLast = this.closeLastSubstream;
           this.closeLastSubstream = null;
@@ -749,21 +598,18 @@ export class ChannelExecutor {
       }
     });
   }
-
   drainChildExecutors(subexec) {
-    return tsplus_module_19.match(() => {
+    return tsplus_module_20.match(() => {
       const lastClose = this.closeLastSubstream;
-
       if (lastClose !== null) {
         this.addFinalizer(_ => lastClose);
       }
-
       return this.finishSubexecutorWithCloseEffect(subexec.upstreamDone, () => lastClose, _ => subexec.upstreamExecutor.close(_));
     }, ([activeChild, rest]) => {
       if (activeChild === null) {
-        const [emitSeparator, remainingExecutors] = this.applyUpstreamPullStrategy(true, rest, subexec.onPull(tsplus_module_20.noUpstream(tsplus_module_1.count(_ => _ !== null)(rest))));
+        const [emitSeparator, remainingExecutors] = this.applyUpstreamPullStrategy(true, rest, subexec.onPull(tsplus_module_21.noUpstream(tsplus_module_1.count(_ => _ !== null)(rest))));
         this.replaceSubexecutor(new DrainChildExecutors(subexec.upstreamExecutor, subexec.lastDone, remainingExecutors, subexec.upstreamExecutor.getDone(), subexec.combineChildResults, subexec.combineWithChildResult, subexec.onPull));
-        return tsplus_module_19.match(() => null, value => {
+        return tsplus_module_20.match(() => null, value => {
           this.emitted = value;
           return new State.Emit();
         })(emitSeparator);
@@ -773,43 +619,34 @@ export class ChannelExecutor {
       }
     })(tsplus_module_1.dequeue(subexec.activeChildExecutors));
   }
-
   pullFromChild(childExecutor, parentSubexecutor, onEmitted, subexec) {
     const handleSubexecFailure = cause => {
       return this.finishSubexecutorWithCloseEffect(tsplus_module_5.failCause(cause), _ => parentSubexecutor.close(_), _ => childExecutor.close(_));
     };
-
     const finishWithDoneValue = doneValue => {
       switch (parentSubexecutor._tag) {
-        case "PullFromUpstream"
-        /* SubexecutorStackTag.PullFromUpstream */
-        :
+        case "PullFromUpstream" /* SubexecutorStackTag.PullFromUpstream */:
           {
             const modifiedParent = new PullFromUpstream(parentSubexecutor.upstreamExecutor, parentSubexecutor.createChild, parentSubexecutor.lastDone !== null ? parentSubexecutor.combineChildResults(parentSubexecutor.lastDone, doneValue) : doneValue, parentSubexecutor.activeChildExecutors, parentSubexecutor.combineChildResults, parentSubexecutor.combineWithChildResult, parentSubexecutor.onPull, parentSubexecutor.onEmit);
             this.closeLastSubstream = childExecutor.close(tsplus_module_5.succeed(doneValue));
             this.replaceSubexecutor(modifiedParent);
             break;
           }
-
-        case "DrainChildExecutors"
-        /* SubexecutorStackTag.DrainChildExecutors */
-        :
+        case "DrainChildExecutors" /* SubexecutorStackTag.DrainChildExecutors */:
           {
             const modifiedParent = new DrainChildExecutors(parentSubexecutor.upstreamExecutor, parentSubexecutor.lastDone !== null ? parentSubexecutor.combineChildResults(parentSubexecutor.lastDone, doneValue) : doneValue, parentSubexecutor.activeChildExecutors, parentSubexecutor.upstreamDone, parentSubexecutor.combineChildResults, parentSubexecutor.combineWithChildResult, parentSubexecutor.onPull);
             this.closeLastSubstream = childExecutor.close(tsplus_module_5.succeed(doneValue));
             this.replaceSubexecutor(modifiedParent);
             break;
           }
-
         default:
           {
             throw new Error("Bug: this should not get here");
           }
       }
     };
-
     return new State.Read(childExecutor, identity, emitted => {
-      tsplus_module_22.match(() => void 0, doneValue => finishWithDoneValue(doneValue), () => {
+      tsplus_module_23.match(() => void 0, doneValue => finishWithDoneValue(doneValue), () => {
         const modifiedParent = parentSubexecutor.enqueuePullFromChild(subexec);
         this.replaceSubexecutor(modifiedParent);
       })(onEmitted(emitted));
@@ -820,94 +657,78 @@ export class ChannelExecutor {
       return null;
     })(exit));
   }
-
   doneSucceed(z) {
-    if (tsplus_module_13.isEmpty(this.doneStack)) {
+    if (tsplus_module_14.isEmpty(this.doneStack)) {
       this.done = tsplus_module_5.succeed(z);
       this.currentChannel = null;
       return State._Done;
     }
-
-    const head = tsplus_module_11.unsafeHead(this.doneStack);
+    const head = tsplus_module_12.unsafeHead(this.doneStack);
     concreteContinuation(head);
-
-    if (head._tag === "ContinuationK"
-    /* ChannelTag.ContinuationK */
-    ) {
-      this.doneStack = tsplus_module_14.unsafeTail(this.doneStack);
+    if (head._tag === "ContinuationK" /* ChannelTag.ContinuationK */) {
+      this.doneStack = tsplus_module_15.unsafeTail(this.doneStack);
       this.currentChannel = head.onSuccess(z);
       return null;
     } else {
       const finalizers = this.popNextFinalizers();
-
-      if (tsplus_module_13.isEmpty(this.doneStack)) {
+      if (tsplus_module_14.isEmpty(this.doneStack)) {
         this.doneStack = finalizers;
         this.done = tsplus_module_5.succeed(z);
         this.currentChannel = null;
         return State._Done;
       } else {
-        const finalizerEffect = this.runFinalizers(tsplus_module_11.map(_ => _.finalizer)(finalizers), tsplus_module_5.succeed(z));
+        const finalizerEffect = this.runFinalizers(tsplus_module_12.map(_ => _.finalizer)(finalizers), tsplus_module_5.succeed(z));
         this.storeInProgressFinalizer(finalizerEffect);
-        return new State.Effect(tsplus_module_2.flatMap(() => tsplus_module_2.succeed(() => this.doneSucceed(z), fileName_1 + ":1002:54"), fileName_1 + ":1002:37")(tsplus_module_17.uninterruptible(tsplus_module_2.ensuring(tsplus_module_2.succeed(() => {
+        return new State.Effect(tsplus_module_2.flatMap(() => tsplus_module_2.succeed(() => this.doneSucceed(z), fileName_1 + ":1002:54"), fileName_1 + ":1002:37")(tsplus_module_17.uninterruptible(tsplus_module_17.ensuring(tsplus_module_2.succeed(() => {
           this.clearInProgressFinalizer();
         }, fileName_1 + ":998:25"), fileName_1 + ":997:22")(finalizerEffect), fileName_1 + ":1001:14")));
       }
     }
   }
-
   doneHalt(cause) {
-    if (tsplus_module_13.isEmpty(this.doneStack)) {
+    if (tsplus_module_14.isEmpty(this.doneStack)) {
       this.done = tsplus_module_5.failCause(cause);
       this.currentChannel = null;
       return State._Done;
     }
-
-    const head = tsplus_module_11.unsafeHead(this.doneStack);
+    const head = tsplus_module_12.unsafeHead(this.doneStack);
     concreteContinuation(head);
-
-    if (head._tag === "ContinuationK"
-    /* ChannelTag.ContinuationK */
-    ) {
-      this.doneStack = tsplus_module_14.unsafeTail(this.doneStack);
+    if (head._tag === "ContinuationK" /* ChannelTag.ContinuationK */) {
+      this.doneStack = tsplus_module_15.unsafeTail(this.doneStack);
       this.currentChannel = head.onHalt(cause);
       return null;
     } else {
       const finalizers = this.popNextFinalizers();
-
-      if (tsplus_module_13.isEmpty(this.doneStack)) {
+      if (tsplus_module_14.isEmpty(this.doneStack)) {
         this.doneStack = finalizers;
         this.done = tsplus_module_5.failCause(cause);
         this.currentChannel = null;
         return State._Done;
       } else {
-        const finalizerEffect = this.runFinalizers(tsplus_module_11.map(_ => _.finalizer)(finalizers), tsplus_module_5.failCause(cause));
+        const finalizerEffect = this.runFinalizers(tsplus_module_12.map(_ => _.finalizer)(finalizers), tsplus_module_5.failCause(cause));
         this.storeInProgressFinalizer(finalizerEffect);
-        return new State.Effect(tsplus_module_2.flatMap(() => tsplus_module_2.succeed(() => this.doneHalt(cause), fileName_1 + ":1042:54"), fileName_1 + ":1042:37")(tsplus_module_17.uninterruptible(tsplus_module_2.ensuring(tsplus_module_2.succeed(() => {
+        return new State.Effect(tsplus_module_2.flatMap(() => tsplus_module_2.succeed(() => this.doneHalt(cause), fileName_1 + ":1042:54"), fileName_1 + ":1042:37")(tsplus_module_17.uninterruptible(tsplus_module_17.ensuring(tsplus_module_2.succeed(() => {
           this.clearInProgressFinalizer();
         }, fileName_1 + ":1038:25"), fileName_1 + ":1037:22")(finalizerEffect), fileName_1 + ":1041:14")));
       }
     }
   }
-
   addFinalizer(f) {
-    this.doneStack = tsplus_module_11.prepend(new ContinuationFinalizer(f))(this.doneStack);
+    this.doneStack = tsplus_module_12.prepend(new ContinuationFinalizer(f))(this.doneStack);
   }
-
   runBracketOut(bracketOut) {
     return new State.Effect(tsplus_module_17.uninterruptibleMask(({
       restore
     }) => tsplus_module_2.matchCauseIO(cause => tsplus_module_2.succeed(() => {
-      this.currentChannel = tsplus_module_9.failCause(() => cause);
+      this.currentChannel = tsplus_module_10.failCause(() => cause);
     }, fileName_1 + ":1057:23"), out => tsplus_module_2.succeed(() => {
       this.addFinalizer(e => bracketOut.finalizer(out, e));
-      this.currentChannel = tsplus_module_23.write(() => out);
-    }, fileName_1 + ":1061:23"), fileName_1 + ":1055:49")(restore(bracketOut.acquire)), fileName_1 + ":1054:29"));
+      this.currentChannel = tsplus_module_24.write(() => out);
+    }, fileName_1 + ":1061:23"), fileName_1 + ":1055:49")(restore(bracketOut.acquire))));
   }
-
   runEnsuring(ensuring) {
     this.addFinalizer(ensuring.finalizer);
     this.currentChannel = ensuring.channel;
   }
-
 }
 //# sourceMappingURL=ChannelExecutor.mjs.map