@effect-app/vue 2.65.0 → 2.66.0

package/dist/experimental/makeUseCommand.d.ts

@@ -1,28 +1,28 @@
 import { Effect } from "effect-app";
 import { Commander } from "./commander.js";
 export declare const makeUseCommand: <R = never>() => Effect.Effect<{
-    alt: <const Id extends string>(id: Id) => <Args extends Array<any>, A, E, R_1 extends import("./commander.js").CommandContext | R>(handler: (...args: Args) => Effect.Effect<A, E, R_1>) => Commander.CommandOut<Args, A, E, R_1, Id>;
+    alt: <const Id extends string>(id: Id) => <Args extends Array<unknown>, A, E, R_1 extends import("./commander.js").CommandContext | R>(handler: (...args: Args) => Effect.Effect<A, E, R_1>) => Commander.CommandOut<Args, A, E, R_1, Id>;
     fn: <const Id extends string>(id: Id) => Commander.Gen<R, Id> & Commander.NonGen<R, Id>;
-    wrap: <const Id extends string, Args extends Array<any>, A_1, E_1, R_2>(mutation: {
+    wrap: <const Id extends string, Args extends Array<unknown>, A_1, E_1, R_2>(mutation: {
         mutate: (...args: Args) => Effect.Effect<A_1, E_1, R_2>;
         name: Id;
     }) => Commander.GenWrap<R, Id, Args, A_1, E_1, R_2> & Commander.NonGenWrap<R, Id, Args, A_1, E_1, R_2>;
-    alt2: <const Id extends string, MutArgs extends Array<any>, MutA, MutE, MutR>(id: Id | {
+    alt2: <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR>(id: Id | {
         name: Id;
         mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
-    }) => <Args_1 extends Array<any>, A_2, E_2, R_3 extends import("./commander.js").CommandContext | R>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
+    }) => <Args_1 extends Array<unknown>, A_2, E_2, R_3 extends import("./commander.js").CommandContext | R>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
         mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
     }) => (...args: Args_1) => Effect.Effect<A_2, E_2, R_3>) => Commander.CommandOut<Args_1, A_2, E_2, R_3, Id>;
     takeOver: <Args_1 extends any[], A_3, E_3, R_4, const Id extends string>(command: Commander.CommandOut<Args_1, A_3, E_3, R_4, Id>) => (...args: Args_1) => Effect.Effect<A_3, E_3, import("./commander.js").CommandContext | Exclude<Exclude<R_4, import("./commander.js").CommandContext>, import("effect/Tracer").ParentSpan>>;
     confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("./commander.js").CommandContext>;
     confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("./commander.js").CommandContext>;
-    updateAction: <Args_1 extends Array<any>>(update: (currentActionId: string, ...args: Args_1) => string) => <A_4, E_4, R_5>(_: Effect.Effect<A_4, E_4, R_5>, ...input: Args_1) => Effect.Effect<A_4, E_4, import("./commander.js").CommandContext | R_5>;
-    defaultFailureMessageHandler: <E_5, Args_1 extends readonly any[]>(action: string, errorRenderer?: ((e: E_5, action: string, ...args: Args_1) => string | undefined) | undefined) => (o: import("effect/Option").Option<E_5>, ...args: Args_1) => string | {
+    updateAction: <Args_1 extends Array<unknown>>(update: (currentActionId: string, ...args: Args_1) => string) => <A_4, E_4, R_5>(_: Effect.Effect<A_4, E_4, R_5>, ...input: Args_1) => Effect.Effect<A_4, E_4, import("./commander.js").CommandContext | R_5>;
+    defaultFailureMessageHandler: <E_5, Args_1 extends Array<unknown>, AME, AMR>(actionMaker: string | ((o: import("effect/Option").Option<E_5>, ...args: Args_1) => string) | ((o: import("effect/Option").Option<E_5>, ...args: Args_1) => Effect.Effect<string, AME, AMR>), errorRenderer?: ((e: E_5, action: string, ...args: Args_1) => string | undefined) | undefined) => (o: import("effect/Option").Option<E_5>, ...args: Args_1) => Effect.Effect<string | {
         level: "warn";
         message: string;
-    };
+    }, AME, AMR>;
     renderError: <E_5, Args_2 extends readonly any[]>(action: string, errorRenderer?: ((e: E_5, action: string, ...args: Args_2) => string | undefined) | undefined) => (e: E_5, ...args: Args_2) => string;
