@typed/fx 1.22.2 → 1.23.0

package/src/FormEntry.ts

@@ -18,7 +18,7 @@ import { ComputedTypeId, RefSubjectTypeId } from "./TypeId.js"
  */
 export interface FormEntry<out R, in out E, in out I, in out O> extends RefSubject.RefSubject<R, E | ParseError, I> {
   readonly name: PropertyKey
-  readonly schema: Schema.Schema<R, I, O>
+  readonly schema: Schema.Schema<O, I, R>
   readonly decoded: RefSubject.Computed<R, E | ParseError, O>
 }
 
@@ -30,7 +30,7 @@ export namespace FormEntry {
    * @since 1.18.0
    */
   export interface Derived<R, R2, E, I, O> extends FormEntry<R, E, I, O> {
-    readonly persist: Effect.Effect<R2, E | ParseError, O>
+    readonly persist: Effect.Effect<O, E | ParseError, R2>
   }
 }
 
@@ -39,7 +39,7 @@ export namespace FormEntry {
  */
 export interface FormEntryOptions<R, I, O> {
   readonly name: PropertyKey
-  readonly schema: Schema.Schema<R, I, O>
+  readonly schema: Schema.Schema<O, I, R>
 }
 
 /**
@@ -52,9 +52,9 @@ export interface FormEntryOptions<R, I, O> {
 export type MakeFormEntry<R0, I, O> = {
   <R, E>(
     ref: RefSubject.RefSubject<R, E, O>
-  ): Effect.Effect<R0 | R | Scope.Scope, never, FormEntry.Derived<never, R, E, I, O>>
-  <R, E>(fx: Fx.Fx<R, E, O>): Effect.Effect<R0 | R | Scope.Scope, never, FormEntry<never, E, I, O>>
-  <R, E>(effect: Effect.Effect<R, E, O>): Effect.Effect<R0 | R | Scope.Scope, never, FormEntry<never, E, I, O>>
+  ): Effect.Effect<FormEntry.Derived<never, R, E, I, O>, never, R0 | R | Scope.Scope>
+  <R, E>(fx: Fx.Fx<R, E, O>): Effect.Effect<FormEntry<never, E, I, O>, never, R0 | R | Scope.Scope>
+  <R, E>(effect: Effect.Effect<O, E, R>): Effect.Effect<FormEntry<never, E, I, O>, never, R0 | R | Scope.Scope>
 }
 
 /**
@@ -64,9 +64,9 @@ export type MakeFormEntry<R0, I, O> = {
 export type MakeInputFormEntry<R0, I, O> = {
   <R, E>(
     ref: RefSubject.RefSubject<R, E, I>
-  ): Effect.Effect<R | Scope.Scope, never, FormEntry.Derived<R0, R, E, I, O>>
-  <R, E>(fx: Fx.Fx<R, E, I>): Effect.Effect<R | Scope.Scope, never, FormEntry<R0, E, I, O>>
-  <R, E>(effect: Effect.Effect<R, E, I>): Effect.Effect<R | Scope.Scope, never, FormEntry<R0, E, I, O>>
+  ): Effect.Effect<FormEntry.Derived<R0, R, E, I, O>, never, R | Scope.Scope>
+  <R, E>(fx: Fx.Fx<R, E, I>): Effect.Effect<FormEntry<R0, E, I, O>, never, R | Scope.Scope>
+  <R, E>(effect: Effect.Effect<I, E, R>): Effect.Effect<FormEntry<R0, E, I, O>, never, R | Scope.Scope>
 }
 
 /**
@@ -75,7 +75,7 @@ export type MakeInputFormEntry<R0, I, O> = {
 export function derive<R, I, O>(options: FormEntryOptions<R, I, O>): MakeFormEntry<R, I, O> {
   const encode = Schema.encode(options.schema)
   const decode = Schema.decode(options.schema)
-  const makeFormEntry = <R2, E>(input: RefSubject.RefSubject<R2, E, O> | Fx.Fx<R2, E, O> | Effect.Effect<R2, E, O>) => {
+  const makeFormEntry = <R2, E>(input: RefSubject.RefSubject<R2, E, O> | Fx.Fx<R2, E, O> | Effect.Effect<O, E, R2>) => {
     const initial = Fx.mapEffect(Effect.isEffect(input) ? Fx.fromEffect(input) : input, (o) => encode(o, parseOptions))
 
     return Effect.map(
@@ -84,7 +84,7 @@ export function derive<R, I, O>(options: FormEntryOptions<R, I, O>): MakeFormEnt
       }),
       (inputRef): FormEntry<R, E, I, O> | FormEntry.Derived<R, R2, E, I, O> => {
         if (RefSubject.isRefSubject<R2, E, O>(input)) {
-          const persist: Effect.Effect<R | R2, ParseError | E, O> = Effect.flatMap(
+          const persist: Effect.Effect<O, ParseError | E, R | R2> = Effect.flatMap(
             Effect.flatMap(
               inputRef,
               (i) => decode(i, parseOptions)
@@ -113,14 +113,14 @@ export function derive<R, I, O>(options: FormEntryOptions<R, I, O>): MakeFormEnt
  */
 export function deriveInput<R, I, O>(options: FormEntryOptions<R, I, O>): MakeInputFormEntry<R, I, O> {
   const decode = Schema.decode(options.schema)
-  const makeFormEntry = <R2, E>(input: RefSubject.RefSubject<R2, E, I> | Fx.Fx<R2, E, I> | Effect.Effect<R2, E, I>) => {
+  const makeFormEntry = <R2, E>(input: RefSubject.RefSubject<R2, E, I> | Fx.Fx<R2, E, I> | Effect.Effect<I, E, R2>) => {
     const initial: Fx.Fx<R2, E | ParseError, I> = Effect.isEffect(input) ? Fx.fromEffect(input) : input
 
     return Effect.map(
       RefSubject.make(initial, { eq: Equivalence.make(Schema.from(options.schema)) }),
       (inputRef): FormEntry<R, E, I, O> | FormEntry.Derived<R, R2, E, I, O> => {
         if (RefSubject.isRefSubject<R2, E, O>(input)) {
-          const persist: Effect.Effect<R | R2, ParseError | E, O> = Effect.flatMap(
+          const persist: Effect.Effect<O, ParseError | E, R | R2> = Effect.flatMap(
             Effect.flatMap(
               inputRef,
               (i) => RefSubject.set(input as RefSubject.RefSubject<R2, E, I>, i)
@@ -156,14 +156,14 @@ class FromEntryImpl<R, E, I, O> extends FxEffectBase<R | Scope.Scope, E | ParseE
   readonly [RefSubjectTypeId]: RefSubjectTypeId = RefSubjectTypeId
 
   readonly decoded: RefSubject.Computed<R, ParseError | E, O>
-  readonly version: Effect.Effect<never, ParseError | E, number>
-  readonly subscriberCount: Effect.Effect<never, never, number>
-  readonly interrupt: Effect.Effect<never, never, void>
+  readonly version: Effect.Effect<number, ParseError | E>
+  readonly subscriberCount: Effect.Effect<number>
+  readonly interrupt: Effect.Effect<void>
 
   constructor(
     readonly ref: RefSubject.RefSubject<never, E | ParseError, I>,
     readonly name: PropertyKey,
-    readonly schema: Schema.Schema<R, I, O>
+    readonly schema: Schema.Schema<O, I, R>
   ) {
     super()
 
@@ -174,25 +174,25 @@ class FromEntryImpl<R, E, I, O> extends FxEffectBase<R | Scope.Scope, E | ParseE
     this.interrupt = ref.interrupt
   }
 
-  run<R3>(sink: Sink.Sink<R3, E | ParseError, I>): Effect.Effect<R3 | Scope.Scope, never, unknown> {
+  run<R3>(sink: Sink.Sink<R3, E | ParseError, I>): Effect.Effect<unknown, never, R3 | Scope.Scope> {
     return this.ref.run(sink)
   }
 
-  toEffect(): Effect.Effect<never, E | ParseError, I> {
+  toEffect(): Effect.Effect<I, E | ParseError> {
     return this.ref
   }
 
   runUpdates<R2, E2, B>(
-    f: (ref: RefSubject.GetSetDelete<never, E | ParseError, I>) => Effect.Effect<R2, E2, B>
-  ): Effect.Effect<R2, E2, B> {
+    f: (ref: RefSubject.GetSetDelete<never, E | ParseError, I>) => Effect.Effect<B, E2, R2>
+  ): Effect.Effect<B, E2, R2> {
     return this.ref.runUpdates(f)
   }
 
-  onFailure(cause: Cause<E | ParseError>): Effect.Effect<never, never, unknown> {
+  onFailure(cause: Cause<E | ParseError>): Effect.Effect<unknown> {
     return this.ref.onFailure(cause)
   }
 
-  onSuccess(value: I): Effect.Effect<never, never, unknown> {
+  onSuccess(value: I): Effect.Effect<unknown> {
     return this.ref.onSuccess(value)
   }
 }
@@ -203,8 +203,8 @@ class DerivedFormEntryImpl<R, R2, E, I, O> extends FromEntryImpl<R, E, I, O>
   constructor(
     ref: RefSubject.RefSubject<never, E | ParseError, I>,
     name: PropertyKey,
-    schema: Schema.Schema<R, I, O>,
-    readonly persist: Effect.Effect<R2, E | ParseError, O>
+    schema: Schema.Schema<O, I, R>,
+    readonly persist: Effect.Effect<O, E | ParseError, R2>
   ) {
     super(ref, name, schema)
   }