Skip to content
New issue

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

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

Graph aliased index containers #1

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Graph aliased index containers #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fede598
Add initial fix for graph-aliased index containers
niklasl Jan 15, 2022
6d2ec49
Commented compaction of graph-aliased containers
niklasl Jan 15, 2022
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
4 changes: 4 additions & 0 deletions trld/jsonld/compaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ def compact(context: object, doc_data: JsonObject,
context = context.get(CONTEXT)
active_context = Context(base_iri).get_context(cast(object, context), context_url)

# TODO: if there is a graph-aliased keyword, ensure:
#if isinstance(doc_data, list):
# doc_data = {GRAPH: doc_data}

result: JsonObject = compaction(active_context, None, doc_data, compact_arrays, ordered)
if isinstance(result, List):
if len(result) == 0:
Expand Down
25 changes: 18 additions & 7 deletions trld/jsonld/expansion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,16 +264,24 @@ def _expand_element(active_context: Context,
# 13.1)
if key == CONTEXT:
continue

# 13.2)
expanded_property: Optional[str] = active_context.expand_vocab_iri(key)

# 13.3)
if expanded_property is None or (':' not in expanded_property and expanded_property not in KEYWORDS):
continue

# TODO: [61e1e7da] spec errata? To allow index containers for @graph
# (The https://json-ld.org/playground/ handles this.)
is_not_graph = expanded_property != GRAPH

# 13.4)
if expanded_property in KEYWORDS:
if is_not_graph and expanded_property in KEYWORDS:
# 13.4.1)
if active_property == REVERSE:
raise InvalidReversePropertyMapError

# 13.4.2)
if expanded_property in result and expanded_property not in {INCLUDED, TYPE}:
pass # FIXME: expansion TC in06 fails with this on ID! Due to nested recusion?
Expand Down Expand Up @@ -325,12 +333,15 @@ def _expand_element(active_context: Context,
#else:
# result[TYPE] = expanded_value

# 13.4.5)
elif expanded_property == GRAPH:
expanded_value = as_list(expansion(active_context,
GRAPH, value,
base_url, frame_expansion, ordered, from_map,
warn_on_keywordlike_terms, warn_on_empty_keys, warn_on_bnode_properties))
# TODO: not needed if [61e1e7da] is correct
## 13.4.5)
# SKIPPED (TODO: is any edge case effected by flags when
# expanded_value is instead created after 13.4?)
#elif expanded_property == GRAPH:
# #expanded_value = as_list(expansion(active_context,
# # GRAPH, value,
# # base_url, frame_expansion, ordered, from_map,
# # warn_on_keywordlike_terms, warn_on_empty_keys, warn_on_bnode_properties))

# 13.4.6)
elif expanded_property == INCLUDED:
Expand Down