@emeryld/rrroutes-client 2.7.8 → 2.7.10

package/README.md

@@ -97,8 +97,8 @@ const getUser = client.build(registry.byKey['GET /v1/users/:userId'], {
 
 // Infinite/feed GET (cfg.feed === true)
 const listFeed = client.build(registry.byKey['GET /v1/posts'], {
-  cursorParam: 'page', // defaults to "pagination_cursor"
-  getNextPageParam: (last) => last.nextCursor, // React Query option override
+  cursorQueryKey: 'page', // defaults to "pagination_cursor"
+  getNextPageCursor: (last) => last.nextCursor, // cursor extraction override
 })
 
 // Mutation

package/dist/index.cjs

@@ -773,16 +773,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;
@@ -791,7 +790,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 (0, import_rrroutes_contract4.buildCacheKey)({
       leaf,
       params,
@@ -954,18 +953,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 = (0, import_rrroutes_contract4.buildCacheKey)({
+      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
@@ -999,8 +1012,8 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
         ...mergedInfiniteQueryOptions,
         enabled: guardedEnabled,
         placeholderData: mergedInfiniteQueryOptions.placeholderData ?? import_react_query3.keepPreviousData,
-        initialPageParam: feedInitialPageParam,
-        getNextPageParam: (lastPage) => cursorFromPage(lastPage),
+        initialPageParam: effectiveInitialPageParam,
+        getNextPageParam: (lastPage) => effectiveNextPageCursor(lastPage),
         queryKey: queryKeys,
         queryFn: ({ pageParam }) => {
           if (!hasCompleteArgs) {
@@ -1009,7 +1022,7 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
           if (!effectiveSplitPageSize) {
             const pageQuery = {
               ...normalizedQuery,
-              ...pageParam ? { [feedCursorParam]: pageParam } : {}
+              ...pageParam ? { [effectiveCursorParam]: pageParam } : {}
             };
             return fetchEndpoint(tuple, {
               queryOverride: pageQuery,
@@ -1021,7 +1034,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,
@@ -1038,7 +1051,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, {
@@ -1047,7 +1060,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) => {
@@ -1590,6 +1603,10 @@ function useSocketConnection(args) {
     () => rooms == null ? [] : Array.isArray(rooms) ? rooms : [rooms],
     [rooms]
   );
+  const normalizedRoomsKey = React2.useMemo(
+    () => normalizedRooms.join("
"),
+    [normalizedRooms]
+  );
   const reportAsyncError = React2.useCallback(
     (phase, error) => {
       if (typeof console !== "undefined" && typeof console.warn === "function") {
@@ -1615,10 +1632,12 @@ function useSocketConnection(args) {
     client,
     event,
     onMessage,
+    onCleanup,
     autoJoin,
     autoLeave,
     reportAsyncError,
-    ...normalizedRooms
+    normalizedRooms,
+    normalizedRoomsKey
   ]);
 }