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.

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 defaults with oneof/anyof and nested dependencies #1304

Merged
merged 11 commits into from
Jun 2, 2019

Conversation

epicfaace
Copy link
Member

@epicfaace epicfaace commented May 31, 2019

Reasons for making this change

Fixes #1293 - default with oneof/anyof
Fixes #1229, fixes #768 - default with nested dependencies

Checklist

  • I'm updating documentation
  • I'm adding or updating code
    • I've added and/or updated tests
    • I've updated docs if needed
    • I've run npm run cs-format on my branch to conform my code to prettier coding style
  • I'm adding a new feature
    • I've updated the playground with an example use of the feature

@epicfaace
Copy link
Member Author

Actually #1293 is not fixed completely yet, working on it

src/utils.js Outdated
@@ -157,6 +157,16 @@ function computeDefaults(schema, parentDefaults, definitions = {}) {
defaults = schema.items.map(itemSchema =>
computeDefaults(itemSchema, undefined, definitions)
);
} else if ("oneOf" in schema) {
schema =
schema["oneOf"][
Copy link
Collaborator

Choose a reason for hiding this comment

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

NIT: This can just be schema.oneOf

src/utils.js Outdated
];
} else if ("anyOf" in schema) {
schema =
schema["anyOf"][
Copy link
Collaborator

Choose a reason for hiding this comment

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

NIT: This can just be schema.anyOf

@epicfaace epicfaace changed the title Fix oneof defaults Fix defaults with oneeof/anyof and nested dependencies Jun 2, 2019
@epicfaace epicfaace changed the title Fix defaults with oneeof/anyof and nested dependencies Fix defaults with oneof/anyof and nested dependencies Jun 2, 2019
test/utils_test.js Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants