@openapi-qraft/react 2.0.0-next.10 → 2.0.0-next.11

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @openapi-qraft/react
 
+## 2.0.0-next.11
+
+### Patch Changes
+
+- 3ed94dc: Implemented support for requests with multiple media types. Now, if an endpoint accepts more than one media type (e.g., JSON and form-data), types will be generated to account for all possible cases, ensuring compatibility with both JSON and form-data input formats.
+- Updated dependencies [3ed94dc]
+  - @openapi-qraft/tanstack-query-react-types@2.0.0-next.11
+
 ## 2.0.0-next.10
 
 ### Patch Changes

package/dist/cjs/lib/requestFn.cjs

@@ -1,5 +1,7 @@
 'use strict';
 
+var responseUtils = require('./responseUtils.cjs');
+
 /**
  * This function is used to make a request to a specified endpoint.
  *
@@ -21,7 +23,7 @@
 }
 /**
  * This function is used to make a request to a specified endpoint.
- * It's needed to create a custom `requestFn` with a custom `urlSerializer`
+ * It's necessary to create a custom `requestFn` with a custom `urlSerializer`
  * and `bodySerializer`, with the tree-shaking of the default `requestFn`
  * and its serializers.
  *
@@ -36,19 +38,16 @@
  * @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.
  */ async function baseRequestFn(requestSchema, requestInfo, options) {
     const { parameters, headers, body, ...requestInfoRest } = requestInfo;
-    const requestBody = options.bodySerializer(requestSchema, requestInfo);
+    const requestPayload = options.bodySerializer(requestSchema, body);
     const baseFetch = options.fetch ?? fetch;
     return baseFetch(options.urlSerializer(requestSchema, requestInfo), {
         method: requestSchema.method.toUpperCase(),
-        body: requestBody,
+        body: requestPayload?.body,
         headers: mergeHeaders({
-            Accept: 'application/json',
-            'Content-Type': requestSchema.mediaType ?? getBodyContentType(body)
-        }, headers, parameters?.header, requestBody instanceof FormData ? {
-            'Content-Type': null
-        } : undefined),
+            Accept: 'application/json'
+        }, requestPayload?.headers, headers, parameters?.header),
         ...requestInfoRest
-    }).then(processResponse).catch(resolveResponse);
+    }).then(responseUtils.processResponse).catch(responseUtils.resolveResponse);
 }
 /**
  * Serializes the given schema and request payload into a URL string.
@@ -121,23 +120,68 @@ function mergeHeaders(...allHeaders) {
     }
     return headers;
 }
-function bodySerializer(schema, info) {
-    if (info.body === undefined) return;
-    if (schema.method === 'get' || schema.method === 'head' || schema.method === 'options') return;
-    if (schema.mediaType?.includes('/form-data')) return getRequestBodyFormData(info);
-    if (!schema.mediaType?.includes('/json') && (typeof info.body === 'string' || info.body instanceof Blob || info.body instanceof FormData)) {
-        return info.body;
+function bodySerializer(schema, body) {
+    if (schema.method === 'get' || schema.method === 'head' || schema.method === 'options') return undefined;
+    if (body === undefined || body === null) return undefined;
+    if (typeof body === 'string') {
+        return {
+            body,
+            headers: {
+                'Content-Type': // prefer text/* media type
+                schema.mediaType?.find((mediaType)=>mediaType.includes('text/')) ?? // prefer JSON media type, assume that body is serialized as JSON
+                schema.mediaType?.find((mediaType)=>mediaType.includes('/json')) ?? 'text/plain'
+            }
+        };
+    }
+    if (body instanceof FormData) {
+        return {
+            body,
+            headers: {
+                // remove `Content-Type` if the serialized body is FormData;
+                // the browser will correctly set Content-Type & boundary expression
+                'Content-Type': null
+            }
+        };
+    }
+    if (body instanceof Blob) {
+        return {
+            body,
+            headers: {
+                'Content-Type': body.type || schema.mediaType?.find((mediaType)=>!(mediaType.includes('text/') && mediaType.includes('/form-data') && mediaType.includes('/json'))) || 'application/octet-stream'
+            }
+        };
+    }
+    let jsonMediaType = null;
+    let formDataMediaType = null;
+    if (schema.mediaType) {
+        for(let i = 0; i < schema.mediaType.length; i++){
+            const mediaType = schema.mediaType[i];
+            if (mediaType.includes('/json')) jsonMediaType = mediaType;
+            else if (mediaType.includes('/form-data')) formDataMediaType = mediaType;
+        }
+    }
+    if (formDataMediaType) {
+        if (!jsonMediaType || // Prefer FormData serialization if one of the fields is a Blob
+        Object.values(body).some((value)=>value instanceof Blob)) {
+            return {
+                body: getRequestBodyFormData(body),
+                headers: {
+                    // remove `Content-Type` if the serialized body is FormData;
+                    // the browser will correctly set Content-Type & boundary expression
+                    'Content-Type': null
+                }
+            };
+        }
     }
-    return JSON.stringify(info.body);
+    return {
+        body: JSON.stringify(body),
+        headers: {
+            'Content-Type': jsonMediaType ?? 'application/json'
+        }
+    };
 }
-function getRequestBodyFormData({ body }) {
+function getRequestBodyFormData(body) {
     if (body instanceof FormData) return body;
-    if (body === null) return;
-    if (body instanceof Blob) throw new Error('Blob not supported in form-data');
-    if (body instanceof ArrayBuffer) throw new Error('ArrayBuffer not supported in form-data');
-    if (body instanceof URLSearchParams) throw new Error('URLSearchParams not supported in form-data');
-    if (body instanceof ReadableStream) throw new Error('ReadableStream not supported in form-data');
-    if (typeof body === 'string') throw new Error('String not supported in form-data');
     if (typeof body !== 'object') throw new Error(`Unsupported body type ${typeof body} in form-data.`);
     const formData = new FormData();
     const process = (key, value)=>{
@@ -156,47 +200,6 @@ function getRequestBodyFormData({ body }) {
     });
     return formData;
 }
-function getBodyContentType(body) {
-    if (!body) return;
-    if (body instanceof Blob) return body.type || 'application/octet-stream';
-    if (typeof body === 'string') return 'text/plain';
-    if (!(body instanceof FormData)) return 'application/json';
-}
-async function processResponse(response) {
-    if (response.status === 204 || response.headers.get('Content-Length') === '0') return response.ok ? {
-        data: {},
-        response
-    } : {
-        error: {},
-        response
-    };
-    if (isJsonResponse(response)) {
-        // clone response before parsing every time to allow multiple reads
-        const jsonResponse = response.clone().json();
-        return resolveResponse(response, response.ok ? jsonResponse : Promise.reject(await jsonResponse));
-    }
-    const jsonResponse = new Promise((resolve, reject)=>// attempt to parse JSON for successful responses, otherwise fail
-        response.clone().text().then(JSON.parse).then(resolve, reject));
-    return resolveResponse(response, response.ok ? jsonResponse : Promise.reject(await jsonResponse));
-}
-function isJsonResponse(response) {
-    const contentType = response.headers.get('Content-Type')?.toLowerCase();
-    return contentType?.includes('/json') || contentType?.includes('+json');
-}
-function resolveResponse(responseToReturn, responsePromise) {
-    if (!responsePromise) return Promise.reject({
-        error: responseToReturn,
-        response: undefined,
-        data: undefined
-    });
-    return responsePromise.then((data)=>({
-            data,
-            response: responseToReturn
-        })).catch((error)=>({
-            error,
-            response: responseToReturn
-        }));
-}
 
 exports.baseRequestFn = baseRequestFn;
 exports.bodySerializer = bodySerializer;

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';\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 needed 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 requestBody = options.bodySerializer(requestSchema, requestInfo);\n\n  const baseFetch = options.fetch ?? fetch;\n\n  return baseFetch(options.urlSerializer(requestSchema, requestInfo), {\n    method: requestSchema.method.toUpperCase(),\n    body: requestBody,\n    headers: mergeHeaders(\n      {\n        Accept: 'application/json',\n        'Content-Type': requestSchema.mediaType ?? getBodyContentType(body),\n      },\n      headers,\n      parameters?.header,\n      requestBody instanceof FormData\n        ? // remove `Content-Type` if the serialized body is FormData; the browser will correctly set Content-Type & boundary expression\n          { 'Content-Type': null }\n        : undefined\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 encodeURI(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 qs: string[] = [];\n\n  const append = (key: string, value: any) => {\n    qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);\n  };\n\n  const process = (key: string, value: any) => {\n    if (typeof value === 'undefined' || value === null) return;\n\n    if (Array.isArray(value)) {\n      value.forEach((v) => {\n        process(key, v);\n      });\n    } else if (typeof value === 'object') {\n      Object.entries(value).forEach(([k, v]) => {\n        process(`${key}[${k}]`, v);\n      });\n    } else {\n      append(key, value);\n    }\n  };\n\n  Object.entries(params).forEach(([key, value]) => {\n    process(key, value);\n  });\n\n  if (qs.length > 0) {\n    return `?${qs.join('&')}`;\n  }\n\n  return '';\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(schema: OperationSchema, info: RequestFnInfo) {\n  if (info.body === undefined) return;\n\n  if (\n    schema.method === 'get' ||\n    schema.method === 'head' ||\n    schema.method === 'options'\n  )\n    return;\n\n  if (schema.mediaType?.includes('/form-data'))\n    return getRequestBodyFormData(info);\n\n  if (\n    !schema.mediaType?.includes('/json') &&\n    (typeof info.body === 'string' ||\n      info.body instanceof Blob ||\n      info.body instanceof FormData)\n  ) {\n    return info.body;\n  }\n\n  return JSON.stringify(info.body);\n}\n\nfunction getRequestBodyFormData({\n  body,\n}: Pick<RequestFnInfo, 'body'>): FormData | undefined {\n  if (body instanceof FormData) return body;\n  if (body === null) return;\n\n  if (body instanceof Blob) throw new Error('Blob not supported in form-data');\n  if (body instanceof ArrayBuffer)\n    throw new Error('ArrayBuffer not supported in form-data');\n  if (body instanceof URLSearchParams)\n    throw new Error('URLSearchParams not supported in form-data');\n  if (body instanceof ReadableStream)\n    throw new Error('ReadableStream not supported in form-data');\n  if (typeof body === 'string')\n    throw new Error('String not supported in form-data');\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\nfunction getBodyContentType(body: RequestFnInfo['body']) {\n  if (!body) return;\n  if (body instanceof Blob) return body.type || 'application/octet-stream';\n  if (typeof body === 'string') return 'text/plain';\n  if (!(body instanceof FormData)) return 'application/json';\n}\n\nasync function processResponse<TData, TError>(\n  response: Response\n): Promise<RequestFnResponse<TData, TError>> {\n  if (response.status === 204 || response.headers.get('Content-Length') === '0')\n    return (\n      response.ok ? { data: {}, response } : { error: {}, response }\n    ) as RequestFnResponse<TData, TError>;\n\n  if (isJsonResponse(response)) {\n    // clone response before parsing every time to allow multiple reads\n    const jsonResponse = response.clone().json();\n    return resolveResponse(\n      response,\n      response.ok ? jsonResponse : Promise.reject(await jsonResponse)\n    );\n  }\n\n  const jsonResponse = new Promise<TData>((resolve, reject) =>\n    // attempt to parse JSON for successful responses, otherwise fail\n    response.clone().text().then(JSON.parse).then(resolve, reject)\n  );\n\n  return resolveResponse(\n    response,\n    response.ok ? jsonResponse : Promise.reject(await jsonResponse)\n  );\n}\n\nfunction isJsonResponse(response: Response) {\n  const contentType = response.headers.get('Content-Type')?.toLowerCase();\n  return contentType?.includes('/json') || contentType?.includes('+json');\n}\n\nfunction resolveResponse<TData, TError>(\n  error: Error\n): Promise<RequestFnResponse<TData, TError>>;\nfunction resolveResponse<TData, TError>(\n  responseToReturn: Response,\n  responsePromise: Promise<TData>\n): Promise<RequestFnResponse<TData, TError>>;\nfunction resolveResponse<TData, TError>(\n  responseToReturn: Response | Error,\n  responsePromise?: Promise<TData>\n): Promise<RequestFnResponse<TData, TError>> {\n  if (!responsePromise)\n    return Promise.reject({\n      error: responseToReturn,\n      response: undefined,\n      data: undefined,\n    });\n\n  return responsePromise\n    .then(\n      (data) =>\n        ({ data, response: responseToReturn }) as RequestFnResponse<\n          TData,\n          TError\n        >\n    )\n    .catch(\n      (error) =>\n        ({ error, response: responseToReturn }) as RequestFnResponse<\n          TData,\n          TError\n        >\n    );\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"],"names":["requestFn","schema","requestInfo","options","baseRequestFn","urlSerializer","bodySerializer","requestSchema","parameters","headers","body","requestInfoRest","requestBody","baseFetch","fetch","method","toUpperCase","mergeHeaders","Accept","mediaType","getBodyContentType","header","FormData","undefined","then","processResponse","catch","resolveResponse","info","path","url","replace","substring","group","Object","prototype","hasOwnProperty","call","encodeURI","String","baseUrl","query","getQueryString","params","qs","append","key","value","push","encodeURIComponent","process","Array","isArray","forEach","v","entries","k","length","join","allHeaders","Headers","headerSet","headersIterator","headerKey","headerValue","delete","set","includes","getRequestBodyFormData","Blob","JSON","stringify","Error","ArrayBuffer","URLSearchParams","ReadableStream","formData","filter","_","type","response","status","get","ok","data","error","isJsonResponse","jsonResponse","clone","json","Promise","reject","resolve","text","parse","contentType","toLowerCase","responseToReturn","responsePromise"],"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 encodeURI(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 qs: string[] = [];\n\n  const append = (key: string, value: any) => {\n    qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);\n  };\n\n  const process = (key: string, value: any) => {\n    if (typeof value === 'undefined' || value === null) return;\n\n    if (Array.isArray(value)) {\n      value.forEach((v) => {\n        process(key, v);\n      });\n    } else if (typeof value === 'object') {\n      Object.entries(value).forEach(([k, v]) => {\n        process(`${key}[${k}]`, v);\n      });\n    } else {\n      append(key, value);\n    }\n  };\n\n  Object.entries(params).forEach(([key, value]) => {\n    process(key, value);\n  });\n\n  if (qs.length > 0) {\n    return `?${qs.join('&')}`;\n  }\n\n  return '';\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 (\n    schema.method === 'get' ||\n    schema.method === 'head' ||\n    schema.method === 'options'\n  )\n    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"],"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","encodeURI","String","baseUrl","query","getQueryString","params","qs","append","key","value","push","encodeURIComponent","process","Array","isArray","forEach","v","entries","k","length","join","allHeaders","Headers","headerSet","headersIterator","headerKey","headerValue","delete","undefined","set","mediaType","find","includes","FormData","Blob","type","jsonMediaType","formDataMediaType","i","values","some","getRequestBodyFormData","JSON","stringify","Error","formData","filter","_"],"mappings":"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"}

package/dist/cjs/lib/responseUtils.cjs

@@ -0,0 +1,44 @@
+'use strict';
+
+/**
+ * Processes the response from the server.
+ * @beta
+ */ async function processResponse(response) {
+    if (response.status === 204 || response.headers.get('Content-Length') === '0') return response.ok ? {
+        data: {},
+        response
+    } : {
+        error: {},
+        response
+    };
+    if (isJsonResponse(response)) {
+        // clone response before parsing every time to allow multiple reads
+        const jsonResponse = response.clone().json();
+        return resolveResponse(response, response.ok ? jsonResponse : Promise.reject(await jsonResponse));
+    }
+    const jsonResponse = new Promise((resolve, reject)=>// attempt to parse JSON for successful responses, otherwise fail
+        response.clone().text().then(JSON.parse).then(resolve, reject));
+    return resolveResponse(response, response.ok ? jsonResponse : Promise.reject(await jsonResponse));
+}
+function resolveResponse(responseToReturn, responsePromise) {
+    if (!responsePromise) return Promise.reject({
+        error: responseToReturn,
+        response: undefined,
+        data: undefined
+    });
+    return responsePromise.then((data)=>({
+            data,
+            response: responseToReturn
+        })).catch((error)=>({
+            error,
+            response: responseToReturn
+        }));
+}
+function isJsonResponse(response) {
+    const contentType = response.headers.get('Content-Type')?.toLowerCase();
+    return contentType?.includes('/json') || contentType?.includes('+json');
+}
+
+exports.processResponse = processResponse;
+exports.resolveResponse = resolveResponse;
+//# sourceMappingURL=responseUtils.cjs.map

