Wildcard matching on @id and other requireAll semantics

Author: gkellogg

CHANGELOG.md

@@ -19,6 +19,7 @@
 - Changes in object embedding.
 - Better support for graph framing.
 - Better frame validation.
+- Wildcard matching on `@id` and other requireAll semantics.
 
 ### Changed
 - Keep term definitions mapping to null so they may be protected.

lib/frame.js

@@ -532,111 +532,106 @@ function _filterSubject(state, subject, frame, flags) {
     const nodeValues = util.getValues(subject, key);
     const isEmpty = util.getValues(frame, key).length === 0;
 
-    if(isKeyword(key)) {
-      // skip non-@id and non-@type
-      if(key !== '@id' && key !== '@type') {
-        continue;
+    if(key === '@id') {
+      // match on no @id or any matching @id, including wildcard
+      if(types.isEmptyObject(frame['@id'][0] || {})) {
+        matchThis = true;
+      } else if(frame['@id'].length >= 0) {
+        matchThis = frame['@id'].includes(nodeValues[0]);
+      }
+      if(!flags.requireAll) {
+        return matchThis;
       }
+    } else if(key === '@type') {
+      // check @type (object value means 'any' type,
+      // fall through to ducktyping)
       wildcard = false;
-
-      // check @id for a specific @id value
-      if(key === '@id') {
-        // if @id is not a wildcard and is not empty, then match or not on
-        // specific value
-        if(frame['@id'].length >= 0 && !types.isEmptyObject(frame['@id'][0])) {
-          return frame['@id'].includes(nodeValues[0]);
+      if(isEmpty) {
+        if(nodeValues.length > 0) {
+          // don't match on no @type
+          return false;
         }
         matchThis = true;
-        continue;
-      }
-
-      // check @type (object value means 'any' type, fall through to ducktyping)
-      if('@type' in frame) {
-        if(isEmpty) {
-          if(nodeValues.length > 0) {
-            // don't match on no @type
-            return false;
-          }
-          matchThis = true;
-        } else if(frame['@type'].length === 1 &&
-          types.isEmptyObject(frame['@type'][0])) {
-          // match on wildcard @type if there is a type
-          matchThis = nodeValues.length > 0;
-        } else {
-          // match on a specific @type
-          for(const type of frame['@type']) {
-            if(types.isObject(type) && '@default' in type) {
-              // match on default object
-              matchThis = true;
-            } else {
-              matchThis = matchThis || nodeValues.some(tt => tt === type);
-            }
+      } else if(frame['@type'].length === 1 &&
+        types.isEmptyObject(frame['@type'][0])) {
+        // match on wildcard @type if there is a type
+        matchThis = nodeValues.length > 0;
+      } else {
+        // match on a specific @type
+        for(const type of frame['@type']) {
+          if(types.isObject(type) && '@default' in type) {
+            // match on default object
+            matchThis = true;
+          } else {
+            matchThis = matchThis || nodeValues.some(tt => tt === type);
           }
         }
-        if(!flags.requireAll) {
-          return matchThis;
-        }
       }
+      if(!flags.requireAll) {
+        return matchThis;
+      }
+    } else if(isKeyword(key)) {
       continue;
-    }
-
-    // Forc a copy of this frame entry so it can be manipulated
-    const thisFrame = util.getValues(frame, key)[0];
-    let hasDefault = false;
-    if(thisFrame) {
-      _validateFrame([thisFrame]);
-      hasDefault = '@default' in thisFrame;
-    }
-
-    // no longer a wildcard pattern if frame has any non-keyword properties
-    wildcard = false;
+    } else {
+      // Force a copy of this frame entry so it can be manipulated
+      const thisFrame = util.getValues(frame, key)[0];
+      let hasDefault = false;
+      if(thisFrame) {
+        _validateFrame([thisFrame]);
+        hasDefault = '@default' in thisFrame;
+      }
 
-    // skip, but allow match if node has no value for property, and frame has a
-    // default value
-    if(nodeValues.length === 0 && hasDefault) {
-      continue;
-    }
+      // no longer a wildcard pattern if frame has any non-keyword properties
+      wildcard = false;
 
-    // if frame value is empty, don't match if subject has any value
-    if(nodeValues.length > 0 && isEmpty) {
-      return false;
-    }
+      // skip, but allow match if node has no value for property, and frame has a
+      // default value
+      if(nodeValues.length === 0 && hasDefault) {
+        continue;
+      }
 
-    if(thisFrame === undefined) {
-      // node does not match if values is not empty and the value of property
-      // in frame is match none.
-      if(nodeValues.length > 0) {
+      // if frame value is empty, don't match if subject has any value
+      if(nodeValues.length > 0 && isEmpty) {
         return false;
       }
-      matchThis = true;
-    } else if(types.isObject(thisFrame)) {
-      // 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)) {
-        const listValue = thisFrame['@list'][0];
-        if(graphTypes.isList(nodeValues[0])) {
-          const nodeListValues = nodeValues[0]['@list'];
-
-          if(graphTypes.isValue(listValue)) {
-            // match on any matching value
-            matchThis = nodeListValues.some(lv => _valueMatch(listValue, lv));
-          } else if(graphTypes.isSubject(listValue) ||
-            graphTypes.isSubjectReference(listValue)) {
-            matchThis = nodeListValues.some(lv => _nodeMatch(
-              state, listValue, lv, flags));
+
+      if(thisFrame === undefined) {
+        // node does not match if values is not empty and the value of property
+        // in frame is match none.
+        if(nodeValues.length > 0) {
+          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)) {
+          const listValue = thisFrame['@list'][0];
+          if(graphTypes.isList(nodeValues[0])) {
+            const nodeListValues = nodeValues[0]['@list'];
+
+            if(graphTypes.isValue(listValue)) {
+              // match on any matching value
+              matchThis = nodeListValues.some(lv => _valueMatch(listValue, lv));
+            } else if(graphTypes.isSubject(listValue) ||
+              graphTypes.isSubjectReference(listValue)) {
+              matchThis = nodeListValues.some(lv => _nodeMatch(
+                state, listValue, lv, flags));
+            }
+          } else {
+            // value must be a list to match
+            matchThis = false;
           }
-        } else {
-          // value must be a list to match
-          matchThis = false;
         }
       }
     }

tests/test-common.js

@@ -129,12 +129,6 @@ const TEST_TYPES = {
         // lists
         /frame-manifest.jsonld#t0055$/,
         /frame-manifest.jsonld#t0058$/,
-        // requireAll
-        /frame-manifest.jsonld#tra01$/,
-        /frame-manifest.jsonld#tra02$/,
-        /frame-manifest.jsonld#tra03$/,
-        // wildcard
-        /frame-manifest.jsonld#t0061$/,
         // included
         /frame-manifest.jsonld#tin01$/,
         /frame-manifest.jsonld#tin02$/,