diff --git a/samples/angular-app/src/api/endpoints/pets/pets.msw.ts b/samples/angular-app/src/api/endpoints/pets/pets.msw.ts
index 5cdc7f1c8..2b92e450b 100644
--- a/samples/angular-app/src/api/endpoints/pets/pets.msw.ts
+++ b/samples/angular-app/src/api/endpoints/pets/pets.msw.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/angular-app/src/api/endpoints/pets/pets.service.ts b/samples/angular-app/src/api/endpoints/pets/pets.service.ts
index 171c89f49..1da4b3d58 100644
--- a/samples/angular-app/src/api/endpoints/pets/pets.service.ts
+++ b/samples/angular-app/src/api/endpoints/pets/pets.service.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/angular-app/src/api/model/createPetsBody.ts b/samples/angular-app/src/api/model/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/angular-app/src/api/model/createPetsBody.ts
+++ b/samples/angular-app/src/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/angular-app/src/api/model/error.ts b/samples/angular-app/src/api/model/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/angular-app/src/api/model/error.ts
+++ b/samples/angular-app/src/api/model/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/angular-app/src/api/model/listPetsParams.ts b/samples/angular-app/src/api/model/listPetsParams.ts
index 287fbfb86..559436d97 100644
--- a/samples/angular-app/src/api/model/listPetsParams.ts
+++ b/samples/angular-app/src/api/model/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/angular-app/src/api/model/pet.ts b/samples/angular-app/src/api/model/pet.ts
index 44e4a9a8d..d23a6589e 100644
--- a/samples/angular-app/src/api/model/pet.ts
+++ b/samples/angular-app/src/api/model/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/angular-app/src/api/model/pets.ts b/samples/angular-app/src/api/model/pets.ts
index f31cec378..cffc015d2 100644
--- a/samples/angular-app/src/api/model/pets.ts
+++ b/samples/angular-app/src/api/model/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/basic/api/endpoints/petstoreFromFileSpec.ts b/samples/basic/api/endpoints/petstoreFromFileSpec.ts
index 619871471..3dbfd5abe 100644
--- a/samples/basic/api/endpoints/petstoreFromFileSpec.ts
+++ b/samples/basic/api/endpoints/petstoreFromFileSpec.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/basic/api/endpoints/petstoreFromFileSpecWithConfig.ts b/samples/basic/api/endpoints/petstoreFromFileSpecWithConfig.ts
index 619871471..3dbfd5abe 100644
--- a/samples/basic/api/endpoints/petstoreFromFileSpecWithConfig.ts
+++ b/samples/basic/api/endpoints/petstoreFromFileSpecWithConfig.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/basic/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/basic/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index 4484aaf81..dedeca92d 100644
--- a/samples/basic/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/basic/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/basic/api/model/createPetsBody.ts b/samples/basic/api/model/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/basic/api/model/createPetsBody.ts
+++ b/samples/basic/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/basic/api/model/error.ts b/samples/basic/api/model/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/basic/api/model/error.ts
+++ b/samples/basic/api/model/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/basic/api/model/listPetsParams.ts b/samples/basic/api/model/listPetsParams.ts
index 287fbfb86..559436d97 100644
--- a/samples/basic/api/model/listPetsParams.ts
+++ b/samples/basic/api/model/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/basic/api/model/pet.ts b/samples/basic/api/model/pet.ts
index 44e4a9a8d..d23a6589e 100644
--- a/samples/basic/api/model/pet.ts
+++ b/samples/basic/api/model/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/basic/api/model/pets.ts b/samples/basic/api/model/pets.ts
index f31cec378..cffc015d2 100644
--- a/samples/basic/api/model/pets.ts
+++ b/samples/basic/api/model/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/nx-fastify-react/apps/app/src/api/endpoints/petstoreAPI.ts b/samples/nx-fastify-react/apps/app/src/api/endpoints/petstoreAPI.ts
index a009fc387..9f1cd0c42 100644
--- a/samples/nx-fastify-react/apps/app/src/api/endpoints/petstoreAPI.ts
+++ b/samples/nx-fastify-react/apps/app/src/api/endpoints/petstoreAPI.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Petstore API
  * Petstore API
@@ -48,11 +48,11 @@ export const useGetPets = <
     signal,
   }) => getPets(signal);
 
