-
-
Notifications
You must be signed in to change notification settings - Fork 9
Misc canonicalizer improvements #2200
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
Open
jviotti
wants to merge
1
commit into
main
Choose a base branch
from
canonicalizer-updates
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| class ItemsImplicit final : public SchemaTransformRule { | ||
| public: | ||
| ItemsImplicit() | ||
| : SchemaTransformRule{"items_implicit", | ||
| "Every array has an implicit `items` " | ||
| "that consists of the boolean schema `true`"} {}; | ||
|
|
||
| [[nodiscard]] auto | ||
| condition(const sourcemeta::core::JSON &schema, | ||
| const sourcemeta::core::JSON &, | ||
| const sourcemeta::core::Vocabularies &vocabularies, | ||
| const sourcemeta::core::SchemaFrame &, | ||
| const sourcemeta::core::SchemaFrame::Location &, | ||
| const sourcemeta::core::SchemaWalker &, | ||
| const sourcemeta::core::SchemaResolver &) const | ||
| -> sourcemeta::core::SchemaTransformRule::Result override { | ||
| ONLY_CONTINUE_IF( | ||
| ((vocabularies.contains( | ||
| Vocabularies::Known::JSON_Schema_2020_12_Validation) && | ||
| vocabularies.contains( | ||
| Vocabularies::Known::JSON_Schema_2020_12_Applicator)) || | ||
| (vocabularies.contains( | ||
| Vocabularies::Known::JSON_Schema_2019_09_Validation) && | ||
| vocabularies.contains( | ||
| Vocabularies::Known::JSON_Schema_2019_09_Applicator)) || | ||
| vocabularies.contains_any( | ||
| {Vocabularies::Known::JSON_Schema_Draft_7, | ||
| Vocabularies::Known::JSON_Schema_Draft_6})) && | ||
| schema.is_object() && schema.defines("type") && | ||
| schema.at("type").is_string() && | ||
| schema.at("type").to_string() == "array" && !schema.defines("items")); | ||
| return true; | ||
| } | ||
|
|
||
| auto transform(JSON &schema, const Result &) const -> void override { | ||
| schema.assign("items", JSON{true}); | ||
| } | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| class AllOfFalseSimplify final : public SchemaTransformRule { | ||
| public: | ||
| AllOfFalseSimplify() | ||
| : SchemaTransformRule{"allof_false_simplify", | ||
| "When `allOf` contains a `false` branch, the " | ||
| "schema is unsatisfiable"} {}; | ||
|
|
||
| [[nodiscard]] auto | ||
| condition(const sourcemeta::core::JSON &schema, | ||
| const sourcemeta::core::JSON &, | ||
| const sourcemeta::core::Vocabularies &vocabularies, | ||
| const sourcemeta::core::SchemaFrame &frame, | ||
| const sourcemeta::core::SchemaFrame::Location &location, | ||
| const sourcemeta::core::SchemaWalker &, | ||
| const sourcemeta::core::SchemaResolver &) const | ||
| -> sourcemeta::core::SchemaTransformRule::Result override { | ||
| static const JSON::String KEYWORD{"allOf"}; | ||
| ONLY_CONTINUE_IF(vocabularies.contains_any( | ||
| {Vocabularies::Known::JSON_Schema_2020_12_Applicator, | ||
| Vocabularies::Known::JSON_Schema_2019_09_Applicator, | ||
| Vocabularies::Known::JSON_Schema_Draft_7, | ||
| Vocabularies::Known::JSON_Schema_Draft_6}) && | ||
| schema.is_object() && schema.defines(KEYWORD) && | ||
| !schema.defines("not") && schema.at(KEYWORD).is_array()); | ||
|
|
||
| const auto &allof{schema.at(KEYWORD)}; | ||
| for (std::size_t index = 0; index < allof.size(); ++index) { | ||
| const auto &entry{allof.at(index)}; | ||
| if (entry.is_boolean() && !entry.to_boolean()) { | ||
| ONLY_CONTINUE_IF(!frame.has_references_through( | ||
| location.pointer, WeakPointer::Token{std::cref(KEYWORD)})); | ||
| return APPLIES_TO_POINTERS({Pointer{KEYWORD, index}}); | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| auto transform(JSON &schema, const Result &) const -> void override { | ||
| schema.at("allOf").into(JSON{true}); | ||
| schema.rename("allOf", "not"); | ||
| } | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| class AnyOfFalseSimplify final : public SchemaTransformRule { | ||
| public: | ||
| AnyOfFalseSimplify() | ||
| : SchemaTransformRule{"anyof_false_simplify", | ||
| "An `anyOf` of a single `false` branch is " | ||
| "unsatisfiable"} {}; | ||
|
|
||
| [[nodiscard]] auto | ||
| condition(const sourcemeta::core::JSON &schema, | ||
| const sourcemeta::core::JSON &, | ||
| const sourcemeta::core::Vocabularies &vocabularies, | ||
| const sourcemeta::core::SchemaFrame &frame, | ||
| const sourcemeta::core::SchemaFrame::Location &location, | ||
| const sourcemeta::core::SchemaWalker &, | ||
| const sourcemeta::core::SchemaResolver &) const | ||
| -> sourcemeta::core::SchemaTransformRule::Result override { | ||
| static const JSON::String KEYWORD{"anyOf"}; | ||
| ONLY_CONTINUE_IF(vocabularies.contains_any( | ||
| {Vocabularies::Known::JSON_Schema_2020_12_Applicator, | ||
| Vocabularies::Known::JSON_Schema_2019_09_Applicator, | ||
| Vocabularies::Known::JSON_Schema_Draft_7, | ||
| Vocabularies::Known::JSON_Schema_Draft_6}) && | ||
| schema.is_object() && schema.defines(KEYWORD) && | ||
| !schema.defines("not") && schema.at(KEYWORD).is_array() && | ||
| schema.at(KEYWORD).size() == 1); | ||
|
|
||
| const auto &entry{schema.at(KEYWORD).front()}; | ||
| ONLY_CONTINUE_IF(entry.is_boolean() && !entry.to_boolean()); | ||
| ONLY_CONTINUE_IF(!frame.has_references_through( | ||
| location.pointer, WeakPointer::Token{std::cref(KEYWORD)})); | ||
| return APPLIES_TO_POINTERS({Pointer{KEYWORD, 0}}); | ||
| } | ||
|
|
||
| auto transform(JSON &schema, const Result &) const -> void override { | ||
| schema.at("anyOf").into(JSON{true}); | ||
| schema.rename("anyOf", "not"); | ||
| } | ||
| }; |
64 changes: 64 additions & 0 deletions
64
src/extension/alterschema/common/anyof_remove_false_schemas.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| class AnyOfRemoveFalseSchemas final : public SchemaTransformRule { | ||
| public: | ||
| AnyOfRemoveFalseSchemas() | ||
| : SchemaTransformRule{ | ||
| "anyof_remove_false_schemas", | ||
| "The boolean schema `false` is guaranteed to never match in " | ||
| "`anyOf`, as it is sufficient for any other branch to match"} {}; | ||
|
|
||
| [[nodiscard]] auto | ||
| condition(const sourcemeta::core::JSON &schema, | ||
| const sourcemeta::core::JSON &, | ||
| const sourcemeta::core::Vocabularies &vocabularies, | ||
| const sourcemeta::core::SchemaFrame &frame, | ||
| const sourcemeta::core::SchemaFrame::Location &location, | ||
| const sourcemeta::core::SchemaWalker &, | ||
| const sourcemeta::core::SchemaResolver &) const | ||
| -> sourcemeta::core::SchemaTransformRule::Result override { | ||
| static const JSON::String KEYWORD{"anyOf"}; | ||
| ONLY_CONTINUE_IF(vocabularies.contains_any( | ||
| {Vocabularies::Known::JSON_Schema_2020_12_Applicator, | ||
| Vocabularies::Known::JSON_Schema_2019_09_Applicator, | ||
| Vocabularies::Known::JSON_Schema_Draft_7, | ||
| Vocabularies::Known::JSON_Schema_Draft_6}) && | ||
| schema.is_object() && schema.defines(KEYWORD) && | ||
| schema.at(KEYWORD).is_array() && | ||
| schema.at(KEYWORD).contains(JSON{false})); | ||
| ONLY_CONTINUE_IF(!frame.has_references_through( | ||
| location.pointer, WeakPointer::Token{std::cref(KEYWORD)})); | ||
|
|
||
| std::vector<Pointer> false_locations; | ||
| bool has_non_false{false}; | ||
| const auto &anyof{schema.at(KEYWORD)}; | ||
| for (std::size_t index = 0; index < anyof.size(); ++index) { | ||
| const auto &entry{anyof.at(index)}; | ||
| if (entry.is_boolean() && !entry.to_boolean()) { | ||
| false_locations.push_back(Pointer{KEYWORD, index}); | ||
| } else { | ||
| has_non_false = true; | ||
| } | ||
| } | ||
|
|
||
| ONLY_CONTINUE_IF(has_non_false); | ||
| return APPLIES_TO_POINTERS(std::move(false_locations)); | ||
| } | ||
|
|
||
| auto transform(JSON &schema, const Result &result) const -> void override { | ||
| static const JSON::String KEYWORD{"anyOf"}; | ||
|
|
||
| std::unordered_set<std::size_t> indices_to_remove; | ||
| for (const auto &location : result.locations) { | ||
| indices_to_remove.insert(location.at(1).to_index()); | ||
| } | ||
|
|
||
| auto new_anyof{JSON::make_array()}; | ||
| const auto &anyof{schema.at(KEYWORD)}; | ||
| for (std::size_t index = 0; index < anyof.size(); ++index) { | ||
| if (!indices_to_remove.contains(index)) { | ||
| new_anyof.push_back(anyof.at(index)); | ||
| } | ||
| } | ||
|
|
||
| schema.assign(KEYWORD, std::move(new_anyof)); | ||
| } | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| class AnyOfTrueSimplify final : public SchemaTransformRule { | ||
| public: | ||
| AnyOfTrueSimplify() | ||
| : SchemaTransformRule{ | ||
| "anyof_true_simplify", | ||
| "An `anyOf` with a `true` or `{}` branch always succeeds"} {}; | ||
|
|
||
| [[nodiscard]] auto | ||
| condition(const sourcemeta::core::JSON &schema, | ||
| const sourcemeta::core::JSON &, | ||
| const sourcemeta::core::Vocabularies &vocabularies, | ||
| const sourcemeta::core::SchemaFrame &frame, | ||
| const sourcemeta::core::SchemaFrame::Location &location, | ||
| const sourcemeta::core::SchemaWalker &, | ||
| const sourcemeta::core::SchemaResolver &) const | ||
| -> sourcemeta::core::SchemaTransformRule::Result override { | ||
| static const JSON::String KEYWORD{"anyOf"}; | ||
| ONLY_CONTINUE_IF(vocabularies.contains_any( | ||
| {Vocabularies::Known::JSON_Schema_2020_12_Applicator, | ||
| Vocabularies::Known::JSON_Schema_2019_09_Applicator, | ||
| Vocabularies::Known::JSON_Schema_Draft_7, | ||
| Vocabularies::Known::JSON_Schema_Draft_6, | ||
| Vocabularies::Known::JSON_Schema_Draft_4}) && | ||
| schema.is_object() && schema.defines(KEYWORD) && | ||
| schema.at(KEYWORD).is_array()); | ||
|
|
||
| const auto &anyof{schema.at(KEYWORD)}; | ||
| for (std::size_t index = 0; index < anyof.size(); ++index) { | ||
| const auto &entry{anyof.at(index)}; | ||
| if ((entry.is_boolean() && entry.to_boolean()) || | ||
| (entry.is_object() && entry.empty())) { | ||
| ONLY_CONTINUE_IF(!frame.has_references_through( | ||
| location.pointer, WeakPointer::Token{std::cref(KEYWORD)})); | ||
| return APPLIES_TO_POINTERS({Pointer{KEYWORD, index}}); | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| auto transform(JSON &schema, const Result &) const -> void override { | ||
| schema.erase("anyOf"); | ||
| } | ||
| }; |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.