refactor: rename config_error to manifest_error

Author: cometkim

jscomp/bsb/bsb_build_schemas.ml

@@ -75,9 +75,13 @@ let warnings = "warnings"
 let number = "number"
 let error = "error"
 let suffix = "suffix"
-let gentypeconfig = "gentypeconfig"
-let language = "language"
+let gentype = "gentypeconfig"
+let gentype_language = "language"
+let gentype_module = "module"
+let gentype_module_resolution = "moduleResolution"
+let gentype_export_interfaces = "exportInterfaces"
+let gentype_generated_file_extension = "moduleResolution"
 let path = "path"
 let ignored_dirs = "ignored-dirs"
 
-let uncurried = "uncurried"
+let uncurried = "uncurried"

jscomp/bsb/bsb_build_util.ml

@@ -151,7 +151,7 @@ let extract_pinned_dependencies (map : Ext_json_types.t Map_string.t) : Set_stri
   | None -> Set_string.empty
   | Some (Arr { content }) ->
       Set_string.of_list (get_list_string content)
-  | Some config -> Bsb_exception.config_error config "expect an array of string"
+  | Some manifest -> Bsb_exception.manifest_error manifest "expect an array of string"
 
 let rec walk_all_deps_aux (visited : string Hash_string.t) (paths : string list)
     ~(top : top) (dir : string) (queue : _ Queue.t) ~pinned_dependencies =

jscomp/bsb/bsb_config_interpret.ml

@@ -44,11 +44,11 @@ let extract_package_name_and_namespace (map : json_map) : string * string option
     =
   let package_name =
     match map.?(Bsb_build_schemas.name) with
-    | Some (Str { str = "_" } as config) ->
-        Bsb_exception.config_error config "_ is a reserved package name"
+    | Some (Str { str = "_" } as manifest) ->
+        Bsb_exception.manifest_error manifest "_ is a reserved package name"
     | Some (Str { str = name }) -> name
-    | Some config ->
-        Bsb_exception.config_error config "name expect a string field"
+    | Some manifest ->
+        Bsb_exception.manifest_error manifest "name expect a string field"
     | None -> Bsb_exception.invalid_spec "field name is required"
   in
   let namespace =
@@ -59,8 +59,8 @@ let extract_package_name_and_namespace (map : json_map) : string * string option
     | Some (Str { str }) ->
         (*TODO : check the validity of namespace *)
         Some (Ext_namespace.namespace_of_package_name str)
-    | Some x ->
-        Bsb_exception.config_error x "namespace field expects string or boolean"
+    | Some manifest ->
+        Bsb_exception.manifest_error manifest "namespace field expects string or boolean"
   in
   (package_name, namespace)
 
@@ -89,33 +89,33 @@ let check_stdlib (map : json_map) : bool =
   | None | Some _ -> true
 
 let extract_gentype_config (map : json_map) : Bsb_config_types.gentype_config =
-  match map.?(Bsb_build_schemas.gentypeconfig) with
+  match map.?(Bsb_build_schemas.gentype) with
   | None -> false
   | Some (Obj _) -> true
-  | Some config ->
-      Bsb_exception.config_error config "gentypeconfig expect an object"
+  | Some manifest ->
+      Bsb_exception.manifest_error manifest "gentypeconfig expect an object"
 
 let extract_uncurried (map : json_map) : bool =
   match map.?(Bsb_build_schemas.uncurried) with
   | None -> true
   | Some (True _) -> true
   | Some (False _) -> false
-  | Some config ->
-      Bsb_exception.config_error config "uncurried expects one of: true, false."
+  | Some manifest ->
+      Bsb_exception.manifest_error manifest "uncurried expects one of: true, false."
 
 let extract_string (map : json_map) (field : string) cb =
   match map.?(field) with
   | None -> None
   | Some (Str { str }) -> cb str
