npm - @effect-app/vue - Versions diffs - 2.53.4 → 2.54.1 - Mend

@effect-app/vue 2.53.4 → 2.54.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/CHANGELOG.md +12 -0
package/dist/experimental/commander.d.ts +4 -2
package/dist/experimental/commander.d.ts.map +1 -1
package/dist/experimental/commander.js +4 -4
package/dist/experimental/makeExperimental.d.ts +3 -1
package/dist/experimental/makeExperimental.d.ts.map +1 -1
package/dist/experimental/toast.d.ts +62 -35
package/dist/experimental/toast.d.ts.map +1 -1
package/dist/experimental/toast.js +22 -2
package/dist/experimental/withToast.d.ts +3 -2
package/dist/experimental/withToast.d.ts.map +1 -1
package/dist/experimental/withToast.js +16 -14
package/package.json +1 -1
package/src/experimental/commander.ts +3 -3
package/src/experimental/toast.ts +35 -8
package/src/experimental/withToast.ts +27 -25
package/test/dist/stubs.d.ts +3 -1
package/test/dist/stubs.d.ts.map +1 -1
package/test/dist/stubs.js +5 -5
package/test/stubs.ts +6 -6

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,17 @@
 # @effect-app/vue
+## 2.54.1
+### Patch Changes
+- 52cd239: fix type
+## 2.54.0
+### Minor Changes
+- 60e4105: enhance toasts.
 ## 2.53.4
 ### Patch Changes

package/dist/experimental/commander.d.ts CHANGED Viewed

