fix(patterns): Allow matches(nonKey, key) to reject successfully

Author: gibson042

packages/patterns/src/patterns/patternMatchers.js

@@ -270,7 +270,7 @@ const makePatternKit = () => {
    * @returns {boolean}
    */
   const checkAsKeyPatt = (specimen, keyAsPattern, check) => {
-    if (keyEQ(specimen, keyAsPattern)) {
+    if (isKey(specimen) && keyEQ(specimen, keyAsPattern)) {
       return true;
     }
     return (

packages/patterns/test/test-patterns.js

@@ -525,20 +525,13 @@ const runTests = (successCase, failCase) => {
         continue;
       }
       // This specimen is not a Key, so testing is less straightforward.
-      if (method === 'scalar' || method === 'key') {
+      if (method === 'scalar' || method === 'key' || method === 'null') {
         successCase(specimen, M.not(M[method]()));
         failCase(
           specimen,
           M[method](),
           makeMessage('"[mysteryTag]"', 'mysteryTag', 'tagged'),
         );
-      } else if (method === 'null') {
-        failCase(
-          specimen,
-          M[method](),
-          simpleMethods.key('"[mysteryTag]"', 'mysteryTag', 'tagged'),
-          true,
-        );
       } else {
         failCase(
           specimen,
@@ -557,21 +550,12 @@ const runTests = (successCase, failCase) => {
         continue;
       }
       // This specimen is not a Key, so testing is less straightforward.
-      if (method !== 'null') {
-        successCase(specimen, M.not(M[method]()));
-        failCase(
-          specimen,
-          M[method](),
-          makeMessage('"[match:any]"', 'match:any', 'tagged'),
-        );
-      } else {
-        failCase(
-          specimen,
-          M[method](),
-          simpleMethods.key('"[match:any]"', 'match:any', 'tagged'),
-          true,
-        );
-      }
+      successCase(specimen, M.not(M[method]()));
+      failCase(
+        specimen,
+        M[method](),
+        makeMessage('"[match:any]"', 'match:any', 'tagged'),
+      );
     }
   }
   {
@@ -583,21 +567,12 @@ const runTests = (successCase, failCase) => {
         continue;
       }
       // This specimen has an invalid payload for its tag, so testing is less straightforward.
-      if (method !== 'null') {
-        const message =
-          method === 'scalar' || method === 'key'
-            ? makeMessage('"[match:any]"', 'match:any', 'tagged')
-            : 'match:any payload: 88 - Must be undefined';
-        successCase(specimen, M.not(M[method]()));
-        failCase(specimen, M[method](), message);
-      } else {
-        failCase(
-          specimen,
-          M[method](),
-          simpleMethods.key('"[match:any]"', 'match:any', 'tagged'),
-          true,
-        );
-      }
+      const message =
+        method === 'scalar' || method === 'key' || method === 'null'
+          ? makeMessage('"[match:any]"', 'match:any', 'tagged')
+          : 'match:any payload: 88 - Must be undefined';
+      successCase(specimen, M.not(M[method]()));
+      failCase(specimen, M[method](), message);
     }
   }
   {
@@ -609,20 +584,13 @@ const runTests = (successCase, failCase) => {
         continue;
       }
       // This specimen is not a Key, so testing is less straightforward.
-      if (method === 'scalar' || method === 'key') {
+      if (method === 'scalar' || method === 'key' || method === 'null') {
         successCase(specimen, M.not(M[method]()));
         failCase(
           specimen,
           M[method](),
           makeMessage('"[match:remotable]"', 'match:remotable', 'tagged'),
         );
-      } else if (method === 'null') {
-        failCase(
-          specimen,
-          M[method](),
-          simpleMethods.key('"[match:remotable]"', 'match:remotable', 'tagged'),
-          true,
-        );
       } else {
         failCase(
           specimen,