Support renaming fields in inline records (#6391)

* add test for @as in inline records * support renaming fields in inline records * add changelog entry * Update build.ninja --------- Co-authored-by: Cristiano Calcagno <[email protected]>
rescript-lang · Sep 7, 2023 · 6390057 · 6390057
1 parent dc41b21
commit 6390057
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@
 
 # 11.0.0-rc.4 (Unreleased)
 
+#### :rocket: New Feature
+
+- Support renaming fields in inline records with `@as` attribute. [#6391](https://github.com/rescript-lang/rescript-compiler/pull/6391)
+
 # 11.0.0-rc.3
 
 #### :bug: Bug Fix

diff --git a/jscomp/core/bs_conditional_initial.ml b/jscomp/core/bs_conditional_initial.ml
@@ -47,6 +47,7 @@ let setup_env () =
   Lambda.fld_record := Record_attributes_check.fld_record;
   Lambda.fld_record_set := Record_attributes_check.fld_record_set;
   Lambda.blk_record := Record_attributes_check.blk_record;
+  Lambda.blk_record_inlined := Record_attributes_check.blk_record_inlined;
   Matching.names_from_construct_pattern := 
     Matching_polyfill.names_from_construct_pattern;
 

diff --git a/jscomp/core/record_attributes_check.ml b/jscomp/core/record_attributes_check.ml
@@ -70,6 +70,15 @@ let blk_record (fields : (label * _) array) mut record_repr =
   Lambda.Blk_record
     { fields = all_labels_info; mutable_flag = mut; record_repr }
 
+let blk_record_inlined fields name num_nonconst optional_labels ~tag ~attrs mutable_flag =
+  let fields =
+    Array.map
+      (fun ((lbl : label), _) ->
+        Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
+      fields
+  in
+  Lambda.Blk_record_inlined {fields; name; num_nonconst; tag; mutable_flag; optional_labels; attrs }
+
 let check_bs_attributes_inclusion (attrs1 : Parsetree.attributes)
     (attrs2 : Parsetree.attributes) lbl_name =
   let a = Ext_list.find_def attrs1 find_name lbl_name in

diff --git a/jscomp/test/as_inline_record_test.js b/jscomp/test/as_inline_record_test.js
diff --git a/jscomp/test/as_inline_record_test.res b/jscomp/test/as_inline_record_test.res
@@ -0,0 +1,7 @@
+type user =
+  | User({
+      @as("renamed")
+      name: string,
+    })
+
+let user = User({name: "Corentin"})
diff --git a/jscomp/test/build.ninja b/jscomp/test/build.ninja