Don't pass untyped ast, simple flag is sufficient.

Author: nojaf

compiler/core/js_call_info.ml

@@ -33,16 +33,12 @@ type call_info =
    {[ fun x y -> (f x y) === f ]} when [f] is an atom
 *)
 
-type t = {
-  call_info: call_info;
-  arity: arity;
-  call_transformed_jsx: Parsetree.jsx_element option;
-}
+type t = {call_info: call_info; arity: arity; call_transformed_jsx: bool}
 
-let dummy = {arity = NA; call_info = Call_na; call_transformed_jsx = None}
+let dummy = {arity = NA; call_info = Call_na; call_transformed_jsx = false}
 
 let builtin_runtime_call =
-  {arity = Full; call_info = Call_builtin_runtime; call_transformed_jsx = None}
+  {arity = Full; call_info = Call_builtin_runtime; call_transformed_jsx = false}
 
 let ml_full_call =
-  {arity = Full; call_info = Call_ml; call_transformed_jsx = None}
+  {arity = Full; call_info = Call_ml; call_transformed_jsx = false}

compiler/core/js_call_info.mli

@@ -35,11 +35,7 @@ type call_info =
    {[ fun x y -> f x y === f ]} when [f] is an atom
 *)
 
-type t = {
-  call_info: call_info;
-  arity: arity;
-  call_transformed_jsx: Parsetree.jsx_element option;
-}
+type t = {call_info: call_info; arity: arity; call_transformed_jsx: bool}
 
 val dummy : t
 

compiler/core/js_dump.ml

@@ -524,7 +524,7 @@ and expression_desc cxt ~(level : int) f x : cxt =
          when Ext_list.length_equal el i
        ]}
     *)
-  | Call (e, el, {call_transformed_jsx = Some jsx_element}) -> (
+  | Call (e, el, {call_transformed_jsx = true}) -> (
     match el with
     | [
      tag;
@@ -561,11 +561,9 @@ and expression_desc cxt ~(level : int) f x : cxt =
         (Call
            ( e,
              el,
-             {call_transformed_jsx = None; arity = Full; call_info = Call_ml} ))
-    )
+             {call_transformed_jsx = false; arity = Full; call_info = Call_ml}
+           )))
   | Call (e, el, info) ->
-    Format.fprintf Format.err_formatter "Js_dump Has transformed_jsx %b\n"
-      (Option.is_some info.call_transformed_jsx);
     P.cond_paren_group f (level > 15) (fun _ ->
         P.group f 0 (fun _ ->
             match (info, el) with
@@ -1080,7 +1078,7 @@ and print_jsx cxt ~(level : int) f (tag : J.expression)
   | Some children ->
     let child_is_jsx =
       match children.expression_desc with
-      | J.Call (_, _, {call_transformed_jsx = Some _}) -> true
+      | J.Call (_, _, {call_transformed_jsx = is_jsx}) -> is_jsx
       | _ -> false
     in
 

compiler/core/lam.ml

@@ -85,7 +85,7 @@ module Types = struct
     ap_func: t;
     ap_args: t list;
     ap_info: ap_info;
-    ap_transformed_jsx: Parsetree.jsx_element option;
+    ap_transformed_jsx: bool;
   }
 
   and t =
@@ -130,7 +130,7 @@ module X = struct
     ap_func: t;
     ap_args: t list;
     ap_info: ap_info;
-    ap_transformed_jsx: Parsetree.jsx_element option;
+    ap_transformed_jsx: bool;
   }
 
   and lfunction = Types.lfunction = {
@@ -289,7 +289,7 @@ let rec is_eta_conversion_exn params inner_args outer_args : t list =
   | _, _, _ -> raise_notrace Not_simple_form
 
 (** FIXME: more robust inlining check later, we should inline it before we add stub code*)
-let rec apply ?(ap_transformed_jsx = None) fn args (ap_info : ap_info) : t =
+let rec apply ?(ap_transformed_jsx = false) fn args (ap_info : ap_info) : t =
   match fn with
   | Lfunction
       {
@@ -723,7 +723,7 @@ let result_wrap loc (result_type : External_ffi_types.return_wrapper) result =
     prim ~primitive:Pundefined_to_opt ~args:[result] loc
   | Return_unset | Return_identity -> result
 
-let handle_bs_non_obj_ffi ?transformed_jsx
+let handle_bs_non_obj_ffi ?(transformed_jsx = false)
     (arg_types : External_arg_spec.params)
     (result_type : External_ffi_types.return_wrapper) ffi args loc prim_name
     ~dynamic_import =

compiler/core/lam.mli

@@ -45,7 +45,7 @@ and apply = private {
   ap_func: t;
   ap_args: t list;
   ap_info: ap_info;
-  ap_transformed_jsx: Parsetree.jsx_element option;
+  ap_transformed_jsx: bool;
 }
 
 and lfunction = {
@@ -90,7 +90,7 @@ and t = private
 val inner_map : t -> (t -> t) -> t
 
 val handle_bs_non_obj_ffi :
-  ?transformed_jsx:Parsetree.jsx_element ->
+  ?transformed_jsx:bool ->
   External_arg_spec.params ->
   External_ffi_types.return_wrapper ->
   External_ffi_types.external_spec ->
@@ -109,12 +109,7 @@ val global_module : ?dynamic_import:bool -> ident -> t
 
 val const : Lam_constant.t -> t
 
-val apply :
-  ?ap_transformed_jsx:Parsetree.jsx_element option ->
-  t ->
-  t list ->
-  ap_info ->
-  t
+val apply : ?ap_transformed_jsx:bool -> t -> t list -> ap_info -> t
 
 val function_ :
   attr:Lambda.function_attribute ->

compiler/core/lam_compile.ml

@@ -55,7 +55,7 @@ let rec apply_with_arity_aux (fn : J.expression) (arity : int list)
                {
                  arity = Full;
                  call_info = Call_ml;
-                 (* no clue if this is correct *) call_transformed_jsx = None;
+                 (* no clue if this is correct *) call_transformed_jsx = false;
                }
              fn first_part)
           rest continue (len - x)
@@ -76,7 +76,7 @@ let rec apply_with_arity_aux (fn : J.expression) (arity : int list)
                      arity = Full;
                      call_info = Call_ml;
                      (* no clue if this is correct *) call_transformed_jsx =
-                       None;
+                       false;
                    }
                  fn
                  (Ext_list.append args @@ Ext_list.map params E.var));

