Support JSON Literals. Uses JCS normatively for RDF output, with atrisk issue.

For w3c/json-ld-syntax#4.

Author: gkellogg

Gemfile.lock

@@ -1,9 +1,10 @@
 GIT
   remote: git://github.com/ruby-rdf/json-ld.git
-  revision: d88f81b143a602a6174b8b9da79c2fc6c04d127b
+  revision: 2a11745bc50eab0d5a4c5c3a5cd98b840176896e
   branch: develop
   specs:
     json-ld (3.0.2)
+      json-canonicalization (~> 0.1)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.13)
       rack (>= 1.6, < 3.0)
@@ -33,6 +34,7 @@ GEM
     htmlentities (4.3.4)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    json-canonicalization (0.1.0)
     json-ld-preloaded (3.0.2)
       json-ld (~> 3.0)
       multi_json (~> 1.12)

index.html

@@ -894,6 +894,10 @@ <h2>RDF Serialization/Deserialization</h2>
       <th>IRI</th>
     </tr></thead>
     <tbody>
+      <tr>
+        <td>jsonld</td>
+        <td>http://www.w3.org/ns/json-ld#</td>
+      </tr>
       <tr>
         <td>rdf</td>
         <td>http://www.w3.org/1999/02/22-rdf-syntax-ns#</td>
@@ -1247,7 +1251,7 @@ <h3>Algorithm</h3>
               <code>true</code> for <var>vocab</var>,
               <var>local context</var>, and <var>defined</var>. If the expanded <var>type</var> is
               neither <code>@id</code>, nor <code>@vocab</code>,
-              <span class="changed">nor, if <a>processing mode</a> is <code>json-ld-1.1</code>, <code>@none</code>,</span>
+              <span class="changed">nor, if <a>processing mode</a> is <code>json-ld-1.1</code>, <code>@json</code> nor <code>@none</code>,</span>
               nor an <a>absolute IRI</a>, an
               <a data-link-for="JsonLdErrorCode">invalid type mapping</a>
               error has been detected and processing is aborted.</li>
@@ -1715,7 +1719,12 @@ <h3>Algorithm</h3>
           </ol>
         </li>
         <li>Initialize an empty <a class="changed">dictionary</a>, <var>result</var>.</li>
-        <li id="alg-expand-each-key-value">For each <var>key</var> and <var>value</var> in <var>element</var>,
+        <li id="alg-expand-each-key-value">
+          <span class="changed">
+            Initialize an empty <a>dictionary</a>, <var>nests</var>, and
+            <var>input type</var> to the last value of any <a>member</a> expanding to <code>@type</code>.
+          </span>
+          For each <var>key</var> and <var>value</var> in <var>element</var>,
           ordered lexicographically by <var>key</var> <span class="changed">if <a data-link-for="JsonLdOptions">ordered</a> is <code>true</code></span>:
           <ol>
             <li>If <var>key</var> is <code>@context</code>, continue to
@@ -1778,7 +1787,11 @@ <h3>Algorithm</h3>
                     and <a data-link-for="JsonLdOptions">ordered</a> flags</span>,
                   <span class="changed">
                     ensuring that <var>expanded value</var> is an <a>array</a> of one or more <a>dictionaries</a></span>.</li>
-                <li>If <var>expanded property</var> is <code>@value</code> and
+                <li>Otherwise, if <var>expanded property</var> is <code>@value</code>,
+                  <span class="changed"><a>processing mode</a> is <code>json-ld-1.1</code>, and
+                    <var>input type</var> is <code>@json</code>,
+                    set <var>expanded value</var> to <var>value</var>.
+                    Otherwise, if</span>
                   <var>value</var> is not a <a>scalar</a> or <code>null</code>, an
                   <a data-link-for="JsonLdErrorCode">invalid value object value</a>
                   error has been detected and processing is aborted. Otherwise,
@@ -1903,7 +1916,11 @@ <h3>Algorithm</h3>
               set <var>term context</var> to <var>active context</var>.</li>
             <li>Set <var>container mapping</var> to <var>key</var>'s <a>container mapping</a> in
               <var class="changed">term context</var>.</li>
-            <li>If <var>container mapping</var> <span class="changed">includes</span> <code>@language</code> and
+            <li class="changed">If <var>key</var>'s <a>term definition</a> in <var>active context</var>
+              has a <a>type mapping</a> of <code>@json</code>,
+              set <var>expanded value</var> to a new <a>dictionary</a> the the <a>member</a>
+              <code>@value</code> set to <var>value</var>, and <code>@type</code> set to <code>@json</code>.</li>
+            <li>Otherwise, if <var>container mapping</var> <span class="changed">includes</span> <code>@language</code> and
               <var>value</var> is a <a class="changed">dictionary</a> then <var>value</var>
               is expanded from a <a>language map</a>
               as follows:
