Support @id and @type map expansion.

Author: gkellogg

lib/context.js

@@ -389,7 +389,7 @@ api.createTermDefinition = (activeCtx, localCtx, term, defined) => {
     // JSON-LD 1.1 support
     if(activeCtx.processingMode && activeCtx.processingMode.indexOf('json-ld-1.1') === 0) {
       // TODO: @id and @type
-      validContainers.push('@graph', '@id');
+      validContainers.push('@graph', '@id', '@type');
 
       // check container length
       if(container.includes('@list')) {

lib/expand.js

@@ -344,6 +344,17 @@ api.expand = ({
         asGraph,
         indexKey: '@id'
       });
+    } else if(container.includes('@type') && _isObject(value)) {
+      // handle type container (skip if value is not an object)
+      expandedValue = _expandIndexMap({
+        activeCtx,
+        options,
+        activeProperty: key,
+        value,
+        expansionMap,
+        asGraph: false,
+        indexKey: '@type'
+      });
     } else {
       // recurse into @list or @set
       const isList = (expandedProperty === '@list');
@@ -671,8 +682,11 @@ function _expandIndexMap(
   const rval = [];
   const keys = Object.keys(value).sort();
   for(let ki = 0; ki < keys.length; ++ki) {
-    const key = keys[ki];
-    let val = value[key];
+    // If indexKey is @id or @type, expand the key appropriately
+    const key = (indexKey === '@id' || indexKey === '@type') ?
+      _expandIri(activeCtx, keys[ki], {vocab: (indexKey === '@type'), base: true}) :
+      keys[ki];
+    let val = value[keys[ki]];
     if(!_isArray(val)) {
       val = [val];
     }
@@ -691,7 +705,13 @@ function _expandIndexMap(
       if(asGraph && !_isGraph(item)) {
         item = {'@graph': [item]};
       }
-      if(!(indexKey in item)) {
+      if(indexKey === '@type') {
+        if(item['@type']) {
+          item['@type'] = [key].concat(item['@type']);
+        } else {
+          item['@type'] = [key];
+        }
+      } else if(!(indexKey in item)) {
         item[indexKey] = key;
       }
       rval.push(item);

tests/test-common.js

@@ -41,7 +41,7 @@ const TEST_TYPES = {
   },
   'jld:ExpandTest': {
     skip: {
-      regex: [/#t[cmn]/]
+      regex: [/#t[cn]/, /#tm00[89]/, /#tm01[0-3]/]
     },
     fn: 'expand',
     params: [