compiler/core/lam_compile_external_call.ml

@@ -267,10 +267,9 @@ let translate_scoped_access scopes obj =
   | [] -> obj
   | x :: xs -> Ext_list.fold_left xs (E.dot obj x) E.dot
 
-let translate_ffi ?(transformed_jsx : Parsetree.jsx_element option)
-    (cxt : Lam_compile_context.t) arg_types
-    (ffi : External_ffi_types.external_spec) (args : J.expression list)
-    ~dynamic_import =
+let translate_ffi ?(transformed_jsx = false) (cxt : Lam_compile_context.t)
+    arg_types (ffi : External_ffi_types.external_spec)
+    (args : J.expression list) ~dynamic_import =
   match ffi with
   | Js_call
       {external_module_name; name; splice : _; scopes; tagged_template = true}

compiler/core/lam_compile_external_call.mli

@@ -30,7 +30,7 @@ val ocaml_to_js_eff :
 (** Compile ocaml external function call to JS IR. *)
 
 val translate_ffi :
-  ?transformed_jsx:Parsetree.jsx_element ->
+  ?transformed_jsx:bool ->
   Lam_compile_context.t ->
   External_arg_spec.params ->
   External_ffi_types.external_spec ->

compiler/core/lam_compile_primitive.ml

@@ -56,14 +56,14 @@ let get_module_system () =
 
 let import_of_path path =
   E.call
-    ~info:{arity = Full; call_info = Call_na; call_transformed_jsx = None}
+    ~info:{arity = Full; call_info = Call_na; call_transformed_jsx = false}
     (E.js_global "import")
     [E.str path]
 
 let wrap_then import value =
   let arg = Ident.create "m" in
   E.call
