From fd72e2acb8a39d143e499a1751c504e465a549d1 Mon Sep 17 00:00:00 2001
From: bowzee <dilame.bowzee@gmail.com>
Date: Thu, 4 Jul 2024 05:00:14 +0300
Subject: [PATCH] refactor(Stream/merge): rename arg names for clarity

---
 .changeset/stream-merge-left-right.md  |  7 +++++++
 packages/effect/src/Stream.ts          |  8 ++++----
 packages/effect/src/internal/stream.ts | 28 +++++++++++++-------------
 3 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/stream-merge-left-right.md

diff --git a/.changeset/stream-merge-left-right.md b/.changeset/stream-merge-left-right.md
new file mode 100644
index 0000000000..7f04d2aef9
--- /dev/null
+++ b/.changeset/stream-merge-left-right.md
@@ -0,0 +1,7 @@
+---
+"effect": minor
+---
+
+refactor(Stream/mergeLeft): rename `self`/`that` argument names to `left`/`right` for clarity
+
+refactor(Stream/mergeRight): rename `self`/`that` argument names to `left`/`right` for clarity
diff --git a/packages/effect/src/Stream.ts b/packages/effect/src/Stream.ts
index 2c996694ab..3091e84e68 100644
--- a/packages/effect/src/Stream.ts
+++ b/packages/effect/src/Stream.ts
@@ -2232,8 +2232,8 @@ export const mergeEither: {
  * @category utils
  */
 export const mergeLeft: {
-  <A2, E2, R2>(that: Stream<A2, E2, R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<A, E2 | E, R2 | R>
-  <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, that: Stream<A2, E2, R2>): Stream<A, E | E2, R | R2>
+  <A2, E2, R2>(right: Stream<A2, E2, R2>): <A, E, R>(left: Stream<A, E, R>) => Stream<A, E2 | E, R2 | R>
+  <A, E, R, A2, E2, R2>(left: Stream<A, E, R>, right: Stream<A2, E2, R2>): Stream<A, E | E2, R | R2>
 } = internal.mergeLeft
 
 /**
@@ -2244,8 +2244,8 @@ export const mergeLeft: {
  * @category utils
  */
 export const mergeRight: {
-  <A2, E2, R2>(that: Stream<A2, E2, R2>): <A, E, R>(self: Stream<A, E, R>) => Stream<A2, E2 | E, R2 | R>
-  <A, E, R, A2, E2, R2>(self: Stream<A, E, R>, that: Stream<A2, E2, R2>): Stream<A2, E | E2, R | R2>
+  <A2, E2, R2>(right: Stream<A2, E2, R2>): <A, E, R>(left: Stream<A, E, R>) => Stream<A2, E2 | E, R2 | R>
+  <A, E, R, A2, E2, R2>(left: Stream<A, E, R>, right: Stream<A2, E2, R2>): Stream<A2, E | E2, R | R2>
 } = internal.mergeRight
 
 /**
diff --git a/packages/effect/src/internal/stream.ts b/packages/effect/src/internal/stream.ts
index 9fd8aa29cf..b89ff7212d 100644
--- a/packages/effect/src/internal/stream.ts
+++ b/packages/effect/src/internal/stream.ts
@@ -3922,35 +3922,35 @@ export const mergeEither = dual<
 /** @internal */
 export const mergeLeft = dual<
   <A2, E2, R2>(
-    that: Stream.Stream<A2, E2, R2>
-  ) => <A, E, R>(self: Stream.Stream<A, E, R>) => Stream.Stream<A, E2 | E, R2 | R>,
+    right: Stream.Stream<A2, E2, R2>
+  ) => <A, E, R>(left: Stream.Stream<A, E, R>) => Stream.Stream<A, E2 | E, R2 | R>,
   <A, E, R, A2, E2, R2>(
-    self: Stream.Stream<A, E, R>,
-    that: Stream.Stream<A2, E2, R2>
+    left: Stream.Stream<A, E, R>,
+    right: Stream.Stream<A2, E2, R2>
   ) => Stream.Stream<A, E2 | E, R2 | R>
 >(
   2,
   <A, E, R, A2, E2, R2>(
-    self: Stream.Stream<A, E, R>,
-    that: Stream.Stream<A2, E2, R2>
-  ): Stream.Stream<A, E | E2, R | R2> => pipe(self, merge(drain(that)))
+    left: Stream.Stream<A, E, R>,
+    right: Stream.Stream<A2, E2, R2>
+  ): Stream.Stream<A, E | E2, R | R2> => pipe(left, merge(drain(right)))
 )
 
 /** @internal */
 export const mergeRight = dual<
   <A2, E2, R2>(
-    that: Stream.Stream<A2, E2, R2>
-  ) => <A, E, R>(self: Stream.Stream<A, E, R>) => Stream.Stream<A2, E2 | E, R2 | R>,
+    right: Stream.Stream<A2, E2, R2>
+  ) => <A, E, R>(left: Stream.Stream<A, E, R>) => Stream.Stream<A2, E2 | E, R2 | R>,
   <A, E, R, A2, E2, R2>(
-    self: Stream.Stream<A, E, R>,
-    that: Stream.Stream<A2, E2, R2>
+    left: Stream.Stream<A, E, R>,
+    right: Stream.Stream<A2, E2, R2>
   ) => Stream.Stream<A2, E2 | E, R2 | R>
 >(
   2,
   <A, E, R, A2, E2, R2>(
-    self: Stream.Stream<A, E, R>,
-    that: Stream.Stream<A2, E2, R2>
-  ): Stream.Stream<A2, E | E2, R | R2> => pipe(drain(self), merge(that))
+    left: Stream.Stream<A, E, R>,
+    right: Stream.Stream<A2, E2, R2>
+  ): Stream.Stream<A2, E | E2, R | R2> => pipe(drain(left), merge(right))
 )
 
 /** @internal */