Add text and tests for @propagate.

gkellogg · gkellogg · commit 5c543e630bfe · 2019-06-24T14:37:16.000-07:00
diff --git a/index.html b/index.html
@@ -1001,7 +1001,7 @@ <h2>Context Processing Algorithm</h2>
       keys and values have to be interpreted as well as the current <a>base IRI</a>,
       the <a>vocabulary mapping</a>, the <a>default language</a>,
       <span class="changed">and an optional <dfn>previous context</dfn>,
-        used when a type-scoped <a>context</a> is defined</span>.
+        used when a non-propagated <a>context</a> is defined</span>.
       Each <a>term definition</a> consists of:</p>
     <ul>
       <li>an <dfn>IRI mapping</dfn>,</li>
@@ -1012,7 +1012,7 @@ <h2>Context Processing Algorithm</h2>
       <li class="changed">an optional <dfn>prefix flag</dfn>,</li>
       <li class="changed">an optional <dfn>index mapping</dfn>,</li>
       <li class="changed">a <dfn>protected</dfn>, used to mark this as a protected term,</li>
-      <li>and an optional <dfn>container mapping</dfn></li>.
+      <li>and an optional <dfn>container mapping</dfn>.</li>
     </ul>
 
     <p>A <a>term definition</a> can not only be used to map a <a>term</a>
@@ -1067,6 +1067,11 @@ <h3>Overview</h3>
         they affect how the other <a>members</a> are processed. Please note that <code>@base</code> is
         ignored when processing remote contexts.</p>
 
+      <p class="changed">If <a>context</a> is not to be propagated,
+        a reference to the <var>previous context</var> is retained so that
+        it may be rolled back when a new <a>node object</a> is entered.
+        By default, all contexts are propagated, other than type-scoped contexts.</p>
+
       <p>Then, for every other <a>member</a> in <a>local context</a>, we update
         the <a>term definition</a> in <var>result</var>. Since
         <a>term definitions</a> in a <a>local context</a>
@@ -1094,19 +1099,23 @@ <h3>Algorithm</h3>
         <span class="changed">, <var>from property</var>, defaulting to <code>false</code>,
           which is used to allow changes to protected terms,
           and <var>from type</var>, defaulting to <code>false</code>,
-          which is used to mark <a>term definitions</a> associated with a type-scoped <a>context</a>.</span>.
+          which is used to set the default for <var>propagated</var>
+          to mark <a>term definitions</a> associated with non-propagated <a>contexts</a>.</span>.
       </p>
 
       <ol>
         <li>Initialize <var>result</var> to the result of cloning
           <var>active context</var>.</li>
+        <li class="changed">If <var>local context</var> is an object containing the member <code>@propagate</code>,
+          its value MUST be <a>boolean</a> <code>true</code> or <code>false</code>,
+          set <var>propagate</var> to that value.</li>
+        <li class="changed">Otherwise, set <var>propagate</var> to <var>from type</var>.</li>
+        <li class="changed">If <var>propagate</var> is <code>false</code>, and <var>result</var>
+          does not have a <a>previous context</a>, set <a>previous context</a>
+          in <var>result</var> to <var>active context</var>.</li>
         <li>If <var>local context</var> is not an <a>array</a>,
           set it to an <a>array</a> containing only
           <var>local context</var>.</li>
-        <li class="changed">
-          If <var>from type</var> is <code>true</code>, and <var>result</var>
-          does not have a <a>previous context</a>, set <a>previous context</a>
-          in <var>result</var> to <var>active context</var>.</li>
         <li>
           For each item <var>context</var> in <var>local context</var>:
           <ol>
@@ -1240,12 +1249,24 @@ <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>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>
             <li>For each <var>key</var>-<var>value</var> pair in <var>context</var> where
-              <var>key</var> is not <code>@base</code>, <code>@vocab</code>,
-              <code>@language</code>, <code>@protected</code>, or <code>@version</code>, invoke the
+              <var>key</var> is not
+              <code>@base</code>,
+              <code>@vocab</code>,
+              <code>@language</code>,
+              <code class="changed">@propagate</code>,
+              <code class="changed">@protected</code>, or
+              <code>@version</code>,
+              invoke the
               <a href="#create-term-definition">Create Term Definition algorithm</a>,
               passing <var>result</var> for <var>active context</var>,
               <var>context</var> for <var>local context</var>, <var>key</var>,
