QueryClient refactoring

2025-03-31 20:54:32 +02:00
parent 76a33fccca
commit 3f091d55c2
1 changed files with 7 additions and 2 deletions
--- a/packages/extension-query/src/QueryClient.ts
+++ b/packages/extension-query/src/QueryClient.ts
@@ -29,7 +29,7 @@ export interface ServiceResult<Self, EH, FallbackA, HandledE> extends Context.Ta
    QueryClient<FallbackA, HandledE>
 > {
    readonly Live: Layer.Layer<
-        Self,
+        Self | EH extends QueryErrorHandler.DefaultQueryErrorHandler ? EH : never,
        never,
        EH extends QueryErrorHandler.DefaultQueryErrorHandler ? never : EH
    >
@@ -53,7 +53,12 @@ export const Service = <Self>() => (
                    EH extends QueryErrorHandler.DefaultQueryErrorHandler ? never : EH
                >
            )
-        ))
+        )).pipe(
+            Layer.provideMerge((props?.ErrorHandler
+                ? Layer.empty
+                : QueryErrorHandler.DefaultQueryErrorHandler.Live
+            ) as Layer.Layer<EH>)
+        )

        return TagClass
    }