@openapi-qraft/react 2.10.0 → 2.10.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @openapi-qraft/react
 
+## 2.10.2
+
+### Patch Changes
+
+- 2a4db33: Refactored parameter preparation logic for queryable write operations to correctly handle body parameters in both regular and infinite queries. The update extracts shared logic into a reusable utility and ensures consistent parameter handling across all affected query methods.
+  - @openapi-qraft/tanstack-query-react-types@2.10.2
+
+## 2.10.1
+
+### Patch Changes
+
+- Updated dependencies [4618a66]
+  - @openapi-qraft/tanstack-query-react-types@2.10.1
+
 ## 2.10.0
 
 ### Minor Changes

package/dist/cjs/lib/callQueryClientFetchMethod.cjs

@@ -2,9 +2,9 @@
 
 var composeInfiniteQueryKey = require('./composeInfiniteQueryKey.cjs');
 var composeQueryKey = require('./composeQueryKey.cjs');
+var prepareRequestFnParameters = require('./prepareRequestFnParameters.cjs');
 var requestFnResponseRejecter = require('./requestFnResponseRejecter.cjs');
 var requestFnResponseResolver = require('./requestFnResponseResolver.cjs');
-var shelfMerge = require('./shelfMerge.cjs');
 
 /**
  * Calls a query client fetch method with parameters and options,
@@ -21,9 +21,11 @@ var shelfMerge = require('./shelfMerge.cjs');
         throw new Error('callQueryClientMethodWithQueryKey: options.queryKey and options.parameters are mutually exclusive');
     }
     const queryFn = queryFnOption ?? (requestFn ? function({ queryKey: [, queryParams], signal, meta, pageParam }) {
+        const { parameters, body } = prepareRequestFnParameters.prepareRequestFnParameters(queryParams, pageParam, infinite);
         return requestFn(schema, {
-            parameters: infinite ? shelfMerge.shelfMerge(2, queryParams, pageParam) : queryParams,
+            parameters: parameters,
             baseUrl,
+            body,
             signal,
             meta
         }).then(requestFnResponseResolver.requestFnResponseResolver, requestFnResponseRejecter.requestFnResponseRejecter);

package/dist/cjs/lib/callQueryClientFetchMethod.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"callQueryClientFetchMethod.cjs","sources":["../../../src/lib/callQueryClientFetchMethod.ts"],"sourcesContent":["import type { QueryClient } from '@tanstack/react-query';\nimport type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';\nimport type { OperationSchema, RequestFn } from './requestFn.js';\nimport { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';\nimport { composeQueryKey } from './composeQueryKey.js';\nimport { requestFnResponseRejecter } from './requestFnResponseRejecter.js';\nimport { requestFnResponseResolver } from './requestFnResponseResolver.js';\nimport { shelfMerge } from './shelfMerge.js';\n\n/**\n * Calls a query client fetch method with parameters and options,\n * and automatically composes the `QueryKey` based on the schema and parameters.\n */\nexport function callQueryClientMethodWithQueryKey<\n  QFMethod extends QueryKeyMethods,\n>(\n  qraftOptions: CreateAPIQueryClientOptions,\n  queryFilterMethod: QFMethod,\n  schema: OperationSchema,\n  infinite: boolean,\n  args: QueryClientMethodArgs<QFMethod>\n): ReturnType<(typeof QueryClient.prototype)[QFMethod]> {\n  const {\n    requestFn: requestFnOption,\n    baseUrl: baseUrlOption,\n    queryFn: queryFnOption,\n    parameters,\n    ...options\n  } = args[0] ?? {};\n\n  const queryClient = qraftOptions.queryClient;\n  const baseUrl = baseUrlOption ?? qraftOptions.baseUrl;\n\n  if (queryFnOption && requestFnOption) {\n    throw new Error(\n      'callQueryClientMethodWithQueryKey: options.queryFn and options.requestFn are mutually exclusive'\n    );\n  }\n\n  const requestFn = requestFnOption ?? qraftOptions.requestFn;\n\n  if (options.queryKey && parameters) {\n    throw new Error(\n      'callQueryClientMethodWithQueryKey: options.queryKey and options.parameters are mutually exclusive'\n    );\n  }\n\n  const queryFn =\n    queryFnOption ??\n    (requestFn\n      ? // @ts-expect-error - Too complex union to type\n        function ({ queryKey: [, queryParams], signal, meta, pageParam }) {\n          return requestFn(schema, {\n            parameters: infinite\n              ? (shelfMerge(2, queryParams, pageParam) as never)\n              : queryParams,\n            baseUrl,\n            signal,\n            meta,\n          }).then(requestFnResponseResolver, requestFnResponseRejecter);\n        }\n      : undefined);\n\n  // @ts-expect-error - Too complex union to type\n  return queryClient[queryFilterMethod]({\n    ...options,\n    queryFn,\n    queryKey:\n      options.queryKey ??\n      (infinite\n        ? composeInfiniteQueryKey(schema, parameters)\n        : composeQueryKey(schema, parameters)),\n  });\n}\n\ntype QueryClientMethodArgs<QMethod extends keyof QueryClientPrototype> = [\n  options: Parameters<QueryClientPrototype[QMethod]>[0] & {\n    parameters?: unknown;\n    baseUrl?: string;\n    requestFn?: RequestFn<unknown, unknown>;\n  },\n  queryClient: QueryClient,\n];\n\ntype QueryKeyMethods =\n  | QueryKeyMethod<'fetchQuery'>\n  | QueryKeyMethod<'prefetchQuery'>\n  | QueryKeyMethod<'ensureQueryData'>\n  | QueryKeyMethod<'fetchInfiniteQuery'>\n  | QueryKeyMethod<'prefetchInfiniteQuery'>\n  | QueryKeyMethod<'ensureInfiniteQueryData'>;\n\ntype QueryClientPrototype = typeof QueryClient.prototype;\n\ntype QueryKeyMethod<QFMethod extends keyof typeof QueryClient.prototype> =\n  QFMethod;\n"],"names":["callQueryClientMethodWithQueryKey","qraftOptions","queryFilterMethod","schema","infinite","args","requestFn","requestFnOption","baseUrl","baseUrlOption","queryFn","queryFnOption","parameters","options","queryClient","Error","queryKey","queryParams","signal","meta","pageParam","shelfMerge","then","requestFnResponseResolver","requestFnResponseRejecter","undefined","composeInfiniteQueryKey","composeQueryKey"],"mappings":";;;;;;;;AASA;;;IAIO,SAASA,iCAAAA,CAGdC,YAAyC,EACzCC,iBAA2B,EAC3BC,MAAuB,EACvBC,QAAiB,EACjBC,IAAqC,EAAA;AAErC,IAAA,MAAM,EACJC,SAAWC,EAAAA,eAAe,EAC1BC,OAASC,EAAAA,aAAa,EACtBC,OAASC,EAAAA,aAAa,EACtBC,UAAU,EACV,GAAGC,OACJ,EAAA,GAAGR,IAAI,CAAC,CAAA,CAAE,IAAI,EAAC,CAAA;IAEhB,MAAMS,WAAAA,GAAcb,aAAaa,WAAW,CAAA;IAC5C,MAAMN,OAAAA,GAAUC,aAAiBR,IAAAA,YAAAA,CAAaO,OAAO,CAAA;AAErD,IAAA,IAAIG,iBAAiBJ,eAAiB,EAAA;AACpC,QAAA,MAAM,IAAIQ,KACR,CAAA,iGAAA,CAAA,CAAA;AAEJ,KAAA;IAEA,MAAMT,SAAAA,GAAYC,eAAmBN,IAAAA,YAAAA,CAAaK,SAAS,CAAA;IAE3D,IAAIO,OAAAA,CAAQG,QAAQ,IAAIJ,UAAY,EAAA;AAClC,QAAA,MAAM,IAAIG,KACR,CAAA,mGAAA,CAAA,CAAA;AAEJ,KAAA;AAEA,IAAA,MAAML,OACJC,GAAAA,aAAAA,KACCL,SAAAA,GAEG,SAAU,EAAEU,QAAAA,EAAU,GAAGC,WAAAA,CAAY,EAAEC,MAAM,EAAEC,IAAI,EAAEC,SAAS,EAAE,EAAA;AAC9D,QAAA,OAAOd,UAAUH,MAAQ,EAAA;AACvBS,YAAAA,UAAAA,EAAYR,QACPiB,GAAAA,qBAAAA,CAAW,CAAGJ,EAAAA,WAAAA,EAAaG,SAC5BH,CAAAA,GAAAA,WAAAA;AACJT,YAAAA,OAAAA;AACAU,YAAAA,MAAAA;AACAC,YAAAA,IAAAA;SACCG,CAAAA,CAAAA,IAAI,CAACC,mDAA2BC,EAAAA,mDAAAA,CAAAA,CAAAA;AACrC,KAAA,GACAC,SAAQ,CAAA,CAAA;;IAGd,OAAOX,WAAW,CAACZ,iBAAAA,CAAkB,CAAC;AACpC,QAAA,GAAGW,OAAO;AACVH,QAAAA,OAAAA;QACAM,QACEH,EAAAA,OAAAA,CAAQG,QAAQ,KACfZ,QAAAA,GACGsB,gDAAwBvB,MAAQS,EAAAA,UAAAA,CAAAA,GAChCe,+BAAgBxB,CAAAA,MAAAA,EAAQS,UAAU,CAAA,CAAA;AAC1C,KAAA,CAAA,CAAA;AACF;;;;"}
+{"version":3,"file":"callQueryClientFetchMethod.cjs","sources":["../../../src/lib/callQueryClientFetchMethod.ts"],"sourcesContent":["import type { QueryClient } from '@tanstack/react-query';\nimport type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';\nimport type { OperationSchema, RequestFn } from './requestFn.js';\nimport { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';\nimport { composeQueryKey } from './composeQueryKey.js';\nimport { prepareRequestFnParameters } from './prepareRequestFnParameters.js';\nimport { requestFnResponseRejecter } from './requestFnResponseRejecter.js';\nimport { requestFnResponseResolver } from './requestFnResponseResolver.js';\n\n/**\n * Calls a query client fetch method with parameters and options,\n * and automatically composes the `QueryKey` based on the schema and parameters.\n */\nexport function callQueryClientMethodWithQueryKey<\n  QFMethod extends QueryKeyMethods,\n>(\n  qraftOptions: CreateAPIQueryClientOptions,\n  queryFilterMethod: QFMethod,\n  schema: OperationSchema,\n  infinite: boolean,\n  args: QueryClientMethodArgs<QFMethod>\n): ReturnType<(typeof QueryClient.prototype)[QFMethod]> {\n  const {\n    requestFn: requestFnOption,\n    baseUrl: baseUrlOption,\n    queryFn: queryFnOption,\n    parameters,\n    ...options\n  } = args[0] ?? {};\n\n  const queryClient = qraftOptions.queryClient;\n  const baseUrl = baseUrlOption ?? qraftOptions.baseUrl;\n\n  if (queryFnOption && requestFnOption) {\n    throw new Error(\n      'callQueryClientMethodWithQueryKey: options.queryFn and options.requestFn are mutually exclusive'\n    );\n  }\n\n  const requestFn = requestFnOption ?? qraftOptions.requestFn;\n\n  if (options.queryKey && parameters) {\n    throw new Error(\n      'callQueryClientMethodWithQueryKey: options.queryKey and options.parameters are mutually exclusive'\n    );\n  }\n\n  const queryFn =\n    queryFnOption ??\n    (requestFn\n      ? // @ts-expect-error - Too complex union to type\n        function ({ queryKey: [, queryParams], signal, meta, pageParam }) {\n          const { parameters, body } = prepareRequestFnParameters(\n            queryParams,\n            pageParam,\n            infinite\n          );\n\n          return requestFn(schema, {\n            parameters: parameters as never,\n            baseUrl,\n            body,\n            signal,\n            meta,\n          }).then(requestFnResponseResolver, requestFnResponseRejecter);\n        }\n      : undefined);\n\n  // @ts-expect-error - Too complex union to type\n  return queryClient[queryFilterMethod]({\n    ...options,\n    queryFn,\n    queryKey:\n      options.queryKey ??\n      (infinite\n        ? composeInfiniteQueryKey(schema, parameters)\n        : composeQueryKey(schema, parameters)),\n  });\n}\n\ntype QueryClientMethodArgs<QMethod extends keyof QueryClientPrototype> = [\n  options: Parameters<QueryClientPrototype[QMethod]>[0] & {\n    parameters?: unknown;\n    baseUrl?: string;\n    requestFn?: RequestFn<unknown, unknown>;\n  },\n  queryClient: QueryClient,\n];\n\ntype QueryKeyMethods =\n  | QueryKeyMethod<'fetchQuery'>\n  | QueryKeyMethod<'prefetchQuery'>\n  | QueryKeyMethod<'ensureQueryData'>\n  | QueryKeyMethod<'fetchInfiniteQuery'>\n  | QueryKeyMethod<'prefetchInfiniteQuery'>\n  | QueryKeyMethod<'ensureInfiniteQueryData'>;\n\ntype QueryClientPrototype = typeof QueryClient.prototype;\n\ntype QueryKeyMethod<QFMethod extends keyof typeof QueryClient.prototype> =\n  QFMethod;\n"],"names":["callQueryClientMethodWithQueryKey","qraftOptions","queryFilterMethod","schema","infinite","args","requestFn","requestFnOption","baseUrl","baseUrlOption","queryFn","queryFnOption","parameters","options","queryClient","Error","queryKey","queryParams","signal","meta","pageParam","body","prepareRequestFnParameters","then","requestFnResponseResolver","requestFnResponseRejecter","undefined","composeInfiniteQueryKey","composeQueryKey"],"mappings":";;;;;;;;AASA;;;IAIO,SAASA,iCAAAA,CAGdC,YAAyC,EACzCC,iBAA2B,EAC3BC,MAAuB,EACvBC,QAAiB,EACjBC,IAAqC,EAAA;AAErC,IAAA,MAAM,EACJC,SAAWC,EAAAA,eAAe,EAC1BC,OAASC,EAAAA,aAAa,EACtBC,OAASC,EAAAA,aAAa,EACtBC,UAAU,EACV,GAAGC,OACJ,EAAA,GAAGR,IAAI,CAAC,CAAA,CAAE,IAAI,EAAC,CAAA;IAEhB,MAAMS,WAAAA,GAAcb,aAAaa,WAAW,CAAA;IAC5C,MAAMN,OAAAA,GAAUC,aAAiBR,IAAAA,YAAAA,CAAaO,OAAO,CAAA;AAErD,IAAA,IAAIG,iBAAiBJ,eAAiB,EAAA;AACpC,QAAA,MAAM,IAAIQ,KACR,CAAA,iGAAA,CAAA,CAAA;AAEJ,KAAA;IAEA,MAAMT,SAAAA,GAAYC,eAAmBN,IAAAA,YAAAA,CAAaK,SAAS,CAAA;IAE3D,IAAIO,OAAAA,CAAQG,QAAQ,IAAIJ,UAAY,EAAA;AAClC,QAAA,MAAM,IAAIG,KACR,CAAA,mGAAA,CAAA,CAAA;AAEJ,KAAA;AAEA,IAAA,MAAML,OACJC,GAAAA,aAAAA,KACCL,SAAAA,GAEG,SAAU,EAAEU,QAAAA,EAAU,GAAGC,WAAAA,CAAY,EAAEC,MAAM,EAAEC,IAAI,EAAEC,SAAS,EAAE,EAAA;QAC9D,MAAM,EAAER,UAAU,EAAES,IAAI,EAAE,GAAGC,qDAAAA,CAC3BL,aACAG,SACAhB,EAAAA,QAAAA,CAAAA,CAAAA;AAGF,QAAA,OAAOE,UAAUH,MAAQ,EAAA;YACvBS,UAAYA,EAAAA,UAAAA;AACZJ,YAAAA,OAAAA;AACAa,YAAAA,IAAAA;AACAH,YAAAA,MAAAA;AACAC,YAAAA,IAAAA;SACCI,CAAAA,CAAAA,IAAI,CAACC,mDAA2BC,EAAAA,mDAAAA,CAAAA,CAAAA;AACrC,KAAA,GACAC,SAAQ,CAAA,CAAA;;IAGd,OAAOZ,WAAW,CAACZ,iBAAAA,CAAkB,CAAC;AACpC,QAAA,GAAGW,OAAO;AACVH,QAAAA,OAAAA;QACAM,QACEH,EAAAA,OAAAA,CAAQG,QAAQ,KACfZ,QAAAA,GACGuB,gDAAwBxB,MAAQS,EAAAA,UAAAA,CAAAA,GAChCgB,+BAAgBzB,CAAAA,MAAAA,EAAQS,UAAU,CAAA,CAAA;AAC1C,KAAA,CAAA,CAAA;AACF;;;;"}

package/dist/cjs/lib/prepareRequestFnParameters.cjs

@@ -0,0 +1,46 @@
+'use strict';
+
+var shelfMerge = require('./shelfMerge.cjs');
+
+/**
+ * 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
+ */ function prepareRequestFnParameters(queryParams, pageParam, infinite) {
+    const { body, ...parameters } = queryParams;
+    if (!infinite) {
+        return {
+            parameters: parameters,
+            body: body
+        };
+    }
+    // Handle infinite query parameters
+    const processedParameters = shelfMerge.shelfMerge(2, parameters, omitBodyFromPageParam(pageParam));
+    const processedBody = mergeBodyWithPageParam(body, pageParam);
+    return {
+        parameters: processedParameters,
+        body: processedBody
+    };
+}
+/**
+ * Remove body from pageParam if it exists
+ */ function omitBodyFromPageParam(pageParam) {
+    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, pageParam) {
+    if (pageParam && typeof pageParam === 'object' && 'body' in pageParam) {
+        return shelfMerge.shelfMerge(1, body, pageParam.body);
+    }
+    return body;
+}
+
+exports.prepareRequestFnParameters = prepareRequestFnParameters;
+//# sourceMappingURL=prepareRequestFnParameters.cjs.map

package/dist/cjs/lib/prepareRequestFnParameters.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepareRequestFnParameters.cjs","sources":["../../../src/lib/prepareRequestFnParameters.ts"],"sourcesContent":["import { shelfMerge } from './shelfMerge.js';\n\n/**\n * Prepares parameters and body for requestFn calls, handling infinite query logic\n * @param queryParams - The query parameters that may contain body\n * @param pageParam - The page parameter for infinite queries\n * @param infinite - Whether this is for an infinite query\n * @returns Object with prepared parameters and body\n */\nexport function prepareRequestFnParameters<TQueryParams>(\n  queryParams: TQueryParams,\n  pageParam: unknown,\n  infinite: boolean\n): {\n  parameters: TQueryParams extends { body: any }\n    ? Omit<TQueryParams, 'body'>\n    : TQueryParams;\n  body: BodyInit | undefined;\n} {\n  const { body, ...parameters } = queryParams as {\n    body?: BodyInit;\n  } & TQueryParams;\n\n  if (!infinite) {\n    return {\n      parameters: parameters as never,\n      body: body as never,\n    };\n  }\n\n  // Handle infinite query parameters\n  const processedParameters = shelfMerge(\n    2,\n    parameters,\n    omitBodyFromPageParam(pageParam)\n  ) as never;\n\n  const processedBody = mergeBodyWithPageParam(body, pageParam) as never;\n\n  return {\n    parameters: processedParameters,\n    body: processedBody,\n  };\n}\n\n/**\n * Remove body from pageParam if it exists\n */\nfunction omitBodyFromPageParam(pageParam: unknown) {\n  if (pageParam && typeof pageParam === 'object' && 'body' in pageParam) {\n    const { body: _body, ...pageParameters } = pageParam;\n    return pageParameters;\n  }\n\n  return pageParam;\n}\n\n/**\n * Merge body with pageParam.body if pageParam contains body\n */\nfunction mergeBodyWithPageParam(\n  body: BodyInit | undefined,\n  pageParam: unknown\n): BodyInit | undefined {\n  if (pageParam && typeof pageParam === 'object' && 'body' in pageParam) {\n    return shelfMerge(1, body, pageParam.body) as BodyInit;\n  }\n\n  return body;\n}\n"],"names":["prepareRequestFnParameters","queryParams","pageParam","infinite","body","parameters","processedParameters","shelfMerge","omitBodyFromPageParam","processedBody","mergeBodyWithPageParam","_body","pageParameters"],"mappings":";;;;AAEA;;;;;;AAMC,IACM,SAASA,0BAAAA,CACdC,WAAyB,EACzBC,SAAkB,EAClBC,QAAiB,EAAA;AAOjB,IAAA,MAAM,EAAEC,IAAI,EAAE,GAAGC,YAAY,GAAGJ,WAAAA,CAAAA;AAIhC,IAAA,IAAI,CAACE,QAAU,EAAA;QACb,OAAO;YACLE,UAAYA,EAAAA,UAAAA;YACZD,IAAMA,EAAAA,IAAAA;AACR,SAAA,CAAA;AACF,KAAA;;AAGA,IAAA,MAAME,mBAAsBC,GAAAA,qBAAAA,CAC1B,CACAF,EAAAA,UAAAA,EACAG,qBAAsBN,CAAAA,SAAAA,CAAAA,CAAAA,CAAAA;IAGxB,MAAMO,aAAAA,GAAgBC,uBAAuBN,IAAMF,EAAAA,SAAAA,CAAAA,CAAAA;IAEnD,OAAO;QACLG,UAAYC,EAAAA,mBAAAA;QACZF,IAAMK,EAAAA,aAAAA;AACR,KAAA,CAAA;AACF,CAAA;AAEA;;IAGA,SAASD,sBAAsBN,SAAkB,EAAA;AAC/C,IAAA,IAAIA,SAAa,IAAA,OAAOA,SAAc,KAAA,QAAA,IAAY,UAAUA,SAAW,EAAA;AACrE,QAAA,MAAM,EAAEE,IAAMO,EAAAA,KAAK,EAAE,GAAGC,gBAAgB,GAAGV,SAAAA,CAAAA;QAC3C,OAAOU,cAAAA,CAAAA;AACT,KAAA;IAEA,OAAOV,SAAAA,CAAAA;AACT,CAAA;AAEA;;AAEC,IACD,SAASQ,sBAAAA,CACPN,IAA0B,EAC1BF,SAAkB,EAAA;AAElB,IAAA,IAAIA,SAAa,IAAA,OAAOA,SAAc,KAAA,QAAA,IAAY,UAAUA,SAAW,EAAA;AACrE,QAAA,OAAOK,qBAAW,CAAA,CAAA,EAAGH,IAAMF,EAAAA,SAAAA,CAAUE,IAAI,CAAA,CAAA;AAC3C,KAAA;IAEA,OAAOA,IAAAA,CAAAA;AACT;;;;"}

package/dist/cjs/lib/requestFn.cjs

@@ -88,7 +88,8 @@ function getQueryString(params) {
         search.append(prefix, String(value));
     };
     Object.entries(params).forEach(([k, v])=>walk(k, v));
-    return search.toString() ? `?${search.toString()}` : '';
+    const searchString = search.toString();
+    return searchString ? `?${searchString}` : '';
 }
 function mergeHeaders(...allHeaders) {
     const headers = new Headers();

package/dist/cjs/lib/requestFn.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"requestFn.cjs","sources":["../../../src/lib/requestFn.ts"],"sourcesContent":["import type {\n  HeadersOptions,\n  OperationSchema,\n  RequestFnInfo,\n  RequestFnOptions,\n  RequestFnResponse,\n} from '@openapi-qraft/tanstack-query-react-types';\nimport { processResponse, resolveResponse } from './responseUtils.js';\n\n/**\n * This function is used to make a request to a specified endpoint.\n *\n * @template T The expected return type of the request.\n *\n * @param schema The schema of the operation to be performed. It includes the OpenAPI path, HTTP method and media type.\n * @param requestInfo The information required to make the request. It includes parameters, headers, body, etc.\n * @param [options] Optional. Additional options for the request. It includes custom urlSerializer, bodySerializer, and fetch function.\n *\n * @returns {Promise<T>} Returns a promise that resolves with the response of the request.\n *\n * @throws {error: object|string, response: Response} Throws an error if the request fails. The error includes the error message and the response from the server.\n */\nexport async function requestFn<TData, TError>(\n  schema: OperationSchema,\n  requestInfo: RequestFnInfo,\n  options?: RequestFnOptions\n): Promise<RequestFnResponse<TData, TError>> {\n  return baseRequestFn<TData, TError>(schema, requestInfo, {\n    urlSerializer,\n    bodySerializer,\n    ...options,\n  });\n}\n\n/**\n * This function is used to make a request to a specified endpoint.\n * It's necessary to create a custom `requestFn` with a custom `urlSerializer`\n * and `bodySerializer`, with the tree-shaking of the default `requestFn`\n * and its serializers.\n *\n * @template T The expected return type of the request.\n *\n * @param requestSchema The schema of the operation to be performed. It includes the OpenAPI path, HTTP method and media type.\n * @param requestInfo The information required to make the request. It includes parameters, headers, body, etc.\n * @param options The options for the request. It includes urlSerializer, bodySerializer, and fetch function. The 'urlSerializer' and 'bodySerializer' are required.\n *\n * @returns {Promise<T>} Returns a promise that resolves with the response of the request.\n *\n * @throws {error: object|string, response: Response} Throws an error if the request fails. The error includes the error message and the response from the server.\n */\nexport async function baseRequestFn<TData, TError>(\n  requestSchema: OperationSchema,\n  requestInfo: RequestFnInfo,\n  options: WithRequired<RequestFnOptions, 'urlSerializer' | 'bodySerializer'>\n): Promise<RequestFnResponse<TData, TError>> {\n  const { parameters, headers, body, ...requestInfoRest } = requestInfo;\n\n  const requestPayload = options.bodySerializer(requestSchema, body);\n\n  const baseFetch = options.fetch ?? fetch;\n\n  return baseFetch(options.urlSerializer(requestSchema, requestInfo), {\n    method: requestSchema.method.toUpperCase(),\n    body: requestPayload?.body,\n    headers: mergeHeaders(\n      { Accept: 'application/json' },\n      requestPayload?.headers,\n      headers,\n      parameters?.header\n    ),\n    ...requestInfoRest,\n  })\n    .then(processResponse as typeof processResponse<TData, TError>)\n    .catch(resolveResponse as typeof resolveResponse<TData, TError>);\n}\n\n/**\n * Serializes the given schema and request payload into a URL string.\n *\n * This function is implemented according to the URI Template standard\n * defined in RFC 6570. It supports the expansion of path and query parameters,\n * correctly handling empty arrays, `null`, and `undefined` values by ignoring\n * them during the expansion process, as specified by the standard.\n *\n * For more information, refer to the official documentation:\n * https://datatracker.ietf.org/doc/html/rfc6570\n *\n * @param schema - The operation schema containing the URL template and method.\n * @param info - The request payload including baseUrl, path parameters, and query parameters.\n * @returns The fully constructed URL string.\n */\nexport function urlSerializer(\n  schema: OperationSchema,\n  info: Pick<RequestFnInfo, 'baseUrl' | 'parameters'>\n): string {\n  const path = schema.url.replace(\n    /{(.*?)}/g,\n    (substring: string, group: string) => {\n      if (\n        info.parameters?.path &&\n        Object.prototype.hasOwnProperty.call(info.parameters.path, group)\n      ) {\n        return encodeURIComponent(String(info.parameters?.path[group]));\n      }\n      return substring;\n    }\n  );\n\n  const baseUrl = info.baseUrl ?? '';\n\n  if (info.parameters?.query) {\n    return `${baseUrl}${path}${getQueryString(info.parameters.query)}`;\n  }\n\n  return `${baseUrl}${path}`;\n}\n\nfunction getQueryString(params: Record<string, any>): string {\n  const search = new URLSearchParams();\n\n  const walk = (prefix: string, value: any) => {\n    if (value == null) return;\n    if (value instanceof Date)\n      return search.append(prefix, value.toISOString());\n    if (Array.isArray(value)) return value.forEach((v) => walk(prefix, v));\n    if (typeof value === 'object') {\n      return Object.entries(value).forEach(([k, v]) =>\n        walk(`${prefix}[${k}]`, v)\n      );\n    }\n    search.append(prefix, String(value));\n  };\n\n  Object.entries(params).forEach(([k, v]) => walk(k, v));\n\n  return search.toString() ? `?${search.toString()}` : '';\n}\n\nexport function mergeHeaders(...allHeaders: (HeadersOptions | undefined)[]) {\n  const headers = new Headers();\n\n  for (const headerSet of allHeaders) {\n    if (!headerSet || typeof headerSet !== 'object') {\n      continue;\n    }\n\n    const headersIterator =\n      headerSet instanceof Headers\n        ? headerSet.entries()\n        : Object.entries(headerSet);\n\n    for (const [headerKey, headerValue] of headersIterator) {\n      if (headerValue === null) {\n        headers.delete(headerKey);\n      } else if (headerValue !== undefined) {\n        headers.set(headerKey, headerValue);\n      }\n    }\n  }\n\n  return headers;\n}\n\nexport function bodySerializer(\n  schema: OperationSchema,\n  body: RequestFnInfo['body']\n) {\n  if (isReadOnlyOperation(schema)) return undefined;\n\n  if (body === undefined || body === null) return undefined;\n\n  if (typeof body === 'string') {\n    return {\n      body,\n      headers: {\n        'Content-Type':\n          // prefer text/* media type\n          schema.mediaType?.find((mediaType) => mediaType.includes('text/')) ??\n          // prefer JSON media type, assume that body is serialized as JSON\n          schema.mediaType?.find((mediaType) => mediaType.includes('/json')) ??\n          'text/plain',\n      },\n    };\n  }\n\n  if (body instanceof FormData) {\n    return {\n      body,\n      headers: {\n        // remove `Content-Type` if the serialized body is FormData;\n        // the browser will correctly set Content-Type & boundary expression\n        'Content-Type': null,\n      },\n    };\n  }\n\n  if (body instanceof Blob) {\n    return {\n      body,\n      headers: {\n        'Content-Type':\n          body.type ||\n          schema.mediaType?.find(\n            (mediaType) =>\n              !(\n                mediaType.includes('text/') &&\n                mediaType.includes('/form-data') &&\n                mediaType.includes('/json')\n              )\n          ) ||\n          'application/octet-stream',\n      },\n    };\n  }\n\n  let jsonMediaType: string | null = null;\n  let formDataMediaType: string | null = null;\n\n  if (schema.mediaType) {\n    for (let i = 0; i < schema.mediaType.length; i++) {\n      const mediaType = schema.mediaType[i];\n      if (mediaType.includes('/json')) jsonMediaType = mediaType;\n      else if (mediaType.includes('/form-data')) formDataMediaType = mediaType;\n    }\n  }\n\n  if (formDataMediaType) {\n    if (\n      !jsonMediaType ||\n      // Prefer FormData serialization if one of the fields is a Blob\n      Object.values(body).some((value) => value instanceof Blob)\n    ) {\n      return {\n        body: getRequestBodyFormData(body),\n        headers: {\n          // remove `Content-Type` if the serialized body is FormData;\n          // the browser will correctly set Content-Type & boundary expression\n          'Content-Type': null,\n        },\n      };\n    }\n  }\n\n  return {\n    body: JSON.stringify(body),\n    headers: {\n      'Content-Type': jsonMediaType ?? 'application/json',\n    },\n  };\n}\n\nfunction getRequestBodyFormData(\n  body: NonNullable<RequestFnInfo['body']>\n): FormData {\n  if (body instanceof FormData) return body;\n  if (typeof body !== 'object')\n    throw new Error(`Unsupported body type ${typeof body} in form-data.`);\n\n  const formData = new FormData();\n\n  const process = (key: string, value: any) => {\n    if (typeof value === 'string' || value instanceof Blob) {\n      formData.append(key, value);\n    } else {\n      formData.append(key, JSON.stringify(value));\n    }\n  };\n\n  Object.entries(body)\n    .filter(([_, value]) => typeof value !== 'undefined' && value !== null)\n    .forEach(([key, value]) => {\n      if (Array.isArray(value)) {\n        value.forEach((v) => process(key, v));\n      } else {\n        process(key, value);\n      }\n    });\n\n  return formData;\n}\n\ntype WithRequired<T, K extends keyof T> = T & {\n  [_ in K]: {};\n};\n\nexport type {\n  RequestFn,\n  RequestFnResponse,\n  HeadersOptions,\n  RequestFnOptions,\n  RequestFnInfo,\n  OperationSchema,\n} from '@openapi-qraft/tanstack-query-react-types';\n\n/**\n * @deprecated use `RequestFnInfo` instead\n */\nexport type RequestFnPayload = RequestFnInfo;\n\nfunction isReadOnlyOperation(operation: {\n  readonly method:\n    | 'get'\n    | 'put'\n    | 'post'\n    | 'patch'\n    | 'delete'\n    | 'options'\n    | 'head'\n    | 'trace';\n}) {\n  return (\n    operation.method === 'get' ||\n    operation.method === 'head' ||\n    operation.method === 'trace' ||\n    operation.method === 'options'\n  );\n}\n"],"names":["requestFn","schema","requestInfo","options","baseRequestFn","urlSerializer","bodySerializer","requestSchema","parameters","headers","body","requestInfoRest","requestPayload","baseFetch","fetch","method","toUpperCase","mergeHeaders","Accept","header","then","processResponse","catch","resolveResponse","info","path","url","replace","substring","group","Object","prototype","hasOwnProperty","call","encodeURIComponent","String","baseUrl","query","getQueryString","params","search","URLSearchParams","walk","prefix","value","Date","append","toISOString","Array","isArray","forEach","v","entries","k","toString","allHeaders","Headers","headerSet","headersIterator","headerKey","headerValue","delete","undefined","set","isReadOnlyOperation","mediaType","find","includes","FormData","Blob","type","jsonMediaType","formDataMediaType","i","length","values","some","getRequestBodyFormData","JSON","stringify","Error","formData","process","key","filter","_","operation"],"mappings":"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"}
+{"version":3,"file":"requestFn.cjs","sources":["../../../src/lib/requestFn.ts"],"sourcesContent":["import type {\n  HeadersOptions,\n  OperationSchema,\n  RequestFnInfo,\n  RequestFnOptions,\n  RequestFnResponse,\n} from '@openapi-qraft/tanstack-query-react-types';\nimport { processResponse, resolveResponse } from './responseUtils.js';\n\n/**\n * This function is used to make a request to a specified endpoint.\n *\n * @template T The expected return type of the request.\n *\n * @param schema The schema of the operation to be performed. It includes the OpenAPI path, HTTP method and media type.\n * @param requestInfo The information required to make the request. It includes parameters, headers, body, etc.\n * @param [options] Optional. Additional options for the request. It includes custom urlSerializer, bodySerializer, and fetch function.\n *\n * @returns {Promise<T>} Returns a promise that resolves with the response of the request.\n *\n * @throws {error: object|string, response: Response} Throws an error if the request fails. The error includes the error message and the response from the server.\n */\nexport async function requestFn<TData, TError>(\n  schema: OperationSchema,\n  requestInfo: RequestFnInfo,\n  options?: RequestFnOptions\n): Promise<RequestFnResponse<TData, TError>> {\n  return baseRequestFn<TData, TError>(schema, requestInfo, {\n    urlSerializer,\n    bodySerializer,\n    ...options,\n  });\n}\n\n/**\n * This function is used to make a request to a specified endpoint.\n * It's necessary to create a custom `requestFn` with a custom `urlSerializer`\n * and `bodySerializer`, with the tree-shaking of the default `requestFn`\n * and its serializers.\n *\n * @template T The expected return type of the request.\n *\n * @param requestSchema The schema of the operation to be performed. It includes the OpenAPI path, HTTP method and media type.\n * @param requestInfo The information required to make the request. It includes parameters, headers, body, etc.\n * @param options The options for the request. It includes urlSerializer, bodySerializer, and fetch function. The 'urlSerializer' and 'bodySerializer' are required.\n *\n * @returns {Promise<T>} Returns a promise that resolves with the response of the request.\n *\n * @throws {error: object|string, response: Response} Throws an error if the request fails. The error includes the error message and the response from the server.\n */\nexport async function baseRequestFn<TData, TError>(\n  requestSchema: OperationSchema,\n  requestInfo: RequestFnInfo,\n  options: WithRequired<RequestFnOptions, 'urlSerializer' | 'bodySerializer'>\n): Promise<RequestFnResponse<TData, TError>> {\n  const { parameters, headers, body, ...requestInfoRest } = requestInfo;\n\n  const requestPayload = options.bodySerializer(requestSchema, body);\n\n  const baseFetch = options.fetch ?? fetch;\n\n  return baseFetch(options.urlSerializer(requestSchema, requestInfo), {\n    method: requestSchema.method.toUpperCase(),\n    body: requestPayload?.body,\n    headers: mergeHeaders(\n      { Accept: 'application/json' },\n      requestPayload?.headers,\n      headers,\n      parameters?.header\n    ),\n    ...requestInfoRest,\n  })\n    .then(processResponse as typeof processResponse<TData, TError>)\n    .catch(resolveResponse as typeof resolveResponse<TData, TError>);\n}\n\n/**\n * Serializes the given schema and request payload into a URL string.\n *\n * This function is implemented according to the URI Template standard\n * defined in RFC 6570. It supports the expansion of path and query parameters,\n * correctly handling empty arrays, `null`, and `undefined` values by ignoring\n * them during the expansion process, as specified by the standard.\n *\n * For more information, refer to the official documentation:\n * https://datatracker.ietf.org/doc/html/rfc6570\n *\n * @param schema - The operation schema containing the URL template and method.\n * @param info - The request payload including baseUrl, path parameters, and query parameters.\n * @returns The fully constructed URL string.\n */\nexport function urlSerializer(\n  schema: OperationSchema,\n  info: Pick<RequestFnInfo, 'baseUrl' | 'parameters'>\n): string {\n  const path = schema.url.replace(\n    /{(.*?)}/g,\n    (substring: string, group: string) => {\n      if (\n        info.parameters?.path &&\n        Object.prototype.hasOwnProperty.call(info.parameters.path, group)\n      ) {\n        return encodeURIComponent(String(info.parameters?.path[group]));\n      }\n      return substring;\n    }\n  );\n\n  const baseUrl = info.baseUrl ?? '';\n\n  if (info.parameters?.query) {\n    return `${baseUrl}${path}${getQueryString(info.parameters.query)}`;\n  }\n\n  return `${baseUrl}${path}`;\n}\n\nfunction getQueryString(params: Record<string, any>): string {\n  const search = new URLSearchParams();\n\n  const walk = (prefix: string, value: any) => {\n    if (value == null) return;\n    if (value instanceof Date)\n      return search.append(prefix, value.toISOString());\n    if (Array.isArray(value)) return value.forEach((v) => walk(prefix, v));\n    if (typeof value === 'object') {\n      return Object.entries(value).forEach(([k, v]) =>\n        walk(`${prefix}[${k}]`, v)\n      );\n    }\n    search.append(prefix, String(value));\n  };\n\n  Object.entries(params).forEach(([k, v]) => walk(k, v));\n\n  const searchString = search.toString();\n\n  return searchString ? `?${searchString}` : '';\n}\n\nexport function mergeHeaders(...allHeaders: (HeadersOptions | undefined)[]) {\n  const headers = new Headers();\n\n  for (const headerSet of allHeaders) {\n    if (!headerSet || typeof headerSet !== 'object') {\n      continue;\n    }\n\n    const headersIterator =\n      headerSet instanceof Headers\n        ? headerSet.entries()\n        : Object.entries(headerSet);\n\n    for (const [headerKey, headerValue] of headersIterator) {\n      if (headerValue === null) {\n        headers.delete(headerKey);\n      } else if (headerValue !== undefined) {\n        headers.set(headerKey, headerValue);\n      }\n    }\n  }\n\n  return headers;\n}\n\nexport function bodySerializer(\n  schema: OperationSchema,\n  body: RequestFnInfo['body']\n) {\n  if (isReadOnlyOperation(schema)) return undefined;\n\n  if (body === undefined || body === null) return undefined;\n\n  if (typeof body === 'string') {\n    return {\n      body,\n      headers: {\n        'Content-Type':\n          // prefer text/* media type\n          schema.mediaType?.find((mediaType) => mediaType.includes('text/')) ??\n          // prefer JSON media type, assume that body is serialized as JSON\n          schema.mediaType?.find((mediaType) => mediaType.includes('/json')) ??\n          'text/plain',\n      },\n    };\n  }\n\n  if (body instanceof FormData) {\n    return {\n      body,\n      headers: {\n        // remove `Content-Type` if the serialized body is FormData;\n        // the browser will correctly set Content-Type & boundary expression\n        'Content-Type': null,\n      },\n    };\n  }\n\n  if (body instanceof Blob) {\n    return {\n      body,\n      headers: {\n        'Content-Type':\n          body.type ||\n          schema.mediaType?.find(\n            (mediaType) =>\n              !(\n                mediaType.includes('text/') &&\n                mediaType.includes('/form-data') &&\n                mediaType.includes('/json')\n              )\n          ) ||\n          'application/octet-stream',\n      },\n    };\n  }\n\n  let jsonMediaType: string | null = null;\n  let formDataMediaType: string | null = null;\n\n  if (schema.mediaType) {\n    for (let i = 0; i < schema.mediaType.length; i++) {\n      const mediaType = schema.mediaType[i];\n      if (mediaType.includes('/json')) jsonMediaType = mediaType;\n      else if (mediaType.includes('/form-data')) formDataMediaType = mediaType;\n    }\n  }\n\n  if (formDataMediaType) {\n    if (\n      !jsonMediaType ||\n      // Prefer FormData serialization if one of the fields is a Blob\n      Object.values(body).some((value) => value instanceof Blob)\n    ) {\n      return {\n        body: getRequestBodyFormData(body),\n        headers: {\n          // remove `Content-Type` if the serialized body is FormData;\n          // the browser will correctly set Content-Type & boundary expression\n          'Content-Type': null,\n        },\n      };\n    }\n  }\n\n  return {\n    body: JSON.stringify(body),\n    headers: {\n      'Content-Type': jsonMediaType ?? 'application/json',\n    },\n  };\n}\n\nfunction getRequestBodyFormData(\n  body: NonNullable<RequestFnInfo['body']>\n): FormData {\n  if (body instanceof FormData) return body;\n  if (typeof body !== 'object')\n    throw new Error(`Unsupported body type ${typeof body} in form-data.`);\n\n  const formData = new FormData();\n\n  const process = (key: string, value: any) => {\n    if (typeof value === 'string' || value instanceof Blob) {\n      formData.append(key, value);\n    } else {\n      formData.append(key, JSON.stringify(value));\n    }\n  };\n\n  Object.entries(body)\n    .filter(([_, value]) => typeof value !== 'undefined' && value !== null)\n    .forEach(([key, value]) => {\n      if (Array.isArray(value)) {\n        value.forEach((v) => process(key, v));\n      } else {\n        process(key, value);\n      }\n    });\n\n  return formData;\n}\n\ntype WithRequired<T, K extends keyof T> = T & {\n  [_ in K]: {};\n};\n\nexport type {\n  RequestFn,\n  RequestFnResponse,\n  HeadersOptions,\n  RequestFnOptions,\n  RequestFnInfo,\n  OperationSchema,\n} from '@openapi-qraft/tanstack-query-react-types';\n\n/**\n * @deprecated use `RequestFnInfo` instead\n */\nexport type RequestFnPayload = RequestFnInfo;\n\nfunction isReadOnlyOperation(operation: {\n  readonly method:\n    | 'get'\n    | 'put'\n    | 'post'\n    | 'patch'\n    | 'delete'\n    | 'options'\n    | 'head'\n    | 'trace';\n}) {\n  return (\n    operation.method === 'get' ||\n    operation.method === 'head' ||\n    operation.method === 'trace' ||\n    operation.method === 'options'\n  );\n}\n"],"names":["requestFn","schema","requestInfo","options","baseRequestFn","urlSerializer","bodySerializer","requestSchema","parameters","headers","body","requestInfoRest","requestPayload","baseFetch","fetch","method","toUpperCase","mergeHeaders","Accept","header","then","processResponse","catch","resolveResponse","info","path","url","replace","substring","group","Object","prototype","hasOwnProperty","call","encodeURIComponent","String","baseUrl","query","getQueryString","params","search","URLSearchParams","walk","prefix","value","Date","append","toISOString","Array","isArray","forEach","v","entries","k","searchString","toString","allHeaders","Headers","headerSet","headersIterator","headerKey","headerValue","delete","undefined","set","isReadOnlyOperation","mediaType","find","includes","FormData","Blob","type","jsonMediaType","formDataMediaType","i","length","values","some","getRequestBodyFormData","JSON","stringify","Error","formData","process","key","filter","_","operation"],"mappings":"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"}

package/dist/cjs/lib/useComposeUseQueryOptions.cjs

@@ -3,9 +3,9 @@
 
 var composeInfiniteQueryKey = require('./composeInfiniteQueryKey.cjs');
 var composeQueryKey = require('./composeQueryKey.cjs');
+var prepareRequestFnParameters = require('./prepareRequestFnParameters.cjs');
 var requestFnResponseRejecter = require('./requestFnResponseRejecter.cjs');
 var requestFnResponseResolver = require('./requestFnResponseResolver.cjs');
-var shelfMerge = require('./shelfMerge.cjs');
 
 /**
  * Composes the options for useQuery, useInfiniteQuery, useSuspenseQuery, and useSuspenseQueries.
@@ -13,10 +13,9 @@ var shelfMerge = require('./shelfMerge.cjs');
  */ function useComposeUseQueryOptions(qraftOptions, schema, args, infinite) {
     const [parameters, options] = args;
     const queryFn = options?.queryFn ?? function({ queryKey: [, queryParams], signal, meta, pageParam }) {
-        const { body, ...parameters } = queryParams;
+        const { parameters, body } = prepareRequestFnParameters.prepareRequestFnParameters(queryParams, pageParam, infinite);
         return qraftOptions.requestFn(schema, {
-            // @ts-expect-error - Too complex to type
-            parameters: infinite ? shelfMerge.shelfMerge(2, parameters, pageParam) : parameters,
+            parameters: parameters,
             baseUrl: qraftOptions.baseUrl,
             body,
             signal,

package/dist/cjs/lib/useComposeUseQueryOptions.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useComposeUseQueryOptions.cjs","sources":["../../../src/lib/useComposeUseQueryOptions.ts"],"sourcesContent":["'use client';\n\nimport type { ServiceOperationQueryKey } from '@openapi-qraft/tanstack-query-react-types';\nimport type { QueryClient, UseQueryOptions } from '@tanstack/react-query';\nimport type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';\nimport type { OperationSchema } from './requestFn.js';\nimport { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';\nimport { composeQueryKey } from './composeQueryKey.js';\nimport { requestFnResponseRejecter } from './requestFnResponseRejecter.js';\nimport { requestFnResponseResolver } from './requestFnResponseResolver.js';\nimport { shelfMerge } from './shelfMerge.js';\n\n/**\n * Composes the options for useQuery, useInfiniteQuery, useSuspenseQuery, and useSuspenseQueries.\n * @internal\n */\nexport function useComposeUseQueryOptions(\n  qraftOptions: CreateAPIQueryClientOptions,\n  schema: OperationSchema,\n  args: UseQueryOptionsArgs,\n  infinite: boolean\n): never {\n  const [parameters, options] = args;\n\n  const queryFn =\n    options?.queryFn ??\n    function ({ queryKey: [, queryParams], signal, meta, pageParam }) {\n      const { body, ...parameters } = queryParams as {\n        body: BodyInit;\n        parameters: Record<string, unknown>;\n      };\n\n      return qraftOptions\n        .requestFn(schema, {\n          // @ts-expect-error - Too complex to type\n          parameters: infinite\n            ? (shelfMerge(2, parameters, pageParam) as never)\n            : parameters,\n          baseUrl: qraftOptions.baseUrl,\n          body,\n          signal,\n          meta,\n        })\n        .then(requestFnResponseResolver, requestFnResponseRejecter);\n    };\n\n  const queryKey = Array.isArray(parameters)\n    ? (parameters as ServiceOperationQueryKey<OperationSchema, unknown>)\n    : infinite\n      ? composeInfiniteQueryKey(schema, parameters)\n      : composeQueryKey(schema, parameters);\n\n  return [{ ...options, queryFn, queryKey }, qraftOptions.queryClient] as never;\n}\n\ntype UseQueryOptionsArgs = [\n  parameters: unknown,\n  options?: UseQueryOptions,\n  queryClient?: QueryClient,\n];\n"],"names":["useComposeUseQueryOptions","qraftOptions","schema","args","infinite","parameters","options","queryFn","queryKey","queryParams","signal","meta","pageParam","body","requestFn","shelfMerge","baseUrl","then","requestFnResponseResolver","requestFnResponseRejecter","Array","isArray","composeInfiniteQueryKey","composeQueryKey","queryClient"],"mappings":"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"}
+{"version":3,"file":"useComposeUseQueryOptions.cjs","sources":["../../../src/lib/useComposeUseQueryOptions.ts"],"sourcesContent":["'use client';\n\nimport type { ServiceOperationQueryKey } from '@openapi-qraft/tanstack-query-react-types';\nimport type { QueryClient, UseQueryOptions } from '@tanstack/react-query';\nimport type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';\nimport type { OperationSchema } from './requestFn.js';\nimport { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';\nimport { composeQueryKey } from './composeQueryKey.js';\nimport { prepareRequestFnParameters } from './prepareRequestFnParameters.js';\nimport { requestFnResponseRejecter } from './requestFnResponseRejecter.js';\nimport { requestFnResponseResolver } from './requestFnResponseResolver.js';\n\n/**\n * Composes the options for useQuery, useInfiniteQuery, useSuspenseQuery, and useSuspenseQueries.\n * @internal\n */\nexport function useComposeUseQueryOptions(\n  qraftOptions: CreateAPIQueryClientOptions,\n  schema: OperationSchema,\n  args: UseQueryOptionsArgs,\n  infinite: boolean\n): never {\n  const [parameters, options] = args;\n\n  const queryFn =\n    options?.queryFn ??\n    function ({ queryKey: [, queryParams], signal, meta, pageParam }) {\n      const { parameters, body } = prepareRequestFnParameters(\n        queryParams,\n        pageParam,\n        infinite\n      );\n\n      return qraftOptions\n        .requestFn(schema, {\n          parameters: parameters as never,\n          baseUrl: qraftOptions.baseUrl,\n          body,\n          signal,\n          meta,\n        })\n        .then(requestFnResponseResolver, requestFnResponseRejecter);\n    };\n\n  const queryKey = Array.isArray(parameters)\n    ? (parameters as ServiceOperationQueryKey<OperationSchema, unknown>)\n    : infinite\n      ? composeInfiniteQueryKey(schema, parameters)\n      : composeQueryKey(schema, parameters);\n\n  return [{ ...options, queryFn, queryKey }, qraftOptions.queryClient] as never;\n}\n\ntype UseQueryOptionsArgs = [\n  parameters: unknown,\n  options?: UseQueryOptions,\n  queryClient?: QueryClient,\n];\n"],"names":["useComposeUseQueryOptions","qraftOptions","schema","args","infinite","parameters","options","queryFn","queryKey","queryParams","signal","meta","pageParam","body","prepareRequestFnParameters","requestFn","baseUrl","then","requestFnResponseResolver","requestFnResponseRejecter","Array","isArray","composeInfiniteQueryKey","composeQueryKey","queryClient"],"mappings":"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"}

package/dist/esm/lib/callQueryClientFetchMethod.js

@@ -1,8 +1,8 @@
 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,
@@ -19,9 +19,11 @@ import { shelfMerge } from './shelfMerge.js';
         throw new Error('callQueryClientMethodWithQueryKey: options.queryKey and options.parameters are mutually exclusive');
     }
     const queryFn = queryFnOption ?? (requestFn ? function({ queryKey: [, queryParams], signal, meta, pageParam }) {
+        const { parameters, body } = prepareRequestFnParameters(queryParams, pageParam, infinite);
         return requestFn(schema, {
-            parameters: infinite ? shelfMerge(2, queryParams, pageParam) : queryParams,
+            parameters: parameters,
             baseUrl,
+            body,
             signal,
             meta
         }).then(requestFnResponseResolver, requestFnResponseRejecter);

package/dist/esm/lib/callQueryClientFetchMethod.js.map

@@ -1 +1 @@
-{"version":3,"file":"callQueryClientFetchMethod.js","sources":["../../../src/lib/callQueryClientFetchMethod.ts"],"sourcesContent":["import type { QueryClient } from '@tanstack/react-query';\nimport type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';\nimport type { OperationSchema, RequestFn } from './requestFn.js';\nimport { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';\nimport { composeQueryKey } from './composeQueryKey.js';\nimport { requestFnResponseRejecter } from './requestFnResponseRejecter.js';\nimport { requestFnResponseResolver } from './requestFnResponseResolver.js';\nimport { shelfMerge } from './shelfMerge.js';\n\n/**\n * Calls a query client fetch method with parameters and options,\n * and automatically composes the `QueryKey` based on the schema and parameters.\n */\nexport function callQueryClientMethodWithQueryKey<\n  QFMethod extends QueryKeyMethods,\n>(\n  qraftOptions: CreateAPIQueryClientOptions,\n  queryFilterMethod: QFMethod,\n  schema: OperationSchema,\n  infinite: boolean,\n  args: QueryClientMethodArgs<QFMethod>\n): ReturnType<(typeof QueryClient.prototype)[QFMethod]> {\n  const {\n    requestFn: requestFnOption,\n    baseUrl: baseUrlOption,\n    queryFn: queryFnOption,\n    parameters,\n    ...options\n  } = args[0] ?? {};\n\n  const queryClient = qraftOptions.queryClient;\n  const baseUrl = baseUrlOption ?? qraftOptions.baseUrl;\n\n  if (queryFnOption && requestFnOption) {\n    throw new Error(\n      'callQueryClientMethodWithQueryKey: options.queryFn and options.requestFn are mutually exclusive'\n    );\n  }\n\n  const requestFn = requestFnOption ?? qraftOptions.requestFn;\n\n  if (options.queryKey && parameters) {\n    throw new Error(\n      'callQueryClientMethodWithQueryKey: options.queryKey and options.parameters are mutually exclusive'\n    );\n  }\n\n  const queryFn =\n    queryFnOption ??\n    (requestFn\n      ? // @ts-expect-error - Too complex union to type\n        function ({ queryKey: [, queryParams], signal, meta, pageParam }) {\n          return requestFn(schema, {\n            parameters: infinite\n              ? (shelfMerge(2, queryParams, pageParam) as never)\n              : queryParams,\n            baseUrl,\n            signal,\n            meta,\n          }).then(requestFnResponseResolver, requestFnResponseRejecter);\n        }\n      : undefined);\n\n  // @ts-expect-error - Too complex union to type\n  return queryClient[queryFilterMethod]({\n    ...options,\n    queryFn,\n    queryKey:\n      options.queryKey ??\n      (infinite\n        ? composeInfiniteQueryKey(schema, parameters)\n        : composeQueryKey(schema, parameters)),\n  });\n}\n\ntype QueryClientMethodArgs<QMethod extends keyof QueryClientPrototype> = [\n  options: Parameters<QueryClientPrototype[QMethod]>[0] & {\n    parameters?: unknown;\n    baseUrl?: string;\n    requestFn?: RequestFn<unknown, unknown>;\n  },\n  queryClient: QueryClient,\n];\n\ntype QueryKeyMethods =\n  | QueryKeyMethod<'fetchQuery'>\n  | QueryKeyMethod<'prefetchQuery'>\n  | QueryKeyMethod<'ensureQueryData'>\n  | QueryKeyMethod<'fetchInfiniteQuery'>\n  | QueryKeyMethod<'prefetchInfiniteQuery'>\n  | QueryKeyMethod<'ensureInfiniteQueryData'>;\n\ntype QueryClientPrototype = typeof QueryClient.prototype;\n\ntype QueryKeyMethod<QFMethod extends keyof typeof QueryClient.prototype> =\n  QFMethod;\n"],"names":["callQueryClientMethodWithQueryKey","qraftOptions","queryFilterMethod","schema","infinite","args","requestFn","requestFnOption","baseUrl","baseUrlOption","queryFn","queryFnOption","parameters","options","queryClient","Error","queryKey","queryParams","signal","meta","pageParam","shelfMerge","then","requestFnResponseResolver","requestFnResponseRejecter","undefined","composeInfiniteQueryKey","composeQueryKey"],"mappings":";;;;;;AASA;;;IAIO,SAASA,iCAAAA,CAGdC,YAAyC,EACzCC,iBAA2B,EAC3BC,MAAuB,EACvBC,QAAiB,EACjBC,IAAqC,EAAA;AAErC,IAAA,MAAM,EACJC,SAAWC,EAAAA,eAAe,EAC1BC,OAASC,EAAAA,aAAa,EACtBC,OAASC,EAAAA,aAAa,EACtBC,UAAU,EACV,GAAGC,OACJ,EAAA,GAAGR,IAAI,CAAC,CAAA,CAAE,IAAI,EAAC,CAAA;IAEhB,MAAMS,WAAAA,GAAcb,aAAaa,WAAW,CAAA;IAC5C,MAAMN,OAAAA,GAAUC,aAAiBR,IAAAA,YAAAA,CAAaO,OAAO,CAAA;AAErD,IAAA,IAAIG,iBAAiBJ,eAAiB,EAAA;AACpC,QAAA,MAAM,IAAIQ,KACR,CAAA,iGAAA,CAAA,CAAA;AAEJ,KAAA;IAEA,MAAMT,SAAAA,GAAYC,eAAmBN,IAAAA,YAAAA,CAAaK,SAAS,CAAA;IAE3D,IAAIO,OAAAA,CAAQG,QAAQ,IAAIJ,UAAY,EAAA;AAClC,QAAA,MAAM,IAAIG,KACR,CAAA,mGAAA,CAAA,CAAA;AAEJ,KAAA;AAEA,IAAA,MAAML,OACJC,GAAAA,aAAAA,KACCL,SAAAA,GAEG,SAAU,EAAEU,QAAAA,EAAU,GAAGC,WAAAA,CAAY,EAAEC,MAAM,EAAEC,IAAI,EAAEC,SAAS,EAAE,EAAA;AAC9D,QAAA,OAAOd,UAAUH,MAAQ,EAAA;AACvBS,YAAAA,UAAAA,EAAYR,QACPiB,GAAAA,UAAAA,CAAW,CAAGJ,EAAAA,WAAAA,EAAaG,SAC5BH,CAAAA,GAAAA,WAAAA;AACJT,YAAAA,OAAAA;AACAU,YAAAA,MAAAA;AACAC,YAAAA,IAAAA;SACCG,CAAAA,CAAAA,IAAI,CAACC,yBAA2BC,EAAAA,yBAAAA,CAAAA,CAAAA;AACrC,KAAA,GACAC,SAAQ,CAAA,CAAA;;IAGd,OAAOX,WAAW,CAACZ,iBAAAA,CAAkB,CAAC;AACpC,QAAA,GAAGW,OAAO;AACVH,QAAAA,OAAAA;QACAM,QACEH,EAAAA,OAAAA,CAAQG,QAAQ,KACfZ,QAAAA,GACGsB,wBAAwBvB,MAAQS,EAAAA,UAAAA,CAAAA,GAChCe,eAAgBxB,CAAAA,MAAAA,EAAQS,UAAU,CAAA,CAAA;AAC1C,KAAA,CAAA,CAAA;AACF;;;;"}
+{"version":3,"file":"callQueryClientFetchMethod.js","sources":["../../../src/lib/callQueryClientFetchMethod.ts"],"sourcesContent":["import type { QueryClient } from '@tanstack/react-query';\nimport type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';\nimport type { OperationSchema, RequestFn } from './requestFn.js';\nimport { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';\nimport { composeQueryKey } from './composeQueryKey.js';\nimport { prepareRequestFnParameters } from './prepareRequestFnParameters.js';\nimport { requestFnResponseRejecter } from './requestFnResponseRejecter.js';\nimport { requestFnResponseResolver } from './requestFnResponseResolver.js';\n\n/**\n * Calls a query client fetch method with parameters and options,\n * and automatically composes the `QueryKey` based on the schema and parameters.\n */\nexport function callQueryClientMethodWithQueryKey<\n  QFMethod extends QueryKeyMethods,\n>(\n  qraftOptions: CreateAPIQueryClientOptions,\n  queryFilterMethod: QFMethod,\n  schema: OperationSchema,\n  infinite: boolean,\n  args: QueryClientMethodArgs<QFMethod>\n): ReturnType<(typeof QueryClient.prototype)[QFMethod]> {\n  const {\n    requestFn: requestFnOption,\n    baseUrl: baseUrlOption,\n    queryFn: queryFnOption,\n    parameters,\n    ...options\n  } = args[0] ?? {};\n\n  const queryClient = qraftOptions.queryClient;\n  const baseUrl = baseUrlOption ?? qraftOptions.baseUrl;\n\n  if (queryFnOption && requestFnOption) {\n    throw new Error(\n      'callQueryClientMethodWithQueryKey: options.queryFn and options.requestFn are mutually exclusive'\n    );\n  }\n\n  const requestFn = requestFnOption ?? qraftOptions.requestFn;\n\n  if (options.queryKey && parameters) {\n    throw new Error(\n      'callQueryClientMethodWithQueryKey: options.queryKey and options.parameters are mutually exclusive'\n    );\n  }\n\n  const queryFn =\n    queryFnOption ??\n    (requestFn\n      ? // @ts-expect-error - Too complex union to type\n        function ({ queryKey: [, queryParams], signal, meta, pageParam }) {\n          const { parameters, body } = prepareRequestFnParameters(\n            queryParams,\n            pageParam,\n            infinite\n          );\n\n          return requestFn(schema, {\n            parameters: parameters as never,\n            baseUrl,\n            body,\n            signal,\n            meta,\n          }).then(requestFnResponseResolver, requestFnResponseRejecter);\n        }\n      : undefined);\n\n  // @ts-expect-error - Too complex union to type\n  return queryClient[queryFilterMethod]({\n    ...options,\n    queryFn,\n    queryKey:\n      options.queryKey ??\n      (infinite\n        ? composeInfiniteQueryKey(schema, parameters)\n        : composeQueryKey(schema, parameters)),\n  });\n}\n\ntype QueryClientMethodArgs<QMethod extends keyof QueryClientPrototype> = [\n  options: Parameters<QueryClientPrototype[QMethod]>[0] & {\n    parameters?: unknown;\n    baseUrl?: string;\n    requestFn?: RequestFn<unknown, unknown>;\n  },\n  queryClient: QueryClient,\n];\n\ntype QueryKeyMethods =\n  | QueryKeyMethod<'fetchQuery'>\n  | QueryKeyMethod<'prefetchQuery'>\n  | QueryKeyMethod<'ensureQueryData'>\n  | QueryKeyMethod<'fetchInfiniteQuery'>\n  | QueryKeyMethod<'prefetchInfiniteQuery'>\n  | QueryKeyMethod<'ensureInfiniteQueryData'>;\n\ntype QueryClientPrototype = typeof QueryClient.prototype;\n\ntype QueryKeyMethod<QFMethod extends keyof typeof QueryClient.prototype> =\n  QFMethod;\n"],"names":["callQueryClientMethodWithQueryKey","qraftOptions","queryFilterMethod","schema","infinite","args","requestFn","requestFnOption","baseUrl","baseUrlOption","queryFn","queryFnOption","parameters","options","queryClient","Error","queryKey","queryParams","signal","meta","pageParam","body","prepareRequestFnParameters","then","requestFnResponseResolver","requestFnResponseRejecter","undefined","composeInfiniteQueryKey","composeQueryKey"],"mappings":";;;;;;AASA;;;IAIO,SAASA,iCAAAA,CAGdC,YAAyC,EACzCC,iBAA2B,EAC3BC,MAAuB,EACvBC,QAAiB,EACjBC,IAAqC,EAAA;AAErC,IAAA,MAAM,EACJC,SAAWC,EAAAA,eAAe,EAC1BC,OAASC,EAAAA,aAAa,EACtBC,OAASC,EAAAA,aAAa,EACtBC,UAAU,EACV,GAAGC,OACJ,EAAA,GAAGR,IAAI,CAAC,CAAA,CAAE,IAAI,EAAC,CAAA;IAEhB,MAAMS,WAAAA,GAAcb,aAAaa,WAAW,CAAA;IAC5C,MAAMN,OAAAA,GAAUC,aAAiBR,IAAAA,YAAAA,CAAaO,OAAO,CAAA;AAErD,IAAA,IAAIG,iBAAiBJ,eAAiB,EAAA;AACpC,QAAA,MAAM,IAAIQ,KACR,CAAA,iGAAA,CAAA,CAAA;AAEJ,KAAA;IAEA,MAAMT,SAAAA,GAAYC,eAAmBN,IAAAA,YAAAA,CAAaK,SAAS,CAAA;IAE3D,IAAIO,OAAAA,CAAQG,QAAQ,IAAIJ,UAAY,EAAA;AAClC,QAAA,MAAM,IAAIG,KACR,CAAA,mGAAA,CAAA,CAAA;AAEJ,KAAA;AAEA,IAAA,MAAML,OACJC,GAAAA,aAAAA,KACCL,SAAAA,GAEG,SAAU,EAAEU,QAAAA,EAAU,GAAGC,WAAAA,CAAY,EAAEC,MAAM,EAAEC,IAAI,EAAEC,SAAS,EAAE,EAAA;QAC9D,MAAM,EAAER,UAAU,EAAES,IAAI,EAAE,GAAGC,0BAAAA,CAC3BL,aACAG,SACAhB,EAAAA,QAAAA,CAAAA,CAAAA;AAGF,QAAA,OAAOE,UAAUH,MAAQ,EAAA;YACvBS,UAAYA,EAAAA,UAAAA;AACZJ,YAAAA,OAAAA;AACAa,YAAAA,IAAAA;AACAH,YAAAA,MAAAA;AACAC,YAAAA,IAAAA;SACCI,CAAAA,CAAAA,IAAI,CAACC,yBAA2BC,EAAAA,yBAAAA,CAAAA,CAAAA;AACrC,KAAA,GACAC,SAAQ,CAAA,CAAA;;IAGd,OAAOZ,WAAW,CAACZ,iBAAAA,CAAkB,CAAC;AACpC,QAAA,GAAGW,OAAO;AACVH,QAAAA,OAAAA;QACAM,QACEH,EAAAA,OAAAA,CAAQG,QAAQ,KACfZ,QAAAA,GACGuB,wBAAwBxB,MAAQS,EAAAA,UAAAA,CAAAA,GAChCgB,eAAgBzB,CAAAA,MAAAA,EAAQS,UAAU,CAAA,CAAA;AAC1C,KAAA,CAAA,CAAA;AACF;;;;"}

package/dist/esm/lib/prepareRequestFnParameters.js

@@ -0,0 +1,44 @@
+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
+ */ function prepareRequestFnParameters(queryParams, pageParam, infinite) {
+    const { body, ...parameters } = queryParams;
+    if (!infinite) {
+        return {
+            parameters: parameters,
+            body: body
+        };
+    }
+    // Handle infinite query parameters
+    const processedParameters = shelfMerge(2, parameters, omitBodyFromPageParam(pageParam));
+    const processedBody = mergeBodyWithPageParam(body, pageParam);
+    return {
+        parameters: processedParameters,
+        body: processedBody
+    };
+}
+/**
+ * Remove body from pageParam if it exists
+ */ function omitBodyFromPageParam(pageParam) {
+    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, pageParam) {
+    if (pageParam && typeof pageParam === 'object' && 'body' in pageParam) {
+        return shelfMerge(1, body, pageParam.body);
+    }
+    return body;
+}
+
+export { prepareRequestFnParameters };
+//# sourceMappingURL=prepareRequestFnParameters.js.map

package/dist/esm/lib/prepareRequestFnParameters.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepareRequestFnParameters.js","sources":["../../../src/lib/prepareRequestFnParameters.ts"],"sourcesContent":["import { shelfMerge } from './shelfMerge.js';\n\n/**\n * Prepares parameters and body for requestFn calls, handling infinite query logic\n * @param queryParams - The query parameters that may contain body\n * @param pageParam - The page parameter for infinite queries\n * @param infinite - Whether this is for an infinite query\n * @returns Object with prepared parameters and body\n */\nexport function prepareRequestFnParameters<TQueryParams>(\n  queryParams: TQueryParams,\n  pageParam: unknown,\n  infinite: boolean\n): {\n  parameters: TQueryParams extends { body: any }\n    ? Omit<TQueryParams, 'body'>\n    : TQueryParams;\n  body: BodyInit | undefined;\n} {\n  const { body, ...parameters } = queryParams as {\n    body?: BodyInit;\n  } & TQueryParams;\n\n  if (!infinite) {\n    return {\n      parameters: parameters as never,\n      body: body as never,\n    };\n  }\n\n  // Handle infinite query parameters\n  const processedParameters = shelfMerge(\n    2,\n    parameters,\n    omitBodyFromPageParam(pageParam)\n  ) as never;\n\n  const processedBody = mergeBodyWithPageParam(body, pageParam) as never;\n\n  return {\n    parameters: processedParameters,\n    body: processedBody,\n  };\n}\n\n/**\n * Remove body from pageParam if it exists\n */\nfunction omitBodyFromPageParam(pageParam: unknown) {\n  if (pageParam && typeof pageParam === 'object' && 'body' in pageParam) {\n    const { body: _body, ...pageParameters } = pageParam;\n    return pageParameters;\n  }\n\n  return pageParam;\n}\n\n/**\n * Merge body with pageParam.body if pageParam contains body\n */\nfunction mergeBodyWithPageParam(\n  body: BodyInit | undefined,\n  pageParam: unknown\n): BodyInit | undefined {\n  if (pageParam && typeof pageParam === 'object' && 'body' in pageParam) {\n    return shelfMerge(1, body, pageParam.body) as BodyInit;\n  }\n\n  return body;\n}\n"],"names":["prepareRequestFnParameters","queryParams","pageParam","infinite","body","parameters","processedParameters","shelfMerge","omitBodyFromPageParam","processedBody","mergeBodyWithPageParam","_body","pageParameters"],"mappings":";;AAEA;;;;;;AAMC,IACM,SAASA,0BAAAA,CACdC,WAAyB,EACzBC,SAAkB,EAClBC,QAAiB,EAAA;AAOjB,IAAA,MAAM,EAAEC,IAAI,EAAE,GAAGC,YAAY,GAAGJ,WAAAA,CAAAA;AAIhC,IAAA,IAAI,CAACE,QAAU,EAAA;QACb,OAAO;YACLE,UAAYA,EAAAA,UAAAA;YACZD,IAAMA,EAAAA,IAAAA;AACR,SAAA,CAAA;AACF,KAAA;;AAGA,IAAA,MAAME,mBAAsBC,GAAAA,UAAAA,CAC1B,CACAF,EAAAA,UAAAA,EACAG,qBAAsBN,CAAAA,SAAAA,CAAAA,CAAAA,CAAAA;IAGxB,MAAMO,aAAAA,GAAgBC,uBAAuBN,IAAMF,EAAAA,SAAAA,CAAAA,CAAAA;IAEnD,OAAO;QACLG,UAAYC,EAAAA,mBAAAA;QACZF,IAAMK,EAAAA,aAAAA;AACR,KAAA,CAAA;AACF,CAAA;AAEA;;IAGA,SAASD,sBAAsBN,SAAkB,EAAA;AAC/C,IAAA,IAAIA,SAAa,IAAA,OAAOA,SAAc,KAAA,QAAA,IAAY,UAAUA,SAAW,EAAA;AACrE,QAAA,MAAM,EAAEE,IAAMO,EAAAA,KAAK,EAAE,GAAGC,gBAAgB,GAAGV,SAAAA,CAAAA;QAC3C,OAAOU,cAAAA,CAAAA;AACT,KAAA;IAEA,OAAOV,SAAAA,CAAAA;AACT,CAAA;AAEA;;AAEC,IACD,SAASQ,sBAAAA,CACPN,IAA0B,EAC1BF,SAAkB,EAAA;AAElB,IAAA,IAAIA,SAAa,IAAA,OAAOA,SAAc,KAAA,QAAA,IAAY,UAAUA,SAAW,EAAA;AACrE,QAAA,OAAOK,UAAW,CAAA,CAAA,EAAGH,IAAMF,EAAAA,SAAAA,CAAUE,IAAI,CAAA,CAAA;AAC3C,KAAA;IAEA,OAAOA,IAAAA,CAAAA;AACT;;;;"}

package/dist/esm/lib/requestFn.js

@@ -86,7 +86,8 @@ function getQueryString(params) {
         search.append(prefix, String(value));
     };
     Object.entries(params).forEach(([k, v])=>walk(k, v));
-    return search.toString() ? `?${search.toString()}` : '';
+    const searchString = search.toString();
+    return searchString ? `?${searchString}` : '';
 }
 function mergeHeaders(...allHeaders) {
     const headers = new Headers();

package/dist/esm/lib/requestFn.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestFn.js","sources":["../../../src/lib/requestFn.ts"],"sourcesContent":["import type {\n  HeadersOptions,\n  OperationSchema,\n  RequestFnInfo,\n  RequestFnOptions,\n  RequestFnResponse,\n} from '@openapi-qraft/tanstack-query-react-types';\nimport { processResponse, resolveResponse } from './responseUtils.js';\n\n/**\n * This function is used to make a request to a specified endpoint.\n *\n * @template T The expected return type of the request.\n *\n * @param schema The schema of the operation to be performed. It includes the OpenAPI path, HTTP method and media type.\n * @param requestInfo The information required to make the request. It includes parameters, headers, body, etc.\n * @param [options] Optional. Additional options for the request. It includes custom urlSerializer, bodySerializer, and fetch function.\n *\n * @returns {Promise<T>} Returns a promise that resolves with the response of the request.\n *\n * @throws {error: object|string, response: Response} Throws an error if the request fails. The error includes the error message and the response from the server.\n */\nexport async function requestFn<TData, TError>(\n  schema: OperationSchema,\n  requestInfo: RequestFnInfo,\n  options?: RequestFnOptions\n): Promise<RequestFnResponse<TData, TError>> {\n  return baseRequestFn<TData, TError>(schema, requestInfo, {\n    urlSerializer,\n    bodySerializer,\n    ...options,\n  });\n}\n\n/**\n * This function is used to make a request to a specified endpoint.\n * It's necessary to create a custom `requestFn` with a custom `urlSerializer`\n * and `bodySerializer`, with the tree-shaking of the default `requestFn`\n * and its serializers.\n *\n * @template T The expected return type of the request.\n *\n * @param requestSchema The schema of the operation to be performed. It includes the OpenAPI path, HTTP method and media type.\n * @param requestInfo The information required to make the request. It includes parameters, headers, body, etc.\n * @param options The options for the request. It includes urlSerializer, bodySerializer, and fetch function. The 'urlSerializer' and 'bodySerializer' are required.\n *\n * @returns {Promise<T>} Returns a promise that resolves with the response of the request.\n *\n * @throws {error: object|string, response: Response} Throws an error if the request fails. The error includes the error message and the response from the server.\n */\nexport async function baseRequestFn<TData, TError>(\n  requestSchema: OperationSchema,\n  requestInfo: RequestFnInfo,\n  options: WithRequired<RequestFnOptions, 'urlSerializer' | 'bodySerializer'>\n): Promise<RequestFnResponse<TData, TError>> {\n  const { parameters, headers, body, ...requestInfoRest } = requestInfo;\n\n  const requestPayload = options.bodySerializer(requestSchema, body);\n\n  const baseFetch = options.fetch ?? fetch;\n\n  return baseFetch(options.urlSerializer(requestSchema, requestInfo), {\n    method: requestSchema.method.toUpperCase(),\n    body: requestPayload?.body,\n    headers: mergeHeaders(\n      { Accept: 'application/json' },\n      requestPayload?.headers,\n      headers,\n      parameters?.header\n    ),\n    ...requestInfoRest,\n  })\n    .then(processResponse as typeof processResponse<TData, TError>)\n    .catch(resolveResponse as typeof resolveResponse<TData, TError>);\n}\n\n/**\n * Serializes the given schema and request payload into a URL string.\n *\n * This function is implemented according to the URI Template standard\n * defined in RFC 6570. It supports the expansion of path and query parameters,\n * correctly handling empty arrays, `null`, and `undefined` values by ignoring\n * them during the expansion process, as specified by the standard.\n *\n * For more information, refer to the official documentation:\n * https://datatracker.ietf.org/doc/html/rfc6570\n *\n * @param schema - The operation schema containing the URL template and method.\n * @param info - The request payload including baseUrl, path parameters, and query parameters.\n * @returns The fully constructed URL string.\n */\nexport function urlSerializer(\n  schema: OperationSchema,\n  info: Pick<RequestFnInfo, 'baseUrl' | 'parameters'>\n): string {\n  const path = schema.url.replace(\n    /{(.*?)}/g,\n    (substring: string, group: string) => {\n      if (\n        info.parameters?.path &&\n        Object.prototype.hasOwnProperty.call(info.parameters.path, group)\n      ) {\n        return encodeURIComponent(String(info.parameters?.path[group]));\n      }\n      return substring;\n    }\n  );\n\n  const baseUrl = info.baseUrl ?? '';\n\n  if (info.parameters?.query) {\n    return `${baseUrl}${path}${getQueryString(info.parameters.query)}`;\n  }\n\n  return `${baseUrl}${path}`;\n}\n\nfunction getQueryString(params: Record<string, any>): string {\n  const search = new URLSearchParams();\n\n  const walk = (prefix: string, value: any) => {\n    if (value == null) return;\n    if (value instanceof Date)\n      return search.append(prefix, value.toISOString());\n    if (Array.isArray(value)) return value.forEach((v) => walk(prefix, v));\n    if (typeof value === 'object') {\n      return Object.entries(value).forEach(([k, v]) =>\n        walk(`${prefix}[${k}]`, v)\n      );\n    }\n    search.append(prefix, String(value));\n  };\n\n  Object.entries(params).forEach(([k, v]) => walk(k, v));\n\n  return search.toString() ? `?${search.toString()}` : '';\n}\n\nexport function mergeHeaders(...allHeaders: (HeadersOptions | undefined)[]) {\n  const headers = new Headers();\n\n  for (const headerSet of allHeaders) {\n    if (!headerSet || typeof headerSet !== 'object') {\n      continue;\n    }\n\n    const headersIterator =\n      headerSet instanceof Headers\n        ? headerSet.entries()\n        : Object.entries(headerSet);\n\n    for (const [headerKey, headerValue] of headersIterator) {\n      if (headerValue === null) {\n        headers.delete(headerKey);\n      } else if (headerValue !== undefined) {\n        headers.set(headerKey, headerValue);\n      }\n    }\n  }\n\n  return headers;\n}\n\nexport function bodySerializer(\n  schema: OperationSchema,\n  body: RequestFnInfo['body']\n) {\n  if (isReadOnlyOperation(schema)) return undefined;\n\n  if (body === undefined || body === null) return undefined;\n\n  if (typeof body === 'string') {\n    return {\n      body,\n      headers: {\n        'Content-Type':\n          // prefer text/* media type\n          schema.mediaType?.find((mediaType) => mediaType.includes('text/')) ??\n          // prefer JSON media type, assume that body is serialized as JSON\n          schema.mediaType?.find((mediaType) => mediaType.includes('/json')) ??\n          'text/plain',\n      },\n    };\n  }\n\n  if (body instanceof FormData) {\n    return {\n      body,\n      headers: {\n        // remove `Content-Type` if the serialized body is FormData;\n        // the browser will correctly set Content-Type & boundary expression\n        'Content-Type': null,\n      },\n    };\n  }\n\n  if (body instanceof Blob) {\n    return {\n      body,\n      headers: {\n        'Content-Type':\n          body.type ||\n          schema.mediaType?.find(\n            (mediaType) =>\n              !(\n                mediaType.includes('text/') &&\n                mediaType.includes('/form-data') &&\n                mediaType.includes('/json')\n              )\n          ) ||\n          'application/octet-stream',\n      },\n    };\n  }\n\n  let jsonMediaType: string | null = null;\n  let formDataMediaType: string | null = null;\n\n  if (schema.mediaType) {\n    for (let i = 0; i < schema.mediaType.length; i++) {\n      const mediaType = schema.mediaType[i];\n      if (mediaType.includes('/json')) jsonMediaType = mediaType;\n      else if (mediaType.includes('/form-data')) formDataMediaType = mediaType;\n    }\n  }\n\n  if (formDataMediaType) {\n    if (\n      !jsonMediaType ||\n      // Prefer FormData serialization if one of the fields is a Blob\n      Object.values(body).some((value) => value instanceof Blob)\n    ) {\n      return {\n        body: getRequestBodyFormData(body),\n        headers: {\n          // remove `Content-Type` if the serialized body is FormData;\n          // the browser will correctly set Content-Type & boundary expression\n          'Content-Type': null,\n        },\n      };\n    }\n  }\n\n  return {\n    body: JSON.stringify(body),\n    headers: {\n      'Content-Type': jsonMediaType ?? 'application/json',\n    },\n  };\n}\n\nfunction getRequestBodyFormData(\n  body: NonNullable<RequestFnInfo['body']>\n): FormData {\n  if (body instanceof FormData) return body;\n  if (typeof body !== 'object')\n    throw new Error(`Unsupported body type ${typeof body} in form-data.`);\n\n  const formData = new FormData();\n\n  const process = (key: string, value: any) => {\n    if (typeof value === 'string' || value instanceof Blob) {\n      formData.append(key, value);\n    } else {\n      formData.append(key, JSON.stringify(value));\n    }\n  };\n\n  Object.entries(body)\n    .filter(([_, value]) => typeof value !== 'undefined' && value !== null)\n    .forEach(([key, value]) => {\n      if (Array.isArray(value)) {\n        value.forEach((v) => process(key, v));\n      } else {\n        process(key, value);\n      }\n    });\n\n  return formData;\n}\n\ntype WithRequired<T, K extends keyof T> = T & {\n  [_ in K]: {};\n};\n\nexport type {\n  RequestFn,\n  RequestFnResponse,\n  HeadersOptions,\n  RequestFnOptions,\n  RequestFnInfo,\n  OperationSchema,\n} from '@openapi-qraft/tanstack-query-react-types';\n\n/**\n * @deprecated use `RequestFnInfo` instead\n */\nexport type RequestFnPayload = RequestFnInfo;\n\nfunction isReadOnlyOperation(operation: {\n  readonly method:\n    | 'get'\n    | 'put'\n    | 'post'\n    | 'patch'\n    | 'delete'\n    | 'options'\n    | 'head'\n    | 'trace';\n}) {\n  return (\n    operation.method === 'get' ||\n    operation.method === 'head' ||\n    operation.method === 'trace' ||\n    operation.method === 'options'\n  );\n}\n"],"names":["requestFn","schema","requestInfo","options","baseRequestFn","urlSerializer","bodySerializer","requestSchema","parameters","headers","body","requestInfoRest","requestPayload","baseFetch","fetch","method","toUpperCase","mergeHeaders","Accept","header","then","processResponse","catch","resolveResponse","info","path","url","replace","substring","group","Object","prototype","hasOwnProperty","call","encodeURIComponent","String","baseUrl","query","getQueryString","params","search","URLSearchParams","walk","prefix","value","Date","append","toISOString","Array","isArray","forEach","v","entries","k","toString","allHeaders","Headers","headerSet","headersIterator","headerKey","headerValue","delete","undefined","set","isReadOnlyOperation","mediaType","find","includes","FormData","Blob","type","jsonMediaType","formDataMediaType","i","length","values","some","getRequestBodyFormData","JSON","stringify","Error","formData","process","key","filter","_","operation"],"mappings":"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"}
+{"version":3,"file":"requestFn.js","sources":["../../../src/lib/requestFn.ts"],"sourcesContent":["import type {\n  HeadersOptions,\n  OperationSchema,\n  RequestFnInfo,\n  RequestFnOptions,\n  RequestFnResponse,\n} from '@openapi-qraft/tanstack-query-react-types';\nimport { processResponse, resolveResponse } from './responseUtils.js';\n\n/**\n * This function is used to make a request to a specified endpoint.\n *\n * @template T The expected return type of the request.\n *\n * @param schema The schema of the operation to be performed. It includes the OpenAPI path, HTTP method and media type.\n * @param requestInfo The information required to make the request. It includes parameters, headers, body, etc.\n * @param [options] Optional. Additional options for the request. It includes custom urlSerializer, bodySerializer, and fetch function.\n *\n * @returns {Promise<T>} Returns a promise that resolves with the response of the request.\n *\n * @throws {error: object|string, response: Response} Throws an error if the request fails. The error includes the error message and the response from the server.\n */\nexport async function requestFn<TData, TError>(\n  schema: OperationSchema,\n  requestInfo: RequestFnInfo,\n  options?: RequestFnOptions\n): Promise<RequestFnResponse<TData, TError>> {\n  return baseRequestFn<TData, TError>(schema, requestInfo, {\n    urlSerializer,\n    bodySerializer,\n    ...options,\n  });\n}\n\n/**\n * This function is used to make a request to a specified endpoint.\n * It's necessary to create a custom `requestFn` with a custom `urlSerializer`\n * and `bodySerializer`, with the tree-shaking of the default `requestFn`\n * and its serializers.\n *\n * @template T The expected return type of the request.\n *\n * @param requestSchema The schema of the operation to be performed. It includes the OpenAPI path, HTTP method and media type.\n * @param requestInfo The information required to make the request. It includes parameters, headers, body, etc.\n * @param options The options for the request. It includes urlSerializer, bodySerializer, and fetch function. The 'urlSerializer' and 'bodySerializer' are required.\n *\n * @returns {Promise<T>} Returns a promise that resolves with the response of the request.\n *\n * @throws {error: object|string, response: Response} Throws an error if the request fails. The error includes the error message and the response from the server.\n */\nexport async function baseRequestFn<TData, TError>(\n  requestSchema: OperationSchema,\n  requestInfo: RequestFnInfo,\n  options: WithRequired<RequestFnOptions, 'urlSerializer' | 'bodySerializer'>\n): Promise<RequestFnResponse<TData, TError>> {\n  const { parameters, headers, body, ...requestInfoRest } = requestInfo;\n\n  const requestPayload = options.bodySerializer(requestSchema, body);\n\n  const baseFetch = options.fetch ?? fetch;\n\n  return baseFetch(options.urlSerializer(requestSchema, requestInfo), {\n    method: requestSchema.method.toUpperCase(),\n    body: requestPayload?.body,\n    headers: mergeHeaders(\n      { Accept: 'application/json' },\n      requestPayload?.headers,\n      headers,\n      parameters?.header\n    ),\n    ...requestInfoRest,\n  })\n    .then(processResponse as typeof processResponse<TData, TError>)\n    .catch(resolveResponse as typeof resolveResponse<TData, TError>);\n}\n\n/**\n * Serializes the given schema and request payload into a URL string.\n *\n * This function is implemented according to the URI Template standard\n * defined in RFC 6570. It supports the expansion of path and query parameters,\n * correctly handling empty arrays, `null`, and `undefined` values by ignoring\n * them during the expansion process, as specified by the standard.\n *\n * For more information, refer to the official documentation:\n * https://datatracker.ietf.org/doc/html/rfc6570\n *\n * @param schema - The operation schema containing the URL template and method.\n * @param info - The request payload including baseUrl, path parameters, and query parameters.\n * @returns The fully constructed URL string.\n */\nexport function urlSerializer(\n  schema: OperationSchema,\n  info: Pick<RequestFnInfo, 'baseUrl' | 'parameters'>\n): string {\n  const path = schema.url.replace(\n    /{(.*?)}/g,\n    (substring: string, group: string) => {\n      if (\n        info.parameters?.path &&\n        Object.prototype.hasOwnProperty.call(info.parameters.path, group)\n      ) {\n        return encodeURIComponent(String(info.parameters?.path[group]));\n      }\n      return substring;\n    }\n  );\n\n  const baseUrl = info.baseUrl ?? '';\n\n  if (info.parameters?.query) {\n    return `${baseUrl}${path}${getQueryString(info.parameters.query)}`;\n  }\n\n  return `${baseUrl}${path}`;\n}\n\nfunction getQueryString(params: Record<string, any>): string {\n  const search = new URLSearchParams();\n\n  const walk = (prefix: string, value: any) => {\n    if (value == null) return;\n    if (value instanceof Date)\n      return search.append(prefix, value.toISOString());\n    if (Array.isArray(value)) return value.forEach((v) => walk(prefix, v));\n    if (typeof value === 'object') {\n      return Object.entries(value).forEach(([k, v]) =>\n        walk(`${prefix}[${k}]`, v)\n      );\n    }\n    search.append(prefix, String(value));\n  };\n\n  Object.entries(params).forEach(([k, v]) => walk(k, v));\n\n  const searchString = search.toString();\n\n  return searchString ? `?${searchString}` : '';\n}\n\nexport function mergeHeaders(...allHeaders: (HeadersOptions | undefined)[]) {\n  const headers = new Headers();\n\n  for (const headerSet of allHeaders) {\n    if (!headerSet || typeof headerSet !== 'object') {\n      continue;\n    }\n\n    const headersIterator =\n      headerSet instanceof Headers\n        ? headerSet.entries()\n        : Object.entries(headerSet);\n\n    for (const [headerKey, headerValue] of headersIterator) {\n      if (headerValue === null) {\n        headers.delete(headerKey);\n      } else if (headerValue !== undefined) {\n        headers.set(headerKey, headerValue);\n      }\n    }\n  }\n\n  return headers;\n}\n\nexport function bodySerializer(\n  schema: OperationSchema,\n  body: RequestFnInfo['body']\n) {\n  if (isReadOnlyOperation(schema)) return undefined;\n\n  if (body === undefined || body === null) return undefined;\n\n  if (typeof body === 'string') {\n    return {\n      body,\n      headers: {\n        'Content-Type':\n          // prefer text/* media type\n          schema.mediaType?.find((mediaType) => mediaType.includes('text/')) ??\n          // prefer JSON media type, assume that body is serialized as JSON\n          schema.mediaType?.find((mediaType) => mediaType.includes('/json')) ??\n          'text/plain',\n      },\n    };\n  }\n\n  if (body instanceof FormData) {\n    return {\n      body,\n      headers: {\n        // remove `Content-Type` if the serialized body is FormData;\n        // the browser will correctly set Content-Type & boundary expression\n        'Content-Type': null,\n      },\n    };\n  }\n\n  if (body instanceof Blob) {\n    return {\n      body,\n      headers: {\n        'Content-Type':\n          body.type ||\n          schema.mediaType?.find(\n            (mediaType) =>\n              !(\n                mediaType.includes('text/') &&\n                mediaType.includes('/form-data') &&\n                mediaType.includes('/json')\n              )\n          ) ||\n          'application/octet-stream',\n      },\n    };\n  }\n\n  let jsonMediaType: string | null = null;\n  let formDataMediaType: string | null = null;\n\n  if (schema.mediaType) {\n    for (let i = 0; i < schema.mediaType.length; i++) {\n      const mediaType = schema.mediaType[i];\n      if (mediaType.includes('/json')) jsonMediaType = mediaType;\n      else if (mediaType.includes('/form-data')) formDataMediaType = mediaType;\n    }\n  }\n\n  if (formDataMediaType) {\n    if (\n      !jsonMediaType ||\n      // Prefer FormData serialization if one of the fields is a Blob\n      Object.values(body).some((value) => value instanceof Blob)\n    ) {\n      return {\n        body: getRequestBodyFormData(body),\n        headers: {\n          // remove `Content-Type` if the serialized body is FormData;\n          // the browser will correctly set Content-Type & boundary expression\n          'Content-Type': null,\n        },\n      };\n    }\n  }\n\n  return {\n    body: JSON.stringify(body),\n    headers: {\n      'Content-Type': jsonMediaType ?? 'application/json',\n    },\n  };\n}\n\nfunction getRequestBodyFormData(\n  body: NonNullable<RequestFnInfo['body']>\n): FormData {\n  if (body instanceof FormData) return body;\n  if (typeof body !== 'object')\n    throw new Error(`Unsupported body type ${typeof body} in form-data.`);\n\n  const formData = new FormData();\n\n  const process = (key: string, value: any) => {\n    if (typeof value === 'string' || value instanceof Blob) {\n      formData.append(key, value);\n    } else {\n      formData.append(key, JSON.stringify(value));\n    }\n  };\n\n  Object.entries(body)\n    .filter(([_, value]) => typeof value !== 'undefined' && value !== null)\n    .forEach(([key, value]) => {\n      if (Array.isArray(value)) {\n        value.forEach((v) => process(key, v));\n      } else {\n        process(key, value);\n      }\n    });\n\n  return formData;\n}\n\ntype WithRequired<T, K extends keyof T> = T & {\n  [_ in K]: {};\n};\n\nexport type {\n  RequestFn,\n  RequestFnResponse,\n  HeadersOptions,\n  RequestFnOptions,\n  RequestFnInfo,\n  OperationSchema,\n} from '@openapi-qraft/tanstack-query-react-types';\n\n/**\n * @deprecated use `RequestFnInfo` instead\n */\nexport type RequestFnPayload = RequestFnInfo;\n\nfunction isReadOnlyOperation(operation: {\n  readonly method:\n    | 'get'\n    | 'put'\n    | 'post'\n    | 'patch'\n    | 'delete'\n    | 'options'\n    | 'head'\n    | 'trace';\n}) {\n  return (\n    operation.method === 'get' ||\n    operation.method === 'head' ||\n    operation.method === 'trace' ||\n    operation.method === 'options'\n  );\n}\n"],"names":["requestFn","schema","requestInfo","options","baseRequestFn","urlSerializer","bodySerializer","requestSchema","parameters","headers","body","requestInfoRest","requestPayload","baseFetch","fetch","method","toUpperCase","mergeHeaders","Accept","header","then","processResponse","catch","resolveResponse","info","path","url","replace","substring","group","Object","prototype","hasOwnProperty","call","encodeURIComponent","String","baseUrl","query","getQueryString","params","search","URLSearchParams","walk","prefix","value","Date","append","toISOString","Array","isArray","forEach","v","entries","k","searchString","toString","allHeaders","Headers","headerSet","headersIterator","headerKey","headerValue","delete","undefined","set","isReadOnlyOperation","mediaType","find","includes","FormData","Blob","type","jsonMediaType","formDataMediaType","i","length","values","some","getRequestBodyFormData","JSON","stringify","Error","formData","process","key","filter","_","operation"],"mappings":"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"}

package/dist/esm/lib/useComposeUseQueryOptions.js

@@ -1,9 +1,9 @@
 'use client';
 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.
@@ -11,10 +11,9 @@ import { shelfMerge } from './shelfMerge.js';
  */ function useComposeUseQueryOptions(qraftOptions, schema, args, infinite) {
     const [parameters, options] = args;
     const queryFn = options?.queryFn ?? function({ queryKey: [, queryParams], signal, meta, pageParam }) {
-        const { body, ...parameters } = queryParams;
+        const { parameters, body } = prepareRequestFnParameters(queryParams, pageParam, infinite);
         return qraftOptions.requestFn(schema, {
-            // @ts-expect-error - Too complex to type
-            parameters: infinite ? shelfMerge(2, parameters, pageParam) : parameters,
+            parameters: parameters,
             baseUrl: qraftOptions.baseUrl,
             body,
             signal,

package/dist/esm/lib/useComposeUseQueryOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"useComposeUseQueryOptions.js","sources":["../../../src/lib/useComposeUseQueryOptions.ts"],"sourcesContent":["'use client';\n\nimport type { ServiceOperationQueryKey } from '@openapi-qraft/tanstack-query-react-types';\nimport type { QueryClient, UseQueryOptions } from '@tanstack/react-query';\nimport type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';\nimport type { OperationSchema } from './requestFn.js';\nimport { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';\nimport { composeQueryKey } from './composeQueryKey.js';\nimport { requestFnResponseRejecter } from './requestFnResponseRejecter.js';\nimport { requestFnResponseResolver } from './requestFnResponseResolver.js';\nimport { shelfMerge } from './shelfMerge.js';\n\n/**\n * Composes the options for useQuery, useInfiniteQuery, useSuspenseQuery, and useSuspenseQueries.\n * @internal\n */\nexport function useComposeUseQueryOptions(\n  qraftOptions: CreateAPIQueryClientOptions,\n  schema: OperationSchema,\n  args: UseQueryOptionsArgs,\n  infinite: boolean\n): never {\n  const [parameters, options] = args;\n\n  const queryFn =\n    options?.queryFn ??\n    function ({ queryKey: [, queryParams], signal, meta, pageParam }) {\n      const { body, ...parameters } = queryParams as {\n        body: BodyInit;\n        parameters: Record<string, unknown>;\n      };\n\n      return qraftOptions\n        .requestFn(schema, {\n          // @ts-expect-error - Too complex to type\n          parameters: infinite\n            ? (shelfMerge(2, parameters, pageParam) as never)\n            : parameters,\n          baseUrl: qraftOptions.baseUrl,\n          body,\n          signal,\n          meta,\n        })\n        .then(requestFnResponseResolver, requestFnResponseRejecter);\n    };\n\n  const queryKey = Array.isArray(parameters)\n    ? (parameters as ServiceOperationQueryKey<OperationSchema, unknown>)\n    : infinite\n      ? composeInfiniteQueryKey(schema, parameters)\n      : composeQueryKey(schema, parameters);\n\n  return [{ ...options, queryFn, queryKey }, qraftOptions.queryClient] as never;\n}\n\ntype UseQueryOptionsArgs = [\n  parameters: unknown,\n  options?: UseQueryOptions,\n  queryClient?: QueryClient,\n];\n"],"names":["useComposeUseQueryOptions","qraftOptions","schema","args","infinite","parameters","options","queryFn","queryKey","queryParams","signal","meta","pageParam","body","requestFn","shelfMerge","baseUrl","then","requestFnResponseResolver","requestFnResponseRejecter","Array","isArray","composeInfiniteQueryKey","composeQueryKey","queryClient"],"mappings":"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"}
+{"version":3,"file":"useComposeUseQueryOptions.js","sources":["../../../src/lib/useComposeUseQueryOptions.ts"],"sourcesContent":["'use client';\n\nimport type { ServiceOperationQueryKey } from '@openapi-qraft/tanstack-query-react-types';\nimport type { QueryClient, UseQueryOptions } from '@tanstack/react-query';\nimport type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';\nimport type { OperationSchema } from './requestFn.js';\nimport { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';\nimport { composeQueryKey } from './composeQueryKey.js';\nimport { prepareRequestFnParameters } from './prepareRequestFnParameters.js';\nimport { requestFnResponseRejecter } from './requestFnResponseRejecter.js';\nimport { requestFnResponseResolver } from './requestFnResponseResolver.js';\n\n/**\n * Composes the options for useQuery, useInfiniteQuery, useSuspenseQuery, and useSuspenseQueries.\n * @internal\n */\nexport function useComposeUseQueryOptions(\n  qraftOptions: CreateAPIQueryClientOptions,\n  schema: OperationSchema,\n  args: UseQueryOptionsArgs,\n  infinite: boolean\n): never {\n  const [parameters, options] = args;\n\n  const queryFn =\n    options?.queryFn ??\n    function ({ queryKey: [, queryParams], signal, meta, pageParam }) {\n      const { parameters, body } = prepareRequestFnParameters(\n        queryParams,\n        pageParam,\n        infinite\n      );\n\n      return qraftOptions\n        .requestFn(schema, {\n          parameters: parameters as never,\n          baseUrl: qraftOptions.baseUrl,\n          body,\n          signal,\n          meta,\n        })\n        .then(requestFnResponseResolver, requestFnResponseRejecter);\n    };\n\n  const queryKey = Array.isArray(parameters)\n    ? (parameters as ServiceOperationQueryKey<OperationSchema, unknown>)\n    : infinite\n      ? composeInfiniteQueryKey(schema, parameters)\n      : composeQueryKey(schema, parameters);\n\n  return [{ ...options, queryFn, queryKey }, qraftOptions.queryClient] as never;\n}\n\ntype UseQueryOptionsArgs = [\n  parameters: unknown,\n  options?: UseQueryOptions,\n  queryClient?: QueryClient,\n];\n"],"names":["useComposeUseQueryOptions","qraftOptions","schema","args","infinite","parameters","options","queryFn","queryKey","queryParams","signal","meta","pageParam","body","prepareRequestFnParameters","requestFn","baseUrl","then","requestFnResponseResolver","requestFnResponseRejecter","Array","isArray","composeInfiniteQueryKey","composeQueryKey","queryClient"],"mappings":"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"}

package/dist/types/lib/callQueryClientFetchMethod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callQueryClientFetchMethod.d.ts","sourceRoot":"","sources":["../../../src/lib/callQueryClientFetchMethod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAOjE;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,SAAS,eAAe,EAEhC,YAAY,EAAE,2BAA2B,EACzC,iBAAiB,EAAE,QAAQ,EAC3B,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,qBAAqB,CAAC,QAAQ,CAAC,GACpC,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAoDtD;AAED,KAAK,qBAAqB,CAAC,OAAO,SAAS,MAAM,oBAAoB,IAAI;IACvE,OAAO,EAAE,UAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACtD,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACzC;IACD,WAAW,EAAE,WAAW;CACzB,CAAC;AAEF,KAAK,eAAe,GAChB,cAAc,CAAC,YAAY,CAAC,GAC5B,cAAc,CAAC,eAAe,CAAC,GAC/B,cAAc,CAAC,iBAAiB,CAAC,GACjC,cAAc,CAAC,oBAAoB,CAAC,GACpC,cAAc,CAAC,uBAAuB,CAAC,GACvC,cAAc,CAAC,yBAAyB,CAAC,CAAC;AAE9C,KAAK,oBAAoB,GAAG,OAAO,WAAW,CAAC,SAAS,CAAC;AAEzD,KAAK,cAAc,CAAC,QAAQ,SAAS,MAAM,OAAO,WAAW,CAAC,SAAS,IACrE,QAAQ,CAAC"}
+{"version":3,"file":"callQueryClientFetchMethod.d.ts","sourceRoot":"","sources":["../../../src/lib/callQueryClientFetchMethod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAOjE;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,SAAS,eAAe,EAEhC,YAAY,EAAE,2BAA2B,EACzC,iBAAiB,EAAE,QAAQ,EAC3B,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,qBAAqB,CAAC,QAAQ,CAAC,GACpC,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAyDtD;AAED,KAAK,qBAAqB,CAAC,OAAO,SAAS,MAAM,oBAAoB,IAAI;IACvE,OAAO,EAAE,UAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACtD,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACzC;IACD,WAAW,EAAE,WAAW;CACzB,CAAC;AAEF,KAAK,eAAe,GAChB,cAAc,CAAC,YAAY,CAAC,GAC5B,cAAc,CAAC,eAAe,CAAC,GAC/B,cAAc,CAAC,iBAAiB,CAAC,GACjC,cAAc,CAAC,oBAAoB,CAAC,GACpC,cAAc,CAAC,uBAAuB,CAAC,GACvC,cAAc,CAAC,yBAAyB,CAAC,CAAC;AAE9C,KAAK,oBAAoB,GAAG,OAAO,WAAW,CAAC,SAAS,CAAC;AAEzD,KAAK,cAAc,CAAC,QAAQ,SAAS,MAAM,OAAO,WAAW,CAAC,SAAS,IACrE,QAAQ,CAAC"}

package/dist/types/lib/prepareRequestFnParameters.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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 declare function prepareRequestFnParameters<TQueryParams>(queryParams: TQueryParams, pageParam: unknown, infinite: boolean): {
+    parameters: TQueryParams extends {
+        body: any;
+    } ? Omit<TQueryParams, 'body'> : TQueryParams;
+    body: BodyInit | undefined;
+};
+//# sourceMappingURL=prepareRequestFnParameters.d.ts.map

package/dist/types/lib/prepareRequestFnParameters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepareRequestFnParameters.d.ts","sourceRoot":"","sources":["../../../src/lib/prepareRequestFnParameters.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,YAAY,EACrD,WAAW,EAAE,YAAY,EACzB,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,GAChB;IACD,UAAU,EAAE,YAAY,SAAS;QAAE,IAAI,EAAE,GAAG,CAAA;KAAE,GAC1C,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,GAC1B,YAAY,CAAC;IACjB,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;CAC5B,CAyBA"}

package/dist/types/lib/requestFn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestFn.d.ts","sourceRoot":"","sources":["../../../src/lib/requestFn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,2CAA2C,CAAC;AAGnD;;;;;;;;;;;;GAYG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,EAC3C,MAAM,EAAE,eAAe,EACvB,WAAW,EAAE,aAAa,EAC1B,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAM3C;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAC/C,aAAa,EAAE,eAAe,EAC9B,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,YAAY,CAAC,gBAAgB,EAAE,eAAe,GAAG,gBAAgB,CAAC,GAC1E,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAoB3C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,YAAY,CAAC,GAClD,MAAM,CAqBR;AAuBD,wBAAgB,YAAY,CAAC,GAAG,UAAU,EAAE,CAAC,cAAc,GAAG,SAAS,CAAC,EAAE,WAuBzE;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;cAoF5B;AAgCD,KAAK,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG;KAC3C,CAAC,IAAI,CAAC,GAAG,EAAE;CACb,CAAC;AAEF,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,eAAe,GAChB,MAAM,2CAA2C,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC"}
+{"version":3,"file":"requestFn.d.ts","sourceRoot":"","sources":["../../../src/lib/requestFn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,2CAA2C,CAAC;AAGnD;;;;;;;;;;;;GAYG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,EAC3C,MAAM,EAAE,eAAe,EACvB,WAAW,EAAE,aAAa,EAC1B,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAM3C;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAC/C,aAAa,EAAE,eAAe,EAC9B,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,YAAY,CAAC,gBAAgB,EAAE,eAAe,GAAG,gBAAgB,CAAC,GAC1E,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAoB3C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,YAAY,CAAC,GAClD,MAAM,CAqBR;AAyBD,wBAAgB,YAAY,CAAC,GAAG,UAAU,EAAE,CAAC,cAAc,GAAG,SAAS,CAAC,EAAE,WAuBzE;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;cAoF5B;AAgCD,KAAK,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG;KAC3C,CAAC,IAAI,CAAC,GAAG,EAAE;CACb,CAAC;AAEF,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,eAAe,GAChB,MAAM,2CAA2C,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC"}

package/dist/types/lib/useComposeUseQueryOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useComposeUseQueryOptions.d.ts","sourceRoot":"","sources":["../../../src/lib/useComposeUseQueryOptions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAOtD;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,2BAA2B,EACzC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,OAAO,GAChB,KAAK,CAgCP;AAED,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,OAAO;IACnB,OAAO,CAAC,EAAE,eAAe;IACzB,WAAW,CAAC,EAAE,WAAW;CAC1B,CAAC"}
+{"version":3,"file":"useComposeUseQueryOptions.d.ts","sourceRoot":"","sources":["../../../src/lib/useComposeUseQueryOptions.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAOtD;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,2BAA2B,EACzC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,mBAAmB,EACzB,QAAQ,EAAE,OAAO,GAChB,KAAK,CA8BP;AAED,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,OAAO;IACnB,OAAO,CAAC,EAAE,eAAe;IACzB,WAAW,CAAC,EAAE,WAAW;CAC1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/react",
-  "version": "2.10.0",
+  "version": "2.10.2",
   "description": "OpenAPI client for React, providing type-safe requests and dynamic TanStack Query React Hooks via a modular, Proxy-based architecture.",
   "scripts": {
     "build": "NODE_ENV=production rollup --config rollup.config.mjs && tsc --project tsconfig.build.json --emitDeclarationOnly",
@@ -15,19 +15,19 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@openapi-qraft/tanstack-query-react-types": "2.10.0"
+    "@openapi-qraft/tanstack-query-react-types": "2.10.2"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.80.0",
     "react": "^18 || ^19"
   },
   "devDependencies": {
-    "@openapi-qraft/cli": "2.10.0",
+    "@openapi-qraft/cli": "2.10.2",
     "@openapi-qraft/eslint-config": "1.0.1",
-    "@openapi-qraft/openapi-typescript-plugin": "^1.2.26",
+    "@openapi-qraft/openapi-typescript-plugin": "^1.2.28",
     "@openapi-qraft/rollup-config": "1.1.1",
-    "@openapi-qraft/tanstack-query-react-plugin": "2.10.0",
-    "@openapi-qraft/test-fixtures": "1.1.0",
+    "@openapi-qraft/tanstack-query-react-plugin": "2.10.2",
+    "@openapi-qraft/test-fixtures": "1.1.1",
     "@tanstack/react-query": "^5.80.6",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",

package/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,11 +50,16 @@ export function callQueryClientMethodWithQueryKey<
     (requestFn
       ? // @ts-expect-error - Too complex union to type
         function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
+          const { parameters, body } = prepareRequestFnParameters(
+            queryParams,
+            pageParam,
+            infinite
+          );
+
           return requestFn(schema, {
-            parameters: infinite
-              ? (shelfMerge(2, queryParams, pageParam) as never)
-              : queryParams,
+            parameters: parameters as never,
             baseUrl,
+            body,
             signal,
             meta,
           }).then(requestFnResponseResolver, requestFnResponseRejecter);

package/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;
+}

package/src/lib/requestFn.ts

@@ -133,7 +133,9 @@ function getQueryString(params: Record<string, any>): string {
 
   Object.entries(params).forEach(([k, v]) => walk(k, v));
 
-  return search.toString() ? `?${search.toString()}` : '';
+  const searchString = search.toString();
+
+  return searchString ? `?${searchString}` : '';
 }
 
 export function mergeHeaders(...allHeaders: (HeadersOptions | undefined)[]) {

package/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,17 +25,15 @@ 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, pageParam) as never)
-            : parameters,
+          parameters: parameters as never,
           baseUrl: qraftOptions.baseUrl,
           body,
           signal,