change bulid schema for bsconfig.json

mununki · mununki · commit 81029b30f20e · 2022-07-03T18:09:41.000+09:00
diff --git a/docs/docson/build-schema.json b/docs/docson/build-schema.json
@@ -350,16 +350,23 @@
                 }
             }
         },
-        "react-specs": {
+        "jsx-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."
+                "version": {
+                    "type": "number",
+                    "enum": [3, 4],
+                    "description": "Whether to apply the specific version of 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."
+                "module": {
+                    "type": "string",
+                    "enum": ["react"],
+                    "description": "JSX module, currently only support the React."
+                },
+                "mode": {
+                    "type": "string",
+                    "enum": ["classic", "automatic"],
+                    "description": "JSX transformation mode"
                 }
             }
         },
diff --git a/jscomp/bsb/bsb_build_schemas.ml b/jscomp/bsb/bsb_build_schemas.ml
@@ -90,11 +90,13 @@ let reason = "reason"
 
 let react_jsx = "react-jsx"
 
-let react = "react"
+let jsx = "jsx"
 
-let jsx_version = "jsx"
+let jsx_version = "version"
 
-let react_runtime = "runtime"
+let jsx_module = "module"
+
+let jsx_mode = "mode"
 
 let entries = "entries"
 
diff --git a/jscomp/bsb/bsb_config_parse.ml b/jscomp/bsb/bsb_config_parse.ml
@@ -145,42 +145,59 @@ 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
+let extract_jsx_version (map : json_map) =
+  let default : Bsb_config_types.jsx_version option ref = ref None in
   map
