Rename config type.

Author: cristianoc

jscomp/gentype/EmitType.ml

@@ -13,22 +13,22 @@ let fileHeader ~sourceFile =
     ~lines:[ "TypeScript file generated from " ^ sourceFile ^ " by genType." ]
   ^ "/* eslint-disable import/first */\n\n"
 
-let generatedFilesExtension ~(config : Config.config) =
+let generatedFilesExtension ~(config : Config.t) =
   match config.generatedFileExtension with
   | Some s ->
       (* from .foo.bar to .foo *)
       Filename.remove_extension s
   | None -> ".gen"
 
-let outputFileSuffix ~(config : Config.config) =
+let outputFileSuffix ~(config : Config.t) =
   match config.generatedFileExtension with
   | Some s when Filename.extension s <> "" (* double extension  *) -> s
   | _ -> generatedFilesExtension ~config ^ ".tsx"
 
 let generatedModuleExtension ~config = generatedFilesExtension ~config
 let shimExtension = ".shim.ts"
 
-let interfaceName ~(config: Config.config) name =
+let interfaceName ~(config: Config.t) name =
   match config.exportInterfaces with true -> "I" ^ name | false -> name
 
 let typeAny = ident ~builtin:true "any"
@@ -73,7 +73,7 @@ let isTypeReactRef ~fields =
 let isTypeFunctionComponent ~fields type_ =
   type_ |> isTypeReactElement && not (isTypeReactRef ~fields)
 
-let rec renderType ~(config: Config.config) ?(indent = None) ~typeNameIsInterface ~inFunType
+let rec renderType ~(config: Config.t) ?(indent = None) ~typeNameIsInterface ~inFunType
     type0 =
   match type0 with
   | Array (t, arrayKind) ->
@@ -280,7 +280,7 @@ let emitExportConst ~early ?(comment = "") ~config ?(docString = "") ~emitters
 let emitExportDefault ~emitters name =
   "export default " ^ name ^ ";" |> Emitters.export ~emitters
 
-let emitExportType ~(config: Config.config) ~emitters ~nameAs ~opaque ~type_ ~typeNameIsInterface
+let emitExportType ~(config: Config.t) ~emitters ~nameAs ~opaque ~type_ ~typeNameIsInterface
     ~typeVars resolvedTypeName =
   let typeParamsString = EmitText.genericsString ~typeVars in
   let isInterface = resolvedTypeName |> typeNameIsInterface in
@@ -334,7 +334,7 @@ let emitImportValueAsEarly ~emitters ~name ~nameAs importPath =
   ^ "';"
   |> Emitters.requireEarly ~emitters
 
-let emitRequire ~importedValueOrComponent ~early ~emitters ~(config: Config.config) ~moduleName
+let emitRequire ~importedValueOrComponent ~early ~emitters ~(config: Config.t) ~moduleName
     importPath =
   let commentBeforeRequire =
     match importedValueOrComponent with

jscomp/gentype/ExportModule.ml

@@ -63,7 +63,7 @@ and exportModuleItemToFields =
          let fieldForValue = {fieldForType with type_ = typeForValue} in
          {fieldForValue; fieldForType; needsConversion} :: fields)
        exportModuleItem []
-    : config:Config.config -> exportModuleItem -> fieldInfo list)
+    : config:Config.t -> exportModuleItem -> fieldInfo list)
 
 let rec extendExportModuleItem x ~converter
     ~(exportModuleItem : exportModuleItem) ~type_ ~valueName =

jscomp/gentype/GenTypeCommon.ml

@@ -144,7 +144,7 @@ struct
       Some (packageName |> namespace_of_package_name)
     else None
 
