fix: add support for when @vocab results in relative iri

Author: tplooker

lib/context.js

@@ -1043,11 +1043,11 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
 
   // prepend vocab
   if(relativeTo.vocab && '@vocab' in activeCtx) {
-    return activeCtx['@vocab'] + value;
+    value = activeCtx['@vocab'] + value;
   }
 
   // prepend base
-  if(relativeTo.base && '@base' in activeCtx) {
+  else if(relativeTo.base && '@base' in activeCtx) {
     if(activeCtx['@base']) {
       // The null case preserves value as potentially relative
       value = prependBase(prependBase(options.base, activeCtx['@base']), value);
@@ -1061,6 +1061,7 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
     const expandedResult = options.expansionMap({
       relativeIri: value,
       activeCtx,
+      options
     });
     if(expandedResult !== undefined) {
       value = expandedResult;

lib/expand.js

@@ -75,6 +75,10 @@ api.expand = async ({
   typeScopedContext = null,
   expansionMap = () => undefined
 }) => {
+
+  // Add expansion map to the processing options
+  options = { ...options, expansionMap };
+
   // nothing to expand
   if(element === null || element === undefined) {
     return null;

tests/misc.js

@@ -686,12 +686,52 @@ describe('expansionMap', () => {
       '@context': {
         "@base": "./",
       },
-      '@id': "absoluteiri",
+      '@id': "relativeiri",
+    };
+
+    let expansionMapCalled = false;
+    const expansionMap = info => {
+      if(info.relativeIri === '/relativeiri') {
+        expansionMapCalled = true;
+      }
+    };
+
+    await jsonld.expand(docWithRelativeIriId, {expansionMap});
+
+    assert.equal(expansionMapCalled, true);
+  });
+
+  it("should be called on relative iri when @base value is './'", async () => {
+    const docWithRelativeIriId = {
+      '@context': {
+        "@base": "./",
+      },
+      '@id': "relativeiri",
+    };
+
+    let expansionMapCalled = false;
+    const expansionMap = info => {
+      if(info.relativeIri === '/relativeiri') {
+        expansionMapCalled = true;
+      }
+    };
+
+    await jsonld.expand(docWithRelativeIriId, {expansionMap});
+
+    assert.equal(expansionMapCalled, true);
+  });
+
+  it("should be called on relative iri when @vocab value is './'", async () => {
+    const docWithRelativeIriId = {
+      '@context': {
+        "@vocab": "./",
+      },
+      '@type': "relativeiri",
     };
 
     let expansionMapCalled = false;
     const expansionMap = info => {
-      if(info.relativeIri === '/absoluteiri') {
+      if(info.relativeIri === '/relativeiri') {
         expansionMapCalled = true;
       }
     };