reactjrx 1.58.0 → 1.60.0

package/dist/index.cjs

@@ -1520,7 +1520,9 @@ const createMutationRunner = ({
           mutationsRunning$.next(mutationsRunning$.getValue() + 1);
         }),
         switchOperator(({ args, options }) => {
-          const queryRunner$ = rxjs.defer(() => rxjs.from(options.mutationFn(args))).pipe(
+          const mutationFn = options.mutationFn;
+          const mutationFnObservable = typeof mutationFn === "function" ? rxjs.defer(() => rxjs.from(mutationFn(args))) : mutationFn;
+          const queryRunner$ = mutationFnObservable.pipe(
             retryOnError(options),
             rxjs.take(1),
             rxjs.map((data) => ({ data, isError: false })),
@@ -1619,6 +1621,10 @@ class MutationClient {
     __publicField(this, "mutationResults$", new rxjs.BehaviorSubject(/* @__PURE__ */ new Map()));
     __publicField(this, "mutate$", new rxjs.Subject());
     __publicField(this, "reset$", new rxjs.Subject());
+    /**
+     * Observable to track how many running mutations per runner
+     */
+    __publicField(this, "isMutatingSubject", new rxjs.BehaviorSubject([]));
     this.mutate$.pipe(
       rxjs.tap(({ options, args }) => {
         const { mutationKey } = options;
@@ -1664,6 +1670,21 @@ class MutationClient {
         (_a = this.mutationRunnersByKey$.getValue().get(serializedKey)) == null ? void 0 : _a.reset$.next();
       })
     ).subscribe();
+    this.mutationRunnersByKey$.pipe(
+      rxjs.switchMap((mapItem) => {
+        const mutationRunners = Array.from(mapItem.entries()).map(
+          ([, value]) => value.mutationsRunning$.pipe(
+            rxjs.map((number) => [value.mutationKey, number])
+          )
+        );
+        const mutationRunnersMutationsRunning$ = rxjs.combineLatest([
+          // when map is empty we still need to push 0
+          rxjs.of([[], 0]),
+          ...mutationRunners
+        ]);
+        return mutationRunnersMutationsRunning$;
+      })
+    ).subscribe(this.isMutatingSubject);
   }
   /**
    * @helper
@@ -1687,36 +1708,18 @@ class MutationClient {
   getMutationRunnersByKey(key) {
     return this.mutationRunnersByKey$.getValue().get(key);
   }
-  /**
-   * @returns number of mutation runnings
-   */
-  runningMutations({ mutationKey, predicate } = {}) {
+  useIsMutating({ mutationKey, predicate } = {}) {
     const defaultPredicate = ({ options }) => mutationKey ? (
       // @todo optimize
       serializeKey(options.mutationKey) === serializeKey(mutationKey)
     ) : true;
     const finalPredicate = predicate ?? defaultPredicate;
-    const mutationRunnersByKeyEntries = Array.from(
-      this.mutationRunnersByKey$.getValue().entries()
-    );
-    const lastValue = mutationRunnersByKeyEntries.filter(
-      ([, value]) => finalPredicate({ options: { mutationKey: value.mutationKey } })
-    ).reduce((acc, [, value]) => acc + value.mutationsRunning$.getValue(), 0);
-    const value$ = this.mutationRunnersByKey$.pipe(
-      rxjs.switchMap((map2) => {
-        const mutationRunners = Array.from(map2.entries()).filter(
-          ([, value]) => finalPredicate({ options: { mutationKey: value.mutationKey } })
-        ).map(([, value]) => value);
-        const mutationRunnersMutationsRunning$ = rxjs.combineLatest([
-          // when map is empty we still need to push 0
-          rxjs.of(0),
-          ...mutationRunners.map(
-            (mutationRunner) => mutationRunner.mutationsRunning$
-          )
-        ]);
-        return mutationRunnersMutationsRunning$;
-      }),
-      rxjs.map((values) => values.reduce((acc, value) => value + acc, 0)),
+    const reduceByNumber = (entries) => entries.reduce((acc, [mutationKey2, value]) => {
+      return finalPredicate({ options: { mutationKey: mutationKey2 } }) ? value + acc : acc;
+    }, 0);
+    const lastValue = reduceByNumber(this.isMutatingSubject.getValue());
+    const value$ = this.isMutatingSubject.pipe(
+      rxjs.map((mutationRunningByKeys) => reduceByNumber(mutationRunningByKeys)),
       rxjs.distinctUntilChanged()
     );
     return { value$, lastValue };
@@ -1770,6 +1773,7 @@ class MutationClient {
     this.mutate$.complete();
     this.mutationResults$.complete();
     this.mutationRunnersByKey$.complete();
+    this.isMutatingSubject.complete();
   }
 }
 const createClient = () => {

package/dist/index.js

@@ -1518,7 +1518,9 @@ const createMutationRunner = ({
           mutationsRunning$.next(mutationsRunning$.getValue() + 1);
         }),
         switchOperator(({ args, options }) => {
-          const queryRunner$ = defer(() => from(options.mutationFn(args))).pipe(
+          const mutationFn = options.mutationFn;
+          const mutationFnObservable = typeof mutationFn === "function" ? defer(() => from(mutationFn(args))) : mutationFn;
+          const queryRunner$ = mutationFnObservable.pipe(
             retryOnError(options),
             take(1),
             map((data) => ({ data, isError: false })),
@@ -1617,6 +1619,10 @@ class MutationClient {
     __publicField(this, "mutationResults$", new BehaviorSubject(/* @__PURE__ */ new Map()));
     __publicField(this, "mutate$", new Subject());
     __publicField(this, "reset$", new Subject());
+    /**
+     * Observable to track how many running mutations per runner
+     */
+    __publicField(this, "isMutatingSubject", new BehaviorSubject([]));
     this.mutate$.pipe(
       tap(({ options, args }) => {
         const { mutationKey } = options;
@@ -1662,6 +1668,21 @@ class MutationClient {
         (_a = this.mutationRunnersByKey$.getValue().get(serializedKey)) == null ? void 0 : _a.reset$.next();
       })
     ).subscribe();
+    this.mutationRunnersByKey$.pipe(
+      switchMap((mapItem) => {
+        const mutationRunners = Array.from(mapItem.entries()).map(
+          ([, value]) => value.mutationsRunning$.pipe(
+            map((number) => [value.mutationKey, number])
+          )
+        );
+        const mutationRunnersMutationsRunning$ = combineLatest([
+          // when map is empty we still need to push 0
+          of([[], 0]),
+          ...mutationRunners
+        ]);
+        return mutationRunnersMutationsRunning$;
+      })
+    ).subscribe(this.isMutatingSubject);
   }
   /**
    * @helper
@@ -1685,36 +1706,18 @@ class MutationClient {
   getMutationRunnersByKey(key) {
     return this.mutationRunnersByKey$.getValue().get(key);
   }
-  /**
-   * @returns number of mutation runnings
-   */
-  runningMutations({ mutationKey, predicate } = {}) {
+  useIsMutating({ mutationKey, predicate } = {}) {
     const defaultPredicate = ({ options }) => mutationKey ? (
       // @todo optimize
       serializeKey(options.mutationKey) === serializeKey(mutationKey)
     ) : true;
     const finalPredicate = predicate ?? defaultPredicate;
-    const mutationRunnersByKeyEntries = Array.from(
-      this.mutationRunnersByKey$.getValue().entries()
-    );
-    const lastValue = mutationRunnersByKeyEntries.filter(
-      ([, value]) => finalPredicate({ options: { mutationKey: value.mutationKey } })
-    ).reduce((acc, [, value]) => acc + value.mutationsRunning$.getValue(), 0);
-    const value$ = this.mutationRunnersByKey$.pipe(
-      switchMap((map2) => {
-        const mutationRunners = Array.from(map2.entries()).filter(
-          ([, value]) => finalPredicate({ options: { mutationKey: value.mutationKey } })
-        ).map(([, value]) => value);
-        const mutationRunnersMutationsRunning$ = combineLatest([
-          // when map is empty we still need to push 0
-          of(0),
-          ...mutationRunners.map(
-            (mutationRunner) => mutationRunner.mutationsRunning$
-          )
-        ]);
-        return mutationRunnersMutationsRunning$;
-      }),
-      map((values) => values.reduce((acc, value) => value + acc, 0)),
+    const reduceByNumber = (entries) => entries.reduce((acc, [mutationKey2, value]) => {
+      return finalPredicate({ options: { mutationKey: mutationKey2 } }) ? value + acc : acc;
+    }, 0);
+    const lastValue = reduceByNumber(this.isMutatingSubject.getValue());
+    const value$ = this.isMutatingSubject.pipe(
+      map((mutationRunningByKeys) => reduceByNumber(mutationRunningByKeys)),
       distinctUntilChanged()
     );
     return { value$, lastValue };
@@ -1768,6 +1771,7 @@ class MutationClient {
     this.mutate$.complete();
     this.mutationResults$.complete();
     this.mutationRunnersByKey$.complete();
+    this.isMutatingSubject.complete();
   }
 }
 const createClient = () => {

package/dist/lib/queries/client/mutations/MutationClient.d.ts

@@ -37,6 +37,10 @@ export declare class MutationClient {
     reset$: Subject<{
         key: QueryKey;
     }>;
+    /**
+     * Observable to track how many running mutations per runner
+     */
+    isMutatingSubject: BehaviorSubject<(readonly [MutationKey, number])[]>;
     constructor();
     /**
      * @helper
@@ -62,10 +66,7 @@ export declare class MutationClient {
     } & {
         mutationKey: MutationKey;
     }) | undefined;
-    /**
-     * @returns number of mutation runnings
-     */
-    runningMutations({ mutationKey, predicate }?: MutationFilters): {
+    useIsMutating({ mutationKey, predicate }?: MutationFilters): {
         value$: Observable<number>;
         lastValue: number;
     };

package/dist/lib/queries/client/mutations/types.d.ts

@@ -22,6 +22,9 @@ import { type Query, type QueryResult } from "../types";
 export type MapOperator = "switch" | "concat" | "merge";
 export type MutationStatus = "idle" | "pending" | "success" | "error";
 export type MutationKey = unknown[];
+/**
+ * @todo this should be used in a lot of place so we can probably make a helper for that
+ */
 export interface MutationFilters {
     /**
      * Match mutation key exactly
@@ -56,7 +59,7 @@ export interface MutationObservedResult<R> extends MutationResult<R> {
     isPending: boolean;
     isPaused: boolean;
 }
-export type MutationFn<T, MutationArg> = ((arg: MutationArg) => Promise<T>) | ((arg: MutationArg) => Observable<T>);
+export type MutationFn<T, MutationArg> = Observable<T> | ((arg: MutationArg) => Promise<T>) | ((arg: MutationArg) => Observable<T>);
 export interface MutationOptions<Result, MutationArg> {
     enabled?: boolean;
     retry?: false | number | ((attempt: number, error: unknown) => boolean);

package/package.json

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