@@ -2077,7 +2094,7 @@ <h3>Algorithm</h3>
                       <var>nested value</var> expands to <code>@value</code>, an
                       <a data-link-for="JsonLdErrorCode">invalid @nest value</a> error
                       has been detected and processing is aborted.</li>
-                    <li>Recursively repeat <a href="#alg-expand-each-key-value">step 7</a>
+                    <li>Recursively repeat <a href="#alg-expand-each-key-value">step 9</a>
                       using <var>nested value</var> for <var>element</var>.</li>
                   </ol>
                 </li>
@@ -2096,6 +2113,9 @@ <h3>Algorithm</h3>
               error has been detected and processing is aborted.</li>
             <li>If the value of <var>result</var>'s <code>@value</code> <a>member</a> is
               <code>null</code>, then set <var>result</var> to <code>null</code>.</li>
+            <li class="changed">Otherwise, if the <var>result</var>'s <code>@type</code> <a>member</a>
+              is <code>@json</code>, then the <code>@value</code> <a>member</a> may
+              contain any value, and is treated as a <a>JSON literal</a>.</li>
             <li>Otherwise, if the value of <var>result</var>'s <code>@value</code> <a>member</a>
               is not a <a>string</a> and <var>result</var> contains the <a>member</a>
               <code>@language</code>, an
@@ -2220,7 +2240,7 @@ <h3>Algorithm</h3>
           <var>value</var>.</li>
         <li>If <var>active property</var> has a <a>type mapping</a> in
           <var>active context</var>,
-          <span class="changed">other than <code>@id</code> or <code>@vocab</code>, or <code>@none</code>,</span>
+          <span class="changed">other than <code>@id</code>, <code>@vocab</code>, or <code>@none</code>,</span>
           add an <code>@type</code> <a>member</a> to
           <var>result</var> and set its value to the value associated with the
           <a>type mapping</a>.</li>
@@ -2372,7 +2392,10 @@ <h3>Algorithm</h3>
           <a href="#value-compaction">Value Compaction algorithm</a>,
           passing <var>active context</var>, <var>inverse context</var>,
           <var>active property</var>,and <var>element</var> as <var>value</var> is
-          a <a>scalar</a>, return that result.</li>
+          a <a>scalar</a>,
+          <span class="changed">or the <a>term definition</a> for <var>active property</var>
+            has a <a>type mapping</a> of <code>@json</code>,</span>
+          return that result.</li>
         <li class="changed">If <var>element</var> is a
           <a>list object</a>, and the <a>container mapping</a> for
           <var>active property</var> in <var>active context</var> is <code>@list</code>,
@@ -4235,6 +4258,13 @@ <h3>Algorithm</h3>
         <li class="changed">If <var>datatype</var> is not <a>well-formed</a>, return <code>null</code>.</li>
         <li class="changed">If <var>item</var> has a <code>@language</code>
           <a>member</a> which is not <a>well-formed</a>, return <code>null</code>.</li>
+        <li class="changed">If <var>datatype</var> is <code>@json</code>,
+          convert <var>value</var> to the <a>canonical lexical form</a> as defined in [[JCS]]
+          using the result of transforming the <a>internal representation</a> of <var>value</var>
+          to JSON and set <var>datatype</var> to <code>jsonld:JSON</code>.
+          <div class="issue atrisk">JCS is still in draft form, and normatively requiring
+            JSON canonicalization may be removed in a future draft, or
+            a JSON-LD specific canonicalization form may be defined.</div></li>
         <li>If <var>value</var> is <code>true</code> or
           <code>false</code>, set <var>value</var> to the <a>string</a>
           <code>true</code> or <code>false</code> which is the
@@ -4552,6 +4582,11 @@ <h3>Overview</h3>
         <a>value objects</a> whereas <a>IRIs</a> and
         <a>blank node identifiers</a> are
         transformed to <a>node objects</a>.
+        <span class="changed">Literals with datatype <code>jsonld:JSON</code>
+          are transformed into a value object using the internal representation
+          based on the lexical-to-value mapping defined in
+          <a data-cite="JSON-LD11#dfn-json-datatype" class="externalDfn">JSON datatype</a> in [[JSON-LD11]]</span>,
+          and <code>@type</code> of <code>@json</code>.</span>
         If the <a data-link-for="JsonLdOptions">useNativeTypes</a> flag is set to <code>true</code>,
         <a>RDF literals</a> with a
         <a>datatype IRI</a>
