reactjrx 1.106.0 → 1.108.0

package/dist/index.cjs

@@ -161,9 +161,8 @@ const useSubject = ({
   }, [completeOnUnmountRef, onBeforeCompleteRef, subject]);
   return subject;
 };
-const useObserveCallback = () => {
+const useObservableCallback = () => {
   const subject = useSubject();
-  const event$ = useLiveRef(subject.current.asObservable());
   const trigger = React.useCallback(
     (arg) => {
       subject.current.next(arg);
@@ -171,7 +170,7 @@ const useObserveCallback = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
-  return [event$.current, trigger];
+  return [subject.current, trigger];
 };
 const useBehaviorSubject = (state) => {
   const subject = useConstant(() => new rxjs.BehaviorSubject(state));
@@ -722,7 +721,7 @@ function useMutation$(options, queryClient) {
       const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
       source.pipe(rxjs.take(1)).subscribe({
         next: (data) => {
-          lastData = data;
+          lastData = { value: data };
         },
         error: (error) => {
           reject(error);
@@ -730,7 +729,7 @@ function useMutation$(options, queryClient) {
         complete: () => {
           if (lastData === void 0)
             return reject(new Error("Stream completed without any data"));
-          resolve(lastData);
+          resolve(lastData.value);
         }
       });
     });
@@ -748,6 +747,32 @@ function useMutation$(options, queryClient) {
   }, [status, isPending, isError, isSuccess, isIdle, stateSubject]);
   return { ...result, state$: stateSubject.current };
 }
+function useSwitchMutation$(options, queryClient) {
+  const [cancel$, cancel] = useObservableCallback();
+  const {
+    mutate,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    mutateAsync: _removed,
+    ...rest
+  } = useMutation$(
+    {
+      ...options,
+      mutationFn: (variables) => {
+        const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+        return source.pipe(rxjs.takeUntil(cancel$), rxjs.defaultIfEmpty(null));
+      }
+    },
+    queryClient
+  );
+  const mutateSwitch = React.useCallback(
+    (variables) => {
+      cancel();
+      mutate(variables);
+    },
+    [mutate, cancel]
+  );
+  return { ...rest, mutate: mutateSwitch };
+}
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
 }
@@ -3517,9 +3542,9 @@ exports.useLiveRef = useLiveRef;
 exports.useMount = useMount;
 exports.useMutation = useMutation;
 exports.useMutation$ = useMutation$;
+exports.useObservableCallback = useObservableCallback;
 exports.useObservableState = useObservableState;
 exports.useObserve = useObserve;
-exports.useObserveCallback = useObserveCallback;
 exports.usePersistSignals = usePersistSignals;
 exports.useQuery = useQuery;
 exports.useQuery$ = useQuery$;
@@ -3529,4 +3554,5 @@ exports.useSignalValue = useSignalValue;
 exports.useSubject = useSubject;
 exports.useSubscribe = useSubscribe;
 exports.useSubscribeEffect = useSubscribeEffect;
+exports.useSwitchMutation$ = useSwitchMutation$;
 exports.useUnmountObservable = useUnmountObservable;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export * from './lib/binding/useObserve';
 export * from './lib/binding/useSubscribe';
-export * from './lib/binding/useObservableEvent';
+export * from './lib/binding/useObservableCallback';
 export * from './lib/binding/useObservableState';
 export * from './lib/binding/useSubject';
 export * from './lib/binding/useBehaviorSubject';
@@ -16,6 +16,7 @@ export { type SignalPersistenceConfig } from './lib/state/persistance/types';
 export * from './lib/utils';
 export * from './lib/queries/useQuery$';
 export * from './lib/queries/useMutation$';
+export * from './lib/queries/useSwitchMutation$';
 export * from './lib/deprecated/react/mutations/useMutation';
 export * from './lib/deprecated/react/queries/useQuery';
 export * from './lib/deprecated/react/useQueryClient';

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, finalize, take, Observable, takeWhile, filter, last, mergeMap as mergeMap$1, takeUntil, shareReplay, ignoreElements, fromEvent, noop as noop$1, pairwise, NEVER, delay, 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, finalize, take, takeUntil, defaultIfEmpty, Observable, takeWhile, filter, last, mergeMap as mergeMap$1, shareReplay, ignoreElements, fromEvent, noop as noop$1, pairwise, NEVER, delay, 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 { useQueryClient as useQueryClient$1, useQuery as useQuery$1, useMutation as useMutation$1 } from "@tanstack/react-query";
 import { jsxs, jsx } from "react/jsx-runtime";
@@ -143,9 +143,8 @@ const useSubject = ({
   }, [completeOnUnmountRef, onBeforeCompleteRef, subject]);
   return subject;
 };
-const useObserveCallback = () => {
+const useObservableCallback = () => {
   const subject = useSubject();
-  const event$ = useLiveRef(subject.current.asObservable());
   const trigger = useCallback(
     (arg) => {
       subject.current.next(arg);
@@ -153,7 +152,7 @@ const useObserveCallback = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
-  return [event$.current, trigger];
+  return [subject.current, trigger];
 };
 const useBehaviorSubject = (state) => {
   const subject = useConstant(() => new BehaviorSubject(state));
@@ -704,7 +703,7 @@ function useMutation$(options, queryClient) {
       const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
       source.pipe(take(1)).subscribe({
         next: (data) => {
-          lastData = data;
+          lastData = { value: data };
         },
         error: (error) => {
           reject(error);
@@ -712,7 +711,7 @@ function useMutation$(options, queryClient) {
         complete: () => {
           if (lastData === void 0)
             return reject(new Error("Stream completed without any data"));
-          resolve(lastData);
+          resolve(lastData.value);
         }
       });
     });
@@ -730,6 +729,32 @@ function useMutation$(options, queryClient) {
   }, [status, isPending, isError, isSuccess, isIdle, stateSubject]);
   return { ...result, state$: stateSubject.current };
 }
+function useSwitchMutation$(options, queryClient) {
+  const [cancel$, cancel] = useObservableCallback();
+  const {
+    mutate,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    mutateAsync: _removed,
+    ...rest
+  } = useMutation$(
+    {
+      ...options,
+      mutationFn: (variables) => {
+        const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+        return source.pipe(takeUntil(cancel$), defaultIfEmpty(null));
+      }
+    },
+    queryClient
+  );
+  const mutateSwitch = useCallback(
+    (variables) => {
+      cancel();
+      mutate(variables);
+    },
+    [mutate, cancel]
+  );
+  return { ...rest, mutate: mutateSwitch };
+}
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
 }
@@ -3500,9 +3525,9 @@ export {
   useMount,
   useMutation,
   useMutation$,
+  useObservableCallback,
   useObservableState,
   useObserve,
-  useObserveCallback,
   usePersistSignals,
   useQuery,
   useQuery$,
@@ -3512,5 +3537,6 @@ export {
   useSubject,
   useSubscribe,
   useSubscribeEffect,
+  useSwitchMutation$,
   useUnmountObservable
 };

package/dist/lib/binding/useObservableCallback.d.ts

@@ -0,0 +1,5 @@
+import { Observable } from 'rxjs';
+/**
+ * This creates an event handler and an observable that represents calls to that handler.
+ */
+export declare const useObservableCallback: <T = void>() => readonly [Observable<T>, (arg: T) => void];

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

@@ -1,8 +1,9 @@
 import { DefaultError, QueryClient, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
 import { Observable } from 'rxjs';
-export declare function useMutation$<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(options: Omit<UseMutationOptions<TData, TError, TVariables, TContext>, "mutationFn"> & {
+export type UseMutation$Options<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown> = Omit<UseMutationOptions<TData, TError, TVariables, TContext>, "mutationFn"> & {
     mutationFn: ((variables: TVariables) => Observable<TData>) | Observable<TData>;
-}, queryClient?: QueryClient): {
+};
+export declare function useMutation$<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(options: UseMutation$Options<TData, TError, TVariables, TContext>, queryClient?: QueryClient): {
     state$: import('rxjs').BehaviorSubject<Pick<UseMutationResult<TData, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
     data: undefined;
     variables: undefined;

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

@@ -0,0 +1,71 @@
+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;
+    state$: import('rxjs').BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, TVariables, 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;
+    state$: import('rxjs').BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: undefined;
+    variables: TVariables;
+    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;
+    state$: import('rxjs').BehaviorSubject<Pick<import('@tanstack/react-query').UseMutationResult<TData | null, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: undefined;
+    error: TError;
+    variables: TVariables;
+    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;
+    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;
+    variables: TVariables;
+    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/package.json

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

package/dist/lib/binding/useObservableEvent.d.ts

@@ -1,4 +0,0 @@
-/**
- * This creates an event handler and an observable that represents calls to that handler.
- */
-export declare const useObserveCallback: <T = void>() => readonly [import('rxjs').Observable<T>, (arg: T) => void];