@effect-app/vue 2.71.0 → 2.72.1

package/src/makeClient.ts

@@ -837,6 +837,8 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
   })
 }) {}
 
+export type ClientFrom<M extends Requests> = RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>
+
 const mkQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
   // making sure names do not collide with auto exports in nuxt apps, please do not rename..
   /**
@@ -1065,7 +1067,7 @@ export const makeClient = <RT, RE, RL>(
   // - reduce duplication for Types
 
   const mapQuery = <M extends Requests>(
-    client: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>
+    client: ClientFrom<M>
   ) => {
     const queries = Struct.keys(client).reduce(
       (acc, key) => {
@@ -1100,7 +1102,7 @@ export const makeClient = <RT, RE, RL>(
   }
 
   const mapMutation = <M extends Requests>(
-    client: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>
+    client: ClientFrom<M>
   ) => {
     const Command = useCommand()
     const wrap = Command.wrap
@@ -1123,24 +1125,24 @@ export const makeClient = <RT, RE, RL>(
               & ReturnType<typeof useMutation<I, E, A, R, Request, Id>>
               & (typeof client[Key] extends
                 RequestHandlerWithInput<infer _I, infer _A, infer _E, infer _R, infer _Request, infer Id>
-                ? Commander.CommandContextLocal<Id>
+                ? Commander.CommandContextLocal<Id, Id>
                 : typeof client[Key] extends RequestHandler<infer _A, infer _E, infer _R, infer _Request, infer Id>
-                  ? Commander.CommandContextLocal<Id>
+                  ? Commander.CommandContextLocal<Id, Id>
                 : never)
             : typeof client[Key] extends RequestHandler<infer A, infer E, infer R, infer Request, infer Id> ?
                 & ReturnType<typeof useMutation<E, A, R, Request, Id>>
                 & (typeof client[Key] extends
                   RequestHandlerWithInput<infer _I, infer _A, infer _E, infer _R, infer _Request, infer Id>
-                  ? Commander.CommandContextLocal<Id>
+                  ? Commander.CommandContextLocal<Id, Id>
                   : typeof client[Key] extends RequestHandler<infer _A, infer _E, infer _R, infer _Request, infer Id>
-                    ? Commander.CommandContextLocal<Id>
+                    ? Commander.CommandContextLocal<Id, Id>
                   : never)
             : never)
           & (typeof client[Key] extends
             RequestHandlerWithInput<infer _I, infer _A, infer _E, infer _R, infer _Request, infer Id>
-            ? Commander.CommandContextLocal<Id>
+            ? Commander.CommandContextLocal<Id, Id>
             : typeof client[Key] extends RequestHandler<infer _A, infer _E, infer _R, infer _Request, infer Id>
-              ? Commander.CommandContextLocal<Id>
+              ? Commander.CommandContextLocal<Id, Id>
             : never)
           & (typeof client[Key] extends
             RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer Request, infer Id>
@@ -1151,15 +1153,15 @@ export const makeClient = <RT, RE, RL>(
           & {
             wrap: typeof client[Key] extends
               RequestHandlerWithInput<infer I, infer A, infer E, infer _R, infer _Request, infer Id>
-              ? ReturnType<typeof wrap<Id, [I], A, E, never>> & Commander.CommandContextLocal<Id>
+              ? ReturnType<typeof wrap<Id, [I], A, E, never, Id>> & Commander.CommandContextLocal<Id, Id>
               : typeof client[Key] extends RequestHandler<infer A, infer E, infer _R, infer _Request, infer Id>
-                ? ReturnType<typeof wrap<Id, [], A, E, never>> & Commander.CommandContextLocal<Id>
+                ? ReturnType<typeof wrap<Id, [], A, E, never, Id>> & Commander.CommandContextLocal<Id, Id>
               : never
             fn: typeof client[Key] extends
               RequestHandlerWithInput<infer _I, infer _A, infer _E, infer _R, infer _Request, infer Id>
-              ? ReturnType<typeof fn_<Id>> & Commander.CommandContextLocal<Id>
+              ? ReturnType<typeof fn_<Id>> & Commander.CommandContextLocal<Id, Id>
               : typeof client[Key] extends RequestHandler<infer _A, infer _E, infer _R, infer _Request, infer Id>
-                ? ReturnType<typeof fn_<Id>> & Commander.CommandContextLocal<Id>
+                ? ReturnType<typeof fn_<Id>> & Commander.CommandContextLocal<Id, Id>
               : never
           }
       }
@@ -1170,14 +1172,15 @@ export const makeClient = <RT, RE, RL>(
   // make available .query, .suspense and .mutate for each operation
   // and a .helpers with all mutations and queries
   const mapClient = <M extends Requests>(
-    queryInvalidation?: QueryInvalidation<M>
+    queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M>
   ) =>
   (
-    client: RequestHandlers<never, never, Omit<M, "meta">, M["meta"]["moduleName"]>
+    client: ClientFrom<M>
   ) => {
     const Command = useCommand()
     const wrap = Command.wrap
     const fn_ = Command.fn
+    const invalidation = queryInvalidation?.(client)
     const extended = Struct.keys(client).reduce(
       (acc, key) => {
         const fn = fn_(client[key].id)
@@ -1189,7 +1192,7 @@ export const makeClient = <RT, RE, RL>(
         }
         const mutate = useMutation(
           client[key] as any,
-          queryInvalidation?.[key] ? { queryInvalidation: queryInvalidation[key] } : undefined
+          invalidation?.[key] ? { queryInvalidation: invalidation[key] } : undefined
         )
         ;(acc as any)[key] = Object.assign(mutate, { wrap: wrap({ mutate, id: awesome.id }), fn }, awesome, fn)
         return acc
@@ -1198,15 +1201,15 @@ export const makeClient = <RT, RE, RL>(
         [Key in keyof typeof client]:
           & (typeof client[Key] extends
             RequestHandlerWithInput<infer _I, infer _A, infer _E, infer _R, infer _Request, infer Id>
-            ? Commander.CommandContextLocal<Id>
+            ? Commander.CommandContextLocal<Id, Id>
             : typeof client[Key] extends RequestHandler<infer _A, infer _E, infer _R, infer _Request, infer Id>
-              ? Commander.CommandContextLocal<Id>
+              ? Commander.CommandContextLocal<Id, Id>
             : never)
           & (typeof client[Key] extends
             RequestHandlerWithInput<infer _I, infer _A, infer _E, infer _R, infer _Request, infer Id>
-            ? Commander.CommandContextLocal<Id>
+            ? Commander.CommandContextLocal<Id, Id>
             : typeof client[Key] extends RequestHandler<infer _A, infer _E, infer _R, infer _Request, infer Id>
-              ? Commander.CommandContextLocal<Id>
+              ? Commander.CommandContextLocal<Id, Id>
             : never)
           & (typeof client[Key] extends
             RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer Request, infer Id>
@@ -1217,15 +1220,15 @@ export const makeClient = <RT, RE, RL>(
           & {
             wrap: typeof client[Key] extends
               RequestHandlerWithInput<infer I, infer A, infer E, infer _R, infer _Request, infer Id>
-              ? ReturnType<typeof wrap<Id, [I], A, E, never>> & Commander.CommandContextLocal<Id>
+              ? ReturnType<typeof wrap<Id, [I], A, E, never, Id>> & Commander.CommandContextLocal<Id, Id>
               : typeof client[Key] extends RequestHandler<infer A, infer E, infer _R, infer _Request, infer Id>
-                ? ReturnType<typeof wrap<Id, [], A, E, never>> & Commander.CommandContextLocal<Id>
+                ? ReturnType<typeof wrap<Id, [], A, E, never, Id>> & Commander.CommandContextLocal<Id, Id>
               : never
             fn: typeof client[Key] extends
               RequestHandlerWithInput<infer _I, infer _A, infer _E, infer _R, infer _Request, infer Id>
-              ? ReturnType<typeof fn_<Id>> & Commander.CommandContextLocal<Id>
+              ? ReturnType<typeof fn_<Id>> & Commander.CommandContextLocal<Id, Id>
               : typeof client[Key] extends RequestHandler<infer _A, infer _E, infer _R, infer _Request, infer Id>
-                ? ReturnType<typeof fn_<Id>> & Commander.CommandContextLocal<Id>
+                ? ReturnType<typeof fn_<Id>> & Commander.CommandContextLocal<Id, Id>
               : never
           }
           & typeof client[Key]
@@ -1258,7 +1261,7 @@ export const makeClient = <RT, RE, RL>(
   // todo; invalidateQueries should perhaps be configured in the Request impl themselves?
   const clientFor = <M extends Requests>(
     m: M,
-    queryInvalidation?: QueryInvalidation<M>
+    queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M>
   ) => getBaseMrt().runSync(clientFor_(m).pipe(Effect.map(mapClient(queryInvalidation))))
 
   const legacy = {

package/test/dist/stubs.d.ts

@@ -9,8 +9,8 @@ export declare const useExperimental: (options?: {
     messages?: Record<string, string> | Record<string, MessageFormatElement[]>;
     toasts: any[];
 }) => {
-    confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("../src/experimental/intl.js").I18n | import("../src/experimental/confirm.js").Confirm | import("../src/experimental/commander.js").CommandContext>;
-    confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("../src/experimental/intl.js").I18n | import("../src/experimental/confirm.js").Confirm | import("../src/experimental/commander.js").CommandContext>;
+    confirmOrInterrupt: (message?: string | undefined) => Effect.Effect<void, never, import("../src/experimental/commander.js").CommandContext | import("../src/experimental/intl.js").I18n | import("../src/experimental/confirm.js").Confirm>;
+    confirm: (message?: string | undefined) => Effect.Effect<boolean, never, import("../src/experimental/commander.js").CommandContext | import("../src/experimental/intl.js").I18n | import("../src/experimental/confirm.js").Confirm>;
     updateAction: <Args extends Array<unknown>>(update: (currentActionId: string, ...args: Args) => string) => <A, E, R_1>(_: Effect.Effect<A, E, R_1>, ...input: Args) => Effect.Effect<A, E, import("../src/experimental/commander.js").CommandContext | R_1>;
     defaultFailureMessageHandler: <E_1, Args extends Array<unknown>, AME, AMR>(actionMaker: string | ((o: import("effect/Option").Option<E_1>, ...args: Args) => string) | ((o: import("effect/Option").Option<E_1>, ...args: Args) => Effect.Effect<string, AME, AMR>), errorRenderer?: (e: E_1, action: string, ...args: Args) => string | undefined) => (o: import("effect/Option").Option<E_1>, ...args: Args) => Effect.Effect<string | {
         level: "warn";
@@ -21,23 +21,23 @@ export declare const useExperimental: (options?: {
         errorRenderer?: (e: E_1, action: string, ...args: Args_2) => string | undefined;
         onWaiting?: null | undefined | string | ((action: string, ...args: Args_2) => string | null | undefined);
         onSuccess?: null | undefined | string | ((a: A, action: string, ...args: Args_2) => string | null | undefined);
-    }) => (self: Effect.Effect<A, E_1, R_2>, ...args: Args_2) => Effect.Effect<A, E_1, import("../src/experimental/intl.js").I18n | import("../src/experimental/withToast.js").WithToast | import("../src/experimental/commander.js").CommandContext | R_2>;
-    alt: <const Id extends string>(id: Id, customI18nKey?: string) => Commander.CommandContextLocal<Id> & (<Args_3 extends Array<unknown>, A, E_2, R_3 extends I18n | WithToast | Toast.Toast | import("../src/experimental/commander.js").CommandContext>(handler: (...args: Args_3) => Effect.Effect<A, E_2, R_3>) => Commander.CommandOut<Args_3, A, E_2, R_3, Id>);
-    fn: <const Id extends string, const I18nKey extends string = Id>(id: Id, customI18nKey?: I18nKey | undefined) => Commander.Gen<I18n | WithToast | Toast.Toast, Id> & Commander.NonGen<I18n | WithToast | Toast.Toast, Id>;
-    wrap: <const Id extends string, Args_3 extends Array<unknown>, A_1, E_3, R_4>(mutation: (((...args: Args_3) => Effect.Effect<A_1, E_3, R_4>) & {
+    }) => (self: Effect.Effect<A, E_1, R_2>, ...args: Args_2) => Effect.Effect<A, E_1, import("../src/experimental/commander.js").CommandContext | import("../src/experimental/intl.js").I18n | R_2 | import("../src/experimental/withToast.js").WithToast>;
+    alt: <const Id extends string, const I18nKey extends string = Id>(id: Id, customI18nKey?: I18nKey | undefined) => Commander.CommandContextLocal<Id, I18nKey> & (<Args_3 extends Array<unknown>, A, E_2, R_3 extends Toast.Toast | I18n | WithToast | import("../src/experimental/commander.js").CommandContext>(handler: (...args: Args_3) => Effect.Effect<A, E_2, R_3>) => Commander.CommandOut<Args_3, A, E_2, R_3, Id, I18nKey>);
+    fn: <const Id extends string, const I18nKey_1 extends string = Id>(id: Id, customI18nKey?: I18nKey_1 | undefined) => Commander.Gen<Toast.Toast | I18n | WithToast, Id, I18nKey_1> & Commander.NonGen<Toast.Toast | I18n | WithToast, Id, I18nKey_1>;
+    wrap: <const Id extends string, Args_3 extends Array<unknown>, A_1, E_3, R_4, I18nKey_2 extends string = Id>(mutation: (((...args: Args_3) => Effect.Effect<A_1, E_3, R_4>) & {
         id: Id;
     }) | {
         mutate: (...args: Args_3) => Effect.Effect<A_1, E_3, R_4>;
         id: Id;
-    }, customI18nKey?: string) => Commander.CommandContextLocal<Id> & Commander.GenWrap<I18n | WithToast | Toast.Toast, Id, Args_3, A_1, E_3, R_4> & Commander.NonGenWrap<I18n | WithToast | Toast.Toast, Id, Args_3, A_1, E_3, R_4>;
-    alt2: <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR>(id: Id | (((...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>) & {
+    }, customI18nKey?: I18nKey_2 | undefined) => Commander.CommandContextLocal<Id, I18nKey_2> & Commander.GenWrap<Toast.Toast | I18n | WithToast, Id, I18nKey_2, Args_3, A_1, E_3, R_4> & Commander.NonGenWrap<Toast.Toast | I18n | WithToast, Id, I18nKey_2, Args_3, A_1, E_3, R_4>;
+    alt2: <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR, const I18nKey_3 extends string = Id>(id: Id | (((...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>) & {
         id: Id;
     }) | {
         id: Id;
         mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
-    }) => Commander.CommandContextLocal<Id> & (<Args_4 extends Array<unknown>, A_2, E_4, R_5 extends I18n | WithToast | Toast.Toast | import("../src/experimental/commander.js").CommandContext>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
+    }, customI18nKey?: I18nKey_3 | undefined) => Commander.CommandContextLocal<Id, I18nKey_3> & (<Args_4 extends Array<unknown>, A_2, E_4, R_5 extends Toast.Toast | I18n | WithToast | import("../src/experimental/commander.js").CommandContext>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id, I18nKey_3> & {
         mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
-    }) => (...args: Args_4) => Effect.Effect<A_2, E_4, R_5>) => Commander.CommandOut<Args_4, A_2, E_4, R_5, Id>);
+    }) => (...args: Args_4) => Effect.Effect<A_2, E_4, R_5>) => Commander.CommandOut<Args_4, A_2, E_4, R_5, Id, I18nKey_3>);
     _tag: "Commander";
 };
 //# sourceMappingURL=stubs.d.ts.map