-    withDefaultToast: <A_4, E_5, R_6, Args_3 extends ReadonlyArray<unknown>>(options?: {
+    withDefaultToast: <A_4, E_5, R_6, Args_3 extends Array<unknown>>(options?: {
         errorRenderer?: (e: E_5, action: string, ...args: Args_3) => string | undefined;
         onWaiting?: string | ((action: string, ...args: Args_3) => string | null | undefined) | null | undefined;
         onSuccess?: string | ((a: A_4, action: string, ...args: Args_3) => string | null | undefined) | null | undefined;

package/dist/experimental/toast.d.ts

@@ -77,7 +77,7 @@ declare const Toast_base: (abstract new (service: {
         success: (message: string, options?: ToastOptsInternal) => Effect.Effect<ToastId, never, never>;
         warning: (message: string, options?: ToastOptsInternal) => Effect.Effect<ToastId, never, never>;
         dismiss: (toastId: ToastId) => Effect.Effect<void, never, never>;
-    }) => X) => X extends Effect.Effect<infer A, infer E, infer R_2> ? Effect.Effect<A, E, R_2 | Toast> : Effect.Effect<X, never, Toast>;
+    }) => X) => X extends Effect.Effect<infer A, infer E, infer R_2> ? Effect.Effect<A, E, Toast | R_2> : Effect.Effect<X, never, Toast>;
 };
 export declare class Toast extends Toast_base {
 }

package/dist/experimental/withToast.d.ts

@@ -13,10 +13,10 @@ export interface ToastOptions<A, E, Args extends ReadonlyArray<unknown>, WaiR, S
     }, never, ErrR>);
 }
 declare const WithToast_base: Effect.Service.Class<WithToast, "WithToast", {
-    readonly effect: Effect.Effect<(<A, E, Args extends ReadonlyArray<unknown>, R, WaiR = never, SucR = never, ErrR = never>(options: ToastOptions<A, E, Args, WaiR, SucR, ErrR>) => (self: Effect.Effect<A, E, R>, ...args: Args) => Effect.Effect<A, E, R | WaiR | SucR | ErrR>), never, Toast>;
+    readonly effect: Effect.Effect<(<A, E, Args extends Array<unknown>, R, WaiR = never, SucR = never, ErrR = never>(options: ToastOptions<A, E, Args, WaiR, SucR, ErrR>) => (self: Effect.Effect<A, E, R>, ...args: Args) => Effect.Effect<A, E, R | WaiR | SucR | ErrR>), never, Toast>;
 }>;
 export declare class WithToast extends WithToast_base {
-    static readonly handle: <A, E, Args extends ReadonlyArray<unknown>, R, WaiR = never, SucR = never, ErrR = never>(options: ToastOptions<A, E, Args, WaiR, SucR, ErrR>) => (self: Effect.Effect<A, E, R>, ...args: Args) => Effect.Effect<A, E, R | WaiR | SucR | ErrR | WithToast>;
+    static readonly handle: <A, E, Args extends Array<unknown>, R, WaiR = never, SucR = never, ErrR = never>(options: ToastOptions<A, E, Args, WaiR, SucR, ErrR>) => (self: Effect.Effect<A, E, R>, ...args: Args) => Effect.Effect<A, E, R | WaiR | SucR | ErrR | WithToast>;
 }
 export {};
 //# sourceMappingURL=withToast.d.ts.map

