reactjrx 1.109.1 → 1.111.0

package/dist/index.cjs

@@ -801,29 +801,28 @@ function useMutation$(options, queryClient) {
     isSuccess: false,
     isIdle: true
   });
-  const mutationFnAsync = (variables) => {
-    let lastData;
-    return new Promise((resolve, reject) => {
-      const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
-      source.pipe(rxjs.take(1)).subscribe({
-        next: (data) => {
-          lastData = { value: data };
-        },
-        error: (error) => {
-          reject(error);
-        },
-        complete: () => {
-          if (lastData === void 0)
-            return reject(new Error("Stream completed without any data"));
-          resolve(lastData.value);
-        }
-      });
-    });
-  };
   const result = reactQuery.useMutation(
     {
       ...options,
-      mutationFn: mutationFnAsync
+      mutationFn: (variables) => {
+        let lastData;
+        return new Promise((resolve, reject) => {
+          const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+          source.pipe(rxjs.take(1)).subscribe({
+            next: (data) => {
+              lastData = { value: data };
+            },
+            error: (error) => {
+              reject(error);
+            },
+            complete: () => {
+              if (lastData === void 0)
+                return reject(new Error("Stream completed without any data"));
+              resolve(lastData.value);
+            }
+          });
+        });
+      }
     },
     queryClient
   );