@@ -4610,6 +4645,11 @@ <h3>Algorithm</h3>
                   to a JSON <a>number</a>.</li>
               </ol>
             </li>
+            <li class="changed">Otherwise, if <a>processing mode</a> is <code>json-ld-1.1</code>,
+              and <var>value</var> is a <a>JSON literal</a>,
+              set the <code>@value</code> <a>member</a> to the result of
+              turning the lexical value of <var>value</var>
+              into the <a>JSON-LD internal representation</a>, and set <var>type</var> to <code>@json</code>.</li>
             <li>Otherwise, if <var>value</var> is a
               <a>language-tagged string</a>
               add a <a>member</a> <code>@language</code> to <var>result</var> and set its value to the
@@ -4638,9 +4678,10 @@ <h2>Data Round Tripping</h2>
       or not (the result of a modulo&#8209;1 operation), the boolean values
       <code>true</code> and <code>false</code> are coerced to <code>xsd:boolean</code>,
       and <a>strings</a> are coerced to <code>xsd:string</code>.
-      The numeric or boolean values themselves are converted to
+      The JSON, numeric, or boolean values themselves are converted to
       <dfn>canonical lexical form</dfn>, i.e., a deterministic string
-      representation as defined in [[XMLSCHEMA11-2]].</p>
+      representation as defined in [[XMLSCHEMA11-2]]
+      <span class="changed">and [[JCS]]</span>.
 
     <p>The <a>canonical lexical form</a> of an <em>integer</em>, i.e., a
       <a>number</a> with no non-zero fractional part or a <a>number</a>
@@ -4692,6 +4733,56 @@ <h2>Data Round Tripping</h2>
       values <code>true</code> and <code>false</code> are the strings
       <code>true</code> and <code>false</code>.</p>
 
+    <p class="changed">The <a>canonical lexical form</a> of the <a>JSON literal</a>
+      values are defined in [[JCS]]. The internal representation
+      of value objects having @type @json are converted to JSON
+      and canonicalized to reduce unnecessary whitespace,
+      order object members, and use a standard representation
+      for strings and numbers.</p>
+
+    <aside class="example changed" data-ignore
+           title="Canonicalized JSON literal">
+      <pre class="original" data-transform="updateExample">
+      <!--
+      {
+        "@context": {
+          "@version": 1.1,
+          "e": {"@id": "http://example.org/vocab#c14n", ****"@type": "@json"****}
+        },
+        "e": ****[
+          56.0,
+          {
+            "d": true,
+            "10": null,
+            "1": [ ]
+          }
+        ]****
+      }
+      -->
+      </pre>
+
+      <p>The example shows the value of "e" as a native JSON array including
+        unnecssary whitespace, a number and an object. The result
+        eliminates the whitespace, uses a canonical number representation,
+        and reorders the object members lexicographically:</p>
+
+      <pre class="turtle"
+           data-content-type="text/turtle"
+           data-result-for="Canonicalized JSON literal-original"
+           data-transform="updateExample"
+           data-to-rdf>
+      <!--
+      @prefix ex: <http://example.org/vocab#> .
+      @prefix jsonld: <http://www.w3.org/ns/json-ld#> .
+      [ex:c14n ****"""[56,{"1":[],"10":null,"d":true}]"""^^jsonld:JSON****] .
+      -->
+      </pre>
+    </aside>
+
+    <p class="issue atrisk">JCS is still in draft form, and normatively requiring
+      JSON canonicalization may be removed in a future draft, or
+      a JSON-LD specific canonicalization form may be defined.</p>
+
     <p>When JSON-native <a>numbers</a> are deserialized
       to RDF, lossless data round-tripping cannot be guaranteed, as rounding
       errors might occur. When
@@ -5731,6 +5822,7 @@ <h2>Changes since JSON-LD Community Group Final Report</h2>
     <li>Because scoped contexts can lead to contexts being reloaded, replace the
       <strong>recursive context inclusion</strong> error with a <a data-link-for="JsonLdErrorCode">context overflow</a> error.</li>
     <li>Added support for <code>"@type": "@none"</code> in a <a>term definition</a> to prevent value compaction.</li>
+    <li>Added support for <a>JSON literals</a>.</li>
   </ul>
 </section>
 

tests/compact-manifest.jsonld

@@ -1184,6 +1184,87 @@
       "context": "compact/h004-context.jsonld",
       "expect": "compact/h004-out.jsonld",
       "option": {"specVersion": "json-ld-1.1", "extractAllScripts": true}
+    }, {
+      "@id": "#tjs01",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact JSON literal (boolean true)",
+      "purpose": "Tests compacting property with @type @json to a JSON literal (boolean true).",
+      "input": "compact/js01-in.jsonld",
+      "context": "compact/js01-context.jsonld",
+      "expect": "compact/js01-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1", "processingMode": "json-ld-1.1"}
+    }, {
+      "@id": "#tjs02",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact JSON literal (boolean false)",
+      "purpose": "Tests compacting property with @type @json to a JSON literal (boolean false).",
+      "input": "compact/js02-in.jsonld",
+      "context": "compact/js02-context.jsonld",
+      "expect": "compact/js02-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1", "processingMode": "json-ld-1.1"}
+    }, {
+      "@id": "#tjs03",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact JSON literal (double)",
+      "purpose": "Tests compacting property with @type @json to a JSON literal (double).",
+      "input": "compact/js03-in.jsonld",
+      "context": "compact/js03-context.jsonld",
+      "expect": "compact/js03-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1", "processingMode": "json-ld-1.1"}
+    }, {
+      "@id": "#tjs04",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact JSON literal (double-zero)",
+      "purpose": "Tests compacting property with @type @json to a JSON literal (double-zero).",
+      "input": "compact/js04-in.jsonld",
+      "context": "compact/js04-context.jsonld",
+      "expect": "compact/js04-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1", "processingMode": "json-ld-1.1"}
+    }, {
+      "@id": "#tjs05",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact JSON literal (integer)",
+      "purpose": "Tests compacting property with @type @json to a JSON literal (integer).",
+      "input": "compact/js05-in.jsonld",
+      "context": "compact/js05-context.jsonld",
+      "expect": "compact/js05-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1", "processingMode": "json-ld-1.1"}
+    }, {
+      "@id": "#tjs06",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact JSON literal (object)",
+      "purpose": "Tests compacting property with @type @json to a JSON literal (object).",
+      "input": "compact/js06-in.jsonld",
+      "context": "compact/js06-context.jsonld",
+      "expect": "compact/js06-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1", "processingMode": "json-ld-1.1"}
+    }, {
+      "@id": "#tjs07",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact JSON literal (array)",
+      "purpose": "Tests compacting property with @type @json to a JSON literal (array).",
+      "input": "compact/js07-in.jsonld",
+      "context": "compact/js07-context.jsonld",
+      "expect": "compact/js07-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1", "processingMode": "json-ld-1.1"}
+    }, {
+      "@id": "#tjs08",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact already expanded JSON literal",
+      "purpose": "Tests compacting JSON literal does not expand terms inside json.",
+      "input": "compact/js08-in.jsonld",
+      "context": "compact/js08-context.jsonld",
+      "expect": "compact/js08-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1", "processingMode": "json-ld-1.1"}
+    }, {
+      "@id": "#tjs09",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact already expanded JSON literal with aliased keys",
+      "purpose": "Tests compacting JSON literal in expanded form.",
+      "input": "compact/js09-in.jsonld",
+      "context": "compact/js09-context.jsonld",
+      "expect": "compact/js09-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1", "processingMode": "json-ld-1.1"}
    }, {
       "@id": "#tm001",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],

