@emeryld/rrroutes-client 2.3.10 → 2.3.12

package/dist/index.mjs

@@ -190,8 +190,6 @@ function createRouteClient(opts) {
   const queryClient = opts.queryClient;
   const fetcher = opts.fetcher ?? defaultFetcher;
   const baseUrl = opts.baseUrl;
-  const cursorParam = opts.cursorParam ?? "pagination_cursor";
-  const getNextCursor = opts.getNextCursor ?? defaultGetNextCursor;
   const environment = opts.environment ?? void 0;
   const { emit: emitDebug, mode: debugMode } = createDebugEmitter(
     opts.debug,
@@ -218,11 +216,28 @@ function createRouteClient(opts) {
     const debugName = meta?.name;
     const emit = (event) => emitDebug(event, debugName);
     emit({ type: "build", leaf: leafLabel });
+    let feedCursorParam = "pagination_cursor";
+    let feedNextPageParam;
+    let feedInitialPageParam;
+    let feedQueryOptions;
+    if (isGet && isFeed) {
+      const infiniteOptions = rqOpts ?? {};
+      const {
+        cursorParam,
+        getNextPageParam,
+        initialPageParam,
+        ...passthroughOptions
+      } = infiniteOptions;
+      feedCursorParam = cursorParam ?? "pagination_cursor";
+      feedNextPageParam = getNextPageParam ?? ((lastPage) => defaultGetNextCursor(lastPage));
+      feedInitialPageParam = typeof initialPageParam === "undefined" ? void 0 : initialPageParam;
+      feedQueryOptions = passthroughOptions;
+    }
     const getQueryKeys = (...tuple) => {
       const a = extractArgs(tuple);
       const params = a?.params;
       const query = a?.query;
-      const qForKey = isGet && isFeed ? stripKey(query, cursorParam) : query;
+      const qForKey = isGet && isFeed ? stripKey(query, feedCursorParam) : query;
       return buildCacheKey({
         leaf,
         params,
@@ -388,7 +403,7 @@ function createRouteClient(opts) {
         });
         const params = args?.params;
         const query = args?.query;
-        const buildOptions = rqOpts ?? {};
+        const buildOptions = feedQueryOptions ?? {};
         const listenersRef = useRef(/* @__PURE__ */ new Set());
         const notifyOnReceive = useCallback((data) => {
           buildOptions?.onReceive?.(data);
@@ -412,14 +427,14 @@ function createRouteClient(opts) {
         const queryResult = useInfiniteQuery(
           {
             ...buildOptions,
+            placeholderData: buildOptions.placeholderData ?? keepPreviousData,
+            initialPageParam: feedInitialPageParam,
+            getNextPageParam: (lastPage) => (feedNextPageParam ?? defaultGetNextCursor)(lastPage),
             queryKey: queryKeys,
-            initialPageParam: void 0,
-            getNextPageParam: (lastPage) => getNextCursor(lastPage),
-            placeholderData: keepPreviousData,
             queryFn: ({ pageParam }) => {
               const pageQuery = {
                 ...normalizedQuery,
-                ...pageParam ? { [cursorParam]: pageParam } : {}
+                ...pageParam ? { [feedCursorParam]: pageParam } : {}
               };
               return fetchEndpoint(tuple, {
                 queryOverride: pageQuery,
@@ -468,7 +483,6 @@ function createRouteClient(opts) {
           },
           []
         );
-        buildUrl({ ...leaf, cfg: leafCfg }, baseUrl, params, query);
         const queryResult = useQuery(
           {
             ...buildOptions,