Serialize compiler_info as json

fable-compiler · Sep 27, 2021 · aaf9d03 · aaf9d03
1 parent 0715db7
commit aaf9d03
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 35 deletions.
diff --git a/src/Fable.AST/Plugins.fs b/src/Fable.AST/Plugins.fs
@@ -14,15 +14,17 @@ type Language =
     | TypeScript
 
 type CompilerOptions =
-      abstract TypedArrays: bool
-      abstract ClampByteArrays: bool
-      abstract Language: Language
-      abstract Define: string list
-      abstract DebugMode: bool
-      abstract OptimizeFSharpAst: bool
-      abstract RootModule: bool
-      abstract Verbosity: Verbosity
-      abstract FileExtension: string
+    {
+        TypedArrays: bool
+        ClampByteArrays: bool
+        Language: Language
+        Define: string list
+        DebugMode: bool
+        OptimizeFSharpAst: bool
+        RootModule: bool
+        Verbosity: Verbosity
+        FileExtension: string
+    }
 
 type PluginHelper =
     abstract LibraryDir: string

diff --git a/src/Fable.Cli/Fable.Cli.fsproj b/src/Fable.Cli/Fable.Cli.fsproj
@@ -43,6 +43,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Dotnet.ProjInfo" Version="0.44.0" />
+    <PackageReference Include="FSharp.SystemTextJson" Version="0.17.4" />
     <PackageReference Include="source-map-sharp" Version="1.0.7" />
     <PackageReference Include="FSharp.Core" Version="5.0.1" />
   </ItemGroup>

diff --git a/src/Fable.Cli/ProjectCracker.fs b/src/Fable.Cli/ProjectCracker.fs
@@ -4,6 +4,7 @@ module Fable.Cli.ProjectCracker
 
 open System
 open System.Xml.Linq
+open System.Text.Json
 open System.Collections.Generic
 open FSharp.Compiler.CodeAnalysis
 open Fable
@@ -425,26 +426,18 @@ let createFableDir (opts: CrackerOptions) =
         let baseDir = opts.OutDir |> Option.defaultWith (fun () -> IO.Path.GetDirectoryName(opts.ProjFile))
         IO.Path.Combine(baseDir, Naming.fableHiddenDir)
 
-    let compilerInfo = IO.Path.Combine(fableDir, "compiler_info.txt")
-    let newInfo =
-        Map [
-            "version", Literals.VERSION
-            "define", opts.FableOptions.Define |> List.sort |> String.concat ","
-            "debug", opts.FableOptions.DebugMode.ToString()
-            "typedArrays", opts.FableOptions.TypedArrays.ToString()
-            "clampByteArrays", opts.FableOptions.ClampByteArrays.ToString()
-            "optimize", opts.FableOptions.OptimizeFSharpAst.ToString()
-        ]
+    let jsonOptions = JsonSerializerOptions()
+    jsonOptions.Converters.Add(Serialization.JsonFSharpConverter())
+    let compilerInfoPath = IO.Path.Combine(fableDir, "compiler_info.txt")
+    let newInfo = {| version = Literals.VERSION; options = opts.FableOptions |}
 
     let isEmptyOrOutdated =
         if opts.NoCache || isDirectoryEmpty fableDir then true
         else
             let isOutdated =
                 try
-                    IO.File.ReadLines(compilerInfo)
-                    |> Seq.map (fun line -> let parts = line.Split("=") in parts.[0], parts.[1])
-                    |> Map
-                    |> fun oldInfo -> oldInfo <> newInfo
+                    let oldInfo = IO.File.ReadAllText(compilerInfoPath)
+                    JsonSerializer.Deserialize(oldInfo, jsonOptions) <> newInfo
                 with _ -> true
             if isOutdated then
                 IO.Directory.Delete(fableDir, true)
@@ -454,7 +447,7 @@ let createFableDir (opts: CrackerOptions) =
         if IO.Directory.Exists(fableDir) then
             IO.Directory.Delete(fableDir, true)
         IO.Directory.CreateDirectory(fableDir) |> ignore
-        IO.File.WriteAllLines(compilerInfo, newInfo |> Seq.map (fun kv -> kv.Key + "=" + kv.Value))
+        IO.File.WriteAllText(compilerInfoPath, JsonSerializer.Serialize(newInfo, jsonOptions))
         IO.File.WriteAllText(IO.Path.Combine(fableDir, ".gitignore"), "**/*")
 
     fableDir

diff --git a/src/Fable.Transforms/Global/Compiler.fs b/src/Fable.Transforms/Global/Compiler.fs
@@ -14,17 +14,17 @@ type CompilerOptionsHelper =
                        ?fileExtension,
                        ?clampByteArrays,
                        ?rootModule) =
-        let define = defaultArg define []
-        { new CompilerOptions with
-              member _.Define = define
-              member _.DebugMode = defaultArg debugMode true
-              member _.Language = defaultArg language JavaScript
-              member _.TypedArrays = defaultArg typedArrays true
-              member _.OptimizeFSharpAst = defaultArg optimizeFSharpAst false
-              member _.RootModule = defaultArg rootModule false
-              member _.Verbosity = defaultArg verbosity Verbosity.Normal
-              member _.FileExtension = defaultArg fileExtension CompilerOptionsHelper.DefaultExtension
-              member _.ClampByteArrays = defaultArg clampByteArrays false }
+        {
+            CompilerOptions.Define = defaultArg define []
+            DebugMode = defaultArg debugMode true
+            Language = defaultArg language JavaScript
+            TypedArrays = defaultArg typedArrays true
+            OptimizeFSharpAst = defaultArg optimizeFSharpAst false
+            RootModule = defaultArg rootModule false
+            Verbosity = defaultArg verbosity Verbosity.Normal
+            FileExtension = defaultArg fileExtension CompilerOptionsHelper.DefaultExtension
+            ClampByteArrays = defaultArg clampByteArrays false
+        }
 
 [<RequireQualifiedAccess>]
 type Severity =