@@ -835,12 +834,7 @@ function useMutation$(options, queryClient) {
 }
 function useSwitchMutation$(options, queryClient) {
   const [cancel$, cancel] = useObservableCallback();
-  const {
-    mutate,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    mutateAsync: _removed,
-    ...rest
-  } = useMutation$(
+  const { mutate, mutateAsync, ...rest } = useMutation$(
     {
       ...options,
       mutationFn: (variables) => {
@@ -853,11 +847,77 @@ function useSwitchMutation$(options, queryClient) {
   const mutateSwitch = React.useCallback(
     (variables) => {
       cancel();
-      mutate(variables);
+      return mutate(variables);
     },
     [mutate, cancel]
   );
-  return { ...rest, mutate: mutateSwitch };
+  const mutateAsyncSwitch = React.useCallback(
+    (variables) => {
+      cancel();
+      return mutateAsync(variables);
+    },
+    [mutateAsync, cancel]
+  );
+  return { ...rest, mutate: mutateSwitch, mutateAsync: mutateAsyncSwitch };
+}
+function useContactMutation$(options, queryClient) {
+  const client = reactQuery.useQueryClient(queryClient);
+  const mutationKey = options.mutationKey;
+  const { mutateAsync, ...rest } = useMutation$(
+    {
+      ...options,
+      onMutate({ variables }) {
+        var _a;
+        return (_a = options.onMutate) == null ? void 0 : _a.call(options, variables);
+      },
+      onSuccess(data, variables, context) {
+        var _a;
+        return (_a = options.onSuccess) == null ? void 0 : _a.call(options, data, variables.variables, context);
+      },
+      onError(error, variables, context) {
+        var _a;
+        return (_a = options.onError) == null ? void 0 : _a.call(options, error, variables.variables, context);
+      },
+      onSettled(data, error, variables, context) {
+        var _a;
+        return (_a = options.onSettled) == null ? void 0 : _a.call(options, data, error, variables.variables, context);
+      },
+      mutationFn: ({ ready$, variables }) => {
+        const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+        return ready$.pipe(
+          rxjs.filter((isReady) => isReady),
+          rxjs.first(),
+          rxjs.switchMap(() => source)
+        );
+      }
+    },
+    queryClient
+  );
+  const mutateAsyncConcat = React.useCallback(
+    async (variables) => {
+      const mutations = client.getMutationCache().findAll({
+        mutationKey,
+        exact: true
+      });
+      const subject = new rxjs.BehaviorSubject(false);
+      const result = mutateAsync({ variables, ready$: subject });
+      await Promise.all(
+        mutations.map((mutation) => mutation.continue().catch(rxjs.noop))
+      );
+      subject.next(true);
+      return await result.finally(() => {
+        subject.complete();
+      });
+    },
+    [mutateAsync, client, mutationKey]
+  );
+  const mutateConcat = React.useCallback(
+    (variables) => {
+      mutateAsyncConcat(variables).catch(rxjs.noop);
+    },
+    [mutateAsyncConcat]
+  );
+  return { ...rest, mutate: mutateConcat, mutateAsync: mutateAsyncConcat };
 }
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
@@ -3624,6 +3684,7 @@ exports.isServer = isServer;
 exports.retryBackoff = retryBackoff;
 exports.signal = signal;
 exports.useBehaviorSubject = useBehaviorSubject;
+exports.useContactMutation$ = useContactMutation$;
 exports.useEffectOnce = useEffectOnce;
 exports.useForeverQuery = useForeverQuery;
 exports.useLiveBehaviorSubject = useLiveBehaviorSubject;

package/dist/index.d.ts

@@ -17,6 +17,7 @@ export * from './lib/utils';
 export * from './lib/queries/useQuery$';
 export * from './lib/queries/useMutation$';
 export * from './lib/queries/useSwitchMutation$';
+export * from './lib/queries/useConcatMutation$';
 export * from './lib/queries/QueryClientProvider$';
 export * from './lib/deprecated/react/mutations/useMutation';
 export * from './lib/deprecated/react/queries/useQuery';

package/dist/index.js

@@ -11,7 +11,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 var _trigger$, _mutationRunner, _currentMutationSubject, _visibility$, _focusedSubject, _client, _currentQuery, _fetchSubject, _currentQueryInitialState, _lastResult, _lastQueryWithDefinedData, _observers, _observerCount, _cancelSubject, _executeSubject, _store, _defaultOptions, _initialState, _notifySubject, _store2, _mutationCache, _queryCache, _mutationDefaults, _queryDefaults, _defaultOptions2;
 import * as React from "react";
 import { useRef, useMemo, useCallback, useSyncExternalStore, useEffect, useState, createContext, memo, useContext } from "react";
-import { isObservable, from, of, defer, startWith, identity, distinctUntilChanged, tap, catchError, EMPTY, Subject, BehaviorSubject, skip, first, map, switchMap, zip, share, merge, throttleTime, asyncScheduler, concatMap, scan, throwError, timer, takeUntil, fromEvent, take, delay, defaultIfEmpty, Observable, takeWhile, filter, last, mergeMap as mergeMap$1, shareReplay, ignoreElements, noop as noop$1, pairwise, NEVER, interval, withLatestFrom, retry, iif, isEmpty, concat, toArray, combineLatest, endWith, lastValueFrom } from "rxjs";
+import { isObservable, from, of, defer, startWith, identity, distinctUntilChanged, tap, catchError, EMPTY, Subject, BehaviorSubject, skip, first, map, switchMap, zip, share, merge, throttleTime, asyncScheduler, concatMap, scan, throwError, timer, takeUntil, fromEvent, take, delay, defaultIfEmpty, filter, noop as noop$1, Observable, takeWhile, last, mergeMap as mergeMap$1, shareReplay, ignoreElements, pairwise, NEVER, interval, withLatestFrom, retry, iif, isEmpty, concat, toArray, combineLatest, endWith, lastValueFrom } from "rxjs";
 import { catchError as catchError$1, mergeMap, retryWhen, concatMap as concatMap$1, first as first$1, tap as tap$1 } from "rxjs/operators";
 import { hashKey as hashKey$1, useQueryClient as useQueryClient$1, useQuery as useQuery$1, useMutation as useMutation$1 } from "@tanstack/react-query";
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -783,29 +783,28 @@ function useMutation$(options, queryClient) {
     isSuccess: false,
     isIdle: true
   });
-  const mutationFnAsync = (variables) => {
-    let lastData;
-    return new Promise((resolve, reject) => {
-      const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
-      source.pipe(take(1)).subscribe({
-        next: (data) => {
-          lastData = { value: data };
-        },
-        error: (error) => {
-          reject(error);
-        },
-        complete: () => {
-          if (lastData === void 0)
-            return reject(new Error("Stream completed without any data"));
-          resolve(lastData.value);
-        }
-      });
-    });
-  };
   const result = useMutation$1(
     {
       ...options,
-      mutationFn: mutationFnAsync
+      mutationFn: (variables) => {
+        let lastData;
+        return new Promise((resolve, reject) => {
+          const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+          source.pipe(take(1)).subscribe({
+            next: (data) => {
+              lastData = { value: data };
+            },
+            error: (error) => {
+              reject(error);
+            },
+            complete: () => {
+              if (lastData === void 0)
+                return reject(new Error("Stream completed without any data"));
+              resolve(lastData.value);
+            }
+          });
+        });
+      }
     },
     queryClient
   );
@@ -817,12 +816,7 @@ function useMutation$(options, queryClient) {
 }
 function useSwitchMutation$(options, queryClient) {
   const [cancel$, cancel] = useObservableCallback();
-  const {
-    mutate,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    mutateAsync: _removed,
-    ...rest
-  } = useMutation$(
+  const { mutate, mutateAsync, ...rest } = useMutation$(
     {
       ...options,
       mutationFn: (variables) => {
@@ -835,11 +829,77 @@ function useSwitchMutation$(options, queryClient) {
   const mutateSwitch = useCallback(
     (variables) => {
       cancel();
-      mutate(variables);
+      return mutate(variables);
     },
     [mutate, cancel]
   );
-  return { ...rest, mutate: mutateSwitch };
+  const mutateAsyncSwitch = useCallback(
+    (variables) => {
+      cancel();
+      return mutateAsync(variables);
+    },
+    [mutateAsync, cancel]
+  );
+  return { ...rest, mutate: mutateSwitch, mutateAsync: mutateAsyncSwitch };
+}
+function useContactMutation$(options, queryClient) {
+  const client = useQueryClient$1(queryClient);
+  const mutationKey = options.mutationKey;
+  const { mutateAsync, ...rest } = useMutation$(
+    {
+      ...options,
+      onMutate({ variables }) {
+        var _a;
+        return (_a = options.onMutate) == null ? void 0 : _a.call(options, variables);
+      },
+      onSuccess(data, variables, context) {
+        var _a;
+        return (_a = options.onSuccess) == null ? void 0 : _a.call(options, data, variables.variables, context);
+      },
+      onError(error, variables, context) {
+        var _a;
+        return (_a = options.onError) == null ? void 0 : _a.call(options, error, variables.variables, context);
+      },
+      onSettled(data, error, variables, context) {
+        var _a;
+        return (_a = options.onSettled) == null ? void 0 : _a.call(options, data, error, variables.variables, context);
+      },
+      mutationFn: ({ ready$, variables }) => {
+        const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+        return ready$.pipe(
+          filter((isReady) => isReady),
+          first(),
+          switchMap(() => source)
+        );
+      }
+    },
+    queryClient
+  );
+  const mutateAsyncConcat = useCallback(
+    async (variables) => {
+      const mutations = client.getMutationCache().findAll({
+        mutationKey,
+        exact: true
+      });
+      const subject = new BehaviorSubject(false);
+      const result = mutateAsync({ variables, ready$: subject });
+      await Promise.all(
+        mutations.map((mutation) => mutation.continue().catch(noop$1))
+      );
+      subject.next(true);
+      return await result.finally(() => {
+        subject.complete();
+      });
+    },
+    [mutateAsync, client, mutationKey]
+  );
+  const mutateConcat = useCallback(
+    (variables) => {
+      mutateAsyncConcat(variables).catch(noop$1);
+    },
+    [mutateAsyncConcat]
+  );
+  return { ...rest, mutate: mutateConcat, mutateAsync: mutateAsyncConcat };
 }
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
@@ -3607,6 +3667,7 @@ export {
   retryBackoff,
   signal,
   useBehaviorSubject,
+  useContactMutation$,
   useEffectOnce,
   useForeverQuery,
   useLiveBehaviorSubject,

package/dist/lib/queries/useConcatMutation$.d.ts

@@ -0,0 +1,99 @@
+import { DefaultError, MutationKey, QueryClient } from '@tanstack/react-query';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { UseMutation$Options } from './useMutation$';
+export declare function useContactMutation$<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(options: UseMutation$Options<TData | null, TError, TVariables, TContext> & {
+    mutationKey: MutationKey;
+}, queryClient?: QueryClient): {
+    mutate: (variables: TVariables) => void;
+    mutateAsync: (variables: TVariables) => Promise<TData | null>;
+    state$: BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, {
+        variables: TVariables;
+        ready$: Subject<boolean>;
+    }, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: undefined;
+    variables: undefined;
+    error: null;
+    isError: false;
+    isIdle: true;
+    isPending: false;
+    isSuccess: false;
+    status: "idle";
+    reset: () => void;
+    context: TContext | undefined;
+    failureCount: number;
+    failureReason: TError | null;
+    isPaused: boolean;
+    submittedAt: number;
+} | {
+    mutate: (variables: TVariables) => void;
+    mutateAsync: (variables: TVariables) => Promise<TData | null>;
+    state$: BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, {
+        variables: TVariables;
+        ready$: Subject<boolean>;
+    }, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: undefined;
+    variables: {
+        variables: TVariables;
+        ready$: Subject<boolean>;
+    };
+    error: null;
+    isError: false;
+    isIdle: false;
+    isPending: true;
+    isSuccess: false;
+    status: "pending";
+    reset: () => void;
+    context: TContext | undefined;
+    failureCount: number;
+    failureReason: TError | null;
+    isPaused: boolean;
+    submittedAt: number;
+} | {
+    mutate: (variables: TVariables) => void;
+    mutateAsync: (variables: TVariables) => Promise<TData | null>;
+    state$: BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, {
+        variables: TVariables;
+        ready$: Subject<boolean>;
+    }, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: undefined;
+    error: TError;
+    variables: {
+        variables: TVariables;
+        ready$: Subject<boolean>;
+    };
+    isError: true;
+    isIdle: false;
+    isPending: false;
+    isSuccess: false;
+    status: "error";
+    reset: () => void;
+    context: TContext | undefined;
+    failureCount: number;
+    failureReason: TError | null;
+    isPaused: boolean;
+    submittedAt: number;
+} | {
+    mutate: (variables: TVariables) => void;
+    mutateAsync: (variables: TVariables) => Promise<TData | null>;
+    state$: BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, {
+        variables: TVariables;
+        ready$: Subject<boolean>;
+    }, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: TData | null;
+    error: null;
+    variables: {
+        variables: TVariables;
+        ready$: Subject<boolean>;
+    };
+    isError: false;
+    isIdle: false;
+    isPending: false;
+    isSuccess: true;
+    status: "success";
+    reset: () => void;
+    context: TContext | undefined;
+    failureCount: number;
+    failureReason: TError | null;
+    isPaused: boolean;
+    submittedAt: number;
+};

package/dist/lib/queries/useSwitchMutation$.d.ts

@@ -2,6 +2,7 @@ import { DefaultError, QueryClient } from '@tanstack/react-query';
 import { UseMutation$Options } from './useMutation$';
 export declare function useSwitchMutation$<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(options: UseMutation$Options<TData | null, TError, TVariables, TContext>, queryClient?: QueryClient): {
     mutate: (variables: TVariables) => void;
+    mutateAsync: (variables: TVariables) => Promise<TData | null>;
     state$: import('rxjs').BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
     data: undefined;
     variables: undefined;
@@ -19,6 +20,7 @@ export declare function useSwitchMutation$<TData = unknown, TError = DefaultErro
     submittedAt: number;
 } | {
     mutate: (variables: TVariables) => void;
+    mutateAsync: (variables: TVariables) => Promise<TData | null>;
     state$: import('rxjs').BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
     data: undefined;
     variables: TVariables;
@@ -36,6 +38,7 @@ export declare function useSwitchMutation$<TData = unknown, TError = DefaultErro
     submittedAt: number;
 } | {
     mutate: (variables: TVariables) => void;
+    mutateAsync: (variables: TVariables) => Promise<TData | null>;
     state$: import('rxjs').BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
     data: undefined;
     error: TError;
@@ -53,6 +56,7 @@ export declare function useSwitchMutation$<TData = unknown, TError = DefaultErro
     submittedAt: number;
 } | {
     mutate: (variables: TVariables) => void;
+    mutateAsync: (variables: TVariables) => Promise<TData | null>;
     state$: import('rxjs').BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
     data: TData | null;
     error: null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reactjrx",
   "private": false,
-  "version": "1.109.1",
+  "version": "1.111.0",
   "type": "module",
   "files": [
     "dist"