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 013045820..5cae0fbb5 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -24,7 +24,7 @@ export const getShowPetByIdMock = () =>
     tag: faker.helpers.arrayElement([faker.word.sample(), void 0]),
   }))();
 
-export const getPetsMSW = () => [
+export const getPetsMock = () => [
   http.get('*/v:version/pets', async () => {
     await delay(1000);
     return new HttpResponse(JSON.stringify(getListPetsMock()), {
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 ca8b5a82e..afd329e13 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -45,7 +45,7 @@ export class PetsService {
    */
   listPets<TData = Pets>(params?: ListPetsParams, version = 1) {
     return listPetsMutator<TData>(
-      { url: `/v${version}/pets`, method: 'get', params },
+      { url: `/v${version}/pets`, method: 'GET', params },
       this.http,
     );
   }
diff --git a/samples/angular-app/src/api/model/createPetsBody.ts b/samples/angular-app/src/api/model/createPetsBody.ts
index e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/angular-app/src/api/model/index.ts b/samples/angular-app/src/api/model/index.ts
index b6c256f61..2ba0037fb 100644
--- a/samples/angular-app/src/api/model/index.ts
+++ b/samples/angular-app/src/api/model/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 6cc100e51..8059e8a06 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.20.0 🍺
+ * Generated by orval v6.21.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 9b0b5abd3..664a63cc5 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.20.0 🍺
+ * Generated by orval v6.21.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 0a685a0c9..945d41217 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.20.0 🍺
+ * Generated by orval v6.21.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 8871bb009..5c070431e 100644
--- a/samples/basic/api/endpoints/petstoreFromFileSpec.ts
+++ b/samples/basic/api/endpoints/petstoreFromFileSpec.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 8871bb009..5c070431e 100644
--- a/samples/basic/api/endpoints/petstoreFromFileSpecWithConfig.ts
+++ b/samples/basic/api/endpoints/petstoreFromFileSpecWithConfig.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 2324cdb40..7422568c1 100644
--- a/samples/basic/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/basic/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -17,7 +17,7 @@ import listPetsMutator from '../mutator/response-type';
 export const listPets = (params?: ListPetsParams, version = 1) => {
   return listPetsMutator<Pets>({
     url: `/v${version}/pets`,
-    method: 'get',
+    method: 'GET',
     params,
   });
 };
@@ -69,7 +69,7 @@ export const getShowPetByIdMock = () =>
     tag: faker.helpers.arrayElement([faker.word.sample(), void 0]),
   }))();
 
-export const getSwaggerPetstoreMSW = () => [
+export const getSwaggerPetstoreMock = () => [
   http.get('*/v:version/pets', async () => {
     await delay(1000);
     return new HttpResponse(JSON.stringify(getListPetsMock()), {
diff --git a/samples/basic/api/model/createPetsBody.ts b/samples/basic/api/model/createPetsBody.ts
index e7c38d61a..f2cdd30fb 100644
--- a/samples/basic/api/model/createPetsBody.ts
+++ b/samples/basic/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 100644
--- a/samples/basic/api/model/error.ts
+++ b/samples/basic/api/model/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/basic/api/model/index.ts b/samples/basic/api/model/index.ts
index b6c256f61..2ba0037fb 100644
--- a/samples/basic/api/model/index.ts
+++ b/samples/basic/api/model/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 6cc100e51..8059e8a06 100644
--- a/samples/basic/api/model/listPetsParams.ts
+++ b/samples/basic/api/model/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 9b0b5abd3..664a63cc5 100644
--- a/samples/basic/api/model/pet.ts
+++ b/samples/basic/api/model/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 0a685a0c9..945d41217 100644
--- a/samples/basic/api/model/pets.ts
+++ b/samples/basic/api/model/pets.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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.msw.ts b/samples/react-app-with-swr/src/api/endpoints/petstoreFromFileSpecWithTransformer.msw.ts
index 2ebfef409..8e8e31a4b 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -34,7 +34,7 @@ export const getShowPetByIdMock = () =>
     tag: faker.helpers.arrayElement([faker.word.sample(), void 0]),
   }))();
 
-export const getSwaggerPetstoreMSW = () => [
+export const getSwaggerPetstoreMock = () => [
   http.get('*/v:version/pets', async () => {
     await delay(1000);
     return new HttpResponse(JSON.stringify(getListPetsMock()), {
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 8d6ff1942..a4d066f7a 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -25,7 +25,7 @@ type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
 export const listPets = (params?: ListPetsParams, version = 1) => {
   return customInstance<Pets>({
     url: `/v${version}/pets`,
-    method: 'get',
+    method: 'GET',
     params,
   });
 };
@@ -77,7 +77,7 @@ export const useListPets = <TError = Error>(
 export const createPets = (createPetsBody: CreatePetsBody, version = 1) => {
   return customInstance<Pet>({
     url: `/v${version}/pets`,
-    method: 'post',
+    method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     data: createPetsBody,
   });
@@ -89,7 +89,7 @@ export const createPets = (createPetsBody: CreatePetsBody, version = 1) => {
 export const showPetById = (petId: string, version = 1) => {
   return customInstance<Pet>({
     url: `/v${version}/pets/${petId}`,
-    method: 'get',
+    method: 'GET',
   });
 };
 
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 e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app-with-swr/src/api/model/index.ts b/samples/react-app-with-swr/src/api/model/index.ts
index b6c256f61..2ba0037fb 100644
--- a/samples/react-app-with-swr/src/api/model/index.ts
+++ b/samples/react-app-with-swr/src/api/model/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 6cc100e51..8059e8a06 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.20.0 🍺
+ * Generated by orval v6.21.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 ba13bccd6..e2a17acca 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.20.0 🍺
+ * Generated by orval v6.21.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 0a685a0c9..945d41217 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.20.0 🍺
+ * Generated by orval v6.21.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 1f297182e..f580d254d 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -24,7 +24,7 @@ export const getShowPetByIdMock = () =>
     tag: faker.helpers.arrayElement([faker.word.sample(), void 0]),
   }))();
 
-export const getSwaggerPetstoreMSW = () => [
+export const getSwaggerPetstoreMock = () => [
   http.get('*/v:version/pets', async () => {
     await delay(1000);
     return new HttpResponse(JSON.stringify(getListPetsMock()), {
diff --git a/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/react-app/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index 94b9c87df..ad64d7f97 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -13,7 +13,7 @@ import { customInstance } from '../mutator/custom-instance';
 export const listPets = (params?: ListPetsParams, version = 1) => {
   return customInstance<Pets>({
     url: `/v${version}/pets`,
-    method: 'get',
+    method: 'GET',
     params,
   });
 };
@@ -24,7 +24,7 @@ export const listPets = (params?: ListPetsParams, version = 1) => {
 export const createPets = (createPetsBody: CreatePetsBody, version = 1) => {
   return customInstance<void>({
     url: `/v${version}/pets`,
-    method: 'post',
+    method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     data: createPetsBody,
   });
@@ -36,7 +36,7 @@ export const createPets = (createPetsBody: CreatePetsBody, version = 1) => {
 export const showPetById = (petId: string, version = 1) => {
   return customInstance<Pet>({
     url: `/v${version}/pets/${petId}`,
-    method: 'get',
+    method: 'GET',
   });
 };
 
diff --git a/samples/react-app/src/api/model/createPetsBody.ts b/samples/react-app/src/api/model/createPetsBody.ts
index e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-app/src/api/model/index.ts b/samples/react-app/src/api/model/index.ts
index b6c256f61..2ba0037fb 100644
--- a/samples/react-app/src/api/model/index.ts
+++ b/samples/react-app/src/api/model/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 6cc100e51..8059e8a06 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.20.0 🍺
+ * Generated by orval v6.21.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 9b0b5abd3..664a63cc5 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.20.0 🍺
+ * Generated by orval v6.21.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 0a685a0c9..945d41217 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.20.0 🍺
+ * Generated by orval v6.21.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 c8618867c..e9f12a03f 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -14,29 +14,32 @@ export const getListPetsMock = () =>
   ).map(() =>
     faker.helpers.arrayElement([
       {
-        breed: faker.helpers.arrayElement(['Labradoodle']),
+        breed: faker.helpers.arrayElement(['Labradoodle'] as const),
         cuteness: faker.number.int({ min: undefined, max: undefined }),
         barksPerMinute: faker.helpers.arrayElement([
           faker.number.int({ min: undefined, max: undefined }),
           undefined,
         ]),
-        type: faker.helpers.arrayElement(['dog']),
+        type: faker.helpers.arrayElement(['dog'] as const),
       },
       {
-        breed: faker.helpers.arrayElement(['Dachshund']),
+        breed: faker.helpers.arrayElement(['Dachshund'] as const),
         length: faker.number.int({ min: undefined, max: undefined }),
         barksPerMinute: faker.helpers.arrayElement([
           faker.number.int({ min: undefined, max: undefined }),
           undefined,
         ]),
-        type: faker.helpers.arrayElement(['dog']),
+        type: faker.helpers.arrayElement(['dog'] as const),
         '@id': faker.helpers.arrayElement([faker.word.sample(), undefined]),
         callingCode: faker.helpers.arrayElement([
-          faker.helpers.arrayElement(['+33', '+420', '+33']),
+          faker.helpers.arrayElement(['+33', '+420', '+33'] as const),
           undefined,
         ]),
         country: faker.helpers.arrayElement([
-          faker.helpers.arrayElement(["People's Republic of China", 'Uruguay']),
+          faker.helpers.arrayElement([
+            "People's Republic of China",
+            'Uruguay',
+          ] as const),
           undefined,
         ]),
         email: faker.helpers.arrayElement([faker.internet.email(), undefined]),
@@ -49,14 +52,17 @@ export const getListPetsMock = () =>
           faker.number.int({ min: undefined, max: undefined }),
           undefined,
         ]),
-        type: faker.helpers.arrayElement(['cat']),
+        type: faker.helpers.arrayElement(['cat'] as const),
         '@id': faker.helpers.arrayElement([faker.word.sample(), undefined]),
         callingCode: faker.helpers.arrayElement([
-          faker.helpers.arrayElement(['+33', '+420', '+33']),
+          faker.helpers.arrayElement(['+33', '+420', '+33'] as const),
           undefined,
         ]),
         country: faker.helpers.arrayElement([
-          faker.helpers.arrayElement(["People's Republic of China", 'Uruguay']),
+          faker.helpers.arrayElement([
+            "People's Republic of China",
+            'Uruguay',
+          ] as const),
           undefined,
         ]),
         email: faker.helpers.arrayElement([faker.internet.email(), undefined]),
@@ -70,29 +76,32 @@ export const getListPetsMock = () =>
 export const getCreatePetsMock = () =>
   faker.helpers.arrayElement([
     {
-      breed: faker.helpers.arrayElement(['Labradoodle']),
+      breed: faker.helpers.arrayElement(['Labradoodle'] as const),
       cuteness: faker.number.int({ min: undefined, max: undefined }),
       barksPerMinute: faker.helpers.arrayElement([
         faker.number.int({ min: undefined, max: undefined }),
         undefined,
       ]),
-      type: faker.helpers.arrayElement(['dog']),
+      type: faker.helpers.arrayElement(['dog'] as const),
     },
     {
-      breed: faker.helpers.arrayElement(['Dachshund']),
+      breed: faker.helpers.arrayElement(['Dachshund'] as const),
       length: faker.number.int({ min: undefined, max: undefined }),
       barksPerMinute: faker.helpers.arrayElement([
         faker.number.int({ min: undefined, max: undefined }),
         undefined,
       ]),
-      type: faker.helpers.arrayElement(['dog']),
+      type: faker.helpers.arrayElement(['dog'] as const),
       '@id': faker.helpers.arrayElement([faker.word.sample(), undefined]),
       callingCode: faker.helpers.arrayElement([
-        faker.helpers.arrayElement(['+33', '+420', '+33']),
+        faker.helpers.arrayElement(['+33', '+420', '+33'] as const),
         undefined,
       ]),
       country: faker.helpers.arrayElement([
-        faker.helpers.arrayElement(["People's Republic of China", 'Uruguay']),
+        faker.helpers.arrayElement([
+          "People's Republic of China",
+          'Uruguay',
+        ] as const),
         undefined,
       ]),
       email: faker.helpers.arrayElement([faker.internet.email(), undefined]),
@@ -105,14 +114,17 @@ export const getCreatePetsMock = () =>
         faker.number.int({ min: undefined, max: undefined }),
         undefined,
       ]),
-      type: faker.helpers.arrayElement(['cat']),
+      type: faker.helpers.arrayElement(['cat'] as const),
       '@id': faker.helpers.arrayElement([faker.word.sample(), undefined]),
       callingCode: faker.helpers.arrayElement([
-        faker.helpers.arrayElement(['+33', '+420', '+33']),
+        faker.helpers.arrayElement(['+33', '+420', '+33'] as const),
         undefined,
       ]),
       country: faker.helpers.arrayElement([
-        faker.helpers.arrayElement(["People's Republic of China", 'Uruguay']),
+        faker.helpers.arrayElement([
+          "People's Republic of China",
+          'Uruguay',
+        ] as const),
         undefined,
       ]),
       email: faker.helpers.arrayElement([faker.internet.email(), undefined]),
@@ -125,29 +137,32 @@ export const getCreatePetsMock = () =>
 export const getUpdatePetsMock = () =>
   faker.helpers.arrayElement([
     {
-      breed: faker.helpers.arrayElement(['Labradoodle']),
+      breed: faker.helpers.arrayElement(['Labradoodle'] as const),
       cuteness: faker.number.int({ min: undefined, max: undefined }),
       barksPerMinute: faker.helpers.arrayElement([
         faker.number.int({ min: undefined, max: undefined }),
         undefined,
       ]),
-      type: faker.helpers.arrayElement(['dog']),
+      type: faker.helpers.arrayElement(['dog'] as const),
     },
     {
-      breed: faker.helpers.arrayElement(['Dachshund']),
+      breed: faker.helpers.arrayElement(['Dachshund'] as const),
       length: faker.number.int({ min: undefined, max: undefined }),
       barksPerMinute: faker.helpers.arrayElement([
         faker.number.int({ min: undefined, max: undefined }),
         undefined,
       ]),
-      type: faker.helpers.arrayElement(['dog']),
+      type: faker.helpers.arrayElement(['dog'] as const),
       '@id': faker.helpers.arrayElement([faker.word.sample(), undefined]),
       callingCode: faker.helpers.arrayElement([
-        faker.helpers.arrayElement(['+33', '+420', '+33']),
+        faker.helpers.arrayElement(['+33', '+420', '+33'] as const),
         undefined,
       ]),
       country: faker.helpers.arrayElement([
-        faker.helpers.arrayElement(["People's Republic of China", 'Uruguay']),
+        faker.helpers.arrayElement([
+          "People's Republic of China",
+          'Uruguay',
+        ] as const),
         undefined,
       ]),
       email: faker.helpers.arrayElement([faker.internet.email(), undefined]),
@@ -160,14 +175,17 @@ export const getUpdatePetsMock = () =>
         faker.number.int({ min: undefined, max: undefined }),
         undefined,
       ]),
-      type: faker.helpers.arrayElement(['cat']),
+      type: faker.helpers.arrayElement(['cat'] as const),
       '@id': faker.helpers.arrayElement([faker.word.sample(), undefined]),
       callingCode: faker.helpers.arrayElement([
-        faker.helpers.arrayElement(['+33', '+420', '+33']),
+        faker.helpers.arrayElement(['+33', '+420', '+33'] as const),
         undefined,
       ]),
       country: faker.helpers.arrayElement([
-        faker.helpers.arrayElement(["People's Republic of China", 'Uruguay']),
+        faker.helpers.arrayElement([
+          "People's Republic of China",
+          'Uruguay',
+        ] as const),
         undefined,
       ]),
       email: faker.helpers.arrayElement([faker.internet.email(), undefined]),
@@ -184,7 +202,7 @@ export const getShowPetByIdMock = () =>
     tag: faker.helpers.arrayElement([faker.word.sample(), void 0]),
   }))();
 
-export const getSwaggerPetstoreMSW = () => [
+export const getSwaggerPetstoreMock = () => [
   http.get('*/v:version/pets', async () => {
     await delay(1000);
     return new HttpResponse(JSON.stringify(getListPetsMock()), {
diff --git a/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index f844549cd..e3879995a 100644
--- a/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/react-query/basic/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -77,7 +77,7 @@ type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
 export const listPets = (params?: ListPetsParams, version = 1) => {
   return customInstance<Pets>({
     url: `/v${version}/pets`,
-    method: 'get',
+    method: 'GET',
     params,
   });
 };
@@ -418,7 +418,7 @@ export const useListPetsSuspenseInfinite = <
 export const createPets = (createPetsBody: CreatePetsBody, version = 1) => {
   return customInstance<Pet>({
     url: `/v${version}/pets`,
-    method: 'post',
+    method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     data: createPetsBody,
   });
@@ -485,7 +485,7 @@ export const useCreatePets = <
 export const updatePets = (pet: NonReadonly<Pet>, version = 1) => {
   return customInstance<Pet>({
     url: `/v${version}/pets`,
-    method: 'put',
+    method: 'PUT',
     headers: { 'Content-Type': 'application/json' },
     data: pet,
   });
@@ -556,7 +556,7 @@ export const showPetById = (
 ) => {
   return customInstance<Pet>({
     url: `/v${version}/pets/${petId}`,
-    method: 'get',
+    method: 'GET',
     signal,
   });
 };
diff --git a/samples/react-query/basic/src/api/model/cat.ts b/samples/react-query/basic/src/api/model/cat.ts
index 25bb81e77..1f6f65015 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.20.0 🍺
+ * Generated by orval v6.21.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 89cc1592f..40b9e8283 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.20.0 🍺
+ * Generated by orval v6.21.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 e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 e71f18e1e..d0c9722fc 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.20.0 🍺
+ * Generated by orval v6.21.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 dc2c71d4c..b479dcc24 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.20.0 🍺
+ * Generated by orval v6.21.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 5c4d4792f..46be22b33 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.20.0 🍺
+ * Generated by orval v6.21.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 6dddcbec5..9311bc00c 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/basic/src/api/model/index.ts b/samples/react-query/basic/src/api/model/index.ts
index 6b75c49f6..7ed98007b 100644
--- a/samples/react-query/basic/src/api/model/index.ts
+++ b/samples/react-query/basic/src/api/model/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 b80c06de2..9448e39ad 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.20.0 🍺
+ * Generated by orval v6.21.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 696a42ce2..cbb27c9f2 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.20.0 🍺
+ * Generated by orval v6.21.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 6cc100e51..8059e8a06 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.20.0 🍺
+ * Generated by orval v6.21.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 4a16b4def..693f33e2a 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.20.0 🍺
+ * Generated by orval v6.21.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 3ea1455e1..fecad97fd 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.20.0 🍺
+ * Generated by orval v6.21.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 837c72e50..bd35a9b2a 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.20.0 🍺
+ * Generated by orval v6.21.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 0a685a0c9..945d41217 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.20.0 🍺
+ * Generated by orval v6.21.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 04dd608d8..bb19dc26d 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -14,11 +14,14 @@ export const getListPetsMock = () =>
   ).map(() => ({
     '@id': faker.helpers.arrayElement([faker.word.sample(), undefined]),
     callingCode: faker.helpers.arrayElement([
-      faker.helpers.arrayElement(['+33', '+420', '+33']),
+      faker.helpers.arrayElement(['+33', '+420', '+33'] as const),
       undefined,
     ]),
     country: faker.helpers.arrayElement([
-      faker.helpers.arrayElement(["People's Republic of China", 'Uruguay']),
+      faker.helpers.arrayElement([
+        "People's Republic of China",
+        'Uruguay',
+      ] as const),
       undefined,
     ]),
     email: faker.helpers.arrayElement([faker.internet.email(), undefined]),
@@ -30,11 +33,14 @@ export const getListPetsMock = () =>
 export const getCreatePetsMock = () => ({
   '@id': faker.helpers.arrayElement([faker.word.sample(), undefined]),
   callingCode: faker.helpers.arrayElement([
-    faker.helpers.arrayElement(['+33', '+420', '+33']),
+    faker.helpers.arrayElement(['+33', '+420', '+33'] as const),
     undefined,
   ]),
   country: faker.helpers.arrayElement([
-    faker.helpers.arrayElement(["People's Republic of China", 'Uruguay']),
+    faker.helpers.arrayElement([
+      "People's Republic of China",
+      'Uruguay',
+    ] as const),
     undefined,
   ]),
   email: faker.helpers.arrayElement([faker.internet.email(), undefined]),
@@ -50,7 +56,7 @@ export const getShowPetByIdMock = () =>
     tag: faker.helpers.arrayElement([faker.word.sample(), void 0]),
   }))();
 
-export const getSwaggerPetstoreMSW = () => [
+export const getSwaggerPetstoreMock = () => [
   http.get('*/v:version/pets', async () => {
     await delay(1000);
     return new HttpResponse(JSON.stringify(getListPetsMock()), {
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 df333567c..23a8030e7 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -36,7 +36,7 @@ export const useListPetsHook = () => {
   return (params?: ListPetsParams, version = 1, signal?: AbortSignal) => {
     return listPets({
       url: `/v${version}/pets`,
-      method: 'get',
+      method: 'GET',
       params,
       signal,
     });
@@ -126,7 +126,7 @@ export const useCreatePetsHook = () => {
   return (createPetsBody: BodyType<CreatePetsBody>, version = 1) => {
     return createPets({
       url: `/v${version}/pets`,
-      method: 'post',
+      method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       data: createPetsBody,
     });
@@ -199,7 +199,7 @@ export const useShowPetByIdHook = () => {
   return (petId: string, version = 1, signal?: AbortSignal) => {
     return showPetById({
       url: `/v${version}/pets/${petId}`,
-      method: 'get',
+      method: 'GET',
       signal,
     });
   };
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 e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/custom-client/src/api/model/index.ts b/samples/react-query/custom-client/src/api/model/index.ts
index 8e7e1c64f..b0db027fa 100644
--- a/samples/react-query/custom-client/src/api/model/index.ts
+++ b/samples/react-query/custom-client/src/api/model/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 6cc100e51..8059e8a06 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.20.0 🍺
+ * Generated by orval v6.21.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 eb3a05c5c..c08883841 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.20.0 🍺
+ * Generated by orval v6.21.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 3ea1455e1..fecad97fd 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.20.0 🍺
+ * Generated by orval v6.21.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 837c72e50..bd35a9b2a 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.20.0 🍺
+ * Generated by orval v6.21.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 0a685a0c9..945d41217 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.20.0 🍺
+ * Generated by orval v6.21.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 91d9e9deb..bf237b524 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -21,7 +21,7 @@ export const createPets = (createPetsBody: CreatePetsBody) => {
   const formData = customFormData(createPetsBody);
   return customInstance<Pet>({
     url: `/pets`,
-    method: 'post',
+    method: 'POST',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: formData,
   });
diff --git a/samples/react-query/form-data-mutator/models/createPetsBody.ts b/samples/react-query/form-data-mutator/models/createPetsBody.ts
index e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data-mutator/models/index.ts b/samples/react-query/form-data-mutator/models/index.ts
index f6ce4e3fb..84c330062 100644
--- a/samples/react-query/form-data-mutator/models/index.ts
+++ b/samples/react-query/form-data-mutator/models/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 eb3a05c5c..c08883841 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.20.0 🍺
+ * Generated by orval v6.21.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 3ea1455e1..fecad97fd 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.20.0 🍺
+ * Generated by orval v6.21.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 837c72e50..bd35a9b2a 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.20.0 🍺
+ * Generated by orval v6.21.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 1531beac3..c4b4ee79a 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -23,7 +23,7 @@ export const createPets = (createPetsBody: CreatePetsBody) => {
 
   return customInstance<Pet>({
     url: `/pets`,
-    method: 'post',
+    method: 'POST',
     headers: { 'Content-Type': 'multipart/form-data' },
     data: formData,
   });
diff --git a/samples/react-query/form-data/models/createPetsBody.ts b/samples/react-query/form-data/models/createPetsBody.ts
index e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-data/models/index.ts b/samples/react-query/form-data/models/index.ts
index f6ce4e3fb..84c330062 100644
--- a/samples/react-query/form-data/models/index.ts
+++ b/samples/react-query/form-data/models/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 eb3a05c5c..c08883841 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.20.0 🍺
+ * Generated by orval v6.21.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 3ea1455e1..fecad97fd 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.20.0 🍺
+ * Generated by orval v6.21.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 837c72e50..bd35a9b2a 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.20.0 🍺
+ * Generated by orval v6.21.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 5b1e8457f..64e2474e0 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -21,7 +21,7 @@ export const createPets = (createPetsBody: CreatePetsBody) => {
   const formUrlEncoded = customFormUrlEncoded(createPetsBody);
   return customInstance<Pet>({
     url: `/pets`,
-    method: 'post',
+    method: 'POST',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     data: formUrlEncoded,
   });
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 e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded-mutator/models/index.ts b/samples/react-query/form-url-encoded-mutator/models/index.ts
index f6ce4e3fb..84c330062 100644
--- a/samples/react-query/form-url-encoded-mutator/models/index.ts
+++ b/samples/react-query/form-url-encoded-mutator/models/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 eb3a05c5c..c08883841 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.20.0 🍺
+ * Generated by orval v6.21.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 3ea1455e1..fecad97fd 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.20.0 🍺
+ * Generated by orval v6.21.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 837c72e50..bd35a9b2a 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.20.0 🍺
+ * Generated by orval v6.21.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 7c6a17c00..efbe775f1 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -23,7 +23,7 @@ export const createPets = (createPetsBody: CreatePetsBody) => {
 
   return customInstance<Pet>({
     url: `/pets`,
-    method: 'post',
+    method: 'POST',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     data: formUrlEncoded,
   });
diff --git a/samples/react-query/form-url-encoded/models/createPetsBody.ts b/samples/react-query/form-url-encoded/models/createPetsBody.ts
index e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/form-url-encoded/models/index.ts b/samples/react-query/form-url-encoded/models/index.ts
index f6ce4e3fb..84c330062 100644
--- a/samples/react-query/form-url-encoded/models/index.ts
+++ b/samples/react-query/form-url-encoded/models/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 eb3a05c5c..c08883841 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.20.0 🍺
+ * Generated by orval v6.21.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 3ea1455e1..fecad97fd 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.20.0 🍺
+ * Generated by orval v6.21.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 837c72e50..bd35a9b2a 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.20.0 🍺
+ * Generated by orval v6.21.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 8b00442a8..75d7575d1 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -33,7 +33,7 @@ export const useListPetsHook = () => {
   const listPets = useCustomInstance<Pets>();
 
   return (params?: ListPetsParams, signal?: AbortSignal) => {
-    return listPets({ url: `/pets`, method: 'get', params, signal });
+    return listPets({ url: `/pets`, method: 'GET', params, signal });
   };
 };
 
@@ -112,7 +112,7 @@ export const useCreatePetsHook = () => {
   return (createPetsBody: CreatePetsBody) => {
     return createPets({
       url: `/pets`,
-      method: 'post',
+      method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       data: createPetsBody,
     });
@@ -180,7 +180,7 @@ export const useShowPetByIdHook = () => {
   const showPetById = useCustomInstance<Pet>();
 
   return (petId: string, signal?: AbortSignal) => {
-    return showPetById({ url: `/pets/${petId}`, method: 'get', signal });
+    return showPetById({ url: `/pets/${petId}`, method: 'GET', signal });
   };
 };
 
diff --git a/samples/react-query/hook-mutator/models/createPetsBody.ts b/samples/react-query/hook-mutator/models/createPetsBody.ts
index e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/react-query/hook-mutator/models/index.ts b/samples/react-query/hook-mutator/models/index.ts
index 8e7e1c64f..b0db027fa 100644
--- a/samples/react-query/hook-mutator/models/index.ts
+++ b/samples/react-query/hook-mutator/models/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 6cc100e51..8059e8a06 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.20.0 🍺
+ * Generated by orval v6.21.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 eb3a05c5c..c08883841 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.20.0 🍺
+ * Generated by orval v6.21.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 3ea1455e1..fecad97fd 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.20.0 🍺
+ * Generated by orval v6.21.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 837c72e50..bd35a9b2a 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.20.0 🍺
+ * Generated by orval v6.21.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 0a685a0c9..945d41217 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.20.0 🍺
+ * Generated by orval v6.21.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 eb6504957..7682400d6 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -24,7 +24,7 @@ export const getShowPetByIdMock = () =>
     tag: faker.helpers.arrayElement([faker.string.sample(), void 0]),
   }))();
 
-export const getSwaggerPetstoreMSW = () => [
+export const getSwaggerPetstoreMock = () => [
   http.get('*/v:version/pets', async () => {
     await delay(1000);
     return new HttpResponse(JSON.stringify(getListPetsMock()), {
diff --git a/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index 583d67f81..a96210c10 100644
--- a/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/svelte-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -32,7 +32,7 @@ export const listPets = (
 ) => {
   return customInstance<Pets>({
     url: `/v${version}/pets`,
-    method: 'get',
+    method: 'GET',
     params,
     signal,
   });
@@ -117,7 +117,7 @@ export const createListPets = <
 export const createPets = (createPetsBody: CreatePetsBody, version = 1) => {
   return customInstance<void>({
     url: `/v${version}/pets`,
-    method: 'post',
+    method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     data: createPetsBody,
   });
@@ -185,7 +185,7 @@ export const showPetById = (
 ) => {
   return customInstance<Pet>({
     url: `/v${version}/pets/${petId}`,
-    method: 'get',
+    method: 'GET',
     signal,
   });
 };
diff --git a/samples/svelte-query/src/api/model/createPetsBody.ts b/samples/svelte-query/src/api/model/createPetsBody.ts
index e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/svelte-query/src/api/model/index.ts b/samples/svelte-query/src/api/model/index.ts
index b6c256f61..2ba0037fb 100644
--- a/samples/svelte-query/src/api/model/index.ts
+++ b/samples/svelte-query/src/api/model/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 6cc100e51..8059e8a06 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.20.0 🍺
+ * Generated by orval v6.21.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 9b0b5abd3..664a63cc5 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.20.0 🍺
+ * Generated by orval v6.21.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 0a685a0c9..945d41217 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc2f3824..adfeab55e 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -32,7 +32,7 @@ export const getShowPetByIdMock = () =>
     tag: faker.helpers.arrayElement([faker.word.sample(), void 0]),
   }))();
 
-export const getSwaggerPetstoreMSW = () => [
+export const getSwaggerPetstoreMock = () => [
   http.get('*/v:version/pets', async () => {
     await delay(1000);
     return new HttpResponse(JSON.stringify(getListPetsMock()), {
diff --git a/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts b/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
index d8e4f01d7..b537c2077 100644
--- a/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
+++ b/samples/vue-query/src/api/endpoints/petstoreFromFileSpecWithTransformer.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -43,7 +43,7 @@ export const listPets = (
 
   return customInstance<Pets>({
     url: `/v${version}/pets`,
-    method: 'get',
+    method: 'GET',
     params,
     signal,
   });
@@ -81,7 +81,7 @@ export const getListPetsInfiniteQueryOptions = <
     pageParam,
   }) =>
     listPets(
-      { ...params, limit: pageParam || params?.['limit'] },
+      { ...params, limit: pageParam || unref(params)?.['limit'] },
       version,
       signal,
     );
@@ -211,7 +211,7 @@ export const createPets = (
 
   return customInstance<Pet>({
     url: `/v${version}/pets`,
-    method: 'post',
+    method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     data: createPetsBody,
   });
@@ -282,7 +282,7 @@ export const showPetById = (
 
   return customInstance<Pet>({
     url: `/v${version}/pets/${petId}`,
-    method: 'get',
+    method: 'GET',
     signal,
   });
 };
diff --git a/samples/vue-query/src/api/model/createPetsBody.ts b/samples/vue-query/src/api/model/createPetsBody.ts
index e7c38d61a..f2cdd30fb 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.20.0 🍺
+ * Generated by orval v6.21.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 6fc080cde..75424d9fe 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
diff --git a/samples/vue-query/src/api/model/index.ts b/samples/vue-query/src/api/model/index.ts
index b6c256f61..2ba0037fb 100644
--- a/samples/vue-query/src/api/model/index.ts
+++ b/samples/vue-query/src/api/model/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.20.0 🍺
+ * Generated by orval v6.21.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 6cc100e51..8059e8a06 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.20.0 🍺
+ * Generated by orval v6.21.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 29fbd3081..5893baf6f 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.20.0 🍺
+ * Generated by orval v6.21.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 0a685a0c9..945d41217 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.20.0 🍺
+ * Generated by orval v6.21.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0