Update container prioritization in compactIri.

Author: gkellogg

lib/compact.js

@@ -486,23 +486,32 @@ api.compactIri = ({
 
     // prefer @index if available in value
     const containers = [];
-    if(_isObject(value) && '@index' in value) {
-      containers.push('@index');
+    if(_isObject(value) && '@index' in value && !('@graph' in value)) {
+      containers.push('@index', '@index@set');
     }
 
     // prefer most specific container including @graph, prefering @set variations
     if(_isGraph(value)) {
-      containers.push('@graph@index@set');
-      containers.push('@graph@index');
-      containers.push('@graph@id@set');
-      containers.push('@graph@id');
-      containers.push('@graph@set');
-      containers.push('@graph');
+      // favor indexmap if the graph is indexed
+      if('@index' in value) {
+        containers.push('@graph@index', '@graph@index@set', '@index', '@index@set');
+      }
+      // favor idmap if the graph is has an @id
+      if('@id' in value) {
+        containers.push(
+          '@graph@id', '@graph@id@set');
+      }
+      containers.push('@graph', '@graph@set');
+      // allow indexmap if the graph is not indexed
+      if(!('@index' in value)) {
+        containers.push('@graph@index', '@graph@index@set', '@index', '@index@set');
+      }
+      // allow idmap if the graph does not have an @id
+      if(!('@id' in value)) {
+        containers.push('@graph@id', '@graph@id@set');
+      }
     } else if(_isObject(value) && !_isValue(value)) {
-      containers.push('@id@set');
-      containers.push('@id');
-      containers.push('@type@set');
-      containers.push('@type');
+      containers.push('@id', '@id@set', '@type','@set@type');
     }
 
     // defaults for term selection based on type/language
@@ -572,16 +581,23 @@ api.compactIri = ({
     } else {
       if(_isValue(value)) {
         if('@language' in value && !('@index' in value)) {
-          containers.push('@language');
+          containers.push('@language', '@language@set');
           typeOrLanguageValue = value['@language'];
         } else if('@type' in value) {
           typeOrLanguage = '@type';
           typeOrLanguageValue = value['@type'];
+        } else if(!('@index' in value)) {
+          // allw indexing by language even if no language present
+          containers.push('@language', '@language@set');
         }
       } else {
         typeOrLanguage = '@type';
         typeOrLanguageValue = '@id';
       }
+      if(_isObject(value) && !('@index' in value)) {
+        // allow indexing even if no @index present
+        containers.push('@index', '@index@set');
+      }
       containers.push('@set');
     }
 

tests/test-common.js

@@ -29,7 +29,7 @@ const manifest = options.manifest || {
 const TEST_TYPES = {
   'jld:CompactTest': {
     skip: {
-      regex: [/#t0073/, /#t[anps]/
+      regex: [/#t0073/, /#t[anps]/]
     },
     fn: 'compact',
     params: [
@@ -41,7 +41,7 @@ const TEST_TYPES = {
   },
   'jld:ExpandTest': {
     skip: {
-      regex: [/#t[n]/]
+      regex: [/#t[n]/, /#tm013/]
     },
     fn: 'expand',
     params: [