@emeryld/rrroutes-client 2.7.8 → 2.7.9

package/dist/index.mjs

@@ -740,16 +740,15 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
   emit({ type: "build", leaf: leafLabel });
   const infiniteOptions = rqOpts ?? {};
   const {
-    cursorParam,
-    getNextPageParam,
+    cursorQueryKey,
+    getNextPageCursor,
     initialPageParam,
     splitPageSize,
     splitPageSizeParam,
     ...passthroughOptions
   } = infiniteOptions;
-  const feedCursorParam = cursorParam ?? "pagination_cursor";
-  const feedNextPageParam = getNextPageParam ?? ((lastPage) => defaultGetNextCursor(lastPage));
-  const cursorFromPage = (page) => feedNextPageParam(page);
+  const feedCursorQueryKey = cursorQueryKey ?? "pagination_cursor";
+  const feedNextPageCursor = getNextPageCursor ?? ((lastPage) => defaultGetNextCursor(lastPage));
   const feedInitialPageParam = typeof initialPageParam === "undefined" ? void 0 : initialPageParam;
   const feedQueryOptions = passthroughOptions;
   const effectiveSplitPageSize = typeof splitPageSize === "number" && splitPageSize > 0 ? splitPageSize : void 0;
@@ -758,7 +757,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
     const a = extractArgs(tuple);
     const params = a?.params;
     const query = a?.query;
-    const qForKey = stripKey(query, feedCursorParam);
+    const qForKey = stripKey(query, feedCursorQueryKey);
     return buildCacheKey2({
       leaf,
       params,
@@ -921,18 +920,32 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
     const useEndpointOptions = expectsArgs ? useArgs[1] : useArgs[0];
     const hasCompleteArgs = !expectsArgs || areEndpointArgsComplete(leaf, args);
     const tuple = toArgsTuple(args);
-    const queryKeys = getQueryKeys(...tuple);
+    const params = args?.params;
+    const query = args?.query;
+    const buildOptions = feedQueryOptions ?? {};
+    const { onReceive: buildOnReceive2, ...buildInfiniteQueryOptions } = buildOptions;
+    const {
+      onReceive: useOnReceive,
+      cursorQueryKey: useCursorQueryKey,
+      getNextPageCursor: useGetNextPageCursor,
+      initialPageParam: useInitialPageParam,
+      ...runtimeInfiniteQueryOptions
+    } = useEndpointOptions ?? {};
+    const effectiveCursorParam = useCursorQueryKey ?? feedCursorQueryKey;
+    const effectiveNextPageCursor = useGetNextPageCursor ?? feedNextPageCursor;
+    const effectiveInitialPageParam = typeof useInitialPageParam === "undefined" ? feedInitialPageParam : useInitialPageParam;
+    const qForKey = stripKey(query, effectiveCursorParam);
+    const queryKeys = buildCacheKey2({
+      leaf,
+      params,
+      query: qForKey
+    });
     emit({
       type: "useEndpoint",
       leaf: leafLabel,
       variant: "infiniteGet",
       keys: queryKeys
     });
-    const params = args?.params;
-    const query = args?.query;
-    const buildOptions = feedQueryOptions ?? {};
-    const { onReceive: buildOnReceive2, ...buildInfiniteQueryOptions } = buildOptions;
-    const { onReceive: useOnReceive, ...runtimeInfiniteQueryOptions } = useEndpointOptions ?? {};
     const mergedInfiniteQueryOptions = {
       ...buildInfiniteQueryOptions,
       ...runtimeInfiniteQueryOptions
@@ -966,8 +979,8 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
         ...mergedInfiniteQueryOptions,
         enabled: guardedEnabled,
         placeholderData: mergedInfiniteQueryOptions.placeholderData ?? keepPreviousData3,
-        initialPageParam: feedInitialPageParam,
-        getNextPageParam: (lastPage) => cursorFromPage(lastPage),
+        initialPageParam: effectiveInitialPageParam,
+        getNextPageParam: (lastPage) => effectiveNextPageCursor(lastPage),
         queryKey: queryKeys,
         queryFn: ({ pageParam }) => {
           if (!hasCompleteArgs) {
@@ -976,7 +989,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
           if (!effectiveSplitPageSize) {
             const pageQuery = {
               ...normalizedQuery,
-              ...pageParam ? { [feedCursorParam]: pageParam } : {}
+              ...pageParam ? { [effectiveCursorParam]: pageParam } : {}
             };
             return fetchEndpoint(tuple, {
               queryOverride: pageQuery,
@@ -988,7 +1001,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
           if (!basePageSize || !Number.isFinite(basePageSize) || basePageSize <= effectiveSplitPageSize) {
             const pageQuery = {
               ...normalizedQuery,
-              ...pageParam ? { [feedCursorParam]: pageParam } : {}
+              ...pageParam ? { [effectiveCursorParam]: pageParam } : {}
             };
             return fetchEndpoint(tuple, {
               queryOverride: pageQuery,
@@ -1005,7 +1018,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
               const thisCallSize = Math.min(remaining, effectiveSplitPageSize);
               const splitQuery = {
                 ...normalizedQuery,
-                ...currentCursor ? { [feedCursorParam]: currentCursor } : {},
+                ...currentCursor ? { [effectiveCursorParam]: currentCursor } : {},
                 [effectiveSplitPageSizeParam]: thisCallSize
               };
               const page = await fetchEndpoint(tuple, {
@@ -1014,7 +1027,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
               });
               aggregated = aggregated ? mergePageOutputs(aggregated, page) : page;
               remaining -= thisCallSize;
-              const nextCursor = cursorFromPage(page);
+              const nextCursor = effectiveNextPageCursor(page);
               currentCursor = nextCursor;
               const k = queryKeys;
               queryClient.setQueryData(k, (prev) => {