Fix issue with as module(...)

Functions of the form `(~comp as module(Comp: Comp))=>` are represented internally as a `Pexp_constraint`, which makes them look like `~comp : t`.
Now special-case this pattern so it's treated just like the other forms of `as ...`.

Fixes #5976

Author: cristianoc

CHANGELOG.md

@@ -76,6 +76,7 @@ These are only breaking changes for unformatted code.
 - Fix issue with JSX V4 and newtype https://github.com/rescript-lang/rescript-compiler/pull/6029
 - Fix issue with JSX V4 when components are nested https://github.com/rescript-lang/rescript-compiler/pull/6031
 - Improve code generated for default arguments in JSX V4 https://github.com/rescript-lang/rescript-compiler/pull/6041
+- Fix issue with JSX V4 props of the form `~p as module(...)` https://github.com/rescript-lang/rescript-compiler/pull/6041
 
 #### :nail_care: Polish
 

jscomp/test/alias_default_value_test.js

@@ -59,9 +59,18 @@ var C4 = {
   make: Alias_default_value_test$C4
 };
 
+function Alias_default_value_test$C6(props) {
+  return props.comp.xx;
+}
+
+var C6 = {
+  make: Alias_default_value_test$C6
+};
+
 exports.C0 = C0;
 exports.C1 = C1;
 exports.C2 = C2;
 exports.C3 = C3;
 exports.C4 = C4;
+exports.C6 = C6;
 /* No side effect */

jscomp/test/alias_default_value_test.res

@@ -31,4 +31,15 @@ module C3 = {
 module C4 = {
   @react.component
   let make = (~a as b, ~x=true) => b
-}
+}
+
+module C6 = {
+  module type Comp = {
+    let xx : int
+    @react.component
+    let make: unit => React.element
+  }
+
+  @react.component
+  let make = (~comp as module(Comp: Comp), ~x as (a, b)) => Comp.xx
+}

res_syntax/src/reactjs_jsx_v4.ml

@@ -640,6 +640,7 @@ let rec recursivelyTransformNamedArgsForMake expr args newtypes coreType =
     in
     let type_ =
       match pattern with
+      | {ppat_desc = Ppat_constraint (_, {ptyp_desc = Ptyp_package _})} -> None
       | {ppat_desc = Ppat_constraint (_, type_)} -> Some type_
       | _ -> None
     in
@@ -965,11 +966,10 @@ let mapBinding ~config ~emptyLoc ~pstr_loc ~fileName ~recFlag binding =
     in
     let rec stripConstraintUnpack ~label pattern =
       match pattern with
+      | {ppat_desc = Ppat_constraint (_, {ptyp_desc = Ptyp_package _})} ->
+        pattern
       | {ppat_desc = Ppat_constraint (pattern, _)} ->
         stripConstraintUnpack ~label pattern
-      | {ppat_desc = Ppat_unpack _; ppat_loc} ->
-        (* remove unpack e.g. model: module(T) *)
-        Pat.var ~loc:ppat_loc {txt = label; loc = ppat_loc}
       | _ -> pattern
     in
     let rec returnedExpression patternsWithLabel patternsWithNolabel

res_syntax/tests/ppx/react/aliasProps.res

@@ -29,7 +29,15 @@ module C4 = {
 
 module C5 = {
   @react.component
-  let make = (~a as (x,y), ~z=3) => x+y+z
+  let make = (~a as (x, y), ~z=3) => x + y + z
 }
 
+module C6 = {
+  module type Comp = {
+    @react.component
+    let make: unit => React.element
+  }
 
+  @react.component
+  let make = (~comp as module(Comp: Comp), ~x as (a, b)) => <Comp />
+}

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

@@ -113,3 +113,19 @@ module C5 = {
     \"AliasProps$C5"
   }
 }
+
+module C6 = {
+  module type Comp = {
+    type props = {}
+
+    let make: React.componentLike<props, React.element>
+  }
+  type props<'comp, 'x> = {comp: 'comp, x: 'x}
+
+  let make = ({comp: module(Comp: Comp), x: (a, b), _}: props<_, _>) => React.jsx(Comp.make, {})
+  let make = {
+    let \"AliasProps$C6" = (props: props<_>) => make(props)
+
+    \"AliasProps$C6"
+  }
+}

res_syntax/tests/ppx/react/expected/firstClassModules.res.txt

@@ -66,8 +66,8 @@ module Select = {
 
   let make = (
     type a key,
-    {model, selected, onChange, items, _}: props<
-      module(T with type t = a and type key = key),
+    {model: module(T: T with type t = a and type key = key), selected, onChange, items, _}: props<
+      _,
       option<key>,
       option<key> => unit,
       array<a>,

res_syntax/tests/ppx/react/expected/newtype.res.txt

@@ -67,7 +67,7 @@ module type T = {
 module V4A2 = {
   type props<'foo> = {foo: 'foo}
 
-  let make = (type a, {foo, _}: props<module(T with type t = a)>) => {
+  let make = (type a, {foo: (foo: module(T with type t = a)), _}: props<_>) => {
     module T = unpack(foo)
     ReactDOM.jsx("div", {})
   }
@@ -91,3 +91,11 @@ module V4A3 = {
     \"Newtype$V4A3"
   }
 }
+type props<'x, 'q> = {x: 'x, q: 'q}
+
+let make = ({x, q, _}: props<('a, 'b), 'a>) => [fst(x), q]
+let make = {
+  let \"Newtype" = (props: props<_>) => make(props)
+
+  \"Newtype"
+}

res_syntax/tests/ppx/react/newtype.res

@@ -43,3 +43,6 @@ module V4A3 = {
     foo
   }
 }
+
+@react.component
+let make =(~x : ('a,'b), ~q:'a ) => [fst(x), q]