@fncts/io 0.0.21 → 0.0.22

package/_cjs/Sink/api.cjs

@@ -3,10 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.apFirst = apFirst;
-exports.apFirstC = apFirstC;
-exports.apSecond = apSecond;
-exports.apSecondC = apSecondC;
 exports.as = as;
 exports.collectAll = collectAll;
 exports.collectAllWhileWith = void 0;
@@ -77,74 +73,47 @@ exports.timed = timed;
 exports.unwrapScoped = exports.unwrap = void 0;
 exports.zip = zip;
 exports.zipC = zipC;
+exports.zipLeft = zipLeft;
+exports.zipLeftC = zipLeftC;
+exports.zipRight = zipRight;
+exports.zipRightC = zipRightC;
 exports.zipWithC = exports.zipWith = void 0;
-
 var tsplus_module_1 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/Conc/api/empty"));
-
 var tsplus_module_2 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/Conc/api"));
-
 var tsplus_module_3 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Sink/definition"));
-
 var tsplus_module_4 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Channel/api"));
-
 var tsplus_module_5 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Channel/core-api"));
-
-var tsplus_module_6 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Ref/constructors"));
-
-var tsplus_module_7 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/IO/api"));
-
-var tsplus_module_8 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/collection/immutable/Conc/mapIO"));
-
-var tsplus_module_9 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/collection/immutable/Conc/dropUntilIO"));
-
-var tsplus_module_10 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/collection/immutable/Conc/dropWhileIO"));
-
-var tsplus_module_11 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/IO/api/environment"));
-
-var tsplus_module_12 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/function/api"));
-
-var tsplus_module_13 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/collection/immutable/Conc/filterIO"));
-
-var tsplus_module_14 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/constructors"));
-
-var tsplus_module_15 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Either/destructors"));
-
-var tsplus_module_16 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/IO/api/acquireRelease"));
-
-var tsplus_module_17 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Cause/api"));
-
-var tsplus_module_18 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/definition"));
-
-var tsplus_module_19 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/destructors"));
-
-var tsplus_module_20 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/Conc"));
-
-var tsplus_module_21 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/Conc/constructors"));
-
-var tsplus_module_22 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Either/api"));
-
-var tsplus_module_23 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Either/constructors"));
-
-var tsplus_module_24 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Channel/internal/MergeDecision"));
-
-var tsplus_module_25 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Channel/api/mergeWith"));
-
-var tsplus_module_26 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Hub/constructors"));
-
-var tsplus_module_27 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/Iterable/api"));
-
-var tsplus_module_28 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Clock/api"));
-
-var tsplus_module_29 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Duration/api"));
-
-var tsplus_module_30 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Exit/api"));
-
+var tsplus_module_6 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Ref/api/set"));
+var tsplus_module_7 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Ref/api/get"));
+var tsplus_module_8 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Ref/constructors"));
+var tsplus_module_9 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/IO/api"));
+var tsplus_module_10 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/collection/immutable/Conc/mapIO"));
+var tsplus_module_11 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/collection/immutable/Conc/dropUntilIO"));
+var tsplus_module_12 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/collection/immutable/Conc/dropWhileIO"));
+var tsplus_module_13 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/IO/api/environment"));
+var tsplus_module_14 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/function/api"));
+var tsplus_module_15 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/collection/immutable/Conc/filterIO"));
+var tsplus_module_16 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/constructors"));
+var tsplus_module_17 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Either/destructors"));
+var tsplus_module_18 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Queue/api/operations"));
+var tsplus_module_19 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/IO/api/acquireRelease"));
+var tsplus_module_20 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Cause/api"));
+var tsplus_module_21 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/definition"));
+var tsplus_module_22 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/destructors"));
+var tsplus_module_23 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/Conc"));
+var tsplus_module_24 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/Conc/constructors"));
+var tsplus_module_25 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Either/api"));
+var tsplus_module_26 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Either/constructors"));
+var tsplus_module_27 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Channel/internal/MergeDecision"));
+var tsplus_module_28 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Channel/api/mergeWith"));
+var tsplus_module_29 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Hub/api"));
+var tsplus_module_30 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/Iterable/api"));
+var tsplus_module_31 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/io/Clock/api"));
+var tsplus_module_32 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Duration/api"));
+var tsplus_module_33 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Exit/api"));
 var _AtomicReference = /*#__PURE__*/require("@fncts/base/internal/AtomicReference");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const fileName_1 = "(@fncts/io) src/Sink/api.ts";
 const collectAllWhileWith = collectAllWhileWith_1;
 exports.collectAllWhileWith = collectAllWhileWith;
@@ -216,13 +185,12 @@ const zipWith = zipWith_1;
 exports.zipWith = zipWith;
 const zipWithC = zipWithC_1;
 exports.zipWithC = zipWithC;
-
 /**
  * Like {@link zip}, but keeps only the result from this sink
  *
- * @tsplus pipeable fncts.io.Sink apFirst
+ * @tsplus pipeable fncts.io.Sink zipLeft
  */
