From 5e2195fe409f8fa5185ada75baaa45e142d5cf64 Mon Sep 17 00:00:00 2001
From: lprnmns <manasalperen@gmail.com>
Date: Sun, 30 Aug 2026 18:51:59 +0300
Subject: [PATCH] fix(openapi-react-query): reject query options as request
 init

---
 .changeset/fix-query-options-init.md            |  5 +++++
 packages/openapi-react-query/src/index.ts       | 17 +++++++++--------
 .../openapi-react-query/test/index.test.tsx     | 12 ++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/fix-query-options-init.md

diff --git a/.changeset/fix-query-options-init.md b/.changeset/fix-query-options-init.md
new file mode 100644
index 000000000..225790b5f
--- /dev/null
+++ b/.changeset/fix-query-options-init.md
@@ -0,0 +1,5 @@
+---
+"openapi-react-query": patch
+---
+
+Reject React Query options passed as request init.
diff --git a/packages/openapi-react-query/src/index.ts b/packages/openapi-react-query/src/index.ts
index fb9683164..d81746801 100644
--- a/packages/openapi-react-query/src/index.ts
+++ b/packages/openapi-react-query/src/index.ts
@@ -30,6 +30,9 @@ import type { HttpMethod, MediaType, PathsWithMethod, RequiredKeysOf } from "ope
 type InferSelectReturnType<TData, TSelect> = TSelect extends (data: TData) => infer R ? R : TData;
 
 type InitWithUnknowns<Init> = Init & { [key: string]: unknown };
+// Keep arbitrary fetch init fields while reserving options for React Query itself.
+type QueryInit<Init> = InitWithUnknowns<Init> & { [Key in keyof UseQueryOptions]?: never };
+type InfiniteQueryInit<Init> = InitWithUnknowns<Init> & { [Key in keyof UseInfiniteQueryOptions]?: never };
 
 export type QueryKey<
   Paths extends Record<string, Record<HttpMethod, {}>>,
@@ -55,9 +58,7 @@ 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, options]: RequiredKeysOf<Init> extends never ? [QueryInit<Init>?, Options?] : [QueryInit<Init>, Options?]
 ) => NoInfer<
   Omit<
     UseQueryOptions<
@@ -99,8 +100,8 @@ export type UseQueryMethod<Paths extends Record<string, Record<HttpMethod, {}>>,
   method: Method,
   url: Path,
   ...[init, options, queryClient]: RequiredKeysOf<Init> extends never
-    ? [InitWithUnknowns<Init>?, Options?, QueryClient?]
-    : [InitWithUnknowns<Init>, Options?, QueryClient?]
+    ? [QueryInit<Init>?, Options?, QueryClient?]
+    : [QueryInit<Init>, Options?, QueryClient?]
 ) => UseQueryResult<InferSelectReturnType<Response["data"], Options["select"]>, Response["error"]>;
 
 export type UseInfiniteQueryMethod<Paths extends Record<string, Record<HttpMethod, {}>>, Media extends MediaType> = <
@@ -123,7 +124,7 @@ export type UseInfiniteQueryMethod<Paths extends Record<string, Record<HttpMetho
 >(
   method: Method,
   url: Path,
-  init: InitWithUnknowns<Init>,
+  init: InfiniteQueryInit<Init>,
   options: Options,
   queryClient?: QueryClient,
 ) => UseInfiniteQueryResult<
@@ -149,8 +150,8 @@ export type UseSuspenseQueryMethod<Paths extends Record<string, Record<HttpMetho
   method: Method,
   url: Path,
   ...[init, options, queryClient]: RequiredKeysOf<Init> extends never
-    ? [InitWithUnknowns<Init>?, Options?, QueryClient?]
-    : [InitWithUnknowns<Init>, Options?, QueryClient?]
+    ? [QueryInit<Init>?, Options?, QueryClient?]
+    : [QueryInit<Init>, Options?, QueryClient?]
 ) => UseSuspenseQueryResult<InferSelectReturnType<Response["data"], Options["select"]>, Response["error"]>;
 
 export type UseMutationMethod<Paths extends Record<string, Record<HttpMethod, {}>>, Media extends MediaType> = <
diff --git a/packages/openapi-react-query/test/index.test.tsx b/packages/openapi-react-query/test/index.test.tsx
index 78715e643..61cd4d9a1 100644
--- a/packages/openapi-react-query/test/index.test.tsx
+++ b/packages/openapi-react-query/test/index.test.tsx
@@ -478,6 +478,18 @@ describe("client", () => {
       >();
     });
 
+    it("should reject query options passed as request init", () => {
+      const fetchClient = createFetchClient<minimalGetPaths>({ baseUrl });
+      const client = createClient(fetchClient);
+
+      // @ts-expect-error Query options belong in the fourth argument.
+      const invalidQuery = () => client.useQuery("get", "/foo", { retry: false });
+      const customInit = () => client.useQuery("get", "/foo", { customRequestOption: true });
+      expectTypeOf(customInit).toBeFunction();
+
+      expectTypeOf(invalidQuery).toBeFunction();
+    });
+
     it("passes abort signal to fetch", async () => {
       let signalPassedToFetch: AbortSignal | undefined;