add new configuration for jsx ppx v4

Author: mununki

docs/docson/build-schema.json

@@ -350,6 +350,19 @@
                 }
             }
         },
+        "react-specs": {
+            "type": "object",
+            "properties": {
+                "jsx": {
+                    "$ref": "#/definitions/jsx-version",
+                    "description": "Whether to apply the [RescriptReact](https://github.com/rescript-lang/rescript-react)-specific JSX PPX transformation."
+                },
+                "runtime": {
+                    "$ref": "#/definitions/react-runtime",
+                    "description": "Whether to apply the [RescriptReact](https://github.com/rescript-lang/rescript-react)-specific JSX PPX transformation."
+                }
+            }
+        },
         "refmt-specs": {
             "oneOf": [
                 {

jscomp/bsb/bsb_build_schemas.ml

@@ -90,6 +90,12 @@ let reason = "reason"
 
 let react_jsx = "react-jsx"
 
+let react = "react"
+
+let jsx_version = "jsx"
+
+let react_runtime = "runtime"
+
 let entries = "entries"
 
 let backend = "backend"

jscomp/bsb/bsb_config_parse.ml

@@ -36,7 +36,6 @@ type json_map = Ext_json_types.t Map_string.t
 
 (* Key is the path *)
 let ( |? ) m (key, cb) = m |> Ext_json.test key cb
-
 let ( .?() ) = Map_string.find_opt
 
 (*TODO: it is a little mess that [cwd] and [project dir] are shared*)
@@ -146,6 +145,46 @@ let extract_reason_react_jsx (map : json_map) =
   |> ignore;
   !default
 
+let extract_react_jsx (map : json_map) =
+  let default : Bsb_config_types.react_jsx option ref = ref None in
+  map
+  |? ( Bsb_build_schemas.react,
+       `Obj
+         (fun m ->
+           match m.?(Bsb_build_schemas.jsx_version) with
+           | Some (Flo { loc; flo }) -> (
+               match flo with
+               | "3" -> default := Some Jsx_v3
+               | "4" -> default := Some Jsx_v4
+               | _ -> Bsb_exception.errorf ~loc "Unsupported react-jsx %s" flo)
+           | Some x ->
+               Bsb_exception.config_error x
+                 "Unexpected input (expect a version number) for jsx"
+           | None -> ()) )
+  |> ignore;
+  !default
+
+let extract_react_runtime (map : json_map) =
+  let default : Bsb_config_types.react_runtime option ref = ref None in
+  map
+  |? ( Bsb_build_schemas.react,
+       `Obj
+         (fun m ->
+           match m.?(Bsb_build_schemas.react_runtime) with
+           | Some (Str { loc; str }) -> (
+               match str with
+               | "classic" -> default := Some Classic
+               | "automatic" -> default := Some Automatic
+               | _ ->
+                   Bsb_exception.errorf ~loc "Unsupported react-runtime %s" str)
+           | Some x ->
+               Bsb_exception.config_error x
+                 "Unexpected input (expect classic or automatic) for \
+                  react-runtime"
+           | None -> ()) )
+  |> ignore;
+  !default
+
 let extract_warning (map : json_map) =
   match map.?(Bsb_build_schemas.warnings) with
   | None -> Bsb_warning.use_default
@@ -293,6 +332,8 @@ 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 react_jsx = extract_react_jsx map in
+      let react_runtime = extract_react_runtime map in
       let bs_dependencies =
         extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies
       in
@@ -349,6 +390,8 @@ 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;
+            react_jsx;
+            react_runtime;
             generators = extract_generators map;
             cut_generators;
           }

jscomp/bsb/bsb_config_types.ml

@@ -28,14 +28,13 @@ type dependency = {
 }
 
 type dependencies = dependency list
-
 type reason_react_jsx = Jsx_v3
 (* string option  *)
 
+type react_jsx = Jsx_v3 | Jsx_v4
+type react_runtime = Classic | Automatic
 type gentype_config = { path : string (* resolved *) }
-
 type command = string
-
 type ppx = { name : string; args : string list }
 
 type t = {
@@ -62,6 +61,8 @@ type t = {
   files_to_install : Bsb_db.module_info Queue.t;
   generate_merlin : bool;
   reason_react_jsx : reason_react_jsx option;
+  react_jsx : react_jsx option;
+  react_runtime : react_runtime option;
   (* whether apply PPX transform or not*)
   generators : command Map_string.t;
   cut_generators : bool;

jscomp/bsb/bsb_merlin_gen.ml

@@ -23,13 +23,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 let merlin = ".merlin"
-
 let merlin_header = "####{BSB GENERATED: NO EDIT"
-
 let merlin_trailer = "####BSB GENERATED: NO EDIT}"
-
 let merlin_trailer_length = String.length merlin_trailer
-
 let ( // ) = Ext_path.combine
 
 (** [new_content] should start end finish with newline *)
@@ -75,15 +71,10 @@ let revise_merlin merlin new_content =
    merlin generation
 *)
 let merlin_flg_ppx = "\nFLG -ppx "
-
 let merlin_flg_pp = "\nFLG -pp "
-
 let merlin_s = "\nS "
-
 let merlin_b = "\nB "
-
 let merlin_flg = "\nFLG "
-
 let bs_flg_prefix = "-bs-"
 
 let output_merlin_namespace buffer ns =
@@ -128,6 +119,8 @@ let merlin_file_gen ~(per_proj_dir : string)
        built_in_dependency;
        external_includes;
        reason_react_jsx;
+       react_jsx;
+       react_runtime;
        namespace;
        package_name = _;
        warning;
@@ -149,21 +142,37 @@ let merlin_file_gen ~(per_proj_dir : string)
         Buffer.add_string buffer (merlin_flg_pp ^ x));
     Buffer.add_string buffer
       (merlin_flg_ppx
+      ^ (match (reason_react_jsx, react_jsx) with
+        | None, None ->
+            let fmt : _ format =
+              if Ext_sys.is_windows_or_cygwin then "\"%s -as-ppx \""
+              else "'%s -as-ppx '"
+            in
+            Printf.sprintf fmt Bsb_global_paths.vendor_bsc
+        | Some opt, None ->
+            let fmt : _ format =
+              if Ext_sys.is_windows_or_cygwin then "\"%s -as-ppx -bs-jsx %d\""
+              else "'%s -as-ppx -bs-jsx %d'"
+            in
+            Printf.sprintf fmt Bsb_global_paths.vendor_bsc
+              (match opt with Jsx_v3 -> 3)
+        | _, Some opt ->
+            let fmt : _ format =
+              if Ext_sys.is_windows_or_cygwin then "\"%s -as-ppx -bs-jsx %d\""
+              else "'%s -as-ppx -bs-jsx %d'"
+            in
+            Printf.sprintf fmt Bsb_global_paths.vendor_bsc
+              (match opt with Jsx_v3 -> 3 | Jsx_v4 -> 4))
       ^
-      match reason_react_jsx with
-      | None ->
-          let fmt : _ format =
-            if Ext_sys.is_windows_or_cygwin then "\"%s -as-ppx \""
-            else "'%s -as-ppx '"
-          in
-          Printf.sprintf fmt Bsb_global_paths.vendor_bsc
+      match react_runtime with
+      | None -> ""
       | Some opt ->
           let fmt : _ format =
-            if Ext_sys.is_windows_or_cygwin then "\"%s -as-ppx -bs-jsx %d\""
-            else "'%s -as-ppx -bs-jsx %d'"
+            if Ext_sys.is_windows_or_cygwin then "\"-bs-react-runtime %s\""
+            else "'-bs-react-runtime %s'"
           in
-          Printf.sprintf fmt Bsb_global_paths.vendor_bsc
-            (match opt with Jsx_v3 -> 3));
+          Printf.sprintf fmt
+            (match opt with Classic -> "classic" | Automatic -> "automatic"));
     Ext_list.iter external_includes (fun path ->
         Buffer.add_string buffer merlin_s;
         Buffer.add_string buffer path;

jscomp/bsb/bsb_ninja_gen.ml

@@ -160,6 +160,8 @@ let output_ninja_and_namespace_map ~per_proj_dir ~package_kind
        files_to_install;
        built_in_dependency;
        reason_react_jsx;
+       react_jsx;
+       react_runtime;
        generators;
        namespace;
        warning;
@@ -206,9 +208,11 @@ 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 ~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 *)
+      ~reason_react_jsx ~react_jsx ~react_runtime ~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
   in
 

jscomp/bsb/bsb_ninja_rule.ml

@@ -91,11 +91,13 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config option)
     ~(has_postbuild : string option) ~(pp_file : string option)
     ~(has_builtin : bool)
     ~(reason_react_jsx : Bsb_config_types.reason_react_jsx 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 =
+    ~(react_jsx : Bsb_config_types.react_jsx option)
+    ~(react_runtime : Bsb_config_types.react_runtime 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 =
   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
@@ -164,6 +166,14 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config option)
     (match (has_reason_react_jsx, reason_react_jsx) with
     | false, _ | _, None -> ()
     | _, Some Jsx_v3 -> Ext_buffer.add_string buf " -bs-jsx 3");
+    (match react_jsx with
+    | None -> ()
+    | Some Jsx_v3 -> Ext_buffer.add_string buf " -bs-jsx 3"
+    | Some Jsx_v4 -> Ext_buffer.add_string buf " -bs-jsx 4");
+    (match react_runtime with
+    | None -> ()
+    | Some Classic -> Ext_buffer.add_string buf " -bs-react-runtime classic"
+    | Some Automatic -> Ext_buffer.add_string buf " -bs-react-runtime automatic");
 
     Ext_buffer.add_char_string buf ' ' bsc_flags;
     Ext_buffer.add_string buf " -absname -bs-ast -o $out $i";

jscomp/bsb/bsb_ninja_rule.mli

@@ -71,6 +71,8 @@ val make_custom_rules :
   pp_file:string option ->
   has_builtin:bool ->
   reason_react_jsx:Bsb_config_types.reason_react_jsx option ->
+  react_jsx:Bsb_config_types.react_jsx option ->
+  react_runtime:Bsb_config_types.react_runtime option ->
   digest:string ->
   package_specs:Bsb_package_specs.t ->
   namespace:string option ->

jscomp/common/js_config.ml

@@ -23,79 +23,44 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
-
-
-
-
-
 (** Browser is not set via command line only for internal use *)
 
-
 let no_version_header = ref false
-
 let cross_module_inline = ref false
-
-
-
 let diagnose = ref false
-let get_diagnose () = 
+
+let get_diagnose () =
   !diagnose
-  
-# 44 "common/js_config.pp.ml"
-  || Sys.getenv_opt "RES_DEBUG_FILE" <> None
+    
+# 34 "common/js_config.pp.ml"
+    || Sys.getenv_opt "RES_DEBUG_FILE" <> None
 
-# 47 "common/js_config.pp.ml"
+# 37 "common/js_config.pp.ml"
 (* let (//) = Filename.concat *)
 
 (* let get_packages_info () = !packages_info *)
 
 let no_builtin_ppx = ref false
-
-
-
-
 let tool_name = "ReScript"
-
 let check_div_by_zero = ref true
 let get_check_div_by_zero () = !check_div_by_zero
-
-
-
 let syntax_only = ref false
 let binary_ast = ref false
-
-
-
 let debug = ref false
-
-let cmi_only = ref false  
+let cmi_only = ref false
 let cmj_only = ref false
-
 let force_cmi = ref false
 let force_cmj = ref false
-
 let jsx_version = ref (-1)
-
-
+let react_runtime = ref "classic"
 let js_stdout = ref true
-
 let all_module_aliases = ref false
-
 let no_stdlib = ref false
-
 let no_export = ref false
-
-
-
 let as_ppx = ref false
 
-
 (* option to config `@rescript/std`*)
-let customize_runtime : string option ref = ref None 
-
+let customize_runtime : string option ref = ref None
 let as_pp = ref false
-
 let self_stack : string Stack.t = Stack.create ()
-
 let modules = ref false

jscomp/common/js_config.mli

@@ -75,6 +75,8 @@ val force_cmj : bool ref
 
 val jsx_version : int ref
 
+val react_runtime: string ref
+
 val js_stdout : bool ref
 
 val all_module_aliases : bool ref