refactor: simplify or remove a couple of conditions (#927)

jest-community · Oct 9, 2021 · a4f66f6 · a4f66f6
1 parent d4cdab8
commit a4f66f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/src/rules/no-large-snapshots.ts b/src/rules/no-large-snapshots.ts
@@ -122,7 +122,7 @@ export default createRule<[RuleOptions], MessageId>({
 
         const { matcher } = parseExpectCall(node);
 
-        if (matcher?.node.parent?.type !== AST_NODE_TYPES.CallExpression) {
+        if (matcher?.node.parent.type !== AST_NODE_TYPES.CallExpression) {
           return;
         }
 

diff --git a/src/rules/utils.ts b/src/rules/utils.ts
@@ -418,7 +418,6 @@ const reparseAsMatcher = (
    * If this matcher isn't called, this will be `null`.
    */
   arguments:
-    parsedMember.node.parent &&
     parsedMember.node.parent.type === AST_NODE_TYPES.CallExpression
       ? parsedMember.node.parent.arguments
       : null,
@@ -453,11 +452,9 @@ const reparseMemberAsModifier = (
     );
   }
 
-  const negation =
-    parsedMember.node.parent &&
-    isExpectMember(parsedMember.node.parent, ModifierName.not)
-      ? parsedMember.node.parent
-      : undefined;
+  const negation = isExpectMember(parsedMember.node.parent, ModifierName.not)
+    ? parsedMember.node.parent
+    : undefined;
 
   return {
     ...parsedMember,
@@ -506,7 +503,7 @@ export const parseExpectCall = <ExpectNode extends ExpectCall>(
 
   const memberNode = modifier.negation || modifier.node;
 
-  if (!memberNode.parent || !isExpectMember(memberNode.parent)) {
+  if (!isExpectMember(memberNode.parent)) {
     return expectation;
   }
 

diff --git a/src/rules/valid-expect.ts b/src/rules/valid-expect.ts
@@ -35,7 +35,6 @@ const getPromiseCallExpressionNode = (node: TSESTree.Node) => {
 
   if (
     node.type === AST_NODE_TYPES.CallExpression &&
-    node.callee &&
     node.callee.type === AST_NODE_TYPES.MemberExpression &&
     isSupportedAccessor(node.callee.object) &&
     getAccessorValue(node.callee.object) === 'Promise' &&
@@ -48,21 +47,19 @@ const getPromiseCallExpressionNode = (node: TSESTree.Node) => {
 };
 
 const findPromiseCallExpressionNode = (node: TSESTree.Node) =>
-  node.parent &&
-  node.parent.parent &&
+  node.parent?.parent &&
   [AST_NODE_TYPES.CallExpression, AST_NODE_TYPES.ArrayExpression].includes(
     node.parent.type,
   )
     ? getPromiseCallExpressionNode(node.parent)
     : null;
 
 const getParentIfThenified = (node: TSESTree.Node): TSESTree.Node => {
-  const grandParentNode = node.parent && node.parent.parent;
+  const grandParentNode = node.parent?.parent;
 
   if (
     grandParentNode &&
     grandParentNode.type === AST_NODE_TYPES.CallExpression &&
-    grandParentNode.callee &&
     isExpectMember(grandParentNode.callee) &&
     ['then', 'catch'].includes(
       getAccessorValue(grandParentNode.callee.property),
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,7 +122,7 @@ export default createRule<[RuleOptions], MessageId>({ @@
             const { matcher } = parseExpectCall(node);
-            if (matcher?.node.parent?.type !== AST_NODE_TYPES.CallExpression) {
+            if (matcher?.node.parent.type !== AST_NODE_TYPES.CallExpression) {
               return;
             }
@@ Expand Down @@