clean up unused pattern, sync jsx ppx interface

Author: mununki

jscomp/bsb/bsb_ninja_rule.ml

@@ -145,7 +145,7 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
         Ext_buffer.add_string buf " $out_last");
     Ext_buffer.contents buf
   in
-  let mk_ast ~has_reason_react_jsx : string =
+  let mk_ast =
     Ext_buffer.clear buf;
     Ext_buffer.add_string buf bsc;
     Ext_buffer.add_char_string buf ' ' warnings;
@@ -163,11 +163,11 @@ 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 (has_reason_react_jsx, 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"
-    | _ -> ());
+    (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
     | None -> ()
     | Some React -> Ext_buffer.add_string buf " -bs-jsx-module react");
@@ -180,10 +180,8 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     Ext_buffer.add_string buf " -absname -bs-ast -o $out $i";
     Ext_buffer.contents buf
   in
-  let build_ast = define ~command:(mk_ast ~has_reason_react_jsx:false) "ast" in
-  let build_ast_from_re =
-    define ~command:(mk_ast ~has_reason_react_jsx:true) "astj"
-  in
+  let build_ast = define ~command:mk_ast "ast" in
+  let build_ast_from_re = define ~command:mk_ast "astj" in
 
   let copy_resources =
     define

jscomp/frontend/ppx_entry.ml

@@ -28,11 +28,8 @@ 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 =
-    match !Js_config.jsx_version with
-    | 3 -> Reactjs_jsx_ppx_v3.rewrite_signature ast
-    | 4 -> Reactjs_jsx_ppx_v4.rewrite_signature !Js_config.jsx_mode ast
-    | _ -> ast
-    (* react-jsx ppx relies on built-in ones like `##` *)
+    Reactjs_jsx_ppx.rewrite_signature ~jsxVersion:!Js_config.jsx_version
+      ~jsxModule:!Js_config.jsx_module ~jsxMode:!Js_config.jsx_mode ast
   in
   if !Js_config.no_builtin_ppx then ast
   else
@@ -45,10 +42,8 @@ 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 =
-    match !Js_config.jsx_version with
-    | 3 -> Reactjs_jsx_ppx_v3.rewrite_implementation ast
-    | 4 -> Reactjs_jsx_ppx_v4.rewrite_implementation !Js_config.jsx_mode ast
-    | _ -> ast
+    Reactjs_jsx_ppx.rewrite_implementation ~jsxVersion:!Js_config.jsx_version
+      ~jsxModule:!Js_config.jsx_module ~jsxMode:!Js_config.jsx_mode ast
   in
   if !Js_config.no_builtin_ppx then ast
   else

lib/4.06.1/rescript.ml

@@ -11748,7 +11748,7 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
         Ext_buffer.add_string buf " $out_last");
     Ext_buffer.contents buf
   in
-  let mk_ast ~has_reason_react_jsx : string =
+  let mk_ast =
     Ext_buffer.clear buf;
     Ext_buffer.add_string buf bsc;
     Ext_buffer.add_char_string buf ' ' warnings;
@@ -11766,11 +11766,11 @@ 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 (has_reason_react_jsx, 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"
-    | _ -> ());
+    (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
     | None -> ()
     | Some React -> Ext_buffer.add_string buf " -bs-jsx-module react");
@@ -11783,10 +11783,8 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
     Ext_buffer.add_string buf " -absname -bs-ast -o $out $i";
     Ext_buffer.contents buf
   in
-  let build_ast = define ~command:(mk_ast ~has_reason_react_jsx:false) "ast" in
-  let build_ast_from_re =
-    define ~command:(mk_ast ~has_reason_react_jsx:true) "astj"
-  in
+  let build_ast = define ~command:mk_ast "ast" in
+  let build_ast_from_re = define ~command:mk_ast "astj" in
 
   let copy_resources =
     define