Generalize insideTypeContainer to insideIndex.

Author: dlongley

lib/expand.js

@@ -50,7 +50,7 @@ module.exports = api;
  * @param element the element to expand.
  * @param options the expansion options.
  * @param insideList true if the element is a list, false if not.
- * @param insideTypeContainer true if the element is inside a type container,
+ * @param insideIndex true if the element is inside an index container,
  *          false if not.
  * @param expansionMap(info) a function that can be used to custom map
  *          unmappable values (or to throw an error when they are detected);
@@ -65,7 +65,7 @@ api.expand = ({
   element,
   options = {},
   insideList = false,
-  insideTypeContainer = false,
+  insideIndex = false,
   expansionMap = () => undefined
 }) => {
   // nothing to expand
@@ -115,7 +115,7 @@ api.expand = ({
         element: element[i],
         options,
         expansionMap,
-        insideTypeContainer
+        insideIndex
       });
       if(insideList && (_isArray(e) || _isList(e))) {
         // lists of lists are illegal
@@ -152,7 +152,7 @@ api.expand = ({
 
   // recursively expand object:
 
-  if(!insideTypeContainer) {
+  if(!insideIndex) {
     // revert type scoped terms
     activeCtx = activeCtx.revertTypeScopedTerms();
   }
@@ -613,7 +613,8 @@ function _expandObject({
     } else if(container.includes('@type') && _isObject(value)) {
       // handle type container (skip if value is not an object)
       expandedValue = _expandIndexMap({
-        activeCtx: termCtx,
+        // since container is `@type`, revert type scoped terms when expanding
+        activeCtx: termCtx.revertTypeScopedTerms(),
         options,
         activeProperty: key,
         value,
@@ -854,19 +855,19 @@ function _expandIndexMap(
     indexKey}) {
   const rval = [];
   const keys = Object.keys(value).sort();
+  const isTypeIndex = indexKey === '@type';
   for(let key of keys) {
     // if indexKey is @type, there may be a context defined for it
-    const ctx = _getContextValue(activeCtx, key, '@context');
-    if(!_isUndefined(ctx)) {
-      // TODO: check that `key` is for `@type` once property indexes
-      // are permitted -- and pass `isPropertyTermScopedContext: true` if
-      // key is a property not an `@type`
-      activeCtx = _processContext({
-        activeCtx,
-        localCtx: ctx,
-        isTypeScopedContext: true,
-        options
-      });
+    if(isTypeIndex) {
+      const ctx = _getContextValue(activeCtx, key, '@context');
+      if(!_isUndefined(ctx)) {
+        activeCtx = _processContext({
+          activeCtx,
+          localCtx: ctx,
+          isTypeScopedContext: true,
+          options
+        });
+      }
     }
 
     let val = value[key];
@@ -879,7 +880,7 @@ function _expandIndexMap(
     if(indexKey === '@id') {
       // expand document relative
       key = _expandIri(activeCtx, key, {base: true}, options);
-    } else if(indexKey === '@type') {
+    } else if(isTypeIndex) {
       key = expandedKey;
     }
 
@@ -889,7 +890,7 @@ function _expandIndexMap(
       element: val,
       options,
       insideList: false,
-      insideTypeContainer: indexKey === '@type',
+      insideIndex: true,
       expansionMap
     });
     for(let item of val) {