diff --git a/DEPENDENCIES b/DEPENDENCIES index 7ea1b38..7ae0987 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,7 +1,7 @@ vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4 noa https://github.com/sourcemeta/noa caad2e1ceedf9fd1a18686a6a6d1e2b9757ead75 -jsontoolkit https://github.com/sourcemeta/jsontoolkit 7654c30ef2f0a0ccb36affa810ffebebd6179ebd +jsontoolkit https://github.com/sourcemeta/jsontoolkit c6d056cc608bf98705ad7700c8c891e1cf6865a0 hydra https://github.com/sourcemeta/hydra a4a74f3cabd32f2f829f449d67339dac33f9910e alterschema https://github.com/sourcemeta/alterschema 92e370ce9c1f0582014b54d43e388ee012dfe13d jsonbinpack https://github.com/sourcemeta/jsonbinpack d777179441d3c703e1fda1187742541aa26836b5 -blaze https://github.com/sourcemeta/blaze df43a0886184e5826036983f536b6f9ea06362a7 +blaze https://github.com/sourcemeta/blaze a7885ab63fcbb4f8d974e574a34bd9c5ccf31a2c diff --git a/vendor/blaze/src/compiler/compile_describe.cc b/vendor/blaze/src/compiler/compile_describe.cc index 116e80c..2d36132 100644 --- a/vendor/blaze/src/compiler/compile_describe.cc +++ b/vendor/blaze/src/compiler/compile_describe.cc @@ -193,7 +193,14 @@ struct DescribeVisitor { if (this->keyword == "properties") { assert(!step.children.empty()); - assert(this->target.is_object()); + if (!this->target.is_object()) { + std::ostringstream message; + describe_type_check(this->valid, this->target.type(), + sourcemeta::jsontoolkit::JSON::Type::Object, + message); + return message.str(); + } + std::ostringstream message; message << "The object value was expected to validate against the "; if (step.children.size() == 1) { @@ -679,6 +686,38 @@ struct DescribeVisitor { return message.str(); } + auto operator()(const LoopPropertiesTypeStrictAny &step) const + -> std::string { + std::ostringstream message; + message << "The object properties were expected to be of type "; + const auto &types{step_value(step)}; + for (auto iterator = types.cbegin(); iterator != types.cend(); ++iterator) { + if (std::next(iterator) == types.cend()) { + message << "or " << to_string(*iterator); + } else { + message << to_string(*iterator) << ", "; + } + } + + return message.str(); + } + + auto operator()(const LoopPropertiesTypeStrictAnyEvaluate &step) const + -> std::string { + std::ostringstream message; + message << "The object properties were expected to be of type "; + const auto &types{step_value(step)}; + for (auto iterator = types.cbegin(); iterator != types.cend(); ++iterator) { + if (std::next(iterator) == types.cend()) { + message << "or " << to_string(*iterator); + } else { + message << to_string(*iterator) << ", "; + } + } + + return message.str(); + } + auto operator()(const LoopKeys &) const -> std::string { assert(this->keyword == "propertyNames"); assert(this->target.is_object()); @@ -732,6 +771,35 @@ struct DescribeVisitor { return message.str(); } + auto operator()(const LoopItemsType &step) const -> std::string { + std::ostringstream message; + message << "The array items were expected to be of type " + << to_string(step.value); + return message.str(); + } + + auto operator()(const LoopItemsTypeStrict &step) const -> std::string { + std::ostringstream message; + message << "The array items were expected to be of type " + << to_string(step.value); + return message.str(); + } + + auto operator()(const LoopItemsTypeStrictAny &step) const -> std::string { + std::ostringstream message; + message << "The array items were expected to be of type "; + const auto &types{step_value(step)}; + for (auto iterator = types.cbegin(); iterator != types.cend(); ++iterator) { + if (std::next(iterator) == types.cend()) { + message << "or " << to_string(*iterator); + } else { + message << to_string(*iterator) << ", "; + } + } + + return message.str(); + } + auto operator()(const LoopContains &step) const -> std::string { assert(this->target.is_array()); std::ostringstream message; @@ -1424,6 +1492,22 @@ struct DescribeVisitor { return message.str(); } + auto operator()(const AssertionPropertyTypeStrictAny &step) const + -> std::string { + std::ostringstream message; + describe_types_check(this->valid, this->target.type(), step_value(step), + message); + return message.str(); + } + + auto operator()(const AssertionPropertyTypeStrictAnyEvaluate &step) const + -> std::string { + std::ostringstream message; + describe_types_check(this->valid, this->target.type(), step_value(step), + message); + return message.str(); + } + auto operator()(const AssertionArrayPrefix &step) const -> std::string { assert(this->keyword == "items" || this->keyword == "prefixItems"); assert(!step.children.empty()); diff --git a/vendor/blaze/src/compiler/compile_helpers.h b/vendor/blaze/src/compiler/compile_helpers.h index 5890b3b..24065b6 100644 --- a/vendor/blaze/src/compiler/compile_helpers.h +++ b/vendor/blaze/src/compiler/compile_helpers.h @@ -9,6 +9,7 @@ #include // std::distance #include // std::regex, std::regex_match, std::smatch #include // std::declval, std::move +#include // std::visit namespace sourcemeta::blaze { @@ -174,7 +175,7 @@ inline auto find_adjacent(const Context &context, sourcemeta::jsontoolkit::to_uri( sourcemeta::jsontoolkit::to_pointer(reference.fragment.value_or("")) .concat({keyword})) - .resolve_from_if_absolute(reference.base.value_or(""))}; + .try_resolve_from(reference.base.value_or(""))}; // TODO: When this logic is used by // `unevaluatedProperties`/`unevaluatedItems`, how can we let the @@ -212,6 +213,21 @@ inline auto find_adjacent(const Context &context, return result; } +inline auto recursive_template_size(const Template &steps) -> std::size_t { + std::size_t result{steps.size()}; + for (const auto &variant : steps) { + std::visit( + [&result](const auto &step) { + if constexpr (requires { step.children; }) { + result += recursive_template_size(step.children); + } + }, + variant); + } + + return result; +} + } // namespace sourcemeta::blaze #endif diff --git a/vendor/blaze/src/compiler/compile_json.cc b/vendor/blaze/src/compiler/compile_json.cc index 16e3891..da67c76 100644 --- a/vendor/blaze/src/compiler/compile_json.cc +++ b/vendor/blaze/src/compiler/compile_json.cc @@ -245,6 +245,10 @@ struct StepVisitor { HANDLE_STEP("assertion", "property-type-strict", AssertionPropertyTypeStrict) HANDLE_STEP("assertion", "property-type-strict-evaluate", AssertionPropertyTypeStrictEvaluate) + HANDLE_STEP("assertion", "property-type-strict-any", + AssertionPropertyTypeStrictAny) + HANDLE_STEP("assertion", "property-type-strict-any-evaluate", + AssertionPropertyTypeStrictAnyEvaluate) HANDLE_STEP("assertion", "array-prefix", AssertionArrayPrefix) HANDLE_STEP("assertion", "array-prefix-evaluate", AssertionArrayPrefixEvaluate) @@ -264,7 +268,6 @@ struct StepVisitor { HANDLE_STEP("loop", "properties-unevaluated", LoopPropertiesUnevaluated) HANDLE_STEP("loop", "properties-unevaluated-except", LoopPropertiesUnevaluatedExcept) - HANDLE_STEP("loop", "items-unevaluated", LoopItemsUnevaluated) HANDLE_STEP("loop", "properties-match", LoopPropertiesMatch) HANDLE_STEP("loop", "properties", LoopProperties) HANDLE_STEP("loop", "properties-evaluate", LoopPropertiesEvaluate) @@ -276,8 +279,15 @@ struct StepVisitor { HANDLE_STEP("loop", "properties-type-strict", LoopPropertiesTypeStrict) HANDLE_STEP("loop", "properties-type-strict-evaluate", LoopPropertiesTypeStrictEvaluate) + HANDLE_STEP("loop", "properties-type-strict-any", LoopPropertiesTypeStrictAny) + HANDLE_STEP("loop", "properties-type-strict-evaluate-any", + LoopPropertiesTypeStrictAnyEvaluate) HANDLE_STEP("loop", "keys", LoopKeys) HANDLE_STEP("loop", "items", LoopItems) + HANDLE_STEP("loop", "items-unevaluated", LoopItemsUnevaluated) + HANDLE_STEP("loop", "items-type", LoopItemsType) + HANDLE_STEP("loop", "items-type-strict", LoopItemsTypeStrict) + HANDLE_STEP("loop", "items-type-strict-any", LoopItemsTypeStrictAny) HANDLE_STEP("loop", "contains", LoopContains) HANDLE_STEP("control", "group", ControlGroup) HANDLE_STEP("control", "group-when-defines", ControlGroupWhenDefines) diff --git a/vendor/blaze/src/compiler/default_compiler_2020_12.h b/vendor/blaze/src/compiler/default_compiler_2020_12.h index 0a5a116..ec6402b 100644 --- a/vendor/blaze/src/compiler/default_compiler_2020_12.h +++ b/vendor/blaze/src/compiler/default_compiler_2020_12.h @@ -58,7 +58,7 @@ auto compiler_2020_12_core_dynamicref(const Context &context, assert(schema_context.schema.at(dynamic_context.keyword).is_string()); sourcemeta::jsontoolkit::URI reference{ schema_context.schema.at(dynamic_context.keyword).to_string()}; - reference.resolve_from_if_absolute(schema_context.base); + reference.try_resolve_from(schema_context.base); reference.canonicalize(); // We handle the non-anchor variant by not treating it as a dynamic reference assert(reference.fragment().has_value()); diff --git a/vendor/blaze/src/compiler/default_compiler_draft4.h b/vendor/blaze/src/compiler/default_compiler_draft4.h index 58da6e3..0378425 100644 --- a/vendor/blaze/src/compiler/default_compiler_draft4.h +++ b/vendor/blaze/src/compiler/default_compiler_draft4.h @@ -4,7 +4,7 @@ #include #include -#include // std::sort, std::any_of +#include // std::sort, std::any_of, std::all_of #include // assert #include // std::regex, std::regex_error #include // std::set @@ -27,6 +27,38 @@ static auto parse_regex(const std::string &pattern, } } +static auto collect_jump_labels(const sourcemeta::blaze::Template &steps, + std::set &output) -> void { + for (const auto &variant : steps) { + std::visit( + [&output](const auto &step) { + using T = std::decay_t; + if constexpr (std::is_same_v) { + output.emplace(step.value); + } else if constexpr (requires { step.children; }) { + collect_jump_labels(step.children, output); + } + }, + variant); + } +} + +static auto defines_direct_enumeration(const sourcemeta::blaze::Template &steps) + -> bool { + return std::any_of(steps.cbegin(), steps.cend(), [](const auto &step) { + return std::holds_alternative(step) || + std::holds_alternative(step); + }); +} + +static auto +is_inside_disjunctor(const sourcemeta::jsontoolkit::Pointer &pointer) -> bool { + return pointer.size() > 2 && pointer.at(pointer.size() - 2).is_index() && + pointer.at(pointer.size() - 3).is_property() && + (pointer.at(pointer.size() - 3).to_property() == "oneOf" || + pointer.at(pointer.size() - 3).to_property() == "anyOf"); +} + namespace internal { using namespace sourcemeta::blaze; @@ -100,18 +132,31 @@ auto compiler_draft4_core_ref(const Context &context, } } + new_schema_context.labels.insert(label); + Template children{ + compile(context, new_schema_context, relative_dynamic_context, + sourcemeta::jsontoolkit::empty_pointer, + sourcemeta::jsontoolkit::empty_pointer, reference.destination)}; + + // If we ended up not using the label after all, then we can ignore the + // wrapper, at the expense of compiling the reference instructions once more + std::set used_labels; + collect_jump_labels(children, used_labels); + if (!used_labels.contains(label)) { + return compile(context, schema_context, dynamic_context, + sourcemeta::jsontoolkit::empty_pointer, + sourcemeta::jsontoolkit::empty_pointer, + reference.destination); + } + // The idea to handle recursion is to expand the reference once, and when // doing so, create a "checkpoint" that we can jump back to in a subsequent // recursive reference. While unrolling the reference once may initially // feel weird, we do it so we can handle references purely in this keyword // handler, without having to add logic to every single keyword to check // whether something points to them and add the "checkpoint" themselves. - new_schema_context.labels.insert(label); - return {make( - context, schema_context, dynamic_context, ValueUnsignedInteger{label}, - compile(context, new_schema_context, relative_dynamic_context, - sourcemeta::jsontoolkit::empty_pointer, - sourcemeta::jsontoolkit::empty_pointer, reference.destination))}; + return {make(context, schema_context, dynamic_context, + ValueUnsignedInteger{label}, std::move(children))}; } auto compiler_draft4_validation_type(const Context &context, @@ -122,10 +167,28 @@ auto compiler_draft4_validation_type(const Context &context, const auto &type{ schema_context.schema.at(dynamic_context.keyword).to_string()}; if (type == "null") { + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_null(); })) { + return {}; + } + return { make(context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Null)}; } else if (type == "boolean") { + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_boolean(); })) { + return {}; + } + return {make( context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Boolean)}; @@ -141,6 +204,15 @@ auto compiler_draft4_validation_type(const Context &context, {minimum, maximum, false})}; } + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_object(); })) { + return {}; + } + return {make( context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Object)}; @@ -156,16 +228,43 @@ auto compiler_draft4_validation_type(const Context &context, {minimum, maximum, false})}; } + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_array(); })) { + return {}; + } + return {make( context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Array)}; } else if (type == "number") { + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_number(); })) { + return {}; + } + return {make( context, schema_context, dynamic_context, std::vector{ sourcemeta::jsontoolkit::JSON::Type::Real, sourcemeta::jsontoolkit::JSON::Type::Integer})}; } else if (type == "integer") { + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_integer(); })) { + return {}; + } + return {make( context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Integer)}; @@ -181,6 +280,15 @@ auto compiler_draft4_validation_type(const Context &context, {minimum, maximum, false})}; } + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_string(); })) { + return {}; + } + return {make( context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::String)}; @@ -439,23 +547,42 @@ auto compiler_draft4_applicator_properties_with_options( // earlier without spending a lot of time on other subschemas std::sort(properties.begin(), properties.end(), [](const auto &left, const auto &right) { - return (left.second.size() == right.second.size()) - ? (left.first < right.first) - : (left.second.size() < right.second.size()); + // Enumerations always take precedence + if (defines_direct_enumeration(left.second)) { + return true; + } else if (defines_direct_enumeration(right.second)) { + return false; + } + + const auto left_size{recursive_template_size(left.second)}; + const auto right_size{recursive_template_size(right.second)}; + if (left_size == right_size) { + return left.first < right.first; + } else { + return left_size < right_size; + } }); - assert(schema_context.relative_pointer.back().is_property()); - assert(schema_context.relative_pointer.back().to_property() == - dynamic_context.keyword); - const auto relative_pointer_size{schema_context.relative_pointer.size()}; - const auto is_directly_inside_oneof{ - relative_pointer_size > 2 && - schema_context.relative_pointer.at(relative_pointer_size - 2) - .is_index() && - schema_context.relative_pointer.at(relative_pointer_size - 3) - .is_property() && - schema_context.relative_pointer.at(relative_pointer_size - 3) - .to_property() == "oneOf"}; + const auto ¤t_entry{static_frame_entry(context, schema_context)}; + const auto inside_disjunctor{ + is_inside_disjunctor(schema_context.relative_pointer) || + // Check if any reference from `anyOf` or `oneOf` points to us + std::any_of(context.references.cbegin(), context.references.cend(), + [&context, ¤t_entry](const auto &reference) { + if (!context.frame.contains( + {sourcemeta::jsontoolkit::ReferenceType::Static, + reference.second.destination})) { + return false; + } + + const auto &target{ + context.frame + .at({sourcemeta::jsontoolkit::ReferenceType::Static, + reference.second.destination}) + .pointer}; + return is_inside_disjunctor(reference.first.second) && + current_entry.pointer.initial() == target; + })}; // There are two ways to compile `properties` depending on whether // most of the properties are marked as required using `required` @@ -463,13 +590,16 @@ auto compiler_draft4_applicator_properties_with_options( // in the corresponding case. const auto prefer_loop_over_instance{ // This strategy only makes sense if most of the properties are "optional" - is_required <= (size / 2) && + is_required <= (size / 4) && // If `properties` only defines a relatively small amount of properties, // then its probably still faster to unroll - schema_context.schema.at(dynamic_context.keyword).size() > 5 && - // Always unroll inside `oneOf`, to have a better chance at + size > 5 && + // Unless the properties definition has a LOT of optional properties, + // we should unroll inside `oneOf` or `anyOf`, to have a better chance at // short-circuiting quickly - !is_directly_inside_oneof}; + // TODO: Maybe the proper middle ground here is to ONLY + // unroll properties with `const`/`enum`? + (!inside_disjunctor || (is_required == 0 && size > 20))}; if (prefer_loop_over_instance) { ValueNamedIndexes indexes; @@ -556,6 +686,25 @@ auto compiler_draft4_applicator_properties_with_options( type_step.keyword_location, type_step.schema_resource, type_step.dynamic, type_step.track, type_step.value}); } + } else if (context.mode == Mode::FastValidation && substeps.size() == 1 && + std::holds_alternative( + substeps.front())) { + const auto &type_step{std::get(substeps.front())}; + if (track_evaluation) { + children.push_back(AssertionPropertyTypeStrictAnyEvaluate{ + type_step.relative_schema_location, + dynamic_context.base_instance_location.concat( + type_step.relative_instance_location), + type_step.keyword_location, type_step.schema_resource, + type_step.dynamic, type_step.track, type_step.value}); + } else { + children.push_back(AssertionPropertyTypeStrictAny{ + type_step.relative_schema_location, + dynamic_context.base_instance_location.concat( + type_step.relative_instance_location), + type_step.keyword_location, type_step.schema_resource, + type_step.dynamic, type_step.track, type_step.value}); + } } else if (context.mode == Mode::FastValidation && substeps.size() == 1 && std::holds_alternative( @@ -569,6 +718,12 @@ auto compiler_draft4_applicator_properties_with_options( children.push_back(unroll( relative_dynamic_context, substeps.front(), dynamic_context.base_instance_location)); + } else if (context.mode == Mode::FastValidation && substeps.size() == 1 && + std::holds_alternative( + substeps.front())) { + children.push_back(unroll( + relative_dynamic_context, substeps.front(), + dynamic_context.base_instance_location)); } else { if (track_evaluation) { @@ -586,7 +741,7 @@ auto compiler_draft4_applicator_properties_with_options( for (auto &&substep : substeps) { children.push_back(std::move(substep)); } - } else { + } else if (!substeps.empty()) { children.push_back(make( context, schema_context, relative_dynamic_context, ValueString{name}, std::move(substeps))); @@ -604,8 +759,24 @@ auto compiler_draft4_applicator_properties_with_options( children.front())) { return {unroll(dynamic_context, children.front())}; + } else if (context.mode == Mode::FastValidation && children.size() == 1 && + std::holds_alternative( + children.front())) { + return {unroll(dynamic_context, + children.front())}; + } else if (context.mode == Mode::FastValidation && children.size() == 1 && + std::holds_alternative( + children.front())) { + return {unroll(dynamic_context, + children.front())}; + } + + if (children.empty()) { + return {}; } + // TODO: Should this be LogicalWhenType? If so, we can avoid evaluating + // every unrolled property against non-object instances return {make(context, schema_context, dynamic_context, ValueNone{}, std::move(children))}; } @@ -777,6 +948,16 @@ auto compiler_draft4_applicator_additionalproperties_with_options( return {make(context, schema_context, dynamic_context, type_step.value)}; } + } else if (context.mode == Mode::FastValidation && children.size() == 1 && + std::holds_alternative(children.front())) { + const auto &type_step{std::get(children.front())}; + if (track_evaluation) { + return {make( + context, schema_context, dynamic_context, type_step.value)}; + } else { + return {make( + context, schema_context, dynamic_context, type_step.value)}; + } } else if (track_evaluation) { if (children.empty()) { @@ -1037,6 +1218,23 @@ auto compiler_draft4_applicator_items_with_options( return {}; } + if (context.mode == Mode::FastValidation && children.size() == 1) { + if (std::holds_alternative(children.front())) { + return {make( + context, schema_context, dynamic_context, + std::get(children.front()).value)}; + } else if (std::holds_alternative(children.front())) { + return {make( + context, schema_context, dynamic_context, + std::get(children.front()).value)}; + } else if (std::holds_alternative( + children.front())) { + return {make( + context, schema_context, dynamic_context, + std::get(children.front()).value)}; + } + } + return {make(context, schema_context, dynamic_context, ValueUnsignedInteger{0}, std::move(children))}; } diff --git a/vendor/blaze/src/compiler/default_compiler_draft6.h b/vendor/blaze/src/compiler/default_compiler_draft6.h index 6abf169..684f373 100644 --- a/vendor/blaze/src/compiler/default_compiler_draft6.h +++ b/vendor/blaze/src/compiler/default_compiler_draft6.h @@ -3,6 +3,8 @@ #include +#include // std::all_of + #include "compile_helpers.h" namespace internal { @@ -16,10 +18,40 @@ auto compiler_draft6_validation_type(const Context &context, const auto &type{ schema_context.schema.at(dynamic_context.keyword).to_string()}; if (type == "null") { + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_null(); })) { + return {}; + } + + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("const") && + schema_context.schema.at("const").is_null()) { + return {}; + } + return { make(context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Null)}; } else if (type == "boolean") { + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_boolean(); })) { + return {}; + } + + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("const") && + schema_context.schema.at("const").is_boolean()) { + return {}; + } + return {make( context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Boolean)}; @@ -28,12 +60,28 @@ auto compiler_draft6_validation_type(const Context &context, unsigned_integer_property(schema_context.schema, "minProperties", 0)}; const auto maximum{ unsigned_integer_property(schema_context.schema, "maxProperties")}; - if (minimum > 0 || maximum.has_value()) { + if (context.mode == Mode::FastValidation && + (minimum > 0 || maximum.has_value())) { return {make(context, schema_context, dynamic_context, {minimum, maximum, false})}; } + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_object(); })) { + return {}; + } + + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("const") && + schema_context.schema.at("const").is_object()) { + return {}; + } + return {make( context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Object)}; @@ -42,22 +90,71 @@ auto compiler_draft6_validation_type(const Context &context, unsigned_integer_property(schema_context.schema, "minItems", 0)}; const auto maximum{ unsigned_integer_property(schema_context.schema, "maxItems")}; - if (minimum > 0 || maximum.has_value()) { + if (context.mode == Mode::FastValidation && + (minimum > 0 || maximum.has_value())) { return {make(context, schema_context, dynamic_context, {minimum, maximum, false})}; } + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_array(); })) { + return {}; + } + + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("const") && + schema_context.schema.at("const").is_array()) { + return {}; + } + return {make( context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Array)}; } else if (type == "number") { + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_number(); })) { + return {}; + } + + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("const") && + schema_context.schema.at("const").is_number()) { + return {}; + } + return {make( context, schema_context, dynamic_context, std::vector{ sourcemeta::jsontoolkit::JSON::Type::Real, sourcemeta::jsontoolkit::JSON::Type::Integer})}; } else if (type == "integer") { + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { + return value.is_integer() || value.is_integer_real(); + })) { + return {}; + } + + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("const") && + (schema_context.schema.at("const").is_integer() || + schema_context.schema.at("const").is_integer_real())) { + return {}; + } + return { make(context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Integer)}; @@ -66,12 +163,28 @@ auto compiler_draft6_validation_type(const Context &context, unsigned_integer_property(schema_context.schema, "minLength", 0)}; const auto maximum{ unsigned_integer_property(schema_context.schema, "maxLength")}; - if (minimum > 0 || maximum.has_value()) { + if (context.mode == Mode::FastValidation && + (minimum > 0 || maximum.has_value())) { return {make(context, schema_context, dynamic_context, {minimum, maximum, false})}; } + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("enum") && + schema_context.schema.at("enum").is_array() && + std::all_of(schema_context.schema.at("enum").as_array().cbegin(), + schema_context.schema.at("enum").as_array().cend(), + [](const auto &value) { return value.is_string(); })) { + return {}; + } + + if (context.mode == Mode::FastValidation && + schema_context.schema.defines("const") && + schema_context.schema.at("const").is_string()) { + return {}; + } + return {make( context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::String)}; diff --git a/vendor/blaze/src/evaluator/evaluator.cc b/vendor/blaze/src/evaluator/evaluator.cc index fdd145b..0a54dd1 100644 --- a/vendor/blaze/src/evaluator/evaluator.cc +++ b/vendor/blaze/src/evaluator/evaluator.cc @@ -512,6 +512,40 @@ auto evaluate_step(const sourcemeta::blaze::Template::value_type &step, EVALUATE_END(assertion, AssertionPropertyTypeStrictEvaluate); } + case IS_STEP(AssertionPropertyTypeStrictAny): { + EVALUATE_BEGIN_TRY_TARGET( + assertion, AssertionPropertyTypeStrictAny, + // Note that here are are referring to the parent + // object that might hold the given property, + // before traversing into the actual property + target.is_object()); + // Now here we refer to the actual property + result = (std::find(assertion.value.cbegin(), assertion.value.cend(), + context.resolve_target().type()) != + assertion.value.cend()); + EVALUATE_END(assertion, AssertionPropertyTypeStrictAny); + } + + case IS_STEP(AssertionPropertyTypeStrictAnyEvaluate): { + EVALUATE_BEGIN_TRY_TARGET( + assertion, AssertionPropertyTypeStrictAnyEvaluate, + // Note that here are are referring to the parent + // object that might hold the given property, + // before traversing into the actual property + target.is_object()); + // Now here we refer to the actual property + result = (std::find(assertion.value.cbegin(), assertion.value.cend(), + context.resolve_target().type()) != + assertion.value.cend()); + + if (result) { + assert(track); + context.evaluate(); + } + + EVALUATE_END(assertion, AssertionPropertyTypeStrictAnyEvaluate); + } + case IS_STEP(AssertionArrayPrefix): { EVALUATE_BEGIN(assertion, AssertionArrayPrefix, target.is_array()); // Otherwise there is no point in emitting this step @@ -524,10 +558,13 @@ auto evaluate_step(const sourcemeta::blaze::Template::value_type &step, ? prefixes : std::min(array_size, prefixes) - 1}; const auto &entry{assertion.children[pointer]}; - // TODO: Directly evaluate the control group entries + result = true; assert(std::holds_alternative(entry)); - if (evaluate_step(entry, callback, context)) { - result = true; + for (const auto &child : std::get(entry).children) { + if (!evaluate_step(child, callback, context)) { + result = false; + break; + } } } @@ -548,18 +585,24 @@ auto evaluate_step(const sourcemeta::blaze::Template::value_type &step, ? prefixes : std::min(array_size, prefixes) - 1}; const auto &entry{assertion.children[pointer]}; - // TODO: Directly evaluate the control group entries + result = true; assert(std::holds_alternative(entry)); - if (evaluate_step(entry, callback, context)) { - result = true; - if (array_size == prefixes) { - context.evaluate(); - } else { - context.evaluate(0, pointer); + for (const auto &child : std::get(entry).children) { + if (!evaluate_step(child, callback, context)) { + result = false; + goto evaluate_assertion_array_prefix_evaluate_end; } } + + assert(result); + if (array_size == prefixes) { + context.evaluate(); + } else { + context.evaluate(0, pointer); + } } + evaluate_assertion_array_prefix_evaluate_end: EVALUATE_END(assertion, AssertionArrayPrefixEvaluate); } @@ -725,6 +768,7 @@ auto evaluate_step(const sourcemeta::blaze::Template::value_type &step, case IS_STEP(ControlGroupWhenDefines): { EVALUATE_BEGIN_PASS_THROUGH(control, ControlGroupWhenDefines); const auto &target{context.resolve_target()}; + assert(!control.children.empty()); if (target.is_object() && target.defines(control.value)) { for (const auto &child : control.children) { @@ -740,6 +784,7 @@ auto evaluate_step(const sourcemeta::blaze::Template::value_type &step, case IS_STEP(ControlLabel): { EVALUATE_BEGIN_NO_PRECONDITION(control, ControlLabel); + assert(!control.children.empty()); context.labels.try_emplace(control.value, control.children); result = true; for (const auto &child : control.children) { @@ -951,39 +996,6 @@ auto evaluate_step(const sourcemeta::blaze::Template::value_type &step, EVALUATE_END(loop, LoopPropertiesUnevaluatedExcept); } - case IS_STEP(LoopItemsUnevaluated): { - EVALUATE_BEGIN(loop, LoopItemsUnevaluated, target.is_array()); - assert(!loop.children.empty()); - assert(track); - const auto &array{target.as_array()}; - result = true; - for (auto iterator = array.cbegin(); iterator != array.cend(); - ++iterator) { - const auto index{std::distance(array.cbegin(), iterator)}; - if (context.is_evaluated( - static_cast(index))) { - continue; - } - - context.enter(static_cast(index), true); - for (const auto &child : loop.children) { - if (!evaluate_step(child, callback, context)) { - result = false; - context.leave(true); - goto evaluate_compiler_annotation_loop_items_unevaluated_end; - } - } - - context.leave(true); - } - - // Mark the entire array as evaluated - context.evaluate(); - - evaluate_compiler_annotation_loop_items_unevaluated_end: - EVALUATE_END(loop, LoopItemsUnevaluated); - } - case IS_STEP(LoopPropertiesMatch): { EVALUATE_BEGIN(loop, LoopPropertiesMatch, target.is_object()); assert(!loop.value.empty()); @@ -1231,6 +1243,39 @@ auto evaluate_step(const sourcemeta::blaze::Template::value_type &step, EVALUATE_END(loop, LoopPropertiesTypeStrictEvaluate); } + case IS_STEP(LoopPropertiesTypeStrictAny): { + EVALUATE_BEGIN(loop, LoopPropertiesTypeStrictAny, target.is_object()); + result = true; + for (const auto &entry : target.as_object()) { + if (std::find(loop.value.cbegin(), loop.value.cend(), + entry.second.type()) == loop.value.cend()) { + result = false; + break; + } + } + + EVALUATE_END(loop, LoopPropertiesTypeStrictAny); + } + + case IS_STEP(LoopPropertiesTypeStrictAnyEvaluate): { + EVALUATE_BEGIN(loop, LoopPropertiesTypeStrictAnyEvaluate, + target.is_object()); + result = true; + for (const auto &entry : target.as_object()) { + if (std::find(loop.value.cbegin(), loop.value.cend(), + entry.second.type()) == loop.value.cend()) { + result = false; + goto evaluate_loop_properties_type_strict_any_evaluate_end; + } + } + + assert(track); + context.evaluate(); + + evaluate_loop_properties_type_strict_any_evaluate_end: + EVALUATE_END(loop, LoopPropertiesTypeStrictAnyEvaluate); + } + case IS_STEP(LoopKeys): { EVALUATE_BEGIN(loop, LoopKeys, target.is_object()); assert(!loop.children.empty()); @@ -1287,6 +1332,85 @@ auto evaluate_step(const sourcemeta::blaze::Template::value_type &step, EVALUATE_END(loop, LoopItems); } + case IS_STEP(LoopItemsUnevaluated): { + EVALUATE_BEGIN(loop, LoopItemsUnevaluated, target.is_array()); + assert(!loop.children.empty()); + assert(track); + const auto &array{target.as_array()}; + result = true; + for (auto iterator = array.cbegin(); iterator != array.cend(); + ++iterator) { + const auto index{std::distance(array.cbegin(), iterator)}; + if (context.is_evaluated( + static_cast(index))) { + continue; + } + + context.enter(static_cast(index), true); + for (const auto &child : loop.children) { + if (!evaluate_step(child, callback, context)) { + result = false; + context.leave(true); + goto evaluate_compiler_annotation_loop_items_unevaluated_end; + } + } + + context.leave(true); + } + + // Mark the entire array as evaluated + context.evaluate(); + + evaluate_compiler_annotation_loop_items_unevaluated_end: + EVALUATE_END(loop, LoopItemsUnevaluated); + } + + case IS_STEP(LoopItemsType): { + EVALUATE_BEGIN(loop, LoopItemsType, target.is_array()); + result = true; + for (const auto &entry : target.as_array()) { + if (entry.type() != loop.value && + // In non-strict mode, we consider a real number that represents an + // integer to be an integer + (loop.value != sourcemeta::jsontoolkit::JSON::Type::Integer || + !entry.is_integer_real())) { + result = false; + break; + } + } + + EVALUATE_END(loop, LoopItemsType); + } + + case IS_STEP(LoopItemsTypeStrict): { + EVALUATE_BEGIN(loop, LoopItemsTypeStrict, target.is_array()); + result = true; + for (const auto &entry : target.as_array()) { + if (entry.type() != loop.value) { + result = false; + break; + } + } + + EVALUATE_END(loop, LoopItemsTypeStrict); + } + + case IS_STEP(LoopItemsTypeStrictAny): { + EVALUATE_BEGIN(loop, LoopItemsTypeStrictAny, target.is_array()); + // Otherwise we are we even emitting this instruction? + assert(loop.value.size() > 1); + result = true; + for (const auto &entry : target.as_array()) { + if (std::find(loop.value.cbegin(), loop.value.cend(), entry.type()) == + loop.value.cend()) { + result = false; + break; + } + } + + EVALUATE_END(loop, LoopItemsTypeStrictAny); + } + case IS_STEP(LoopContains): { EVALUATE_BEGIN(loop, LoopContains, target.is_array()); assert(!loop.children.empty()); diff --git a/vendor/blaze/src/evaluator/include/sourcemeta/blaze/evaluator_template.h b/vendor/blaze/src/evaluator/include/sourcemeta/blaze/evaluator_template.h index d315cec..96744bc 100644 --- a/vendor/blaze/src/evaluator/include/sourcemeta/blaze/evaluator_template.h +++ b/vendor/blaze/src/evaluator/include/sourcemeta/blaze/evaluator_template.h @@ -45,6 +45,8 @@ struct AssertionPropertyType; struct AssertionPropertyTypeEvaluate; struct AssertionPropertyTypeStrict; struct AssertionPropertyTypeStrictEvaluate; +struct AssertionPropertyTypeStrictAny; +struct AssertionPropertyTypeStrictAnyEvaluate; struct AssertionArrayPrefix; struct AssertionArrayPrefixEvaluate; struct AnnotationEmit; @@ -61,7 +63,6 @@ struct LogicalWhenDefines; struct LogicalWhenArraySizeGreater; struct LoopPropertiesUnevaluated; struct LoopPropertiesUnevaluatedExcept; -struct LoopItemsUnevaluated; struct LoopPropertiesMatch; struct LoopProperties; struct LoopPropertiesEvaluate; @@ -72,8 +73,14 @@ struct LoopPropertiesType; struct LoopPropertiesTypeEvaluate; struct LoopPropertiesTypeStrict; struct LoopPropertiesTypeStrictEvaluate; +struct LoopPropertiesTypeStrictAny; +struct LoopPropertiesTypeStrictAnyEvaluate; struct LoopKeys; struct LoopItems; +struct LoopItemsUnevaluated; +struct LoopItemsType; +struct LoopItemsTypeStrict; +struct LoopItemsTypeStrictAny; struct LoopContains; struct ControlGroup; struct ControlGroupWhenDefines; @@ -98,16 +105,19 @@ using Template = std::vector>; @@ -146,6 +156,8 @@ enum class TemplateIndex : std::uint8_t { AssertionPropertyTypeEvaluate, AssertionPropertyTypeStrict, AssertionPropertyTypeStrictEvaluate, + AssertionPropertyTypeStrictAny, + AssertionPropertyTypeStrictAnyEvaluate, AssertionArrayPrefix, AssertionArrayPrefixEvaluate, AnnotationEmit, @@ -162,7 +174,6 @@ enum class TemplateIndex : std::uint8_t { LogicalWhenArraySizeGreater, LoopPropertiesUnevaluated, LoopPropertiesUnevaluatedExcept, - LoopItemsUnevaluated, LoopPropertiesMatch, LoopProperties, LoopPropertiesEvaluate, @@ -173,8 +184,14 @@ enum class TemplateIndex : std::uint8_t { LoopPropertiesTypeEvaluate, LoopPropertiesTypeStrict, LoopPropertiesTypeStrictEvaluate, + LoopPropertiesTypeStrictAny, + LoopPropertiesTypeStrictAnyEvaluate, LoopKeys, LoopItems, + LoopItemsUnevaluated, + LoopItemsType, + LoopItemsTypeStrict, + LoopItemsTypeStrictAny, LoopContains, ControlGroup, ControlGroupWhenDefines, @@ -371,6 +388,17 @@ DEFINE_STEP_WITH_VALUE(Assertion, PropertyTypeStrict, ValueType) /// property is of a given type if present (strict mode) and marks evaluation DEFINE_STEP_WITH_VALUE(Assertion, PropertyTypeStrictEvaluate, ValueType) +/// @ingroup evaluator_instructions +/// @brief Represents a compiler assertion step that checks that an instance +/// property is of a given set of types if present (strict mode) +DEFINE_STEP_WITH_VALUE(Assertion, PropertyTypeStrictAny, ValueTypes) + +/// @ingroup evaluator_instructions +/// @brief Represents a compiler assertion step that checks that an instance +/// property is of a given set of types if present (strict mode) and marks +/// evaluation +DEFINE_STEP_WITH_VALUE(Assertion, PropertyTypeStrictAnyEvaluate, ValueTypes) + /// @ingroup evaluator_instructions /// @brief Represents a compiler assertion step that applies substeps to the /// beginning of an array @@ -445,10 +473,6 @@ DEFINE_STEP_APPLICATOR(Loop, PropertiesUnevaluated, ValueNone) /// in the given blacklist and were not previously evaluated DEFINE_STEP_APPLICATOR(Loop, PropertiesUnevaluatedExcept, ValuePropertyFilter) -/// @ingroup evaluator_instructions -/// @brief Represents a compiler step that loops over unevaluated array items -DEFINE_STEP_APPLICATOR(Loop, ItemsUnevaluated, ValueNone) - /// @ingroup evaluator_instructions /// @brief Represents a compiler step that matches steps to object properties DEFINE_STEP_APPLICATOR(Loop, PropertiesMatch, ValueNamedIndexes) @@ -497,6 +521,16 @@ DEFINE_STEP_WITH_VALUE(Loop, PropertiesTypeStrict, ValueType) /// given type (strict mode) and marks evaluation DEFINE_STEP_WITH_VALUE(Loop, PropertiesTypeStrictEvaluate, ValueType) +/// @ingroup evaluator_instructions +/// @brief Represents a compiler step that checks every object property is of a +/// set of given types (strict mode) +DEFINE_STEP_WITH_VALUE(Loop, PropertiesTypeStrictAny, ValueTypes) + +/// @ingroup evaluator_instructions +/// @brief Represents a compiler step that checks every object property is of a +/// set of given types (strict mode) and marks evaluation +DEFINE_STEP_WITH_VALUE(Loop, PropertiesTypeStrictAnyEvaluate, ValueTypes) + /// @ingroup evaluator_instructions /// @brief Represents a compiler step that loops over object property keys DEFINE_STEP_APPLICATOR(Loop, Keys, ValueNone) @@ -506,6 +540,25 @@ DEFINE_STEP_APPLICATOR(Loop, Keys, ValueNone) /// a given index DEFINE_STEP_APPLICATOR(Loop, Items, ValueUnsignedInteger) +/// @ingroup evaluator_instructions +/// @brief Represents a compiler step that loops over unevaluated array items +DEFINE_STEP_APPLICATOR(Loop, ItemsUnevaluated, ValueNone) + +/// @ingroup evaluator_instructions +/// @brief Represents a compiler step that loops over array items checking their +/// type +DEFINE_STEP_WITH_VALUE(Loop, ItemsType, ValueType) + +/// @ingroup evaluator_instructions +/// @brief Represents a compiler step that loops over array items checking their +/// type (strict mode) +DEFINE_STEP_WITH_VALUE(Loop, ItemsTypeStrict, ValueType) + +/// @ingroup evaluator_instructions +/// @brief Represents a compiler step that loops over array items checking their +/// type (strict mode) +DEFINE_STEP_WITH_VALUE(Loop, ItemsTypeStrictAny, ValueTypes) + /// @ingroup evaluator_instructions /// @brief Represents a compiler step that checks array items match a given /// criteria diff --git a/vendor/jsontoolkit/LICENSE b/vendor/jsontoolkit/LICENSE index 0be6f02..9348973 100644 --- a/vendor/jsontoolkit/LICENSE +++ b/vendor/jsontoolkit/LICENSE @@ -1,661 +1,12 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - JSON Toolkit - The swiss army knife for JSON applications - Copyright (C) 2022 Juan Cruz Viotti - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. +This software is dual-licensed: you can redistribute it and/or modify it under +the terms of the GNU Affero General Public License as published by the Free +Software Foundation, either version 3 of the License, or (at your option) any +later version. For the terms of this license, see +. + +You are free to use this software under the terms of the GNU Affero General +Public License WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +Alternatively, you can use this software under a commercial license, as set out +in . diff --git a/vendor/jsontoolkit/LICENSE-COMMERCIAL b/vendor/jsontoolkit/LICENSE-COMMERCIAL deleted file mode 100644 index 2b3c48a..0000000 --- a/vendor/jsontoolkit/LICENSE-COMMERCIAL +++ /dev/null @@ -1,2 +0,0 @@ -Refer to https://www.sourcemeta.com/licensing/ for learning more about -obtaining a commercial license. diff --git a/vendor/jsontoolkit/src/jsonpointer/jsonpointer.cc b/vendor/jsontoolkit/src/jsonpointer/jsonpointer.cc index 0d3ccbb..718449a 100644 --- a/vendor/jsontoolkit/src/jsonpointer/jsonpointer.cc +++ b/vendor/jsontoolkit/src/jsonpointer/jsonpointer.cc @@ -269,7 +269,7 @@ auto to_uri(const Pointer &pointer) -> URI { } auto to_uri(const Pointer &pointer, const URI &base) -> URI { - return to_uri(pointer).resolve_from_if_absolute(base).canonicalize(); + return to_uri(pointer).try_resolve_from(base).canonicalize(); } } // namespace sourcemeta::jsontoolkit diff --git a/vendor/jsontoolkit/src/jsonschema/default_walker.cc b/vendor/jsontoolkit/src/jsonschema/default_walker.cc index 3a503d8..d074665 100644 --- a/vendor/jsontoolkit/src/jsonschema/default_walker.cc +++ b/vendor/jsontoolkit/src/jsonschema/default_walker.cc @@ -29,6 +29,8 @@ auto sourcemeta::jsontoolkit::default_schema_walker( WALK(HTTPS_BASE "2020-12/vocab/applicator", "if", Value) WALK(HTTPS_BASE "2020-12/vocab/applicator", "propertyNames", Value) WALK(HTTPS_BASE "2020-12/vocab/content", "contentSchema", Value) + WALK(HTTPS_BASE "2020-12/vocab/validation", "maximum", None, "type") + WALK(HTTPS_BASE "2020-12/vocab/validation", "minimum", None, "type") // See https://json-schema.org/blog/posts/schema-static-analysis for a study // of 2020-12 keyword dependency @@ -50,10 +52,10 @@ auto sourcemeta::jsontoolkit::default_schema_walker( // For the purpose of compiler optimizations WALK_MAYBE_DEPENDENT(HTTPS_BASE "2020-12/vocab/applicator", "properties", - Members, HTTPS_BASE "2020-12/vocab/validation", "type", + Members, HTTPS_BASE "2020-12/vocab/validation", "required") - WALK(HTTPS_BASE "2020-12/vocab/validation", "maximum", None, "type") - WALK(HTTPS_BASE "2020-12/vocab/validation", "minimum", None, "type") + WALK_MAYBE_DEPENDENT(HTTPS_BASE "2020-12/vocab/validation", "type", None, + HTTPS_BASE "2020-12/vocab/applicator", "properties") // JSON Schema still defines this for backwards-compatibility // See https://json-schema.org/draft/2020-12/schema @@ -75,6 +77,8 @@ auto sourcemeta::jsontoolkit::default_schema_walker( WALK(HTTPS_BASE "2019-09/vocab/hyper-schema", "targetSchema", Value) WALK(HTTPS_BASE "2019-09/vocab/hyper-schema", "headerSchema", Value) WALK(HTTPS_BASE "2019-09/vocab/hyper-schema", "submissionSchema", Value) + WALK(HTTPS_BASE "2019-09/vocab/validation", "maximum", None, "type") + WALK(HTTPS_BASE "2019-09/vocab/validation", "minimum", None, "type") // See // https://json-schema.org/draft/2019-09/draft-handrews-json-schema-02#rfc.section.9.1 @@ -93,10 +97,10 @@ auto sourcemeta::jsontoolkit::default_schema_walker( // For the purpose of compiler optimizations WALK_MAYBE_DEPENDENT(HTTPS_BASE "2019-09/vocab/applicator", "properties", - Members, HTTPS_BASE "2019-09/vocab/validation", "type", + Members, HTTPS_BASE "2019-09/vocab/validation", "required") - WALK(HTTPS_BASE "2019-09/vocab/validation", "maximum", None, "type") - WALK(HTTPS_BASE "2019-09/vocab/validation", "minimum", None, "type") + WALK_MAYBE_DEPENDENT(HTTPS_BASE "2019-09/vocab/validation", "type", None, + HTTPS_BASE "2019-09/vocab/applicator", "properties") // JSON Schema still defines this for backwards-compatibility // See https://json-schema.org/draft/2019-09/schema @@ -117,6 +121,8 @@ auto sourcemeta::jsontoolkit::default_schema_walker( WALK(HTTP_BASE "draft-07/schema#", "if", Value, "$ref") WALK(HTTP_BASE "draft-07/schema#", "contains", Value, "$ref") WALK(HTTP_BASE "draft-07/schema#", "propertyNames", Value, "$ref") + WALK(HTTP_BASE "draft-07/schema#", "maximum", None, "$ref") + WALK(HTTP_BASE "draft-07/schema#", "minimum", None, "$ref") WALK_MAYBE_DEPENDENT(HTTP_BASE "draft-07/hyper-schema#", "hrefSchema", Value, HTTP_BASE "draft-07/schema#", "$ref") @@ -136,10 +142,8 @@ auto sourcemeta::jsontoolkit::default_schema_walker( WALK(HTTP_BASE "draft-07/schema#", "else", Value, "if") // For the purpose of compiler optimizations - WALK(HTTP_BASE "draft-07/schema#", "properties", Members, "$ref", "type", - "required") - WALK(HTTP_BASE "draft-07/schema#", "maximum", None, "$ref", "type") - WALK(HTTP_BASE "draft-07/schema#", "minimum", None, "$ref", "type") + WALK(HTTP_BASE "draft-07/schema#", "properties", Members, "$ref", "required") + WALK(HTTP_BASE "draft-07/schema#", "type", None, "properties") // $ref also takes precedence over any unknown keyword if (vocabularies.contains(HTTP_BASE "draft-07/schema#") && @@ -158,6 +162,8 @@ auto sourcemeta::jsontoolkit::default_schema_walker( WALK(HTTP_BASE "draft-06/schema#", "not", Value, "$ref") WALK(HTTP_BASE "draft-06/schema#", "contains", Value, "$ref") WALK(HTTP_BASE "draft-06/schema#", "propertyNames", Value, "$ref") + WALK(HTTP_BASE "draft-06/schema#", "maximum", None, "$ref") + WALK(HTTP_BASE "draft-06/schema#", "minimum", None, "$ref") WALK_MAYBE_DEPENDENT(HTTP_BASE "draft-06/hyper-schema#", "hrefSchema", Value, HTTP_BASE "draft-06/schema#", "$ref") @@ -172,10 +178,8 @@ auto sourcemeta::jsontoolkit::default_schema_walker( "properties", "patternProperties") // For the purpose of compiler optimizations - WALK(HTTP_BASE "draft-06/schema#", "properties", Members, "$ref", "type", - "required") - WALK(HTTP_BASE "draft-06/schema#", "maximum", None, "$ref", "type") - WALK(HTTP_BASE "draft-06/schema#", "minimum", None, "$ref", "type") + WALK(HTTP_BASE "draft-06/schema#", "properties", Members, "$ref", "required") + WALK(HTTP_BASE "draft-06/schema#", "type", None, "properties") // $ref also takes precedence over any unknown keyword if (vocabularies.contains(HTTP_BASE "draft-06/schema#") && @@ -191,23 +195,23 @@ auto sourcemeta::jsontoolkit::default_schema_walker( WALK(HTTP_BASE "draft-04/schema#", "anyOf", Elements, "$ref") WALK(HTTP_BASE "draft-04/schema#", "oneOf", Elements, "$ref") WALK(HTTP_BASE "draft-04/schema#", "not", Value, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "dependencies", Members, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "required", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "uniqueItems", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "pattern", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "format", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "maxLength", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "minLength", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "maxItems", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "minItems", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "maximum", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "minimum", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "maxProperties", None, "$ref") + WALK(HTTP_BASE "draft-04/schema#", "minProperties", None, "$ref") // These dependencies are only for the purpose of compiler optimizations - WALK(HTTP_BASE "draft-04/schema#", "dependencies", Members, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "required", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "uniqueItems", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "pattern", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "format", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "maxLength", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "minLength", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "maxItems", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "minItems", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "maximum", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "minimum", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "maxProperties", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "minProperties", None, "$ref", "type") - WALK(HTTP_BASE "draft-04/schema#", "properties", Members, "$ref", "type", - "required") + WALK(HTTP_BASE "draft-04/schema#", "properties", Members, "$ref", "required") + WALK(HTTP_BASE "draft-04/schema#", "type", None, "properties") WALK_MAYBE_DEPENDENT(HTTP_BASE "draft-04/hyper-schema#", "targetSchema", Value, HTTP_BASE "draft-04/schema#", "$ref") diff --git a/vendor/jsontoolkit/src/jsonschema/reference.cc b/vendor/jsontoolkit/src/jsonschema/reference.cc index b455e5e..ef84671 100644 --- a/vendor/jsontoolkit/src/jsonschema/reference.cc +++ b/vendor/jsontoolkit/src/jsonschema/reference.cc @@ -210,7 +210,7 @@ auto sourcemeta::jsontoolkit::frame( } const bool maybe_relative_is_absolute{maybe_relative.is_absolute()}; - maybe_relative.resolve_from_if_absolute(base); + maybe_relative.try_resolve_from(base); const std::string new_id{maybe_relative.recompose()}; if (!maybe_relative_is_absolute || @@ -238,7 +238,7 @@ auto sourcemeta::jsontoolkit::frame( const auto nearest_bases{ find_nearest_bases(base_uris, entry.common.pointer, entry.id)}; if (!nearest_bases.first.empty()) { - metaschema.resolve_from_if_absolute(nearest_bases.first.front()); + metaschema.try_resolve_from(nearest_bases.first.front()); } metaschema.canonicalize(); @@ -358,7 +358,7 @@ auto sourcemeta::jsontoolkit::frame( auto relative_pointer_uri{ sourcemeta::jsontoolkit::to_uri(pointer.resolve_from(base.second))}; if (!base.first.empty()) { - relative_pointer_uri.resolve_from_if_absolute({base.first}); + relative_pointer_uri.try_resolve_from({base.first}); } relative_pointer_uri.canonicalize(); @@ -386,7 +386,7 @@ auto sourcemeta::jsontoolkit::frame( sourcemeta::jsontoolkit::URI ref{ entry.common.value.at("$ref").to_string()}; if (!nearest_bases.first.empty()) { - ref.resolve_from_if_absolute(nearest_bases.first.front()); + ref.try_resolve_from(nearest_bases.first.front()); } ref.canonicalize(); diff --git a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h index c698abf..be76d72 100644 --- a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h +++ b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h @@ -295,8 +295,8 @@ class SOURCEMETA_JSONTOOLKIT_URI_EXPORT URI { /// ``` auto resolve_from(const URI &base) -> URI &; - /// Resolve a relative URI against an absolute base URI as established by RFC - /// 3986. If the base is not a relative URI, nothing happens. For example: + /// Resolve a relative URI against a base URI as established by RFC + /// 3986. If the resolution cannot happen, nothing happens. For example: /// /// ```cpp /// #include @@ -304,10 +304,10 @@ class SOURCEMETA_JSONTOOLKIT_URI_EXPORT URI { /// /// const sourcemeta::jsontoolkit::URI base{"bar"}; /// sourcemeta::jsontoolkit::URI result{"foo"}; - /// result.resolve_from_if_absolute(base); + /// result.try_resolve_from(base); /// assert(result.recompose() == "foo"); /// ``` - auto resolve_from_if_absolute(const URI &base) -> URI &; + auto try_resolve_from(const URI &base) -> URI &; /// Attempt to resolve a URI relative to another URI. If the latter URI is not /// a base for the former, leave the URI intact. For example: diff --git a/vendor/jsontoolkit/src/uri/uri.cc b/vendor/jsontoolkit/src/uri/uri.cc index 31c6483..7af6d30 100644 --- a/vendor/jsontoolkit/src/uri/uri.cc +++ b/vendor/jsontoolkit/src/uri/uri.cc @@ -93,7 +93,8 @@ static auto canonicalize_path(const std::string &path, const bool is_relative) // Reconstruct the canonical path std::string canonical_path; - std::string separator = is_relative ? "/" : ""; + std::string separator = (is_relative && !has_leading_with_word) ? "/" : ""; + for (const auto &seg : segments) { canonical_path += separator + seg; separator = "/"; @@ -535,9 +536,21 @@ auto URI::from_fragment(std::string_view fragment) -> URI { return {uri.str()}; } -auto URI::resolve_from_if_absolute(const URI &base) -> URI & { +auto URI::try_resolve_from(const URI &base) -> URI & { if (base.is_absolute()) { return this->resolve_from(base); + + // TODO: This only handles a very specific case. We should generalize this + // function to perform proper base resolution on relative bases + } else if (this->is_fragment_only() && !base.fragment().has_value()) { + this->path_ = base.path_; + this->userinfo_ = base.userinfo_; + this->host_ = base.host_; + this->port_ = base.port_; + this->scheme_ = base.scheme_; + this->query_ = base.query_; + return *this; + } else { return *this; }