Latest syntax: better treatment of spread props.

Author: cristianoc

lib/4.06.1/unstable/js_compiler.ml

@@ -272980,6 +272980,7 @@ let makeModuleName fileName nestedModules fnName =
 
 (* make record from props and spread props if exists *)
 let recordFromProps ~loc ~removeKey callArguments =
+  let spreadPropsLabel = "_spreadProps" in
   let rec removeLastPositionUnitAux props acc =
     match props with
     | [] -> acc
@@ -272988,7 +272989,16 @@ let recordFromProps ~loc ~removeKey callArguments =
     | (Nolabel, {pexp_loc}) :: _rest ->
       React_jsx_common.raiseError ~loc:pexp_loc
         "JSX: found non-labelled argument before the last position"
-    | prop :: rest -> removeLastPositionUnitAux rest (prop :: acc)
+    | ((Labelled txt, {pexp_loc}) as prop) :: rest
+    | ((Optional txt, {pexp_loc}) as prop) :: rest ->
+      if txt = spreadPropsLabel then
+        match acc with
+        | [] -> removeLastPositionUnitAux rest (prop :: acc)
+        | _ ->
+          React_jsx_common.raiseError ~loc:pexp_loc
+            "JSX: use {...p} {x: v} not {x: v} {...p} \n\
+            \     multiple spreads {...p} {...p} not allowed."
+      else removeLastPositionUnitAux rest (prop :: acc)
   in
   let props, propsToSpread =
     removeLastPositionUnitAux callArguments []
@@ -273013,20 +273023,17 @@ let recordFromProps ~loc ~removeKey callArguments =
   let spreadFields =
     propsToSpread |> List.map (fun (_, expression) -> expression)
   in
-  match spreadFields with
-  | [] ->
+  match (fields, spreadFields) with
+  | [], [spreadProps] | [], spreadProps :: _ -> spreadProps
+  | _, [] ->
     {
       pexp_desc = Pexp_record (fields, None);
       pexp_loc = loc;
       pexp_attributes = [];
     }
-  | [spreadProps] ->
-    {
-      pexp_desc = Pexp_record (fields, Some spreadProps);
-      pexp_loc = loc;
-      pexp_attributes = [];
-    }
-  | spreadProps :: _ ->
+  | _, [spreadProps]
+  (* take the first spreadProps only *)
+  | _, spreadProps :: _ ->
     {
       pexp_desc = Pexp_record (fields, Some spreadProps);
       pexp_loc = loc;

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -274443,6 +274443,7 @@ let makeModuleName fileName nestedModules fnName =
 
 (* make record from props and spread props if exists *)
 let recordFromProps ~loc ~removeKey callArguments =
+  let spreadPropsLabel = "_spreadProps" in
   let rec removeLastPositionUnitAux props acc =
     match props with
     | [] -> acc
@@ -274451,7 +274452,16 @@ let recordFromProps ~loc ~removeKey callArguments =
     | (Nolabel, {pexp_loc}) :: _rest ->
       React_jsx_common.raiseError ~loc:pexp_loc
         "JSX: found non-labelled argument before the last position"
-    | prop :: rest -> removeLastPositionUnitAux rest (prop :: acc)
+    | ((Labelled txt, {pexp_loc}) as prop) :: rest
+    | ((Optional txt, {pexp_loc}) as prop) :: rest ->
+      if txt = spreadPropsLabel then
+        match acc with
+        | [] -> removeLastPositionUnitAux rest (prop :: acc)
+        | _ ->
+          React_jsx_common.raiseError ~loc:pexp_loc
+            "JSX: use {...p} {x: v} not {x: v} {...p} \n\
+            \     multiple spreads {...p} {...p} not allowed."
+      else removeLastPositionUnitAux rest (prop :: acc)
   in
   let props, propsToSpread =
     removeLastPositionUnitAux callArguments []
@@ -274476,20 +274486,17 @@ let recordFromProps ~loc ~removeKey callArguments =
   let spreadFields =
     propsToSpread |> List.map (fun (_, expression) -> expression)
   in
-  match spreadFields with
-  | [] ->
+  match (fields, spreadFields) with
+  | [], [spreadProps] | [], spreadProps :: _ -> spreadProps
+  | _, [] ->
     {
       pexp_desc = Pexp_record (fields, None);
       pexp_loc = loc;
       pexp_attributes = [];
     }
-  | [spreadProps] ->
-    {
-      pexp_desc = Pexp_record (fields, Some spreadProps);
-      pexp_loc = loc;
-      pexp_attributes = [];
-    }
-  | spreadProps :: _ ->
+  | _, [spreadProps]
+  (* take the first spreadProps only *)
+  | _, spreadProps :: _ ->
     {
       pexp_desc = Pexp_record (fields, Some spreadProps);
       pexp_loc = loc;

lib/4.06.1/whole_compiler.ml

@@ -284822,6 +284822,7 @@ let makeModuleName fileName nestedModules fnName =
 
 (* make record from props and spread props if exists *)
 let recordFromProps ~loc ~removeKey callArguments =
+  let spreadPropsLabel = "_spreadProps" in
   let rec removeLastPositionUnitAux props acc =
     match props with
     | [] -> acc
@@ -284830,7 +284831,16 @@ let recordFromProps ~loc ~removeKey callArguments =
     | (Nolabel, {pexp_loc}) :: _rest ->
       React_jsx_common.raiseError ~loc:pexp_loc
         "JSX: found non-labelled argument before the last position"
-    | prop :: rest -> removeLastPositionUnitAux rest (prop :: acc)
+    | ((Labelled txt, {pexp_loc}) as prop) :: rest
+    | ((Optional txt, {pexp_loc}) as prop) :: rest ->
+      if txt = spreadPropsLabel then
+        match acc with
+        | [] -> removeLastPositionUnitAux rest (prop :: acc)
+        | _ ->
+          React_jsx_common.raiseError ~loc:pexp_loc
+            "JSX: use {...p} {x: v} not {x: v} {...p} \n\
+            \     multiple spreads {...p} {...p} not allowed."
+      else removeLastPositionUnitAux rest (prop :: acc)
   in
   let props, propsToSpread =
     removeLastPositionUnitAux callArguments []
@@ -284855,20 +284865,17 @@ let recordFromProps ~loc ~removeKey callArguments =
   let spreadFields =
     propsToSpread |> List.map (fun (_, expression) -> expression)
   in
-  match spreadFields with
-  | [] ->
+  match (fields, spreadFields) with
+  | [], [spreadProps] | [], spreadProps :: _ -> spreadProps
+  | _, [] ->
     {
       pexp_desc = Pexp_record (fields, None);
       pexp_loc = loc;
       pexp_attributes = [];
     }
-  | [spreadProps] ->
-    {
-      pexp_desc = Pexp_record (fields, Some spreadProps);
-      pexp_loc = loc;
-      pexp_attributes = [];
-    }
-  | spreadProps :: _ ->
+  | _, [spreadProps]
+  (* take the first spreadProps only *)
+  | _, spreadProps :: _ ->
     {
       pexp_desc = Pexp_record (fields, Some spreadProps);
       pexp_loc = loc;