Allow multiple dotdotdot

Author: cristianoc

jscomp/core/record_attributes_check.ml

@@ -81,7 +81,8 @@ let rec check_duplicated_labels_aux (lbls : Parsetree.label_declaration list)
   match lbls with
   | [] -> None
   | { pld_name = { txt } as pld_name; pld_attributes } :: rest -> (
-      if Set_string.mem coll txt then Some pld_name
+      (* TODO: this operates on the parse tree and does not know about expansion *)
+      if Set_string.mem coll txt && txt <> "dotdotdot" then Some pld_name
       else
         let coll_with_lbl = Set_string.add coll txt in
         match Ext_list.find_opt pld_attributes find_name_with_loc with

jscomp/ml/typedecl.ml

@@ -447,7 +447,7 @@ let transl_declaration env sdecl id =
               else Record_regular
           in
           let lbls, lbls' = match lbls, lbls' with
-            | {ld_name = {txt = "dotdotdot"}; ld_type} :: rest, _ :: rest' ->
+            | {ld_name = {txt = "dotdotdot"}; ld_type} :: _, _ :: _ ->
               let rec extract t = match t.desc with
                 | Tpoly(t, []) -> extract t
                 | _ -> Ctype.repr t in
@@ -458,14 +458,17 @@ let transl_declaration env sdecl id =
                   ld_type = {ld_type with ctyp_type = l.ld_type};
                   ld_loc = l.ld_loc;
                   ld_attributes = l.ld_attributes; } in
-              let lbls, lbls' =
-                match Ctype.extract_concrete_typedecl env (extract ld_type.ctyp_type) with
-                (_p0, _p, {type_kind=Type_record (fields, _repr)}) ->
-                  (fields |> List.map mkLbl) @ rest, fields @ rest'
-                | _ -> assert false
-                | exception _ -> assert false
+              let rec process_lbls acc lbls lbls' = match lbls, lbls' with
+                | {ld_name = {txt = "dotdotdot"}; ld_type} :: rest, _ :: rest' ->
+                  (match Ctype.extract_concrete_typedecl env (extract ld_type.ctyp_type) with
+                    (_p0, _p, {type_kind=Type_record (fields, _repr)}) ->
+                      process_lbls (fst acc @ (fields |> List.map mkLbl), snd acc @ fields) rest rest'
+                    | _ -> assert false
+                    | exception _ -> assert false)
+                | lbl::rest, lbl'::rest' -> process_lbls (fst acc @ [lbl], snd acc @ [lbl']) rest rest'
+                | _ -> acc
               in
-              lbls, lbls'
+              process_lbls ([], []) lbls lbls'
             | _ -> lbls, lbls' in
           Ttype_record lbls, Type_record(lbls', rep)
       | Ptype_open -> Ttype_open, Type_open

jscomp/test/DotDotDot.js

@@ -7,5 +7,14 @@ var v = {
   z: ""
 };
 
+var v2 = {
+  x: 10,
+  y: "",
+  z: "",
+  v: 1.0,
+  w: 2.0
+};
+
 exports.v = v;
+exports.v2 = v2;
 /* No side effect */

jscomp/test/DotDotDot.res

@@ -6,6 +6,12 @@ type c = {dotdotdot: b, z: string}
 
 let v: c = {x: 10, y: "", z: ""}
 
+type vw = {v: float, w: float}
+
+type cvw = {dotdotdot: c, dotdotdot: vw}
+
+let v2: cvw = {x: 10, y: "", z: "", v: 1.0, w: 2.0}
+
 type globalProps = {
   id?: string,
   name?: string,
@@ -21,9 +27,7 @@ type anchorProps = {
 }
 
 // globalProps only case?
-type divProps = {
-  dotdotdot: globalProps,
-}
+type divProps = {dotdotdot: globalProps}
 
 type svgProps = {
   dotdotdot: globalProps,