@fncts/io 0.0.20 → 0.0.22

package/_mjs/Sink/api.mjs

@@ -56,9 +56,9 @@ export const makeFoldLeft = makeFoldLeft_1;
 export const makeFoldIO = makeFoldIO_1;
 export const makeFoldWeightedDecompose = makeFoldWeightedDecompose_1;
 export const makeFoldWeightedDecomposeIO = makeFoldWeightedDecomposeIO_1;
-export const map_ = map_1;
-export const mapIO_ = mapIO_1;
-export const matchSink_ = matchSink_1;
+export const map = map_1;
+export const mapIO = mapIO_1;
+export const matchSink = matchSink_1;
 export const raceBoth = raceBoth_1;
 export const raceWith = raceWith_1;
 export const serviceWith = serviceWith_1;
@@ -71,84 +71,89 @@ import { AtomicReference } from "@fncts/base/internal/AtomicReference";
 /**
  * Like {@link zip}, but keeps only the result from this sink
  *
- * @tsplus fluent fncts.io.Sink apFirst
+ * @tsplus pipeable fncts.io.Sink zipLeft
  */
-
-export function apFirst(self, that, __tsplusTrace) {
-  return zipWith_1(() => self, that, (z, _) => z, __tsplusTrace);
+export function zipLeft(that, __tsplusTrace) {
+  return self => {
+    return zipWith_1(that, (z, _) => z, __tsplusTrace)(() => self);
+  };
 }
 /**
  * Like {@link zipC}, but keeps only the result from this sink
  *
- * @tsplus fluent fncts.io.Sink apFirstC
+ * @tsplus pipeable fncts.io.Sink zipLeftC
  */
-
-export function apFirstC(self, that, __tsplusTrace) {
-  return zipWithC_1(() => self, that, (z, _) => z, __tsplusTrace);
+export function zipLeftC(that, __tsplusTrace) {
+  return self => {
+    return zipWithC_1(that, (z, _) => z, __tsplusTrace)(() => self);
+  };
 }
 /**
  * Like {@link zip}, but keeps only the result from the `that` sink
  *
- * @tsplus fluent fncts.io.Sink apSecond
+ * @tsplus pipeable fncts.io.Sink zipRight
  */
-
-export function apSecond(self, that, __tsplusTrace) {
-  return zipWith_1(() => self, that, (_, z1) => z1, __tsplusTrace);
+export function zipRight(that, __tsplusTrace) {
+  return self => {
+    return zipWith_1(that, (_, z1) => z1, __tsplusTrace)(() => self);
+  };
 }
 /**
  * Like {@link zipC}, but keeps only the result from the `that` sink
  *
- * @tsplus fluent fncts.io.Sink apSecondC
+ * @tsplus pipeable fncts.io.Sink zipRightC
  */
-
-export function apSecondC(self, that, __tsplusTrace) {
-  return zipWithC_1(() => self, that, (_, z1) => z1, __tsplusTrace);
+export function zipRightC(that, __tsplusTrace) {
+  return self => {
+    return zipWithC_1(that, (_, z1) => z1, __tsplusTrace)(() => self);
+  };
 }
 /**
  * Replaces this sink's result with the provided value.
  *
- * @tsplus fluent fncts.io.Sink as
+ * @tsplus pipeable fncts.io.Sink as
  */
-
-export function as(self, z, __tsplusTrace) {
-  return map_1(self, () => z(), __tsplusTrace);
+export function as(z, __tsplusTrace) {
+  return self => {
+    return map_1(() => z(), __tsplusTrace)(self);
+  };
 }
 /**
  * Repeatedly runs the sink and accumulates its results into a chunk
  *
- * @tsplus fluent fncts.io.Sink collectAll
+ * @tsplus pipeable fncts.io.Sink collectAll
  */
-
-export function collectAll(self, __tsplusTrace) {
-  return collectAllWhileWith_1(self, () => tsplus_module_1.empty(), () => true, (s, z) => tsplus_module_2.append_(s, z), __tsplusTrace);
+export function collectAll(__tsplusTrace) {
+  return self => {
+    return collectAllWhileWith_1(() => tsplus_module_1.empty(), () => true, (s, z) => tsplus_module_2.append(z)(s), __tsplusTrace)(self);
+  };
 }
 /**
  * Repeatedly runs the sink for as long as its results satisfy the predicate
  * `p`. The sink's results will be accumulated using the stepping function
  * `f`.
  *
- * @tsplus fluent fncts.io.Sink collectAllWhileWith
- */
-
-function collectAllWhileWith_1(self, z, p, f, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => tsplus_module_9.zip_(tsplus_module_8.make(() => tsplus_module_1.empty(), __tsplusTrace), tsplus_module_8.make(() => false, __tsplusTrace), __tsplusTrace)), ([leftoversRef, upstreamDoneRef]) => {
-    const upstreamMarker = tsplus_module_4.readWith(inp => tsplus_module_5.apSecond_(tsplus_module_4.writeNow(inp), upstreamMarker), tsplus_module_4.failNow, x => tsplus_module_4.as_(tsplus_module_4.fromIO(() => tsplus_module_6.set_(upstreamDoneRef, true, __tsplusTrace)), () => x));
-
-    function loop(currentResult, __tsplusTrace) {
-      return tsplus_module_4.matchChannel_(tsplus_module_4.collectElements(self.channel), tsplus_module_4.failNow, ([leftovers, doneValue]) => {
-        if (p(doneValue)) {
-          return tsplus_module_5.apSecond_(tsplus_module_4.fromIO(() => tsplus_module_6.set_(leftoversRef, tsplus_module_2.flatten(leftovers), __tsplusTrace)), tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => tsplus_module_7.get(upstreamDoneRef, __tsplusTrace)), upstreamDone => {
-            const accumulatedResult = f(currentResult, doneValue);
-            if (upstreamDone) return tsplus_module_4.as_(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)), () => accumulatedResult);else return loop(accumulatedResult, __tsplusTrace);
-          }));
-        } else {
-          return tsplus_module_4.as_(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)), () => currentResult);
-        }
-      });
-    }
-
-    return tsplus_module_4.pipeTo_(tsplus_module_4.pipeTo_(upstreamMarker, tsplus_module_4.bufferChunk(leftoversRef)), loop(z(), __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.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.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(() => 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_9.zip(tsplus_module_8.make(() => false, __tsplusTrace), __tsplusTrace)(tsplus_module_8.make(() => tsplus_module_1.empty(), __tsplusTrace)))));
+  };
 }
 /**
  * Collects the leftovers from the stream when the sink succeeds and returns
@@ -156,93 +161,95 @@ function collectAllWhileWith_1(self, z, p, f, __tsplusTrace) {
  *
  * @tsplus getter fncts.io.Sink collectLeftover
  */