-    ~info:{arity = Full; call_info = Call_na; call_transformed_jsx = None}
+    ~info:{arity = Full; call_info = Call_na; call_transformed_jsx = false}
     (E.dot import "then")
     [
       E.ocaml_fun ~return_unit:false ~async:false ~one_unit_arg:false [arg]
@@ -90,7 +90,7 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
     match args with
     | fn :: rest ->
       E.call
-        ~info:{arity = Full; call_info = Call_na; call_transformed_jsx = None}
+        ~info:{arity = Full; call_info = Call_na; call_transformed_jsx = false}
         fn rest
     | _ -> assert false)
   | Pnull_to_opt -> (
@@ -599,7 +599,7 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
   | Pjs_object_create _ -> assert false
   | Pjs_call {arg_types; ffi; dynamic_import; transformed_jsx} ->
     Lam_compile_external_call.translate_ffi cxt arg_types ffi args
-      ~dynamic_import ?transformed_jsx
+      ~dynamic_import ~transformed_jsx
   (* FIXME, this can be removed later *)
   | Pisint -> E.is_type_number (Ext_list.singleton_exn args)
   | Pis_poly_var_block -> E.is_type_object (Ext_list.singleton_exn args)

compiler/core/lam_convert.ml

@@ -373,7 +373,7 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
   let exit_map = Hash_int.create 0 in
   let may_depends = Lam_module_ident.Hash_set.create 0 in
 
-  let rec convert_ccall ?(transformed_jsx = None)
+  let rec convert_ccall ?(transformed_jsx = false)
       (a_prim : Primitive.description) (args : Lambda.lambda list) loc
       ~dynamic_import : Lam.t =
     let prim_name = a_prim.prim_name in
@@ -382,14 +382,13 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
       let args = Ext_list.map args convert_aux in
       prim ~primitive:(Pjs_object_create labels) ~args loc
     | Ffi_bs (arg_types, result_type, ffi) ->
-      Format.fprintf Format.err_formatter "Ffi_bs\n";
       let arg_types =
         match arg_types with
         | Params ls -> ls
         | Param_number i -> Ext_list.init i (fun _ -> External_arg_spec.dummy)
       in
       let args = Ext_list.map args convert_aux in
-      Lam.handle_bs_non_obj_ffi ?transformed_jsx arg_types result_type ffi args
+      Lam.handle_bs_non_obj_ffi ~transformed_jsx arg_types result_type ffi args
         loc prim_name ~dynamic_import
     | Ffi_inline_const i -> Lam.const i
     | Ffi_normal ->
@@ -455,9 +454,6 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
     | Lprim (Prevapply, _, _, _) -> assert false
     | Lprim (Pdirapply, _, _, _) -> assert false
     | Lprim (Pccall a, args, loc, transformed_jsx) ->
-      Format.fprintf Format.err_formatter
-        "lam convert Pccall Has transformed_jsx %b\n"
-        (Option.is_some transformed_jsx);
       convert_ccall ~transformed_jsx a args loc ~dynamic_import
     | Lprim (Pjs_raw_expr, args, loc, _) -> (
       match args with

compiler/core/lam_pass_alpha_conversion.ml

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 let alpha_conversion (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
-  let rec populate_apply_info ?(ap_transformed_jsx = None)
+  let rec populate_apply_info ?(ap_transformed_jsx = false)
       (args_arity : int list) (len : int) (fn : Lam.t) (args : Lam.t list)
       ap_info : Lam.t =
     match args_arity with

compiler/core/lam_primitive.ml

@@ -46,7 +46,7 @@ type t =
       arg_types: External_arg_spec.params;
       ffi: External_ffi_types.external_spec;
       dynamic_import: bool;
-      transformed_jsx: Parsetree.jsx_element option;
+      transformed_jsx: bool;
     }
   | Pjs_object_create of External_arg_spec.obj_params
   (* Exceptions *)

compiler/core/lam_primitive.mli

@@ -42,7 +42,7 @@ type t =
       arg_types: External_arg_spec.params;
       ffi: External_ffi_types.external_spec;
       dynamic_import: bool;
-      transformed_jsx: Parsetree.jsx_element option;
+      transformed_jsx: bool;
     }
   | Pjs_object_create of External_arg_spec.obj_params
   | Praise

compiler/core/polyvar_pattern_match.ml

@@ -66,7 +66,7 @@ let or_list (arg : lam) (hash_names : (int * string) list) =
         ( Pintcomp Ceq,
           [arg; Lconst (Const_pointer (hash, Pt_variant {name}))],
           Location.none,
-          None )
+          false )
     in
     Ext_list.fold_left rest init (fun acc (hash, name) ->
         Lambda.Lprim
@@ -77,10 +77,10 @@ let or_list (arg : lam) (hash_names : (int * string) list) =
                 ( Pintcomp Ceq,
                   [arg; Lconst (Const_pointer (hash, Pt_variant {name}))],
                   Location.none,
-                  None );
+                  false );
             ],
             Location.none,
