Process @type term contexts before key iteration.

Adapted test tc011 fix from ruby-rdf:
ruby-rdf/json-ld@10f0d53

Author: davidlehn

lib/compact.js

@@ -141,41 +141,43 @@ api.compact = ({
       options.link[element['@id']].push({expanded: element, compacted: rval});
     }
 
+    // apply any context defined on an alias of @type
+    // if key is @type and any compacted value is a term having a local
+    // context, overlay that context
+    const types = element['@type'] || [];
+    for(const type of types) {
+      const compactedType = api.compactIri(
+        {activeCtx, iri: type, relativeTo: {vocab: true}})
+
+      // Use any scoped context defined on this value
+      const ctx = _getContextValue(activeCtx, compactedType, '@context');
+      if(ctx) {
+        activeCtx = _processContext({activeCtx, localCtx: ctx, options});
+      }
+    }
+
     // process element keys in order
     const keys = Object.keys(element).sort();
     for(const expandedProperty of keys) {
       const expandedValue = element[expandedProperty];
 
       // compact @id and @type(s)
       if(expandedProperty === '@id' || expandedProperty === '@type') {
-        let compactedValue;
-
-        // compact single @id
-        if(_isString(expandedValue)) {
-          compactedValue = api.compactIri({
+        let compactedValue = [].concat(expandedValue).map(
+          expandedIri => api.compactIri({
             activeCtx,
-            iri: expandedValue,
-            relativeTo: {vocab: (expandedProperty === '@type')}
-          });
-        } else {
-          // expanded value must be a @type array
-          compactedValue = [];
-          for(const expandedIri of expandedValue) {
-            const compactedType = api.compactIri(
-              {activeCtx, iri: expandedIri, relativeTo: {vocab: true}})
-
-            // Use any scoped context defined on this value
-            const ctx = _getContextValue(activeCtx, compactedType, '@context');
-            if(ctx) {
-              activeCtx = _processContext({activeCtx, localCtx: ctx, options});
+            iri: expandedIri,
+            relativeTo: {
+              vocab: expandedProperty === '@type'
             }
-
-            compactedValue.push(compactedType);
-          }
+          }));
+        if(compactedValue.length === 1) {
+          compactedValue = compactedValue[0];
         }
 
         // use keyword alias and add value
-        const alias = api.compactIri({activeCtx, iri: expandedProperty, relativeTo: {vocab: true}});
+        const alias = api.compactIri(
+          {activeCtx, iri: expandedProperty, relativeTo: {vocab: true}});
         const isArray = _isArray(compactedValue) && expandedValue.length === 0;
         _addValue(rval, alias, compactedValue, {propertyIsArray: isArray});
         continue;