From 882ec9591c4a0a5cd6dc29c5766633f283504c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Mon, 5 May 2025 03:09:17 +0200
Subject: [PATCH] Fix

---
 packages/example/src/VQueryErrorHandler.tsx | 14 ---------
 packages/reffuse/src/ReffuseNamespace.ts    | 35 +++++++++++----------
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/packages/example/src/VQueryErrorHandler.tsx b/packages/example/src/VQueryErrorHandler.tsx
index d492f4f..0b9fa57 100644
--- a/packages/example/src/VQueryErrorHandler.tsx
+++ b/packages/example/src/VQueryErrorHandler.tsx
@@ -18,20 +18,6 @@ export function VQueryErrorHandler() {
         ), [])
     )
 
-    const error2 = R.useSubscribeStream(
-        R.useMemo(() => AppQueryErrorHandler.pipe(
-            Effect.flatMap()
-
-            Effect.map(handler => handler.errors.pipe(
-                Stream.changes,
-                Stream.tap(Console.error),
-                Stream.tap(() => Effect.sync(() => setOpen(true))),
-            ))
-        ), []),
-
-        () => Effect.fail(new Error()),
-    )
-
     if (Option.isNone(error))
         return <></>
 
diff --git a/packages/reffuse/src/ReffuseNamespace.ts b/packages/reffuse/src/ReffuseNamespace.ts
index 0a12773..66b3400 100644
--- a/packages/reffuse/src/ReffuseNamespace.ts
+++ b/packages/reffuse/src/ReffuseNamespace.ts
@@ -487,15 +487,15 @@ export abstract class ReffuseNamespace<R> {
         this: ReffuseNamespace<R>,
         stream: Stream.Stream<A, E, R>,
     ): Option.Option<A>
-    useSubscribeStream<A, E, R>(
+    useSubscribeStream<A, E, IE, R>(
         this: ReffuseNamespace<R>,
         stream: Stream.Stream<A, E, R>,
-        initialValue: () => Effect.Effect<A, E, R>,
+        initialValue: () => Effect.Effect<A, IE, R>,
     ): Option.Some<A>
-    useSubscribeStream<A, E, R>(
+    useSubscribeStream<A, E, IE, R>(
         this: ReffuseNamespace<R>,
         stream: Stream.Stream<A, E, R>,
-        initialValue?: () => Effect.Effect<A, E, R>,
+        initialValue?: () => Effect.Effect<A, IE, R>,
     ): Option.Option<A> {
         const [reactStateValue, setReactStateValue] = React.useState(this.useMemo(
             () => initialValue
@@ -513,19 +513,25 @@ export abstract class ReffuseNamespace<R> {
         return reactStateValue
     }
 
-    usePullStream<A, InitialA extends A | undefined, E, InitialE, R>(
+    usePullStream<A, E, IE, R>(
         this: ReffuseNamespace<R>,
         stream: Stream.Stream<A, E, R>,
-        initialValue?: () => Effect.Effect<InitialA, InitialE, R>,
-    ): [
-        latestValue: InitialA extends A ? Option.Some<A> : Option.Option<A>,
-        pull: Effect.Effect<Chunk.Chunk<A>, Option.Option<E>>,
-    ] {
+    ): [latestValue: Option.Option<A>, pull: Effect.Effect<Chunk.Chunk<A>, Option.Option<E>>]
+    usePullStream<A, E, IE, R>(
+        this: ReffuseNamespace<R>,
+        stream: Stream.Stream<A, E, R>,
+        initialValue: () => Effect.Effect<A, IE, R>,
+    ): [latestValue: Option.Some<A>, pull: Effect.Effect<Chunk.Chunk<A>, Option.Option<E>>]
+    usePullStream<A, E, IE, R>(
+        this: ReffuseNamespace<R>,
+        stream: Stream.Stream<A, E, R>,
+        initialValue?: () => Effect.Effect<A, IE, R>,
+    ): [latestValue: Option.Option<A>, pull: Effect.Effect<Chunk.Chunk<A>, Option.Option<E>>] {
         const scope = this.useScope([stream])
 
-        const [reactStateValue, setReactStateValue] = React.useState<Option.Option<A>>(this.useMemo(
+        const [reactStateValue, setReactStateValue] = React.useState(this.useMemo(
             () => initialValue
-                ? Effect.map(initialValue(), v => Option.some(v as A))
+                ? Effect.map(initialValue(), Option.some)
                 : Effect.succeed(Option.none()),
             [],
             { doNotReExecuteOnRuntimeOrContextChange: true },
@@ -548,10 +554,7 @@ export abstract class ReffuseNamespace<R> {
             ))
         ), [stream, scope])
 
-        return [
-            reactStateValue as InitialA extends A ? Option.Some<A> : Option.Option<A>,
-            pull,
-        ]
+        return [reactStateValue, pull]
     }