, never, R>
-} = Effect.fnUntraced(function* , E, R>(
- stream: Stream.Stream,
- initialValue?: A,
-) {
- const [reactStateValue, setReactStateValue] = React.useState(
- // biome-ignore lint/correctness/useExhaustiveDependencies: no reactivity needed
- React.useMemo(() => initialValue
- ? Option.some(initialValue)
- : Option.none(),
- [])
- )
-
- yield* useFork(() => Stream.runForEach(
- Stream.changesWith(stream, Equivalence.strict()),
- v => Effect.sync(() => setReactStateValue(Option.some(v))),
- ), [stream])
-
- return reactStateValue as Option.Some
-})
diff --git a/packages/effect-fc/src/Memoized.ts b/packages/effect-fc/src/Memoized.ts
index 7ed205f..61cea91 100644
--- a/packages/effect-fc/src/Memoized.ts
+++ b/packages/effect-fc/src/Memoized.ts
@@ -3,7 +3,7 @@ import { type Equivalence, Function, Predicate } from "effect"
import type * as Component from "./Component.js"
-export const TypeId: unique symbol = Symbol.for("effect-fc/Memoized")
+export const TypeId: unique symbol = Symbol.for("@effect-fc/Memoized/Memoized")
export type TypeId = typeof TypeId
export interface Memoized extends Memoized.Options
{
diff --git a/packages/effect-fc/src/ReactRuntime.ts b/packages/effect-fc/src/ReactRuntime.ts
index 64f1af9..cdbe329 100644
--- a/packages/effect-fc/src/ReactRuntime.ts
+++ b/packages/effect-fc/src/ReactRuntime.ts
@@ -1,9 +1,10 @@
/** biome-ignore-all lint/complexity/useArrowFunction: necessary for class prototypes */
-import { Effect, type Layer, ManagedRuntime, Predicate, type Runtime } from "effect"
+import { Effect, Layer, ManagedRuntime, Predicate, type Runtime } from "effect"
import * as React from "react"
+import * as Component from "./Component.js"
-export const TypeId: unique symbol = Symbol.for("effect-fc/ReactRuntime")
+export const TypeId: unique symbol = Symbol.for("@effect-fc/ReactRuntime/ReactRuntime")
export type TypeId = typeof TypeId
export interface ReactRuntime {
@@ -21,9 +22,12 @@ export const isReactRuntime = (u: unknown): u is ReactRuntime
export const make = (
layer: Layer.Layer,
memoMap?: Layer.MemoMap,
-): ReactRuntime => Object.setPrototypeOf(
+): ReactRuntime => Object.setPrototypeOf(
Object.assign(function() {}, {
- runtime: ManagedRuntime.make(layer, memoMap),
+ runtime: ManagedRuntime.make(
+ Layer.merge(layer, Component.ScopeMap.Default),
+ memoMap,
+ ),
// biome-ignore lint/style/noNonNullAssertion: context initialization
context: React.createContext>(null!),
}),
diff --git a/packages/effect-fc/src/Stream.ts b/packages/effect-fc/src/Stream.ts
new file mode 100644
index 0000000..726b7be
--- /dev/null
+++ b/packages/effect-fc/src/Stream.ts
@@ -0,0 +1,58 @@
+import { Effect, Equivalence, Option, PubSub, Ref, type Scope, Stream } from "effect"
+import * as React from "react"
+import * as Component from "./Component.js"
+
+
+export const useStream: {
+ (
+ stream: Stream.Stream
+ ): Effect.Effect, never, R>
+ , E, R>(
+ stream: Stream.Stream,
+ initialValue: A,
+ ): Effect.Effect, never, R>
+} = Effect.fnUntraced(function* , E, R>(
+ stream: Stream.Stream,
+ initialValue?: A,
+) {
+ const [reactStateValue, setReactStateValue] = React.useState(() => initialValue
+ ? Option.some(initialValue)
+ : Option.none()
+ )
+
+ yield* Component.useReactEffect(() => Effect.forkScoped(
+ Stream.runForEach(
+ Stream.changesWith(stream, Equivalence.strict()),
+ v => Effect.sync(() => setReactStateValue(Option.some(v))),
+ )
+ ), [stream])
+
+ return reactStateValue as Option.Some
+})
+
+export const useStreamFromReactiveValues: {
+ (
+ values: A
+ ): Effect.Effect, never, Scope.Scope>
+} = Effect.fnUntraced(function* (values: A) {
+ const { latest, pubsub, stream } = yield* Component.useOnMount(() => Effect.Do.pipe(
+ Effect.bind("latest", () => Ref.make(values)),
+ Effect.bind("pubsub", () => Effect.acquireRelease(PubSub.unbounded(), PubSub.shutdown)),
+ Effect.let("stream", ({ latest, pubsub }) => latest.pipe(
+ Effect.flatMap(a => Effect.map(
+ Stream.fromPubSub(pubsub, { scoped: true }),
+ s => Stream.concat(Stream.make(a), s),
+ )),
+ Stream.unwrapScoped,
+ )),
+ ))
+
+ yield* Component.useReactEffect(() => Ref.set(latest, values).pipe(
+ Effect.andThen(PubSub.publish(pubsub, values)),
+ Effect.unlessEffect(PubSub.isShutdown(pubsub)),
+ ), values)
+
+ return stream
+})
+
+export * from "effect/Stream"
diff --git a/packages/effect-fc/src/Subscribable.ts b/packages/effect-fc/src/Subscribable.ts
index 9ebba36..22f5dbe 100644
--- a/packages/effect-fc/src/Subscribable.ts
+++ b/packages/effect-fc/src/Subscribable.ts
@@ -1,17 +1,47 @@
-import { Effect, Stream, Subscribable } from "effect"
+import { Effect, Equivalence, pipe, type Scope, Stream, Subscribable } from "effect"
+import * as React from "react"
+import * as Component from "./Component.js"
-export const zipLatestAll = >>(
- ...subscribables: T
+export const zipLatestAll = []>(
+ ...elements: T
): Subscribable.Subscribable<
[T[number]] extends [never]
? never
: { [K in keyof T]: T[K] extends Subscribable.Subscribable ? A : never },
- [T[number]] extends [never] ? never : T[number] extends Subscribable.Subscribable ? _E : never,
- [T[number]] extends [never] ? never : T[number] extends Subscribable.Subscribable ? _R : never
+ [T[number]] extends [never] ? never : T[number] extends Subscribable.Subscribable ? E : never,
+ [T[number]] extends [never] ? never : T[number] extends Subscribable.Subscribable ? R : never
> => Subscribable.make({
- get: Effect.all(subscribables.map(v => v.get)),
- changes: Stream.zipLatestAll(...subscribables.map(v => v.changes)),
+ get: Effect.all(elements.map(v => v.get)),
+ changes: Stream.zipLatestAll(...elements.map(v => v.changes)),
}) as any
+export const useSubscribables: {
+ []>(
+ ...elements: T
+ ): Effect.Effect<
+ [T[number]] extends [never]
+ ? never
+ : { [K in keyof T]: T[K] extends Subscribable.Subscribable ? A : never },
+ [T[number]] extends [never] ? never : T[number] extends Subscribable.Subscribable ? E : never,
+ ([T[number]] extends [never] ? never : T[number] extends Subscribable.Subscribable ? R : never) | Scope.Scope
+ >
+} = Effect.fnUntraced(function* []>(
+ ...elements: T
+) {
+ const [reactStateValue, setReactStateValue] = React.useState(
+ yield* Component.useOnMount(() => Effect.all(elements.map(v => v.get)))
+ )
+
+ yield* Component.useReactEffect(() => Effect.forkScoped(pipe(
+ elements.map(ref => Stream.changesWith(ref.changes, Equivalence.strict())),
+ streams => Stream.zipLatestAll(...streams),
+ Stream.runForEach(v =>
+ Effect.sync(() => setReactStateValue(v))
+ ),
+ )), elements)
+
+ return reactStateValue as any
+})
+
export * from "effect/Subscribable"
diff --git a/packages/effect-fc/src/SubscriptionRef.ts b/packages/effect-fc/src/SubscriptionRef.ts
new file mode 100644
index 0000000..eb7e9b8
--- /dev/null
+++ b/packages/effect-fc/src/SubscriptionRef.ts
@@ -0,0 +1,48 @@
+import { Effect, Equivalence, Ref, type Scope, Stream, SubscriptionRef } from "effect"
+import * as React from "react"
+import * as Component from "./Component.js"
+import * as SetStateAction from "./SetStateAction.js"
+
+
+export const useSubscriptionRefState: {
+ (
+ ref: SubscriptionRef.SubscriptionRef
+ ): Effect.Effect>], never, Scope.Scope>
+} = Effect.fnUntraced(function* (ref: SubscriptionRef.SubscriptionRef) {
+ const [reactStateValue, setReactStateValue] = React.useState(yield* Component.useOnMount(() => ref))
+
+ yield* Component.useReactEffect(() => Effect.forkScoped(
+ Stream.runForEach(
+ Stream.changesWith(ref.changes, Equivalence.strict()),
+ v => Effect.sync(() => setReactStateValue(v)),
+ )
+ ), [ref])
+
+ const setValue = yield* Component.useCallbackSync((setStateAction: React.SetStateAction) =>
+ Effect.andThen(
+ Ref.updateAndGet(ref, prevState => SetStateAction.value(setStateAction, prevState)),
+ v => setReactStateValue(v),
+ ),
+ [ref])
+
+ return [reactStateValue, setValue]
+})
+
+export const useSubscriptionRefFromState: {
+ (state: readonly [A, React.Dispatch>]): Effect.Effect, never, Scope.Scope>
+} = Effect.fnUntraced(function*([value, setValue]) {
+ const ref = yield* Component.useOnChange(() => Effect.tap(
+ SubscriptionRef.make(value),
+ ref => Effect.forkScoped(
+ Stream.runForEach(
+ Stream.changesWith(ref.changes, Equivalence.strict()),
+ v => Effect.sync(() => setValue(v)),
+ )
+ ),
+ ), [setValue])
+
+ yield* Component.useReactEffect(() => Ref.set(ref, value), [value])
+ return ref
+})
+
+export * from "effect/SubscriptionRef"
diff --git a/packages/effect-fc/src/SubscriptionSubRef.ts b/packages/effect-fc/src/SubscriptionSubRef.ts
index 8533999..7980a29 100644
--- a/packages/effect-fc/src/SubscriptionSubRef.ts
+++ b/packages/effect-fc/src/SubscriptionSubRef.ts
@@ -2,7 +2,7 @@ import { Chunk, Effect, Effectable, Option, Predicate, Readable, Ref, Stream, Su
import * as PropertyPath from "./PropertyPath.js"
-export const SubscriptionSubRefTypeId: unique symbol = Symbol.for("effect-fc/SubscriptionSubRef")
+export const SubscriptionSubRefTypeId: unique symbol = Symbol.for("effect-fc/SubscriptionSubRef/SubscriptionSubRef")
export type SubscriptionSubRefTypeId = typeof SubscriptionSubRefTypeId
export interface SubscriptionSubRef>
diff --git a/packages/effect-fc/src/index.ts b/packages/effect-fc/src/index.ts
index b2227e8..f63afb4 100644
--- a/packages/effect-fc/src/index.ts
+++ b/packages/effect-fc/src/index.ts
@@ -1,10 +1,11 @@
export * as Async from "./Async.js"
export * as Component from "./Component.js"
export * as Form from "./Form.js"
-export * as Hooks from "./Hooks/index.js"
export * as Memoized from "./Memoized.js"
export * as PropertyPath from "./PropertyPath.js"
export * as ReactRuntime from "./ReactRuntime.js"
export * as SetStateAction from "./SetStateAction.js"
+export * as Stream from "./Stream.js"
export * as Subscribable from "./Subscribable.js"
+export * as SubscriptionRef from "./SubscriptionRef.js"
export * as SubscriptionSubRef from "./SubscriptionSubRef.js"
diff --git a/packages/example/src/domain/Todo.ts b/packages/example/src/domain/Todo.ts
index f4fe24f..500faab 100644
--- a/packages/example/src/domain/Todo.ts
+++ b/packages/example/src/domain/Todo.ts
@@ -1,5 +1,5 @@
-import { assertEncodedJsonifiable } from "@/lib/schema"
import { Schema } from "effect"
+import { assertEncodedJsonifiable } from "@/lib/schema"
export class Todo extends Schema.Class("Todo")({
diff --git a/packages/example/src/lib/form/TextFieldFormInput.tsx b/packages/example/src/lib/form/TextFieldFormInput.tsx
index 567afdb..5e69a4a 100644
--- a/packages/example/src/lib/form/TextFieldFormInput.tsx
+++ b/packages/example/src/lib/form/TextFieldFormInput.tsx
@@ -1,6 +1,6 @@
import { Callout, Flex, Spinner, Switch, TextField } from "@radix-ui/themes"
import { Array, Option, Struct } from "effect"
-import { Component, Form, Hooks } from "effect-fc"
+import { Component, Form, Subscribable } from "effect-fc"
interface Props
@@ -18,60 +18,58 @@ extends Omit, Form.useOptional
export type TextFieldFormInputProps = Props | OptionalProps
-export class TextFieldFormInput extends Component.makeUntraced("TextFieldFormInput")(
- function*(props: TextFieldFormInputProps) {
- const input: (
- | { readonly optional: true } & Form.useOptionalInput.Result
- | { readonly optional: false } & Form.useInput.Result
- ) = props.optional
- // biome-ignore lint/correctness/useHookAtTopLevel: "optional" reactivity not supported
- ? { optional: true, ...yield* Form.useOptionalInput(props.field, props) }
- // biome-ignore lint/correctness/useHookAtTopLevel: "optional" reactivity not supported
- : { optional: false, ...yield* Form.useInput(props.field, props) }
+export class TextFieldFormInput extends Component.makeUntraced("TextFieldFormInput")(function*(props: TextFieldFormInputProps) {
+ const input: (
+ | { readonly optional: true } & Form.useOptionalInput.Result
+ | { readonly optional: false } & Form.useInput.Result
+ ) = props.optional
+ // biome-ignore lint/correctness/useHookAtTopLevel: "optional" reactivity not supported
+ ? { optional: true, ...yield* Form.useOptionalInput(props.field, props) }
+ // biome-ignore lint/correctness/useHookAtTopLevel: "optional" reactivity not supported
+ : { optional: false, ...yield* Form.useInput(props.field, props) }
- const [issues, isValidating, isSubmitting] = yield* Hooks.useSubscribables(
- props.field.issuesSubscribable,
- props.field.isValidatingSubscribable,
- props.field.isSubmittingSubscribable,
- )
+ const [issues, isValidating, isSubmitting] = yield* Subscribable.useSubscribables(
+ props.field.issuesSubscribable,
+ props.field.isValidatingSubscribable,
+ props.field.isSubmittingSubscribable,
+ )
- return (
-
- input.setValue(e.target.value)}
- disabled={(input.optional && !input.enabled) || isSubmitting}
- {...Struct.omit(props, "optional", "defaultValue")}
- >
- {input.optional &&
-
-
-
- }
+ return (
+
+ input.setValue(e.target.value)}
+ disabled={(input.optional && !input.enabled) || isSubmitting}
+ {...Struct.omit(props, "optional", "defaultValue")}
+ >
+ {input.optional &&
+
+
+
+ }
- {isValidating &&
-
-
-
- }
+ {isValidating &&
+
+
+
+ }
- {props.children}
-
+ {props.children}
+
- {Option.match(Array.head(issues), {
- onSome: issue => (
-
- {issue.message}
-
- ),
+ {Option.match(Array.head(issues), {
+ onSome: issue => (
+
+ {issue.message}
+
+ ),
- onNone: () => <>>,
- })}
-
- )
- }
-) {}
+ onNone: () => <>>,
+ })}
+
+ )
+}) {}
diff --git a/packages/example/src/lib/input/TextAreaInput.tsx b/packages/example/src/lib/input/TextAreaInput.tsx
deleted file mode 100644
index 03d4359..0000000
--- a/packages/example/src/lib/input/TextAreaInput.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/** biome-ignore-all lint/correctness/useHookAtTopLevel: effect-fc HOC */
-import { Callout, Flex, TextArea, type TextAreaProps } from "@radix-ui/themes"
-import { Array, type Equivalence, Option, ParseResult, type Schema, Struct } from "effect"
-import { Component } from "effect-fc"
-import { useInput } from "effect-fc/Hooks"
-import * as React from "react"
-
-
-export type TextAreaInputProps = Omit, "schema" | "equivalence"> & Omit
-
-export const TextAreaInput = (options: {
- readonly schema: Schema.Schema
- readonly equivalence?: Equivalence.Equivalence
-}): Component.Component<
- TextAreaInputProps,
- React.JSX.Element,
- ParseResult.ParseError,
- R
-> => Component.makeUntraced("TextFieldInput")(function*(props) {
- const input = yield* useInput({ ...options, ...props })
- const issue = React.useMemo(() => input.error.pipe(
- Option.map(ParseResult.ArrayFormatter.formatErrorSync),
- Option.flatMap(Array.head),
- ), [input.error])
-
- return (
-
-
- )
-})
diff --git a/packages/example/src/lib/input/TextFieldInput.tsx b/packages/example/src/lib/input/TextFieldInput.tsx
deleted file mode 100644
index b06d1ff..0000000
--- a/packages/example/src/lib/input/TextFieldInput.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/** biome-ignore-all lint/correctness/useHookAtTopLevel: effect-fc HOC */
-import { Callout, Checkbox, Flex, TextField } from "@radix-ui/themes"
-import { Array, type Equivalence, Option, ParseResult, type Schema, Struct } from "effect"
-import { Component } from "effect-fc"
-import { useInput, useOptionalInput } from "effect-fc/Hooks"
-import * as React from "react"
-
-
-export type TextFieldInputProps = (
- & Omit, "schema" | "equivalence">
- & Omit
-)
-export type TextFieldOptionalInputProps = (
- & Omit, "schema" | "equivalence">
- & Omit
-)
-
-export const TextFieldInput = (options: {
- readonly optional?: O
- readonly schema: Schema.Schema
- readonly equivalence?: Equivalence.Equivalence
-}) => Component.makeUntraced("TextFieldInput")(function*(props: O extends true
- ? TextFieldOptionalInputProps
- : TextFieldInputProps
-) {
- const input: (
- | { readonly optional: true } & useOptionalInput.Result
- | { readonly optional: false } & useInput.Result
- ) = options.optional
- ? {
- optional: true,
- ...yield* useOptionalInput({ ...options, ...props as TextFieldOptionalInputProps }),
- }
- : {
- optional: false,
- ...yield* useInput({ ...options, ...props as TextFieldInputProps }),
- }
-
- const issue = React.useMemo(() => input.error.pipe(
- Option.map(ParseResult.ArrayFormatter.formatErrorSync),
- Option.flatMap(Array.head),
- ), [input.error])
-
- return (
-
-
- {input.optional &&
- input.setEnabled(checked !== "indeterminate" && checked)}
- />
- }
-
- input.setValue(e.target.value)}
- disabled={input.optional ? !input.enabled : undefined}
- {...Struct.omit(props as TextFieldOptionalInputProps | TextFieldInputProps, "ref", "defaultValue")}
- />
-
-
- {(!(input.optional && !input.enabled) && Option.isSome(issue)) &&
-
- {issue.value.message}
-
- }
-
- )
-})
diff --git a/packages/example/src/routeTree.gen.ts b/packages/example/src/routeTree.gen.ts
index d29c115..b842211 100644
--- a/packages/example/src/routeTree.gen.ts
+++ b/packages/example/src/routeTree.gen.ts
@@ -13,7 +13,7 @@ import { Route as FormRouteImport } from './routes/form'
import { Route as BlankRouteImport } from './routes/blank'
import { Route as IndexRouteImport } from './routes/index'
import { Route as DevMemoRouteImport } from './routes/dev/memo'
-import { Route as DevInputRouteImport } from './routes/dev/input'
+import { Route as DevContextRouteImport } from './routes/dev/context'
import { Route as DevAsyncRenderingRouteImport } from './routes/dev/async-rendering'
const FormRoute = FormRouteImport.update({
@@ -36,9 +36,9 @@ const DevMemoRoute = DevMemoRouteImport.update({
path: '/dev/memo',
getParentRoute: () => rootRouteImport,
} as any)
-const DevInputRoute = DevInputRouteImport.update({
- id: '/dev/input',
- path: '/dev/input',
+const DevContextRoute = DevContextRouteImport.update({
+ id: '/dev/context',
+ path: '/dev/context',
getParentRoute: () => rootRouteImport,
} as any)
const DevAsyncRenderingRoute = DevAsyncRenderingRouteImport.update({
@@ -52,7 +52,7 @@ export interface FileRoutesByFullPath {
'/blank': typeof BlankRoute
'/form': typeof FormRoute
'/dev/async-rendering': typeof DevAsyncRenderingRoute
- '/dev/input': typeof DevInputRoute
+ '/dev/context': typeof DevContextRoute
'/dev/memo': typeof DevMemoRoute
}
export interface FileRoutesByTo {
@@ -60,7 +60,7 @@ export interface FileRoutesByTo {
'/blank': typeof BlankRoute
'/form': typeof FormRoute
'/dev/async-rendering': typeof DevAsyncRenderingRoute
- '/dev/input': typeof DevInputRoute
+ '/dev/context': typeof DevContextRoute
'/dev/memo': typeof DevMemoRoute
}
export interface FileRoutesById {
@@ -69,7 +69,7 @@ export interface FileRoutesById {
'/blank': typeof BlankRoute
'/form': typeof FormRoute
'/dev/async-rendering': typeof DevAsyncRenderingRoute
- '/dev/input': typeof DevInputRoute
+ '/dev/context': typeof DevContextRoute
'/dev/memo': typeof DevMemoRoute
}
export interface FileRouteTypes {
@@ -79,7 +79,7 @@ export interface FileRouteTypes {
| '/blank'
| '/form'
| '/dev/async-rendering'
- | '/dev/input'
+ | '/dev/context'
| '/dev/memo'
fileRoutesByTo: FileRoutesByTo
to:
@@ -87,7 +87,7 @@ export interface FileRouteTypes {
| '/blank'
| '/form'
| '/dev/async-rendering'
- | '/dev/input'
+ | '/dev/context'
| '/dev/memo'
id:
| '__root__'
@@ -95,7 +95,7 @@ export interface FileRouteTypes {
| '/blank'
| '/form'
| '/dev/async-rendering'
- | '/dev/input'
+ | '/dev/context'
| '/dev/memo'
fileRoutesById: FileRoutesById
}
@@ -104,7 +104,7 @@ export interface RootRouteChildren {
BlankRoute: typeof BlankRoute
FormRoute: typeof FormRoute
DevAsyncRenderingRoute: typeof DevAsyncRenderingRoute
- DevInputRoute: typeof DevInputRoute
+ DevContextRoute: typeof DevContextRoute
DevMemoRoute: typeof DevMemoRoute
}
@@ -138,11 +138,11 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DevMemoRouteImport
parentRoute: typeof rootRouteImport
}
- '/dev/input': {
- id: '/dev/input'
- path: '/dev/input'
- fullPath: '/dev/input'
- preLoaderRoute: typeof DevInputRouteImport
+ '/dev/context': {
+ id: '/dev/context'
+ path: '/dev/context'
+ fullPath: '/dev/context'
+ preLoaderRoute: typeof DevContextRouteImport
parentRoute: typeof rootRouteImport
}
'/dev/async-rendering': {
@@ -160,7 +160,7 @@ const rootRouteChildren: RootRouteChildren = {
BlankRoute: BlankRoute,
FormRoute: FormRoute,
DevAsyncRenderingRoute: DevAsyncRenderingRoute,
- DevInputRoute: DevInputRoute,
+ DevContextRoute: DevContextRoute,
DevMemoRoute: DevMemoRoute,
}
export const routeTree = rootRouteImport
diff --git a/packages/example/src/routes/dev/async-rendering.tsx b/packages/example/src/routes/dev/async-rendering.tsx
index e5a23e8..5bd2e6a 100644
--- a/packages/example/src/routes/dev/async-rendering.tsx
+++ b/packages/example/src/routes/dev/async-rendering.tsx
@@ -2,7 +2,7 @@ import { Flex, Text, TextField } from "@radix-ui/themes"
import { createFileRoute } from "@tanstack/react-router"
import { GetRandomValues, makeUuid4 } from "@typed/id"
import { Effect } from "effect"
-import { Async, Component, Hooks, Memoized } from "effect-fc"
+import { Async, Component, Memoized } from "effect-fc"
import * as React from "react"
import { runtime } from "@/runtime"
@@ -69,7 +69,7 @@ class AsyncComponent extends Component.makeUntraced("AsyncComponent")(function*(
class MemoizedAsyncComponent extends Memoized.memoized(AsyncComponent) {}
class SubComponent extends Component.makeUntraced("SubComponent")(function*() {
- const [state] = React.useState(yield* Hooks.useOnce(() => Effect.provide(makeUuid4, GetRandomValues.CryptoRandom)))
+ const [state] = React.useState(yield* Component.useOnMount(() => Effect.provide(makeUuid4, GetRandomValues.CryptoRandom)))
return {state}
}) {}
diff --git a/packages/example/src/routes/dev/context.tsx b/packages/example/src/routes/dev/context.tsx
new file mode 100644
index 0000000..f512353
--- /dev/null
+++ b/packages/example/src/routes/dev/context.tsx
@@ -0,0 +1,42 @@
+import { Container, Flex, Text, TextField } from "@radix-ui/themes"
+import { createFileRoute } from "@tanstack/react-router"
+import { Console, Effect } from "effect"
+import { Component } from "effect-fc"
+import * as React from "react"
+import { runtime } from "@/runtime"
+
+
+class SubService extends Effect.Service()("SubService", {
+ effect: (value: string) => Effect.succeed({ value })
+}) {}
+
+const SubComponent = Component.makeUntraced("SubComponent")(function*() {
+ const service = yield* SubService
+ yield* Component.useOnMount(() => Effect.gen(function*() {
+ yield* Effect.addFinalizer(() => Console.log("SubComponent unmounted"))
+ yield* Console.log("SubComponent mounted")
+ }))
+
+ return {service.value}
+})
+
+const ContextView = Component.makeUntraced("ContextView")(function*() {
+ const [serviceValue, setServiceValue] = React.useState("test")
+ const SubServiceLayer = React.useMemo(() => SubService.Default(serviceValue), [serviceValue])
+ const SubComponentFC = yield* Effect.provide(SubComponent, yield* Component.useContext(SubServiceLayer))
+
+ return (
+
+
+ setServiceValue(e.target.value)} />
+
+
+
+ )
+}).pipe(
+ Component.withRuntime(runtime.context)
+)
+
+export const Route = createFileRoute("/dev/context")({
+ component: ContextView
+})
diff --git a/packages/example/src/routes/dev/input.tsx b/packages/example/src/routes/dev/input.tsx
deleted file mode 100644
index ef20057..0000000
--- a/packages/example/src/routes/dev/input.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Container } from "@radix-ui/themes"
-import { createFileRoute } from "@tanstack/react-router"
-import { Schema, SubscriptionRef } from "effect"
-import { Component, Hooks, Memoized } from "effect-fc"
-import { TextFieldInput } from "@/lib/input/TextFieldInput"
-import { runtime } from "@/runtime"
-
-
-const IntFromString = Schema.NumberFromString.pipe(Schema.int())
-
-const IntTextFieldInput = TextFieldInput({ schema: IntFromString })
-const StringTextFieldInput = TextFieldInput({ schema: Schema.String })
-
-const Input = Component.makeUntraced("Input")(function*() {
- const IntTextFieldInputFC = yield* IntTextFieldInput
- const StringTextFieldInputFC = yield* StringTextFieldInput
-
- const intRef1 = yield* Hooks.useOnce(() => SubscriptionRef.make(0))
- // const intRef2 = yield* useOnce(() => SubscriptionRef.make(0))
- const stringRef = yield* Hooks.useOnce(() => SubscriptionRef.make(""))
- // yield* useFork(() => Stream.runForEach(intRef1.changes, Console.log), [intRef1])
-
- // const input2 = yield* useInput({ schema: IntFromString, ref: intRef2 })
-
- // const [str, setStr] = yield* useRefState(stringRef)
-
- return (
-
-
-
-
-
- )
-}).pipe(
- Memoized.memoized,
- Component.withRuntime(runtime.context)
-)
-
-export const Route = createFileRoute("/dev/input")({
- component: Input,
-})
diff --git a/packages/example/src/routes/form.tsx b/packages/example/src/routes/form.tsx
index 722e2d8..30fe641 100644
--- a/packages/example/src/routes/form.tsx
+++ b/packages/example/src/routes/form.tsx
@@ -1,7 +1,7 @@
import { Button, Container, Flex } from "@radix-ui/themes"
import { createFileRoute } from "@tanstack/react-router"
import { Console, Effect, Option, ParseResult, Schema } from "effect"
-import { Component, Form, Hooks } from "effect-fc"
+import { Component, Form, Subscribable } from "effect-fc"
import { TextFieldFormInput } from "@/lib/form/TextFieldFormInput"
import { DateTimeUtcFromZonedInput } from "@/lib/schema"
import { runtime } from "@/runtime"
@@ -50,10 +50,15 @@ class RegisterForm extends Effect.Service()("RegisterForm", {
class RegisterFormView extends Component.makeUntraced("RegisterFormView")(function*() {
const form = yield* RegisterForm
const submit = yield* Form.useSubmit(form)
- const [canSubmit] = yield* Hooks.useSubscribables(form.canSubmitSubscribable)
+ const [canSubmit] = yield* Subscribable.useSubscribables(form.canSubmitSubscribable)
const TextFieldFormInputFC = yield* TextFieldFormInput
+ yield* Component.useOnMount(() => Effect.gen(function*() {
+ yield* Effect.addFinalizer(() => Console.log("RegisterFormView unmounted"))
+ yield* Console.log("RegisterFormView mounted")
+ }))
+
return (
@@ -87,7 +92,7 @@ class RegisterFormView extends Component.makeUntraced("RegisterFormView")(functi
const RegisterPage = Component.makeUntraced("RegisterPage")(function*() {
const RegisterFormViewFC = yield* Effect.provide(
RegisterFormView,
- yield* Hooks.useContext(RegisterForm.Default, { finalizerExecutionMode: "fork" }),
+ yield* Component.useContext(RegisterForm.Default),
)
return
diff --git a/packages/example/src/routes/index.tsx b/packages/example/src/routes/index.tsx
index 8da0367..f9146cc 100644
--- a/packages/example/src/routes/index.tsx
+++ b/packages/example/src/routes/index.tsx
@@ -1,6 +1,6 @@
import { createFileRoute } from "@tanstack/react-router"
import { Effect } from "effect"
-import { Component, Hooks } from "effect-fc"
+import { Component } from "effect-fc"
import { runtime } from "@/runtime"
import { Todos } from "@/todo/Todos"
import { TodosState } from "@/todo/TodosState.service"
@@ -11,7 +11,7 @@ const TodosStateLive = TodosState.Default("todos")
const Index = Component.makeUntraced("Index")(function*() {
const TodosFC = yield* Effect.provide(
Todos,
- yield* Hooks.useContext(TodosStateLive, { finalizerExecutionMode: "fork" }),
+ yield* Component.useContext(TodosStateLive),
)
return
diff --git a/packages/example/src/todo/Todo.tsx b/packages/example/src/todo/Todo.tsx
index 9d575f1..556ba46 100644
--- a/packages/example/src/todo/Todo.tsx
+++ b/packages/example/src/todo/Todo.tsx
@@ -1,18 +1,19 @@
import { Box, Button, Flex, IconButton } from "@radix-ui/themes"
import { GetRandomValues, makeUuid4 } from "@typed/id"
-import { Chunk, DateTime, Effect, Match, Option, Ref, Runtime, Schema, Stream, SubscriptionRef } from "effect"
-import { Component, Hooks, Memoized, Subscribable, SubscriptionSubRef } from "effect-fc"
+import { Chunk, Effect, Match, Option, Ref, Runtime, Schema, Stream } from "effect"
+import { Component, Form, Subscribable } from "effect-fc"
import { FaArrowDown, FaArrowUp } from "react-icons/fa"
import { FaDeleteLeft } from "react-icons/fa6"
import * as Domain from "@/domain"
-import { TextAreaInput } from "@/lib/input/TextAreaInput"
-import { TextFieldInput } from "@/lib/input/TextFieldInput"
+import { TextFieldFormInput } from "@/lib/form/TextFieldFormInput"
import { DateTimeUtcFromZonedInput } from "@/lib/schema"
import { TodosState } from "./TodosState.service"
-const StringTextAreaInput = TextAreaInput({ schema: Schema.String })
-const OptionalDateTimeInput = TextFieldInput({ optional: true, schema: DateTimeUtcFromZonedInput })
+const TodoFormSchema = Schema.compose(Schema.Struct({
+ ...Domain.Todo.Todo.fields,
+ completedAt: Schema.OptionFromSelf(DateTimeUtcFromZonedInput),
+}), Domain.Todo.Todo)
const makeTodo = makeUuid4.pipe(
Effect.map(id => Domain.Todo.Todo.make({
@@ -33,49 +34,75 @@ export class Todo extends Component.makeUntraced("Todo")(function*(props: TodoPr
const runtime = yield* Effect.runtime()
const state = yield* TodosState
- const { ref, indexRef, contentRef, completedAtRef } = yield* Hooks.useMemo(() => Match.value(props).pipe(
- Match.tag("new", () => Effect.Do.pipe(
- Effect.bind("ref", () => Effect.andThen(makeTodo, SubscriptionRef.make)),
- Effect.let("indexRef", () => Subscribable.make({ get: Effect.succeed(-1), changes: Stream.empty })),
- )),
- Match.tag("edit", ({ id }) => Effect.Do.pipe(
- Effect.let("ref", () => state.getElementRef(id)),
- Effect.let("indexRef", () => state.getIndexSubscribable(id)),
- )),
- Match.exhaustive,
+ const [
+ indexRef,
+ form,
+ contentField,
+ completedAtField,
+ ] = yield* Component.useOnChange(() => Effect.gen(function*() {
+ const indexRef = Match.value(props).pipe(
+ Match.tag("new", () => Subscribable.make({ get: Effect.succeed(-1), changes: Stream.make(-1) })),
+ Match.tag("edit", ({ id }) => state.getIndexSubscribable(id)),
+ Match.exhaustive,
+ )
- Effect.let("contentRef", ({ ref }) => SubscriptionSubRef.makeFromPath(ref, ["content"])),
- Effect.let("completedAtRef", ({ ref }) => SubscriptionSubRef.makeFromPath(ref, ["completedAt"])),
- ), [props._tag, props._tag === "edit" ? props.id : undefined])
+ const form = yield* Form.service({
+ schema: TodoFormSchema,
+ initialEncodedValue: yield* Schema.encode(TodoFormSchema)(
+ yield* Match.value(props).pipe(
+ Match.tag("new", () => makeTodo),
+ Match.tag("edit", ({ id }) => state.getElementRef(id)),
+ Match.exhaustive,
+ )
+ ),
+ onSubmit: function(todo) {
+ return Match.value(props).pipe(
+ Match.tag("new", () => Ref.update(state.ref, Chunk.prepend(todo)).pipe(
+ Effect.andThen(makeTodo),
+ Effect.andThen(Schema.encode(TodoFormSchema)),
+ Effect.andThen(v => Ref.set(this.encodedValueRef, v)),
+ )),
+ Match.tag("edit", ({ id }) => Ref.set(state.getElementRef(id), todo)),
+ Match.exhaustive,
+ )
+ },
+ autosubmit: props._tag === "edit",
+ debounce: "250 millis",
+ })
- const [index, size] = yield* Hooks.useSubscribables(indexRef, state.sizeSubscribable)
+ return [
+ indexRef,
+ form,
+ Form.field(form, ["content"]),
+ Form.field(form, ["completedAt"]),
+ ] as const
+ }), [props._tag, props._tag === "edit" ? props.id : undefined])
- const StringTextAreaInputFC = yield* StringTextAreaInput
- const OptionalDateTimeInputFC = yield* OptionalDateTimeInput
+ const [index, size, canSubmit] = yield* Subscribable.useSubscribables(
+ indexRef,
+ state.sizeSubscribable,
+ form.canSubmitSubscribable,
+ )
+ const submit = yield* Form.useSubmit(form)
+ const TextFieldFormInputFC = yield* TextFieldFormInput
return (
-
+
- DateTime.now)}
+ defaultValue=""
/>
{props._tag === "new" &&
-
)
-}).pipe(
- Memoized.memoized
-) {}
+}) {}
diff --git a/packages/example/src/todo/Todos.tsx b/packages/example/src/todo/Todos.tsx
index 3fb4076..381dd8c 100644
--- a/packages/example/src/todo/Todos.tsx
+++ b/packages/example/src/todo/Todos.tsx
@@ -1,15 +1,15 @@
import { Container, Flex, Heading } from "@radix-ui/themes"
import { Chunk, Console, Effect } from "effect"
-import { Component, Hooks } from "effect-fc"
+import { Component, Subscribable } from "effect-fc"
import { Todo } from "./Todo"
import { TodosState } from "./TodosState.service"
export class Todos extends Component.makeUntraced("Todos")(function*() {
const state = yield* TodosState
- const [todos] = yield* Hooks.useSubscribables(state.ref)
+ const [todos] = yield* Subscribable.useSubscribables(state.ref)
- yield* Hooks.useOnce(() => Effect.andThen(
+ yield* Component.useOnMount(() => Effect.andThen(
Console.log("Todos mounted"),
Effect.addFinalizer(() => Console.log("Todos unmounted")),
))