-  |? ( Bsb_build_schemas.react,
+  |? ( Bsb_build_schemas.jsx,
        `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)
+               | _ -> 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 -> ()) )
+  |> ignore;
+  !default
+
+let extract_jsx_module (map : json_map) =
+  let default : Bsb_config_types.jsx_module option ref = ref None in
+  map
+  |? ( Bsb_build_schemas.jsx,
+       `Obj
+         (fun m ->
+           match m.?(Bsb_build_schemas.jsx_module) with
+           | Some (Str { loc; str }) -> (
+               match str with
+               | "react" -> default := Some React
+               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx-module %s" str)
            | Some x ->
                Bsb_exception.config_error x
-                 "Unexpected input (expect a version number) for jsx"
+                 "Unexpected input (jsx module name) for jsx-mode"
            | None -> ()) )
   |> ignore;
   !default
 
-let extract_react_runtime (map : json_map) =
-  let default : Bsb_config_types.react_runtime option ref = ref None in
+let extract_jsx_mode (map : json_map) =
+  let default : Bsb_config_types.jsx_mode option ref = ref None in
   map
-  |? ( Bsb_build_schemas.react,
+  |? ( Bsb_build_schemas.jsx,
        `Obj
          (fun m ->
-           match m.?(Bsb_build_schemas.react_runtime) with
+           match m.?(Bsb_build_schemas.jsx_mode) 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)
+               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx-mode %s" str)
            | Some x ->
                Bsb_exception.config_error x
-                 "Unexpected input (expect classic or automatic) for \
-                  react-runtime"
+                 "Unexpected input (expect classic or automatic) for jsx-mode"
            | None -> ()) )
   |> ignore;
   !default
@@ -332,8 +349,9 @@ 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 jsx_version = extract_jsx_version map in
+      let jsx_module = extract_jsx_module map in
+      let jsx_mode = extract_jsx_mode map in
       let bs_dependencies =
         extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies
       in
@@ -390,8 +408,9 @@ 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;
+            jsx_version;
+            jsx_module;
+            jsx_mode;
             generators = extract_generators map;
             cut_generators;
           }
diff --git a/jscomp/bsb/bsb_config_types.ml b/jscomp/bsb/bsb_config_types.ml
@@ -31,8 +31,9 @@ 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 jsx_version = Jsx_v3 | Jsx_v4
+type jsx_module = React
+type jsx_mode = Classic | Automatic
 type gentype_config = { path : string (* resolved *) }
 type command = string
 type ppx = { name : string; args : string list }
@@ -61,8 +62,9 @@ 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;
+  jsx_version : jsx_version option;
+  jsx_module : jsx_module option;
+  jsx_mode : jsx_mode option;
   (* whether apply PPX transform or not*)
   generators : command Map_string.t;
   cut_generators : bool;
diff --git a/jscomp/bsb/bsb_merlin_gen.ml b/jscomp/bsb/bsb_merlin_gen.ml
@@ -119,8 +119,9 @@ let merlin_file_gen ~(per_proj_dir : string)
        built_in_dependency;
        external_includes;
        reason_react_jsx;
-       react_jsx;
-       react_runtime;
+       jsx_version;
+       jsx_module;
+       jsx_mode;
        namespace;
        package_name = _;
        warning;
@@ -142,7 +143,7 @@ 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
+      ^ (match (reason_react_jsx, jsx_version) with
         | None, None ->
             let fmt : _ format =
               if Ext_sys.is_windows_or_cygwin then "\"%s -as-ppx \""
@@ -163,13 +164,21 @@ let merlin_file_gen ~(per_proj_dir : string)
             in
             Printf.sprintf fmt Bsb_global_paths.vendor_bsc
               (match opt with Jsx_v3 -> 3 | Jsx_v4 -> 4))
+      ^ (match jsx_module with
+        | None -> ""
+        | Some opt ->
+            let fmt : _ format =
+              if Ext_sys.is_windows_or_cygwin then "\"-bs-jsx-module %s\""
+              else "'-bs-jsx-module %s'"
+            in
+            Printf.sprintf fmt (match opt with React -> "react"))
       ^
-      match react_runtime with
+      match jsx_mode with
       | None -> ""
       | Some opt ->
           let fmt : _ format =
-            if Ext_sys.is_windows_or_cygwin then "\"-bs-react-runtime %s\""
-            else "'-bs-react-runtime %s'"
+            if Ext_sys.is_windows_or_cygwin then "\"-bs-jsx-mode %s\""
+            else "'-bs-jsx-mode %s'"
           in
           Printf.sprintf fmt
             (match opt with Classic -> "classic" | Automatic -> "automatic"));
diff --git a/jscomp/bsb/bsb_ninja_gen.ml b/jscomp/bsb/bsb_ninja_gen.ml
@@ -160,8 +160,9 @@ let output_ninja_and_namespace_map ~per_proj_dir ~package_kind
        files_to_install;
        built_in_dependency;
        reason_react_jsx;
-       react_jsx;
-       react_runtime;
+       jsx_version;
+       jsx_module;
+       jsx_mode;
        generators;
        namespace;
        warning;
@@ -208,8 +209,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 ~react_jsx ~react_runtime ~package_specs ~namespace
-      ~digest ~package_name ~warnings ~ppx_files ~bsc_flags
+      ~reason_react_jsx ~jsx_version ~jsx_module ~jsx_mode ~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 *)
diff --git a/jscomp/bsb/bsb_ninja_rule.ml b/jscomp/bsb/bsb_ninja_rule.ml
@@ -91,8 +91,9 @@ 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)
-    ~(react_jsx : Bsb_config_types.react_jsx option)
-    ~(react_runtime : Bsb_config_types.react_runtime option) ~(digest : string)
+    ~(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)
@@ -163,17 +164,18 @@ let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config option)
     | None -> ()
     | Some flag ->
         Ext_buffer.add_char_string buf ' ' (Bsb_build_util.pp_flag flag));
-    (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
+    (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 jsx_module 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
+    | Some React -> Ext_buffer.add_string buf " -bs-jsx-module react");
+    (match jsx_mode with
     | None -> ()
-    | Some Classic -> Ext_buffer.add_string buf " -bs-react-runtime classic"
-    | Some Automatic -> Ext_buffer.add_string buf " -bs-react-runtime automatic");
+    | Some Classic -> Ext_buffer.add_string buf " -bs-jsx-mode classic"
+    | Some Automatic -> Ext_buffer.add_string buf " -bs-jsx-mode automatic");
 
     Ext_buffer.add_char_string buf ' ' bsc_flags;
     Ext_buffer.add_string buf " -absname -bs-ast -o $out $i";
diff --git a/jscomp/bsb/bsb_ninja_rule.mli b/jscomp/bsb/bsb_ninja_rule.mli
@@ -71,8 +71,9 @@ 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 ->
+  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 ->
diff --git a/jscomp/common/js_config.ml b/jscomp/common/js_config.ml
@@ -52,7 +52,8 @@ 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 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
diff --git a/jscomp/common/js_config.mli b/jscomp/common/js_config.mli
@@ -75,7 +75,9 @@ val force_cmj : bool ref
 
 val jsx_version : int ref
 
-val react_runtime: string ref
+val jsx_module: string ref
+
+val jsx_mode: string ref
 
 val js_stdout : bool ref
 
diff --git a/jscomp/common/js_config.pp.ml b/jscomp/common/js_config.pp.ml
@@ -50,7 +50,8 @@ 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 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
diff --git a/jscomp/frontend/ppx_driver.ml b/jscomp/frontend/ppx_driver.ml
@@ -35,9 +35,12 @@ let main impl intf =
           ( "-bs-jsx",
             Arg.Int (fun i -> Js_config.jsx_version := i),
             " Set jsx version" );
-          ( "-bs-react-runtime",
-            Arg.String (fun i -> Js_config.react_runtime := i),
-            " Set react runtime" );
+          ( "-bs-jsx-module",
+            Arg.String (fun i -> Js_config.jsx_module := i),
+            " Set jsx module" );
+          ( "-bs-jsx-mode",
+            Arg.String (fun i -> Js_config.jsx_mode := i),
+            " Set jsx mode" );
         ]
         ignore usage;
       Ppx_apply.apply_lazy ~source:a.(n - 2) ~target:a.(n - 1) impl intf)
diff --git a/jscomp/frontend/ppx_entry.ml b/jscomp/frontend/ppx_entry.ml
@@ -30,7 +30,7 @@ let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
   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.react_runtime ast
+    | 4 -> Reactjs_jsx_ppx_v4.rewrite_signature !Js_config.jsx_mode ast
     | _ -> ast
     (* react-jsx ppx relies on built-in ones like `##` *)
   in
@@ -47,8 +47,7 @@ let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
   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.react_runtime ast
+    | 4 -> Reactjs_jsx_ppx_v4.rewrite_implementation !Js_config.jsx_mode ast
     | _ -> ast
   in
   if !Js_config.no_builtin_ppx then ast
diff --git a/jscomp/main/rescript_compiler_main.ml b/jscomp/main/rescript_compiler_main.ml
@@ -279,10 +279,15 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
         Js_config.jsx_version := int_of_string i),
     "*internal* Set jsx version";
 
-    "-bs-react-runtime", string_call (fun i ->
-      (if i <> "classic" && i <> "automatic" then Bsc_args.bad_arg (" Not supported react-runtime : " ^ i));
-      Js_config.react_runtime := i),
-    "*internal* Set react runtime";
+    "-bs-jsx-module", string_call (fun i ->
+      (if i <> "react" then Bsc_args.bad_arg (" Not supported jsx-module : " ^ i));
+      Js_config.jsx_mode := 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),
+    "*internal* Set jsx mode";
 
     "-bs-package-output", string_call Js_packages_state.update_npm_package_path, 
     "*internal* Set npm-output-path: [opt_module]:path, for example: 'lib/cjs', 'amdjs:lib/amdjs', 'es6:lib/es6' ";
diff --git a/lib/4.06.1/rescript.ml b/lib/4.06.1/rescript.ml
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
