Support keyed and prop spreading

compiler/core/js_dump.ml

@@ -580,6 +580,27 @@ and expression_desc cxt ~(level : int) f x : cxt =
         visit [] props
       in
       print_jsx cxt ~level ~spread_props f fnName tag fields
+    (* In the case of prop spreading and keyed *)
+    | [tag; ({expression_desc = J.Seq _} as props); key] ->
+      let fields, spread_props =
+        let rec visit acc e =
+          match e.J.expression_desc with
+          | J.Seq
+              ( {
+                  J.expression_desc =
+                    J.Bin
+                      ( Js_op.Eq,
+                        {J.expression_desc = J.Static_index (_, name, _)},
+                        value );
+                },
+                rest ) ->
+            visit ((name, value) :: acc) rest
+          | _ -> (List.rev acc, e)
+        in
+        visit [] props
+      in
+      let fields = ("key", key) :: fields in
+      print_jsx cxt ~level ~spread_props f fnName tag fields
     | _ ->
       expression_desc cxt ~level f
         (Call

tests/tests/src/nojaf.mjs

@@ -38,9 +38,7 @@ let _unary_element_with_spread_props = <input {...newrecord}  type={"text"}/>;
 
 let newrecord$1 = {...baseProps};
 
-let _container_with_spread_props = <div {...newrecord$1}  title={"barry"} className={"barry"}>{"Hello, world!"}
-<input type={"text"}/>
-</div>;
+let _container_with_spread_props = <div {...newrecord$1}  title={"barry"} className={"barry"}>{"Hello, world!"}<input type={"text"}/></div>;
 
 let baseChildren = [
   <span>{"Hello, world!"}</span>,
@@ -51,8 +49,15 @@ let _container_with_spread_children = <div className={"barry"} title={"barry"}>{
 
 let newrecord$2 = {...baseProps};
 
-let _container_with_spread_props_and_children = <div {...newrecord$2}  title={"barry"} className={"barry"}>{baseChildren}
-</div>;
+let _container_with_spread_props_and_children = <div {...newrecord$2}  title={"barry"} className={"barry"}>{baseChildren}</div>;
+
+let newrecord$3 = {...baseProps};
+
+let _unary_element_with_spread_props_keyed = <input {...newrecord$3}  key={"barry-key"} type={"text"}/>;
+
+let newrecord$4 = {...baseProps};
+
+let _container_with_spread_props_keyed = <div {...newrecord$4}  key={"barry-key"} title={"barry"} className={"barry"}>{"Hello, world!"}<input type={"text"}/></div>;
 
 export {
   React,
@@ -70,5 +75,7 @@ export {
   baseChildren,
   _container_with_spread_children,
   _container_with_spread_props_and_children,
+  _unary_element_with_spread_props_keyed,
+  _container_with_spread_props_keyed,
 }
 /* _single_element_child Not a pure module */

tests/tests/src/nojaf.res

@@ -122,3 +122,11 @@ let _container_with_spread_children = <div title="barry" className="barry"> ...b
 
 let _container_with_spread_props_and_children =
   <div {...baseProps} title="barry" className="barry"> ...baseChildren </div>
+
+let _unary_element_with_spread_props_keyed = <input {...baseProps} type_="text" key="barry-key" />
+
+let _container_with_spread_props_keyed =
+  <div {...baseProps} title="barry" className="barry" key="barry-key">
+    {React.string("Hello, world!")}
+    <input type_="text" />
+  </div>