@@ -1789,7 +1810,7 @@ <h3>Algorithm</h3>
           the <a data-link-for="JsonLdOptions">ordered</a> flag, used to order
           <a>dictionary member</a> keys lexicographically, where noted,
           and the <var>from map</var> flag, used to control reverting
-          previous <a>term definitions</a> in the <a>active context</a> associated with a type-scoped <a>context</a>.</span>
+          previous <a>term definitions</a> in the <a>active context</a> associated with non-propagated <a>contexts</a>.</span>
         To begin, the <var>active property</var> is set to <code>null</code>,
         and <var>element</var> is set to the <a>JSON-LD input</a>.
         <span class="changed">If not passed, the both flags are set to <code>false</code></span>.</p>
@@ -1864,7 +1885,7 @@ <h3>Algorithm</h3>
         </li>
         <li>Otherwise <var>element</var> is a <a class="changed">dictionary</a>.</li>
         <li class="changed">If <var>active context</var> has a <a>previous context</a>,
-          the <var>active context</var> is type-scoped.
+          the <var>active context</var> is not propagated.
           If <var>from map</var> is undefined or <code>false</code>,
           and <var>element</var> does not contain a <a>member</a> expanding to <code>@value</code>,
           and <var>element</var> does not consist of a single member expanding to <code>@id</code>,
@@ -2568,7 +2589,7 @@ <h3>Algorithm</h3>
         </li>
         <li>Otherwise <var>element</var> is a <a class="changed">dictionary</a>.</li>
         <li class="changed">If <var>active context</var> has a <a>previous context</a>,
-          the <var>active context</var> is type-scoped.
+          the <var>active context</var> is not propagated.
           If <var>element</var> does not contain an <code>@value</code> <a>member</a>,
           and <var>element</var> does not consist of a single <code>@id</code> member,
           set <var>active context</var> to <a>previous context</a> from <var>active context</var>,
@@ -6216,6 +6237,9 @@ <h2>Changes since JSON-LD Community Group Final Report</h2>
     <li>The <a href="#iri-compaction">IRI compaction algorithm</a> may generate an error if the result is an
       <a>absolute IRI</a> which could be confused with a compact IRI in the
       <a>active context</a>.</li>
+    <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>@preserve</code>
+      <a>member</a> in a <a>local context</a>.</li>
   </ul>
 </section>
 
diff --git a/tests/compact-manifest.jsonld b/tests/compact-manifest.jsonld
@@ -1139,6 +1139,24 @@
       "context": "compact/c025-context.jsonld",
       "expect": "compact/c025-out.jsonld",
       "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc026",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "@propagate: true on type-scoped context",
