packages/extension-query/src/ErrorHandler.ts

@@ -0,0 +1,26 @@
+import { type Cause, type Context, Effect, Layer, Queue, Stream } from "effect"
+
+
+export interface ErrorHandler<E> {
+    readonly errors: Stream.Stream<Cause.Cause<E>>
+    handle<A, SelfE, R>(self: Effect.Effect<A, SelfE | E, R>): Effect.Effect<A, SelfE, R>
+}
+
+export const Tag = <const Id extends string>(id: Id) => <
+    Self, E = never,
+>() => Effect.Tag(id)<Self, ErrorHandler<E>>()
+
+export const layer = <Self, Id extends string, E>(
+    tag: Context.TagClass<Self, Id, ErrorHandler<E>>
+): Layer.Layer<Self> => Layer.effect(tag, Effect.gen(function*() {
+    const queue = yield* Queue.unbounded<Cause.Cause<E>>()
+    const errors = Stream.fromQueue(queue)
+
+    const handle = <A, SelfE, R>(
+        self: Effect.Effect<A, SelfE | E, R>
+    ) => Effect.tapErrorCause(self, cause =>
+        Queue.offer(queue, cause as Cause.Cause<E>)
+    ) as Effect.Effect<A, SelfE, R>
+
+    return { errors, handle }
+}))

packages/extension-query/src/FailureHandler.ts

@@ -1,20 +0,0 @@
-import { type Context, Effect, Layer, Queue, Stream } from "effect"
-
-
-export interface FailureHandler<E> {
-    readonly failures: Stream.Stream<E>
-    readonly queue: Queue.Queue<E>
-}
-
-export const Tag = <const Id extends string>(id: Id) => <
-    Self, E = never,
->() => Effect.Tag(id)<Self, FailureHandler<E>>()
-
-export const layer = <Self, Id extends string, E>(
-    tag: Context.TagClass<Self, Id, FailureHandler<E>>
-): Layer.Layer<Self> => Layer.effect(tag, Queue.unbounded<E>().pipe(
-    Effect.map(queue => ({
-        failures: Stream.fromQueue(queue),
-        queue,
-    }))
-))

packages/extension-query/src/QueryClient.ts

@@ -1,20 +1,19 @@
 import { Context, Effect, Layer } from "effect"
+import * as ErrorHandler from "./ErrorHandler.js"
 
 
-interface MyService<T> {
-    readonly value: T
+export interface QueryClient<EH, HandledE> {
+    readonly ErrorHandler: Context.Tag<EH, ErrorHandler.ErrorHandler<HandledE>>
 }
 
-const MyServiceAnyTag = Context.GenericTag<MyService<any>>("MyService")
-const MyServiceStringTag = Context.GenericTag<MyService<string>>("MyService")
 
-declare const MyServiceAnyLayer: Layer.Layer<Context.Tag.Service<typeof MyServiceAnyTag>>
-declare const MyServiceStringLayer: Layer.Layer<Context.Tag.Service<typeof MyServiceStringTag>>
+export interface LayerProps<EH, HandledE> {
+    readonly ErrorHandler?: Context.Tag<EH, ErrorHandler.ErrorHandler<HandledE>>
+}
 
-
-const prg = Effect.gen(function*() {
-    yield* MyServiceAnyTag
-    yield* MyServiceStringTag
-}).pipe(
-    Effect.provide(MyServiceStringLayer)
-)
+export const layer = <EH = never, HandledE = never>(
+    props: LayerProps<EH, HandledE>
+): Layer.Layer<QueryClient<EH, HandledE>> =>
+    Layer.effect(Context.GenericTag<QueryClient<EH, HandledE>>("@reffuse/extension-query/QueryClient"), Effect.succeed({
+        ErrorHandler: props.ErrorHandler
+    }))