Update based on F2F discussion to simply lock terms, and not allow unlocking other than to clear the active context.

Author: gkellogg

index.html

@@ -926,7 +926,7 @@ <h2>Context Processing Algorithm</h2>
       <span class="changed">an optional <a>context</a></span>,
       <span class="changed">an optional <dfn>nest value</dfn>,</span>
       <span class="changed">an optional <dfn>prefix flag</dfn>,</span>
-      <span class="changed">an optional <dfn>context id</dfn>, used to flag this as a sealed term,</span>
+      <span class="changed">a <dfn>sealed</dfn>, used to mark this as a sealed term,</span>
       and an optional <dfn>container mapping</dfn>.
       A <a>term definition</a> can not only be used to map a <a>term</a>
       to an IRI, but also to map a <a>term</a> to a <a>keyword</a>,
@@ -994,35 +994,24 @@ <h3>Algorithm</h3>
 
       <p>This algorithm specifies how a new <a>active context</a> is updated
         with a <a>local context</a>. The algorithm takes two required
-        <span class="changed">and two optional</span>
+        <span class="changed">and one optional</span>
         input variables.
         The required inputs inputs are an <var>active context</var> and a <var>local context</var>.
-        <span class="changed">The optional inputs are <var>from term</var></span>, which defaults to <code>null</code>,
-        and an <a>array</a> <var>remote contexts</var> which is used to detect cyclical context inclusions,
-        which defaults to a new empty <a>array</a>.</p>
+        The optional input is an <a>array</a> <var>remote contexts</var>,
+        defaulting to a new empty <a>array</a>, which is used to detect cyclical context inclusions.</p>
 
       <ol>
         <li>Initialize <var>result</var> to the result of cloning
           <var>active context</var>.</li>
-        <li>Initialize <var>current seal</var> to the value of <a>context id</a>
-          from the term definition for <var>from term</var>,
-          if such a term definition exists.</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>
           For each item <var>context</var> in <var>local context</var>:
           <ol>
-            <li class="changed">Initialize <var>context id</var> to a unique identifier.
-              <span class="note"><var>context id</var> is used to identify sealed terms
-                created from the same context.</span></li>
-            <li>If <var>context</var> is <code>null</code>
-              <span class="changed">and <var>current seal</var> is <code>null</code></span>,
-              set <var>result</var> to a
+            <li>If <var>context</var> is <code>null</code>, set <var>result</var> to a
               newly-initialized <var>active context</var> and continue with the
               next <var>context</var>.
-              <span class="changed">If <var>current seal</var> is not <code>null</code>,
-                processors SHOULD issue a warning that an attempt was made to clear a sealed context.</span>
               <span class="note">In JSON-LD 1.0, the <a>base IRI</a> was given
                 a default value here; this is now described conditionally
                 in <a href="#the-application-programming-interface" class="sectionRef"></a>.</span></li>
@@ -1146,9 +1135,8 @@ <h3>Algorithm</h3>
               passing <var>result</var> for <var>active context</var>,
               <var>context</var> for <var>local context</var>, <var>key</var>,
               <var>defined</var>,
-              <span class="changed">the value of the <code>@sealed</code>
-                member from <var>context</var>, if any, for <var>sealed</var></span>,
-                <var>current seal</var>, and <var>context id</var>.</li>
+              <span class="changed">and the value of the <code>@sealed</code>
+                member from <var>context</var>, if any, for <var>sealed</var></span>.</li>
           </ol>
         </li>
         <li>Return <var>result</var>.</li>
@@ -1193,14 +1181,12 @@ <h3>Overview</h3>
     <section class="algorithm">
       <h3>Algorithm</h3>
 
-      <p>The algorithm has four required <span class="changed">and three optional</span> inputs.
+      <p>The algorithm has four required <span class="changed">and one optional</span> inputs.
         The required inputs are
         an <var>active context</var>, a <var>local context</var>,
         a <var>term</var>, and a map <var>defined</var>.
