Account for @type being a blank node when looking for blank nodes to prune.

Author: gkellogg

lib/frame.js

@@ -168,6 +168,15 @@ api.frame = (state, subjects, frame, parent, property = null) => {
       // copy keywords to output
       if(isKeyword(prop)) {
         output[prop] = util.clone(subject[prop]);
+
+        if(prop === '@type') {
+          // count bnode values of @type
+          for(const type of subject['@type']) {
+            if(type.indexOf('_:') === 0) {
+              util.addValue(state.bnodeMap, type, output, {propertyIsArray: true});
+            }
+          }
+        }
         continue;
       }
 
@@ -206,7 +215,7 @@ api.frame = (state, subjects, frame, parent, property = null) => {
         if(graphTypes.isSubjectReference(o)) {
           // recurse into subject reference
           api.frame(state, [o['@id']], subframe, output, prop);
-        } else if(_valueMatch(subframe, o)){
+        } else if(_valueMatch(subframe[0], o)){
           // include other values, if they match
           _addFrameOutput(output, prop, util.clone(o));
         }
@@ -594,20 +603,20 @@ function _valueMatch(pattern, value) {
   const v1 = value['@value'];
   const t1 = value['@type'];
   const l1 = value['@language'];
-  const v2 = [].concat(value['@value']);
-  const t2 = [].concat(value['@type']);
-  const l2 = [].concat(value['@language']);
+  const v2 = pattern['@value'] || [];
+  const t2 = pattern['@type'] || [];
+  const l2 = pattern['@language'] || [];
 
   if(v2.length === 0 && t2.length === 0 && l2.length === 0) {
     return true;
   }
-  if(!v2.includes(v1) && !graphTypes.isEmptyObject(v2)) {
+  if(!(v2.includes(v1) || types.isEmptyObject(v2[0]))) {
     return false;
   }
-  if(!t2.includes(t1) && !graphTypes.isEmptyObject(t2)) {
+  if(!(!t1 && t2.length === 0 || t2.includes(t1) || t1 && types.isEmptyObject(t2[0]))) {
     return false;
   }
-  if(!l2.includes(l1) && !graphTypes.isEmptyObjectl2) {
+  if(!(!l1 && l2.length === 0 || l2.includes(l1) || l1 && types.isEmptyObject(l2[0]))) {
     return false;
   }
   return true;