- Fix: use configured Jsx module for constraining component return type.https://github.com/rescript-lang/rescript/pull/7945

{loc; txt=Ldot (Ldot (Lident"Js","Nullable"),"t")}

[ref_type_var loc]

Typ.constr~loc {loc; txt=Ldot (Lident"Jsx","element")}[]

Exp.constraint_ expr (jsx_element_type~loc:expr.pexp_loc)

match expr.pexp_descwith

|Pexp_fun ({rhs}asdesc) ->

{exprwith pexp_desc=Pexp_fun {descwith rhs= constrain_jsx_return rhs}}

|Pexp_newtype (param,inner) ->

{exprwith pexp_desc=Pexp_newtype (param, constrain_jsx_return inner)}

|Pexp_constraint (inner,_) ->

let constrained_inner= constrain_jsx_return innerin

jsx_element_constraint constrained_inner

|Pexp_let (rec_flag,bindings,body) ->

{

exprwith

pexp_desc=Pexp_let (rec_flag, bindings, constrain_jsx_return body);

}

|Pexp_sequence (first,second) ->

{exprwith pexp_desc=Pexp_sequence (first, constrain_jsx_return second)}

|_ -> jsx_element_constraint expr

Typ.constr~loc {loc; txt= module_access_name config"element"}[]

letother_attrs_pure (loc,_)=

aux (List.rev named_arg_list)

Exp.constraint_ expr (jsx_element_type config~loc:expr.pexp_loc)

match expr.pexp_descwith

|Pexp_fun ({rhs}asdesc) ->

{

exprwith

pexp_desc=Pexp_fun {descwith rhs= constrain_jsx_return rhs};

}

|Pexp_newtype (param,inner) ->

{exprwith pexp_desc=Pexp_newtype (param, constrain_jsx_return inner)}

|Pexp_constraint (inner,_) ->

let constrained_inner= constrain_jsx_return innerin

jsx_element_constraint constrained_inner

|Pexp_let (rec_flag,bindings,body) ->

{

exprwith

pexp_desc=Pexp_let (rec_flag, bindings, constrain_jsx_return body);

}

|Pexp_sequence (first,second) ->

{exprwith pexp_desc=Pexp_sequence (first, constrain_jsx_return second)}

|_ -> jsx_element_constraint expr

ifJsx_common.has_attr_on_bindingJsx_common.has_attr bindingthen (

check_multiple_components~config~loc:pstr_loc;

let core_type_of_attr=

let new_external_type=

( {loc= pstr_loc; txt= module_access_name config"componentLike"},

[ret_props_type; jsx_element_type~loc:pstr_loc] )

[ret_props_type; jsx_element_typeconfig~loc:pstr_loc] )

let new_structure=

{

let new_external_type=

( {loc= psig_loc; txt= module_access_name config"componentLike"},

[ret_props_type; jsx_element_type~loc:psig_loc] )

[ret_props_type; jsx_element_typeconfig~loc:psig_loc] )

let new_structure=

