From 3f091d55c205236c7128ae0ceffb777ec884a969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Mon, 31 Mar 2025 20:54:32 +0200
Subject: [PATCH] QueryClient refactoring

---
 packages/extension-query/src/QueryClient.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/extension-query/src/QueryClient.ts b/packages/extension-query/src/QueryClient.ts
index 5f0a2c0..08e01ca 100644
--- 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
     }