From 21d011dd12d57ea780440838d420dff09c8cf559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Fri, 30 May 2025 01:11:10 +0200
Subject: [PATCH] QueryErrorHandler refactoring

---
 .../extension-query/src/QueryErrorHandler.ts  | 68 +++++++------------
 1 file changed, 23 insertions(+), 45 deletions(-)

diff --git a/packages/extension-query/src/QueryErrorHandler.ts b/packages/extension-query/src/QueryErrorHandler.ts
index ebfa750..1c0e04b 100644
--- a/packages/extension-query/src/QueryErrorHandler.ts
+++ b/packages/extension-query/src/QueryErrorHandler.ts
@@ -1,5 +1,4 @@
-import { Cause, Context, Effect, identity, Layer, PubSub, Stream } from "effect"
-import type { Mutable } from "effect/Types"
+import { Cause, Effect, identity, PubSub, Stream } from "effect"
 
 
 export interface QueryErrorHandler<FallbackA, HandledE> {
@@ -11,55 +10,34 @@ export type Fallback<T> = T extends QueryErrorHandler<infer A, any> ? A : never
 export type Error<T> = T extends QueryErrorHandler<any, infer E> ? E : never
 
 
-export interface ServiceResult<
-    Self,
-    Id extends string,
-    FallbackA,
-    HandledE,
-> extends Context.TagClass<
-    Self,
-    Id,
-    QueryErrorHandler<FallbackA, HandledE>
-> {
-    readonly Default: Layer.Layer<Self>
-}
-
-export const Service = <Self, HandledE = never>() => (
-    <const Id extends string, FallbackA>(
-        id: Id,
+export const make = <HandledE = never>() => (
+    <FallbackA>(
         f: (
             self: Effect.Effect<never, HandledE>,
             failure: (failure: HandledE) => Effect.Effect<never>,
             defect: (defect: unknown) => Effect.Effect<never>,
-        ) => Effect.Effect<FallbackA>,
-    ): ServiceResult<Self, Id, FallbackA, HandledE> => {
-        const TagClass = Context.Tag(id)() as ServiceResult<Self, Id, FallbackA, HandledE>
+        ) => Effect.Effect<FallbackA>
+    ): Effect.Effect<QueryErrorHandler<FallbackA, HandledE>> => Effect.gen(function*() {
+        const pubsub = yield* PubSub.unbounded<Cause.Cause<HandledE>>()
+        const errors = Stream.fromPubSub(pubsub)
 
-        (TagClass as Mutable<typeof TagClass>).Default = Layer.effect(TagClass, Effect.gen(function*() {
-            const pubsub = yield* PubSub.unbounded<Cause.Cause<HandledE>>()
-            const errors = Stream.fromPubSub(pubsub)
+        const handle = <A, E, R>(
+            self: Effect.Effect<A, E, R>
+        ): Effect.Effect<A | FallbackA, Exclude<E, HandledE>, R> => f(
+            self as unknown as Effect.Effect<never, HandledE, never>,
+            (failure: HandledE) => PubSub.publish(pubsub, Cause.fail(failure)).pipe(
+                Effect.andThen(Effect.failCause(Cause.empty))
+            ),
+            (defect: unknown) => PubSub.publish(pubsub, Cause.die(defect)).pipe(
+                Effect.andThen(Effect.failCause(Cause.empty))
+            ),
+        )
 
-            const handle = <A, E, R>(
-                self: Effect.Effect<A, E, R>
-            ): Effect.Effect<A | FallbackA, Exclude<E, HandledE>, R> => f(
-                self as unknown as Effect.Effect<never, HandledE, never>,
-                (failure: HandledE) => PubSub.publish(pubsub, Cause.fail(failure)).pipe(
-                    Effect.andThen(Effect.failCause(Cause.empty))
-                ),
-                (defect: unknown) => PubSub.publish(pubsub, Cause.die(defect)).pipe(
-                    Effect.andThen(Effect.failCause(Cause.empty))
-                ),
-            )
-
-            return { errors, handle }
-        }))
-
-        return TagClass
-    }
+        return { errors, handle }
+    })
 )
 
 
-export class DefaultQueryErrorHandler extends Service<DefaultQueryErrorHandler>()(
-    "@reffuse/extension-query/DefaultQueryErrorHandler",
-    identity,
-) {}
+export class DefaultQueryErrorHandler extends Effect.Service<DefaultQueryErrorHandler>()("@reffuse/extension-query/DefaultQueryErrorHandler", {
+    effect: make<never>()(identity)
+}) {}