fix parse spread props in jsx

Author: mununki

res_syntax/src/res_core.ml

@@ -2724,7 +2724,7 @@ and parseJsxProp p =
         (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr [])
       in
       let attrExpr =
-        let e = parsePrimaryExpr ~operand:(parseAtomicExpr p) p in
+        let e = parsePrimaryExpr ~operand:(parseExpr p) p in
         {e with pexp_attributes = propLocAttr :: e.pexp_attributes}
       in
       (* using label "spreadProps" to distinguish from others *)

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

@@ -1,35 +1,60 @@
+@@jsxConfig({version: 4, mode: "classic"})
+// Error: spreadProps should be first in order than other props
+// let c0 = <A x="x" {...p} />
 
-  Syntax error!
-  tests/ppx/react/spreadProps.res:24:23-24
+// Error: multiple spreadProps not allowed
+// let c0 = <A x="x" {...p0} {...p1} />
 
-  22 │ // both need to be parsed
-  23 │ let c6 = <A {...(params->Obj.magic)} />
-  24 │ let c7 = <A {...params->Obj.magic} />
-  25 │ 
-  26 │ @@jsxConfig({version:4, mode: "automatic"})
+// only spread props
+let c1 = React.createElement(A.make, p)
 
-  I'm not sure what to parse here when looking at "->".
+// reversed order
+let c2 = React.createElement(A.make, {...p, x: "x"})
 
+let c3 = ReactDOM.createDOMElementVariadic("div", ~props=p, [])
 
-  Syntax error!
-  tests/ppx/react/spreadProps.res:24:25-27
+let c4 = ReactDOM.createDOMElementVariadic("div", ~props={...p, x: "x", key: "k"}, [])
 
-  22 │ // both need to be parsed
-  23 │ let c6 = <A {...(params->Obj.magic)} />
-  24 │ let c7 = <A {...params->Obj.magic} />
-  25 │ 
-  26 │ @@jsxConfig({version:4, mode: "automatic"})
+let c4 = ReactDOM.createDOMElementVariadic(
+  "div",
+  ~props={...p, key: "k"},
+  [ReactDOM.createDOMElementVariadic("br", []), ReactDOM.createDOMElementVariadic("br", [])],
+)
 
-  consecutive statements on a line must be separated by ';' or a newline
+let c5 = ReactDOM.createDOMElementVariadic(
+  "div",
+  ~props={...p, key: "k"},
+  [ReactDOM.createDOMElementVariadic("br", []), ReactDOM.createDOMElementVariadic("br", [])],
+)
 
+// both need to be parsed
+let c6 = React.createElement(A.make, params->Obj.magic)
+let c7 = React.createElement(A.make, params->Obj.magic)
 
-  Syntax error!
-  tests/ppx/react/spreadProps.res:47:23-24
+@@jsxConfig({version: 4, mode: "automatic"})
+// Error: spreadProps should be first in order than other props
+// let c0 = <A x="x" {...p} />
 
-  45 │ // both need to be parsed
-  46 │ let c6 = <A {...(params->Obj.magic)} />
-  47 │ let c7 = <A {...params->Obj.magic} />
-  48 │ 
+// Error: multiple spreadProps not allowed
+// let c0 = <A x="x" {...p0} {...p1} />
 
-  I'm not sure what to parse here when looking at "->".
+// only spread props
+let c1 = React.jsx(A.make, p)
 
+// reversed order
+let c2 = React.jsx(A.make, {...p, x: "x"})
+
+let c3 = ReactDOM.jsx("div", p)
+
+let c4 = ReactDOM.jsxKeyed("div", {...p, x: "x"}, ~key="k", ())
+
+let c5 = ReactDOM.jsxsKeyed(
+  "div",
+  {...p, children: React.array([ReactDOM.jsx("br", {}), ReactDOM.jsx("br", {})])},
+  ~key="k",
+  (),
+)
+
+// both need to be parsed
+let c6 = React.jsx(A.make, params->Obj.magic)
+let c7 = React.jsx(A.make, params->Obj.magic)