@emeryld/rrroutes-client 2.3.11 → 2.4.0

package/dist/index.mjs

@@ -69,23 +69,16 @@ function toSearchString(query) {
   if (!query) return "";
   const params = new URLSearchParams();
   for (const [k, v] of Object.entries(query)) {
-    if (v == null) continue;
-    if (Array.isArray(v)) {
-      v.forEach((x) => {
-        if (x == null) return;
-        if (typeof x === "object") {
-          params.append(k, JSON.stringify(x));
-        } else {
-          params.append(k, String(x));
-        }
-      });
+    if (v === void 0 || v === null) continue;
+    if (typeof v === "string") {
+      params.append(k, v);
       continue;
     }
-    if (typeof v === "object") {
-      params.set(k, JSON.stringify(v));
+    if (typeof v === "number" || typeof v === "boolean") {
+      params.append(k, String(v));
       continue;
     }
-    params.set(k, String(v));
+    params.append(k, JSON.stringify(v));
   }
   const s = params.toString();
   return s ? `?${s}` : "";
@@ -190,8 +183,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 +209,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 +396,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 +420,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,