@effect-app/vue 2.56.3 → 2.57.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/vue
 
+## 2.57.0
+
+### Minor Changes
+
+- 4462bb1: cleanup toast and mapHandler legacy
+
+## 2.56.4
+
+### Patch Changes
+
+- fix typo
+
 ## 2.56.3
 
 ### Patch Changes

package/dist/experimental/commander.d.ts

@@ -173,7 +173,7 @@ declare const Commander_base: Effect.Service.Class<Commander, "Commander", {
          */
         fn: <RT>(runtime: Runtime.Runtime<RT>) => (actionName: string) => Commander.Gen<RT> & Commander.NonGen<RT>;
         alt: <RT>(runtime: Runtime.Runtime<RT>) => (actionName: string) => <Args extends Array<any>, A, E, R extends RT | CommandContext>(handler: (...args: Args) => Effect.Effect<A, E, R>) => Commander.CommandOut<Args, A, E, R>;
-    }, never, I18n | WithToast | Confirm>;
+    }, never, I18n | Confirm | WithToast>;
 }>;
 export declare class Commander extends Commander_base {
 }

package/dist/makeClient.d.ts

@@ -9,7 +9,7 @@ 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 Res } from "./mutate.js";
+import { type MutationOptions, type MutationOptionsBase, type Res } from "./mutate.js";
 import { type KnownFiberFailure, type QueryObserverOptionsCustom } from "./query.js";
 /**
  * Use this after handling an error yourself, still continueing on the Error track, but the error will not be reported.
@@ -49,11 +49,16 @@ type ActResp<A, E, R, V = ComputedRef<Res<A, E>>> = readonly [
     WithAction<Effect.Effect<Exit.Exit<A, E>, never, R>>
 ];
 export declare const suppressToast: import("effect/Function").LazyArg<Effect.Effect<undefined, never, never>>;
-declare const _useUnsafeMutation: {
-    <I, E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(self: RequestHandlerWithInput<I, A, E, R, Request>, options?: MutationOptions<A, E, R, A2, E2, R2, I>): (i: I) => Effect.Effect<A2, E2, R2>;
-    <E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(self: RequestHandler<A, E, R, Request>, options?: MutationOptions<A, E, R, A2, E2, R2>): Effect.Effect<A2, E2, R2>;
+declare const _useMutation: {
+    <I, E, A, R, Request extends TaggedRequestClassAny>(self: RequestHandlerWithInput<I, A, E, R, Request>, options?: MutationOptionsBase): (i: I) => Effect.Effect<A, E, R>;
+    <E, A, R, Request extends TaggedRequestClassAny>(self: RequestHandler<A, E, R, Request>, options?: MutationOptionsBase): Effect.Effect<A, E, R>;
 };
-export declare const useUnsafeMutation: typeof _useUnsafeMutation;
+/**
+ * Pass an Effect or a function that returns an Effect, e.g from a client action
+ * Executes query cache invalidation based on default rules or provided option.
+ * adds a span with the mutation name
+ */
+export declare const useMutation: typeof _useMutation;
 declare const LegacyMutation_base: Effect.Service.Class<LegacyMutation, "LegacyMutation", {
     readonly effect: Effect.Effect<(<R>(runtime: Runtime.Runtime<R>) => {
         /** @deprecated use Command.fn */
@@ -86,7 +91,10 @@ declare const LegacyMutation_base: Effect.Service.Class<LegacyMutation, "LegacyM
             <I, E_5 extends ResponseErrors, A_10, R_11, Request_10 extends TaggedRequestClassAny, A2_10 = A_10, E2_10 extends ResponseErrors = E_5, R2_10 = R_11, 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_11, Request_10>, action: string, options?: Opts<A_10, E_5, R_11, I, A2_10, E2_10, R2_10, ESuccess_8, RSuccess_8, EError_8, RError_8, EDefect_8, RDefect_8>): Resp<I, A2_10, E2_10, R2_10>;
             <E_6 extends ResponseErrors, A_11, Request_11 extends TaggedRequestClassAny, A2_11 = A_11, E2_11 extends ResponseErrors = E_6, R2_11 = R, ESuccess_9 = never, RSuccess_9 = never, EError_9 = never, RError_9 = never, EDefect_9 = never, RDefect_9 = never>(self: RequestHandler<A_11, E_6, R, Request_11>, action: string, options?: Opts<A_11, E_6, R, void, A2_11, E2_11, R2_11, ESuccess_9, RSuccess_9, EError_9, RError_9, EDefect_9, RDefect_9>): ActResp<A2_11, E2_11, R2_11>;
         };
-        /** @deprecated use Command.fn */
+        /**
+         * handles errors as toasts and reports defects
+         * @deprecated use Command.fn
+         */
         useHandleRequestWithToast: () => <A_12, E_6 extends ResponseErrors, R_12, I = void, A2_12 = A_12, E2_12 extends ResponseErrors = E_6, R2_12 = R_12, 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>), name: string, action: string, options?: Opts<A_12, E_6, R_12, 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;
         };