-  | Some config -> Bsb_exception.config_error config (field ^ " expect a string")
+  | Some manifest -> Bsb_exception.manifest_error manifest (field ^ " expect a string")
 
 let extract_boolean (map : json_map) (field : string) (default : bool) : bool =
   match map.?(field) with
   | None -> default
   | Some (True _) -> true
   | Some (False _) -> false
-  | Some config ->
-      Bsb_exception.config_error config (field ^ " expect a boolean")
+  | Some manifest ->
+      Bsb_exception.manifest_error manifest (field ^ " expect a boolean")
 
 let extract_reason_react_jsx (map : json_map) =
   let default : Bsb_config_types.reason_react_jsx option ref = ref None in
@@ -130,7 +130,7 @@ let extract_reason_react_jsx (map : json_map) =
                | _ -> Bsb_exception.errorf ~loc "Unsupported jsx version %s" flo
                )
            | Some x ->
-               Bsb_exception.config_error x
+               Bsb_exception.manifest_error x
                  "Unexpected input (expect a version number) for jsx, note \
                   boolean is no longer allowed"
            | None -> ()) )
@@ -141,14 +141,14 @@ let extract_warning (map : json_map) =
   match map.?(Bsb_build_schemas.warnings) with
   | None -> Bsb_warning.use_default
   | Some (Obj { map }) -> Bsb_warning.from_map map
-  | Some config -> Bsb_exception.config_error config "expect an object"
+  | Some manifest -> Bsb_exception.manifest_error manifest "expect an object"
 
 let extract_ignored_dirs (map : json_map) : Set_string.t =
   match map.?(Bsb_build_schemas.ignored_dirs) with
   | None -> Set_string.empty
   | Some (Arr { content }) ->
       Set_string.of_list (Bsb_build_util.get_list_string content)
-  | Some config -> Bsb_exception.config_error config "expect an array of string"
+  | Some manifest -> Bsb_exception.manifest_error manifest "expect an array of string"
 
 let extract_generators (map : json_map) =
   let generators = ref Map_string.empty in
@@ -169,8 +169,8 @@ let extract_generators (map : json_map) =
                       {| generators exepect format like { "name" : "cppo",  "command"  : "cppo $in -o $out"} |}
                 )
             | _ -> acc)
-  | Some config ->
-      Bsb_exception.config_error config
+  | Some manifest ->
+      Bsb_exception.manifest_error manifest
         (Bsb_build_schemas.generators ^ " expect an array field"));
   !generators
 
@@ -181,14 +181,14 @@ let extract_dependencies (map : json_map) cwd (field : string) :
   | Some (Arr { content = s }) ->
       Ext_list.map (Bsb_build_util.get_list_string s) (fun s ->
           resolve_package cwd (Bsb_pkg_types.string_as_package s))
-  | Some config -> Bsb_exception.config_error config (field ^ " expect an array")
+  | Some manifest -> Bsb_exception.manifest_error manifest (field ^ " expect an array")
 
 (* return an empty array if not found *)
 let extract_string_list (map : json_map) (field : string) : string list =
   match map.?(field) with
   | None -> []
   | Some (Arr { content = s }) -> Bsb_build_util.get_list_string s
-  | Some config -> Bsb_exception.config_error config (field ^ " expect an array")
+  | Some manifest -> Bsb_exception.manifest_error manifest (field ^ " expect an array")
 
 let extract_ppx (map : json_map) (field : string) ~(cwd : string) :
     Bsb_config_types.ppx list =
@@ -209,12 +209,12 @@ let extract_ppx (map : json_map) (field : string) ~(cwd : string) :
           | Arr { content } -> (
               let xs = Bsb_build_util.get_list_string content in
               match xs with
-              | [] -> Bsb_exception.config_error x " empty array is not allowed"
+              | [] -> Bsb_exception.manifest_error x " empty array is not allowed"
               | name :: args -> { Bsb_config_types.name = resolve name; args })
-          | config ->
-              Bsb_exception.config_error config
+          | manifest ->
+              Bsb_exception.manifest_error manifest
                 (field ^ "expect each item to be either string or array"))