package/dist/experimental/withToast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withToast.d.ts","sourceRoot":"","sources":["../../src/experimental/withToast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAkB,KAAK,EAAE,MAAM,YAAY,CAAA;AAElD,MAAM,WAAW,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IACvF,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,EACL,MAAM,GACN,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,GAAG,IAAI,CAAC,GAClC,IAAI,GACJ,CAAC,CACD,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IACjD,SAAS,EACL,MAAM,GACN,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,GAAG,IAAI,CAAC,GACxC,IAAI,GACJ,CAAC,CACD,CAAC,EAAE,CAAC,EACJ,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IACjD,SAAS,EACL,MAAM,GACN,CAAC,CACD,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EACvB,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,GACzD,CAAC,CACD,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EACvB,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;CAC1F;;qCAoBW,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,UAAU,IAAI,UAAU,IAAI,mBAC3E,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;;AAJzD,qBAAa,SAAU,SAAQ,cAkD7B;IACA,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAI,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAC9G,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,KAClD,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC,CACb;CAC/F"}
+{"version":3,"file":"withToast.d.ts","sourceRoot":"","sources":["../../src/experimental/withToast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,YAAY,CAAA;AAEvD,OAAO,EAAkB,KAAK,EAAE,MAAM,YAAY,CAAA;AAElD,MAAM,WAAW,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IACvF,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,EACL,MAAM,GACN,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,GAAG,IAAI,CAAC,GAClC,IAAI,GACJ,CAAC,CACD,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IACjD,SAAS,EACL,MAAM,GACN,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,GAAG,IAAI,CAAC,GACxC,IAAI,GACJ,CAAC,CACD,CAAC,EAAE,CAAC,EACJ,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IACjD,SAAS,EACL,MAAM,GACN,CAAC,CACD,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EACvB,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,GACzD,CAAC,CACD,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EACvB,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;CAC1F;;qCAMW,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,UAAU,IAAI,UAAU,IAAI,mBACnE,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;;AAJzD,qBAAa,SAAU,SAAQ,cAkD7B;IACA,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAI,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EACtG,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,KAClD,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC,CACb;CAC/F"}

package/dist/experimental/withToast.js

@@ -1,17 +1,6 @@
 import { Cause, Effect } from "effect-app";
+import { wrapEffect } from "effect-app/utils";
 import { CurrentToastId, Toast } from "./toast.js";
-// unifies any input to be an effect.
-const wrapEffect = (m) => {
-    if (typeof m === "function") {
-        return (...args) => {
-            const r = m(...args);
-            if (Effect.isEffect(r))
-                return r;
-            return Effect.succeed(r);
-        };
-    }
-    return () => Effect.succeed(m);
-};
 // @effect-diagnostics-next-line missingEffectServiceDependency:off
 export class WithToast extends Effect.Service()("WithToast", {
     effect: Effect.gen(function* () {
@@ -48,4 +37,4 @@ export class WithToast extends Effect.Service()("WithToast", {
 }) {
     static handle = (options) => (self, ...args) => this.use((_) => _(options)(self, ...args));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aFRvYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4cGVyaW1lbnRhbC93aXRoVG9hc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQWUsTUFBTSxZQUFZLENBQUE7QUFDdkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUE7QUErQmxELHFDQUFxQztBQUNyQyxNQUFNLFVBQVUsR0FBRyxDQUNqQixDQUEyRSxFQUMzRSxFQUFFO0lBQ0YsSUFBSSxPQUFPLENBQUMsS0FBSyxVQUFVLEVBQUUsQ0FBQztRQUM1QixPQUFPLENBQUMsR0FBRyxJQUFVLEVBQThCLEVBQUU7WUFDbkQsTUFBTSxDQUFDLEdBQUksQ0FBUyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUE7WUFDN0IsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFBRSxPQUFPLENBQTJCLENBQUE7WUFDMUQsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzFCLENBQUMsQ0FBQTtJQUNILENBQUM7SUFDRCxPQUFPLEdBQStCLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQzVELENBQUMsQ0FBQTtBQUVELG1FQUFtRTtBQUNuRSxNQUFNLE9BQU8sU0FBVSxTQUFRLE1BQU0sQ0FBQyxPQUFPLEVBQWEsQ0FBQyxXQUFXLEVBQUU7SUFDdEUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQzFCLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQTtRQUMxQixPQUFPLENBQ0wsT0FBbUQsRUFDbkQsRUFBRSxDQUNGLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUMsSUFBNEIsRUFBRSxHQUFHLElBQVU7WUFDckUsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sSUFBSSxLQUFLLENBQUE7WUFFNUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFBO1lBQ3ZELE1BQU0sT0FBTyxHQUFHLENBQUMsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FDeEQsQ0FBQyxDQUFDLHlCQUF5QjthQUM1QixDQUFBO1lBQ0QsT0FBTyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUNyQixNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUMsQ0FBQztnQkFDdEMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQTtnQkFDMUQsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUM7b0JBQ2YsT0FBTTtnQkFDUixDQUFDO2dCQUNELEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQ2xCLENBQUMsRUFDRCxPQUFPLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsQ0FDekYsQ0FBQTtZQUNILENBQUMsQ0FBQyxDQUFDLEVBQ0gsTUFBTSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFDLEtBQUs7Z0JBQ3BELEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQ3BCLGtDQUFrQyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQ3hELEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsRUFDOUIsS0FBSyxDQUNOLENBQUE7Z0JBRUQsSUFBSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztvQkFDbkMsSUFBSSxPQUFPO3dCQUFFLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUE7b0JBQzFDLE9BQU07Z0JBQ1IsQ0FBQztnQkFFRCxNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQTtnQkFDbkYsTUFBTSxJQUFJLEdBQUcsRUFBRSxPQUFPLEVBQUUsV0FBVyxHQUFHLENBQUMsRUFBRSxDQUFBO2dCQUV6QyxJQUFJLE9BQU8sQ0FBQyxLQUFLLFFBQVEsRUFBRSxDQUFDO29CQUMxQixPQUFPLENBQUMsQ0FBQyxLQUFLLEtBQUssTUFBTTt3QkFDdkIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxPQUFPLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsSUFBSSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO3dCQUMxRixDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLE9BQU8sS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxJQUFJLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtnQkFDNUYsQ0FBQztnQkFDRCxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxPQUFPLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsSUFBSSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDaEYsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQyxFQUMzQixPQUFPLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLGNBQWMsRUFBRSxjQUFjLENBQUMsRUFBRSxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUN6RyxDQUFBO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUM7Q0FDSCxDQUFDO0lBQ0EsTUFBTSxDQUFVLE1BQU0sR0FBRyxDQUN2QixPQUFtRCxFQUN1RCxFQUFFLENBQzlHLENBQUMsSUFBSSxFQUFFLEdBQUcsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQWtDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aFRvYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4cGVyaW1lbnRhbC93aXRoVG9hc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQWUsTUFBTSxZQUFZLENBQUE7QUFDdkQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQzdDLE9BQU8sRUFBRSxjQUFjLEVBQUUsS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBK0JsRCxtRUFBbUU7QUFDbkUsTUFBTSxPQUFPLFNBQVUsU0FBUSxNQUFNLENBQUMsT0FBTyxFQUFhLENBQUMsV0FBVyxFQUFFO0lBQ3RFLE1BQU0sRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUMxQixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUE7UUFDMUIsT0FBTyxDQUNMLE9BQW1ELEVBQ25ELEVBQUUsQ0FDRixNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFDLElBQTRCLEVBQUUsR0FBRyxJQUFVO1lBQ3JFLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxPQUFPLElBQUksS0FBSyxDQUFBO1lBRTVDLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQTtZQUN2RCxNQUFNLE9BQU8sR0FBRyxDQUFDLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQ3hELENBQUMsQ0FBQyx5QkFBeUI7YUFDNUIsQ0FBQTtZQUNELE9BQU8sS0FBSyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDckIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FB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

package/dist/makeClient.d.ts

@@ -129,7 +129,7 @@ declare const LegacyMutation_base: Effect.Service.Class<LegacyMutation, "LegacyM
             <I_1, E_7, A_12, R_13, Request_12 extends TaggedRequestClassAny, Name_12 extends string, A2_13 = A_12, E2_13 = E_7, R2_13 = R_13>(self: RequestHandlerWithInput<I_1, A_12, E_7, R_13, Request_12, Name_12>, options?: MutationOptions<A_12, E_7, R_13, A2_13, E2_13, R2_13, I_1>): 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_14, Request_13 extends TaggedRequestClassAny, Name_13 extends string, A2_14 = A_13, E2_14 = E_8, R2_14 = R_14>(self: RequestHandler<A_13, E_8, R_14, Request_13, Name_13>, options?: MutationOptions<A_13, E_8, R_14, A2_14, E2_14, R2_14>): readonly [ComputedRef<Result.Result<A2_14, E2_14>>, Effect.Effect<Exit.Exit<A2_14, E2_14>, never, R2_14>];
         };
-    }), never, I18n | Toast>;
+    }), never, Toast | I18n>;
 }>;
 export declare class LegacyMutation extends LegacyMutation_base {
 }
