Skip to content

Commit 812b752

Browse files
ncavencave
committed
Erase unions and records
1 parent 531e546 commit 812b752

File tree

15 files changed

+151
-27
lines changed

15 files changed

+151
-27
lines changed

‎.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"name": "Run bench-compiler (Node)",
7474
"program": "${workspaceRoot}/src/fable-standalone/test/bench-compiler/out-node/app.js",
7575
// "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--fableLib", "out-lib"],
76-
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--fableLib", "out-lib"],
76+
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--fableLib", "out-lib", "--eraseTypes"],
7777
"cwd": "${workspaceRoot}/src/fable-standalone/test/bench-compiler"
7878
},
7979
{
@@ -82,7 +82,7 @@
8282
"name": "Run bench-compiler (.NET)",
8383
"program": "${workspaceFolder}/src/fable-standalone/test/bench-compiler/bin/Debug/net5.0/bench-compiler.dll",
8484
// "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "--fableLib", "out-lib"],
85-
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--fableLib", "out-lib"],
85+
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--fableLib", "out-lib", "--eraseTypes"],
8686
"cwd": "${workspaceFolder}/src/fable-standalone/test/bench-compiler"
8787
},
8888
{

‎src/Fable.AST/Plugins.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ type Verbosity =
1010
| Silent
1111

1212
type CompilerOptions =
13+
abstract EraseTypes: bool
1314
abstract TypedArrays: bool
1415
abstract ClampByteArrays: bool
1516
abstract Typescript: bool

‎src/Fable.Cli/Entry.fs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ type Runner =
159159
|> Option.defaultValue (defaultFileExt typescript args)
160160

161161
let compilerOptions =
162-
CompilerOptionsHelper.Make(typescript = typescript,
162+
CompilerOptionsHelper.Make(eraseTypes = flagEnabled "--eraseTypes" args,
163+
typescript = typescript,
163164
typedArrays = typedArrays,
164165
fileExtension = fileExt,
165166
define = define,

‎src/Fable.Transforms/FSharp2Fable.Util.fs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,16 @@ module Helpers =
447447
let makeRangeFrom (fsExpr: FSharpExpr) =
448448
Some (makeRange fsExpr.Range)
449449

450+
let isErasedTypeDef (com: Compiler) (tdef: FSharpEntity) =
451+
com.Options.EraseTypes && tdef.IsFSharp
452+
&& (tdef.IsFSharpUnion || tdef.IsFSharpRecord || tdef.IsValueType || tdef.IsByRef)
453+
&& not (tdef.TryFullName = Some Types.reference) // no F# refs
454+
&& not (hasAttribute Atts.customEquality tdef.Attributes)
455+
&& not (hasAttribute Atts.customComparison tdef.Attributes)
456+
457+
let isErasedType (com: Compiler) (t: FSharpType) =
458+
t.HasTypeDefinition && (isErasedTypeDef com t.TypeDefinition)
459+
450460
let unionCaseTag (com: IFableCompiler) (ent: FSharpEntity) (unionCase: FSharpUnionCase) =
451461
try
452462
// If the order of cases changes in the declaration, the tag has to change too.
@@ -1167,6 +1177,12 @@ module Util =
11671177
makeImportUserGenerated None Fable.Any selector path |> Some
11681178
| _ -> None
11691179

1180+
let isErasedEntity (com: Compiler) (ent: Fable.Entity) =
1181+
match ent with
1182+
| :? FsEnt as fsEnt ->
1183+
Helpers.isErasedTypeDef com fsEnt.FSharpEntity
1184+
| _ -> false
1185+
11701186
let isErasedOrStringEnumEntity (ent: Fable.Entity) =
11711187
ent.Attributes |> Seq.exists (fun att ->
11721188
match att.Entity.FullName with

‎src/Fable.Transforms/Fable2Babel.fs

Lines changed: 67 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,12 @@ module Reflection =
311311
let ent = com.GetEntity(ent)
312312
if ent.IsInterface then
313313
warnAndEvalToFalse "interfaces"
314+
elif FSharp2Fable.Util.isErasedEntity com ent then
315+
let expr = com.TransformAsExpr(ctx, expr)
316+
let idx = if ent.IsFSharpUnion then 1 else 0
317+
let actual = Util.getExpr None expr (Util.ofInt idx)
318+
let expected = Util.ofString ent.FullName
319+
Expression.binaryExpression(BinaryEqualStrict, actual, expected, ?loc=range)
314320
else
315321
match tryJsConstructor com ctx ent with
316322
| Some cons ->
@@ -383,6 +389,7 @@ module Annotation =
383389
| Fable.LambdaType _ -> Util.uncurryLambdaType typ ||> makeFunctionTypeAnnotation com ctx typ
384390
| Fable.DelegateType(argTypes, returnType) -> makeFunctionTypeAnnotation com ctx typ argTypes returnType
385391
| Fable.GenericParam name -> makeSimpleTypeAnnotation com ctx name
392+
| Replacements.ErasedType com (_, _, _, genArgs) -> makeTupleTypeAnnotation com ctx genArgs
386393
| Fable.DeclaredType(ent, genArgs) ->
387394
makeEntityTypeAnnotation com ctx ent genArgs
388395
| Fable.AnonymousRecordType(fieldNames, genArgs) ->
@@ -814,9 +821,18 @@ module Util =
814821
let getUnionCaseName (uci: Fable.UnionCase) =
815822
match uci.CompiledName with Some cname -> cname | None -> uci.Name
816823

824+
// let getUnionCaseFullName (uci: Fable.UnionCase) =
825+
// uci.XmlDocSig
826+
// |> Naming.replacePrefix "T:Microsoft.FSharp." "FSharp."
827+
// |> Naming.replacePrefix "T:" ""
828+
817829
let getUnionExprTag (com: IBabelCompiler) ctx r (fableExpr: Fable.Expr) =
818830
let expr = com.TransformAsExpr(ctx, fableExpr)
819-
getExpr r expr (Expression.stringLiteral("tag"))
831+
match fableExpr.Type with
832+
| Replacements.ErasedType com _ ->
833+
getExpr r expr (ofInt 0)
834+
| _ ->
835+
getExpr r expr (Expression.stringLiteral("tag"))
820836

821837
/// Wrap int expressions with `| 0` to help optimization of JS VMs
822838
let wrapIntExpression typ (e: Expression) =
@@ -962,27 +978,40 @@ module Util =
962978
com.TransformAsExpr(ctx, x)
963979
| Fable.NewRecord(values, ent, genArgs) ->
964980
let ent = com.GetEntity(ent)
965-
let values = List.mapToArray (fun x -> com.TransformAsExpr(ctx, x)) values
966-
let consRef = ent |> jsConstructor com ctx
967-
let typeParamInst =
968-
if com.Options.Typescript && (ent.FullName = Types.reference)
969-
then makeGenTypeParamInst com ctx genArgs
970-
else None
971-
Expression.newExpression(consRef, values, ?typeArguments=typeParamInst, ?loc=r)
981+
let values = List.map (fun x -> com.TransformAsExpr(ctx, x)) values
982+
if FSharp2Fable.Util.isErasedEntity com ent then
983+
let recordName = ent.FullName |> ofString
984+
recordName::values |> List.toArray |> Expression.arrayExpression
985+
else
986+
let consRef = ent |> jsConstructor com ctx
987+
let values = values |> List.toArray
988+
let typeParamInst =
989+
if com.Options.Typescript && (ent.FullName = Types.reference)
990+
then makeGenTypeParamInst com ctx genArgs
991+
else None
992+
Expression.newExpression(consRef, values, ?typeArguments=typeParamInst, ?loc=r)
972993
| Fable.NewAnonymousRecord(values, fieldNames, _genArgs) ->
973994
let values = List.mapToArray (fun x -> com.TransformAsExpr(ctx, x)) values
974-
Array.zip fieldNames values |> makeJsObject
995+
if com.Options.EraseTypes then
996+
values |> Expression.arrayExpression
997+
else
998+
Array.zip fieldNames values |> makeJsObject
975999
| Fable.NewUnion(values, tag, ent, genArgs) ->
9761000
let ent = com.GetEntity(ent)
9771001
let values = List.map (fun x -> com.TransformAsExpr(ctx, x)) values
978-
let consRef = ent |> jsConstructor com ctx
979-
let typeParamInst =
980-
if com.Options.Typescript
981-
then makeGenTypeParamInst com ctx genArgs
982-
else None
983-
// let caseName = ent.UnionCases |> List.item tag |> getUnionCaseName |> ofString
984-
let values = (ofInt tag)::values |> List.toArray
985-
Expression.newExpression(consRef, values, ?typeArguments=typeParamInst, ?loc=r)
1002+
if FSharp2Fable.Util.isErasedEntity com ent then
1003+
let caseTag = tag |> ofInt
1004+
let caseName = ent.UnionCases |> List.item tag |> getUnionCaseName |> ofString
1005+
caseTag::caseName::values |> List.toArray |> Expression.arrayExpression
1006+
else
1007+
let consRef = ent |> jsConstructor com ctx
1008+
let typeParamInst =
1009+
if com.Options.Typescript
1010+
then makeGenTypeParamInst com ctx genArgs
1011+
else None
1012+
// let caseName = ent.UnionCases |> List.item tag |> getUnionCaseName |> ofString
1013+
let values = (ofInt tag)::values |> List.toArray
1014+
Expression.newExpression(consRef, values, ?typeArguments=typeParamInst, ?loc=r)
9861015

9871016
let enumerator2iterator com ctx =
9881017
let enumerator = Expression.callExpression(get None (Expression.identifier("this")) "GetEnumerator", [||])
@@ -1201,7 +1230,14 @@ module Util =
12011230
let expr = com.TransformAsExpr(ctx, fableExpr)
12021231
match key with
12031232
| Fable.ExprKey(TransformExpr com ctx prop) -> getExpr range expr prop
1204-
| Fable.FieldKey field -> get range expr field.Name
1233+
| Fable.FieldKey field ->
1234+
match fableExpr.Type with
1235+
| Replacements.ErasedType com (fieldNames, offset, _, _) ->
1236+
let indexOpt = fieldNames |> Array.tryFindIndex (fun name -> name = field.Name)
1237+
match indexOpt with
1238+
| Some index -> getExpr range expr (ofInt (offset + index))
1239+
| _ -> get range expr field.Name
1240+
| _ -> get range expr field.Name
12051241

12061242
| Fable.ListHead ->
12071243
// get range (com.TransformAsExpr(ctx, fableExpr)) "head"
@@ -1229,15 +1265,26 @@ module Util =
12291265

12301266
| Fable.UnionField(index, _) ->
12311267
let expr = com.TransformAsExpr(ctx, fableExpr)
1232-
getExpr range (getExpr None expr (Expression.stringLiteral("fields"))) (ofInt index)
1268+
match fableExpr.Type with
1269+
| Replacements.ErasedType com (_, offset, _, _) ->
1270+
getExpr range expr (ofInt (offset + index))
1271+
| _ ->
1272+
getExpr range (getExpr None expr (Expression.stringLiteral("fields"))) (ofInt index)
12331273

12341274
let transformSet (com: IBabelCompiler) ctx range fableExpr (value: Fable.Expr) kind =
12351275
let expr = com.TransformAsExpr(ctx, fableExpr)
12361276
let value = com.TransformAsExpr(ctx, value) |> wrapIntExpression value.Type
12371277
let ret =
12381278
match kind with
12391279
| None -> expr
1240-
| Some(Fable.FieldKey fi) -> get None expr fi.Name
1280+
| Some(Fable.FieldKey field) ->
1281+
match fableExpr.Type with
1282+
| Replacements.ErasedType com (fieldNames, offset, _, _) ->
1283+
let indexOpt = fieldNames |> Array.tryFindIndex (fun name -> name = field.Name)
1284+
match indexOpt with
1285+
| Some index -> getExpr None expr (ofInt (offset + index))
1286+
| _ -> get None expr field.Name
1287+
| _ -> get None expr field.Name
12411288
| Some(Fable.ExprKey(TransformExpr com ctx e)) -> getExpr None expr e
12421289
assign range ret value
12431290

‎src/Fable.Transforms/Global/Compiler.fs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ module Literals =
55

66
type CompilerOptionsHelper =
77
static member DefaultExtension = ".fs.js"
8-
static member Make(?typedArrays,
8+
static member Make(?eraseTypes,
9+
?typedArrays,
910
?typescript,
1011
?define,
1112
?optimizeFSharpAst,
@@ -17,6 +18,7 @@ type CompilerOptionsHelper =
1718
{ new CompilerOptions with
1819
member _.Define = define
1920
member _.DebugMode = isDebug
21+
member _.EraseTypes = defaultArg eraseTypes false
2022
member _.Typescript = defaultArg typescript false
2123
member _.TypedArrays = defaultArg typedArrays true
2224
member _.OptimizeFSharpAst = defaultArg optimizeFSharpAst false

‎src/Fable.Transforms/Replacements.fs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,20 @@ let (|NewAnonymousRecord|_|) = function
278278
Some([], exprs, fieldNames, genArgs, r)
279279
| _ -> None
280280

281+
let (|ErasedType|_|) (com: Compiler) = function
282+
| Fable.AnonymousRecordType (fieldNames, genArgs) when com.Options.EraseTypes ->
283+
Some (fieldNames, 0, false, genArgs)
284+
| Fable.DeclaredType (ent, genArgs) ->
285+
let ent = com.GetEntity(ent)
286+
if FSharp2Fable.Util.isErasedEntity com ent then
287+
let offset = if ent.IsFSharpUnion then 2 else 1
288+
let fieldNames =
289+
if ent.IsFSharpUnion then [||] // not used for unions
290+
else ent.FSharpFields |> List.map (fun x -> x.Name) |> List.toArray
291+
Some (fieldNames, offset, ent.IsFSharpUnion, genArgs)
292+
else None
293+
| _ -> None
294+
281295
let coreModFor = function
282296
| BclGuid -> "Guid"
283297
| BclDateTime -> "Date"
@@ -436,6 +450,9 @@ let toString com (ctx: Context) r (args: Expr list) =
436450
| Number _ -> Helper.InstanceCall(head, "toString", String, tail)
437451
| Array _ | List _ ->
438452
Helper.LibCall(com, "Types", "seqToString", String, [head], ?loc=r)
453+
| ErasedType com (_, offset, isUnion, _) ->
454+
let args = [makeIntConst offset; makeBoolConst isUnion; head]
455+
Helper.LibCall(com, "Types", "erasedTypeToString", String, args, ?loc=r)
439456
// | DeclaredType(ent, _) when ent.IsFSharpUnion || ent.IsFSharpRecord || ent.IsValueType ->
440457
// Helper.InstanceCall(head, "toString", String, [], ?loc=r)
441458
// | DeclaredType(ent, _) ->
@@ -732,6 +749,7 @@ let identityHash com r (arg: Expr) =
732749
// | Array _ -> "arrayHash"
733750
// | Builtin (BclDateTime|BclDateTimeOffset) -> "dateHash"
734751
// | Builtin (BclInt64|BclUInt64|BclDecimal) -> "fastStructuralHash"
752+
| ErasedType com _ -> "structuralHash"
735753
| DeclaredType _ -> "safeHash"
736754
| _ -> "identityHash"
737755
Helper.LibCall(com, "Util", methodName, Number Int32, [arg], ?loc=r)
@@ -748,6 +766,7 @@ let structuralHash (com: ICompiler) r (arg: Expr) =
748766
| Array _ -> "arrayHash"
749767
| Builtin (BclDateTime|BclDateTimeOffset) -> "dateHash"
750768
| Builtin (BclInt64|BclUInt64|BclDecimal) -> "fastStructuralHash"
769+
| ErasedType com _ -> "structuralHash"
751770
| DeclaredType(ent, _) ->
752771
let ent = com.GetEntity(ent)
753772
if not ent.IsInterface then "safeHash"
@@ -770,6 +789,8 @@ let rec equals (com: ICompiler) ctx r equal (left: Expr) (right: Expr) =
770789
Helper.InstanceCall(left, "Equals", Boolean, [right]) |> is equal
771790
| Builtin (BclInt64|BclUInt64|BclDecimal|BclBigInt as bt) ->
772791
Helper.LibCall(com, coreModFor bt, "equals", Boolean, [left; right], ?loc=r) |> is equal
792+
| ErasedType com _ ->
793+
Helper.LibCall(com, "Util", "equalArrays", Boolean, [left; right], ?loc=r) |> is equal
773794
| DeclaredType _ ->
774795
Helper.LibCall(com, "Util", "equals", Boolean, [left; right], ?loc=r) |> is equal
775796
| Array t ->
@@ -794,6 +815,8 @@ and compare (com: ICompiler) ctx r (left: Expr) (right: Expr) =
794815
Helper.LibCall(com, "Date", "compare", Number Int32, [left; right], ?loc=r)
795816
| Builtin (BclInt64|BclUInt64|BclDecimal|BclBigInt as bt) ->
796817
Helper.LibCall(com, coreModFor bt, "compare", Number Int32, [left; right], ?loc=r)
818+
| ErasedType com _ ->
819+
Helper.LibCall(com, "Util", "compareArrays", Number Int32, [left; right], ?loc=r)
797820
| DeclaredType _ ->
798821
Helper.LibCall(com, "Util", "compare", Number Int32, [left; right], ?loc=r)
799822
| Array t ->

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ type CmdLineOptions = {
1010
sourceMaps: bool
1111
typedArrays: bool
1212
typescript: bool
13+
eraseTypes: bool
1314
printAst: bool
1415
// watch: bool
1516
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ let parseFiles projectFileName options =
162162

163163
let parseFable (res, fileName) =
164164
fable.CompileToBabelAst(libDir, res, fileName,
165+
eraseTypes = options.eraseTypes,
165166
typedArrays = options.typedArrays,
166167
typescript = options.typescript)
167168

@@ -258,6 +259,7 @@ let run opts projectFileName outDir =
258259
typedArrays = opts |> tryFlag "--typedArrays"
259260
|> Option.defaultValue (opts |> hasFlag "--typescript" |> not)
260261
typescript = opts |> hasFlag "--typescript"
262+
eraseTypes = opts |> hasFlag "--eraseTypes"
261263
printAst = opts |> hasFlag "--printAst"
262264
// watch = opts |> hasFlag "--watch"
263265
}

‎src/fable-library/Types.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@ export function seqToString<T>(self: Iterable<T>): string {
1717
return str + "]";
1818
}
1919

20+
export function erasedTypeToString(offset: number, isUnion: boolean, fields: any[]) {
21+
if (Array.isArray(fields) && offset > 0) {
22+
const name = toString(fields[offset - 1]);
23+
if (isUnion) {
24+
const caseName = name.substring(name.lastIndexOf(".") + 1);
25+
return unionToString(caseName, fields.slice(offset));
26+
} else {
27+
return name; // records and value types
28+
}
29+
} else {
30+
return toString(fields);
31+
}
32+
}
33+
2034
export function toString(x: any, callStack = 0): string {
2135
if (x != null && typeof x === "object") {
2236
if (typeof x.toString === "function") {

‎src/fable-standalone/src/Interfaces.fs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ type IFableManager =
6868
abstract GetToolTipText: parseResults: IParseResults * line: int * col: int * lineText: string -> string[]
6969
abstract GetCompletionsAtLocation: parseResults: IParseResults * line: int * col: int * lineText: string -> Completion[]
7070
abstract CompileToBabelAst: fableLibrary: string * parseResults: IParseResults * fileName: string
71+
* ?eraseTypes: bool
7172
* ?typedArrays: bool
72-
* ?typescript: bool -> IBabelResult
73+
* ?typescript: bool
74+
-> IBabelResult
7375
abstract PrintBabelAst: babelResult: IBabelResult * IWriter -> Async<unit>
7476
abstract FSharpAstToString: parseResults: IParseResults * fileName: string -> string

‎src/fable-standalone/src/Main.fs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,14 +258,16 @@ let init () =
258258
getCompletionsAtLocation res line col lineText
259259

260260
member __.CompileToBabelAst(fableLibrary:string, parseResults:IParseResults, fileName:string,
261-
?typedArrays, ?typescript) =
261+
?eraseTypes, ?typedArrays, ?typescript) =
262262
let res = parseResults :?> ParseResults
263263
let project = res.GetProject()
264264
let define = parseResults.OtherFSharpOptions |> Array.choose (fun x ->
265265
if x.StartsWith("--define:") || x.StartsWith("-d:")
266266
then x.[(x.IndexOf(':') + 1)..] |> Some
267267
else None) |> Array.toList
268-
let options = Fable.CompilerOptionsHelper.Make(define=define, ?typedArrays=typedArrays, ?typescript=typescript)
268+
let options =
269+
Fable.CompilerOptionsHelper.Make(define=define,
270+
?eraseTypes=eraseTypes, ?typedArrays=typedArrays, ?typescript=typescript)
269271
let com = CompilerImpl(fileName, project, options, fableLibrary)
270272
let ast =
271273
FSharp2Fable.Compiler.transformFile com

‎src/fable-standalone/test/bench-compiler/Platform.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ type CmdLineOptions = {
88
sourceMaps: bool
99
typedArrays: bool
1010
typescript: bool
11+
eraseTypes: bool
1112
printAst: bool
1213
// watch: bool
1314
}

‎src/fable-standalone/test/bench-compiler/app.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ let parseFiles projectFileName options =
152152

153153
let parseFable (res, fileName) =
154154
fable.CompileToBabelAst(libDir, res, fileName,
155+
eraseTypes = options.eraseTypes,
155156
typedArrays = options.typedArrays,
156157
typescript = options.typescript)
157158

@@ -248,6 +249,7 @@ let run opts projectFileName outDir =
248249
typedArrays = opts |> tryFlag "--typedArrays"
249250
|> Option.defaultValue (opts |> hasFlag "--typescript" |> not)
250251
typescript = opts |> hasFlag "--typescript"
252+
eraseTypes = opts |> hasFlag "--eraseTypes"
251253
printAst = opts |> hasFlag "--printAst"
252254
// watch = opts |> hasFlag "--watch"
253255
}

0 commit comments

Comments
 (0)