Skip to content

Make use of JSONObject::Entry::key_equals in src/core/jsonld #2547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jviotti merged 1 commit into from
Jun 27, 2026
+41 −27
Merged

Make use of JSONObject::Entry::key_equals in src/core/jsonld #2547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/core/jsonld/include/sourcemeta/core/jsonld.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ enum class JSONLDVersion : std::uint8_t { V1_0, V1_1 };
/// "@context": { "name": "https://schema.org/name" },
/// "name": "Sourcemeta"
/// })")};
///
/// const auto expanded{sourcemeta::core::jsonld_expand(document)};
/// sourcemeta::core::prettify(expanded, std::cout);
/// std::cout << std::endl;
Expand All @@ -73,6 +74,7 @@ auto jsonld_expand(const JSON &input, const JSON::StringView base_iri = "",
/// R"({ "name": "Sourcemeta" })")};
/// const auto context{sourcemeta::core::parse_json(
/// R"({ "name": "https://schema.org/name" })")};
///
/// const auto expanded{sourcemeta::core::jsonld_expand(document, context)};
/// sourcemeta::core::prettify(expanded, std::cout);
/// std::cout << std::endl;
Expand Down
14 changes: 9 additions & 5 deletions src/core/jsonld/jsonld_context_processing.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ auto process_context(ExpansionState &state, ActiveContext &active_context,
// overriding, and process the result as a single context.
auto merged{JSON{*imported_context}};
for (const auto &entry : context.as_object()) {
if (JSON::StringView{entry.first} != KEYWORD_IMPORT) {
if (!entry.key_equals(KEYWORD_IMPORT, KEYWORD_IMPORT_HASH)) {
merged.assign(entry.first, entry.second);
}
}
Expand Down Expand Up @@ -261,10 +261,14 @@ auto process_context(ExpansionState &state, ActiveContext &active_context,
DefinedTerms defined;
for (const auto &entry : context.as_object()) {
const auto &name{entry.first};
if (name == KEYWORD_BASE || name == KEYWORD_VOCAB ||
name == KEYWORD_LANGUAGE || name == KEYWORD_VERSION ||
name == KEYWORD_DIRECTION || name == KEYWORD_IMPORT ||
name == KEYWORD_PROPAGATE || name == KEYWORD_PROTECTED) {
if (entry.key_equals(KEYWORD_BASE, KEYWORD_BASE_HASH) ||
entry.key_equals(KEYWORD_VOCAB, KEYWORD_VOCAB_HASH) ||
entry.key_equals(KEYWORD_LANGUAGE, KEYWORD_LANGUAGE_HASH) ||
entry.key_equals(KEYWORD_VERSION, KEYWORD_VERSION_HASH) ||
entry.key_equals(KEYWORD_DIRECTION, KEYWORD_DIRECTION_HASH) ||
entry.key_equals(KEYWORD_IMPORT, KEYWORD_IMPORT_HASH) ||
entry.key_equals(KEYWORD_PROPAGATE, KEYWORD_PROPAGATE_HASH) ||
entry.key_equals(KEYWORD_PROTECTED, KEYWORD_PROTECTED_HASH)) {
continue;
}
create_term_definition(state, active_context, context, name, defined,
Expand Down
25 changes: 15 additions & 10 deletions src/core/jsonld/jsonld_create_term_definition.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,15 @@ auto create_term_definition(ExpansionState &state,
bool has_container{false};
bool invalid_entry{false};
for (const auto &entry : value.as_object()) {
const auto &name{entry.first};
if (name == KEYWORD_PROTECTED) {
if (entry.key_equals(KEYWORD_PROTECTED, KEYWORD_PROTECTED_HASH)) {
if (!entry.second.is_boolean()) {
throw JSONLDError("Invalid @protected value", term_pointer,
{KEYWORD_PROTECTED});
}
type_definition.is_protected = entry.second.to_boolean();
} else if (name == KEYWORD_CONTAINER && entry.second.is_string()) {
} else if (entry.key_equals(KEYWORD_CONTAINER,
KEYWORD_CONTAINER_HASH) &&
entry.second.is_string()) {
const auto &container{entry.second.to_string()};
if (container == KEYWORD_SET) {
type_definition.container.push_back(container);
Expand Down Expand Up @@ -579,13 +580,17 @@ auto create_term_definition(ExpansionState &state,
// A term definition may not contain any entry other than the keywords
// recognised above.
for (const auto &entry : value.as_object()) {
const JSON::StringView key{entry.first};
if (key != KEYWORD_ID && key != KEYWORD_REVERSE &&
key != KEYWORD_CONTAINER && key != KEYWORD_CONTEXT &&
key != KEYWORD_DIRECTION && key != KEYWORD_INDEX &&
key != KEYWORD_LANGUAGE && key != KEYWORD_NEST &&
key != KEYWORD_PREFIX && key != KEYWORD_PROTECTED &&
key != KEYWORD_TYPE) {
if (!entry.key_equals(KEYWORD_ID, KEYWORD_ID_HASH) &&
!entry.key_equals(KEYWORD_REVERSE, KEYWORD_REVERSE_HASH) &&
!entry.key_equals(KEYWORD_CONTAINER, KEYWORD_CONTAINER_HASH) &&
!entry.key_equals(KEYWORD_CONTEXT, KEYWORD_CONTEXT_HASH) &&
!entry.key_equals(KEYWORD_DIRECTION, KEYWORD_DIRECTION_HASH) &&
!entry.key_equals(KEYWORD_INDEX, KEYWORD_INDEX_HASH) &&
!entry.key_equals(KEYWORD_LANGUAGE, KEYWORD_LANGUAGE_HASH) &&
!entry.key_equals(KEYWORD_NEST, KEYWORD_NEST_HASH) &&
!entry.key_equals(KEYWORD_PREFIX, KEYWORD_PREFIX_HASH) &&
!entry.key_equals(KEYWORD_PROTECTED, KEYWORD_PROTECTED_HASH) &&
!entry.key_equals(KEYWORD_TYPE, KEYWORD_TYPE_HASH)) {
throw JSONLDError("Invalid term definition", term_pointer);
}
}
Expand Down
27 changes: 15 additions & 12 deletions src/core/jsonld/jsonld_expansion.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,16 @@ auto expand_object(ExpansionState &state, ActiveContext active_context,
type != nullptr && type->is_string() ? &type->to_string() : nullptr};
const bool is_json{type_string != nullptr && *type_string == KEYWORD_JSON};
for (const auto &entry : result.as_object()) {
const auto &name{entry.first};
if (name != KEYWORD_VALUE && name != KEYWORD_TYPE &&
name != KEYWORD_LANGUAGE && name != KEYWORD_INDEX &&
name != KEYWORD_DIRECTION) {
if (!entry.key_equals(KEYWORD_VALUE, KEYWORD_VALUE_HASH) &&
!entry.key_equals(KEYWORD_TYPE, KEYWORD_TYPE_HASH) &&
!entry.key_equals(KEYWORD_LANGUAGE, KEYWORD_LANGUAGE_HASH) &&
!entry.key_equals(KEYWORD_INDEX, KEYWORD_INDEX_HASH) &&
!entry.key_equals(KEYWORD_DIRECTION, KEYWORD_DIRECTION_HASH)) {
throw JSONLDError("Invalid value object", pointer);
}
if ((name == KEYWORD_LANGUAGE || name == KEYWORD_DIRECTION) && has_type) {
if ((entry.key_equals(KEYWORD_LANGUAGE, KEYWORD_LANGUAGE_HASH) ||
entry.key_equals(KEYWORD_DIRECTION, KEYWORD_DIRECTION_HASH)) &&
has_type) {
throw JSONLDError("Invalid value object", pointer);
}
}
Expand Down Expand Up @@ -180,9 +183,9 @@ auto expand_object(ExpansionState &state, ActiveContext active_context,
if (result.defines(KEYWORD_LIST, KEYWORD_LIST_HASH) ||
result.defines(KEYWORD_SET, KEYWORD_SET_HASH)) {
for (const auto &entry : result.as_object()) {
const auto &name{entry.first};
if (name != KEYWORD_LIST && name != KEYWORD_SET &&
name != KEYWORD_INDEX) {
if (!entry.key_equals(KEYWORD_LIST, KEYWORD_LIST_HASH) &&
!entry.key_equals(KEYWORD_SET, KEYWORD_SET_HASH) &&
!entry.key_equals(KEYWORD_INDEX, KEYWORD_INDEX_HASH)) {
throw JSONLDError("Invalid set or list object", pointer);
}
}
Expand All @@ -200,9 +203,9 @@ auto expand_object(ExpansionState &state, ActiveContext active_context,
result.defines(KEYWORD_DIRECTION, KEYWORD_DIRECTION_HASH))) {
bool only_value_keys{true};
for (const auto &entry : result.as_object()) {
const auto &name{entry.first};
if (name != KEYWORD_LANGUAGE && name != KEYWORD_DIRECTION &&
name != KEYWORD_INDEX) {
if (!entry.key_equals(KEYWORD_LANGUAGE, KEYWORD_LANGUAGE_HASH) &&
!entry.key_equals(KEYWORD_DIRECTION, KEYWORD_DIRECTION_HASH) &&
!entry.key_equals(KEYWORD_INDEX, KEYWORD_INDEX_HASH)) {
only_value_keys = false;
}
}
Expand Down Expand Up @@ -459,7 +462,7 @@ auto expand_entries(ExpansionState &state, ActiveContext &active_context,
: JSON::make_object()};
for (const auto &reverse_entry : reversed.as_object()) {
const auto &reverse_property{reverse_entry.first};
if (reverse_entry.hash == KEYWORD_REVERSE_HASH) {
if (reverse_entry.key_equals(KEYWORD_REVERSE, KEYWORD_REVERSE_HASH)) {
for (auto &forward : reverse_entry.second.as_object()) {
merge(result, JSON::StringView{forward.first},
into_array(JSON{forward.second}));
Expand Down
Loading