Initial fragment support

Author: nojaf

compiler/core/js_dump.ml

@@ -540,6 +540,25 @@ and expression_desc cxt ~(level : int) f x : cxt =
             | _ -> Some (f, x))
       in
       match jsx_element with
+      | Parsetree.Jsx_fragment {jsx_fragment_children = children} ->
+        P.string f "<>";
+        (let children =
+           fields
+           |> List.find_map (fun (n, e) ->
+                  if n = "children" then Some e else None)
+         in
+         children
+         |> Option.iter (fun c ->
+                P.string f "{";
+                let _ = expression ~level:1 cxt f c in
+                P.string f "}"));
+        P.string f "</>";
+        cxt
+      | Parsetree.Jsx_unary_element
+          {jsx_unary_element_tag_name = {txt = Longident.Lident tagName}} ->
+        Printf.eprintf "Crazy Tag: %s\n" tagName;
+        P.string f (Format.sprintf "<%s />" tagName);
+        cxt
       | Parsetree.Jsx_container_element
           {
             jsx_container_element_tag_name_start =

compiler/core/jsx_help.ml

@@ -1,3 +1,18 @@
+let lambda_tag_info_to_string (e : Lambda.tag_info) =
+  match e with
+  | Lambda.Blk_constructor _ -> "Blk_constructor"
+  | Lambda.Blk_record_inlined _ -> "Blk_record_inlined"
+  | Lambda.Blk_tuple -> "Blk_tuple"
+  | Lambda.Blk_poly_var _ -> "Blk_poly_var"
+  | Lambda.Blk_record _ -> "Blk_record"
+  | Lambda.Blk_module _ -> "Blk_module"
+  | Lambda.Blk_module_export _ -> "Blk_module_export"
+  | Lambda.Blk_extension -> "Blk_extension"
+  | Lambda.Blk_some -> "Blk_some"
+  | Lambda.Blk_some_not_nested -> "Blk_some_not_nested"
+  | Lambda.Blk_record_ext _ -> "Blk_record_ext"
+  | Lambda.Blk_lazy_general -> "Blk_lazy_general"
+
 let j_exp_to_string (e : J.expression) =
   match e.J.expression_desc with
   | J.Object _ -> "Object"
@@ -21,26 +36,12 @@ let j_exp_to_string (e : J.expression) =
   | J.Array_index _ -> "Array_index"
   | J.Static_index _ -> "Static_index"
   | J.Length _ -> "Length"
-  | J.Caml_block _ -> "Caml_block"
+  | J.Caml_block (_, _, _, tag) ->
+    Format.sprintf "Caml_block (%s)" (lambda_tag_info_to_string tag)
   | J.Caml_block_tag _ -> "Caml_block_tag"
   | J.Tagged_template _ -> "Tagged_template"
   | J.Optional_block _ -> "Optional_block"
   | J.Spread _ -> "Spread"
   | J.Await _ -> "Await"
   | J.Raw_js_code _ -> "Raw_js_code"
   | _ -> "Other"
-
-let lambda_tag_info_to_string (e : Lambda.tag_info) =
-  match e with
-  | Lambda.Blk_constructor _ -> "Blk_constructor"
-  | Lambda.Blk_record_inlined _ -> "Blk_record_inlined"
-  | Lambda.Blk_tuple -> "Blk_tuple"
-  | Lambda.Blk_poly_var _ -> "Blk_poly_var"
-  | Lambda.Blk_record _ -> "Blk_record"
-  | Lambda.Blk_module _ -> "Blk_module"
-  | Lambda.Blk_module_export _ -> "Blk_module_export"
-  | Lambda.Blk_extension -> "Blk_extension"
-  | Lambda.Blk_some -> "Blk_some"
-  | Lambda.Blk_some_not_nested -> "Blk_some_not_nested"
-  | Lambda.Blk_record_ext _ -> "Blk_record_ext"
-  | Lambda.Blk_lazy_general -> "Blk_lazy_general"

compiler/ml/ast_mapper.ml

@@ -293,8 +293,8 @@ module E = struct
       fun_ ~loc ~attrs ~arity ~async lab
         (map_opt (sub.expr sub) def)
         (sub.pat sub p) (sub.expr sub e)
-    | Pexp_apply {funct = e; args = l; partial} ->
-      apply ~loc ~attrs ~partial (sub.expr sub e)
+    | Pexp_apply {funct = e; args = l; partial; transformed_jsx} ->
+      apply ~loc ~attrs ~partial ?transformed_jsx (sub.expr sub e)
         (List.map (map_snd (sub.expr sub)) l)
     | Pexp_match (e, pel) ->
       match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)

compiler/syntax/src/jsx_v4.ml

@@ -1208,7 +1208,7 @@ let append_children_prop (config : Jsx_common.jsx_config) mapper
         Exp.apply
           (Exp.ident
              {txt = Ldot (element_binding, "someElement"); loc = Location.none})
-          [(Nolabel, child)]
+          [(Nolabel, mapper.expr mapper child)]
     in
     let is_optional =
       match component_description with