tests/compact/js01-context.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "e": {"@id": "http://example.org/vocab#bool", "@type": "@json"}
+  }
+}

tests/compact/js01-in.jsonld

@@ -0,0 +1,3 @@
+[{
+  "http://example.org/vocab#bool": [{"@value": true, "@type": "@json"}]
+}]

tests/compact/js01-out.jsonld

@@ -0,0 +1,7 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "e": {"@id": "http://example.org/vocab#bool", "@type": "@json"}
+  },
+  "e": true
+}

tests/compact/js02-context.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "e": {"@id": "http://example.org/vocab#bool", "@type": "@json"}
+  }
+}

tests/compact/js02-in.jsonld

@@ -0,0 +1,3 @@
+[{
+  "http://example.org/vocab#bool": [{"@value": false, "@type": "@json"}]
+}]

tests/compact/js02-out.jsonld

@@ -0,0 +1,7 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "e": {"@id": "http://example.org/vocab#bool", "@type": "@json"}
+  },
+  "e": false
+}

tests/compact/js03-context.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "e": {"@id": "http://example.org/vocab#double", "@type": "@json"}
+  }
+}

tests/compact/js03-in.jsonld

@@ -0,0 +1,3 @@
+[{
+  "http://example.org/vocab#double": [{"@value": 1.23, "@type": "@json"}]
+}]

tests/compact/js03-out.jsonld

@@ -0,0 +1,7 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "e": {"@id": "http://example.org/vocab#double", "@type": "@json"}
+  },
+  "e": 1.23
+}

tests/compact/js04-context.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "e": {"@id": "http://example.org/vocab#double", "@type": "@json"}
+  }
+}