Use rval rather than activeCtx when processing @base and @vocab.

Resolve relative `@vocab` using expandIri with both vocab and base relative resolution.
A relative `@vocab` is only invalid in 1.0.

Author: gkellogg

CHANGELOG.md

@@ -10,6 +10,8 @@
 ### Changed
 - Default processing mode changed to json-ld-1.1. Allows a 1.1 context to be
   used after non-1.1 contexts.
+- `@vocab` can be relative in 1.0, resolved against either a previous `@vocab`,
+  `@base` or document base.
 
 ### Removed
 - **BREAKING**: Remove callback API support. This includes removing support

lib/context.js

@@ -194,7 +194,7 @@ api.process = async ({
 
     // if not set explicitly, set processingMode to "json-ld-1.1"
     rval.processingMode =
-      rval.processingMode || activeCtx.processingMode || 'json-ld-1.1';
+      rval.processingMode || activeCtx.processingMode;
 
     // handle @base
     if('@base' in ctx) {
@@ -205,7 +205,7 @@ api.process = async ({
       } else if(_isAbsoluteIri(base)) {
         base = parseUrl(base);
       } else if(_isRelativeIri(base)) {
-        base = parseUrl(prependBase(activeCtx['@base'].href, base));
+        base = parseUrl(prependBase(rval['@base'].href, base));
       } else {
         throw new JsonLdError(
           'Invalid JSON-LD syntax; the value of "@base" in a ' +
@@ -228,10 +228,14 @@ api.process = async ({
           '@context must be a string or null.',
           'jsonld.SyntaxError', {code: 'invalid vocab mapping', context: ctx});
       } else if(!_isAbsoluteIri(value)) {
-        throw new JsonLdError(
-          'Invalid JSON-LD syntax; the value of "@vocab" in a ' +
-          '@context must be an absolute IRI.',
-          'jsonld.SyntaxError', {code: 'invalid vocab mapping', context: ctx});
+        if(api.processingMode(rval, 1.0)) {
+          throw new JsonLdError(
+            'Invalid JSON-LD syntax; the value of "@vocab" in a ' +
+            '@context must be an absolute IRI.',
+            'jsonld.SyntaxError', {code: 'invalid vocab mapping', context: ctx});
+        }
+        rval['@vocab'] = _expandIri(rval, value, {vocab: true, base: true},
+          undefined, undefined, options);
       } else {
         rval['@vocab'] = value;
       }
@@ -1086,11 +1090,10 @@ api.getAllContexts = async (input, options) => {
  */
 api.processingMode = (activeCtx, version) => {
   if(version.toString() >= '1.1') {
-    return activeCtx.processingMode &&
+    return !activeCtx.processingMode ||
       activeCtx.processingMode >= 'json-ld-' + version.toString();
   } else {
-    return !activeCtx.processingMode ||
-      activeCtx.processingMode === 'json-ld-1.0';
+    return activeCtx.processingMode === 'json-ld-1.0';
   }
 };
 

tests/test-common.js

@@ -34,13 +34,9 @@ const TEST_TYPES = {
       idRegex: [
         // terms
         /compact-manifest.jsonld#tp001$/,
-        // rel iri
-        /compact-manifest.jsonld#t0095$/,
         // type set
         /compact-manifest.jsonld#t0104$/,
         /compact-manifest.jsonld#t0105$/,
-        // rel vocab
-        /compact-manifest.jsonld#t0107$/,
         // @type: @none
         /compact-manifest.jsonld#ttn01$/,
         /compact-manifest.jsonld#ttn02$/,
@@ -117,14 +113,8 @@ const TEST_TYPES = {
         /expand-manifest.jsonld#t0102$/,
         // multiple graphs
         /expand-manifest.jsonld#t0103$/,
-        // rel iri
-        /expand-manifest.jsonld#t0092$/,
         // iris
         /expand-manifest.jsonld#t0109$/,
-        // rel vocab
-        /expand-manifest.jsonld#t0110$/,
-        /expand-manifest.jsonld#t0111$/,
-        /expand-manifest.jsonld#t0112$/,
         // terms beginning with ':'
         /expand-manifest.jsonld#t0117$/,
         /expand-manifest.jsonld#t0118$/,
@@ -460,10 +450,8 @@ const TEST_TYPES = {
         /toRdf-manifest.jsonld#t0132$/,
         // @vocab mapping
         /toRdf-manifest.jsonld#te075$/,
-        // rel IRI
-        /toRdf-manifest.jsonld#te092$/,
         /toRdf-manifest.jsonld#te109$/,
-        /toRdf-manifest.jsonld#te110$/,
+        // Invalid Statement
         /toRdf-manifest.jsonld#te111$/,
         /toRdf-manifest.jsonld#te112$/,
         // index maps