Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(Stream): rename argument names of mergeLeft and mergeRight from self/that to left/right for clarity #3160

Merged
merged 1 commit into from
Jul 4, 2024
Merged

refactor(Stream): rename argument names of mergeLeft and mergeRight from self/that to left/right for clarity #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/stream-merge-left-right.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions packages/effect/src/Stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<AR, ER, RR>(right: Stream<AR, ER, RR>): <AL, EL, RL>(left: Stream<AL, EL, RL>) => Stream<AL, ER | EL, RR | RL>
<AL, EL, RL, AR, ER, RR>(left: Stream<AL, EL, RL>, right: Stream<AR, ER, RR>): Stream<AL, EL | ER, RL | RR>
} = internal.mergeLeft

/**
Expand All @@ -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>
<AR, ER, RR>(right: Stream<AR, ER, RR>): <AL, EL, RL>(left: Stream<AL, EL, RL>) => Stream<AR, ER | EL, RR | RL>
<AL, EL, RL, AR, ER, RR>(left: Stream<AL, EL, RL>, right: Stream<AR, ER, RR>): Stream<AR, EL | ER, RL | RR>
} = internal.mergeRight

/**
Expand Down
44 changes: 22 additions & 22 deletions packages/effect/src/internal/stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3921,36 +3921,36 @@ 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>,
<A, E, R, A2, E2, R2>(
self: Stream.Stream<A, E, R>,
that: Stream.Stream<A2, E2, R2>
) => Stream.Stream<A, E2 | E, R2 | R>
<AR, ER, RR>(
right: Stream.Stream<AR, ER, RR>
) => <AL, EL, RL>(left: Stream.Stream<AL, EL, RL>) => Stream.Stream<AL, ER | EL, RR | RL>,
<AL, EL, RL, AR, ER, RR>(
left: Stream.Stream<AL, EL, RL>,
right: Stream.Stream<AR, ER, RR>
) => Stream.Stream<AL, ER | EL, RR | RL>
>(
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)))
<AL, EL, RL, AR, ER, RR>(
left: Stream.Stream<AL, EL, RL>,
right: Stream.Stream<AR, ER, RR>
): Stream.Stream<AL, EL | ER, RL | RR> => 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>,
<A, E, R, A2, E2, R2>(
self: Stream.Stream<A, E, R>,
that: Stream.Stream<A2, E2, R2>
) => Stream.Stream<A2, E2 | E, R2 | R>
<AR, ER, RR>(
right: Stream.Stream<AR, ER, RR>
) => <AL, EL, RL>(left: Stream.Stream<AL, EL, RL>) => Stream.Stream<AR, ER | EL, RR | RL>,
<AL, EL, RL, AR, ER, RR>(
left: Stream.Stream<AL, EL, RL>,
right: Stream.Stream<AR, ER, RR>
) => Stream.Stream<AR, ER | EL, RR | RL>
>(
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))
<AL, EL, RL, AR, ER, RR>(
left: Stream.Stream<AL, EL, RL>,
right: Stream.Stream<AR, ER, RR>
): Stream.Stream<AR, EL | ER, RL | RR> => pipe(drain(left), merge(right))
)
/** @internal */
Expand Down