-
-
 export function collectLeftover(self, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_5.map_(tsplus_module_4.collectElements(self.channel), ([chunks, z]) => [z, tsplus_module_2.flatten(chunks)]));
+  return new tsplus_module_3.Sink(tsplus_module_5.map(([chunks, z]) => [z, tsplus_module_2.flatten(chunks)])(tsplus_module_4.collectElements(self.channel)));
 }
 /**
  * Transforms this sink's input elements.
  *
- * @tsplus fluent fncts.io.Sink contramap
+ * @tsplus pipeable fncts.io.Sink contramap
  */
-
-function contramap_1(self, f, __tsplusTrace) {
-  return contramapChunks_1(self, chunk => tsplus_module_2.map_(chunk, f), __tsplusTrace);
+function contramap_1(f, __tsplusTrace) {
+  return self => {
+    return contramapChunks_1(chunk => tsplus_module_2.map(f)(chunk), __tsplusTrace)(self);
+  };
 }
 /**
  * Transforms this sink's input chunks. `f` must preserve chunking-invariance
  *
- * @tsplus fluent fncts.io.Sink contramapChunks
+ * @tsplus pipeable fncts.io.Sink contramapChunks
  */
-
-
-function contramapChunks_1(self, f, __tsplusTrace) {
-  const loop = tsplus_module_4.readWith(chunk => tsplus_module_5.apSecond_(tsplus_module_4.writeNow(f(chunk)), loop), tsplus_module_4.failNow, tsplus_module_5.succeedNow);
-  return new tsplus_module_3.Sink(tsplus_module_4.pipeTo_(loop, self.channel));
+function contramapChunks_1(f, __tsplusTrace) {
+  return self => {
+    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));
+  };
 }
 /**
  * Effectfully transforms this sink's input chunks. `f` must preserve
  * chunking-invariance
  *
- * @tsplus fluent fncts.io.Sink contramapChunksIO
+ * @tsplus pipeable fncts.io.Sink contramapChunksIO
  */
-
-
-function contramapChunksIO_1(self, f, __tsplusTrace) {
-  const loop = tsplus_module_4.readWith(chunk => tsplus_module_5.apSecond_(tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => f(chunk)), tsplus_module_4.writeNow), loop), tsplus_module_4.failNow, tsplus_module_5.succeedNow);
-  return new tsplus_module_3.Sink(tsplus_module_4.pipeToOrFail_(loop, self.channel));
+function contramapChunksIO_1(f, __tsplusTrace) {
+  return self => {
+    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));
+  };
 }
 /**
  * Effectfully transforms this sink's input elements.
  *
- * @tsplus fluent fncts.io.Sink contramapIO
+ * @tsplus pipeable fncts.io.Sink contramapIO
  */
