Algorithm updates and tests to allow @container: @set on @type or an alias in 1.1. Remains an error to redefine @type in 1.0.

For w3c/json-ld-syntax#34.

Author: gkellogg

index.html

@@ -1139,7 +1139,7 @@ <h2>Create Term Definition</h2>
     <section class="informative">
       <h3>Overview</h3>
 
-      <p><a>term definitions</a> are created by
+      <p><a>Term definitions</a> are created by
         parsing the information in the given <a>local context</a> for the
         given <a>term</a>. If the given <a>term</a> is a
         <a>compact IRI</a>, it may omit an <a>IRI mapping</a> by
@@ -1179,14 +1179,21 @@ <h3>Algorithm</h3>
         <li>Set the value associated with <var>defined</var>'s <var>term</var> <a>member</a> to
           <code>false</code>. This indicates that the <a>term definition</a>
           is now being created but is not yet complete.</li>
-        <li>Since <a>keywords</a> cannot be overridden,
-          <var>term</var> must not be a <a>keyword</a>. Otherwise, a
+        <li>Initialize <var>value</var> to a copy of the value associated with the <a>member</a>
+          <var>term</var> in <var>local context</var>.</li>
+        <li class="changed">If <a data-link-for="JsonLdOptions">processingMode</a>
+          is <code>json-ld-1.1</code>
+          and <var>term</var> is <code>@type</code>, <var>value</var>
+          MUST be a <a>dictionary</a> with the member <code>@container</code>
+          and value <code>@set</code>. Any other value means that a
+          <a data-link-for="JsonLdErrorCode">keyword redefinition</a> error has
+          been detected and processing is aborted.</li>
+        <li><span class="changed">Otherwise</span>, since <a>keywords</a> cannot be overridden,
+          <var>term</var> MUST NOT be a <a>keyword</a> and a
           <a data-link-for="JsonLdErrorCode">keyword redefinition</a>
           error has been detected and processing is aborted.</li>
         <li>Remove any existing <a>term definition</a> for <var>term</var> in
           <var>active context</var>.</li>
-        <li>Initialize <var>value</var> to a copy of the value associated with the <a>member</a>
-          <var>term</var> in <var>local context</var>.</li>
         <li>If <var>value</var> is <code>null</code> or <var>value</var>
           is a <a class="changed">dictionary</a> containing the key-value pair
           <code>@id</code>-<code>null</code>, set the
@@ -1197,15 +1204,15 @@ <h3>Algorithm</h3>
           to a <a class="changed">dictionary</a> consisting of a single <a>member</a> whose
           key is <code>@id</code> and whose value is <var>value</var>.
           <span class="changed">Set <var>simple term</var> to <code>true</code></span>.</li>
-        <li>Otherwise, <var>value</var> must be a <a class="changed">dictionary</a>, if not, an
+        <li>Otherwise, <var>value</var> MUST be a <a class="changed">dictionary</a>, if not, an
           <a data-link-for="JsonLdErrorCode">invalid term definition</a>
           error has been detected and processing is aborted.
           <span class="changed">Set <var>simple term</var> to <code>false</code></span>.</li>
         <li>Create a new <a>term definition</a>, <var>definition</var>.</li>
         <li>If <var>value</var> contains the <a>member</a> <code>@type</code>:
           <ol>
             <li>Initialize <var>type</var> to the value associated with the
-              <code>@type</code> <a>member</a>, which must be a <a>string</a>. Otherwise, an
+              <code>@type</code> <a>member</a>, which MUST be a <a>string</a>. Otherwise, an
               <a data-link-for="JsonLdErrorCode">invalid type mapping</a>
               error has been detected and processing is aborted.</li>
             <li>Set <var>type</var> to the result of using the
@@ -1297,6 +1304,8 @@ <h3>Algorithm</h3>
               of <var>definition</var> to <var>term</var>.</li>
           </ol>
         </li>
+        <li class="changed">Otherwise, if term is <code>@type</code>, set the <a>IRI mapping</a>
+          of <var>definition</var> to <code>@type</code>.</li>
         <li>Otherwise, if <var>active context</var> has a
           <a>vocabulary mapping</a>, the <a>IRI mapping</a>
           of <var>definition</var> is set to the result of concatenating the value
@@ -1307,7 +1316,7 @@ <h3>Algorithm</h3>
         <li>If <var>value</var> contains the <a>member</a> <code>@container</code>:
           <ol>
             <li>Initialize <var>container</var> to the value associated with the
