fix alias props with default value

Author: mununki

cli/reactjs_jsx_v4.ml

@@ -1016,12 +1016,12 @@ let transformStructureItem ~config mapper item =
               (argToType ~newtypes ~typeConstraints)
               [] namedArgList
           in
-          let vbMatch (name, default, {ppat_loc}, _, _, _) =
+          let vbMatch (name, default, _, alias, loc, _) =
             let label = getLabel name in
             match default with
             | Some default ->
               Vb.mk
-                (Pat.var (Location.mkloc label ppat_loc))
+                (Pat.var (Location.mkloc alias loc))
                 (Exp.match_
                    (Exp.ident
                       {txt = Ldot (Lident "props", label); loc = Location.none})
@@ -1037,7 +1037,7 @@ let transformStructureItem ~config mapper item =
                    ])
             | None ->
               Vb.mk
-                (Pat.var (Location.mkloc label ppat_loc))
+                (Pat.var (Location.mkloc alias loc))
                 (Exp.ident @@ Location.mknoloc @@ Ldot (Lident "props", label))
           in
           let vbMatchList =

tests/ppx/react/aliasProps.res

@@ -9,3 +9,8 @@ module C1 = {
   @react.component
   let make = (~priority as p, ~text="Test") => React.string(p ++ text)
 }
+
+module C2 = {
+  @react.component
+  let make = (~foo as bar="") => <div />
+}

tests/ppx/react/expected/aliasProps.res.txt

@@ -9,7 +9,7 @@ module C0 = {
     | Some(text) => text
     | None => "Test"
     }
-    and priority = props.priority
+    and _ = props.priority
 
     React.string(text)
   }
@@ -29,7 +29,7 @@ module C1 = {
     | Some(text) => text
     | None => "Test"
     }
-    and priority = props.priority
+    and p = props.priority
 
     React.string(p ++ text)
   }
@@ -39,3 +39,22 @@ module C1 = {
     \"AliasProps$C1"
   }
 }
+
+module C2 = {
+  type props<'foo> = {foo?: 'foo}
+
+  @react.component
+  let make = (props: props<'foo>) => {
+    let bar = switch props.foo {
+    | Some(foo) => foo
+    | None => ""
+    }
+
+    ReactDOM.jsx("div", {})
+  }
+  let make = {
+    let \"AliasProps$C2" = (props: props<_>) => make(props)
+
+    \"AliasProps$C2"
+  }
+}