@effect-app/vue 2.68.0 → 2.69.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/vue
 
+## 2.69.1
+
+### Patch Changes
+
+- 08ecb10: expose "Command"
+
+## 2.69.0
+
+### Minor Changes
+
+- b104088: add new helpers and move old to legacy
+
 ## 2.68.0
 
 ### Minor Changes

package/dist/experimental/commander.d.ts

@@ -169,9 +169,9 @@ export declare namespace Commander {
 type ErrorRenderer<E, Args extends readonly any[]> = (e: E, action: string, ...args: Args) => string | undefined;
 export declare const CommanderStatic: {
     /** Version of @see confirmOrInterrupt that automatically includes the action name in the default messages */
-    confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, Confirm | I18n | CommandContext>;
+    confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, I18n | Confirm | CommandContext>;
     /** Version of @see confirm that automatically includes the action name in the default messages */
-    confirm: (message?: string | undefined) => Effect.Effect<boolean, never, Confirm | I18n | CommandContext>;
+    confirm: (message?: string | undefined) => Effect.Effect<boolean, never, I18n | Confirm | CommandContext>;
     updateAction: <Args extends Array<unknown>>(update: (currentActionId: string, ...args: Args) => string) => <A, E, R>(_: Effect.Effect<A, E, R>, ...input: Args) => Effect.Effect<A, E, CommandContext | R>;
     defaultFailureMessageHandler: <E, Args extends Array<unknown>, AME, AMR>(actionMaker: string | ((o: Option.Option<E>, ...args: Args) => string) | ((o: Option.Option<E>, ...args: Args) => Effect.Effect<string, AME, AMR>), errorRenderer?: ErrorRenderer<E, Args>) => (o: Option.Option<E>, ...args: Args) => Effect.Effect<string | {
         level: "warn";
@@ -183,7 +183,7 @@ export declare const CommanderStatic: {
         errorRenderer?: ErrorRenderer<E, Args>;
         onWaiting?: null | undefined | string | ((action: string, ...args: Args) => string | null | undefined);
         onSuccess?: null | undefined | string | ((a: A, action: string, ...args: Args) => string | null | undefined);
-    }) => (self: Effect.Effect<A, E, R>, ...args: Args) => Effect.Effect<A, E, I18n | CommandContext | R | WithToast>;
+    }) => (self: Effect.Effect<A, E, R>, ...args: Args) => Effect.Effect<A, E, I18n | WithToast | CommandContext | R>;
 };
 declare const Commander_base: Effect.Service.Class<Commander, "Commander", {
     readonly dependencies: readonly [import("effect/Layer").Layer<WithToast, never, import("./toast.js").Toast>, import("effect/Layer").Layer<Confirm, never, I18n>];

package/dist/experimental/makeUseCommand.d.ts

@@ -1,8 +1,8 @@
 import { Effect } from "effect-app";
 import { Commander } from "./commander.js";
 export declare const makeUseCommand: <R = never>() => Effect.Effect<{
-    confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("./confirm.js").Confirm | import("./intl.js").I18n | import("./commander.js").CommandContext>;
-    confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("./confirm.js").Confirm | import("./intl.js").I18n | import("./commander.js").CommandContext>;
+    confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("./intl.js").I18n | import("./confirm.js").Confirm | import("./commander.js").CommandContext>;
+    confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("./intl.js").I18n | import("./confirm.js").Confirm | import("./commander.js").CommandContext>;
     updateAction: <Args extends Array<unknown>>(update: (currentActionId: string, ...args: Args) => string) => <A, E, R_1>(_: Effect.Effect<A, E, R_1>, ...input: Args) => Effect.Effect<A, E, import("./commander.js").CommandContext | R_1>;
     defaultFailureMessageHandler: <E_1, Args extends Array<unknown>, AME, AMR>(actionMaker: string | ((o: import("effect/Option").Option<E_1>, ...args: Args) => string) | ((o: import("effect/Option").Option<E_1>, ...args: Args) => Effect.Effect<string, AME, AMR>), errorRenderer?: (e: E_1, action: string, ...args: Args) => string | undefined) => (o: import("effect/Option").Option<E_1>, ...args: Args) => Effect.Effect<string | {
         level: "warn";
@@ -13,7 +13,7 @@ export declare const makeUseCommand: <R = never>() => Effect.Effect<{
         errorRenderer?: (e: E_1, action: string, ...args: Args_2) => string | undefined;
         onWaiting?: null | undefined | string | ((action: string, ...args: Args_2) => string | null | undefined);
         onSuccess?: null | undefined | string | ((a: A, action: string, ...args: Args_2) => string | null | undefined);
-    }) => (self: Effect.Effect<A, E_1, R_2>, ...args: Args_2) => Effect.Effect<A, E_1, import("./intl.js").I18n | import("./commander.js").CommandContext | R_2 | import("./withToast.js").WithToast>;
+    }) => (self: Effect.Effect<A, E_1, R_2>, ...args: Args_2) => Effect.Effect<A, E_1, import("./intl.js").I18n | import("./withToast.js").WithToast | import("./commander.js").CommandContext | R_2>;
     alt: <const Id extends string>(id: Id) => Commander.CommandContextLocal<Id> & (<Args_3 extends Array<unknown>, A, E_2, R_3 extends import("./commander.js").CommandContext | R>(handler: (...args: Args_3) => Effect.Effect<A, E_2, R_3>) => Commander.CommandOut<Args_3, A, E_2, R_3, Id>);
     fn: <const Id extends string>(id: Id) => Commander.Gen<R, Id> & Commander.NonGen<R, Id>;
     wrap: <const Id extends string, Args_3 extends Array<unknown>, A_1, E_3, R_4>(mutation: (((...args: Args_3) => Effect.Effect<A_1, E_3, R_4>) & {

package/dist/makeClient.d.ts

@@ -1,16 +1,18 @@
 import * as Result from "@effect-atom/atom/Result";
-import { type InitialDataFunction, type QueryObserverResult, type RefetchOptions, type UseQueryReturnType } from "@tanstack/vue-query";
+import { type InitialDataFunction, type InvalidateOptions, type InvalidateQueryFilters, type QueryObserverResult, type RefetchOptions, type UseQueryReturnType } from "@tanstack/vue-query";
 import { Cause, Effect, Exit, Layer, ManagedRuntime, Option, Runtime, S } from "effect-app";
-import type { RequestHandler, RequestHandlerWithInput, TaggedRequestClassAny } from "effect-app/client/clientFor";
+import type { RequestHandler, RequestHandlers, RequestHandlerWithInput, Requests, TaggedRequestClassAny } from "effect-app/client/clientFor";
 import { ErrorSilenced, type SupportedErrors } from "effect-app/client/errors";
 import { type OperationFailure } from "effect-app/Operations";
 import type { Schema } from "effect-app/Schema";
+import { type RuntimeFiber } from "effect/Fiber";
 import { type ComputedRef, type Ref, type WatchSource } from "vue";
 import { Commander } from "./experimental/commander.js";
 import { I18n } from "./experimental/intl.js";
 import { Toast } from "./experimental/toast.js";
 import { type MutationOptions, type MutationOptionsBase, type Res } from "./mutate.js";
 import { type CustomDefinedInitialQueryOptions, type CustomUndefinedInitialQueryOptions, type KnownFiberFailure } from "./query.js";
+import { type ApiClientFactory } from "effect-app/client";
 /**
  * Use this after handling an error yourself, still continueing on the Error track, but the error will not be reported.
  */
@@ -138,117 +140,349 @@ declare const LegacyMutation_base: Effect.Service.Class<LegacyMutation, "LegacyM
 export declare class LegacyMutation extends LegacyMutation_base {
 }
 type Base = I18n | Toast;
-export declare const makeClient: <RT, RE, RL>(getBaseMrt: () => ManagedRuntime.ManagedRuntime<RT, never>, rootLayer: Layer.Layer<RL | Base, RE>) => {
-    useSafeMutationWithState: {
-        <I, E, A, R, Request extends TaggedRequestClassAny, Name extends string, A2 = A, E2 = E, R2 = R>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, options?: MutationOptions<A, E, R, A2, E2, R2, I> | undefined): readonly [ComputedRef<Res<A, E>>, (i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>];
-        <E_1, A_1, R_1, Request_1 extends TaggedRequestClassAny, Name_1 extends string, A2_1 = A_1, E2_1 = E_1, R2_1 = R_1>(self: RequestHandler<A_1, E_1, R_1, Request_1, Name_1>, options?: MutationOptions<A_1, E_1, R_1, A2_1, E2_1, R2_1, void> | undefined): readonly [ComputedRef<Res<A_1, E_1>>, Effect.Effect<Exit.Exit<A2_1, E2_1>, never, R2_1>];
-    };
-    useAndHandleMutation: {
-        <I, E_1 extends ResponseErrors, A_2, R_2, Request_2 extends TaggedRequestClassAny, Name_2 extends string, A2_2 = A_2, E2_2 extends ResponseErrors = E_1, R2_2 = R_2, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A_2, E_1, R_2, Request_2, Name_2>, action: string, options?: Opts<A_2, E_1, R_2, I, A2_2, E2_2, R2_2, ESuccess, RSuccess, EError, RError, EDefect, RDefect> | undefined): Resp<I, A2_2, E2_2, R2_2, ComputedRef<Res<A2_2, E2_2>>>;
-        <E_2 extends ResponseErrors, A_3, R_3, Request_3 extends TaggedRequestClassAny, Name_3 extends string, A2_3 = A_3, E2_3 extends ResponseErrors = E_2, R2_3 = R_3, ESuccess_1 = never, RSuccess_1 = never, EError_1 = never, RError_1 = never, EDefect_1 = never, RDefect_1 = never>(self: RequestHandler<A_3, E_2, R_3, Request_3, Name_3>, action: string, options?: Opts<A_3, E_2, R_3, void, A2_3, E2_3, R2_3, ESuccess_1, RSuccess_1, EError_1, RError_1, EDefect_1, RDefect_1> | undefined): ActResp<A2_3, E2_3, R2_3, ComputedRef<Res<A2_3, E2_3>>>;
-    };
-    useAndHandleMutationResult: {
-        <I, E_2 extends ResponseErrors, A_4, R_4, Request_4 extends TaggedRequestClassAny, Name_4 extends string, A2_4 = A_4, E2_4 extends ResponseErrors = E_2, R2_4 = R_4, ESuccess_2 = never, RSuccess_2 = never, EError_2 = never, RError_2 = never, EDefect_2 = never, RDefect_2 = never>(self: RequestHandlerWithInput<I, A_4, E_2, R_4, Request_4, Name_4>, action: string, options?: Opts<A_4, E_2, R_4, I, A2_4, E2_4, R2_4, ESuccess_2, RSuccess_2, EError_2, RError_2, EDefect_2, RDefect_2> | undefined): Resp<I, A2_4, E2_4, R2_4, ComputedRef<Result.Result<A2_4, E2_4>>>;
-        <E_3 extends ResponseErrors, A_5, R_5, Request_5 extends TaggedRequestClassAny, Name_5 extends string, A2_5 = A_5, E2_5 extends ResponseErrors = E_3, R2_5 = R_5, ESuccess_3 = never, RSuccess_3 = never, EError_3 = never, RError_3 = never, EDefect_3 = never, RDefect_3 = never>(self: RequestHandler<A_5, E_3, R_5, Request_5, Name_5>, action: string, options?: Opts<A_5, E_3, R_5, void, A2_5, E2_5, R2_5, ESuccess_3, RSuccess_3, EError_3, RError_3, EDefect_3, RDefect_3> | undefined): ActResp<A2_5, E2_5, R2_5, ComputedRef<Result.Result<A2_5, E2_5>>>;
-    };
-    useAndHandleMutationSilently: {
-        <I, E_3 extends ResponseErrors, A_6, R_6, Request_6 extends TaggedRequestClassAny, Name_6 extends string, A2_6 = A_6, E2_6 extends ResponseErrors = E_3, R2_6 = R_6, ESuccess_4 = never, RSuccess_4 = never, EError_4 = never, RError_4 = never, EDefect_4 = never, RDefect_4 = never>(self: RequestHandlerWithInput<I, A_6, E_3, R_6, Request_6, Name_6>, action: string, options?: Opts<A_6, E_3, R_6, I, A2_6, E2_6, R2_6, ESuccess_4, RSuccess_4, EError_4, RError_4, EDefect_4, RDefect_4> | undefined): Resp<I, A2_6, E2_6, R_6, ComputedRef<Res<A2_6, E2_6>>>;
-        <E_4 extends ResponseErrors, A_7, R_7, Request_7 extends TaggedRequestClassAny, Name_7 extends string, A2_7 = A_7, E2_7 extends ResponseErrors = E_4, R2_7 = R_7, ESuccess_5 = never, RSuccess_5 = never, EError_5 = never, RError_5 = never, EDefect_5 = never, RDefect_5 = never>(self: RequestHandler<A_7, E_4, R_7, Request_7, Name_7>, action: string, options?: Opts<A_7, E_4, R_7, void, A2_7, E2_7, R2_7, ESuccess_5, RSuccess_5, EError_5, RError_5, EDefect_5, RDefect_5> | undefined): ActResp<void, never, R_7, ComputedRef<Res<void, never>>>;
-    };
-    useAndHandleMutationCustom: {
-        <I, E_4 extends ResponseErrors, A_8, R_8, Request_8 extends TaggedRequestClassAny, Name_8 extends string, A2_8 = A_8, E2_8 extends ResponseErrors = E_4, R2_8 = R_8, ESuccess_6 = never, RSuccess_6 = never, EError_6 = never, RError_6 = never, EDefect_6 = never, RDefect_6 = never>(self: RequestHandlerWithInput<I, A_8, E_4, R_8, Request_8, Name_8>, action: string, options?: LowOptsOptional<A_8, E_4, R_8, I, A2_8, E2_8, R2_8, ESuccess_6, RSuccess_6, EError_6, RError_6, EDefect_6, RDefect_6> | undefined): Resp<I, A2_8, E2_8, R2_8, ComputedRef<Res<A2_8, E2_8>>>;
-        <E_5 extends ResponseErrors, A_9, R_9, Request_9 extends TaggedRequestClassAny, Name_9 extends string, A2_9 = A_9, E2_9 extends ResponseErrors = E_5, R2_9 = R_9, ESuccess_7 = never, RSuccess_7 = never, EError_7 = never, RError_7 = never, EDefect_7 = never, RDefect_7 = never>(self: RequestHandler<A_9, E_5, R_9, Request_9, Name_9>, action: string, options?: LowOptsOptional<A_9, E_5, R_9, void, A2_9, E2_9, R2_9, ESuccess_7, RSuccess_7, EError_7, RError_7, EDefect_7, RDefect_7> | undefined): ActResp<A2_9, E2_9, R2_9, ComputedRef<Res<A2_9, E2_9>>>;
-    };
-    makeUseAndHandleMutation: (defaultOptions?: Opts<any, any, any, any, any, any, any, any, any>) => {
-        <I, E_5 extends ResponseErrors, A_10, R_10, Request_10 extends TaggedRequestClassAny, Name_10 extends string, A2_10 = A_10, E2_10 extends ResponseErrors = E_5, R2_10 = R_10, ESuccess_8 = never, RSuccess_8 = never, EError_8 = never, RError_8 = never, EDefect_8 = never, RDefect_8 = never>(self: RequestHandlerWithInput<I, A_10, E_5, R_10, Request_10, Name_10>, action: string, options?: Opts<A_10, E_5, R_10, I, A2_10, E2_10, R2_10, ESuccess_8, RSuccess_8, EError_8, RError_8, EDefect_8, RDefect_8> | undefined): Resp<I, A2_10, E2_10, R2_10, ComputedRef<Res<A2_10, E2_10>>>;
-        <E_6 extends ResponseErrors, A_11, Request_11 extends TaggedRequestClassAny, Name_11 extends string, A2_11 = A_11, E2_11 extends ResponseErrors = E_6, R2_11 = LegacyMutation | Base | RL, ESuccess_9 = never, RSuccess_9 = never, EError_9 = never, RError_9 = never, EDefect_9 = never, RDefect_9 = never>(self: RequestHandler<A_11, E_6, LegacyMutation | Base | RL, Request_11, Name_11>, action: string, options?: Opts<A_11, E_6, LegacyMutation | Base | RL, void, A2_11, E2_11, R2_11, ESuccess_9, RSuccess_9, EError_9, RError_9, EDefect_9, RDefect_9> | undefined): ActResp<A2_11, E2_11, R2_11, ComputedRef<Res<A2_11, E2_11>>>;
-    };
-    useHandleRequestWithToast: () => <A_12, E_6 extends ResponseErrors, R_11, I = void, A2_12 = A_12, E2_12 extends ResponseErrors = E_6, R2_12 = R_11, ESuccess_10 = never, RSuccess_10 = never, EError_10 = never, RError_10 = never, EDefect_10 = never, RDefect_10 = never>(f: Effect.Effect<Exit.Exit<A2_12, E2_12>, never, R2_12> | ((i: I) => Effect.Effect<Exit.Exit<A2_12, E2_12>, never, R2_12>), id: string, action: string, options?: Opts<A_12, E_6, R_11, I, A2_12, E2_12, R2_12, ESuccess_10, RSuccess_10, EError_10, RError_10, EDefect_10, RDefect_10>) => (Effect.Effect<Exit.Exit<A2_12, E2_12>, ESuccess_10 | EError_10 | EDefect_10, Exclude<R2_12, import("effect/Tracer").ParentSpan> | Exclude<RSuccess_10, import("effect/Tracer").ParentSpan> | Exclude<RError_10, import("effect/Tracer").ParentSpan> | Exclude<RDefect_10, import("effect/Tracer").ParentSpan>> | ((i: any) => Effect.Effect<Exit.Exit<A2_12, E2_12>, ESuccess_10 | EError_10 | EDefect_10, Exclude<R2_12, import("effect/Tracer").ParentSpan> | Exclude<RSuccess_10, import("effect/Tracer").ParentSpan> | Exclude<RError_10, import("effect/Tracer").ParentSpan> | Exclude<RDefect_10, import("effect/Tracer").ParentSpan>>)) & {
-        action: string;
-    };
-    buildFormFromSchema: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, C extends Record<PropertyKey, any>, OnSubmitA>(s: S.Schema<To, From, LegacyMutation | Base | RL> & {
-        new (c: C): any;
-        extend: any;
-        fields: S.Struct.Fields;
-    }, state: Ref<Omit<From, "_tag">, Omit<From, "_tag">>, onSubmit: (a: To) => Effect.Effect<OnSubmitA, never, LegacyMutation | Base | RL>) => {
-        fields: { [K in keyof To]-?: {
-            true: {
-                true: To[K] extends {
-                    _tag: string;
-                } ? import("./form.js").DiscriminatedUnionFieldInfo<{ [P in import("./form.js").DistributiveNestedFieldInfoKey<To[K]> as P["_infoTag" & keyof P] & string]: P; }> : import("./form.js").UnionFieldInfo<import("./form.js").DistributiveNestedFieldInfoKey<To[K]>[]>;
-                false: import("./form.js").NestedFieldInfoKey<To[K]>;
-            }[`${To[K] extends object ? true : false}`];
-            false: import("./form.js").NestedFieldInfoKey<To[K]>;
-        }[`${import("effect-app/utils").IsUnion<To[K]>}`]; };
-        /** optimized for Vuetify v-form submit callback */
-        submit: <T extends Promise<{
-            valid: boolean;
-        }>>(e: T) => Promise<OnSubmitA | undefined>;
-        /** optimized for Native form submit callback or general use */
-        submitFromState: Effect.Effect<OnSubmitA, S.ParseResult.ParseError, LegacyMutation | Base | RL>;
-        submitFromStatePromise: () => Promise<OnSubmitA>;
-        isDirty: Ref<boolean, boolean>;
-        isValid: Ref<boolean, boolean>;
-        isLoading: Ref<boolean, boolean>;
-    };
-    useSafeMutation: {
-        <I_1, E_7, A_12, R_12, Request_12 extends TaggedRequestClassAny, Name_12 extends string, A2_13 = A_12, E2_13 = E_7, R2_13 = R_12>(self: RequestHandlerWithInput<I_1, A_12, E_7, R_12, Request_12, Name_12>, options?: MutationOptions<A_12, E_7, R_12, A2_13, E2_13, R2_13, I_1> | undefined): readonly [ComputedRef<Result.Result<A2_13, E2_13>>, (i: I_1) => Effect.Effect<Exit.Exit<A2_13, E2_13>, never, R2_13>];
-        <E_8, A_13, R_13, Request_13 extends TaggedRequestClassAny, Name_13 extends string, A2_14 = A_13, E2_14 = E_8, R2_14 = R_13>(self: RequestHandler<A_13, E_8, R_13, Request_13, Name_13>, options?: MutationOptions<A_13, E_8, R_13, A2_14, E2_14, R2_14, void> | undefined): readonly [ComputedRef<Result.Result<A2_14, E2_14>>, Effect.Effect<Exit.Exit<A2_14, E2_14>, never, R2_14>];
-    };
-    useQuery: {
-        <E_8, A_14, Request_14 extends TaggedRequestClassAny, Name_14 extends string>(self: RequestHandler<A_14, E_8, RT, Request_14, Name_14>): {
-            <TData = A_14>(options: CustomDefinedInitialQueryOptions<A_14, KnownFiberFailure<E_8>, TData, readonly unknown[]>): readonly [ComputedRef<Result.Result<TData, E_8>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_14, KnownFiberFailure<E_8>>, never, never>, UseQueryReturnType<any, any>];
-            <TData = A_14>(options?: CustomUndefinedInitialQueryOptions<A_14, KnownFiberFailure<E_8>, TData, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_14, E_8>>, ComputedRef<A_14 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_14, KnownFiberFailure<E_8>>, never, never>, UseQueryReturnType<any, any>];
-        };
-        <Arg, E_8, A_15, Request_15 extends TaggedRequestClassAny, Name_15 extends string>(self: RequestHandlerWithInput<Arg, A_15, E_8, RT, Request_15, Name_15>): {
-            <TData = A_15>(arg: Arg | WatchSource<Arg>, options: CustomDefinedInitialQueryOptions<A_15, KnownFiberFailure<E_8>, TData, readonly unknown[]>): readonly [ComputedRef<Result.Result<TData, E_8>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_15, KnownFiberFailure<E_8>>, never, never>, UseQueryReturnType<any, any>];
-            <TData = A_15>(arg: Arg | WatchSource<Arg>, options?: CustomUndefinedInitialQueryOptions<A_15, KnownFiberFailure<E_8>, TData, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_15, E_8>>, ComputedRef<A_15 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_15, KnownFiberFailure<E_8>>, never, never>, UseQueryReturnType<any, any>];
-        };
-    };
-    useSuspenseQuery: {
-        <E_9, A_16, Request_16 extends TaggedRequestClassAny, Name_16 extends string>(self: RequestHandler<A_16, E_9, RT, Request_16, Name_16>): {
-            <TData = A_16>(options?: CustomUndefinedInitialQueryOptions<A_16, E_9, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_9>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>]>;
-            <TData = A_16>(options?: (CustomDefinedInitialQueryOptions<A_16, E_9, TData, readonly unknown[]> & {
-                initialData: TData | InitialDataFunction<TData>;
-            }) | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_9>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>]>;
-        };
-        <Arg, E_9, A_17, Request_17 extends TaggedRequestClassAny, Name_17 extends string>(self: RequestHandlerWithInput<Arg, A_17, E_9, RT, Request_17, Name_17>): {
-            <TData = A_17>(arg: Arg | WatchSource<Arg>, options?: CustomDefinedInitialQueryOptions<A_17, E_9, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_9>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>]>;
-            <TData = A_17>(arg: Arg | WatchSource<Arg>, options?: CustomUndefinedInitialQueryOptions<A_17, E_9, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_9>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>]>;
-        };
+export declare const makeClient: <RT, RE, RL>(getBaseMrt: () => ManagedRuntime.ManagedRuntime<RT | ApiClientFactory, never>, rootLayer: Layer.Layer<RL | Base, RE>, clientFor_: ReturnType<(typeof ApiClientFactory)["makeFor"]>) => {
+    Command: {
+        confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, I18n | import("./experimental/confirm.js").Confirm | import("./experimental/commander.js").CommandContext>;
+        confirm: (message?: string | undefined) => Effect.Effect<boolean, never, I18n | import("./experimental/confirm.js").Confirm | import("./experimental/commander.js").CommandContext>;
+        updateAction: <Args extends Array<unknown>>(update: (currentActionId: string, ...args: Args) => string) => <A, E, R>(_: Effect.Effect<A, E, R>, ...input: Args) => Effect.Effect<A, E, import("./experimental/commander.js").CommandContext | R>;
+        defaultFailureMessageHandler: <E_1, Args extends Array<unknown>, AME, AMR>(actionMaker: string | ((o: Option.Option<E_1>, ...args: Args) => string) | ((o: Option.Option<E_1>, ...args: Args) => Effect.Effect<string, AME, AMR>), errorRenderer?: (e: E_1, action: string, ...args: Args) => string | undefined) => (o: Option.Option<E_1>, ...args: Args) => Effect.Effect<string | {
+            level: "warn";
+            message: string;
+        }, AME, I18n | AMR>;
+        renderError: Effect.Effect<(<E_1, Args_1 extends readonly any[]>(action: string, errorRenderer?: (e: E_1, action: string, ...args: Args_1) => string | undefined) => (e: E_1, ...args: Args_1) => string), never, I18n>;
+        withDefaultToast: <A, E_1, R_1, Args_2 extends Array<unknown>>(options?: {
+            errorRenderer?: (e: E_1, action: string, ...args: Args_2) => string | undefined;
+            onWaiting?: null | undefined | string | ((action: string, ...args: Args_2) => string | null | undefined);
+            onSuccess?: null | undefined | string | ((a: A, action: string, ...args: Args_2) => string | null | undefined);
+        }) => (self: Effect.Effect<A, E_1, R_1>, ...args: Args_2) => Effect.Effect<A, E_1, I18n | import("./experimental/withToast.js").WithToast | import("./experimental/commander.js").CommandContext | R_1>;
+        alt: <const Id extends string>(id: Id) => Commander.CommandContextLocal<Id> & (<Args_3 extends Array<unknown>, A, E_2, R_2 extends I18n | Toast | RL | import("./experimental/commander.js").CommandContext>(handler: (...args: Args_3) => Effect.Effect<A, E_2, R_2>) => Commander.CommandOut<Args_3, A, E_2, R_2, Id>);
+        fn: <const Id extends string>(id: Id) => Commander.Gen<I18n | Toast | RL, Id> & Commander.NonGen<I18n | Toast | RL, Id>;
+        wrap: <const Id extends string, Args_3 extends Array<unknown>, A_1, E_3, R_3>(mutation: (((...args: Args_3) => Effect.Effect<A_1, E_3, R_3>) & {
+            id: Id;
+        }) | {
+            mutate: (...args: Args_3) => Effect.Effect<A_1, E_3, R_3>;
+            id: Id;
+        }) => Commander.CommandContextLocal<Id> & Commander.GenWrap<I18n | Toast | RL, Id, Args_3, A_1, E_3, R_3> & Commander.NonGenWrap<I18n | Toast | RL, Id, Args_3, A_1, E_3, R_3>;
+        alt2: <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR>(id: Id | (((...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>) & {
+            id: Id;
+        }) | {
+            id: Id;
+            mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
+        }) => Commander.CommandContextLocal<Id> & (<Args_4 extends Array<unknown>, A_2, E_4, R_4 extends I18n | Toast | RL | import("./experimental/commander.js").CommandContext>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
+            mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
+        }) => (...args: Args_4) => Effect.Effect<A_2, E_4, R_4>) => Commander.CommandOut<Args_4, A_2, E_4, R_4, Id>);
+        _tag: "Commander";
     };
     useCommand: () => {
-        confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("./experimental/confirm.js").Confirm | I18n | import("./experimental/commander.js").CommandContext>;
-        confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("./experimental/confirm.js").Confirm | I18n | import("./experimental/commander.js").CommandContext>;
-        updateAction: <Args extends Array<unknown>>(update: (currentActionId: string, ...args: Args) => string) => <A_18, E_10, R_14>(_: Effect.Effect<A_18, E_10, R_14>, ...input: Args) => Effect.Effect<A_18, E_10, import("./experimental/commander.js").CommandContext | R_14>;
-        defaultFailureMessageHandler: <E_11, Args extends Array<unknown>, AME, AMR>(actionMaker: string | ((o: Option.Option<E_11>, ...args: Args) => string) | ((o: Option.Option<E_11>, ...args: Args) => Effect.Effect<string, AME, AMR>), errorRenderer?: (e: E_11, action: string, ...args: Args) => string | undefined) => (o: Option.Option<E_11>, ...args: Args) => Effect.Effect<string | {
+        confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, I18n | import("./experimental/confirm.js").Confirm | import("./experimental/commander.js").CommandContext>;
+        confirm: (message?: string | undefined) => Effect.Effect<boolean, never, I18n | import("./experimental/confirm.js").Confirm | import("./experimental/commander.js").CommandContext>;
+        updateAction: <Args_4 extends Array<unknown>>(update: (currentActionId: string, ...args: Args_4) => string) => <A_3, E, R>(_: Effect.Effect<A_3, E, R>, ...input: Args_4) => Effect.Effect<A_3, E, import("./experimental/commander.js").CommandContext | R>;
+        defaultFailureMessageHandler: <E_5, Args extends Array<unknown>, AME, AMR>(actionMaker: string | ((o: Option.Option<E_5>, ...args: Args) => string) | ((o: Option.Option<E_5>, ...args: Args) => Effect.Effect<string, AME, AMR>), errorRenderer?: (e: E_5, action: string, ...args: Args) => string | undefined) => (o: Option.Option<E_5>, ...args: Args) => Effect.Effect<string | {
             level: "warn";
             message: string;
         }, AME, I18n | AMR>;
-        renderError: Effect.Effect<(<E_11, Args_1 extends readonly any[]>(action: string, errorRenderer?: (e: E_11, action: string, ...args: Args_1) => string | undefined) => (e: E_11, ...args: Args_1) => string), never, I18n>;
-        withDefaultToast: <A_18, E_11, R_15, Args_2 extends Array<unknown>>(options?: {
-            errorRenderer?: (e: E_11, action: string, ...args: Args_2) => string | undefined;
+        renderError: Effect.Effect<(<E_5, Args_1 extends readonly any[]>(action: string, errorRenderer?: (e: E_5, action: string, ...args: Args_1) => string | undefined) => (e: E_5, ...args: Args_1) => string), never, I18n>;
+        withDefaultToast: <A_3, E_1, R_1, Args_2 extends Array<unknown>>(options?: {
+            errorRenderer?: (e: E_1, action: string, ...args: Args_2) => string | undefined;
             onWaiting?: null | undefined | string | ((action: string, ...args: Args_2) => string | null | undefined);
-            onSuccess?: null | undefined | string | ((a: A_18, action: string, ...args: Args_2) => string | null | undefined);
-        }) => (self: Effect.Effect<A_18, E_11, R_15>, ...args: Args_2) => Effect.Effect<A_18, E_11, I18n | import("./experimental/commander.js").CommandContext | R_15 | import("./experimental/withToast.js").WithToast>;
-        alt: <const Id extends string>(id: Id) => Commander.CommandContextLocal<Id> & (<Args_3 extends Array<unknown>, A_18, E_12, R_16 extends I18n | import("./experimental/commander.js").CommandContext | Toast | RL>(handler: (...args: Args_3) => Effect.Effect<A_18, E_12, R_16>) => Commander.CommandOut<Args_3, A_18, E_12, R_16, Id>);
+            onSuccess?: null | undefined | string | ((a: A_3, action: string, ...args: Args_2) => string | null | undefined);
+        }) => (self: Effect.Effect<A_3, E_1, R_1>, ...args: Args_2) => Effect.Effect<A_3, E_1, I18n | import("./experimental/withToast.js").WithToast | import("./experimental/commander.js").CommandContext | R_1>;
+        alt: <const Id extends string>(id: Id) => Commander.CommandContextLocal<Id> & (<Args_4 extends Array<unknown>, A, E_2, R_2 extends I18n | Toast | RL | import("./experimental/commander.js").CommandContext>(handler: (...args: Args_4) => Effect.Effect<A, E_2, R_2>) => Commander.CommandOut<Args_4, A, E_2, R_2, Id>);
         fn: <const Id extends string>(id: Id) => Commander.Gen<I18n | Toast | RL, Id> & Commander.NonGen<I18n | Toast | RL, Id>;
-        wrap: <const Id extends string, Args_3 extends Array<unknown>, A_19, E_13, R_17>(mutation: (((...args: Args_3) => Effect.Effect<A_19, E_13, R_17>) & {
+        wrap: <const Id extends string, Args_3 extends Array<unknown>, A_1, E_3, R_3>(mutation: (((...args: Args_3) => Effect.Effect<A_1, E_3, R_3>) & {
             id: Id;
         }) | {
-            mutate: (...args: Args_3) => Effect.Effect<A_19, E_13, R_17>;
+            mutate: (...args: Args_3) => Effect.Effect<A_1, E_3, R_3>;
             id: Id;
-        }) => Commander.CommandContextLocal<Id> & Commander.GenWrap<I18n | Toast | RL, Id, Args_3, A_19, E_13, R_17> & Commander.NonGenWrap<I18n | Toast | RL, Id, Args_3, A_19, E_13, R_17>;
+        }) => Commander.CommandContextLocal<Id> & Commander.GenWrap<I18n | Toast | RL, Id, Args_3, A_1, E_3, R_3> & Commander.NonGenWrap<I18n | Toast | RL, Id, Args_3, A_1, E_3, R_3>;
         alt2: <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR>(id: Id | (((...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>) & {
             id: Id;
         }) | {
             id: Id;
             mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
-        }) => Commander.CommandContextLocal<Id> & (<Args_4 extends Array<unknown>, A_20, E_14, R_18 extends I18n | import("./experimental/commander.js").CommandContext | Toast | RL>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
+        }) => Commander.CommandContextLocal<Id> & (<Args_4 extends Array<unknown>, A_2, E_4, R_4 extends I18n | Toast | RL | import("./experimental/commander.js").CommandContext>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
             mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
-        }) => (...args: Args_4) => Effect.Effect<A_20, E_14, R_18>) => Commander.CommandOut<Args_4, A_20, E_14, R_18, Id>);
+        }) => (...args: Args_4) => Effect.Effect<A_2, E_4, R_4>) => Commander.CommandOut<Args_4, A_2, E_4, R_4, Id>);
         _tag: "Commander";
     };