@@ -133,7 +133,9 @@ declare const Commander_base: Effect.Service.Class<Commander, "Commander", {
         /** Version of @see confirm that automatically includes the action name in the default messages */
         confirm: (message?: string | undefined) => Effect.Effect<boolean, never, CommandContext>;
         /** Version of withDefaultToast that automatically includes the action name in the default messages and uses intl */
-        withDefaultToast: <A, E, R>(errorRenderer?: (e: E) => string | undefined) => (self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, CommandContext | R>;
+        withDefaultToast: <A, E, R>(options?: {
+            errorRenderer?: (e: E) => string | undefined;
+        }) => (self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, CommandContext | R>;
         /**
          * Define a Command
          * @param actionName The internal name of the action. will be used as Span. will be used to lookup user facing name via intl. `action.${actionName}`
@@ -147,7 +149,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>;
-    }, never, I18n | Confirm | WithToast>;
+    }, never, WithToast | Confirm | I18n>;
 }>;
 export declare class Commander extends Commander_base {
 }

package/dist/experimental/commander.d.ts.map CHANGED Viewed

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

package/dist/experimental/commander.js CHANGED Viewed

@@ -157,13 +157,13 @@ export class Commander extends Effect.Service()("Commander", {
                     ?? intl.formatMessage({ id: "handle.confirmation" }, { action: context.action }));
             }),
             /** Version of withDefaultToast that automatically includes the action name in the default messages and uses intl */
-            withDefaultToast: (errorRenderer) => (self) => Effect.gen(function* () {
+            withDefaultToast: (options) => (self) => Effect.gen(function* () {
                 const { action } = yield* CommandContext;
                 const defaultWarnMessage = intl.formatMessage({ id: "handle.with_warnings" }, { action });
                 const defaultErrorMessage = intl.formatMessage({ id: "handle.with_errors" }, { action });
                 function renderError(e) {
-                    if (errorRenderer) {
-                        const m = errorRenderer(e);
+                    if (options?.errorRenderer) {
+                        const m = options.errorRenderer(e);
                         if (m) {
                             return m;
                         }
@@ -238,4 +238,4 @@ export class Commander extends Effect.Service()("Commander", {
     })
 }) {
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"commander.js","sourceRoot":"","sources":["../../src/experimental/commander.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"commander.js","sourceRoot":"","sources":["../../src/experimental/commander.ts"],"names":[],"mappings":"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"}

package/dist/experimental/makeExperimental.d.ts CHANGED Viewed

@@ -5,7 +5,9 @@ export declare const makeExperimental: <R = never>() => Effect.Effect<{
     fn: (actionName: string) => Commander.Gen<R> & Commander.NonGen<R>;
     confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("./commander.js").CommandContext>;
     confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("./commander.js").CommandContext>;
-    withDefaultToast: <A_1, E_1, R_2>(errorRenderer?: ((e: E_1) => string | undefined) | undefined) => (self: Effect.Effect<A_1, E_1, R_2>) => Effect.Effect<A_1, E_1, import("./commander.js").CommandContext | R_2>;
+    withDefaultToast: <A_1, E_1, R_2>(options?: {
+        errorRenderer?: (e: E_1) => string | undefined;
+    } | undefined) => (self: Effect.Effect<A_1, E_1, R_2>) => Effect.Effect<A_1, E_1, import("./commander.js").CommandContext | R_2>;
     _tag: "Commander";
 }, never, Commander | R>;
 //# sourceMappingURL=makeExperimental.d.ts.map

package/dist/experimental/makeExperimental.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"makeExperimental.d.ts","sourceRoot":"","sources":["../../src/experimental/makeExperimental.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,eAAO,MAAM,gBAAgB,GAA+B,CAAC~~;;;;;;;~~wBAK3D,CAAA"}
1	+ {"version":3,"file":"makeExperimental.d.ts","sourceRoot":"","sources":["../../src/experimental/makeExperimental.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,eAAO,MAAM,gBAAgB,GAA+B,CAAC;;;;;;;;;wBAK3D,CAAA"}

package/dist/experimental/toast.d.ts CHANGED Viewed

@@ -1,52 +1,79 @@
-import { Context } from "effect-app";
+import { Context, Effect } from "effect-app";
 export type ToastId = string | number;
 export type ToastOpts = {
-    id?: ToastId;
+    id?: ToastId | undefined | null;
     timeout?: number;
 };
 export type UseToast = () => {
-    error: (message: string, options?: ToastOpts) => ToastId;
-    warning: (message: string, options?: ToastOpts) => ToastId;
-    success: (message: string, options?: ToastOpts) => ToastId;
-    info: (message: string, options?: ToastOpts) => ToastId;
-    dismiss: (id: ToastId) => void;
+    error: (this: void, message: string, options?: ToastOpts) => ToastId;
+    warning: (this: void, message: string, options?: ToastOpts) => ToastId;
+    success: (this: void, message: string, options?: ToastOpts) => ToastId;
+    info: (this: void, message: string, options?: ToastOpts) => ToastId;
+    dismiss: (this: void, id: ToastId) => void;
+};
+declare const CurrentToastId_base: (abstract new (service: {
+    toastId: ToastId;
+}) => Readonly<{
+    toastId: ToastId;
+}> & Context.TagClassShape<"CurrentToastId", {
+    toastId: ToastId;
+}>) & {
+    toLayer: <E, R>(eff: Effect.Effect<Omit<CurrentToastId, keyof Context.TagClassShape<any, any>>, E, R>) => import("effect/Layer").Layer<CurrentToastId, E, R>;
+    toLayerScoped: <E, R_1>(eff: Effect.Effect<Omit<CurrentToastId, keyof Context.TagClassShape<any, any>>, E, R_1>) => import("effect/Layer").Layer<CurrentToastId, E, Exclude<R_1, import("effect/Scope").Scope>>;
+    of: (service: Omit<CurrentToastId, keyof Context.TagClassShape<any, any>>) => CurrentToastId;
+} & Context.Tag<CurrentToastId, CurrentToastId> & {
+    toastId: Effect.Effect<ToastId, never, CurrentToastId>;
+} & {
+    use: <X>(body: (_: {
+        toastId: ToastId;
+    }) => X) => X extends Effect.Effect<infer A, infer E, infer R_2> ? Effect.Effect<A, E, CurrentToastId | R_2> : Effect.Effect<X, never, CurrentToastId>;
+};
+export declare class CurrentToastId extends CurrentToastId_base {
+}
+/** fallback to CurrentToastId when available unless id is explicitly set to a value or null */
+export declare const wrap: (toast: ReturnType<UseToast>) => {
+    error: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    info: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    success: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    warning: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    dismiss: (toastId: ToastId) => Effect.Effect<void, never, never>;
 };
 declare const Toast_base: (abstract new (service: {
-    error: (message: string, options?: ToastOpts) => ToastId;
-    warning: (message: string, options?: ToastOpts) => ToastId;
-    success: (message: string, options?: ToastOpts) => ToastId;
-    info: (message: string, options?: ToastOpts) => ToastId;
-    dismiss: (id: ToastId) => void;
+    error: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    info: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    success: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    warning: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    dismiss: (toastId: ToastId) => Effect.Effect<void, never, never>;
 }) => Readonly<{
-    error: (message: string, options?: ToastOpts) => ToastId;
-    warning: (message: string, options?: ToastOpts) => ToastId;
-    success: (message: string, options?: ToastOpts) => ToastId;
-    info: (message: string, options?: ToastOpts) => ToastId;
-    dismiss: (id: ToastId) => void;
+    error: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    info: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    success: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    warning: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    dismiss: (toastId: ToastId) => Effect.Effect<void, never, never>;
 }> & Context.TagClassShape<"Toast", {
-    error: (message: string, options?: ToastOpts) => ToastId;
-    warning: (message: string, options?: ToastOpts) => ToastId;
-    success: (message: string, options?: ToastOpts) => ToastId;
-    info: (message: string, options?: ToastOpts) => ToastId;
-    dismiss: (id: ToastId) => void;
+    error: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    info: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    success: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    warning: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+    dismiss: (toastId: ToastId) => Effect.Effect<void, never, never>;
 }>) & {
-    toLayer: <E, R>(eff: import("effect/Effect").Effect<Omit<Toast, keyof Context.TagClassShape<any, any>>, E, R>) => import("effect/Layer").Layer<Toast, E, R>;
-    toLayerScoped: <E, R_1>(eff: import("effect/Effect").Effect<Omit<Toast, keyof Context.TagClassShape<any, any>>, E, R_1>) => import("effect/Layer").Layer<Toast, E, Exclude<R_1, import("effect/Scope").Scope>>;
+    toLayer: <E, R>(eff: Effect.Effect<Omit<Toast, keyof Context.TagClassShape<any, any>>, E, R>) => import("effect/Layer").Layer<Toast, E, R>;
+    toLayerScoped: <E, R_1>(eff: Effect.Effect<Omit<Toast, keyof Context.TagClassShape<any, any>>, E, R_1>) => import("effect/Layer").Layer<Toast, E, Exclude<R_1, import("effect/Scope").Scope>>;
     of: (service: Omit<Toast, keyof Context.TagClassShape<any, any>>) => Toast;
 } & Context.Tag<Toast, Toast> & {
-    error: (message: string, options?: ToastOpts | undefined) => import("effect/Effect").Effect<ToastId, never, Toast>;
-    warning: (message: string, options?: ToastOpts | undefined) => import("effect/Effect").Effect<ToastId, never, Toast>;
-    success: (message: string, options?: ToastOpts | undefined) => import("effect/Effect").Effect<ToastId, never, Toast>;
-    info: (message: string, options?: ToastOpts | undefined) => import("effect/Effect").Effect<ToastId, never, Toast>;
-    dismiss: (id: ToastId) => import("effect/Effect").Effect<void, never, Toast>;
+    error: (message: string, options?: ToastOpts | undefined) => Effect.Effect<ToastId, never, Toast>;
+    info: (message: string, options?: ToastOpts | undefined) => Effect.Effect<ToastId, never, Toast>;
+    success: (message: string, options?: ToastOpts | undefined) => Effect.Effect<ToastId, never, Toast>;
+    warning: (message: string, options?: ToastOpts | undefined) => Effect.Effect<ToastId, never, Toast>;
+    dismiss: (toastId: ToastId) => Effect.Effect<void, never, Toast>;
 } & {
     use: <X>(body: (_: {
-        error: (message: string, options?: ToastOpts) => ToastId;
-        warning: (message: string, options?: ToastOpts) => ToastId;
-        success: (message: string, options?: ToastOpts) => ToastId;
-        info: (message: string, options?: ToastOpts) => ToastId;
-        dismiss: (id: ToastId) => void;
-    }) => X) => X extends import("effect/Effect").Effect<infer A, infer E, infer R_2> ? import("effect/Effect").Effect<A, E, R_2 | Toast> : import("effect/Effect").Effect<X, never, Toast>;
+        error: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+        info: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+        success: (message: string, options?: ToastOpts) => Effect.Effect<ToastId, never, never>;
+        warning: (message: string, options?: ToastOpts) => 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>;
 };
 export declare class Toast extends Toast_base {
 }

package/dist/experimental/toast.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"toast.d.ts","sourceRoot":"","sources":["../../src/experimental/toast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;~~AAEpC~~,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA;AACrC,MAAM,MAAM,SAAS,GAAG;IAAE,EAAE,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;~~AAE1D~~,MAAM,MAAM,QAAQ,GAAG,MAAM;IAC3B,KAAK,EAAE,CAAC,~~OAAO~~,EAAE,~~MAAM~~,EAAE,OAAO,~~CAAC,~~EAAE,~~SAAS,KAAK,OAAO,CAAA;IACxD,OAAO,EAAE,CAAC,OAAO,EAAE,~~MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,OAAO,CAAA;~~IAC1D~~,OAAO,EAAE,CAAC,~~OAAO~~,EAAE,~~MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,OAAO,CAAA;IAC1D,~~IAAI,EAAE,~~CAAC,~~OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,OAAO,CAAA;~~IACvD~~,OAAO,EAAE,CAAC,~~EAAE~~,EAAE,~~OAAO,KAAK,~~IAAI,~~CAAA;CAC/B~~,~~CAAA;;WALQ,CAAC,~~OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,OAAO;~~aAC/C~~,~~CAAC~~,~~OAAO,~~EAAE,~~MAAM~~,EAAE,~~OAAO~~,~~CAAC,~~EAAE,~~SAAS,KAAK,~~OAAO~~;aACjD~~,~~CAAC,OAAO,~~EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,OAAO;~~UACpD~~,~~CAAC,~~OAAO,EAAE,~~MAAM~~,EAAE,~~OAAO~~,~~CAAC,~~EAAE,~~SAAS,KAAK,OAAO;aAC9C,CAAC,~~EAAE,EAAE,OAAO,KAAK,IAAI;;~~WAJvB~~,~~CAAC~~,OAAO,~~EAAE~~,~~MAAM,EAAE,~~OAAO,~~CAAC~~,~~EAAE~~,~~SAAS~~,~~KAAK,OAAO~~;~~aAC~~/C,~~CAAC~~,~~OAAO~~,~~EAAE~~,~~MAAM~~,~~EAAE,~~OAAO,CAAC,~~EAAE~~,~~SAAS,KAAK,OAAO~~;~~aACjD~~,~~CAAC~~,~~OAAO~~,~~EAAE~~,MAAM,~~EAAE~~,~~OAAO~~,~~CAAC~~,~~EAAE~~,SAAS~~,KAAK,OAAO~~;~~UACpD~~,~~CAAC,OAAO,EAAE,~~MAAM,~~EAAE~~,~~OAAO,CAAC,EAAE,~~SAAS,~~KAAK,~~OAAO;~~aAC9C~~,~~CAAC,EAAE,EAAE,OAAO,KAAK,IAAI~~;;~~WAJvB~~,~~CAAC~~,~~OAAO~~,~~EAAE~~,MAAM,~~EAAE~~,~~OAAO~~,~~CAAC~~,~~EAAE~~,SAAS~~,KAAK,OAAO~~;~~aAC/C~~,~~CAAC,OAAO,EAAE,~~MAAM,~~EAAE~~,~~OAAO,CAAC,EAAE,~~SAAS~~,KAAK,OAAO~~;~~aACjD~~,~~CAAC,~~OAAO,~~EAAE,~~MAAM,~~EAAE~~,~~OAAO~~,~~CAAC~~,~~EAAE~~,SAAS~~,KAAK,OAAO~~;~~UACpD~~,~~CAAC~~,~~OAAO~~,~~EAAE~~,MAAM,~~EAAE~~,~~OAAO,CAAC,EAAE,~~SAAS~~,KAAK,OAAO~~;~~aAC9C~~,~~CAAC,EAAE,EAAE,~~OAAO,~~KAAK~~,~~IAAI;;;;;;;;;;;;;eAJvB~~,~~CAAC~~,~~OAAO,EAAE,~~MAAM,~~EAAE~~,~~OAAO~~,~~CAAC~~,~~EAAE~~,SAAS~~,KAAK,OAAO~~;~~iBAC/C~~,~~CAAC,OAAO,EAAE,~~MAAM,~~EAAE~~,~~OAAO,CAAC,EAAE,~~SAAS~~,KAAK,OAAO~~;~~iBACjD~~,~~CAAC,~~OAAO,~~EAAE,~~MAAM,~~EAAE~~,~~OAAO~~,~~CAAC~~,~~EAAE~~,SAAS~~,KAAK,OAAO~~;~~cACpD~~,~~CAAC~~,~~OAAO~~,~~EAAE~~,MAAM,~~EAAE~~,~~OAAO,CAAC,EAAE,~~SAAS~~,KAAK,OAAO~~;~~iBAC9C~~,~~CAAC,EAAE,EAAE,~~OAAO~~,KAAK,IAAI~~;;;~~AAGhC~~,qBAAa,KAAM,SAAQ,~~UAAqD~~;~~CAAG~~"}
1	+ {"version":3,"file":"toast.d.ts","sourceRoot":"","sources":["../../src/experimental/toast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAU,MAAM,YAAY,CAAA;AAEpD,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA;AACrC,MAAM,MAAM,SAAS,GAAG;IAAE,EAAE,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7E,MAAM,MAAM,QAAQ,GAAG,MAAM;IAC3B,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,OAAO,CAAA;IACpE,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,OAAO,CAAA;IACtE,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,OAAO,CAAA;IACtE,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,KAAK,OAAO,CAAA;IACnE,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,KAAK,IAAI,CAAA;CAC3C,CAAA;;aAE8F,OAAO;;aAAP,OAAO;;aAAP,OAAO;;;;;;;;;iBAAP,OAAO;;;AAAtG,qBAAa,cAAe,SAAQ,mBAAuE;CAAG;AAE9G,+FAA+F;AAC/F,eAAO,MAAM,IAAI,GAAI,OAAO,UAAU,CAAC,QAAQ,CAAC;qBAE3B,MAAM,YAAY,SAAS;oBAA3B,MAAM,YAAY,SAAS;uBAA3B,MAAM,YAAY,SAAS;uBAA3B,MAAM,YAAY,SAAS;uBAiBzB,OAAO;CAE7B,CAAA;;qBAnBoB,MAAM,YAAY,SAAS;oBAA3B,MAAM,YAAY,SAAS;uBAA3B,MAAM,YAAY,SAAS;uBAA3B,MAAM,YAAY,SAAS;uBAiBzB,OAAO;;qBAjBT,MAAM,YAAY,SAAS;oBAA3B,MAAM,YAAY,SAAS;uBAA3B,MAAM,YAAY,SAAS;uBAA3B,MAAM,YAAY,SAAS;uBAiBzB,OAAO;;qBAjBT,MAAM,YAAY,SAAS;oBAA3B,MAAM,YAAY,SAAS;uBAA3B,MAAM,YAAY,SAAS;uBAA3B,MAAM,YAAY,SAAS;uBAiBzB,OAAO;;;;;;;;;;;;;yBAjBT,MAAM,YAAY,SAAS;wBAA3B,MAAM,YAAY,SAAS;2BAA3B,MAAM,YAAY,SAAS;2BAA3B,MAAM,YAAY,SAAS;2BAiBzB,OAAO;;;AAI9B,qBAAa,KAAM,SAAQ,UAAwD;CAClF"}

package/dist/experimental/toast.js CHANGED Viewed

@@ -1,4 +1,24 @@
-import { Context } from "effect-app";
+import { Context, Effect, Option } from "effect-app";
+export class CurrentToastId extends Context.TagId("CurrentToastId")() {
+}
+/** fallback to CurrentToastId when available unless id is explicitly set to a value or null */
+export const wrap = (toast) => {
+    const wrap = (toastHandler) => {
+        return (message, options) => Effect.serviceOption(CurrentToastId).pipe(Effect.map((currentToast) => toastHandler(message, {
+            ...options,
+            id: options?.id !== undefined
+                ? options.id
+                : Option.getOrUndefined(Option.map(currentToast, (_) => _.toastId))
+        })));
+    };
+    return {
+        error: wrap(toast.error),
+        info: wrap(toast.info),
+        success: wrap(toast.success),
+        warning: wrap(toast.warning),
+        dismiss: (toastId) => Effect.sync(() => toast.dismiss(toastId))
+    };
+};
 export class Toast extends Context.TagId("Toast")() {
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9hc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZXhwZXJpbWVudGFsL3RvYXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFhcEMsTUFBTSxPQUFPLEtBQU0sU0FBUSxPQUFPLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxFQUErQjtDQUFHIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9hc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZXhwZXJpbWVudGFsL3RvYXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQWFwRCxNQUFNLE9BQU8sY0FBZSxTQUFRLE9BQU8sQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsRUFBd0M7Q0FBRztBQUU5RywrRkFBK0Y7QUFDL0YsTUFBTSxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsS0FBMkIsRUFBRSxFQUFFO0lBQ2xELE1BQU0sSUFBSSxHQUFHLENBQUMsWUFBK0QsRUFBRSxFQUFFO1FBQy9FLE9BQU8sQ0FBQyxPQUFlLEVBQUUsT0FBbUIsRUFBRSxFQUFFLENBQzlDLE1BQU0sQ0FBQyxhQUFhLENBQUMsY0FBYyxDQUFDLENBQUMsSUFBSSxDQUN2QyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsWUFBWSxFQUFFLEVBQUUsQ0FDMUIsWUFBWSxDQUFDLE9BQU8sRUFBRTtZQUNwQixHQUFHLE9BQU87WUFDVixFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsS0FBSyxTQUFTO2dCQUMzQixDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1osQ0FBQyxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUN0RSxDQUFDLENBQ0gsQ0FDRixDQUFBO0lBQ0wsQ0FBQyxDQUFBO0lBQ0QsT0FBTztRQUNMLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQztRQUN4QixJQUFJLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUM7UUFDdEIsT0FBTyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDO1FBQzVCLE9BQU8sRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQztRQUM1QixPQUFPLEVBQUUsQ0FBQyxPQUFnQixFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDekUsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQUVELE1BQU0sT0FBTyxLQUFNLFNBQVEsT0FBTyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBa0M7Q0FDbEYifQ==

package/dist/experimental/withToast.d.ts CHANGED Viewed

@@ -1,8 +1,9 @@
 import { Effect, type Option } from "effect-app";
 import { Toast } from "./toast.js";
 export interface ToastOptions<A, E, Args extends ReadonlyArray<unknown>> {
-    onWaiting: string | ((...args: Args) => string);
-    onSuccess: string | ((a: A, ...args: Args) => string);
+    timeout?: number;
+    onWaiting: string | ((...args: Args) => string) | null;
+    onSuccess: string | ((a: A, ...args: Args) => string) | null;
     onFailure: string | ((error: Option.Option<E>, ...args: Args) => string | {
         level: "warn" | "error";
         message: string;

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

	@@ -1 +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,~~EAAE~~,KAAK,EAAE,MAAM,YAAY,CAAA;~~AAElC~~,MAAM,WAAW,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC;IACrE,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,CAAA;~~IAC/C~~,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,CAAA;~~IACrD~~,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,CAAA;CAC9D;;qCAMW,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,WACzC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC;;AAJvC,qBAAa,SAAU,SAAQ,~~cA0C7B~~;CAAG"}
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;IACrE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,GAAG,IAAI,CAAA;IACtD,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,GAAG,IAAI,CAAA;IAC5D,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,CAAA;CAC9D;;qCAMW,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,WACzC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC;;AAJvC,qBAAa,SAAU,SAAQ,cA2C7B;CAAG"}

package/dist/experimental/withToast.js CHANGED Viewed

@@ -1,22 +1,24 @@
 import { Cause, Effect } from "effect-app";
-import { Toast } from "./toast.js";
+import { CurrentToastId, Toast } from "./toast.js";
 // @effect-diagnostics-next-line missingEffectServiceDependency:off
 export class WithToast extends Effect.Service()("WithToast", {
     effect: Effect.gen(function* () {
         const toast = yield* Toast;
         return (options) => Effect.fnUntraced(function* (self, ...args) {
-            const toastId = toast.info(
+            const baseTimeout = options.timeout ?? 3_000;
+            const toastId = options.onWaiting === null ? undefined : yield* toast.info(
             // .loading
             typeof options.onWaiting === "string"
                 ? options.onWaiting
-                : options.onWaiting(...args));
-            return yield* self.pipe(Effect.tap((a) => {
-                toast.success(typeof options.onSuccess === "string"
-                    ? options.onSuccess
-                    : options.onSuccess(a, ...args), { id: toastId, timeout: 3_000 });
-            }), Effect.tapErrorCause((cause) => Effect.sync(() => {
+                : options.onWaiting(...args)
+            // TODO: timeout forever?
+            );
+            return yield* self.pipe(Effect.tap((a) => options.onSuccess === null ? Effect.void : toast.success(typeof options.onSuccess === "string"
+                ? options.onSuccess
+                : options.onSuccess(a, ...args), { id: toastId, timeout: baseTimeout })), Effect.tapErrorCause(Effect.fnUntraced(function* (cause) {
                 if (Cause.isInterruptedOnly(cause)) {
-                    toast.dismiss(toastId);
+                    if (toastId)
+                        yield* toast.dismiss(toastId);
                     return;
                 }
                 const t = typeof options.onFailure === "string"
@@ -24,13 +26,13 @@ export class WithToast extends Effect.Service()("WithToast", {
                     : options.onFailure(Cause.failureOption(cause), ...args);
                 if (typeof t === "object") {
                     return t.level === "warn"
-                        ? toast.warning(t.message, { id: toastId, timeout: 5_000 })
-                        : toast.error(t.message, { id: toastId, timeout: 5_000 });
+                        ? yield* toast.warning(t.message, { id: toastId, timeout: baseTimeout * 2 })
+                        : yield* toast.error(t.message, { id: toastId, timeout: baseTimeout * 2 });
                 }
-                toast.error(t, { id: toastId, timeout: 5_000 });
-            })));
+                yield* toast.error(t, { id: toastId, timeout: baseTimeout * 2 });
+            })), toastId ? Effect.provideService(CurrentToastId, CurrentToastId.of({ toastId })) : (_) => _);
         });
     })
 }) {
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aFRvYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4cGVyaW1lbnRhbC93aXRoVG9hc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQWUsTUFBTSxZQUFZLENBQUE7QUFDdkQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLFlBQVksQ0FBQTtBQWFsQyxtRUFBbUU7QUFDbkUsTUFBTSxPQUFPLFNBQVUsU0FBUSxNQUFNLENBQUMsT0FBTyxFQUFhLENBQUMsV0FBVyxFQUFFO0lBQ3RFLE1BQU0sRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUMxQixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUE7UUFDMUIsT0FBTyxDQUNMLE9BQWlDLEVBQ2pDLEVBQUUsQ0FDRixNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFDLElBQTRCLEVBQUUsR0FBRyxJQUFVO1lBQ3JFLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxJQUFJO1lBQ3hCLFdBQVc7WUFDWCxPQUFPLE9BQU8sQ0FBQyxTQUFTLEtBQUssUUFBUTtnQkFDbkMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTO2dCQUNuQixDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUMvQixDQUFBO1lBQ0QsT0FBTyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUNyQixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7Z0JBQ2YsS0FBSyxDQUFDLE9BQU8sQ0FDWCxPQUFPLE9BQU8sQ0FBQyxTQUFTLEtBQUssUUFBUTtvQkFDbkMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTO29CQUNuQixDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFDakMsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsQ0FDaEMsQ0FBQTtZQUNILENBQUMsQ0FBQyxFQUNGLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUM3QixNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtnQkFDZixJQUFJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO29CQUNuQyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFBO29CQUN0QixPQUFNO2dCQUNSLENBQUM7Z0JBQ0QsTUFBTSxDQUFDLEdBQUcsT0FBTyxPQUFPLENBQUMsU0FBUyxLQUFLLFFBQVE7b0JBQzdDLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUztvQkFDbkIsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFBO2dCQUMxRCxJQUFJLE9BQU8sQ0FBQyxLQUFLLFFBQVEsRUFBRSxDQUFDO29CQUMxQixPQUFPLENBQUMsQ0FBQyxLQUFLLEtBQUssTUFBTTt3QkFDdkIsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxDQUFDO3dCQUMzRCxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQTtnQkFDN0QsQ0FBQztnQkFDRCxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUE7WUFDakQsQ0FBQyxDQUFDLENBQ0gsQ0FDRixDQUFBO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUM7Q0FDSCxDQUFDO0NBQUcifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aFRvYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4cGVyaW1lbnRhbC93aXRoVG9hc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQWUsTUFBTSxZQUFZLENBQUE7QUFDdkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFjbEQsbUVBQW1FO0FBQ25FLE1BQU0sT0FBTyxTQUFVLFNBQVEsTUFBTSxDQUFDLE9BQU8sRUFBYSxDQUFDLFdBQVcsRUFBRTtJQUN0RSxNQUFNLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7UUFDMUIsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFBO1FBQzFCLE9BQU8sQ0FDTCxPQUFpQyxFQUNqQyxFQUFFLENBQ0YsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBQyxJQUE0QixFQUFFLEdBQUcsSUFBVTtZQUNyRSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxJQUFJLEtBQUssQ0FBQTtZQUM1QyxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSTtZQUN4RSxXQUFXO1lBQ1gsT0FBTyxPQUFPLENBQUMsU0FBUyxLQUFLLFFBQVE7Z0JBQ25DLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUztnQkFDbkIsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxJQUFJLENBQUM7WUFDOUIseUJBQXlCO2FBQzFCLENBQUE7WUFDRCxPQUFPLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQ3JCLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUNmLE9BQU8sQ0FBQyxTQUFTLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUN0RCxPQUFPLE9BQU8sQ0FBQyxTQUFTLEtBQUssUUFBUTtnQkFDbkMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTO2dCQUNuQixDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFDakMsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsQ0FDdEMsQ0FDRixFQUNELE1BQU0sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBQyxLQUFLO2dCQUNwRCxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO29CQUNuQyxJQUFJLE9BQU87d0JBQUUsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtvQkFDMUMsT0FBTTtnQkFDUixDQUFDO2dCQUNELE1BQU0sQ0FBQyxHQUFHLE9BQU8sT0FBTyxDQUFDLFNBQVMsS0FBSyxRQUFRO29CQUM3QyxDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVM7b0JBQ25CLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQTtnQkFDMUQsSUFBSSxPQUFPLENBQUMsS0FBSyxRQUFRLEVBQUUsQ0FBQztvQkFDMUIsT0FBTyxDQUFDLENBQUMsS0FBSyxLQUFLLE1BQU07d0JBQ3ZCLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxXQUFXLEdBQUcsQ0FBQyxFQUFFLENBQUM7d0JBQzVFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxXQUFXLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtnQkFDOUUsQ0FBQztnQkFDRCxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFdBQVcsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO1lBQ2xFLENBQUMsQ0FBQyxDQUFDLEVBQ0gsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLGNBQWMsRUFBRSxjQUFjLENBQUMsRUFBRSxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUMzRixDQUFBO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUM7Q0FDSCxDQUFDO0NBQUcifQ==

package/package.json CHANGED Viewed

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

package/src/experimental/commander.ts CHANGED Viewed

@@ -588,7 +588,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
         )
       }),
       /** Version of withDefaultToast that automatically includes the action name in the default messages and uses intl */
-      withDefaultToast: <A, E, R>(errorRenderer?: (e: E) => string | undefined) =>
+      withDefaultToast: <A, E, R>(options?: { errorRenderer?: (e: E) => string | undefined }) =>
       (
         self: Effect.Effect<A, E, R>
       ) =>
@@ -604,8 +604,8 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
             { action }
           )
           function renderError(e: E): string {
-            if (errorRenderer) {
-              const m = errorRenderer(e)
+            if (options?.errorRenderer) {
+              const m = options.errorRenderer(e)
               if (m) {
                 return m
               }

package/src/experimental/toast.ts CHANGED Viewed

@@ -1,14 +1,41 @@
-import { Context } from "effect-app"
+import { Context, Effect, Option } from "effect-app"
 export type ToastId = string | number
-export type ToastOpts = { id?: ToastId; timeout?: number }
+export type ToastOpts = { id?: ToastId | undefined | null; timeout?: number }
 export type UseToast = () => {
-  error: (message: string, options?: ToastOpts) => ToastId
-  warning: (message: string, options?: ToastOpts) => ToastId
-  success: (message: string, options?: ToastOpts) => ToastId
-  info: (message: string, options?: ToastOpts) => ToastId
-  dismiss: (id: ToastId) => void
+  error: (this: void, message: string, options?: ToastOpts) => ToastId
+  warning: (this: void, message: string, options?: ToastOpts) => ToastId
+  success: (this: void, message: string, options?: ToastOpts) => ToastId
+  info: (this: void, message: string, options?: ToastOpts) => ToastId
+  dismiss: (this: void, id: ToastId) => void
 }
-export class Toast extends Context.TagId("Toast")<Toast, ReturnType<UseToast>>() {}
+export class CurrentToastId extends Context.TagId("CurrentToastId")<CurrentToastId, { toastId: ToastId }>() {}
+/** fallback to CurrentToastId when available unless id is explicitly set to a value or null */
+export const wrap = (toast: ReturnType<UseToast>) => {
+  const wrap = (toastHandler: (message: string, options?: ToastOpts) => ToastId) => {
+    return (message: string, options?: ToastOpts) =>
+      Effect.serviceOption(CurrentToastId).pipe(
+        Effect.map((currentToast) =>
+          toastHandler(message, {
+            ...options,
+            id: options?.id !== undefined
+              ? options.id
+              : Option.getOrUndefined(Option.map(currentToast, (_) => _.toastId))
+          })
+        )
+      )
+  }
+  return {
+    error: wrap(toast.error),
+    info: wrap(toast.info),
+    success: wrap(toast.success),
+    warning: wrap(toast.warning),
+    dismiss: (toastId: ToastId) => Effect.sync(() => toast.dismiss(toastId))
+  }
+}
+export class Toast extends Context.TagId("Toast")<Toast, ReturnType<typeof wrap>>() {
+}

package/src/experimental/withToast.ts CHANGED Viewed

@@ -1,9 +1,10 @@
 import { Cause, Effect, type Option } from "effect-app"
-import { Toast } from "./toast.js"
+import { CurrentToastId, Toast } from "./toast.js"
 export interface ToastOptions<A, E, Args extends ReadonlyArray<unknown>> {
-  onWaiting: string | ((...args: Args) => string)
-  onSuccess: string | ((a: A, ...args: Args) => string)
+  timeout?: number
+  onWaiting: string | ((...args: Args) => string) | null
+  onSuccess: string | ((a: A, ...args: Args) => string) | null
   onFailure:
     | string
     | ((
@@ -20,38 +21,39 @@ export class WithToast extends Effect.Service<WithToast>()("WithToast", {
       options: ToastOptions<A, E, Args>
     ) =>
       Effect.fnUntraced(function*(self: Effect.Effect<A, E, R>, ...args: Args) {
-        const toastId = toast.info(
+        const baseTimeout = options.timeout ?? 3_000
+        const toastId = options.onWaiting === null ? undefined : yield* toast.info(
           // .loading
           typeof options.onWaiting === "string"
             ? options.onWaiting
             : options.onWaiting(...args)
+          // TODO: timeout forever?
         )
         return yield* self.pipe(
-          Effect.tap((a) => {
-            toast.success(
+          Effect.tap((a) =>
+            options.onSuccess === null ? Effect.void : toast.success(
               typeof options.onSuccess === "string"
                 ? options.onSuccess
                 : options.onSuccess(a, ...args),
-              { id: toastId, timeout: 3_000 }
+              { id: toastId, timeout: baseTimeout }
             )
-          }),
-          Effect.tapErrorCause((cause) =>
-            Effect.sync(() => {
-              if (Cause.isInterruptedOnly(cause)) {
-                toast.dismiss(toastId)
-                return
-              }
-              const t = typeof options.onFailure === "string"
-                ? options.onFailure
-                : options.onFailure(Cause.failureOption(cause), ...args)
-              if (typeof t === "object") {
-                return t.level === "warn"
-                  ? toast.warning(t.message, { id: toastId, timeout: 5_000 })
-                  : toast.error(t.message, { id: toastId, timeout: 5_000 })
-              }
-              toast.error(t, { id: toastId, timeout: 5_000 })
-            })
-          )
+          ),
+          Effect.tapErrorCause(Effect.fnUntraced(function*(cause) {
+            if (Cause.isInterruptedOnly(cause)) {
+              if (toastId) yield* toast.dismiss(toastId)
+              return
+            }
+            const t = typeof options.onFailure === "string"
+              ? options.onFailure
+              : options.onFailure(Cause.failureOption(cause), ...args)
+            if (typeof t === "object") {
+              return t.level === "warn"
+                ? yield* toast.warning(t.message, { id: toastId, timeout: baseTimeout * 2 })
+                : yield* toast.error(t.message, { id: toastId, timeout: baseTimeout * 2 })
+            }
+            yield* toast.error(t, { id: toastId, timeout: baseTimeout * 2 })
+          })),
+          toastId ? Effect.provideService(CurrentToastId, CurrentToastId.of({ toastId })) : (_) => _
         )
       })
   })

package/test/dist/stubs.d.ts CHANGED Viewed

@@ -11,7 +11,9 @@ export declare const useExperimental: (options?: {
     fn: (actionName: string) => Commander.Gen<never> & Commander.NonGen<never>;
     confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("../src/experimental/commander.js").CommandContext>;
     confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("../src/experimental/commander.js").CommandContext>;
-    withDefaultToast: <A_1, E_1, R_2>(errorRenderer?: ((e: E_1) => string | undefined) | undefined) => (self: Effect.Effect<A_1, E_1, R_2>) => Effect.Effect<A_1, E_1, import("../src/experimental/commander.js").CommandContext | R_2>;
+    withDefaultToast: <A_1, E_1, R_2>(options?: {
+        errorRenderer?: (e: E_1) => string | undefined;
+    } | undefined) => (self: Effect.Effect<A_1, E_1, R_2>) => Effect.Effect<A_1, E_1, import("../src/experimental/commander.js").CommandContext | R_2>;
     _tag: "Commander";
 };
 //# sourceMappingURL=stubs.d.ts.map

package/test/dist/stubs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AA8ClD,eAAO,MAAM,aAAa,GAAI,WAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAM,oCAgBzG,CAAA;AAEH,eAAO,MAAM,eAAe,GAC1B,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE;;;gCA/DjE,CAAC;~~qBAGT~~,~~CAAA~~;~~mDAI1B~~,~~CAAF;;CA+DH~~,CAAA"}
1	+ {"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AA8ClD,eAAO,MAAM,aAAa,GAAI,WAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAM,oCAgBzG,CAAA;AAEH,eAAO,MAAM,eAAe,GAC1B,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE;;;gCA/DjE,CAAC;qBAGG,CAAC;6CAGQ,CAAC;qBAE9C,CAAL;;;CA8DF,CAAA"}

package/test/dist/stubs.js CHANGED Viewed

@@ -4,8 +4,8 @@ import { ref } from "vue";
 import { Commander } from "../src/experimental/commander.js";
 import { I18n } from "../src/experimental/intl.js";
 import { makeExperimental } from "../src/experimental/makeExperimental.js";
-import { Toast } from "../src/experimental/toast.js";
-const fakeToastLayer = (toasts = []) => Toast.toLayer(Effect.sync(() => {
+import * as Toast from "../src/experimental/toast.js";
+const fakeToastLayer = (toasts = []) => Toast.Toast.toLayer(Effect.sync(() => {
     const dismiss = (id) => {
         const idx = toasts.findIndex((_) => _.id === id);
         if (idx > -1) {
@@ -36,13 +36,13 @@ const fakeToastLayer = (toasts = []) => Toast.toLayer(Effect.sync(() => {
         }
         return id;
     };
-    return {
+    return Toast.wrap({
         error: fakeToast,
         warning: fakeToast,
         success: fakeToast,
         info: fakeToast,
         dismiss
-    };
+    });
 }));
 export const fakeIntlLayer = (messages = {}) => I18n.toLayer(Effect.sync(() => {
     const locale = ref("en");
@@ -63,4 +63,4 @@ export const useExperimental = (options) => {
     const CommanderLayer = Commander.Default.pipe(Layer.provide([FakeIntlLayer, FakeToastLayer]));
     return Effect.runSync(makeExperimental().pipe(Effect.provide(CommanderLayer)));
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R1YnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zdHVicy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssSUFBSSxNQUFNLGdCQUFnQixDQUFBO0FBQ3RDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFDekIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQzVELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQTtBQUNsRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQTtBQUMxRSxPQUFPLEVBQUUsS0FBSyxFQUFnQixNQUFNLDhCQUE4QixDQUFBO0FBR2xFLE1BQU0sY0FBYyxHQUFHLENBQUMsU0FBZ0IsRUFBRSxFQUFFLEVBQUUsQ0FDNUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtJQUM3QixNQUFNLE9BQU8sR0FBRyxDQUFDLEVBQVcsRUFBRSxFQUFFO1FBQzlCLE1BQU0sR0FBRyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUE7UUFDaEQsSUFBSSxHQUFHLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUNiLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUN6QixZQUFZLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQzdCLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ3ZCLENBQUM7SUFDSCxDQUFDLENBQUE7SUFDRCxNQUFNLFNBQVMsR0FBRyxDQUFDLE9BQWUsRUFBRSxPQUE0QyxFQUFFLEVBQUU7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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R1YnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zdHVicy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssSUFBSSxNQUFNLGdCQUFnQixDQUFBO0FBQ3RDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFDekIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQzVELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQTtBQUNsRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQTtBQUMxRSxPQUFPLEtBQUssS0FBSyxNQUFNLDhCQUE4QixDQUFBO0FBR3JELE1BQU0sY0FBYyxHQUFHLENBQUMsU0FBZ0IsRUFBRSxFQUFFLEVBQUUsQ0FDNUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7SUFDbkMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxFQUFpQixFQUFFLEVBQUU7UUFDcEMsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQTtRQUNoRCxJQUFJLEdBQUcsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDO1lBQ2IsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ3pCLFlBQVksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUE7WUFDN0IsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDdkIsQ0FBQztJQUNILENBQUMsQ0FBQTtJQUNELE1BQU0sU0FBUyxHQUFHLENBQUMsT0FBZSxFQUFFLE9BQXlCLEVBQUUs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

package/test/stubs.ts CHANGED Viewed

@@ -6,12 +6,12 @@ import { ref } from "vue"
 import { Commander } from "../src/experimental/commander.js"
 import { I18n } from "../src/experimental/intl.js"
 import { makeExperimental } from "../src/experimental/makeExperimental.js"
-import { Toast, type ToastId } from "../src/experimental/toast.js"
+import * as Toast from "../src/experimental/toast.js"
 import { type MakeIntlReturn } from "../src/makeIntl.js"
 const fakeToastLayer = (toasts: any[] = []) =>
-  Toast.toLayer(Effect.sync(() => {
-    const dismiss = (id: ToastId) => {
+  Toast.Toast.toLayer(Effect.sync(() => {
+    const dismiss = (id: Toast.ToastId) => {
       const idx = toasts.findIndex((_) => _.id === id)
       if (idx > -1) {
         const toast = toasts[idx]
@@ -19,7 +19,7 @@ const fakeToastLayer = (toasts: any[] = []) =>
         toasts.splice(idx, 1)
       }
     }
-    const fakeToast = (message: string, options?: { timeout?: number; id?: ToastId }) => {
+    const fakeToast = (message: string, options?: Toast.ToastOpts) => {
       const id = options?.id ?? Math.random().toString(36).substring(2, 15)
       console.log(`Toast [${id}]: ${message}`, options)
@@ -41,13 +41,13 @@ const fakeToastLayer = (toasts: any[] = []) =>
       }
       return id
     }
-    return {
+    return Toast.wrap({
       error: fakeToast,
       warning: fakeToast,
       success: fakeToast,
       info: fakeToast,
       dismiss
-    }
+    })
   }))
 export const fakeIntlLayer = (messages: Record<string, string> | Record<string, MessageFormatElement[]> = {}) =>