-              <code>@container</code> <a>member</a>, which must be either
+              <code>@container</code> <a>member</a>, which MUST be either
               <code class="changed">@graph</code>,
               <code class="changed">@id</code>,
               <code>@index</code>,
@@ -1355,7 +1364,7 @@ <h3>Algorithm</h3>
           does not contain the <a>member</a> <code>@type</code>:
           <ol>
             <li>Initialize <var>language</var> to the value associated with the
-              <code>@language</code> <a>member</a>, which must be either <code>null</code>
+              <code>@language</code> <a>member</a>, which MUST be either <code>null</code>
               or a <a>string</a>. Otherwise, an
               <a data-link-for="JsonLdErrorCode">invalid language mapping</a>
               error has been detected and processing is aborted.</li>
@@ -1370,8 +1379,8 @@ <h3>Algorithm</h3>
               <a data-link-for="JsonLdErrorCode">invalid term definition</a>
               has been detected and processing is aborted.</li>
             <li>Initialize <a>nest value</a> in <var>definition</var> to the value associated with the
-              <code>@nest</code> <a>member</a>, which must be a <a>string</a> and
-              must not be a keyword other than <code>@nest</code>. Otherwise, an
+              <code>@nest</code> <a>member</a>, which MUST be a <a>string</a> and
+              MUST NOT be a keyword other than <code>@nest</code>. Otherwise, an
               <a data-link-for="JsonLdErrorCode">invalid @nest value</a>
               error has been detected and processing is aborted.</li>
           </ol>
@@ -1383,7 +1392,7 @@ <h3>Algorithm</h3>
               <a data-link-for="JsonLdErrorCode">invalid term definition</a>
               has been detected and processing is aborted.</li>
             <li>Initialize the <a>prefix flag</a> to the value associated with the
-              <code>@prefix</code> <a>member</a>, which must be a <a>boolean</a>. Otherwise, an
+              <code>@prefix</code> <a>member</a>, which MUST be a <a>boolean</a>. Otherwise, an
               <a data-link-for="JsonLdErrorCode">invalid @prefix value</a>
               error has been detected and processing is aborted.</li>
           </ol>
@@ -2412,6 +2421,12 @@ <h3>Algorithm</h3>
                     passing <var>active context</var>, <var>inverse context</var>,
                     <var>expanded property</var> for <var>var</var>,
                     and <code>true</code> for <var>vocab</var>.</li>
+                  <li class="changed">If <a>processing mode</a> is <code>json-ld-1.1</code>,
+                    <var>element</var> does not have an <code>@value</code> member,
+                    <var>expanded property</var> is <code>@type</code>,
+                    and the <a>term definition</a> for <var>alias</var> in the
+                    <var>active context</var> has a <a>container mapping</a> including <code>@set</code>,
+                    ensure that <var>compacted value</var> is an <a>array</a>.</li>
                   <li>Add a <a>member</a> <var>alias</var> to <var>result</var> whose value is
                     set to <var>compacted value</var> and continue to the next
                     <var>expanded property</var>.</li>
@@ -2431,7 +2446,7 @@ <h3>Algorithm</h3>
                     <li>If the <a>term definition</a> for <var>property</var> in the
                       <var>active context</var> indicates that <var>property</var> is
                       a <a>reverse property</a>
-                      <ol>
+                            <ol>
                         <li>If the <a>term definition</a> for <var>property</var> in
                           the <var>active context</var> has a
                           <a>container mapping</a> <span class="changed">including</span> <code>@set</code> or
@@ -5471,20 +5486,8 @@ <h2>Changes since 1.0 Recommendation of 16 January 2014</h2>
       a context. When this is set, vocabulary-relative IRIs, such as the
       <a>members</a> of <a>node objects</a>, are expanded or compacted relative
       to the <a>base IRI</a> using string concatenation.</li>
