refactor: optimize some code for full coverage & cleanup wip comments

Author: G-Rath

src/rules/__tests__/valid-expect.test.ts

@@ -355,6 +355,36 @@ ruleTester.run('valid-expect', rule, {
         },
       ],
     },
+    {
+      code: 'expect(true).not.resolves.toBeDefined();',
+      errors: [
+        {
+          endColumn: 40,
+          column: 1,
+          messageId: 'modifierUnknown',
+        },
+      ],
+    },
+    {
+      code: 'expect(true).not.not.toBeDefined();',
+      errors: [
+        {
+          endColumn: 35,
+          column: 1,
+          messageId: 'modifierUnknown',
+        },
+      ],
+    },
+    {
+      code: 'expect(true).resolves.not.exactly.toBeDefined();',
+      errors: [
+        {
+          endColumn: 48,
+          column: 1,
+          messageId: 'modifierUnknown',
+        },
+      ],
+    },
     {
       code: 'expect(true).resolves;',
       errors: [

src/rules/utils/parseJestFnCall.ts

@@ -263,58 +263,17 @@ export const parseJestFnCallWithReason = (
 
   const type = determineJestFnType(name);
 
-  // if (
-  //   node.parent?.type === AST_NODE_TYPES.CallExpression
-  //   // node.parent?.type === AST_NODE_TYPES.MemberExpression
-  // ) {
-  //   return null;
-  // }
-
   if (type === 'expect') {
-    // const findTopMostMemberExpression = (
-    //   node: TSESTree.MemberExpression,
-    // ): TSESTree.MemberExpression => {
-    //   let topMostMemberExpression = node;
-    //   let { parent } = node;
-    //
-    //   while (parent) {
-    //     if (parent.type !== AST_NODE_TYPES.MemberExpression) {
-    //       break;
-    //     }
-    //
-    //     topMostMemberExpression = parent;
-    //     parent = parent.parent;
-    //   }
-    //
-    //   return topMostMemberExpression;
-    // };
     const result = parseJestExpectCall(parsedJestFnCall);
 
-    const topMost = findTopMostCallExpression(node);
-
-    // if (topMost !== node) {
-    //   return null;
-    // }
-
-    // console.log(
-    //   typeof result,
-    //   'topmost',
-    //   topMost === node,
-    //   parsedJestFnCall.members.length,
-    // );
-    if (typeof result === 'string' && topMost !== node) {
+    // if the `expect` call chain is not valid, only report on the topmost node
+    // since all members in the chain are likely to get flagged for some reason
+    if (
+      typeof result === 'string' &&
+      findTopMostCallExpression(node) !== node
+    ) {
       return null;
     }
-    // console.log(result);
-
-    // if (typeof result !== 'string') {
-    //   if (
-    //     node.parent?.type === AST_NODE_TYPES.CallExpression ||
-    //     node.parent?.type === AST_NODE_TYPES.MemberExpression
-    //   ) {
-    //     return null;
-    //   }
-    // }
 
     if (result === 'matcher-not-found') {
       if (node.parent?.type === AST_NODE_TYPES.MemberExpression) {
@@ -361,10 +320,6 @@ const findModifiersAndMatcher = (
 ): ModifiersAndMatcher | string => {
   const modifiers: KnownMemberExpressionProperty[] = [];
 
-  if (members.length === 0) {
-    return 'matcher-not-found';
-  }
-
   for (const member of members) {
     // check if the member is being called, which means it is the matcher
     // (and also the end of the entire "expect" call chain)
@@ -377,7 +332,6 @@ const findModifiersAndMatcher = (
         matcherArgs: member.parent.parent.arguments,
         modifiers,
       };
-      // return 'matcher-not-called';
     }
 
     // otherwise, it should be a modifier
@@ -410,7 +364,8 @@ const findModifiersAndMatcher = (
     modifiers.push(member);
   }
 
-  return 'matcher-not-called';
+  // this will only really happen if there are no members
+  return 'matcher-not-found';
 };
 
 const parseJestExpectCall = (