Renamed compiler option

Author: ncave

.vscode/launch.json

@@ -76,7 +76,7 @@
             "name": "Run bench-compiler (.NET)",
             "program": "${workspaceFolder}/src/fable-standalone/test/bench-compiler/bin/Debug/netcoreapp3.1/bench-compiler.dll",
             // "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests"],
-            "args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--eraseUnions"],
+            "args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--eraseTypes"],
             // "args": ["${workspaceRoot}/src/fable-library/Fable.Library.fsproj", "out-lib", "--typescript"],
             "cwd": "${workspaceFolder}/src/fable-standalone/test/bench-compiler"
         },

src/Fable.AST/Plugins.fs

@@ -10,7 +10,7 @@ type Verbosity =
     | Silent
 
 type CompilerOptions =
-      abstract EraseUnions: bool
+      abstract EraseTypes: bool
       abstract TypedArrays: bool
       abstract ClampByteArrays: bool
       abstract Typescript: bool

src/Fable.Cli/Entry.fs

@@ -157,7 +157,7 @@ type Runner =
             argValue "--extension" args |> Option.defaultValue (defaultFileExt typescript args)
 
         let compilerOptions =
-            CompilerOptionsHelper.Make(eraseUnions = flagEnabled "--eraseUnions" args,
+            CompilerOptionsHelper.Make(eraseTypes = flagEnabled "--eraseTypes" args,
                                        typescript = typescript,
                                        typedArrays = typedArrays,
                                        fileExtension = fileExt,

src/Fable.Transforms/FSharp2Fable.Util.fs

@@ -437,7 +437,7 @@ module Helpers =
         Some (makeRange fsExpr.Range)
 
     let isErasedTypeDef (com: Compiler) (tdef: FSharpEntity) =
-        com.Options.EraseUnions
+        com.Options.EraseTypes
         && (tdef.IsFSharpUnion || tdef.IsFSharpRecord) // || tdef.IsValueType)
         && not (tdef.TryFullName = Some Types.reference) // no F# refs
         && not (hasAttribute Atts.customEquality tdef.Attributes)

src/Fable.Transforms/Global/Compiler.fs

@@ -5,7 +5,7 @@ module Literals =
 
 type CompilerOptionsHelper =
     static member DefaultExtension = ".fs.js"
-    static member Make(?eraseUnions,
+    static member Make(?eraseTypes,
                        ?typedArrays,
                        ?typescript,
                        ?define,
@@ -20,7 +20,7 @@ type CompilerOptionsHelper =
               member _.Define = define
               member _.Configuration = defaultArg configuration "Debug"
               member _.DebugMode = isDebug
-              member _.EraseUnions = defaultArg eraseUnions false
+              member _.EraseTypes = defaultArg eraseTypes false
               member _.Typescript = defaultArg typescript false
               member _.TypedArrays = defaultArg typedArrays true
               member _.OptimizeFSharpAst = defaultArg optimizeFSharpAst false

src/Fable.Transforms/Replacements.fs

@@ -707,7 +707,7 @@ let isCompatibleWithJsComparison = function
 
 let getEntityHashMethod (com: ICompiler) (ent: Entity) =
     if (ent.IsFSharpUnion || ent.IsFSharpRecord) then
-        if com.Options.EraseUnions
+        if com.Options.EraseTypes
         then "Util", "structuralHash"
         else "Util", "safeHash"
     elif ent.IsValueType
@@ -716,7 +716,7 @@ let getEntityHashMethod (com: ICompiler) (ent: Entity) =
 
 let getEntityEqualsMethod (com: ICompiler) (ent: Entity) =
     // if (ent.IsFSharpUnion || ent.IsFSharpRecord) then
-    //     if com.Options.EraseUnions
+    //     if com.Options.EraseTypes
     //     then "Util", "equals"
     //     else "Util", "equals"
     // elif ent.IsValueType
@@ -726,7 +726,7 @@ let getEntityEqualsMethod (com: ICompiler) (ent: Entity) =
 
 let getEntityCompareMethod (com: ICompiler) (ent: Entity) =
     // if (ent.IsFSharpUnion || ent.IsFSharpRecord) then
-    //     if com.Options.EraseUnions
+    //     if com.Options.EraseTypes
     //     then "Util", "compare"
     //     else "Util", "compare"
     // elif ent.IsValueType

src/fable-compiler-js/src/Platform.fs

@@ -8,6 +8,7 @@ type CmdLineOptions = {
     benchmark: bool
     optimize: bool
     // sourceMaps: bool
+    eraseTypes: bool
     typedArrays: bool
     typescript: bool
     printAst: bool

src/fable-compiler-js/src/app.fs

@@ -152,8 +152,10 @@ let parseFiles projectFileName options =
     // Fable (F# to JS)
     let projDir = projectFileName |> normalizeFullPath |> Path.GetDirectoryName
     let libDir = options.libDir |> Option.defaultValue (getFableLibDir()) |> normalizeFullPath
+
     let parseFable (res, fileName) =
         fable.CompileToBabelAst(libDir, res, fileName,
+            eraseTypes = options.eraseTypes,
             typedArrays = options.typedArrays,
             typescript = options.typescript)
 
@@ -164,9 +166,9 @@ let parseFiles projectFileName options =
 
     let getOrAddDeduplicateTargetDir =
         let dedupDic = System.Collections.Generic.Dictionary()
-        fun (importDir: string) addTargetDir ->
+        fun importDir addTargetDir ->
             // Lower importDir as some OS use case insensitive paths
-            let importDir = JS.path.resolve(importDir).ToLower()
+            let importDir = (normalizeFullPath importDir).ToLower()
             match dedupDic.TryGetValue(importDir) with
             | true, v -> v
             | false, _ ->
@@ -238,6 +240,7 @@ let run opts projectFileName outDir =
         benchmark = opts |> hasFlag "--benchmark"
         optimize = opts |> hasFlag "--optimize"
         // sourceMaps = opts |> hasFlag "--sourceMaps"
+        eraseTypes = opts |> hasFlag "--eraseTypes"
         typedArrays = opts |> tryFlag "--typedArrays"
                            |> Option.defaultValue (opts |> hasFlag "--typescript" |> not)
         typescript = opts |> hasFlag "--typescript"

src/fable-standalone/src/Interfaces.fs

@@ -64,7 +64,7 @@ type IFableManager =
     abstract GetToolTipText: parseResults: IParseResults * line: int * col: int * lineText: string -> string[]
     abstract GetCompletionsAtLocation: parseResults: IParseResults * line: int * col: int * lineText: string -> Completion[]
     abstract CompileToBabelAst: fableLibrary: string * parseResults: IParseResults * fileName: string
-                                * ?eraseUnions: bool
+                                * ?eraseTypes: bool
                                 * ?typedArrays: bool
                                 * ?typescript: bool
                                 -> IBabelResult

src/fable-standalone/src/Main.fs

@@ -258,7 +258,7 @@ let init () =
             getCompletionsAtLocation res line col lineText
 
         member __.CompileToBabelAst(fableLibrary:string, parseResults:IParseResults, fileName:string,
-                                    ?eraseUnions, ?typedArrays, ?typescript) =
+                                    ?eraseTypes, ?typedArrays, ?typescript) =
             let res = parseResults :?> ParseResults
             let project = res.GetProject()
             let define = parseResults.OtherFSharpOptions |> Array.choose (fun x ->
@@ -267,7 +267,7 @@ let init () =
                 else None) |> Array.toList
             let options =
                 Fable.CompilerOptionsHelper.Make(define=define,
-                    ?eraseUnions=eraseUnions, ?typedArrays=typedArrays, ?typescript=typescript)
+                    ?eraseTypes=eraseTypes, ?typedArrays=typedArrays, ?typescript=typescript)
             let com = CompilerImpl(fileName, project, options, fableLibrary)
             let ast =
                 FSharp2Fable.Compiler.transformFile com