chore: handle returning logical expressions

Author: akulsr0

lib/rules/no-render-return-undefined.js

@@ -7,6 +7,7 @@
 
 const astUtil = require('../util/ast');
 const docsUrl = require('../util/docsUrl');
+const isFirstLetterCapitalized = require('../util/isFirstLetterCapitalized');
 const report = require('../util/report');
 const variableUtil = require('../util/variable');
 
@@ -54,32 +55,34 @@ module.exports = {
         return value;
       }
 
-      if (returnNode.type === 'ConditionalExpression') {
-        const possibleReturnValue = [getReturnValue(returnNode.consequent), getReturnValue(returnNode.alternate)];
-        const returnsUndefined = possibleReturnValue.some((val) => val === undefined);
-        if (returnsUndefined) return undefined;
-        return possibleReturnValue;
-      }
-
-      if (returnNode.type === 'CallExpression') {
-        const calleeName = returnNode.callee.name;
-        const calleeNode = variableUtil.variablesInScope(context).find((item) => item.name === calleeName);
-        const calleeDefinitionNode = calleeNode && calleeNode.defs && calleeNode.defs[0] && calleeNode.defs[0].node;
-        const calleeReturnStatement = astUtil.findReturnStatement(calleeDefinitionNode);
-        const calleeReturnNode = (calleeReturnStatement && calleeReturnStatement.argument)
-          || (calleeDefinitionNode.init && calleeDefinitionNode.init.body);
-        return getReturnValue(calleeReturnNode);
-      }
-
-      if (returnNode.type === 'ArrayExpression') {
-        return returnNode.elements;
-      }
-
-      if (returnNode.type === 'JSXElement') {
-        return returnNode;
+      switch (returnNode.type) {
+        case 'LogicalExpression': {
+          return getReturnValue(returnNode.right);
+        }
+        case 'ConditionalExpression': {
+          const possibleReturnValue = [getReturnValue(returnNode.consequent), getReturnValue(returnNode.alternate)];
+          const returnsUndefined = possibleReturnValue.some((val) => val === undefined);
+          if (returnsUndefined) return undefined;
+          return possibleReturnValue;
+        }
+        case 'CallExpression': {
+          const calleeName = returnNode.callee.name;
+          const calleeNode = variableUtil.variablesInScope(context).find((item) => item.name === calleeName);
+          const calleeDefinitionNode = calleeNode && calleeNode.defs && calleeNode.defs[0] && calleeNode.defs[0].node;
+          const calleeReturnStatement = astUtil.findReturnStatement(calleeDefinitionNode);
+          const calleeReturnNode = (calleeReturnStatement && calleeReturnStatement.argument)
+            || (calleeDefinitionNode.init && calleeDefinitionNode.init.body);
+          return getReturnValue(calleeReturnNode);
+        }
+        case 'ArrayExpression': {
+          return returnNode.elements;
+        }
+        case 'JSXElement': {
+          return returnNode;
+        }
+        default:
+          return returnNode.value;
       }
-
-      return returnNode.value;
     }
 
     const isReturningUndefined = (returnStatement) => {
@@ -102,7 +105,7 @@ module.exports = {
       const fnName = (node.id && node.id.name) || node.parent.id.name;
 
       // Considering functions starting with Uppercase letters are react components
-      const isReactComponent = fnName[0] === fnName[0].toUpperCase();
+      const isReactComponent = isFirstLetterCapitalized(fnName);
       const returnStatement = astUtil.findReturnStatement(node);
 
       if (!isReactComponent) return;