reactjrx 1.34.0 → 1.40.0

package/dist/index.js

@@ -1,5 +1,5 @@
-import { useRef, useMemo, useCallback, useSyncExternalStore, useEffect, createContext, memo, useContext, useState } from "react";
-import { distinctUntilChanged, tap, finalize, catchError, EMPTY, Subject, identity, BehaviorSubject, of, zip, from, map, merge, throttleTime, switchMap, defer, iif, timer, throwError, take, startWith, combineLatest, first, takeUntil, filter, concatMap as concatMap$1, mergeMap, skip, interval, withLatestFrom, shareReplay, repeat, pairwise, share, retry } from "rxjs";
+import { useRef, useMemo, useCallback, useSyncExternalStore, useEffect, createContext, memo, useContext } from "react";
+import { distinctUntilChanged, tap, finalize, catchError, EMPTY, Subject, identity, BehaviorSubject, of, zip, from, map, merge, throttleTime, switchMap, defer, iif, timer, throwError, scan, take, startWith, combineLatest, first, takeUntil, filter, concatMap as concatMap$1, mergeMap, fromEvent, skip, withLatestFrom, retry, shareReplay, endWith, delay, share, pairwise, NEVER, takeWhile } from "rxjs";
 import { jsx } from "react/jsx-runtime";
 import { retryWhen, concatMap, tap as tap$1 } from "rxjs/operators";
 const useLiveRef = (value) => {
@@ -145,8 +145,8 @@ function trigger(mapper = identity) {
 }
 const SIGNAL_RESET = Symbol("SIGNAL_RESET");
 function signal(options) {
-  const { default: defaultValue } = options ?? {};
-  const subject = new BehaviorSubject(defaultValue);
+  const { default: defaultValue2 } = options ?? {};
+  const subject = new BehaviorSubject(defaultValue2);
   const setValue = (arg) => {
     if (arg === subject.getValue())
       return;
@@ -158,7 +158,7 @@ function signal(options) {
       return;
     }
     if (arg === SIGNAL_RESET) {
-      subject.next(defaultValue ?? void 0);
+      subject.next(defaultValue2 ?? void 0);
       return;
     }
     subject.next(arg);
@@ -409,15 +409,6 @@ function retryBackoff(config) {
     );
   });
 }
-const retryFromOptions = (options) => retryBackoff({
-  initialInterval: 100,
-  ...typeof options.retry === "function" ? {
-    shouldRetry: options.retry
-  } : {
-    maxRetries: options.retry === false ? 0 : options.retry ?? 3
-  }
-});
-const querx = (options) => (source) => source.pipe(retryFromOptions(options));
 const useBehaviorSubject = (state) => {
   const subject = useConstant(() => new BehaviorSubject(state));
   const completed = useRef(false);
@@ -457,6 +448,31 @@ function shallowEqual(objA, objB) {
   }
   return true;
 }
