reactjrx 1.104.0 → 1.106.0

package/dist/index.cjs

@@ -71,6 +71,9 @@ function useObserve(source$, optionsOrDeps, maybeDeps) {
   );
   const sourceRef = useLiveRef(source$);
   const optionsRef = useLiveRef(options);
+  const getSnapshot = React.useCallback(() => {
+    return valueRef.current;
+  }, []);
   const subscribe = React.useCallback(
     (next) => {
       const source = sourceRef.current;
@@ -100,10 +103,7 @@ function useObserve(source$, optionsOrDeps, maybeDeps) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [...deps]
   );
-  const getSnapshot = React.useCallback(() => {
-    return valueRef.current;
-  }, []);
-  const result = React.useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const result = React.useSyncExternalStore(subscribe, getSnapshot);
   return result;
 }
 function useSubscribe(source, deps = []) {
@@ -203,6 +203,13 @@ const useObservableState = (defaultValue) => {
   );
   return [subject$.current, setState, subject.current.getValue()];
 };
+const useLiveBehaviorSubject = (state) => {
+  const subject = useBehaviorSubject(state);
+  React.useEffect(() => {
+    subject.current.next(state);
+  }, [state, subject]);
+  return subject;
+};
 const SIGNAL_RESET = Symbol("SIGNAL_RESET");
 function signal(config = {}) {
   const normalizedConfig = {
@@ -357,13 +364,6 @@ const createLocalStorageAdapter = ({
     }
   };
 };
-const useLiveBehaviorSubject = (state) => {
-  const subject = useBehaviorSubject(state);
-  React.useEffect(() => {
-    subject.current.next(state);
-  }, [state, subject]);
-  return subject;
-};
 const IDENTIFIER_PERSISTANCE_KEY = "__reactjrx";
 const getNormalizedPersistanceValue = (unknownValue) => {
   if (typeof unknownValue === "object" && unknownValue !== null && IDENTIFIER_PERSISTANCE_KEY in unknownValue && unknownValue[IDENTIFIER_PERSISTANCE_KEY] === IDENTIFIER_PERSISTANCE_KEY) {
@@ -709,6 +709,13 @@ function useQuery$(options, queryClient) {
   return result;
 }
 function useMutation$(options, queryClient) {
+  const stateSubject = useBehaviorSubject({
+    status: "idle",
+    isPending: false,
+    isError: false,
+    isSuccess: false,
+    isIdle: true
+  });
   const mutationFnAsync = (variables) => {
     let lastData;
     return new Promise((resolve, reject) => {
@@ -735,7 +742,11 @@ function useMutation$(options, queryClient) {
     },
     queryClient
   );
-  return result;
+  const { status, isPending, isError, isSuccess, isIdle } = result;
+  React.useEffect(() => {
+    stateSubject.current.next({ status, isPending, isError, isSuccess, isIdle });
+  }, [status, isPending, isError, isSuccess, isIdle, stateSubject]);
+  return { ...result, state$: stateSubject.current };
 }
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
@@ -3501,6 +3512,7 @@ exports.signal = signal;
 exports.useBehaviorSubject = useBehaviorSubject;
 exports.useEffectOnce = useEffectOnce;
 exports.useForeverQuery = useForeverQuery;
+exports.useLiveBehaviorSubject = useLiveBehaviorSubject;
 exports.useLiveRef = useLiveRef;
 exports.useMount = useMount;
 exports.useMutation = useMutation;

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export * from './lib/binding/useObservableEvent';
 export * from './lib/binding/useObservableState';
 export * from './lib/binding/useSubject';
 export * from './lib/binding/useBehaviorSubject';
+export * from './lib/binding/useLiveBehaviorSubject';
 export * from './lib/state/signal';
 export * from './lib/state/react/useSignalValue';
 export * from './lib/state/react/useSignal';
@@ -13,14 +14,14 @@ export * from './lib/state/persistance/adapters/createLocalStorageAdapter';
 export * from './lib/state/react/usePersistSignals';
 export { type SignalPersistenceConfig } from './lib/state/persistance/types';
 export * from './lib/utils';
-export * from './lib/tmp/useQuery$';
-export * from './lib/tmp/useMutation$';
-export * from './lib/queries/react/mutations/useMutation';
-export * from './lib/queries/react/queries/useQuery';
-export * from './lib/queries/react/useQueryClient';
-export * from './lib/queries/react/queries/useForeverQuery';
+export * from './lib/queries/useQuery$';
+export * from './lib/queries/useMutation$';
+export * from './lib/deprecated/react/mutations/useMutation';
+export * from './lib/deprecated/react/queries/useQuery';
+export * from './lib/deprecated/react/useQueryClient';
+export * from './lib/deprecated/react/queries/useForeverQuery';
 export * from './lib/binding/useSubscribeEffect';
-export * from './lib/queries/client/QueryClient';
-export { QueryCache } from './lib/queries/client/queries/cache/QueryCache';
-export { QueryClientProvider } from './lib/queries/react/QueryClientProvider';
-export { MutationCache } from './lib/queries/client/mutations/cache/MutationCache';
+export * from './lib/deprecated/client/QueryClient';
+export { QueryCache } from './lib/deprecated/client/queries/cache/QueryCache';
+export { QueryClientProvider } from './lib/deprecated/react/QueryClientProvider';
+export { MutationCache } from './lib/deprecated/client/mutations/cache/MutationCache';

package/dist/index.js

@@ -53,6 +53,9 @@ function useObserve(source$, optionsOrDeps, maybeDeps) {
   );
   const sourceRef = useLiveRef(source$);
   const optionsRef = useLiveRef(options);
+  const getSnapshot = useCallback(() => {
+    return valueRef.current;
+  }, []);
   const subscribe = useCallback(
     (next) => {
       const source = sourceRef.current;
@@ -82,10 +85,7 @@ function useObserve(source$, optionsOrDeps, maybeDeps) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [...deps]
   );
-  const getSnapshot = useCallback(() => {
-    return valueRef.current;
-  }, []);
-  const result = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const result = useSyncExternalStore(subscribe, getSnapshot);
   return result;
 }
 function useSubscribe(source, deps = []) {
@@ -185,6 +185,13 @@ const useObservableState = (defaultValue) => {
   );
   return [subject$.current, setState, subject.current.getValue()];
 };
+const useLiveBehaviorSubject = (state) => {
+  const subject = useBehaviorSubject(state);
+  useEffect(() => {
+    subject.current.next(state);
+  }, [state, subject]);
+  return subject;
+};
 const SIGNAL_RESET = Symbol("SIGNAL_RESET");
 function signal(config = {}) {
   const normalizedConfig = {
@@ -339,13 +346,6 @@ const createLocalStorageAdapter = ({
     }
   };
 };
-const useLiveBehaviorSubject = (state) => {
-  const subject = useBehaviorSubject(state);
-  useEffect(() => {
-    subject.current.next(state);
-  }, [state, subject]);
-  return subject;
-};
 const IDENTIFIER_PERSISTANCE_KEY = "__reactjrx";
 const getNormalizedPersistanceValue = (unknownValue) => {
   if (typeof unknownValue === "object" && unknownValue !== null && IDENTIFIER_PERSISTANCE_KEY in unknownValue && unknownValue[IDENTIFIER_PERSISTANCE_KEY] === IDENTIFIER_PERSISTANCE_KEY) {
@@ -691,6 +691,13 @@ function useQuery$(options, queryClient) {
   return result;
 }
 function useMutation$(options, queryClient) {
+  const stateSubject = useBehaviorSubject({
+    status: "idle",
+    isPending: false,
+    isError: false,
+    isSuccess: false,
+    isIdle: true
+  });
   const mutationFnAsync = (variables) => {
     let lastData;
     return new Promise((resolve, reject) => {
@@ -717,7 +724,11 @@ function useMutation$(options, queryClient) {
     },
     queryClient
   );
-  return result;
+  const { status, isPending, isError, isSuccess, isIdle } = result;
+  useEffect(() => {
+    stateSubject.current.next({ status, isPending, isError, isSuccess, isIdle });
+  }, [status, isPending, isError, isSuccess, isIdle, stateSubject]);
+  return { ...result, state$: stateSubject.current };
 }
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
@@ -3484,6 +3495,7 @@ export {
   useBehaviorSubject,
   useEffectOnce,
   useForeverQuery,
+  useLiveBehaviorSubject,
   useLiveRef,
   useMount,
   useMutation,

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

@@ -0,0 +1,77 @@
+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"> & {
+    mutationFn: ((variables: TVariables) => Observable<TData>) | Observable<TData>;
+}, queryClient?: QueryClient): {
+    state$: import('rxjs').BehaviorSubject<Pick<UseMutationResult<TData, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: undefined;
+    variables: undefined;
+    error: null;
+    isError: false;
+    isIdle: true;
+    isPending: false;
+    isSuccess: false;
+    status: "idle";
+    mutate: import('@tanstack/react-query').UseMutateFunction<TData, TError, TVariables, TContext>;
+    reset: () => void;
+    context: TContext | undefined;
+    failureCount: number;
+    failureReason: TError | null;
+    isPaused: boolean;
+    submittedAt: number;
+    mutateAsync: import('@tanstack/react-query').UseMutateAsyncFunction<TData, TError, TVariables, TContext>;
+} | {
+    state$: import('rxjs').BehaviorSubject<Pick<UseMutationResult<TData, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: undefined;
+    variables: TVariables;
+    error: null;
+    isError: false;
+    isIdle: false;
+    isPending: true;
+    isSuccess: false;
+    status: "pending";
+    mutate: import('@tanstack/react-query').UseMutateFunction<TData, TError, TVariables, TContext>;
+    reset: () => void;
+    context: TContext | undefined;
+    failureCount: number;
+    failureReason: TError | null;
+    isPaused: boolean;
+    submittedAt: number;
+    mutateAsync: import('@tanstack/react-query').UseMutateAsyncFunction<TData, TError, TVariables, TContext>;
+} | {
+    state$: import('rxjs').BehaviorSubject<Pick<UseMutationResult<TData, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: undefined;
+    error: TError;
+    variables: TVariables;
+    isError: true;
+    isIdle: false;
+    isPending: false;
+    isSuccess: false;
+    status: "error";
+    mutate: import('@tanstack/react-query').UseMutateFunction<TData, TError, TVariables, TContext>;
+    reset: () => void;
+    context: TContext | undefined;
+    failureCount: number;
+    failureReason: TError | null;
+    isPaused: boolean;
+    submittedAt: number;
+    mutateAsync: import('@tanstack/react-query').UseMutateAsyncFunction<TData, TError, TVariables, TContext>;
+} | {
+    state$: import('rxjs').BehaviorSubject<Pick<UseMutationResult<TData, TError, TVariables, TContext>, "status" | "isPending" | "isError" | "isSuccess" | "isIdle">>;
+    data: TData;
+    error: null;
+    variables: TVariables;
+    isError: false;
+    isIdle: false;
+    isPending: false;
+    isSuccess: true;
+    status: "success";
+    mutate: import('@tanstack/react-query').UseMutateFunction<TData, TError, TVariables, TContext>;
+    reset: () => void;
+    context: TContext | undefined;
+    failureCount: number;
+    failureReason: TError | null;
+    isPaused: boolean;
+    submittedAt: number;
+    mutateAsync: import('@tanstack/react-query').UseMutateAsyncFunction<TData, TError, TVariables, TContext>;
+};

package/dist/tests/utils.d.ts

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react';
-import { QueryClient, QueryClientConfig } from '../lib/queries/client/QueryClient';
+import { QueryClient, QueryClientConfig } from '../lib/deprecated/client/QueryClient';
 import { default as React } from 'react';
 export declare const waitForTimeout: (timeout: number) => Promise<undefined>;
 /**

package/package.json

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

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

@@ -1,5 +0,0 @@
-import { DefaultError, QueryClient, UseMutationOptions } 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"> & {
-    mutationFn: ((variables: TVariables) => Observable<TData>) | Observable<TData>;
-}, queryClient?: QueryClient): import('@tanstack/react-query').UseMutationResult<TData, TError, TVariables, TContext>;