-    <li><a>Lists</a> may now have <a>members</a> which are themselves <a>lists</a>.</li>
-    <li>The <a href="#deserialize-json-ld-to-rdf-algorithm">Deserialize JSON-LD to RDF Algorithm</a>
-      has been updated to ensure that only <a>well-formed</a> <a>triples</a>
-      are emitted; previously, it only ensured that <a>triples</a> containing
-      <a>relative IRIs</a> were excluded.</li>
-    <li>The API now adds an <a data-link-for="JsonLdOptions">ordered</a>
-       option, defaulting to <code>false</code> This is used in algorithms to
-       control interation of <a>dictionary member</a> keys. Previously, the
-       algorithms always required such an order. The instructions for
-       evaluating test results have been updated accordingly.</li>
-    <li>The <a href="#generate-blank-node-identifier">Generate Blank Node Identifier algorithm</a>
-      has been updated to remove the specifics of how new blank node
-      identifiers are created.</li>
   </ul>
+  <p>Additionally, see <a href="#changes-from-cg" class="sectionRef"></a>.</p>
 </section>
 
 <section class="appendix informative" id="changes-from-cg">
@@ -5503,6 +5506,10 @@ <h2>Changes since JSON-LD Community Group Final Report</h2>
     <li>The <a href="#generate-blank-node-identifier">Generate Blank Node Identifier algorithm</a>
       has been updated to remove the specifics of how new blank node
       identifiers are created.</li>
+    <li>Values of <code>@type</code>, or an alais of <code>@type</code>, may now have their <code>@container</code> set to @set
+      to ensure that <code>@type</code> members are always represented as an array. This
+      also allows a term to be defined for <code>@type</code>, where the value MUST be a <a>dictionary</a>
+      with <code>@container</code> set to <code>@set</code>.</li>
   </ul>
 </section>
 

tests/compact-manifest.jsonld

@@ -869,6 +869,33 @@
       "context": "compact/0103-context.jsonld",
       "expect": "compact/0103-out.jsonld",
       "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0104",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact @type with @container: @set",
+      "purpose": "Ensures that a single @type value is represented as an array",
+      "input": "compact/0104-in.jsonld",
+      "context": "compact/0104-context.jsonld",
+      "expect": "compact/0104-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0105",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact @type with @container: @set using an alias of @type",
+      "purpose": "Ensures that a single @type value is represented as an array",
+      "input": "compact/0105-in.jsonld",
+      "context": "compact/0105-context.jsonld",
+      "expect": "compact/0105-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0106",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Do not compact @type with @container: @set to an array using an alias of @type",
+      "purpose": "Ensures that a single @type value is not represented as an array in 1.0",
+      "input": "compact/0106-in.jsonld",
+      "context": "compact/0106-context.jsonld",
+      "expect": "compact/0106-out.jsonld",
+      "option": {"processingMode": "json-ld-1.0", "specVersion": "json-ld-1.1"}
     }, {
       "@id": "#tc001",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],

tests/compact/0104-context.jsonld

@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "@type": {"@container": "@set"}
+  }
+}

tests/compact/0104-in.jsonld

@@ -0,0 +1,3 @@
+{
+  "@type": "http://example.org/type"
+}

tests/compact/0104-out.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@type": {"@container": "@set"}
+  },
+  "@type": ["http://example.org/type"]
+}

tests/compact/0105-context.jsonld

@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "type": {"@id": "@type", "@container": "@set"}
+  }
+}

tests/compact/0105-in.jsonld

@@ -0,0 +1,3 @@
+{
+  "@type": "http://example.org/type"
+}

tests/compact/0105-out.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "type": {"@id": "@type", "@container": "@set"}
+  },
+  "type": ["http://example.org/type"]
+}

tests/compact/0106-context.jsonld

@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "type": {"@id": "@type", "@container": "@set"}
+  }
+}

tests/compact/0106-in.jsonld

@@ -0,0 +1,3 @@
+{
+  "@type": "http://example.org/type"
+}

tests/compact/0106-out.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "type": {"@id": "@type", "@container": "@set"}
+  },
+  "type": "http://example.org/type"
+}

tests/expand-manifest.jsonld

@@ -1180,6 +1180,13 @@
       "purpose": "Verifies that an exception is raised in Expansion when an invalid set or list object is found",
       "input": "expand/e041-in.jsonld",
       "expect": "invalid set or list object"
+   }, {
+      "@id": "#te042",
+      "@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],
+      "name": "Keywords may not be redefined",
+      "purpose": "Verifies that an exception is raised on expansion when processing an invalid context attempting to define @container on a keyword",
+      "input": "expand/e042-in.jsonld",
+      "expect": "keyword redefinition"
     }, {
       "@id": "#tec01",
       "@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],

tests/expand/e042-in.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@type": {"@container": "@set"}
+  },
+  "@type": "http://example.org/type"
+}