-  const query = useQuery<Awaited<ReturnType<typeof getPets>>, TError, TData>(
+  const query = useQuery<Awaited<ReturnType<typeof getPets>>, TError, TData>({
     queryKey,
     queryFn,
-    queryOptions
-  ) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
+    ...queryOptions,
+  }) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
 
   query.queryKey = queryKey;
 
diff --git a/samples/nx-fastify-react/apps/app/src/api/schemas/getPets201Item.ts b/samples/nx-fastify-react/apps/app/src/api/schemas/getPets201Item.ts
index 248bf4c3b..5e246d49e 100644
--- a/samples/nx-fastify-react/apps/app/src/api/schemas/getPets201Item.ts
+++ b/samples/nx-fastify-react/apps/app/src/api/schemas/getPets201Item.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Petstore API
  * Petstore API
diff --git a/samples/react-app-with-swr/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts b/samples/react-app-with-swr/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
index 485da5ccc..2be335868 100644
--- a/samples/react-app-with-swr/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
+++ b/samples/react-app-with-swr/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app-with-swr/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/react-app-with-swr/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index 02cb80350..91d565f1a 100644
--- a/samples/react-app-with-swr/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/react-app-with-swr/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app-with-swr/src/api/model/createPetsBody.ts b/samples/react-app-with-swr/src/api/model/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/react-app-with-swr/src/api/model/createPetsBody.ts
+++ b/samples/react-app-with-swr/src/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app-with-swr/src/api/model/error.ts b/samples/react-app-with-swr/src/api/model/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/react-app-with-swr/src/api/model/error.ts
+++ b/samples/react-app-with-swr/src/api/model/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app-with-swr/src/api/model/listPetsParams.ts b/samples/react-app-with-swr/src/api/model/listPetsParams.ts
index 287fbfb86..559436d97 100644
--- a/samples/react-app-with-swr/src/api/model/listPetsParams.ts
+++ b/samples/react-app-with-swr/src/api/model/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app-with-swr/src/api/model/pet.ts b/samples/react-app-with-swr/src/api/model/pet.ts
index f67123437..7f39b5485 100644
--- a/samples/react-app-with-swr/src/api/model/pet.ts
+++ b/samples/react-app-with-swr/src/api/model/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app-with-swr/src/api/model/pets.ts b/samples/react-app-with-swr/src/api/model/pets.ts
index f31cec378..cffc015d2 100644
--- a/samples/react-app-with-swr/src/api/model/pets.ts
+++ b/samples/react-app-with-swr/src/api/model/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts b/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
index e10089f58..39bad8a6a 100644
--- a/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
+++ b/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index 1abc2d155..7fe30c8a5 100644
--- a/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app/src/api/model/createPetsBody.ts b/samples/react-app/src/api/model/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/react-app/src/api/model/createPetsBody.ts
+++ b/samples/react-app/src/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app/src/api/model/error.ts b/samples/react-app/src/api/model/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/react-app/src/api/model/error.ts
+++ b/samples/react-app/src/api/model/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app/src/api/model/listPetsParams.ts b/samples/react-app/src/api/model/listPetsParams.ts
index 287fbfb86..559436d97 100644
--- a/samples/react-app/src/api/model/listPetsParams.ts
+++ b/samples/react-app/src/api/model/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app/src/api/model/pet.ts b/samples/react-app/src/api/model/pet.ts
index 44e4a9a8d..d23a6589e 100644
--- a/samples/react-app/src/api/model/pet.ts
+++ b/samples/react-app/src/api/model/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app/src/api/model/pets.ts b/samples/react-app/src/api/model/pets.ts
index f31cec378..cffc015d2 100644
--- a/samples/react-app/src/api/model/pets.ts
+++ b/samples/react-app/src/api/model/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts b/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
index 09eb3aaf4..7a5f3a556 100644
--- a/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
+++ b/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index 370250768..c93d407d9 100644
--- a/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,29 +1,29 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
  */
+import { useQuery, useInfiniteQuery, useMutation } from '@tanstack/react-query';
 import type {
-  MutationFunction,
-  QueryFunction,
-  QueryKey,
+  UseQueryOptions,
   UseInfiniteQueryOptions,
-  UseInfiniteQueryResult,
   UseMutationOptions,
-  UseQueryOptions,
+  QueryFunction,
+  MutationFunction,
   UseQueryResult,
+  UseInfiniteQueryResult,
+  QueryKey,
 } from '@tanstack/react-query';
