@typed/fx 1.3.0 → 1.4.1

package/src/Subject/RefSubject.ts

@@ -55,7 +55,7 @@ export namespace RefSubject {
         const currentValue = getValue()
         const [b, a] = f(currentValue)
 
-        MutableRef.set(current, (Option.some(a)))
+        MutableRef.set(current, Option.some(a))
 
         if (eq(currentValue, a)) {
           return Effect.succeed(b)
@@ -82,7 +82,7 @@ export namespace RefSubject {
       delete: Effect.sync(() => {
         const option = MutableRef.get(current)
         const reset = initial()
-        MutableRef.set(current, (Option.some(reset)))
+        MutableRef.set(current, Option.some(reset))
 
         return Option.getOrElse(option, () => reset)
       }),

package/src/constructor/index.ts

@@ -31,7 +31,6 @@ export * from './promiseAbort.js'
 export * from './promiseFx.js'
 export * from './random.js'
 export * from './scheduled.js'
-export * from './service.js'
 export * from './serviceWith.js'
 export * from './serviceWithEffect.js'
 export * from './serviceWithFx.js'

package/src/constructor/serviceWith.ts

@@ -5,6 +5,6 @@ import type { Fx } from '../Fx.js'
 
 import { fromEffect } from './fromEffect.js'
 
-export const serviceWith: <T>(tag: Tag<T>) => <A>(f: (a: T) => A) => Fx<T, never, A> =
+export const serviceWith: <I, T>(tag: Tag<I, T>) => <A>(f: (a: T) => A) => Fx<I, never, A> =
   (tag) => (f) =>
-    fromEffect(Effect.serviceWith(tag, f))
+    fromEffect(Effect.map(tag, f))

package/src/constructor/serviceWithEffect.ts

@@ -5,7 +5,7 @@ import type { Fx } from '../Fx.js'
 
 import { fromEffect } from './fromEffect.js'
 
-export const serviceWithEffect: <T>(
-  tag: Tag<T>,
-) => <R, E, A>(f: (a: T) => Effect.Effect<R, E, A>) => Fx<T | R, E, A> = (tag) => (f) =>
-  fromEffect(Effect.serviceWithEffect(tag, f))
+export const serviceWithEffect: <I, T>(
+  tag: Tag<I, T>,
+) => <R, E, A>(f: (a: T) => Effect.Effect<R, E, A>) => Fx<I | R, E, A> = (tag) => (f) =>
+  fromEffect(Effect.flatMap(tag, f))

package/src/constructor/serviceWithFx.ts

@@ -4,16 +4,16 @@ import * as Effect from '@effect/io/Effect'
 import { Fx } from '../Fx.js'
 
 export const serviceWithFx =
-  <T>(tag: Tag<T>) =>
-  <R, E, A>(f: (t: T) => Fx<R, E, A>): Fx<T | R, E, A> =>
+  <I, S>(tag: Tag<I, S>) =>
+  <R, E, A>(f: (s: S) => Fx<R, E, A>): Fx<I | R, E, A> =>
     new ServiceWithFx(tag, f)
 
-class ServiceWithFx<T, R, E, A> extends Fx.Variance<T | R, E, A> implements Fx<T | R, E, A> {
-  constructor(readonly tag: Tag<T>, readonly f: (a: T) => Fx<R, E, A>) {
+class ServiceWithFx<I, S, R, E, A> extends Fx.Variance<I | R, E, A> implements Fx<I | R, E, A> {
+  constructor(readonly tag: Tag<I, S>, readonly f: (a: S) => Fx<R, E, A>) {
     super()
   }
 
   run<R2>(sink: Fx.Sink<R2, E, A>) {
-    return Effect.serviceWithEffect(this.tag, (a) => this.f(a).run(sink))
+    return Effect.flatMap(this.tag, (a) => this.f(a).run(sink))
   }
 }

package/src/operator/provideService.ts

@@ -4,18 +4,22 @@ import * as Effect from '@effect/io/Effect'
 
 import { Fx } from '../Fx.js'
 
-export function provideService<S>(tag: Context.Tag<S>) {
+export function provideService<I, S>(tag: Context.Tag<I, S>) {
   return (service: S) => {
-    return <R, E, A>(self: Fx<R | S, E, A>): Fx<Exclude<R, S>, E, A> =>
+    return <R, E, A>(self: Fx<R | I, E, A>): Fx<Exclude<R, I>, E, A> =>
       new ProvideServiceFx(self, tag, service)
   }
 }
 
-class ProvideServiceFx<R, E, A, S>
-  extends Fx.Variance<Exclude<R, S>, E, A>
-  implements Fx<Exclude<R, S>, E, A>
+class ProvideServiceFx<R, E, A, I, S>
+  extends Fx.Variance<Exclude<R, I>, E, A>
+  implements Fx<Exclude<R, I>, E, A>
 {
-  constructor(readonly self: Fx<R | S, E, A>, readonly tag: Context.Tag<S>, readonly service: S) {
+  constructor(
+    readonly self: Fx<R | I, E, A>,
+    readonly tag: Context.Tag<I, S>,
+    readonly service: S,
+  ) {
     super()
   }
 

package/src/operator/provideServiceEffect.ts

@@ -5,21 +5,21 @@ import type { Scope } from '@effect/io/Scope'
 
 import { Fx } from '../Fx.js'
 
-export function provideServiceEffect<S, R2, E2>(
-  tag: Context.Tag<S>,
+export function provideServiceEffect<I, S, R2, E2>(
+  tag: Context.Tag<I, S>,
   service: Effect.Effect<R2, E2, S>,
 ) {
-  return <R, E, A>(self: Fx<R | S, E, A>): Fx<Exclude<R | R2, S>, E | E2, A> =>
+  return <R, E, A>(self: Fx<R | I, E, A>): Fx<Exclude<R | R2, I>, E | E2, A> =>
     new ProvideServiceEffectFx(self, tag, service)
 }
 
-class ProvideServiceEffectFx<R, E, A, R2, E2, S>
-  extends Fx.Variance<Exclude<R | R2, S>, E | E2, A>
-  implements Fx<Exclude<R | R2, S>, E | E2, A>
+class ProvideServiceEffectFx<R, E, A, R2, E2, I, S>
+  extends Fx.Variance<Exclude<R | R2, I>, E | E2, A>
+  implements Fx<Exclude<R | R2, I>, E | E2, A>
 {
   constructor(
-    readonly self: Fx<R | S, E, A>,
-    readonly tag: Context.Tag<S>,
+    readonly self: Fx<R | I, E, A>,
+    readonly tag: Context.Tag<I, S>,
     readonly service: Effect.Effect<R2, E2, S>,
   ) {
     super()
@@ -30,6 +30,6 @@ class ProvideServiceEffectFx<R, E, A, R2, E2, S>
       this.self.run(sink),
       Effect.provideServiceEffect(this.tag, this.service),
       Effect.matchCauseEffect(sink.error, Effect.succeed),
-    ) as Effect.Effect<Exclude<R | R2 | R3 | Scope, S>, never, unknown>
+    ) as Effect.Effect<Exclude<R | R2 | R3 | Scope, I>, never, unknown>
   }
 }

package/src/operator/provideSomeLayer.ts

@@ -20,7 +20,7 @@ class ProvideSomeLayerFx<R, E, A, R2, E2, S>
   run<R3>(sink: Fx.Sink<R3, E | E2, A>) {
     return pipe(
       Effect.provideSomeLayer(this.layer)(this.self.run(sink)),
-      Effect.matchCauseEffect(sink.error, Effect.succeed),
+      Effect.catchAllCause(sink.error),
     )
   }
 }

package/src/operator/race.ts

@@ -57,7 +57,7 @@ class RaceAllFx<Streams extends readonly Fx<any, any, any>[]>
                 run(sink.event, sink.error, sink.end),
                 Effect.scheduleForked(asap), // Schedule starts so that all Scopes can be returned *before* attempting to cleanup
                 Effect.as(scope),
-                Effect.provideService(Scope.Tag, scope),
+                Effect.provideService(Scope.Scope, scope),
               ),
             ),
           ),