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/main/builtin_cmi_datasets.ml

@@ -1,4 +1,4 @@
-(* aa85187c9b598b8b3d1ab300676f1c9e *) 
+(* f00667b6f0841924d198799669f30e1f *) 
 let module_names : string array = Obj.magic (
 "Js" (* 23 *),
 "Arg" (* 217 *),
@@ -89,6 +89,7 @@ let module_names : string array = Obj.magic (
 "BytesLabels" (* 878 *),
 "Dom_storage" (* 386 *),
 "Js_mapperRt" (* 87 *),
+"Js_promise2" (* 50 *),
 "JsxDOMStyle" (* 23 *),
 "Node_buffer" (* 23 *),
 "Node_module" (* 23 *),
@@ -224,6 +225,7 @@ let module_data : string array = Obj.magic (
 (* BytesLabels *)"\132\149\166\190\000\000\003Z\000\000\000\231\000\000\003\012\000\000\002\216\160\b\000\000\152\000\176#cat\144\160\160B@@@\176#map\144\160\160B@@@\176#sub\144\160\160C@@@\176$blit\144\160\160E@@@\176$copy\144\160\160A@@@\176$fill\144\160\160D@@@\176$init\144\160\160B@@@\176$iter\144\160\160B@@@\176$make\144\160\160B@@@\176$mapi\144\160\160B@@@\176$trim\144\160\160A@@@\176%equal\144\160\160B@@\144\148\192B\160\176\001\005z!x@\160\176\001\005{!y@@\151\176\1470caml_bytes_equal\160\144\004\011\160\144\004\n@\176\1929stdlib-406/bytesLabels.ml\001\001\171\0011\127\0011\155\192\004\002\001\001\171\0011\127\0011\160@\208B@@@@\176%index\144\160\160B@@@\176%iteri\144\160\160B@@@\176&concat\144\160\160B@@@\176&extend\144\160\160C@@@\176&rindex\144\160\160B@@@\176'compare\144\160\160B@@\144\148\192B\160\176\001\005w!x@\160\176\001\005x!y@@\151\176\1472caml_bytes_compare\160\144\004\011\160\144\004\n@\176\192\0044\001\001\170\0011L\0011h\192\0045\001\001\170\0011L\0011~@\208B@@@@\176'escaped\144\160\160A@@@\176(contains\144\160\160B@@@\176)index_opt\144\160\160B@@@\176)of_string\144\160\160A@@@\176)to_string\144\160\160A@@@\176*index_from\144\160\160C@@@\176*rindex_opt\144\160\160B@@@\176*sub_string\144\160\160C@@@\176+blit_string\144\160\160E@@@\176+rindex_from\144\160\160C@@@\176-contains_from\144\160\160C@@@\176.index_from_opt\144\160\160C@@@\176.rcontains_from\144\160\160C@@@\176/lowercase_ascii\144\160\160A@@@\176/rindex_from_opt\144\160\160C@@@\176/uppercase_ascii\144\160\160A@@@\1760capitalize_ascii\144\160\160A@@@\1760unsafe_of_string\144\004F@\1760unsafe_to_string\144\004D@\1762uncapitalize_ascii\144\160\160A@@@A",
 (* Dom_storage *)"\132\149\166\190\000\000\001n\000\000\000k\000\000\001^\000\000\001T\160\192\176#key\144\160\160B@@\144\148\192B\160\176\001\004\004!i@\160\176\001\004\005#obj@@\151\176\000B\160\151\176\180#key\160\160AA\160\004\002@\181#key@@\160\144\004\016\160\144\004\021@\176\1925others/dom_storage.mlR\001\003\022\001\0036\192\004\002R\001\003\022\001\003B@@\004\004\208B@@@@\176'getItem\144\160\160B@@\144\148\192B\160\176\001\003\246!s@\160\176\001\003\247#obj@@\151\176\000B\160\151\176\180'getItem\160\004#\160\004$@\181'getItem@@\160\144\004\015\160\144\004\020@\176\192\004\"D\000x\001\000\140\192\004#D\000x\001\000\156@@\004\003\208B@@@@\176'setItem\144\160\160C@@@\176*removeItem\144\160\160B@@\144\148\192B\160\176\001\003\255!s@\160\176\001\004\000#obj@@\174\151\176\180*removeItem\160\004G\160\004H@\181*removeItem@@\160\144\004\r\160\144\004\018@\176\192\004FL\001\001\208\001\001\238\192\004GL\001\001\208\001\002\001@\146A\208B@@A@A",
 (* Js_mapperRt *)"\132\149\166\190\000\000\000C\000\000\000\017\000\000\0009\000\000\0004\160\176\176'fromInt\144\160\160C@@@\176-fromIntAssert\144\160\160C@@@\1761raiseWhenNotFound\144\160\160A@@@A",
+(* Js_promise2 *)"\132\149\166\190\000\000\000\030\000\000\000\012\000\000\000$\000\000\000\"\160\160\176$then\144\160\160B@@@\176%catch\144\160\160B@@@A",
 (* JsxDOMStyle *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
 (* Node_buffer *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
 (* Node_module *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",

jscomp/main/builtin_cmj_datasets.ml

@@ -417,7 +417,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
@@ -428,14 +428,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/ml/typedecl.ml

@@ -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.js

@@ -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,