Clean up jsx config.

Author: cristianoc

jscomp/bsb/bsb_config_parse.ml

@@ -88,8 +88,7 @@ let check_stdlib (map : json_map) : bool =
   | Some (False _) -> false
   | None | Some _ -> true
 
-let extract_gentype_config (map : json_map) :
-    Bsb_config_types.gentype_config =
+let extract_gentype_config (map : json_map) : Bsb_config_types.gentype_config =
   match map.?(Bsb_build_schemas.gentypeconfig) with
   | None -> false
   | Some (Obj _) -> true
@@ -130,53 +129,6 @@ let extract_reason_react_jsx (map : json_map) =
   |> ignore;
   !default
 
-let extract_jsx (map : json_map) =
-  let version : Bsb_config_types.jsx_version option ref = ref None in
-  let module_ : Bsb_config_types.jsx_module option ref = ref None in
-  let mode : Bsb_config_types.jsx_mode option ref = ref None in
-  map
-  |? ( Bsb_build_schemas.jsx,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.jsx_version) with
-           | Some (Flo { loc; flo }) -> (
-               match flo with
-               | "3" -> version := Some Jsx_v3
-               | "4" -> version := Some Jsx_v4
-               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx-version %s" flo
-               )
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input (expect a version number) for jsx-version"
-           | None -> ()) )
-  |? ( Bsb_build_schemas.jsx,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.jsx_module) with
-           | Some (Str { loc; str }) -> (
-               match str with
-               | "react" -> module_ := Some React
-               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx-module %s" str)
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input (jsx module name) for jsx-mode"
-           | None -> ()) )
-  |? ( Bsb_build_schemas.jsx,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.jsx_mode) with
-           | Some (Str { loc; str }) -> (
-               match str with
-               | "classic" -> mode := Some Classic
-               | "automatic" -> mode := Some Automatic
-               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx-mode %s" str)
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input (expect classic or automatic) for jsx-mode"
-           | None -> ()) )
-  |> ignore;
-  (!version, !module_, !mode)
-
 let extract_warning (map : json_map) =
   match map.?(Bsb_build_schemas.warnings) with
   | None -> Bsb_warning.use_default
@@ -324,7 +276,6 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
                   .path)
       in
       let reason_react_jsx = extract_reason_react_jsx map in
-      let jsx_version, jsx_module, jsx_mode = extract_jsx map in
       let bs_dependencies =
         extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies
       in
@@ -381,9 +332,7 @@ let interpret_json ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string)
             generate_merlin =
               extract_boolean map Bsb_build_schemas.generate_merlin false;
             reason_react_jsx;
-            jsx_version;
-            jsx_module;
-            jsx_mode;
+            jsx = Bsb_jsx.from_map map;
             generators = extract_generators map;
             cut_generators;
           }

jscomp/bsb/bsb_config_types.ml

@@ -31,9 +31,6 @@ type dependencies = dependency list
 type reason_react_jsx = Jsx_v3
 (* string option  *)
 
-type jsx_version = Jsx_v3 | Jsx_v4
-type jsx_module = React
-type jsx_mode = Classic | Automatic
 type gentype_config = bool
 type command = string
 type ppx = { name : string; args : string list }
