fix: handle empty response in MSW mocks (#1482)

orval-labs · Jun 26, 2024 · c2fff70 · c2fff70
1 parent 7efca63
commit c2fff70
Show file tree

Hide file tree

Showing 158 changed files with 219 additions and 5,222 deletions.
diff --git a/packages/mock/src/msw/index.ts b/packages/mock/src/msw/index.ts
@@ -136,13 +136,13 @@ export const ${handlerName} = (${
             : ${getResponseMockFunctionName}())`
         : null
     },
-      {
-        status: ${status === 'default' ? 200 : status.replace(/XX$/, '00')},
-        headers: {
-          'Content-Type': '${isTextPlain ? 'text/plain' : 'application/json'}',
+      { status: ${status === 'default' ? 200 : status.replace(/XX$/, '00')},
+        ${
+          isReturnHttpResponse
+            ? `headers: { 'Content-Type': ${isTextPlain ? "'text/plain'" : "'application/json'"} }`
+            : ''
         }
-      }
-    )
+      })
   })
 }\n`;
 

diff --git 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.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -42,25 +42,15 @@ export const getListPetsMockHandler = (
             : overrideResponse
           : getListPetsResponseMock(),
       ),
-      {
-        status: 200,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      },
+      { status: 200, headers: { 'Content-Type': 'application/json' } },
     );
   });
 };
 
 export const getCreatePetsMockHandler = () => {
   return http.post('*/v:version/pets', async () => {
     await delay(1000);
-    return new HttpResponse(null, {
-      status: 201,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    });
+    return new HttpResponse(null, { status: 201 });
   });
 };
 
@@ -81,12 +71,7 @@ export const getShowPetByIdMockHandler = (
             : overrideResponse
           : getShowPetByIdResponseMock(),
       ),
-      {
-        status: 200,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      },
+      { status: 200, headers: { 'Content-Type': 'application/json' } },
     );
   });
 };

diff --git 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.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0
@@ -155,25 +155,15 @@ export const getListPetsMockHandler = (
             : overrideResponse
           : getListPetsResponseMock(),
       ),
-      {
-        status: 200,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      },
+      { status: 200, headers: { 'Content-Type': 'application/json' } },
     );
   });
 };
 
 export const getCreatePetsMockHandler = () => {
   return http.post('*/v:version/pets', async () => {
     await delay(1000);
-    return new HttpResponse(null, {
-      status: 201,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    });
+    return new HttpResponse(null, { status: 201 });
   });
 };
 
@@ -194,12 +184,7 @@ export const getListPetsNestedArrayMockHandler = (
             : overrideResponse
           : getListPetsNestedArrayResponseMock(),
       ),
-      {
-        status: 200,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      },
+      { status: 200, headers: { 'Content-Type': 'application/json' } },
     );
   });
 };
@@ -221,12 +206,7 @@ export const getShowPetByIdMockHandler = (
             : overrideResponse
           : getShowPetByIdResponseMock(),
       ),
-      {
-        status: 200,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      },
+      { status: 200, headers: { 'Content-Type': 'application/json' } },
     );
   });
 };

diff --git a/samples/basic/api/model/createPetsBody.ts b/samples/basic/api/model/createPetsBody.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/basic/api/model/listPetsNestedArrayParams.ts b/samples/basic/api/model/listPetsNestedArrayParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.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
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/basic/api/model/petCallingCode.ts b/samples/basic/api/model/petCallingCode.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/basic/api/model/petCountry.ts b/samples/basic/api/model/petCountry.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/basic/api/model/petsArray.ts b/samples/basic/api/model/petsArray.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/basic/api/model/petsNestedArray.ts b/samples/basic/api/model/petsNestedArray.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/hono/src/petstore.context.ts b/samples/hono/src/petstore.context.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/hono/src/petstore.schemas.ts b/samples/hono/src/petstore.schemas.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/hono/src/petstore.ts b/samples/hono/src/petstore.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/hono/src/petstore.validator.ts b/samples/hono/src/petstore.validator.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/hono/src/petstore.zod.ts b/samples/hono/src/petstore.zod.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/cat.ts b/samples/next-app-with-fetch/app/gen/models/cat.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/catType.ts b/samples/next-app-with-fetch/app/gen/models/catType.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/createPetsBodyItem.ts b/samples/next-app-with-fetch/app/gen/models/createPetsBodyItem.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/dachshund.ts b/samples/next-app-with-fetch/app/gen/models/dachshund.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/dachshundBreed.ts b/samples/next-app-with-fetch/app/gen/models/dachshundBreed.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/dog.ts b/samples/next-app-with-fetch/app/gen/models/dog.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/dogType.ts b/samples/next-app-with-fetch/app/gen/models/dogType.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/error.ts b/samples/next-app-with-fetch/app/gen/models/error.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/index.ts b/samples/next-app-with-fetch/app/gen/models/index.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/labradoodle.ts b/samples/next-app-with-fetch/app/gen/models/labradoodle.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/labradoodleBreed.ts b/samples/next-app-with-fetch/app/gen/models/labradoodleBreed.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/listPetsParams.ts b/samples/next-app-with-fetch/app/gen/models/listPetsParams.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/pet.ts b/samples/next-app-with-fetch/app/gen/models/pet.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/petCallingCode.ts b/samples/next-app-with-fetch/app/gen/models/petCallingCode.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0

diff --git a/samples/next-app-with-fetch/app/gen/models/petCountry.ts b/samples/next-app-with-fetch/app/gen/models/petCountry.ts
@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.30.2 🍺
+ * Generated by orval v6.31.0 🍺
  * Do not edit manually.
  * Swagger Petstore
  * OpenAPI spec version: 1.0.0