Query refactoring

packages/extension-query/src/QueryClient.ts

@@ -1,47 +1,56 @@
 import { Context, Effect, Layer } from "effect"
 import type { Mutable } from "effect/Types"
-import * as ErrorHandler from "./ErrorHandler.js"
+import * as QueryErrorHandler from "./QueryErrorHandler.js"
 
 
-export interface QueryClient<HandledE> {
-    readonly errorHandler: ErrorHandler.ErrorHandler<HandledE>
+export interface QueryClient<FallbackA, HandledE> {
+    readonly errorHandler: QueryErrorHandler.QueryErrorHandler<FallbackA, HandledE>
 }
 
 
 const id = "@reffuse/extension-query/QueryClient"
 
-export type TagClassShape<HandledE> = Context.TagClassShape<typeof id, QueryClient<HandledE>>
-export type GenericTagClass<HandledE> = Context.TagClass<TagClassShape<HandledE>, typeof id, QueryClient<HandledE>>
-export const makeGenericTagClass = <HandledE = never>(): GenericTagClass<HandledE> => Context.Tag(id)()
+export type TagClassShape<FallbackA, HandledE> = Context.TagClassShape<typeof id, QueryClient<FallbackA, HandledE>>
+export type GenericTagClass<FallbackA, HandledE> = Context.TagClass<
+    TagClassShape<FallbackA, HandledE>,
+    typeof id,
+    QueryClient<FallbackA, HandledE>
+>
+export const makeGenericTagClass = <FallbackA = never, HandledE = never>(): GenericTagClass<FallbackA, HandledE> => Context.Tag(id)()
 
 
-export interface ServiceProps<EH, HandledE> {
-    readonly ErrorHandler?: Context.Tag<EH, ErrorHandler.ErrorHandler<HandledE>>
+export interface ServiceProps<EH, FallbackA, HandledE> {
+    readonly ErrorHandler?: Context.Tag<EH, QueryErrorHandler.QueryErrorHandler<FallbackA, HandledE>>
 }
 
-export interface ServiceResult<Self, EH, HandledE> extends Context.TagClass<Self, typeof id, QueryClient<HandledE>> {
+export interface ServiceResult<Self, EH, FallbackA, HandledE> extends Context.TagClass<
+    Self,
+    typeof id,
+    QueryClient<FallbackA, HandledE>
+> {
     readonly Live: Layer.Layer<
         Self,
         never,
-        EH extends ErrorHandler.DefaultErrorHandler ? never : EH
+        EH extends QueryErrorHandler.DefaultQueryErrorHandler ? never : EH
     >
 }
 
 export const Service = <Self>() => (
     <
-        EH = ErrorHandler.DefaultErrorHandler,
-        HandledE = ErrorHandler.Error<Context.Tag.Service<ErrorHandler.DefaultErrorHandler>>,
+        EH = QueryErrorHandler.DefaultQueryErrorHandler,
+        FallbackA = QueryErrorHandler.Fallback<Context.Tag.Service<QueryErrorHandler.DefaultQueryErrorHandler>>,
+        HandledE = QueryErrorHandler.Error<Context.Tag.Service<QueryErrorHandler.DefaultQueryErrorHandler>>,
     >(
-        props?: ServiceProps<EH, HandledE>
-    ): ServiceResult<Self, EH, HandledE> => {
-        const TagClass = Context.Tag(id)() as ServiceResult<Self, EH, HandledE>
+        props?: ServiceProps<EH, FallbackA, HandledE>
+    ): ServiceResult<Self, EH, FallbackA, HandledE> => {
+        const TagClass = Context.Tag(id)() as ServiceResult<Self, EH, FallbackA, HandledE>
 
         (TagClass as Mutable<typeof TagClass>).Live = Layer.effect(TagClass, Effect.Do.pipe(
             Effect.bind("errorHandler", () =>
-                (props?.ErrorHandler ?? ErrorHandler.DefaultErrorHandler) as Effect.Effect<
-                    ErrorHandler.ErrorHandler<HandledE>,
+                (props?.ErrorHandler ?? QueryErrorHandler.DefaultQueryErrorHandler) as Effect.Effect<
+                    QueryErrorHandler.QueryErrorHandler<FallbackA, HandledE>,
                     never,
-                    EH extends ErrorHandler.DefaultErrorHandler ? never : EH
+                    EH extends QueryErrorHandler.DefaultQueryErrorHandler ? never : EH
                 >
             )
         ))