Skip to content

Commit

Permalink
fix: false-positive recursive tag case when using oneOf + allOf (#1534)
Browse files Browse the repository at this point in the history
  • Loading branch information
RomanHotsiy authored Feb 15, 2021
1 parent 524e512 commit 8270481
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/services/OpenAPIParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,12 @@ export class OpenAPIParser {
receiver.properties[prop] = subSchema.properties[prop];
} else {
// merge inner properties
receiver.properties[prop] = this.mergeAllOf(
const mergedProp = this.mergeAllOf(
{ allOf: [receiver.properties[prop], subSchema.properties[prop]] },
$ref + '/properties/' + prop,
);
receiver.properties[prop] = mergedProp
this.exitParents(mergedProp); // every prop resolution should have separate recursive stack
}
}
}
Expand Down

0 comments on commit 8270481

Please sign in to comment.