generalize more

Author: zth

jscomp/bsc/rescript_compiler_main.ml

@@ -251,7 +251,6 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "*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 := Js_config.jsx_module_of_string i),
     "*internal* Set jsx module";
 

jscomp/syntax/src/jsx_common.ml

@@ -6,21 +6,26 @@ type jsxConfig = {
   mutable module_: string;
   mutable mode: string;
   mutable nestedModules: string list;
-  mutable hasReactComponent: bool;
+  mutable hasComponent: bool;
 }
 
+let mkModuleAccessName config = String.capitalize_ascii config.module_
+
+let mkJsxComponentName config =
+  String.lowercase_ascii config.module_ ^ ".component"
+
 (* Helper method to look up the [@react.component] attribute *)
-let hasAttr (loc, _) = loc.txt = "react.component"
+let hasAttr ~config (loc, _) = loc.txt = mkJsxComponentName config
 
 (* Iterate over the attributes and try to find the [@react.component] attribute *)
-let hasAttrOnBinding {pvb_attributes} =
-  List.find_opt hasAttr pvb_attributes <> None
+let hasAttrOnBinding ~config {pvb_attributes} =
+  List.find_opt (hasAttr ~config) pvb_attributes <> None
 
-let coreTypeOfAttrs attributes =
+let coreTypeOfAttrs ~config attributes =
   List.find_map
     (fun ({txt}, payload) ->
       match (txt, payload) with
-      | "react.component", PTyp coreType -> Some coreType
+      | txt, PTyp coreType when txt = mkJsxComponentName config -> Some coreType
       | _ -> None)
     attributes
 
@@ -37,7 +42,7 @@ let typVarsOfCoreType {ptyp_desc} =
 
 let raiseError ~loc msg = Location.raise_errorf ~loc msg
 
-let raiseErrorMultipleReactComponent ~loc =
+let raiseErrorMultipleComponent ~loc =
   raiseError ~loc
     "Only one component definition is allowed for each module. Move to a \
      submodule or other file if necessary."

jscomp/syntax/src/jsx_ppx.ml

@@ -51,7 +51,7 @@ let updateConfig config payload =
   (match getInt ~key:"version" fields with
   | None -> ()
   | Some i -> config.Jsx_common.version <- i);
-  (match getString ~key:"module" fields with
+  (match getString ~key:"module_" fields with
   | None -> ()
   | Some s -> config.module_ <- s);
   match getString ~key:"mode" fields with
@@ -89,18 +89,18 @@ let getMapper ~config =
       version = config.version;
       module_ = config.module_;
       mode = config.mode;
-      hasReactComponent = config.hasReactComponent;
+      hasComponent = config.hasComponent;
     }
   in
   let restoreConfig oldConfig =
     config.version <- oldConfig.Jsx_common.version;
     config.module_ <- oldConfig.module_;
     config.mode <- oldConfig.mode;
-    config.hasReactComponent <- oldConfig.hasReactComponent
+    config.hasComponent <- oldConfig.hasComponent
   in
   let signature mapper items =
     let oldConfig = saveConfig () in
-    config.hasReactComponent <- false;
+    config.hasComponent <- false;
     let result =
       List.map
         (fun item ->
@@ -119,7 +119,7 @@ let getMapper ~config =
   in
   let structure mapper items =
     let oldConfig = saveConfig () in
-    config.hasReactComponent <- false;
+    config.hasComponent <- false;
     let result =
       List.map
         (fun item ->
@@ -147,7 +147,7 @@ let rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode
       module_ = jsxModule;
       mode = jsxMode;
       nestedModules = [];
-      hasReactComponent = false;
+      hasComponent = false;
     }
   in
   let mapper = getMapper ~config in
@@ -161,7 +161,7 @@ let rewrite_signature ~jsxVersion ~jsxModule ~jsxMode
       module_ = jsxModule;
       mode = jsxMode;
       nestedModules = [];
-      hasReactComponent = false;
+      hasComponent = false;
     }
   in
   let mapper = getMapper ~config in