+    clientFor: <M extends Requests>(m: M, queryInvalidation?: QueryInvalidation<M>) => { [Key in keyof RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>]: (RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandlerWithInput<infer _I, infer _A, infer _E, infer _R, infer _Request extends Schema.Any & {
+        readonly _tag: string;
+        readonly success: any;
+        readonly failure: any;
+    }, infer Id extends string> ? Commander.CommandContextLocal<Id> : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandler<infer _A_1, infer _E_1, infer _R_1, infer _Request_1 extends Schema.Any & {
+        readonly _tag: string;
+        readonly success: any;
+        readonly failure: any;
+    }, infer Id_1 extends string> ? Commander.CommandContextLocal<Id_1> : never) & (RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandlerWithInput<infer _I_1, infer _A_2, infer _E_2, infer _R_2, infer _Request_2 extends Schema.Any & {
+        readonly _tag: string;
+        readonly success: any;
+        readonly failure: any;
+    }, infer Id_2 extends string> ? Commander.CommandContextLocal<Id_2> : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandler<infer _A_3, infer _E_3, infer _R_3, infer _Request_3 extends Schema.Any & {
+        readonly _tag: string;
+        readonly success: any;
+        readonly failure: any;
+    }, infer Id_3 extends string> ? Commander.CommandContextLocal<Id_3> : never) & (RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandlerWithInput<infer I, infer A_3, infer E_5, infer R_5, infer Request extends Schema.Any & {
+        readonly _tag: string;
+        readonly success: any;
+        readonly failure: any;
+    }, infer Id_4 extends string> ? ((i: I) => Effect.Effect<A_3, E_5, R_5>) & {
+        readonly id: Id_4;
+    } : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandler<infer A_4, infer E_6, infer R_6, infer Request_1 extends Schema.Any & {
+        readonly _tag: string;
+        readonly success: any;
+        readonly failure: any;
+    }, infer Id_5 extends string> ? Effect.Effect<A_4, E_6, R_6> & {
+        readonly id: Id_5;
+    } : never) & {
+        wrap: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandlerWithInput<infer I_1, infer A_5, infer E_7, infer _R_4, infer _Request_4 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_6 extends string> ? Commander.CommandContextLocal<Id_6> & Commander.GenWrap<I18n | Toast | RL, Id_6, [I_1], A_5, E_7, never> & Commander.NonGenWrap<I18n | Toast | RL, Id_6, [I_1], A_5, E_7, never> : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandler<infer A_6, infer E_8, infer _R_5, infer _Request_5 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_7 extends string> ? Commander.CommandContextLocal<Id_7> & Commander.GenWrap<I18n | Toast | RL, Id_7, [], A_6, E_8, never> & Commander.NonGenWrap<I18n | Toast | RL, Id_7, [], A_6, E_8, never> : never;
+        fn: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandlerWithInput<infer _I_2, infer _A_4, infer _E_4, infer _R_6, infer _Request_6 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_8 extends string> ? Commander.Gen<I18n | Toast | RL, Id_8> & Commander.NonGen<I18n | Toast | RL, Id_8> & Commander.CommandContextLocal<Id_8> : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandler<infer _A_5, infer _E_5, infer _R_7, infer _Request_7 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_9 extends string> ? Commander.Gen<I18n | Toast | RL, Id_9> & Commander.NonGen<I18n | Toast | RL, Id_9> & Commander.CommandContextLocal<Id_9> : never;
+    } & RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] & {
+        query: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandlerWithInput<infer I_2, infer A_7, infer E_9, infer _R_8, infer Request_2 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_10 extends string> ? {
+            <TData = A_7>(arg: I_2 | WatchSource<I_2>, options: CustomDefinedInitialQueryOptions<A_7, KnownFiberFailure<E_9>, TData, readonly unknown[]>): readonly [ComputedRef<Result.Result<TData, E_9>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_7, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>];
+            <TData = A_7>(arg: I_2 | WatchSource<I_2>, options?: CustomUndefinedInitialQueryOptions<A_7, KnownFiberFailure<E_9>, TData, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_7, E_9>>, ComputedRef<A_7 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_7, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>];
+        } : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandler<infer A_8, infer E_10, infer _R_9, infer Request_3 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_11 extends string> ? {
+            <TData = A_8>(options: CustomDefinedInitialQueryOptions<A_8, KnownFiberFailure<E_10>, TData, readonly unknown[]>): readonly [ComputedRef<Result.Result<TData, E_10>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_8, KnownFiberFailure<E_10>>, never, never>, UseQueryReturnType<any, any>];
+            <TData = A_8>(options?: CustomUndefinedInitialQueryOptions<A_8, KnownFiberFailure<E_10>, TData, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_8, E_10>>, ComputedRef<A_8 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_8, KnownFiberFailure<E_10>>, never, never>, UseQueryReturnType<any, any>];
+        } : never;
+        suspense: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandlerWithInput<infer I_3, infer A_9, infer E_11, infer _R_10, infer Request_4 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_12 extends string> ? {
+            <TData = A_9>(arg: I_3 | WatchSource<I_3>, options?: CustomDefinedInitialQueryOptions<A_9, E_11, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_11>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_11>>, never, never>, UseQueryReturnType<any, any>]>;
+            <TData = A_9>(arg: I_3 | WatchSource<I_3>, options?: CustomUndefinedInitialQueryOptions<A_9, E_11, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_11>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_11>>, never, never>, UseQueryReturnType<any, any>]>;
+        } : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key] extends RequestHandler<infer A_10, infer E_12, infer _R_11, infer Request_5 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_13 extends string> ? {
+            <TData = A_10>(options?: CustomUndefinedInitialQueryOptions<A_10, E_12, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_12>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_12>>, never, never>, UseQueryReturnType<any, any>]>;
+            <TData = A_10>(options?: (CustomDefinedInitialQueryOptions<A_10, E_12, TData, readonly unknown[]> & {
+                initialData: TData | InitialDataFunction<TData>;
+            }) | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_12>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_12>>, never, never>, UseQueryReturnType<any, any>]>;
+        } : never;
+    }; } & {
+        helpers: { [Key_1 in keyof RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]> as `${ToCamel<string & Key_1>}Mutation`]: (RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandlerWithInput<infer I, infer A_3, infer E_5, infer R_5, infer Request extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id extends string> ? ((i: I) => Effect.Effect<A_3, E_5, R_5>) & {
+            readonly id: Id;
+        } & (RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandlerWithInput<infer _I, infer _A, infer _E, infer _R, infer _Request extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_1 extends string> ? Commander.CommandContextLocal<Id_1> : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandler<infer _A_1, infer _E_1, infer _R_1, infer _Request_1 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_2 extends string> ? Commander.CommandContextLocal<Id_2> : never) : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandler<infer A_4, infer E_6, infer R_6, infer Request_1 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_3 extends string> ? Effect.Effect<A_4, E_6, R_6> & {
+            readonly id: Id_3;
+        } & (RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandlerWithInput<infer _I_1, infer _A_2, infer _E_2, infer _R_2, infer _Request_2 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_4 extends string> ? Commander.CommandContextLocal<Id_4> : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandler<infer _A_3, infer _E_3, infer _R_3, infer _Request_3 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_5 extends string> ? Commander.CommandContextLocal<Id_5> : never) : never) & (RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandlerWithInput<infer _I_2, infer _A_4, infer _E_4, infer _R_4, infer _Request_4 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_6 extends string> ? Commander.CommandContextLocal<Id_6> : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandler<infer _A_5, infer _E_5, infer _R_5, infer _Request_5 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_7 extends string> ? Commander.CommandContextLocal<Id_7> : never) & (RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandlerWithInput<infer I_1, infer A_5, infer E_7, infer R_7, infer Request_2 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_8 extends string> ? ((i: I_1) => Effect.Effect<A_5, E_7, R_7>) & {
+            readonly id: Id_8;
+        } : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandler<infer A_6, infer E_8, infer R_8, infer Request_3 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_9 extends string> ? Effect.Effect<A_6, E_8, R_8> & {
+            readonly id: Id_9;
+        } : never) & {
+            wrap: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandlerWithInput<infer I_2, infer A_7, infer E_9, infer _R_6, infer _Request_6 extends Schema.Any & {
+                readonly _tag: string;
+                readonly success: any;
+                readonly failure: any;
+            }, infer Id_10 extends string> ? Commander.CommandContextLocal<Id_10> & Commander.GenWrap<I18n | Toast | RL, Id_10, [I_2], A_7, E_9, never> & Commander.NonGenWrap<I18n | Toast | RL, Id_10, [I_2], A_7, E_9, never> : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandler<infer A_8, infer E_10, infer _R_7, infer _Request_7 extends Schema.Any & {
+                readonly _tag: string;
+                readonly success: any;
+                readonly failure: any;
+            }, infer Id_11 extends string> ? Commander.CommandContextLocal<Id_11> & Commander.GenWrap<I18n | Toast | RL, Id_11, [], A_8, E_10, never> & Commander.NonGenWrap<I18n | Toast | RL, Id_11, [], A_8, E_10, never> : never;
+            fn: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandlerWithInput<infer _I_3, infer _A_6, infer _E_6, infer _R_8, infer _Request_8 extends Schema.Any & {
+                readonly _tag: string;
+                readonly success: any;
+                readonly failure: any;
+            }, infer Id_12 extends string> ? Commander.Gen<I18n | Toast | RL, Id_12> & Commander.NonGen<I18n | Toast | RL, Id_12> & Commander.CommandContextLocal<Id_12> : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_1] extends RequestHandler<infer _A_7, infer _E_7, infer _R_9, infer _Request_9 extends Schema.Any & {
+                readonly _tag: string;
+                readonly success: any;
+                readonly failure: any;
+            }, infer Id_13 extends string> ? Commander.Gen<I18n | Toast | RL, Id_13> & Commander.NonGen<I18n | Toast | RL, Id_13> & Commander.CommandContextLocal<Id_13> : never;
+        }; } & { [Key_2 in keyof RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]> as `${ToCamel<string & Key_2>}Query`]: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_2] extends RequestHandlerWithInput<infer I, infer A_3, infer E_5, infer _R, infer Request extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id extends string> ? {
+            <TData = A_3>(arg: I | WatchSource<I>, options: CustomDefinedInitialQueryOptions<A_3, KnownFiberFailure<E_5>, TData, readonly unknown[]>): readonly [ComputedRef<Result.Result<TData, E_5>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_3, KnownFiberFailure<E_5>>, never, never>, UseQueryReturnType<any, any>];
+            <TData = A_3>(arg: I | WatchSource<I>, options?: CustomUndefinedInitialQueryOptions<A_3, KnownFiberFailure<E_5>, TData, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_3, E_5>>, ComputedRef<A_3 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_3, KnownFiberFailure<E_5>>, never, never>, UseQueryReturnType<any, any>];
+        } & {
+            id: Id;
+        } : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_2] extends RequestHandler<infer A_4, infer E_6, infer _R_1, infer Request_1 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_1 extends string> ? {
+            <TData = A_4>(options: CustomDefinedInitialQueryOptions<A_4, KnownFiberFailure<E_6>, TData, readonly unknown[]>): readonly [ComputedRef<Result.Result<TData, E_6>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_4, KnownFiberFailure<E_6>>, never, never>, UseQueryReturnType<any, any>];
+            <TData = A_4>(options?: CustomUndefinedInitialQueryOptions<A_4, KnownFiberFailure<E_6>, TData, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_4, E_6>>, ComputedRef<A_4 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_4, KnownFiberFailure<E_6>>, never, never>, UseQueryReturnType<any, any>];
+        } & {
+            id: Id_1;
+        } : never; } & { [Key_3 in keyof RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]> as `${ToCamel<string & Key_3>}SuspenseQuery`]: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_3] extends RequestHandlerWithInput<infer I, infer A_3, infer E_5, infer _R, infer Request extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id extends string> ? {
+            <TData = A_3>(arg: I | WatchSource<I>, options?: CustomDefinedInitialQueryOptions<A_3, E_5, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_5>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_5>>, never, never>, UseQueryReturnType<any, any>]>;
+            <TData = A_3>(arg: I | WatchSource<I>, options?: CustomUndefinedInitialQueryOptions<A_3, E_5, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_5>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_5>>, never, never>, UseQueryReturnType<any, any>]>;
+        } & {
+            id: Id;
+        } : RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>[Key_3] extends RequestHandler<infer A_4, infer E_6, infer _R_1, infer Request_1 extends Schema.Any & {
+            readonly _tag: string;
+            readonly success: any;
+            readonly failure: any;
+        }, infer Id_1 extends string> ? {
+            <TData = A_4>(options?: CustomUndefinedInitialQueryOptions<A_4, E_6, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_6>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_6>>, never, never>, UseQueryReturnType<any, any>]>;
+            <TData = A_4>(options?: (CustomDefinedInitialQueryOptions<A_4, E_6, TData, readonly unknown[]> & {
+                initialData: TData | InitialDataFunction<TData>;
+            }) | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_6>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_6>>, never, never>, UseQueryReturnType<any, any>]>;
+        } & {
+            id: Id_1;
+        } : never; };
+    };
+    legacy: {
+        /** @deprecated use OmegaForm */
+        buildFormFromSchema: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, C extends Record<PropertyKey, any>, OnSubmitA>(s: S.Schema<To, From, LegacyMutation | RL | Base> & {
+            new (c: C): any;
+            extend: any;
+            fields: S.Struct.Fields;
+        }, state: Ref<Omit<From, "_tag">, Omit<From, "_tag">>, onSubmit: (a: To) => Effect.Effect<OnSubmitA, never, LegacyMutation | RL | Base>) => {
+            fields: { [K in keyof To]-?: {
+                true: {
+                    true: To[K] extends {
+                        _tag: string;
+                    } ? import("./form.js").DiscriminatedUnionFieldInfo<{ [P in import("./form.js").DistributiveNestedFieldInfoKey<To[K]> as P["_infoTag" & keyof P] & string]: P; }> : import("./form.js").UnionFieldInfo<import("./form.js").DistributiveNestedFieldInfoKey<To[K]>[]>;
+                    false: import("./form.js").NestedFieldInfoKey<To[K]>;
+                }[`${To[K] extends object ? true : false}`];
+                false: import("./form.js").NestedFieldInfoKey<To[K]>;
+            }[`${import("effect-app/utils").IsUnion<To[K]>}`]; };
+            /** optimized for Vuetify v-form submit callback */
+            submit: <T extends Promise<{
+                valid: boolean;
+            }>>(e: T) => Promise<OnSubmitA | undefined>;
+            /** optimized for Native form submit callback or general use */
+            submitFromState: Effect.Effect<OnSubmitA, S.ParseResult.ParseError, LegacyMutation | RL | Base>;
+            submitFromStatePromise: () => Promise<OnSubmitA>;
+            isDirty: Ref<boolean, boolean>;
+            isValid: Ref<boolean, boolean>;
+            isLoading: Ref<boolean, boolean>;
+        };
+        /** @deprecated use Command pattern */
+        makeUseAndHandleMutation: (defaultOptions?: Opts<any, any, any, any, any, any, any, any, any>) => {
+            <I, E_5 extends ResponseErrors, A_3, R_5, Request extends TaggedRequestClassAny, Name extends string, A2 = A_3, E2 extends ResponseErrors = E_5, R2 = R_5, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A_3, E_5, R_5, Request, Name>, action: string, options?: Opts<A_3, E_5, R_5, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect> | undefined): Resp<I, A2, E2, R2, ComputedRef<Res<A2, E2>>>;
+            <E_6 extends ResponseErrors, A_4, Request_1 extends TaggedRequestClassAny, Name_1 extends string, A2_1 = A_4, E2_1 extends ResponseErrors = E_6, R2_1 = LegacyMutation | RL | Base, ESuccess_1 = never, RSuccess_1 = never, EError_1 = never, RError_1 = never, EDefect_1 = never, RDefect_1 = never>(self: RequestHandler<A_4, E_6, LegacyMutation | RL | Base, Request_1, Name_1>, action: string, options?: Opts<A_4, E_6, LegacyMutation | RL | Base, void, A2_1, E2_1, R2_1, ESuccess_1, RSuccess_1, EError_1, RError_1, EDefect_1, RDefect_1> | undefined): ActResp<A2_1, E2_1, R2_1, ComputedRef<Res<A2_1, E2_1>>>;
+        };
+        /** @deprecated use Command pattern */
+        useAndHandleMutation: {
+            <I, E_6 extends ResponseErrors, A_5, R_6, Request_2 extends TaggedRequestClassAny, Name_2 extends string, A2_2 = A_5, E2_2 extends ResponseErrors = E_6, R2_2 = R_6, ESuccess_2 = never, RSuccess_2 = never, EError_2 = never, RError_2 = never, EDefect_2 = never, RDefect_2 = never>(self: RequestHandlerWithInput<I, A_5, E_6, R_6, Request_2, Name_2>, action: string, options?: Opts<A_5, E_6, R_6, I, A2_2, E2_2, R2_2, ESuccess_2, RSuccess_2, EError_2, RError_2, EDefect_2, RDefect_2> | undefined): Resp<I, A2_2, E2_2, R2_2, ComputedRef<Res<A2_2, E2_2>>>;
+            <E_7 extends ResponseErrors, A_6, R_7, Request_3 extends TaggedRequestClassAny, Name_3 extends string, A2_3 = A_6, E2_3 extends ResponseErrors = E_7, R2_3 = R_7, ESuccess_3 = never, RSuccess_3 = never, EError_3 = never, RError_3 = never, EDefect_3 = never, RDefect_3 = never>(self: RequestHandler<A_6, E_7, R_7, Request_3, Name_3>, action: string, options?: Opts<A_6, E_7, R_7, void, A2_3, E2_3, R2_3, ESuccess_3, RSuccess_3, EError_3, RError_3, EDefect_3, RDefect_3> | undefined): ActResp<A2_3, E2_3, R2_3, ComputedRef<Res<A2_3, E2_3>>>;
+        };
+        /** @deprecated use Command pattern */
+        useSafeMutation: {
+            <I, E_7, A_7, R_8, Request_4 extends TaggedRequestClassAny, Name_4 extends string, A2_4 = A_7, E2_4 = E_7, R2_4 = R_8>(self: RequestHandlerWithInput<I, A_7, E_7, R_8, Request_4, Name_4>, options?: MutationOptions<A_7, E_7, R_8, A2_4, E2_4, R2_4, I> | undefined): readonly [ComputedRef<Result.Result<A2_4, E2_4>>, (i: I) => Effect.Effect<Exit.Exit<A2_4, E2_4>, never, R2_4>];
+            <E_8, A_8, R_9, Request_5 extends TaggedRequestClassAny, Name_5 extends string, A2_5 = A_8, E2_5 = E_8, R2_5 = R_9>(self: RequestHandler<A_8, E_8, R_9, Request_5, Name_5>, options?: MutationOptions<A_8, E_8, R_9, A2_5, E2_5, R2_5, void> | undefined): readonly [ComputedRef<Result.Result<A2_5, E2_5>>, Effect.Effect<Exit.Exit<A2_5, E2_5>, never, R2_5>];
+        };
+        /** @deprecated use Command pattern */
+        useSafeMutationWithState: {
+            <I, E_8, A_9, R_10, Request_6 extends TaggedRequestClassAny, Name_6 extends string, A2_6 = A_9, E2_6 = E_8, R2_6 = R_10>(self: RequestHandlerWithInput<I, A_9, E_8, R_10, Request_6, Name_6>, options?: MutationOptions<A_9, E_8, R_10, A2_6, E2_6, R2_6, I> | undefined): readonly [ComputedRef<Res<A_9, E_8>>, (i: I) => Effect.Effect<Exit.Exit<A2_6, E2_6>, never, R2_6>];
+            <E_9, A_10, R_11, Request_7 extends TaggedRequestClassAny, Name_7 extends string, A2_7 = A_10, E2_7 = E_9, R2_7 = R_11>(self: RequestHandler<A_10, E_9, R_11, Request_7, Name_7>, options?: MutationOptions<A_10, E_9, R_11, A2_7, E2_7, R2_7, void> | undefined): readonly [ComputedRef<Res<A_10, E_9>>, Effect.Effect<Exit.Exit<A2_7, E2_7>, never, R2_7>];
+        };
+        /** @deprecated use .query on the clientFor(x).Action */
+        useQuery: {
+            <E_9, A_11, Request_8 extends TaggedRequestClassAny, Name_8 extends string>(self: RequestHandler<A_11, E_9, RT | ApiClientFactory, Request_8, Name_8>): {
+                <TData = A_11>(options: CustomDefinedInitialQueryOptions<A_11, KnownFiberFailure<E_9>, TData, readonly unknown[]>): readonly [ComputedRef<Result.Result<TData, E_9>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_11, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>];
+                <TData = A_11>(options?: CustomUndefinedInitialQueryOptions<A_11, KnownFiberFailure<E_9>, TData, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_11, E_9>>, ComputedRef<A_11 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_11, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>];
+            };
+            <Arg, E_9, A_12, Request_9 extends TaggedRequestClassAny, Name_9 extends string>(self: RequestHandlerWithInput<Arg, A_12, E_9, RT | ApiClientFactory, Request_9, Name_9>): {
+                <TData = A_12>(arg: Arg | WatchSource<Arg>, options: CustomDefinedInitialQueryOptions<A_12, KnownFiberFailure<E_9>, TData, readonly unknown[]>): readonly [ComputedRef<Result.Result<TData, E_9>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_12, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>];
+                <TData = A_12>(arg: Arg | WatchSource<Arg>, options?: CustomUndefinedInitialQueryOptions<A_12, KnownFiberFailure<E_9>, TData, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_12, E_9>>, ComputedRef<A_12 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_12, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>];
+            };
+        };
+        /** @deprecated use .suspense on the clientFor(x).Action */
+        useSuspenseQuery: {
+            <E_10, A_13, Request_10 extends TaggedRequestClassAny, Name_10 extends string>(self: RequestHandler<A_13, E_10, RT | ApiClientFactory, Request_10, Name_10>): {
+                <TData = A_13>(options?: CustomUndefinedInitialQueryOptions<A_13, E_10, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_10>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_10>>, never, never>, UseQueryReturnType<any, any>]>;
+                <TData = A_13>(options?: (CustomDefinedInitialQueryOptions<A_13, E_10, TData, readonly unknown[]> & {
+                    initialData: TData | InitialDataFunction<TData>;
+                }) | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_10>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_10>>, never, never>, UseQueryReturnType<any, any>]>;
+            };
+            <Arg, E_10, A_14, Request_11 extends TaggedRequestClassAny, Name_11 extends string>(self: RequestHandlerWithInput<Arg, A_14, E_10, RT | ApiClientFactory, Request_11, Name_11>): {
+                <TData = A_14>(arg: Arg | WatchSource<Arg>, options?: CustomDefinedInitialQueryOptions<A_14, E_10, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_10>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_10>>, never, never>, UseQueryReturnType<any, any>]>;
+                <TData = A_14>(arg: Arg | WatchSource<Arg>, options?: CustomUndefinedInitialQueryOptions<A_14, E_10, TData, readonly unknown[]> | undefined): Promise<readonly [ComputedRef<Result.Result<TData, E_10>>, ComputedRef<TData>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E_10>>, never, never>, UseQueryReturnType<any, any>]>;
+            };
+        };
+    };
 };
+export type QueryInvalidation<M> = {
+    [K in keyof M]?: (defaultKey: string[], name: string) => {
+        filters?: InvalidateQueryFilters | undefined;
+        options?: InvalidateOptions | undefined;
+    }[];
+};
+export type ToCamel<S extends string | number | symbol> = S extends string ? S extends `${infer Head}_${infer Tail}` ? `${Uncapitalize<Head>}${Capitalize<ToCamel<Tail>>}` : Uncapitalize<S> : never;
+export interface CommandBase<I extends ReadonlyArray<any>, A = void> {
+    handle: (...input: I) => A;
+    waiting: boolean;
+    action: string;
+}
+export interface EffectCommand<I extends ReadonlyArray<any>, A = unknown, E = unknown> extends CommandBase<I, RuntimeFiber<A, E>> {
+}
+export interface UnaryCommand<I, A = unknown, E = unknown> extends CommandBase<[I], RuntimeFiber<A, E>> {
+}
+export interface CommandFromRequest<I extends abstract new (...args: any) => any, A = unknown, E = unknown> extends UnaryCommand<ConstructorParameters<I>[0], A, E> {
+}
 export {};
 //# sourceMappingURL=makeClient.d.ts.map