-
-
-function contramapIO_1(self, f, __tsplusTrace) {
-  return contramapChunksIO_1(self, chunk => tsplus_module_10.mapIO_(chunk, f, __tsplusTrace), __tsplusTrace);
+function contramapIO_1(f, __tsplusTrace) {
+  return self => {
+    return contramapChunksIO_1(chunk => tsplus_module_10.mapIO(f, __tsplusTrace)(chunk), __tsplusTrace)(self);
+  };
 }
 /**
  * Transforms both inputs and result of this sink using the provided
  * functions.
  *
- * @tsplus fluent fncts.io.Sink dimap
+ * @tsplus pipeable fncts.io.Sink dimap
  */
-
-
-export function dimap(self, f, g, __tsplusTrace) {
-  return map_1(contramap_1(self, f, __tsplusTrace), g, __tsplusTrace);
+export function dimap(f, g, __tsplusTrace) {
+  return self => {
+    return map_1(g, __tsplusTrace)(contramap_1(f, __tsplusTrace)(self));
+  };
 }
 /**
  * Transforms both input chunks and result of this sink using the provided
  * functions.
  *
- * @tsplus fluent fncts.io.Sink dimapChunks
+ * @tsplus pipeable fncts.io.Sink dimapChunks
  */
-
-export function dimapChunks(self, f, g, __tsplusTrace) {
-  return map_1(contramapChunks_1(self, f, __tsplusTrace), g, __tsplusTrace);
+export function dimapChunks(f, g, __tsplusTrace) {
+  return self => {
+    return map_1(g, __tsplusTrace)(contramapChunks_1(f, __tsplusTrace)(self));
+  };
 }
 /**
  * Effectfully transforms both input chunks and result of this sink using the
  * provided functions. `f` and `g` must preserve chunking-invariance
  *
- * @tsplus fluent fncts.io.Sink dimapChunksIO
+ * @tsplus pipeable fncts.io.Sink dimapChunksIO
  */
-
-export function dimapChunksIO(self, f, g, __tsplusTrace) {
-  return mapIO_1(contramapChunksIO_1(self, f, __tsplusTrace), g, __tsplusTrace);
+export function dimapChunksIO(f, g, __tsplusTrace) {
+  return self => {
+    return mapIO_1(g, __tsplusTrace)(contramapChunksIO_1(f, __tsplusTrace)(self));
+  };
 }
 /**
  * Effectfully transforms both inputs and result of this sink using the
  * provided functions.
  *
- * @tsplus fluent fncts.io.Sink dimapIO
+ * @tsplus pipeable fncts.io.Sink dimapIO
  */
-
-export function dimapIO(self, f, g, __tsplusTrace) {
-  return mapIO_1(contramapIO_1(self, f, __tsplusTrace), g, __tsplusTrace);
+export function dimapIO(f, g, __tsplusTrace) {
+  return self => {
+    return mapIO_1(g, __tsplusTrace)(contramapIO_1(f, __tsplusTrace)(self));
+  };
 }
 /**
  * Returns a lazily constructed sink that may require effects for its
@@ -250,34 +257,29 @@ export function dimapIO(self, 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
  */
-
 export const drain = /*#__PURE__*/new tsplus_module_3.Sink(drainLoop);
 /**
  * Drops incoming elements until the predicate `p` is satisfied.
  *
  * @tsplus static fncts.io.SinkOps dropUntil
  */
-
 export function makeDropUntil(p, __tsplusTrace) {
   const loop = tsplus_module_4.readWith(inp => {
-    const leftover = tsplus_module_2.dropUntil(inp, p);
+    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.writeNow(leftover), tsplus_module_4.id());
+      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);
@@ -287,9 +289,8 @@ export function makeDropUntil(p, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps dropUntilIO
  */
-
 export function makeDropUntilIO(p, __tsplusTrace) {
-  const loop = tsplus_module_4.readWith(inp => tsplus_module_4.unwrap(() => tsplus_module_9.map_(tsplus_module_11.dropUntilIO(inp, p, __tsplusTrace), leftover => tsplus_module_2.isEmpty(leftover) ? loop : tsplus_module_5.apSecond_(tsplus_module_4.writeNow(leftover), tsplus_module_4.id()), __tsplusTrace)), 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);
 }
 /**
@@ -297,16 +298,14 @@ export function makeDropUntilIO(p, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps dropWhile
  */
-
 export function makeDropWhile(predicate, __tsplusTrace) {
   const loop = tsplus_module_4.readWith(inp => {
-    const leftover = tsplus_module_2.dropWhile_(inp, predicate);
+    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.writeNow(leftover), tsplus_module_4.id());
+      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);
@@ -317,9 +316,8 @@ export function makeDropWhile(predicate, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps dropWhileIO
  */
-
 export function dropWhileIO(p, __tsplusTrace) {
-  const loop = tsplus_module_4.readWith(inp => tsplus_module_4.unwrap(() => tsplus_module_9.map_(tsplus_module_12.dropWhileIO(inp, p, __tsplusTrace), leftover => tsplus_module_2.isEmpty(leftover) ? loop : tsplus_module_5.apSecond_(tsplus_module_4.writeNow(leftover), tsplus_module_4.id()), __tsplusTrace)), 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);
 }
 /**
@@ -327,7 +325,6 @@ export function dropWhileIO(p, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps environment
  */
-
 export function environment(__tsplusTrace) {
   return fromIO_1(() => tsplus_module_13.environment(__tsplusTrace), __tsplusTrace);
 }
@@ -336,7 +333,6 @@ export function environment(__tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps environmentWith
  */
-
 export function environmentWith(f, __tsplusTrace) {
   return fromIO_1(() => tsplus_module_13.environmentWith(f, __tsplusTrace), __tsplusTrace);
 }
@@ -345,7 +341,6 @@ export function environmentWith(f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps environmentWithIO
  */
-
 export function environmentWithIO(f, __tsplusTrace) {
   return fromIO_1(() => tsplus_module_13.environmentWithIO(f, __tsplusTrace), __tsplusTrace);
 }
@@ -354,16 +349,14 @@ export function environmentWithIO(f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps environmentWithSink
  */
-
 export function environmentWithSink(f, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_13.environmentWith(tsplus_module_14.compose_(f, s => s.channel), __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
  */
-
 export function fail(e, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_4.fail(e));
 }
@@ -372,7 +365,6 @@ export 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));
 }
@@ -381,8 +373,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));
 }
@@ -391,8 +381,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));
 }
@@ -401,34 +389,32 @@ function failNow_1(e, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps filterInput
  */
-
-
 export function filterInput(self, p, __tsplusTrace) {
-  return contramapChunks_1(self, chunk => tsplus_module_2.filter_(chunk, p), __tsplusTrace);
+  return contramapChunks_1(chunk => tsplus_module_2.filter(p)(chunk), __tsplusTrace)(self);
 }
 /**
  * Filters the sink's input with the given IO predicate
  *
  * @tsplus static fncts.io.SinkOps filterInputIO
  */
-
 export function filterInputIO(self, p, __tsplusTrace) {
-  return contramapChunksIO_1(self, chunk => tsplus_module_15.filterIO(chunk, p, __tsplusTrace), __tsplusTrace);
+  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 fluent fncts.io.Sink findIO
+ * @tsplus pipeable fncts.io.Sink findIO
  */
-
-export function findIO(self, f, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => tsplus_module_9.zip_(tsplus_module_8.make(() => tsplus_module_1.empty(), __tsplusTrace), tsplus_module_8.make(() => false, __tsplusTrace), __tsplusTrace)), ([leftoversRef, upstreamDoneRef]) => {
-    const upstreamMarker = tsplus_module_4.readWith(inp => tsplus_module_5.apSecond_(tsplus_module_4.writeNow(inp), upstreamMarker), tsplus_module_4.failNow, x => tsplus_module_4.as_(tsplus_module_4.fromIO(() => tsplus_module_6.set_(upstreamDoneRef, true, __tsplusTrace)), () => x));
-    const loop = tsplus_module_4.matchChannel_(tsplus_module_4.collectElements(self.channel), tsplus_module_4.failNow, ([leftovers, doneValue]) => tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => f(doneValue)), satisfied => tsplus_module_5.apSecond_(tsplus_module_4.fromIO(() => tsplus_module_6.set_(leftoversRef, tsplus_module_2.flatten(leftovers), __tsplusTrace)), tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => tsplus_module_7.get(upstreamDoneRef, __tsplusTrace)), upstreamDone => {
-      if (satisfied) return tsplus_module_4.as_(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)), () => tsplus_module_16.just(doneValue));else if (upstreamDone) return tsplus_module_4.as_(tsplus_module_4.writeNow(tsplus_module_2.flatten(leftovers)), () => tsplus_module_16.nothing());else return loop;
-    }))));
-    return tsplus_module_4.pipeTo_(tsplus_module_4.pipeTo_(upstreamMarker, tsplus_module_4.bufferChunk(leftoversRef)), loop);
-  }));
+export 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.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_9.zip(tsplus_module_8.make(() => false, __tsplusTrace), __tsplusTrace)(tsplus_module_8.make(() => tsplus_module_1.empty(), __tsplusTrace)))));
+  };
 }
 /**
  * Runs this sink until it yields a result, then uses that result to create
@@ -437,11 +423,12 @@ export function findIO(self, f, __tsplusTrace) {
  *
  * This function essentially runs sinks in sequence.
  *
- * @tsplus fluent fncts.io.Sink flatMap
+ * @tsplus pipeable fncts.io.Sink flatMap
  */