@@ -62,9 +59,7 @@ type t = {
   files_to_install : Bsb_db.module_info Queue.t;
   generate_merlin : bool;
   reason_react_jsx : reason_react_jsx option;
-  jsx_version : jsx_version option;
-  jsx_module : jsx_module option;
-  jsx_mode : jsx_mode option;
+  jsx: Bsb_jsx.t;
   (* whether apply PPX transform or not*)
   generators : command Map_string.t;
   cut_generators : bool;

jscomp/bsb/bsb_jsx.ml

@@ -0,0 +1,59 @@
+type version = Jsx_v3 | Jsx_v4
+type module_ = React
+type mode = Classic | Automatic
+
+type t = {
+  version : version option;
+  module_ : module_ option;
+  mode : mode option;
+}
+
+let ( .?() ) = Map_string.find_opt
+let ( |? ) m (key, cb) = m |> Ext_json.test key cb
+
+let from_map map =
+  let version : version option ref = ref None in
+  let module_ : module_ option ref = ref None in
+  let mode : mode option ref = ref None in
+  map
+  |? ( Bsb_build_schemas.jsx,
+       `Obj
+         (fun m ->
+           match m.?(Bsb_build_schemas.jsx_version) with
+           | Some (Flo { loc; flo }) -> (
+               match flo with
+               | "3" -> version := Some Jsx_v3
+               | "4" -> version := Some Jsx_v4
+               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx-version %s" flo
+               )
+           | Some x ->
+               Bsb_exception.config_error x
+                 "Unexpected input (expect a version number) for jsx-version"
+           | None -> ()) )
+  |? ( Bsb_build_schemas.jsx,
+       `Obj
+         (fun m ->
+           match m.?(Bsb_build_schemas.jsx_module) with
+           | Some (Str { loc; str }) -> (
+               match str with
+               | "react" -> module_ := Some React
+               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx-module %s" str)
+           | Some x ->
+               Bsb_exception.config_error x
+                 "Unexpected input (jsx module name) for jsx-mode"
+           | None -> ()) )
+  |? ( Bsb_build_schemas.jsx,
+       `Obj
+         (fun m ->
+           match m.?(Bsb_build_schemas.jsx_mode) with
+           | Some (Str { loc; str }) -> (
+               match str with
+               | "classic" -> mode := Some Classic
+               | "automatic" -> mode := Some Automatic
+               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx-mode %s" str)
+           | Some x ->
+               Bsb_exception.config_error x
+                 "Unexpected input (expect classic or automatic) for jsx-mode"
+           | None -> ()) )
+  |> ignore;
+  { version = !version; module_ = !module_; mode = !mode }

jscomp/bsb/bsb_ninja_gen.ml

@@ -160,9 +160,7 @@ let output_ninja_and_namespace_map ~per_proj_dir ~package_kind
        files_to_install;
        built_in_dependency;
        reason_react_jsx;
-       jsx_version;
-       jsx_module;
-       jsx_mode;
+       jsx;
        generators;
        namespace;
        warning;
@@ -209,9 +207,8 @@ let output_ninja_and_namespace_map ~per_proj_dir ~package_kind
   let rules : Bsb_ninja_rule.builtin =
     Bsb_ninja_rule.make_custom_rules ~gentype_config
       ~has_postbuild:js_post_build_cmd ~pp_file ~has_builtin:built_in_dependency
-      ~reason_react_jsx ~jsx_version ~jsx_module ~jsx_mode ~package_specs
-      ~namespace ~digest ~package_name ~warnings ~ppx_files ~bsc_flags
-      ~dpkg_incls (* dev dependencies *)
+      ~reason_react_jsx ~jsx ~package_specs ~namespace ~digest ~package_name
+      ~warnings ~ppx_files ~bsc_flags ~dpkg_incls (* dev dependencies *)
       ~lib_incls (* its own libs *)
       ~dev_incls (* its own devs *)
       ~bs_dependencies ~bs_dev_dependencies generators

jscomp/bsb/bsb_ninja_rule.ml

@@ -91,14 +91,11 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     ~(has_postbuild : string option) ~(pp_file : string option)
     ~(has_builtin : bool)
     ~(reason_react_jsx : Bsb_config_types.reason_react_jsx option)
-    ~(jsx_version : Bsb_config_types.jsx_version option)
-    ~(jsx_module : Bsb_config_types.jsx_module option)
-    ~(jsx_mode : Bsb_config_types.jsx_mode option) ~(digest : string)
-    ~(package_specs : Bsb_package_specs.t) ~(namespace : string option)
-    ~package_name ~warnings ~(ppx_files : Bsb_config_types.ppx list) ~bsc_flags
-    ~(dpkg_incls : string) ~(lib_incls : string) ~(dev_incls : string)
-    ~bs_dependencies ~bs_dev_dependencies (custom_rules : command Map_string.t)
-    : builtin =
+    ~(jsx : Bsb_jsx.t) ~(digest : string) ~(package_specs : Bsb_package_specs.t)
+    ~(namespace : string option) ~package_name ~warnings
+    ~(ppx_files : Bsb_config_types.ppx list) ~bsc_flags ~(dpkg_incls : string)
+    ~(lib_incls : string) ~(dev_incls : string) ~bs_dependencies
+    ~bs_dev_dependencies (custom_rules : command Map_string.t) : builtin =
   let bs_dep = Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep in
   let bsc = Ext_filename.maybe_quote Bsb_global_paths.vendor_bsc in
   (* FIXME: We don't need set [-o ${out}] when building ast
@@ -123,8 +120,7 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     *)
     (match gentype_config with
     | false -> ()
-    | true ->
-        Ext_buffer.add_string buf " -bs-gentype");
+    | true -> Ext_buffer.add_string buf " -bs-gentype");
     if read_cmi <> `is_cmi then (
       Ext_buffer.add_string buf " -bs-package-name ";
       Ext_buffer.add_string buf (Ext_filename.maybe_quote package_name);
@@ -163,15 +159,15 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     | None -> ()
     | Some flag ->
         Ext_buffer.add_char_string buf ' ' (Bsb_build_util.pp_flag flag));
-    (match (reason_react_jsx, jsx_version) with
+    (match (reason_react_jsx, jsx.version) with
     | _, Some Jsx_v3 -> Ext_buffer.add_string buf " -bs-jsx 3"
     | _, Some Jsx_v4 -> Ext_buffer.add_string buf " -bs-jsx 4"
     | Some Jsx_v3, None -> Ext_buffer.add_string buf " -bs-jsx 3"
     | None, None -> ());
-    (match jsx_module with
+    (match jsx.module_ with
     | None -> ()
     | Some React -> Ext_buffer.add_string buf " -bs-jsx-module react");
-    (match jsx_mode with
+    (match jsx.mode with
     | None -> ()
     | Some Classic -> Ext_buffer.add_string buf " -bs-jsx-mode classic"
     | Some Automatic -> Ext_buffer.add_string buf " -bs-jsx-mode automatic");

jscomp/bsb/bsb_ninja_rule.mli

@@ -71,9 +71,7 @@ val make_custom_rules :
   pp_file:string option ->
   has_builtin:bool ->
   reason_react_jsx:Bsb_config_types.reason_react_jsx option ->
-  jsx_version:Bsb_config_types.jsx_version option ->
-  jsx_module:Bsb_config_types.jsx_module option ->
-  jsx_mode:Bsb_config_types.jsx_mode option ->
+  jsx:Bsb_jsx.t ->
   digest:string ->
   package_specs:Bsb_package_specs.t ->
   namespace:string option ->