-import { useInfiniteQuery, useMutation, useQuery } from '@tanstack/react-query';
 import type {
-  CreatePetsBody,
+  Pets,
   Error,
   ListPetsParams,
   Pet,
-  Pets,
+  CreatePetsBody,
 } from '../model';
-import type { ErrorType } from '../mutator/custom-instance';
 import { customInstance } from '../mutator/custom-instance';
+import type { ErrorType } from '../mutator/custom-instance';
 
 type AwaitedInput<T> = PromiseLike<T> | T;
 
diff --git a/samples/react-query/basic/src/api/model/cat.ts b/samples/react-query/basic/src/api/model/cat.ts
index 56e62070b..8e38729f3 100644
--- a/samples/react-query/basic/src/api/model/cat.ts
+++ b/samples/react-query/basic/src/api/model/cat.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/catType.ts b/samples/react-query/basic/src/api/model/catType.ts
index 4647bc2bc..cf92e71f9 100644
--- a/samples/react-query/basic/src/api/model/catType.ts
+++ b/samples/react-query/basic/src/api/model/catType.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/createPetsBody.ts b/samples/react-query/basic/src/api/model/createPetsBody.ts
index ccc51677c..ef1b29a68 100644
--- a/samples/react-query/basic/src/api/model/createPetsBody.ts
+++ b/samples/react-query/basic/src/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/dachshund.ts b/samples/react-query/basic/src/api/model/dachshund.ts
index c1f76d84b..814082e43 100644
--- a/samples/react-query/basic/src/api/model/dachshund.ts
+++ b/samples/react-query/basic/src/api/model/dachshund.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/dachshundBreed.ts b/samples/react-query/basic/src/api/model/dachshundBreed.ts
index 669a997bb..8935e66af 100644
--- a/samples/react-query/basic/src/api/model/dachshundBreed.ts
+++ b/samples/react-query/basic/src/api/model/dachshundBreed.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/dog.ts b/samples/react-query/basic/src/api/model/dog.ts
index 823328d46..94313fd88 100644
--- a/samples/react-query/basic/src/api/model/dog.ts
+++ b/samples/react-query/basic/src/api/model/dog.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/dogType.ts b/samples/react-query/basic/src/api/model/dogType.ts
index e2f21e8e8..0fd284fd6 100644
--- a/samples/react-query/basic/src/api/model/dogType.ts
+++ b/samples/react-query/basic/src/api/model/dogType.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/error.ts b/samples/react-query/basic/src/api/model/error.ts
index ff23a610c..cb3c4af0a 100644
--- a/samples/react-query/basic/src/api/model/error.ts
+++ b/samples/react-query/basic/src/api/model/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/labradoodle.ts b/samples/react-query/basic/src/api/model/labradoodle.ts
index c4af9f24a..5ebab0e93 100644
--- a/samples/react-query/basic/src/api/model/labradoodle.ts
+++ b/samples/react-query/basic/src/api/model/labradoodle.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/labradoodleBreed.ts b/samples/react-query/basic/src/api/model/labradoodleBreed.ts
index 3a810fdfa..fd04b4b4c 100644
--- a/samples/react-query/basic/src/api/model/labradoodleBreed.ts
+++ b/samples/react-query/basic/src/api/model/labradoodleBreed.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/listPetsParams.ts b/samples/react-query/basic/src/api/model/listPetsParams.ts
index 94270c55b..559436d97 100644
--- a/samples/react-query/basic/src/api/model/listPetsParams.ts
+++ b/samples/react-query/basic/src/api/model/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/pet.ts b/samples/react-query/basic/src/api/model/pet.ts
index 108151bb1..cadc283e3 100644
--- a/samples/react-query/basic/src/api/model/pet.ts
+++ b/samples/react-query/basic/src/api/model/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/petCallingCode.ts b/samples/react-query/basic/src/api/model/petCallingCode.ts
index 4233b61e4..033afe4c1 100644
--- a/samples/react-query/basic/src/api/model/petCallingCode.ts
+++ b/samples/react-query/basic/src/api/model/petCallingCode.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/petCountry.ts b/samples/react-query/basic/src/api/model/petCountry.ts
index 0c1d490b4..3c19ea5e6 100644
--- a/samples/react-query/basic/src/api/model/petCountry.ts
+++ b/samples/react-query/basic/src/api/model/petCountry.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/pets.ts b/samples/react-query/basic/src/api/model/pets.ts
index e3fcf1648..cffc015d2 100644
--- a/samples/react-query/basic/src/api/model/pets.ts
+++ b/samples/react-query/basic/src/api/model/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/custom-client/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts b/samples/react-query/custom-client/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
index 6a58ce886..b234ca0a4 100644
--- a/samples/react-query/custom-client/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
+++ b/samples/react-query/custom-client/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/custom-client/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/react-query/custom-client/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index 5cb190000..7f00d9ff5 100644
--- a/samples/react-query/custom-client/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/react-query/custom-client/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -82,7 +82,9 @@ export const useListPets = <
     Awaited<ReturnType<ReturnType<typeof useListPetsHook>>>,
     TError,
     TData