+      "purpose": "type-scoped context with @propagate: true survive node-objects",
+      "input": "compact/c026-in.jsonld",
+      "context": "compact/c026-context.jsonld",
+      "expect": "compact/c026-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc027",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "@propagate: false on property-scoped context",
+      "purpose": "property-scoped context with @propagate: false do not survive node-objects",
+      "input": "compact/c027-in.jsonld",
+      "context": "compact/c027-context.jsonld",
+      "expect": "compact/c027-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1"}
     }, {
       "@id": "#te001",
       "@type": [ "jld:NegativeEvaluationTest", "jld:CompactTest" ],
diff --git a/tests/compact/c026-context.jsonld b/tests/compact/c026-context.jsonld
@@ -0,0 +1,12 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example/",
+    "Foo": {
+      "@context": {
+        "@propagate": true,
+        "baz": {"@type": "@vocab"}
+      }
+    }
+  }
+}
diff --git a/tests/compact/c026-in.jsonld b/tests/compact/c026-in.jsonld
@@ -0,0 +1,8 @@
+[
+  {
+    "@type": ["http://example/Foo"],
+    "http://example/bar": [{
+      "http://example/baz": [{"@id": "http://example/buzz"}]
+    }]
+  }
+]
diff --git a/tests/compact/c026-out.jsonld b/tests/compact/c026-out.jsonld
@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example/",
+    "Foo": {
+      "@context": {
+        "@propagate": true,
+        "baz": {"@type": "@vocab"}
+      }
+    }
+  },
+  "@type": "Foo",
+  "bar": {"baz": "buzz"}
+}
diff --git a/tests/compact/c027-context.jsonld b/tests/compact/c027-context.jsonld
@@ -0,0 +1,12 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example/",
+    "bar": {
+      "@context": {
+        "@propagate": false,
+        "baz": {"@type": "@id"}
+      }
+    }
+  }
+}
diff --git a/tests/compact/c027-in.jsonld b/tests/compact/c027-in.jsonld
@@ -0,0 +1,7 @@
+[{
+ "http://example/bar": [{
+   "http://example/baz": [{
+     "http://example/baz": [{"@value": "buzz"}]
+   }]
+ }]
+}]
diff --git a/tests/compact/c027-out.jsonld b/tests/compact/c027-out.jsonld
@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example/",
+    "bar": {
+      "@context": {
+        "@propagate": false,
+        "baz": {"@type": "@id"}
+      }
+    }
+  },
+  "bar": {"baz": {"baz": "buzz"}}
+}
diff --git a/tests/expand-manifest.jsonld b/tests/expand-manifest.jsonld
@@ -1040,6 +1040,30 @@
       "input": "expand/c025-in.jsonld",
       "expect": "expand/c025-out.jsonld",
       "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc026",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "@propagate: true on type-scoped context",
+      "purpose": "type-scoped context with @propagate: true survive node-objects",
+      "input": "expand/c026-in.jsonld",
+      "expect": "expand/c026-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc027",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "@propagate: false on property-scoped context",
+      "purpose": "property-scoped context with @propagate: false do not survive node-objects",
+      "input": "expand/c027-in.jsonld",
+      "expect": "expand/c027-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc028",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "@propagate: false on embedded context",
+      "purpose": "embedded context with @propagate: false do not survive node-objects",
+      "input": "expand/c028-in.jsonld",
+      "expect": "expand/c028-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1"}
     }, {
       "@id": "#te001",
       "@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],
diff --git a/tests/expand/c026-in.jsonld b/tests/expand/c026-in.jsonld
@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example/",
+    "Foo": {
+      "@context": {
+        "@propagate": true,
+        "baz": {"@type": "@vocab"}
+      }
+    }
+  },
+  "@type": "Foo",
+  "bar": {"baz": "buzz"}
+}
diff --git a/tests/expand/c026-out.jsonld b/tests/expand/c026-out.jsonld
@@ -0,0 +1,8 @@
+[
+  {
+    "@type": ["http://example/Foo"],
+    "http://example/bar": [{
+      "http://example/baz": [{"@id": "http://example/buzz"}]
+    }]
+  }
+]
diff --git a/tests/expand/c027-in.jsonld b/tests/expand/c027-in.jsonld
@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example/",
+    "bar": {
+      "@context": {
+        "@propagate": false,
+        "baz": {"@type": "@id"}
+      }
+    }
+  },
+  "bar": {"baz": {"baz": "buzz"}}
+}
diff --git a/tests/expand/c027-out.jsonld b/tests/expand/c027-out.jsonld
@@ -0,0 +1,7 @@
+[{
+ "http://example/bar": [{
+   "http://example/baz": [{
+     "http://example/baz": [{"@value": "buzz"}]
+   }]
+ }]
+}]
diff --git a/tests/expand/c028-in.jsonld b/tests/expand/c028-in.jsonld
@@ -0,0 +1,15 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example/"
+  },
+  "bar": {
+    "@context": {
+      "@propagate": false,
+      "baz": {"@type": "@vocab"}
+    },
+    "baz": {
+      "baz": "buzz"
+    }
+  }
+}
diff --git a/tests/expand/c028-out.jsonld b/tests/expand/c028-out.jsonld
@@ -0,0 +1,7 @@
+[{
+ "http://example/bar": [{
+   "http://example/baz": [{
+     "http://example/baz": [{"@value": "buzz"}]
+   }]
+ }]
+}]
