Add more regression tests

Author: fhammerschmidt

compiler/core/lam_compile.ml

@@ -347,46 +347,51 @@ let compile output_prefix =
     push hidden_name;
     List.rev !candidates
   in
-  let exported_hidden_component_name (module_id : J.module_id)
+  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:module_id.dynamic_import module_id.id
+          Lam_compile_env.query_external_id_info ~dynamic_import id
             (candidate ^ "$jsx")
         with
         | _ -> Some candidate
         | exception Not_found -> loop rest)
     in
-    match module_id.kind with
-    | Ml -> loop hidden_name_candidates
-    | _ -> None
+    loop hidden_name_candidates
   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) =
+    let rec extract_root_expr (expr : J.expression) =
       match expr.expression_desc with
-      | Var (Qualified (module_id, _)) -> Some module_id
-      | Static_index (inner, _, _) -> extract_module_id inner
+      | 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
     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
-      match extract_module_id compiled_expr with
-      | Some module_id -> (
+      match extract_root_expr compiled_expr with
+      | Some root_expr -> (
         match
-          exported_hidden_component_name module_id hidden_name_candidates
+          exported_hidden_component_name ~id ~dynamic_import
+            hidden_name_candidates
         with
-        | Some hidden_name ->
-          {
-            compiled_expr with
-            expression_desc = Var (Qualified (module_id, Some hidden_name));
-          }
+        | Some hidden_name -> hidden_component_access root_expr hidden_name
         | None -> compiled_expr)
       | None -> compiled_expr)
     | None -> compiled_expr
@@ -1671,7 +1676,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)
     | _ -> (
@@ -1795,7 +1800,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]; _} -> (

compiler/syntax/src/jsx_v4.ml

@@ -953,6 +953,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

tests/build_tests/rsc_component_with_props_nested/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\$RscComponentWithPropsNested\.Sidebar\$Provider,/,
+);
+assert.doesNotMatch(output, /\.Provider\.make,/);
+assert.match(sidebarOutput, /Sidebar\$Provider\$jsx/);
+assert.match(
+  sidebarOutput,
+  /export \{[\s\S]*Provider,[\s\S]*Sidebar\$Provider,[\s\S]*Sidebar\$Provider\$jsx[\s\S]*\}/s,
+);
+
+await execClean();

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

tests/build_tests/rsc_component_with_props_nested/src/MainLayout.res

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

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"

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

tests/build_tests/rsc_dynamic_import_nested_jsx/input.js

@@ -0,0 +1,30 @@
+// @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\.Provider\.make;/);
+assert.match(
+  output,
+  /JsxRuntime\.jsx\(Sidebar\$RscDynamicImportNestedJsx\.Sidebar\$Provider,/,
+);
+assert.doesNotMatch(
+  output,
+  /let dynamicProvider = DynamicSidebar\.Sidebar\$Provider;/,
+);
+
+await execClean();

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

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) => {
+  <Sidebar.Provider> {Option.getOr(children, React.null)} </Sidebar.Provider>
+}