Relax to allow @version to be set in any context; it only conflicts if processingMode is set to something else in the API. Also changes term selection for compact IRIs in 1.0 mode as a necessary byproduct of this approach.

Fixes #581

Author: gkellogg

spec/latest/json-ld-api/index.html

@@ -958,8 +958,6 @@ <h3>Algorithm</h3>
                   error has been detected and processing is aborted.</li>
               </ol>
             </li>
-            <li class="changed">Set <a>processing mode</a>,
-              to <code>json-ld-1.0</code>, if not already set.</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>
@@ -1044,10 +1042,12 @@ <h3>Algorithm</h3>
           key <var>term</var> to <code>true</code>, and return.</li>
         <li>Otherwise, if <var>value</var> is a <a>string</a>, convert it
           to a <a class="changed">dictionary</a> consisting of a single member whose
-          key is <code>@id</code> and whose value is <var>value</var>.</li>
+          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
           <a data-link-for="JsonLdErrorCode">invalid term definition</a>
-          error has been detected and processing is aborted.</li>
+          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 key <code>@type</code>:
           <ol>
@@ -1120,14 +1120,10 @@ <h3>Algorithm</h3>
               <a data-link-for="JsonLdErrorCode">invalid keyword alias</a>
               error has been detected and processing is aborted.</li>
             <li class="changed">If <var>term</var> does not contain a colon (<code>:</code>),
-              and if <a>processing mode</a> is <code>json-ld-1.0</code>, and the,
+              <span class="changed"><var>simple term</var> is <code>true</code></span>, and the,
               <a>IRI mapping</a> of <var>definition</var> ends with a URI
               <a data-cite="RFC3986#section-2.2">gen-delim</a> character,
-              set the <a>prefix flag</a> in <var>definition</var> to <code>true</code>.
-              If <a>processing mode</a> is not <code>json-ld-1.0</code>, and the <a>IRI mapping</a> ends with a URI
-              <a data-cite="RFC3986#section-2.2">gen-delim</a> character,
-              set the <a>prefix flag</a> in <var>definition</var> to <code>true</code>, only if
-              <var>value</var> was originally a <a>string</a>.</li>
+              set the <a>prefix flag</a> in <var>definition</var> to <code>true</code>.</li>
           </ol>
         </li>
         <li>

spec/latest/json-ld/index.html

@@ -972,7 +972,7 @@ <h2>JSON-LD 1.1 Processing Mode</h2>
   </pre>
 
   <p>The first <code>context</code> encountered when processing a
-    document determines the <code>processing mode</code>,
+    document which contains <code>@version</code> determines the <code>processing mode</code>,
     unless it is defined explicitly through an API option.</p>
 
   <p class="note">Setting the <a>processing mode</a> explicitly
@@ -1191,10 +1191,18 @@ <h2>Compact IRIs</h2>
   -->
   </pre>
 
-  <p class="changed">In JSON-LD 1.0, terms will be used as <a>compact IRI</a> prefixes when
-  compacting only if they map to a value that ends with a URI <a
-  data-cite="RFC3986#section-2.2">gen-delim</a> character (e.g, <code>/</code>,
-  <code>#</code> and others, see [[!RFC3986]]).</p>
+  <p class="changed">In JSON-LD 1.0, terms may be chosen as <a>compact IRI</a> prefixes when
+    compacting only if a <a>simple term definition</a> is used where the value ends with a
+    URI <a data-cite="RFC3986#section-2.2">gen-delim</a> character (e.g, <code>/</code>,
+    <code>#</code> and others, see [[!RFC3986]]).
+    <span class="note">The previous specification allows any term to be chosen as
+      a compact IRI prefix, which lead to a poor experience.</span></p>
+
+  <p class="changed">In JSON-LD 1.1, terms may be chosen as <a>compact IRI</a> prefixes
+    when compacting only if
+    a <a>simple term definition</a> is used where the value ends with a URI <a data-cite="RFC3986#section-2.2">gen-delim</a> character,
+    or if their <a>expanded term definition</a> contains
+    a <code>@prefix</code> member with the value <a>true</a>.</p>
 
   <p class="note">This represents a small change to the 1.0 algorithm to prevent IRIs
     that are not really intended to be used as prefixes from being used for creating
@@ -5070,6 +5078,7 @@ <h3>Serializing/Deserializing RDF</h3>
 <section class="appendix informative">
   <h2>Changes since 1.0 Recommendation of 16 January 2014</h2>
   <ul>
+    <li>A context may contain a <code>@version</code> member which is used to set the <a>processing mode</a>.</li>
     <li>An <a>expanded term definition</a> can now have an
       <code>@context</code> property, which defines a <a>context</a> used for values of
       a <a>property</a> identified with such a <a>term</a>.</li>
@@ -5093,7 +5102,7 @@ <h2>Changes since 1.0 Recommendation of 16 January 2014</h2>
       keyword along with <code>@set</code> (other than <code>@list</code>).
       This allows a way to ensure that such property values will always
       be expressed in <a>array</a> form.</li>
-    <li>In JSON-LD 1.1, terms will be used as <a>compact IRI</a> prefixes
+    <li>In JSON-LD 1.1, terms will be chosen as <a>compact IRI</a> prefixes
       when compacting only if
       a <a>simple term definition</a> is used where the value ends with a URI <a data-cite="RFC3986#section-2.2">gen-delim</a> character,
       or if their <a>expanded term definition</a> contains

test-suite/tests/cmopact-0096-context.jsonld

@@ -1241,8 +1241,8 @@
     }, {
       "@id": "#tp001",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
-      "name": "Compact IRI may use an expanded term definition in 1.0",
-      "purpose": "Terms with an expanded term definition may be used for creating compact IRIs",
+      "name": "Compact IRI will not use an expanded term definition in 1.0",
+      "purpose": "Terms with an expanded term definition are not used for creating compact IRIs",
       "option": {"processingMode": "json-ld-1.0", "specVersion": "json-ld-1.1"},
       "input": "compact-p001-in.jsonld",
       "context": "compact-p001-context.jsonld",

test-suite/tests/compact-manifest.jsonld

@@ -2,7 +2,7 @@
   "@context": {
     "ex": {"@id": "http://example.org/"}
   },
-  "@id": "ex:id1",
-  "@type": ["ex:Type1", "ex:Type2"],
-  "ex:term": {"@id": "ex:id2"}
+  "@id": "http://example.org/id1",
+  "@type": ["http://example.org/Type1", "http://example.org/Type2"],
+  "http://example.org/term": {"@id": "http://example.org/id2"}
 }

test-suite/tests/compact-p001-out.jsonld

@@ -1074,6 +1074,14 @@
       "input": "expand-n007-in.jsonld",
       "expect": "expand-n007-out.jsonld",
       "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tp001",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "@version may be specified after first context",
+      "purpose": "If processing mode is not set through API, it is set by the first context containing @version.",
+      "option": {"specVersion": "json-ld-1.1"},
+      "input": "expand-p001-in.jsonld",
+      "expect": "expand-p001-out.jsonld"
    }, {
       "@id": "#tl001",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],

test-suite/tests/expand-manifest.jsonld

@@ -0,0 +1,7 @@
+{
+  "@context": [
+    {"@vocab": "http://example/"},
+    {"@version": 1.1, "a": {"@type": "@id"}}
+  ],
+  "a": "http://example.org/foo"
+}

test-suite/tests/expand-p001-in.jsonld

@@ -0,0 +1,3 @@
+[{
+ "http://example/a": [{"@id": "http://example.org/foo"}]
+}]