JSX preserve mode: fix "make is not a valid component name"

Author: cknitt

compiler/core/lam_pass_remove_alias.ml

@@ -50,9 +50,12 @@ let simplify_alias (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
          Main use case, we should detect inline all immutable block .. *)
       match simpl arg with
       | Lvar v as l ->
-        Lam_util.field_flatten_get
-          (fun _ -> Lam.prim ~primitive ~args:[l] loc)
-          v i info meta.ident_tbl
+        (* Preserve module qualification when JSX preserve mode is enabled
+           This ensures component names like X.make are not flattened to just make
+           in JSX preserve mode *)
+        let prim = Lam.prim ~primitive ~args:[l] loc in
+        if !Js_config.jsx_preserve then prim
+        else Lam_util.field_flatten_get (fun _ -> prim) v i info meta.ident_tbl
       | l -> Lam.prim ~primitive ~args:[l] loc)
     | Lprim
         {

tests/tests/src/async_jsx.mjs

@@ -25,7 +25,7 @@ let Foo = {
 
 function Async_jsx$Bar(props) {
   return <div>
-    <Async_jsx$Foo />
+    <Foo.make />
   </div>;
 }
 

tests/tests/src/jsx_preserve_test.mjs

@@ -20,7 +20,7 @@ let _multiple_element_children = <div>
   <h1>
     {"Hello, world!"}
   </h1>
-  <Jsx_preserve_test$Icon />
+  <Icon.make />
 </div>;
 
 let _single_element_fragment = <>
@@ -141,7 +141,7 @@ let B = {
 
 let _external_component_with_children = <QueryClientProvider>
   <strong />
-  <Jsx_preserve_test$B />
+  <B.make />
 </QueryClientProvider>;
 
 function Jsx_preserve_test$MyWeirdComponent(props) {
@@ -155,7 +155,7 @@ let MyWeirdComponent = {
   make: Jsx_preserve_test$MyWeirdComponent
 };
 
-let _escaped_jsx_prop = <Jsx_preserve_test$MyWeirdComponent
+let _escaped_jsx_prop = <MyWeirdComponent.make
   MyWeirdProp={"bar"}
 />;
 
@@ -197,7 +197,7 @@ let ComponentWithOptionalProps = {
   make: Jsx_preserve_test$ComponentWithOptionalProps
 };
 
-let _optional_props = <Jsx_preserve_test$ComponentWithOptionalProps
+let _optional_props = <ComponentWithOptionalProps.make
   i={1}
   s={"test"}
   element={<div />}