@@ -220,28 +220,28 @@ export declare const makeClient: <RT, RE, RL>(getBaseMrt: () => ManagedRuntime.M
         };
     };
     useCommand: () => {
-        alt: <const Id extends string>(id: Id) => <Args extends Array<any>, A_18, E_10, R_14 extends I18n | Toast | import("./experimental/commander.js").CommandContext | RL>(handler: (...args: Args) => Effect.Effect<A_18, E_10, R_14>) => Commander.CommandOut<Args, A_18, E_10, R_14, 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 extends Array<any>, A_19, E_11, R_15>(mutation: {
+        alt: <const Id extends string>(id: Id) => <Args extends Array<unknown>, A_18, E_10, R_14 extends Toast | import("./experimental/commander.js").CommandContext | I18n | RL>(handler: (...args: Args) => Effect.Effect<A_18, E_10, R_14>) => Commander.CommandOut<Args, A_18, E_10, R_14, Id>;
+        fn: <const Id extends string>(id: Id) => Commander.Gen<Toast | I18n | RL, Id> & Commander.NonGen<Toast | I18n | RL, Id>;
+        wrap: <const Id extends string, Args extends Array<unknown>, A_19, E_11, R_15>(mutation: {
             mutate: (...args: Args) => Effect.Effect<A_19, E_11, R_15>;
             name: Id;
-        }) => Commander.GenWrap<I18n | Toast | RL, Id, Args, A_19, E_11, R_15> & Commander.NonGenWrap<I18n | Toast | RL, Id, Args, A_19, E_11, R_15>;
-        alt2: <const Id extends string, MutArgs extends Array<any>, MutA, MutE, MutR>(id: Id | {
+        }) => Commander.GenWrap<Toast | I18n | RL, Id, Args, A_19, E_11, R_15> & Commander.NonGenWrap<Toast | I18n | RL, Id, Args, A_19, E_11, R_15>;
+        alt2: <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR>(id: Id | {
             name: Id;
             mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
-        }) => <Args_1 extends Array<any>, A_20, E_12, R_16 extends I18n | Toast | import("./experimental/commander.js").CommandContext | RL>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
+        }) => <Args_1 extends Array<unknown>, A_20, E_12, R_16 extends Toast | import("./experimental/commander.js").CommandContext | I18n | RL>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
             mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
         }) => (...args: Args_1) => Effect.Effect<A_20, E_12, R_16>) => Commander.CommandOut<Args_1, A_20, E_12, R_16, Id>;
         takeOver: <Args_1 extends any[], A_21, E_13, R_17, const Id extends string>(command: Commander.CommandOut<Args_1, A_21, E_13, R_17, Id>) => (...args: Args_1) => Effect.Effect<A_21, E_13, import("./experimental/commander.js").CommandContext | Exclude<Exclude<R_17, import("./experimental/commander.js").CommandContext>, import("effect/Tracer").ParentSpan>>;
         confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("./experimental/commander.js").CommandContext>;
         confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("./experimental/commander.js").CommandContext>;
