Fix for: Framing does not respect specified value #300

Author: michaelcpuckett

lib/frame.js

@@ -597,19 +597,8 @@ function _filterSubject(state, subject, frame, flags) {
           return false;
         }
         matchThis = true;
-      } else if(types.isObject(thisFrame)) { // XXX only framing keywords
-        // node matches if values is not empty and the value of property in
-        // frame is wildcard
-        matchThis = nodeValues.length > 0;
       } else {
-        if(graphTypes.isValue(thisFrame)) {
-          // match on any matching value
-          matchThis = nodeValues.some(nv => _valueMatch(thisFrame, nv));
-        } else if(graphTypes.isSubject(thisFrame) ||
-          graphTypes.isSubjectReference(thisFrame)) {
-          matchThis =
-            nodeValues.some(nv => _nodeMatch(state, thisFrame, nv, flags));
-        } else if(graphTypes.isList(thisFrame)) {
+        if(graphTypes.isList(thisFrame)) {
           const listValue = thisFrame['@list'][0];
           if(graphTypes.isList(nodeValues[0])) {
             const nodeListValues = nodeValues[0]['@list'];
@@ -622,10 +611,16 @@ function _filterSubject(state, subject, frame, flags) {
               matchThis = nodeListValues.some(lv => _nodeMatch(
                 state, listValue, lv, flags));
             }
-          } else {
-            // value must be a list to match
-            matchThis = false;
           }
+        } else if(graphTypes.isValue(thisFrame)) {
+          matchThis = nodeValues.some(nv => _valueMatch(thisFrame, nv));
+        } else if(graphTypes.isSubjectReference(thisFrame)) {
+          matchThis =
+            nodeValues.some(nv => _nodeMatch(state, thisFrame, nv, flags));
+        } else if(types.isObject(thisFrame)) {
+          matchThis = nodeValues.length > 0;
+        } else {
+          matchThis = false;
         }
       }
     }