From dae81ed13df0d1bfa3e902de23cfb5048e42c665 Mon Sep 17 00:00:00 2001
From: merrywhether <r@risto.io>
Date: Mon, 28 Aug 2023 14:31:43 -0700
Subject: [PATCH] fix(eslint-plugin): support JSX attrs in
 allowTypedFunctionExpressions

---
 .../rules/explicit-function-return-type.md    |  4 +
 .../src/util/explicitReturnTypeUtils.ts       | 75 ++++++++++++-------
 .../explicit-function-return-type.test.ts     | 62 +++++++++++++++
 3 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/packages/eslint-plugin/docs/rules/explicit-function-return-type.md b/packages/eslint-plugin/docs/rules/explicit-function-return-type.md
index 0d0e476d576..5ed8aec0096 100644
--- a/packages/eslint-plugin/docs/rules/explicit-function-return-type.md
+++ b/packages/eslint-plugin/docs/rules/explicit-function-return-type.md
@@ -172,6 +172,10 @@ functionWithObjectArg({
     return 1;
   },
 });
+
+const Comp: FC = () => {
+  return <button onClick={() => {}} />;
+};
 ```
 
 ### `allowHigherOrderFunctions`
diff --git a/packages/eslint-plugin/src/util/explicitReturnTypeUtils.ts b/packages/eslint-plugin/src/util/explicitReturnTypeUtils.ts
index a47b101e07c..a46130cb426 100644
--- a/packages/eslint-plugin/src/util/explicitReturnTypeUtils.ts
+++ b/packages/eslint-plugin/src/util/explicitReturnTypeUtils.ts
@@ -37,6 +37,51 @@ function isPropertyDefinitionWithTypeAnnotation(
   );
 }
 
+/**
+ * Checks if a node belongs to:
+ * ```
+ * foo(() => 1)
+ * ```
+ */
+function isFunctionArgument(
+  parent: TSESTree.Node,
+  callee?: FunctionExpression,
+): parent is TSESTree.CallExpression {
+  return (
+    parent.type === AST_NODE_TYPES.CallExpression &&
+    // make sure this isn't an IIFE
+    parent.callee !== callee
+  );
+}
+
+/**
+ * Checks if a node is an expression in a JSX attribute assignment
+ * ```
+ * <Comp x={...} />
+ * ```
+ */
+function isJSXAttribute(
+  node: TSESTree.Node,
+): node is TSESTree.JSXExpressionContainer | TSESTree.JSXSpreadAttribute {
+  return (
+    node.type === AST_NODE_TYPES.JSXExpressionContainer ||
+    node.type === AST_NODE_TYPES.JSXSpreadAttribute
+  );
+}
+
+function isTypedParent(
+  parent: TSESTree.Node,
+  callee?: FunctionExpression,
+): boolean {
+  return (
+    isTypeAssertion(parent) ||
+    isVariableDeclaratorWithTypeAnnotation(parent) ||
+    isPropertyDefinitionWithTypeAnnotation(parent) ||
+    isFunctionArgument(parent, callee) ||
+    isJSXAttribute(parent)
+  );
+}
+
 /**
  * Checks if a node belongs to:
  * ```
@@ -78,13 +123,7 @@ function isPropertyOfObjectWithType(
     return false;
   }
 
-  return (
-    isTypeAssertion(parent) ||
-    isPropertyDefinitionWithTypeAnnotation(parent) ||
-    isVariableDeclaratorWithTypeAnnotation(parent) ||
-    isFunctionArgument(parent) ||
-    isPropertyOfObjectWithType(parent)
-  );
+  return isTypedParent(parent) || isPropertyOfObjectWithType(parent);
 }
 
 /**
@@ -127,23 +166,6 @@ function doesImmediatelyReturnFunctionExpression({
   );
 }
 
-/**
- * Checks if a node belongs to:
- * ```
- * foo(() => 1)
- * ```
- */
-function isFunctionArgument(
-  parent: TSESTree.Node,
-  callee?: FunctionExpression,
-): parent is TSESTree.CallExpression {
-  return (
-    parent.type === AST_NODE_TYPES.CallExpression &&
-    // make sure this isn't an IIFE
-    parent.callee !== callee
-  );
-}
-
 /**
  * Checks if a function belongs to:
  * ```
@@ -194,11 +216,8 @@ function isTypedFunctionExpression(
   }
 
   return (
-    isTypeAssertion(parent) ||
-    isVariableDeclaratorWithTypeAnnotation(parent) ||
-    isPropertyDefinitionWithTypeAnnotation(parent) ||
+    isTypedParent(parent, node) ||
     isPropertyOfObjectWithType(parent) ||
-    isFunctionArgument(parent, node) ||
     isConstructorArgument(parent)
   );
 }
diff --git a/packages/eslint-plugin/tests/rules/explicit-function-return-type.test.ts b/packages/eslint-plugin/tests/rules/explicit-function-return-type.test.ts
index d65263a9c02..1359f4f256b 100644
--- a/packages/eslint-plugin/tests/rules/explicit-function-return-type.test.ts
+++ b/packages/eslint-plugin/tests/rules/explicit-function-return-type.test.ts
@@ -180,6 +180,46 @@ class App {
       `,
       options: [{ allowTypedFunctionExpressions: true }],
     },
+    // https://github.com/typescript-eslint/typescript-eslint/issues/7552
+    {
+      code: `
+const Comp: FC = () => {
+  return <button onClick={() => {}} />;
+};
+      `,
+      options: [{ allowTypedFunctionExpressions: true }],
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+    {
+      code: `
+const Comp: FC = () => {
+  return <Button on={{ click: () => {} }} />;
+};
+      `,
+      options: [{ allowTypedFunctionExpressions: true }],
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+    {
+      code: `
+const Comp: FC = () => {
+  return <button {...{ onClick: () => {} }} />;
+};
+      `,
+      options: [{ allowTypedFunctionExpressions: true }],
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
     // https://github.com/typescript-eslint/typescript-eslint/issues/525
     {
       code: `
@@ -977,6 +1017,28 @@ const x: Foo = {
         },
       ],
     },
+    {
+      code: `
+const Comp = (): JSX.Element => {
+  return <button onClick={() => {}} />;
+};
+      `,
+      options: [{ allowTypedFunctionExpressions: false }],
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+      errors: [
+        {
+          messageId: 'missingReturnType',
+          line: 3,
+          endLine: 3,
+          column: 30,
+          endColumn: 32,
+        },
+      ],
+    },
     {
       code: '() => () => {};',
       options: [{ allowHigherOrderFunctions: true }],