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..798321d434 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: { - (that: Stream): (self: Stream) => Stream - (self: Stream, that: Stream): Stream + (right: Stream): (left: Stream) => Stream + (left: Stream, right: Stream): Stream } = internal.mergeLeft /** @@ -2244,8 +2244,8 @@ export const mergeLeft: { * @category utils */ export const mergeRight: { - (that: Stream): (self: Stream) => Stream - (self: Stream, that: Stream): Stream + (right: Stream): (left: Stream) => Stream + (left: Stream, right: Stream): Stream } = internal.mergeRight /** diff --git a/packages/effect/src/internal/stream.ts b/packages/effect/src/internal/stream.ts index 9fd8aa29cf..96bb5ce5fc 100644 --- a/packages/effect/src/internal/stream.ts +++ b/packages/effect/src/internal/stream.ts @@ -3921,36 +3921,36 @@ export const mergeEither = dual< /** @internal */ export const mergeLeft = dual< - ( - that: Stream.Stream - ) => (self: Stream.Stream) => Stream.Stream, - ( - self: Stream.Stream, - that: Stream.Stream - ) => Stream.Stream + ( + right: Stream.Stream + ) => (left: Stream.Stream) => Stream.Stream, + ( + left: Stream.Stream, + right: Stream.Stream + ) => Stream.Stream >( 2, - ( - self: Stream.Stream, - that: Stream.Stream - ): Stream.Stream => pipe(self, merge(drain(that))) + ( + left: Stream.Stream, + right: Stream.Stream + ): Stream.Stream => pipe(left, merge(drain(right))) ) /** @internal */ export const mergeRight = dual< - ( - that: Stream.Stream - ) => (self: Stream.Stream) => Stream.Stream, - ( - self: Stream.Stream, - that: Stream.Stream - ) => Stream.Stream + ( + right: Stream.Stream + ) => (left: Stream.Stream) => Stream.Stream, + ( + left: Stream.Stream, + right: Stream.Stream + ) => Stream.Stream >( 2, - ( - self: Stream.Stream, - that: Stream.Stream - ): Stream.Stream => pipe(drain(self), merge(that)) + ( + left: Stream.Stream, + right: Stream.Stream + ): Stream.Stream => pipe(drain(left), merge(right)) ) /** @internal */