-
-function flatMap_1(self, f, __tsplusTrace) {
-  return matchSink_1(self, failNow_1, f, __tsplusTrace);
+function flatMap_1(f, __tsplusTrace) {
+  return self => {
+    return matchSink_1(failNow_1, f, __tsplusTrace)(self);
+  };
 }
 /**
  * Creates a sink from a {@link Channel}
@@ -449,8 +436,6 @@ function flatMap_1(self, f, __tsplusTrace) {
  * @tsplus static fncts.io.SinkOps fromChannel
  * @tsplus static fncts.io.SinkOps __call
  */
-
-
 export function fromChannel(channel, __tsplusTrace) {
   return new tsplus_module_3.Sink(channel);
 }
@@ -459,23 +444,19 @@ export function fromChannel(channel, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps fromPush
  */
-
 export function fromPush(push, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.unwrapScoped(() => tsplus_module_9.map_(push, fromPushPull, __tsplusTrace)));
+  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_(tsplus_module_4.fromIO(() => push(tsplus_module_16.just(inp))), ([r, leftovers]) => tsplus_module_17.match_(r, e => tsplus_module_5.apSecond_(tsplus_module_4.writeNow(leftovers), tsplus_module_4.failNow(e)), z => tsplus_module_5.apSecond_(tsplus_module_4.writeNow(leftovers), tsplus_module_5.succeedNow(z))), () => fromPushPull(push, __tsplusTrace)), tsplus_module_4.failNow, () => tsplus_module_4.matchChannel_(tsplus_module_4.fromIO(() => push(tsplus_module_16.nothing())), ([r, leftovers]) => tsplus_module_17.match_(r, e => tsplus_module_5.apSecond_(tsplus_module_4.writeNow(leftovers), tsplus_module_4.failNow(e)), z => tsplus_module_5.apSecond_(tsplus_module_4.writeNow(leftovers), tsplus_module_5.succeedNow(z))), () => tsplus_module_4.fromIO(() => tsplus_module_9.halt(() => new Error("empty sink"), __tsplusTrace))));
+  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_9.map_(tsplus_module_9.succeed(queue, __tsplusTrace), queue => makeForeachChunk_1(inp => tsplus_module_18.offerAll_(queue, inp, __tsplusTrace), __tsplusTrace), __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
@@ -483,18 +464,14 @@ function fromQueue_1(queue, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps fromQueueWithShutdown
  */
-
-
 function fromQueueWithShutdown_1(queue, __tsplusTrace) {
-  return unwrapScoped_1(() => tsplus_module_9.map_(tsplus_module_19.acquireRelease(() => tsplus_module_9.succeed(queue, __tsplusTrace), queue => tsplus_module_18.shutdown(queue, __tsplusTrace), __tsplusTrace), queue => fromQueue_1(() => queue, __tsplusTrace), __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
  */
-
-
 export function fromHub(hub, __tsplusTrace) {
   return fromQueue_1(hub, __tsplusTrace);
 }
@@ -504,7 +481,6 @@ export function fromHub(hub, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps fromHubWithShutdown
  */
-
 export function fromHubWithShutdown(hub, __tsplusTrace) {
   return fromQueueWithShutdown_1(hub, __tsplusTrace);
 }
@@ -513,7 +489,6 @@ export 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));
 }
@@ -522,8 +497,6 @@ function fromIO_1(b, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps halt
  */
-
-
 export function halt(defect, __tsplusTrace) {
   return failCause_1(() => tsplus_module_20.halt(defect()), __tsplusTrace);
 }
@@ -532,7 +505,6 @@ export function halt(defect, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps haltNow
  */
-
 export function haltNow(defect, __tsplusTrace) {
   return failCauseNow_1(tsplus_module_20.halt(defect), __tsplusTrace);
 }
@@ -541,16 +513,14 @@ export function haltNow(defect, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps head
  */
-
 export function head(__tsplusTrace) {
-  return makeFold_1(() => tsplus_module_16.nothing(), elem => tsplus_module_21.isNothing(elem), (s, inp) => tsplus_module_22.match_(s, () => tsplus_module_16.just(inp), () => 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));
 }
@@ -559,8 +529,6 @@ function ignoreLeftover_1(self, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps last
  */
-
-
 export function last(__tsplusTrace) {
   return makeFoldLeft_1(() => tsplus_module_16.nothing(), (_, inp) => tsplus_module_16.just(inp), __tsplusTrace);
 }
@@ -570,7 +538,6 @@ export function last(__tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps leftover
  */
-
 export function leftover(c, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_4.write(c));
 }
@@ -579,7 +546,6 @@ export function leftover(c, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps log
  */
-
 export function log(message, __tsplusTrace) {
   return fromIO_1(() => tsplus_module_9.log(message, __tsplusTrace), __tsplusTrace);
 }
@@ -588,13 +554,11 @@ export function log(message, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps collectAll
  */
-
 export 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_(state, inp), __tsplusTrace), tsplus_module_5.failCauseNow, () => tsplus_module_5.endNow(state));
+  return tsplus_module_4.readWithCause(inp => collectLoop(tsplus_module_2.concat(inp)(state), __tsplusTrace), tsplus_module_5.failCauseNow, () => tsplus_module_5.endNow(state));
 }
 /**
  * A sink that collects first `n` elements into a chunk. Note that the chunk
@@ -602,19 +566,16 @@ function collectLoop(state, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps collectAllN
  */
-
-
 export function makeCollectAllN(n, __tsplusTrace) {
-  return flatMap_1(fromIO_1(() => tsplus_module_9.succeed(() => new tsplus_module_23.ConcBuilder(), __tsplusTrace), __tsplusTrace), builder => map_1(makeFoldUntil_1(() => builder, n, (builder, inp) => builder.append(inp), __tsplusTrace), builder => builder.result(), __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
  */
-
 export function makeForeach(f, __tsplusTrace) {
-  return makeForeachWhile_1(inp => tsplus_module_9.as_(f(inp), () => true, __tsplusTrace), __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
@@ -622,9 +583,8 @@ export 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_(tsplus_module_4.fromIO(() => f(inp)), process), 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);
 }
 /**
@@ -633,19 +593,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_(tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => f(tsplus_module_2.unsafeGet_(chunk, idx))), b => b ? foreachWhileLoop(f, chunk, idx + 1, len, cont, __tsplusTrace) : tsplus_module_4.writeNow(tsplus_module_2.drop_(chunk, idx))), e => tsplus_module_5.apSecond_(tsplus_module_4.writeNow(tsplus_module_2.drop_(chunk, idx)), tsplus_module_4.failNow(e)));
+  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
@@ -653,10 +609,8 @@ function foreachWhileLoop(f, chunk, idx, len, cont, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foreachChunkWhile
  */
-
-
 export function makeForeachChunkWhile(f, __tsplusTrace) {
-  const reader = tsplus_module_4.readWith(inp => tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => f(inp)), cont => cont ? reader : tsplus_module_4.unit), tsplus_module_4.failNow, () => tsplus_module_4.unit);
+  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);
 }
 /**
@@ -665,37 +619,32 @@ export 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_(chunk_1, idx_1));
-
+      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;
@@ -713,21 +662,19 @@ function foldChunkSplit(contFn, f, s, chunk, idx, len, __tsplusTrace) {
         __tsplusTrace_1 = __tsplusTrace_2;
         continue;
       } else {
-        return [s1, tsplus_module_2.drop_(chunk_1, idx_1 + 1)];
+        return [s1, tsplus_module_2.drop(idx_1 + 1)(chunk_1)];
       }
     }
   }
 }
-
 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_(tsplus_module_4.writeNow(leftovers), () => nextS);
+        return tsplus_module_4.as_(() => nextS)(tsplus_module_4.writeNow(leftovers));
       } else {
         return foldReader(nextS, contFn, f, __tsplusTrace);
       }
@@ -742,10 +689,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_9.map_(tsplus_module_9.succeed(max, __tsplusTrace), max => map_1(makeFold_1(() => [z(), 0], ([_, n]) => n < max, ([o, count], i) => [f(o, i), count + 1], __tsplusTrace), ([s]) => s, __tsplusTrace), __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
@@ -755,12 +700,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);
@@ -779,17 +721,14 @@ 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);
   } else {
-    return tsplus_module_4.readWith(inp => tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => f(s, inp)), s => foldChunksIOReader(s, contFn, f, __tsplusTrace)), err => tsplus_module_4.failNow(err), _ => tsplus_module_5.succeedNow(_));
+    return tsplus_module_4.readWith(inp => tsplus_module_5.flatMap(s => foldChunksIOReader(s, contFn, f, __tsplusTrace))(tsplus_module_4.fromIO(() => f(s, inp))), err => tsplus_module_4.failNow(err), _ => tsplus_module_5.succeedNow(_));
   }
 }
 /**
@@ -797,8 +736,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);
 }
@@ -808,8 +745,6 @@ function makeFoldLeft_1(z, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldLeftChunks
  */
-
-
 export function makeFoldLeftChunks(z, f, __tsplusTrace) {
   return ignoreLeftover_1(makeFoldChunks_1(z, () => true, f, __tsplusTrace), __tsplusTrace);
 }
@@ -819,7 +754,6 @@ export function makeFoldLeftChunks(z, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldLeftChunksIO
  */
-
 export function makeFoldLeftChunksIO(z, f, __tsplusTrace) {
   return makeFoldChunksIO_1(z, () => true, f, __tsplusTrace);
 }
@@ -829,7 +763,6 @@ export function makeFoldLeftChunksIO(z, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldLeftIO
  */
-
 export function makeFoldLeftIO(z, f, __tsplusTrace) {
   return makeFoldIO_1(z, () => true, f, __tsplusTrace);
 }
@@ -839,30 +772,27 @@ export 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_9.succeedNow([s, tsplus_module_16.nothing()], __tsplusTrace);
   } else {
-    return tsplus_module_9.flatMap_(f(s, tsplus_module_2.unsafeGet_(chunk, idx)), s1 => {
+    return tsplus_module_9.flatMap(s1 => {
       if (contFn(s1)) {
         return foldChunkSplitIO(s1, contFn, f, chunk, idx + 1, len, __tsplusTrace);
       } else {
-        return tsplus_module_9.succeedNow([s1, tsplus_module_16.just(tsplus_module_2.drop_(chunk, idx + 1))], __tsplusTrace);
+        return tsplus_module_9.succeedNow([s1, tsplus_module_16.just(tsplus_module_2.drop(idx + 1)(chunk))], __tsplusTrace);
       }
-    }, __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_(tsplus_module_4.fromIO(() => foldChunkSplitIO(s, contFn, f, inp, 0, inp.length, __tsplusTrace)), ([nextS, leftovers]) => tsplus_module_22.match_(leftovers, () => foldIOReader(nextS, contFn, f, __tsplusTrace), l => tsplus_module_4.as_(tsplus_module_4.writeNow(l), () => nextS))), 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(_));
   }
 }
 /**
@@ -873,10 +803,8 @@ function foldIOReader(s, contFn, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldUntilIO
  */
-
-
 export function makeFoldUntilIO(z, max, f, __tsplusTrace) {
-  return map_1(makeFoldIO_1(() => [z(), 0], ([_, n]) => n < max(), ([o, count], i) => tsplus_module_9.map_(f(o, i), s => [s, count + 1], __tsplusTrace), __tsplusTrace), ([s]) => s, __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
@@ -897,7 +825,6 @@ export function makeFoldUntilIO(z, max, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldWeightedDecompose
  */
-
 function makeFoldWeightedDecompose_1(z, costFn, max, decompose, f, __tsplusTrace) {
   return defer_1(() => {
     /**
@@ -907,31 +834,27 @@ function makeFoldWeightedDecompose_1(z, costFn, max, decompose, f, __tsplusTrace
       if (idx === inp.length) {
         return [s, cost, dirty, tsplus_module_1.empty()];
       } else {
-        const elem = tsplus_module_2.unsafeGet_(inp, idx);
+        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_(inp, idx + 1)];
+            return [f(s, elem), total, true, tsplus_module_2.drop(idx + 1)(inp)];
           } else if (decomposed.length <= 1 && dirty) {
-            return [s, cost, dirty, tsplus_module_2.drop_(inp, idx)];
+            return [s, cost, dirty, tsplus_module_2.drop(idx)(inp)];
           } else {
-            return fold(tsplus_module_2.concat_(decomposed, tsplus_module_2.drop_(inp, idx + 1)), s, max, dirty, cost, 0, __tsplusTrace);
+            return fold(tsplus_module_2.concat(tsplus_module_2.drop(idx + 1)(inp))(decomposed), s, max, dirty, cost, 0, __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_4.writeNow(leftovers), tsplus_module_5.succeedNow(nextS));
+          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 {
@@ -939,7 +862,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);
 }
@@ -957,45 +879,41 @@ 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_9.succeedNow([s, cost, dirty, tsplus_module_1.empty()], __tsplusTrace);
       } else {
-        const elem = tsplus_module_2.unsafeGet_(inp, idx);
-        return tsplus_module_9.flatMap_(tsplus_module_9.map_(costFn(s, elem), _ => cost + _, __tsplusTrace), total => {
+        const elem = tsplus_module_2.unsafeGet(idx)(inp);
+        return tsplus_module_9.flatMap(total => {
           if (total <= max) {
-            return tsplus_module_9.flatMap_(f(s, elem), s => fold(inp, s, max, true, total, idx + 1, __tsplusTrace), __tsplusTrace);
+            return tsplus_module_9.flatMap(s => fold(inp, s, max, true, total, idx + 1, __tsplusTrace), __tsplusTrace)(f(s, elem));
           } else {
-            return tsplus_module_9.flatMap_(decompose(elem), decomposed => {
+            return tsplus_module_9.flatMap(decomposed => {
               if (decomposed.length <= 1 && !dirty) {
-                return tsplus_module_9.map_(f(s, elem), s => [s, total, true, tsplus_module_2.drop_(inp, idx + 1)], __tsplusTrace);
+                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_9.succeedNow([s, cost, dirty, tsplus_module_2.drop_(inp, idx)], __tsplusTrace);
+                return tsplus_module_9.succeedNow([s, cost, dirty, tsplus_module_2.drop(idx)(inp)], __tsplusTrace);
               } else {
-                return fold(tsplus_module_2.concat_(decomposed, tsplus_module_2.drop_(inp, idx + 1)), s, max, dirty, cost, 0, __tsplusTrace);
+                return fold(tsplus_module_2.concat(tsplus_module_2.drop(idx + 1)(inp))(decomposed), s, max, dirty, cost, 0, __tsplusTrace);
               }
-            }, __tsplusTrace);
+            }, __tsplusTrace)(decompose(elem));
           }
-        }, __tsplusTrace);
+        }, __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_(tsplus_module_4.fromIO(() => fold(inp, s, max, dirty, cost, 0, __tsplusTrace)), ([nextS, nextCost, nextDirty, leftovers]) => {
+      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_4.writeNow(leftovers), tsplus_module_5.succeedNow(nextS));
+          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 {
           return go(nextS, nextCost, nextDirty, max, __tsplusTrace);
         }
-      }), err => tsplus_module_4.failNow(err), _ => tsplus_module_5.succeedNow(s));
+      })(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);
 }
@@ -1011,8 +929,6 @@ function makeFoldWeightedDecomposeIO_1(z, costFn, max, decompose, f, __tsplusTra
  *
  * @tsplus static fncts.io.SinkOps foldWeighted
  */
-
-
 export function makeFoldWeighted(z, costFn, max, f, __tsplusTrace) {
   return makeFoldWeightedDecompose_1(z, costFn, max, tsplus_module_24.single, f, __tsplusTrace);
 }
@@ -1028,37 +944,38 @@ export function makeFoldWeighted(z, costFn, max, f, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps foldWeightedIO
  */
-
 export function makeFoldWeightedIO(z, costFn, max, 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 fluent fncts.io.Sink map
+ * @tsplus pipeable fncts.io.Sink map
  */
-
-function map_1(self, f, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_5.map_(self.channel, f));
+function map_1(f, __tsplusTrace) {
+  return self => {
+    return new tsplus_module_3.Sink(tsplus_module_5.map(f)(self.channel));
+  };
 }
 /**
  * Transforms the errors emitted by this sink using `f`.
  *
- * @tsplus fluent fncts.io.Sink mapError
+ * @tsplus pipeable fncts.io.Sink mapError
  */
-
-
-export function mapError_(self, f, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.mapError_(self.channel, f));
+export function mapError(f, __tsplusTrace) {
+  return self => {
+    return new tsplus_module_3.Sink(tsplus_module_4.mapError(f)(self.channel));
+  };
 }
 /**
  * Effectfully transforms this sink's result.
  *
- * @tsplus fluent fncts.io.Sink mapIO
+ * @tsplus pipeable fncts.io.Sink mapIO
  */
-
-function mapIO_1(self, f, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.mapIO_(self.channel, f));
+function mapIO_1(f, __tsplusTrace) {
+  return self => {
+    return new tsplus_module_3.Sink(tsplus_module_4.mapIO(f)(self.channel));
+  };
 }
 /**
  * Runs this sink until it yields a result, then uses that result to create
@@ -1067,90 +984,89 @@ function mapIO_1(self, f, __tsplusTrace) {
  *
  * This function essentially runs sinks in sequence.
  *
- * @tsplus fluent fncts.io.Sink matchSink
+ * @tsplus pipeable fncts.io.Sink matchSink
  */
-
-
-function matchSink_1(self, onFailure, onSuccess, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.matchChannel_(tsplus_module_4.doneCollect(self.channel), e => onFailure(e).channel, ([leftovers, z]) => tsplus_module_4.defer(() => {
-    const leftoversRef = new AtomicReference(tsplus_module_2.filter_(leftovers, c => tsplus_module_2.isNonEmpty(c)));
-    const refReader = tsplus_module_5.flatMap_(tsplus_module_5.succeed(() => leftoversRef.getAndSet(tsplus_module_1.empty())), chunk => tsplus_module_4.writeChunk(chunk));
-    const passthrough = tsplus_module_4.id();
-    const continuationSink = tsplus_module_4.pipeTo_(tsplus_module_5.apSecond_(refReader, passthrough), onSuccess(z).channel);
-    return tsplus_module_5.flatMap_(tsplus_module_4.doneCollect(continuationSink), ([newLeftovers, z1]) => tsplus_module_5.apSecond_(tsplus_module_5.flatMap_(tsplus_module_5.succeed(() => leftoversRef.get), tsplus_module_4.writeChunk), tsplus_module_4.as_(tsplus_module_4.writeChunk(newLeftovers), () => z1)));
-  })));
+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(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.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)));
+  };
 }
 /**
  * Switch to another sink in case of failure
  *
- * @tsplus fluent fncts.io.Sink orElse
+ * @tsplus pipeable fncts.io.Sink orElse
  */
-
-
-export function orElse(self, that, __tsplusTrace) {
-  return defer_1(() => new tsplus_module_3.Sink(tsplus_module_4.orElse_(self.channel, that().channel)), __tsplusTrace);
+export function orElse(that, __tsplusTrace) {
+  return self => {
+    return defer_1(() => new tsplus_module_3.Sink(tsplus_module_4.orElse(that().channel)(self.channel)), __tsplusTrace);
+  };
 }
 /**
  * Provides the sink with its required environment, which eliminates its
  * dependency on `R`.
  *
- * @tsplus fluent fncts.io.Sink provideEnvironment
+ * @tsplus pipeable fncts.io.Sink provideEnvironment
  */
-
-export function provideEnvironment(self, r, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.provideEnvironment_(self.channel, r));
+export function provideEnvironment(r, __tsplusTrace) {
+  return self => {
+    return new tsplus_module_3.Sink(tsplus_module_4.provideEnvironment(r)(self.channel));
+  };
 }
 /**
  * Runs both sinks in parallel on the input, returning the result or the
  * error from the one that finishes first.
  *
- * @tsplus fluent fncts.io.Sink race
+ * @tsplus pipeable fncts.io.Sink race
  */
-
-export function race(self, that, __tsplusTrace) {
-  return map_1(raceBoth_1(self, that), result => tsplus_module_25.merge(result), __tsplusTrace);
+export function race(that, __tsplusTrace) {
+  return self => {
+    return map_1(result => tsplus_module_25.merge(result), __tsplusTrace)(raceBoth_1(that)(self));
+  };
 }
 /**
  * Runs both sinks in parallel on the input, returning the result or the error
  * from the one that finishes first.
  *
- * @tsplus fluent fncts.io.Sink raceBoth
+ * @tsplus pipeable fncts.io.Sink raceBoth
  */
-
-function raceBoth_1(self, that, capacity = () => 16, __tsplusTrace) {
-  return raceWith_1(self, that, selfDone => tsplus_module_27.done(tsplus_module_9.map_(tsplus_module_9.fromExitNow(selfDone, __tsplusTrace), tsplus_module_26.left, __tsplusTrace)), thatDone => tsplus_module_27.done(tsplus_module_9.map_(tsplus_module_9.fromExitNow(thatDone, __tsplusTrace), tsplus_module_26.right, __tsplusTrace)), capacity, __tsplusTrace);
+function raceBoth_1(that, capacity = () => 16, __tsplusTrace) {
+  return 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);
+  };
 }
 /**
  * Runs both sinks in parallel on the input, using the specified merge
  * function as soon as one result or the other has been computed.
  *
- * @tsplus fluent fncts.io.Sink raceWith
- */
-
-
-function raceWith_1(self, that, leftDone, rightDone, capacity = () => 16, __tsplusTrace) {
-  const scoped = tsplus_module_9.defer(() => {
-    const that0 = that();
-    const capacity0 = capacity();
-    return tsplus_module_9.flatMap_(tsplus_module_29.makeBounded(capacity(), __tsplusTrace), hub => tsplus_module_9.flatMap_(tsplus_module_4.fromHubScoped(() => hub), c1 => tsplus_module_9.map_(tsplus_module_4.fromHubScoped(() => hub), c2 => {
-      const reader = tsplus_module_4.toHub(() => hub);
-      const writer = tsplus_module_28.mergeWith_(tsplus_module_4.pipeTo_(c1, self.channel), tsplus_module_4.pipeTo_(c2, that0.channel), leftDone, rightDone);
-      const channel = tsplus_module_28.mergeWith_(reader, writer, () => tsplus_module_27.wait(tsplus_module_9.fromExitNow), done => tsplus_module_27.done(tsplus_module_9.fromExitNow(done, __tsplusTrace)));
-      return new tsplus_module_3.Sink(channel);
-    }, __tsplusTrace), __tsplusTrace), __tsplusTrace);
-  }, __tsplusTrace);
-  return unwrapScoped_1(() => scoped, __tsplusTrace);
+ * @tsplus pipeable fncts.io.Sink raceWith
+ */
+function raceWith_1(that, leftDone, rightDone, capacity = () => 16, __tsplusTrace) {
+  return self => {
+    const scoped = tsplus_module_9.defer(() => {
+      const that0 = that();
+      const capacity0 = capacity();
+      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_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_29.makeBounded(capacity(), __tsplusTrace));
+    }, __tsplusTrace);
+    return unwrapScoped_1(() => scoped, __tsplusTrace);
+  };
 }
 /**
  * Accesses the specified service in the environment of the effect.
  *
  * @tsplus static fncts.io.SinkOps service
  */
-
-
-export function service(
-/** @tsplus auto */
-tag) {
+export function service( /** @tsplus auto */tag) {
   const tag_1 = tag;
   return serviceWith_1(tsplus_module_14.identity, tag_1);
 }
@@ -1159,11 +1075,8 @@ tag) {
  *
  * @tsplus static fncts.io.SinkOps serviceWith
  */
-
-function serviceWith_1(f,
-/** @tsplus auto */
-tag) {
-  return fromIO_1(() => tsplus_module_13.serviceWith(f, tag, fileName_1 + ":1550:36"), fileName_1 + ":1550: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
@@ -1171,12 +1084,8 @@ tag) {
  *
  * @tsplus static fncts.io.SinkOps serviceWithIO
  */
-
-
-export function serviceWithIO(f,
-/** @tsplus auto */
-tag) {
-  return fromIO_1(() => tsplus_module_13.serviceWithIO(f, tag, fileName_1 + ":1563:38"), fileName_1 + ":1563:21");
+export 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
@@ -1184,45 +1093,40 @@ tag) {
  *
  * @tsplus static fncts.io.SinkOps serviceWithSink
  */
-
-export function serviceWithSink(f,
-/** @tsplus auto */
-tag) {
-  return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_13.serviceWith(tsplus_module_14.compose_(f, s => s.channel), tag, fileName_1 + ":1578:21")));
+export 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
  * consumes elements until an element after the first satisfies the specified
  * predicate.
  *
- * @tsplus fluent fncts.io.Sink splitWhere
+ * @tsplus pipeable fncts.io.Sink splitWhere
  */
-
-export function splitWhere(self, p, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => tsplus_module_8.make(() => tsplus_module_1.empty(), __tsplusTrace)), ref => tsplus_module_5.flatMap_(tsplus_module_4.collectElements(tsplus_module_4.pipeToOrFail_(splitter(p, false, ref, __tsplusTrace), self.channel)), ([leftovers, z]) => tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => tsplus_module_7.get(ref, __tsplusTrace)), leftover => tsplus_module_5.apSecond_(tsplus_module_4.writeNow(tsplus_module_2.concat_(leftover, tsplus_module_2.flatten(leftovers))), tsplus_module_5.succeedNow(z))))));
+export 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.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_30.findIndex(inp, p);
-
+      const index = tsplus_module_30.findIndex(p)(inp);
       if (index === -1) {
-        return tsplus_module_5.apSecond_(tsplus_module_4.writeNow(inp), splitter(p, true, leftovers, __tsplusTrace));
+        return tsplus_module_5.zipRight(splitter(p, true, leftovers, __tsplusTrace))(tsplus_module_4.writeNow(inp));
       } else {
-        const [left, right] = tsplus_module_2.splitAt_(inp, index);
-        return tsplus_module_5.apSecond_(tsplus_module_4.writeNow(left), tsplus_module_4.fromIO(() => tsplus_module_6.set_(leftovers, right, __tsplusTrace)));
+        const [left, right] = tsplus_module_2.splitAt(index)(inp);
+        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_30.findIndex(inp, p);
-
+      const index = tsplus_module_30.findIndex(p)(inp);
       if (index === -1) {
-        return tsplus_module_5.apSecond_(tsplus_module_4.writeNow(inp), splitter(p, true, leftovers, __tsplusTrace));
+        return tsplus_module_5.zipRight(splitter(p, true, leftovers, __tsplusTrace))(tsplus_module_4.writeNow(inp));
       } else {
-        const [left, right] = tsplus_module_2.splitAt_(inp, Math.max(index, 1));
-        return tsplus_module_5.apSecond_(tsplus_module_4.writeNow(left), tsplus_module_4.fromIO(() => tsplus_module_6.set_(leftovers, right, __tsplusTrace)));
+        const [left, right] = tsplus_module_2.splitAt(Math.max(index, 1))(inp);
+        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);
@@ -1232,8 +1136,6 @@ function splitter(p, written, leftovers, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps succeed
  */
-
-
 export function succeed(z, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_5.succeed(z));
 }
@@ -1242,7 +1144,6 @@ export function succeed(z, __tsplusTrace) {
  *
  * @tsplus static fncts.io.SinkOps succeedNow
  */
-
 export function succeedNow(z, __tsplusTrace) {
   return new tsplus_module_3.Sink(tsplus_module_5.succeedNow(z));
 }
@@ -1250,81 +1151,79 @@ export function succeedNow(z, __tsplusTrace) {
  * Summarize a sink by running an effect when the sink starts and again when
  * it completes
  *
- * @tsplus fluent fncts.io.Sink summarized
+ * @tsplus pipeable fncts.io.Sink summarized
  */
-
-function summarized_1(self, summary, f, __tsplusTrace) {
-  return new tsplus_module_3.Sink(tsplus_module_4.unwrap(() => tsplus_module_9.map_(tsplus_module_9.succeed(summary, __tsplusTrace), summary => tsplus_module_5.flatMap_(tsplus_module_4.fromIO(() => summary), start => tsplus_module_5.flatMap_(self.channel, done => tsplus_module_5.map_(tsplus_module_4.fromIO(() => summary), end => tsplus_module_14.tuple(done, f(start, end))))), __tsplusTrace)));
+function summarized_1(summary, f, __tsplusTrace) {
+  return self => {
+    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
  */
-
-
 export function timed(self, __tsplusTrace) {
-  return summarized_1(self, () => tsplus_module_31.currentTime, (start, end) => tsplus_module_32.fromInterval(start, end), __tsplusTrace);
+  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_9.map_(io(), sink => sink.channel, __tsplusTrace)));
+  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_9.map_(scoped(), sink => sink.channel, __tsplusTrace)));
+  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
  * the provided sink until it yields a result, finally combining the two
  * results into a tuple.
  *
- * @tsplus fluent fncts.io.Sink zip
+ * @tsplus pipeable fncts.io.Sink zip
  */
-
-
-export function zip(self, that, __tsplusTrace) {
-  return zipWith_1(() => self, that, tsplus_module_14.tuple, __tsplusTrace);
+export function zip(that, __tsplusTrace) {
+  return self => {
+    return zipWith_1(that, tsplus_module_14.tuple, __tsplusTrace)(() => self);
+  };
 }
 /**
  * Runs both sinks in parallel on the input and combines the results in a
  * tuple.
  *
- * @tsplus fluent fncts.io.Sink zipC
+ * @tsplus pipeable fncts.io.Sink zipC
  */
-
-export function zipC(self, that, __tsplusTrace) {
-  return zipWithC_1(() => self, that, tsplus_module_14.tuple, __tsplusTrace);
+export function zipC(that, __tsplusTrace) {
+  return self => {
+    return zipWithC_1(that, tsplus_module_14.tuple, __tsplusTrace)(() => self);
+  };
 }
 /**
  * Feeds inputs to this sink until it yields a result, then switches over to
  * the provided sink until it yields a result, finally combining the two
  * results with `f`.
  *
- * @tsplus fluent fncts.io.Sink zipWith
+ * @tsplus pipeable fncts.io.Sink zipWith
  */
-
-function zipWith_1(self, that, f, __tsplusTrace) {
-  return defer_1(() => flatMap_1(self(), z => map_1(that(), z1 => f(z, z1), __tsplusTrace), __tsplusTrace), __tsplusTrace);
+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);
+  };
 }
 /**
  * Runs both sinks in parallel on the input and combines the results using the
  * provided function.
  *
- * @tsplus fluent fncts.io.Sink zipWithC
+ * @tsplus pipeable fncts.io.Sink zipWithC
  */
-
-
-function zipWithC_1(self, that, f, __tsplusTrace) {
-  return defer_1(() => raceWith_1(self(), () => that(), exit => tsplus_module_33.match_(exit, err => tsplus_module_27.done(tsplus_module_9.failCauseNow(err, __tsplusTrace)), lz => tsplus_module_27.wait(exit => tsplus_module_33.match_(exit, cause => tsplus_module_9.failCauseNow(cause, __tsplusTrace), rz => tsplus_module_9.succeedNow(f(lz, rz), __tsplusTrace)))), exit => tsplus_module_33.match_(exit, err => tsplus_module_27.done(tsplus_module_9.failCauseNow(err, __tsplusTrace)), rz => tsplus_module_27.wait(exit => tsplus_module_33.match_(exit, cause => tsplus_module_9.failCauseNow(cause, __tsplusTrace), lz => tsplus_module_9.succeedNow(f(lz, rz), __tsplusTrace))))), __tsplusTrace);
+function zipWithC_1(that, f, __tsplusTrace) {
+  return self => {
+    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.mjs.map