-  | Some config -> Bsb_exception.config_error config (field ^ " expect an array")
+  | Some manifest -> Bsb_exception.manifest_error manifest (field ^ " expect an array")
 
 let extract_js_post_build (map : json_map) cwd : string option =
   let js_post_build_cmd = ref None in

jscomp/bsb/bsb_exception.ml

@@ -24,7 +24,7 @@
 
 type error =
   | Package_not_found of Bsb_pkg_types.t * string option (* json file *)
-  | Json_config of Ext_position.t * string
+  | Json_manifest of Ext_position.t * string
   | Invalid_json of string
   | Invalid_spec of string
   | Conflict_module of string * string * string
@@ -68,7 +68,7 @@ let print (fmt : Format.formatter) (x : error) =
            @{<error>Error:@} package @{<error>%s@} not found or built %s\n\
            - Did you install it?\n\
            - If you did, did you run `rescript build -with-deps`?" name in_json
-  | Json_config (pos, s) ->
+  | Json_manifest (pos, s) ->
       Format.fprintf fmt
         "File %S, line %d:\n\
          @{<error>Error:@} %s \n\
@@ -89,12 +89,12 @@ let no_implementation modname = error (No_implementation modname)
 let not_consistent modname = error (Not_consistent modname)
 
 let errorf ~loc fmt =
-  Format.ksprintf (fun s -> error (Json_config (loc, s))) fmt
+  Format.ksprintf (fun s -> error (Json_manifest (loc, s))) fmt
 
-let config_error config fmt =
-  let loc = Ext_json.loc_of config in
+let manifest_error manifest fmt =
+  let loc = Ext_json.loc_of manifest in
 
-  error (Json_config (loc, fmt))
+  error (Json_manifest (loc, fmt))
 
 let invalid_spec s = error (Invalid_spec s)
 

jscomp/bsb/bsb_exception.mli

@@ -37,7 +37,7 @@ val conflict_module : string -> string -> string -> exn
 
 val errorf : loc:Ext_position.t -> ('a, unit, string, 'b) format4 -> 'a
 
-val config_error : Ext_json_types.t -> string -> 'a
+val manifest_error : Ext_json_types.t -> string -> 'a
 
 val invalid_spec : string -> 'a
 

jscomp/bsb/bsb_jsx.ml

@@ -48,7 +48,7 @@ let from_map map =
                | _ -> Bsb_exception.errorf ~loc "Unsupported jsx version %s" flo
                )
            | Some x ->
-               Bsb_exception.config_error x
+               Bsb_exception.manifest_error x
                  "Unexpected input (expect a version number) for jsx version"
            | None -> ()) )
   |? ( Bsb_build_schemas.jsx,
@@ -60,7 +60,7 @@ let from_map map =
                | "react" -> module_ := Some React
                | _ -> Bsb_exception.errorf ~loc "Unsupported jsx module %s" str)
            | Some x ->
-               Bsb_exception.config_error x
+               Bsb_exception.manifest_error x
                  "Unexpected input (jsx module name) for jsx module"
            | None -> ()) )
   |? ( Bsb_build_schemas.jsx,
@@ -73,7 +73,7 @@ let from_map map =
                | "automatic" -> mode := Some Automatic
                | _ -> Bsb_exception.errorf ~loc "Unsupported jsx mode %s" str)
            | Some x ->
-               Bsb_exception.config_error x
+               Bsb_exception.manifest_error x
                  "Unexpected input (expect classic or automatic) for jsx mode"
            | None -> ()) )
   |? ( Bsb_build_schemas.jsx,
@@ -83,7 +83,7 @@ let from_map map =
            | Some (Arr { content }) ->
             v3_dependencies := get_list_string content
            | Some x ->
-               Bsb_exception.config_error x
+               Bsb_exception.manifest_error x
                  "Unexpected input for jsx v3-dependencies"
            | None -> ()) )
   |> ignore;