-  let isGeneratedModule id ~(config : Config.config) =
+  let isGeneratedModule id ~(config : Config.t) =
     config.bsDependencies
     |> List.exists (fun packageName ->
            packageName |> packageNameToGeneratedModuleName

jscomp/gentype/GenTypeConfig.ml

@@ -3,7 +3,7 @@ module ModuleNameMap = Map.Make (ModuleName)
 type module_ = CommonJS | ES6
 type bsVersion = int * int * int
 
-type config = {
+type t = {
   mutable bsbProjectRoot : string;
   bsDependencies : string list;
   mutable emitImportCurry : bool;
@@ -92,7 +92,8 @@ let rec findProjectRoot ~dir =
     let parent = dir |> Filename.dirname in
     if parent = dir then (
       prerr_endline
-        ("Error: cannot find project root containing " ^ compilerConfigFile ^ ".");
+        ("Error: cannot find project root containing " ^ compilerConfigFile
+       ^ ".");
       assert false)
     else findProjectRoot ~dir:parent
 

jscomp/gentype/ImportPath.ml

@@ -18,7 +18,7 @@ let chopExtensionSafe s =
 
 let dump (dir, s) = NodeFilename.concat dir s
 
-let toCmt ~(config : Config.config) ~outputFileRelative (dir, s) =
+let toCmt ~(config : Config.t) ~outputFileRelative (dir, s) =
   let open Filename in
   concat
     (outputFileRelative |> dirname)

jscomp/gentype/ImportPath.mli

@@ -2,9 +2,9 @@ open GenTypeCommon
 
 type t
 
-val bsCurryPath : config:Config.config -> t
+val bsCurryPath : config:Config.t -> t
 val dump : t -> string
 val emit : t -> string
 val fromModule : dir:string -> importExtension:string -> ModuleName.t -> t
 val fromStringUnsafe : string -> t
-val toCmt : config:Config.config -> outputFileRelative:string -> t -> string
+val toCmt : config:Config.t -> outputFileRelative:string -> t -> string

jscomp/gentype/ModuleResolver.ml

@@ -17,7 +17,7 @@ let readBsDependenciesDirs ~root =
 
 type pkgs = { dirs : string list; pkgs : (string, string) Hashtbl.t }
 
-let readDirsFromConfig ~(config : Config.config) =
+let readDirsFromConfig ~(config : Config.t) =
   let dirs = ref [] in
   let root = config.projectRoot in
   let ( +++ ) = Filename.concat in
@@ -51,7 +51,7 @@ let readDirsFromConfig ~(config : Config.config) =
   | None -> ());
   !dirs
 
-let readSourceDirs ~(config : Config.config) =
+let readSourceDirs ~(config : Config.t) =
   let sourceDirs =
     [ "lib"; "bs"; ".sourcedirs.json" ]
     |> List.fold_left ( +++ ) config.bsbProjectRoot
@@ -196,7 +196,7 @@ let apply ~resolver ~useBsDependencies moduleName =
 
 (** Resolve a reference to ModuleName, and produce a path suitable for require.
    E.g. require "../foo/bar/ModuleName.ext" where ext is ".re" or ".js". *)
-let resolveModule ~(config : Config.config) ~importExtension ~outputFileRelative
+let resolveModule ~(config : Config.t) ~importExtension ~outputFileRelative
     ~resolver ~useBsDependencies moduleName =
   let outputFileRelativeDir =
     (* e.g. src if we're generating src/File.re.js *)
@@ -264,7 +264,7 @@ let resolveGeneratedModule ~config ~outputFileRelative ~resolver moduleName =
   importPath
 
 (** Returns the path to import a given Reason module name. *)
-let importPathForReasonModuleName ~(config : Config.config) ~outputFileRelative
+let importPathForReasonModuleName ~(config : Config.t) ~outputFileRelative
     ~resolver moduleName =
   if !Debug.moduleResolution then
     Log_.item "Resolve Reason Module: %s\n" (moduleName |> ModuleName.toString);

jscomp/gentype/Paths.ml

@@ -28,7 +28,7 @@ let findNameSpace cmt =
 let getOutputFileRelative ~config cmt =
   (cmt |> handleNamespace) ^ EmitType.outputFileSuffix ~config
 
-let getOutputFile ~(config : Config.config) cmt =
+let getOutputFile ~(config : Config.t) cmt =
   Filename.concat config.projectRoot (getOutputFileRelative ~config cmt)
 
 let getModuleName cmt =

jscomp/gentype/Runtime.mli

@@ -14,7 +14,7 @@ val checkMutableObjectField : previousName:string -> name:string -> bool
 
 val default : string
 
-val emitModuleAccessPath : config:Config.config -> moduleAccessPath -> string
+val emitModuleAccessPath : config:Config.t -> moduleAccessPath -> string
 
 val emitJSVariantGetLabel : polymorphic:bool -> string -> string
 

jscomp/gentype/TypeEnv.mli

@@ -5,7 +5,7 @@ type t
 val addModuleEquation : dep:dep -> internal:bool -> t -> unit
 val addModulePath : typeEnv:t -> string -> ResolvedName.t
 val addTypeEquations : typeEquations:(Longident.t * type_) list -> t -> t
-val applyTypeEquations : config:Config.config -> path:Path.t -> t -> type_ option
+val applyTypeEquations : config:Config.t -> path:Path.t -> t -> type_ option
 val expandAliasToExternalModule : name:string -> t -> dep option
 val getModuleEquations : t -> ResolvedName.eq list
 val getModuleAccessPath : name:string -> t -> Runtime.moduleAccessPath