package/dist/cjs/lib/responseUtils.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"responseUtils.cjs","sources":["../../../src/lib/responseUtils.ts"],"sourcesContent":["import type { RequestFnResponse } from '@openapi-qraft/tanstack-query-react-types';\n\n/**\n * Processes the response from the server.\n * @beta\n */\nexport async function processResponse<TData, TError>(\n  response: Response\n): Promise<RequestFnResponse<TData, TError>> {\n  if (response.status === 204 || response.headers.get('Content-Length') === '0')\n    return (\n      response.ok ? { data: {}, response } : { error: {}, response }\n    ) as RequestFnResponse<TData, TError>;\n\n  if (isJsonResponse(response)) {\n    // clone response before parsing every time to allow multiple reads\n    const jsonResponse = response.clone().json();\n    return resolveResponse(\n      response,\n      response.ok ? jsonResponse : Promise.reject(await jsonResponse)\n    );\n  }\n\n  const jsonResponse = new Promise<TData>((resolve, reject) =>\n    // attempt to parse JSON for successful responses, otherwise fail\n    response.clone().text().then(JSON.parse).then(resolve, reject)\n  );\n\n  return resolveResponse(\n    response,\n    response.ok ? jsonResponse : Promise.reject(await jsonResponse)\n  );\n}\n\n/**\n * Resolves the response from the server.\n * @beta\n */\nexport function resolveResponse<TData, TError>(\n  error: Error\n): Promise<RequestFnResponse<TData, TError>>;\nexport function resolveResponse<TData, TError>(\n  responseToReturn: Response,\n  responsePromise: Promise<TData>\n): Promise<RequestFnResponse<TData, TError>>;\nexport function resolveResponse<TData, TError>(\n  responseToReturn: Response | Error,\n  responsePromise?: Promise<TData>\n): Promise<RequestFnResponse<TData, TError>> {\n  if (!responsePromise)\n    return Promise.reject({\n      error: responseToReturn,\n      response: undefined,\n      data: undefined,\n    });\n\n  return responsePromise\n    .then(\n      (data) =>\n        ({ data, response: responseToReturn }) as RequestFnResponse<\n          TData,\n          TError\n        >\n    )\n    .catch(\n      (error) =>\n        ({ error, response: responseToReturn }) as RequestFnResponse<\n          TData,\n          TError\n        >\n    );\n}\n\nfunction isJsonResponse(response: Response) {\n  const contentType = response.headers.get('Content-Type')?.toLowerCase();\n  return contentType?.includes('/json') || contentType?.includes('+json');\n}\n"],"names":["processResponse","response","status","headers","get","ok","data","error","isJsonResponse","jsonResponse","clone","json","resolveResponse","Promise","reject","resolve","text","then","JSON","parse","responseToReturn","responsePromise","undefined","catch","contentType","toLowerCase","includes"],"mappings":";;AAEA;;;IAIO,eAAeA,eAAAA,CACpBC,QAAkB,EAAA;AAElB,IAAA,IAAIA,QAASC,CAAAA,MAAM,KAAK,GAAA,IAAOD,SAASE,OAAO,CAACC,GAAG,CAAC,gBAAsB,CAAA,KAAA,GAAA,EACxE,OACEH,QAAAA,CAASI,EAAE,GAAG;AAAEC,QAAAA,IAAAA,EAAM,EAAC;AAAGL,QAAAA,QAAAA;KAAa,GAAA;AAAEM,QAAAA,KAAAA,EAAO,EAAC;AAAGN,QAAAA,QAAAA;AAAS,KAAA,CAAA;AAGjE,IAAA,IAAIO,eAAeP,QAAW,CAAA,EAAA;;AAE5B,QAAA,MAAMQ,YAAeR,GAAAA,QAAAA,CAASS,KAAK,EAAA,CAAGC,IAAI,EAAA,CAAA;QAC1C,OAAOC,eAAAA,CACLX,UACAA,QAASI,CAAAA,EAAE,GAAGI,YAAeI,GAAAA,OAAAA,CAAQC,MAAM,CAAC,MAAML,YAAAA,CAAAA,CAAAA,CAAAA;AAEtD,KAAA;AAEA,IAAA,MAAMA,eAAe,IAAII,OAAAA,CAAe,CAACE,OAAAA,EAASD;QAEhDb,QAASS,CAAAA,KAAK,EAAGM,CAAAA,IAAI,EAAGC,CAAAA,IAAI,CAACC,IAAAA,CAAKC,KAAK,CAAA,CAAEF,IAAI,CAACF,OAASD,EAAAA,MAAAA,CAAAA,CAAAA,CAAAA;IAGzD,OAAOF,eAAAA,CACLX,UACAA,QAASI,CAAAA,EAAE,GAAGI,YAAeI,GAAAA,OAAAA,CAAQC,MAAM,CAAC,MAAML,YAAAA,CAAAA,CAAAA,CAAAA;AAEtD,CAAA;AAaO,SAASG,eAAAA,CACdQ,gBAAkC,EAClCC,eAAgC,EAAA;AAEhC,IAAA,IAAI,CAACA,eAAAA,EACH,OAAOR,OAAAA,CAAQC,MAAM,CAAC;QACpBP,KAAOa,EAAAA,gBAAAA;QACPnB,QAAUqB,EAAAA,SAAAA;QACVhB,IAAMgB,EAAAA,SAAAA;AACR,KAAA,CAAA,CAAA;AAEF,IAAA,OAAOD,eACJJ,CAAAA,IAAI,CACH,CAACX,QACE;AAAEA,YAAAA,IAAAA;YAAML,QAAUmB,EAAAA,gBAAAA;AAAiB,SAAA,CAKvCG,CAAAA,CAAAA,KAAK,CACJ,CAAChB,SACE;AAAEA,YAAAA,KAAAA;YAAON,QAAUmB,EAAAA,gBAAAA;SAAiB,CAAA,CAAA,CAAA;AAK7C,CAAA;AAEA,SAASZ,eAAeP,QAAkB,EAAA;AACxC,IAAA,MAAMuB,cAAcvB,QAASE,CAAAA,OAAO,CAACC,GAAG,CAAC,cAAiBqB,CAAAA,EAAAA,WAAAA,EAAAA,CAAAA;AAC1D,IAAA,OAAOD,WAAaE,EAAAA,QAAAA,CAAS,OAAYF,CAAAA,IAAAA,WAAAA,EAAaE,QAAS,CAAA,OAAA,CAAA,CAAA;AACjE;;;;;"}