+const retryOnError = (options) => retryBackoff({
+  initialInterval: 100,
+  ...typeof options.retry === "function" ? {
+    shouldRetry: options.retry
+  } : {
+    maxRetries: options.retry === false ? 0 : options.retry ?? 3
+  }
+});
+const mergeResults = (stream$) => stream$.pipe(
+  scan(
+    (acc, current) => {
+      return {
+        ...acc,
+        ...current
+      };
+    },
+    {
+      data: void 0,
+      error: void 0,
+      fetchStatus: "idle",
+      status: "loading"
+    }
+  ),
+  distinctUntilChanged(shallowEqual)
+);
 function useAsyncQuery(query, mapOperatorOrOptions, options = {}) {
   const queryRef = useLiveRef(query);
   const triggerSubject = useSubject();
@@ -503,7 +519,7 @@ function useAsyncQuery(query, mapOperatorOrOptions, options = {}) {
             }),
             combineLatest([
               defer(() => from(queryRef.current(args))).pipe(
-                querx(optionsRef.current),
+                retryOnError(optionsRef.current),
                 first(),
                 map((data) => ({ data, isError: false })),
                 catchError((error) => {
@@ -544,12 +560,12 @@ function useAsyncQuery(query, mapOperatorOrOptions, options = {}) {
         })
       )
     ).pipe(
+      filter((state) => !!state && !!Object.keys(state).length),
       /**
        * @important
        * state update optimization
        */
-      distinctUntilChanged(shallowEqual),
-      filter((state) => !!state && !!Object.keys(state).length)
+      distinctUntilChanged(shallowEqual)
     ).subscribe((state) => {
       data$.current.next({
         ...data$.current.getValue(),
@@ -577,255 +593,168 @@ function useAsyncQuery(query, mapOperatorOrOptions, options = {}) {
   }, []);
   return { ...result, isLoading: result.status === "loading", mutate, reset };
 }
-const arrayEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
-const useCreateCacheStore = () => {
-  const cacheStore = useBehaviorSubject({});
-  useSubscribe(
-    () => cacheStore.current.pipe(
-      skip(1),
-      tap(() => {
-        const store = cacheStore.current.getValue();
-        console.log(
-          "[cache] update",
-          Object.keys(store).reduce((acc, key) => {
-            const entry = store[key];
-            if (entry != null) {
-              acc[key] = entry;
-            }
-            acc[key]._debug = {
-              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-              // @ts-expect-error
-              eol: new Date(store[key].date + store[key].ttl)
-            };
-            return acc;
-          }, {})
-        );
-      })
-    ),
-    [cacheStore]
-  );
-  useSubscribe(
-    () => interval(1e3).pipe(
-      withLatestFrom(cacheStore.current),
-      tap(() => {
-        const now = (/* @__PURE__ */ new Date()).getTime();
-        const store = cacheStore.current.getValue();
-        const keys = Object.keys(store);
-        const validKeys = keys.filter((key) => {
-          const value = store[key];
-          if (value != null && value.date + value.ttl > now) {
-            return true;
-          }
-          return false;
-        });
-        if (validKeys.length === keys.length) {
-          return;
-        }
-        const newStore = validKeys.reduce((acc, key) => {
-          const entry = store[key];
-          if (entry != null) {
-            acc[key] = entry;
-          }
-          return acc;
-        }, {});
-        cacheStore.current.next(newStore);
-      })
-    ),
-    [cacheStore]
-  );
-  return cacheStore;
-};
-const useQueryStore = () => {
-  const [store] = useState(/* @__PURE__ */ new Map());
-  return store;
-};
-const Context = createContext(void 0);
-const Provider = memo(({ children }) => {
-  const cacheStore = useCreateCacheStore();
-  const queryStore = useQueryStore();
-  const value = useMemo(() => ({ cacheStore, queryStore }), []);
-  return /* @__PURE__ */ jsx(Context.Provider, { value, children });
+const Context = createContext({
+  client: null
 });
-const useProvider = () => {
+const Provider = memo(
+  ({
+    children,
+    client
+  }) => {
+    const value = useMemo(() => ({ client }), [client]);
+    useEffect(
+      () => () => {
+        client.destroy();
+      },
+      [client]
+    );
+    return /* @__PURE__ */ jsx(Context.Provider, { value, children });
+  }
+);
+const useReactJrxProvider = () => {
   const context = useContext(Context);
+  if (context === null) {
+    throw new Error("You forgot to register the provider");
+  }
   return { ...context };
 };
-const serializeKey = (key) => {
-  if (key.length === 0)
-    return "";
-  return JSON.stringify(key);
-};
-const deduplicate = (key, queryStore) => (source) => {
-  if (!key)
-    return source;
-  const sourceFromStore = queryStore == null ? void 0 : queryStore.get(key);
-  const finalSource = sourceFromStore ?? source.pipe(
-    finalize(() => {
-      queryStore == null ? void 0 : queryStore.delete(key);
-    }),
-    shareReplay({
-      refCount: true,
-      bufferSize: 1
+const arrayEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
+function isDefined(arg) {
+  return arg !== null && arg !== void 0;
+}
+const createActivityTrigger = (params$) => {
+  return params$.pipe(
+    switchMap(({ options: { refetchOnWindowFocus = true } }) => {
+      const shouldRunTrigger = typeof refetchOnWindowFocus === "function" ? refetchOnWindowFocus({}) : refetchOnWindowFocus;
+      return shouldRunTrigger !== false ? merge(
+        fromEvent(document, "visibilitychange").pipe(
+          filter(() => !document.hidden),
+          map(() => ({ ignoreStale: shouldRunTrigger === "always" }))
+        ),
+        fromEvent(window, "focus").pipe(
+          map(() => ({ ignoreStale: shouldRunTrigger === "always" }))
+        )
+      ) : EMPTY;
     })
   );
-  if (sourceFromStore == null) {
-    queryStore == null ? void 0 : queryStore.set(key, finalSource);
-  }
-  return finalSource;
 };
-const autoRefetch = (options = {}) => (source) => {
-  if (options.staleTime === Infinity)
-    return source;
-  return source.pipe(
-    repeat({
-      delay: options.staleTime ?? 999999
+const createNetworkTrigger = (params$) => {
+  return params$.pipe(
+    switchMap(({ options: { refetchOnReconnect = true } }) => {
+      const shouldRunTrigger = typeof refetchOnReconnect === "function" ? refetchOnReconnect({}) : refetchOnReconnect;
+      return shouldRunTrigger !== false ? fromEvent(window, "online").pipe(
+        map(() => ({ ignoreStale: shouldRunTrigger === "always" }))
+      ) : EMPTY;
     })
   );
 };
-function isDefined(arg) {
-  return arg !== null && arg !== void 0;
-}
-const withKeyComparison = (stream) => stream.pipe(
-  startWith(void 0),
-  pairwise(),
-  map(([previous, current]) => {
-    if (current) {
-      if (!previous) {
-        return {
-          ...current,
-          previousKey: void 0,
-          isUsingDifferentKey: true
-        };
-      }
-      const serializedKey = serializeKey(current.key);
-      const serializedPreviousKey = serializeKey(previous.key);
-      return {
-        ...current,
-        previousKey: (previous == null ? void 0 : previous.key) ?? current.key,
-        isUsingDifferentKey: serializedPreviousKey !== serializedKey
-      };
-    }
-    return void 0;
-  }),
-  filter(isDefined)
-);
-function useQuery(keyOrQuery, queryOrOptionOrNothing, optionsOrNothing) {
-  const query = Array.isArray(keyOrQuery) ? queryOrOptionOrNothing : keyOrQuery;
-  const options = optionsOrNothing ?? (queryOrOptionOrNothing !== query ? queryOrOptionOrNothing : void 0) ?? {};
-  const key = Array.isArray(keyOrQuery) ? keyOrQuery : void 0;
-  const params$ = useBehaviorSubject({ key, options, query });
-  const refetch$ = useSubject();
-  const data$ = useBehaviorSubject({
-    data: void 0,
-    error: void 0,
-    isLoading: true
-  });
-  const { queryStore } = useProvider();
+const useQueryParams = ({
+  queryKey,
+  queryFn,
+  ...options
+}) => {
+  const params$ = useBehaviorSubject({ queryKey, options, queryFn });
   useEffect(() => {
     params$.current.next({
-      key,
+      queryKey,
       options,
-      query
+      queryFn
     });
-  }, [key, options, query]);
-  useSubscribe(() => {
-    const options$ = params$.current.pipe(
-      map(({ options: options2 }) => options2),
-      distinctUntilChanged(shallowEqual)
-    );
-    const newKeyReceived$ = params$.current.pipe(
-      map(({ key: key2 }) => key2 ?? []),
-      distinctUntilChanged(arrayEqual)
-    );
-    const newQuery$ = params$.current.pipe(
-      map(({ query: query2 }) => query2 ?? (() => of(void 0)))
-    );
-    const queryAsObservableObjectChanged$ = newQuery$.pipe(
-      filter((query2) => typeof query2 !== "function"),
-      distinctUntilChanged(shallowEqual)
-    );
-    const enabledOptionChanged$ = options$.pipe(
-      map(({ enabled = true }) => enabled),
-      distinctUntilChanged(),
-      share()
-    );
-    const queryTrigger$ = combineLatest([
-      newKeyReceived$,
-      enabledOptionChanged$,
-      queryAsObservableObjectChanged$.pipe(startWith(void 0)),
-      refetch$.current.pipe(startWith(void 0))
-    ]);
-    const disabled$ = enabledOptionChanged$.pipe(
-      filter((enabled) => !enabled),
-      tap(() => {
-        data$.current.next({
-          ...data$.current.getValue(),
-          isLoading: false
-        });
-      })
-    );
-    return queryTrigger$.pipe(
-      withLatestFrom(options$, newQuery$),
-      map(([[key2, enabled], options2, query2]) => ({
-        key: key2,
-        enabled,
-        options: options2,
-        query: query2
-      })),
-      withKeyComparison,
-      filter(({ enabled }) => enabled),
-      switchMap(({ key: key2, options: options2, isUsingDifferentKey, query: query2 }) => {
-        const serializedKey = serializeKey(key2);
-        return of(null).pipe(
-          tap(() => {
-            data$.current.next({
-              ...data$.current.getValue(),
-              data: isUsingDifferentKey ? void 0 : data$.current.getValue().data,
-              error: void 0,
-              isLoading: true
-            });
-          }),
-          switchMap(() => {
-            const query$ = defer(() => {
-              const queryOrResponse = typeof query2 === "function" ? query2() : query2;
-              return from(queryOrResponse);
-            });
-            return query$.pipe(
-              querx(options2),
-              deduplicate(serializedKey, queryStore),
-              // key.length > 0 ? withCache(key) : identity,
-              map((response) => [response]),
-              catchError((error) => {
-                return of([void 0, error]);
-              }),
-              tap(([response, error]) => {
-                if (response) {
-                  if (options2.onSuccess != null)
-                    options2.onSuccess(response);
-                }
-                data$.current.next({
-                  ...data$.current.getValue(),
-                  isLoading: false,
-                  error,
-                  data: response
-                });
-              })
-            );
-          }),
-          autoRefetch(options2),
-          takeUntil(disabled$)
-        );
-      })
-    );
-  }, []);
+  }, [queryKey, options, queryFn]);
+  return params$;
+};
+const defaultValue = {
+  data: void 0,
+  isLoading: true,
+  error: void 0,
+  status: "loading",
+  fetchStatus: "idle"
+};
+function useQuery({
+  queryKey,
+  queryFn,
+  ...options
+}) {
+  const internalRefresh$ = useSubject();
+  const { client } = useReactJrxProvider();
+  const params$ = useQueryParams({ queryFn, queryKey, ...options });
   const result = useObserve(
-    () => data$.current,
-    { defaultValue: data$.current.getValue() },
-    []
+    () => {
+      const key$ = params$.current.pipe(map(({ queryKey: queryKey2 }) => queryKey2 ?? []));
+      const initialTrigger$ = of(null);
+      const newKeyTrigger$ = key$.pipe(
+        distinctUntilChanged(arrayEqual),
+        skip(1)
+      );
+      const isQueryObject = (query) => !!query && typeof query !== "function";
+      const newObservableObjectQuery$ = params$.current.pipe(
+        map(({ queryFn: queryFn2 }) => queryFn2),
+        filter(isQueryObject),
+        distinctUntilChanged(shallowEqual),
+        isQueryObject(params$.current.getValue().queryFn) ? skip(1) : identity
+      );
+      const fn$ = params$.current.pipe(
+        map(({ queryFn: queryFn2 }) => queryFn2),
+        filter(isDefined)
+      );
+      const options$ = params$.current.pipe(map(({ options: options2 }) => options2));
+      const activityRefetch$ = createActivityTrigger(params$.current);
+      const networkRefetch$ = createNetworkTrigger(params$.current);
+      const newQueryTrigger$ = merge(
+        initialTrigger$,
+        newKeyTrigger$,
+        newObservableObjectQuery$
+      );
+      const refetch$ = merge(
+        internalRefresh$.current.pipe(map(() => ({ ignoreStale: true }))),
+        merge(activityRefetch$, networkRefetch$).pipe(throttleTime(500))
+      );
+      return newQueryTrigger$.pipe(
+        withLatestFrom(key$),
+        switchMap(([, key]) => {
+          const { result$ } = client.query$({
+            key,
+            fn$,
+            options$,
+            refetch$
+          });
+          return result$.pipe(
+            scan(
+              (previousValue, { data: currentData, ...currentValue }) => ({
+                data: void 0,
+                ...previousValue,
+                ...currentValue,
+                isLoading: currentValue.status === "loading",
+                ...currentData && {
+                  data: currentData.result
+                }
+              }),
+              {}
+            )
+          );
+        })
+        /**
+         * @important
+         * We skip the first result as it is comparable to default passed value.
+         * This is assuming all query are async and does not return a result right away.
+         * This is a design choice.
+         */
+        // params$.current.getValue().options.enabled !== false
+        //   ? skip(1)
+        //   : identity
+      );
+    },
+    {
+      defaultValue: {
+        ...defaultValue,
+        isLoading: params$.current.getValue().options.enabled !== false
+      }
+    },
+    [client]
   );
-  const refetch = useCallback((arg) => {
-    refetch$.current.next(arg);
-  }, []);
+  const refetch = useCallback(() => {
+    internalRefresh$.current.next();
+  }, [client]);
   return { ...result, refetch };
 }
 function useSubscribeEffect(source, unsafeOptions, deps = []) {
@@ -848,10 +777,878 @@ function useSubscribeEffect(source, unsafeOptions, deps = []) {
   );
   useSubscribe(enhancerMakeObservable, deps);
 }
+const serializeObject = (object) => {
+  if (Array.isArray(object)) {
+    return object.reduce((acc, value, index) => {
+      if (index === object.length - 1)
+        return `${acc}${serializeObject(value)}]`;
+      return `${acc}${serializeObject(value)},`;
+    }, "[");
+  }
+  if (object === void 0)
+    return "";
+  return JSON.stringify(object, Object.keys(object).sort());
+};
+const serializeKey = (key) => {
+  if (key.length === 0)
+    return "[]";
+  return serializeObject(key);
+};
+const resetStyle = { backgroundColor: "transparent", color: "inherit" };
+function createLogger(env) {
+  const _logger = {
+    namespaces: [
+      { name: "@reactjrx", style: { backgroundColor: "#d02f4e", color: "white" } }
+    ],
+    namespace(name, style) {
+      const logger2 = createLogger(env);
+      logger2.namespaces.push({
+        name,
+        style: style ?? resetStyle
+      });
+      return logger2;
+    },
+    printNamespaces() {
+      return {
+        namespaces: _logger.namespaces.map(({ name }) => `%c ${name} %c`).join(" "),
+        styles: _logger.namespaces.reduce((acc, { style }) => {
+          acc.push(
+            `background-color: ${style.backgroundColor}; color: ${style.color};`
+          );
+          acc.push("background-color: transparent; color: inherit;");
+          return acc;
+        }, [])
+      };
+    },
+    print(method, ...message) {
+      if (env === "development") {
+        const { namespaces, styles } = _logger.printNamespaces();
+        console[method](namespaces, ...styles, ...message);
+      }
+      return _logger;
+    },
+    printWithoutNamespace(method, ...message) {
+      if (env === "development") {
+        console[method](...message);
+      }
+      return _logger;
+    },
+    log(...message) {
+      return _logger.print("log", ...message);
+    },
+    warn(...message) {
+      return _logger.print("warn", ...message);
+    },
+    error(...message) {
+      return _logger.print("error", ...message);
+    },
+    group(...message) {
+      return _logger.print("group", ...message);
+    },
+    groupEnd() {
+      if (env === "development") {
+        console.groupEnd();
+      }
+      return _logger;
+    }
+  };
+  return _logger;
+}
+const Logger = createLogger("development");
+const logger$3 = Logger.namespace("store");
+const createDebugger = (store$) => {
+  return store$.pipe(
+    map(
+      (value) => [...value.keys()].reduce((acc, key) => {
+        var _a;
+        acc[key] = (_a = value.get(key)) == null ? void 0 : _a.getValue();
+        return acc;
+      }, {})
+    ),
+    distinctUntilChanged(shallowEqual)
+  ).subscribe((value) => {
+    logger$3.log("store", "update", value);
+  });
+};
+const createQueryStore = () => {
+  const store = /* @__PURE__ */ new Map();
+  const store$ = new BehaviorSubject(store);
+  const queryEventSubject = new Subject();
+  const queryTriggerSubject = new Subject();
+  const notify = () => {
+    store$.next(store);
+  };
+  const setValue = (key, value) => {
+    store.set(key, new BehaviorSubject(value));
+    notify();
+  };
+  const getValue = (serializedKey) => {
+    var _a;
+    return (_a = store.get(serializedKey)) == null ? void 0 : _a.getValue();
+  };
+  const getValue$ = (key) => {
+    return store$.pipe(
+      map(() => store.get(key)),
+      filter(isDefined),
+      map((entry) => entry.getValue()),
+      distinctUntilChanged(shallowEqual)
+    );
+  };
+  const updateValue = (key, value) => {
+    const existingObject = store.get(key);
+    if (!existingObject)
+      return;
+    if (typeof value === "function") {
+      existingObject.next({
+        ...existingObject.getValue(),
+        ...value(existingObject.getValue())
+      });
+    } else {
+      existingObject.next({ ...existingObject.getValue(), ...value });
+    }
+    store$.next(store);
+  };
+  const updateMany = (value, predicate = () => true) => {
+    store.forEach((oldValue$) => {
+      const oldValue = oldValue$.getValue();
+      if (predicate(oldValue)) {
+        oldValue$.next({ ...oldValue, ...value });
+      }
+    });
+    store$.next(store);
+  };
+  const deleteValue = (key) => {
+    store.delete(key);
+    store$.next(store);
+  };
+  const addRunner = (key, stream) => {
+    updateValue(key, (old) => ({
+      ...old,
+      runners: [...old.runners, stream]
+    }));
+    return () => {
+      var _a;
+      const newListeners = ((_a = store.get(key)) == null ? void 0 : _a.getValue().runners.filter((reference) => reference !== stream)) ?? [];
+      updateValue(key, (old) => ({
+        ...old,
+        runners: newListeners
+      }));
+    };
+  };
+  const debugger$ = createDebugger(store$);
+  return {
+    set: setValue,
+    get: getValue,
+    get$: getValue$,
+    delete: deleteValue,
+    update: updateValue,
+    keys: () => store.keys(),
+    updateMany,
+    addRunner,
+    store$,
+    queryEvent$: queryEventSubject.asObservable(),
+    dispatchQueryEvent: (event) => {
+      queryEventSubject.next(event);
+    },
+    queryTrigger$: queryTriggerSubject.asObservable(),
+    dispatchQueryTrigger: (event) => {
+      queryTriggerSubject.next(event);
+    },
+    size: () => store.size,
+    destroy: () => {
+      debugger$.unsubscribe();
+      queryEventSubject.complete();
+      queryTriggerSubject.complete();
+    }
+  };
+};
+const createQueryTrigger = ({
+  refetch$,
+  options$,
+  queryStore,
+  key
+}) => {
+  const enabledOption$ = options$.pipe(
+    map(({ enabled = true }) => enabled),
+    distinctUntilChanged()
+  );
+  const enabledTrigger$ = enabledOption$.pipe(
+    skip(1),
+    filter((enabled) => enabled)
+  );
+  return merge(
+    queryStore.queryTrigger$.pipe(
+      filter((event) => key === event.key),
+      map(({ trigger: trigger2 }) => trigger2)
+    ),
+    refetch$.pipe(
+      map((event) => ({
+        ...event,
+        type: "refetch"
+      }))
+    ),
+    enabledTrigger$.pipe(
+      map(() => ({
+        type: "enabled",
+        ignoreStale: false
+      }))
+    )
+  );
+};
+const deduplicate = (key, queryStore) => (source) => {
+  if (key === serializeKey([]))
+    return source;
+  return defer(() => {
+    var _a;
+    const sourceFromStore = (_a = queryStore.get(key)) == null ? void 0 : _a.deduplication_fn;
+    const deleteFromStore = () => {
+      queryStore.update(key, {
+        deduplication_fn: void 0
+      });
+    };
+    const finalSource = sourceFromStore ?? source.pipe(
+      /**
+       * Ideally we would want to remove the query from the store only on finalize,
+       * which means whenever the query complete or error. Unfortunately finalize is
+       * triggered after a new stream arrive which create a concurrency issue.
+       * tap is triggered correctly synchronously and before a new query arrive.
+       */
+      tap({
+        error: deleteFromStore,
+        complete: deleteFromStore
+      }),
+      /**
+       * Because tap is not called on unsubscription we still need to handle the case.
+       */
+      finalize(deleteFromStore),
+      shareReplay({
+        refCount: true,
+        bufferSize: 1
+      })
+    );
+    if (!sourceFromStore) {
+      queryStore.update(key, {
+        deduplication_fn: finalSource
+      });
+    }
+    return finalSource;
+  });
+};
+const notifyQueryResult = (options$) => (stream$) => stream$.pipe(
+  withLatestFrom(options$),
+  map(([result, options]) => {
+    var _a, _b;
+    if (result.error) {
+      (_a = options.onError) == null ? void 0 : _a.call(options, result.error);
+    } else {
+      (_b = options.onSuccess) == null ? void 0 : _b.call(options, result);
+    }
+    return result;
+  })
+);
+const registerResultInCache = ({
+  queryStore,
+  serializedKey,
+  options
+}) => (stream) => stream.pipe(
+  tap((result) => {
+    queryStore.update(serializedKey, {
+      ...options.cacheTime !== 0 && {
+        cache_fnResult: { result }
+      }
+    });
+  })
+);
+const mapWithComplete = (mapFn) => (stream) => {
+  return stream.pipe(map(mapFn({ isComplete: false })));
+};
+const createQueryFetch = ({
+  options$,
+  options,
+  fn,
+  queryStore,
+  serializedKey,
+  trigger: trigger2,
+  trigger$
+}) => {
+  const enabledOption$ = options$.pipe(
+    map(({ enabled = true }) => enabled),
+    distinctUntilChanged()
+  );
+  const disabled$ = enabledOption$.pipe(
+    distinctUntilChanged(),
+    filter((enabled) => !enabled)
+  );
+  const deferredQuery = defer(() => {
+    const queryOrResponse = typeof fn === "function" ? fn() : fn;
+    return from(queryOrResponse);
+  });
+  const fnExecution$ = deferredQuery.pipe(
+    retryOnError(options),
+    deduplicate(serializedKey, queryStore),
+    tap(() => {
+      queryStore.dispatchQueryEvent({
+        key: serializedKey,
+        type: "fetchSuccess"
+      });
+      queryStore.update(serializedKey, {
+        lastFetchedAt: (/* @__PURE__ */ new Date()).getTime()
+      });
+    }),
+    registerResultInCache({ serializedKey, options, queryStore }),
+    mapWithComplete(({ isComplete }) => (result) => ({
+      status: "success",
+      ...isComplete && {
+        fetchStatus: "idle"
+      },
+      data: { result },
+      error: void 0
+    })),
+    endWith({
+      fetchStatus: "idle"
+    }),
+    catchError((error) => {
+      queryStore.dispatchQueryEvent({
+        key: serializedKey,
+        type: "fetchError"
+      });
+      return of({
+        fetchStatus: "idle",
+        status: "error",
+        data: void 0,
+        error
+      });
+    }),
+    notifyQueryResult(options$)
+  );
+  const newCache$ = queryStore.queryEvent$.pipe(
+    filter(
+      (event) => event.key === serializedKey && event.type === "queryDataSet"
+    ),
+    map(() => {
+      var _a, _b;
+      return (_b = (_a = queryStore.get(serializedKey)) == null ? void 0 : _a.cache_fnResult) == null ? void 0 : _b.result;
+    }),
+    filter(isDefined),
+    map((result) => ({
+      status: "success",
+      data: { result }
+    })),
+    /**
+     * @important
+     * To avoid cache update being returned being the first result is returned.
+     * For example if user set query data inside onSuccess callback, we simulate
+     * a small delay to ensure it happens after.
+     */
+    delay(1)
+  );
+  const execution$ = merge(
+    disabled$.pipe(
+      take(1),
+      map(() => ({
+        fetchStatus: "idle"
+      }))
+    ),
+    merge(
+      of({ fetchStatus: "fetching", error: void 0 }),
+      fnExecution$
+    ).pipe(takeUntil(disabled$)),
+    newCache$
+  ).pipe(takeUntil(trigger$));
+  const query = queryStore.get(serializedKey);
+  const cacheResult = query == null ? void 0 : query.cache_fnResult;
+  const hasCache = !!cacheResult;
+  if (hasCache) {
+    if (!(query == null ? void 0 : query.isStale) && !trigger2.ignoreStale) {
+      return of({
+        fetchStatus: "idle",
+        status: "success",
+        data: { result: cacheResult.result },
+        error: void 0
+      });
+    } else {
+      return merge(
+        of({
+          fetchStatus: "fetching",
+          status: "success",
+          data: { result: cacheResult.result },
+          error: void 0
+        }),
+        execution$
+      );
+    }
+  }
+  return execution$;
+};
+const compareKeys = (keyA, keyB, { exact = false } = {}) => {
+  if (exact) {
+    return serializeKey(keyA) === serializeKey(keyB);
+  }
+  return keyA.reduce((acc, value, index) => {
+    if (!acc)
+      return false;
+    return serializeObject(value) === serializeObject(keyB[index]);
+  }, true);
+};
+const logger$2 = Logger.namespace("invalidation");
+const createInvalidationClient = ({
+  queryStore
+}) => {
+  const invalidateQueries = ({
+    queryKey,
+    exact = false,
+    predicate
+  } = {}) => {
+    let keysToRefetch = [];
+    if (queryKey) {
+      logger$2.log(`invalidation requested for`, queryKey);
+      queryStore.updateMany({ isStale: true }, (entry) => {
+        const isValid = compareKeys(queryKey, entry.queryKey, { exact });
+        if (isValid) {
+          keysToRefetch.push(serializeKey(entry.queryKey));
+        }
+        return isValid;
+      });
+    } else if (predicate) {
+      queryStore.updateMany({ isStale: true }, (entry) => {
+        const isValid = predicate(entry);
+        if (isValid) {
+          keysToRefetch.push(serializeKey(entry.queryKey));
+        }
+        return isValid;
+      });
+    } else {
+      logger$2.log(`Invalidation requested for all queries`);
+      queryStore.updateMany({ isStale: true });
+      keysToRefetch = Array.from(queryStore.keys());
+    }
+    keysToRefetch.forEach((key) => {
+      queryStore.dispatchQueryTrigger({
+        key,
+        trigger: { ignoreStale: true, type: "refetch" }
+      });
+    });
+  };
+  return {
+    invalidateQueries,
+    destroy: () => {
+    }
+  };
+};
+const logger$1 = Logger.namespace("refetch");
+const createRefetchClient = ({
+  queryStore
+}) => {
+  const pipeQueryResult = ({
+    options$
+  }) => (stream) => {
+    const sharedStream = stream.pipe(share());
+    return merge(
+      sharedStream,
+      sharedStream.pipe(
+        filter(
+          (result) => !!result.data && result.fetchStatus !== "fetching"
+        ),
+        distinctUntilChanged((prev, curr) => prev.data === curr.data),
+        withLatestFrom(options$),
+        map(([, { refetchInterval }]) => refetchInterval),
+        filter(isDefined),
+        switchMap((refetchInterval) => {
+          if (typeof refetchInterval === "number") {
+            return timer(refetchInterval).pipe(
+              map(() => ({
+                type: "refetch",
+                ignoreStale: true
+              })),
+              switchMap(() => EMPTY)
+            );
+          }
+          return EMPTY;
+        })
+      )
+    );
+  };
+  const pipeQueryTrigger = ({
+    key
+  }) => (stream) => {
+    return merge(
+      stream.pipe(
+        tap(({ ignoreStale }) => {
+          const query = queryStore.get(key);
+          if (query && ignoreStale && !query.isStale) {
+            logger$1.log(key, "marked stale by trigger!");
+            queryStore.update(key, {
+              isStale: true
+            });
+          }
+        })
+      )
+    );
+  };
+  return {
+    pipeQueryResult,
+    pipeQueryTrigger,
+    destroy: () => {
+    }
+  };
+};
+const difference = (a, b) => a.filter((element) => !b.includes(element));
+const createQueryListener = (store, onQuery) => store.store$.pipe(
+  map((store2) => [...store2.keys()]),
+  startWith([]),
+  pairwise(),
+  mergeMap(([previousKeys, currentKeys]) => {
+    const newKeys = difference(currentKeys, previousKeys);
+    return merge(
+      ...newKeys.map((key) => {
+        const deleted$ = store.store$.pipe(
+          map(() => store.get(key)),
+          filter((item) => item === void 0)
+        );
+        return merge(NEVER, of(key)).pipe(
+          tap(() => {
+            console.log("QUERY", key, "in");
+          }),
+          onQuery,
+          finalize(() => {
+            console.log("QUERY", key, "complete");
+          }),
+          takeUntil(deleted$)
+        );
+      })
+    );
+  })
+);
+const mapStoreQueryToRunnerOptions = (stream) => stream.pipe(
+  switchMap((entry) => combineLatest(entry.runners)),
+  map((runnerValues) => runnerValues.map(({ options }) => options))
+);
+const mapOptionsToOption$1 = (stream) => stream.pipe(
+  map(
+    (options) => options.reduce(
+      (acc, value) => {
+        return {
+          ...acc,
+          lowestStaleTime: value.staleTime === void 0 ? acc.lowestStaleTime : Math.min(
+            value.staleTime ?? Infinity,
+            acc.lowestStaleTime ?? Infinity
+          )
+        };
+      },
+      { lowestStaleTime: void 0 }
+    )
+  ),
+  distinctUntilChanged(shallowEqual)
+);
+const onlyFetchEventDone = (key) => (stream) => stream.pipe(
+  filter(
+    (event) => event.key === key && (event.type === "fetchError" || event.type === "fetchSuccess")
+  )
+);
+const markAsStale = ({
+  queryStore
+}) => (stream) => stream.pipe(
+  switchMap((key) => {
+    const query$ = queryStore.get$(key);
+    return queryStore.queryEvent$.pipe(
+      onlyFetchEventDone(key),
+      switchMap(
+        () => query$.pipe(
+          mapStoreQueryToRunnerOptions,
+          mapOptionsToOption$1,
+          tap(({ lowestStaleTime = 0 }) => {
+            var _a;
+            if (lowestStaleTime === 0) {
+              logger$2.log(key, "marked as stale!", {
+                staleTime: lowestStaleTime
+              });
+              queryStore.update(key, { isStale: true });
+            } else if ((_a = queryStore.get(key)) == null ? void 0 : _a.isStale) {
+              logger$2.log(key, "marked non stale", {
+                staleTime: lowestStaleTime
+              });
+              queryStore.update(key, { isStale: false });
+            }
+          }),
+          filter(
+            ({ lowestStaleTime }) => lowestStaleTime !== Infinity && lowestStaleTime !== 0
+          ),
+          switchMap(({ lowestStaleTime = 0 }) => timer(lowestStaleTime)),
+          tap(() => {
+            var _a;
+            if (!((_a = queryStore.get(key)) == null ? void 0 : _a.isStale)) {
+              logger$2.log(key, "marked as stale!");
+              queryStore.update(key, { isStale: true });
+            }
+          })
+        )
+      ),
+      map(() => key)
+    );
+  })
+);
+const mapOptionsToOption = (stream) => stream.pipe(
+  map(
+    (options) => options.reduce(
+      (acc, value) => {
+        return {
+          ...acc,
+          lowestCacheTime: value.cacheTime === void 0 ? acc.lowestCacheTime : Math.min(
+            value.cacheTime ?? Infinity,
+            acc.lowestCacheTime ?? Infinity
+          )
+        };
+      },
+      { lowestCacheTime: void 0 }
+    )
+  ),
+  distinctUntilChanged(shallowEqual)
+);
+const onCacheUpdate = (stream) => stream.pipe(
+  map((item) => item.cache_fnResult),
+  distinctUntilChanged(shallowEqual)
+);
+const invalidateCache = ({
+  queryStore
+}) => (stream) => stream.pipe(
+  switchMap((key) => {
+    const query$ = queryStore.get$(key);
+    const invalidateCache$ = query$.pipe(
+      onCacheUpdate,
+      switchMap(
+        () => query$.pipe(
+          mapStoreQueryToRunnerOptions,
+          mapOptionsToOption,
+          switchMap(
+            ({
+              lowestCacheTime = 5 * 60 * 1e3
+              /* 5mn */
+            }) => timer(lowestCacheTime).pipe(
+              tap(() => {
+                queryStore.update(key, { cache_fnResult: void 0 });
+              })
+            )
+          )
+        )
+      )
+    );
+    return invalidateCache$.pipe(map(() => key));
+  })
+);
+const garbageCache = ({
+  queryStore
+}) => (stream) => stream.pipe(
+  switchMap((key) => {
+    const query$ = queryStore.get$(key);
+    return query$.pipe(
+      filter((entry) => !entry.cache_fnResult),
+      map((entry) => entry.runners.length > 0),
+      pairwise(),
+      filter(([hadRunners, hasRunners]) => hadRunners && !hasRunners),
+      tap(() => {
+        queryStore.delete(key);
+      }),
+      map(() => key)
+    );
+  })
+);
+const getInitialQueryEntity = ({ key }) => ({
+  isStale: true,
+  queryKey: key,
+  runners: []
+});
+const updateStoreWithQuery = ({
+  queryStore,
+  serializedKey,
+  runner$,
+  key
+}) => (stream) => stream.pipe(
+  map((value) => {
+    if (key.length === 0)
+      return [value, () => {
+      }];
+    if (!queryStore.get(serializedKey)) {
+      queryStore.set(serializedKey, getInitialQueryEntity({ key }));
+    } else {
+      queryStore.update(serializedKey, {
+        queryKey: key,
+        ...value.options.markStale && {
+          isStale: true
+        }
+      });
+    }
+    return [value, queryStore.addRunner(serializedKey, runner$)];
+  })
+);
+const logger = Logger.namespace("cache");
+const createCacheClient = ({
+  queryStore
+}) => {
+  const setQueryData = ({
+    queryKey,
+    updater
+  }) => {
+    const serializedKey = serializeKey(queryKey);
+    if (queryKey.length === 0)
+      return;
+    logger.log("set cache for query", serializeKey);
+    if (!queryStore.get(serializedKey)) {
+      queryStore.set(serializedKey, getInitialQueryEntity({ key: queryKey }));
+    }
+    queryStore.update(serializedKey, (entity) => {
+      var _a;
+      if (typeof updater === "function") {
+        const callableUpdater = updater;
+        return {
+          ...entity,
+          cache_fnResult: {
+            result: callableUpdater(
+              (_a = entity.cache_fnResult) == null ? void 0 : _a.result
+            )
+          }
+        };
+      }
+      return {
+        ...entity,
+        cache_fnResult: {
+          result: updater
+        }
+      };
+    });
+    queryStore.dispatchQueryEvent({
+      key: serializedKey,
+      type: "queryDataSet"
+    });
+  };
+  return {
+    setQueryData
+  };
+};
+const createClient = () => {
+  const queryStore = createQueryStore();
+  const invalidationClient = createInvalidationClient({ queryStore });
+  const cacheClient = createCacheClient({ queryStore });
+  const refetchClient = createRefetchClient({ queryStore });
+  const query$ = ({
+    key,
+    fn$: maybeFn$,
+    fn: maybeFn,
+    refetch$ = new Subject(),
+    options$ = new BehaviorSubject({})
+  }) => {
+    const serializedKey = serializeKey(key);
+    const internalRefetch$ = new Subject();
+    const fn$ = maybeFn$ ?? (maybeFn ? of(maybeFn) : NEVER);
+    console.log("query$()", serializedKey);
+    const runner$ = options$.pipe(map((options) => ({ options })));
+    let deleteRunner = () => {
+    };
+    const initialTrigger$ = of({
+      type: "initial",
+      ignoreStale: false
+    });
+    const trigger$ = createQueryTrigger({
+      options$,
+      refetch$: merge(refetch$, internalRefetch$),
+      key: serializedKey,
+      queryStore
+    }).pipe(refetchClient.pipeQueryTrigger({ options$, key: serializedKey }));
+    const result$ = merge(initialTrigger$, trigger$).pipe(
+      withLatestFrom(fn$, options$),
+      map(([trigger2, fn, options]) => ({ trigger: trigger2, fn, options })),
+      updateStoreWithQuery({
+        key,
+        queryStore,
+        runner$,
+        serializedKey
+      }),
+      map(([value, deleteRunnerFn]) => {
+        deleteRunner = deleteRunnerFn;
+        console.log("reactjrx", serializedKey, "query trigger", {
+          trigger: value.trigger,
+          options: value.options
+        });
+        return value;
+      }),
+      filter(({ options }) => options.enabled !== false),
+      mergeMap(
+        ({ fn, options, trigger: trigger2 }) => createQueryFetch({
+          options$,
+          options,
+          fn,
+          queryStore,
+          serializedKey,
+          trigger: trigger2,
+          trigger$
+        })
+      ),
+      // hooks
+      switchMap(
+        (result) => merge(
+          of(result).pipe(
+            refetchClient.pipeQueryResult({
+              key: serializedKey,
+              queryStore,
+              options$,
+              refetch$: internalRefetch$
+            })
+          )
+        )
+      ),
+      mergeResults,
+      withLatestFrom(options$),
+      takeWhile(([result, options]) => {
+        const shouldStop = result.data !== void 0 && options.terminateOnFirstResult;
+        return !shouldStop;
+      }, true),
+      map(([result]) => result),
+      tap((result) => {
+        console.log("result", result);
+      }),
+      finalize(() => {
+        deleteRunner();
+      })
+    );
+    return {
+      result$
+    };
+  };
+  const queryListenerSub = createQueryListener(
+    queryStore,
+    (stream) => stream.pipe(
+      switchMap((key) => {
+        const key$ = of(key);
+        return merge(
+          invalidateCache({
+            queryStore
+          })(key$),
+          markAsStale({
+            queryStore
+          })(key$),
+          garbageCache({
+            queryStore
+          })(key$)
+        );
+      })
+    )
+  ).subscribe();
+  return {
+    query$,
+    queryStore,
+    ...invalidationClient,
+    ...cacheClient,
+    ...refetchClient,
+    destroy: () => {
+      queryStore.destroy();
+      queryListenerSub.unsubscribe();
+    }
+  };
+};
 export {
   PersistSignals,
   Provider as ReactjrxQueryProvider,
   SIGNAL_RESET,
+  createClient,
   createLocalforageAdapter,
   createSharedStoreAdapter,
   exponentialBackoffDelay,
@@ -865,10 +1662,12 @@ export {
   useObserveCallback,
   usePersistSignalsContext,
   useQuery,
+  useReactJrxProvider,
   useScopeSignals,
   useSetSignal,
   useSignal,
   useSignalValue,
+  useSubject,
   useSubscribe,
   useSubscribeEffect,
   useUnmountObservable,