Maintain multiple graphs.

Adapted from:
"Make sure multiple objects with `@container: @graph` are maintained as
multiple graphs."
ruby-rdf/json-ld@b2675a1

Author: davidlehn

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Fixed
 - Use rdf-canonize to compare n-quads test results.
+- Multiple graph tests.
 
 ### Changed
 - Use JSON-LD WG tests.

lib/expand.js

@@ -660,11 +660,10 @@ function _expandObject({
     // and value is not, itself, a graph
     // index cases handled above
     if(container.includes('@graph') &&
-      !container.some(key => key === '@id' || key === '@index') &&
-      !_isGraph(expandedValue)) {
-      // ensure expanded value is an array
-      expandedValue = [].concat(expandedValue);
-      expandedValue = {'@graph': expandedValue};
+      !container.some(key => key === '@id' || key === '@index')) {
+      // ensure expanded values are arrays
+      expandedValue = [].concat(expandedValue)
+        .map(v => _isGraph(v) ? v : {'@graph': [].concat(v)});
     }
 
     // FIXME: can this be merged with code above to simplify?

tests/test-common.js

@@ -47,10 +47,7 @@ const TEST_TYPES = {
         // scoped context on type
         /^#tc012/,
         // rel iri
-        /^#t0095/,
-        // graphs
-        /^#t0092/,
-        /^#t0093/
+        /^#t0095/
       ]
     },
     fn: 'compact',
@@ -81,12 +78,6 @@ const TEST_TYPES = {
         /^#tp002/,
         // scoped context on type
         /^#tc011/,
-        // graph
-        /^#t0093/,
-        /^#t0094/,
-        /^#t0095/,
-        /^#t0103/,
-        /^#t0104/,
         // rel iri
         /^#t0092/,
         // remote