package/dist/cjs/unstable__responseUtils.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+var responseUtils = require('./lib/responseUtils.cjs');
+
+
+
+exports.processResponse = responseUtils.processResponse;
+exports.resolveResponse = responseUtils.resolveResponse;
+//# sourceMappingURL=unstable__responseUtils.cjs.map

package/dist/cjs/unstable__responseUtils.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"unstable__responseUtils.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;"}

package/dist/esm/lib/requestFn.js

@@ -1,3 +1,5 @@
+import { processResponse, resolveResponse } from './responseUtils.js';
+
 /**
  * This function is used to make a request to a specified endpoint.
  *
@@ -19,7 +21,7 @@
 }
 /**
  * This function is used to make a request to a specified endpoint.
- * It's needed to create a custom `requestFn` with a custom `urlSerializer`
+ * It's necessary to create a custom `requestFn` with a custom `urlSerializer`
  * and `bodySerializer`, with the tree-shaking of the default `requestFn`
  * and its serializers.
  *
@@ -34,17 +36,14 @@
  * @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.
  */ async function baseRequestFn(requestSchema, requestInfo, options) {
     const { parameters, headers, body, ...requestInfoRest } = requestInfo;
-    const requestBody = options.bodySerializer(requestSchema, requestInfo);
+    const requestPayload = options.bodySerializer(requestSchema, body);
     const baseFetch = options.fetch ?? fetch;
     return baseFetch(options.urlSerializer(requestSchema, requestInfo), {
         method: requestSchema.method.toUpperCase(),
-        body: requestBody,
+        body: requestPayload?.body,
         headers: mergeHeaders({
-            Accept: 'application/json',
-            'Content-Type': requestSchema.mediaType ?? getBodyContentType(body)
-        }, headers, parameters?.header, requestBody instanceof FormData ? {
-            'Content-Type': null
-        } : undefined),
+            Accept: 'application/json'
+        }, requestPayload?.headers, headers, parameters?.header),
         ...requestInfoRest
     }).then(processResponse).catch(resolveResponse);
 }
