wip: add Config.fs

tehraninasab · Aug 3, 2023 · ac9324e · ac9324e
1 parent 0db7884
commit ac9324e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/scripts/styleApply.fsx b/scripts/styleApply.fsx
@@ -11,8 +11,8 @@ open FileConventions
 
 let rootDir = Path.Combine(__SOURCE_DIRECTORY__, "..") |> DirectoryInfo
 
-StyleFSharpFiles rootDir fantomlessToolVersion
-StyleTypeScriptFiles prettierVersion
-StyleYmlFiles prettierVersion
+StyleFSharpFiles rootDir
+StyleTypeScriptFiles()
+StyleYmlFiles()
 StyleCSharpFiles rootDir
-StyleXamlFiles prettierVersion pluginXmlVersion
+StyleXamlFiles()
diff --git a/scripts/styleCheck.fsx b/scripts/styleCheck.fsx
@@ -63,7 +63,7 @@ let CheckStyleOfFSharpFiles(rootDir: DirectoryInfo) : bool =
 
     let success =
         if ContainsFiles rootDir "*.fs" || ContainsFiles rootDir ".fsx" then
-            StyleFSharpFiles rootDir fantomlessToolVersion
+            StyleFSharpFiles rootDir
             let processResult = GitDiff()
             UnwrapProcessResult suggestion true processResult |> ignore
             IsProcessSuccessful processResult
@@ -85,7 +85,7 @@ let CheckStyleOfTypeScriptFiles(rootDir: DirectoryInfo) : bool =
 
     let success =
         if ContainsFiles rootDir "*.ts" then
-            StyleTypeScriptFiles prettierVersion
+            StyleTypeScriptFiles()
             let processResult = GitDiff()
             UnwrapProcessResult suggestion true processResult |> ignore
             IsProcessSuccessful processResult
@@ -107,7 +107,7 @@ let CheckStyleOfYmlFiles(rootDir: DirectoryInfo) : bool =
 
     let success =
         if ContainsFiles rootDir "*.yml" then
-            StyleYmlFiles prettierVersion
+            StyleYmlFiles()
             let processResult = GitDiff()
             UnwrapProcessResult suggestion true processResult |> ignore
             IsProcessSuccessful processResult
@@ -149,7 +149,7 @@ let CheckStyleOfXamlFiles(rootDir: DirectoryInfo) : bool =
 
     let success =
         if ContainsFiles rootDir "*.xaml" then
-            StyleXamlFiles prettierVersion pluginXmlVersion
+            StyleXamlFiles()
             let processResult = GitDiff()
             UnwrapProcessResult suggestion true processResult |> ignore
             IsProcessSuccessful processResult

diff --git a/src/FileConventions/Config.fs b/src/FileConventions/Config.fs
@@ -0,0 +1,6 @@
+
+module Config
+
+let fantomlessToolVersion = "4.7.997-prerelease"
+let prettierVersion = "2.8.3"
+let pluginXmlVersion = "v2.2.0"
diff --git a/src/FileConventions/FileConventions.fsproj b/src/FileConventions/FileConventions.fsproj
@@ -10,6 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="Config.fs" />
     <Compile Include="Helpers.fs" />
     <Compile Include="Library.fs" />
   </ItemGroup>

diff --git a/src/FileConventions/Library.fs b/src/FileConventions/Library.fs
@@ -9,6 +9,7 @@ open Fsdk
 open Fsdk.Process
 
 open Helpers
+open Config
 
 let HasCorrectShebang(fileInfo: FileInfo) =
     let fileText = File.ReadLines fileInfo.FullName
@@ -385,7 +386,7 @@ let NonVerboseFlags(fileInfo: FileInfo) =
     numInvalidFlags > 0
 
 
-let StyleFSharpFiles (rootDir: DirectoryInfo) (fantomlessToolVersion: string) =
+let StyleFSharpFiles (rootDir: DirectoryInfo) =
     InstallFantomlessTool fantomlessToolVersion
 
     Process
@@ -411,7 +412,7 @@ let StyleCSharpFiles(rootDir: DirectoryInfo) =
         .UnwrapDefault()
     |> ignore
 
-let StyleXamlFiles (prettierVersion: string) (pluginXmlVersion: string) =
+let StyleXamlFiles () =
     InstallPrettier prettierVersion
     InstallPrettierPluginXml pluginXmlVersion
 
@@ -448,15 +449,15 @@ let StyleXamlFiles (prettierVersion: string) (pluginXmlVersion: string) =
         .UnwrapDefault()
     |> ignore
 
-let StyleTypeScriptFiles(prettierVersion: string) =
+let StyleTypeScriptFiles() =
     InstallPrettier prettierVersion
 
     let pattern =
         $"{Directory.GetCurrentDirectory()}{Path.DirectorySeparatorChar}**{Path.DirectorySeparatorChar}*.ts"
 
     RunPrettier $"--quote-props=consistent --write {pattern}"
 
-let StyleYmlFiles(prettierVersion: string) =
+let StyleYmlFiles() =
     InstallPrettier prettierVersion
 
     let pattern =