Native: keep labeled-arg make, use old-style JSX calls

On native, don't generate the makeProps/wrapper pattern for
[@react.component]. Keep make with its original labeled-arg signature
for backward compatibility with .rei files, .ml call sites, and
first-class modules. Native JSX now generates old-style labeled-arg
calls (Component.make ~prop1:v1 ~children:... ()) instead of
Component.make(Component.makeProps(~prop1:v1, ...)).

Author: davesnx

packages/react/src/React.ml

@@ -512,15 +512,10 @@ let rec cloneElement element new_attributes =
   | Suspense _ -> raise (Invalid_argument "React.cloneElement: cannot clone a Suspense")
 
 module Fragment = struct
-  let makeProps ~children () : < children : element > Js.t =
-    object
-      method children = children
-    end
-
-  let make ?key:_ props = Fragment props#children
+  let make ?key:_ ~children () = Fragment children
 end
 
-let fragment children = Fragment.make (Fragment.makeProps ~children ())
+let fragment children = Fragment.make ~children ()
 
 (* ReasonReact APIs *)
 let string txt = Text txt
@@ -542,13 +537,7 @@ module Context = struct
     consumer : children:element -> element;
   }
 
-  let makeProps ~value ~children () : < value : 'a ; children : element > Js.t =
-    object
-      method value = value
-      method children = children
-    end
-
-  let provider ctx ?key:_ props = ctx.provider ~value:props#value ~children:props#children ()
+  let provider ctx ?key:_ ~value ~children () = ctx.provider ~value ~children ()
 end
 
 let createContext (initial_value : 'a) : 'a Context.t =
@@ -573,14 +562,8 @@ let createContext (initial_value : 'a) : 'a Context.t =
 module Suspense = struct
   let or_react_null = function None -> null | Some x -> x
 
-  let makeProps ?fallback ?children () : < fallback : element option ; children : element option > Js.t =
-    object
-      method fallback = fallback
-      method children = children
-    end
-
-  let make ?key props =
-    Suspense { key; fallback = or_react_null props#fallback; children = or_react_null props#children }
+  let make ?key ?fallback ?children () =
+    Suspense { key; fallback = or_react_null fallback; children = or_react_null children }
 end
 
 module Cache = struct

packages/react/src/React.mli

@@ -608,8 +608,7 @@ and model_value = element Model.t
 exception Invalid_children of string
 
 module Fragment : sig
-  val makeProps : children:element -> unit -> < children : element > Js.t
-  val make : (< children : element > Js.t, element) componentLike
+  val make : ?key:string -> children:element -> unit -> element
 end
 
 val createElement : string -> JSX.prop list -> element list -> element
@@ -633,17 +632,13 @@ module Context : sig
     consumer : children:element -> element;
   }
 
-  val makeProps : value:'a -> children:element -> unit -> < value : 'a ; children : element > Js.t
-  val provider : 'a t -> (< value : 'a ; children : element > Js.t, element) componentLike
+  val provider : 'a t -> ?key:string -> value:'a -> children:element -> unit -> element
 end
 
 val createContext : 'a -> 'a Context.t
 
 module Suspense : sig
-  val makeProps :
-    ?fallback:element -> ?children:element -> unit -> < fallback : element option ; children : element option > Js.t
-
-  val make : (< fallback : element option ; children : element option > Js.t, element) componentLike
+  val make : ?key:string -> ?fallback:element -> ?children:element -> unit -> element
 end
 
 module Cache : sig

packages/server-reason-react-ppx/server_reason_react_ppx.ml

@@ -99,7 +99,8 @@ let component_make_props_ident tag =
 
 let is_key_arg (label, _) = match label with Optional "key" | Labelled "key" -> true | _ -> false
 
-let rewrite_component ~loc tag args children =
+(* JSX rewrite for JS/melange: Component.make(Component.makeProps(~prop1:v1, ...)) *)
+let rewrite_component_js ~loc tag args children =
   let component = pexp_ident ~loc tag in
   let props_args =
     match children with
@@ -116,6 +117,32 @@ let rewrite_component ~loc tag args children =
   in
   pexp_apply ~loc component make_args
 
+(* JSX rewrite for native: Component.make(~prop1:v1, ~children:..., ()) -- old-style labeled args.
+   Note: args already includes a trailing (Nolabel, ()) from the JSX parse, so we don't add another. *)
+let rewrite_component_native ~loc tag args children =
+  (* tag is already Ldot(Module, "make") from the caller (line ~1507),
+     or Lident "local_fn" from line ~1510. For Lident, append .make. *)
+  let make_ident =
+    match tag with
+    | { txt = Ldot (_, "make"); _ } -> pexp_ident ~loc tag (* already Module.make *)
+    | { txt = Lident name; loc } -> pexp_ident ~loc { txt = Ldot (Lident name, "make"); loc }
+    | { txt = Ldot (path, name); loc } -> pexp_ident ~loc { txt = Ldot (Ldot (path, name), "make"); loc }
+    | { txt = Lapply _; loc } -> raise_errorf ~loc "jsx: can't use functor application in JSX"
+  in
+  let args_no_unit = strip_unit_args args in
+  let props_args =
+    match children with
+    | None -> args_no_unit
+    | Some [ children ] -> (Labelled "children", children) :: args_no_unit
+    | Some children -> (Labelled "children", [%expr React.list [%e pexp_list ~loc children]]) :: args_no_unit
+  in
+  pexp_apply ~loc make_ident (props_args @ [ (Nolabel, [%expr ()]) ])
+
+let rewrite_component ~loc tag args children =
+  match mode.contents with
+  | Js -> rewrite_component_js ~loc tag args children
+  | Native -> rewrite_component_native ~loc tag args children
+
 let validate_prop ~loc id name =
   match DomProps.findByJsxName ~tag:id name with
   | Ok p -> p
@@ -1356,41 +1383,14 @@ let rewrite_structure_item ~nested_module_names structure_item =
           else None
         in
         let rewrites = List.map value_bindings ~f:rewrite_component_binding in
-        let make_props_bindings =
-          List.filter_map rewrites ~f:(function
-            | Some (_, make_props_binding, _) -> Some make_props_binding
-            | None -> None)
-        in
-        let public_bindings =
-          List.filter_map rewrites ~f:(function Some (_, _, public_binding) -> Some public_binding | None -> None)
-        in
         let internal_bindings =
           List.map2 value_bindings rewrites ~f:(fun vb rewrite ->
               match rewrite with Some (internal_binding, _, _) -> internal_binding | None -> vb)
         in
-        match make_props_bindings with
-        | [] -> pstr_value ~loc:structure_item.pstr_loc rec_flag internal_bindings
-        | _ -> (
-            let loc = structure_item.pstr_loc in
-            (* Propagate non-react attributes from the original bindings to the
-               include struct. This ensures attributes like [@platform js] or
-               [@browser_only] are visible to subsequent ppxes (e.g. browser_ppx) so they can drop the entire include when needed. *)
-            let propagated_attrs =
-              List.concat_map value_bindings ~f:(fun vb ->
-                  List.filter vb.pvb_attributes ~f:(fun attr -> not (is_react_attr attr)))
-            in
-            let include_stri =
-              [%stri
-                include struct
-                  [%%i pstr_value ~loc:structure_item.pstr_loc Nonrecursive make_props_bindings]
-                  [%%i pstr_value ~loc:structure_item.pstr_loc rec_flag internal_bindings]
-                  [%%i pstr_value ~loc:structure_item.pstr_loc Nonrecursive public_bindings]
-                end]
-            in
-            match (propagated_attrs, include_stri.pstr_desc) with
-            | _ :: _, Pstr_include incl ->
-                { include_stri with pstr_desc = Pstr_include { incl with pincl_attributes = propagated_attrs } }
-            | _ -> include_stri)
+        (* On native, keep make with labeled args (no wrapper) for backward
+           compatibility with .rei files, .ml call sites, and first-class modules.
+           Native JSX uses old-style labeled arg calls, so makeProps/wrapper aren't needed. *)
+        pstr_value ~loc:structure_item.pstr_loc rec_flag internal_bindings
       with Error err -> pstr_eval ~loc:structure_item.pstr_loc err [])
   | _ -> structure_item
 

tasks/plan-08-action-formdata-protocol-progressive-ench.md

@@ -111,11 +111,9 @@ React's client-side `encodeFormAction` callback converts a server reference into
 - [ ] Replace the `useActionState` stub in `packages/react/src/React.ml:878` with a real implementation that works with the form state protocol.
 - [ ] This enables progressive enhancement for stateful form actions (showing optimistic updates, handling errors).
 
-### Phase 6: Bound server references (optional, future)
+### Phase 6: Bound server references → moved to plan-12
 
-- [ ] Support `$ACTION_REF_` for bound server references (server functions with pre-filled arguments via `.bind()`).
-- [ ] This requires changes to `Runtime.server_function` to carry a `bound` field and to the PPX to support partial application of server functions.
-- [ ] The `action_to_json` function in `ReactServerDOM.ml:198` currently always emits `"bound": null`; this would need to emit the bound arguments when present.
+Moved to `tasks/plan-12-bound-server-references.md`. Includes `$ACTION_REF_` support, `encode_bound` on `Runtime.server_function`, and PPX changes for partial application.
 
 ## Design