-        <span class="changed">The optional inputs are
-          <var>sealed</var> which defaults to <code>false</code>,
-          <var>current seal</var>, which defaults to <code>null</code>,
-          and <var>context id</var>, which defaults to <code>null</code>.</span></p>
+        <span class="changed">The optional input is
+          <var>sealed</var> which defaults to <code>false</code>.</span></p>
       <ol>
         <li>If <var>defined</var> contains the <a>member</a> <var>term</var> and the associated
           value is <code>true</code> (indicating that the
@@ -1225,8 +1211,7 @@ <h3>Algorithm</h3>
           <a data-link-for="JsonLdErrorCode">keyword redefinition</a>
           error has been detected and processing is aborted.</li>
         <li class="changed">If the <var>active context</var> has an existing
-          <a>term definition</a> for <var>term</var> with a non-null <a>context id</a>,
-          and <var>current seal</var> is not <code>null</code>, processing is aborted;
+          <a>term definition</a> for <var>term</var> which is sealed, processing is aborted;
           processors SHOULD issue a warning that an attempt was made to redefine a sealed term.</li>
         <li>Otherwise, remove any existing <a>term definition</a> for <var>term</var> in
           <var>active context</var>.</li>
@@ -1248,8 +1233,7 @@ <h3>Algorithm</h3>
         <li class="changed">If the <code>@sealed</code> member in <var>value</var>
           is <code>true</code>, or there is no <code>@sealed</code> member in <var>value</var>
           and the <var>sealed</var> parameter is <code>true</code>,
-          set the <a>context id</a> in <var>definition</var>
-          to the value of the <var>context id</var> parameter.</li>
+          set the <a>sealed</a> in <var>definition</var> to true.</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
@@ -1710,9 +1694,8 @@ <h3>Algorithm</h3>
         <li>If <var>element</var> contains the <a>member</a> <code>@context</code>, set
           <var>active context</var> to the result of the
           <a href="#context-processing-algorithm">Context Processing algorithm</a>,
-          passing <var>active context</var>, the value of the
-          <code>@context</code> <a>member</a> as <var>local context</var>,
-          <span class="changed">and <var>active property</var> as <var>from term</var></span>.</li>
+          passing <var>active context</var> and the value of the
+          <code>@context</code> <a>member</a> as <var>local context</var>.</li>
         <li class="changed">For each <var>key</var>/<var>value</var> pair in <var>element</var>
           where <var>key</var> expands to <code>@type</code> using the
           <a href="#iri-expansion">IRI Expansion algorithm</a>,
@@ -1724,9 +1707,8 @@ <h3>Algorithm</h3>
               has a <a>local context</a>, set <var>active context</var> to the result
               to the result of the
               <a href="#context-processing-algorithm">Context Processing algorithm</a>,
-              passing <var>active context</var>, the value of the
-              <var>term</var>'s <a>local context</a> as <var>local context</var>,
-              <span class="changed">and <var>active property</var> as <var>from term</var></span>.</li>
+              passing <var>active context</var> and the value of the
+              <var>term</var>'s <a>local context</a> as <var>local context</var>.</li>
           </ol>
         </li>
         <li>Initialize an empty <a class="changed">dictionary</a>, <var>result</var>.</li>
@@ -1914,10 +1896,8 @@ <h3>Algorithm</h3>
               has a <a>local context</a>, set <var>term context</var> to the result of the
               <a href="#context-processing-algorithm">Context Processing algorithm</a>,
               passing <var>active context</var> and the value of the
-              <var>key</var>'s <a>local context</a> as <var>local context</var>.
-              <span class="changed note">The <var>from term</var> is not passed,
-                as scoped contexts may redefine sealed terms.</span>
-              Otherwise, set <var>term context</var> to <var>active context</var>.</li>
+              <var>key</var>'s <a>local context</a> as <var>local context</var>. Otherwise,
+              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
@@ -1971,11 +1951,9 @@ <h3>Algorithm</h3>
                       <var>term context</var> has a <a>local context</a>, set
                       <var>map context</var> to the result of the <a
                       href="#context-processing-algorithm">Context Processing
-                      algorithm</a>, passing <var>term context</var> as <var>active context</var>, the
+                      algorithm</a>, passing <var>term context</var> as <var>active context</var> and the
                       value of the <var>index</var>'s <a>local context</a> as
-                      <var>local context</var>,
-                      <span class="changed">and <var>active property</var> as <var>from term</var></span>.
-                      Otherwise, set <var>map context</var>
+                      <var>local context</var>. Otherwise, set <var>map context</var>
                       to <var>term context</var>.</li>
                     <li>Set <var>expanded index</var> to the result of using the
                       <a href="#iri-expansion">IRI Expansion algorithm</a>,
@@ -2349,9 +2327,8 @@ <h3>Algorithm</h3>
           <ol>
             <li>Set <var>active context</var> to the result of the
               <a href="#context-processing-algorithm">Context Processing algorithm</a>,
-              passing <var>active context</var>, the value of the
-              <var>active property</var>'s <a>local context</a> as <var>local context</var>,
-              <span class="changed">and <var>active property</var> as <var>from term</var></span>.</li>
+              passing <var>active context</var> and the value of the
+              <var>active property</var>'s <a>local context</a> as <var>local context</var>.</li>
             <li>Set <var>inverse context</var> using the
               <a href="#inverse-context-creation">Inverse Context Creation algorithm</a>
               using <var>active context</var>.</li>
@@ -2420,9 +2397,8 @@ <h3>Algorithm</h3>
               <ol>
                 <li>Set <var>active context</var> to the result of the
                   <a href="#context-processing-algorithm">Context Processing algorithm</a>,
-                  passing <var>active context</var>, the value of <var>term</var>'s
-                  <a>local context</a> as <var>local context</var>
-                  <span class="changed">and <var>active property</var> as <var>from term</var></span>.</li>
+                  passing <var>active context</var> and the value of <var>term</var>'s
+                  <a>local context</a> as <var>local context</var>.</li>
                 <li>Set <var>inverse context</var> using the
                   <a href="#inverse-context-creation">Inverse Context Creation algorithm</a>
                   using <var>active context</var>.</li>

tests/expand-manifest.jsonld

@@ -1819,27 +1819,19 @@
    }, {
       "@id": "#tse05",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
-      "name": "Do not clear active context with sealed terms from a sealed term",
-      "purpose": "The Active context may not be set to null if there are sealed terms when expanding a sealed term from the same context.",
+      "name": "Clear active context with sealed terms from an embedded context",
+      "purpose": "The Active context be set to null from an embedded context.",
       "option": {"specVersion": "json-ld-1.1"},
       "input": "expand/se05-in.jsonld",
       "expect": "expand/se05-out.jsonld"
    }, {
       "@id": "#tse06",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
-      "name": "Clear active context of sealed terms from an unsealed term.",
-      "purpose": "The Active context may be set to null from a scoped context of an unsealed term.",
+      "name": "Clear active context of sealed terms from a term.",
+      "purpose": "The Active context may be set to null from a scoped context of a term.",
       "option": {"specVersion": "json-ld-1.1"},
       "input": "expand/se06-in.jsonld",
       "expect": "expand/se06-out.jsonld"
-   }, {
-      "@id": "#tse07",
-      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
-      "name": "Clear sealed context from scoped term that is sealed.",
-      "purpose": "The Active context may be set to null from a scoped context of a sealed term.",
-      "option": {"specVersion": "json-ld-1.1"},
-      "input": "expand/se07-in.jsonld",
-      "expect": "expand/se07-out.jsonld"
    }, {
       "@id": "#tse08",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
@@ -1851,8 +1843,8 @@
    }, {
       "@id": "#tse09",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
-      "name": "Redefine term in other sealed context.",
-      "purpose": "A sealed term can redefine a sealed term in another context.",
+      "name": "Attempt to redefine term in other sealed context.",
+      "purpose": "A sealed term cannot redefine another sealed term.",
       "option": {"specVersion": "json-ld-1.1"},
       "input": "expand/se09-in.jsonld",
       "expect": "expand/se09-out.jsonld"

tests/expand/se05-in.jsonld

@@ -6,7 +6,7 @@
     "sealed": {"@language": null}
   },
   "sealed": {
-    "@context": null,
-    "sealed": "this should have the property http://example.com/sealed"
+    "@context": [null, {"@vocab": "http://something-else/"}],
+    "sealed": "this should have the property http://something-else/sealed"
   }
 }