@@ -125,7 +133,7 @@ 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>(baseMrt: ManagedRuntime.ManagedRuntime<RT, never>, rootLayer: Layer.Layer<RL | Base, RE>) => Promise<{
+export declare const makeClient: <RT, RE, RL>(baseMrt: ManagedRuntime.ManagedRuntime<RT, never>, rootLayer: Layer.Layer<RL | Base, RE>) => {
     useSafeMutationWithState: {
         <I, E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(self: RequestHandlerWithInput<I, A, E, R, Request>, 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, A2_1 = A_1, E2_1 = E_1, R2_1 = R_1>(self: RequestHandler<A_1, E_1, R_1, Request_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>];
@@ -148,16 +156,16 @@ export declare const makeClient: <RT, RE, RL>(baseMrt: ManagedRuntime.ManagedRun
     };
     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, 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>, 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, A2_11 = A_11, E2_11 extends ResponseErrors = E_6, R2_11 = LegacyMutation | RL | Base, 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 | RL | Base, Request_11>, action: string, options?: Opts<A_11, E_6, LegacyMutation | RL | Base, 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>>>;
+        <E_6 extends ResponseErrors, A_11, Request_11 extends TaggedRequestClassAny, 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>, 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>), name: 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 | RL | Base> & {
+    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 | RL | Base>) => {
+    }, 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 {
@@ -172,7 +180,7 @@ export declare const makeClient: <RT, RE, RL>(baseMrt: ManagedRuntime.ManagedRun
             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>;
+        submitFromState: Effect.Effect<OnSubmitA, S.ParseResult.ParseError, LegacyMutation | Base | RL>;
         isDirty: Ref<boolean, boolean>;
         isValid: Ref<boolean, boolean>;
         isLoading: Ref<boolean, boolean>;
@@ -202,7 +210,7 @@ export declare const makeClient: <RT, RE, RL>(baseMrt: ManagedRuntime.ManagedRun
         <Arg, E_11, A_21, Request_21 extends TaggedRequestClassAny>(self: RequestHandlerWithInput<Arg, A_21, E_11, RT, Request_21>, arg: Arg | WatchSource<Arg>, options?: QueryObserverOptionsCustom<A_21, E_11, A_21, A_21, readonly unknown[]> | undefined): Effect.Effect<readonly [ComputedRef<Result.Result<A_21, E_11>>, ComputedRef<A_21>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_21, KnownFiberFailure<E_11>>, never, never>, UseQueryReturnType<any, any>], never, never>;
     };
     useCommand: () => {
-        alt: (actionName: string) => <Args extends Array<any>, A_22, E_12, R_14 extends I18n | Toast | RL | import("./experimental/commander.js").CommandContext>(handler: (...args: Args) => Effect.Effect<A_22, E_12, R_14>) => Commander.CommandOut<Args, A_22, E_12, R_14>;
+        alt: (actionName: string) => <Args extends Array<any>, A_22, E_12, R_14 extends I18n | Toast | import("./experimental/commander.js").CommandContext | RL>(handler: (...args: Args) => Effect.Effect<A_22, E_12, R_14>) => Commander.CommandOut<Args, A_22, E_12, R_14>;
         fn: (actionName: string) => Commander.Gen<I18n | Toast | RL> & Commander.NonGen<I18n | Toast | RL>;
         takeOver: <Args extends any[], A_23, E_13, R_15>(command: Commander.CommandOut<Args, A_23, E_13, R_15>) => (...args: Args) => Effect.Effect<A_23, E_13, import("./experimental/commander.js").CommandContext | Exclude<Exclude<R_15, import("./experimental/commander.js").CommandContext>, import("effect/Tracer").ParentSpan>>;
         confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("./experimental/commander.js").CommandContext>;
@@ -214,6 +222,6 @@ export declare const makeClient: <RT, RE, RL>(baseMrt: ManagedRuntime.ManagedRun
         } | undefined) => (self: Effect.Effect<A_24, E_14, R_16>) => Effect.Effect<A_24, E_14, import("./experimental/commander.js").CommandContext | R_16>;
         _tag: "Commander";
     };
-}>;
+};
 export {};
 //# sourceMappingURL=makeClient.d.ts.map

package/dist/makeClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeClient.d.ts","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"makeClient.d.ts","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"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"}

package/dist/makeClient.js

@@ -3,7 +3,7 @@ import * as Result from "@effect-atom/atom/Result";
 import { isCancelledError } from "@tanstack/vue-query";
 import { Cause, Effect, Exit, Layer, ManagedRuntime, Match, Option, Runtime, S, Struct } from "effect-app";
 import { ErrorSilenced } from "effect-app/client/errors";
-import { constant, pipe, tuple } from "effect-app/Function";
+import { constant, identity, pipe, tuple } from "effect-app/Function";
 import { OperationSuccess } from "effect-app/Operations";
 import { dropUndefinedT } from "effect-app/utils";
 import { computed, getCurrentInstance, onBeforeUnmount, onUnmounted, ref, shallowRef, watch } from "vue";
@@ -16,7 +16,7 @@ import { buildFieldInfoFromFieldsRoot } from "./form.js";
 import { reportRuntimeError } from "./lib.js";
 import { asResult, makeMutation, mutationResultToVue } from "./mutate.js";
 import { makeQuery } from "./query.js";
-const tapHandler = (handler, map) => Effect.isEffect(handler) ? map(handler) : (i) => map(handler(i));
+const mapHandler = (handler, map) => Effect.isEffect(handler) ? map(handler, undefined) : (i) => map(handler(i), i);
 /**
  * Use this after handling an error yourself, still continueing on the Error track, but the error will not be reported.
  */
@@ -25,6 +25,7 @@ export class SuppressErrors extends Cause.YieldableError {
     [ErrorSilenced] = true;
 }
 export const suppressToast = constant(Effect.succeed(undefined));
+/** handles errors as specified and reports defects */
 function handleRequest(f, name, action, options) {
     const handleEffect = (i) => (self) => self.pipe(Effect.tap(Exit.matchEffect({
         onSuccess: (r) => options.onSuccess(r, i),
@@ -56,8 +57,13 @@ function handleRequest(f, name, action, options) {
         ? pipe(f, handleEffect(void 0))
         : (i) => pipe(f(i), handleEffect(i)), { action });
 }
-const _useUnsafeMutation = makeMutation();
-export const useUnsafeMutation = (self, options) => tapHandler(_useUnsafeMutation(self, options), Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false }));
+const _useMutation = makeMutation();
+/**
+ * Pass an Effect or a function that returns an Effect, e.g from a client action
+ * Executes query cache invalidation based on default rules or provided option.
+ * adds a span with the mutation name
+ */
+export const useMutation = (self, options) => mapHandler(_useMutation(self, options), Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false }));
 // @effect-diagnostics-next-line missingEffectServiceDependency:off
 export class LegacyMutation extends Effect.Service()("LegacyMutation", {
     effect: Effect.gen(function* () {
@@ -69,13 +75,15 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
              * you should use the result ref to render errors!
              */
             const _useSafeMutation = (self, options) => {
-                const unsafe = _useUnsafeMutation(self, options);
-                const [a, b] = asResult(tapHandler(unsafe, Effect.tapDefect(reportRuntimeError)));
+                const unsafe = _useMutation(self, options);
+                const mh = options?.mapHandler ?? identity;
+                const [a, b] = asResult(mapHandler(mapHandler(unsafe, mh), Effect.tapDefect(reportRuntimeError)));
                 return [
                     a,
-                    tapHandler(b, Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false }))
+                    mapHandler(b, Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false }))
                 ];
             };
+            /** handles errors as toasts and reports defects */
             const _useHandleRequestWithToast = () => {
                 return handleRequestWithToast;
                 /**
@@ -174,12 +182,15 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
             const _useAndHandleMutationResult = (self, action, options) => {
                 const handleRequestWithToast = _useHandleRequestWithToast();
                 const handler = self.handler;
-                const [a, b] = asResult(_useUnsafeMutation({
+                const unsafe = _useMutation({
                     ...self,
                     handler: Effect.isEffect(handler)
                         ? pipe(Effect.annotateCurrentSpan({ action }), Effect.zipRight(handler))
                         : (...args) => pipe(Effect.annotateCurrentSpan({ action }), Effect.zipRight(handler(...args)))
-                }, options ? dropUndefinedT(options) : undefined));
+                }, options ? dropUndefinedT(options) : undefined);
+                const mh = options?.mapHandler ?? identity;
+                // Effect.tapDefect(reportRuntimeError) handled in toast handler,
+                const [a, b] = asResult(mapHandler(unsafe, mh));
                 return tuple(a, handleRequestWithToast(b, self.name, action, options));
             };
             //
@@ -210,12 +221,14 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
              * Actions for success, error and defect can be provided in the Options.
              */
             const _useAndHandleMutationCustom = (self, action, options) => {
-                const [a, b] = asResult(_useUnsafeMutation({
+                const unsafe = _useMutation({
                     ...self,
                     handler: Effect.isEffect(self.handler)
                         ? pipe(Effect.annotateCurrentSpan({ action }), Effect.andThen(self.handler))
                         : (...args) => pipe(Effect.annotateCurrentSpan({ action }), Effect.andThen(self.handler(...args)))
-                }, options ? dropUndefinedT(options) : undefined));
+                }, options ? dropUndefinedT(options) : undefined);
+                const mh = options?.mapHandler ?? identity;
+                const [a, b] = asResult(mapHandler(mapHandler(unsafe, mh), Effect.tapDefect(reportRuntimeError)));
                 return tuple(computed(() => mutationResultToVue(a.value)), handleRequest(b, self.name, action, {
                     onSuccess: suppressToast,
                     onDefect: suppressToast,
@@ -284,7 +297,10 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
                 useAndHandleMutationCustom: _useAndHandleMutationCustom,
                 /** @deprecated use Command.fn */
                 makeUseAndHandleMutation: _makeUseAndHandleMutation,
-                /** @deprecated use Command.fn */
+                /**
+                 * handles errors as toasts and reports defects
+                 * @deprecated use Command.fn
+                 */
                 useHandleRequestWithToast: _useHandleRequestWithToast,
                 /** @deprecated use OmegaForm */
                 buildFormFromSchema: _buildFormFromSchema,
@@ -343,7 +359,7 @@ const mkQuery = (runtime) => {
 };
 // somehow mrt.runtimeEffect doesnt work sync, but this workaround works fine? not sure why though as the layers are generally only sync
 const managedRuntimeRt = (mrt) => mrt.runSync(Effect.runtime());
-export const makeClient = async (baseMrt, rootLayer) => {
+export const makeClient = (baseMrt, rootLayer) => {
     const baseRt = managedRuntimeRt(baseMrt);
     // we want to create a managed runtime for query, command and mutation hooks, one per component instance
     const getRt = () => {
@@ -405,4 +421,4 @@ export const makeClient = async (baseMrt, rootLayer) => {
         }, {})
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeClient.js","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeClient.js","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAA4B,gBAAgB,EAA0E,MAAM,qBAAqB,CAAA;AACxJ,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE1G,OAAO,EAAE,aAAa,EAAwB,MAAM,0BAA0B,CAAA;AAC9E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AACrE,OAAO,EAAyB,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAoB,kBAAkB,EAAE,eAAe,EAAE,WAAW,EAAY,GAAG,EAAE,UAAU,EAAE,KAAK,EAAoB,MAAM,KAAK,CAAA;AACtJ,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,4BAA4B,EAAE,MAAM,WAAW,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAkD,mBAAmB,EAAY,MAAM,aAAa,CAAA;AACnI,OAAO,EAA0B,SAAS,EAAmC,MAAM,YAAY,CAAA;AAE/F,MAAM,UAAU,GAAG,CACjB,OAAoE,EACpE,GAAsE,EACtE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,SAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AAE7F;;GAEG;AACH,MAAM,OAAO,cAAe,SAAQ,KAAK,CAAC,cAAc;IAC7C,IAAI,GAAG,gBAAgB,CAAA;IACvB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAA;CAChC;AAgFD,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;AAEhE,sDAAsD;AACtD,SAAS,aAAa,CAYpB,CAAkG,EAClG,IAAY,EACZ,MAAc,EACd,OAIC;IAED,MAAM,YAAY,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,IAA8C,EAAE,EAAE,CAClF,IAAI,CAAC,IAAI,CACP,MAAM,CAAC,GAAG,CACR,IAAI,CAAC,WAAW,CAAC;QACf,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC;QACzC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CACnB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,IAAI,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,OAAO,CAAC,IAAI,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAA;gBACrD,OAAM;YACR,CAAC;YAED,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YACvC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;oBACzC,OAAO,CAAC,IAAI,CAAC,8BAA8B,MAAM,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;oBAChE,OAAM;gBACR,CAAC;gBACD,MAAM,OAAO,GAAG,qBAAqB,MAAM,EAAE,CAAA;gBAC7C,KAAK,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;gBAC5D,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBACpC,OAAM;YACR,CAAC;YAED,MAAM,KAAK,GAAG;gBACZ,MAAM;gBACN,OAAO,EAAE,8BAA8B,MAAM,EAAE;aAChD,CAAA;YACD,KAAK,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;YAEvC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QACnC,CAAC,CAAC;KACL,CAAC,CACH,EACD,MAAM,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAClE,CAAA;IACH,OAAO,MAAM,CAAC,MAAM,CAClB,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC,IAAI,CACJ,CAAC,EACD,YAAY,CAAC,KAAK,CAAC,CAAC,CACrB;QACD,CAAC,CAAC,CAAC,CAAI,EAAE,EAAE,CACT,IAAI,CACF,CAAC,CAAC,CAAC,CAAC,EACJ,YAAY,CAAC,CAAC,CAAC,CAChB,EACL,EAAE,MAAM,EAAE,CACX,CAAA;AACH,CAAC;AAED,MAAM,YAAY,GAAG,YAAY,EAAE,CAAA;AAEnC;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAwB,CAO9C,IAAqF,EACrF,OAA6B,EAC7B,EAAE,CACF,UAAU,CACR,YAAY,CAAC,IAAW,EAAE,OAAO,CAAC,EAClC,MAAM,CAAC,QAAQ,CAAC,YAAY,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAChE,CAAA;AAEV,mEAAmE;AACnE,MAAM,OAAO,cAAe,SAAQ,MAAM,CAAC,OAAO,EAAkB,CAAC,gBAAgB,EAAE;IACrF,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAA;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAA;QAE1B,OAAO,CAAI,OAA2B,EAAE,EAAE;YACxC;;;eAGG;YACH,MAAM,gBAAgB,GAelB,CACF,IAAqF,EACrF,OAAiD,EACjD,EAAE;gBACF,MAAM,MAAM,GAAG,YAAY,CAAC,IAAW,EAAE,OAAO,CAAC,CAAA;gBAGjD,MAAM,EAAE,GAAG,OAAO,EAAE,UAAU,IAAI,QAAc,CAAA;gBAEhD,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,MAAa,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAQ,CAAC,CAAA;gBAC/G,OAAO;oBACL,CAAC;oBACD,UAAU,CACR,CAAC,EACD,MAAM,CAAC,QAAQ,CAAC,YAAY,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CACvE;iBACc,CAAA;YACnB,CAAC,CAAA;YAED,mDAAmD;YACnD,MAAM,0BAA0B,GAAG,GAAG,EAAE;gBACtC,OAAO,sBAAsB,CAAA;gBAC7B;;;mBAGG;gBACH,SAAS,sBAAsB,CAe7B,CAAwG,EACxG,IAAY,EACZ,MAAc,EACd,UAA8F,EAAE;oBAEhG,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,UAAU,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAA;oBAC5F,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAC3C,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAC9B,EAAE,MAAM,EAAE,aAAa,EAAE,CAC1B,CAAA;oBACD,MAAM,qBAAqB,GAAG,IAAI,CAAC,aAAa,CAC9C,EAAE,EAAE,EAAE,gBAAgB,EAAE,EACxB,EAAE,MAAM,EAAE,aAAa,EAAE,CAC1B,CAAA;oBACD,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,CAC5C,EAAE,EAAE,EAAE,oBAAoB,EAAE,EAC5B,EAAE,MAAM,EAAE,aAAa,EAAE,CAC1B,CAAA;oBAED,OAAO,aAAa,CAAwE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE;wBAC3G,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,CAAC,EAAE,CAAC;4BACzC,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB;kCAChG,CAAC,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO;oCACvC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,OAAO;oCAClB,CAAC,CAAC,EAAE,CAAC,CAAA;4BACT,IAAI,OAAO,EAAE,CAAC;gCACZ,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;4BAC/B,CAAC;wBACH,CAAC,CAAC;wBACF,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,CAAC,EAAE,CAAC;4BACtC,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gCAC1D,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAClB,kBAAkB,GAAG,CAAC,CAAC,OAAO;oCAC5B,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,OAAO;oCAClB,CAAC,CAAC,EAAE,CACP,CAAA;gCACD,OAAM;4BACR,CAAC;4BAED,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW;gCACjC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;gCAClC,CAAC,CAAC,GAAG,mBAAmB,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;4BAChD,IAAI,OAAO,EAAE,CAAC;gCACZ,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;4BAC7B,CAAC;wBACH,CAAC,CAAC;wBACF,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,KAAK,EAAE,CAAC;4BAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa;gCACnC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;gCACxC,CAAC,CAAC,IAAI,CAAC,aAAa,CAClB,EAAE,EAAE,EAAE,yBAAyB,EAAE,EACjC;oCACE,MAAM,EAAE,aAAa;oCACrB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;iCAC3B,CACF,CAAA;4BACH,IAAI,OAAO,EAAE,CAAC;gCACZ,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;4BAC7B,CAAC;wBACH,CAAC,CAAC;qBACH,CAAC,CAAA;gBACJ,CAAC;gBAED,SAAS,WAAW,CAAC,CAAiB;oBACpC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CACxB,KAAK,CAAC,IAAI,CAAC;wBACT,yBAAyB;wBACzB,8BAA8B;wBAC9B,sCAAsC;wBACtC,+BAA+B;wBAC/B,OAAO;wBACP,0BAA0B;wBAC1B,gCAAgC;wBAChC,uCAAuC;wBACvC,2BAA2B;wBAC3B,kCAAkC;wBAClC,2CAA2C;wBAC3C,YAAY;wBACZ,uBAAuB;wBACvB,uEAAuE;wBACvE,oDAAoD;wBACpD,4BAA4B;wBAC5B,uCAAuC;wBACvC,aAAa;wBACb,UAAU;wBACV,kCAAkC;wBAClC,6CAA6C;wBAC7C,YAAY;wBACZ,mBAAmB;wBACnB,8DAA8D;wBAC9D,qBAAqB;wBACrB,kCAAkC;wBAClC,mBAAmB;wBACnB,aAAa;wBACb,WAAW;wBACX,sBAAsB;wBACtB,8BAA8B;wBAC9B,uCAAuC;wBACvC,+BAA+B;wBAC/B,OAAO;wBACP,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE;4BAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;4BAC1B,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAA;wBACxD,CAAC;qBACF,CAAC,EACF,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CACnD,CAAA;gBACH,CAAC;YACH,CAAC,CAAA;YAED;;;eAGG;YACH,MAAM,2BAA2B,GAwC7B,CACF,IAAqF,EACrF,MAAW,EACX,OAA+E,EAC1E,EAAE;gBACP,MAAM,sBAAsB,GAAG,0BAA0B,EAAE,CAAA;gBAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;gBAC5B,MAAM,MAAM,GAAG,YAAY,CAAC;oBAC1B,GAAG,IAAI;oBACP,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;wBAC/B,CAAC,CAAE,IAAI,CACL,MAAM,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,EACtC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CACjB;wBACT,CAAC,CAAC,CAAC,GAAG,IAAW,EAAE,EAAE,CACnB,IAAI,CACF,MAAM,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,EACtC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAClC;iBACN,EAAE,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;gBAGjD,MAAM,EAAE,GAAG,OAAO,EAAE,UAAU,IAAI,QAAc,CAAA;gBAEhD,iEAAiE;gBACjE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAQ,CAAC,CAAA;gBAEtD,OAAO,KAAK,CACV,CAAC,EACD,sBAAsB,CAAC,CAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAC7D,CAAA;YACH,CAAC,CAAA;YACD,EAAE;YAEF;;;eAGG;YACH,MAAM,qBAAqB,GAwCvB,CACF,IAAS,EACT,MAAW,EACX,OAA+E,EAC1E,EAAE;gBACP,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;gBAEjE,OAAO,KAAK,CACV,QAAQ,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAC5C,CAAC,CACF,CAAA;YACH,CAAC,CAAA;YAED,SAAS,yBAAyB,CAChC,cAAkE;gBAElE,OAAO,CAAC,CAAC,IAAS,EAAE,MAAW,EAAE,OAAY,EAAE,EAAE;oBAC/C,OAAO,qBAAqB,CAC1B,IAAI,EACJ,MAAM,EACN,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAClC,CAAA;gBACH,CAAC,CAuCA,CAAA;YACH,CAAC;YAED;;;eAGG;YACH,MAAM,6BAA6B,GAwC/B,yBAAyB,CAAC;gBAC5B,cAAc,EAAE,aAAa;gBAC7B,WAAW,EAAE,aAAa;gBAC1B,aAAa,EAAE,aAAa;aAC7B,CAAQ,CAAA;YAET;;;eAGG;YACH,MAAM,2BAA2B,GAwC7B,CAAC,IAAS,EAAE,MAAc,EAAE,OAAY,EAAE,EAAE;gBAC9C,MAAM,MAAM,GAAG,YAAY,CAAC;oBAC1B,GAAG,IAAI;oBACP,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;wBACpC,CAAC,CAAE,IAAI,CACL,MAAM,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,EACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CACrB;wBACT,CAAC,CAAC,CAAC,GAAG,IAAW,EAAE,EAAE,CACnB,IAAI,CACF,MAAM,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC,EACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CACtC;iBACN,EAAE,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;gBAGjD,MAAM,EAAE,GAAG,OAAO,EAAE,UAAU,IAAI,QAAc,CAAA;gBAEhD,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,MAAa,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAQ,CAAC,CAAA;gBAE/G,OAAO,KAAK,CACV,QAAQ,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAC5C,aAAa,CAAC,CAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE;oBACzC,SAAS,EAAE,aAAa;oBACxB,QAAQ,EAAE,aAAa;oBACvB,MAAM,EAAE,aAAa;oBACrB,GAAG,OAAO;iBACX,CAAC,CACI,CAAA;YACV,CAAC,CAAA;YAED;;;eAGG;YACH,MAAM,yBAAyB,GAe3B,CACF,IAAqF,EACrF,OAAiD,EACjD,EAAE;gBACF,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,IAAW,EAAE,OAAO,CAAC,CAAA;gBAErD,OAAO,KAAK,CACV,QAAQ,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAC5C,CAAC,CACK,CAAA;YACV,CAAC,CAAA;YAED,gCAAgC;YAChC,MAAM,oBAAoB,GAAG,CAM3B,CAM4D,EAC5D,KAA8B,EAC9B,QAAuD,EACvD,EAAE;gBACF,MAAM,MAAM,GAAG,4BAA4B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;gBACrD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAQ,CAAA;gBAC7D,MAAM,KAAK,GAAG,CAAC,CAAC,aAAa,CAAc,MAAM,CAAC,CAAA;gBAClD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;gBAC1B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,CAAA;gBACzB,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;gBAC5B,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;gBAE9C,MAAM,OAAO,GACX,CAAC,QAAuD,EAAE,EAAE,CAC5D,KAAK,EAAyC,CAAI,EAAE,EAAE;oBACpD,SAAS,CAAC,KAAK,GAAG,IAAI,CAAA;oBACtB,IAAI,CAAC;wBACH,MAAM,CAAC,GAAG,MAAM,CAAC,CAAA;wBACjB,IAAI,CAAC,CAAC,CAAC,KAAK;4BAAE,OAAM;wBACpB,OAAO,MAAM,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;oBAChF,CAAC;4BAAS,CAAC;wBACT,SAAS,CAAC,KAAK,GAAG,KAAK,CAAA;oBACzB,CAAC;gBACH,CAAC,CAAA;gBACH,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAEhC,KAAK,CACH,KAAK,EACL,CAAC,CAAC,EAAE,EAAE;oBACJ,kBAAkB;oBAClB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBACnE,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAA;gBAED,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAC1C,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;gBACnD,CAAC,CAAC,CAAA;gBAEF,OAAO;oBACL,MAAM;oBACN,mDAAmD;oBACnD,MAAM;oBACN,+DAA+D;oBAC/D,eAAe;oBACf,OAAO;oBACP,OAAO;oBACP,SAAS;iBACV,CAAA;YACH,CAAC,CAAA;YACD,OAAO;gBACL,iCAAiC;gBACjC,wBAAwB,EAAE,yBAAyB;gBACnD,iCAAiC;gBACjC,oBAAoB,EAAE,qBAAqB;gBAC3C,iCAAiC;gBACjC,0BAA0B,EAAE,2BAA2B;gBACvD,iCAAiC;gBACjC,4BAA4B,EAAE,6BAA6B;gBAC3D,iCAAiC;gBACjC,0BAA0B,EAAE,2BAA2B;gBACvD,iCAAiC;gBACjC,wBAAwB,EAAE,yBAAyB;gBACnD;;;mBAGG;gBACH,yBAAyB,EAAE,0BAA0B;gBACrD,gCAAgC;gBAChC,mBAAmB,EAAE,oBAAoB;gBACzC,iCAAiC;gBACjC,eAAe,EAAE,gBAAgB;aAClC,CAAA;QACH,CAAC,CAAA;IACH,CAAC,CAAC;CACH,CAAC;CAAG;AAEL,MAAM,OAAO,GAAG,CAAI,OAA2B,EAAE,EAAE;IACjD,0FAA0F;IAC1F;;OAEG;IACH,OAAO;IACP,MAAM,aAAa,GAAG,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IAmFpD,SAAS,oBAAoB,CAC3B,IAAS,EACT,YAAkB,EAClB,OAAa;QAEb,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,aAAa,CACvD,IAAI,EACJ,YAAY,EACZ,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,wCAAwC;SACxE,CAAA;QAED,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,CAAA;QAC3B,eAAe,CAAC,GAAG,EAAE;YACnB,SAAS,CAAC,KAAK,GAAG,KAAK,CAAA;QACzB,CAAC,CAAC,CAAA;QAEF,oDAAoD;QACpD,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACzB,sFAAsF;YACtF,oDAAoD;YACpD,8KAA8K;YAC9K,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAC5D,MAAM,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE,CAC1C,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC;gBAC/B,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;gBAC1D,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC;oBAC7B,CAAC,CAAC,MAAM,CAAC,SAAS;oBAClB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAC7B,CAAA;YACD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;gBACrB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAA;YAChC,CAAC;YACD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAA;YAC9B,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7B,OAAO,CAAC,KAAK,CAAC,oDAAoD,EAAE;oBAClE,IAAI;oBACJ,YAAY;oBACZ,OAAO;oBACP,CAAC;oBACD,SAAS;iBACV,CAAC,CAAA;gBACF,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACtB,oDAAoD,CACrD,CAAA;YACH,CAAC;YACD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC5C,CAAC;YAED,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAU,CAAA;QACrD,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,CAAA;AAC9D,CAAC,CAAA;AAED,wIAAwI;AACxI,MAAM,gBAAgB,GAAG,CAAO,GAAwC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAK,CAAC,CAAA;AAG7G,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,OAAiD,EACjD,SAAqC,EACrC,EAAE;IACF,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAExC,wGAAwG;IACxG,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,MAAM,QAAQ,GAAG,kBAAkB,EAKlC,CAAA;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;YAC1D,QAAQ,CAAC,MAAM,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,EAAE,CAAA;YACxC,WAAW,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;QACjC,CAAC;QACD,OAAO,QAAQ,CAAC,MAAO,CAAA;IACzB,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,CAAO,CAA0B,EAAE,EAAE;QACvD,MAAM,GAAG,GAAG,KAAK,EAAE,CAAA;QACnB,MAAM,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;QAC3G,WAAW,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;QAC/B,OAAO,EAAE,CAAA;IACX,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,CAAI,GAAW,EAAE,KAAc,EAAE,EAAE;QAC7C,MAAM,GAAG,GAAG,KAAK,EAAE,CAAA;QACnB,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACjC,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAa,CAAA;QACtB,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,EAAE,CAAA;QACpB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IACD,2DAA2D;IAC3D,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE;QACnB,MAAM,GAAG,GAAG,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;QAC/C,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QACvC,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAChC,OAAO,GAAG,CAAC,EAAE,CAAC,CAAA;IAChB,CAAC,CAAC,CAAA;IACJ,MAAM,UAAU,GAAG,GAAG,EAAE,CACtB,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE;QAClB,MAAM,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAC1C,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAA;QACzC,OAAO,GAAG,CAAA;IACZ,CAAC,CAAC,CAAA;IACJ,MAAM,IAAI,GAAsD;QAC9D,0BAA0B;QAC1B,sBAAsB;QACtB,4BAA4B;QAC5B,8BAA8B;QAC9B,4BAA4B;QAC5B,0BAA0B;QAC1B,2BAA2B;QAC3B,qBAAqB;QACrB,iBAAiB;KAClB,CAAA;IAGD,OAAO;QACL,UAAU;QACV,GAAG,OAAO,CAAC,MAAM,CAAC;QAClB,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAW,EAAE,EAAE;gBAC9B,OAAQ,WAAW,EAAU,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;YAC7C,CAAC,CAAQ,CAAA;YACT,OAAO,IAAI,CAAA;QACb,CAAC,EAAE,EAAoE,CAAC;KACzE,CAAA;AACH,CAAC,CAAA"}

package/dist/mutate.d.ts

@@ -14,12 +14,7 @@ export interface Res<A, E> {
 }
 export type WatchSource<T = any> = Ref<T> | ComputedRef<T> | (() => T);
 export declare function make<A, E, R>(self: Effect.Effect<A, E, R>): readonly [import("vue").ShallowRef<Result.Result<A, E>, Result.Result<A, E>>, ComputedRef<A | undefined>, Effect.Effect<Result.Success<A, E> | Result.Failure<A, E>, never, R>];
-export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> {
-    /**
-     * Map the handler; cache invalidation is already done in this handler.
-     * This is useful for e.g navigating, as you know caches have already updated.
-     */
-    mapHandler?: (handler: Effect.Effect<A, E, R>, input: I) => Effect.Effect<A2, E2, R2>;
+export interface MutationOptionsBase {
     /**
      * By default we invalidate one level of the query key, e.g $project/$configuration.get, we invalidate $project.
      * This can be overridden by providing a function that returns an array of filters and options.
@@ -29,14 +24,22 @@ export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> {
         options?: InvalidateOptions | undefined;
     }[];
 }
+/** @deprecated prefer more basic @see MutationOptionsBase and separate useMutation from Command.fn */
+export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> extends MutationOptionsBase {
+    /**
+     * Map the handler; cache invalidation is already done in this handler.
+     * This is useful for e.g navigating, as you know caches have already updated.
+     *
+     * @deprecated use `Command.fn` instead of `useMutation*` with `mapHandler` option.
+     */
+    mapHandler?: (handler: Effect.Effect<A, E, R>, input: I) => Effect.Effect<A2, E2, R2>;
+}
 export declare const asResult: {
     <A, E, R>(handler: Effect.Effect<A, E, R>): readonly [ComputedRef<Result.Result<A, E>>, Effect.Effect<Exit.Exit<A, E>, never, R>];
     <Args extends readonly any[], A, E, R>(handler: (...args: Args) => Effect.Effect<A, E, R>): readonly [ComputedRef<Result.Result<A, E>>, (...args: Args) => Effect.Effect<Exit.Exit<A, E>, never, R>];
 };
 export declare const makeMutation: () => {
-    <I, E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(self: RequestHandlerWithInput<I, A, E, R, Request>, options?: MutationOptions<A, E, R, A2, E2, R2, I>): (i: I) => Effect.Effect<A2, E2, R2>;
-    <E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(self: RequestHandler<A, E, R, Request>, options?: MutationOptions<A, E, R, A2, E2, R2>): Effect.Effect<A2, E2, R2>;
+    <I, E, A, R, Request extends TaggedRequestClassAny>(self: RequestHandlerWithInput<I, A, E, R, Request>, options?: MutationOptionsBase): (i: I) => Effect.Effect<A, E, R>;
+    <E, A, R, Request extends TaggedRequestClassAny>(self: RequestHandler<A, E, R, Request>, options?: MutationOptionsBase): Effect.Effect<A, E, R>;
 };
-export interface MakeMutation2 extends ReturnType<typeof makeMutation> {
-}
 //# sourceMappingURL=mutate.d.ts.map

package/dist/mutate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutate.d.ts","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mutate.d.ts","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"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"}

package/dist/mutate.js

@@ -2,7 +2,7 @@
 import * as Result from "@effect-atom/atom/Result";
 import { useQueryClient } from "@tanstack/vue-query";
 import { Effect, Option } from "effect-app";
-import { identity, tuple } from "effect-app/Function";
+import { tuple } from "effect-app/Function";
 import { computed, shallowRef } from "vue";
 import { makeQueryKey } from "./lib.js";
 export const getQueryKey = (h) => {
@@ -72,10 +72,6 @@ export const asResult = (handler) => {
     return tuple(computed(() => state.value), act);
 };
 export const makeMutation = () => {
-    /**
-     * Pass a function that returns an Effect, e.g from a client action, or an Effect
-     * Returns a tuple with state ref and execution function which reports errors as Toast.
-     */
     const useMutation = (self, options) => {
         const queryClient = useQueryClient();
         const invalidateQueries = (filters, options) => Effect.currentSpan.pipe(Effect.orElseSucceed(() => null), Effect.flatMap((span) => Effect.promise(() => queryClient.invalidateQueries(filters, { ...options, updateMeta: { span } }))));
@@ -96,12 +92,11 @@ export const makeMutation = () => {
                 .andThen(Effect.annotateCurrentSpan({ queryKey }), invalidateQueries({ queryKey }))
                 .pipe(Effect.withSpan("client.query.invalidation", { captureStackTrace: false }));
         });
-        const mapHandler = options?.mapHandler ?? identity;
-        const handle = (self, i = void 0) => (mapHandler(Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache }), i));
+        const handle = (self) => Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache });
         const handler = self.handler;
-        const r = Effect.isEffect(handler) ? handle(handler) : (i) => handle(handler(i), i);
+        const r = Effect.isEffect(handler) ? handle(handler) : (i) => handle(handler(i));
         return r;
     };
     return useMutation;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXV0YXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL211dGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxLQUFLLE1BQU0sTUFBTSwwQkFBMEIsQ0FBQTtBQUNsRCxPQUFPLEVBQXVELGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQ3pHLE9BQU8sRUFBYyxNQUFNLEVBQWEsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRWxFLE9BQU8sRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDckQsT0FBTyxFQUFFLFFBQVEsRUFBOEIsVUFBVSxFQUFFLE1BQU0sS0FBSyxDQUFBO0FBQ3RFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFFdkMsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFHLENBQUMsQ0FBbUIsRUFBRSxFQUFFO0lBQ2pELE1BQU0sR0FBRyxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMzQixNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUE7SUFDL0MsNkZBQTZGO0lBQzdGLG9GQUFvRjtJQUNwRixNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUE7SUFDakYsSUFBSSxDQUFDLENBQUM7UUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXV0YXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL211dGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxLQUFLLE1BQU0sTUFBTSwwQkFBMEIsQ0FBQTtBQUNsRCxPQUFPLEVBQXVELGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQ3pHLE9BQU8sRUFBYyxNQUFNLEVBQWEsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRWxFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsUUFBUSxFQUE4QixVQUFVLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFDdEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUV2QyxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FBQyxDQUFtQixFQUFFLEVBQUU7SUFDakQsTUFBTSxHQUFHLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzNCLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUMvQyw2RkFBNkY7SUFDN0Ysb0ZBQW9GO0lBQ3BGLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQTtJQUNqRixJQUFJLENBQUMsQ0FBQztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3pELE9B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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue",
-  "version": "2.56.3",
+  "version": "2.57.0",
   "license": "MIT",
   "type": "module",
   "homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",

package/src/makeClient.ts

@@ -4,7 +4,7 @@ import { type InitialDataFunction, isCancelledError, type QueryObserverResult, t
 import { Cause, Effect, Exit, Layer, ManagedRuntime, Match, Option, Runtime, S, Struct } from "effect-app"
 import type { RequestHandler, RequestHandlerWithInput, TaggedRequestClassAny } from "effect-app/client/clientFor"
 import { ErrorSilenced, type SupportedErrors } from "effect-app/client/errors"
-import { constant, pipe, tuple } from "effect-app/Function"
+import { constant, identity, pipe, tuple } from "effect-app/Function"
 import { type OperationFailure, OperationSuccess } from "effect-app/Operations"
 import type { Schema } from "effect-app/Schema"
 import { dropUndefinedT } from "effect-app/utils"
@@ -16,13 +16,13 @@ import { makeUseCommand } from "./experimental/makeUseCommand.js"
 import { Toast } from "./experimental/toast.js"
 import { buildFieldInfoFromFieldsRoot } from "./form.js"
 import { reportRuntimeError } from "./lib.js"
-import { asResult, makeMutation, type MutationOptions, mutationResultToVue, type Res } from "./mutate.js"
+import { asResult, makeMutation, type MutationOptions, type MutationOptionsBase, mutationResultToVue, type Res } from "./mutate.js"
 import { type KnownFiberFailure, makeQuery, type QueryObserverOptionsCustom } from "./query.js"
 
-const tapHandler = <A, E, R, I>(
+const mapHandler = <A, E, R, I = void, A2 = A, E2 = E, R2 = R>(
   handler: Effect.Effect<A, E, R> | ((i: I) => Effect.Effect<A, E, R>),
-  map: (self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
-) => Effect.isEffect(handler) ? map(handler) : (i: I) => map(handler(i))
+  map: (self: Effect.Effect<A, E, R>, i: I) => Effect.Effect<A2, E2, R2>
+) => Effect.isEffect(handler) ? map(handler, undefined as any) : (i: I) => map(handler(i), i)
 
 /**
  * Use this after handling an error yourself, still continueing on the Error track, but the error will not be reported.
@@ -112,6 +112,7 @@ type ActResp<A, E, R, V = ComputedRef<Res<A, E>>> = readonly [
 
 export const suppressToast = constant(Effect.succeed(undefined))
 
+/** handles errors as specified and reports defects */
 function handleRequest<
   E extends ResponseErrors,
   A,
@@ -184,23 +185,25 @@ function handleRequest<
   )
 }
 
-const _useUnsafeMutation = makeMutation()
+const _useMutation = makeMutation()
 
-export const useUnsafeMutation: typeof _useUnsafeMutation = <
+/**
+ * Pass an Effect or a function that returns an Effect, e.g from a client action
+ * Executes query cache invalidation based on default rules or provided option.
+ * adds a span with the mutation name
+ */
+export const useMutation: typeof _useMutation = <
   I,
   E,
   A,
   R,
-  Request extends TaggedRequestClassAny,
-  A2 = A,
-  E2 = E,
-  R2 = R
+  Request extends TaggedRequestClassAny
 >(
   self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
-  options?: MutationOptions<A, E, R, A2, E2, R2, I>
+  options?: MutationOptionsBase
 ) =>
-  tapHandler(
-    _useUnsafeMutation(self as any, options),
+  mapHandler(
+    _useMutation(self as any, options),
     Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false })
   ) as any
 
@@ -209,6 +212,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
   effect: Effect.gen(function*() {
     const intl = yield* I18n
     const toast = yield* Toast
+
     return <R>(runtime: Runtime.Runtime<R>) => {
       /**
        * Effect results are converted to Exit, so errors are ignored by default.
@@ -233,18 +237,22 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
         self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
         options?: MutationOptions<A, E, R, A2, E2, R2, I>
       ) => {
-        const unsafe = _useUnsafeMutation(self as any, options)
+        const unsafe = _useMutation(self as any, options)
+
+        type MH = NonNullable<NonNullable<typeof options>["mapHandler"]>
+        const mh = options?.mapHandler ?? identity as MH
 
-        const [a, b] = asResult(tapHandler(unsafe, Effect.tapDefect(reportRuntimeError)) as any)
+        const [a, b] = asResult(mapHandler(mapHandler(unsafe as any, mh), Effect.tapDefect(reportRuntimeError)) as any)
         return [
           a,
-          tapHandler(
+          mapHandler(
             b,
             Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false })
           )
         ] as const as any
       }
 
+      /** handles errors as toasts and reports defects */
       const _useHandleRequestWithToast = () => {
         return handleRequestWithToast
         /**
@@ -427,7 +435,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
       ): any => {
         const handleRequestWithToast = _useHandleRequestWithToast()
         const handler = self.handler
-        const [a, b] = asResult(_useUnsafeMutation({
+        const unsafe = _useMutation({
           ...self,
           handler: Effect.isEffect(handler)
             ? (pipe(
@@ -439,7 +447,13 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
                 Effect.annotateCurrentSpan({ action }),
                 Effect.zipRight(handler(...args))
               )
-        }, options ? dropUndefinedT(options) : undefined))
+        }, options ? dropUndefinedT(options) : undefined)
+
+        type MH = NonNullable<NonNullable<typeof options>["mapHandler"]>
+        const mh = options?.mapHandler ?? identity as MH
+
+        // Effect.tapDefect(reportRuntimeError) handled in toast handler,
+        const [a, b] = asResult(mapHandler(unsafe, mh) as any)
 
         return tuple(
           a,
@@ -651,7 +665,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           options?: LowOptsOptional<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
         ): ActResp<A2, E2, R2>
       } = (self: any, action: string, options: any) => {
-        const [a, b] = asResult(_useUnsafeMutation({
+        const unsafe = _useMutation({
           ...self,
           handler: Effect.isEffect(self.handler)
             ? (pipe(
@@ -663,7 +677,12 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
                 Effect.annotateCurrentSpan({ action }),
                 Effect.andThen(self.handler(...args))
               )
-        }, options ? dropUndefinedT(options) : undefined))
+        }, options ? dropUndefinedT(options) : undefined)
+
+        type MH = NonNullable<NonNullable<typeof options>["mapHandler"]>
+        const mh = options?.mapHandler ?? identity as MH
+
+        const [a, b] = asResult(mapHandler(mapHandler(unsafe as any, mh), Effect.tapDefect(reportRuntimeError)) as any)
 
         return tuple(
           computed(() => mutationResultToVue(a.value)),
@@ -783,7 +802,10 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
         useAndHandleMutationCustom: _useAndHandleMutationCustom,
         /** @deprecated use Command.fn */
         makeUseAndHandleMutation: _makeUseAndHandleMutation,
-        /** @deprecated use Command.fn */
+        /**
+         * handles errors as toasts and reports defects
+         * @deprecated use Command.fn
+         */
         useHandleRequestWithToast: _useHandleRequestWithToast,
         /** @deprecated use OmegaForm */
         buildFormFromSchema: _buildFormFromSchema,
@@ -943,7 +965,7 @@ const mkQuery = <R>(runtime: Runtime.Runtime<R>) => {
 const managedRuntimeRt = <A, E>(mrt: ManagedRuntime.ManagedRuntime<A, E>) => mrt.runSync(Effect.runtime<A>())
 
 type Base = I18n | Toast
-export const makeClient = async <RT, RE, RL>(
+export const makeClient = <RT, RE, RL>(
   baseMrt: ManagedRuntime.ManagedRuntime<RT, never>,
   rootLayer: Layer.Layer<RL | Base, RE>
 ) => {

package/src/mutate.ts

@@ -3,7 +3,7 @@ import * as Result from "@effect-atom/atom/Result"
 import { type InvalidateOptions, type InvalidateQueryFilters, useQueryClient } from "@tanstack/vue-query"
 import { type Cause, Effect, type Exit, Option } from "effect-app"
 import type { RequestHandler, RequestHandlerWithInput, TaggedRequestClassAny } from "effect-app/client/clientFor"
-import { identity, tuple } from "effect-app/Function"
+import { tuple } from "effect-app/Function"
 import { computed, type ComputedRef, type Ref, shallowRef } from "vue"
 import { makeQueryKey } from "./lib.js"
 
@@ -67,12 +67,7 @@ export function make<A, E, R>(self: Effect.Effect<A, E, R>) {
   return tuple(result, latestSuccess, execute)
 }
 
-export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> {
-  /**
-   * Map the handler; cache invalidation is already done in this handler.
-   * This is useful for e.g navigating, as you know caches have already updated.
-   */
-  mapHandler?: (handler: Effect.Effect<A, E, R>, input: I) => Effect.Effect<A2, E2, R2>
+export interface MutationOptionsBase {
   /**
    * By default we invalidate one level of the query key, e.g $project/$configuration.get, we invalidate $project.
    * This can be overridden by providing a function that returns an array of filters and options.
@@ -83,6 +78,17 @@ export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> {
   }[]
 }
 
+/** @deprecated prefer more basic @see MutationOptionsBase and separate useMutation from Command.fn */
+export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> extends MutationOptionsBase {
+  /**
+   * Map the handler; cache invalidation is already done in this handler.
+   * This is useful for e.g navigating, as you know caches have already updated.
+   *
+   * @deprecated use `Command.fn` instead of `useMutation*` with `mapHandler` option.
+   */
+  mapHandler?: (handler: Effect.Effect<A, E, R>, input: I) => Effect.Effect<A2, E2, R2>
+}
+
 // TODO: more efficient invalidation, including args etc
 // return Effect.promise(() => queryClient.invalidateQueries({
 //   predicate: (_) => nses.includes(_.queryKey.filter((_) => _.startsWith("$")).join("/"))
@@ -137,22 +143,26 @@ export const asResult: {
 }
 
 export const makeMutation = () => {
-  /**
-   * Pass a function that returns an Effect, e.g from a client action, or an Effect
-   * Returns a tuple with state ref and execution function which reports errors as Toast.
-   */
   const useMutation: {
-    <I, E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(
+    /**
+     * Pass a function that returns an Effect, e.g from a client action
+     * Executes query cache invalidation based on default rules or provided option.
+     */
+    <I, E, A, R, Request extends TaggedRequestClassAny>(
       self: RequestHandlerWithInput<I, A, E, R, Request>,
-      options?: MutationOptions<A, E, R, A2, E2, R2, I>
-    ): (i: I) => Effect.Effect<A2, E2, R2>
-    <E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(
+      options?: MutationOptionsBase
+    ): (i: I) => Effect.Effect<A, E, R>
+    /**
+     * Pass an Effect, e.g from a client action
+     * Executes query cache invalidation based on default rules or provided option.
+     */
+    <E, A, R, Request extends TaggedRequestClassAny>(
       self: RequestHandler<A, E, R, Request>,
-      options?: MutationOptions<A, E, R, A2, E2, R2>
-    ): Effect.Effect<A2, E2, R2>
-  } = <I, E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(
+      options?: MutationOptionsBase
+    ): Effect.Effect<A, E, R>
+  } = <I, E, A, R, Request extends TaggedRequestClassAny>(
     self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
-    options?: MutationOptions<A, E, R, A2, E2, R2, I>
+    options?: MutationOptionsBase
   ) => {
     const queryClient = useQueryClient()
 
@@ -193,21 +203,13 @@ export const makeMutation = () => {
         .pipe(Effect.withSpan("client.query.invalidation", { captureStackTrace: false }))
     })
 
-    type MH = NonNullable<NonNullable<typeof options>["mapHandler"]>
-    const mapHandler = options?.mapHandler ?? identity as MH
-
-    const handle = (self: Effect.Effect<A, E, R>, i: I | void = void 0) => (mapHandler(
-      Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache }),
-      i as I
-    ))
+    const handle = (self: Effect.Effect<A, E, R>) =>
+      Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache })
 
     const handler = self.handler
-    const r = Effect.isEffect(handler) ? handle(handler) : (i: I) => handle(handler(i), i)
+    const r = Effect.isEffect(handler) ? handle(handler) : (i: I) => handle(handler(i))
 
     return r as any
   }
   return useMutation
 }
-
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type
-export interface MakeMutation2 extends ReturnType<typeof makeMutation> {}