Don't make values of @included values of the property referencing the containing node object. Changes Flattening and expected toRdf tests.

Author: gkellogg

common/jsonld.js

@@ -40,6 +40,19 @@ const jsonld = {
       status: 'unofficial',
       date: 'January 2014'
     },
+    "JSON.API": {
+      title: "JSON API",
+      href: "https://jsonapi.org/format/",
+      authors: [
+        'Steve Klabnik',
+        'Yehuda Katz',
+        'Dan Gebhardt',
+        'Tyler Kellen',
+        'Ethan Resnick'
+      ],
+      status: 'unofficial',
+      date: '29 May 2015'
+    },
     "JCS": {
       title: "JSON Canonicalization Scheme (JCS)",
       href: 'https://tools.ietf.org/html/draft-rundgren-json-canonicalization-scheme-05',

common/terms.html

@@ -226,7 +226,7 @@
     having an <a>expanded term definition</a>
     where <code>@container</code> is set to  <code>@graph</code>.</dd>
   <dt class="changed"><dfn data-cite="JSON-LD11#dfn-included-block">included block</dfn></dt><dd class="changed">
-    An <a>included block</a> is an <a>entry</a> in a <a>node object</a> where the key is `@included` or an alias
+    An <a>included block</a> is an <a>entry</a> in a <a>node object</a> where the key is either `@included` or an alias of `@included`
     and the value is one ore more <a>node objects</a>.</dd>
   <dt><dfn data-cite="JSON-LD11#dfn-index-map">index map</dfn></dt><dd>
     An <a>index map</a> is a <a>map</a> value of a <a>term</a>
@@ -352,4 +352,4 @@
     The vocabulary mapping is set in the <a>context</a> using the <code>@vocab</code> key
     whose value MUST be an <a>IRI</a> or <code>null</code>.</dd>
 </dl>
-</section>
+</section>

index.html

@@ -4314,7 +4314,7 @@ <h3>Algorithm</h3>
               the <code>@graph</code> <a>entry</a> from <var>element</var>.</li>
             <li class="changed">If <var>element</var> has an `@included` <a>entry</a>,
               recursively invoke this algorithm passing the value of the `@included <a>entry</a> for <var>element</var>,
-              <var>node map</var>, <var>active subject</var>, <var>active property</var>, and <var>active graph</var>
+              <var>node map</var>, and <var>active graph</var>
               before removing the `@included` <a>entry</a> from <var>element</var>.</li>
             <li>Finally, for each key-value pair <var>property</var>-<var>value</var> in <var>element</var> ordered by
               <var>property</var> perform the following steps:

tests/flatten/in05-out.jsonld

@@ -1,9 +1,6 @@
 [{
   "@id": "_:b0",
-  "http://example.org/prop": [
-    {"@id": "_:b1"},
-    {"@id": "_:b2"}
-  ]
+  "http://example.org/prop": [{"@id": "_:b1"}]
 }, {
   "@id": "_:b1",
   "@type": ["http://example.org/Foo"]

tests/toRdf/in05-out.nq

@@ -1,4 +1,3 @@
 _:b0 <http://example.org/prop> _:b1 .
-_:b0 <http://example.org/prop> _:b2 .
 _:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Foo> .
 _:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Bar> .