-function apFirst(that, __tsplusTrace) {
+function zipLeft(that, __tsplusTrace) {
   return self => {
     return zipWith_1(that, (z, _) => z, __tsplusTrace)(() => self);
   };
@@ -230,11 +198,9 @@ function apFirst(that, __tsplusTrace) {
 /**
  * Like {@link zipC}, but keeps only the result from this sink
  *
- * @tsplus pipeable fncts.io.Sink apFirstC
+ * @tsplus pipeable fncts.io.Sink zipLeftC
  */
-
-
-function apFirstC(that, __tsplusTrace) {
+function zipLeftC(that, __tsplusTrace) {
   return self => {
     return zipWithC_1(that, (z, _) => z, __tsplusTrace)(() => self);
   };
@@ -242,11 +208,9 @@ function apFirstC(that, __tsplusTrace) {
 /**
  * Like {@link zip}, but keeps only the result from the `that` sink
  *
- * @tsplus pipeable fncts.io.Sink apSecond
+ * @tsplus pipeable fncts.io.Sink zipRight
  */
-
-
-function apSecond(that, __tsplusTrace) {
+function zipRight(that, __tsplusTrace) {
   return self => {
     return zipWith_1(that, (_, z1) => z1, __tsplusTrace)(() => self);
   };
@@ -254,11 +218,9 @@ function apSecond(that, __tsplusTrace) {
 /**
  * Like {@link zipC}, but keeps only the result from the `that` sink
  *
- * @tsplus pipeable fncts.io.Sink apSecondC
+ * @tsplus pipeable fncts.io.Sink zipRightC
  */
-
-
-function apSecondC(that, __tsplusTrace) {
+function zipRightC(that, __tsplusTrace) {
   return self => {
     return zipWithC_1(that, (_, z1) => z1, __tsplusTrace)(() => self);
   };
@@ -268,8 +230,6 @@ function apSecondC(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink as
  */
-
-
 function as(z, __tsplusTrace) {
   return self => {
     return map_1(() => z(), __tsplusTrace)(self);
@@ -280,8 +240,6 @@ function as(z, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink collectAll
  */
-
-
 function collectAll(__tsplusTrace) {
   return self => {
     return collectAllWhileWith_1(() => tsplus_module_1.empty(), () => true, (s, z) => tsplus_module_2.append(z)(s), __tsplusTrace)(self);
@@ -294,28 +252,24 @@ function collectAll(__tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink collectAllWhileWith
  */
-
-
 function collectAllWhileWith_1(z, p, f, __tsplusTrace) {
   return self => {
     return new tsplus_module_3.Sink(tsplus_module_5.flatMap(([leftoversRef, upstreamDoneRef]) => {
-      const upstreamMarker = tsplus_module_4.readWith(inp => tsplus_module_5.apSecond(upstreamMarker)(tsplus_module_4.writeNow(inp)), tsplus_module_4.failNow, x => tsplus_module_4.as_(() => x)(tsplus_module_4.fromIO(() => upstreamDoneRef.set(true, __tsplusTrace))));
-
+      const upstreamMarker = tsplus_module_4.readWith(inp => tsplus_module_5.zipRight(upstreamMarker)(tsplus_module_4.writeNow(inp)), tsplus_module_4.failNow, x => tsplus_module_4.as_(() => x)(tsplus_module_4.fromIO(() => tsplus_module_6.set(true, __tsplusTrace)(upstreamDoneRef))));
       function loop(currentResult, __tsplusTrace) {
         return tsplus_module_4.matchChannel(tsplus_module_4.failNow, ([leftovers, doneValue]) => {
           if (p(doneValue)) {
-            return tsplus_module_5.apSecond(tsplus_module_5.flatMap(upstreamDone => {
+            return tsplus_module_5.zipRight(tsplus_module_5.flatMap(upstreamDone => {
               const accumulatedResult = f(currentResult, doneValue);
               if (upstreamDone) return tsplus_module_4.as_(() => accumulatedResult)(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)));else return loop(accumulatedResult, __tsplusTrace);
-            })(tsplus_module_4.fromIO(() => upstreamDoneRef.get)))(tsplus_module_4.fromIO(() => leftoversRef.set(tsplus_module_2.flatten(leftovers), __tsplusTrace)));
+            })(tsplus_module_4.fromIO(() => tsplus_module_7.get(upstreamDoneRef, __tsplusTrace))))(tsplus_module_4.fromIO(() => tsplus_module_6.set(tsplus_module_2.flatten(leftovers), __tsplusTrace)(leftoversRef)));
           } else {
             return tsplus_module_4.as_(() => currentResult)(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)));
           }
         })(tsplus_module_4.collectElements(self.channel));
       }
-
       return tsplus_module_4.pipeTo(loop(z(), __tsplusTrace))(tsplus_module_4.pipeTo(tsplus_module_4.bufferChunk(leftoversRef))(upstreamMarker));
-    })(tsplus_module_4.fromIO(() => tsplus_module_7.zip(tsplus_module_6.make(() => false, __tsplusTrace), __tsplusTrace)(tsplus_module_6.make(() => tsplus_module_1.empty(), __tsplusTrace)))));
+    })(tsplus_module_4.fromIO(() => tsplus_module_9.zip(tsplus_module_8.make(() => false, __tsplusTrace), __tsplusTrace)(tsplus_module_8.make(() => tsplus_module_1.empty(), __tsplusTrace)))));
   };
 }
 /**
@@ -324,8 +278,6 @@ function collectAllWhileWith_1(z, p, f, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Sink collectLeftover
  */
-
-
 function collectLeftover(self, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_5.map(([chunks, z]) => [z, tsplus_module_2.flatten(chunks)])(tsplus_module_4.collectElements(self.channel)));
 }
@@ -334,8 +286,6 @@ function collectLeftover(self, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink contramap
  */
-
-
 function contramap_1(f, __tsplusTrace) {
   return self => {
     return contramapChunks_1(chunk => tsplus_module_2.map(f)(chunk), __tsplusTrace)(self);
@@ -346,11 +296,9 @@ function contramap_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink contramapChunks
  */
-
-
 function contramapChunks_1(f, __tsplusTrace) {
   return self => {
-    const loop = tsplus_module_4.readWith(chunk => tsplus_module_5.apSecond(loop)(tsplus_module_4.writeNow(f(chunk))), tsplus_module_4.failNow, tsplus_module_5.succeedNow);
+    const loop = tsplus_module_4.readWith(chunk => tsplus_module_5.zipRight(loop)(tsplus_module_4.writeNow(f(chunk))), tsplus_module_4.failNow, tsplus_module_5.succeedNow);
     return new tsplus_module_3.Sink(tsplus_module_4.pipeTo(self.channel)(loop));
   };
 }
@@ -360,11 +308,9 @@ function contramapChunks_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink contramapChunksIO
  */
-
-
 function contramapChunksIO_1(f, __tsplusTrace) {
   return self => {
-    const loop = tsplus_module_4.readWith(chunk => tsplus_module_5.apSecond(loop)(tsplus_module_5.flatMap(tsplus_module_4.writeNow)(tsplus_module_4.fromIO(() => f(chunk)))), tsplus_module_4.failNow, tsplus_module_5.succeedNow);
+    const loop = tsplus_module_4.readWith(chunk => tsplus_module_5.zipRight(loop)(tsplus_module_5.flatMap(tsplus_module_4.writeNow)(tsplus_module_4.fromIO(() => f(chunk)))), tsplus_module_4.failNow, tsplus_module_5.succeedNow);
     return new tsplus_module_3.Sink(tsplus_module_4.pipeToOrFail(self.channel)(loop));
   };
 }
@@ -373,11 +319,9 @@ function contramapChunksIO_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink contramapIO
  */
-
-
 function contramapIO_1(f, __tsplusTrace) {
   return self => {
-    return contramapChunksIO_1(chunk => tsplus_module_8.mapIO(f, __tsplusTrace)(chunk), __tsplusTrace)(self);
+    return contramapChunksIO_1(chunk => tsplus_module_10.mapIO(f, __tsplusTrace)(chunk), __tsplusTrace)(self);
   };
 }
 /**
@@ -386,8 +330,6 @@ function contramapIO_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink dimap
  */
-
-
 function dimap(f, g, __tsplusTrace) {
   return self => {
     return map_1(g, __tsplusTrace)(contramap_1(f, __tsplusTrace)(self));
@@ -399,8 +341,6 @@ function dimap(f, g, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink dimapChunks
  */
-
-
 function dimapChunks(f, g, __tsplusTrace) {
   return self => {
     return map_1(g, __tsplusTrace)(contramapChunks_1(f, __tsplusTrace)(self));
@@ -412,8 +352,6 @@ function dimapChunks(f, g, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink dimapChunksIO
  */
-
-
 function dimapChunksIO(f, g, __tsplusTrace) {
   return self => {
     return mapIO_1(g, __tsplusTrace)(contramapChunksIO_1(f, __tsplusTrace)(self));
@@ -425,8 +363,6 @@ function dimapChunksIO(f, g, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink dimapIO
  */
-
-
 function dimapIO(f, g, __tsplusTrace) {
   return self => {
     return mapIO_1(g, __tsplusTrace)(contramapIO_1(f, __tsplusTrace)(self));
@@ -438,37 +374,30 @@ function dimapIO(f, g, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps defer
  */
-
-
 function defer_1(sink, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_4.defer(() => sink().channel));
 }
-
 const drainLoop = /*#__PURE__*/tsplus_module_4.readWithCause(() => drainLoop, tsplus_module_5.failCauseNow, () => tsplus_module_4.unit);
 /**
  * A sink that ignores all of its inputs.
  *
  * @tsplus static fncts.io.SinkOps drain
  */
-
 const drain = /*#__PURE__*/new tsplus_module_3.Sink(drainLoop);
 /**
  * Drops incoming elements until the predicate `p` is satisfied.
  *
  * @tsplus static fncts.io.SinkOps dropUntil
  */
-
 exports.drain = drain;
-
 function makeDropUntil(p, __tsplusTrace) {
   const loop = tsplus_module_4.readWith(inp => {
     const leftover = tsplus_module_2.dropUntil(p)(inp);
     const more = tsplus_module_2.isEmpty(leftover);
-
     if (more) {
       return loop;
     } else {
-      return tsplus_module_5.apSecond(tsplus_module_4.id())(tsplus_module_4.writeNow(leftover));
+      return tsplus_module_5.zipRight(tsplus_module_4.id())(tsplus_module_4.writeNow(leftover));
     }
   }, tsplus_module_4.failNow, () => tsplus_module_4.unit);
   return new tsplus_module_3.Sink(loop);
@@ -478,10 +407,8 @@ function makeDropUntil(p, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps dropUntilIO
  */
-
-
 function makeDropUntilIO(p, __tsplusTrace) {
-  const loop = tsplus_module_4.readWith(inp => tsplus_module_4.unwrap(() => tsplus_module_7.map(leftover => tsplus_module_2.isEmpty(leftover) ? loop : tsplus_module_5.apSecond(tsplus_module_4.id())(tsplus_module_4.writeNow(leftover)), __tsplusTrace)(tsplus_module_9.dropUntilIO(p, __tsplusTrace)(inp))), tsplus_module_4.failNow, () => tsplus_module_4.unit);
+  const loop = tsplus_module_4.readWith(inp => tsplus_module_4.unwrap(() => tsplus_module_9.map(leftover => tsplus_module_2.isEmpty(leftover) ? loop : tsplus_module_5.zipRight(tsplus_module_4.id())(tsplus_module_4.writeNow(leftover)), __tsplusTrace)(tsplus_module_11.dropUntilIO(p, __tsplusTrace)(inp))), tsplus_module_4.failNow, () => tsplus_module_4.unit);
   return new tsplus_module_3.Sink(loop);
 }
 /**
@@ -489,17 +416,14 @@ function makeDropUntilIO(p, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps dropWhile
  */
-
-
 function makeDropWhile(predicate, __tsplusTrace) {
   const loop = tsplus_module_4.readWith(inp => {
     const leftover = tsplus_module_2.dropWhile(predicate)(inp);
     const more = tsplus_module_2.isEmpty(leftover);
-
     if (more) {
       return loop;
     } else {
-      return tsplus_module_5.apSecond(tsplus_module_4.id())(tsplus_module_4.writeNow(leftover));
+      return tsplus_module_5.zipRight(tsplus_module_4.id())(tsplus_module_4.writeNow(leftover));
     }
   }, tsplus_module_4.failNow, () => tsplus_module_4.unit);
   return new tsplus_module_3.Sink(loop);
@@ -510,10 +434,8 @@ function makeDropWhile(predicate, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps dropWhileIO
  */
-
-
 function dropWhileIO(p, __tsplusTrace) {
-  const loop = tsplus_module_4.readWith(inp => tsplus_module_4.unwrap(() => tsplus_module_7.map(leftover => tsplus_module_2.isEmpty(leftover) ? loop : tsplus_module_5.apSecond(tsplus_module_4.id())(tsplus_module_4.writeNow(leftover)), __tsplusTrace)(tsplus_module_10.dropWhileIO(p, __tsplusTrace)(inp))), tsplus_module_4.failNow, () => tsplus_module_4.unit);
+  const loop = tsplus_module_4.readWith(inp => tsplus_module_4.unwrap(() => tsplus_module_9.map(leftover => tsplus_module_2.isEmpty(leftover) ? loop : tsplus_module_5.zipRight(tsplus_module_4.id())(tsplus_module_4.writeNow(leftover)), __tsplusTrace)(tsplus_module_12.dropWhileIO(p, __tsplusTrace)(inp))), tsplus_module_4.failNow, () => tsplus_module_4.unit);
   return new tsplus_module_3.Sink(loop);
 }
 /**
@@ -521,48 +443,38 @@ function dropWhileIO(p, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps environment
  */
-
-
 function environment(__tsplusTrace) {
-  return fromIO_1(() => tsplus_module_11.environment(__tsplusTrace), __tsplusTrace);
+  return fromIO_1(() => tsplus_module_13.environment(__tsplusTrace), __tsplusTrace);
 }
 /**
  * Accesses the environment of the sink.
  *
  * @tsplus static fncts.io.SinkOps environmentWith
  */
-
-
 function environmentWith(f, __tsplusTrace) {
-  return fromIO_1(() => tsplus_module_11.environmentWith(f, __tsplusTrace), __tsplusTrace);
+  return fromIO_1(() => tsplus_module_13.environmentWith(f, __tsplusTrace), __tsplusTrace);
 }
 /**
  * Accesses the environment of the sink in the context of an effect.
  *
  * @tsplus static fncts.io.SinkOps environmentWithIO
  */
-
-
 function environmentWithIO(f, __tsplusTrace) {
-  return fromIO_1(() => tsplus_module_11.environmentWithIO(f, __tsplusTrace), __tsplusTrace);
+  return fromIO_1(() => tsplus_module_13.environmentWithIO(f, __tsplusTrace), __tsplusTrace);
 }
 /**
  * Accesses the environment of the sink in the context of a sink.
  *
  * @tsplus static fncts.io.SinkOps environmentWithSink
  */
-
-
 function environmentWithSink(f, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_11.environmentWith(tsplus_module_12.compose(s => s.channel)(f), __tsplusTrace)));
+  return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_13.environmentWith(tsplus_module_14.compose(s => s.channel)(f), __tsplusTrace)));
 }
 /**
  * A sink that always fails with the specified error.
  *
  * @tsplus static fncts.io.SinkOps fail
  */
-
-
 function fail(e, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_4.fail(e));
 }
@@ -571,8 +483,6 @@ function fail(e, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps failCause
  */
-
-
 function failCause_1(cause, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_5.failCause(cause));
 }
@@ -581,8 +491,6 @@ function failCause_1(cause, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps failCauseNow
  */
-
-
 function failCauseNow_1(cause, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_5.failCauseNow(cause));
 }
@@ -591,8 +499,6 @@ function failCauseNow_1(cause, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps failNow
  */
-
-
 function failNow_1(e, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_4.failNow(e));
 }
@@ -601,8 +507,6 @@ function failNow_1(e, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps filterInput
  */
-
-
 function filterInput(self, p, __tsplusTrace) {
   return contramapChunks_1(chunk => tsplus_module_2.filter(p)(chunk), __tsplusTrace)(self);
 }
@@ -611,27 +515,23 @@ function filterInput(self, p, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps filterInputIO
  */
-
-
 function filterInputIO(self, p, __tsplusTrace) {
-  return contramapChunksIO_1(chunk => tsplus_module_13.filterIO(p, __tsplusTrace)(chunk), __tsplusTrace)(self);
+  return contramapChunksIO_1(chunk => tsplus_module_15.filterIO(p, __tsplusTrace)(chunk), __tsplusTrace)(self);
 }
 /**
  * Creates a sink that produces values until one verifies the predicate `f`.
  *
  * @tsplus pipeable fncts.io.Sink findIO
  */
-
-
 function findIO(f, __tsplusTrace) {
   return self => {
     return new tsplus_module_3.Sink(tsplus_module_5.flatMap(([leftoversRef, upstreamDoneRef]) => {
-      const upstreamMarker = tsplus_module_4.readWith(inp => tsplus_module_5.apSecond(upstreamMarker)(tsplus_module_4.writeNow(inp)), tsplus_module_4.failNow, x => tsplus_module_4.as_(() => x)(tsplus_module_4.fromIO(() => upstreamDoneRef.set(true, __tsplusTrace))));
-      const loop = tsplus_module_4.matchChannel(tsplus_module_4.failNow, ([leftovers, doneValue]) => tsplus_module_5.flatMap(satisfied => tsplus_module_5.apSecond(tsplus_module_5.flatMap(upstreamDone => {
-        if (satisfied) return tsplus_module_4.as_(() => tsplus_module_14.just(doneValue))(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)));else if (upstreamDone) return tsplus_module_4.as_(() => tsplus_module_14.nothing())(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)));else return loop;
-      })(tsplus_module_4.fromIO(() => upstreamDoneRef.get)))(tsplus_module_4.fromIO(() => leftoversRef.set(tsplus_module_2.flatten(leftovers), __tsplusTrace))))(tsplus_module_4.fromIO(() => f(doneValue))))(tsplus_module_4.collectElements(self.channel));
+      const upstreamMarker = tsplus_module_4.readWith(inp => tsplus_module_5.zipRight(upstreamMarker)(tsplus_module_4.writeNow(inp)), tsplus_module_4.failNow, x => tsplus_module_4.as_(() => x)(tsplus_module_4.fromIO(() => tsplus_module_6.set(true, __tsplusTrace)(upstreamDoneRef))));
+      const loop = tsplus_module_4.matchChannel(tsplus_module_4.failNow, ([leftovers, doneValue]) => tsplus_module_5.flatMap(satisfied => tsplus_module_5.zipRight(tsplus_module_5.flatMap(upstreamDone => {
+        if (satisfied) return tsplus_module_4.as_(() => tsplus_module_16.just(doneValue))(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)));else if (upstreamDone) return tsplus_module_4.as_(() => tsplus_module_16.nothing())(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)));else return loop;
+      })(tsplus_module_4.fromIO(() => tsplus_module_7.get(upstreamDoneRef, __tsplusTrace))))(tsplus_module_4.fromIO(() => tsplus_module_6.set(tsplus_module_2.flatten(leftovers), __tsplusTrace)(leftoversRef))))(tsplus_module_4.fromIO(() => f(doneValue))))(tsplus_module_4.collectElements(self.channel));
       return tsplus_module_4.pipeTo(loop)(tsplus_module_4.pipeTo(tsplus_module_4.bufferChunk(leftoversRef))(upstreamMarker));
-    })(tsplus_module_4.fromIO(() => tsplus_module_7.zip(tsplus_module_6.make(() => false, __tsplusTrace), __tsplusTrace)(tsplus_module_6.make(() => tsplus_module_1.empty(), __tsplusTrace)))));
+    })(tsplus_module_4.fromIO(() => tsplus_module_9.zip(tsplus_module_8.make(() => false, __tsplusTrace), __tsplusTrace)(tsplus_module_8.make(() => tsplus_module_1.empty(), __tsplusTrace)))));
   };
 }
 /**
@@ -643,8 +543,6 @@ function findIO(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink flatMap
  */
-
-
 function flatMap_1(f, __tsplusTrace) {
   return self => {
     return matchSink_1(failNow_1, f, __tsplusTrace)(self);
@@ -656,8 +554,6 @@ function flatMap_1(f, __tsplusTrace) {
  * @tsplus static fncts.io.SinkOps fromChannel
  * @tsplus static fncts.io.SinkOps __call
  */
-
-
 function fromChannel(channel, __tsplusTrace) {
   return new tsplus_module_3.Sink(channel);
 }
@@ -666,24 +562,19 @@ function fromChannel(channel, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps fromPush
  */
-
-
 function fromPush(push, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.unwrapScoped(() => tsplus_module_7.map(fromPushPull, __tsplusTrace)(push)));
+  return new tsplus_module_3.Sink(tsplus_module_4.unwrapScoped(() => tsplus_module_9.map(fromPushPull, __tsplusTrace)(push)));
 }
-
 function fromPushPull(push, __tsplusTrace) {
-  return tsplus_module_4.readWith(inp => tsplus_module_4.matchChannel(([r, leftovers]) => tsplus_module_15.match(e => tsplus_module_5.apSecond(tsplus_module_4.failNow(e))(tsplus_module_4.writeNow(leftovers)), z => tsplus_module_5.apSecond(tsplus_module_5.succeedNow(z))(tsplus_module_4.writeNow(leftovers)))(r), () => fromPushPull(push, __tsplusTrace))(tsplus_module_4.fromIO(() => push(tsplus_module_14.just(inp)))), tsplus_module_4.failNow, () => tsplus_module_4.matchChannel(([r, leftovers]) => tsplus_module_15.match(e => tsplus_module_5.apSecond(tsplus_module_4.failNow(e))(tsplus_module_4.writeNow(leftovers)), z => tsplus_module_5.apSecond(tsplus_module_5.succeedNow(z))(tsplus_module_4.writeNow(leftovers)))(r), () => tsplus_module_4.fromIO(() => tsplus_module_7.halt(() => new Error("empty sink"), __tsplusTrace)))(tsplus_module_4.fromIO(() => push(tsplus_module_14.nothing()))));
+  return tsplus_module_4.readWith(inp => tsplus_module_4.matchChannel(([r, leftovers]) => tsplus_module_17.match(e => tsplus_module_5.zipRight(tsplus_module_4.failNow(e))(tsplus_module_4.writeNow(leftovers)), z => tsplus_module_5.zipRight(tsplus_module_5.succeedNow(z))(tsplus_module_4.writeNow(leftovers)))(r), () => fromPushPull(push, __tsplusTrace))(tsplus_module_4.fromIO(() => push(tsplus_module_16.just(inp)))), tsplus_module_4.failNow, () => tsplus_module_4.matchChannel(([r, leftovers]) => tsplus_module_17.match(e => tsplus_module_5.zipRight(tsplus_module_4.failNow(e))(tsplus_module_4.writeNow(leftovers)), z => tsplus_module_5.zipRight(tsplus_module_5.succeedNow(z))(tsplus_module_4.writeNow(leftovers)))(r), () => tsplus_module_4.fromIO(() => tsplus_module_9.halt(() => new Error("empty sink"), __tsplusTrace)))(tsplus_module_4.fromIO(() => push(tsplus_module_16.nothing()))));
 }
 /**
  * Create a sink which enqueues each element into the specified queue.
  *
  * @tsplus static fncts.io.SinkOps fromQueue
  */
-
-
 function fromQueue_1(queue, __tsplusTrace) {
-  return unwrap_1(() => tsplus_module_7.map(queue => makeForeachChunk_1(inp => queue.offerAll(inp, __tsplusTrace), __tsplusTrace), __tsplusTrace)(tsplus_module_7.succeed(queue, __tsplusTrace)), __tsplusTrace);
+  return unwrap_1(() => tsplus_module_9.map(queue => makeForeachChunk_1(inp => tsplus_module_18.offerAll(inp, __tsplusTrace)(queue), __tsplusTrace), __tsplusTrace)(tsplus_module_9.succeed(queue, __tsplusTrace)), __tsplusTrace);
 }
 /**
  * Create a sink which enqueues each element into the specified queue. The
@@ -691,18 +582,14 @@ function fromQueue_1(queue, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps fromQueueWithShutdown
  */
-
-
 function fromQueueWithShutdown_1(queue, __tsplusTrace) {
-  return unwrapScoped_1(() => tsplus_module_7.map(queue => fromQueue_1(() => queue, __tsplusTrace), __tsplusTrace)(tsplus_module_16.acquireRelease(() => tsplus_module_7.succeed(queue, __tsplusTrace), queue => queue.shutdown, __tsplusTrace)), __tsplusTrace);
+  return unwrapScoped_1(() => tsplus_module_9.map(queue => fromQueue_1(() => queue, __tsplusTrace), __tsplusTrace)(tsplus_module_19.acquireRelease(() => tsplus_module_9.succeed(queue, __tsplusTrace), queue => tsplus_module_18.shutdown(queue, __tsplusTrace), __tsplusTrace)), __tsplusTrace);
 }
 /**
  * Create a sink which publishes each element to the specified hub.
  *
  * @tsplus static fncts.io.SinkOps fromHub
  */
-
-
 function fromHub(hub, __tsplusTrace) {
   return fromQueue_1(hub, __tsplusTrace);
 }
@@ -712,8 +599,6 @@ function fromHub(hub, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps fromHubWithShutdown
  */
-
-
 function fromHubWithShutdown(hub, __tsplusTrace) {
   return fromQueueWithShutdown_1(hub, __tsplusTrace);
 }
@@ -722,8 +607,6 @@ function fromHubWithShutdown(hub, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps fromIO
  */
-
-
 function fromIO_1(b, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_4.fromIO(b));
 }
@@ -732,38 +615,30 @@ function fromIO_1(b, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps halt
  */
-
-
 function halt(defect, __tsplusTrace) {
-  return failCause_1(() => tsplus_module_17.halt(defect()), __tsplusTrace);
+  return failCause_1(() => tsplus_module_20.halt(defect()), __tsplusTrace);
 }
 /**
  * Creates a sink halting with the specified unchecked value.
  *
  * @tsplus static fncts.io.SinkOps haltNow
  */
-
-
 function haltNow(defect, __tsplusTrace) {
-  return failCauseNow_1(tsplus_module_17.halt(defect), __tsplusTrace);
+  return failCauseNow_1(tsplus_module_20.halt(defect), __tsplusTrace);
 }
 /**
  * Creates a sink containing the first value.
  *
  * @tsplus static fncts.io.SinkOps head
  */
-
-
 function head(__tsplusTrace) {
-  return makeFold_1(() => tsplus_module_14.nothing(), elem => tsplus_module_18.isNothing(elem), (s, inp) => tsplus_module_19.match(() => tsplus_module_14.just(inp), () => s)(s), __tsplusTrace);
+  return makeFold_1(() => tsplus_module_16.nothing(), elem => tsplus_module_21.isNothing(elem), (s, inp) => tsplus_module_22.match(() => tsplus_module_16.just(inp), () => s)(s), __tsplusTrace);
 }
 /**
  * Drains the remaining elements from the stream after the sink finishes
  *
  * @tsplus getter fncts.io.Sink ignoreLeftover
  */
-
-
 function ignoreLeftover_1(self, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_4.drain(self.channel));
 }
@@ -772,10 +647,8 @@ function ignoreLeftover_1(self, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps last
  */
-
-
 function last(__tsplusTrace) {
-  return makeFoldLeft_1(() => tsplus_module_14.nothing(), (_, inp) => tsplus_module_14.just(inp), __tsplusTrace);
+  return makeFoldLeft_1(() => tsplus_module_16.nothing(), (_, inp) => tsplus_module_16.just(inp), __tsplusTrace);
 }
 /**
  * Creates a sink that does not consume any input but provides the given chunk
@@ -783,8 +656,6 @@ function last(__tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps leftover
  */
-
-
 function leftover(c, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_4.write(c));
 }
@@ -793,22 +664,17 @@ function leftover(c, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps log
  */
-
-
 function log(message, __tsplusTrace) {
-  return fromIO_1(() => tsplus_module_7.log(message, __tsplusTrace), __tsplusTrace);
+  return fromIO_1(() => tsplus_module_9.log(message, __tsplusTrace), __tsplusTrace);
 }
 /**
  * A sink that collects all of its inputs into a chunk.
  *
  * @tsplus static fncts.io.SinkOps collectAll
  */
-
-
 function makeCollectAll(__tsplusTrace) {
   return new tsplus_module_3.Sink(collectLoop(tsplus_module_1.empty(), __tsplusTrace));
 }
-
 function collectLoop(state, __tsplusTrace) {
   return tsplus_module_4.readWithCause(inp => collectLoop(tsplus_module_2.concat(inp)(state), __tsplusTrace), tsplus_module_5.failCauseNow, () => tsplus_module_5.endNow(state));
 }
@@ -818,20 +684,16 @@ function collectLoop(state, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps collectAllN
  */
-
-
 function makeCollectAllN(n, __tsplusTrace) {
-  return flatMap_1(builder => map_1(builder => builder.result(), __tsplusTrace)(makeFoldUntil_1(() => builder, n, (builder, inp) => builder.append(inp), __tsplusTrace)), __tsplusTrace)(fromIO_1(() => tsplus_module_7.succeed(() => new tsplus_module_20.ConcBuilder(), __tsplusTrace), __tsplusTrace));
+  return flatMap_1(builder => map_1(builder => builder.result(), __tsplusTrace)(makeFoldUntil_1(() => builder, n, (builder, inp) => builder.append(inp), __tsplusTrace)), __tsplusTrace)(fromIO_1(() => tsplus_module_9.succeed(() => new tsplus_module_23.ConcBuilder(), __tsplusTrace), __tsplusTrace));
 }
 /**
  * A sink that executes the provided effectful function for every element fed to it.
  *
  * @tsplus static fncts.io.SinkOps foreach
  */
-
-
 function makeForeach(f, __tsplusTrace) {
-  return makeForeachWhile_1(inp => tsplus_module_7.as(() => true, __tsplusTrace)(f(inp)), __tsplusTrace);
+  return makeForeachWhile_1(inp => tsplus_module_9.as(() => true, __tsplusTrace)(f(inp)), __tsplusTrace);
 }
 /**
  * A sink that executes the provided effectful function for every chunk fed to
@@ -839,10 +701,8 @@ function makeForeach(f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foreachChunk
  */
-
-
 function makeForeachChunk_1(f, __tsplusTrace) {
-  const process = tsplus_module_4.readWithCause(inp => tsplus_module_5.apSecond(process)(tsplus_module_4.fromIO(() => f(inp))), tsplus_module_5.failCauseNow, () => tsplus_module_4.unit);
+  const process = tsplus_module_4.readWithCause(inp => tsplus_module_5.zipRight(process)(tsplus_module_4.fromIO(() => f(inp))), tsplus_module_5.failCauseNow, () => tsplus_module_4.unit);
   return new tsplus_module_3.Sink(process);
 }
 /**
@@ -851,19 +711,15 @@ function makeForeachChunk_1(f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foreachWhile
  */
-
-
 function makeForeachWhile_1(f, __tsplusTrace) {
   const process = tsplus_module_4.readWithCause(inp => foreachWhileLoop(f, inp, 0, inp.length, process, __tsplusTrace), tsplus_module_5.failCauseNow, () => tsplus_module_4.unit);
   return new tsplus_module_3.Sink(process);
 }
-
 function foreachWhileLoop(f, chunk, idx, len, cont, __tsplusTrace) {
   if (idx === len) {
     return cont;
   }
-
-  return tsplus_module_4.catchAll(e => tsplus_module_5.apSecond(tsplus_module_4.failNow(e))(tsplus_module_4.writeNow(tsplus_module_2.drop(idx)(chunk))))(tsplus_module_5.flatMap(b => b ? foreachWhileLoop(f, chunk, idx + 1, len, cont, __tsplusTrace) : tsplus_module_4.writeNow(tsplus_module_2.drop(idx)(chunk)))(tsplus_module_4.fromIO(() => f(tsplus_module_2.unsafeGet(idx)(chunk)))));
+  return tsplus_module_4.catchAll(e => tsplus_module_5.zipRight(tsplus_module_4.failNow(e))(tsplus_module_4.writeNow(tsplus_module_2.drop(idx)(chunk))))(tsplus_module_5.flatMap(b => b ? foreachWhileLoop(f, chunk, idx + 1, len, cont, __tsplusTrace) : tsplus_module_4.writeNow(tsplus_module_2.drop(idx)(chunk)))(tsplus_module_4.fromIO(() => f(tsplus_module_2.unsafeGet(idx)(chunk)))));
 }
 /**
  * A sink that executes the provided effectful function for every chunk fed to
@@ -871,8 +727,6 @@ function foreachWhileLoop(f, chunk, idx, len, cont, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foreachChunkWhile
  */
-
-
 function makeForeachChunkWhile(f, __tsplusTrace) {
   const reader = tsplus_module_4.readWith(inp => tsplus_module_5.flatMap(cont => cont ? reader : tsplus_module_4.unit)(tsplus_module_4.fromIO(() => f(inp))), tsplus_module_4.failNow, () => tsplus_module_4.unit);
   return new tsplus_module_3.Sink(reader);
@@ -883,38 +737,32 @@ function makeForeachChunkWhile(f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps fold
  */
-
-
 function makeFold_1(z, contFn, f, __tsplusTrace) {
   return defer_1(() => new tsplus_module_3.Sink(foldReader(z(), contFn, f, __tsplusTrace)), __tsplusTrace);
 }
 /**
  * @tsplus tailRec
  */
-
-
 function foldChunkSplit(contFn, f, s, chunk, idx, len, __tsplusTrace) {
   var contFn_1 = contFn,
-      f_1 = f,
-      s_1 = s,
-      chunk_1 = chunk,
-      idx_1 = idx,
-      len_1 = len,
-      __tsplusTrace_1 = __tsplusTrace;
+    f_1 = f,
+    s_1 = s,
+    chunk_1 = chunk,
+    idx_1 = idx,
+    len_1 = len,
+    __tsplusTrace_1 = __tsplusTrace;
   var contFn_2 = contFn,
-      f_2 = f,
-      s_2 = s,
-      chunk_2 = chunk,
-      idx_2 = idx,
-      len_2 = len,
-      __tsplusTrace_2 = __tsplusTrace;
-
+    f_2 = f,
+    s_2 = s,
+    chunk_2 = chunk,
+    idx_2 = idx,
+    len_2 = len,
+    __tsplusTrace_2 = __tsplusTrace;
   while (1) {
     if (idx_1 === len_1) {
       return [s_1, tsplus_module_1.empty()];
     } else {
       const s1 = f_1(s_1, tsplus_module_2.unsafeGet(idx_1)(chunk_1));
-
       if (contFn_1(s1)) {
         contFn_2 = contFn_1;
         f_2 = f_1;
@@ -937,14 +785,12 @@ function foldChunkSplit(contFn, f, s, chunk, idx, len, __tsplusTrace) {
     }
   }
 }
-
 function foldReader(s, contFn, f, __tsplusTrace) {
   if (!contFn(s)) {
     return tsplus_module_5.succeedNow(s);
   } else {
     return tsplus_module_4.readWith(inp => {
       const [nextS, leftovers] = foldChunkSplit(contFn, f, s, inp, 0, inp.length, __tsplusTrace);
-
       if (tsplus_module_2.isNonEmpty(leftovers)) {
         return tsplus_module_4.as_(() => nextS)(tsplus_module_4.writeNow(leftovers));
       } else {
@@ -961,10 +807,8 @@ function foldReader(s, contFn, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldUntil
  */
-
-
 function makeFoldUntil_1(z, max, f, __tsplusTrace) {
-  return unwrap_1(() => tsplus_module_7.map(max => map_1(([s]) => s, __tsplusTrace)(makeFold_1(() => [z(), 0], ([_, n]) => n < max, ([o, count], i) => [f(o, i), count + 1], __tsplusTrace)), __tsplusTrace)(tsplus_module_7.succeed(max, __tsplusTrace)), __tsplusTrace);
+  return unwrap_1(() => tsplus_module_9.map(max => map_1(([s]) => s, __tsplusTrace)(makeFold_1(() => [z(), 0], ([_, n]) => n < max, ([o, count], i) => [f(o, i), count + 1], __tsplusTrace)), __tsplusTrace)(tsplus_module_9.succeed(max, __tsplusTrace)), __tsplusTrace);
 }
 /**
  * A sink that folds its input chunks with the provided function, termination
@@ -974,12 +818,9 @@ function makeFoldUntil_1(z, max, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldChunks
  */
-
-
 function makeFoldChunks_1(z, contFn, f, __tsplusTrace) {
   return defer_1(() => new tsplus_module_3.Sink(foldChunksReader(z(), contFn, f, __tsplusTrace)), __tsplusTrace);
 }
-
 function foldChunksReader(s, contFn, f, __tsplusTrace) {
   if (!contFn(s)) {
     return tsplus_module_5.succeedNow(s);
@@ -998,12 +839,9 @@ function foldChunksReader(s, contFn, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldChunksIO
  */
-
-
 function makeFoldChunksIO_1(z, contFn, f, __tsplusTrace) {
   return defer_1(() => new tsplus_module_3.Sink(foldChunksIOReader(z(), contFn, f, __tsplusTrace)), __tsplusTrace);
 }
-
 function foldChunksIOReader(s, contFn, f, __tsplusTrace) {
   if (!contFn(s)) {
     return tsplus_module_5.succeedNow(s);
@@ -1016,8 +854,6 @@ function foldChunksIOReader(s, contFn, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldLeft
  */
-
-
 function makeFoldLeft_1(z, f, __tsplusTrace) {
   return ignoreLeftover_1(makeFold_1(z, () => true, f, __tsplusTrace), __tsplusTrace);
 }
@@ -1027,8 +863,6 @@ function makeFoldLeft_1(z, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldLeftChunks
  */
-
-
 function makeFoldLeftChunks(z, f, __tsplusTrace) {
   return ignoreLeftover_1(makeFoldChunks_1(z, () => true, f, __tsplusTrace), __tsplusTrace);
 }
@@ -1038,8 +872,6 @@ function makeFoldLeftChunks(z, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldLeftChunksIO
  */
-
-
 function makeFoldLeftChunksIO(z, f, __tsplusTrace) {
   return makeFoldChunksIO_1(z, () => true, f, __tsplusTrace);
 }
@@ -1049,8 +881,6 @@ function makeFoldLeftChunksIO(z, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldLeftIO
  */
-
-
 function makeFoldLeftIO(z, f, __tsplusTrace) {
   return makeFoldIO_1(z, () => true, f, __tsplusTrace);
 }
@@ -1060,31 +890,27 @@ function makeFoldLeftIO(z, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldIO
  */
-
-
 function makeFoldIO_1(z, contFn, f, __tsplusTrace) {
   return defer_1(() => new tsplus_module_3.Sink(foldIOReader(z(), contFn, f, __tsplusTrace)), __tsplusTrace);
 }
-
 function foldChunkSplitIO(s, contFn, f, chunk, idx, len, __tsplusTrace) {
   if (idx === len) {
-    return tsplus_module_7.succeedNow([s, tsplus_module_14.nothing()], __tsplusTrace);
+    return tsplus_module_9.succeedNow([s, tsplus_module_16.nothing()], __tsplusTrace);
   } else {
-    return tsplus_module_7.flatMap(s1 => {
+    return tsplus_module_9.flatMap(s1 => {
       if (contFn(s1)) {
         return foldChunkSplitIO(s1, contFn, f, chunk, idx + 1, len, __tsplusTrace);
       } else {
-        return tsplus_module_7.succeedNow([s1, tsplus_module_14.just(tsplus_module_2.drop(idx + 1)(chunk))], __tsplusTrace);
+        return tsplus_module_9.succeedNow([s1, tsplus_module_16.just(tsplus_module_2.drop(idx + 1)(chunk))], __tsplusTrace);
       }
     }, __tsplusTrace)(f(s, tsplus_module_2.unsafeGet(idx)(chunk)));
   }
 }
-
 function foldIOReader(s, contFn, f, __tsplusTrace) {
   if (!contFn(s)) {
     return tsplus_module_5.succeedNow(s);
   } else {
-    return tsplus_module_4.readWith(inp => tsplus_module_5.flatMap(([nextS, leftovers]) => tsplus_module_19.match(() => foldIOReader(nextS, contFn, f, __tsplusTrace), l => tsplus_module_4.as_(() => nextS)(tsplus_module_4.writeNow(l)))(leftovers))(tsplus_module_4.fromIO(() => foldChunkSplitIO(s, contFn, f, inp, 0, inp.length, __tsplusTrace))), err => tsplus_module_4.failNow(err), _ => tsplus_module_5.succeedNow(_));
+    return tsplus_module_4.readWith(inp => tsplus_module_5.flatMap(([nextS, leftovers]) => tsplus_module_22.match(() => foldIOReader(nextS, contFn, f, __tsplusTrace), l => tsplus_module_4.as_(() => nextS)(tsplus_module_4.writeNow(l)))(leftovers))(tsplus_module_4.fromIO(() => foldChunkSplitIO(s, contFn, f, inp, 0, inp.length, __tsplusTrace))), err => tsplus_module_4.failNow(err), _ => tsplus_module_5.succeedNow(_));
   }
 }
 /**
@@ -1095,10 +921,8 @@ function foldIOReader(s, contFn, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldUntilIO
  */
-
-
 function makeFoldUntilIO(z, max, f, __tsplusTrace) {
-  return map_1(([s]) => s, __tsplusTrace)(makeFoldIO_1(() => [z(), 0], ([_, n]) => n < max(), ([o, count], i) => tsplus_module_7.map(s => [s, count + 1], __tsplusTrace)(f(o, i)), __tsplusTrace));
+  return map_1(([s]) => s, __tsplusTrace)(makeFoldIO_1(() => [z(), 0], ([_, n]) => n < max(), ([o, count], i) => tsplus_module_9.map(s => [s, count + 1], __tsplusTrace)(f(o, i)), __tsplusTrace));
 }
 /**
  * Creates a sink that folds elements of type `In` into a structure of type
@@ -1119,8 +943,6 @@ function makeFoldUntilIO(z, max, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldWeightedDecompose
  */
-
-
 function makeFoldWeightedDecompose_1(z, costFn, max, decompose, f, __tsplusTrace) {
   return defer_1(() => {
     /**
@@ -1132,12 +954,10 @@ function makeFoldWeightedDecompose_1(z, costFn, max, decompose, f, __tsplusTrace
       } else {
         const elem = tsplus_module_2.unsafeGet(idx)(inp);
         const total = cost + costFn(s, elem);
-
         if (total <= max) {
           return fold(inp, f(s, elem), max, true, total, idx + 1, __tsplusTrace);
         } else {
           const decomposed = decompose(elem);
-
           if (decomposed.length <= 1 && !dirty) {
             return [f(s, elem), total, true, tsplus_module_2.drop(idx + 1)(inp)];
           } else if (decomposed.length <= 1 && dirty) {
@@ -1148,13 +968,11 @@ function makeFoldWeightedDecompose_1(z, costFn, max, decompose, f, __tsplusTrace
         }
       }
     }
-
     function go(s, cost, dirty, max, __tsplusTrace) {
       return tsplus_module_4.readWith(inp => {
         const [nextS, nextCost, nextDirty, leftovers] = fold(inp, s, max, dirty, cost, 0, __tsplusTrace);
-
         if (tsplus_module_2.isNonEmpty(leftovers)) {
-          return tsplus_module_5.apSecond(tsplus_module_5.succeedNow(nextS))(tsplus_module_4.writeNow(leftovers));
+          return tsplus_module_5.zipRight(tsplus_module_5.succeedNow(nextS))(tsplus_module_4.writeNow(leftovers));
         } else if (cost > max) {
           return tsplus_module_5.succeedNow(nextS);
         } else {
@@ -1162,7 +980,6 @@ function makeFoldWeightedDecompose_1(z, costFn, max, decompose, f, __tsplusTrace
         }
       }, err => tsplus_module_4.failNow(err), _ => tsplus_module_5.succeedNow(s));
     }
-
     return new tsplus_module_3.Sink(go(z(), 0, false, max(), __tsplusTrace));
   }, __tsplusTrace);
 }
@@ -1180,37 +997,34 @@ function makeFoldWeightedDecompose_1(z, costFn, max, decompose, f, __tsplusTrace
  *
  * @tsplus static fncts.io.SinkOps foldWeightedDecomposeIO
  */
-
-
 function makeFoldWeightedDecomposeIO_1(z, costFn, max, decompose, f, __tsplusTrace) {
   return defer_1(() => {
     function fold(inp, s, max, dirty, cost, idx, __tsplusTrace) {
       if (idx === inp.length) {
-        return tsplus_module_7.succeedNow([s, cost, dirty, tsplus_module_1.empty()], __tsplusTrace);
+        return tsplus_module_9.succeedNow([s, cost, dirty, tsplus_module_1.empty()], __tsplusTrace);
       } else {
         const elem = tsplus_module_2.unsafeGet(idx)(inp);
-        return tsplus_module_7.flatMap(total => {
+        return tsplus_module_9.flatMap(total => {
           if (total <= max) {
-            return tsplus_module_7.flatMap(s => fold(inp, s, max, true, total, idx + 1, __tsplusTrace), __tsplusTrace)(f(s, elem));
+            return tsplus_module_9.flatMap(s => fold(inp, s, max, true, total, idx + 1, __tsplusTrace), __tsplusTrace)(f(s, elem));
           } else {
-            return tsplus_module_7.flatMap(decomposed => {
+            return tsplus_module_9.flatMap(decomposed => {
               if (decomposed.length <= 1 && !dirty) {
-                return tsplus_module_7.map(s => [s, total, true, tsplus_module_2.drop(idx + 1)(inp)], __tsplusTrace)(f(s, elem));
+                return tsplus_module_9.map(s => [s, total, true, tsplus_module_2.drop(idx + 1)(inp)], __tsplusTrace)(f(s, elem));
               } else if (decomposed.length <= 1 && dirty) {
-                return tsplus_module_7.succeedNow([s, cost, dirty, tsplus_module_2.drop(idx)(inp)], __tsplusTrace);
+                return tsplus_module_9.succeedNow([s, cost, dirty, tsplus_module_2.drop(idx)(inp)], __tsplusTrace);
               } else {
                 return fold(tsplus_module_2.concat(tsplus_module_2.drop(idx + 1)(inp))(decomposed), s, max, dirty, cost, 0, __tsplusTrace);
               }
             }, __tsplusTrace)(decompose(elem));
           }
-        }, __tsplusTrace)(tsplus_module_7.map(_ => cost + _, __tsplusTrace)(costFn(s, elem)));
+        }, __tsplusTrace)(tsplus_module_9.map(_ => cost + _, __tsplusTrace)(costFn(s, elem)));
       }
     }
-
     function go(s, cost, dirty, max, __tsplusTrace) {
       return tsplus_module_4.readWith(inp => tsplus_module_5.flatMap(([nextS, nextCost, nextDirty, leftovers]) => {
         if (tsplus_module_2.isNonEmpty(leftovers)) {
-          return tsplus_module_5.apSecond(tsplus_module_5.succeedNow(nextS))(tsplus_module_4.writeNow(leftovers));
+          return tsplus_module_5.zipRight(tsplus_module_5.succeedNow(nextS))(tsplus_module_4.writeNow(leftovers));
         } else if (cost > max) {
           return tsplus_module_5.succeedNow(nextS);
         } else {
@@ -1218,7 +1032,6 @@ function makeFoldWeightedDecomposeIO_1(z, costFn, max, decompose, f, __tsplusTra
         }
       })(tsplus_module_4.fromIO(() => fold(inp, s, max, dirty, cost, 0, __tsplusTrace))), err => tsplus_module_4.failNow(err), _ => tsplus_module_5.succeedNow(s));
     }
-
     return new tsplus_module_3.Sink(go(z(), 0, false, max(), __tsplusTrace));
   }, __tsplusTrace);
 }
@@ -1234,10 +1047,8 @@ function makeFoldWeightedDecomposeIO_1(z, costFn, max, decompose, f, __tsplusTra
  *
  * @tsplus static fncts.io.SinkOps foldWeighted
  */
-
-
 function makeFoldWeighted(z, costFn, max, f, __tsplusTrace) {
-  return makeFoldWeightedDecompose_1(z, costFn, max, tsplus_module_21.single, f, __tsplusTrace);
+  return makeFoldWeightedDecompose_1(z, costFn, max, tsplus_module_24.single, f, __tsplusTrace);
 }
 /**
  * Creates a sink that effectfully folds elements of type `In` into a
@@ -1251,18 +1062,14 @@ function makeFoldWeighted(z, costFn, max, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldWeightedIO
  */
-
-
 function makeFoldWeightedIO(z, costFn, max, f, __tsplusTrace) {
-  return makeFoldWeightedDecomposeIO_1(z, costFn, max, inp => tsplus_module_7.succeedNow(tsplus_module_21.single(inp), __tsplusTrace), f, __tsplusTrace);
+  return makeFoldWeightedDecomposeIO_1(z, costFn, max, inp => tsplus_module_9.succeedNow(tsplus_module_24.single(inp), __tsplusTrace), f, __tsplusTrace);
 }
 /**
  * Transforms this sink's result.
  *
  * @tsplus pipeable fncts.io.Sink map
  */
-
-
 function map_1(f, __tsplusTrace) {
   return self => {
     return new tsplus_module_3.Sink(tsplus_module_5.map(f)(self.channel));
@@ -1273,8 +1080,6 @@ function map_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink mapError
  */
-
-
 function mapError(f, __tsplusTrace) {
   return self => {
     return new tsplus_module_3.Sink(tsplus_module_4.mapError(f)(self.channel));
@@ -1285,8 +1090,6 @@ function mapError(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink mapIO
  */
-
-
 function mapIO_1(f, __tsplusTrace) {
   return self => {
     return new tsplus_module_3.Sink(tsplus_module_4.mapIO(f)(self.channel));
@@ -1301,16 +1104,14 @@ function mapIO_1(f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink matchSink
  */
-
-
 function matchSink_1(onFailure, onSuccess, __tsplusTrace) {
   return self => {
     return new tsplus_module_3.Sink(tsplus_module_4.matchChannel(e => onFailure(e).channel, ([leftovers, z]) => tsplus_module_4.defer(() => {
       const leftoversRef = new _AtomicReference.AtomicReference(tsplus_module_2.filter(c => tsplus_module_2.isNonEmpty(c))(leftovers));
       const refReader = tsplus_module_5.flatMap(chunk => tsplus_module_4.writeChunk(chunk))(tsplus_module_5.succeed(() => leftoversRef.getAndSet(tsplus_module_1.empty())));
       const passthrough = tsplus_module_4.id();
-      const continuationSink = tsplus_module_4.pipeTo(onSuccess(z).channel)(tsplus_module_5.apSecond(passthrough)(refReader));
-      return tsplus_module_5.flatMap(([newLeftovers, z1]) => tsplus_module_5.apSecond(tsplus_module_4.as_(() => z1)(tsplus_module_4.writeChunk(newLeftovers)))(tsplus_module_5.flatMap(tsplus_module_4.writeChunk)(tsplus_module_5.succeed(() => leftoversRef.get))))(tsplus_module_4.doneCollect(continuationSink));
+      const continuationSink = tsplus_module_4.pipeTo(onSuccess(z).channel)(tsplus_module_5.zipRight(passthrough)(refReader));
+      return tsplus_module_5.flatMap(([newLeftovers, z1]) => tsplus_module_5.zipRight(tsplus_module_4.as_(() => z1)(tsplus_module_4.writeChunk(newLeftovers)))(tsplus_module_5.flatMap(tsplus_module_4.writeChunk)(tsplus_module_5.succeed(() => leftoversRef.get))))(tsplus_module_4.doneCollect(continuationSink));
     }))(tsplus_module_4.doneCollect(self.channel)));
   };
 }
@@ -1319,8 +1120,6 @@ function matchSink_1(onFailure, onSuccess, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink orElse
  */
-
-
 function orElse(that, __tsplusTrace) {
   return self => {
     return defer_1(() => new tsplus_module_3.Sink(tsplus_module_4.orElse(that().channel)(self.channel)), __tsplusTrace);
@@ -1332,8 +1131,6 @@ function orElse(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink provideEnvironment
  */
-
-
 function provideEnvironment(r, __tsplusTrace) {
   return self => {
     return new tsplus_module_3.Sink(tsplus_module_4.provideEnvironment(r)(self.channel));
@@ -1345,11 +1142,9 @@ function provideEnvironment(r, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink race
  */
-
-
 function race(that, __tsplusTrace) {
   return self => {
-    return map_1(result => tsplus_module_22.merge(result), __tsplusTrace)(raceBoth_1(that)(self));
+    return map_1(result => tsplus_module_25.merge(result), __tsplusTrace)(raceBoth_1(that)(self));
   };
 }
 /**
@@ -1358,11 +1153,9 @@ function race(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink raceBoth
  */
-
-
 function raceBoth_1(that, capacity = () => 16, __tsplusTrace) {
   return self => {
-    return raceWith_1(that, selfDone => tsplus_module_24.done(tsplus_module_7.map(tsplus_module_23.left, __tsplusTrace)(tsplus_module_7.fromExitNow(selfDone, __tsplusTrace))), thatDone => tsplus_module_24.done(tsplus_module_7.map(tsplus_module_23.right, __tsplusTrace)(tsplus_module_7.fromExitNow(thatDone, __tsplusTrace))), capacity, __tsplusTrace)(self);
+    return raceWith_1(that, selfDone => tsplus_module_27.done(tsplus_module_9.map(tsplus_module_26.left, __tsplusTrace)(tsplus_module_9.fromExitNow(selfDone, __tsplusTrace))), thatDone => tsplus_module_27.done(tsplus_module_9.map(tsplus_module_26.right, __tsplusTrace)(tsplus_module_9.fromExitNow(thatDone, __tsplusTrace))), capacity, __tsplusTrace)(self);
   };
 }
 /**
@@ -1371,19 +1164,17 @@ function raceBoth_1(that, capacity = () => 16, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink raceWith
  */
-
-
 function raceWith_1(that, leftDone, rightDone, capacity = () => 16, __tsplusTrace) {
   return self => {
-    const scoped = tsplus_module_7.defer(() => {
+    const scoped = tsplus_module_9.defer(() => {
       const that0 = that();
       const capacity0 = capacity();
-      return tsplus_module_7.flatMap(hub => tsplus_module_7.flatMap(c1 => tsplus_module_7.map(c2 => {
+      return tsplus_module_9.flatMap(hub => tsplus_module_9.flatMap(c1 => tsplus_module_9.map(c2 => {
         const reader = tsplus_module_4.toHub(() => hub);
-        const writer = tsplus_module_25.mergeWith(tsplus_module_4.pipeTo(that0.channel)(c2), leftDone, rightDone)(tsplus_module_4.pipeTo(self.channel)(c1));
-        const channel = tsplus_module_25.mergeWith(writer, () => tsplus_module_24.wait(tsplus_module_7.fromExitNow), done => tsplus_module_24.done(tsplus_module_7.fromExitNow(done, __tsplusTrace)))(reader);
+        const writer = tsplus_module_28.mergeWith(tsplus_module_4.pipeTo(that0.channel)(c2), leftDone, rightDone)(tsplus_module_4.pipeTo(self.channel)(c1));
+        const channel = tsplus_module_28.mergeWith(writer, () => tsplus_module_27.wait(tsplus_module_9.fromExitNow), done => tsplus_module_27.done(tsplus_module_9.fromExitNow(done, __tsplusTrace)))(reader);
         return new tsplus_module_3.Sink(channel);
-      }, __tsplusTrace)(tsplus_module_4.fromHubScoped(() => hub)), __tsplusTrace)(tsplus_module_4.fromHubScoped(() => hub)), __tsplusTrace)(tsplus_module_26.makeBounded(capacity(), __tsplusTrace));
+      }, __tsplusTrace)(tsplus_module_4.fromHubScoped(() => hub)), __tsplusTrace)(tsplus_module_4.fromHubScoped(() => hub)), __tsplusTrace)(tsplus_module_29.makeBounded(capacity(), __tsplusTrace));
     }, __tsplusTrace);
     return unwrapScoped_1(() => scoped, __tsplusTrace);
   };
@@ -1393,25 +1184,17 @@ function raceWith_1(that, leftDone, rightDone, capacity = () => 16, __tsplusTrac
  *
  * @tsplus static fncts.io.SinkOps service
  */
-
-
-function service(
-/** @tsplus auto */
-tag) {
+function service( /** @tsplus auto */tag) {
   const tag_1 = tag;
-  return serviceWith_1(tsplus_module_12.identity, tag_1);
+  return serviceWith_1(tsplus_module_14.identity, tag_1);
 }
 /**
  * Accesses the specified service in the environment of the sink.
  *
  * @tsplus static fncts.io.SinkOps serviceWith
  */
-
-
-function serviceWith_1(f,
-/** @tsplus auto */
-tag) {
-  return fromIO_1(() => tsplus_module_11.serviceWith(f, tag, fileName_1 + ":1520:36"), fileName_1 + ":1520:21");
+function serviceWith_1(f, /** @tsplus auto */tag) {
+  return fromIO_1(() => tsplus_module_13.serviceWith(f, tag, fileName_1 + ":1523:36"), fileName_1 + ":1523:21");
 }
 /**
  * Accesses the specified service in the environment of the sink in the
@@ -1419,12 +1202,8 @@ tag) {
  *
  * @tsplus static fncts.io.SinkOps serviceWithIO
  */
-
-
-function serviceWithIO(f,
-/** @tsplus auto */
-tag) {
-  return fromIO_1(() => tsplus_module_11.serviceWithIO(f, tag, fileName_1 + ":1533:38"), fileName_1 + ":1533:21");
+function serviceWithIO(f, /** @tsplus auto */tag) {
+  return fromIO_1(() => tsplus_module_13.serviceWithIO(f, tag, fileName_1 + ":1536:38"), fileName_1 + ":1536:21");
 }
 /**
  * Accesses the specified service in the environment of the sink in the
@@ -1432,12 +1211,8 @@ tag) {
  *
  * @tsplus static fncts.io.SinkOps serviceWithSink
  */
-
-
-function serviceWithSink(f,
-/** @tsplus auto */
-tag) {
-  return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_11.serviceWith(tsplus_module_12.compose(s => s.channel)(f), tag, fileName_1 + ":1548:21")));
+function serviceWithSink(f, /** @tsplus auto */tag) {
+  return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_13.serviceWith(tsplus_module_14.compose(s => s.channel)(f), tag, fileName_1 + ":1551:21")));
 }
 /**
  * Splits the sink on the specified predicate, returning a new sink that
@@ -1446,35 +1221,30 @@ tag) {
  *
  * @tsplus pipeable fncts.io.Sink splitWhere
  */
-
-
 function splitWhere(p, __tsplusTrace) {
   return self => {
-    return new tsplus_module_3.Sink(tsplus_module_5.flatMap(ref => tsplus_module_5.flatMap(([leftovers, z]) => tsplus_module_5.flatMap(leftover => tsplus_module_5.apSecond(tsplus_module_5.succeedNow(z))(tsplus_module_4.writeNow(tsplus_module_2.concat(tsplus_module_2.flatten(leftovers))(leftover))))(tsplus_module_4.fromIO(() => ref.get)))(tsplus_module_4.collectElements(tsplus_module_4.pipeToOrFail(self.channel)(splitter(p, false, ref, __tsplusTrace)))))(tsplus_module_4.fromIO(() => tsplus_module_6.make(() => tsplus_module_1.empty(), __tsplusTrace))));
+    return new tsplus_module_3.Sink(tsplus_module_5.flatMap(ref => tsplus_module_5.flatMap(([leftovers, z]) => tsplus_module_5.flatMap(leftover => tsplus_module_5.zipRight(tsplus_module_5.succeedNow(z))(tsplus_module_4.writeNow(tsplus_module_2.concat(tsplus_module_2.flatten(leftovers))(leftover))))(tsplus_module_4.fromIO(() => tsplus_module_7.get(ref, __tsplusTrace))))(tsplus_module_4.collectElements(tsplus_module_4.pipeToOrFail(self.channel)(splitter(p, false, ref, __tsplusTrace)))))(tsplus_module_4.fromIO(() => tsplus_module_8.make(() => tsplus_module_1.empty(), __tsplusTrace))));
   };
 }
-
 function splitter(p, written, leftovers, __tsplusTrace) {
   return tsplus_module_4.readWithCause(inp => {
     if (tsplus_module_2.isEmpty(inp)) {
       return splitter(p, written, leftovers, __tsplusTrace);
     } else if (written) {
-      const index = tsplus_module_27.findIndex(p)(inp);
-
+      const index = tsplus_module_30.findIndex(p)(inp);
       if (index === -1) {
-        return tsplus_module_5.apSecond(splitter(p, true, leftovers, __tsplusTrace))(tsplus_module_4.writeNow(inp));
+        return tsplus_module_5.zipRight(splitter(p, true, leftovers, __tsplusTrace))(tsplus_module_4.writeNow(inp));
       } else {
         const [left, right] = tsplus_module_2.splitAt(index)(inp);
-        return tsplus_module_5.apSecond(tsplus_module_4.fromIO(() => leftovers.set(right, __tsplusTrace)))(tsplus_module_4.writeNow(left));
+        return tsplus_module_5.zipRight(tsplus_module_4.fromIO(() => tsplus_module_6.set(right, __tsplusTrace)(leftovers)))(tsplus_module_4.writeNow(left));
       }
     } else {
-      const index = tsplus_module_27.findIndex(p)(inp);
-
+      const index = tsplus_module_30.findIndex(p)(inp);
       if (index === -1) {
-        return tsplus_module_5.apSecond(splitter(p, true, leftovers, __tsplusTrace))(tsplus_module_4.writeNow(inp));
+        return tsplus_module_5.zipRight(splitter(p, true, leftovers, __tsplusTrace))(tsplus_module_4.writeNow(inp));
       } else {
         const [left, right] = tsplus_module_2.splitAt(Math.max(index, 1))(inp);
-        return tsplus_module_5.apSecond(tsplus_module_4.fromIO(() => leftovers.set(right, __tsplusTrace)))(tsplus_module_4.writeNow(left));
+        return tsplus_module_5.zipRight(tsplus_module_4.fromIO(() => tsplus_module_6.set(right, __tsplusTrace)(leftovers)))(tsplus_module_4.writeNow(left));
       }
     }
   }, tsplus_module_5.failCauseNow, tsplus_module_5.succeedNow);
@@ -1484,8 +1254,6 @@ function splitter(p, written, leftovers, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps succeed
  */
-
-
 function succeed(z, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_5.succeed(z));
 }
@@ -1494,8 +1262,6 @@ function succeed(z, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps succeedNow
  */
-
-
 function succeedNow(z, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_5.succeedNow(z));
 }
@@ -1505,40 +1271,32 @@ function succeedNow(z, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink summarized
  */
-
-
 function summarized_1(summary, f, __tsplusTrace) {
   return self => {
-    return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_7.map(summary => tsplus_module_5.flatMap(start => tsplus_module_5.flatMap(done => tsplus_module_5.map(end => tsplus_module_12.tuple(done, f(start, end)))(tsplus_module_4.fromIO(() => summary)))(self.channel))(tsplus_module_4.fromIO(() => summary)), __tsplusTrace)(tsplus_module_7.succeed(summary, __tsplusTrace))));
+    return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_9.map(summary => tsplus_module_5.flatMap(start => tsplus_module_5.flatMap(done => tsplus_module_5.map(end => tsplus_module_14.tuple(done, f(start, end)))(tsplus_module_4.fromIO(() => summary)))(self.channel))(tsplus_module_4.fromIO(() => summary)), __tsplusTrace)(tsplus_module_9.succeed(summary, __tsplusTrace))));
   };
 }
 /**
  * @tsplus getter fncts.io.Sink timed
  */
-
-
 function timed(self, __tsplusTrace) {
-  return summarized_1(() => tsplus_module_28.currentTime, (start, end) => tsplus_module_29.fromInterval(start, end), __tsplusTrace)(self);
+  return summarized_1(() => tsplus_module_31.currentTime, (start, end) => tsplus_module_32.fromInterval(start, end), __tsplusTrace)(self);
 }
 /**
  * Creates a sink produced from an effect.
  *
  * @tsplus static fncts.io.SinkOps unwrap
  */
-
-
 function unwrap_1(io, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_7.map(sink => sink.channel, __tsplusTrace)(io())));
+  return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_9.map(sink => sink.channel, __tsplusTrace)(io())));
 }
 /**
  * Creates a sink produced from a scoped effect.
  *
  * @tsplus static fncts.io.SinkOps unwrapScoped
  */
-
-
 function unwrapScoped_1(scoped, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.unwrapScoped(() => tsplus_module_7.map(sink => sink.channel, __tsplusTrace)(scoped())));
+  return new tsplus_module_3.Sink(tsplus_module_4.unwrapScoped(() => tsplus_module_9.map(sink => sink.channel, __tsplusTrace)(scoped())));
 }
 /**
  * Feeds inputs to this sink until it yields a result, then switches over to
@@ -1547,11 +1305,9 @@ function unwrapScoped_1(scoped, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink zip
  */
-
-
 function zip(that, __tsplusTrace) {
   return self => {
-    return zipWith_1(that, tsplus_module_12.tuple, __tsplusTrace)(() => self);
+    return zipWith_1(that, tsplus_module_14.tuple, __tsplusTrace)(() => self);
   };
 }
 /**
@@ -1560,11 +1316,9 @@ function zip(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink zipC
  */
-
-
 function zipC(that, __tsplusTrace) {
   return self => {
-    return zipWithC_1(that, tsplus_module_12.tuple, __tsplusTrace)(() => self);
+    return zipWithC_1(that, tsplus_module_14.tuple, __tsplusTrace)(() => self);
   };
 }
 /**
@@ -1574,8 +1328,6 @@ function zipC(that, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink zipWith
  */
-
-
 function zipWith_1(that, f, __tsplusTrace) {
   return self => {
     return defer_1(() => flatMap_1(z => map_1(z1 => f(z, z1), __tsplusTrace)(that()), __tsplusTrace)(self()), __tsplusTrace);
@@ -1587,11 +1339,9 @@ function zipWith_1(that, f, __tsplusTrace) {
  *
  * @tsplus pipeable fncts.io.Sink zipWithC
  */
-
-
 function zipWithC_1(that, f, __tsplusTrace) {
   return self => {
-    return defer_1(() => raceWith_1(() => that(), exit => tsplus_module_30.match(err => tsplus_module_24.done(tsplus_module_7.failCauseNow(err, __tsplusTrace)), lz => tsplus_module_24.wait(exit => tsplus_module_30.match(cause => tsplus_module_7.failCauseNow(cause, __tsplusTrace), rz => tsplus_module_7.succeedNow(f(lz, rz), __tsplusTrace))(exit)))(exit), exit => tsplus_module_30.match(err => tsplus_module_24.done(tsplus_module_7.failCauseNow(err, __tsplusTrace)), rz => tsplus_module_24.wait(exit => tsplus_module_30.match(cause => tsplus_module_7.failCauseNow(cause, __tsplusTrace), lz => tsplus_module_7.succeedNow(f(lz, rz), __tsplusTrace))(exit)))(exit))(self()), __tsplusTrace);
+    return defer_1(() => raceWith_1(() => that(), exit => tsplus_module_33.match(err => tsplus_module_27.done(tsplus_module_9.failCauseNow(err, __tsplusTrace)), lz => tsplus_module_27.wait(exit => tsplus_module_33.match(cause => tsplus_module_9.failCauseNow(cause, __tsplusTrace), rz => tsplus_module_9.succeedNow(f(lz, rz), __tsplusTrace))(exit)))(exit), exit => tsplus_module_33.match(err => tsplus_module_27.done(tsplus_module_9.failCauseNow(err, __tsplusTrace)), rz => tsplus_module_27.wait(exit => tsplus_module_33.match(cause => tsplus_module_9.failCauseNow(cause, __tsplusTrace), lz => tsplus_module_9.succeedNow(f(lz, rz), __tsplusTrace))(exit)))(exit))(self()), __tsplusTrace);
   };
 }
 //# sourceMappingURL=api.cjs.map