Ensure proper context is used when expanding/compacting IRIs.

- If a property-term-scoped context is in use in conjunction with
  a type-scoped context, then IRIs should be expanded/compacted
  using the previous context.

Author: dlongley

lib/compact.js

@@ -587,6 +587,12 @@ api.compactIri = ({
     return iri;
   }
 
+  // if context is from a property term scoped context composed with a
+  // type-scoped context, then use the previous context instead
+  if(activeCtx.isPropertyTermScoped && activeCtx.previousContext) {
+    activeCtx = activeCtx.previousContext;
+  }
+
   const inverseCtx = activeCtx.getInverse();
 
   // if term is a keyword, it may be compacted to a simple alias

lib/context.js

@@ -74,6 +74,7 @@ api.process = ({
   if(isPropertyTermScopedContext && activeCtx.previousContext) {
     // TODO: consider optimizing to a shallow copy
     activeCtx = activeCtx.clone();
+    activeCtx.isPropertyTermScoped = true;
     activeCtx.previousContext = api.process({
       activeCtx: activeCtx.previousContext,
       localCtx: ctxs,
@@ -734,6 +735,12 @@ function _expandIri(activeCtx, value, relativeTo, localCtx, defined, options) {
     api.createTermDefinition(activeCtx, localCtx, value, defined, options);
   }
 
+  // if context is from a property term scoped context composed with a
+  // type-scoped context, then use previous context instead
+  if(activeCtx.isPropertyTermScoped && activeCtx.previousContext) {
+    activeCtx = activeCtx.previousContext;
+  }
+
   relativeTo = relativeTo || {};
   if(relativeTo.vocab) {
     const mapping = activeCtx.mappings.get(value);
@@ -989,6 +996,7 @@ api.getInitialContext = options => {
     child.getInverse = this.getInverse;
     child.protected = util.clone(this.protected);
     if(this.previousContext) {
+      child.isPropertyTermScoped = this.previousContext.isPropertyTermScoped;
       child.previousContext = this.previousContext.clone();
     }
     child.revertTypeScopedContext = this.revertTypeScopedContext;