Revert "jsx: allow locally abstract types and type constraints on @react.component definitions (#487)"

src/reactjs_jsx_ppx_v3.ml

@@ -93,10 +93,9 @@ let otherAttrsPure (loc, _) = loc.txt <> "react.component"
 let hasAttrOnBinding { pvb_attributes } = find_opt hasAttr pvb_attributes <> None
 
 (* Finds the name of the variable the binding is assigned to, otherwise raises Invalid_argument *)
-let rec getFnName binding =
+let getFnName binding =
   match binding with
-  | { ppat_desc = Ppat_var { txt } } -> txt
-  | { ppat_desc = Ppat_constraint (pat, _) } -> getFnName pat
+  | { pvb_pat = { ppat_desc = Ppat_var { txt } } } -> txt
   | _ -> raise (Invalid_argument "react.component calls cannot be destructured.")
   [@@raises Invalid_argument]
 
@@ -488,7 +487,7 @@ let jsxMapper () =
             let bindingLoc = binding.pvb_loc in
             let bindingPatLoc = binding.pvb_pat.ppat_loc in
             let binding = { binding with pvb_pat = { binding.pvb_pat with ppat_loc = emptyLoc }; pvb_loc = emptyLoc } in
-            let fnName = getFnName binding.pvb_pat in
+            let fnName = getFnName binding in
             let internalFnName = fnName ^ "$Internal" in
             let fullModuleName = makeModuleName fileName !nestedModules fnName in
             let modifiedBindingOld binding =
@@ -507,10 +506,6 @@ let jsxMapper () =
                     spelunkForFunExpression innerFunctionExpression
                 | { pexp_desc = Pexp_sequence (_wrapperExpression, innerFunctionExpression) } ->
                     spelunkForFunExpression innerFunctionExpression
-                | { pexp_desc = Pexp_newtype (_label, innerFunctionExpression) } ->
-                    spelunkForFunExpression innerFunctionExpression
-                | { pexp_desc = Pexp_constraint (innerFunctionExpression, _typ) } ->
-                    spelunkForFunExpression innerFunctionExpression
                 | _ ->
                     raise
                       (Invalid_argument