fix(msw): fix break msw when anyof included allof (#1635)

* fix(msw): fix break msw when `anyOf` include `allOf` * chore: add test case
orval-labs · Sep 22, 2024 · f373039 · f373039
1 parent 398b667
commit f373039
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/packages/mock/src/faker/getters/combine.ts b/packages/mock/src/faker/getters/combine.ts
@@ -117,7 +117,8 @@ export const combineSchemasMock = ({
     }
 
     const isObjectBounds =
-      !combine || (combine.separator === 'oneOf' && separator === 'allOf');
+      !combine ||
+      (['oneOf', 'anyOf'].includes(combine.separator) && separator === 'allOf');
 
     if (!index && isObjectBounds) {
       if (

diff --git a/tests/specifications/any-of.yaml b/tests/specifications/any-of.yaml
@@ -22,9 +22,49 @@ paths:
       responses:
         '204':
           description: Ok
+  /any-of-included-all-of-pet:
+    get:
+      summary: Gets anyOf included allOf pets
+      operationId: getAnyOfIncludedAllOfPets
+      responses:
+        '200':
+          description: Pet
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
 components:
   schemas:
     A:
       type: string
       enum:
         - A
+    Pet:
+      anyOf:
+        - $ref: '#/components/schemas/Cat'
+        - $ref: '#/components/schemas/Dog'
+    Cat:
+      type: object
+      required:
+        - color
+      properties:
+        color:
+          type: string
+    Dog:
+      allOf:
+        - $ref: '#/components/schemas/DogType'
+        - $ref: '#/components/schemas/DogDetail'
+    DogType:
+      type: object
+      required:
+        - type
+      properties:
+        type:
+          type: string
+    DogDetail:
+      type: object
+      required:
+        - name
+      properties:
+        name:
+          type: string