Get field name from attribute when pattern matching (#6456)

* Get field name from attribute when pattern matching

* Move find_name to matching so it can be shared

* Add addtional prop to the test

* Update changelog

Author: shulhi

CHANGELOG.md

@@ -27,6 +27,7 @@
 - Fix build error where JSX v4 transformation of the discouraged forwardRef in uncurried mode https://github.com/rescript-lang/rescript-compiler/pull/6447
 - Fix printing of exotic JSX names https://github.com/rescript-lang/rescript-compiler/pull/6451
 - Fix locations when code with `await` fails to compile (all locations would point to the internal function `unsafe_await`) https://github.com/rescript-lang/rescript-compiler/pull/6452
+- Fix renaming fields (with @as) in inline records doesn't work when destructuring https://github.com/rescript-lang/rescript-compiler/pull/6456
 
 #### :house: Internal
 

jscomp/core/record_attributes_check.ml

@@ -24,18 +24,7 @@
 
 type label = Types.label_description
 
-let find_name (attr : Parsetree.attribute) =
-  match attr with
-  | ( { txt = "bs.as" | "as" },
-      PStr
-        [
-          {
-            pstr_desc =
-              Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (s, _)) }, _);
-          };
-        ] ) ->
-      Some s
-  | _ -> None
+let find_name = Matching.find_name
 
 let find_name_with_loc (attr : Parsetree.attribute) : string Asttypes.loc option
     =

jscomp/ml/matching.ml

@@ -26,6 +26,19 @@ open Printf
 
 let dbg = false
 
+let find_name (attr : Parsetree.attribute) =
+  match attr with
+  | ( { txt = "bs.as" | "as" },
+      PStr
+        [
+          {
+            pstr_desc =
+              Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (s, _)) }, _);
+          };
+        ] ) ->
+      Some s
+  | _ -> None
+
 (*  See Peyton-Jones, ``The Implementation of functional programming
     languages'', chapter 5. *)
 (*
@@ -1601,7 +1614,8 @@ let make_record_matching loc all_labels def = function
             | Record_regular | Record_optional_labels _ -> 
               Lprim (Pfield (lbl.lbl_pos, !Lambda.fld_record lbl), [arg], loc) 
             | Record_inlined _ ->
-              Lprim (Pfield (lbl.lbl_pos, Fld_record_inline {name = lbl.lbl_name}), [arg], loc)
+              let name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name in
+              Lprim (Pfield (lbl.lbl_pos, Fld_record_inline {name}), [arg], loc)
             | Record_unboxed _ -> arg
             | Record_extension -> Lprim (Pfield (lbl.lbl_pos + 1, Fld_record_extension {name = lbl.lbl_name}), [arg], loc) 
           in

jscomp/ml/matching.mli

@@ -18,6 +18,9 @@
 open Typedtree
 open Lambda
 
+val find_name :
+  Parsetree.attribute -> Asttypes.label option
+
 val call_switcher_variant_constant : 
   (Location.t ->
    Lambda.lambda option ->

jscomp/test/as_inline_record_test.js

@@ -2,6 +2,17 @@ type user =
   | User({
       @as("renamed")
       name: string,
+      age: int,
     })
 
-let user = User({name: "Corentin"})
+let user = User({name: "Corentin", age: 35})
+
+let getName = t =>
+  switch t {
+  | User({name}) => name
+  }
+
+let getAge = t => 
+  switch t {
+  | User({age}) => age
+  }