Rename Config file.

Author: cristianoc

jscomp/gentype/EmitJs.ml

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

jscomp/gentype/EmitType.ml

@@ -1,7 +1,6 @@
 module StringMap = Map.Make (String)
 module StringSet = Set.Make (String)
-module Config = Config_
-include Config
+module Config = GenTypeConfig
 
 let logNotImplemented x =
   if !Debug.notImplemented then Log_.item "Not Implemented: %s\n" x
@@ -145,7 +144,7 @@ struct
       Some (packageName |> namespace_of_package_name)
     else None
 
-  let isGeneratedModule id ~config =
+  let isGeneratedModule id ~(config : Config.config) =
     config.bsDependencies
     |> List.exists (fun packageName ->
            packageName |> packageNameToGeneratedModuleName

jscomp/gentype/ExportModule.ml

@@ -2,7 +2,7 @@ open GenTypeCommon
 
 type t = string * string
 
-let bsCurryPath ~config = ("", Config_.getBsCurryPath ~config)
+let bsCurryPath ~config = ("", Config.getBsCurryPath ~config)
 
 let fromModule ~dir ~importExtension moduleName =
   let withNoPath =
@@ -18,7 +18,7 @@ let chopExtensionSafe s =
 
 let dump (dir, s) = NodeFilename.concat dir s
 
-let toCmt ~config ~outputFileRelative (dir, s) =
+let toCmt ~(config : Config.config) ~outputFileRelative (dir, s) =
   let open Filename in
   concat
     (outputFileRelative |> dirname)

jscomp/gentype/GenTypeCommon.ml

@@ -2,14 +2,9 @@ open GenTypeCommon
 
 type t
 
-val bsCurryPath : config:config -> t
-
+val bsCurryPath : config:Config.config -> 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 -> outputFileRelative:string -> t -> string
+val toCmt : config:Config.config -> outputFileRelative:string -> t -> string

jscomp/gentype/Config_.ml renamed to jscomp/gentype/GenTypeConfig.ml

@@ -17,7 +17,7 @@ let readBsDependenciesDirs ~root =
 
 type pkgs = { dirs : string list; pkgs : (string, string) Hashtbl.t }
 
-let readDirsFromConfig ~config =
+let readDirsFromConfig ~(config : Config.config) =
   let dirs = ref [] in
   let root = config.projectRoot in
   let ( +++ ) = Filename.concat in
@@ -51,7 +51,7 @@ let readDirsFromConfig ~config =
   | None -> ());
   !dirs
 
-let readSourceDirs ~config =
+let readSourceDirs ~(config : Config.config) =
   let sourceDirs =
     [ "lib"; "bs"; ".sourcedirs.json" ]
     |> List.fold_left ( +++ ) config.bsbProjectRoot
@@ -196,8 +196,8 @@ 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 ~importExtension ~outputFileRelative ~resolver
-    ~useBsDependencies moduleName =
+let resolveModule ~(config : Config.config) ~importExtension ~outputFileRelative
+    ~resolver ~useBsDependencies moduleName =
   let outputFileRelativeDir =
     (* e.g. src if we're generating src/File.re.js *)
     Filename.dirname outputFileRelative
@@ -264,8 +264,8 @@ let resolveGeneratedModule ~config ~outputFileRelative ~resolver moduleName =
   importPath
 
 (** Returns the path to import a given Reason module name. *)
-let importPathForReasonModuleName ~config ~outputFileRelative ~resolver
-    moduleName =
+let importPathForReasonModuleName ~(config : Config.config) ~outputFileRelative
+    ~resolver moduleName =
   if !Debug.moduleResolution then
     Log_.item "Resolve Reason Module: %s\n" (moduleName |> ModuleName.toString);
   match config.shimsMap |> ModuleNameMap.find moduleName with

jscomp/gentype/ImportPath.ml

@@ -28,7 +28,7 @@ let findNameSpace cmt =
 let getOutputFileRelative ~config cmt =
   (cmt |> handleNamespace) ^ EmitType.outputFileSuffix ~config
 
-let getOutputFile ~config cmt =
+let getOutputFile ~(config : Config.config) cmt =
   Filename.concat config.projectRoot (getOutputFileRelative ~config cmt)
 
 let getModuleName cmt =
@@ -57,7 +57,7 @@ let getCmtFile cmt =
   cmtFile
 
 let getBsConfigFile ~projectRoot =
-  let bsconfig = concat projectRoot compilerConfigFile in
+  let bsconfig = concat projectRoot Config.compilerConfigFile in
   match bsconfig |> Sys.file_exists with true -> Some bsconfig | false -> None
 
 (** Find the relative path from /.../bs/lib

jscomp/gentype/ImportPath.mli

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