Adds text for @source and expansion tests including with @propagate.

Author: gkellogg

index.html

@@ -1180,6 +1180,34 @@ <h3>Algorithm</h3>
             <li>If <var>context</var> is not a <a class="changed">dictionary</a>, an
               <a data-link-for="JsonLdErrorCode">invalid local context</a>
               error has been detected and processing is aborted.</li>
+            <li class="changed">If <var>context</var> has an <code>@version</code> <a>member</a>:
+              <ol>
+                <li>If the associated value is not <code>1.1</code>,
+                  an <a data-link-for="JsonLdErrorCode">invalid @version value</a>
+                  has been detected, and processing is aborted.</li>
+                <li>If <a>processing mode</a>
+                  is set to <code>json-ld-1.0</code>,
+                  a <a data-link-for="JsonLdErrorCode">processing mode conflict</a>
+                  error has been detected and processing is aborted.</li>
+                <li>Set <a>processing mode</a>,
+                  to <code>json-ld-1.1</code>, if not already set.</li>
+              </ol>
+            </li>
+            <li class="changed">If <var>context</var> has a <code>@source</code> <a>member</a>:
+              <ol>
+                <li>If <a>processing mode</a> is <code>json-ld-1.0</code>,
+                  an <a data-link-for="JsonLdErrorCode">invalid context member</a>
+                  error has been detected and processing is aborted.</li>
+                <li>Otherwise, if its value is not a <a>string</a>,
+                  an <a data-link-for="JsonLdErrorCode">invalid @source value</a>
+                  error has been detected and processing is aborted.</li>
+                <li>Otherwise, set <var>result</var> to the result of recursively calling this algorithm,
+                  passing <var>result</var> for <var>active context</var>,
+                  the value of <code>@source</code> for <var>local context</var>,
+                  and a copy of <var>remote contexts</var>.
+                </li>
+              </ol>
+            </li>
             <li>If <var>context</var> has an <code>@base</code> <a>member</a> and <var>remote contexts</var> is empty, i.e., the currently
               being processed context is not a remote context:
               <ol>
@@ -1199,19 +1227,6 @@ <h3>Algorithm</h3>
                   error has been detected and processing is aborted.</li>
               </ol>
             </li>
-            <li class="changed">If <var>context</var> has an <code>@version</code> <a>member</a>:
-              <ol>
-                <li>If the associated value is not <code>1.1</code>,
-                  an <a data-link-for="JsonLdErrorCode">invalid @version value</a>
-                  has been detected, and processing is aborted.</li>
-                <li>If <a>processing mode</a>
-                  is set to <code>json-ld-1.0</code>,
-                  a <a data-link-for="JsonLdErrorCode">processing mode conflict</a>
-                  error has been detected and processing is aborted.</li>
-                <li>Set <a>processing mode</a>,
-                  to <code>json-ld-1.1</code>, if not already set.</li>
-              </ol>
-            </li>
             <li>If <var>context</var> has an <code>@vocab</code> <a>member</a>:
               <ol>
                 <li>Initialize <var>value</var> to the value associated with the
@@ -1249,12 +1264,18 @@ <h3>Algorithm</h3>
                   error has been detected and processing is aborted.</li>
               </ol>
             </li>
-            <li>If <var>context</var> has a <code>@propagate</code> <a>member</a>
-              and its value is not <a>boolean</a> <code>true</code> or <code>false</code>,
-              or <a>processing mode</a> is <code>json-ld-1.0</code>,
-              an <a data-link-for="JsonLdErrorCode">invalid local context</a>
-              error has been detected and processing is aborted.
-              <span class="note"><var>previous context</var> was determined before.</span></li>
+            <li class="changed">If <var>context</var> has a <code>@propagate</code> <a>member</a>:
+              <ol>
+                <li>If <a>processing mode</a> is <code>json-ld-1.0</code>,
+                  an <a data-link-for="JsonLdErrorCode">invalid context member</a>
+                  error has been detected and processing is aborted.</li>
+                <li>Otherwise, if its value is not <a>boolean</a> <code>true</code> or <code>false</code>,
+                  an <a data-link-for="JsonLdErrorCode">invalid @propagate value</a>
+                  error has been detected and processing is aborted.</li>
+                <li>Otherwise, <var>previous context</var> was determined before,
+                  and no further processing is necessary.</li>
+              </ol>
+            </li>
             <li>Create a <a class="changed">dictionary</a> <var>defined</var> to use to keep
               track of whether or not a <a>term</a> has already been defined
               or currently being defined during recursion.</li>
