Skip to content

Don't swallow a graph object when expanding a graph container. #328

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
merged 1 commit into from
Nov 13, 2019
Merged

Don't swallow a graph object when expanding a graph container. #328

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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## 2.0.0 - 2019-xx-xx

### Fixed
- Expanding the value of a graph container which is already a graph object
generates a recursive graph object.
- Compacting multiple nodes in a graph container places them in `@included`.

### Changed
- Default processing mode changed to json-ld-1.1. Allows a 1.1 context to be
used after non-1.1 contexts.
Expand Down
4 changes: 4 additions & 0 deletions lib/compact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,10 @@ api.compact = async ({
_isSimpleGraph(expandedItem)) {
// container includes @graph but not @id or @index and value is a
// simple graph object add compact value
// if compactedItem contains multiple values, it is wrapped in `@included`
if(_isArray(compactedItem) && compactedItem.length > 1) {
compactedItem = {'@included': compactedItem}
}
_addValue(
nestResult, itemActiveProperty, compactedItem, {
propertyIsArray:
Expand Down
2 changes: 1 addition & 1 deletion lib/expand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ async function _expandObject({
!container.some(key => key === '@id' || key === '@index')) {
// ensure expanded values are arrays
expandedValue = _asArray(expandedValue)
.map(v => _isGraph(v) ? v : {'@graph': _asArray(v)});
.map(v => ({'@graph': _asArray(v)}));
}

// FIXME: can this be merged with code above to simplify?
Expand Down
15 changes: 0 additions & 15 deletions tests/test-common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ const TEST_TYPES = {
/compact-manifest.jsonld#t0105$/,
// rel vocab
/compact-manifest.jsonld#t0107$/,
// @container: @graph with multiple objects
/compact-manifest.jsonld#t0109$/,
/compact-manifest.jsonld#t0110$/,
// @type: @none
/compact-manifest.jsonld#ttn01$/,
/compact-manifest.jsonld#ttn02$/,
Expand Down Expand Up @@ -116,11 +113,6 @@ const TEST_TYPES = {
specVersion: ['json-ld-1.0'],
// FIXME
idRegex: [
// Don't double-expand an already expanded graph
/expand-manifest.jsonld#t0081$/,
// Double-expand an already expanded graph
/expand-manifest.jsonld#t0095$/,
/expand-manifest.jsonld#t0104$/,
// indexed graph objects
/expand-manifest.jsonld#t0102$/,
// multiple graphs
Expand Down Expand Up @@ -424,13 +416,6 @@ const TEST_TYPES = {
idRegex: [
// blank node properties
/toRdf-manifest.jsonld#t0118$/,
// Don't double-expand an already expanded graph
/toRdf-manifest.jsonld#te081$/,
/toRdf-manifest.jsonld#te095$/,
// Does not create a new graph object
/toRdf-manifest.jsonld#te102$/,
/toRdf-manifest.jsonld#te103$/,
/toRdf-manifest.jsonld#te104$/,
// terms beginning with ':'
/toRdf-manifest.jsonld#te117$/,
/toRdf-manifest.jsonld#te118$/,
Expand Down