ensure Channel.mergeWith fibers can be interrupted

Effect-TS · Oct 31, 2024 · 5cb5cb4 · 5cb5cb4
1 parent 62d365d
commit 5cb5cb4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.changeset/polite-actors-boil.md b/.changeset/polite-actors-boil.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+ensure Channel.mergeWith fibers can be interrupted
diff --git a/packages/effect/src/internal/channel.ts b/packages/effect/src/internal/channel.ts
@@ -1711,7 +1711,7 @@ export const mergeWith = dual<
                     Effect.succeed(
                       core.flatMap(core.write(elem), () =>
                         core.flatMap(
-                          core.fromEffect(Effect.forkDaemon(pull)),
+                          core.fromEffect(Effect.forkIn(Effect.interruptible(pull), scope)),
                           (leftFiber) => go(both(leftFiber, fiber))
                         ))
                     )
@@ -1807,8 +1807,8 @@ export const mergeWith = dual<
             return pipe(
               core.fromEffect(
                 Effect.zipWith(
-                  Effect.forkIn(pullL, scope),
-                  Effect.forkIn(pullR, scope),
+                  Effect.forkIn(Effect.interruptible(pullL), scope),
+                  Effect.forkIn(Effect.interruptible(pullR), scope),
                   (left, right): State =>
                     mergeState.BothRunning<
                       Env | Env1,