@@ -5930,10 +5951,13 @@ <h4>JsonLdErrorCode</h4>
             "invalid @index value",
             "invalid @nest value",
             "invalid @prefix value",
+            "invalid @propagate value",
             "invalid @reverse value",
+            "invalid @source value",
             "invalid @version value",
             "invalid base IRI",
             "invalid container mapping",
+            "invalid context member",
             "invalid context nullification",
             "invalid default language",
             "invalid IRI mapping",
@@ -5986,9 +6010,13 @@ <h4>JsonLdErrorCode</h4>
         <dd class="changed">An invalid value for <code>@nest</code> has been found.</dd>
         <dt class="changed"><dfn>invalid @prefix value</dfn></dt>
         <dd class="changed">An invalid value for <code>@prefix</code> has been found.</dd>
+        <dt class="changed"><dfn>invalid @propagate value</dfn></dt>
+        <dd class="changed">An invalid value for <code>@propagate</code> has been found.</dd>
         <dt><dfn>invalid @reverse value</dfn></dt>
         <dd>An invalid value for an <code>@reverse</code> <a>member</a> has been detected,
           i.e., the value was not a <a class="changed">dictionary</a>.</dd>
+        <dt class="changed"><dfn>invalid @source value</dfn></dt>
+        <dd class="changed">An invalid value for <code>@source</code> has been found.</dd>
         <dt><dfn>invalid @version value</dfn></dt>
         <dd>The <code>@version</code> <a>member</a> was used in a <a>context</a>
           with an out of range value.</dd>
@@ -6083,6 +6111,8 @@ <h4>JsonLdErrorCode</h4>
           which is incompatible with the previous specified version.</dd>
         <dt><dfn>context overflow</dfn></dt>
         <dd>maximum number of <code>@context</code> URLs exceeded.</dd>
+        <dt class="changed"><dfn>invalid context member</dfn></dt>
+        <dd class="changed">A member of a context is invalid due to processing mode incompatibility.</dd>
         <dt class="changed"><dfn>invalid context nullification</dfn></dt>
         <dd class="changed">An attempt was made to nullify a context
           containing <a>protected</a> <a>term definitions</a>.</dd>
@@ -6240,6 +6270,9 @@ <h2>Changes since JSON-LD Community Group Final Report</h2>
     <li>By default, all contexts are propagated when traversing <a>node objects</a>, other than
       type-scoped contexts. This can be controlled using the <code>@propagate</code>
       <a>member</a> in a <a>local context</a>.</li>
+    <li>A context may contain a <code>@source</code> member used to reference a remote context
+      within a context, allowing <code>JSON-LD 1.1</code> features to be added to contexts originally
+      authored for <code>JSON-LD 1.0</code>.</li>
   </ul>
 </section>
 

tests/expand-manifest.jsonld

