Internalize GetFableModulesFromDir & GetFableModulesFromProject

src/Fable.Compiler/ProjectCracker.fs

@@ -84,11 +84,47 @@ type CacheInfo =
         | None -> true
         | Some other -> this.GetTimestamp() > other.GetTimestamp()
 
+/// Combine the `baseDir` with `fable_modules`
+let getFableModulesFromDir (baseDir: string) : string =
+    IO.Path.Combine(baseDir, Naming.fableModules) |> Path.normalizePath
+
+let getFableModulesFromProject
+    (
+        projDir: string,
+        outDir: string option,
+        noCache: bool,
+        evaluateOnly: bool
+    )
+    : string
+    =
+    let fableModulesDir =
+        outDir
+        |> Option.defaultWith (fun () -> projDir)
+        |> getFableModulesFromDir
+
+    // If we are only evaluating the project, we don't want to delete the fable_modules folder
+    // in theory we should not have to create it either, but it seems harmless
+    // to let the check for empty folder
+    if not evaluateOnly then
+        if noCache then
+            if IO.Directory.Exists(fableModulesDir) then
+                IO.Directory.Delete(fableModulesDir, recursive = true)
+
+    if File.isDirectoryEmpty fableModulesDir then
+        IO.Directory.CreateDirectory(fableModulesDir) |> ignore
+
+        IO.File.WriteAllText(
+            IO.Path.Combine(fableModulesDir, ".gitignore"),
+            "**/*"
+        )
+
+    fableModulesDir
+
 type CrackerOptions(cliArgs: CliArgs, evaluateOnly: bool) =
     let projDir = IO.Path.GetDirectoryName cliArgs.ProjectFile
 
     let fableModulesDir =
-        CrackerOptions.GetFableModulesFromProject(
+        getFableModulesFromProject (
             projDir,
             cliArgs.OutDir,
             cliArgs.NoCache,
@@ -147,38 +183,6 @@ type CrackerOptions(cliArgs: CliArgs, evaluateOnly: bool) =
     static member GetFableModulesFromDir(baseDir: string) : string =
         IO.Path.Combine(baseDir, Naming.fableModules) |> Path.normalizePath
 
-    static member GetFableModulesFromProject
-        (
-            projDir: string,
-            outDir: string option,
-            noCache: bool,
-            evaluateOnly: bool
-        )
-        : string
-        =
-        let fableModulesDir =
-            outDir
-            |> Option.defaultWith (fun () -> projDir)
-            |> CrackerOptions.GetFableModulesFromDir
-
-        // If we are only evaluating the project, we don't want to delete the fable_modules folder
-        // in theory we should not have to create it either, but it seems harmless
-        // to let the check for empty folder
-        if not evaluateOnly then
-            if noCache then
-                if IO.Directory.Exists(fableModulesDir) then
-                    IO.Directory.Delete(fableModulesDir, recursive = true)
-
-        if File.isDirectoryEmpty fableModulesDir then
-            IO.Directory.CreateDirectory(fableModulesDir) |> ignore
-
-            IO.File.WriteAllText(
-                IO.Path.Combine(fableModulesDir, ".gitignore"),
-                "**/*"
-            )
-
-        fableModulesDir
-
     member _.ResetFableModulesDir() =
         if IO.Directory.Exists(fableModulesDir) then
             IO.Directory.Delete(fableModulesDir, recursive = true)
@@ -911,8 +915,7 @@ let loadPrecompiledInfo (opts: CrackerOptions) otherOptions sourceFiles =
     | Some precompiledLib ->
         // Load PrecompiledInfo
         let info =
-            CrackerOptions.GetFableModulesFromDir(precompiledLib)
-            |> PrecompiledInfoImpl.Load
+            getFableModulesFromDir precompiledLib |> PrecompiledInfoImpl.Load
 
         // Check if precompiled compiler version and options match
         if info.CompilerVersion <> Literals.VERSION then

src/Fable.Compiler/ProjectCracker.fsi

@@ -43,14 +43,6 @@ type CrackerOptions =
     member SourceMapsRoot: string option
     member EvaluateOnly: bool
     member BuildDll: normalizedDllPath: string -> unit
-    static member GetFableModulesFromDir: baseDir: string -> string
-
-    static member GetFableModulesFromProject:
-        projDir: string *
-        outDir: string option *
-        noCache: bool *
-        evaluateOnly: bool ->
-            string
 
 type CrackerResponse =
     {