Index maps on @none or an alias for json-ld/json-ld.org#569.

Author: gkellogg

lib/compact.js

@@ -47,7 +47,6 @@ module.exports = api;
  *          to compact, null for none.
  * @param element the element to compact.
  * @param options the compaction options:
- *          [issuer] a jsonld.IdentifierIssuer to use to label blank nodes.
  * @param compactionMap the compaction map to use.
  *
  * @return the compacted value.
@@ -134,9 +133,6 @@ api.compact = ({
 
     const rval = {};
 
-    // produce a map of all subjects and name each bnode
-    const issuer = options.issuer || new util.IdentifierIssuer('_:b');
-
     if(options.link && '@id' in element) {
       // store linked element
       if(!(element['@id'] in options.link)) {
@@ -340,10 +336,9 @@ api.compact = ({
               rval[itemActiveProperty] = mapObject = {};
             }
 
-            // TODO: future change will use @none in both cases.
-            const key = container.includes('@id') ?
-              (expandedItem['@id'] || issuer.getId(null)) :
-              (expandedItem['@index'] || '@none');
+            // index on @id or @index or alias of @none
+            const key = (container.includes('@id') ? expandedItem['@id'] : expandedItem['@index']) ||
+              api.compactIri({activeCtx, iri: '@none', vocab: true});
             // add compactedItem to map, using value of `@id` or a new blank node identifier
             _addValue(
               mapObject, key, compactedItem,
@@ -398,12 +393,12 @@ api.compact = ({
             key = expandedItem['@index'];
           } else if(container.includes('@id')) {
             const idKey = api.compactIri({activeCtx, iri: '@id', vocab: true});
-            key = compactedItem[idKey] || '@none';
+            key = compactedItem[idKey];
             delete compactedItem[idKey];
           } else if(container.includes('@type')) {
             const typeKey = api.compactIri({activeCtx, iri: '@type', vocab: true});
             let types;
-            [key, ...types] = [].concat(compactedItem[typeKey] || ['@none']);
+            [key, ...types] = [].concat(compactedItem[typeKey] || []);
             switch(types.length) {
             case 0:
               delete compactedItem[typeKey];
@@ -417,6 +412,10 @@ api.compact = ({
             }
           }
 
+          // if compacting this value which has no key, index on @none
+          if(!key) {
+            key = api.compactIri({activeCtx, iri: '@none', vocab: true});
+          }
           // add compact value to map object using key from expanded value
           // based on the container type
           _addValue(

lib/context.js

@@ -843,6 +843,7 @@ api.isKeyword = v => {
   case '@index':
   case '@language':
   case '@list':
+  case '@none':
   case '@omitDefault':
   case '@preserve':
   case '@requireAll':

lib/expand.js

@@ -341,7 +341,7 @@ api.expand = ({
 
     if(container.includes('@language') && _isObject(value)) {
       // handle language map container (skip if value is not an object)
-      expandedValue = _expandLanguageMap(value);
+      expandedValue = _expandLanguageMap(termCtx, value);
     } else if(container.includes('@index') && _isObject(value)) {
       // handle index container (skip if value is not an object)
       const asGraph = container.includes('@graph');
@@ -665,21 +665,21 @@ function _expandValue({activeCtx, activeProperty, value}) {
 /**
  * Expands a language map.
  *
+ * @param activeCtx the active context to use.
  * @param languageMap the language map to expand.
  *
  * @return the expanded language map.
  */
-function _expandLanguageMap(languageMap) {
+function _expandLanguageMap(activeCtx, languageMap) {
   const rval = [];
   const keys = Object.keys(languageMap).sort();
-  for(let ki = 0; ki < keys.length; ++ki) {
-    const key = keys[ki];
+  for(let key of keys) {
+    const expandedKey = _expandIri(activeCtx, key, {vocab: true})
     let val = languageMap[key];
     if(!_isArray(val)) {
       val = [val];
     }
-    for(let vi = 0; vi < val.length; ++vi) {
-      const item = val[vi];
+    for(let item of val) {
       if(item === null) {
         // null values are allowed (8.5) but ignored (3.1)
         continue;
@@ -690,10 +690,11 @@ function _expandLanguageMap(languageMap) {
           'jsonld.SyntaxError',
           {code: 'invalid language map value', languageMap: languageMap});
       }
-      rval.push({
-        '@value': item,
-        '@language': key.toLowerCase()
-      });
+      const val = {'@value': item};
+      if(expandedKey !== '@none') {
+        val['@language'] = key.toLowerCase();
+      }
+      rval.push(val);
     }
   }
   return rval;
@@ -703,21 +704,27 @@ function _expandIndexMap(
   {activeCtx, options, activeProperty, value, expansionMap, asGraph, indexKey}) {
   const rval = [];
   const keys = Object.keys(value).sort();
-  for(let ki = 0; ki < keys.length; ++ki) {
+  for(let key of keys) {
     // if indexKey is @type, there may be a context defined for it
-    const ctx = _getContextValue(activeCtx, keys[ki], '@context');
+    const ctx = _getContextValue(activeCtx, key, '@context');
     if(ctx) {
       activeCtx = _processContext({activeCtx, localCtx: ctx, options});
     }
 
-    // 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]];
+    let val = value[key];
     if(!_isArray(val)) {
       val = [val];
     }
+
+    // expand for @type, but also for @none
+    const expandedKey = _expandIri(activeCtx, key, {vocab: true})
+    if(indexKey === '@id' ) {
+      // expand document relative
+      key = _expandIri(activeCtx, key, {base: true});
+    } else if(indexKey === '@type') {
+      key = expandedKey;
+    }
+
     val = api.expand({
       activeCtx,
       activeProperty,
@@ -726,20 +733,20 @@ function _expandIndexMap(
       insideList: false,
       expansionMap
     });
-    for(let vi = 0; vi < val.length; ++vi) {
-      let item = val[vi];
-
+    for(let item of val) {
       // If this is also a @graph container, turn items into graphs
       if(asGraph && !_isGraph(item)) {
         item = {'@graph': [item]};
       }
       if(indexKey === '@type') {
-        if(item['@type']) {
+        if(expandedKey === '@none') {
+          // ignore @none
+        } else if(item['@type']) {
           item['@type'] = [key].concat(item['@type']);
         } else {
           item['@type'] = [key];
         }
-      } else if(!(indexKey in item)) {
+      } else if(expandedKey !== '@none' && !(indexKey in item)) {
         item[indexKey] = key;
       }
       rval.push(item);