-            None ))
+            false ))
   | _ -> assert false
 
 let make_test_sequence_variant_constant (fail : lam option) (arg : lam)
@@ -114,5 +114,5 @@ let call_switcher_variant_constr (loc : Location.t) (fail : lam option)
     ( Alias,
       Pgenval,
       v,
-      Lprim (Pfield (0, Fld_poly_var_tag), [arg], loc, None),
+      Lprim (Pfield (0, Fld_poly_var_tag), [arg], loc, false),
       call_switcher_variant_constant loc fail (Lvar v) int_lambda_list names )

compiler/frontend/ast_compatible.ml

@@ -44,7 +44,7 @@ let apply_simple ?(loc = default_loc) ?(attrs = []) (fn : expression)
           funct = fn;
           args = Ext_list.map args (fun x -> (Asttypes.Nolabel, x));
           partial = false;
-          transformed_jsx = None;
+          transformed_jsx = false;
         };
   }
 
@@ -58,7 +58,7 @@ let app1 ?(loc = default_loc) ?(attrs = []) fn arg1 : expression =
           funct = fn;
           args = [(Nolabel, arg1)];
           partial = false;
-          transformed_jsx = None;
+          transformed_jsx = false;
         };
   }
 
@@ -72,7 +72,7 @@ let app2 ?(loc = default_loc) ?(attrs = []) fn arg1 arg2 : expression =
           funct = fn;
           args = [(Nolabel, arg1); (Nolabel, arg2)];
           partial = false;
-          transformed_jsx = None;
+          transformed_jsx = false;
         };
   }
 
@@ -86,7 +86,7 @@ let app3 ?(loc = default_loc) ?(attrs = []) fn arg1 arg2 arg3 : expression =
           funct = fn;
           args = [(Nolabel, arg1); (Nolabel, arg2); (Nolabel, arg3)];
           partial = false;
-          transformed_jsx = None;
+          transformed_jsx = false;
         };
   }
 
@@ -134,7 +134,7 @@ let apply_labels ?(loc = default_loc) ?(attrs = []) fn
             Ext_list.map args (fun (l, a) ->
                 (Asttypes.Labelled {txt = l; loc = Location.none}, a));
           partial = false;
-          transformed_jsx = None;
+          transformed_jsx = false;
         };
   }
 

compiler/frontend/ast_uncurry_gen.ml

@@ -75,5 +75,5 @@ let to_method_callback loc (self : Bs_ast_mapper.mapper) label
                  [Typ.any ~loc ()]) );
         ];
       partial = false;
-      transformed_jsx = None;
+      transformed_jsx = false;
     }

compiler/frontend/bs_ast_mapper.ml

@@ -331,7 +331,7 @@ module E = struct
         (map_opt (sub.expr sub) def)
         (sub.pat sub p) (sub.expr sub e)
     | Pexp_apply {funct = e; args = l; partial; transformed_jsx} ->
-      apply ~loc ~attrs ~partial ?transformed_jsx (sub.expr sub e)
+      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/ml/ast_helper.ml

@@ -154,7 +154,8 @@ module Exp = struct
   let fun_ ?loc ?attrs ?(async = false) ~arity a b c d =
     mk ?loc ?attrs
       (Pexp_fun {arg_label = a; default = b; lhs = c; rhs = d; arity; async})
-  let apply ?loc ?attrs ?(partial = false) ?transformed_jsx funct args =
+  let apply ?loc ?attrs ?(partial = false) ?(transformed_jsx = false) funct args
+      =
     mk ?loc ?attrs (Pexp_apply {funct; args; partial; transformed_jsx})
   let match_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_match (a, b))
   let try_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_try (a, b))

compiler/ml/ast_helper.mli

@@ -149,7 +149,7 @@ module Exp : sig
     ?loc:loc ->
     ?attrs:attrs ->
     ?partial:bool ->
-    ?transformed_jsx:jsx_element ->
+    ?transformed_jsx:bool ->
     expression ->
     (arg_label * expression) list ->
     expression

compiler/ml/ast_mapper.ml

@@ -294,7 +294,7 @@ module E = struct
         (map_opt (sub.expr sub) def)
         (sub.pat sub p) (sub.expr sub e)
     | Pexp_apply {funct = e; args = l; partial; transformed_jsx} ->
-      apply ~loc ~attrs ~partial ?transformed_jsx (sub.expr sub e)
+      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)