{

type r = {name: string, age: int}

let add: (~x: int, ~y: int) => int

@react.component

let make: (~name: string) =>Jsx.element

let make: (~name: string) =>React.element

module Other: {

@react.component

let otherComponentName: (~name: string) =>Jsx.element

let otherComponentName: (~name: string) =>React.element

}

module Mod: {

@react.component

let make: (~name: string) =>Jsx.element

let make: (~name: string) =>React.element

}

module type ModTyp = {

@react.component

let make: (~name: string) =>Jsx.element

let make: (~name: string) =>React.element

}

@module("path") external dirname: string => string = "dirname"

@module("path") @variadic

module Functor: () =>

{

@react.component

let make: unit =>Jsx.element

let make: unit =>React.element

}

module type FT = {

module Functor: (

X: {

let a: int

@react.component

let make: (~name: string) =>Jsx.element

let make: (~name: string) =>React.element

let b: int

},

Y: ModTyp,

) =>

{

@react.component

let make: (~name: string) =>Jsx.element

let make: (~name: string) =>React.element

}

}

module NormaList = List

and D: ModTyp

module type OptT = {

@react.component

let withOpt1: (~x: int=?, ~y: int) =>Jsx.element

let withOpt1: (~x: int=?, ~y: int) =>React.element

module type Opt2 = {

@react.component

let withOpt2: (~x: int=?, ~y: int) =>Jsx.element

let withOpt2: (~x: int=?, ~y: int) =>React.element

}

module type Opt3 = {

@react.component

let withOpt3: (~x: option<int>, ~y: int) =>Jsx.element

let withOpt3: (~x: option<int>, ~y: int) =>React.element

}

}

module Opt: {

@react.component

let withOpt1: (~x: int=?, ~y: int) =>Jsx.element

let withOpt1: (~x: int=?, ~y: int) =>React.element

module Opt2: {

@react.component

let withOpt2: (~x: int=?, ~y: int) =>Jsx.element

let withOpt2: (~x: int=?, ~y: int) =>React.element

}

module type Opt2 = {

@react.component

let withOpt2: (~x: int=?, ~y: int) =>Jsx.element

let withOpt2: (~x: int=?, ~y: int) =>React.element

}

module Opt3: {

@react.component

let withOpt3: (~x: option<int>, ~y: int) =>Jsx.element

let withOpt3: (~x: option<int>, ~y: int) =>React.element

}

module type Opt3 = {

@react.component

let withOpt3: (~x: option<int>, ~y: int) =>Jsx.element

let withOpt3: (~x: option<int>, ~y: int) =>React.element

}

}

module Opt2: OptT

external lowerBound: ([> #d | #e | #f]) => unit = "myexternal"

module ComponentWithPolyProp: {

@react.component

let make: (~size: [< #large | #small]=?) =>Jsx.element

let make: (~size: [< #large | #small]=?) =>React.element

}

module OrderedSet: {

type t<'a, 'identity> = {

Hover src/Jsx2.resi 1:4

{"contents": {"kind": "markdown", "value": "```rescript\nJsx.element\n```\n\n---\n\n```\n \n```\n```rescript\ntype Jsx.element\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Jsx.res%22%2C25%2C0%5D)\n"}}

{"contents": {"kind": "markdown", "value": "```rescript\nReact.element\n```\n\n---\n\n```\n \n```\n```rescript\ntypeReact.element =Jsx.element\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C0%2C0%5D)\n"}}

Hover src/Jsx2.resi 4:4

{"contents": {"kind": "markdown", "value": "```rescript\nint\n```"}}

Create Interface src/JsxV4.res

module M4: {

@react.component

let make: (~first: string, ~fun: string=?, ~second: string=?) =>Jsx.element

let make: (~first: string, ~fun: string=?, ~second: string=?) =>React.element

}

module MM: {

@react.component

let make: unit =>Jsx.element

let make: unit =>React.element

}

module Other: {

@react.component

let make: (~name: string) =>Jsx.element

let make: (~name: string) =>React.element

}

@@jsxConfig({version:4})

@@jsxConfig({version:4,module_:"Jsx"})

@react.component

letmake=async ()=>1

@@jsxConfig({version:4})

@@jsxConfig({version:4,module_:"Jsx"})

typeprops<'a>= {value:'a}

@@jsxConfig({version:4})

@@jsxConfig({version:4,module_:"Jsx"})

@react.component

letmake= ()=>1

@@jsxConfig({version:4})

@@jsxConfig({version:4,module_:"Jsx"})

@react.component

letmake=React.forwardRef((_,_ref)=>1)

| Some(text) => text

| None => "Test"

}

(React.string(text):Jsx.element)

(React.string(text):React.element)

}

let make = {

let \"AliasProps$C0" = (props: props<_>) => make(props)

| Some(text) => text

| None => "Test"

}

(React.string(p ++ text):Jsx.element)

(React.string(p ++ text):React.element)

}

let make = {

let \"AliasProps$C1" = (props: props<_>) => make(props)

| Some(foo) => foo

| None => ""

}

(React.string(bar):Jsx.element)

(React.string(bar):React.element)

}

let make = {

let \"AliasProps$C2" = (props: props<_>) => make(props)

(

{

React.string(bar ++ a ++ b)

}:Jsx.element

}:React.element

)

}

let make = {

| Some(x) => x

| None => true

}

(ReactDOM.jsx("div", {children: ?ReactDOM.someElement(b)}):Jsx.element)

(ReactDOM.jsx("div", {children: ?ReactDOM.someElement(b)}):React.element)

}

let make = {

let \"AliasProps$C4" = (props: props<_>) => make(props)

| Some(z) => z

| None => 3

}

(x + y + z:Jsx.element)

(x + y + z:React.element)

}

let make = {

let \"AliasProps$C5" = (props: props<_>) => make(props)

@res.jsxComponentProps

type props = {}

let make: React.componentLike<props,Jsx.element>

let make: React.componentLike<props,React.element>

}

@res.jsxComponentProps

type props<'comp, 'x> = {comp: 'comp, x: 'x}

let make = ({comp: module(Comp: Comp), x: (a, b), _}: props<_, _>):Jsx.element =>

let make = ({comp: module(Comp: Comp), x: (a, b), _}: props<_, _>):React.element =>

React.jsx(Comp.make, {})

let make = {

let \"AliasProps$C6" = (props: props<_>) => make(props)