fix: call expansion map from _expandIri instead of _expandObject

Author: tplooker

lib/context.js

@@ -1053,7 +1053,18 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
       return prependBase(prependBase(options.base, activeCtx['@base']), value);
     }
   } else if(relativeTo.base) {
-    return prependBase(options.base, value);
+    value = prependBase(options.base, value);
+  }
+
+  if(!_isAbsoluteIri(value) && options.expansionMap) {
+    // TODO: use `await` to support async
+    const expandedResult = options.expansionMap({
+      relativeIri: value,
+      activeCtx,
+    });
+    if(expandedResult !== undefined) {
+      value = expandedResult;
+    }
   }
 
   return value;

lib/expand.js

@@ -420,6 +420,9 @@ async function _expandObject({
   const nests = [];
   let unexpandedValue;
 
+  // Add expansion map to the processing options
+  options = {...options, expansionMap};
+
   // Figure out if this is the type for a JSON literal
   const isJsonType = element[typeKey] &&
     _expandIri(activeCtx,

tests/misc.js

@@ -534,7 +534,7 @@ describe('expansionMap', () => {
 
     let expansionMapCalled = false;
     const expansionMap = info => {
-      if(info.relativeIri && info.relativeIri.value === 'relativeiri') {
+      if(info.relativeIri === 'relativeiri') {
         expansionMapCalled = true;
       }
     };
@@ -557,7 +557,7 @@ describe('expansionMap', () => {
 
     let expansionMapCalled = false;
     const expansionMap = info => {
-      if(info.relativeIri && info.relativeIri.value === 'relativeiri') {
+      if(info.relativeIri === 'relativeiri') {
         expansionMapCalled = true;
       }
     };
@@ -579,7 +579,7 @@ describe('expansionMap', () => {
 
     let expansionMapCalled = false;
     const expansionMap = info => {
-      if(info.relativeIri && info.relativeIri.value === 'relativeiri') {
+      if(info.relativeIri === 'relativeiri') {
         expansionMapCalled = true;
       }
     };
@@ -601,7 +601,7 @@ describe('expansionMap', () => {
 
     let expansionMapCalled = false;
     const expansionMap = info => {
-      if(info.relativeIri && info.relativeIri.value === 'relativeiri') {
+      if(info.relativeIri === 'relativeiri') {
         expansionMapCalled = true;
       }
     };
@@ -624,16 +624,15 @@ describe('expansionMap', () => {
 
     let expansionMapCalledTimes = 0;
     const expansionMap = info => {
-      if(info.relativeIri &&
-        (info.relativeIri.value === 'relativeiri' ||
-         info.relativeIri.value === 'anotherRelativeiri')) {
+      if(info.relativeIri === 'relativeiri' ||
+         info.relativeIri === 'anotherRelativeiri') {
         expansionMapCalledTimes++;
       }
     };
 
     await jsonld.expand(docWithRelativeIriId, {expansionMap});
 
-    assert.equal(expansionMapCalledTimes, 2);
+    assert.equal(expansionMapCalledTimes, 3);
   });
 
   it('should be called on relative iri for \
@@ -649,7 +648,7 @@ describe('expansionMap', () => {
 
     let expansionMapCalled = false;
     const expansionMap = info => {
-      if(info.relativeIri && info.relativeIri.value === 'relativeiri') {
+      if(info.relativeIri === 'relativeiri') {
         expansionMapCalled = true;
       }
     };
@@ -672,7 +671,7 @@ describe('expansionMap', () => {
 
     let expansionMapCalled = false;
     const expansionMap = info => {
-      if(info.relativeIri && info.relativeIri.value === 'relativeiri') {
+      if(info.relativeIri === 'relativeiri') {
         expansionMapCalled = true;
       }
     };