Consolodate test for JSON Literal type.

Author: gkellogg

lib/expand.js

@@ -414,12 +414,11 @@ async function _expandObject({
   const nests = [];
   let unexpandedValue;
 
-  // Remember inputType to aid with JSON literals
-  let inputType = element[typeKey];
-  if(inputType) {
-    inputType = _asArray(inputType).slice(-1)[0];
-    inputType = _expandIri(activeCtx, inputType, {vocab: true}, options);
-  }
+  // Figure out if this is the type for a JSON literal
+  const isJsonType = element[typeKey] &&
+    _expandIri(activeCtx,
+      (_isArray(element[typeKey]) ? element[typeKey][0] : element[typeKey]),
+      {vocab: true}, options) == '@json';
 
   for(const key of keys) {
     let value = element[key];
@@ -531,7 +530,7 @@ async function _expandObject({
       // capture value for later
       // "colliding keywords" check prevents this from being set twice
       unexpandedValue = value;
-      if(inputType === '@json' && _processingMode(activeCtx, 1.1)) {
+      if(isJsonType && _processingMode(activeCtx, 1.1)) {
         // no coercion to array, and retain all values
         expandedParent['@value'] = value;
       } else {