-  >(queryKey, queryFn, {
+  >({
+    queryKey,
+    queryFn,
     enabled: !!version,
     ...queryOptions,
   }) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
@@ -199,7 +201,9 @@ export const useShowPetById = <
     Awaited<ReturnType<ReturnType<typeof useShowPetByIdHook>>>,
     TError,
     TData
-  >(queryKey, queryFn, {
+  >({
+    queryKey,
+    queryFn,
     enabled: !!(version && petId),
     ...queryOptions,
   }) as UseQueryResult<TData, TError> & { queryKey: QueryKey };
diff --git a/samples/react-query/custom-client/src/api/model/createPetsBody.ts b/samples/react-query/custom-client/src/api/model/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/react-query/custom-client/src/api/model/createPetsBody.ts
+++ b/samples/react-query/custom-client/src/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/custom-client/src/api/model/error.ts b/samples/react-query/custom-client/src/api/model/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/react-query/custom-client/src/api/model/error.ts
+++ b/samples/react-query/custom-client/src/api/model/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/custom-client/src/api/model/listPetsParams.ts b/samples/react-query/custom-client/src/api/model/listPetsParams.ts
index 287fbfb86..559436d97 100644
--- a/samples/react-query/custom-client/src/api/model/listPetsParams.ts
+++ b/samples/react-query/custom-client/src/api/model/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/custom-client/src/api/model/pet.ts b/samples/react-query/custom-client/src/api/model/pet.ts
index cfd03971b..e6a15ac77 100644
--- a/samples/react-query/custom-client/src/api/model/pet.ts
+++ b/samples/react-query/custom-client/src/api/model/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/custom-client/src/api/model/petCallingCode.ts b/samples/react-query/custom-client/src/api/model/petCallingCode.ts
index 112bd9f2b..033afe4c1 100644
--- a/samples/react-query/custom-client/src/api/model/petCallingCode.ts
+++ b/samples/react-query/custom-client/src/api/model/petCallingCode.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/custom-client/src/api/model/petCountry.ts b/samples/react-query/custom-client/src/api/model/petCountry.ts
index 68458a1da..3c19ea5e6 100644
--- a/samples/react-query/custom-client/src/api/model/petCountry.ts
+++ b/samples/react-query/custom-client/src/api/model/petCountry.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/custom-client/src/api/model/pets.ts b/samples/react-query/custom-client/src/api/model/pets.ts
index f31cec378..cffc015d2 100644
--- a/samples/react-query/custom-client/src/api/model/pets.ts
+++ b/samples/react-query/custom-client/src/api/model/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data-mutator/endpoints.ts b/samples/react-query/form-data-mutator/endpoints.ts
index fc4a0025a..cf77ebebe 100644
--- a/samples/react-query/form-data-mutator/endpoints.ts
+++ b/samples/react-query/form-data-mutator/endpoints.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data-mutator/models/createPetsBody.ts b/samples/react-query/form-data-mutator/models/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/react-query/form-data-mutator/models/createPetsBody.ts
+++ b/samples/react-query/form-data-mutator/models/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data-mutator/models/error.ts b/samples/react-query/form-data-mutator/models/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/react-query/form-data-mutator/models/error.ts
+++ b/samples/react-query/form-data-mutator/models/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data-mutator/models/pet.ts b/samples/react-query/form-data-mutator/models/pet.ts
index cfd03971b..e6a15ac77 100644
--- a/samples/react-query/form-data-mutator/models/pet.ts
+++ b/samples/react-query/form-data-mutator/models/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data-mutator/models/petCallingCode.ts b/samples/react-query/form-data-mutator/models/petCallingCode.ts
index 112bd9f2b..033afe4c1 100644
--- a/samples/react-query/form-data-mutator/models/petCallingCode.ts
+++ b/samples/react-query/form-data-mutator/models/petCallingCode.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data-mutator/models/petCountry.ts b/samples/react-query/form-data-mutator/models/petCountry.ts
index 68458a1da..3c19ea5e6 100644
--- a/samples/react-query/form-data-mutator/models/petCountry.ts
+++ b/samples/react-query/form-data-mutator/models/petCountry.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data/endpoints.ts b/samples/react-query/form-data/endpoints.ts
index 4d0708315..02de676dd 100644
--- a/samples/react-query/form-data/endpoints.ts
+++ b/samples/react-query/form-data/endpoints.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data/models/createPetsBody.ts b/samples/react-query/form-data/models/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/react-query/form-data/models/createPetsBody.ts
+++ b/samples/react-query/form-data/models/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data/models/error.ts b/samples/react-query/form-data/models/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/react-query/form-data/models/error.ts
+++ b/samples/react-query/form-data/models/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data/models/pet.ts b/samples/react-query/form-data/models/pet.ts
index cfd03971b..e6a15ac77 100644
--- a/samples/react-query/form-data/models/pet.ts
+++ b/samples/react-query/form-data/models/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data/models/petCallingCode.ts b/samples/react-query/form-data/models/petCallingCode.ts
index 112bd9f2b..033afe4c1 100644
--- a/samples/react-query/form-data/models/petCallingCode.ts
+++ b/samples/react-query/form-data/models/petCallingCode.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data/models/petCountry.ts b/samples/react-query/form-data/models/petCountry.ts
index 68458a1da..3c19ea5e6 100644
--- a/samples/react-query/form-data/models/petCountry.ts
+++ b/samples/react-query/form-data/models/petCountry.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded-mutator/endpoints.ts b/samples/react-query/form-url-encoded-mutator/endpoints.ts
index 2c3940958..5cab1cda4 100644
--- a/samples/react-query/form-url-encoded-mutator/endpoints.ts
+++ b/samples/react-query/form-url-encoded-mutator/endpoints.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded-mutator/models/createPetsBody.ts b/samples/react-query/form-url-encoded-mutator/models/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/react-query/form-url-encoded-mutator/models/createPetsBody.ts
+++ b/samples/react-query/form-url-encoded-mutator/models/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded-mutator/models/error.ts b/samples/react-query/form-url-encoded-mutator/models/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/react-query/form-url-encoded-mutator/models/error.ts
+++ b/samples/react-query/form-url-encoded-mutator/models/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded-mutator/models/pet.ts b/samples/react-query/form-url-encoded-mutator/models/pet.ts
index cfd03971b..e6a15ac77 100644
--- a/samples/react-query/form-url-encoded-mutator/models/pet.ts
+++ b/samples/react-query/form-url-encoded-mutator/models/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded-mutator/models/petCallingCode.ts b/samples/react-query/form-url-encoded-mutator/models/petCallingCode.ts
index 112bd9f2b..033afe4c1 100644
--- a/samples/react-query/form-url-encoded-mutator/models/petCallingCode.ts
+++ b/samples/react-query/form-url-encoded-mutator/models/petCallingCode.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded-mutator/models/petCountry.ts b/samples/react-query/form-url-encoded-mutator/models/petCountry.ts
index 68458a1da..3c19ea5e6 100644
--- a/samples/react-query/form-url-encoded-mutator/models/petCountry.ts
+++ b/samples/react-query/form-url-encoded-mutator/models/petCountry.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded/endpoints.ts b/samples/react-query/form-url-encoded/endpoints.ts
index adad2dd7f..fa1453e8c 100644
--- a/samples/react-query/form-url-encoded/endpoints.ts
+++ b/samples/react-query/form-url-encoded/endpoints.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded/models/createPetsBody.ts b/samples/react-query/form-url-encoded/models/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/react-query/form-url-encoded/models/createPetsBody.ts
+++ b/samples/react-query/form-url-encoded/models/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded/models/error.ts b/samples/react-query/form-url-encoded/models/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/react-query/form-url-encoded/models/error.ts
+++ b/samples/react-query/form-url-encoded/models/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded/models/pet.ts b/samples/react-query/form-url-encoded/models/pet.ts
index cfd03971b..e6a15ac77 100644
--- a/samples/react-query/form-url-encoded/models/pet.ts
+++ b/samples/react-query/form-url-encoded/models/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded/models/petCallingCode.ts b/samples/react-query/form-url-encoded/models/petCallingCode.ts
index 112bd9f2b..033afe4c1 100644
--- a/samples/react-query/form-url-encoded/models/petCallingCode.ts
+++ b/samples/react-query/form-url-encoded/models/petCallingCode.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded/models/petCountry.ts b/samples/react-query/form-url-encoded/models/petCountry.ts
index 68458a1da..3c19ea5e6 100644
--- a/samples/react-query/form-url-encoded/models/petCountry.ts
+++ b/samples/react-query/form-url-encoded/models/petCountry.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/hook-mutator/endpoints.ts b/samples/react-query/hook-mutator/endpoints.ts
index 7c858c3e7..7dcacf2fe 100644
--- a/samples/react-query/hook-mutator/endpoints.ts
+++ b/samples/react-query/hook-mutator/endpoints.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -74,7 +74,7 @@ export const useListPets = <
     Awaited<ReturnType<ReturnType<typeof useListPetsHook>>>,
     TError,
     TData
-  >(queryKey, queryFn, queryOptions) as UseQueryResult<TData, TError> & {
+  >({ queryKey, queryFn, ...queryOptions }) as UseQueryResult<TData, TError> & {
     queryKey: QueryKey;
   };
 
@@ -179,7 +179,7 @@ export const useShowPetById = <
     Awaited<ReturnType<ReturnType<typeof useShowPetByIdHook>>>,
     TError,
     TData
-  >(queryKey, queryFn, { enabled: !!petId, ...queryOptions }) as UseQueryResult<
+  >({ queryKey, queryFn, enabled: !!petId, ...queryOptions }) as UseQueryResult<
     TData,
     TError
   > & { queryKey: QueryKey };
diff --git a/samples/react-query/hook-mutator/models/createPetsBody.ts b/samples/react-query/hook-mutator/models/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/react-query/hook-mutator/models/createPetsBody.ts
+++ b/samples/react-query/hook-mutator/models/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/hook-mutator/models/error.ts b/samples/react-query/hook-mutator/models/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/react-query/hook-mutator/models/error.ts
+++ b/samples/react-query/hook-mutator/models/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/hook-mutator/models/listPetsParams.ts b/samples/react-query/hook-mutator/models/listPetsParams.ts
index 287fbfb86..559436d97 100644
--- a/samples/react-query/hook-mutator/models/listPetsParams.ts
+++ b/samples/react-query/hook-mutator/models/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/hook-mutator/models/pet.ts b/samples/react-query/hook-mutator/models/pet.ts
index cfd03971b..e6a15ac77 100644
--- a/samples/react-query/hook-mutator/models/pet.ts
+++ b/samples/react-query/hook-mutator/models/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/hook-mutator/models/petCallingCode.ts b/samples/react-query/hook-mutator/models/petCallingCode.ts
index 112bd9f2b..033afe4c1 100644
--- a/samples/react-query/hook-mutator/models/petCallingCode.ts
+++ b/samples/react-query/hook-mutator/models/petCallingCode.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/hook-mutator/models/petCountry.ts b/samples/react-query/hook-mutator/models/petCountry.ts
index 68458a1da..3c19ea5e6 100644
--- a/samples/react-query/hook-mutator/models/petCountry.ts
+++ b/samples/react-query/hook-mutator/models/petCountry.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/hook-mutator/models/pets.ts b/samples/react-query/hook-mutator/models/pets.ts
index f31cec378..cffc015d2 100644
--- a/samples/react-query/hook-mutator/models/pets.ts
+++ b/samples/react-query/hook-mutator/models/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts b/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
index d3f4e9d32..628129e7c 100644
--- a/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
+++ b/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index 5852d19df..afb10acb0 100644
--- a/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,24 +1,24 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
  */
+import { createQuery, createMutation } from '@tanstack/svelte-query';
 import type {
-  CreateMutationOptions,
   CreateQueryOptions,
-  CreateQueryResult,
-  MutationFunction,
+  CreateMutationOptions,
   QueryFunction,
+  MutationFunction,
+  CreateQueryResult,
   QueryKey,
 } from '@tanstack/svelte-query';
-import { createMutation, createQuery } from '@tanstack/svelte-query';
 import type {
-  CreatePetsBody,
+  Pets,
   Error,
   ListPetsParams,
+  CreatePetsBody,
   Pet,
-  Pets,
 } from '../model';
 import { customInstance } from '../mutator/custom-instance';
 
diff --git a/samples/svelte-query/src/api/model/createPetsBody.ts b/samples/svelte-query/src/api/model/createPetsBody.ts
index ccc51677c..ef1b29a68 100644
--- a/samples/svelte-query/src/api/model/createPetsBody.ts
+++ b/samples/svelte-query/src/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/svelte-query/src/api/model/error.ts b/samples/svelte-query/src/api/model/error.ts
index ff23a610c..cb3c4af0a 100644
--- a/samples/svelte-query/src/api/model/error.ts
+++ b/samples/svelte-query/src/api/model/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/svelte-query/src/api/model/listPetsParams.ts b/samples/svelte-query/src/api/model/listPetsParams.ts
index 94270c55b..559436d97 100644
--- a/samples/svelte-query/src/api/model/listPetsParams.ts
+++ b/samples/svelte-query/src/api/model/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/svelte-query/src/api/model/pet.ts b/samples/svelte-query/src/api/model/pet.ts
index 74ea390ae..d23a6589e 100644
--- a/samples/svelte-query/src/api/model/pet.ts
+++ b/samples/svelte-query/src/api/model/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/svelte-query/src/api/model/pets.ts b/samples/svelte-query/src/api/model/pets.ts
index e3fcf1648..cffc015d2 100644
--- a/samples/svelte-query/src/api/model/pets.ts
+++ b/samples/svelte-query/src/api/model/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.1 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts b/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
index ec1765ab1..2b9829594 100644
--- a/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
+++ b/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index aa04b3198..a38b51b09 100644
--- a/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,21 +1,20 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
  */
-import { useQuery, useInfiniteQuery, useMutation } from 'vue-query';
+import { useQuery, useInfiniteQuery, useMutation } from '@tanstack/vue-query';
 import type {
   UseQueryOptions,
   UseInfiniteQueryOptions,
   UseMutationOptions,
   QueryFunction,
   MutationFunction,
-  UseQueryResult,
-  UseInfiniteQueryResult,
   QueryKey,
-} from 'vue-query/types';
-import type { UseQueryReturnType } from 'vue-query/lib/vue/useBaseQuery';
+  UseQueryReturnType,
+  UseInfiniteQueryReturnType,
+} from '@tanstack/vue-query';
 import type {
   Pets,
   Error,
@@ -68,13 +67,10 @@ export const useListPetsInfinite = <
       TData
     >;
   },
-): UseQueryReturnType<TData, TError, UseInfiniteQueryResult<TData, TError>> & {
-  queryKey: QueryKey;
-} => {
+): UseInfiniteQueryReturnType<TData, TError> & { queryKey: QueryKey } => {
   const { query: queryOptions } = options ?? {};
 
-  const queryKey =
-    queryOptions?.queryKey ?? getListPetsQueryKey(params, version);
+  const queryKey = getListPetsQueryKey(params, version);
 
   const queryFn: QueryFunction<Awaited<ReturnType<typeof listPets>>> = ({
     signal,
@@ -85,14 +81,12 @@ export const useListPetsInfinite = <
     Awaited<ReturnType<typeof listPets>>,
     TError,
     TData
-  >(queryKey, queryFn, {
+  >({
+    queryKey,
+    queryFn,
     enabled: !!version,
     ...queryOptions,
-  }) as UseQueryReturnType<
-    TData,
-    TError,
-    UseInfiniteQueryResult<TData, TError>
-  > & { queryKey: QueryKey };
+  }) as UseInfiniteQueryReturnType<TData, TError> & { queryKey: QueryKey };
 
   query.queryKey = queryKey;
 
@@ -117,25 +111,21 @@ export const useListPets = <
       TData
     >;
   },
-): UseQueryReturnType<TData, TError, UseQueryResult<TData, TError>> & {
-  queryKey: QueryKey;
-} => {
+): UseQueryReturnType<TData, TError> & { queryKey: QueryKey } => {
   const { query: queryOptions } = options ?? {};
 
-  const queryKey =
-    queryOptions?.queryKey ?? getListPetsQueryKey(params, version);
+  const queryKey = getListPetsQueryKey(params, version);
 
   const queryFn: QueryFunction<Awaited<ReturnType<typeof listPets>>> = ({
     signal,
   }) => listPets(params, version, signal);
 
-  const query = useQuery<Awaited<ReturnType<typeof listPets>>, TError, TData>(
+  const query = useQuery<Awaited<ReturnType<typeof listPets>>, TError, TData>({
     queryKey,
     queryFn,
-    { enabled: !!version, ...queryOptions },
-  ) as UseQueryReturnType<TData, TError, UseQueryResult<TData, TError>> & {
-    queryKey: QueryKey;
-  };
+    enabled: !!version,
+    ...queryOptions,
+  }) as UseQueryReturnType<TData, TError> & { queryKey: QueryKey };
 
   query.queryKey = queryKey;
 
@@ -224,13 +214,10 @@ export const useShowPetByIdInfinite = <
       TData
     >;
   },
-): UseQueryReturnType<TData, TError, UseInfiniteQueryResult<TData, TError>> & {
-  queryKey: QueryKey;
-} => {
+): UseInfiniteQueryReturnType<TData, TError> & { queryKey: QueryKey } => {
   const { query: queryOptions } = options ?? {};
 
-  const queryKey =
-    queryOptions?.queryKey ?? getShowPetByIdQueryKey(petId, version);
+  const queryKey = getShowPetByIdQueryKey(petId, version);
 
   const queryFn: QueryFunction<Awaited<ReturnType<typeof showPetById>>> = ({
     signal,
@@ -240,14 +227,12 @@ export const useShowPetByIdInfinite = <
     Awaited<ReturnType<typeof showPetById>>,
     TError,
     TData
-  >(queryKey, queryFn, {
+  >({
+    queryKey,
+    queryFn,
     enabled: !!(version && petId),
     ...queryOptions,
-  }) as UseQueryReturnType<
-    TData,
-    TError,
-    UseInfiniteQueryResult<TData, TError>
-  > & { queryKey: QueryKey };
+  }) as UseInfiniteQueryReturnType<TData, TError> & { queryKey: QueryKey };
 
   query.queryKey = queryKey;
 
@@ -272,13 +257,10 @@ export const useShowPetById = <
       TData
     >;
   },
-): UseQueryReturnType<TData, TError, UseQueryResult<TData, TError>> & {
-  queryKey: QueryKey;
-} => {
+): UseQueryReturnType<TData, TError> & { queryKey: QueryKey } => {
   const { query: queryOptions } = options ?? {};
 
-  const queryKey =
-    queryOptions?.queryKey ?? getShowPetByIdQueryKey(petId, version);
+  const queryKey = getShowPetByIdQueryKey(petId, version);
 
   const queryFn: QueryFunction<Awaited<ReturnType<typeof showPetById>>> = ({
     signal,
@@ -288,12 +270,12 @@ export const useShowPetById = <
     Awaited<ReturnType<typeof showPetById>>,
     TError,
     TData
-  >(queryKey, queryFn, {
+  >({
+    queryKey,
+    queryFn,
     enabled: !!(version && petId),
     ...queryOptions,
-  }) as UseQueryReturnType<TData, TError, UseQueryResult<TData, TError>> & {
-    queryKey: QueryKey;
-  };
+  }) as UseQueryReturnType<TData, TError> & { queryKey: QueryKey };
 
   query.queryKey = queryKey;
 
diff --git a/samples/vue-query/src/api/model/createPetsBody.ts b/samples/vue-query/src/api/model/createPetsBody.ts
index ab145b0d9..ef1b29a68 100644
--- a/samples/vue-query/src/api/model/createPetsBody.ts
+++ b/samples/vue-query/src/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/vue-query/src/api/model/error.ts b/samples/vue-query/src/api/model/error.ts
index 47c35cbdd..cb3c4af0a 100644
--- a/samples/vue-query/src/api/model/error.ts
+++ b/samples/vue-query/src/api/model/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/vue-query/src/api/model/listPetsParams.ts b/samples/vue-query/src/api/model/listPetsParams.ts
index 287fbfb86..559436d97 100644
--- a/samples/vue-query/src/api/model/listPetsParams.ts
+++ b/samples/vue-query/src/api/model/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/vue-query/src/api/model/pet.ts b/samples/vue-query/src/api/model/pet.ts
index a1b7a82ca..cc3453ed4 100644
--- a/samples/vue-query/src/api/model/pet.ts
+++ b/samples/vue-query/src/api/model/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/vue-query/src/api/model/pets.ts b/samples/vue-query/src/api/model/pets.ts
index f31cec378..cffc015d2 100644
--- a/samples/vue-query/src/api/model/pets.ts
+++ b/samples/vue-query/src/api/model/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.11.0 🍺
+ * Generated by orval v6.12.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0