Stylistic improvements.

Author: gkellogg

lib/compact.js

@@ -315,31 +315,23 @@ api.compact = ({
 
         // Graph object compaction cases
         if(isGraph) {
-          if(container.includes('@graph') && container.includes('@id')) {
-            // container includes @graph and @id
+          if(container.includes('@graph') &&
+            (container.includes('@id') || container.includes('@index') && _isSimpleGraph(expandedItem))) {
             // get or create the map object
             let mapObject;
             if(itemActiveProperty in rval) {
               mapObject = rval[itemActiveProperty];
             } else {
               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');
             // add compactedItem to map, using value of `@id` or a new blank node identifier
             _addValue(
-              mapObject, (expandedItem['@id'] || issuer.getId(null)), compactedItem,
-              {propertyIsArray: (!options.compactArrays || container.includes('@set'))});
-          } else if(container.includes('@graph') && container.includes('@index') && _isSimpleGraph(expandedItem)) {
-            // container includes @graph and @index and item is a simple graph
-            // get or create the map object
-            let mapObject;
-            if(itemActiveProperty in rval) {
-              mapObject = rval[itemActiveProperty];
-            } else {
-              rval[itemActiveProperty] = mapObject = {};
-            }
-            // add compactedItem to map, using value of `@index` or `@none`
-            _addValue(
-              mapObject, (expandedItem['@index'] || '@none'), compactedItem,
+              mapObject, key, compactedItem,
               {propertyIsArray: (!options.compactArrays || container.includes('@set'))});
           } else if(container.includes('@graph') && _isSimpleGraph(expandedItem)) {
             // container includes @graph but not @id or @index and value is a simple graph object
@@ -372,13 +364,14 @@ api.compact = ({
           container.includes('@id') || container.includes('@type')) {
           // handle language and index maps
           // get or create the map object
-          let mapObject, key;
+          let mapObject;
           if(itemActiveProperty in rval) {
             mapObject = rval[itemActiveProperty];
           } else {
             rval[itemActiveProperty] = mapObject = {};
           }
 
+          let key;
           if(container.includes('@language')) {
           // if container is a language map, simplify compacted value to
           // a simple string
@@ -394,19 +387,25 @@ api.compact = ({
             delete compactedItem[idKey];
           } else if(container.includes('@type')) {
             const typeKey = api.compactIri({activeCtx, iri: '@type', vocab: true});
-            var types;
+            let 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;
+            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
-          _addValue(mapObject, key, compactedItem,
-            {propertyIsArray: container.includes('@set')});
+          _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

lib/context.js

@@ -400,7 +400,7 @@ api.createTermDefinition = (activeCtx, localCtx, term, defined) => {
             {code: 'invalid container mapping', context: localCtx});
         }
       } else if(container.includes('@graph')) {
-        if(container.some(key => key != '@graph' && key != '@id' && key != '@index' && key != '@set')) {
+        if(container.some(key => key !== '@graph' && key !== '@id' && key !== '@index' && key !== '@set')) {
           throw new JsonLdError(
             'Invalid JSON-LD syntax; @context @container with @graph must have no other values ' +
             'other than @id, @index, and @set',