Merge branch 'fix/ignore-jsx-callbacks'

Author: joshwilsonvu

docs/components-return-once.md

@@ -106,6 +106,13 @@ function Component(props) {
   return props.primary || <div>{props.secondaryText}</div>;
 }
 
+HOC(() => {
+  if (condition) {
+    return <div />;
+  }
+  return <div />;
+});
+ 
 ```
 
 ### Valid Examples
@@ -131,5 +138,12 @@ function notAComponent() {
   return <div />;
 }
 
+callback(() => {
+  if (condition) {
+    return <div />;
+  }
+  return <div />;
+});
+
 ```
 <!-- AUTO-GENERATED-CONTENT:END -->

src/rules/components-return-once.ts

@@ -62,7 +62,12 @@ const rule: TSESLint.RuleModule<"noEarlyReturn" | "noConditionalReturn", []> = {
     const onFunctionExit = (node: FunctionNode) => {
       if (
         (node.type === "FunctionDeclaration" && node.id?.name?.match(/^[a-z]/)) ||
-        node.parent?.type === "JSXExpressionContainer" // "render props" aren't components
+        // "render props" aren't components
+        node.parent?.type === "JSXExpressionContainer" ||
+        // ignore createMemo(() => conditional JSX), report HOC(() => conditional JSX)
+        (node.parent?.type === "CallExpression" &&
+          node.parent.arguments.some((n) => n === node) &&
+          !(node.parent.callee as T.Identifier).name?.match(/^[A-Z]/))
       ) {
         currentFunction().isComponent = false;
       }

test/rules/components-return-once.test.ts

@@ -18,6 +18,12 @@ export const cases = run("components-return-once", rule, {
       }
       return <div />;
     }`,
+    `callback(() => {
+      if (condition) {
+        return <div />;
+      }
+      return <div />;
+    });`,
   ],
   invalid: [
     // Early returns
@@ -111,5 +117,15 @@ export const cases = run("components-return-once", rule, {
 }`,
       errors: [{ messageId: "noConditionalReturn" }],
     },
+    // HOCs
+    {
+      code: `HOC(() => {
+        if (condition) {
+          return <div />;
+        }
+        return <div />;
+      });`,
+      errors: [{ messageId: "noEarlyReturn" }],
+    },
   ],
 });