Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix incorrect allOf merging (fix #2923) (Reimplement #3025) #3227
Fix incorrect allOf merging (fix #2923) (Reimplement #3025) #3227
Changes from 3 commits
4d6b292
ad92d83
0555715
4acaa55
a2fe939
88519a3
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have a test that passes an invalid schema and expects a specific error message. The test fails without this change because a string ends up getting passed here as
rawSchema
, and we don't get to the error case that the test does expect.The best fix would be to actually validate the schema before we get this far, but that would be a large change that would require a lot of effort.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We use the path schema to decide which objects to drop when we use
omitExtraData
. For some reason, a change here uncovered a case where the additionalProperty fields would be dropped byomitExtraData
+liveOmit
if theadditionalProperties
schema was an object. This fixes that regression.