tests/expand/se05-out.jsonld

@@ -1,7 +1,7 @@
 [
   {
     "http://example.com/sealed": [{
-      "http://example.com/sealed": [{"@value": "this should have the property http://example.com/sealed"}]
+      "http://something-else/sealed": [{"@value": "this should have the property http://something-else/sealed"}]
     }]
   }
 ]

tests/expand/se07-in.jsonld

@@ -1,15 +1,12 @@
 {
-  "@context": [{
-    "@version": 1.1,
-    "@sealed": true,
-    "sealed1": "http://example.org/sealed1"
-  }, {
+  "@context": {
     "@version": 1.1,
     "@sealed": true,
+    "sealed1": "http://example.org/sealed1",
     "sealed2": "http://example.org/sealed2"
-  }],
+  },
   "sealed2": {
     "@context": {"sealed1": "http://example.com/something-else"},
-    "sealed1": "this should have the property http://example.com/something-else"
+    "sealed1": "this should have the property http://example.org/sealed1"
   }
 }

tests/expand/se07-out.jsonld

@@ -1,7 +1,7 @@
 [{
   "http://example.org/sealed2": [{
     "http://example.org/sealed1": [{
-      "@value": "this should have the property http://example.com/something-else"
+      "@value": "this should have the property http://example.org/sealed1"
     }]
   }]
 }]