Compact using @id and @type maps.

Author: gkellogg

lib/compact.js

@@ -368,26 +368,45 @@ api.compact = ({
               rval, itemActiveProperty, compactedItem,
               {propertyIsArray: (!options.compactArrays || container.includes('@set'))});
           }
-        } else if(container.includes('@language') || container.includes('@index')) {
-        // handle language and index maps
+        } else if(container.includes('@language') || container.includes('@index') ||
+          container.includes('@id') || container.includes('@type')) {
+          // handle language and index maps
           // get or create the map object
-          let mapObject;
+          let mapObject, key;
           if(itemActiveProperty in rval) {
             mapObject = rval[itemActiveProperty];
           } else {
             rval[itemActiveProperty] = mapObject = {};
           }
 
+          if(container.includes('@language')) {
           // if container is a language map, simplify compacted value to
           // a simple string
-          if(container.includes('@language') && _isValue(compactedItem)) {
-            compactedItem = compactedItem['@value'];
+            if(_isValue(compactedItem)) {
+              compactedItem = compactedItem['@value'];
+            }
+            key = expandedItem['@language'];
+          } else if(container.includes('@index')) {
+            key = expandedItem['@index'];
+          } else if(container.includes('@id')) {
+            const idKey = api.compactIri({activeCtx, iri: '@id', vocab: true});
+            key = compactedItem[idKey] || '@none';
+            delete compactedItem[idKey];
+          } else if(container.includes('@type')) {
+            const typeKey = api.compactIri({activeCtx, iri: '@type', vocab: true});
+            var types;
+            [key, ...types] = [].concat(compactedItem[typeKey] || ['@none']);
+            switch(types.length) {
+            case 0: delete compactedItem[typeKey]; break;
+            case 1: compactedItem[typeKey] = types[0]; break;
+            default: compactedItem[typeKey] = types; break;
+            }
           }
 
           // add compact value to map object using key from expanded value
           // based on the container type
-          const c = container.includes('@language') ? '@language' : '@index';
-          _addValue(mapObject, expandedItem[c], compactedItem);
+          _addValue(mapObject, key, compactedItem,
+            {propertyIsArray: container.includes('@set')});
         } else {
           // use an array if: compactArrays flag is false,
           // @container is @set or @list , value is an empty
@@ -465,6 +484,11 @@ api.compactIri = ({
       containers.push('@graph@id');
       containers.push('@graph@set');
       containers.push('@graph');
+    } else if(_isObject(value) && !_isValue(value)) {
+      containers.push('@id@set');
+      containers.push('@id');
+      containers.push('@type@set');
+      containers.push('@type');
     }
 
     // defaults for term selection based on type/language

tests/test-common.js

@@ -29,7 +29,7 @@ const manifest = options.manifest || {
 const TEST_TYPES = {
   'jld:CompactTest': {
     skip: {
-      regex: [/#t0073/, /#t[acmnps]/]
+      regex: [/#t0073/, /#t[acnps]/, /#tm00[7-9]/, /#tm01[0-2]/]
     },
     fn: 'compact',
     params: [