@rpcbase/client 0.381.0 → 0.383.0

package/dist/{useQuery-n0OatV-X.js → useQuery-Ce_EmI2F.js}

@@ -1,14 +1,28 @@
-import { createContext, useContext, useId, useState, useRef, useEffect, useMemo } from "react";
+import { createContext, useContext, useId, useMemo, useState, useRef, useEffect } from "react";
 import { jsx } from "react/jsx-runtime";
 const STATIC_RPCBASE_RTS_HYDRATION_DATA_KEY = "__staticRpcbaseRtsHydrationData";
 const RtsSsrRuntimeContext = createContext(null);
 const hydrationDataStore = /* @__PURE__ */ new Map();
+const hydrationPageInfoStore = /* @__PURE__ */ new Map();
 const makeStoreKey = (modelName, queryKey) => `${modelName}.${queryKey}`;
 const normalizeStringOrNull = (value) => {
   if (typeof value !== "string") return null;
   const normalized = value.trim();
   return normalized ? normalized : null;
 };
+const normalizePageInfo$2 = (value) => {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+  const raw = value;
+  if (typeof raw.hasNextPage !== "boolean" || typeof raw.hasPrevPage !== "boolean") return void 0;
+  const nextCursor = typeof raw.nextCursor === "string" && raw.nextCursor ? raw.nextCursor : void 0;
+  const prevCursor = typeof raw.prevCursor === "string" && raw.prevCursor ? raw.prevCursor : void 0;
+  return {
+    hasNextPage: raw.hasNextPage,
+    hasPrevPage: raw.hasPrevPage,
+    ...nextCursor ? { nextCursor } : {},
+    ...prevCursor ? { prevCursor } : {}
+  };
+};
 const parseHydrationData = (value) => {
   if (!value || typeof value !== "object") return null;
   const raw = value;
@@ -22,10 +36,12 @@ const parseHydrationData = (value) => {
     const queryKey = normalizeStringOrNull(query.queryKey);
     if (!modelName || !queryKey) continue;
     if (!Array.isArray(query.data)) continue;
+    const pageInfo = normalizePageInfo$2(query.pageInfo);
     queries.push({
       modelName,
       queryKey,
-      data: query.data
+      data: query.data,
+      ...pageInfo ? { pageInfo } : {}
     });
   }
   return {
@@ -35,58 +51,34 @@ const parseHydrationData = (value) => {
     queries
   };
 };
-const hydrateRtsFromWindow = (identity) => {
+const hydrateRtsFromWindow = () => {
   if (typeof window === "undefined") return;
   const browserWindow = window;
   const raw = browserWindow[STATIC_RPCBASE_RTS_HYDRATION_DATA_KEY];
   delete browserWindow[STATIC_RPCBASE_RTS_HYDRATION_DATA_KEY];
   const parsed = parseHydrationData(raw);
   if (!parsed) return;
-  if (parsed.tenantId !== identity.tenantId || parsed.uid !== identity.uid) {
-    return;
-  }
   hydrationDataStore.clear();
+  hydrationPageInfoStore.clear();
   for (const query of parsed.queries) {
     hydrationDataStore.set(makeStoreKey(query.modelName, query.queryKey), query.data);
+    hydrationPageInfoStore.set(makeStoreKey(query.modelName, query.queryKey), query.pageInfo);
   }
 };
 const peekHydratedRtsQueryData = (modelName, queryKey) => {
   return hydrationDataStore.get(makeStoreKey(modelName, queryKey));
 };
+const peekHydratedRtsQueryPageInfo = (modelName, queryKey) => {
+  return hydrationPageInfoStore.get(makeStoreKey(modelName, queryKey));
+};
+const consumeHydratedRtsQueryData = (modelName, queryKey) => {
+  const key = makeStoreKey(modelName, queryKey);
+  hydrationDataStore.delete(key);
+  hydrationPageInfoStore.delete(key);
+};
 const clearHydratedRtsQueryData = () => {
   hydrationDataStore.clear();
-};
-const readRootLikeLoaderData = () => {
-  if (typeof window === "undefined") return null;
-  const hydration = window.__staticRouterHydrationData;
-  if (!hydration || typeof hydration !== "object") return null;
-  const loaderData = hydration.loaderData;
-  if (!loaderData || typeof loaderData !== "object") return null;
-  const entries = Object.entries(loaderData);
-  let fallback = null;
-  for (const [routeId, data] of entries) {
-    if (!data || typeof data !== "object" || Array.isArray(data)) continue;
-    const obj = data;
-    const hasTenantId = Object.prototype.hasOwnProperty.call(obj, "tenantId");
-    const hasUser = Object.prototype.hasOwnProperty.call(obj, "user");
-    if (!hasTenantId && !hasUser) continue;
-    if (routeId === "root") return obj;
-    if (!fallback) fallback = obj;
-  }
-  return fallback;
-};
-const resolveRtsHydrationIdentityFromStaticRouterData = () => {
-  const rootData = readRootLikeLoaderData();
-  if (!rootData) {
-    return { tenantId: null, uid: null };
-  }
-  const tenantId = normalizeStringOrNull(rootData.tenantId);
-  const user = rootData.user;
-  const userId = user && typeof user === "object" ? normalizeStringOrNull(user.id) : null;
-  return {
-    tenantId,
-    uid: userId
-  };
+  hydrationPageInfoStore.clear();
 };
 const RtsSsrRuntimeProvider = ({
   value,
@@ -426,7 +418,8 @@ const computeRtsQueryKey = (query, options) => {
   const sort = options.sort ? JSON.stringify(options.sort) : "";
   const limit = typeof options.limit === "number" ? String(options.limit) : "";
   const populate = options.populate ? JSON.stringify(options.populate) : "";
-  return `${key}${JSON.stringify(query)}${projection}${sort}${limit}${populate}`;
+  const pagination = options.pagination ? JSON.stringify(options.pagination) : "";
+  return `${key}${JSON.stringify(query)}${projection}${sort}${limit}${populate}${pagination}`;
 };
 const TENANT_ID_QUERY_PARAM = "rb-tenant-id";
 const RTS_CHANGES_ROUTE = "/api/rb/rts/changes";
@@ -520,15 +513,31 @@ const isDocWithId = (doc) => {
   if (!doc || typeof doc !== "object") return false;
   return typeof doc._id === "string";
 };
+const normalizePageInfo$1 = (value) => {
+  if (!value || typeof value !== "object") return void 0;
+  if (Array.isArray(value)) return void 0;
+  const raw = value;
+  if (typeof raw.hasNextPage !== "boolean" || typeof raw.hasPrevPage !== "boolean") return void 0;
+  const nextCursor = typeof raw.nextCursor === "string" && raw.nextCursor ? raw.nextCursor : void 0;
+  const prevCursor = typeof raw.prevCursor === "string" && raw.prevCursor ? raw.prevCursor : void 0;
+  return {
+    hasNextPage: raw.hasNextPage,
+    hasPrevPage: raw.hasPrevPage,
+    ...nextCursor ? { nextCursor } : {},
+    ...prevCursor ? { prevCursor } : {}
+  };
+};
 const handleQueryPayload = (payload) => {
   const { modelName, queryKey, data, error, txnId } = payload;
   const cbKey = `${modelName}.${queryKey}`;
   const callbacks = queryCallbacks.get(cbKey);
   if (!callbacks || !callbacks.size) return;
   const subscription = subscriptions.get(cbKey);
+  const pageInfo = normalizePageInfo$1(payload.pageInfo);
   const hasPopulate = Boolean(subscription?.options?.populate);
+  const hasPagination = Boolean(subscription?.options?.pagination || pageInfo);
   const isLocal = !!(txnId && localTxnBuf.includes(txnId));
-  const context = { source: "network", isLocal, txnId };
+  const context = { source: "network", isLocal, txnId, ...pageInfo ? { pageInfo } : {} };
   if (error) {
     for (const cb of callbacks) cb(error, void 0, context);
     return;
@@ -538,6 +547,7 @@ const handleQueryPayload = (payload) => {
   const docs = Array.isArray(data) ? data.filter(isDocWithId) : [];
   if (!docs.length) return;
   if (hasPopulate) return;
+  if (hasPagination) return;
   void updateDocs(modelName, docs, currentUid).catch(() => {
   });
 };
@@ -780,11 +790,14 @@ const registerQuery = (modelName, query, optionsOrCallback, callbackMaybe, behav
   const queryKey = computeRtsQueryKey(query, options);
   const cbKey = `${modelName}.${queryKey}`;
   const runInitialNetworkQuery = behavior?.runInitialNetworkQuery !== false;
+  const runInitialLocalQuery = behavior?.runInitialLocalQuery !== false;
+  const hasPopulate = Boolean(options.populate);
+  const hasPagination = Boolean(options.pagination);
   const set = queryCallbacks.get(cbKey) ?? /* @__PURE__ */ new Set();
   set.add(callback);
   queryCallbacks.set(cbKey, set);
   subscriptions.set(cbKey, { modelName, query, options, queryKey, runInitialNetworkQuery });
-  if (currentUid) {
+  if (currentUid && runInitialLocalQuery && !hasPopulate && !hasPagination) {
     void runQuery({
       modelName,
       query,
@@ -810,6 +823,57 @@ const registerQuery = (modelName, query, optionsOrCallback, callbackMaybe, behav
     }
   };
 };
+const makeRunQueryKey = () => `run-query.${Date.now().toString(36)}.${Math.random().toString(36).slice(2, 10)}`;
+const runNetworkQuery = async ({
+  modelName,
+  query,
+  options = {},
+  timeoutMs = 1e4
+}) => {
+  if (typeof modelName !== "string" || modelName.trim().length === 0) {
+    throw new Error("runNetworkQuery: modelName must be a non-empty string");
+  }
+  if (!socket || socket.readyState !== WebSocket.OPEN) {
+    throw new Error("runNetworkQuery: RTS socket is not connected");
+  }
+  const resolvedOptions = options.key ? options : { ...options, key: makeRunQueryKey() };
+  const queryKey = computeRtsQueryKey(query, resolvedOptions);
+  const cbKey = `${modelName}.${queryKey}`;
+  return await new Promise((resolve, reject) => {
+    let settled = false;
+    let timeoutId = null;
+    const cleanup = () => {
+      const callbacks2 = queryCallbacks.get(cbKey);
+      callbacks2?.delete(callback);
+      if (callbacks2 && callbacks2.size === 0) queryCallbacks.delete(cbKey);
+      if (timeoutId !== null && typeof window !== "undefined") {
+        window.clearTimeout(timeoutId);
+      }
+    };
+    const settle = (next) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      next();
+    };
+    const callback = (error, data, context) => {
+      if (error) {
+        settle(() => reject(error));
+        return;
+      }
+      settle(() => resolve({ data, context }));
+    };
+    const callbacks = queryCallbacks.get(cbKey) ?? /* @__PURE__ */ new Set();
+    callbacks.add(callback);
+    queryCallbacks.set(cbKey, callbacks);
+    if (typeof timeoutMs === "number" && Number.isFinite(timeoutMs) && timeoutMs > 0) {
+      timeoutId = window.setTimeout(() => {
+        settle(() => reject(new Error("runNetworkQuery: request timed out")));
+      }, timeoutMs);
+    }
+    sendToServer({ type: "run-query", modelName, queryKey, query, options: resolvedOptions });
+  });
+};
 const sendMessage = (event, payload) => {
   sendToServer({ type: "event", event, payload });
 };
@@ -823,6 +887,43 @@ const onMessage = (event, callback) => {
     if (callbacks && callbacks.size === 0) messageCallbacks.delete(event);
   };
 };
+const normalizePageInfo = (value) => {
+  if (!value || typeof value !== "object") return void 0;
+  if (Array.isArray(value)) return void 0;
+  const raw = value;
+  if (typeof raw.hasNextPage !== "boolean" || typeof raw.hasPrevPage !== "boolean") return void 0;
+  const nextCursor = typeof raw.nextCursor === "string" && raw.nextCursor ? raw.nextCursor : void 0;
+  const prevCursor = typeof raw.prevCursor === "string" && raw.prevCursor ? raw.prevCursor : void 0;
+  return {
+    hasNextPage: raw.hasNextPage,
+    hasPrevPage: raw.hasPrevPage,
+    ...nextCursor ? { nextCursor } : {},
+    ...prevCursor ? { prevCursor } : {}
+  };
+};
+const getDocId = (doc) => {
+  if (!doc || typeof doc !== "object") return "";
+  const id = doc._id;
+  return typeof id === "string" ? id.trim() : "";
+};
+const dedupeById = (docs) => {
+  const seen = /* @__PURE__ */ new Set();
+  const merged = [];
+  for (const doc of docs) {
+    const id = getDocId(doc);
+    if (id && seen.has(id)) continue;
+    if (id) seen.add(id);
+    merged.push(doc);
+  }
+  return merged;
+};
+const flattenLoadedPages = (previousPages, headPage, nextPages) => {
+  const merged = [];
+  for (const page of previousPages) merged.push(...page.nodes);
+  if (headPage) merged.push(...headPage.nodes);
+  for (const page of nextPages) merged.push(...page.nodes);
+  return dedupeById(merged);
+};
 const useQuery = (modelName, query = {}, options = {}) => {
   if (typeof modelName !== "string" || modelName.trim().length === 0) {
     throw new Error("useQuery: modelName must be a non-empty string");
@@ -837,12 +938,16 @@ const useQuery = (modelName, query = {}, options = {}) => {
   const sortJson = options.sort ? JSON.stringify(options.sort) : "";
   const limitStr = typeof options.limit === "number" ? String(options.limit) : "";
   const populateJson = options.populate ? JSON.stringify(options.populate) : "";
+  const paginationJson = options.pagination ? JSON.stringify(options.pagination) : "";
+  const hasPopulate = Boolean(options.populate);
+  const isPaginated = Boolean(options.pagination);
   const queryKey = computeRtsQueryKey(query, {
     key,
     projection: options.projection,
     sort: options.sort,
     limit: options.limit,
-    populate: options.populate
+    populate: options.populate,
+    pagination: options.pagination
   });
   const ssrRuntime = useRtsSsrRuntime();
   if (enabled && ssrEnabled && ssrRuntime) {
@@ -854,14 +959,23 @@ const useQuery = (modelName, query = {}, options = {}) => {
         projection: options.projection,
         sort: options.sort,
         limit: options.limit,
-        populate: options.populate
+        populate: options.populate,
+        pagination: options.pagination
       },
       queryKey
     });
   }
-  const seedDataRaw = enabled && ssrEnabled ? ssrRuntime ? ssrRuntime.getQueryData(modelName, queryKey) : peekHydratedRtsQueryData(modelName, queryKey) : void 0;
+  const seedDataRaw = useMemo(
+    () => enabled && ssrEnabled ? ssrRuntime ? ssrRuntime.getQueryData(modelName, queryKey) : peekHydratedRtsQueryData(modelName, queryKey) : void 0,
+    [enabled, ssrEnabled, ssrRuntime, modelName, queryKey]
+  );
+  const seedPageInfoRaw = useMemo(
+    () => enabled && ssrEnabled ? ssrRuntime ? ssrRuntime.getQueryPageInfo(modelName, queryKey) : peekHydratedRtsQueryPageInfo(modelName, queryKey) : void 0,
+    [enabled, ssrEnabled, ssrRuntime, modelName, queryKey]
+  );
   const hasSeedData = Array.isArray(seedDataRaw);
   const seedData = hasSeedData ? seedDataRaw : void 0;
+  const seedPageInfo = normalizePageInfo(seedPageInfoRaw);
   const seedJson = (() => {
     if (!hasSeedData) return "";
     try {
@@ -870,35 +984,74 @@ const useQuery = (modelName, query = {}, options = {}) => {
       return "";
     }
   })();
-  const [data, setData] = useState(() => seedData);
+  const [data, setData] = useState(() => isPaginated ? void 0 : seedData);
+  const [headPage, setHeadPage] = useState(() => isPaginated && seedData ? { nodes: seedData, ...seedPageInfo ? { pageInfo: seedPageInfo } : {} } : null);
+  const [previousPages, setPreviousPages] = useState([]);
+  const [nextPages, setNextPages] = useState([]);
   const [source, setSource] = useState(() => hasSeedData ? "cache" : void 0);
   const [error, setError] = useState(void 0);
   const [loading, setLoading] = useState(enabled && !hasSeedData);
+  const [pagingDirection, setPagingDirection] = useState(null);
   const hasFirstReply = useRef(false);
   const hasNetworkReply = useRef(false);
   const lastDataJsonRef = useRef("");
+  const previousPagesRef = useRef([]);
+  const nextPagesRef = useRef([]);
+  const headPageRef = useRef(null);
+  const pagingDirectionRef = useRef(null);
+  useEffect(() => {
+    previousPagesRef.current = previousPages;
+  }, [previousPages]);
+  useEffect(() => {
+    nextPagesRef.current = nextPages;
+  }, [nextPages]);
   useEffect(() => {
+    headPageRef.current = headPage;
+  }, [headPage]);
+  useEffect(() => {
+    pagingDirectionRef.current = pagingDirection;
+  }, [pagingDirection]);
+  useEffect(() => {
+    if (!ssrRuntime && enabled && ssrEnabled && hasSeedData) {
+      consumeHydratedRtsQueryData(modelName, queryKey);
+    }
     hasFirstReply.current = hasSeedData;
     hasNetworkReply.current = false;
     lastDataJsonRef.current = seedJson;
     setError(void 0);
+    setPreviousPages([]);
+    setNextPages([]);
     if (!enabled) {
       setLoading(false);
       setData(void 0);
+      setHeadPage(null);
       setSource(void 0);
       return;
     }
     if (hasSeedData) {
+      const nextSeedData = seedData;
       setLoading(false);
-      setData(seedData);
       setSource("cache");
+      if (isPaginated) {
+        setHeadPage({
+          nodes: nextSeedData,
+          ...seedPageInfo ? { pageInfo: seedPageInfo } : {}
+        });
+        setData(void 0);
+      } else {
+        setData(nextSeedData);
+        setHeadPage(null);
+      }
       return;
     }
+    setData(void 0);
+    setHeadPage(null);
     setLoading(true);
-  }, [enabled, modelName, queryKey, hasSeedData, seedData, seedJson]);
+  }, [enabled, ssrEnabled, ssrRuntime, modelName, queryKey, hasSeedData, seedData, seedJson, isPaginated, seedPageInfo]);
   useEffect(() => {
     if (!enabled) return;
     const runInitialNetworkQuery = refreshOnMount || !hasSeedData;
+    const runInitialLocalQuery = !hasSeedData && !hasPopulate && !isPaginated;
     const unsubscribe = registerQuery(
       modelName,
       query,
@@ -907,7 +1060,8 @@ const useQuery = (modelName, query = {}, options = {}) => {
         projection: options.projection,
         sort: options.sort,
         limit: options.limit,
-        populate: options.populate
+        populate: options.populate,
+        pagination: options.pagination
       },
       (err, result, context) => {
         if (context.source === "cache" && hasNetworkReply.current) return;
@@ -924,9 +1078,11 @@ const useQuery = (modelName, query = {}, options = {}) => {
           return;
         }
         hasFirstReply.current = true;
+        const networkPageInfo = context.source === "network" ? context.pageInfo : void 0;
+        const payloadForHash = isPaginated ? { result, pageInfo: networkPageInfo } : result;
         let nextJson = "";
         try {
-          nextJson = JSON.stringify(result);
+          nextJson = JSON.stringify(payloadForHash);
         } catch {
           nextJson = "";
         }
@@ -936,24 +1092,174 @@ const useQuery = (modelName, query = {}, options = {}) => {
         }
         lastDataJsonRef.current = nextJson;
         setSource(context.source);
+        setError(void 0);
+        if (isPaginated) {
+          setHeadPage({
+            nodes: result,
+            ...networkPageInfo ? { pageInfo: networkPageInfo } : {}
+          });
+          return;
+        }
         setData(result);
       },
       {
-        runInitialNetworkQuery
+        runInitialNetworkQuery,
+        runInitialLocalQuery
       }
     );
     return () => {
       unsubscribe?.();
     };
-  }, [enabled, modelName, queryKey, queryJson, projectionJson, sortJson, limitStr, populateJson, hasSeedData, refreshOnMount]);
+  }, [
+    enabled,
+    modelName,
+    queryKey,
+    queryJson,
+    projectionJson,
+    sortJson,
+    limitStr,
+    populateJson,
+    paginationJson,
+    hasSeedData,
+    refreshOnMount,
+    isPaginated
+  ]);
+  const effectivePageInfo = useMemo(() => {
+    if (!isPaginated) return void 0;
+    const firstPageInfo = previousPages.length > 0 ? previousPages[0]?.pageInfo : headPage?.pageInfo;
+    const lastPageInfo = nextPages.length > 0 ? nextPages[nextPages.length - 1]?.pageInfo : headPage?.pageInfo;
+    if (!firstPageInfo && !lastPageInfo) return void 0;
+    const hasPrevPage = Boolean(firstPageInfo?.hasPrevPage);
+    const hasNextPage = Boolean(lastPageInfo?.hasNextPage);
+    const prevCursor = firstPageInfo?.prevCursor;
+    const nextCursor = lastPageInfo?.nextCursor;
+    return {
+      hasPrevPage,
+      hasNextPage,
+      ...prevCursor ? { prevCursor } : {},
+      ...nextCursor ? { nextCursor } : {}
+    };
+  }, [headPage, isPaginated, nextPages, previousPages]);
+  const mergedPaginatedData = useMemo(() => {
+    if (!isPaginated) return void 0;
+    if (!headPage && previousPages.length === 0 && nextPages.length === 0) return void 0;
+    return flattenLoadedPages(previousPages, headPage, nextPages);
+  }, [headPage, isPaginated, nextPages, previousPages]);
+  const fetchNext = async () => {
+    if (!enabled || !isPaginated || !options.pagination) return false;
+    if (pagingDirectionRef.current) return false;
+    const currentHead = headPageRef.current;
+    const currentNextPages = nextPagesRef.current;
+    const cursor = currentNextPages.length > 0 ? currentNextPages[currentNextPages.length - 1]?.pageInfo?.nextCursor : currentHead?.pageInfo?.nextCursor;
+    const hasNextPage = currentNextPages.length > 0 ? Boolean(currentNextPages[currentNextPages.length - 1]?.pageInfo?.hasNextPage) : Boolean(currentHead?.pageInfo?.hasNextPage);
+    if (!cursor || !hasNextPage) return false;
+    setPagingDirection("next");
+    setLoading(true);
+    setError(void 0);
+    try {
+      const response = await runNetworkQuery({
+        modelName,
+        query,
+        options: {
+          key,
+          projection: options.projection,
+          sort: options.sort,
+          limit: options.limit,
+          populate: options.populate,
+          pagination: {
+            ...options.pagination,
+            direction: "next",
+            cursor
+          }
+        }
+      });
+      if (!Array.isArray(response.data)) return false;
+      const page = {
+        nodes: response.data,
+        ...response.context.source === "network" && response.context.pageInfo ? { pageInfo: response.context.pageInfo } : {}
+      };
+      setSource("network");
+      setNextPages((current) => [...current, page]);
+      return true;
+    } catch (err) {
+      setError(err);
+      return false;
+    } finally {
+      setPagingDirection(null);
+      setLoading(false);
+    }
+  };
+  const fetchPrevious = async () => {
+    if (!enabled || !isPaginated || !options.pagination) return false;
+    if (pagingDirectionRef.current) return false;
+    const currentHead = headPageRef.current;
+    const currentPreviousPages = previousPagesRef.current;
+    const cursor = currentPreviousPages.length > 0 ? currentPreviousPages[0]?.pageInfo?.prevCursor : currentHead?.pageInfo?.prevCursor;
+    const hasPrevPage = currentPreviousPages.length > 0 ? Boolean(currentPreviousPages[0]?.pageInfo?.hasPrevPage) : Boolean(currentHead?.pageInfo?.hasPrevPage);
+    if (!cursor || !hasPrevPage) return false;
+    setPagingDirection("prev");
+    setLoading(true);
+    setError(void 0);
+    try {
+      const response = await runNetworkQuery({
+        modelName,
+        query,
+        options: {
+          key,
+          projection: options.projection,
+          sort: options.sort,
+          limit: options.limit,
+          populate: options.populate,
+          pagination: {
+            ...options.pagination,
+            direction: "prev",
+            cursor
+          }
+        }
+      });
+      if (!Array.isArray(response.data)) return false;
+      const page = {
+        nodes: response.data,
+        ...response.context.source === "network" && response.context.pageInfo ? { pageInfo: response.context.pageInfo } : {}
+      };
+      setSource("network");
+      setPreviousPages((current) => [page, ...current]);
+      return true;
+    } catch (err) {
+      setError(err);
+      return false;
+    } finally {
+      setPagingDirection(null);
+      setLoading(false);
+    }
+  };
+  const resetPagination = () => {
+    if (!isPaginated) return;
+    setPreviousPages([]);
+    setNextPages([]);
+  };
   return useMemo(
     () => ({
-      data,
+      data: isPaginated ? mergedPaginatedData : data,
+      pageInfo: effectivePageInfo,
       source,
       error,
-      loading
+      loading,
+      fetchNext,
+      fetchPrevious,
+      resetPagination
     }),
-    [data, source, error, loading]
+    [
+      data,
+      effectivePageInfo,
+      error,
+      fetchNext,
+      fetchPrevious,
+      isPaginated,
+      loading,
+      mergedPaginatedData,
+      source
+    ]
   );
 };
 export {
@@ -970,15 +1276,16 @@ export {
   disconnect as i,
   reconnect as j,
   registerQuery as k,
-  syncRtsChanges as l,
-  hydrateRtsFromWindow as m,
-  clearHydratedRtsQueryData as n,
+  runNetworkQuery as l,
+  syncRtsChanges as m,
+  hydrateRtsFromWindow as n,
   onMessage as o,
-  peekHydratedRtsQueryData as p,
-  resolveRtsHydrationIdentityFromStaticRouterData as q,
+  clearHydratedRtsQueryData as p,
+  peekHydratedRtsQueryData as q,
   resetRtsPouchStore as r,
   sendMessage as s,
-  useQuery as t,
-  updateDocs as u
+  peekHydratedRtsQueryPageInfo as t,
+  updateDocs as u,
+  useQuery as v
 };
-//# sourceMappingURL=useQuery-n0OatV-X.js.map
+//# sourceMappingURL=useQuery-Ce_EmI2F.js.map