* Indexing on @type requires @type to be either @id or @vocab,

  and defaults to `@id`.

Author: gkellogg

CHANGELOG.md

@@ -6,6 +6,8 @@
 - Expanding the value of a graph container which is already a graph object
   generates a recursive graph object.
 - Compacting multiple nodes in a graph container places them in `@included`.
+- Indexing on "@type" requires "@type" to be either "@id" or "@vocab",
+  and defaults to "@id".
 
 ### Changed
 - Default processing mode changed to json-ld-1.1. Allows a 1.1 context to be

lib/compact.js

@@ -545,6 +545,18 @@ api.compact = async ({
                 compactedItem[typeKey] = types;
                 break;
             }
+
+            // If compactedItem contains a single entry
+            // whose key maps to @id, recompact without @type
+            if(Object.keys(compactedItem).length === 1 && '@id' in expandedItem) {
+              compactedItem = await api.compact({
+                activeCtx,
+                activeProperty: itemActiveProperty,
+                element: {'@id': expandedItem['@id']},
+                options,
+                compactionMap
+              });
+            }
           }
 
           // if compacting this value which has no key, index on @none
@@ -1063,7 +1075,7 @@ function _selectTerm(
 
   // determine prefs for @id based on whether or not value compacts to a term
   if((typeOrLanguageValue === '@id' || typeOrLanguageValue === '@reverse') &&
-    _isSubjectReference(value)) {
+    _isObject(value) && '@id' in value) {
     // prefer @reverse first
     if(typeOrLanguageValue === '@reverse') {
       prefs.push('@reverse');

lib/context.js

@@ -560,6 +560,20 @@ api.createTermDefinition = (
         // otherwise, container may also include @set
         isValid &= container.length <= (hasSet ? 2 : 1);
       }
+
+      if(container.includes('@type')) {
+        // If mapping does not have an @type,
+        // set it to @id
+        mapping['@type'] = mapping['@type'] || '@id';
+
+        // type mapping must be either @id or @vocab
+        if(!['@id', '@vocab'].includes(mapping['@type'])) {
+          throw new JsonLdError(
+            'Invalid JSON-LD syntax; container: @type requires @type to be @id or @vocab.',
+            'jsonld.SyntaxError',
+            {code: 'invalid type mapping', context: localCtx});
+        }
+      }
     } else {
       // in JSON-LD 1.0, container must not be an array (it must be a string,
       // which is one of the validContainers)

tests/test-common.js

@@ -55,10 +55,6 @@ const TEST_TYPES = {
         /compact-manifest.jsonld#tin03$/,
         /compact-manifest.jsonld#tin04$/,
         /compact-manifest.jsonld#tin05$/,
-        // index on @type
-        /compact-manifest.jsonld#tm020$/,
-        /compact-manifest.jsonld#tm021$/,
-        /compact-manifest.jsonld#tm022$/,
         // context values
         /compact-manifest.jsonld#ts001$/,
         /compact-manifest.jsonld#ts002$/,
@@ -203,9 +199,6 @@ const TEST_TYPES = {
         /expand-manifest.jsonld#tin07$/,
         /expand-manifest.jsonld#tin08$/,
         /expand-manifest.jsonld#tin09$/,
-        // index on @type
-        /expand-manifest.jsonld#tm017$/,
-        /expand-manifest.jsonld#tm020$/,
         // @nest
         /expand-manifest.jsonld#tn008$/,
         // keywords
@@ -473,9 +466,6 @@ const TEST_TYPES = {
         /toRdf-manifest.jsonld#tin04$/,
         /toRdf-manifest.jsonld#tin05$/,
         /toRdf-manifest.jsonld#tin06$/,
-        // index on @type
-        /toRdf-manifest.jsonld#tm017$/,
-        /toRdf-manifest.jsonld#tm020$/,
         // @next
         /toRdf-manifest.jsonld#tn008$/,
         // keywords