luo980/json-schema-validator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to find required properties in patch

Browse Source
This commit is contained in:
didier-brizet 2022-09-14 17:41:38 +02:00
parent 2354610da5
commit 4fafbd7266
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/json-validator.cpp
View File

@ -1012,10 +1012,6 @@ class object : public schema
if (minProperties_.first && instance.size() < minProperties_.second) if (minProperties_.first && instance.size() < minProperties_.second)
e.error(ptr, instance, "too few properties"); e.error(ptr, instance, "too few properties");
for (auto &r : required_)
if (instance.find(r) == instance.end())
e.error(ptr, instance, "required property '" + r + "' not found in object");
// for each property in instance // for each property in instance
for (auto &p : instance.items()) { for (auto &p : instance.items()) {
if (propertyNames_) if (propertyNames_)
@ -1064,6 +1060,14 @@ class object : public schema
} }
} }
for (const auto &r : required_) {
if (instance.find(r) != instance.end())
continue;
if (!find_patch_add((ptr / r), patch).is_null())
continue;
e.error(ptr, instance, "required property '" + r + "' not found in object");
}
for (auto &dep : dependencies_) { for (auto &dep : dependencies_) {
auto prop = instance.find(dep.first); auto prop = instance.find(dep.first);
if (prop != instance.end()) // if dependency-property is present in instance if (prop != instance.end()) // if dependency-property is present in instance