fix: required of parent schema not considered in allOf #1570

packages/core/src/getters/combine.ts

@@ -113,6 +113,12 @@ export const combineSchemas = ({
         propName = propName + pascal(getNumberWord(acc.schemas.length + 1));
       }
 
+      // the required fields in this schema need to be considered
+      // in the sub schema under the allOf key
+      if (separator === 'allOf') {
+        subSchema = {...subSchema, required: schema.required};
+      }
+
       const resolvedValue = resolveObject({
         schema: subSchema,
         propName,

tests/configs/react-query.config.ts

@@ -413,6 +413,18 @@ export default defineConfig({
       target: '../specifications/polymorphic.yaml',
     },
   },
+  polymorphicRequired: {
+    output: {
+      target: '../generated/react-query/polymorphic-required/endpoints.ts',
+      schemas: '../generated/react-query/polymorphic-required/model',
+      client: 'react-query',
+      mock: true,
+      headers: true,
+    },
+    input: {
+      target: '../specifications/polymorphic-required.yaml',
+    },
+  },
   namedParameters: {
     output: {
       target: '../generated/react-query/named-parameters/endpoints.ts',

tests/specifications/polymorphic-required.yaml

@@ -0,0 +1,59 @@
+openapi: 3.0.1
+info:
+  title: API
+  version: V1
+paths:
+  /demo:
+    get:
+      operationId: getPolymorphicRequiredResponse
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: object
+                oneOf:
+                  - $ref: '#/components/schemas/DescendantOne'
+                  - $ref: '#/components/schemas/DescendantTwo'
+components:
+  schemas:
+    DescendantOne:
+      required:
+        - type
+        - count
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/ParentType'
+        - type: object
+          properties:
+            value:
+              type: boolean
+            count:
+              type: integer
+              format: int32
+            otherCount:
+              type: integer
+              format: int32
+    DescendantTwo:
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/ParentType'
+        - type: object
+          properties:
+            value:
+              type: string
+    ParentType:
+      type: object
+      required:
+        - key
+      properties:
+        key:
+          type: string
+        type:
+          type: string
+          enum:
+            - BOOLEAN
+            - STRING
+      discriminator:
+        propertyName: type