From bada57a591d9c8bc5ed330d0a9aed45dd16379d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Mon, 28 Jul 2025 04:02:55 +0200 Subject: [PATCH] Refactoring --- packages/effect-fc/package.json | 4 ++++ packages/effect-fc/src/Component.ts | 4 ++-- packages/effect-fc/src/{Hook/index.ts => hooks/Hooks.ts} | 0 packages/effect-fc/src/{Hook => hooks}/ScopeOptions.ts | 0 packages/effect-fc/src/hooks/index.ts | 2 ++ packages/effect-fc/src/{Hook => hooks}/internal.ts | 0 packages/effect-fc/src/{Hook => hooks}/useCallbackPromise.ts | 0 packages/effect-fc/src/{Hook => hooks}/useCallbackSync.ts | 0 packages/effect-fc/src/{Hook => hooks}/useContext.ts | 0 packages/effect-fc/src/{Hook => hooks}/useEffect.ts | 0 packages/effect-fc/src/{Hook => hooks}/useFork.ts | 0 packages/effect-fc/src/{Hook => hooks}/useLayoutEffect.ts | 0 packages/effect-fc/src/{Hook => hooks}/useMemo.ts | 0 packages/effect-fc/src/{Hook => hooks}/useOnce.ts | 0 .../effect-fc/src/{Hook => hooks}/useRefFromReactiveValue.ts | 0 packages/effect-fc/src/{Hook => hooks}/useRefState.ts | 0 packages/effect-fc/src/{Hook => hooks}/useScope.ts | 0 .../src/{Hook => hooks}/useStreamFromReactiveValues.ts | 0 packages/effect-fc/src/{Hook => hooks}/useSubscribeRefs.ts | 0 packages/effect-fc/src/{Hook => hooks}/useSubscribeStream.ts | 0 packages/effect-fc/src/index.ts | 1 - 21 files changed, 8 insertions(+), 3 deletions(-) rename packages/effect-fc/src/{Hook/index.ts => hooks/Hooks.ts} (100%) rename packages/effect-fc/src/{Hook => hooks}/ScopeOptions.ts (100%) create mode 100644 packages/effect-fc/src/hooks/index.ts rename packages/effect-fc/src/{Hook => hooks}/internal.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useCallbackPromise.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useCallbackSync.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useContext.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useEffect.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useFork.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useLayoutEffect.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useMemo.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useOnce.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useRefFromReactiveValue.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useRefState.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useScope.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useStreamFromReactiveValues.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useSubscribeRefs.ts (100%) rename packages/effect-fc/src/{Hook => hooks}/useSubscribeStream.ts (100%) diff --git a/packages/effect-fc/package.json b/packages/effect-fc/package.json index 8994f33..27e9ca9 100644 --- a/packages/effect-fc/package.json +++ b/packages/effect-fc/package.json @@ -17,6 +17,10 @@ "types": "./dist/index.d.ts", "default": "./dist/index.js" }, + "./hooks": { + "types": "./dist/types/hooks.d.ts", + "default": "./dist/types/hooks.js" + }, "./types": { "types": "./dist/types/index.d.ts", "default": "./dist/types/index.js" diff --git a/packages/effect-fc/src/Component.ts b/packages/effect-fc/src/Component.ts index 98089ee..6cf7585 100644 --- a/packages/effect-fc/src/Component.ts +++ b/packages/effect-fc/src/Component.ts @@ -1,6 +1,6 @@ import { Context, Effect, Effectable, ExecutionStrategy, Function, Predicate, Runtime, Scope, String, Tracer, type Utils } from "effect" import * as React from "react" -import * as Hook from "./Hook/index.js" +import { Hooks } from "./hooks/index.js" import * as Memoized from "./Memoized.js" @@ -40,7 +40,7 @@ const ComponentProto = Object.freeze({ runtimeRef.current = yield* Effect.runtime>() return React.useCallback(function ScopeProvider(props: P) { - const scope = Runtime.runSync(runtimeRef.current)(Hook.useScope( + const scope = Runtime.runSync(runtimeRef.current)(Hooks.useScope( Array.from( Context.omit(...nonReactiveTags)(runtimeRef.current.context).unsafeMap.values() ), diff --git a/packages/effect-fc/src/Hook/index.ts b/packages/effect-fc/src/hooks/Hooks.ts similarity index 100% rename from packages/effect-fc/src/Hook/index.ts rename to packages/effect-fc/src/hooks/Hooks.ts diff --git a/packages/effect-fc/src/Hook/ScopeOptions.ts b/packages/effect-fc/src/hooks/ScopeOptions.ts similarity index 100% rename from packages/effect-fc/src/Hook/ScopeOptions.ts rename to packages/effect-fc/src/hooks/ScopeOptions.ts diff --git a/packages/effect-fc/src/hooks/index.ts b/packages/effect-fc/src/hooks/index.ts new file mode 100644 index 0000000..e1811a5 --- /dev/null +++ b/packages/effect-fc/src/hooks/index.ts @@ -0,0 +1,2 @@ +export * from "./Hooks.js" +export * as Hooks from "./Hooks.js" diff --git a/packages/effect-fc/src/Hook/internal.ts b/packages/effect-fc/src/hooks/internal.ts similarity index 100% rename from packages/effect-fc/src/Hook/internal.ts rename to packages/effect-fc/src/hooks/internal.ts diff --git a/packages/effect-fc/src/Hook/useCallbackPromise.ts b/packages/effect-fc/src/hooks/useCallbackPromise.ts similarity index 100% rename from packages/effect-fc/src/Hook/useCallbackPromise.ts rename to packages/effect-fc/src/hooks/useCallbackPromise.ts diff --git a/packages/effect-fc/src/Hook/useCallbackSync.ts b/packages/effect-fc/src/hooks/useCallbackSync.ts similarity index 100% rename from packages/effect-fc/src/Hook/useCallbackSync.ts rename to packages/effect-fc/src/hooks/useCallbackSync.ts diff --git a/packages/effect-fc/src/Hook/useContext.ts b/packages/effect-fc/src/hooks/useContext.ts similarity index 100% rename from packages/effect-fc/src/Hook/useContext.ts rename to packages/effect-fc/src/hooks/useContext.ts diff --git a/packages/effect-fc/src/Hook/useEffect.ts b/packages/effect-fc/src/hooks/useEffect.ts similarity index 100% rename from packages/effect-fc/src/Hook/useEffect.ts rename to packages/effect-fc/src/hooks/useEffect.ts diff --git a/packages/effect-fc/src/Hook/useFork.ts b/packages/effect-fc/src/hooks/useFork.ts similarity index 100% rename from packages/effect-fc/src/Hook/useFork.ts rename to packages/effect-fc/src/hooks/useFork.ts diff --git a/packages/effect-fc/src/Hook/useLayoutEffect.ts b/packages/effect-fc/src/hooks/useLayoutEffect.ts similarity index 100% rename from packages/effect-fc/src/Hook/useLayoutEffect.ts rename to packages/effect-fc/src/hooks/useLayoutEffect.ts diff --git a/packages/effect-fc/src/Hook/useMemo.ts b/packages/effect-fc/src/hooks/useMemo.ts similarity index 100% rename from packages/effect-fc/src/Hook/useMemo.ts rename to packages/effect-fc/src/hooks/useMemo.ts diff --git a/packages/effect-fc/src/Hook/useOnce.ts b/packages/effect-fc/src/hooks/useOnce.ts similarity index 100% rename from packages/effect-fc/src/Hook/useOnce.ts rename to packages/effect-fc/src/hooks/useOnce.ts diff --git a/packages/effect-fc/src/Hook/useRefFromReactiveValue.ts b/packages/effect-fc/src/hooks/useRefFromReactiveValue.ts similarity index 100% rename from packages/effect-fc/src/Hook/useRefFromReactiveValue.ts rename to packages/effect-fc/src/hooks/useRefFromReactiveValue.ts diff --git a/packages/effect-fc/src/Hook/useRefState.ts b/packages/effect-fc/src/hooks/useRefState.ts similarity index 100% rename from packages/effect-fc/src/Hook/useRefState.ts rename to packages/effect-fc/src/hooks/useRefState.ts diff --git a/packages/effect-fc/src/Hook/useScope.ts b/packages/effect-fc/src/hooks/useScope.ts similarity index 100% rename from packages/effect-fc/src/Hook/useScope.ts rename to packages/effect-fc/src/hooks/useScope.ts diff --git a/packages/effect-fc/src/Hook/useStreamFromReactiveValues.ts b/packages/effect-fc/src/hooks/useStreamFromReactiveValues.ts similarity index 100% rename from packages/effect-fc/src/Hook/useStreamFromReactiveValues.ts rename to packages/effect-fc/src/hooks/useStreamFromReactiveValues.ts diff --git a/packages/effect-fc/src/Hook/useSubscribeRefs.ts b/packages/effect-fc/src/hooks/useSubscribeRefs.ts similarity index 100% rename from packages/effect-fc/src/Hook/useSubscribeRefs.ts rename to packages/effect-fc/src/hooks/useSubscribeRefs.ts diff --git a/packages/effect-fc/src/Hook/useSubscribeStream.ts b/packages/effect-fc/src/hooks/useSubscribeStream.ts similarity index 100% rename from packages/effect-fc/src/Hook/useSubscribeStream.ts rename to packages/effect-fc/src/hooks/useSubscribeStream.ts diff --git a/packages/effect-fc/src/index.ts b/packages/effect-fc/src/index.ts index 6d643c6..9676bf1 100644 --- a/packages/effect-fc/src/index.ts +++ b/packages/effect-fc/src/index.ts @@ -1,5 +1,4 @@ export * as Component from "./Component.js" -export * as Hook from "./Hook/index.js" export * as Memoized from "./Memoized.js" export * as ReactManagedRuntime from "./ReactManagedRuntime.js" export * as Suspense from "./Suspense.js"