Fix issue overlapping argument with default value and alias with default value

cli/reactjs_jsx_v4.ml

@@ -729,10 +729,10 @@ let argToType ~newtypes ~(typeConstraints : core_type option) types
     :: types
   | _ -> types
 
-let argWithDefaultValue (name, default, _, _, _, _) =
-  match default with
-  | Some default when isOptional name -> Some (getLabel name, default)
-  | _ -> None
+let hasDefaultValue nameArgList =
+  nameArgList
+  |> List.exists (fun (name, default, _, _, _, _) ->
+         Option.is_some default && isOptional name)
 
 let argToConcreteType types (name, attrs, loc, type_) =
   match name with
@@ -1016,26 +1016,34 @@ let transformStructureItem ~config mapper item =
               (argToType ~newtypes ~typeConstraints)
               [] namedArgList
           in
-          let namedArgWithDefaultValueList =
-            List.filter_map argWithDefaultValue namedArgList
+          let vbMatch (name, default, _, _, _, _) =
+            let label = getLabel name in
+            match default with
+            | Some default ->
+              Vb.mk
+                (Pat.var (Location.mknoloc label))
+                (Exp.match_
+                   (Exp.ident
+                      {txt = Ldot (Lident "props", label); loc = Location.none})
+                   [
+                     Exp.case
+                       (Pat.construct
+                          (Location.mknoloc @@ Lident "Some")
+                          (Some (Pat.var (Location.mknoloc label))))
+                       (Exp.ident (Location.mknoloc @@ Lident label));
+                     Exp.case
+                       (Pat.construct (Location.mknoloc @@ Lident "None") None)
+                       default;
+                   ])
+            | None ->
+              Vb.mk
+                (Pat.var (Location.mknoloc label))
+                (Exp.ident @@ Location.mknoloc @@ Ldot (Lident "props", label))
           in
-          let vbMatch (label, default) =
-            Vb.mk
-              (Pat.var (Location.mknoloc label))
-              (Exp.match_
-                 (Exp.ident {txt = Lident label; loc = Location.none})
-                 [
-                   Exp.case
-                     (Pat.construct
-                        (Location.mknoloc @@ Lident "Some")
-                        (Some (Pat.var (Location.mknoloc label))))
-                     (Exp.ident (Location.mknoloc @@ Lident label));
-                   Exp.case
-                     (Pat.construct (Location.mknoloc @@ Lident "None") None)
-                     default;
-                 ])
+          let vbMatchList =
+            if hasDefaultValue namedArgList then List.map vbMatch namedArgList
+            else []
           in
-          let vbMatchList = List.map vbMatch namedArgWithDefaultValueList in
           (* type props = { ... } *)
           let propsRecordType =
             makePropsRecordType ~coreTypeOfAttr ~typVarsOfCoreType "props"
@@ -1163,11 +1171,17 @@ let transformStructureItem ~config mapper item =
               (fun expr (_, pattern) -> Exp.fun_ Nolabel None pattern expr)
               expression patternsWithNolabel
           in
+          (* ({a, b, _}: props<'a, 'b>) *)
           let recordPattern =
             match patternsWithLabel with
             | [] -> Pat.any ()
             | _ -> Pat.record (List.rev patternsWithLabel) Open
           in
+          let recordPattern =
+            if hasDefaultValue namedArgList then
+              Pat.var {txt = "props"; loc = emptyLoc}
+            else recordPattern
+          in
           let expression =
             Exp.fun_ Nolabel None
               (Pat.constraint_ recordPattern

tests/ppx/react/defaultValueProp.res

@@ -0,0 +1,9 @@
+module C0 = {
+  @react.component
+  let make = (~a=2, ~b=a*2) => <div />
+}
+
+module C1 = {
+  @react.component
+  let make = (~a=2, ~b) => <div />
+}

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

@@ -4,11 +4,12 @@ module C0 = {
   type props<'priority, 'text> = {priority: 'priority, text?: 'text}
 
   @react.component
-  let make = ({priority: _, ?text, _}: props<'priority, 'text>) => {
-    let text = switch text {
+  let make = (props: props<'priority, 'text>) => {
+    let text = switch props.text {
     | Some(text) => text
     | None => "Test"
     }
+    and priority = props.priority
 
     React.string(text)
   }
@@ -23,11 +24,12 @@ module C1 = {
   type props<'priority, 'text> = {priority: 'priority, text?: 'text}
 
   @react.component
-  let make = ({priority: p, ?text, _}: props<'priority, 'text>) => {
-    let text = switch text {
+  let make = (props: props<'priority, 'text>) => {
+    let text = switch props.text {
     | Some(text) => text
     | None => "Test"
     }
+    and priority = props.priority
 
     React.string(p ++ text)
   }

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

@@ -0,0 +1,40 @@
+module C0 = {
+  type props<'a, 'b> = {a?: 'a, b?: 'b}
+  @react.component
+  let make = (props: props<'a, 'b>) => {
+    let b = switch props.b {
+    | Some(b) => b
+    | None => a * 2
+    }
+    and a = switch props.a {
+    | Some(a) => a
+    | None => 2
+    }
+
+    ReactDOM.jsx("div", {})
+  }
+  let make = {
+    let \"DefaultValueProp$C0" = (props: props<_>) => make(props)
+    \"DefaultValueProp$C0"
+  }
+}
+
+module C1 = {
+  type props<'a, 'b> = {a?: 'a, b: 'b}
+
+  @react.component
+  let make = (props: props<'a, 'b>) => {
+    let b = props.b
+    and a = switch props.a {
+    | Some(a) => a
+    | None => 2
+    }
+
+    ReactDOM.jsx("div", {})
+  }
+  let make = {
+    let \"DefaultValueProp$C1" = (props: props<_>) => make(props)
+
+    \"DefaultValueProp$C1"
+  }
+}

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

@@ -2,8 +2,8 @@
 type props<'a> = {a?: 'a}
 
 @react.component
-let make = ({?a, _}: props<(. unit) => unit>) => {
-  let a = switch a {
+let make = (props: props<(. unit) => unit>) => {
+  let a = switch props.a {
   | Some(a) => a
   | None => (. ()) => ()
   }
@@ -30,8 +30,8 @@ module Foo = {
   type props<'callback> = {callback?: 'callback}
 
   @react.component
-  let make = ({?callback, _}: props<(. string, bool, bool) => unit>) => {
-    let callback = switch callback {
+  let make = (props: props<(. string, bool, bool) => unit>) => {
+    let callback = switch props.callback {
     | Some(callback) => callback
     | None => (. _, _, _) => ()
     }