@@ -1064,6 +1064,22 @@
       "input": "expand/c028-in.jsonld",
       "expect": "expand/c028-out.jsonld",
       "option": {"specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc029",
+      "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"],
+      "name": "@propagate is invalid in 1.0",
+      "purpose": "@propagate is invalid in 1.0",
+      "input": "expand/c029-in.jsonld",
+      "expect": "invalid context member",
+      "option": {"specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc029",
+      "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"],
+      "name": "@propagate must be boolean valued",
+      "purpose": "@propagate must be boolean valued",
+      "input": "expand/c030-in.jsonld",
+      "expect": "invalid @propagate value",
+      "option": {"specVersion": "json-ld-1.1"}
     }, {
       "@id": "#te001",
       "@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],
@@ -2379,6 +2395,54 @@
       "option": {"specVersion": "json-ld-1.1"},
       "input": "expand/pr29-in.jsonld",
       "expect": "expand/pr29-out.jsonld"
+    }, {
+      "@id": "#tso01",
+      "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"],
+      "name": "@source is invalid in 1.0.",
+      "purpose": "@source is invalid in 1.0.",
+      "option": {"specVersion": "json-ld-1.1"},
+      "input": "expand/so01-in.jsonld",
+      "expect": "invalid context member"
+    }, {
+      "@id": "#tso02",
+      "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"],
+      "name": "@source must be a string",
+      "purpose": "@source must be a string.",
+      "option": {"specVersion": "json-ld-1.1"},
+      "input": "expand/so02-in.jsonld",
+      "expect": "invalid @source value"
+    }, {
+      "@id": "#tso03",
+      "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"],
+      "name": "@source overflow",
+      "purpose": "Processors must detect overflowing context loads through @source.",
+      "option": {"specVersion": "json-ld-1.1"},
+      "input": "expand/so03-in.jsonld",
+      "expect": "maximum number of @context URLs exceeded"
+    }, {
+      "@id": "#tso04",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Embedded context with @source",
+      "purpose": "An embedded context may load another context using @source.",
+      "option": {"specVersion": "json-ld-1.1"},
+      "input": "expand/so04-in.jsonld",
+      "expect": "expand/so04-out.jsonld"
+    }, {
+      "@id": "#tso05",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "@propagate: true on type-scoped context with @source",
+      "purpose": "type-scoped context with @propagate: true survive node-objects (with @source)",
+      "input": "expand/so05-in.jsonld",
+      "expect": "expand/so05-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tso06",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "@propagate: false on property-scoped context with @source",
+      "purpose": "property-scoped context with @propagate: false do not survive node-objects (with @source)",
+      "input": "expand/so06-in.jsonld",
+      "expect": "expand/so06-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1"}
     }, {
       "@id": "#ttn01",
       "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"],

tests/expand/c029-in.jsonld

@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "@propagate": true
+  }
+}

tests/expand/c030-in.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@propagate": "not boolean"
+  }
+}

tests/expand/so01-in.jsonld

@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "@source": "so01-in.jsonld"
+  }
+}

tests/expand/so02-in.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@source": {}
+  }
+}

tests/expand/so03-in.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@source": "so03-in.jsonld"
+  }
+}

tests/expand/so04-context.jsonld

@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "property": "http://example.org/property"
+  }
+}

tests/expand/so04-in.jsonld

@@ -0,0 +1,7 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@source": "so04-context.jsonld"
+  },
+  "property": "value"
+}

tests/expand/so04-out.jsonld

@@ -0,0 +1,3 @@
+[{
+  "http://example.org/property": [{"@value": "value"}]
+}]

tests/expand/so05-context.jsonld

@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "baz": {"@id": "http://example.org/baz", "@type": "@vocab"}
+  }
+}

tests/expand/so05-in.jsonld

@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example/",
+    "Foo": {
+      "@context": {
+        "@source": "so05-context.jsonld",
+        "@propagate": true
+      }
+    }
+  },
+  "@type": "Foo",
+  "bar": {"baz": "buzz"}
+}

tests/expand/so05-out.jsonld

@@ -0,0 +1,8 @@
+[
+  {
+    "@type": ["http://example/Foo"],
+    "http://example/bar": [{
+      "http://example.org/baz": [{"@id": "http://example/buzz"}]
+    }]
+  }
+]

tests/expand/so06-context.jsonld

@@ -0,0 +1,5 @@
+{
+  "@context": {
+    "baz": {"@id": "http://example.com/baz", "@type": "@id"}
+  }
+}

tests/expand/so06-in.jsonld

@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example/",
+    "bar": {
+      "@context": {
+        "@source": "so06-context.jsonld",
+        "@propagate": false
+      }
+    }
+  },
+  "bar": {"baz": {"baz": "buzz"}}
+}

tests/expand/so06-out.jsonld

@@ -0,0 +1,7 @@
+[{
+ "http://example/bar": [{
+   "http://example.com/baz": [{
+     "http://example/baz": [{"@value": "buzz"}]
+   }]
+ }]
+}]