Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-02-17 02:10:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: false-positive recursive tag case when using oneOf + allOf (#1534)

Browse Source
This commit is contained in:
Roman Hotsiy 2021-02-15 14:50:35 +02:00 committed by GitHub
parent 524e512b94
commit 8270481e9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/OpenAPIParser.ts
View File

@ -261,10 +261,12 @@ export class OpenAPIParser {
receiver.properties[prop] = subSchema.properties[prop]; receiver.properties[prop] = subSchema.properties[prop];
} else { } else {
// merge inner properties // merge inner properties
receiver.properties[prop] = this.mergeAllOf( const mergedProp = this.mergeAllOf(
{ allOf: [receiver.properties[prop], subSchema.properties[prop]] }, { allOf: [receiver.properties[prop], subSchema.properties[prop]] },
$ref + '/properties/' + prop, $ref + '/properties/' + prop,
); );
receiver.properties[prop] = mergedProp
this.exitParents(mergedProp); // every prop resolution should have separate recursive stack
} }
} }
} }