@effect-app/vue 2.60.9 → 2.61.0

package/src/experimental/commander.ts

@@ -1086,85 +1086,93 @@ 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>(options?: { errorRenderer?: (e: E) => string | undefined; onWaiting?: null; onSuccess?: null }) =>
-        (
-          self: Effect.Effect<A, E, R>
-        ) =>
-          Effect.gen(function*() {
-            const cc = yield* CommandContext
+      withDefaultToast: <A, E, R, Args extends ReadonlyArray<unknown>>(
+        options?: {
+          errorRenderer?: (e: E, ...args: Args) => string | undefined
+          onWaiting?: null
+          onSuccess?: null
+        }
+      ) =>
+      (
+        self: Effect.Effect<A, E, R>,
+        ...args: Args
+      ) =>
+        Effect.gen(function*() {
+          const cc = yield* CommandContext
 
-            function renderError(e: E): string {
-              if (options?.errorRenderer) {
-                const m = options.errorRenderer(e)
-                if (m) {
-                  return m
-                }
+          function renderError(e: E, ...args: Args): string {
+            if (options?.errorRenderer) {
+              const m = options.errorRenderer(e, ...args)
+              if (m) {
+                return m
               }
-              if (!S.is(SupportedErrors)(e) && !S.ParseResult.isParseError(e)) {
-                if (typeof e === "object" && e !== null) {
-                  if ("message" in e) {
-                    return `${e.message}`
-                  }
-                  if ("_tag" in e) {
-                    return `${e._tag}`
-                  }
+            }
+            if (!S.is(SupportedErrors)(e) && !S.ParseResult.isParseError(e)) {
+              if (typeof e === "object" && e !== null) {
+                if ("message" in e) {
+                  return `${e.message}`
+                }
+                if ("_tag" in e) {
+                  return `${e._tag}`
                 }
-                return ""
               }
-              const e2: SupportedErrors | S.ParseResult.ParseError = e
-              return Match.value(e2).pipe(
-                Match.tags({
-                  ParseError: (e) => {
-                    console.warn(e.toString())
-                    return intl.formatMessage({ id: "validation.failed" })
-                  }
-                }),
-                Match.orElse((e) => `${e.message ?? e._tag ?? e}`)
-              )
+              return ""
             }
+            const e2: SupportedErrors | S.ParseResult.ParseError = e
+            return Match.value(e2).pipe(
+              Match.tags({
+                ParseError: (e) => {
+                  console.warn(e.toString())
+                  return intl.formatMessage({ id: "validation.failed" })
+                }
+              }),
+              Match.orElse((e) => `${e.message ?? e._tag ?? e}`)
+            )
+          }
 
-            return yield* self.pipe(
-              withToast({
+          return yield* self.pipe(
+            (_) =>
+              withToast<A, E, Args, R>({
                 onWaiting: options?.onWaiting === null ? null : intl.formatMessage(
                   { id: "handle.waiting" },
                   { action: cc.action }
                 ),
                 onSuccess: options?.onSuccess === null
                   ? null
-                  : (a) =>
+                  : (a, ..._args) =>
                     intl.formatMessage({ id: "handle.success" }, { action: cc.action })
                     + (S.is(OperationSuccess)(a) && a.message ? "\n" + a.message : ""),
-                onFailure: Option.match({
-                  onNone: () =>
-                    intl.formatMessage(
-                      { id: "handle.unexpected_error2" },
-                      {
-                        action: cc.action,
-                        error: "" // TODO consider again Cause.pretty(cause), // will be reported to Sentry/Otel anyway.. and we shouldn't bother users with error dumps?
-                      }
-                    ),
-                  onSome: (e) =>
-                    S.is(OperationFailure)(e)
-                      ? {
-                        level: "warn",
-                        message: intl.formatMessage(
-                            { id: "handle.with_warnings" },
+                onFailure: (o, ...args) =>
+                  Option.match(o, {
+                    onNone: () =>
+                      intl.formatMessage(
+                        { id: "handle.unexpected_error2" },
+                        {
+                          action: cc.action,
+                          error: "" // TODO consider again Cause.pretty(cause), // will be reported to Sentry/Otel anyway.. and we shouldn't bother users with error dumps?
+                        }
+                      ),
+                    onSome: (e) =>
+                      S.is(OperationFailure)(e)
+                        ? {
+                          level: "warn",
+                          message: intl.formatMessage(
+                              { id: "handle.with_warnings" },
+                              { action: cc.action }
+                            ) + e.message
+                            ? "\n" + e.message
+                            : ""
+                        }
+                        : `${
+                          intl.formatMessage(
+                            { id: "handle.with_errors" },
                             { action: cc.action }
-                          ) + e.message
-                          ? "\n" + e.message
-                          : ""
-                      }
-                      : `${
-                        intl.formatMessage(
-                          { id: "handle.with_errors" },
-                          { action: cc.action }
-                        )
-                      }:\n` + renderError(e)
-                })
-              })
-            )
-          }),
+                          )
+                        }:\n` + renderError(e, ...args)
+                  })
+              })(_, ...args)
+          )
+        }),
       /**
        * Define a Command for handling user actions with built-in error reporting and state management.
        *

package/src/lib.ts

@@ -68,14 +68,14 @@ export function useIntervalPauseWhileProcessing(
  * use the `mapHandler` in options instead, as it will be executed *after* invalidating caches, instead of before.
  */
 export const mapHandler: {
-  <I, E, R, A, E2, A2, R2, Request extends TaggedRequestClassAny>(
-    self: RequestHandlerWithInput<I, A, E, R, Request>,
+  <I, E, R, A, E2, A2, R2, Request extends TaggedRequestClassAny, Name extends string>(
+    self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
     map: (handler: (i: I) => Effect.Effect<A, E, R>) => (i: I) => Effect.Effect<A2, E2, R2>
-  ): RequestHandlerWithInput<I, A2, E2, R2, Request>
-  <E, A, R, E2, A2, R2, Request extends TaggedRequestClassAny>(
-    self: RequestHandler<A, E, R, Request>,
+  ): RequestHandlerWithInput<I, A2, E2, R2, Request, Name>
+  <E, A, R, E2, A2, R2, Request extends TaggedRequestClassAny, Name extends string>(
+    self: RequestHandler<A, E, R, Request, Name>,
     map: (handler: Effect.Effect<A, E, R>) => Effect.Effect<A2, E2, R2>
-  ): RequestHandler<A2, E2, R2, Request>
+  ): RequestHandler<A2, E2, R2, Request, Name>
 } = (self: any, map: any): any => ({
   ...self,
   handler: typeof self.handler === "function"

package/src/makeClient.ts

@@ -197,9 +197,10 @@ export const useMutation: typeof _useMutation = <
   E,
   A,
   R,
-  Request extends TaggedRequestClassAny
+  Request extends TaggedRequestClassAny,
+  Name extends string
 >(
-  self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
+  self: RequestHandlerWithInput<I, A, E, R, Request, Name> | RequestHandler<A, E, R, Request, Name>,
   options?: MutationOptionsBase
 ) =>
   mapHandler(
@@ -219,22 +220,22 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
        * you should use the result ref to render errors!
        */
       const _useSafeMutation: {
-        <I, E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(
-          self: RequestHandlerWithInput<I, A, E, R, Request>,
+        <I, E, A, R, Request extends TaggedRequestClassAny, Name extends string, A2 = A, E2 = E, R2 = R>(
+          self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
           options?: MutationOptions<A, E, R, A2, E2, R2, I>
         ): readonly [
           ComputedRef<Result.Result<A2, E2>>,
           (i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>
         ]
-        <E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(
-          self: RequestHandler<A, E, R, Request>,
+        <E, A, R, Request extends TaggedRequestClassAny, Name extends string, A2 = A, E2 = E, R2 = R>(
+          self: RequestHandler<A, E, R, Request, Name>,
           options?: MutationOptions<A, E, R, A2, E2, R2>
         ): readonly [
           ComputedRef<Result.Result<A2, E2>>,
           Effect.Effect<Exit.Exit<A2, E2>, never, R2>
         ]
-      } = <I, E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(
-        self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
+      } = <I, E, A, R, Request extends TaggedRequestClassAny, Name extends string, A2 = A, E2 = E, R2 = R>(
+        self: RequestHandlerWithInput<I, A, E, R, Request, Name> | RequestHandler<A, E, R, Request, Name>,
         options?: MutationOptions<A, E, R, A2, E2, R2, I>
       ) => {
         const unsafe = _useMutation(self as any, options)
@@ -395,6 +396,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           A,
           R,
           Request extends TaggedRequestClassAny,
+          Name extends string,
           A2 = A,
           E2 extends ResponseErrors = E,
           R2 = R,
@@ -405,7 +407,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           EDefect = never,
           RDefect = never
         >(
-          self: RequestHandlerWithInput<I, A, E, R, Request>,
+          self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
           action: string,
           options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
         ): Resp<I, A2, E2, R2, ComputedRef<Result.Result<A2, E2>>>
@@ -414,6 +416,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           A,
           R,
           Request extends TaggedRequestClassAny,
+          Name extends string,
           A2 = A,
           E2 extends ResponseErrors = E,
           R2 = R,
@@ -424,12 +427,12 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           EDefect = never,
           RDefect = never
         >(
-          self: RequestHandler<A, E, R, Request>,
+          self: RequestHandler<A, E, R, Request, Name>,
           action: string,
           options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
         ): ActResp<A2, E2, R2, ComputedRef<Result.Result<A2, E2>>>
-      } = <E extends ResponseErrors, A, R, Request extends TaggedRequestClassAny, I>(
-        self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
+      } = <E extends ResponseErrors, A, R, Request extends TaggedRequestClassAny, Name extends string, I>(
+        self: RequestHandlerWithInput<I, A, E, R, Request, Name> | RequestHandler<A, E, R, Request, Name>,
         action: any,
         options?: Opts<any, any, any, any, any, any, any, any, any, any, any, any, any>
       ): any => {
@@ -473,6 +476,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           A,
           R,
           Request extends TaggedRequestClassAny,
+          Name extends string,
           A2 = A,
           E2 extends ResponseErrors = E,
           R2 = R,
@@ -483,7 +487,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           EDefect = never,
           RDefect = never
         >(
-          self: RequestHandlerWithInput<I, A, E, R, Request>,
+          self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
           action: string,
           options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
         ): Resp<I, A2, E2, R2>
@@ -492,6 +496,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           A,
           R,
           Request extends TaggedRequestClassAny,
+          Name extends string,
           A2 = A,
           E2 extends ResponseErrors = E,
           R2 = R,
@@ -502,7 +507,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           EDefect = never,
           RDefect = never
         >(
-          self: RequestHandler<A, E, R, Request>,
+          self: RequestHandler<A, E, R, Request, Name>,
           action: string,
           options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
         ): ActResp<A2, E2, R2>
@@ -535,6 +540,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
             A,
             R,
             Request extends TaggedRequestClassAny,
+            Name extends string,
             A2 = A,
             E2 extends ResponseErrors = E,
             R2 = R,
@@ -545,7 +551,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
             EDefect = never,
             RDefect = never
           >(
-            self: RequestHandlerWithInput<I, A, E, R, Request>,
+            self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
             action: string,
             options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
           ): Resp<I, A2, E2, R2>
@@ -553,6 +559,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
             E extends ResponseErrors,
             A,
             Request extends TaggedRequestClassAny,
+            Name extends string,
             A2 = A,
             E2 extends ResponseErrors = E,
             R2 = R,
@@ -563,7 +570,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
             EDefect = never,
             RDefect = never
           >(
-            self: RequestHandler<A, E, R, Request>,
+            self: RequestHandler<A, E, R, Request, Name>,
             action: string,
             options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
           ): ActResp<A2, E2, R2>
@@ -581,6 +588,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           A,
           R,
           Request extends TaggedRequestClassAny,
+          Name extends string,
           A2 = A,
           E2 extends ResponseErrors = E,
           R2 = R,
@@ -591,7 +599,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           EDefect = never,
           RDefect = never
         >(
-          self: RequestHandlerWithInput<I, A, E, R, Request>,
+          self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
           action: string,
           options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
         ): Resp<I, A2, E2, R>
@@ -600,6 +608,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           A,
           R,
           Request extends TaggedRequestClassAny,
+          Name extends string,
           A2 = A,
           E2 extends ResponseErrors = E,
           R2 = R,
@@ -610,7 +619,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           EDefect = never,
           RDefect = never
         >(
-          self: RequestHandler<A, E, R, Request>,
+          self: RequestHandler<A, E, R, Request, Name>,
           action: string,
           options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
         ): ActResp<void, never, R>
@@ -631,6 +640,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           A,
           R,
           Request extends TaggedRequestClassAny,
+          Name extends string,
           A2 = A,
           E2 extends ResponseErrors = E,
           R2 = R,
@@ -641,7 +651,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           EDefect = never,
           RDefect = never
         >(
-          self: RequestHandlerWithInput<I, A, E, R, Request>,
+          self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
           action: string,
           options?: LowOptsOptional<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
         ): Resp<I, A2, E2, R2>
@@ -650,6 +660,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           A,
           R,
           Request extends TaggedRequestClassAny,
+          Name extends string,
           A2 = A,
           E2 extends ResponseErrors = E,
           R2 = R,
@@ -660,7 +671,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
           EDefect = never,
           RDefect = never
         >(
-          self: RequestHandler<A, E, R, Request>,
+          self: RequestHandler<A, E, R, Request, Name>,
           action: string,
           options?: LowOptsOptional<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
         ): ActResp<A2, E2, R2>
@@ -700,22 +711,22 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
        * you should use the result ref to render errors!
        */
       const _useSafeMutationWithState: {
-        <I, E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(
-          self: RequestHandlerWithInput<I, A, E, R, Request>,
+        <I, E, A, R, Request extends TaggedRequestClassAny, Name extends string, A2 = A, E2 = E, R2 = R>(
+          self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
           options?: MutationOptions<A, E, R, A2, E2, R2, I>
         ): readonly [
           ComputedRef<Res<A, E>>,
           (i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>
         ]
-        <E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(
-          self: RequestHandler<A, E, R, Request>,
+        <E, A, R, Request extends TaggedRequestClassAny, Name extends string, A2 = A, E2 = E, R2 = R>(
+          self: RequestHandler<A, E, R, Request, Name>,
           options?: MutationOptions<A, E, R, A2, E2, R2>
         ): readonly [
           ComputedRef<Res<A, E>>,
           Effect.Effect<Exit.Exit<A2, E2>, never, R2>
         ]
-      } = <I, E, A, R, Request extends TaggedRequestClassAny, A2 = A, E2 = E, R2 = R>(
-        self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
+      } = <I, E, A, R, Request extends TaggedRequestClassAny, Name extends string, A2 = A, E2 = E, R2 = R>(
+        self: RequestHandlerWithInput<I, A, E, R, Request, Name> | RequestHandler<A, E, R, Request, Name>,
         options?: MutationOptions<A, E, R, A2, E2, R2, I>
       ) => {
         const [a, b] = _useSafeMutation(self as any, options)
@@ -836,9 +847,10 @@ const mkQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
     <
       E,
       A,
-      Request extends TaggedRequestClassAny
+      Request extends TaggedRequestClassAny,
+      Name extends string
     >(
-      self: RequestHandler<A, E, R, Request>
+      self: RequestHandler<A, E, R, Request, Name>
     ): {
       (options?: QueryObserverOptionsCustom<A, E>): Promise<
         readonly [
@@ -869,9 +881,10 @@ const mkQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
       Arg,
       E,
       A,
-      Request extends TaggedRequestClassAny
+      Request extends TaggedRequestClassAny,
+      Name extends string
     >(
-      self: RequestHandlerWithInput<Arg, A, E, R, Request>
+      self: RequestHandlerWithInput<Arg, A, E, R, Request, Name>
     ): {
       (
         arg: Arg | WatchSource<Arg>,
@@ -899,8 +912,8 @@ const mkQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
         ]
       >
     }
-  } = <Arg, E, A, Request extends TaggedRequestClassAny>(
-    self: RequestHandlerWithInput<Arg, A, E, R, Request> | RequestHandler<A, E, R, Request>
+  } = <Arg, E, A, Request extends TaggedRequestClassAny, Name extends string>(
+    self: RequestHandlerWithInput<Arg, A, E, R, Request, Name> | RequestHandler<A, E, R, Request, Name>
   ) => {
     const runPromise = Runtime.runPromise(getRuntime())
     const q = _useQuery(self as any) as any

package/src/mutate.ts

@@ -147,20 +147,20 @@ export const makeMutation = () => {
      * 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>,
+    <I, E, A, R, Request extends TaggedRequestClassAny, Name extends string>(
+      self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
       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>,
+    <E, A, R, Request extends TaggedRequestClassAny, Name extends string>(
+      self: RequestHandler<A, E, R, Request, Name>,
       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>,
+  } = <I, E, A, R, Request extends TaggedRequestClassAny, Name extends string>(
+    self: RequestHandlerWithInput<I, A, E, R, Request, Name> | RequestHandler<A, E, R, Request, Name>,
     options?: MutationOptionsBase
   ) => {
     const queryClient = useQueryClient()

package/src/query.ts

@@ -33,10 +33,10 @@ export const makeQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
   // declare function useQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>, queryClient?: QueryClient): UseQueryReturnType<TData, TError>;
   // declare function useQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>, queryClient?: QueryClient): UseQueryDefinedReturnType<TData, TError>;
   // declare function useQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>, queryClient?: QueryClient): UseQueryReturnType<TData, TError>;
-  const useQuery_ = <I, A, E, Request extends TaggedRequestClassAny>(
+  const useQuery_ = <I, A, E, Request extends TaggedRequestClassAny, Name extends string>(
     q:
-      | RequestHandlerWithInput<I, A, E, R, Request>
-      | RequestHandler<A, E, R, Request>
+      | RequestHandlerWithInput<I, A, E, R, Request, Name>
+      | RequestHandler<A, E, R, Request, Name>
   ) =>
   (arg?: I | WatchSource<I>, options: QueryObserverOptionsCustom<unknown, KnownFiberFailure<E>, A> = {} // TODO
   ) => {
@@ -156,8 +156,8 @@ export const makeQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
   }
 
   const useQuery: {
-    <E, A, Request extends TaggedRequestClassAny>(
-      self: RequestHandler<A, E, R, Request>
+    <E, A, Request extends TaggedRequestClassAny, Name extends string>(
+      self: RequestHandler<A, E, R, Request, Name>
     ): {
       // required options, with initialData
       (
@@ -178,8 +178,8 @@ export const makeQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
         UseQueryReturnType<any, any>
       ]
     }
-    <Arg, E, A, Request extends TaggedRequestClassAny>(
-      self: RequestHandlerWithInput<Arg, A, E, R, Request>
+    <Arg, E, A, Request extends TaggedRequestClassAny, Name extends string>(
+      self: RequestHandlerWithInput<Arg, A, E, R, Request, Name>
     ): {
       // required options, with initialData
       (
@@ -268,11 +268,11 @@ export const useUpdateQuery = () => {
 
   const f: {
     <A>(
-      query: RequestHandler<A, any, any, any>,
+      query: RequestHandler<A, any, any, any, any>,
       updater: (data: NoInfer<A>) => NoInfer<A>
     ): void
     <I, A>(
-      query: RequestHandlerWithInput<I, A, any, any, any>,
+      query: RequestHandlerWithInput<I, A, any, any, any, any>,
       input: I,
       updater: (data: NoInfer<A>) => NoInfer<A>
     ): void

package/test/dist/stubs.d.ts

@@ -16,11 +16,11 @@ export declare const useExperimental: (options?: {
     takeOver: <Args_1 extends any[], A_2, E_2, R_3, const Name extends string>(command: Commander.CommandOut<Args_1, A_2, E_2, R_3, Name>) => (...args: Args_1) => Effect.Effect<A_2, E_2, import("../src/experimental/commander.js").CommandContext | Exclude<Exclude<R_3, import("../src/experimental/commander.js").CommandContext>, import("effect/Tracer").ParentSpan>>;
     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_3, E_3, R_4>(options?: {
-        errorRenderer?: (e: E_3) => string | undefined;
+    withDefaultToast: <A_3, E_3, R_4, Args_1 extends ReadonlyArray<unknown>>(options?: {
+        errorRenderer?: (e: E_3, ...args: Args_1) => string | undefined;
         onWaiting?: null;
         onSuccess?: null;
-    } | undefined) => (self: Effect.Effect<A_3, E_3, R_4>) => Effect.Effect<A_3, E_3, import("../src/experimental/commander.js").CommandContext | R_4>;
+    } | undefined) => (self: Effect.Effect<A_3, E_3, R_4>, ...args: Args_1) => Effect.Effect<A_3, E_3, import("../src/experimental/commander.js").CommandContext | R_4>;
     _tag: "Commander";
 };
 //# sourceMappingURL=stubs.d.ts.map

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

@@ -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;;;;;;;+IAjDnG,GAAD;gCAIgD,CAAC;qBAIlC,CAAC;6CAGc,CAAC;qBAE3B,CAAC;iBACD,CAAC;iBAAyB,CAAC;;;CA0CnC,CAAA"}
+{"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;;;;;;;+IAjDnG,GAAD;gCAIgD,CAAC;qBAIlC,CAAC;oFAKC,CAAC;qBAAyB,CAAC,WACzC,GAAG;iBACS,CAAC;iBACP,CAAC;2DAGN,GAAI;;CAqCZ,CAAA"}