JSX V4: allow uncurried make function and treat it as usual (#5802)

* PPX V4: allow uncurried `make` function and treat it as usual

* Update CHANGELOG.md

Author: cristianoc

CHANGELOG.md

@@ -15,7 +15,6 @@
 #### :rocket: New Feature
 
 - Introduce experimental uncurried by default mode. Can be turned on mid-file by adding standalone annotation `@@uncurried`. For experimentation only. https://github.com/rescript-lang/rescript-compiler/pull/5796
-
 - Adding `@@toUncurried` to the file and reformat will convert to uncurried syntax https://github.com/rescript-lang/rescript-compiler/pull/5800
 
 #### :boom: Breaking Change
@@ -34,7 +33,7 @@ These are only breaking changes for unformatted code.
 
 - Syntax: process uncurried types explicitly in the parser/printer https://github.com/rescript-lang/rescript-compiler/pull/5784
 - Syntax: process uncurried function declarations explicitly in the parser/printer https://github.com/rescript-lang/rescript-compiler/pull/5794
-
+- PPX V4: allow uncurried `make` function and treat it like a currie one https://github.com/rescript-lang/rescript-compiler/pull/5802
 
 # 10.1.0-rc.5
 

lib/4.06.1/unstable/js_compiler.ml

@@ -154485,6 +154485,13 @@ let transformStructureItem ~config mapper item =
           React_jsx_common.raiseErrorMultipleReactComponent ~loc:pstr_loc
         else (
           config.hasReactComponent <- true;
+          let binding =
+            match binding.pvb_expr.pexp_desc with
+            | Pexp_record
+                ([({txt = Ldot (Ldot (Lident "Js", "Fn"), _)}, e)], None) ->
+              {binding with pvb_expr = e}
+            | _ -> binding
+          in
           let coreTypeOfAttr =
             React_jsx_common.coreTypeOfAttrs binding.pvb_attributes
           in
@@ -154897,6 +154904,11 @@ let transformSignatureItem ~config _mapper item =
       if config.React_jsx_common.hasReactComponent then
         React_jsx_common.raiseErrorMultipleReactComponent ~loc:psig_loc
       else config.hasReactComponent <- true;
+      let pval_type =
+        match pval_type.ptyp_desc with
+        | Ptyp_constr ({txt = Ldot (Ldot (Lident "Js", "Fn"), _)}, [t]) -> t
+        | _ -> pval_type
+      in
       check_string_int_attribute_iter.signature_item
         check_string_int_attribute_iter item;
       let hasForwardRef = ref false in

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -154485,6 +154485,13 @@ let transformStructureItem ~config mapper item =
           React_jsx_common.raiseErrorMultipleReactComponent ~loc:pstr_loc
         else (
           config.hasReactComponent <- true;
+          let binding =
+            match binding.pvb_expr.pexp_desc with
+            | Pexp_record
+                ([({txt = Ldot (Ldot (Lident "Js", "Fn"), _)}, e)], None) ->
+              {binding with pvb_expr = e}
+            | _ -> binding
+          in
           let coreTypeOfAttr =
             React_jsx_common.coreTypeOfAttrs binding.pvb_attributes
           in
@@ -154897,6 +154904,11 @@ let transformSignatureItem ~config _mapper item =
       if config.React_jsx_common.hasReactComponent then
         React_jsx_common.raiseErrorMultipleReactComponent ~loc:psig_loc
       else config.hasReactComponent <- true;
+      let pval_type =
+        match pval_type.ptyp_desc with
+        | Ptyp_constr ({txt = Ldot (Ldot (Lident "Js", "Fn"), _)}, [t]) -> t
+        | _ -> pval_type
+      in
       check_string_int_attribute_iter.signature_item
         check_string_int_attribute_iter item;
       let hasForwardRef = ref false in
@@ -168684,7 +168696,14 @@ and parseStandaloneAttribute p =
   let startPos = p.startPos in
   Parser.expect AtAt p;
   let attrId = parseAttributeId ~startPos p in
-  if attrId.txt = "uncurried" then p.uncurried_by_default <- true;
+  let attrId =
+    match attrId.txt with
+    | "uncurried" ->
+      p.uncurried_by_default <- true;
+      attrId
+    | "toUncurried" -> {attrId with txt = "uncurried"}
+    | _ -> attrId
+  in
   let payload = parsePayload p in
   (attrId, payload)
 

lib/4.06.1/whole_compiler.ml

@@ -164769,6 +164769,13 @@ let transformStructureItem ~config mapper item =
           React_jsx_common.raiseErrorMultipleReactComponent ~loc:pstr_loc
         else (
           config.hasReactComponent <- true;
+          let binding =
+            match binding.pvb_expr.pexp_desc with
+            | Pexp_record
+                ([({txt = Ldot (Ldot (Lident "Js", "Fn"), _)}, e)], None) ->
+              {binding with pvb_expr = e}
+            | _ -> binding
+          in
           let coreTypeOfAttr =
             React_jsx_common.coreTypeOfAttrs binding.pvb_attributes
           in
@@ -165181,6 +165188,11 @@ let transformSignatureItem ~config _mapper item =
       if config.React_jsx_common.hasReactComponent then
         React_jsx_common.raiseErrorMultipleReactComponent ~loc:psig_loc
       else config.hasReactComponent <- true;
+      let pval_type =
+        match pval_type.ptyp_desc with
+        | Ptyp_constr ({txt = Ldot (Ldot (Lident "Js", "Fn"), _)}, [t]) -> t
+        | _ -> pval_type
+      in
       check_string_int_attribute_iter.signature_item
         check_string_int_attribute_iter item;
       let hasForwardRef = ref false in
@@ -182116,7 +182128,14 @@ and parseStandaloneAttribute p =
   let startPos = p.startPos in
   Parser.expect AtAt p;
   let attrId = parseAttributeId ~startPos p in
-  if attrId.txt = "uncurried" then p.uncurried_by_default <- true;
+  let attrId =
+    match attrId.txt with
+    | "uncurried" ->
+      p.uncurried_by_default <- true;
+      attrId
+    | "toUncurried" -> {attrId with txt = "uncurried"}
+    | _ -> attrId
+  in
   let payload = parsePayload p in
   (attrId, payload)
 

res_syntax/cli/reactjs_jsx_v4.ml

@@ -817,6 +817,13 @@ let transformStructureItem ~config mapper item =
           React_jsx_common.raiseErrorMultipleReactComponent ~loc:pstr_loc
         else (
           config.hasReactComponent <- true;
+          let binding =
+            match binding.pvb_expr.pexp_desc with
+            | Pexp_record
+                ([({txt = Ldot (Ldot (Lident "Js", "Fn"), _)}, e)], None) ->
+              {binding with pvb_expr = e}
+            | _ -> binding
+          in
           let coreTypeOfAttr =
             React_jsx_common.coreTypeOfAttrs binding.pvb_attributes
           in
@@ -1229,6 +1236,11 @@ let transformSignatureItem ~config _mapper item =
       if config.React_jsx_common.hasReactComponent then
         React_jsx_common.raiseErrorMultipleReactComponent ~loc:psig_loc
       else config.hasReactComponent <- true;
+      let pval_type =
+        match pval_type.ptyp_desc with
+        | Ptyp_constr ({txt = Ldot (Ldot (Lident "Js", "Fn"), _)}, [t]) -> t
+        | _ -> pval_type
+      in
       check_string_int_attribute_iter.signature_item
         check_string_int_attribute_iter item;
       let hasForwardRef = ref false in

res_syntax/tests/ppx/react/expected/v4.res.txt

@@ -21,3 +21,24 @@ module AnotherName = {
     \"V4$AnotherName$anotherName"
   }
 }
+
+module Uncurried = {
+  type props<'x> = {
+    x: 'x,
+  }
+
+  @react.component let make = ({x, _}: props<'x>) => React.string(x)
+  let make = {
+    let \"V4$Uncurried" = (props: props<_>) => make(props)
+
+    \"V4$Uncurried"
+  }
+}
+
+module type TUncurried = {
+  type props<'x> = {
+    x: 'x,
+  }
+
+  let make: React.componentLike<props<string>, React.element>
+}

res_syntax/tests/ppx/react/v4.res

@@ -7,3 +7,13 @@ module AnotherName = {
   @react.component
   let anotherName = (~x) => React.string(x)
 }
+
+module Uncurried = {
+  @react.component
+  let make = (. ~x) => React.string(x)
+}
+
+module type TUncurried = {
+  @react.component
+  let make: (. ~x: string) => React.element
+}