Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Support oneOf #1503

Merged
merged 3 commits into from
Aug 13, 2018
Merged

Support oneOf #1503

merged 3 commits into from
Aug 13, 2018

Conversation

KitsuneRal
Copy link
Member

This is in support of Zil0's effort on documenting E2E (#1284).

@turt2live turt2live self-assigned this Aug 12, 2018
turt2live
turt2live approved these changes Aug 13, 2018
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems sensible. It's somewhat hard to see how it affects the generated HTML, although it looks correct.

@turt2live turt2live merged commit 669d526 into matrix-org:master Aug 13, 2018
@KitsuneRal
Copy link
Member Author

In HTML you'll have the schema defined inside a oneOf list (e.g., CipherTextInfo from zil0's PR) converted to a separate table; and instead of things like string or object you'll be able to get string or CipherTextInfo. A similar trick can be used in push rules (I'll probably make a separate PR to improve their definition using oneOf).

@KitsuneRal KitsuneRal deleted the support_oneOf branch August 25, 2018 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@turt2live turt2live turt2live approved these changes

Assignees

@turt2live turt2live

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@KitsuneRal @turt2live