parse jsx config to variants

mununki · mununki · commit 1c10e4eda7ba · 2022-07-14T13:12:47.000+09:00
diff --git a/jscomp/common/js_config.ml b/jscomp/common/js_config.ml
@@ -25,17 +25,21 @@
 
 (** Browser is not set via command line only for internal use *)
 
+type jsx_version = Jsx_v3 | Jsx_v4 | NotSelected
+type jsx_module = React
+type jsx_mode = Classic | Automatic
+
 let no_version_header = ref false
 let cross_module_inline = ref false
 let diagnose = ref false
 
 let get_diagnose () =
   !diagnose
   
-# 34 "common/js_config.pp.ml"
+# 38 "common/js_config.pp.ml"
   || Sys.getenv_opt "RES_DEBUG_FILE" <> None
 
-# 37 "common/js_config.pp.ml"
+# 41 "common/js_config.pp.ml"
 (* let (//) = Filename.concat *)
 
 (* let get_packages_info () = !packages_info *)
@@ -51,15 +55,41 @@ 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 jsx_module = ref "react"
-let jsx_mode = ref "classic"
+let jsx_version = ref NotSelected
+let jsx_module = ref React
+let jsx_mode = 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
 
+let int_of_jsx_version = function
+| Jsx_v3 -> 3
+| Jsx_v4 -> 4
+| NotSelected -> -1
+
+let string_of_jsx_module = function
+| React -> "react"
+
+let string_of_jsx_mode = function
+| Classic -> "classic"
+| Automatic -> "automatic"
+
+let jsx_version_of_int = function
+| 3 -> Jsx_v3
+| 4 -> Jsx_v4
+| _ -> NotSelected
+
+let jsx_module_of_string = function
+| "react" -> React
+| _ -> React
+
+let jsx_mode_of_string = function
+| "classic" -> Classic
+| "automatic" -> Automatic
+| _ -> Classic
+
 (* option to config `@rescript/std`*)
 let customize_runtime : string option ref = ref None
 let as_pp = ref false
diff --git a/jscomp/common/js_config.mli b/jscomp/common/js_config.mli
@@ -22,6 +22,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
+type jsx_version = Jsx_v3 | Jsx_v4 | NotSelected
+type jsx_module = React
+type jsx_mode = Classic | Automatic
+
 (* val get_packages_info :
    unit -> Js_packages_info.t *)
 
@@ -73,11 +77,11 @@ val force_cmi : bool ref
 
 val force_cmj : bool ref
 
-val jsx_version : int ref
+val jsx_version : jsx_version ref
 
-val jsx_module: string ref
+val jsx_module: jsx_module ref
 
-val jsx_mode: string ref
+val jsx_mode: jsx_mode ref
 
 val js_stdout : bool ref
 
@@ -89,6 +93,18 @@ val no_export : bool ref
 
 val as_ppx : bool ref
 
+val int_of_jsx_version : jsx_version -> int
+
+val string_of_jsx_module : jsx_module -> string
+
+val string_of_jsx_mode : jsx_mode -> string
+
+val jsx_version_of_int : int -> jsx_version
+
+val jsx_module_of_string : string -> jsx_module
+
+val jsx_mode_of_string : string -> jsx_mode
+
 val customize_runtime : string option ref
 
 val as_pp : bool ref
diff --git a/jscomp/common/js_config.pp.ml b/jscomp/common/js_config.pp.ml
@@ -24,6 +24,10 @@
 
 (** Browser is not set via command line only for internal use *)
 
+type jsx_version = Jsx_v3 | Jsx_v4 | NotSelected
+type jsx_module = React
+type jsx_mode = Classic | Automatic
+
 let no_version_header = ref false
 let cross_module_inline = ref false
 let diagnose = ref false
@@ -49,15 +53,41 @@ 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 jsx_module = ref "react"
-let jsx_mode = ref "classic"
+let jsx_version = ref NotSelected
+let jsx_module = ref React
+let jsx_mode = 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
 
+let int_of_jsx_version = function
+| Jsx_v3 -> 3
+| Jsx_v4 -> 4
+| NotSelected -> -1
+
+let string_of_jsx_module = function
+| React -> "react"
+
+let string_of_jsx_mode = function
+| Classic -> "classic"
+| Automatic -> "automatic"
+
+let jsx_version_of_int = function
+| 3 -> Jsx_v3
+| 4 -> Jsx_v4
+| _ -> NotSelected
+
+let jsx_module_of_string = function
+| "react" -> React
+| _ -> React
+
+let jsx_mode_of_string = function
+| "classic" -> Classic
+| "automatic" -> Automatic
+| _ -> Classic
+
 (* option to config `@rescript/std`*)
 let customize_runtime : string option ref = ref None
 let as_pp = ref false
diff --git a/jscomp/frontend/ppx_driver.ml b/jscomp/frontend/ppx_driver.ml
@@ -33,13 +33,17 @@ let main impl intf =
         (Array.sub Sys.argv 0 (n - 2))
         [
           ( "-bs-jsx",
-            Arg.Int (fun i -> Js_config.jsx_version := i),
+            Arg.Int
+              (fun i -> Js_config.jsx_version := Js_config.jsx_version_of_int i),
             " Set jsx version" );
           ( "-bs-jsx-module",
-            Arg.String (fun i -> Js_config.jsx_module := i),
+            Arg.String
+              (fun i ->
+                Js_config.jsx_module := Js_config.jsx_module_of_string i),
             " Set jsx module" );
           ( "-bs-jsx-mode",
-            Arg.String (fun i -> Js_config.jsx_mode := i),
+            Arg.String
+              (fun i -> Js_config.jsx_mode := Js_config.jsx_mode_of_string i),
             " Set jsx mode" );
         ]
         ignore usage;
diff --git a/jscomp/frontend/ppx_entry.ml b/jscomp/frontend/ppx_entry.ml
@@ -28,8 +28,14 @@ let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
   Bs_ast_invariant.iter_warnings_on_sigi ast;
   Ast_config.iter_on_bs_config_sigi ast;
   let ast =
-    Reactjs_jsx_ppx.rewrite_signature ~jsxVersion:!Js_config.jsx_version
-      ~jsxModule:!Js_config.jsx_module ~jsxMode:!Js_config.jsx_mode ast
+    match !Js_config.jsx_version with
+    | NotSelected -> ast
+    | _ ->
+        let open Js_config in
+        let jsxVersion = int_of_jsx_version !jsx_version in
+        let jsxModule = string_of_jsx_module !jsx_module in
+        let jsxMode = string_of_jsx_mode !jsx_mode in
+        Reactjs_jsx_ppx.rewrite_signature ~jsxVersion ~jsxModule ~jsxMode ast
   in
   if !Js_config.no_builtin_ppx then ast
   else
@@ -42,8 +48,15 @@ let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
   Bs_ast_invariant.iter_warnings_on_stru ast;
   Ast_config.iter_on_bs_config_stru ast;
   let ast =
-    Reactjs_jsx_ppx.rewrite_implementation ~jsxVersion:!Js_config.jsx_version
-      ~jsxModule:!Js_config.jsx_module ~jsxMode:!Js_config.jsx_mode ast
+    match !Js_config.jsx_version with
+    | NotSelected -> ast
+    | _ ->
+        let open Js_config in
+        let jsxVersion = int_of_jsx_version !jsx_version in
+        let jsxModule = string_of_jsx_module !jsx_module in
+        let jsxMode = string_of_jsx_mode !jsx_mode in
+        Reactjs_jsx_ppx.rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode
+          ast
   in
   if !Js_config.no_builtin_ppx then ast
   else
diff --git a/jscomp/main/jsoo_main.ml b/jscomp/main/jsoo_main.ml
@@ -59,7 +59,7 @@ let implementation ~use_super_errors impl str : Js.Unsafe.obj =
     Lazy.force Super_main.setup);
 
   try
-    Js_config.jsx_version := 3;
+    Js_config.jsx_version := Js_config.Jsx_v3;
     (* default *)
     let ast = impl (Lexing.from_string str) in
     let ast = Ppx_entry.rewrite_implementation ast in
diff --git a/jscomp/main/jsoo_playground_main.ml b/jscomp/main/jsoo_playground_main.ml
@@ -474,7 +474,7 @@ module Compile = struct
       let env = Res_compmisc.initial_env () in (* Question ?? *)
       (* let finalenv = ref Env.empty in *)
       let types_signature = ref [] in
-      Js_config.jsx_version := 3; (* default *)
+      Js_config.jsx_version := Js_config.Jsx_v3; (* default *)
       let ast = impl (str) in
       let ast = Ppx_entry.rewrite_implementation ast in
       let typed_tree =
diff --git a/jscomp/main/rescript_compiler_main.ml b/jscomp/main/rescript_compiler_main.ml
@@ -275,18 +275,21 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "*internal* <module>  Opens the module <module> before typing";
 
     "-bs-jsx", string_call (fun i -> 
-        (if i <> "3" && i <> "4" then Bsc_args.bad_arg (" Not supported jsx version : " ^  i));
-        Js_config.jsx_version := int_of_string i),
+      (if i <> "3" && i <> "4" then Bsc_args.bad_arg (" Not supported jsx version : " ^  i));
+      let open Js_config in
+      jsx_version := jsx_version_of_int @@ int_of_string i),
     "*internal* Set jsx version";
 
     "-bs-jsx-module", string_call (fun i ->
       (if i <> "react" then Bsc_args.bad_arg (" Not supported jsx-module : " ^ i));
-      Js_config.jsx_module := i),
+      let open Js_config in
+      Js_config.jsx_module := jsx_module_of_string i),
     "*internal* Set jsx module";
 
     "-bs-jsx-mode", string_call (fun i ->
       (if i <> "classic" && i <> "automatic" then Bsc_args.bad_arg (" Not supported jsx-mode : " ^ i));
-      Js_config.jsx_mode := i),
+      let open Js_config in
+      Js_config.jsx_mode := jsx_mode_of_string i),
     "*internal* Set jsx mode";
 
     "-bs-package-output", string_call Js_packages_state.update_npm_package_path, 
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
diff --git a/lib/4.06.1/unstable/js_playground_compiler.ml b/lib/4.06.1/unstable/js_playground_compiler.ml
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