-        updateAction: <Args_1 extends Array<any>>(update: (currentActionId: string, ...args: Args_1) => string) => <A_22, E_14, R_18>(_: Effect.Effect<A_22, E_14, R_18>, ...input: Args_1) => Effect.Effect<A_22, E_14, import("./experimental/commander.js").CommandContext | R_18>;
-        defaultFailureMessageHandler: <E_15, Args_1 extends readonly any[]>(action: string, errorRenderer?: ((e: E_15, action: string, ...args: Args_1) => string | undefined) | undefined) => (o: Option.Option<E_15>, ...args: Args_1) => string | {
+        updateAction: <Args_1 extends Array<unknown>>(update: (currentActionId: string, ...args: Args_1) => string) => <A_22, E_14, R_18>(_: Effect.Effect<A_22, E_14, R_18>, ...input: Args_1) => Effect.Effect<A_22, E_14, import("./experimental/commander.js").CommandContext | R_18>;
+        defaultFailureMessageHandler: <E_15, Args_1 extends Array<unknown>, AME, AMR>(actionMaker: string | ((o: Option.Option<E_15>, ...args: Args_1) => string) | ((o: Option.Option<E_15>, ...args: Args_1) => Effect.Effect<string, AME, AMR>), errorRenderer?: ((e: E_15, action: string, ...args: Args_1) => string | undefined) | undefined) => (o: Option.Option<E_15>, ...args: Args_1) => Effect.Effect<string | {
             level: "warn";
             message: string;
-        };
+        }, AME, AMR>;
         renderError: <E_15, Args_2 extends readonly any[]>(action: string, errorRenderer?: ((e: E_15, action: string, ...args: Args_2) => string | undefined) | undefined) => (e: E_15, ...args: Args_2) => string;
