@typed/fx 1.8.0 → 1.8.2

package/src/RefSubject.ts

@@ -12,6 +12,7 @@ import type { Context } from './externals.js'
 import { Effect, Fiber, MutableRef, Option, Ref } from './externals.js'
 import { hold, HoldFx } from './hold.js'
 import { map } from './map.js'
+import { multicast } from './multicast.js'
 import { never } from './never.js'
 import { switchMapEffect } from './switchMap.js'
 
@@ -570,13 +571,18 @@ class ComputedImpl<R, E, A, R2, E2, B> implements Computed<R | R2, E | E2, B> {
     _A: identity,
   }
 
+  readonly fx: Fx<R | R2, E | E2, B>
+
   constructor(
     readonly computed: Computed<R, E, A>,
     readonly f: (a: A) => Effect.Effect<R2, E2, B>,
-  ) {}
+  ) {
+    // Create a stable reference to derived Fx
+    this.fx = multicast(switchMapEffect(this.computed, this.f))
+  }
 
   run<R3>(sink: Sink<R3, E | E2, B>) {
-    return switchMapEffect(this.computed, this.f).run(sink)
+    return this.fx.run(sink)
   }
 
   traced(trace: Trace): Fx<R | R2, E | E2, B> {

package/src/catchAllCause.ts

@@ -1,8 +1,7 @@
 import { pipe } from '@effect/data/Function'
 
-import { Cause, Effect, Either, Fiber, Ref } from './externals.js'
-
 import { Fx, Sink } from './Fx.js'
+import { Cause, Effect, Either, Fiber, Ref } from './externals.js'
 import { failCause } from './failCause.js'
 import { fromEffect } from './fromEffect.js'
 

package/src/exhaustMap.ts

@@ -1,8 +1,7 @@
 import { pipe } from '@effect/data/Function'
 
-import { Cause, Effect, Fiber, Ref } from './externals.js'
-
 import { Fx, Sink } from './Fx.js'
+import { Cause, Effect, Fiber, Ref } from './externals.js'
 import { fromEffect } from './fromEffect.js'
 
 export function exhaustMap<R, E, A, R2, E2, B>(

package/src/exhaustMapCause.ts

@@ -1,8 +1,7 @@
 import { pipe } from '@effect/data/Function'
 
-import { Cause, Effect, Either, Fiber, Ref } from './externals.js'
-
 import { Fx, Sink } from './Fx.js'
+import { Cause, Effect, Either, Fiber, Ref } from './externals.js'
 import { failCause } from './failCause.js'
 import { fromEffect } from './fromEffect.js'
 

package/src/exhaustMapLatest.ts

@@ -2,9 +2,8 @@ import { pipe } from '@effect/data/Function'
 import * as Option from '@effect/data/Option'
 import type { Scope } from '@effect/io/Scope'
 
-import { Cause, Effect, Fiber, Ref } from './externals.js'
-
 import { Fx, Sink } from './Fx.js'
+import { Cause, Effect, Fiber, Ref } from './externals.js'
 import { fromEffect } from './fromEffect.js'
 
 export function exhaustMapLatest<R, E, A, R2, E2, B>(

package/src/exhaustMapLatestCause.ts

@@ -2,9 +2,8 @@ import { pipe } from '@effect/data/Function'
 import * as Option from '@effect/data/Option'
 import type { Scope } from '@effect/io/Scope'
 
-import { Cause, Effect, Either, Fiber, Ref } from './externals.js'
-
 import { Fx, Sink } from './Fx.js'
+import { Cause, Effect, Either, Fiber, Ref } from './externals.js'
 import { failCause } from './failCause.js'
 import { fromEffect } from './fromEffect.js'
 

package/src/flatMap.ts

@@ -1,8 +1,7 @@
 import { pipe } from '@effect/data/Function'
 
-import { Cause, Effect, Fiber, Ref } from './externals.js'
-
 import { Fx, Sink } from './Fx.js'
+import { Cause, Effect, Fiber, Ref } from './externals.js'
 import { fromEffect } from './fromEffect.js'
 
 export function flatMap<R, E, A, R2, E2, B>(

package/src/fromEffect.ts

@@ -1,6 +1,5 @@
-import { Effect } from './externals.js'
-
 import { Fx } from './Fx.js'
+import { Effect } from './externals.js'
 
 export function fromEffect<R, E, A>(effect: Effect.Effect<R, E, A>): Fx<R, E, A> {
   return Fx((sink) => Effect.matchCauseEffect(effect, sink.error, sink.event))

package/src/fromFxEffect.test.ts

@@ -0,0 +1,16 @@
+import { describe } from 'vitest'
+
+import { Cause, Effect } from './externals.js'
+import { fromFxEffect } from './fromFxEffect.js'
+import { succeed } from './succeed.js'
+import { testCause, testCollectAll } from './test-utils.js'
+
+describe(__filename, () => {
+  describe(fromFxEffect.name, (): void => {
+    const value = Math.random()
+
+    testCollectAll('returns the output', fromFxEffect(Effect.succeed(succeed(value))), [value])
+
+    testCause('fails with the given Cause', fromFxEffect(Effect.fail(value)), Cause.fail(value))
+  })
+})

package/src/gen.test.ts

@@ -0,0 +1,29 @@
+import { describe } from 'vitest'
+
+import { Cause, Effect } from './externals.js'
+import { gen } from './gen.js'
+import { succeed } from './succeed.js'
+import { testCause, testCollectAll } from './test-utils.js'
+
+describe(__filename, () => {
+  describe(gen.name, () => {
+    const value = Math.random()
+
+    testCollectAll(
+      'returns the output',
+      // eslint-disable-next-line require-yield
+      gen(function* () {
+        return succeed(value)
+      }),
+      [value],
+    )
+
+    testCause(
+      'fails with the given Cause',
+      gen(function* ($) {
+        return yield* $(Effect.fail(value))
+      }),
+      Cause.fail(value),
+    )
+  })
+})

package/src/index.ts

@@ -537,6 +537,11 @@ export const mergeAll: <FXS extends ReadonlyArray<Fx<any, any, any>>>(
       internal.mergeAll(...fxs).traced(trace),
 )
 
+export const merge: {
+  <R2, E2, B>(other: Fx<R2, E2, B>): <R, E, A>(fx: Fx<R, E, A>) => Fx<R | R2, E | E2, A | B>
+  <R, E, A, R2, E2, B>(fx: Fx<R, E, A>, other: Fx<R2, E2, B>): Fx<R | R2, E | E2, A | B>
+} = dualWithTrace(2, (trace) => (fx, other) => internal.merge(fx, other).traced(trace))
+
 export const multicast: <R, E, A>(fx: Fx<R, E, A>) => Fx<R, E, A> = methodWithTrace(
   (trace) =>
     <R, E, A>(fx: Fx<R, E, A>): Fx<R, E, A> =>

package/src/reduce.ts

@@ -1,12 +1,17 @@
-import { Fx, Sink } from './Fx.js'
-import { Effect } from './externals.js'
+import { Fx } from './Fx.js'
+import { Effect, Scope } from './externals.js'
+import { observe } from './observe.js'
 
-export function reduce<R, E, A, B>(fx: Fx<R, E, A>, b: B, f: (b: B, a: A) => B): Fx<R, E, B> {
-  return Fx((sink) =>
-    Effect.suspend(() => {
-      let acc = b
+export function reduce<R, E, A, B>(
+  fx: Fx<R, E, A>,
+  b: B,
+  f: (b: B, a: A) => B,
+): Effect.Effect<R | Scope.Scope, E, B> {
+  return Effect.gen(function* ($) {
+    let acc = b
 
-      return fx.run(Sink((a) => Effect.sync(() => (acc = f(acc, a))), sink.error))
-    }),
-  )
+    yield* $(observe(fx, (a) => Effect.sync(() => (acc = f(acc, a)))))
+
+    return acc
+  })
 }

package/src/switchMap.ts

@@ -1,8 +1,7 @@
 import { pipe } from '@effect/data/Function'
 
-import { Cause, Effect, Fiber, RefS } from './externals.js'
-
 import { Fx, Sink } from './Fx.js'
+import { Cause, Effect, Fiber, RefS } from './externals.js'
 import { fromEffect } from './fromEffect.js'
 
 export function switchMap<R, E, A, R2, E2, B>(

package/src/switchMapCause.ts

@@ -1,8 +1,7 @@
 import { pipe } from '@effect/data/Function'
 
-import { Cause, Effect, Either, Fiber, RefS } from './externals.js'
-
 import { Fx, Sink } from './Fx.js'
+import { Cause, Effect, Either, Fiber, RefS } from './externals.js'
 import { failCause } from './failCause.js'
 import { fromEffect } from './fromEffect.js'
 

package/src/switchMatch.ts

@@ -1,8 +1,7 @@
 import { pipe } from '@effect/data/Function'
 
-import { Cause, Effect, Either, Fiber, RefS } from './externals.js'
-
 import { Fx, Sink } from './Fx.js'
+import { Cause, Effect, Either, Fiber, RefS } from './externals.js'
 import { failCause } from './failCause.js'
 import { fromEffect } from './fromEffect.js'