@@ -44,15 +44,15 @@ export function mergeAllOf(allOf: SchemaObject[]) {
44
44
ignoreAdditionalProperties : true ,
45
45
} ) ;
46
46
47
- const required = allOf . reduce ( ( acc , cur ) => {
47
+ const mergedRequired = allOf . reduce ( ( acc , cur ) => {
48
48
if ( Array . isArray ( cur . required ) ) {
49
49
const next = [ ...acc , ...cur . required ] ;
50
50
return next ;
51
51
}
52
52
return acc ;
53
53
} , [ ] as any ) ;
54
54
55
- return { mergedSchemas, required } ;
55
+ return { mergedSchemas, mergedRequired } ;
56
56
}
57
57
58
58
/**
@@ -260,9 +260,8 @@ function createItems(schema: SchemaObject) {
260
260
// TODO: figure out if and how we should pass merged required array
261
261
const {
262
262
mergedSchemas,
263
- } : { mergedSchemas : SchemaObject ; required : string [ ] } = mergeAllOf (
264
- schema . items ?. allOf
265
- ) ;
263
+ } : { mergedSchemas : SchemaObject ; mergedRequired : string [ ] | boolean } =
264
+ mergeAllOf ( schema . items ?. allOf ) ;
266
265
267
266
// Handles combo anyOf/oneOf + properties
268
267
if (
@@ -596,7 +595,6 @@ function createEdges({
596
595
discriminator,
597
596
} : EdgeProps ) : any {
598
597
const schemaName = getSchemaName ( schema ) ;
599
-
600
598
if ( discriminator !== undefined && discriminator . propertyName === name ) {
601
599
return createPropertyDiscriminator (
602
600
name ,
@@ -618,11 +616,9 @@ function createEdges({
618
616
}
619
617
620
618
if ( schema . allOf !== undefined ) {
621
- const {
622
- mergedSchemas,
623
- required,
624
- } : { mergedSchemas : SchemaObject ; required : string [ ] | boolean } =
625
- mergeAllOf ( schema . allOf ) ;
619
+ const { mergedSchemas } : { mergedSchemas : SchemaObject } = mergeAllOf (
620
+ schema . allOf
621
+ ) ;
626
622
const mergedSchemaName = getSchemaName ( mergedSchemas ) ;
627
623
if (
628
624
mergedSchemas . oneOf !== undefined ||
0 commit comments