Copilot comment fixes

Author: fhammerschmidt

compiler/core/lam_compile.ml

@@ -347,6 +347,23 @@ let compile output_prefix =
     push hidden_name;
     List.rev !candidates
   in
+  let exported_hidden_component_name (module_id : J.module_id)
+      (hidden_name_candidates : string list) =
+    let rec loop = function
+      | [] -> None
+      | candidate :: rest -> (
+        match
+          Lam_compile_env.query_external_id_info
+            ~dynamic_import:module_id.dynamic_import module_id.id
+            (candidate ^ "$jsx")
+        with
+        | _ -> Some candidate
+        | exception Not_found -> loop rest)
+    in
+    match module_id.kind with
+    | Ml -> loop hidden_name_candidates
+    | _ -> None
+  in
   let rewrite_nested_jsx_component_expr (jsx_tag : Lam.t)
       (compiled_expr : J.expression) : J.expression =
     let rec extract_module_id (expr : J.expression) =
@@ -356,22 +373,22 @@ let compile output_prefix =
       | _ -> None
     in
     match extract_nested_external_component_field jsx_tag with
-    | Some (id, dynamic_import, hidden_name) -> (
+    | Some (id, _dynamic_import, hidden_name) -> (
       let hidden_name_candidates =
         hidden_component_name_candidates id hidden_name
       in
-      let resolved_hidden_name =
-        match hidden_name_candidates with
-        | candidate :: _ -> Some candidate
-        | [] -> None
-      in
-      match (resolved_hidden_name, extract_module_id compiled_expr) with
-      | Some hidden_name, Some module_id ->
-        {
-          compiled_expr with
-          expression_desc = Var (Qualified (module_id, Some hidden_name));
-        }
-      | _ -> compiled_expr)
+      match extract_module_id compiled_expr with
+      | Some module_id -> (
+        match
+          exported_hidden_component_name module_id hidden_name_candidates
+        with
+        | Some hidden_name ->
+          {
+            compiled_expr with
+            expression_desc = Var (Qualified (module_id, Some hidden_name));
+          }
+        | None -> compiled_expr)
+      | None -> compiled_expr)
     | None -> compiled_expr
   in
   let rec compile_external_field (* Like [List.empty]*)

compiler/syntax/src/jsx_v4.ml

@@ -127,9 +127,19 @@ let unnamespace_module_name file_name =
   | Some index -> String.sub file_name 0 index
   | None -> (
     match Ext_namespace.try_split_module_name file_name with
-    | Some (module_name, _namespace) -> module_name
+    | 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) with
+  | "make", _ :: _ ->
+    config.hoisted_structure_items <-
+      make_hoisted_component_binding ~empty_loc ~full_module_name
+        config.nested_modules
+      :: config.hoisted_structure_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
@@ -843,13 +853,8 @@ let map_binding ~config ~empty_loc ~pstr_loc ~file_name ~rec_flag binding =
           Some (binding_wrapper full_expression) )
     in
     let () =
-      match (fn_name, config.nested_modules) with
-      | "make", _ :: _ ->
-        config.hoisted_structure_items <-
-          make_hoisted_component_binding ~empty_loc ~full_module_name
-            config.nested_modules
-          :: config.hoisted_structure_items
-      | _ -> ()
+      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
@@ -981,7 +986,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,
@@ -1042,6 +1048,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

tests/build_tests/rsc_nested_jsx_members/input.js

@@ -18,6 +18,21 @@ const sidebarOutputPath = path.join(
   "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",
+);
 
 assert.match(
   output,
@@ -27,16 +42,28 @@ 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\.Sidebar\$RscNestedJsxMembers\$Provider,/,
 );
+assert.doesNotMatch(
+  externalOutput,
+  /JsxRuntime\.jsx\(SidebarExternal\$RscNestedJsxMembers\.Provider\.make,/,
+);
 assert.doesNotMatch(output, /\.Provider\.make,/);
 assert.match(
   sidebarOutput,
   /export \{[\s\S]*Provider,[\s\S]*Inset,[\s\S]*Sidebar\$Provider,[\s\S]*Sidebar\$Inset,[\s\S]*\}/s,
 );
 assert.match(sidebarOutput, /Sidebar\$Provider\$jsx/);
 assert.match(sidebarOutput, /Sidebar\$Inset\$jsx/);
+assert.match(
+  externalSidebarOutput,
+  /export \{[\s\S]*Provider,[\s\S]*SidebarExternal\$Provider,[\s\S]*SidebarExternal\$Provider\$jsx[\s\S]*\}/s,
+);
 
 await execClean();

tests/build_tests/rsc_nested_jsx_members/src/MainLayoutExternal.res

@@ -0,0 +1,4 @@
+@react.component
+let make = (~children) => {
+  <SidebarExternal.Provider> {children} </SidebarExternal.Provider>
+}

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"
+}

tests/build_tests/rsc_nested_jsx_members/src/SidebarExternalImpl.js

@@ -0,0 +1,3 @@
+export default function SidebarExternalImpl(props) {
+  return props.children ?? null;
+}

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 */