From d55b43284600ebf13be168a6eeca0780643a89ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sun, 23 Mar 2025 23:58:05 +0100
Subject: [PATCH] Refactoring

---
 packages/example/src/query.ts               |  2 +-
 packages/extension-query/src/QueryClient.ts | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/example/src/query.ts b/packages/example/src/query.ts
index 8d69470..7b659eb 100644
--- a/packages/example/src/query.ts
+++ b/packages/example/src/query.ts
@@ -18,4 +18,4 @@ export class AppQueryErrorHandler extends ErrorHandler.Service<AppQueryErrorHand
     ),
 ) {}
 
-export class AppQueryClient extends QueryClient.Service({ ErrorHandler: AppQueryErrorHandler })<AppQueryClient>() {}
+export class AppQueryClient extends QueryClient.Service<AppQueryClient>()({ ErrorHandler: AppQueryErrorHandler }) {}
diff --git a/packages/extension-query/src/QueryClient.ts b/packages/extension-query/src/QueryClient.ts
index f5bea0a..dd467f5 100644
--- a/packages/extension-query/src/QueryClient.ts
+++ b/packages/extension-query/src/QueryClient.ts
@@ -23,13 +23,13 @@ export interface ServiceResult<Self, EH, HandledE> extends Context.TagClass<Self
     readonly Live: Layer.Layer<Self>
 }
 
-export const Service = <
-    EH = ErrorHandler.DefaultErrorHandler,
-    HandledE = ErrorHandler.Error<Context.Tag.Service<ErrorHandler.DefaultErrorHandler>>,
->(
-    props?: ServiceProps<EH, HandledE>
-) => (
-    <Self>(): ServiceResult<Self, EH, HandledE> => {
+export const Service = <Self>() => (
+    <
+        EH = ErrorHandler.DefaultErrorHandler,
+        HandledE = ErrorHandler.Error<Context.Tag.Service<ErrorHandler.DefaultErrorHandler>>,
+    >(
+        props?: ServiceProps<EH, HandledE>
+    ): ServiceResult<Self, EH, HandledE> => {
         const TagClass = Context.Tag(id)() as ServiceResult<Self, EH, HandledE>
         (TagClass as Mutable<typeof TagClass>).Live = Layer.succeed(TagClass, {
             ErrorHandler: (props?.ErrorHandler ?? ErrorHandler.DefaultErrorHandler) as Context.Tag<EH, ErrorHandler.ErrorHandler<HandledE>>