diff --git a/CHANGELOG.md b/CHANGELOG.md index e9fa571287a..a278cfe2539 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ #### :boom: Breaking Change - Change `Intl.Collator.compare` return type from `int` to `Ordering.t` (`float`). https://github.com/rescript-lang/rescript/pull/8289 +- Nested React component modules now export only the namespaced component value instead of a public `make` wrapper, and GenType mirrors that new boundary shape. https://github.com/rescript-lang/rescript/pull/8293 #### :eyeglasses: Spec Compliance diff --git a/compiler/core/js_of_lam_block.ml b/compiler/core/js_of_lam_block.ml index 850e8ad2f94..bfc943d99f5 100644 --- a/compiler/core/js_of_lam_block.ml +++ b/compiler/core/js_of_lam_block.ml @@ -43,7 +43,7 @@ let field (field_info : Lam_compat.field_dbg_info) e (i : int32) = | Fld_cons -> E.cons_access e i | Fld_record_inline {name} -> E.inline_record_access e name i | Fld_record {name} -> E.record_access e name i - | Fld_module {name} -> E.module_access e name i + | Fld_module {name; jsx_component = _} -> E.module_access e name i let field_by_exp e i = E.array_index e i diff --git a/compiler/core/js_pass_nested_component_exports.ml b/compiler/core/js_pass_nested_component_exports.ml new file mode 100644 index 00000000000..b5d5bb4618f --- /dev/null +++ b/compiler/core/js_pass_nested_component_exports.ml @@ -0,0 +1,213 @@ +(* Copyright (C) 2026 - Authors of ReScript + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *) + +module E = Js_exp_make + +module StringSet = Set.Make (String) + +type candidate = {module_ident: Ident.t; hidden_export_name: string} + +let dynamic_import_module_root (expr : J.expression) = + match expr.expression_desc with + | Await + { + expression_desc = + Call ({expression_desc = Var (Id import_ident); _}, [arg], _); + _; + } + when String.equal import_ident.name "import" -> ( + match arg.expression_desc with + | Str {txt; _} -> + let basename = Filename.basename txt in + let suffixes = [".res.mjs"; ".res.js"; ".mjs"; ".js"] in + let rec strip_suffix = function + | [] -> basename + | suffix :: rest -> + if Filename.check_suffix basename suffix then + Filename.chop_suffix basename suffix + else strip_suffix rest + in + Some (strip_suffix suffixes) + | _ -> None) + | _ -> None + +let marker_name hidden_export_name = hidden_export_name ^ "$jsx" + +let hidden_component_suffix (module_ident : Ident.t) = + "$" ^ Ident.name module_ident + +let is_hidden_component_name_for module_ident ident = + Ext_string.ends_with (Ident.name ident) (hidden_component_suffix module_ident) + +let find_hidden_alias_by_value block module_ident value_ident = + List.find_map + (fun (st : J.statement) -> + match st.statement_desc with + | Variable + { + ident; + value = Some {expression_desc = Var (Id target); _}; + property = _; + ident_info = _; + } + when Ident.same target value_ident + && is_hidden_component_name_for module_ident ident -> + Some ident + | _ -> None) + block + +let has_export_name exports name = + List.exists + (fun (ident : Ident.t) -> String.equal (Ident.name ident) name) + exports + +let candidate_of_statement block exports (st : J.statement) = + match st.statement_desc with + | Variable + { + ident = module_ident; + value = + Some + { + expression_desc = + Caml_block + ( [{expression_desc = Var (Id value_ident); _}], + Immutable, + _, + Blk_module ["make"] ); + _; + }; + property = _; + ident_info = _; + } -> ( + let hidden_ident = + if is_hidden_component_name_for module_ident value_ident then + Some value_ident + else find_hidden_alias_by_value block module_ident value_ident + in + match hidden_ident with + | Some hidden_ident when has_export_name exports hidden_ident.name -> + Some {module_ident; hidden_export_name = hidden_ident.name} + | Some _ | None -> None) + | _ -> None + +let collect_candidates block exports = + Ext_list.filter_map block (candidate_of_statement block exports) + +let hidden_export_names_to_remove candidates = + Ext_list.fold_left candidates StringSet.empty (fun acc candidate -> + acc + |> StringSet.add (Ident.name candidate.module_ident) + |> StringSet.add (marker_name candidate.hidden_export_name)) + +let marker_names_to_remove_from_block candidates = + Ext_list.fold_left candidates StringSet.empty (fun acc candidate -> + StringSet.add (marker_name candidate.hidden_export_name) acc) + +let candidate_by_module_ident candidates module_ident = + List.find_map + (fun candidate -> + if Ident.same candidate.module_ident module_ident then Some candidate + else None) + candidates + +let rewrite_block block candidates removed_marker_names = + List.concat_map + (fun (st : J.statement) -> + match st.statement_desc with + | Variable {ident; value; property; ident_info} -> ( + match candidate_by_module_ident candidates ident with + | Some _ -> [st] + | None -> + if StringSet.mem (Ident.name ident) removed_marker_names then [] + else [st]) + | _ -> [st]) + block + +let dynamic_import_aliases block = + List.fold_left + (fun aliases (st : J.statement) -> + match st.statement_desc with + | Variable {ident; value = Some expr; _} -> ( + match dynamic_import_module_root expr with + | Some module_root -> Map_ident.add aliases ident module_root + | None -> aliases) + | _ -> aliases) + Map_ident.empty block + +let rewrite_dynamic_import_component_access aliases (expr : J.expression) = + let rec collect_segments segments (expr : J.expression) = + match expr.expression_desc with + | Static_index (inner, field, _) -> + collect_segments (field :: segments) inner + | Var (Id id) -> ( + match Map_ident.find_opt aliases id with + | Some module_root when segments <> [] -> Some (id, module_root, segments) + | Some _ | None -> None) + | _ -> None + in + match expr.expression_desc with + | Static_index (inner, "make", _) -> ( + match collect_segments [] inner with + | Some (id, module_root, segments) -> + let segments = List.rev segments in + let hidden_name = + match segments with + | first :: _ when Ext_string.starts_with first (module_root ^ "$") -> + String.concat "$" segments + | _ -> String.concat "$" (module_root :: segments) + in + {expr with expression_desc = Static_index (E.var id, hidden_name, None)} + | None -> expr) + | _ -> expr + +let rewrite_dynamic_import_block block = + let aliases = dynamic_import_aliases block in + if Map_ident.is_empty aliases then block + else + let mapper = + { + Js_record_map.super with + expression = + (fun self expr -> + let expr = Js_record_map.super.expression self expr in + rewrite_dynamic_import_component_access aliases expr); + } + in + mapper.block mapper block + +let program (js : J.program) : J.program = + let candidates = collect_candidates js.block js.exports in + let removed_export_names = hidden_export_names_to_remove candidates in + let removed_marker_names = marker_names_to_remove_from_block candidates in + let exports = + Ext_list.filter js.exports (fun (ident : Ident.t) -> + not (StringSet.mem (Ident.name ident) removed_export_names)) + in + let export_set = Set_ident.of_list exports in + let block = + rewrite_dynamic_import_block + (rewrite_block js.block candidates removed_marker_names) + in + {J.block; exports; export_set} diff --git a/compiler/core/js_pass_nested_component_exports.mli b/compiler/core/js_pass_nested_component_exports.mli new file mode 100644 index 00000000000..624543fc9a8 --- /dev/null +++ b/compiler/core/js_pass_nested_component_exports.mli @@ -0,0 +1,28 @@ +(* Copyright (C) 2026 - Authors of ReScript + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * In addition to the permissions granted to you by the LGPL, you may combine + * or link a "work that uses the Library" with a publicly distributed version + * of this file to produce a combined library or application, then distribute + * that combined work under the terms of your choosing, with no requirement + * to comply with the obligations normally placed on you by section 4 of the + * LGPL version 3 (or the corresponding section of a later version of the LGPL + * should you choose to use a later version). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *) + +(* Rewrite nested React component module exports from `{make: fn}` wrappers to + direct component exports, while keeping `.make` as a self-reference for + compatibility with existing generated call sites. *) +val program : J.program -> J.program diff --git a/compiler/core/lam.ml b/compiler/core/lam.ml index 51b8bb3e382..3eb1b227845 100644 --- a/compiler/core/lam.ml +++ b/compiler/core/lam.ml @@ -555,7 +555,8 @@ let prim ~primitive:(prim : Lam_primitive.t) ~args loc : t = | ( f :: fields, Lprim { - primitive = Pfield (pos, Fld_module {name = f1}); + primitive = + Pfield (pos, Fld_module {name = f1; jsx_component = false}); args = [(Lglobal_module (v1, _) | Lvar v1)]; } :: args ) -> @@ -566,7 +567,8 @@ let prim ~primitive:(prim : Lam_primitive.t) ~args loc : t = | ( field1 :: rest, Lprim { - primitive = Pfield (pos, Fld_module {name = f1}); + primitive = + Pfield (pos, Fld_module {name = f1; jsx_component = false}); args = [((Lglobal_module (v1, _) | Lvar v1) as lam)]; } :: args1 ) -> diff --git a/compiler/core/lam_analysis.ml b/compiler/core/lam_analysis.ml index a4b78bea0eb..90f4c6c4cf9 100644 --- a/compiler/core/lam_analysis.ml +++ b/compiler/core/lam_analysis.ml @@ -123,7 +123,12 @@ let rec no_side_effects (lam : Lam.t) : bool = (* | Lsend _ -> false *) | Lapply { - ap_func = Lprim {primitive = Pfield (_, Fld_module {name = "from_fun"})}; + ap_func = + Lprim + { + primitive = + Pfield (_, Fld_module {name = "from_fun"; jsx_component = _}); + }; ap_args = [arg]; } -> no_side_effects arg diff --git a/compiler/core/lam_arity_analysis.ml b/compiler/core/lam_arity_analysis.ml index ee3d91f1541..c3608365049 100644 --- a/compiler/core/lam_arity_analysis.ml +++ b/compiler/core/lam_arity_analysis.ml @@ -42,7 +42,7 @@ let rec get_arity (meta : Lam_stats.t) (lam : Lam.t) : Lam_arity.t = | Llet (_, _, _, l) -> get_arity meta l | Lprim { - primitive = Pfield (_, Fld_module {name}); + primitive = Pfield (_, Fld_module {name; jsx_component = _}); args = [Lglobal_module (id, dynamic_import)]; _; } -> ( @@ -58,7 +58,7 @@ let rec get_arity (meta : Lam_stats.t) (lam : Lam.t) : Lam_arity.t = [ Lprim { - primitive = Pfield (_, Fld_module {name}); + primitive = Pfield (_, Fld_module {name; jsx_component = _}); args = [Lglobal_module (id, dynamic_import)]; }; ]; diff --git a/compiler/core/lam_compat.ml b/compiler/core/lam_compat.ml index a652d74ca43..70c3486c5e9 100644 --- a/compiler/core/lam_compat.ml +++ b/compiler/core/lam_compat.ml @@ -64,7 +64,7 @@ type let_kind = Lambda.let_kind = Strict | Alias | StrictOpt | Variable type field_dbg_info = Lambda.field_dbg_info = | Fld_record of {name: string; mutable_flag: Asttypes.mutable_flag} - | Fld_module of {name: string} + | Fld_module of {name: string; jsx_component: bool} | Fld_record_inline of {name: string} | Fld_record_extension of {name: string} | Fld_tuple diff --git a/compiler/core/lam_compat.mli b/compiler/core/lam_compat.mli index 4d67d95242e..cbea5cd5ea8 100644 --- a/compiler/core/lam_compat.mli +++ b/compiler/core/lam_compat.mli @@ -28,7 +28,7 @@ type let_kind = Lambda.let_kind = Strict | Alias | StrictOpt | Variable type field_dbg_info = Lambda.field_dbg_info = | Fld_record of {name: string; mutable_flag: Asttypes.mutable_flag} - | Fld_module of {name: string} + | Fld_module of {name: string; jsx_component: bool} | Fld_record_inline of {name: string} | Fld_record_extension of {name: string} | Fld_tuple diff --git a/compiler/core/lam_compile.ml b/compiler/core/lam_compile.ml index 42844bc99c0..4810011f735 100644 --- a/compiler/core/lam_compile.ml +++ b/compiler/core/lam_compile.ml @@ -232,6 +232,260 @@ type initialization = J.block *) let compile output_prefix = + let local_module_aliases : Lam.t Map_ident.t ref = ref Map_ident.empty in + let root_module_name (id : Ident.t) = + match Ext_namespace.try_split_module_name id.name with + | Some (_namespace, module_name) -> module_name + | None -> ( + match String.index_opt id.name '$' with + | Some index -> String.sub id.name 0 index + | None -> id.name) + in + let rec extract_nested_external_component_segments segments + ((lam : Lam.t), (make_dynamic_import : bool option ref)) : + (Ident.t * bool * string list) option = + match lam with + | Lprim + { + primitive = Pfield (_, Fld_module {name; jsx_component = _}); + args = [arg]; + _; + } -> + extract_nested_external_component_segments (name :: segments) + (arg, make_dynamic_import) + | Lprim {primitive = Pawait; args = [arg]; _} -> + extract_nested_external_component_segments segments + (arg, make_dynamic_import) + | Lvar id -> ( + match Map_ident.find_opt !local_module_aliases id with + | Some alias_lam -> + extract_nested_external_component_segments segments + (alias_lam, make_dynamic_import) + | None -> + make_dynamic_import := Some false; + Some (id, false, List.rev segments)) + | Lglobal_module (id, dynamic_import) -> + make_dynamic_import := Some dynamic_import; + Some (id, dynamic_import, List.rev segments) + | _ -> None + in + let rec extract_static_nested_external_component_segments segments + (lam : Lam.t) : (Ident.t * bool * string list) option = + match lam with + | Lprim + { + primitive = Pfield (_, Fld_module {name; jsx_component = _}); + args = [arg]; + _; + } -> + extract_static_nested_external_component_segments (name :: segments) arg + | Lprim {primitive = Pawait; args = [arg]; _} -> + extract_static_nested_external_component_segments segments arg + | Lprim {primitive = Pimport; args = [arg]; _} -> + extract_static_nested_external_component_segments segments arg + | Lvar id -> ( + match Map_ident.find_opt !local_module_aliases id with + | Some alias_lam -> + extract_static_nested_external_component_segments segments alias_lam + | None -> None) + | Lglobal_module (id, dynamic_import) -> + Some (id, dynamic_import, List.rev segments) + | _ -> None + in + let extract_nested_external_component_path (lam : Lam.t) : + (Ident.t * bool * string) option = + let dynamic_import = ref None in + match + extract_nested_external_component_segments [] (lam, dynamic_import) + with + | Some (id, dynamic_import, segments) -> ( + let denamespace_segment segment = + let root_name = root_module_name id in + let namespaced_prefix = root_name ^ "$" in + if Ext_string.starts_with segment namespaced_prefix then + match String.split_on_char '$' segment with + | root :: _namespace :: rest when rest <> [] -> + String.concat "$" (root :: rest) + | _ -> segment + else segment + in + let segments = + match segments with + | head :: rest + when head = id.name + || head = root_module_name id + || Ext_string.starts_with head (root_module_name id ^ "$") -> + rest + | _ -> segments + in + let segments = + match segments with + | head :: rest -> denamespace_segment head :: rest + | [] -> [] + in + match segments with + | [] -> None + | _ -> + Some + ( id, + dynamic_import, + String.concat "$" (root_module_name id :: segments) )) + | None -> None + in + let extract_nested_external_component_field (lam : Lam.t) : + (Ident.t * bool * string) option = + match lam with + | Lprim + { + primitive = Pfield (_, Fld_module {name = "make"; jsx_component = _}); + args = [arg]; + _; + } -> + extract_nested_external_component_path arg + | _ -> None + in + let extract_static_nested_external_component_path (lam : Lam.t) : + (Ident.t * bool * string) option = + match extract_static_nested_external_component_segments [] lam with + | Some (id, dynamic_import, segments) -> ( + let denamespace_segment segment = + let root_name = root_module_name id in + let namespaced_prefix = root_name ^ "$" in + if Ext_string.starts_with segment namespaced_prefix then + match String.split_on_char '$' segment with + | root :: _namespace :: rest when rest <> [] -> + String.concat "$" (root :: rest) + | _ -> segment + else segment + in + let segments = + match segments with + | head :: rest + when head = id.name + || head = root_module_name id + || Ext_string.starts_with head (root_module_name id ^ "$") -> + rest + | _ -> segments + in + let segments = + match segments with + | head :: rest -> denamespace_segment head :: rest + | [] -> [] + in + match segments with + | [] -> None + | _ -> + Some + ( id, + dynamic_import, + String.concat "$" (root_module_name id :: segments) )) + | None -> None + in + let normalize_hidden_component_name (id : Ident.t) (hidden_name : string) = + let root_name = root_module_name id in + let id_parts = String.split_on_char '$' id.name in + let namespace_parts = + match id_parts with + | _root :: rest -> rest + | [] -> [] + in + let hidden_parts = String.split_on_char '$' hidden_name in + let hidden_parts_without_root = + match hidden_parts with + | first :: rest when String.equal first root_name -> rest + | _ -> hidden_parts + in + let rec drop_prefix prefix parts = + match (prefix, parts) with + | [], _ -> parts + | x :: xs, y :: ys when String.equal x y -> drop_prefix xs ys + | _ -> parts + in + let tail = drop_prefix namespace_parts hidden_parts_without_root in + match tail with + | [] -> hidden_name + | _ -> String.concat "$" (root_name :: tail) + in + let hidden_component_name_candidates (id : Ident.t) (hidden_name : string) = + let candidates = ref [] in + let push candidate = + if not (List.mem candidate !candidates) then + candidates := candidate :: !candidates + in + (match String.split_on_char '$' hidden_name with + | root :: _namespace :: rest when rest <> [] -> + push (String.concat "$" (root :: rest)) + | _ -> ()); + push (normalize_hidden_component_name id hidden_name); + push hidden_name; + List.rev !candidates + in + let exported_hidden_component_name ~(id : Ident.t) ~(dynamic_import : bool) + (hidden_name_candidates : string list) = + let rec loop = function + | [] -> None + | candidate :: rest -> ( + match + Lam_compile_env.query_external_id_info ~dynamic_import id candidate + with + | _ -> Some candidate + | exception Not_found -> loop rest) + in + loop hidden_name_candidates + in + let rec extract_root_expr (expr : J.expression) = + match expr.expression_desc with + | Var (Qualified (module_id, Some _)) -> + Some {expr with expression_desc = Var (Qualified (module_id, None))} + | Static_index (inner, _, _) -> extract_root_expr inner + | Var _ -> Some expr + | _ -> None + in + let hidden_component_access (root_expr : J.expression) hidden_name = + match root_expr.expression_desc with + | Var (Qualified (module_id, None)) -> + { + root_expr with + expression_desc = Var (Qualified (module_id, Some hidden_name)); + } + | _ -> E.dot root_expr hidden_name + in + let rewrite_nested_jsx_component_expr (jsx_tag : Lam.t) + (compiled_expr : J.expression) : J.expression = + match extract_nested_external_component_field jsx_tag with + | Some (id, dynamic_import, hidden_name) -> ( + let hidden_name_candidates = + hidden_component_name_candidates id hidden_name + in + match extract_root_expr compiled_expr with + | Some root_expr -> ( + match + exported_hidden_component_name ~id ~dynamic_import + hidden_name_candidates + with + | Some hidden_name -> hidden_component_access root_expr hidden_name + | None -> compiled_expr) + | None -> compiled_expr) + | None -> compiled_expr + in + let rewrite_nested_component_make_expr (lam : Lam.t) + (compiled_expr : J.expression) : J.expression = + match extract_static_nested_external_component_path lam with + | Some (id, dynamic_import, hidden_name) -> ( + let hidden_name_candidates = + hidden_component_name_candidates id hidden_name + in + match extract_root_expr compiled_expr with + | Some root_expr -> ( + match + exported_hidden_component_name ~id ~dynamic_import + hidden_name_candidates + with + | Some hidden_name -> hidden_component_access root_expr hidden_name + | None -> compiled_expr) + | None -> compiled_expr) + | None -> compiled_expr + in let rec compile_external_field (* Like [List.empty]*) ?(dynamic_import = false) (lamba_cxt : Lam_compile_context.t) (id : Ident.t) name : Js_output.t = @@ -300,7 +554,14 @@ let compile output_prefix = (Ext_list.append block args_code, b :: args) | _ -> assert false) in - + let args = + if appinfo.ap_transformed_jsx then + match (appinfo.ap_args, args) with + | jsx_tag :: _, jsx_expr :: rest_args -> + rewrite_nested_jsx_component_expr jsx_tag jsx_expr :: rest_args + | _ -> args + else args + in let fn = E.ml_var_dot ~dynamic_import module_id ident_info.name in let expression = match appinfo.ap_info.ap_status with @@ -1505,7 +1766,7 @@ let compile output_prefix = }; } -> ( match fld_info with - | Fld_module {name} -> + | Fld_module {name; jsx_component = _} -> compile_external_field_apply ~dynamic_import appinfo id name lambda_cxt | _ -> assert false) | _ -> ( @@ -1524,6 +1785,14 @@ let compile output_prefix = (Ext_list.append block args_code, b :: fn_code) | {value = None} -> assert false) in + let args = + if appinfo.ap_transformed_jsx then + match (appinfo.ap_args, args) with + | jsx_tag :: _, jsx_expr :: rest_args -> + rewrite_nested_jsx_component_expr jsx_tag jsx_expr :: rest_args + | _ -> args + else args + in match (ap_func, lambda_cxt.continuation) with | ( Lvar fn_id, ( EffectCall (Maybe_tail_is_return (Tail_with_name {label = Some ret})) @@ -1583,6 +1852,57 @@ let compile output_prefix = and compile_prim (prim_info : Lam.prim_info) (lambda_cxt : Lam_compile_context.t) = match prim_info with + | { + primitive = + Pjs_call + { + prim_name = "jsx" | "jsxs" | "jsxKeyed" | "jsxsKeyed"; + transformed_jsx = true; + _; + }; + args = jsx_tag :: rest_args; + loc; + } -> + let new_cxt = {lambda_cxt with continuation = NeedValue Not_tail} in + let tag_block, tag_expr = + match compile_lambda new_cxt jsx_tag with + | {block; value = Some b} -> + (block, rewrite_nested_jsx_component_expr jsx_tag b) + | {value = None} -> assert false + in + let rest_blocks, rest_exprs = + Ext_list.split_map rest_args (fun x -> + match compile_lambda new_cxt x with + | {block; value = Some b} -> (block, b) + | {value = None} -> assert false) + in + let args_code : J.block = List.concat (tag_block :: rest_blocks) in + let exp = + Lam_compile_primitive.translate output_prefix loc lambda_cxt + prim_info.primitive (tag_expr :: rest_exprs) + in + Js_output.output_of_block_and_expression lambda_cxt.continuation args_code + exp + | { + primitive = + Pfield (_, (Fld_module {name = "make"; jsx_component = _} as fld_info)); + args = [arg]; + _; + } -> ( + match arg with + | Lglobal_module (id, dynamic_import) -> + compile_external_field ~dynamic_import lambda_cxt id "make" + | _ -> ( + let new_cxt = {lambda_cxt with continuation = NeedValue Not_tail} in + match compile_lambda new_cxt arg with + | {block; value = Some compiled_arg} -> + let compiled_expr = Js_of_lam_block.field fld_info compiled_arg 0l in + let compiled_expr = + rewrite_nested_component_make_expr arg compiled_expr + in + Js_output.output_of_block_and_expression lambda_cxt.continuation block + compiled_expr + | {value = None} -> assert false)) | { primitive = Pfield (_, fld_info); args = [Lglobal_module (id, dynamic_import)]; @@ -1590,7 +1910,7 @@ let compile output_prefix = } -> ( (* should be before Lglobal_global *) match fld_info with - | Fld_module {name = field} -> + | Fld_module {name = field; jsx_component = _} -> compile_external_field ~dynamic_import lambda_cxt id field | _ -> assert false) | {primitive = Praise; args = [e]; _} -> ( @@ -1809,7 +2129,14 @@ let compile output_prefix = {lambda_cxt with continuation = Declare (let_kind, id)} arg in - Js_output.append_output args_code (compile_lambda lambda_cxt body) + let previous_aliases = !local_module_aliases in + local_module_aliases := Map_ident.add previous_aliases id arg; + let body_output = + Fun.protect + ~finally:(fun () -> local_module_aliases := previous_aliases) + (fun () -> compile_lambda lambda_cxt body) + in + Js_output.append_output args_code body_output | Lletrec (id_args, body) -> (* There is a bug in our current design, it requires compile args first (register that some objects are jsidentifiers) diff --git a/compiler/core/lam_compile_main.ml b/compiler/core/lam_compile_main.ml index 5871d643ebd..1eb49c0d9b3 100644 --- a/compiler/core/lam_compile_main.ml +++ b/compiler/core/lam_compile_main.ml @@ -254,6 +254,9 @@ js |> (fun js -> ignore @@ Js_pass_scope.program js ; js ) |> Js_shake.shake_program |> _j "shake" +|> (fun js -> + if !Js_config.cmj_only then js + else Js_pass_nested_component_exports.program js) |> ( fun (program: J.program) -> let external_module_ids : Lam_module_ident.t list = if !Js_config.all_module_aliases then [] diff --git a/compiler/core/lam_pass_remove_alias.ml b/compiler/core/lam_pass_remove_alias.ml index 1dad7d3865c..cd72556a775 100644 --- a/compiler/core/lam_pass_remove_alias.ml +++ b/compiler/core/lam_pass_remove_alias.ml @@ -133,7 +133,8 @@ let simplify_alias (meta : Lam_stats.t) (lam : Lam.t) : Lam.t = ap_func = Lprim { - primitive = Pfield (_, Fld_module {name = fld_name}); + primitive = + Pfield (_, Fld_module {name = fld_name; jsx_component = _}); args = [Lglobal_module (ident, dynamic_import)]; _; } as l1; diff --git a/compiler/core/lam_print.ml b/compiler/core/lam_print.ml index 172e219abb7..0607724e232 100644 --- a/compiler/core/lam_print.ml +++ b/compiler/core/lam_print.ml @@ -323,7 +323,7 @@ let lambda ppf v = fprintf ppf ")@ %a)@]" lam body | Lprim { - primitive = Pfield (n, Fld_module {name = s}); + primitive = Pfield (n, Fld_module {name = s; jsx_component = _}); args = [Lglobal_module (id, dynamic_import)]; _; } -> diff --git a/compiler/gentype/EmitJs.ml b/compiler/gentype/EmitJs.ml index 7a72efa2e17..964b34a2928 100644 --- a/compiler/gentype/EmitJs.ml +++ b/compiler/gentype/EmitJs.ml @@ -139,6 +139,28 @@ let emit_export_from_type_declarations ~config ~emitters ~env let emit_code_item ~config ~emitters ~module_items_emitter ~env ~file_name ~output_file_relative ~resolver ~inline_one_level ~type_name_is_interface code_item = + let nested_make_hidden_export_access ~file_name module_access_path = + let rec flatten = function + | Runtime.Root s -> [s] + | Runtime.Dot (path, module_item) -> + flatten path @ [module_item |> Runtime.module_item_to_string] + in + match flatten module_access_path with + | [] -> None + | _module_path :: _ as path -> ( + match List.rev path with + | "make" :: module_path_rev -> ( + match List.rev module_path_rev with + | [] -> None + | module_path -> + Some + ((file_name |> ModuleName.for_js_file |> ModuleName.to_string) + ^ "." + ^ (file_name |> ModuleName.to_string) + ^ "$" + ^ String.concat "$" module_path)) + | _ -> None) + in if !Debug.code_items then Log_.item "Code Item: %s\n" (code_item |> code_item_to_string ~config ~type_name_is_interface); @@ -350,6 +372,12 @@ let emit_code_item ~config ~emitters ~module_items_emitter ~env ~file_name (comp_type, None) | _ -> (type_, None) in + let is_react_component_export = + match type_ with + | Function {arg_types = [{a_type = Object (_, fields)}]; ret_type; _} -> + ret_type |> EmitType.is_type_function_component ~fields + | _ -> false + in resolved_name |> ExportModule.extend_export_modules ~doc_string ~module_items_emitter @@ -375,9 +403,15 @@ let emit_code_item ~config ~emitters ~module_items_emitter ~env ~file_name | _ -> emitters in let emitters = - (file_name_js |> ModuleName.to_string) - ^ "." - ^ (module_access_path |> Runtime.emit_module_access_path ~config) + (match + ( original_name = make && is_react_component_export, + nested_make_hidden_export_access ~file_name module_access_path ) + with + | true, Some hidden_access -> hidden_access + | _ -> + (file_name_js |> ModuleName.to_string) + ^ "." + ^ (module_access_path |> Runtime.emit_module_access_path ~config)) |> EmitType.emit_export_const ~config ~doc_string ~early:false ~emitters ~name ~type_ ~type_name_is_interface in diff --git a/compiler/gentype/ExportModule.ml b/compiler/gentype/ExportModule.ml index eb3ce62954e..54b913b2801 100644 --- a/compiler/gentype/ExportModule.ml +++ b/compiler/gentype/ExportModule.ml @@ -3,7 +3,12 @@ open GenTypeCommon type export_module_item = (string, export_module_value) Hashtbl.t and export_module_value = - | S of {name: string; type_: type_; doc_string: DocString.t} + | S of { + name: string; + path: string list; + type_: type_; + doc_string: DocString.t; + } | M of {export_module_item: export_module_item} type export_module_items = (string, export_module_item) Hashtbl.t @@ -18,7 +23,7 @@ type field_info = {field_for_value: field; field_for_type: field} let rec export_module_value_to_type ~config export_module_value = match export_module_value with - | S {name; type_; doc_string} -> + | S {name; type_; doc_string; _} -> {type_for_value = ident name; type_for_type = type_; doc_string} | M {export_module_item} -> let fields_info = @@ -57,13 +62,13 @@ and export_module_item_to_fields = export_module_item [] : config:Config.t -> export_module_item -> field_info list) -let rec extend_export_module_item ~doc_string x +let rec extend_export_module_item ~doc_string ~resolved_name x ~(export_module_item : export_module_item) ~type_ ~value_name = match x with | [] -> () | [field_name] -> Hashtbl.replace export_module_item field_name - (S {name = value_name; type_; doc_string}) + (S {name = value_name; path = resolved_name; type_; doc_string}) | field_name :: rest -> let inner_export_module_item = match Hashtbl.find export_module_item field_name with @@ -77,7 +82,7 @@ let rec extend_export_module_item ~doc_string x inner_export_module_item in rest - |> extend_export_module_item ~doc_string + |> extend_export_module_item ~doc_string ~resolved_name ~export_module_item:inner_export_module_item ~value_name ~type_ let extend_export_module_items x ~doc_string @@ -95,8 +100,8 @@ let extend_export_module_items x ~doc_string export_module_item in rest - |> extend_export_module_item ~doc_string ~export_module_item ~type_ - ~value_name + |> extend_export_module_item ~doc_string ~resolved_name:x + ~export_module_item ~type_ ~value_name let create_module_items_emitter = (fun () -> Hashtbl.create 1 : unit -> export_module_items) @@ -107,16 +112,55 @@ let rev_fold f tbl base = let emit_all_module_items ~config ~emitters ~file_name (export_module_items : export_module_items) = + let is_react_component_type type_ = + match type_ with + | Function {arg_types = [{a_type = Object (_, fields)}]; ret_type; _} -> + ret_type |> EmitType.is_type_function_component ~fields + | _ -> false + in + let hidden_export_access resolved_name = + match List.rev resolved_name with + | "make" :: module_path_rev -> ( + match List.rev module_path_rev with + | [] -> None + | module_path -> + Some + ((file_name |> ModuleName.for_js_file |> ModuleName.to_string) + ^ "." + ^ (file_name |> ModuleName.to_string) + ^ "$" + ^ String.concat "$" module_path)) + | _ -> None + in + let single_make_component_export export_module_item = + match Hashtbl.length export_module_item with + | 1 -> ( + match Hashtbl.find_opt export_module_item "make" with + | Some (S {path; type_; doc_string; _}) when is_react_component_type type_ + -> ( + match hidden_export_access path with + | Some access -> Some (access, type_, doc_string) + | None -> None) + | Some (S _) | Some (M _) | None -> None) + | _ -> None + in emitters |> rev_fold (fun module_name export_module_item emitters -> - let {type_for_type; doc_string} = - M {export_module_item} |> export_module_value_to_type ~config - in if !Debug.code_items then Log_.item "EmitModule %s @." module_name; - let emitted_module_item = - ModuleName.for_inner_module ~file_name ~inner_module_name:module_name - |> ModuleName.to_string + let emitted_module_item, type_for_type, doc_string = + match single_make_component_export export_module_item with + | Some (component_access, type_, doc_string) -> + (component_access, type_, doc_string) + | None -> + let {type_for_type; doc_string} = + M {export_module_item} |> export_module_value_to_type ~config + in + ( ModuleName.for_inner_module ~file_name + ~inner_module_name:module_name + |> ModuleName.to_string, + type_for_type, + doc_string ) in emitted_module_item |> EmitType.emit_export_const ~doc_string ~early:false ~config diff --git a/compiler/gentype/Runtime.ml b/compiler/gentype/Runtime.ml index e8b14e21e9d..6ceef0a6c86 100644 --- a/compiler/gentype/Runtime.ml +++ b/compiler/gentype/Runtime.ml @@ -4,6 +4,7 @@ type module_access_path = | Dot of module_access_path * module_item let new_module_item ~name = name +let module_item_to_string module_item = module_item let rec emit_module_access_path ~config module_access_path = match module_access_path with diff --git a/compiler/gentype/Runtime.mli b/compiler/gentype/Runtime.mli index d220a0a7b51..84ce6009da7 100644 --- a/compiler/gentype/Runtime.mli +++ b/compiler/gentype/Runtime.mli @@ -8,8 +8,8 @@ type module_access_path = val check_mutable_object_field : previous_name:string -> name:string -> bool val default : string val emit_module_access_path : config:Config.t -> module_access_path -> string - val is_mutable_object_field : string -> bool +val module_item_to_string : module_item -> string val new_module_item : name:string -> module_item val js_variant_tag : polymorphic:bool -> tag:string option -> string val js_variant_payload_tag : n:int -> string diff --git a/compiler/ml/lambda.ml b/compiler/ml/lambda.ml index db810d4f912..540b9204c0a 100644 --- a/compiler/ml/lambda.ml +++ b/compiler/ml/lambda.ml @@ -113,7 +113,7 @@ let ref_tag_info : tag_info = type field_dbg_info = | Fld_record of {name: string; mutable_flag: Asttypes.mutable_flag} - | Fld_module of {name: string} + | Fld_module of {name: string; jsx_component: bool} | Fld_record_inline of {name: string} | Fld_record_extension of {name: string} | Fld_tuple @@ -134,6 +134,8 @@ let fld_record_extension (lbl : label) = Fld_record_extension {name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name} +let fld_module ~name ~jsx_component = Fld_module {name; jsx_component} + let ref_field_info : field_dbg_info = Fld_record {name = "contents"; mutable_flag = Mutable} @@ -620,11 +622,28 @@ let rec transl_normal_path = function else Lvar id | Pdot (p, s, pos) -> Lprim - ( Pfield (pos, Fld_module {name = s}), + ( Pfield (pos, Fld_module {name = s; jsx_component = false}), [transl_normal_path p], Location.none ) | Papply _ -> assert false +let transl_jsx_path path = + let rec aux ~is_final = function + | Path.Pident id -> + if Ident.global id then Lprim (Pgetglobal id, [], Location.none) + else Lvar id + | Pdot (p, s, pos) -> + Lprim + ( Pfield + ( pos, + Fld_module + {name = s; jsx_component = is_final && String.equal s "make"} ), + [aux ~is_final:false p], + Location.none ) + | Papply _ -> assert false + in + aux ~is_final:true path + (* Translation of identifiers *) let transl_module_path ?(loc = Location.none) env path = @@ -633,6 +652,9 @@ let transl_module_path ?(loc = Location.none) env path = let transl_value_path ?(loc = Location.none) env path = transl_normal_path (Env.normalize_path_prefix (Some loc) env path) +let transl_jsx_value_path ?(loc = Location.none) env path = + transl_jsx_path (Env.normalize_path_prefix (Some loc) env path) + let transl_extension_path = transl_value_path (* Apply a substitution to a lambda-term. diff --git a/compiler/ml/lambda.mli b/compiler/ml/lambda.mli index d8eaf57be6f..3658437d902 100644 --- a/compiler/ml/lambda.mli +++ b/compiler/ml/lambda.mli @@ -84,7 +84,7 @@ val ref_tag_info : tag_info type field_dbg_info = | Fld_record of {name: string; mutable_flag: Asttypes.mutable_flag} - | Fld_module of {name: string} + | Fld_module of {name: string; jsx_component: bool} | Fld_record_inline of {name: string} | Fld_record_extension of {name: string} | Fld_tuple @@ -100,6 +100,8 @@ val fld_record_inline : Types.label_description -> field_dbg_info val fld_record_extension : Types.label_description -> field_dbg_info +val fld_module : name:string -> jsx_component:bool -> field_dbg_info + val ref_field_info : field_dbg_info type set_field_dbg_info = @@ -393,6 +395,7 @@ val transl_normal_path : Path.t -> lambda (* Path.t is already normal *) val transl_module_path : ?loc:Location.t -> Env.t -> Path.t -> lambda val transl_value_path : ?loc:Location.t -> Env.t -> Path.t -> lambda +val transl_jsx_value_path : ?loc:Location.t -> Env.t -> Path.t -> lambda val transl_extension_path : ?loc:Location.t -> Env.t -> Path.t -> lambda val subst_lambda : lambda Ident.tbl -> lambda -> lambda diff --git a/compiler/ml/printlambda.ml b/compiler/ml/printlambda.ml index 0282f6e113c..ecafa38cd6e 100644 --- a/compiler/ml/printlambda.ml +++ b/compiler/ml/printlambda.ml @@ -72,7 +72,7 @@ let string_of_loc_kind = function let str_of_field_info (fld_info : Lambda.field_dbg_info) = match fld_info with - | Fld_module {name} + | Fld_module {name; jsx_component = _} | Fld_record {name} | Fld_record_inline {name} | Fld_record_extension {name} -> diff --git a/compiler/ml/translcore.ml b/compiler/ml/translcore.ml index 078cbf133a0..670a91a8a82 100644 --- a/compiler/ml/translcore.ml +++ b/compiler/ml/translcore.ml @@ -652,6 +652,11 @@ let extract_directive_for_fn exp = if txt = "directive" then Ast_payload.is_single_string payload else None) +let has_jsx_component_path_attr (exp : Typedtree.expression) = + List.exists + (fun ({txt; _}, _) -> String.equal txt "res.jsxComponentPath") + exp.exp_attributes + let rec transl_exp e = List.iter (Translattribute.check_attribute e) e.exp_attributes; transl_exp0 e @@ -661,7 +666,9 @@ and transl_exp0 (e : Typedtree.expression) : Lambda.lambda = | Texp_ident (_, _, {val_kind = Val_prim p}) -> transl_primitive e.exp_loc p e.exp_env e.exp_type | Texp_ident (path, _, {val_kind = Val_reg}) -> - transl_value_path ~loc:e.exp_loc e.exp_env path + if has_jsx_component_path_attr e then + transl_jsx_value_path ~loc:e.exp_loc e.exp_env path + else transl_value_path ~loc:e.exp_loc e.exp_env path | Texp_constant cst -> Lconst (Const_base cst) | Texp_let (rec_flag, pat_expr_list, body) -> transl_let rec_flag pat_expr_list (transl_exp body) diff --git a/compiler/ml/translmod.ml b/compiler/ml/translmod.ml index 87471ac26bf..caf2b47dde6 100644 --- a/compiler/ml/translmod.ml +++ b/compiler/ml/translmod.ml @@ -64,14 +64,20 @@ let rec apply_coercion loc strict (restr : Typedtree.module_coercion) arg = | Tcoerce_structure (pos_cc_list, id_pos_list, runtime_fields) -> Lambda.name_lambda strict arg (fun id -> let get_field_name name pos = - Lambda.Lprim (Pfield (pos, Fld_module {name}), [Lvar id], loc) + Lambda.Lprim + ( Pfield (pos, Fld_module {name; jsx_component = false}), + [Lvar id], + loc ) in let lam = Lambda.Lprim ( Pmakeblock (Blk_module runtime_fields), Ext_list.map2 pos_cc_list runtime_fields (fun (pos, cc) name -> apply_coercion loc Alias cc - (Lprim (Pfield (pos, Fld_module {name}), [Lvar id], loc))), + (Lprim + ( Pfield (pos, Fld_module {name; jsx_component = false}), + [Lvar id], + loc ))), loc ) in wrap_id_pos_list loc id_pos_list get_field_name lam) @@ -432,7 +438,10 @@ and transl_structure loc fields cc rootpath final_env = function Pgenval, id, Lprim - ( Pfield (pos, Fld_module {name = Ident.name id}), + ( Pfield + ( pos, + Fld_module {name = Ident.name id; jsx_component = false} + ), [Lvar mid], incl.incl_loc ), body ), diff --git a/compiler/syntax/src/jsx_common.ml b/compiler/syntax/src/jsx_common.ml index a48cf11bc97..84667be8124 100644 --- a/compiler/syntax/src/jsx_common.ml +++ b/compiler/syntax/src/jsx_common.ml @@ -6,6 +6,17 @@ type jsx_config = { mutable module_: string; mutable nested_modules: string list; mutable has_component: bool; + mutable hoisted_structure_items: structure_item list; + mutable hoisted_signature_items: signature_item list; + (* Nesting depth of [structure] / [signature] while rewriting one file. + Used so we only clear/append hoisted items at the true file root — not for + nested [Pmod_structure] / [Pmty_signature] reached from inner traversal, + which would otherwise wipe hoists from earlier items. *) + mutable structure_depth: int; + (* Inside [Pmod_functor] / [Pmty_functor] bodies, hoisting [File$M = M.make] + at the file top would reference [M] as a functor (illegal). Skip hoists + when > 0. *) + mutable functor_depth: int; } (* Helper method to look up the [@react.component] attribute *) diff --git a/compiler/syntax/src/jsx_ppx.ml b/compiler/syntax/src/jsx_ppx.ml index 4b05e1995d9..e3b22f0fca4 100644 --- a/compiler/syntax/src/jsx_ppx.ml +++ b/compiler/syntax/src/jsx_ppx.ml @@ -85,6 +85,50 @@ let get_mapper ~config = | 4 -> module_binding4 mapper mb | _ -> default_mapper.module_binding mapper mb in + let module_expr mapper me = + match (config.version, me.pmod_desc) with + | 4, Pmod_functor _ -> ( + config.functor_depth <- config.functor_depth + 1; + try + let m = default_mapper.module_expr mapper me in + config.functor_depth <- config.functor_depth - 1; + m + with e -> + config.functor_depth <- config.functor_depth - 1; + raise e) + | _ -> default_mapper.module_expr mapper me + in + let module_type mapper mt = + match (config.version, mt.pmty_desc) with + | 4, Pmty_functor _ -> ( + config.functor_depth <- config.functor_depth + 1; + try + let m = default_mapper.module_type mapper mt in + config.functor_depth <- config.functor_depth - 1; + m + with e -> + config.functor_depth <- config.functor_depth - 1; + raise e) + | _ -> default_mapper.module_type mapper mt + in + let module_declaration mapper md = + match config.version with + | 4 -> + config.nested_modules <- md.pmd_name.txt :: config.nested_modules; + let mapped = + try default_mapper.module_declaration mapper md + with e -> + (match config.nested_modules with + | _ :: rest -> config.nested_modules <- rest + | [] -> ()); + raise e + in + (match config.nested_modules with + | _ :: rest -> config.nested_modules <- rest + | [] -> ()); + mapped + | _ -> default_mapper.module_declaration mapper md + in let save_config () = { config with @@ -100,7 +144,10 @@ let get_mapper ~config = in let signature mapper items = let old_config = save_config () in + let is_top_level = config.structure_depth = 0 in + config.structure_depth <- config.structure_depth + 1; config.has_component <- false; + if is_top_level then config.hoisted_signature_items <- []; let result = List.map (fun item -> @@ -112,12 +159,21 @@ let get_mapper ~config = items |> List.flatten in + let result = + if config.version = 4 && is_top_level then + result @ List.rev config.hoisted_signature_items + else result + in + config.structure_depth <- config.structure_depth - 1; restore_config old_config; result in let structure mapper items = let old_config = save_config () in + let is_top_level = config.structure_depth = 0 in + config.structure_depth <- config.structure_depth + 1; config.has_component <- false; + if is_top_level then config.hoisted_structure_items <- []; let result = List.map (fun item -> @@ -129,11 +185,26 @@ let get_mapper ~config = items |> List.flatten in + let result = + if config.version = 4 && is_top_level then + result @ List.rev config.hoisted_structure_items + else result + in + config.structure_depth <- config.structure_depth - 1; restore_config old_config; result in - {default_mapper with expr; module_binding; signature; structure} + { + default_mapper with + expr; + module_binding; + module_expr; + module_type; + module_declaration; + signature; + structure; + } let rewrite_implementation ~jsx_version ~jsx_module (code : Parsetree.structure) : Parsetree.structure = @@ -143,6 +214,10 @@ let rewrite_implementation ~jsx_version ~jsx_module (code : Parsetree.structure) module_ = jsx_module; nested_modules = []; has_component = false; + hoisted_structure_items = []; + hoisted_signature_items = []; + structure_depth = 0; + functor_depth = 0; } in let mapper = get_mapper ~config in @@ -156,6 +231,10 @@ let rewrite_signature ~jsx_version ~jsx_module (code : Parsetree.signature) : module_ = jsx_module; nested_modules = []; has_component = false; + hoisted_structure_items = []; + hoisted_signature_items = []; + structure_depth = 0; + functor_depth = 0; } in let mapper = get_mapper ~config in diff --git a/compiler/syntax/src/jsx_v4.ml b/compiler/syntax/src/jsx_v4.ml index 83bbb0dcdc4..9412449a604 100644 --- a/compiler/syntax/src/jsx_v4.ml +++ b/compiler/syntax/src/jsx_v4.ml @@ -80,6 +80,54 @@ let make_new_binding binding expression new_name = Jsx_common.raise_error ~loc:pvb_loc "JSX component calls cannot be destructured." +let longident_of_segments = function + | [] -> assert false + | head :: rest -> + List.fold_left (fun acc name -> Ldot (acc, name)) (Lident head) rest + +(* [nested_modules] is the same stack as [config.nested_modules] while inside a + nested [module M: { ... }]: outermost submodule name is at the tail. *) +let props_longident_for_nested_module nested_modules = + match List.rev nested_modules with + | [] -> Lident "props" + | m :: rest -> + let mod_path = + List.fold_left (fun acc name -> Ldot (acc, name)) (Lident m) rest + in + Ldot (mod_path, "props") + +(* Hoisted File$Nested / File$Nested$jsx exist for JS/RSC exports; they are not + always referenced from ReScript when a nested module is absent from the + [.resi], so suppress unused-value (32) on these bindings only. *) +let jsx_hoisted_binding_warning_attrs = + [ + ( Location.mknoloc "warning", + PStr [Str.eval (Exp.constant (Pconst_string ("-32", None)))] ); + ] + +let make_hoisted_component_binding ~empty_loc ~full_module_name nested_modules = + let path = + nested_modules |> List.rev |> longident_of_segments |> fun txt -> + {loc = empty_loc; txt = Ldot (txt, "make")} + in + let marker_name = full_module_name ^ "$jsx" in + { + pstr_loc = empty_loc; + pstr_desc = + Pstr_value + ( Nonrecursive, + [ + Vb.mk ~loc:empty_loc ~attrs:jsx_hoisted_binding_warning_attrs + (Pat.var ~loc:empty_loc {loc = empty_loc; txt = full_module_name}) + (Exp.ident ~loc:empty_loc path); + Vb.mk ~loc:empty_loc ~attrs:jsx_hoisted_binding_warning_attrs + (Pat.var ~loc:empty_loc {loc = empty_loc; txt = marker_name}) + (Exp.construct ~loc:empty_loc + {loc = empty_loc; txt = Lident "true"} + None); + ] ); + } + (* Lookup the filename from the location information on the AST node and turn it into a valid module identifier *) let filename_from_loc (pstr_loc : Location.t) = let file_name = @@ -94,8 +142,65 @@ let filename_from_loc (pstr_loc : Location.t) = let file_name = String.capitalize_ascii file_name in file_name +let unnamespace_module_name file_name = + match String.index_opt file_name '$' with + | Some index -> String.sub file_name 0 index + | None -> ( + match Ext_namespace.try_split_module_name file_name with + | Some (_namespace, module_name) -> module_name + | None -> file_name) + +let maybe_hoist_nested_make_component ~(config : Jsx_common.jsx_config) + ~empty_loc ~full_module_name fn_name = + match (fn_name, config.nested_modules, config.functor_depth) with + | "make", _ :: _, 0 -> + config.hoisted_structure_items <- + make_hoisted_component_binding ~empty_loc ~full_module_name + config.nested_modules + :: config.hoisted_structure_items + | _ -> () + +let make_hoisted_component_signature ~empty_loc ~full_module_name + (component_type : Parsetree.core_type) = + let marker_name = full_module_name ^ "$jsx" in + let bool_ty = + Typ.constr ~loc:empty_loc {loc = empty_loc; txt = Lident "bool"} [] + in + let full_sig = + { + psig_loc = empty_loc; + psig_desc = + Psig_value + (Val.mk ~loc:empty_loc + {loc = empty_loc; txt = full_module_name} + component_type); + } + in + let jsx_sig = + { + psig_loc = empty_loc; + psig_desc = + Psig_value + (Val.mk ~loc:empty_loc {loc = empty_loc; txt = marker_name} bool_ty); + } + in + (full_sig, jsx_sig) + +let maybe_hoist_nested_make_signature ~(config : Jsx_common.jsx_config) + ~empty_loc ~full_module_name ~component_type fn_name = + match (fn_name, config.nested_modules, config.functor_depth) with + | "make", _ :: _, 0 -> + let full_sig, jsx_sig = + make_hoisted_component_signature ~empty_loc ~full_module_name + component_type + in + config.hoisted_signature_items <- + jsx_sig :: full_sig :: config.hoisted_signature_items + | _ -> () + (* Build a string representation of a module name with segments separated by $ *) let make_module_name file_name nested_modules fn_name = + let file_name = unnamespace_module_name file_name in let full_module_name = match (file_name, nested_modules, fn_name) with (* TODO: is this even reachable? It seems like the fileName always exists *) @@ -216,6 +321,8 @@ let make_type_decls_with_core_type props_name loc core_type typ_vars = let live_attr = ({txt = "live"; loc = Location.none}, PStr []) let jsx_component_props_attr = ({txt = "res.jsxComponentProps"; loc = Location.none}, PStr []) +let jsx_component_path_attr = + ({txt = "res.jsxComponentPath"; loc = Location.none}, PStr []) (* type props<'x, 'y, ...> = { x: 'x, y?: 'y, ... } *) let make_props_record_type ~core_type_of_attr ~external_ ~typ_vars_of_core_type @@ -803,6 +910,10 @@ let map_binding ~config ~empty_loc ~pstr_loc ~file_name ~rec_flag binding = }, Some (binding_wrapper full_expression) ) in + let () = + maybe_hoist_nested_make_component ~config ~empty_loc ~full_module_name + fn_name + in (Some props_record_type, binding, new_binding)) else if Jsx_common.has_attr_on_binding Jsx_common.has_attr_with_props binding then @@ -900,6 +1011,10 @@ let map_binding ~config ~empty_loc ~pstr_loc ~file_name ~rec_flag binding = Some (make_new_binding ~loc:empty_loc ~full_module_name modified_binding) in + let () = + maybe_hoist_nested_make_component ~config ~empty_loc ~full_module_name + fn_name + in let binding_expr = { binding.pvb_expr with @@ -933,7 +1048,8 @@ let transform_structure_item ~config item = | { pstr_loc; pstr_desc = - Pstr_primitive ({pval_attributes; pval_type} as value_description); + Pstr_primitive + ({pval_attributes; pval_type; pval_name} as value_description); } as pstr -> ( match ( List.filter Jsx_common.has_attr pval_attributes, @@ -994,6 +1110,15 @@ let transform_structure_item ~config item = }; } in + let file_name = filename_from_loc pstr_loc in + let empty_loc = Location.in_file file_name in + let full_module_name = + make_module_name file_name config.nested_modules pval_name.txt + in + let () = + maybe_hoist_nested_make_component ~config ~empty_loc ~full_module_name + pval_name.txt + in [props_record_type; new_structure] | _ -> Jsx_common.raise_error ~loc:pstr_loc @@ -1034,7 +1159,8 @@ let transform_signature_item ~config item = match item with | { psig_loc; - psig_desc = Psig_value ({pval_attributes; pval_type} as psig_desc); + psig_desc = + Psig_value ({pval_attributes; pval_type; pval_name} as psig_desc); } as psig -> ( match List.filter Jsx_common.has_attr pval_attributes with | [] -> [item] @@ -1050,15 +1176,23 @@ let transform_signature_item ~config item = in let prop_types = collect_prop_types [] pval_type in let named_type_list = List.fold_left arg_to_concrete_type [] prop_types in + let props_type_args = + match core_type_of_attr with + | None -> make_props_type_params named_type_list + | Some _ -> ( + match typ_vars_of_core_type with + | [] -> [] + | _ -> [Typ.any ()]) + in let ret_props_type = + Typ.constr (Location.mkloc (Lident "props") psig_loc) props_type_args + in + let ret_props_type_for_hoist = Typ.constr - (Location.mkloc (Lident "props") psig_loc) - (match core_type_of_attr with - | None -> make_props_type_params named_type_list - | Some _ -> ( - match typ_vars_of_core_type with - | [] -> [] - | _ -> [Typ.any ()])) + (Location.mkloc + (props_longident_for_nested_module config.nested_modules) + psig_loc) + props_type_args in let external_ = psig_desc.pval_prim <> [] in let props_record_type = @@ -1071,6 +1205,11 @@ let transform_signature_item ~config item = ( {loc = psig_loc; txt = module_access_name config "component"}, [ret_props_type] ) in + let new_external_type_for_hoist = + Ptyp_constr + ( {loc = psig_loc; txt = module_access_name config "component"}, + [ret_props_type_for_hoist] ) + in let new_structure = { psig with @@ -1083,6 +1222,16 @@ let transform_signature_item ~config item = }; } in + let file_name = filename_from_loc psig_loc in + let empty_loc = Location.in_file file_name in + let full_module_name = + make_module_name file_name config.nested_modules pval_name.txt + in + let component_type = + {pval_type with ptyp_desc = new_external_type_for_hoist} + in + maybe_hoist_nested_make_signature ~config ~empty_loc ~full_module_name + ~component_type pval_name.txt; [props_record_type; new_structure] | _ -> Jsx_common.raise_error ~loc:psig_loc @@ -1286,10 +1435,24 @@ let mk_uppercase_tag_name_expr tag_name = | JsxUpperTag path -> Longident.Ldot (path, "make") in let loc = tag_name.loc in - Exp.ident ~loc {txt = tag_identifier; loc} + Exp.ident ~loc ~attrs:[jsx_component_path_attr] {txt = tag_identifier; loc} let expr ~(config : Jsx_common.jsx_config) mapper expression = match expression with + | { + pexp_desc = Pexp_letmodule (name, module_expr, body); + pexp_loc = loc; + pexp_attributes = attrs; + } -> + config.nested_modules <- name.txt :: config.nested_modules; + let mapped_module_expr = default_mapper.module_expr mapper module_expr in + let mapped_body = mapper.expr mapper body in + let () = + match config.nested_modules with + | _ :: rest -> config.nested_modules <- rest + | [] -> () + in + Exp.letmodule ~loc ~attrs name mapped_module_expr mapped_body | { pexp_desc = Pexp_jsx_element jsx_element; pexp_loc = loc; diff --git a/rewatch/tests/watch/06-watch-missing-source-folder.sh b/rewatch/tests/watch/06-watch-missing-source-folder.sh index 08436c4fe19..11d4336c4ca 100755 --- a/rewatch/tests/watch/06-watch-missing-source-folder.sh +++ b/rewatch/tests/watch/06-watch-missing-source-folder.sh @@ -54,14 +54,34 @@ fi # where the config change triggers a full rebuild that runs concurrently # with the subsequent `rewatch build`. exit_watcher -sleep 1 +if ! wait_for_file_gone "lib/rescript.lock" 20; then + error "Watcher did not stop in time" + git checkout "$DEP01_CONFIG" + exit 1 +fi # Restore dep01's rescript.json git checkout "$DEP01_CONFIG" # Rebuild to regenerate any artifacts that were removed by `rewatch clean` # but not rebuilt due to the modified config (e.g. Dep01.mjs). -rewatch build > /dev/null 2>&1 +if ! rewatch build > /dev/null 2>&1; then + error "Rebuild after restoring config failed" + rm -f rewatch.log + exit 1 +fi + +# Slow CI runners can still be catching up on file restoration when the build +# command returns. Wait until git no longer sees tracked deletions before doing +# the final cleanliness check. +timeout=20 +while [ "$timeout" -gt 0 ]; do + if [ -z "$(git diff --name-only --diff-filter=D .)" ]; then + break + fi + sleep 1 + timeout=$((timeout - 1)) +done rm -f rewatch.log if git diff --exit-code . > /dev/null 2>&1 && [ -z "$(git ls-files --others --exclude-standard .)" ]; diff --git a/tests/analysis_tests/tests/src/expected/CompletionAttributes.res.txt b/tests/analysis_tests/tests/src/expected/CompletionAttributes.res.txt index 1c7c3fb9df5..0145d56593c 100644 --- a/tests/analysis_tests/tests/src/expected/CompletionAttributes.res.txt +++ b/tests/analysis_tests/tests/src/expected/CompletionAttributes.res.txt @@ -24,6 +24,12 @@ Resolved opens 1 Stdlib "tags": [], "detail": "Package", "documentation": null + }, { + "label": "./CompletionJsxProps.cmt", + "kind": 4, + "tags": [], + "detail": "Local file", + "documentation": null }, { "label": "./test.json", "kind": 4, @@ -191,6 +197,12 @@ Resolved opens 1 Stdlib "tags": [], "detail": "Package", "documentation": null + }, { + "label": "./CompletionJsxProps.cmt", + "kind": 4, + "tags": [], + "detail": "Local file", + "documentation": null }, { "label": "./test.json", "kind": 4, @@ -216,6 +228,12 @@ Resolved opens 1 Stdlib "tags": [], "detail": "Package", "documentation": null + }, { + "label": "./CompletionJsxProps.cmt", + "kind": 4, + "tags": [], + "detail": "Local file", + "documentation": null }, { "label": "./test.json", "kind": 4, diff --git a/tests/analysis_tests/tests/src/expected/CreateInterface.res.txt b/tests/analysis_tests/tests/src/expected/CreateInterface.res.txt index 998459a8a1c..6a135ff1b04 100644 --- a/tests/analysis_tests/tests/src/expected/CreateInterface.res.txt +++ b/tests/analysis_tests/tests/src/expected/CreateInterface.res.txt @@ -132,4 +132,12 @@ module OrderedSet: { } let make: (~id: module(Belt.Id.Comparable with type identity = 'a and type t = 'b)) => t<'b, 'a> } +let CreateInterface$Mod: Mod.props => React.element +let CreateInterface$Mod$jsx: bool +let CreateInterface$Memo: React.component> +let CreateInterface$Memo$jsx: bool +let CreateInterface$ComponentWithPolyProp: ComponentWithPolyProp.props< + [< #large | #small], +> => React.element +let CreateInterface$ComponentWithPolyProp$jsx: bool diff --git a/tests/analysis_tests/tests/src/expected/JsxV4.res.txt b/tests/analysis_tests/tests/src/expected/JsxV4.res.txt index ea1e781cb4e..45682c0a53c 100644 --- a/tests/analysis_tests/tests/src/expected/JsxV4.res.txt +++ b/tests/analysis_tests/tests/src/expected/JsxV4.res.txt @@ -32,4 +32,10 @@ module Other: { @react.component let make: (~name: string) => React.element } +let JsxV4$M4: M4.props => React.element +let JsxV4$M4$jsx: bool +let JsxV4$MM: MM.props => React.element +let JsxV4$MM$jsx: bool +let JsxV4$Other: Other.props => React.element +let JsxV4$Other$jsx: bool diff --git a/tests/build_tests/react_ppx/src/gpr_3695_test.res.js b/tests/build_tests/react_ppx/src/gpr_3695_test.res.js index ebaf897020a..11c0cca5c42 100644 --- a/tests/build_tests/react_ppx/src/gpr_3695_test.res.js +++ b/tests/build_tests/react_ppx/src/gpr_3695_test.res.js @@ -10,9 +10,15 @@ function test(className) { return Foo; } +let Gpr_3695_test$Test = Foo; + +let Gpr_3695_test$Test$jsx = true; + export { React, Test, test, + Gpr_3695_test$Test, + Gpr_3695_test$Test$jsx, } -/* Foo Not a pure module */ +/* Gpr_3695_test$Test Not a pure module */ diff --git a/tests/build_tests/react_ppx/src/gpr_3987_test.res.js b/tests/build_tests/react_ppx/src/gpr_3987_test.res.js index 378f9156caf..1730f19420e 100644 --- a/tests/build_tests/react_ppx/src/gpr_3987_test.res.js +++ b/tests/build_tests/react_ppx/src/gpr_3987_test.res.js @@ -58,7 +58,7 @@ JsxRuntime.jsx(Gpr_3987_test$Gpr3987ReproError, { export { makeContainer, Gpr3987ReproOk, - Gpr3987ReproOk2, - Gpr3987ReproError, + Gpr_3987_test$Gpr3987ReproOk2, + Gpr_3987_test$Gpr3987ReproError, } /* Not a pure module */ diff --git a/tests/build_tests/react_ppx/src/issue_7917_test.res.js b/tests/build_tests/react_ppx/src/issue_7917_test.res.js index 9df85100b95..169c1dee854 100644 --- a/tests/build_tests/react_ppx/src/issue_7917_test.res.js +++ b/tests/build_tests/react_ppx/src/issue_7917_test.res.js @@ -19,7 +19,7 @@ function Issue_7917_test(props) { let make = Issue_7917_test; export { - M, make, + Issue_7917_test$M, } /* react/jsx-runtime Not a pure module */ diff --git a/tests/build_tests/react_ppx/src/recursive_component_test.res.js b/tests/build_tests/react_ppx/src/recursive_component_test.res.js index 4e3fd9951f4..f3aa4d5fc91 100644 --- a/tests/build_tests/react_ppx/src/recursive_component_test.res.js +++ b/tests/build_tests/react_ppx/src/recursive_component_test.res.js @@ -18,7 +18,13 @@ let Rec = { mm: mm }; +let Recursive_component_test$Rec = make; + +let Recursive_component_test$Rec$jsx = true; + export { Rec, + Recursive_component_test$Rec, + Recursive_component_test$Rec$jsx, } /* No side effect */ diff --git a/tests/build_tests/rsc_component_with_props_members/input.js b/tests/build_tests/rsc_component_with_props_members/input.js new file mode 100644 index 00000000000..74e28a26632 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members/input.js @@ -0,0 +1,71 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const output = await fs.readFile( + path.join(import.meta.dirname, "src", "MainLayout.res.js"), + "utf8", +); +const sidebarOutput = await fs.readFile( + path.join(import.meta.dirname, "src", "Sidebar.res.js"), + "utf8", +); +const plainAccessOutput = await fs.readFile( + path.join(import.meta.dirname, "src", "PlainAccess.res.js"), + "utf8", +); + +assert.match( + output, + /JsxRuntime\.jsx\(Sidebar\$RscComponentWithPropsMembers\.Sidebar\$Provider,/, +); +assert.match( + output, + /JsxRuntime\.jsx\(Sidebar\$RscComponentWithPropsMembers\.Sidebar\$Inset,/, +); +assert.doesNotMatch(output, /\.Provider\.make,/); +assert.doesNotMatch(output, /\.Inset\.make,/); +assert.match( + sidebarOutput, + /let Provider = \{[\s\S]*make: Sidebar\$Provider[\s\S]*\};/s, +); +assert.match( + sidebarOutput, + /let Inset = \{[\s\S]*make: Sidebar\$Inset[\s\S]*\};/s, +); +assert.match( + sidebarOutput, + /export \{[\s\S]*Sidebar\$Provider,[\s\S]*Sidebar\$Inset[\s\S]*\}/s, +); +assert.doesNotMatch(sidebarOutput, /Provider\.make = Provider;/); +assert.doesNotMatch(sidebarOutput, /Inset\.make = Inset;/); +assert.doesNotMatch(sidebarOutput, /Sidebar\$Provider\$jsx/); +assert.doesNotMatch(sidebarOutput, /Sidebar\$Inset\$jsx/); +assert.match( + plainAccessOutput, + /let provider = Sidebar\$RscComponentWithPropsMembers\.Sidebar\$Provider;/, +); +assert.match( + plainAccessOutput, + /let inset = Sidebar\$RscComponentWithPropsMembers\.Sidebar\$Inset;/, +); +assert.doesNotMatch(plainAccessOutput, /\.Provider\.make/); +assert.doesNotMatch(plainAccessOutput, /\.Inset\.make/); +assert.doesNotMatch( + plainAccessOutput, + /Sidebar\$RscComponentWithPropsMembers\.Provider/, +); +assert.doesNotMatch( + plainAccessOutput, + /Sidebar\$RscComponentWithPropsMembers\.Inset/, +); + +await execClean(); diff --git a/tests/build_tests/rsc_component_with_props_members/rescript.json b/tests/build_tests/rsc_component_with_props_members/rescript.json new file mode 100644 index 00000000000..27274bf511a --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "rsc-component-with-props-members", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.js" + }, + "namespace": true +} diff --git a/tests/build_tests/rsc_component_with_props_members/src/MainLayout.res b/tests/build_tests/rsc_component_with_props_members/src/MainLayout.res new file mode 100644 index 00000000000..51d4feac18d --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members/src/MainLayout.res @@ -0,0 +1,6 @@ +@react.component +let make = (~children) => { + + {children} + +} diff --git a/tests/build_tests/rsc_component_with_props_members/src/PlainAccess.res b/tests/build_tests/rsc_component_with_props_members/src/PlainAccess.res new file mode 100644 index 00000000000..7941e529d79 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members/src/PlainAccess.res @@ -0,0 +1,3 @@ +let provider = Sidebar.Provider.make + +let inset = Sidebar.Inset.make diff --git a/tests/build_tests/rsc_component_with_props_members/src/React.res b/tests/build_tests/rsc_component_with_props_members/src/React.res new file mode 100644 index 00000000000..733b8ee02f0 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members/src/React.res @@ -0,0 +1,10 @@ +type element + +@val external null: element = "null" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_component_with_props_members/src/Sidebar.res b/tests/build_tests/rsc_component_with_props_members/src/Sidebar.res new file mode 100644 index 00000000000..42553c69e48 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members/src/Sidebar.res @@ -0,0 +1,13 @@ +module Provider = { + type props = {children: React.element} + + @react.componentWithProps + let make = props => props.children +} + +module Inset = { + type props = {children: React.element} + + @react.componentWithProps + let make = props => props.children +} diff --git a/tests/build_tests/rsc_component_with_props_members_no_namespace/input.js b/tests/build_tests/rsc_component_with_props_members_no_namespace/input.js new file mode 100644 index 00000000000..f762ee4f172 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members_no_namespace/input.js @@ -0,0 +1,33 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const output = await fs.readFile( + path.join(import.meta.dirname, "src", "MainLayout.res.js"), + "utf8", +); +const sidebarOutput = await fs.readFile( + path.join(import.meta.dirname, "src", "Sidebar.res.js"), + "utf8", +); + +assert.match(output, /JsxRuntime\.jsx\(Sidebar\.Sidebar\$Provider,/); +assert.doesNotMatch(output, /Sidebar\.Provider\.make/); +assert.doesNotMatch(output, /JsxRuntime\.jsx\(Sidebar\.Provider,/); +assert.match( + sidebarOutput, + /let Provider = \{[\s\S]*make: Sidebar\$Provider[\s\S]*\};/s, +); +assert.match(sidebarOutput, /export \{[\s\S]*Sidebar\$Provider[\s\S]*\}/s); +assert.doesNotMatch(sidebarOutput, /Provider\.make = Provider;/); +assert.doesNotMatch(sidebarOutput, /Sidebar\$Provider\$jsx/); + +await execClean(); diff --git a/tests/build_tests/rsc_component_with_props_members_no_namespace/rescript.json b/tests/build_tests/rsc_component_with_props_members_no_namespace/rescript.json new file mode 100644 index 00000000000..a456f72c057 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members_no_namespace/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "rsc-component-with-props-members-no-namespace", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.js" + }, + "namespace": false +} diff --git a/tests/build_tests/rsc_component_with_props_members_no_namespace/src/MainLayout.res b/tests/build_tests/rsc_component_with_props_members_no_namespace/src/MainLayout.res new file mode 100644 index 00000000000..e2c753eeb17 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members_no_namespace/src/MainLayout.res @@ -0,0 +1,4 @@ +@react.component +let make = (~children) => { + {children} +} diff --git a/tests/build_tests/rsc_component_with_props_members_no_namespace/src/React.res b/tests/build_tests/rsc_component_with_props_members_no_namespace/src/React.res new file mode 100644 index 00000000000..733b8ee02f0 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members_no_namespace/src/React.res @@ -0,0 +1,10 @@ +type element + +@val external null: element = "null" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_component_with_props_members_no_namespace/src/Sidebar.res b/tests/build_tests/rsc_component_with_props_members_no_namespace/src/Sidebar.res new file mode 100644 index 00000000000..b667cc58fe6 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_members_no_namespace/src/Sidebar.res @@ -0,0 +1,6 @@ +module Provider = { + type props = {children: React.element} + + @react.componentWithProps + let make = props => props.children +} diff --git a/tests/build_tests/rsc_component_with_props_nested/input.js b/tests/build_tests/rsc_component_with_props_nested/input.js new file mode 100644 index 00000000000..7b00e9a0ecc --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_nested/input.js @@ -0,0 +1,35 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const outputPath = path.join(import.meta.dirname, "src", "MainLayout.res.js"); +const output = await fs.readFile(outputPath, "utf8"); +const sidebarOutputPath = path.join( + import.meta.dirname, + "src", + "Sidebar.res.js", +); +const sidebarOutput = await fs.readFile(sidebarOutputPath, "utf8"); + +assert.match( + output, + /JsxRuntime\.jsx\(Sidebar\$RscComponentWithPropsNested\.Sidebar\$Provider,/, +); +assert.doesNotMatch(output, /\.Provider\.make,/); +assert.match( + sidebarOutput, + /let Provider = \{[\s\S]*make: Sidebar\$Provider[\s\S]*\};/s, +); +assert.match(sidebarOutput, /export \{[\s\S]*Sidebar\$Provider[\s\S]*\}/s); +assert.doesNotMatch(sidebarOutput, /Provider\.make = Provider;/); +assert.doesNotMatch(sidebarOutput, /Sidebar\$Provider\$jsx/); + +await execClean(); diff --git a/tests/build_tests/rsc_component_with_props_nested/rescript.json b/tests/build_tests/rsc_component_with_props_nested/rescript.json new file mode 100644 index 00000000000..537397ae493 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_nested/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "rsc-component-with-props-nested", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.js" + }, + "namespace": true +} diff --git a/tests/build_tests/rsc_component_with_props_nested/src/MainLayout.res b/tests/build_tests/rsc_component_with_props_nested/src/MainLayout.res new file mode 100644 index 00000000000..e2c753eeb17 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_nested/src/MainLayout.res @@ -0,0 +1,4 @@ +@react.component +let make = (~children) => { + {children} +} diff --git a/tests/build_tests/rsc_component_with_props_nested/src/React.res b/tests/build_tests/rsc_component_with_props_nested/src/React.res new file mode 100644 index 00000000000..75e3b2c2d78 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_nested/src/React.res @@ -0,0 +1,12 @@ +type element + +@val external null: element = "null" + +external string: string => element = "%identity" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_component_with_props_nested/src/Sidebar.res b/tests/build_tests/rsc_component_with_props_nested/src/Sidebar.res new file mode 100644 index 00000000000..b667cc58fe6 --- /dev/null +++ b/tests/build_tests/rsc_component_with_props_nested/src/Sidebar.res @@ -0,0 +1,6 @@ +module Provider = { + type props = {children: React.element} + + @react.componentWithProps + let make = props => props.children +} diff --git a/tests/build_tests/rsc_dynamic_import_nested_jsx/input.js b/tests/build_tests/rsc_dynamic_import_nested_jsx/input.js new file mode 100644 index 00000000000..1d629929c9d --- /dev/null +++ b/tests/build_tests/rsc_dynamic_import_nested_jsx/input.js @@ -0,0 +1,37 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const outputPath = path.join(import.meta.dirname, "src", "MainLayout.res.mjs"); +const output = await fs.readFile(outputPath, "utf8"); + +assert.match( + output, + /let DynamicSidebar = await import\("\.\/Sidebar\.res\.mjs"\);/, +); +assert.match( + output, + /let dynamicProvider = DynamicSidebar\.Sidebar\$Provider;/, +); +assert.match( + output, + /JsxRuntime\.jsx\(Sidebar\$RscDynamicImportNestedJsx\.Sidebar\$Provider,/, +); +assert.doesNotMatch( + output, + /let dynamicProvider = DynamicSidebar\.Provider\.make;/, +); +assert.doesNotMatch( + output, + /JsxRuntime\.jsx\(Sidebar\$RscDynamicImportNestedJsx\.Provider,/, +); + +await execClean(); diff --git a/tests/build_tests/rsc_dynamic_import_nested_jsx/rescript.json b/tests/build_tests/rsc_dynamic_import_nested_jsx/rescript.json new file mode 100644 index 00000000000..f4772ad950b --- /dev/null +++ b/tests/build_tests/rsc_dynamic_import_nested_jsx/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "rsc-dynamic-import-nested-jsx", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.mjs" + }, + "namespace": true +} diff --git a/tests/build_tests/rsc_dynamic_import_nested_jsx/src/MainLayout.res b/tests/build_tests/rsc_dynamic_import_nested_jsx/src/MainLayout.res new file mode 100644 index 00000000000..42ebacc8096 --- /dev/null +++ b/tests/build_tests/rsc_dynamic_import_nested_jsx/src/MainLayout.res @@ -0,0 +1,8 @@ +module DynamicSidebar = await Sidebar + +let dynamicProvider = DynamicSidebar.Provider.make + +@react.component +let make = (~children) => { + {Option.getOr(children, React.null)} +} diff --git a/tests/build_tests/rsc_dynamic_import_nested_jsx/src/React.res b/tests/build_tests/rsc_dynamic_import_nested_jsx/src/React.res new file mode 100644 index 00000000000..75e3b2c2d78 --- /dev/null +++ b/tests/build_tests/rsc_dynamic_import_nested_jsx/src/React.res @@ -0,0 +1,12 @@ +type element + +@val external null: element = "null" + +external string: string => element = "%identity" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_dynamic_import_nested_jsx/src/Sidebar.res b/tests/build_tests/rsc_dynamic_import_nested_jsx/src/Sidebar.res new file mode 100644 index 00000000000..ad06cf9dc20 --- /dev/null +++ b/tests/build_tests/rsc_dynamic_import_nested_jsx/src/Sidebar.res @@ -0,0 +1,6 @@ +module Provider = { + @react.component + let make = (~children) => { + children + } +} diff --git a/tests/build_tests/rsc_mixed_runtime_import/input.js b/tests/build_tests/rsc_mixed_runtime_import/input.js new file mode 100644 index 00000000000..1e4f73b8bd2 --- /dev/null +++ b/tests/build_tests/rsc_mixed_runtime_import/input.js @@ -0,0 +1,34 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const outputPath = path.join(import.meta.dirname, "src", "MainLayout.res.mjs"); +const output = await fs.readFile(outputPath, "utf8"); + +assert.match( + output, + /import \* as Sidebar\$RscMixedRuntimeImport from "\.\/Sidebar\.res\.mjs";/, +); +assert.match( + output, + /import \* as Stdlib_OptionJs from "@rescript\/runtime\/lib\/es6\/Stdlib_Option\.js";/, +); +assert.match( + output, + /JsxRuntime\.jsx\(Sidebar\$RscMixedRuntimeImport\.Sidebar\$Provider,/, +); +assert.doesNotMatch(output, /@rescript\/runtime\/lib\/es6\/Stdlib_Option\.mjs/); +assert.equal( + output.match(/@rescript\/runtime\/lib\/es6\/Stdlib_Option\.js/g)?.length ?? 0, + 1, +); + +await execClean(); diff --git a/tests/build_tests/rsc_mixed_runtime_import/rescript.json b/tests/build_tests/rsc_mixed_runtime_import/rescript.json new file mode 100644 index 00000000000..c9a0312aa05 --- /dev/null +++ b/tests/build_tests/rsc_mixed_runtime_import/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "rsc-mixed-runtime-import", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.mjs" + }, + "namespace": true +} diff --git a/tests/build_tests/rsc_mixed_runtime_import/src/MainLayout.res b/tests/build_tests/rsc_mixed_runtime_import/src/MainLayout.res new file mode 100644 index 00000000000..4a2dfa741f1 --- /dev/null +++ b/tests/build_tests/rsc_mixed_runtime_import/src/MainLayout.res @@ -0,0 +1,8 @@ +@module("@rescript/runtime/lib/es6/Stdlib_Option.js") +external getOr: (option<'a>, 'a) => 'a = "getOr" + +@react.component +let make = (~children) => { + let child = getOr(children, React.null) + {child} +} diff --git a/tests/build_tests/rsc_mixed_runtime_import/src/React.res b/tests/build_tests/rsc_mixed_runtime_import/src/React.res new file mode 100644 index 00000000000..733b8ee02f0 --- /dev/null +++ b/tests/build_tests/rsc_mixed_runtime_import/src/React.res @@ -0,0 +1,10 @@ +type element + +@val external null: element = "null" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_mixed_runtime_import/src/Sidebar.res b/tests/build_tests/rsc_mixed_runtime_import/src/Sidebar.res new file mode 100644 index 00000000000..25e1db24bca --- /dev/null +++ b/tests/build_tests/rsc_mixed_runtime_import/src/Sidebar.res @@ -0,0 +1,4 @@ +module Provider = { + @react.component + let make = (~children) => children +} diff --git a/tests/build_tests/rsc_nested_jsx_alias_chain/input.js b/tests/build_tests/rsc_nested_jsx_alias_chain/input.js new file mode 100644 index 00000000000..504abfd4c8b --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_alias_chain/input.js @@ -0,0 +1,41 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const layoutOutput = await fs.readFile( + path.join(import.meta.dirname, "src", "MainLayout.res.js"), + "utf8", +); +const plainAccessOutput = await fs.readFile( + path.join(import.meta.dirname, "src", "PlainAccess.res.js"), + "utf8", +); + +assert.match( + layoutOutput, + /JsxRuntime\.jsx\(Sidebar\$RscNestedJsxAliasChain\.Sidebar\$Provider,/, +); +assert.doesNotMatch(layoutOutput, /\.Provider\.make,/); +assert.match( + plainAccessOutput, + /let provider = Sidebar\$RscNestedJsxAliasChain\.Sidebar\$Provider;/, +); +assert.match( + plainAccessOutput, + /let callProvider = Sidebar\$RscNestedJsxAliasChain\.Sidebar\$Provider\(\{/, +); +assert.doesNotMatch(plainAccessOutput, /\.Provider\.make/); +assert.doesNotMatch( + plainAccessOutput, + /Sidebar\$RscNestedJsxAliasChain\.Provider/, +); + +await execClean(); diff --git a/tests/build_tests/rsc_nested_jsx_alias_chain/rescript.json b/tests/build_tests/rsc_nested_jsx_alias_chain/rescript.json new file mode 100644 index 00000000000..a9eae8680c0 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_alias_chain/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "rsc-nested-jsx-alias-chain", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.js" + }, + "namespace": true +} diff --git a/tests/build_tests/rsc_nested_jsx_alias_chain/src/MainLayout.res b/tests/build_tests/rsc_nested_jsx_alias_chain/src/MainLayout.res new file mode 100644 index 00000000000..9fcca339704 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_alias_chain/src/MainLayout.res @@ -0,0 +1,7 @@ +module SidebarAlias = Sidebar +module ProviderAlias = SidebarAlias.Provider + +@react.component +let make = (~children) => { + {children} +} diff --git a/tests/build_tests/rsc_nested_jsx_alias_chain/src/PlainAccess.res b/tests/build_tests/rsc_nested_jsx_alias_chain/src/PlainAccess.res new file mode 100644 index 00000000000..73b07478a5c --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_alias_chain/src/PlainAccess.res @@ -0,0 +1,6 @@ +module SidebarAlias = Sidebar +module ProviderAlias = SidebarAlias.Provider + +let provider = ProviderAlias.make + +let callProvider = ProviderAlias.make({children: React.null}) diff --git a/tests/build_tests/rsc_nested_jsx_alias_chain/src/React.res b/tests/build_tests/rsc_nested_jsx_alias_chain/src/React.res new file mode 100644 index 00000000000..733b8ee02f0 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_alias_chain/src/React.res @@ -0,0 +1,10 @@ +type element + +@val external null: element = "null" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_nested_jsx_alias_chain/src/Sidebar.res b/tests/build_tests/rsc_nested_jsx_alias_chain/src/Sidebar.res new file mode 100644 index 00000000000..25e1db24bca --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_alias_chain/src/Sidebar.res @@ -0,0 +1,4 @@ +module Provider = { + @react.component + let make = (~children) => children +} diff --git a/tests/build_tests/rsc_nested_jsx_deep/input.js b/tests/build_tests/rsc_nested_jsx_deep/input.js new file mode 100644 index 00000000000..bb5b0bb1eca --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_deep/input.js @@ -0,0 +1,47 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const outputPath = path.join(import.meta.dirname, "src", "MainLayout.res.js"); +const output = await fs.readFile(outputPath, "utf8"); +const sidebarOutputPath = path.join( + import.meta.dirname, + "src", + "Sidebar.res.js", +); +const sidebarOutput = await fs.readFile(sidebarOutputPath, "utf8"); + +assert.match( + output, + /JsxRuntime\.jsx\(Sidebar\$RscNestedJsxDeep\.Sidebar\$Group,/, +); +assert.doesNotMatch(output, /\.Group\.make,/); +assert.match( + sidebarOutput, + /let Group = \{[\s\S]*make: Sidebar\$Group[\s\S]*\};/s, +); +assert.match(sidebarOutput, /export \{[\s\S]*Sidebar\$Group[\s\S]*\}/s); +assert.doesNotMatch(sidebarOutput, /Group\.make = Group;/); +assert.doesNotMatch(sidebarOutput, /Sidebar\$Group\$jsx/); + +const brandIcons = await import("./src/BrandIcons.res.js"); +assert.deepStrictEqual( + new Set(Object.keys(brandIcons)), + new Set(["BrandIcons$ReScript", "getIconForLanguageExtension"]), +); + +const multipleNested = await import("./src/MultipleNested.res.js"); +assert.deepStrictEqual( + new Set(Object.keys(multipleNested)), + new Set(["MultipleNested$Group", "MultipleNested$Other"]), +); + +await execClean(); diff --git a/tests/build_tests/rsc_nested_jsx_deep/rescript.json b/tests/build_tests/rsc_nested_jsx_deep/rescript.json new file mode 100644 index 00000000000..4b94b2840cb --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_deep/rescript.json @@ -0,0 +1,19 @@ +{ + "name": "rsc-nested-jsx-deep", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.js" + }, + "namespace": true, + "warnings": { + "error": "+A" + } +} diff --git a/tests/build_tests/rsc_nested_jsx_deep/src/BrandIcons.res b/tests/build_tests/rsc_nested_jsx_deep/src/BrandIcons.res new file mode 100644 index 00000000000..05ec1396656 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_deep/src/BrandIcons.res @@ -0,0 +1,11 @@ +module ReScript = { + @react.component + let make = () => React.null +} + +let getIconForLanguageExtension = (language: string) => { + switch language { + | "res" | "rescript" => + | _ => React.null + } +} diff --git a/tests/build_tests/rsc_nested_jsx_deep/src/MainLayout.res b/tests/build_tests/rsc_nested_jsx_deep/src/MainLayout.res new file mode 100644 index 00000000000..3e31dfdfcbc --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_deep/src/MainLayout.res @@ -0,0 +1,4 @@ +@react.component +let make = (~children) => { + {children} +} diff --git a/tests/build_tests/rsc_nested_jsx_deep/src/MultipleNested.res b/tests/build_tests/rsc_nested_jsx_deep/src/MultipleNested.res new file mode 100644 index 00000000000..d3a41698541 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_deep/src/MultipleNested.res @@ -0,0 +1,20 @@ +module Internal = { + @react.component + let make = (~children) => { + children + } +} + +module Group = { + @react.component + let make = (~children) => { + {children} + } +} + +module Other = { + @react.component + let make = (~children) => { + children + } +} diff --git a/tests/build_tests/rsc_nested_jsx_deep/src/MultipleNested.resi b/tests/build_tests/rsc_nested_jsx_deep/src/MultipleNested.resi new file mode 100644 index 00000000000..961a38e9aa2 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_deep/src/MultipleNested.resi @@ -0,0 +1,9 @@ +module Group: { + @react.component + let make: (~children: React.element) => React.element +} + +module Other: { + @react.component + let make: (~children: React.element) => React.element +} diff --git a/tests/build_tests/rsc_nested_jsx_deep/src/React.res b/tests/build_tests/rsc_nested_jsx_deep/src/React.res new file mode 100644 index 00000000000..733b8ee02f0 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_deep/src/React.res @@ -0,0 +1,10 @@ +type element + +@val external null: element = "null" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_nested_jsx_deep/src/Sidebar.res b/tests/build_tests/rsc_nested_jsx_deep/src/Sidebar.res new file mode 100644 index 00000000000..a7feecaa77a --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_deep/src/Sidebar.res @@ -0,0 +1,6 @@ +module Group = { + @react.component + let make = (~children) => { + children + } +} diff --git a/tests/build_tests/rsc_nested_jsx_local_hidden_resi/input.js b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/input.js new file mode 100644 index 00000000000..2017210dc4f --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/input.js @@ -0,0 +1,31 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +const buildResult = await execBuild(); + +if (buildResult.status !== 0) { + assert.fail(buildResult.stdout + buildResult.stderr); +} + +const localOnlyOutput = await fs.readFile( + path.join(import.meta.dirname, "src", "LocalOnly.res.js"), + "utf8", +); +const consumerOutput = await fs.readFile( + path.join(import.meta.dirname, "src", "Consumer.res.js"), + "utf8", +); + +assert.match(localOnlyOutput, /JsxRuntime\.jsx\(LocalOnly\$Hidden,/); +assert.doesNotMatch(localOnlyOutput, /export \{[\s\S]*Hidden[\s\S]*\}/s); +assert.doesNotMatch(localOnlyOutput, /LocalOnly\$Hidden\$jsx/); +assert.match(consumerOutput, /JsxRuntime\.jsx\(LocalOnly\.make,/); + +await execClean(); diff --git a/tests/build_tests/rsc_nested_jsx_local_hidden_resi/rescript.json b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/rescript.json new file mode 100644 index 00000000000..f80ec5668d8 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/rescript.json @@ -0,0 +1,15 @@ +{ + "name": "rsc-nested-jsx-local-hidden-resi", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.js" + } +} diff --git a/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/Consumer.res b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/Consumer.res new file mode 100644 index 00000000000..a52fa6eb5cd --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/Consumer.res @@ -0,0 +1,2 @@ +@react.component +let make = () => diff --git a/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/LocalOnly.res b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/LocalOnly.res new file mode 100644 index 00000000000..1d2de50211e --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/LocalOnly.res @@ -0,0 +1,9 @@ +module Hidden = { + @react.component + let make = () => React.null +} + +@react.component +let make = () => { + +} diff --git a/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/LocalOnly.resi b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/LocalOnly.resi new file mode 100644 index 00000000000..1ca44ce2609 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/LocalOnly.resi @@ -0,0 +1,2 @@ +@react.component +let make: unit => React.element diff --git a/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/React.res b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/React.res new file mode 100644 index 00000000000..733b8ee02f0 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_local_hidden_resi/src/React.res @@ -0,0 +1,10 @@ +type element + +@val external null: element = "null" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_nested_jsx_members/input.js b/tests/build_tests/rsc_nested_jsx_members/input.js new file mode 100644 index 00000000000..33960dfcb18 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members/input.js @@ -0,0 +1,104 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const outputPath = path.join(import.meta.dirname, "src", "MainLayout.res.js"); +const output = await fs.readFile(outputPath, "utf8"); +const sidebarOutputPath = path.join( + import.meta.dirname, + "src", + "Sidebar.res.js", +); +const sidebarOutput = await fs.readFile(sidebarOutputPath, "utf8"); +const externalOutputPath = path.join( + import.meta.dirname, + "src", + "MainLayoutExternal.res.js", +); +const externalOutput = await fs.readFile(externalOutputPath, "utf8"); +const externalSidebarOutputPath = path.join( + import.meta.dirname, + "src", + "SidebarExternal.res.js", +); +const externalSidebarOutput = await fs.readFile( + externalSidebarOutputPath, + "utf8", +); +const plainAccessOutputPath = path.join( + import.meta.dirname, + "src", + "PlainAccess.res.js", +); +const plainAccessOutput = await fs.readFile(plainAccessOutputPath, "utf8"); + +assert.match( + output, + /import \* as Sidebar\$RscNestedJsxMembers from "\.\/Sidebar\.res\.js";/, +); +assert.match( + output, + /JsxRuntime\.jsx\(Sidebar\$RscNestedJsxMembers\.Sidebar\$Provider,/, +); +assert.match( + externalOutput, + /JsxRuntime\.jsx\(SidebarExternal\$RscNestedJsxMembers\.SidebarExternal\$Provider,/, +); +assert.doesNotMatch( + output, + /JsxRuntime\.jsx\(Sidebar\$RscNestedJsxMembers\.Provider,/, +); +assert.doesNotMatch( + externalOutput, + /JsxRuntime\.jsx\(SidebarExternal\$RscNestedJsxMembers\.Provider\.make,/, +); +assert.doesNotMatch(output, /\.Provider\.make,/); +assert.match( + sidebarOutput, + /let Provider = \{[\s\S]*make: Sidebar\$Provider[\s\S]*\};/s, +); +assert.match( + sidebarOutput, + /let Inset = \{[\s\S]*make: Sidebar\$Inset[\s\S]*\};/s, +); +assert.doesNotMatch(sidebarOutput, /Provider\.make = Provider;/); +assert.doesNotMatch(sidebarOutput, /Inset\.make = Inset;/); +assert.doesNotMatch(sidebarOutput, /Sidebar\$Provider\$jsx/); +assert.doesNotMatch(sidebarOutput, /Sidebar\$Inset\$jsx/); +assert.match( + sidebarOutput, + /export \{[\s\S]*Sidebar\$Provider,[\s\S]*Sidebar\$Inset[\s\S]*\}/s, +); +assert.match( + externalSidebarOutput, + /let Provider = \{[\s\S]*make: make[\s\S]*\};/s, +); +assert.doesNotMatch(externalSidebarOutput, /Provider\.make = Provider;/); +assert.doesNotMatch(externalSidebarOutput, /SidebarExternal\$Provider\$jsx/); +assert.match( + externalSidebarOutput, + /export \{[\s\S]*SidebarExternal\$Provider[\s\S]*\}/s, +); +assert.match( + plainAccessOutput, + /let provider = Sidebar\$RscNestedJsxMembers\.Sidebar\$Provider;/, +); +assert.match( + plainAccessOutput, + /let callProvider = Sidebar\$RscNestedJsxMembers\.Sidebar\$Provider\(\{/, +); +assert.doesNotMatch(plainAccessOutput, /\.Provider\.make/); +assert.doesNotMatch( + plainAccessOutput, + /Sidebar\$RscNestedJsxMembers\.Provider/, +); + +await execClean(); diff --git a/tests/build_tests/rsc_nested_jsx_members/rescript.json b/tests/build_tests/rsc_nested_jsx_members/rescript.json new file mode 100644 index 00000000000..b83ca40838d --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "rsc-nested-jsx-members", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.js" + }, + "namespace": true +} diff --git a/tests/build_tests/rsc_nested_jsx_members/src/MainLayout.res b/tests/build_tests/rsc_nested_jsx_members/src/MainLayout.res new file mode 100644 index 00000000000..e2c753eeb17 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members/src/MainLayout.res @@ -0,0 +1,4 @@ +@react.component +let make = (~children) => { + {children} +} diff --git a/tests/build_tests/rsc_nested_jsx_members/src/MainLayoutExternal.res b/tests/build_tests/rsc_nested_jsx_members/src/MainLayoutExternal.res new file mode 100644 index 00000000000..1a25cad0b9a --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members/src/MainLayoutExternal.res @@ -0,0 +1,4 @@ +@react.component +let make = (~children) => { + {children} +} diff --git a/tests/build_tests/rsc_nested_jsx_members/src/PlainAccess.res b/tests/build_tests/rsc_nested_jsx_members/src/PlainAccess.res new file mode 100644 index 00000000000..50ad67b4bb5 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members/src/PlainAccess.res @@ -0,0 +1,3 @@ +let provider = Sidebar.Provider.make + +let callProvider = Sidebar.Provider.make({children: React.null}) diff --git a/tests/build_tests/rsc_nested_jsx_members/src/React.res b/tests/build_tests/rsc_nested_jsx_members/src/React.res new file mode 100644 index 00000000000..0a2d41f0096 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members/src/React.res @@ -0,0 +1,30 @@ +type element + +@val external null: element = "null" + +external string: string => element = "%identity" + +external array: array => element = "%identity" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react") +external createElement: (component<'props>, 'props) => element = "createElement" + +@variadic @module("react") +external createElementVariadic: (component<'props>, 'props, array) => element = + "createElement" + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" + +@module("react/jsx-runtime") +external jsxKeyed: (component<'props>, 'props, ~key: string=?, @ignore unit) => element = "jsx" + +@module("react/jsx-runtime") +external jsxs: (component<'props>, 'props) => element = "jsxs" + +@module("react/jsx-runtime") +external jsxsKeyed: (component<'props>, 'props, ~key: string=?, @ignore unit) => element = "jsxs" diff --git a/tests/build_tests/rsc_nested_jsx_members/src/Sidebar.res b/tests/build_tests/rsc_nested_jsx_members/src/Sidebar.res new file mode 100644 index 00000000000..a88c10803e2 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members/src/Sidebar.res @@ -0,0 +1,13 @@ +module Provider = { + @react.component + let make = (~children) => { + children + } +} + +module Inset = { + @react.component + let make = (~children) => { + children + } +} diff --git a/tests/build_tests/rsc_nested_jsx_members/src/SidebarExternal.res b/tests/build_tests/rsc_nested_jsx_members/src/SidebarExternal.res new file mode 100644 index 00000000000..f0015e98896 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members/src/SidebarExternal.res @@ -0,0 +1,4 @@ +module Provider = { + @react.component @module("./SidebarExternalImpl.js") + external make: (~children: React.element=?) => React.element = "default" +} diff --git a/tests/build_tests/rsc_nested_jsx_members/src/SidebarExternalImpl.js b/tests/build_tests/rsc_nested_jsx_members/src/SidebarExternalImpl.js new file mode 100644 index 00000000000..f94e84e1aa9 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members/src/SidebarExternalImpl.js @@ -0,0 +1,3 @@ +export default function SidebarExternalImpl(props) { + return props.children ?? null; +} diff --git a/tests/build_tests/rsc_nested_jsx_members_no_namespace/input.js b/tests/build_tests/rsc_nested_jsx_members_no_namespace/input.js new file mode 100644 index 00000000000..1b3ff51f092 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members_no_namespace/input.js @@ -0,0 +1,33 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const outputPath = path.join(import.meta.dirname, "src", "MainLayout.res.js"); +const output = await fs.readFile(outputPath, "utf8"); +const sidebarOutputPath = path.join( + import.meta.dirname, + "src", + "Sidebar.res.js", +); +const sidebarOutput = await fs.readFile(sidebarOutputPath, "utf8"); + +assert.match(output, /JsxRuntime\.jsx\(Sidebar\.Sidebar\$Provider,/); +assert.doesNotMatch(output, /Sidebar\.Provider\.make/); +assert.doesNotMatch(output, /JsxRuntime\.jsx\(Sidebar\.Provider,/); +assert.match( + sidebarOutput, + /let Provider = \{[\s\S]*make: Sidebar\$Provider[\s\S]*\};/s, +); +assert.match(sidebarOutput, /export \{[\s\S]*Sidebar\$Provider[\s\S]*\}/s); +assert.doesNotMatch(sidebarOutput, /Provider\.make = Provider;/); +assert.doesNotMatch(sidebarOutput, /Sidebar\$Provider\$jsx/); + +await execClean(); diff --git a/tests/build_tests/rsc_nested_jsx_members_no_namespace/rescript.json b/tests/build_tests/rsc_nested_jsx_members_no_namespace/rescript.json new file mode 100644 index 00000000000..dba3aa44e5a --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members_no_namespace/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "rsc-nested-jsx-members-no-namespace", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.js" + }, + "namespace": false +} diff --git a/tests/build_tests/rsc_nested_jsx_members_no_namespace/src/MainLayout.res b/tests/build_tests/rsc_nested_jsx_members_no_namespace/src/MainLayout.res new file mode 100644 index 00000000000..e2c753eeb17 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members_no_namespace/src/MainLayout.res @@ -0,0 +1,4 @@ +@react.component +let make = (~children) => { + {children} +} diff --git a/tests/build_tests/rsc_nested_jsx_members_no_namespace/src/React.res b/tests/build_tests/rsc_nested_jsx_members_no_namespace/src/React.res new file mode 100644 index 00000000000..733b8ee02f0 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members_no_namespace/src/React.res @@ -0,0 +1,10 @@ +type element + +@val external null: element = "null" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_nested_jsx_members_no_namespace/src/Sidebar.res b/tests/build_tests/rsc_nested_jsx_members_no_namespace/src/Sidebar.res new file mode 100644 index 00000000000..ad06cf9dc20 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_members_no_namespace/src/Sidebar.res @@ -0,0 +1,6 @@ +module Provider = { + @react.component + let make = (~children) => { + children + } +} diff --git a/tests/build_tests/rsc_nested_jsx_warn_error/input.js b/tests/build_tests/rsc_nested_jsx_warn_error/input.js new file mode 100644 index 00000000000..94e48dc3352 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_warn_error/input.js @@ -0,0 +1,19 @@ +// @ts-check + +import * as assert from "node:assert"; +import { stripVTControlCharacters } from "node:util"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +const result = await execBuild(); + +if (result.status !== 0) { + assert.fail(result.stdout + result.stderr); +} + +const stderr = stripVTControlCharacters(result.stderr); +assert.doesNotMatch(stderr, /Warning number 32/); + +await execClean(); diff --git a/tests/build_tests/rsc_nested_jsx_warn_error/rescript.json b/tests/build_tests/rsc_nested_jsx_warn_error/rescript.json new file mode 100644 index 00000000000..62ea5431fa6 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_warn_error/rescript.json @@ -0,0 +1,19 @@ +{ + "name": "rsc-nested-jsx-warn-error", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.js" + }, + "namespace": true, + "warnings": { + "error": "+A" + } +} diff --git a/tests/build_tests/rsc_nested_jsx_warn_error/src/MainLayout.res b/tests/build_tests/rsc_nested_jsx_warn_error/src/MainLayout.res new file mode 100644 index 00000000000..e2c753eeb17 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_warn_error/src/MainLayout.res @@ -0,0 +1,4 @@ +@react.component +let make = (~children) => { + {children} +} diff --git a/tests/build_tests/rsc_nested_jsx_warn_error/src/React.res b/tests/build_tests/rsc_nested_jsx_warn_error/src/React.res new file mode 100644 index 00000000000..733b8ee02f0 --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_warn_error/src/React.res @@ -0,0 +1,10 @@ +type element + +@val external null: element = "null" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_nested_jsx_warn_error/src/Sidebar.res b/tests/build_tests/rsc_nested_jsx_warn_error/src/Sidebar.res new file mode 100644 index 00000000000..25e1db24bca --- /dev/null +++ b/tests/build_tests/rsc_nested_jsx_warn_error/src/Sidebar.res @@ -0,0 +1,4 @@ +module Provider = { + @react.component + let make = (~children) => children +} diff --git a/tests/build_tests/rsc_suffix_runtime_import/input.js b/tests/build_tests/rsc_suffix_runtime_import/input.js new file mode 100644 index 00000000000..ee1dd122963 --- /dev/null +++ b/tests/build_tests/rsc_suffix_runtime_import/input.js @@ -0,0 +1,34 @@ +// @ts-check + +import * as assert from "node:assert"; +import * as fs from "node:fs/promises"; +import * as path from "node:path"; +import { setup } from "#dev/process"; + +const { execBuild, execClean } = setup(import.meta.dirname); + +await execClean(); +await execBuild(); + +const outputPath = path.join(import.meta.dirname, "src", "MainLayout.res.mjs"); +const output = await fs.readFile(outputPath, "utf8"); + +assert.match( + output, + /import \* as Stdlib_Option from "@rescript\/runtime\/lib\/es6\/Stdlib_Option\.mjs";/, +); +assert.match( + output, + /import \* as Sidebar\$RscSuffixRuntimeImport from "\.\/Sidebar\.res\.mjs";/, +); +assert.match( + output, + /JsxRuntime\.jsx\(Sidebar\$RscSuffixRuntimeImport\.Sidebar\$Provider,/, +); +assert.equal(output.match(/Stdlib_Option\.(js|mjs)/g)?.length ?? 0, 1); +assert.doesNotMatch( + output, + /@rescript\/runtime\/lib\/es6\/Stdlib_Option\.(js|mjs)";[\s\S]*@rescript\/runtime\/lib\/es6\/Stdlib_Option\.(js|mjs)";/s, +); + +await execClean(); diff --git a/tests/build_tests/rsc_suffix_runtime_import/rescript.json b/tests/build_tests/rsc_suffix_runtime_import/rescript.json new file mode 100644 index 00000000000..177e276e8f0 --- /dev/null +++ b/tests/build_tests/rsc_suffix_runtime_import/rescript.json @@ -0,0 +1,16 @@ +{ + "name": "rsc-suffix-runtime-import", + "jsx": { + "version": 4 + }, + "sources": { + "dir": "src", + "subdirs": true + }, + "package-specs": { + "module": "esmodule", + "in-source": true, + "suffix": ".res.mjs" + }, + "namespace": true +} diff --git a/tests/build_tests/rsc_suffix_runtime_import/src/MainLayout.res b/tests/build_tests/rsc_suffix_runtime_import/src/MainLayout.res new file mode 100644 index 00000000000..a45377b4f3d --- /dev/null +++ b/tests/build_tests/rsc_suffix_runtime_import/src/MainLayout.res @@ -0,0 +1,5 @@ +@react.component +let make = (~children) => { + let child = Option.getOr(children, React.null) + {child} +} diff --git a/tests/build_tests/rsc_suffix_runtime_import/src/React.res b/tests/build_tests/rsc_suffix_runtime_import/src/React.res new file mode 100644 index 00000000000..75e3b2c2d78 --- /dev/null +++ b/tests/build_tests/rsc_suffix_runtime_import/src/React.res @@ -0,0 +1,12 @@ +type element + +@val external null: element = "null" + +external string: string => element = "%identity" + +type componentLike<'props, 'return> = 'props => 'return + +type component<'props> = componentLike<'props, element> + +@module("react/jsx-runtime") +external jsx: (component<'props>, 'props) => element = "jsx" diff --git a/tests/build_tests/rsc_suffix_runtime_import/src/Sidebar.res b/tests/build_tests/rsc_suffix_runtime_import/src/Sidebar.res new file mode 100644 index 00000000000..25e1db24bca --- /dev/null +++ b/tests/build_tests/rsc_suffix_runtime_import/src/Sidebar.res @@ -0,0 +1,4 @@ +module Provider = { + @react.component + let make = (~children) => children +} diff --git a/tests/gentype_tests/typescript-react-example/src/Hooks.gen.tsx b/tests/gentype_tests/typescript-react-example/src/Hooks.gen.tsx index 3ebfd588035..fd481eff2ad 100644 --- a/tests/gentype_tests/typescript-react-example/src/Hooks.gen.tsx +++ b/tests/gentype_tests/typescript-react-example/src/Hooks.gen.tsx @@ -61,15 +61,15 @@ export default $$default; export const Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle; readonly callback: () => void }> = HooksJS.Another.anotherComponent as any; -export const Inner_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.make as any; +export const Inner_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Hooks$Inner as any; export const Inner_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.Another.anotherComponent as any; -export const Inner_Inner2_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.Inner2.make as any; +export const Inner_Inner2_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Hooks$Inner$Inner2 as any; export const Inner_Inner2_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.Inner2.Another.anotherComponent as any; -export const NoProps_make: React.ComponentType<{}> = HooksJS.NoProps.make as any; +export const NoProps_make: React.ComponentType<{}> = HooksJS.Hooks$NoProps as any; export const functionWithRenamedArgs: (_to:vehicle, _Type:vehicle, cb:cb) => string = HooksJS.functionWithRenamedArgs as any; @@ -79,7 +79,7 @@ export const WithRename_componentWithRenamedArgs: React.ComponentType<{ readonly cb: cb }> = HooksJS.WithRename.componentWithRenamedArgs as any; -export const WithRef_make: React.ComponentType<{ readonly vehicle: vehicle; readonly ref?: any }> = HooksJS.WithRef.make as any; +export const WithRef_make: React.ComponentType<{ readonly vehicle: vehicle; readonly ref?: any }> = HooksJS.Hooks$WithRef as any; export const ForwardRef_input: (_1:r) => JSX.Element = HooksJS.ForwardRef.input as any; @@ -87,13 +87,13 @@ export const Poly_polymorphicComponent: React.ComponentType<{ readonly p: [vehic export const Fun_functionReturningReactElement: React.ComponentType<{ readonly name: string }> = HooksJS.Fun.functionReturningReactElement as any; -export const RenderPropRequiresConversion_make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> = HooksJS.RenderPropRequiresConversion.make as any; +export const RenderPropRequiresConversion_make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> = HooksJS.Hooks$RenderPropRequiresConversion as any; export const WithChildren_aComponentWithChildren: React.ComponentType<{ readonly vehicle: vehicle; readonly children: React.ReactNode }> = HooksJS.WithChildren.aComponentWithChildren as any; -export const DD_make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> = HooksJS.DD.make as any; +export const DD_make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> = HooksJS.Hooks$DD as any; -export const NoProps: { make: React.ComponentType<{}> } = HooksJS.NoProps as any; +export const NoProps: React.ComponentType<{}> = HooksJS.Hooks$NoProps as any; export const Inner: { Inner2: { @@ -116,7 +116,7 @@ export const Inner: { }> } = HooksJS.Inner as any; -export const RenderPropRequiresConversion: { make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> } = HooksJS.RenderPropRequiresConversion as any; +export const RenderPropRequiresConversion: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> = HooksJS.Hooks$RenderPropRequiresConversion as any; export const WithRename: { componentWithRenamedArgs: React.ComponentType<{ readonly _to: vehicle; @@ -128,11 +128,11 @@ export const ForwardRef: { input: (_1:r) => JSX.Element } = HooksJS.ForwardRef a export const Fun: { functionReturningReactElement: React.ComponentType<{ readonly name: string }> } = HooksJS.Fun as any; -export const WithRef: { make: React.ComponentType<{ readonly vehicle: vehicle; readonly ref?: any }> } = HooksJS.WithRef as any; +export const WithRef: React.ComponentType<{ readonly vehicle: vehicle; readonly ref?: any }> = HooksJS.Hooks$WithRef as any; export const WithChildren: { aComponentWithChildren: React.ComponentType<{ readonly vehicle: vehicle; readonly children: React.ReactNode }> } = HooksJS.WithChildren as any; -export const DD: { make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> } = HooksJS.DD as any; +export const DD: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> = HooksJS.Hooks$DD as any; export const Another: { anotherComponent: React.ComponentType<{ readonly vehicle: vehicle; readonly callback: () => void }> } = HooksJS.Another as any; diff --git a/tests/gentype_tests/typescript-react-example/src/Hooks.res.js b/tests/gentype_tests/typescript-react-example/src/Hooks.res.js index 8669c8eafed..2c1ef8d56b1 100644 --- a/tests/gentype_tests/typescript-react-example/src/Hooks.res.js +++ b/tests/gentype_tests/typescript-react-example/src/Hooks.res.js @@ -204,20 +204,30 @@ let make$1 = Hooks; let $$default = Hooks; +let Hooks$Inner$jsx = true; + +let Hooks$Inner$Inner2$jsx = true; + +let Hooks$WithRef = make; + export { make$1 as make, $$default as default, Another, Inner, - NoProps, functionWithRenamedArgs, WithRename, - WithRef, ForwardRef, Poly, Fun, - RenderPropRequiresConversion, WithChildren, - DD, + Hooks$Inner, + Hooks$Inner$jsx, + Hooks$Inner$Inner2, + Hooks$Inner$Inner2$jsx, + Hooks$NoProps, + Hooks$WithRef, + Hooks$RenderPropRequiresConversion, + Hooks$DD, } /* make Not a pure module */ diff --git a/tests/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx b/tests/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx index 5d138887bf3..77509ddeaae 100644 --- a/tests/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx +++ b/tests/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx @@ -38,6 +38,6 @@ export type props = { readonly renderMe: renderMe }; -export const CompV4_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4JS.CompV4.make as any; +export const CompV4_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4JS.JSXV4$CompV4 as any; -export const CompV4: { make: React.ComponentType<{ readonly x: string; readonly y: string }> } = JSXV4JS.CompV4 as any; +export const CompV4: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4JS.JSXV4$CompV4 as any; diff --git a/tests/gentype_tests/typescript-react-example/src/JSXV4.res.js b/tests/gentype_tests/typescript-react-example/src/JSXV4.res.js index 016dda6790c..79505cae9bb 100644 --- a/tests/gentype_tests/typescript-react-example/src/JSXV4.res.js +++ b/tests/gentype_tests/typescript-react-example/src/JSXV4.res.js @@ -13,7 +13,7 @@ let CompV4 = { let make = JSXV4Gen.make; export { - CompV4, make, + JSXV4$CompV4, } /* make Not a pure module */ diff --git a/tests/syntax_tests/data/ppx/react/expected/aliasProps.res.txt b/tests/syntax_tests/data/ppx/react/expected/aliasProps.res.txt index f2ae63a276f..ec718c8b55d 100644 --- a/tests/syntax_tests/data/ppx/react/expected/aliasProps.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/aliasProps.res.txt @@ -155,10 +155,17 @@ module C6 = { } let make = ({comp: module(Comp: Comp), x: (a, b), _}: props<_, _>): React.element => - React.jsx(Comp.make, {}) + React.jsx(@res.jsxComponentPath Comp.make, {}) let make = { let \"AliasProps$C6" = (props: props<_>) => make(props) \"AliasProps$C6" } } +@warning("-32") let \"AliasProps$C0" = C0.make @warning("-32") and \"AliasProps$C0$jsx" = true +@warning("-32") let \"AliasProps$C1" = C1.make @warning("-32") and \"AliasProps$C1$jsx" = true +@warning("-32") let \"AliasProps$C2" = C2.make @warning("-32") and \"AliasProps$C2$jsx" = true +@warning("-32") let \"AliasProps$C3" = C3.make @warning("-32") and \"AliasProps$C3$jsx" = true +@warning("-32") let \"AliasProps$C4" = C4.make @warning("-32") and \"AliasProps$C4$jsx" = true +@warning("-32") let \"AliasProps$C5" = C5.make @warning("-32") and \"AliasProps$C5$jsx" = true +@warning("-32") let \"AliasProps$C6" = C6.make @warning("-32") and \"AliasProps$C6$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/asyncAwait.res.txt b/tests/syntax_tests/data/ppx/react/expected/asyncAwait.res.txt index d77b11decd3..4a2ccb3500c 100644 --- a/tests/syntax_tests/data/ppx/react/expected/asyncAwait.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/asyncAwait.res.txt @@ -35,3 +35,5 @@ module C1 = { \"AsyncAwait$C1" } } +@warning("-32") let \"AsyncAwait$C0" = C0.make @warning("-32") and \"AsyncAwait$C0$jsx" = true +@warning("-32") let \"AsyncAwait$C1" = C1.make @warning("-32") and \"AsyncAwait$C1$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/defaultPatternProp.res.txt b/tests/syntax_tests/data/ppx/react/expected/defaultPatternProp.res.txt index 97ed9f45567..e4a96d16e0c 100644 --- a/tests/syntax_tests/data/ppx/react/expected/defaultPatternProp.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/defaultPatternProp.res.txt @@ -25,7 +25,7 @@ module C0 = { | None => module(M: S) } let module(C: S) = __component_value - (React.jsx(C.make, {}): React.element) + (React.jsx(@res.jsxComponentPath C.make, {}): React.element) } let make = { let \"DefaultPatternProp$C0" = (props: props<_>) => make(props) @@ -33,3 +33,7 @@ module C0 = { \"DefaultPatternProp$C0" } } +@warning("-32") let \"DefaultPatternProp$C0$M" = C0.M.make +@warning("-32") and \"DefaultPatternProp$C0$M$jsx" = true +@warning("-32") let \"DefaultPatternProp$C0" = C0.make +@warning("-32") and \"DefaultPatternProp$C0$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/defaultValueProp.res.txt b/tests/syntax_tests/data/ppx/react/expected/defaultValueProp.res.txt index c8a7759839e..7b24b91d0b4 100644 --- a/tests/syntax_tests/data/ppx/react/expected/defaultValueProp.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/defaultValueProp.res.txt @@ -91,3 +91,11 @@ module C3 = { \"DefaultValueProp$C3" } } +@warning("-32") let \"DefaultValueProp$C0" = C0.make +@warning("-32") and \"DefaultValueProp$C0$jsx" = true +@warning("-32") let \"DefaultValueProp$C1" = C1.make +@warning("-32") and \"DefaultValueProp$C1$jsx" = true +@warning("-32") let \"DefaultValueProp$C2" = C2.make +@warning("-32") and \"DefaultValueProp$C2$jsx" = true +@warning("-32") let \"DefaultValueProp$C3" = C3.make +@warning("-32") and \"DefaultValueProp$C3$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/externalWithCustomName.res.txt b/tests/syntax_tests/data/ppx/react/expected/externalWithCustomName.res.txt index dd98fc72ff3..a7b96145c72 100644 --- a/tests/syntax_tests/data/ppx/react/expected/externalWithCustomName.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/externalWithCustomName.res.txt @@ -11,4 +11,4 @@ module Foo = { external component: React.component> = "component" } -let t = React.jsx(Foo.component, {a: 1, b: {"1"}}) +let t = React.jsx(@res.jsxComponentPath Foo.component, {a: 1, b: {"1"}}) diff --git a/tests/syntax_tests/data/ppx/react/expected/externalWithRef.res.txt b/tests/syntax_tests/data/ppx/react/expected/externalWithRef.res.txt index 44a3420fd87..13e42c9dae9 100644 --- a/tests/syntax_tests/data/ppx/react/expected/externalWithRef.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/externalWithRef.res.txt @@ -10,3 +10,5 @@ module V4C = { @module("componentForwardRef") external make: React.component> = "component" } +@warning("-32") let \"ExternalWithRef$V4C" = V4C.make +@warning("-32") and \"ExternalWithRef$V4C$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/externalWithTypeVariables.res.txt b/tests/syntax_tests/data/ppx/react/expected/externalWithTypeVariables.res.txt index cbdee832996..72c71617ae4 100644 --- a/tests/syntax_tests/data/ppx/react/expected/externalWithTypeVariables.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/externalWithTypeVariables.res.txt @@ -10,3 +10,5 @@ module V4C = { @module("c") external make: React.component, React.element>> = "component" } +@warning("-32") let \"ExternalWithTypeVariables$V4C" = V4C.make +@warning("-32") and \"ExternalWithTypeVariables$V4C$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/fileLevelConfig.res.txt b/tests/syntax_tests/data/ppx/react/expected/fileLevelConfig.res.txt index 77cde0caea1..98b0b1dd63a 100644 --- a/tests/syntax_tests/data/ppx/react/expected/fileLevelConfig.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/fileLevelConfig.res.txt @@ -15,3 +15,5 @@ module V4A = { \"FileLevelConfig$V4A" } } +@warning("-32") let \"FileLevelConfig$V4A" = V4A.make +@warning("-32") and \"FileLevelConfig$V4A$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/firstClassModules.resi.txt b/tests/syntax_tests/data/ppx/react/expected/firstClassModules.resi.txt index feabbdaf5f4..9a3cb5536f3 100644 --- a/tests/syntax_tests/data/ppx/react/expected/firstClassModules.resi.txt +++ b/tests/syntax_tests/data/ppx/react/expected/firstClassModules.resi.txt @@ -22,3 +22,12 @@ module Select: { >, > } +let \"FirstClassModules$Select": React.component< + Select.props< + module(T with type t = 'a and type key = 'key), + option<'key>, + option<'key> => unit, + array<'a>, + >, +> +let \"FirstClassModules$Select$jsx": bool diff --git a/tests/syntax_tests/data/ppx/react/expected/forwardRef.res.txt b/tests/syntax_tests/data/ppx/react/expected/forwardRef.res.txt index 8cd3bcff8ce..ee69fc32062 100644 --- a/tests/syntax_tests/data/ppx/react/expected/forwardRef.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/forwardRef.res.txt @@ -45,7 +45,10 @@ module V4A = { "div", { children: ?ReactDOM.someElement( - React.jsx(FancyInput.make, {ref: input, children: {React.string("Click to focus")}}), + React.jsx( + @res.jsxComponentPath FancyInput.make, + {ref: input, children: {React.string("Click to focus")}}, + ), ), }, ): React.element @@ -103,7 +106,10 @@ module V4AUncurried = { "div", { children: ?ReactDOM.someElement( - React.jsx(FancyInput.make, {ref: input, children: {React.string("Click to focus")}}), + React.jsx( + @res.jsxComponentPath FancyInput.make, + {ref: input, children: {React.string("Click to focus")}}, + ), ), }, ): React.element @@ -115,3 +121,10 @@ module V4AUncurried = { \"ForwardRef$V4AUncurried" } } +@warning("-32") let \"ForwardRef$V4A$FancyInput" = V4A.FancyInput.make +@warning("-32") and \"ForwardRef$V4A$FancyInput$jsx" = true +@warning("-32") let \"ForwardRef$V4A" = V4A.make @warning("-32") and \"ForwardRef$V4A$jsx" = true +@warning("-32") let \"ForwardRef$V4AUncurried$FancyInput" = V4AUncurried.FancyInput.make +@warning("-32") and \"ForwardRef$V4AUncurried$FancyInput$jsx" = true +@warning("-32") let \"ForwardRef$V4AUncurried" = V4AUncurried.make +@warning("-32") and \"ForwardRef$V4AUncurried$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/forwardRef.resi.txt b/tests/syntax_tests/data/ppx/react/expected/forwardRef.resi.txt index 47cd6f10105..89055b25426 100644 --- a/tests/syntax_tests/data/ppx/react/expected/forwardRef.resi.txt +++ b/tests/syntax_tests/data/ppx/react/expected/forwardRef.resi.txt @@ -89,3 +89,35 @@ module V4AUncurried: { let make: React.component>>> } } +let \"ForwardRef$V4C$FancyInput": React.component< + V4C.FancyInput.props, +> +let \"ForwardRef$V4C$FancyInput$jsx": bool +let \"ForwardRef$V4C$ForwardRef": React.component< + V4C.ForwardRef.props>>, +> +let \"ForwardRef$V4C$ForwardRef$jsx": bool +let \"ForwardRef$V4CUncurried$FancyInput": React.component< + V4CUncurried.FancyInput.props, +> +let \"ForwardRef$V4CUncurried$FancyInput$jsx": bool +let \"ForwardRef$V4CUncurried$ForwardRef": React.component< + V4CUncurried.ForwardRef.props>>, +> +let \"ForwardRef$V4CUncurried$ForwardRef$jsx": bool +let \"ForwardRef$V4A$FancyInput": React.component< + V4A.FancyInput.props, +> +let \"ForwardRef$V4A$FancyInput$jsx": bool +let \"ForwardRef$V4A$ForwardRef": React.component< + V4A.ForwardRef.props>>, +> +let \"ForwardRef$V4A$ForwardRef$jsx": bool +let \"ForwardRef$V4AUncurried$FancyInput": React.component< + V4AUncurried.FancyInput.props, +> +let \"ForwardRef$V4AUncurried$FancyInput$jsx": bool +let \"ForwardRef$V4AUncurried$ForwardRef": React.component< + V4AUncurried.ForwardRef.props>>, +> +let \"ForwardRef$V4AUncurried$ForwardRef$jsx": bool diff --git a/tests/syntax_tests/data/ppx/react/expected/fragment.res.txt b/tests/syntax_tests/data/ppx/react/expected/fragment.res.txt index 80c3bb1d868..3af2218962c 100644 --- a/tests/syntax_tests/data/ppx/react/expected/fragment.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/fragment.res.txt @@ -7,11 +7,11 @@ let _ = React.jsxs( {children: React.array([ReactDOM.jsx("div", {}), ReactDOM.jsx("div", {})])}, ) let _ = React.jsx(React.jsxFragment, {children: React.jsx(React.jsxFragment, {})}) -let _ = React.jsx(Z.make, {}) -let _ = React.jsx(Z.make, {children: ReactDOM.jsx("div", {})}) -let _ = React.jsx(Z.make, {a: "a", children: ReactDOM.jsx("div", {})}) +let _ = React.jsx(@res.jsxComponentPath Z.make, {}) +let _ = React.jsx(@res.jsxComponentPath Z.make, {children: ReactDOM.jsx("div", {})}) +let _ = React.jsx(@res.jsxComponentPath Z.make, {a: "a", children: ReactDOM.jsx("div", {})}) let _ = React.jsxs( - Z.make, + @res.jsxComponentPath Z.make, {children: React.array([ReactDOM.jsx("div", {}), ReactDOM.jsx("div", {})])}, ) let _ = ReactDOM.jsx("div", {}) diff --git a/tests/syntax_tests/data/ppx/react/expected/interface.res.txt b/tests/syntax_tests/data/ppx/react/expected/interface.res.txt index df0f7137fb5..674cfc85dcf 100644 --- a/tests/syntax_tests/data/ppx/react/expected/interface.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/interface.res.txt @@ -21,3 +21,6 @@ module NoProps = { \"Interface$NoProps" } } +@warning("-32") let \"Interface$A" = A.make @warning("-32") and \"Interface$A$jsx" = true +@warning("-32") let \"Interface$NoProps" = NoProps.make +@warning("-32") and \"Interface$NoProps$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/interface.resi.txt b/tests/syntax_tests/data/ppx/react/expected/interface.resi.txt index d0cc914abf7..6a21c4d722c 100644 --- a/tests/syntax_tests/data/ppx/react/expected/interface.resi.txt +++ b/tests/syntax_tests/data/ppx/react/expected/interface.resi.txt @@ -12,3 +12,7 @@ module NoProps: { let make: React.component } +let \"Interface$A": React.component> +let \"Interface$A$jsx": bool +let \"Interface$NoProps": React.component +let \"Interface$NoProps$jsx": bool diff --git a/tests/syntax_tests/data/ppx/react/expected/mangleKeyword.res.txt b/tests/syntax_tests/data/ppx/react/expected/mangleKeyword.res.txt index f1e40360ec5..1d79a25571c 100644 --- a/tests/syntax_tests/data/ppx/react/expected/mangleKeyword.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/mangleKeyword.res.txt @@ -25,5 +25,9 @@ module C4A1 = { external make: React.component> = "default" } -let c4a0 = React.jsx(C4A0.make, {_open: "x", _type: "t"}) -let c4a1 = React.jsx(C4A1.make, {_open: "x", _type: "t"}) +let c4a0 = React.jsx(@res.jsxComponentPath C4A0.make, {_open: "x", _type: "t"}) +let c4a1 = React.jsx(@res.jsxComponentPath C4A1.make, {_open: "x", _type: "t"}) +@warning("-32") let \"MangleKeyword$C4A0" = C4A0.make +@warning("-32") and \"MangleKeyword$C4A0$jsx" = true +@warning("-32") let \"MangleKeyword$C4A1" = C4A1.make +@warning("-32") and \"MangleKeyword$C4A1$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/nested.res.txt b/tests/syntax_tests/data/ppx/react/expected/nested.res.txt index 70f8efde0e3..76e62072ce8 100644 --- a/tests/syntax_tests/data/ppx/react/expected/nested.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/nested.res.txt @@ -8,16 +8,19 @@ module Outer = { let make = (_: props): React.element => ReactDOM.jsx("div", {}) let make = { - let \"Nested$Outer" = props => make(props) + let \"Nested$Outer$Inner" = props => make(props) - \"Nested$Outer" + \"Nested$Outer$Inner" } } - React.jsx(Inner.make, {}) + React.jsx(@res.jsxComponentPath Inner.make, {}) } let make = { let \"Nested$Outer" = props => make(props) \"Nested$Outer" } } +@warning("-32") let \"Nested$Outer$Inner" = Outer.Inner.make +@warning("-32") and \"Nested$Outer$Inner$jsx" = true +@warning("-32") let \"Nested$Outer" = Outer.make @warning("-32") and \"Nested$Outer$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/newtype.res.txt b/tests/syntax_tests/data/ppx/react/expected/newtype.res.txt index 2fdecb86740..fdfc5714bfa 100644 --- a/tests/syntax_tests/data/ppx/react/expected/newtype.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/newtype.res.txt @@ -99,3 +99,9 @@ module Uncurried = { \"Newtype$Uncurried" } } +@warning("-32") let \"Newtype$V4A" = V4A.make @warning("-32") and \"Newtype$V4A$jsx" = true +@warning("-32") let \"Newtype$V4A1" = V4A1.make @warning("-32") and \"Newtype$V4A1$jsx" = true +@warning("-32") let \"Newtype$V4A2" = V4A2.make @warning("-32") and \"Newtype$V4A2$jsx" = true +@warning("-32") let \"Newtype$V4A3" = V4A3.make @warning("-32") and \"Newtype$V4A3$jsx" = true +@warning("-32") let \"Newtype$Uncurried" = Uncurried.make +@warning("-32") and \"Newtype$Uncurried$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/noPropsWithKey.res.txt b/tests/syntax_tests/data/ppx/react/expected/noPropsWithKey.res.txt index aa8dc64f353..7b4e9bd7ea3 100644 --- a/tests/syntax_tests/data/ppx/react/expected/noPropsWithKey.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/noPropsWithKey.res.txt @@ -29,8 +29,8 @@ module V4C = { React.jsxFragment, { children: React.array([ - React.jsxKeyed(V4CA.make, {}, ~key="k", ()), - React.jsxKeyed(V4CB.make, {}, ~key="k", ()), + React.jsxKeyed(@res.jsxComponentPath V4CA.make, {}, ~key="k", ()), + React.jsxKeyed(@res.jsxComponentPath V4CB.make, {}, ~key="k", ()), ]), }, ) @@ -40,3 +40,9 @@ module V4C = { \"NoPropsWithKey$V4C" } } +@warning("-32") let \"NoPropsWithKey$V4CA" = V4CA.make +@warning("-32") and \"NoPropsWithKey$V4CA$jsx" = true +@warning("-32") let \"NoPropsWithKey$V4CB" = V4CB.make +@warning("-32") and \"NoPropsWithKey$V4CB$jsx" = true +@warning("-32") let \"NoPropsWithKey$V4C" = V4C.make +@warning("-32") and \"NoPropsWithKey$V4C$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/optimizeAutomaticMode.res.txt b/tests/syntax_tests/data/ppx/react/expected/optimizeAutomaticMode.res.txt index dfb3506590e..b0b191ffde8 100644 --- a/tests/syntax_tests/data/ppx/react/expected/optimizeAutomaticMode.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/optimizeAutomaticMode.res.txt @@ -18,3 +18,5 @@ module User = { \"OptimizeAutomaticMode$User" } } +@warning("-32") let \"OptimizeAutomaticMode$User" = User.make +@warning("-32") and \"OptimizeAutomaticMode$User$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/optionalKeyType.res.txt b/tests/syntax_tests/data/ppx/react/expected/optionalKeyType.res.txt index 0420bce343e..24d5b15c217 100644 --- a/tests/syntax_tests/data/ppx/react/expected/optionalKeyType.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/optionalKeyType.res.txt @@ -2,9 +2,9 @@ let key = None @@jsxConfig({version: 4}) -let _ = React.jsxKeyed(C.make, {}, ~key="k", ()) -let _ = React.jsxKeyed(C.make, {}, ~key=?Some("k"), ()) -let _ = React.jsxKeyed(C.make, {}, ~key?, ()) +let _ = React.jsxKeyed(@res.jsxComponentPath C.make, {}, ~key="k", ()) +let _ = React.jsxKeyed(@res.jsxComponentPath C.make, {}, ~key=?Some("k"), ()) +let _ = React.jsxKeyed(@res.jsxComponentPath C.make, {}, ~key?, ()) let _ = ReactDOM.jsxKeyed("div", {}, ~key="k", ()) let _ = ReactDOM.jsxKeyed("div", {}, ~key=?Some("k"), ()) let _ = ReactDOM.jsxKeyed("div", {}, ~key?, ()) diff --git a/tests/syntax_tests/data/ppx/react/expected/returnConstraint.res.txt b/tests/syntax_tests/data/ppx/react/expected/returnConstraint.res.txt index 7d017b6d9b7..3320905230f 100644 --- a/tests/syntax_tests/data/ppx/react/expected/returnConstraint.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/returnConstraint.res.txt @@ -47,3 +47,11 @@ module Async = { \"ReturnConstraint$Async" } } +@warning("-32") let \"ReturnConstraint$Standard" = Standard.make +@warning("-32") and \"ReturnConstraint$Standard$jsx" = true +@warning("-32") let \"ReturnConstraint$ForwardRef" = ForwardRef.make +@warning("-32") and \"ReturnConstraint$ForwardRef$jsx" = true +@warning("-32") let \"ReturnConstraint$WithProps" = WithProps.make +@warning("-32") and \"ReturnConstraint$WithProps$jsx" = true +@warning("-32") let \"ReturnConstraint$Async" = Async.make +@warning("-32") and \"ReturnConstraint$Async$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/sharedProps.res.txt b/tests/syntax_tests/data/ppx/react/expected/sharedProps.res.txt index 83c7a5fb041..777b9cff874 100644 --- a/tests/syntax_tests/data/ppx/react/expected/sharedProps.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/sharedProps.res.txt @@ -67,3 +67,19 @@ module V4A8 = { external make: React.component = "default" } +@warning("-32") let \"SharedProps$V4A1" = V4A1.make +@warning("-32") and \"SharedProps$V4A1$jsx" = true +@warning("-32") let \"SharedProps$V4A2" = V4A2.make +@warning("-32") and \"SharedProps$V4A2$jsx" = true +@warning("-32") let \"SharedProps$V4A3" = V4A3.make +@warning("-32") and \"SharedProps$V4A3$jsx" = true +@warning("-32") let \"SharedProps$V4A4" = V4A4.make +@warning("-32") and \"SharedProps$V4A4$jsx" = true +@warning("-32") let \"SharedProps$V4A5" = V4A5.make +@warning("-32") and \"SharedProps$V4A5$jsx" = true +@warning("-32") let \"SharedProps$V4A6" = V4A6.make +@warning("-32") and \"SharedProps$V4A6$jsx" = true +@warning("-32") let \"SharedProps$V4A7" = V4A7.make +@warning("-32") and \"SharedProps$V4A7$jsx" = true +@warning("-32") let \"SharedProps$V4A8" = V4A8.make +@warning("-32") and \"SharedProps$V4A8$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/sharedProps.resi.txt b/tests/syntax_tests/data/ppx/react/expected/sharedProps.resi.txt index 3deabcfbe3e..7674ec9fc3a 100644 --- a/tests/syntax_tests/data/ppx/react/expected/sharedProps.resi.txt +++ b/tests/syntax_tests/data/ppx/react/expected/sharedProps.resi.txt @@ -49,3 +49,19 @@ module V4A4: { let make: React.component } +let \"SharedProps$V4C1": React.component +let \"SharedProps$V4C1$jsx": bool +let \"SharedProps$V4C2": React.component> +let \"SharedProps$V4C2$jsx": bool +let \"SharedProps$V4C3": React.component> +let \"SharedProps$V4C3$jsx": bool +let \"SharedProps$V4C4": React.component +let \"SharedProps$V4C4$jsx": bool +let \"SharedProps$V4A1": React.component +let \"SharedProps$V4A1$jsx": bool +let \"SharedProps$V4A2": React.component> +let \"SharedProps$V4A2$jsx": bool +let \"SharedProps$V4A3": React.component> +let \"SharedProps$V4A3$jsx": bool +let \"SharedProps$V4A4": React.component +let \"SharedProps$V4A4$jsx": bool diff --git a/tests/syntax_tests/data/ppx/react/expected/sharedPropsWithProps.res.txt b/tests/syntax_tests/data/ppx/react/expected/sharedPropsWithProps.res.txt index 8abf4452b0f..98ea0b39a8f 100644 --- a/tests/syntax_tests/data/ppx/react/expected/sharedPropsWithProps.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/sharedPropsWithProps.res.txt @@ -76,3 +76,17 @@ module V4A7 = { \"SharedPropsWithProps$V4A7" } } +@warning("-32") let \"SharedPropsWithProps$V4A1" = V4A1.make +@warning("-32") and \"SharedPropsWithProps$V4A1$jsx" = true +@warning("-32") let \"SharedPropsWithProps$V4A2" = V4A2.make +@warning("-32") and \"SharedPropsWithProps$V4A2$jsx" = true +@warning("-32") let \"SharedPropsWithProps$V4A3" = V4A3.make +@warning("-32") and \"SharedPropsWithProps$V4A3$jsx" = true +@warning("-32") let \"SharedPropsWithProps$V4A4" = V4A4.make +@warning("-32") and \"SharedPropsWithProps$V4A4$jsx" = true +@warning("-32") let \"SharedPropsWithProps$V4A5" = V4A5.make +@warning("-32") and \"SharedPropsWithProps$V4A5$jsx" = true +@warning("-32") let \"SharedPropsWithProps$V4A6" = V4A6.make +@warning("-32") and \"SharedPropsWithProps$V4A6$jsx" = true +@warning("-32") let \"SharedPropsWithProps$V4A7" = V4A7.make +@warning("-32") and \"SharedPropsWithProps$V4A7$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/spreadProps.res.txt b/tests/syntax_tests/data/ppx/react/expected/spreadProps.res.txt index db116ee8d81..acc79ec0fee 100644 --- a/tests/syntax_tests/data/ppx/react/expected/spreadProps.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/spreadProps.res.txt @@ -6,10 +6,10 @@ // let c0 = // only spread props -let c1 = React.jsx(A.make, p) +let c1 = React.jsx(@res.jsxComponentPath A.make, p) // reversed order -let c2 = React.jsx(A.make, {...p, x: "x"}) +let c2 = React.jsx(@res.jsxComponentPath A.make, {...p, x: "x"}) let c3 = ReactDOM.jsx("div", p) @@ -23,5 +23,5 @@ let c5 = ReactDOM.jsxsKeyed( ) // both need to be parsed -let c6 = React.jsx(A.make, params->Obj.magic) -let c7 = React.jsx(A.make, params->Obj.magic) +let c6 = React.jsx(@res.jsxComponentPath A.make, params->Obj.magic) +let c7 = React.jsx(@res.jsxComponentPath A.make, params->Obj.magic) diff --git a/tests/syntax_tests/data/ppx/react/expected/topLevel.res.txt b/tests/syntax_tests/data/ppx/react/expected/topLevel.res.txt index 9330346a961..36a14fdaf62 100644 --- a/tests/syntax_tests/data/ppx/react/expected/topLevel.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/topLevel.res.txt @@ -17,3 +17,4 @@ module V4A = { \"TopLevel$V4A" } } +@warning("-32") let \"TopLevel$V4A" = V4A.make @warning("-32") and \"TopLevel$V4A$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/typeConstraint.res.txt b/tests/syntax_tests/data/ppx/react/expected/typeConstraint.res.txt index 68a3b0278b3..30f6be7931d 100644 --- a/tests/syntax_tests/data/ppx/react/expected/typeConstraint.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/typeConstraint.res.txt @@ -14,3 +14,5 @@ module V4A = { \"TypeConstraint$V4A" } } +@warning("-32") let \"TypeConstraint$V4A" = V4A.make +@warning("-32") and \"TypeConstraint$V4A$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/uncurriedProps.res.txt b/tests/syntax_tests/data/ppx/react/expected/uncurriedProps.res.txt index 9d81169bd1e..8cb02b596d9 100644 --- a/tests/syntax_tests/data/ppx/react/expected/uncurriedProps.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/uncurriedProps.res.txt @@ -57,10 +57,15 @@ module Bar = { @res.jsxComponentProps type props = {} - let make = (_: props): React.element => React.jsx(Foo.make, {callback: {(_, _, _) => ()}}) + let make = (_: props): React.element => + React.jsx(@res.jsxComponentPath Foo.make, {callback: {(_, _, _) => ()}}) let make = { let \"UncurriedProps$Bar" = props => make(props) \"UncurriedProps$Bar" } } +@warning("-32") let \"UncurriedProps$Foo" = Foo.make +@warning("-32") and \"UncurriedProps$Foo$jsx" = true +@warning("-32") let \"UncurriedProps$Bar" = Bar.make +@warning("-32") and \"UncurriedProps$Bar$jsx" = true diff --git a/tests/syntax_tests/data/ppx/react/expected/v4.res.txt b/tests/syntax_tests/data/ppx/react/expected/v4.res.txt index a6f05b0e17f..1bd7275a719 100644 --- a/tests/syntax_tests/data/ppx/react/expected/v4.res.txt +++ b/tests/syntax_tests/data/ppx/react/expected/v4.res.txt @@ -116,3 +116,10 @@ module Rec2 = { } and mm = x => make(x) } +@warning("-32") let \"V4$Uncurried" = Uncurried.make @warning("-32") and \"V4$Uncurried$jsx" = true +@warning("-32") let \"V4$E" = E.make @warning("-32") and \"V4$E$jsx" = true +@warning("-32") let \"V4$EUncurried" = EUncurried.make +@warning("-32") and \"V4$EUncurried$jsx" = true +@warning("-32") let \"V4$Rec" = Rec.make @warning("-32") and \"V4$Rec$jsx" = true +@warning("-32") let \"V4$Rec1" = Rec1.make @warning("-32") and \"V4$Rec1$jsx" = true +@warning("-32") let \"V4$Rec2" = Rec2.make @warning("-32") and \"V4$Rec2$jsx" = true diff --git a/tests/tests/src/ExternalArity.mjs b/tests/tests/src/ExternalArity.mjs index 1de3ab38f2d..9f669373f66 100644 --- a/tests/tests/src/ExternalArity.mjs +++ b/tests/tests/src/ExternalArity.mjs @@ -37,10 +37,16 @@ let ReactTest = { FormattedMessage: FormattedMessage }; +let ExternalArity$ReactTest$FormattedMessage = ReactIntl.FormattedMessage; + +let ExternalArity$ReactTest$FormattedMessage$jsx = true; + export { f1, f2, FromTypeConstructor, ReactTest, + ExternalArity$ReactTest$FormattedMessage, + ExternalArity$ReactTest$FormattedMessage$jsx, } /* test1 Not a pure module */ diff --git a/tests/tests/src/alias_default_value_test.mjs b/tests/tests/src/alias_default_value_test.mjs index 714b76ab98a..40dd576932b 100644 --- a/tests/tests/src/alias_default_value_test.mjs +++ b/tests/tests/src/alias_default_value_test.mjs @@ -92,13 +92,13 @@ let C8 = { }; export { - C0, - C1, - C2, - C3, - C4, - C6, - C7, - C8, + Alias_default_value_test$C0, + Alias_default_value_test$C1, + Alias_default_value_test$C2, + Alias_default_value_test$C3, + Alias_default_value_test$C4, + Alias_default_value_test$C6, + Alias_default_value_test$C7, + Alias_default_value_test$C8, } /* No side effect */ diff --git a/tests/tests/src/async_jsx.mjs b/tests/tests/src/async_jsx.mjs index f02ec3cf205..536673c09dc 100644 --- a/tests/tests/src/async_jsx.mjs +++ b/tests/tests/src/async_jsx.mjs @@ -35,7 +35,7 @@ let Bar = { export { getNow, - Foo, - Bar, + Async_jsx$Foo, + Async_jsx$Bar, } /* react/jsx-runtime Not a pure module */ diff --git a/tests/tests/src/jsx_optional_props_test.mjs b/tests/tests/src/jsx_optional_props_test.mjs index ef3a0d326f1..851759f336c 100644 --- a/tests/tests/src/jsx_optional_props_test.mjs +++ b/tests/tests/src/jsx_optional_props_test.mjs @@ -17,7 +17,7 @@ let _element = JsxRuntime.jsx(Jsx_optional_props_test$ComponentWithOptionalProps }); export { - ComponentWithOptionalProps, _element, + Jsx_optional_props_test$ComponentWithOptionalProps, } /* _element Not a pure module */ diff --git a/tests/tests/src/jsx_preserve_test.mjs b/tests/tests/src/jsx_preserve_test.mjs index 570ca4607cf..519fde3c5f3 100644 --- a/tests/tests/src/jsx_preserve_test.mjs +++ b/tests/tests/src/jsx_preserve_test.mjs @@ -229,7 +229,7 @@ let Y = { make: make$1 }; -; +<42 />; let context = React.createContext(0); @@ -247,10 +247,17 @@ function Jsx_preserve_test(props) { ; } +let Jsx_preserve_test$A = QueryClientProvider; + let make$3 = Jsx_preserve_test; +let Jsx_preserve_test$A$jsx = true; + +let Jsx_preserve_test$Y$1 = make$1; + +let Jsx_preserve_test$Y$jsx = true; + export { - Icon, _single_element_child, _multiple_element_children, _single_element_fragment, @@ -265,12 +272,9 @@ export { _container_with_spread_props_keyed, _unary_element_with_only_spread_props, A, - B, _external_component_with_children, - MyWeirdComponent, _escaped_jsx_prop, _large_component, - ComponentWithOptionalProps, _optional_props, _props_with_hyphen, _empty_fragment, @@ -281,5 +285,13 @@ export { context, ContextProvider, make$3 as make, + Jsx_preserve_test$Icon, + Jsx_preserve_test$A, + Jsx_preserve_test$A$jsx, + Jsx_preserve_test$B, + Jsx_preserve_test$MyWeirdComponent, + Jsx_preserve_test$ComponentWithOptionalProps, + Jsx_preserve_test$Y$1 as Jsx_preserve_test$Y, + Jsx_preserve_test$Y$jsx, } /* _single_element_child Not a pure module */ diff --git a/tests/tests/src/jsxv4_newtype.mjs b/tests/tests/src/jsxv4_newtype.mjs index a6e2b5a2dc7..bf5594f4efc 100644 --- a/tests/tests/src/jsxv4_newtype.mjs +++ b/tests/tests/src/jsxv4_newtype.mjs @@ -34,9 +34,9 @@ let V4A3 = { }; export { - V4A, - V4A1, - V4A2, - V4A3, + Jsxv4_newtype$V4A, + Jsxv4_newtype$V4A1, + Jsxv4_newtype$V4A2, + Jsxv4_newtype$V4A3, } /* No side effect */