reactjrx 1.40.0 → 1.41.0

package/dist/index.cjs

@@ -242,7 +242,6 @@ const PersistSignals = react.memo(
       ).pipe(rxjs.map(() => true));
       return stream.pipe(
         rxjs.tap(() => {
-          console.log("hydration complete");
           if (onReadyRef.current != null)
             onReadyRef.current();
         }),
@@ -598,27 +597,35 @@ function useAsyncQuery(query, mapOperatorOrOptions, options = {}) {
 const Context = react.createContext({
   client: null
 });
+const ClientEffect = ({
+  client
+}) => {
+  react.useEffect(() => {
+    const destroy = client.start();
+    return () => {
+      destroy();
+    };
+  }, [client]);
+  return null;
+};
 const Provider = react.memo(
   ({
     children,
     client
   }) => {
     const value = react.useMemo(() => ({ client }), [client]);
-    react.useEffect(
-      () => () => {
-        client.destroy();
-      },
-      [client]
-    );
-    return /* @__PURE__ */ jsxRuntime.jsx(Context.Provider, { value, children });
+    return /* @__PURE__ */ jsxRuntime.jsxs(Context.Provider, { value, children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ClientEffect, { client: value.client }),
+      children
+    ] });
   }
 );
-const useReactJrxProvider = () => {
+const useQueryClient = () => {
   const context = react.useContext(Context);
   if (context === null) {
     throw new Error("You forgot to register the provider");
   }
-  return { ...context };
+  return context.client;
 };
 const arrayEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
 function isDefined(arg) {
@@ -678,7 +685,7 @@ function useQuery({
   ...options
 }) {
   const internalRefresh$ = useSubject();
-  const { client } = useReactJrxProvider();
+  const client = useQueryClient();
   const params$ = useQueryParams({ queryFn, queryKey, ...options });
   const result = useObserve(
     () => {
@@ -856,7 +863,7 @@ function createLogger(env) {
   };
   return _logger;
 }
-const Logger = createLogger("development");
+const Logger = createLogger("production");
 const logger$3 = Logger.namespace("store");
 const createDebugger = (store$) => {
   return store$.pipe(
@@ -937,7 +944,12 @@ const createQueryStore = () => {
       }));
     };
   };
-  const debugger$ = createDebugger(store$);
+  const start = () => {
+    const debugger$ = createDebugger(store$);
+    return () => {
+      debugger$.unsubscribe();
+    };
+  };
   return {
     set: setValue,
     get: getValue,
@@ -957,11 +969,7 @@ const createQueryStore = () => {
       queryTriggerSubject.next(event);
     },
     size: () => store.size,
-    destroy: () => {
-      debugger$.unsubscribe();
-      queryEventSubject.complete();
-      queryTriggerSubject.complete();
-    }
+    start
   };
 };
 const createQueryTrigger = ({
@@ -1053,17 +1061,17 @@ const registerResultInCache = ({
   serializedKey,
   options
 }) => (stream) => stream.pipe(
-  rxjs.tap((result) => {
-    queryStore.update(serializedKey, {
-      ...options.cacheTime !== 0 && {
-        cache_fnResult: { result }
-      }
-    });
+  rxjs.tap(({ data }) => {
+    if (data == null ? void 0 : data.result) {
+      const result = data == null ? void 0 : data.result;
+      queryStore.update(serializedKey, {
+        ...options.cacheTime !== 0 && {
+          cache_fnResult: { result }
+        }
+      });
+    }
   })
 );
-const mapWithComplete = (mapFn) => (stream) => {
-  return stream.pipe(rxjs.map(mapFn({ isComplete: false })));
-};
 const createQueryFetch = ({
   options$,
   options,
@@ -1097,12 +1105,8 @@ const createQueryFetch = ({
         lastFetchedAt: (/* @__PURE__ */ new Date()).getTime()
       });
     }),
-    registerResultInCache({ serializedKey, options, queryStore }),
-    mapWithComplete(({ isComplete }) => (result) => ({
+    rxjs.map((result) => ({
       status: "success",
-      ...isComplete && {
-        fetchStatus: "idle"
-      },
       data: { result },
       error: void 0
     })),
@@ -1121,7 +1125,8 @@ const createQueryFetch = ({
         error
       });
     }),
-    notifyQueryResult(options$)
+    notifyQueryResult(options$),
+    registerResultInCache({ serializedKey, options, queryStore })
   );
   const newCache$ = queryStore.queryEvent$.pipe(
     rxjs.filter(
@@ -1189,6 +1194,12 @@ const compareKeys = (keyA, keyB, { exact = false } = {}) => {
   return keyA.reduce((acc, value, index) => {
     if (!acc)
       return false;
+    if (value === void 0) {
+      const hasNextItemInLineNotUndefined = keyA.slice(index, keyA.length - 1).some((item) => item !== void 0);
+      if (!hasNextItemInLineNotUndefined) {
+        return true;
+      }
+    }
     return serializeObject(value) === serializeObject(keyB[index]);
   }, true);
 };
@@ -1232,9 +1243,7 @@ const createInvalidationClient = ({
     });
   };
   return {
-    invalidateQueries,
-    destroy: () => {
-    }
+    invalidateQueries
   };
 };
 const logger$1 = Logger.namespace("refetch");
@@ -1289,9 +1298,7 @@ const createRefetchClient = ({
   };
   return {
     pipeQueryResult,
-    pipeQueryTrigger,
-    destroy: () => {
-    }
+    pipeQueryTrigger
   };
 };
 const difference = (a, b) => a.filter((element) => !b.includes(element));
@@ -1309,11 +1316,9 @@ const createQueryListener = (store, onQuery) => store.store$.pipe(
         );
         return rxjs.merge(rxjs.NEVER, rxjs.of(key)).pipe(
           rxjs.tap(() => {
-            console.log("QUERY", key, "in");
           }),
           onQuery,
           rxjs.finalize(() => {
-            console.log("QUERY", key, "complete");
           }),
           rxjs.takeUntil(deleted$)
         );
@@ -1459,13 +1464,15 @@ const getInitialQueryEntity = ({ key }) => ({
   queryKey: key,
   runners: []
 });
-const updateStoreWithQuery = ({
+const updateStoreWithNewQuery = ({
   queryStore,
   serializedKey,
   runner$,
+  options$,
   key
 }) => (stream) => stream.pipe(
-  rxjs.map((value) => {
+  rxjs.withLatestFrom(options$),
+  rxjs.map(([value, options]) => {
     if (key.length === 0)
       return [value, () => {
       }];
@@ -1474,7 +1481,7 @@ const updateStoreWithQuery = ({
     } else {
       queryStore.update(serializedKey, {
         queryKey: key,
-        ...value.options.markStale && {
+        ...options.markStale && {
           isStale: true
         }
       });
@@ -1541,7 +1548,7 @@ const createClient = () => {
     const serializedKey = serializeKey(key);
     const internalRefetch$ = new rxjs.Subject();
     const fn$ = maybeFn$ ?? (maybeFn ? rxjs.of(maybeFn) : rxjs.NEVER);
-    console.log("query$()", serializedKey);
+    Logger.log("query$()", serializedKey);
     const runner$ = options$.pipe(rxjs.map((options) => ({ options })));
     let deleteRunner = () => {
     };
@@ -1555,18 +1562,26 @@ const createClient = () => {
       key: serializedKey,
       queryStore
     }).pipe(refetchClient.pipeQueryTrigger({ options$, key: serializedKey }));
-    const result$ = rxjs.merge(initialTrigger$, trigger$).pipe(
+    const result$ = rxjs.merge(
+      initialTrigger$.pipe(
+        updateStoreWithNewQuery({
+          key,
+          queryStore,
+          runner$,
+          serializedKey,
+          options$
+        }),
+        rxjs.map(([value, deleteRunnerFn]) => {
+          deleteRunner = deleteRunnerFn;
+          return value;
+        })
+      ),
+      trigger$
+    ).pipe(
       rxjs.withLatestFrom(fn$, options$),
       rxjs.map(([trigger2, fn, options]) => ({ trigger: trigger2, fn, options })),
-      updateStoreWithQuery({
-        key,
-        queryStore,
-        runner$,
-        serializedKey
-      }),
-      rxjs.map(([value, deleteRunnerFn]) => {
-        deleteRunner = deleteRunnerFn;
-        console.log("reactjrx", serializedKey, "query trigger", {
+      rxjs.map((value) => {
+        Logger.log("reactjrx", serializedKey, "query trigger", {
           trigger: value.trigger,
           options: value.options
         });
@@ -1604,9 +1619,6 @@ const createClient = () => {
         return !shouldStop;
       }, true),
       rxjs.map(([result]) => result),
-      rxjs.tap((result) => {
-        console.log("result", result);
-      }),
       rxjs.finalize(() => {
         deleteRunner();
       })
@@ -1615,7 +1627,7 @@ const createClient = () => {
       result$
     };
   };
-  const queryListenerSub = createQueryListener(
+  const queryListener$ = createQueryListener(
     queryStore,
     (stream) => stream.pipe(
       rxjs.switchMap((key) => {
@@ -1633,17 +1645,24 @@ const createClient = () => {
         );
       })
     )
-  ).subscribe();
+  );
+  const start = () => {
+    const queryListenerSub = queryListener$.subscribe();
+    const started = [queryStore.start()];
+    return () => {
+      started.forEach((destroy) => {
+        destroy();
+      });
+      queryListenerSub.unsubscribe();
+    };
+  };
   return {
+    start,
     query$,
     queryStore,
     ...invalidationClient,
     ...cacheClient,
-    ...refetchClient,
-    destroy: () => {
-      queryStore.destroy();
-      queryListenerSub.unsubscribe();
-    }
+    ...refetchClient
   };
 };
 exports.PersistSignals = PersistSignals;
@@ -1663,7 +1682,7 @@ exports.useObserve = useObserve;
 exports.useObserveCallback = useObserveCallback;
 exports.usePersistSignalsContext = usePersistSignalsContext;
 exports.useQuery = useQuery;
-exports.useReactJrxProvider = useReactJrxProvider;
+exports.useQueryClient = useQueryClient;
 exports.useScopeSignals = useScopeSignals;
 exports.useSetSignal = useSetSignal;
 exports.useSignal = useSignal;

package/dist/index.d.ts

@@ -20,4 +20,4 @@ export * from "./lib/queries/react/useAsyncQuery";
 export * from "./lib/queries/react/useQuery";
 export * from "./lib/queries/react/useSubscribeEffect";
 export * from "./lib/queries/client/createClient";
-export { Provider as ReactjrxQueryProvider, useReactJrxProvider } from "./lib/queries/react/Provider";
+export { Provider as ReactjrxQueryProvider, useQueryClient } from "./lib/queries/react/Provider";

package/dist/index.js

@@ -1,6 +1,6 @@
 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 { jsx, jsxs } from "react/jsx-runtime";
 import { retryWhen, concatMap, tap as tap$1 } from "rxjs/operators";
 const useLiveRef = (value) => {
   const ref = useRef(value);
@@ -240,7 +240,6 @@ const PersistSignals = memo(
       ).pipe(map(() => true));
       return stream.pipe(
         tap(() => {
-          console.log("hydration complete");
           if (onReadyRef.current != null)
             onReadyRef.current();
         }),
@@ -596,27 +595,35 @@ function useAsyncQuery(query, mapOperatorOrOptions, options = {}) {
 const Context = createContext({
   client: null
 });
+const ClientEffect = ({
+  client
+}) => {
+  useEffect(() => {
+    const destroy = client.start();
+    return () => {
+      destroy();
+    };
+  }, [client]);
+  return null;
+};
 const Provider = memo(
   ({
     children,
     client
   }) => {
     const value = useMemo(() => ({ client }), [client]);
-    useEffect(
-      () => () => {
-        client.destroy();
-      },
-      [client]
-    );
-    return /* @__PURE__ */ jsx(Context.Provider, { value, children });
+    return /* @__PURE__ */ jsxs(Context.Provider, { value, children: [
+      /* @__PURE__ */ jsx(ClientEffect, { client: value.client }),
+      children
+    ] });
   }
 );
-const useReactJrxProvider = () => {
+const useQueryClient = () => {
   const context = useContext(Context);
   if (context === null) {
     throw new Error("You forgot to register the provider");
   }
-  return { ...context };
+  return context.client;
 };
 const arrayEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
 function isDefined(arg) {
@@ -676,7 +683,7 @@ function useQuery({
   ...options
 }) {
   const internalRefresh$ = useSubject();
-  const { client } = useReactJrxProvider();
+  const client = useQueryClient();
   const params$ = useQueryParams({ queryFn, queryKey, ...options });
   const result = useObserve(
     () => {
@@ -854,7 +861,7 @@ function createLogger(env) {
   };
   return _logger;
 }
-const Logger = createLogger("development");
+const Logger = createLogger("production");
 const logger$3 = Logger.namespace("store");
 const createDebugger = (store$) => {
   return store$.pipe(
@@ -935,7 +942,12 @@ const createQueryStore = () => {
       }));
     };
   };
-  const debugger$ = createDebugger(store$);
+  const start = () => {
+    const debugger$ = createDebugger(store$);
+    return () => {
+      debugger$.unsubscribe();
+    };
+  };
   return {
     set: setValue,
     get: getValue,
@@ -955,11 +967,7 @@ const createQueryStore = () => {
       queryTriggerSubject.next(event);
     },
     size: () => store.size,
-    destroy: () => {
-      debugger$.unsubscribe();
-      queryEventSubject.complete();
-      queryTriggerSubject.complete();
-    }
+    start
   };
 };
 const createQueryTrigger = ({
@@ -1051,17 +1059,17 @@ const registerResultInCache = ({
   serializedKey,
   options
 }) => (stream) => stream.pipe(
-  tap((result) => {
-    queryStore.update(serializedKey, {
-      ...options.cacheTime !== 0 && {
-        cache_fnResult: { result }
-      }
-    });
+  tap(({ data }) => {
+    if (data == null ? void 0 : data.result) {
+      const result = data == null ? void 0 : data.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,
@@ -1095,12 +1103,8 @@ const createQueryFetch = ({
         lastFetchedAt: (/* @__PURE__ */ new Date()).getTime()
       });
     }),
-    registerResultInCache({ serializedKey, options, queryStore }),
-    mapWithComplete(({ isComplete }) => (result) => ({
+    map((result) => ({
       status: "success",
-      ...isComplete && {
-        fetchStatus: "idle"
-      },
       data: { result },
       error: void 0
     })),
@@ -1119,7 +1123,8 @@ const createQueryFetch = ({
         error
       });
     }),
-    notifyQueryResult(options$)
+    notifyQueryResult(options$),
+    registerResultInCache({ serializedKey, options, queryStore })
   );
   const newCache$ = queryStore.queryEvent$.pipe(
     filter(
@@ -1187,6 +1192,12 @@ const compareKeys = (keyA, keyB, { exact = false } = {}) => {
   return keyA.reduce((acc, value, index) => {
     if (!acc)
       return false;
+    if (value === void 0) {
+      const hasNextItemInLineNotUndefined = keyA.slice(index, keyA.length - 1).some((item) => item !== void 0);
+      if (!hasNextItemInLineNotUndefined) {
+        return true;
+      }
+    }
     return serializeObject(value) === serializeObject(keyB[index]);
   }, true);
 };
@@ -1230,9 +1241,7 @@ const createInvalidationClient = ({
     });
   };
   return {
-    invalidateQueries,
-    destroy: () => {
-    }
+    invalidateQueries
   };
 };
 const logger$1 = Logger.namespace("refetch");
@@ -1287,9 +1296,7 @@ const createRefetchClient = ({
   };
   return {
     pipeQueryResult,
-    pipeQueryTrigger,
-    destroy: () => {
-    }
+    pipeQueryTrigger
   };
 };
 const difference = (a, b) => a.filter((element) => !b.includes(element));
@@ -1307,11 +1314,9 @@ const createQueryListener = (store, onQuery) => store.store$.pipe(
         );
         return merge(NEVER, of(key)).pipe(
           tap(() => {
-            console.log("QUERY", key, "in");
           }),
           onQuery,
           finalize(() => {
-            console.log("QUERY", key, "complete");
           }),
           takeUntil(deleted$)
         );
@@ -1457,13 +1462,15 @@ const getInitialQueryEntity = ({ key }) => ({
   queryKey: key,
   runners: []
 });
-const updateStoreWithQuery = ({
+const updateStoreWithNewQuery = ({
   queryStore,
   serializedKey,
   runner$,
+  options$,
   key
 }) => (stream) => stream.pipe(
-  map((value) => {
+  withLatestFrom(options$),
+  map(([value, options]) => {
     if (key.length === 0)
       return [value, () => {
       }];
@@ -1472,7 +1479,7 @@ const updateStoreWithQuery = ({
     } else {
       queryStore.update(serializedKey, {
         queryKey: key,
-        ...value.options.markStale && {
+        ...options.markStale && {
           isStale: true
         }
       });
@@ -1539,7 +1546,7 @@ const createClient = () => {
     const serializedKey = serializeKey(key);
     const internalRefetch$ = new Subject();
     const fn$ = maybeFn$ ?? (maybeFn ? of(maybeFn) : NEVER);
-    console.log("query$()", serializedKey);
+    Logger.log("query$()", serializedKey);
     const runner$ = options$.pipe(map((options) => ({ options })));
     let deleteRunner = () => {
     };
@@ -1553,18 +1560,26 @@ const createClient = () => {
       key: serializedKey,
       queryStore
     }).pipe(refetchClient.pipeQueryTrigger({ options$, key: serializedKey }));
-    const result$ = merge(initialTrigger$, trigger$).pipe(
+    const result$ = merge(
+      initialTrigger$.pipe(
+        updateStoreWithNewQuery({
+          key,
+          queryStore,
+          runner$,
+          serializedKey,
+          options$
+        }),
+        map(([value, deleteRunnerFn]) => {
+          deleteRunner = deleteRunnerFn;
+          return value;
+        })
+      ),
+      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", {
+      map((value) => {
+        Logger.log("reactjrx", serializedKey, "query trigger", {
           trigger: value.trigger,
           options: value.options
         });
@@ -1602,9 +1617,6 @@ const createClient = () => {
         return !shouldStop;
       }, true),
       map(([result]) => result),
-      tap((result) => {
-        console.log("result", result);
-      }),
       finalize(() => {
         deleteRunner();
       })
@@ -1613,7 +1625,7 @@ const createClient = () => {
       result$
     };
   };
-  const queryListenerSub = createQueryListener(
+  const queryListener$ = createQueryListener(
     queryStore,
     (stream) => stream.pipe(
       switchMap((key) => {
@@ -1631,17 +1643,24 @@ const createClient = () => {
         );
       })
     )
-  ).subscribe();
+  );
+  const start = () => {
+    const queryListenerSub = queryListener$.subscribe();
+    const started = [queryStore.start()];
+    return () => {
+      started.forEach((destroy) => {
+        destroy();
+      });
+      queryListenerSub.unsubscribe();
+    };
+  };
   return {
+    start,
     query$,
     queryStore,
     ...invalidationClient,
     ...cacheClient,
-    ...refetchClient,
-    destroy: () => {
-      queryStore.destroy();
-      queryListenerSub.unsubscribe();
-    }
+    ...refetchClient
   };
 };
 export {
@@ -1662,7 +1681,7 @@ export {
   useObserveCallback,
   usePersistSignalsContext,
   useQuery,
-  useReactJrxProvider,
+  useQueryClient,
   useScopeSignals,
   useSetSignal,
   useSignal,

package/dist/lib/queries/client/cache/registerResultInCache.d.ts

@@ -1,8 +1,8 @@
 import { type MonoTypeOperatorFunction } from "rxjs";
 import { type QueryStore } from "../store/createQueryStore";
-import { type QueryOptions } from "../types";
+import { type QueryResult, type QueryOptions } from "../types";
 export declare const registerResultInCache: <T>({ queryStore, serializedKey, options }: {
     queryStore: QueryStore;
     serializedKey: string;
     options: QueryOptions<T>;
-}) => MonoTypeOperatorFunction<T>;
+}) => MonoTypeOperatorFunction<Partial<QueryResult<T>>>;

package/dist/lib/queries/client/createClient.d.ts

@@ -2,7 +2,6 @@ import { type Observable, BehaviorSubject } from "rxjs";
 import { type QueryOptions, type QueryFn, type QueryTrigger, type QueryResult } from "./types";
 import { type QueryKey } from "./keys/types";
 export declare const createClient: () => {
-    destroy: () => void;
     pipeQueryResult: <R extends Partial<QueryResult<T>>, T>({ options$ }: {
         key: string;
         queryStore: {
@@ -22,7 +21,7 @@ export declare const createClient: () => {
             queryTrigger$: Observable<import("./store/createQueryStore").QueryTriggerEvent>;
             dispatchQueryTrigger: (event: import("./store/createQueryStore").QueryTriggerEvent) => void;
             size: () => number;
-            destroy: () => void;
+            start: () => () => void;
         };
         options$: Observable<QueryOptions<T>>;
         refetch$: Observable<QueryTrigger>;
@@ -40,6 +39,7 @@ export declare const createClient: () => {
         exact?: boolean | undefined;
         predicate?: ((storeObject: import("./store/createQueryStore").StoreObject<unknown>) => boolean) | undefined;
     }) => void;
+    start: () => () => void;
     query$: <T_5>({ key, fn$: maybeFn$, fn: maybeFn, refetch$, options$ }: {
         key: QueryKey;
         fn?: QueryFn<T_5> | undefined;
@@ -68,6 +68,6 @@ export declare const createClient: () => {
         queryTrigger$: Observable<import("./store/createQueryStore").QueryTriggerEvent>;
         dispatchQueryTrigger: (event: import("./store/createQueryStore").QueryTriggerEvent) => void;
         size: () => number;
-        destroy: () => void;
+        start: () => () => void;
     };
 };

package/dist/lib/queries/client/invalidation/invalidationClient.d.ts

@@ -8,5 +8,4 @@ export declare const createInvalidationClient: ({ queryStore }: {
         exact?: boolean | undefined;
         predicate?: ((storeObject: import("../store/createQueryStore").StoreObject<unknown>) => boolean) | undefined;
     }) => void;
-    destroy: () => void;
 };

package/dist/lib/queries/client/refetch/client.d.ts

@@ -14,5 +14,4 @@ export declare const createRefetchClient: ({ queryStore }: {
         key: string;
         options$: Observable<QueryOptions<T_1>>;
     }) => MonoTypeOperatorFunction<QueryTrigger>;
-    destroy: () => void;
 };

package/dist/lib/queries/client/store/createQueryStore.d.ts

@@ -51,5 +51,5 @@ export declare const createQueryStore: () => {
     queryTrigger$: Observable<QueryTriggerEvent>;
     dispatchQueryTrigger: (event: QueryTriggerEvent) => void;
     size: () => number;
-    destroy: () => void;
+    start: () => () => void;
 };

package/dist/lib/queries/client/store/updateStoreWithNewQuery.d.ts

@@ -0,0 +1,7 @@
+import { type OperatorFunction, type Observable } from "rxjs";
+import { type QueryPipelineParams, type QueryOptions } from "../types";
+export declare const updateStoreWithNewQuery: <T, R>({ queryStore, serializedKey, runner$, options$, key }: QueryPipelineParams<R> & {
+    runner$: Observable<{
+        options: QueryOptions<R>;
+    }>;
+}) => OperatorFunction<T, [T, () => void]>;

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

@@ -1,5 +1,6 @@
 import { type Observable } from "rxjs";
 import { type QueryKey } from "./keys/types";
+import { type QueryStore } from "./store/createQueryStore";
 export interface QueryResult<T> {
     data: {
         result: T;
@@ -19,6 +20,12 @@ export interface QueryCommand<T> {
     options$?: Observable<QueryOptions<T>>;
 }
 export type QueryFn<T> = (() => Promise<T>) | (() => Observable<T>) | Observable<T>;
+export interface QueryPipelineParams<R> {
+    queryStore: QueryStore;
+    serializedKey: string;
+    key: QueryKey;
+    options$: Observable<QueryOptions<R>>;
+}
 export interface QueryTrigger {
     type: string;
     ignoreStale: boolean;

package/dist/lib/queries/react/Provider.d.ts

@@ -7,6 +7,73 @@ export declare const Provider: import("react").MemoExoticComponent<({ children,
     children: ReactNode;
     client: ReturnType<typeof createClient>;
 }) => import("react/jsx-runtime").JSX.Element>;
-export declare const useReactJrxProvider: () => {
-    client: ReturnType<typeof createClient>;
+export declare const useQueryClient: () => {
+    pipeQueryResult: <R extends Partial<import("../client/types").QueryResult<T>>, T>({ options$ }: {
+        key: string;
+        queryStore: {
+            set: (key: string, value: import("../client/store/createQueryStore").StoreObject<unknown>) => void;
+            get: <T_1>(serializedKey: string) => import("../client/store/createQueryStore").StoreObject<T_1> | undefined;
+            get$: (key: string) => import("rxjs").Observable<import("../client/store/createQueryStore").StoreObject<unknown>>;
+            delete: (key: string) => void;
+            update: <T_2>(key: string, value: Partial<import("../client/store/createQueryStore").StoreObject<T_2>> | ((value: import("../client/store/createQueryStore").StoreObject<T_2>) => import("../client/store/createQueryStore").StoreObject<T_2>)) => void;
+            keys: () => IterableIterator<string>;
+            updateMany: (value: Partial<import("../client/store/createQueryStore").StoreObject<unknown>>, predicate?: (storeObject: import("../client/store/createQueryStore").StoreObject<unknown>) => boolean) => void;
+            addRunner: <T_3>(key: string, stream: import("rxjs").Observable<{
+                options: import("../client/types").QueryOptions<T_3>;
+            }>) => () => void;
+            store$: import("rxjs").BehaviorSubject<Map<string, import("rxjs").BehaviorSubject<import("../client/store/createQueryStore").StoreObject<unknown>>>>;
+            queryEvent$: import("rxjs").Observable<import("../client/store/createQueryStore").QueryEvent>;
+            dispatchQueryEvent: (event: import("../client/store/createQueryStore").QueryEvent) => void;
+            queryTrigger$: import("rxjs").Observable<import("../client/store/createQueryStore").QueryTriggerEvent>;
+            dispatchQueryTrigger: (event: import("../client/store/createQueryStore").QueryTriggerEvent) => void;
+            size: () => number;
+            start: () => () => void;
+        };
+        options$: import("rxjs").Observable<import("../client/types").QueryOptions<T>>;
+        refetch$: import("rxjs").Observable<import("../client/types").QueryTrigger>;
+    }) => import("rxjs").MonoTypeOperatorFunction<R>;
+    pipeQueryTrigger: <T_4>({ key }: {
+        key: string;
+        options$: import("rxjs").Observable<import("../client/types").QueryOptions<T_4>>;
+    }) => import("rxjs").MonoTypeOperatorFunction<import("../client/types").QueryTrigger>;
+    setQueryData: ({ queryKey, updater }: {
+        queryKey: import("../client/keys/types").QueryKey;
+        updater: unknown;
+    }) => void;
+    invalidateQueries: ({ queryKey, exact, predicate }?: {
+        queryKey?: import("../client/keys/types").QueryKey | undefined;
+        exact?: boolean | undefined;
+        predicate?: ((storeObject: import("../client/store/createQueryStore").StoreObject<unknown>) => boolean) | undefined;
+    }) => void;
+    start: () => () => void;
+    query$: <T_5>({ key, fn$: maybeFn$, fn: maybeFn, refetch$, options$ }: {
+        key: import("../client/keys/types").QueryKey;
+        fn?: import("../client/types").QueryFn<T_5> | undefined;
+        fn$?: import("rxjs").Observable<import("../client/types").QueryFn<T_5>> | undefined;
+        refetch$?: import("rxjs").Observable<{
+            ignoreStale: boolean;
+        }> | undefined;
+        options$?: import("rxjs").Observable<import("../client/types").QueryOptions<T_5>> | undefined;
+    }) => {
+        result$: import("rxjs").Observable<import("../client/types").QueryResult<T_5>>;
+    };
+    queryStore: {
+        set: (key: string, value: import("../client/store/createQueryStore").StoreObject<unknown>) => void;
+        get: <T_1>(serializedKey: string) => import("../client/store/createQueryStore").StoreObject<T_1> | undefined;
+        get$: (key: string) => import("rxjs").Observable<import("../client/store/createQueryStore").StoreObject<unknown>>;
+        delete: (key: string) => void;
+        update: <T_2>(key: string, value: Partial<import("../client/store/createQueryStore").StoreObject<T_2>> | ((value: import("../client/store/createQueryStore").StoreObject<T_2>) => import("../client/store/createQueryStore").StoreObject<T_2>)) => void;
+        keys: () => IterableIterator<string>;
+        updateMany: (value: Partial<import("../client/store/createQueryStore").StoreObject<unknown>>, predicate?: (storeObject: import("../client/store/createQueryStore").StoreObject<unknown>) => boolean) => void;
+        addRunner: <T_3>(key: string, stream: import("rxjs").Observable<{
+            options: import("../client/types").QueryOptions<T_3>;
+        }>) => () => void;
+        store$: import("rxjs").BehaviorSubject<Map<string, import("rxjs").BehaviorSubject<import("../client/store/createQueryStore").StoreObject<unknown>>>>;
+        queryEvent$: import("rxjs").Observable<import("../client/store/createQueryStore").QueryEvent>;
+        dispatchQueryEvent: (event: import("../client/store/createQueryStore").QueryEvent) => void;
+        queryTrigger$: import("rxjs").Observable<import("../client/store/createQueryStore").QueryTriggerEvent>;
+        dispatchQueryTrigger: (event: import("../client/store/createQueryStore").QueryTriggerEvent) => void;
+        size: () => number;
+        start: () => () => void;
+    };
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reactjrx",
   "private": false,
-  "version": "1.40.0",
+  "version": "1.41.0",
   "type": "module",
   "files": [
     "dist"
@@ -41,7 +41,7 @@
     "@types/react-dom": "^18.0.11",
     "@typescript-eslint/eslint-plugin": "^5.59.0",
     "@vitejs/plugin-react": "^4.0.0",
-    "eslint": "^8.38.0",
+    "eslint": "^8.47.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-config-standard-with-typescript": "^34.0.1",
     "eslint-plugin-import": "^2.27.5",

package/dist/lib/queries/client/fetch/mapWithComplete.d.ts

@@ -1,4 +0,0 @@
-import { type OperatorFunction } from "rxjs";
-export declare const mapWithComplete: <T, R>(mapFn: ({ isComplete }: {
-    isComplete: boolean;
-}) => (data: T) => R) => OperatorFunction<T, R>;

package/dist/lib/queries/client/store/updateStoreWithQuery.d.ts

@@ -1,14 +0,0 @@
-import { type OperatorFunction, type Observable } from "rxjs";
-import { type QueryStore } from "./createQueryStore";
-import { type QueryOptions } from "../types";
-import { type QueryKey } from "../keys/types";
-export declare const updateStoreWithQuery: <T extends {
-    options: QueryOptions<R>;
-}, R>({ queryStore, serializedKey, runner$, key }: {
-    queryStore: QueryStore;
-    serializedKey: string;
-    key: QueryKey;
-    runner$: Observable<{
-        options: QueryOptions<R>;
-    }>;
-}) => OperatorFunction<T, [T, () => void]>;