@@ -119,23 +118,68 @@ function mergeHeaders(...allHeaders) {
     }
     return headers;
 }
-function bodySerializer(schema, info) {
-    if (info.body === undefined) return;
-    if (schema.method === 'get' || schema.method === 'head' || schema.method === 'options') return;
-    if (schema.mediaType?.includes('/form-data')) return getRequestBodyFormData(info);
-    if (!schema.mediaType?.includes('/json') && (typeof info.body === 'string' || info.body instanceof Blob || info.body instanceof FormData)) {
-        return info.body;
+function bodySerializer(schema, body) {
+    if (schema.method === 'get' || schema.method === 'head' || schema.method === 'options') return undefined;
+    if (body === undefined || body === null) return undefined;
+    if (typeof body === 'string') {
+        return {
+            body,
+            headers: {
+                'Content-Type': // prefer text/* media type
+                schema.mediaType?.find((mediaType)=>mediaType.includes('text/')) ?? // prefer JSON media type, assume that body is serialized as JSON
+                schema.mediaType?.find((mediaType)=>mediaType.includes('/json')) ?? 'text/plain'
+            }
+        };
+    }
+    if (body instanceof FormData) {
+        return {
+            body,
+            headers: {
+                // remove `Content-Type` if the serialized body is FormData;
+                // the browser will correctly set Content-Type & boundary expression
+                'Content-Type': null
+            }
+        };
+    }
+    if (body instanceof Blob) {
+        return {
+            body,
+            headers: {
+                'Content-Type': body.type || schema.mediaType?.find((mediaType)=>!(mediaType.includes('text/') && mediaType.includes('/form-data') && mediaType.includes('/json'))) || 'application/octet-stream'
+            }
+        };
+    }
+    let jsonMediaType = null;
+    let formDataMediaType = null;
+    if (schema.mediaType) {
+        for(let i = 0; i < schema.mediaType.length; i++){
+            const mediaType = schema.mediaType[i];
+            if (mediaType.includes('/json')) jsonMediaType = mediaType;
+            else if (mediaType.includes('/form-data')) formDataMediaType = mediaType;
+        }
+    }
+    if (formDataMediaType) {
+        if (!jsonMediaType || // Prefer FormData serialization if one of the fields is a Blob
+        Object.values(body).some((value)=>value instanceof Blob)) {
+            return {
+                body: getRequestBodyFormData(body),
+                headers: {
+                    // remove `Content-Type` if the serialized body is FormData;
+                    // the browser will correctly set Content-Type & boundary expression
+                    'Content-Type': null
+                }
+            };
+        }
     }
-    return JSON.stringify(info.body);
+    return {
+        body: JSON.stringify(body),
+        headers: {
+            'Content-Type': jsonMediaType ?? 'application/json'
+        }
+    };
 }
-function getRequestBodyFormData({ body }) {
+function getRequestBodyFormData(body) {
     if (body instanceof FormData) return body;
-    if (body === null) return;
-    if (body instanceof Blob) throw new Error('Blob not supported in form-data');
-    if (body instanceof ArrayBuffer) throw new Error('ArrayBuffer not supported in form-data');
-    if (body instanceof URLSearchParams) throw new Error('URLSearchParams not supported in form-data');
-    if (body instanceof ReadableStream) throw new Error('ReadableStream not supported in form-data');
-    if (typeof body === 'string') throw new Error('String not supported in form-data');
     if (typeof body !== 'object') throw new Error(`Unsupported body type ${typeof body} in form-data.`);
     const formData = new FormData();
     const process = (key, value)=>{
@@ -154,47 +198,6 @@ function getRequestBodyFormData({ body }) {
     });
     return formData;
 }
-function getBodyContentType(body) {
-    if (!body) return;
-    if (body instanceof Blob) return body.type || 'application/octet-stream';
-    if (typeof body === 'string') return 'text/plain';
-    if (!(body instanceof FormData)) return 'application/json';
-}
-async function processResponse(response) {
-    if (response.status === 204 || response.headers.get('Content-Length') === '0') return response.ok ? {
-        data: {},
-        response
-    } : {
-        error: {},
-        response
-    };
-    if (isJsonResponse(response)) {
-        // clone response before parsing every time to allow multiple reads
-        const jsonResponse = response.clone().json();
-        return resolveResponse(response, response.ok ? jsonResponse : Promise.reject(await jsonResponse));
-    }
-    const jsonResponse = new Promise((resolve, reject)=>// attempt to parse JSON for successful responses, otherwise fail
-        response.clone().text().then(JSON.parse).then(resolve, reject));
-    return resolveResponse(response, response.ok ? jsonResponse : Promise.reject(await jsonResponse));
-}
-function isJsonResponse(response) {
-    const contentType = response.headers.get('Content-Type')?.toLowerCase();
-    return contentType?.includes('/json') || contentType?.includes('+json');
-}
-function resolveResponse(responseToReturn, responsePromise) {
-    if (!responsePromise) return Promise.reject({
-        error: responseToReturn,
-        response: undefined,
-        data: undefined
-    });
-    return responsePromise.then((data)=>({
-            data,
-            response: responseToReturn
-        })).catch((error)=>({
-            error,
-            response: responseToReturn
-        }));
-}
 
 export { baseRequestFn, bodySerializer, mergeHeaders, requestFn, urlSerializer };
 //# sourceMappingURL=requestFn.js.map

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';\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 needed 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 requestBody = options.bodySerializer(requestSchema, requestInfo);\n\n  const baseFetch = options.fetch ?? fetch;\n\n  return baseFetch(options.urlSerializer(requestSchema, requestInfo), {\n    method: requestSchema.method.toUpperCase(),\n    body: requestBody,\n    headers: mergeHeaders(\n      {\n        Accept: 'application/json',\n        'Content-Type': requestSchema.mediaType ?? getBodyContentType(body),\n      },\n      headers,\n      parameters?.header,\n      requestBody instanceof FormData\n        ? // remove `Content-Type` if the serialized body is FormData; the browser will correctly set Content-Type & boundary expression\n          { 'Content-Type': null }\n        : undefined\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 encodeURI(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 qs: string[] = [];\n\n  const append = (key: string, value: any) => {\n    qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);\n  };\n\n  const process = (key: string, value: any) => {\n    if (typeof value === 'undefined' || value === null) return;\n\n    if (Array.isArray(value)) {\n      value.forEach((v) => {\n        process(key, v);\n      });\n    } else if (typeof value === 'object') {\n      Object.entries(value).forEach(([k, v]) => {\n        process(`${key}[${k}]`, v);\n      });\n    } else {\n      append(key, value);\n    }\n  };\n\n  Object.entries(params).forEach(([key, value]) => {\n    process(key, value);\n  });\n\n  if (qs.length > 0) {\n    return `?${qs.join('&')}`;\n  }\n\n  return '';\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(schema: OperationSchema, info: RequestFnInfo) {\n  if (info.body === undefined) return;\n\n  if (\n    schema.method === 'get' ||\n    schema.method === 'head' ||\n    schema.method === 'options'\n  )\n    return;\n\n  if (schema.mediaType?.includes('/form-data'))\n    return getRequestBodyFormData(info);\n\n  if (\n    !schema.mediaType?.includes('/json') &&\n    (typeof info.body === 'string' ||\n      info.body instanceof Blob ||\n      info.body instanceof FormData)\n  ) {\n    return info.body;\n  }\n\n  return JSON.stringify(info.body);\n}\n\nfunction getRequestBodyFormData({\n  body,\n}: Pick<RequestFnInfo, 'body'>): FormData | undefined {\n  if (body instanceof FormData) return body;\n  if (body === null) return;\n\n  if (body instanceof Blob) throw new Error('Blob not supported in form-data');\n  if (body instanceof ArrayBuffer)\n    throw new Error('ArrayBuffer not supported in form-data');\n  if (body instanceof URLSearchParams)\n    throw new Error('URLSearchParams not supported in form-data');\n  if (body instanceof ReadableStream)\n    throw new Error('ReadableStream not supported in form-data');\n  if (typeof body === 'string')\n    throw new Error('String not supported in form-data');\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\nfunction getBodyContentType(body: RequestFnInfo['body']) {\n  if (!body) return;\n  if (body instanceof Blob) return body.type || 'application/octet-stream';\n  if (typeof body === 'string') return 'text/plain';\n  if (!(body instanceof FormData)) return 'application/json';\n}\n\nasync function processResponse<TData, TError>(\n  response: Response\n): Promise<RequestFnResponse<TData, TError>> {\n  if (response.status === 204 || response.headers.get('Content-Length') === '0')\n    return (\n      response.ok ? { data: {}, response } : { error: {}, response }\n    ) as RequestFnResponse<TData, TError>;\n\n  if (isJsonResponse(response)) {\n    // clone response before parsing every time to allow multiple reads\n    const jsonResponse = response.clone().json();\n    return resolveResponse(\n      response,\n      response.ok ? jsonResponse : Promise.reject(await jsonResponse)\n    );\n  }\n\n  const jsonResponse = new Promise<TData>((resolve, reject) =>\n    // attempt to parse JSON for successful responses, otherwise fail\n    response.clone().text().then(JSON.parse).then(resolve, reject)\n  );\n\n  return resolveResponse(\n    response,\n    response.ok ? jsonResponse : Promise.reject(await jsonResponse)\n  );\n}\n\nfunction isJsonResponse(response: Response) {\n  const contentType = response.headers.get('Content-Type')?.toLowerCase();\n  return contentType?.includes('/json') || contentType?.includes('+json');\n}\n\nfunction resolveResponse<TData, TError>(\n  error: Error\n): Promise<RequestFnResponse<TData, TError>>;\nfunction resolveResponse<TData, TError>(\n  responseToReturn: Response,\n  responsePromise: Promise<TData>\n): Promise<RequestFnResponse<TData, TError>>;\nfunction resolveResponse<TData, TError>(\n  responseToReturn: Response | Error,\n  responsePromise?: Promise<TData>\n): Promise<RequestFnResponse<TData, TError>> {\n  if (!responsePromise)\n    return Promise.reject({\n      error: responseToReturn,\n      response: undefined,\n      data: undefined,\n    });\n\n  return responsePromise\n    .then(\n      (data) =>\n        ({ data, response: responseToReturn }) as RequestFnResponse<\n          TData,\n          TError\n        >\n    )\n    .catch(\n      (error) =>\n        ({ error, response: responseToReturn }) as RequestFnResponse<\n          TData,\n          TError\n        >\n    );\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"],"names":["requestFn","schema","requestInfo","options","baseRequestFn","urlSerializer","bodySerializer","requestSchema","parameters","headers","body","requestInfoRest","requestBody","baseFetch","fetch","method","toUpperCase","mergeHeaders","Accept","mediaType","getBodyContentType","header","FormData","undefined","then","processResponse","catch","resolveResponse","info","path","url","replace","substring","group","Object","prototype","hasOwnProperty","call","encodeURI","String","baseUrl","query","getQueryString","params","qs","append","key","value","push","encodeURIComponent","process","Array","isArray","forEach","v","entries","k","length","join","allHeaders","Headers","headerSet","headersIterator","headerKey","headerValue","delete","set","includes","getRequestBodyFormData","Blob","JSON","stringify","Error","ArrayBuffer","URLSearchParams","ReadableStream","formData","filter","_","type","response","status","get","ok","data","error","isJsonResponse","jsonResponse","clone","json","Promise","reject","resolve","text","parse","contentType","toLowerCase","responseToReturn","responsePromise"],"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 encodeURI(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 qs: string[] = [];\n\n  const append = (key: string, value: any) => {\n    qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);\n  };\n\n  const process = (key: string, value: any) => {\n    if (typeof value === 'undefined' || value === null) return;\n\n    if (Array.isArray(value)) {\n      value.forEach((v) => {\n        process(key, v);\n      });\n    } else if (typeof value === 'object') {\n      Object.entries(value).forEach(([k, v]) => {\n        process(`${key}[${k}]`, v);\n      });\n    } else {\n      append(key, value);\n    }\n  };\n\n  Object.entries(params).forEach(([key, value]) => {\n    process(key, value);\n  });\n\n  if (qs.length > 0) {\n    return `?${qs.join('&')}`;\n  }\n\n  return '';\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 (\n    schema.method === 'get' ||\n    schema.method === 'head' ||\n    schema.method === 'options'\n  )\n    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"],"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","encodeURI","String","baseUrl","query","getQueryString","params","qs","append","key","value","push","encodeURIComponent","process","Array","isArray","forEach","v","entries","k","length","join","allHeaders","Headers","headerSet","headersIterator","headerKey","headerValue","delete","undefined","set","mediaType","find","includes","FormData","Blob","type","jsonMediaType","formDataMediaType","i","values","some","getRequestBodyFormData","JSON","stringify","Error","formData","filter","_"],"mappings":"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"}

package/dist/esm/lib/responseUtils.js

@@ -0,0 +1,41 @@
+/**
+ * Processes the response from the server.
+ * @beta
+ */ async function processResponse(response) {
+    if (response.status === 204 || response.headers.get('Content-Length') === '0') return response.ok ? {
+        data: {},
+        response
+    } : {
+        error: {},
+        response
+    };
+    if (isJsonResponse(response)) {
+        // clone response before parsing every time to allow multiple reads
+        const jsonResponse = response.clone().json();
+        return resolveResponse(response, response.ok ? jsonResponse : Promise.reject(await jsonResponse));
+    }
+    const jsonResponse = new Promise((resolve, reject)=>// attempt to parse JSON for successful responses, otherwise fail
+        response.clone().text().then(JSON.parse).then(resolve, reject));
+    return resolveResponse(response, response.ok ? jsonResponse : Promise.reject(await jsonResponse));
+}
+function resolveResponse(responseToReturn, responsePromise) {
+    if (!responsePromise) return Promise.reject({
+        error: responseToReturn,
+        response: undefined,
+        data: undefined
+    });
+    return responsePromise.then((data)=>({
+            data,
+            response: responseToReturn
+        })).catch((error)=>({
+            error,
+            response: responseToReturn
+        }));
+}
+function isJsonResponse(response) {
+    const contentType = response.headers.get('Content-Type')?.toLowerCase();
+    return contentType?.includes('/json') || contentType?.includes('+json');
+}
+
+export { processResponse, resolveResponse };
+//# sourceMappingURL=responseUtils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"responseUtils.js","sources":["../../../src/lib/responseUtils.ts"],"sourcesContent":["import type { RequestFnResponse } from '@openapi-qraft/tanstack-query-react-types';\n\n/**\n * Processes the response from the server.\n * @beta\n */\nexport async function processResponse<TData, TError>(\n  response: Response\n): Promise<RequestFnResponse<TData, TError>> {\n  if (response.status === 204 || response.headers.get('Content-Length') === '0')\n    return (\n      response.ok ? { data: {}, response } : { error: {}, response }\n    ) as RequestFnResponse<TData, TError>;\n\n  if (isJsonResponse(response)) {\n    // clone response before parsing every time to allow multiple reads\n    const jsonResponse = response.clone().json();\n    return resolveResponse(\n      response,\n      response.ok ? jsonResponse : Promise.reject(await jsonResponse)\n    );\n  }\n\n  const jsonResponse = new Promise<TData>((resolve, reject) =>\n    // attempt to parse JSON for successful responses, otherwise fail\n    response.clone().text().then(JSON.parse).then(resolve, reject)\n  );\n\n  return resolveResponse(\n    response,\n    response.ok ? jsonResponse : Promise.reject(await jsonResponse)\n  );\n}\n\n/**\n * Resolves the response from the server.\n * @beta\n */\nexport function resolveResponse<TData, TError>(\n  error: Error\n): Promise<RequestFnResponse<TData, TError>>;\nexport function resolveResponse<TData, TError>(\n  responseToReturn: Response,\n  responsePromise: Promise<TData>\n): Promise<RequestFnResponse<TData, TError>>;\nexport function resolveResponse<TData, TError>(\n  responseToReturn: Response | Error,\n  responsePromise?: Promise<TData>\n): Promise<RequestFnResponse<TData, TError>> {\n  if (!responsePromise)\n    return Promise.reject({\n      error: responseToReturn,\n      response: undefined,\n      data: undefined,\n    });\n\n  return responsePromise\n    .then(\n      (data) =>\n        ({ data, response: responseToReturn }) as RequestFnResponse<\n          TData,\n          TError\n        >\n    )\n    .catch(\n      (error) =>\n        ({ error, response: responseToReturn }) as RequestFnResponse<\n          TData,\n          TError\n        >\n    );\n}\n\nfunction isJsonResponse(response: Response) {\n  const contentType = response.headers.get('Content-Type')?.toLowerCase();\n  return contentType?.includes('/json') || contentType?.includes('+json');\n}\n"],"names":["processResponse","response","status","headers","get","ok","data","error","isJsonResponse","jsonResponse","clone","json","resolveResponse","Promise","reject","resolve","text","then","JSON","parse","responseToReturn","responsePromise","undefined","catch","contentType","toLowerCase","includes"],"mappings":"AAEA;;;IAIO,eAAeA,eAAAA,CACpBC,QAAkB,EAAA;AAElB,IAAA,IAAIA,QAASC,CAAAA,MAAM,KAAK,GAAA,IAAOD,SAASE,OAAO,CAACC,GAAG,CAAC,gBAAsB,CAAA,KAAA,GAAA,EACxE,OACEH,QAAAA,CAASI,EAAE,GAAG;AAAEC,QAAAA,IAAAA,EAAM,EAAC;AAAGL,QAAAA,QAAAA;KAAa,GAAA;AAAEM,QAAAA,KAAAA,EAAO,EAAC;AAAGN,QAAAA,QAAAA;AAAS,KAAA,CAAA;AAGjE,IAAA,IAAIO,eAAeP,QAAW,CAAA,EAAA;;AAE5B,QAAA,MAAMQ,YAAeR,GAAAA,QAAAA,CAASS,KAAK,EAAA,CAAGC,IAAI,EAAA,CAAA;QAC1C,OAAOC,eAAAA,CACLX,UACAA,QAASI,CAAAA,EAAE,GAAGI,YAAeI,GAAAA,OAAAA,CAAQC,MAAM,CAAC,MAAML,YAAAA,CAAAA,CAAAA,CAAAA;AAEtD,KAAA;AAEA,IAAA,MAAMA,eAAe,IAAII,OAAAA,CAAe,CAACE,OAAAA,EAASD;QAEhDb,QAASS,CAAAA,KAAK,EAAGM,CAAAA,IAAI,EAAGC,CAAAA,IAAI,CAACC,IAAAA,CAAKC,KAAK,CAAA,CAAEF,IAAI,CAACF,OAASD,EAAAA,MAAAA,CAAAA,CAAAA,CAAAA;IAGzD,OAAOF,eAAAA,CACLX,UACAA,QAASI,CAAAA,EAAE,GAAGI,YAAeI,GAAAA,OAAAA,CAAQC,MAAM,CAAC,MAAML,YAAAA,CAAAA,CAAAA,CAAAA;AAEtD,CAAA;AAaO,SAASG,eAAAA,CACdQ,gBAAkC,EAClCC,eAAgC,EAAA;AAEhC,IAAA,IAAI,CAACA,eAAAA,EACH,OAAOR,OAAAA,CAAQC,MAAM,CAAC;QACpBP,KAAOa,EAAAA,gBAAAA;QACPnB,QAAUqB,EAAAA,SAAAA;QACVhB,IAAMgB,EAAAA,SAAAA;AACR,KAAA,CAAA,CAAA;AAEF,IAAA,OAAOD,eACJJ,CAAAA,IAAI,CACH,CAACX,QACE;AAAEA,YAAAA,IAAAA;YAAML,QAAUmB,EAAAA,gBAAAA;AAAiB,SAAA,CAKvCG,CAAAA,CAAAA,KAAK,CACJ,CAAChB,SACE;AAAEA,YAAAA,KAAAA;YAAON,QAAUmB,EAAAA,gBAAAA;SAAiB,CAAA,CAAA,CAAA;AAK7C,CAAA;AAEA,SAASZ,eAAeP,QAAkB,EAAA;AACxC,IAAA,MAAMuB,cAAcvB,QAASE,CAAAA,OAAO,CAACC,GAAG,CAAC,cAAiBqB,CAAAA,EAAAA,WAAAA,EAAAA,CAAAA;AAC1D,IAAA,OAAOD,WAAaE,EAAAA,QAAAA,CAAS,OAAYF,CAAAA,IAAAA,WAAAA,EAAaE,QAAS,CAAA,OAAA,CAAA,CAAA;AACjE;;;;"}

package/dist/esm/unstable__responseUtils.js

@@ -0,0 +1,2 @@
+export { processResponse, resolveResponse } from './lib/responseUtils.js';
+//# sourceMappingURL=unstable__responseUtils.js.map

package/dist/esm/unstable__responseUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unstable__responseUtils.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

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

@@ -15,7 +15,7 @@ import type { HeadersOptions, OperationSchema, RequestFnInfo, RequestFnOptions,
 export declare function requestFn<TData, TError>(schema: OperationSchema, requestInfo: RequestFnInfo, options?: RequestFnOptions): Promise<RequestFnResponse<TData, TError>>;
 /**
  * This function is used to make a request to a specified endpoint.
- * It's needed to create a custom `requestFn` with a custom `urlSerializer`
+ * It's necessary to create a custom `requestFn` with a custom `urlSerializer`
  * and `bodySerializer`, with the tree-shaking of the default `requestFn`
  * and its serializers.
  *
@@ -47,7 +47,22 @@ export declare function baseRequestFn<TData, TError>(requestSchema: OperationSch
  */
 export declare function urlSerializer(schema: OperationSchema, info: Pick<RequestFnInfo, 'baseUrl' | 'parameters'>): string;
 export declare function mergeHeaders(...allHeaders: (HeadersOptions | undefined)[]): Headers;
-export declare function bodySerializer(schema: OperationSchema, info: RequestFnInfo): string | FormData | Blob | undefined;
+export declare function bodySerializer(schema: OperationSchema, body: RequestFnInfo['body']): {
+    body: string;
+    headers: {
+        'Content-Type': string;
+    };
+} | {
+    body: FormData;
+    headers: {
+        'Content-Type': null;
+    };
+} | {
+    body: Blob;
+    headers: {
+        'Content-Type': string;
+    };
+} | undefined;
 type WithRequired<T, K extends keyof T> = T & {
     [_ in K]: {};
 };

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;AAEnD;;;;;;;;;;;;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,CA0B3C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,YAAY,CAAC,GAClD,MAAM,CAqBR;AAoCD,wBAAgB,YAAY,CAAC,GAAG,UAAU,EAAE,CAAC,cAAc,GAAG,SAAS,CAAC,EAAE,WAuBzE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,aAAa,wCAuB1E;AAsHD,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;AAoCD,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;;;;;;;;;;;;;;;cAyF5B;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/responseUtils.d.ts

@@ -0,0 +1,13 @@
+import type { RequestFnResponse } from '@openapi-qraft/tanstack-query-react-types';
+/**
+ * Processes the response from the server.
+ * @beta
+ */
+export declare function processResponse<TData, TError>(response: Response): Promise<RequestFnResponse<TData, TError>>;
+/**
+ * Resolves the response from the server.
+ * @beta
+ */
+export declare function resolveResponse<TData, TError>(error: Error): Promise<RequestFnResponse<TData, TError>>;
+export declare function resolveResponse<TData, TError>(responseToReturn: Response, responsePromise: Promise<TData>): Promise<RequestFnResponse<TData, TError>>;
+//# sourceMappingURL=responseUtils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"responseUtils.d.ts","sourceRoot":"","sources":["../../../src/lib/responseUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAEnF;;;GAGG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,MAAM,EACjD,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAwB3C;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAC3C,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;AAC7C,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAC3C,gBAAgB,EAAE,QAAQ,EAC1B,eAAe,EAAE,OAAO,CAAC,KAAK,CAAC,GAC9B,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC"}

package/dist/types/unstable__responseUtils.d.ts

@@ -0,0 +1,2 @@
+export { resolveResponse, processResponse } from './lib/responseUtils.js';
+//# sourceMappingURL=unstable__responseUtils.d.ts.map

package/dist/types/unstable__responseUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unstable__responseUtils.d.ts","sourceRoot":"","sources":["../../src/unstable__responseUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/react",
-  "version": "2.0.0-next.10",
+  "version": "2.0.0-next.11",
   "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",
@@ -11,18 +11,19 @@
     "lint": "eslint",
     "clean": "rimraf dist/",
     "codegen": "openapi-qraft --plugin tanstack-query-react --plugin openapi-typescript ../test-fixtures/openapi.json -rm -o src/tests/fixtures/api --openapi-types-file-name openapi.ts --explicit-import-extensions --filter-services '/approval_policies/**,/entities/**,/files/**,!/internal/**' --operation-predefined-parameters '/approval_policies/{approval_policy_id}/**:header.x-monite-entity-id' '/entities/{entity_id}/documents:header.x-monite-version' --operation-name-modifier '/files/list:[a-zA-Z]+List ==> findAll' && yarn _prettify-api",
+    "codegen2": "openapi-qraft --plugin tanstack-query-react --plugin openapi-typescript http://localhost:3000/api/doc -rm -o src/tests/fixtures/api --openapi-types-file-name openapi.ts --explicit-import-extensions && yarn _prettify-api",
     "_prettify-api": "prettier --write src/tests/fixtures/api/**/*.ts"
   },
   "sideEffects": false,
   "dependencies": {
-    "@openapi-qraft/tanstack-query-react-types": "2.0.0-next.10"
+    "@openapi-qraft/tanstack-query-react-types": "2.0.0-next.11"
   },
   "devDependencies": {
-    "@openapi-qraft/cli": "2.0.0-next.10",
+    "@openapi-qraft/cli": "2.0.0-next.11",
     "@openapi-qraft/eslint-config": "1.0.0",
-    "@openapi-qraft/openapi-typescript-plugin": "^1.2.0-next.10",
+    "@openapi-qraft/openapi-typescript-plugin": "^1.2.0-next.11",
     "@openapi-qraft/rollup-config": "1.1.0-next.0",
-    "@openapi-qraft/tanstack-query-react-plugin": "2.0.0-next.10",
+    "@openapi-qraft/tanstack-query-react-plugin": "2.0.0-next.11",
     "@openapi-qraft/test-fixtures": "1.0.0",
     "@tanstack/react-query": "^5.56.2",
     "@testing-library/jest-dom": "^5.17.0",
@@ -41,7 +42,7 @@
     "query-string": "^8.2.0",
     "react": "^18.3.1",
     "rimraf": "^5.0.10",
-    "rollup": "~4.21.3",
+    "rollup": "~4.22.4",
     "vitest": "^1.6.0"
   },
   "peerDependencies": {
@@ -77,6 +78,11 @@
       "require": "./dist/cjs/qraftPredefinedParametersRequestFn.cjs",
       "types": "./dist/types/qraftPredefinedParametersRequestFn.d.ts"
     },
+    "./unstable__responseUtils": {
+      "import": "./dist/esm/unstable__responseUtils.js",
+      "require": "./dist/cjs/unstable__responseUtils.cjs",
+      "types": "./dist/types/unstable__responseUtils.d.ts"
+    },
     "./package.json": "./package.json"
   },
   "typesVersions": {

package/src/lib/requestFn.ts

@@ -5,6 +5,7 @@ import type {
   RequestFnOptions,
   RequestFnResponse,
 } from '@openapi-qraft/tanstack-query-react-types';
+import { processResponse, resolveResponse } from './responseUtils.js';
 
 /**
  * This function is used to make a request to a specified endpoint.
@@ -33,7 +34,7 @@ export async function requestFn<TData, TError>(
 
 /**
  * This function is used to make a request to a specified endpoint.
- * It's needed to create a custom `requestFn` with a custom `urlSerializer`
+ * It's necessary to create a custom `requestFn` with a custom `urlSerializer`
  * and `bodySerializer`, with the tree-shaking of the default `requestFn`
  * and its serializers.
  *
@@ -54,24 +55,18 @@ export async function baseRequestFn<TData, TError>(
 ): Promise<RequestFnResponse<TData, TError>> {
   const { parameters, headers, body, ...requestInfoRest } = requestInfo;
 
-  const requestBody = options.bodySerializer(requestSchema, requestInfo);
+  const requestPayload = options.bodySerializer(requestSchema, body);
 
   const baseFetch = options.fetch ?? fetch;
 
   return baseFetch(options.urlSerializer(requestSchema, requestInfo), {
     method: requestSchema.method.toUpperCase(),
-    body: requestBody,
+    body: requestPayload?.body,
     headers: mergeHeaders(
-      {
-        Accept: 'application/json',
-        'Content-Type': requestSchema.mediaType ?? getBodyContentType(body),
-      },
+      { Accept: 'application/json' },
+      requestPayload?.headers,
       headers,
-      parameters?.header,
-      requestBody instanceof FormData
-        ? // remove `Content-Type` if the serialized body is FormData; the browser will correctly set Content-Type & boundary expression
-          { 'Content-Type': null }
-        : undefined
+      parameters?.header
     ),
     ...requestInfoRest,
   })
@@ -179,46 +174,103 @@ export function mergeHeaders(...allHeaders: (HeadersOptions | undefined)[]) {
   return headers;
 }
 
-export function bodySerializer(schema: OperationSchema, info: RequestFnInfo) {
-  if (info.body === undefined) return;
-
+export function bodySerializer(
+  schema: OperationSchema,
+  body: RequestFnInfo['body']
+) {
   if (
     schema.method === 'get' ||
     schema.method === 'head' ||
     schema.method === 'options'
   )
-    return;
+    return undefined;
+
+  if (body === undefined || body === null) return undefined;
+
+  if (typeof body === 'string') {
+    return {
+      body,
+      headers: {
+        'Content-Type':
+          // prefer text/* media type
+          schema.mediaType?.find((mediaType) => mediaType.includes('text/')) ??
+          // prefer JSON media type, assume that body is serialized as JSON
+          schema.mediaType?.find((mediaType) => mediaType.includes('/json')) ??
+          'text/plain',
+      },
+    };
+  }
 
-  if (schema.mediaType?.includes('/form-data'))
-    return getRequestBodyFormData(info);
+  if (body instanceof FormData) {
+    return {
+      body,
+      headers: {
+        // remove `Content-Type` if the serialized body is FormData;
+        // the browser will correctly set Content-Type & boundary expression
+        'Content-Type': null,
+      },
+    };
+  }
 
-  if (
-    !schema.mediaType?.includes('/json') &&
-    (typeof info.body === 'string' ||
-      info.body instanceof Blob ||
-      info.body instanceof FormData)
-  ) {
-    return info.body;
+  if (body instanceof Blob) {
+    return {
+      body,
+      headers: {
+        'Content-Type':
+          body.type ||
+          schema.mediaType?.find(
+            (mediaType) =>
+              !(
+                mediaType.includes('text/') &&
+                mediaType.includes('/form-data') &&
+                mediaType.includes('/json')
+              )
+          ) ||
+          'application/octet-stream',
+      },
+    };
   }
 
-  return JSON.stringify(info.body);
+  let jsonMediaType: string | null = null;
+  let formDataMediaType: string | null = null;
+
+  if (schema.mediaType) {
+    for (let i = 0; i < schema.mediaType.length; i++) {
+      const mediaType = schema.mediaType[i];
+      if (mediaType.includes('/json')) jsonMediaType = mediaType;
+      else if (mediaType.includes('/form-data')) formDataMediaType = mediaType;
+    }
+  }
+
+  if (formDataMediaType) {
+    if (
+      !jsonMediaType ||
+      // Prefer FormData serialization if one of the fields is a Blob
+      Object.values(body).some((value) => value instanceof Blob)
+    ) {
+      return {
+        body: getRequestBodyFormData(body),
+        headers: {
+          // remove `Content-Type` if the serialized body is FormData;
+          // the browser will correctly set Content-Type & boundary expression
+          'Content-Type': null,
+        },
+      };
+    }
+  }
+
+  return {
+    body: JSON.stringify(body),
+    headers: {
+      'Content-Type': jsonMediaType ?? 'application/json',
+    },
+  };
 }
 
-function getRequestBodyFormData({
-  body,
-}: Pick<RequestFnInfo, 'body'>): FormData | undefined {
+function getRequestBodyFormData(
+  body: NonNullable<RequestFnInfo['body']>
+): FormData {
   if (body instanceof FormData) return body;
-  if (body === null) return;
-
-  if (body instanceof Blob) throw new Error('Blob not supported in form-data');
-  if (body instanceof ArrayBuffer)
-    throw new Error('ArrayBuffer not supported in form-data');
-  if (body instanceof URLSearchParams)
-    throw new Error('URLSearchParams not supported in form-data');
-  if (body instanceof ReadableStream)
-    throw new Error('ReadableStream not supported in form-data');
-  if (typeof body === 'string')
-    throw new Error('String not supported in form-data');
   if (typeof body !== 'object')
     throw new Error(`Unsupported body type ${typeof body} in form-data.`);
 
@@ -245,81 +297,6 @@ function getRequestBodyFormData({
   return formData;
 }
 
-function getBodyContentType(body: RequestFnInfo['body']) {
-  if (!body) return;
-  if (body instanceof Blob) return body.type || 'application/octet-stream';
-  if (typeof body === 'string') return 'text/plain';
-  if (!(body instanceof FormData)) return 'application/json';
-}
-
-async function processResponse<TData, TError>(
-  response: Response
-): Promise<RequestFnResponse<TData, TError>> {
-  if (response.status === 204 || response.headers.get('Content-Length') === '0')
-    return (
-      response.ok ? { data: {}, response } : { error: {}, response }
-    ) as RequestFnResponse<TData, TError>;
-
-  if (isJsonResponse(response)) {
-    // clone response before parsing every time to allow multiple reads
-    const jsonResponse = response.clone().json();
-    return resolveResponse(
-      response,
-      response.ok ? jsonResponse : Promise.reject(await jsonResponse)
-    );
-  }
-
-  const jsonResponse = new Promise<TData>((resolve, reject) =>
-    // attempt to parse JSON for successful responses, otherwise fail
-    response.clone().text().then(JSON.parse).then(resolve, reject)
-  );
-
-  return resolveResponse(
-    response,
-    response.ok ? jsonResponse : Promise.reject(await jsonResponse)
-  );
-}
-
-function isJsonResponse(response: Response) {
-  const contentType = response.headers.get('Content-Type')?.toLowerCase();
-  return contentType?.includes('/json') || contentType?.includes('+json');
-}
-
-function resolveResponse<TData, TError>(
-  error: Error
-): Promise<RequestFnResponse<TData, TError>>;
-function resolveResponse<TData, TError>(
-  responseToReturn: Response,
-  responsePromise: Promise<TData>
-): Promise<RequestFnResponse<TData, TError>>;
-function resolveResponse<TData, TError>(
-  responseToReturn: Response | Error,
-  responsePromise?: Promise<TData>
-): Promise<RequestFnResponse<TData, TError>> {
-  if (!responsePromise)
-    return Promise.reject({
-      error: responseToReturn,
-      response: undefined,
-      data: undefined,
-    });
-
-  return responsePromise
-    .then(
-      (data) =>
-        ({ data, response: responseToReturn }) as RequestFnResponse<
-          TData,
-          TError
-        >
-    )
-    .catch(
-      (error) =>
-        ({ error, response: responseToReturn }) as RequestFnResponse<
-          TData,
-          TError
-        >
-    );
-}
-
 type WithRequired<T, K extends keyof T> = T & {
   [_ in K]: {};
 };

package/src/lib/responseUtils.ts

@@ -0,0 +1,77 @@
+import type { RequestFnResponse } from '@openapi-qraft/tanstack-query-react-types';
+
+/**
+ * Processes the response from the server.
+ * @beta
+ */
+export async function processResponse<TData, TError>(
+  response: Response
+): Promise<RequestFnResponse<TData, TError>> {
+  if (response.status === 204 || response.headers.get('Content-Length') === '0')
+    return (
+      response.ok ? { data: {}, response } : { error: {}, response }
+    ) as RequestFnResponse<TData, TError>;
+
+  if (isJsonResponse(response)) {
+    // clone response before parsing every time to allow multiple reads
+    const jsonResponse = response.clone().json();
+    return resolveResponse(
+      response,
+      response.ok ? jsonResponse : Promise.reject(await jsonResponse)
+    );
+  }
+
+  const jsonResponse = new Promise<TData>((resolve, reject) =>
+    // attempt to parse JSON for successful responses, otherwise fail
+    response.clone().text().then(JSON.parse).then(resolve, reject)
+  );
+
+  return resolveResponse(
+    response,
+    response.ok ? jsonResponse : Promise.reject(await jsonResponse)
+  );
+}
+
+/**
+ * Resolves the response from the server.
+ * @beta
+ */
+export function resolveResponse<TData, TError>(
+  error: Error
+): Promise<RequestFnResponse<TData, TError>>;
+export function resolveResponse<TData, TError>(
+  responseToReturn: Response,
+  responsePromise: Promise<TData>
+): Promise<RequestFnResponse<TData, TError>>;
+export function resolveResponse<TData, TError>(
+  responseToReturn: Response | Error,
+  responsePromise?: Promise<TData>
+): Promise<RequestFnResponse<TData, TError>> {
+  if (!responsePromise)
+    return Promise.reject({
+      error: responseToReturn,
+      response: undefined,
+      data: undefined,
+    });
+
+  return responsePromise
+    .then(
+      (data) =>
+        ({ data, response: responseToReturn }) as RequestFnResponse<
+          TData,
+          TError
+        >
+    )
+    .catch(
+      (error) =>
+        ({ error, response: responseToReturn }) as RequestFnResponse<
+          TData,
+          TError
+        >
+    );
+}
+
+function isJsonResponse(response: Response) {
+  const contentType = response.headers.get('Content-Type')?.toLowerCase();
+  return contentType?.includes('/json') || contentType?.includes('+json');
+}

package/src/unstable__responseUtils.ts

@@ -0,0 +1 @@
+export { resolveResponse, processResponse } from './lib/responseUtils.js';