change optional field in cstr arg to option type

Author: mununki

jscomp/ml/typedecl.ml

@@ -358,6 +358,20 @@ let transl_declaration env sdecl id =
           | (_,_,loc)::_ ->
               Location.prerr_warning loc Warnings.Constraint_on_gadt
         end;
+        let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "ns.optional") in
+        let scstrs =
+          Ext_list.map scstrs (fun ({pcd_args} as cstr) ->
+            match pcd_args with
+            | Pcstr_tuple _ -> cstr
+            | Pcstr_record lds ->
+              {cstr with pcd_args = Pcstr_record (Ext_list.map lds (fun ld ->
+                if has_optional ld.pld_attributes then
+                  let typ = ld.pld_type in
+                  let typ = {typ with ptyp_desc = Ptyp_constr ({txt = Lident "option"; loc=typ.ptyp_loc}, [typ])} in
+                  {ld with pld_type = typ}
+                else ld
+              ))}
+            ) in
         let all_constrs = ref StringSet.empty in
         List.iter
           (fun {pcd_name = {txt = name}} ->

jscomp/test/record_regression.js

@@ -82,7 +82,7 @@ var h10 = newrecord$3;
 
 var foo = /* Foo */{
   name: "foo",
-  age: undefined
+  age: 3
 };
 
 exports.f1 = f1;

lib/4.06.1/unstable/js_compiler.ml

@@ -37960,6 +37960,20 @@ let transl_declaration env sdecl id =
           | (_,_,loc)::_ ->
               Location.prerr_warning loc Warnings.Constraint_on_gadt
         end;
+        let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "ns.optional") in
+        let scstrs =
+          Ext_list.map scstrs (fun ({pcd_args} as cstr) ->
+            match pcd_args with
+            | Pcstr_tuple _ -> cstr
+            | Pcstr_record lds ->
+              {cstr with pcd_args = Pcstr_record (Ext_list.map lds (fun ld ->
+                if has_optional ld.pld_attributes then
+                  let typ = ld.pld_type in
+                  let typ = {typ with ptyp_desc = Ptyp_constr ({txt = Lident "option"; loc=typ.ptyp_loc}, [typ])} in
+                  {ld with pld_type = typ}
+                else ld
+              ))}
+            ) in
         let all_constrs = ref StringSet.empty in
         List.iter
           (fun {pcd_name = {txt = name}} ->

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -37960,6 +37960,20 @@ let transl_declaration env sdecl id =
           | (_,_,loc)::_ ->
               Location.prerr_warning loc Warnings.Constraint_on_gadt
         end;
+        let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "ns.optional") in
+        let scstrs =
+          Ext_list.map scstrs (fun ({pcd_args} as cstr) ->
+            match pcd_args with
+            | Pcstr_tuple _ -> cstr
+            | Pcstr_record lds ->
+              {cstr with pcd_args = Pcstr_record (Ext_list.map lds (fun ld ->
+                if has_optional ld.pld_attributes then
+                  let typ = ld.pld_type in
+                  let typ = {typ with ptyp_desc = Ptyp_constr ({txt = Lident "option"; loc=typ.ptyp_loc}, [typ])} in
+                  {ld with pld_type = typ}
+                else ld
+              ))}
+            ) in
         let all_constrs = ref StringSet.empty in
         List.iter
           (fun {pcd_name = {txt = name}} ->

lib/4.06.1/whole_compiler.ml

@@ -214132,6 +214132,20 @@ let transl_declaration env sdecl id =
           | (_,_,loc)::_ ->
               Location.prerr_warning loc Warnings.Constraint_on_gadt
         end;
+        let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "ns.optional") in
+        let scstrs =
+          Ext_list.map scstrs (fun ({pcd_args} as cstr) ->
+            match pcd_args with
+            | Pcstr_tuple _ -> cstr
+            | Pcstr_record lds ->
+              {cstr with pcd_args = Pcstr_record (Ext_list.map lds (fun ld ->
+                if has_optional ld.pld_attributes then
+                  let typ = ld.pld_type in
+                  let typ = {typ with ptyp_desc = Ptyp_constr ({txt = Lident "option"; loc=typ.ptyp_loc}, [typ])} in
+                  {ld with pld_type = typ}
+                else ld
+              ))}
+            ) in
         let all_constrs = ref StringSet.empty in
         List.iter
           (fun {pcd_name = {txt = name}} ->