@leancodepl/react-query-cqrs-client 9.6.2 → 9.6.4

package/index.cjs.js

@@ -59,11 +59,11 @@ function uncapitalizedParse() {
 }
 /**
  * Creates React Query CQRS client with hooks for queries, operations, and commands.
- * 
+ *
  * Integrates with React Query to provide caching, background updates, and optimistic updates
  * for CQRS operations. Automatically handles authentication, retries, and response transformation
  * with uncapitalized keys.
- * 
+ *
  * @param cqrsEndpoint - Base URL for CQRS API endpoints
  * @param queryClient - React Query client instance
  * @param tokenProvider - Optional token provider for authentication
@@ -136,7 +136,7 @@ function uncapitalizedParse() {
                     queryKey: [
                         type
                     ],
-                    queryFn: async (context)=>await rxjs.firstValueFrom(useApiQuery.fetcher(context.pageParam, context)),
+                    queryFn: (context)=>rxjs.firstValueFrom(useApiQuery.fetcher(context.pageParam, context)),
                     initialPageParam: initialPageData
                 }, options), queryClient);
             };
@@ -187,8 +187,8 @@ function uncapitalizedParse() {
                     mutationKey: useApiOperation.key,
                     mutationFn: (variables)=>rxjs.firstValueFrom(useApiOperation.fetcher(variables))
                 }, options, {
-                    async onSuccess (data, variables, context) {
-                        const result = await (onSuccessBase == null ? void 0 : onSuccessBase(data, variables, context));
+                    async onSuccess (data, variables, onMutateResult, context) {
+                        const result = await (onSuccessBase == null ? void 0 : onSuccessBase(data, variables, onMutateResult, context));
                         if (invalidateQueries) {
                             await Promise.allSettled(invalidateQueries.map((queryKey)=>queryClient.invalidateQueries({
                                     queryKey
@@ -219,26 +219,27 @@ function uncapitalizedParse() {
                 return reactQuery.useMutation(_extends({}, options, {
                     mutationKey: useApiCommand.key,
                     mutationFn: (variables)=>rxjs.firstValueFrom(useApiCommand.call(variables, handler)),
-                    async onMutate (variables) {
+                    async onMutate (variables, context) {
                         // there's really no good way to do it without type cast
-                        const baseContext = await (onMutate == null ? void 0 : onMutate(variables));
+                        const baseResult = await (onMutate == null ? void 0 : onMutate(variables, context));
                         var _optimisticUpdate;
                         const optimisticUpdateReverts = await Promise.all((_optimisticUpdate = optimisticUpdate == null ? void 0 : optimisticUpdate(variables)) != null ? _optimisticUpdate : []);
-                        return _extends({}, baseContext, {
+                        return _extends({}, baseResult, {
                             revertOptimisticUpdate: ()=>optimisticUpdateReverts.forEach((revertOptimisticUpdate)=>revertOptimisticUpdate())
                         });
                     },
-                    async onError (error, variables, context) {
-                        await (onError == null ? void 0 : onError(error, variables, context));
-                        context == null ? void 0 : context.revertOptimisticUpdate();
+                    async onError (error, variables, onMutateResult, context) {
+                        await (onError == null ? void 0 : onError(error, variables, onMutateResult, context));
+                        onMutateResult == null ? void 0 : onMutateResult.revertOptimisticUpdate();
                     },
-                    async onSettled (data, error, variables, context) {
+                    // eslint-disable-next-line max-params
+                    async onSettled (data, error, variables, onMutateResult, context) {
                         if (invalidateQueries) {
                             await Promise.allSettled(invalidateQueries.map((queryKey)=>queryClient.invalidateQueries({
                                     queryKey
                                 })));
                         }
-                        return await (onSettled == null ? void 0 : onSettled(data, error, variables, context));
+                        return await (onSettled == null ? void 0 : onSettled(data, error, variables, onMutateResult, context));
                     }
                 }), queryClient);
             }
@@ -246,7 +247,7 @@ function uncapitalizedParse() {
             useApiCommand.key = [
                 useApiCommand.type
             ];
-            useApiCommand.fetcher = (variables)=>fetcher(variables);
+            useApiCommand.fetcher = fetcher;
             useApiCommand.call = (variables, handler)=>{
                 const $response = useApiCommand.fetcher(variables);
                 return $response.pipe(operators.map((result)=>({

package/index.esm.js

@@ -57,11 +57,11 @@ function uncapitalizedParse() {
 }
 /**
  * Creates React Query CQRS client with hooks for queries, operations, and commands.
- * 
+ *
  * Integrates with React Query to provide caching, background updates, and optimistic updates
  * for CQRS operations. Automatically handles authentication, retries, and response transformation
  * with uncapitalized keys.
- * 
+ *
  * @param cqrsEndpoint - Base URL for CQRS API endpoints
  * @param queryClient - React Query client instance
  * @param tokenProvider - Optional token provider for authentication
@@ -134,7 +134,7 @@ function uncapitalizedParse() {
                     queryKey: [
                         type
                     ],
-                    queryFn: async (context)=>await firstValueFrom(useApiQuery.fetcher(context.pageParam, context)),
+                    queryFn: (context)=>firstValueFrom(useApiQuery.fetcher(context.pageParam, context)),
                     initialPageParam: initialPageData
                 }, options), queryClient);
             };
@@ -185,8 +185,8 @@ function uncapitalizedParse() {
                     mutationKey: useApiOperation.key,
                     mutationFn: (variables)=>firstValueFrom(useApiOperation.fetcher(variables))
                 }, options, {
-                    async onSuccess (data, variables, context) {
-                        const result = await (onSuccessBase == null ? void 0 : onSuccessBase(data, variables, context));
+                    async onSuccess (data, variables, onMutateResult, context) {
+                        const result = await (onSuccessBase == null ? void 0 : onSuccessBase(data, variables, onMutateResult, context));
                         if (invalidateQueries) {
                             await Promise.allSettled(invalidateQueries.map((queryKey)=>queryClient.invalidateQueries({
                                     queryKey
@@ -217,26 +217,27 @@ function uncapitalizedParse() {
                 return useMutation(_extends({}, options, {
                     mutationKey: useApiCommand.key,
                     mutationFn: (variables)=>firstValueFrom(useApiCommand.call(variables, handler)),
-                    async onMutate (variables) {
+                    async onMutate (variables, context) {
                         // there's really no good way to do it without type cast
-                        const baseContext = await (onMutate == null ? void 0 : onMutate(variables));
+                        const baseResult = await (onMutate == null ? void 0 : onMutate(variables, context));
                         var _optimisticUpdate;
                         const optimisticUpdateReverts = await Promise.all((_optimisticUpdate = optimisticUpdate == null ? void 0 : optimisticUpdate(variables)) != null ? _optimisticUpdate : []);
-                        return _extends({}, baseContext, {
+                        return _extends({}, baseResult, {
                             revertOptimisticUpdate: ()=>optimisticUpdateReverts.forEach((revertOptimisticUpdate)=>revertOptimisticUpdate())
                         });
                     },
-                    async onError (error, variables, context) {
-                        await (onError == null ? void 0 : onError(error, variables, context));
-                        context == null ? void 0 : context.revertOptimisticUpdate();
+                    async onError (error, variables, onMutateResult, context) {
+                        await (onError == null ? void 0 : onError(error, variables, onMutateResult, context));
+                        onMutateResult == null ? void 0 : onMutateResult.revertOptimisticUpdate();
                     },
-                    async onSettled (data, error, variables, context) {
+                    // eslint-disable-next-line max-params
+                    async onSettled (data, error, variables, onMutateResult, context) {
                         if (invalidateQueries) {
                             await Promise.allSettled(invalidateQueries.map((queryKey)=>queryClient.invalidateQueries({
                                     queryKey
                                 })));
                         }
-                        return await (onSettled == null ? void 0 : onSettled(data, error, variables, context));
+                        return await (onSettled == null ? void 0 : onSettled(data, error, variables, onMutateResult, context));
                     }
                 }), queryClient);
             }
@@ -244,7 +245,7 @@ function uncapitalizedParse() {
             useApiCommand.key = [
                 useApiCommand.type
             ];
-            useApiCommand.fetcher = (variables)=>fetcher(variables);
+            useApiCommand.fetcher = fetcher;
             useApiCommand.call = (variables, handler)=>{
                 const $response = useApiCommand.fetcher(variables);
                 return $response.pipe(map((result)=>({

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@leancodepl/react-query-cqrs-client",
-  "version": "9.6.2",
+  "version": "9.6.4",
   "license": "Apache-2.0",
   "dependencies": {
-    "@leancodepl/cqrs-client-base": "9.6.2",
-    "@leancodepl/utils": "9.6.2",
-    "@leancodepl/validation": "9.6.2",
+    "@leancodepl/cqrs-client-base": "9.6.4",
+    "@leancodepl/utils": "9.6.4",
+    "@leancodepl/validation": "9.6.4",
     "@tanstack/react-query": ">=5.0.0",
     "rxjs": ">=7.0.0"
   },

package/src/lib/mkCqrsClient.d.ts

@@ -1,4 +1,4 @@
-import { FetchQueryOptions, InfiniteData, QueryClient, QueryFunctionContext, QueryKey, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
+import { DefaultError, FetchQueryOptions, InfiniteData, QueryClient, QueryFunctionContext, QueryKey, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, Updater, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
 import { Observable, OperatorFunction } from "rxjs";
 import { AjaxConfig } from "rxjs/ajax";
 import { ApiResponse, ApiSuccess, CommandResult, FailedCommandResult, SuccessfulCommandResult, TokenProvider } from "@leancodepl/cqrs-client-base";
@@ -34,52 +34,52 @@ export declare function mkCqrsClient({ cqrsEndpoint, queryClient, tokenProvider,
     tokenHeader?: string;
 }): {
     createQuery<TQuery, TResult>(type: string): {
-        (data: TQuery, options?: Omit<UndefinedInitialDataOptions<NullableUncapitalizeDeep<TResult>, unknown>, "queryFn" | "queryKey">): import("@tanstack/react-query").UseQueryResult<NullableUncapitalizeDeep<TResult>, unknown>;
+        (data: TQuery, options?: Omit<UndefinedInitialDataOptions<NullableUncapitalizeDeep<TResult>, DefaultError, NullableUncapitalizeDeep<TResult>, readonly [string, (Partial<TQuery> | undefined)?]>, "queryFn" | "queryKey">): import("@tanstack/react-query").UseQueryResult<import("@tanstack/react-query").NoInfer<NullableUncapitalizeDeep<TResult>>, Error>;
         type: string;
-        fetcher(data: TQuery, context?: QueryFunctionContext<QueryKey>): Observable<NullableUncapitalizeDeep<TResult>>;
-        fetch(data: TQuery, options?: Omit<FetchQueryOptions<NullableUncapitalizeDeep<TResult>, unknown>, "queryFn" | "queryKey">): Promise<NullableUncapitalizeDeep<TResult>>;
-        lazy<TContext = unknown>(options?: Omit<UseMutationOptions<NullableUncapitalizeDeep<TResult>, unknown, TQuery, TContext>, "mutationFn" | "mutationKey">): UseMutationResult<NullableUncapitalizeDeep<TResult>, unknown, TQuery, TContext>;
-        infinite(initialPageData: TQuery, options: Omit<UndefinedInitialDataInfiniteOptions<NullableUncapitalizeDeep<TResult>, unknown, InfiniteData<NullableUncapitalizeDeep<TResult>>, QueryKey, TQuery>, "initialPageParam" | "queryFn" | "queryKey" | "select">): import("@tanstack/react-query").UseInfiniteQueryResult<InfiniteData<NullableUncapitalizeDeep<TResult>, TQuery>, unknown>;
-        key(query: Partial<TQuery>): readonly [string, Partial<TQuery>];
+        fetcher(data: TQuery, context?: QueryFunctionContext<readonly [string, (Partial<TQuery> | undefined)?]>): Observable<NullableUncapitalizeDeep<TResult>>;
+        fetch(data: TQuery, options?: Omit<FetchQueryOptions<NullableUncapitalizeDeep<TResult>, DefaultError, NullableUncapitalizeDeep<TResult>, readonly [string, (Partial<TQuery> | undefined)?]>, "queryFn" | "queryKey">): Promise<NullableUncapitalizeDeep<TResult>>;
+        lazy<TOnMutateResult = unknown>(options?: Omit<UseMutationOptions<NullableUncapitalizeDeep<TResult>, DefaultError, TQuery, TOnMutateResult>, "mutationFn" | "mutationKey">): UseMutationResult<NullableUncapitalizeDeep<TResult>, Error, TQuery, TOnMutateResult>;
+        infinite(initialPageData: TQuery, options: Omit<UndefinedInitialDataInfiniteOptions<NullableUncapitalizeDeep<TResult>, DefaultError, InfiniteData<NullableUncapitalizeDeep<TResult>>, readonly [string, (Partial<TQuery> | undefined)?], TQuery>, "initialPageParam" | "queryFn" | "queryKey" | "select">): import("@tanstack/react-query").UseInfiniteQueryResult<InfiniteData<NullableUncapitalizeDeep<TResult>, TQuery>, Error>;
+        key(query: Partial<TQuery>): readonly [string, (Partial<TQuery> | undefined)?];
         setQueryData: {
             (query: TQuery, updater: Updater<NullableUncapitalizeDeep<TResult> | undefined, NullableUncapitalizeDeep<TResult> | undefined>): NullableUncapitalizeDeep<TResult> | undefined;
-            (queryKey: QueryKey, updater: Updater<NullableUncapitalizeDeep<TResult> | undefined, NullableUncapitalizeDeep<TResult> | undefined>): NullableUncapitalizeDeep<TResult> | undefined;
+            (queryKey: readonly [string, (Partial<TQuery> | undefined)?], updater: Updater<NullableUncapitalizeDeep<TResult> | undefined, NullableUncapitalizeDeep<TResult> | undefined>): NullableUncapitalizeDeep<TResult> | undefined;
         };
         setQueriesData(query: Partial<TQuery>, updater: Updater<NullableUncapitalizeDeep<TResult> | undefined, NullableUncapitalizeDeep<TResult> | undefined>): [readonly unknown[], unknown][];
         getQueryData(query: TQuery): NullableUncapitalizeDeep<TResult> | undefined;
         getQueriesData(query: Partial<TQuery>): [readonly unknown[], NullableUncapitalizeDeep<TResult> | undefined][];
-        prefetch(data: TQuery, options?: Omit<FetchQueryOptions<NullableUncapitalizeDeep<TResult>, unknown>, "initialData" | "queryFn" | "queryKey">): Promise<void>;
+        prefetch(data: TQuery, options?: Omit<FetchQueryOptions<NullableUncapitalizeDeep<TResult>, DefaultError, NullableUncapitalizeDeep<TResult>, readonly [string, (Partial<TQuery> | undefined)?]>, "initialData" | "queryFn" | "queryKey">): Promise<void>;
         invalidate(query: Partial<TQuery>): Promise<void>;
         cancel(query: Partial<TQuery>): Promise<void>;
         optimisticUpdate(updater: Updater<NullableUncapitalizeDeep<TResult> | undefined, NullableUncapitalizeDeep<TResult> | undefined>, query?: Partial<TQuery>): Promise<() => void>;
     };
     createOperation<TOperation, TResult>(type: string): {
-        <TContext = unknown>({ onSuccess: onSuccessBase, invalidateQueries, ...options }?: Omit<UseMutationOptions<NullableUncapitalizeDeep<TResult>, unknown, TOperation, TContext>, "mutationFn" | "mutationKey"> & {
+        <TOnMutateResult = unknown>({ onSuccess: onSuccessBase, invalidateQueries, ...options }?: Omit<UseMutationOptions<NullableUncapitalizeDeep<TResult>, DefaultError, TOperation, TOnMutateResult>, "mutationFn" | "mutationKey"> & {
             invalidateQueries?: QueryKey[];
-        }): UseMutationResult<NullableUncapitalizeDeep<TResult>, unknown, TOperation, TContext>;
+        }): UseMutationResult<NullableUncapitalizeDeep<TResult>, Error, TOperation, TOnMutateResult>;
         type: string;
-        key: string[];
+        key: readonly [string];
         fetcher(variables: TOperation): Observable<NullableUncapitalizeDeep<TResult>>;
     };
     createCommand<TCommand, TErrorCodes extends {
         [name: string]: number;
     }>(type: string, errorCodes: TErrorCodes): {
-        <TContext extends Record<string, unknown> = {}>(options?: Omit<UseMutationOptions<ApiSuccess<SuccessfulCommandResult>, ApiResponse<FailedCommandResult<TErrorCodes>>, TCommand, TContext>, "mutationFn" | "mutationKey"> & {
+        <TOnMutateResult extends Record<string, unknown> = {}>(options?: Omit<UseMutationOptions<ApiSuccess<SuccessfulCommandResult>, ApiResponse<FailedCommandResult<TErrorCodes>>, TCommand, TOnMutateResult>, "mutationFn" | "mutationKey"> & {
             invalidateQueries?: QueryKey[];
             handler?: undefined;
             optimisticUpdate?: (variables: TCommand) => Promise<() => void>[];
-        }): UseMutationResult<ApiSuccess<SuccessfulCommandResult>, ApiResponse<FailedCommandResult<TErrorCodes>>, TCommand, TContext>;
-        <TResult, TContext extends Record<string, unknown> = {}>(options?: Omit<UseMutationOptions<TResult, TResult, TCommand, TContext>, "mutationFn" | "mutationKey"> & {
+        }): UseMutationResult<ApiSuccess<SuccessfulCommandResult>, ApiResponse<FailedCommandResult<TErrorCodes>>, TCommand, TOnMutateResult>;
+        <TResult, TOnMutateResult extends Record<string, unknown> = {}>(options?: Omit<UseMutationOptions<TResult, TResult, TCommand, TOnMutateResult>, "mutationFn" | "mutationKey"> & {
             invalidateQueries?: QueryKey[];
             handler: (handler: ValidationErrorsHandler<TErrorCodes & {
                 success: -1;
                 failure: -2;
             }, never>) => TResult;
             optimisticUpdate?: (variables: TCommand) => Promise<() => void>[];
-        }): UseMutationResult<TResult, TResult, TCommand, TContext>;
+        }): UseMutationResult<TResult, TResult, TCommand, TOnMutateResult>;
         type: string;
-        key: string[];
-        fetcher(variables: TCommand): Observable<SuccessfulCommandResult>;
+        key: readonly [string];
+        fetcher: (data: TCommand) => Observable<SuccessfulCommandResult>;
         call<TResult>(variables: TCommand, handler?: (handler: ValidationErrorsHandler<TErrorCodes & {
             success: -1;
             failure: -2;