chore(react-client): add shared prepareRequestFnParameters() for query* methods

Author: radist2s

packages/react-client/src/lib/callQueryClientFetchMethod.ts

@@ -3,9 +3,9 @@ import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema, RequestFn } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';
 import { composeQueryKey } from './composeQueryKey.js';
+import { prepareRequestFnParameters } from './prepareRequestFnParameters.js';
 import { requestFnResponseRejecter } from './requestFnResponseRejecter.js';
 import { requestFnResponseResolver } from './requestFnResponseResolver.js';
-import { shelfMerge } from './shelfMerge.js';
 
 /**
  * Calls a query client fetch method with parameters and options,
@@ -50,43 +50,16 @@ export function callQueryClientMethodWithQueryKey<
     (requestFn
       ? // @ts-expect-error - Too complex union to type
         function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-          const { body, ...parameters } = queryParams as {
-            body: BodyInit;
-          } & typeof queryParams;
+          const { parameters, body } = prepareRequestFnParameters(
+            queryParams,
+            pageParam,
+            infinite
+          );
 
           return requestFn(schema, {
-            parameters: infinite
-              ? (shelfMerge(
-                  2,
-                  parameters,
-                  (function omitBodyFromParameters() {
-                    if (
-                      pageParam &&
-                      typeof pageParam === 'object' &&
-                      'body' in pageParam
-                    ) {
-                      const { body: _body, ...pageParameters } = pageParam;
-                      return pageParameters;
-                    }
-
-                    return pageParam;
-                  })()
-                ) as never)
-              : parameters,
+            parameters: parameters as never,
             baseUrl,
-            body: infinite
-              ? (function shelfMergeBody() {
-                  if (
-                    pageParam &&
-                    typeof pageParam === 'object' &&
-                    'body' in pageParam
-                  ) {
-                    return shelfMerge(1, body, pageParam.body) as BodyInit;
-                  }
-
-                  return body;
-                })()
-              : body,
+            body,
             signal,
             meta,
           }).then(requestFnResponseResolver, requestFnResponseRejecter);

packages/react-client/src/lib/prepareRequestFnParameters.ts

@@ -0,0 +1,70 @@
+import { shelfMerge } from './shelfMerge.js';
+
+/**
+ * Prepares parameters and body for requestFn calls, handling infinite query logic
+ * @param queryParams - The query parameters that may contain body
+ * @param pageParam - The page parameter for infinite queries
+ * @param infinite - Whether this is for an infinite query
+ * @returns Object with prepared parameters and body
+ */
+export function prepareRequestFnParameters<TQueryParams>(
+  queryParams: TQueryParams,
+  pageParam: unknown,
+  infinite: boolean
+): {
+  parameters: TQueryParams extends { body: any }
+    ? Omit<TQueryParams, 'body'>
+    : TQueryParams;
+  body: BodyInit | undefined;
+} {
+  const { body, ...parameters } = queryParams as {
+    body?: BodyInit;
+  } & TQueryParams;
+
+  if (!infinite) {
+    return {
+      parameters: parameters as never,
+      body: body as never,
+    };
+  }
+
+  // Handle infinite query parameters
+  const processedParameters = shelfMerge(
+    2,
+    parameters,
+    omitBodyFromPageParam(pageParam)
+  ) as never;
+
+  const processedBody = mergeBodyWithPageParam(body, pageParam) as never;
+
+  return {
+    parameters: processedParameters,
+    body: processedBody,
+  };
+}
+
+/**
+ * Remove body from pageParam if it exists
+ */
+function omitBodyFromPageParam(pageParam: unknown) {
+  if (pageParam && typeof pageParam === 'object' && 'body' in pageParam) {
+    const { body: _body, ...pageParameters } = pageParam;
+    return pageParameters;
+  }
+
+  return pageParam;
+}
+
+/**
+ * Merge body with pageParam.body if pageParam contains body
+ */
+function mergeBodyWithPageParam(
+  body: BodyInit | undefined,
+  pageParam: unknown
+): BodyInit | undefined {
+  if (pageParam && typeof pageParam === 'object' && 'body' in pageParam) {
+    return shelfMerge(1, body, pageParam.body) as BodyInit;
+  }
+
+  return body;
+}

packages/react-client/src/lib/useComposeUseQueryOptions.ts

@@ -6,9 +6,9 @@ import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';
 import { composeQueryKey } from './composeQueryKey.js';
+import { prepareRequestFnParameters } from './prepareRequestFnParameters.js';
 import { requestFnResponseRejecter } from './requestFnResponseRejecter.js';
 import { requestFnResponseResolver } from './requestFnResponseResolver.js';
-import { shelfMerge } from './shelfMerge.js';
 
 /**
  * Composes the options for useQuery, useInfiniteQuery, useSuspenseQuery, and useSuspenseQueries.
@@ -25,46 +25,17 @@ export function useComposeUseQueryOptions(
   const queryFn =
     options?.queryFn ??
     function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
-      const { body, ...parameters } = queryParams as {
-        body: BodyInit;
-        parameters: Record<string, unknown>;
-      };
+      const { parameters, body } = prepareRequestFnParameters(
+        queryParams,
+        pageParam,
+        infinite
+      );
 
       return qraftOptions
         .requestFn(schema, {
-          // @ts-expect-error - Too complex to type
-          parameters: infinite
-            ? (shelfMerge(
-                2,
-                parameters,
-                (function omitBodyFromParameters() {
-                  if (
-                    pageParam &&
-                    typeof pageParam === 'object' &&
-                    'body' in pageParam
-                  ) {
-                    const { body: _body, ...pageParameters } = pageParam;
-                    return pageParameters;
-                  }
-
-                  return pageParam;
-                })()
-              ) as never)
-            : parameters,
+          parameters: parameters as never,
           baseUrl: qraftOptions.baseUrl,
-          body: infinite
-            ? (function shelfMergeBody() {
-                if (
-                  pageParam &&
-                  typeof pageParam === 'object' &&
-                  'body' in pageParam
-                ) {
-                  return shelfMerge(1, body, pageParam.body) as BodyInit;
-                }
-
-                return body;
-              })()
-            : body,
+          body,
           signal,
           meta,
         })