feat(openapi-react-query)!: change queryOptions params

Author: jeiea

.changeset/rich-boxes-add.md

@@ -0,0 +1,5 @@
+---
+"openapi-react-query": minor
+---
+
+Removed fourth argument from `queryOptions()`. Use spread operator instead.

docs/openapi-react-query/query-options.md

@@ -96,7 +96,7 @@ export const $api = createClient(fetchClient);
 ## Api
 
 ```tsx
-const queryOptions = $api.queryOptions(method, path, options, queryOptions);
+const queryOptions = $api.queryOptions(method, path, options);
 ```
 
 **Arguments**
@@ -112,8 +112,6 @@ const queryOptions = $api.queryOptions(method, path, options, queryOptions);
   - The fetch options to use for the request.
   - Only required if the OpenApi schema requires parameters.
   - The options `params` are used as key. See [Query Keys](https://tanstack.com/query/latest/docs/framework/react/guides/query-keys) for more information.
-- `queryOptions`
-  - Additional query options to pass through.
 
 **Returns**
 

packages/openapi-react-query/src/index.ts

@@ -19,7 +19,7 @@ export type QueryKey<
   Paths extends Record<string, Record<HttpMethod, {}>>,
   Method extends HttpMethod,
   Path extends PathsWithMethod<Paths, Method>,
-> = readonly [FetchClient<Paths>, Method, Path, MaybeOptionalInit<Paths[Path], Method>];
+> = readonly [FetchClient<Paths, MediaType>, Method, Path, MaybeOptionalInit<Paths[Path], Method>];
 
 export type QueryOptionsFunction<Paths extends Record<string, Record<HttpMethod, {}>>, Media extends MediaType> = <
   Method extends HttpMethod,
@@ -33,9 +33,8 @@ export type QueryOptionsFunction<Paths extends Record<string, Record<HttpMethod,
 >(
   method: Method,
   path: Path,
-  ...[init, options]: RequiredKeysOf<Init> extends never
-    ? [InitWithUnknowns<Init>?, Options?]
-    : [InitWithUnknowns<Init>, Options?]
+  init?: InitWithUnknowns<Init>,
+  options?: Options,
 ) => NoInfer<
   Omit<
     UseQueryOptions<Response["data"], Response["error"], Response["data"], QueryKey<Paths, Method, Path>>,
@@ -119,18 +118,17 @@ export default function createClient<Paths extends {}, Media extends MediaType =
     return data;
   };
 
-  const queryOptions: QueryOptionsFunction<Paths, Media> = (method, path, ...[init, options]) => ({
+  const queryOptions: QueryOptionsFunction<Paths, Media> = (method, path, init) => ({
     queryKey: [client, method, path, init as InitWithUnknowns<typeof init>] as const,
     queryFn,
-    ...options,
   });
 
   return {
     queryOptions,
     useQuery: (method, path, ...[init, options, queryClient]) =>
-      useQuery(queryOptions(method, path, init as InitWithUnknowns<typeof init>, options), queryClient),
+      useQuery({ ...queryOptions(method, path, init), ...options }, queryClient),
     useSuspenseQuery: (method, path, ...[init, options, queryClient]) =>
-      useSuspenseQuery(queryOptions(method, path, init as InitWithUnknowns<typeof init>, options), queryClient),
+      useSuspenseQuery({ ...queryOptions(method, path, init), ...options }, queryClient),
     useMutation: (method, path, options, queryClient) =>
       useMutation(
         {