Component refactoring

packages/effect-fc/src/ReactComponent.ts

@@ -1,47 +1,71 @@
-import { Context, Effect, ExecutionStrategy, Exit, Function, Ref, Runtime, Scope, Tracer } from "effect"
-import type { Mutable } from "effect/Types"
+import { Context, Effect, ExecutionStrategy, Exit, Function, Pipeable, Ref, Runtime, Scope, String, Tracer, type Types, type Utils } from "effect"
 import * as React from "react"
-import type * as ReactHook from "./ReactHook.js"
 
 
-export interface ReactComponent<E, R, P> {
+export interface ReactComponent<E, R, P> extends Pipeable.Pipeable {
     (props: P): Effect.Effect<React.ReactNode, E, R>
     readonly displayName?: string
+    readonly options: Options
 }
 
-export type Error<T> = T extends ReactComponent<infer E, any, any> ? E : never
-export type Context<T> = T extends ReactComponent<any, infer R, any> ? R : never
-export type Props<T> = T extends ReactComponent<any, any, infer P> ? P : never
+export interface Options {
+    readonly finalizerExecutionMode: "sync" | "fork"
+    readonly finalizerExecutionStrategy: ExecutionStrategy.ExecutionStrategy
+}
+
+export type Error<T> = T extends ReactComponent<infer E, infer _R, infer _P> ? E : never
+export type Context<T> = T extends ReactComponent<infer _E, infer R, infer _P> ? R : never
+export type Props<T> = T extends ReactComponent<infer _E, infer _R, infer P> ? P : never
 
 export const nonReactiveTags = [Tracer.ParentSpan] as const
 
 
-export const withDisplayName: {
-    <C extends ReactComponent<any, any, any>>(displayName: string): (self: C) => C
-    <C extends ReactComponent<any, any, any>>(self: C, displayName: string): C
-} = Function.dual(2, <C extends ReactComponent<any, any, any>>(
-    self: C,
-    displayName: string,
-): C => {
-    (self as Mutable<C>).displayName = displayName
-    return self
-})
+export interface MakeOptions {
+    readonly traced?: boolean
+    readonly finalizerExecutionMode?: "sync" | "fork"
+    readonly finalizerExecutionStrategy?: ExecutionStrategy.ExecutionStrategy
+}
+
+export const make = <Eff extends Utils.YieldWrap<Effect.Effect<any, any, any>>, P>(
+    body: (props: P) => Generator<Eff, React.ReactNode, never>,
+    options?: MakeOptions,
+): ReactComponent<
+    [Eff] extends [never] ? never : [Eff] extends [Utils.YieldWrap<Effect.Effect<infer _A, infer E, infer _R>>] ? E : never,
+    [Eff] extends [never] ? never : [Eff] extends [Utils.YieldWrap<Effect.Effect<infer _A, infer _E, infer R>>] ? R : never,
+    P
+> => {
+    const displayName = !String.isEmpty(body.name) ? body.name : undefined
+
+    const f = ((options?.traced ?? true)
+        ? displayName
+            ? Effect.fn(displayName)(body)
+            : Effect.fn(body)
+        : Effect.fnUntraced(body)
+    ) as ReactComponent<any, any, any>
+
+    f.pipe = function pipe() { return Pipeable.pipeArguments(this, arguments) };
+    (f as Types.Mutable<typeof f>).displayName = displayName;
+    (f as Types.Mutable<typeof f>).options = {
+        finalizerExecutionStrategy: options?.finalizerExecutionStrategy ?? ExecutionStrategy.sequential,
+        finalizerExecutionMode: options?.finalizerExecutionMode ?? "sync",
+    }
+
+    return f
+}
 
 
 export const useFC: {
     <E, R, P extends {} = {}>(
-        self: ReactComponent<E, R, P>,
-        options?: ReactHook.ScopeOptions,
+        self: ReactComponent<E, R, P>
     ): Effect.Effect<React.FC<P>, never, Exclude<R, Scope.Scope>>
 } = Effect.fnUntraced(function* <E, R, P extends {}>(
-    self: ReactComponent<E, R, P>,
-    options?: ReactHook.ScopeOptions,
+    self: ReactComponent<E, R, P>
 ) {
     const runtimeRef = React.useRef<Runtime.Runtime<Exclude<R, Scope.Scope>>>(null!)
     runtimeRef.current = yield* Effect.runtime<Exclude<R, Scope.Scope>>()
 
     return React.useMemo(() => function ScopeProvider(props: P) {
-        const scope = useScope(runtimeRef.current, options)
+        const scope = useScope(runtimeRef.current, self.options)
 
         const FC = React.useMemo(() => {
             const f = (props: P) => Runtime.runSync(runtimeRef.current)(
@@ -59,10 +83,10 @@ export const useFC: {
 
 const useScope = (
     runtime: Runtime.Runtime<never>,
-    options?: ReactHook.ScopeOptions,
+    options: Options,
 ) => {
     const [isInitialRun, initialScope] = React.useMemo(() => Runtime.runSync(runtime)(
-        Effect.all([Ref.make(true), makeScope(options)])
+        Effect.all([Ref.make(true), Scope.make(options.finalizerExecutionStrategy)])
     ), [])
     const [scope, setScope] = React.useState(initialScope)
 
@@ -73,7 +97,7 @@ const useScope = (
                 () => closeScope(scope, runtime, options),
             ),
 
-            onFalse: () => makeScope(options).pipe(
+            onFalse: () => Scope.make(options.finalizerExecutionStrategy).pipe(
                 Effect.tap(scope => Effect.sync(() => setScope(scope))),
                 Effect.map(scope => () => closeScope(scope, runtime, options)),
             ),
@@ -83,13 +107,12 @@ const useScope = (
     return scope
 }
 
-const makeScope = (options?: ReactHook.ScopeOptions) => Scope.make(options?.finalizerExecutionStrategy ?? ExecutionStrategy.sequential)
 const closeScope = (
     scope: Scope.CloseableScope,
     runtime: Runtime.Runtime<never>,
-    options?: ReactHook.ScopeOptions,
+    options: Options,
 ) => {
-    switch (options?.finalizerExecutionMode ?? "sync") {
+    switch (options.finalizerExecutionMode) {
         case "sync":
             Runtime.runSync(runtime)(Scope.close(scope, Exit.void))
             break
@@ -104,27 +127,23 @@ export const use: {
     <E, R, P extends {} = {}>(
         self: ReactComponent<E, R, P>,
         fn: (Component: React.FC<P>) => React.ReactNode,
-        options?: ReactHook.ScopeOptions,
     ): Effect.Effect<React.ReactNode, never, Exclude<R, Scope.Scope>>
-} = Effect.fnUntraced(function*(self, fn, options) {
-    return fn(yield* useFC(self, options))
+} = Effect.fnUntraced(function*(self, fn) {
+    return fn(yield* useFC(self))
 })
 
 export const withRuntime: {
     <E, R, P extends {} = {}>(
         context: React.Context<Runtime.Runtime<R>>,
-        options?: ReactHook.ScopeOptions,
     ): (self: ReactComponent<E, R | Scope.Scope, P>) => React.FC<P>
     <E, R, P extends {} = {}>(
         self: ReactComponent<E, R | Scope.Scope, P>,
         context: React.Context<Runtime.Runtime<R>>,
-        options?: ReactHook.ScopeOptions,
     ): React.FC<P>
-} = Function.dual(3, <E, R, P extends {}>(
+} = Function.dual(2, <E, R, P extends {}>(
     self: ReactComponent<E, R | Scope.Scope, P>,
     context: React.Context<Runtime.Runtime<R>>,
-    options?: ReactHook.ScopeOptions,
 ): React.FC<P> => function WithRuntime(props) {
     const runtime = React.useContext(context)
-    return React.createElement(Runtime.runSync(runtime)(useFC(self, options)), props)
+    return React.createElement(Runtime.runSync(runtime)(useFC(self)), props)
 })

packages/effect-fc/src/ReactHook.ts

@@ -4,8 +4,8 @@ import { SetStateAction } from "./types/index.js"
 
 
 export interface ScopeOptions {
-    readonly finalizerExecutionStrategy?: ExecutionStrategy.ExecutionStrategy
     readonly finalizerExecutionMode?: "sync" | "fork"
+    readonly finalizerExecutionStrategy?: ExecutionStrategy.ExecutionStrategy
 }