-        withDefaultToast: <A_22, E_15, R_19, Args_3 extends ReadonlyArray<unknown>>(options?: {
+        withDefaultToast: <A_22, E_15, R_19, Args_3 extends Array<unknown>>(options?: {
             errorRenderer?: (e: E_15, action: string, ...args: Args_3) => string | undefined;
             onWaiting?: string | ((action: string, ...args: Args_3) => string | null | undefined) | null | undefined;
             onSuccess?: string | ((a: A_22, action: string, ...args: Args_3) => string | null | undefined) | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue",
-  "version": "2.65.0",
+  "version": "2.66.0",
   "license": "MIT",
   "type": "module",
   "homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
@@ -10,7 +10,7 @@
     "@tanstack/vue-query": "5.83.1",
     "@vueuse/core": "^13.9.0",
     "query-string": "^9.2.2",
-    "effect-app": "3.3.7"
+    "effect-app": "3.4.0"
   },
   "peerDependencies": {
     "@effect-atom/atom": "^0.1.22",

package/src/experimental/commander.ts

@@ -5,6 +5,7 @@ import { type Result } from "@effect-atom/atom/Result"
 import { Cause, Effect, type Exit, flow, Match, Option, Runtime, S } from "effect-app"
 import { SupportedErrors } from "effect-app/client"
 import { OperationFailure, OperationSuccess } from "effect-app/Operations"
+import { wrapEffect } from "effect-app/utils"
 import { type RuntimeFiber } from "effect/Fiber"
 import { type NoInfer } from "effect/Types"
 import { isGeneratorFunction, type YieldWrap } from "effect/Utils"
@@ -69,7 +70,7 @@ export declare namespace Commander {
     waiting: boolean
   }
 
-  export interface CommandOut<Args extends Array<any>, A, E, R, Id extends string> extends CommandProps<A, E, Id> {
+  export interface CommandOut<Args extends Array<unknown>, A, E, R, Id extends string> extends CommandProps<A, E, Id> {
     new(): {}
 
     /** click handlers */
@@ -91,7 +92,7 @@ export declare namespace Commander {
     exec: (...args: Args) => Effect.Effect<Exit.Exit<A, E>, never, Exclude<R, CommandContext>>
   }
 
-  type CommandOutHelper<Args extends Array<any>, Eff extends Effect.Effect<any, any, any>, Id extends string> =
+  type CommandOutHelper<Args extends Array<unknown>, Eff extends Effect.Effect<any, any, any>, Id extends string> =
     CommandOut<
       Args,
       Effect.Effect.Success<Eff>,
@@ -101,7 +102,7 @@ export declare namespace Commander {
     >
 
   export type Gen<RT, Id extends string> = {
-    <Eff extends YieldWrap<Effect.Effect<any, any, RT | CommandContext>>, AEff, Args extends Array<any>>(
+    <Eff extends YieldWrap<Effect.Effect<any, any, RT | CommandContext>>, AEff, Args extends Array<unknown>>(
       body: (...args: Args) => Generator<Eff, AEff, never>
     ): CommandOut<
       Args,
@@ -117,7 +118,7 @@ export declare namespace Commander {
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
-      Args extends Array<any>,
+      Args extends Array<unknown>,
       A extends Effect.Effect<any, any, RT | CommandContext>
     >(
       body: (...args: Args) => Generator<Eff, AEff, never>,
@@ -137,7 +138,7 @@ export declare namespace Commander {
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
-      Args extends Array<any>,
+      Args extends Array<unknown>,
       A,
       B extends Effect.Effect<any, any, RT | CommandContext>
     >(
@@ -159,7 +160,7 @@ export declare namespace Commander {
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
-      Args extends Array<any>,
+      Args extends Array<unknown>,
       A,
       B,
       C extends Effect.Effect<any, any, RT | CommandContext>
@@ -183,7 +184,7 @@ export declare namespace Commander {
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
-      Args extends Array<any>,
+      Args extends Array<unknown>,
       A,
       B,
       C,
@@ -209,7 +210,7 @@ export declare namespace Commander {
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
-      Args extends Array<any>,
+      Args extends Array<unknown>,
       A,
       B,
       C,
@@ -237,7 +238,7 @@ export declare namespace Commander {
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
-      Args extends Array<any>,
+      Args extends Array<unknown>,
       A,
       B,
       C,
@@ -267,7 +268,7 @@ export declare namespace Commander {
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
-      Args extends Array<any>,
+      Args extends Array<unknown>,
       A,
       B,
       C,
@@ -299,7 +300,7 @@ export declare namespace Commander {
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
-      Args extends Array<any>,
+      Args extends Array<unknown>,
       A,
       B,
       C,
@@ -333,7 +334,7 @@ export declare namespace Commander {
     <
       Eff extends YieldWrap<Effect.Effect<any, any, any>>,
       AEff,
-      Args extends Array<any>,
+      Args extends Array<unknown>,
       A,
       B,
       C,
@@ -369,32 +370,32 @@ export declare namespace Commander {
   }
 
   export type NonGen<RT, Id extends string> = {
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, Args extends Array<unknown>>(
       body: (...args: Args) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, Args extends Array<unknown>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, Args extends Array<unknown>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, Args extends Array<unknown>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
       c: (_: C, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, Args extends Array<unknown>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
       c: (_: C, ...args: NoInfer<Args>) => D,
       d: (_: D, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, Args extends Array<unknown>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
@@ -402,7 +403,7 @@ export declare namespace Commander {
       d: (_: D, ...args: NoInfer<Args>) => E,
       e: (_: E, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, Args extends Array<unknown>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
@@ -411,7 +412,7 @@ export declare namespace Commander {
       e: (_: E, ...args: NoInfer<Args>) => F,
       f: (_: F, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, G, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, G, Args extends Array<unknown>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
@@ -421,7 +422,7 @@ export declare namespace Commander {
       f: (_: F, ...args: NoInfer<Args>) => G,
       g: (_: G, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, G, H, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, G, H, Args extends Array<unknown>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
@@ -432,7 +433,7 @@ export declare namespace Commander {
       g: (_: G, ...args: NoInfer<Args>) => H,
       h: (_: H, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, G, H, I, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, A, B, C, D, E, F, G, H, I, Args extends Array<unknown>>(
       body: (...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
@@ -446,7 +447,7 @@ export declare namespace Commander {
     ): CommandOutHelper<Args, Eff, Id>
   }
 
-  export type GenWrap<RT, Id extends string, Args extends Array<any>, AEff, EEff, REff> = {
+  export type GenWrap<RT, Id extends string, Args extends Array<unknown>, AEff, EEff, REff> = {
     (): CommandOut<
       Args,
       AEff,
@@ -617,9 +618,9 @@ export declare namespace Commander {
     ): CommandOutHelper<Args, I, Id>
   }
 
-  export type NonGenWrap<RT, Id extends string, Args extends Array<any>, AEff, EEff, REff> = {
+  export type NonGenWrap<RT, Id extends string, Args extends Array<unknown>, AEff, EEff, REff> = {
     (): CommandOutHelper<Args, Effect.Effect<AEff, EEff, REff>, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, Args extends Array<unknown>>(
       a: (
         _: Effect.Effect<
           AEff,
@@ -629,7 +630,7 @@ export declare namespace Commander {
         ...args: NoInfer<Args>
       ) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, Args extends Array<unknown>>(
       a: (
         _: Effect.Effect<
           AEff,
@@ -640,7 +641,7 @@ export declare namespace Commander {
       ) => B,
       b: (_: B, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, Args extends Array<unknown>>(
       a: (
         _: Effect.Effect<
           AEff,
@@ -652,7 +653,7 @@ export declare namespace Commander {
       b: (_: B, ...args: NoInfer<Args>) => C,
       c: (_: C, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, Args extends Array<unknown>>(
       a: (
         _: Effect.Effect<
           AEff,
@@ -665,7 +666,7 @@ export declare namespace Commander {
       c: (_: C, ...args: NoInfer<Args>) => D,
       d: (_: D, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, Args extends Array<unknown>>(
       a: (
         _: Effect.Effect<
           AEff,
@@ -679,7 +680,7 @@ export declare namespace Commander {
       d: (_: D, ...args: NoInfer<Args>) => E,
       e: (_: E, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, Args extends Array<unknown>>(
       a: (
         _: Effect.Effect<
           AEff,
@@ -694,7 +695,7 @@ export declare namespace Commander {
       e: (_: E, ...args: NoInfer<Args>) => F,
       f: (_: F, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, G, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, G, Args extends Array<unknown>>(
       a: (
         _: Effect.Effect<
           AEff,
@@ -710,7 +711,7 @@ export declare namespace Commander {
       f: (_: F, ...args: NoInfer<Args>) => G,
       g: (_: G, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, G, H, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, G, H, Args extends Array<unknown>>(
       a: (
         _: Effect.Effect<
           AEff,
@@ -727,7 +728,7 @@ export declare namespace Commander {
       g: (_: G, ...args: NoInfer<Args>) => H,
       h: (_: H, ...args: NoInfer<Args>) => Eff
     ): CommandOutHelper<Args, Eff, Id>
-    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, G, H, I, Args extends Array<any>>(
+    <Eff extends Effect.Effect<any, any, RT | CommandContext>, B, C, D, E, F, G, H, I, Args extends Array<unknown>>(
       a: (
         _: Effect.Effect<
           AEff,
@@ -778,7 +779,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
     const makeCommand = <RT>(runtime: Runtime.Runtime<RT>) => {
       const runFork = Runtime.runFork(runtime)
       return <const Id extends string>(id: Id, errorDef?: Error) =>
-      <Args extends ReadonlyArray<any>, A, E, R extends RT | CommandContext>(
+      <Args extends ReadonlyArray<unknown>, A, E, R extends RT | CommandContext>(
         handler: (...args: Args) => Effect.Effect<A, E, R>
       ) => {
         // we capture the definition stack here, so we can append it to later stack traces
@@ -1053,10 +1054,17 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
         )
       }
 
-    const defaultFailureMessageHandler =
-      <E, Args extends readonly any[]>(action: string, errorRenderer?: ErrorRenderer<E, Args>) =>
-      (o: Option.Option<E>, ...args: Args) =>
-        Option.match(o, {
+    const 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>
+    ) =>
+      Effect.fnUntraced(function*(o: Option.Option<E>, ...args: Args) {
+        const action = yield* wrapEffect(actionMaker)(o, ...args)
+
+        return Option.match(o, {
           onNone: () =>
             intl.formatMessage(
               { id: "handle.unexpected_error2" },
@@ -1083,6 +1091,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
                 )
               }:\n` + renderError(action, errorRenderer)(e, ...args)
         })
+      })
 
     return {
       /** @experimental */
@@ -1163,7 +1172,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
         )
       }),
       updateAction:
-        <Args extends Array<any>>(update: (currentActionId: string, ...args: Args) => string) =>
+        <Args extends Array<unknown>>(update: (currentActionId: string, ...args: Args) => string) =>
         <A, E, R>(_: Effect.Effect<A, E, R>, ...input: Args) =>
           Effect.updateService(
             _,
@@ -1173,7 +1182,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
       defaultFailureMessageHandler,
       renderError,
       /** Version of withDefaultToast that automatically includes the action name in the default messages and uses intl */
-      withDefaultToast: <A, E, R, Args extends ReadonlyArray<unknown>>(
+      withDefaultToast: <A, E, R, Args extends Array<unknown>>(
         options?: {
           errorRenderer?: ErrorRenderer<E, Args>
           onWaiting?: null | undefined | string | ((action: string, ...args: Args) => string | null | undefined)
@@ -1276,9 +1285,9 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
         }
       }) as unknown as <RT>(
         runtime: Runtime.Runtime<RT>
-      ) => <const Id extends string, MutArgs extends Array<any>, MutA, MutE, MutR>(
+      ) => <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR>(
         id: Id | { name: Id; mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR> }
-      ) => <Args extends Array<any>, A, E, R extends RT | CommandContext>(
+      ) => <Args extends Array<unknown>, A, E, R extends RT | CommandContext>(
         handler: (
           ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
             // todo: only if we passed in one
@@ -1290,14 +1299,14 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
       /** @experimental */
       alt: makeCommand as unknown as <RT>(runtime: Runtime.Runtime<RT>) => <const Id extends string>(
         id: Id
-      ) => <Args extends Array<any>, A, E, R extends RT | CommandContext>(
+      ) => <Args extends Array<unknown>, A, E, R extends RT | CommandContext>(
         handler: (...args: Args) => Effect.Effect<A, E, R>
       ) => Commander.CommandOut<Args, A, E, R, Id>,
 
       /** @experimental */
       wrap: <RT>(runtime: Runtime.Runtime<RT>) => {
         const make = makeCommand(runtime)
-        return <const Id extends string, Args extends Array<any>, A, E, R>(
+        return <const Id extends string, Args extends Array<unknown>, A, E, R>(
           mutation: { mutate: (...args: Args) => Effect.Effect<A, E, R>; name: Id }
         ): Commander.GenWrap<RT, Id, Args, A, E, R> & Commander.NonGenWrap<RT, Id, Args, A, E, R> =>
         (

package/src/experimental/withToast.ts

@@ -1,4 +1,5 @@
 import { Cause, Effect, type Option } from "effect-app"
+import { wrapEffect } from "effect-app/utils"
 import { CurrentToastId, Toast } from "./toast.js"
 
 export interface ToastOptions<A, E, Args extends ReadonlyArray<unknown>, WaiR, SucR, ErrR> {
@@ -30,25 +31,11 @@ export interface ToastOptions<A, E, Args extends ReadonlyArray<unknown>, WaiR, S
     ) => Effect.Effect<string | { level: "warn" | "error"; message: string }, never, ErrR>)
 }
 
-// unifies any input to be an effect.
-const wrapEffect = <I, A, E, R, Args extends Array<any>>(
-  m: I | ((...args: Args) => A) | ((...args: Args) => Effect.Effect<A, E, R>)
-) => {
-  if (typeof m === "function") {
-    return (...args: Args): Effect.Effect<A | I, E, R> => {
-      const r = (m as any)(...args)
-      if (Effect.isEffect(r)) return r as Effect.Effect<A, E, R>
-      return Effect.succeed(r)
-    }
-  }
-  return (): Effect.Effect<A | I, E, R> => Effect.succeed(m)
-}
-
 // @effect-diagnostics-next-line missingEffectServiceDependency:off
 export class WithToast extends Effect.Service<WithToast>()("WithToast", {
   effect: Effect.gen(function*() {
     const toast = yield* Toast
-    return <A, E, Args extends ReadonlyArray<unknown>, R, WaiR = never, SucR = never, ErrR = never>(
+    return <A, E, Args extends Array<unknown>, R, WaiR = never, SucR = never, ErrR = never>(
       options: ToastOptions<A, E, Args, WaiR, SucR, ErrR>
     ) =>
       Effect.fnUntraced(function*(self: Effect.Effect<A, E, R>, ...args: Args) {
@@ -96,7 +83,7 @@ export class WithToast extends Effect.Service<WithToast>()("WithToast", {
       })
   })
 }) {
-  static readonly handle = <A, E, Args extends ReadonlyArray<unknown>, R, WaiR = never, SucR = never, ErrR = never>(
+  static readonly handle = <A, E, Args extends Array<unknown>, R, WaiR = never, SucR = never, ErrR = never>(
     options: ToastOptions<A, E, Args, WaiR, SucR, ErrR>
   ): (self: Effect.Effect<A, E, R>, ...args: Args) => Effect.Effect<A, E, R | WaiR | SucR | ErrR | WithToast> =>
   (self, ...args) => this.use((_) => _<A, E, Args, R, WaiR, SucR, ErrR>(options)(self, ...args))