effect 3.10.6 → 3.10.7

package/dist/esm/internal/version.js

@@ -1,4 +1,4 @@
-let moduleVersion = "3.10.6";
+let moduleVersion = "3.10.7";
 export const getCurrentVersion = () => moduleVersion;
 export const setCurrentVersion = version => {
   moduleVersion = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect",
-  "version": "3.10.6",
+  "version": "3.10.7",
   "description": "The missing standard library for TypeScript, for writing production-grade software.",
   "license": "MIT",
   "repository": {

package/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,

package/src/internal/stream.ts

@@ -5475,17 +5475,32 @@ export const retry = dual<
     self: Stream.Stream<A, E, R>,
     schedule: Schedule.Schedule<X, E0, R2>
   ): Stream.Stream<A, E, R | R2> =>
-    unwrap(
-      Effect.map(Schedule.driver(schedule), (driver) => {
-        const loop: Stream.Stream<A, E, R | R2> = catchAll(self, (error) =>
-          unwrap(
-            Effect.matchEffect(driver.next(error as E0), {
-              onFailure: () => Effect.fail(error),
-              onSuccess: () => Effect.succeed(pipe(loop, tap(() => driver.reset)))
-            })
-          ))
+    Schedule.driver(schedule).pipe(
+      Effect.map((driver) => {
+        const loop: Channel.Channel<
+          Chunk.Chunk<A>,
+          unknown,
+          E,
+          unknown,
+          unknown,
+          unknown,
+          R | R2
+        > = toChannel(self).pipe(
+          channel.mapOutEffect((out) => Effect.as(driver.reset, out)),
+          channel.catchAll((error) =>
+            driver.next(error as E0).pipe(
+              Effect.match({
+                onFailure: () => core.fail(error),
+                onSuccess: () => loop
+              }),
+              channel.unwrap
+            )
+          )
+        )
         return loop
-      })
+      }),
+      channel.unwrap,
+      fromChannel
     )
 )
 

package/src/internal/version.ts

@@ -1,4 +1,4 @@
-let moduleVersion = "3.10.6"
+let moduleVersion = "3.10.7"
 
 export const getCurrentVersion = () => moduleVersion