Skip to content

Commit bdc58d3

Browse files
ncavencave
committed
Erase unions and records
1 parent c97d8ba commit bdc58d3

File tree

15 files changed

+137
-26
lines changed

15 files changed

+137
-26
lines changed

‎.vscode/launch.json

Lines changed: 1 addition & 1 deletion
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"],
76-
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test"],
76+
"args": ["${workspaceRoot}/../fable-test/fable-test.fsproj", "out-test", "--eraseTypes"],
7777
"cwd": "${workspaceRoot}/src/fable-standalone/test/bench-compiler"
7878
},
7979
{

‎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
@@ -443,6 +443,16 @@ module Helpers =
443443
let makeRangeFrom (fsExpr: FSharpExpr) =
444444
Some (makeRange fsExpr.Range)
445445

446+
let isErasedTypeDef (com: Compiler) (tdef: FSharpEntity) =
447+
com.Options.EraseTypes && tdef.IsFSharp
448+
&& (tdef.IsFSharpUnion || tdef.IsFSharpRecord || tdef.IsValueType || tdef.IsByRef)
449+
&& not (tdef.TryFullName = Some Types.reference) // no F# refs
450+
&& not (hasAttribute Atts.customEquality tdef.Attributes)
451+
&& not (hasAttribute Atts.customComparison tdef.Attributes)
452+
453+
let isErasedType (com: Compiler) (t: FSharpType) =
454+
t.HasTypeDefinition && (isErasedTypeDef com t.TypeDefinition)
455+
446456
let unionCaseTag (com: IFableCompiler) (ent: FSharpEntity) (unionCase: FSharpUnionCase) =
447457
try
448458
// If the order of cases changes in the declaration, the tag has to change too.
@@ -1157,6 +1167,12 @@ module Util =
11571167
makeImportUserGenerated None Fable.Any selector path |> Some
11581168
| _ -> None
11591169

1170+
let isErasedEntity (com: Compiler) (ent: Fable.Entity) =
1171+
match ent with
1172+
| :? FsEnt as fsEnt ->
1173+
Helpers.isErasedTypeDef com fsEnt.FSharpEntity
1174+
| _ -> false
1175+
11601176
let isErasedOrStringEnumEntity (ent: Fable.Entity) =
11611177
ent.Attributes |> Seq.exists (fun att ->
11621178
match att.Entity.FullName with

‎src/Fable.Transforms/Fable2Babel.fs

Lines changed: 57 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,7 +821,11 @@ module Util =
814821

815822
let getUnionExprTag (com: IBabelCompiler) ctx r (fableExpr: Fable.Expr) =
816823
let expr = com.TransformAsExpr(ctx, fableExpr)
817-
getExpr r expr (Expression.stringLiteral("tag"))
824+
match fableExpr.Type with
825+
| Replacements.ErasedType com _ ->
826+
getExpr r expr (ofInt 0)
827+
| _ ->
828+
getExpr r expr (Expression.stringLiteral("tag"))
818829

819830
/// Wrap int expressions with `| 0` to help optimization of JS VMs
820831
let wrapIntExpression typ (e: Expression) =
@@ -960,27 +971,41 @@ module Util =
960971
com.TransformAsExpr(ctx, x)
961972
| Fable.NewRecord(values, ent, genArgs) ->
962973
let ent = com.GetEntity(ent)
963-
let values = List.mapToArray (fun x -> com.TransformAsExpr(ctx, x)) values
964-
let consRef = ent |> jsConstructor com ctx
965-
let typeParamInst =
966-
if com.Options.Typescript && (ent.FullName = Types.reference)
967-
then makeGenTypeParamInst com ctx genArgs
968-
else None
969-
Expression.newExpression(consRef, values, ?typeArguments=typeParamInst, ?loc=r)
974+
let values = List.map (fun x -> com.TransformAsExpr(ctx, x)) values
975+
if FSharp2Fable.Util.isErasedEntity com ent then
976+
let recordName = ent.FullName |> ofString
977+
recordName::values |> List.toArray |> Expression.arrayExpression
978+
else
979+
let consRef = ent |> jsConstructor com ctx
980+
let values = values |> List.toArray
981+
let typeParamInst =
982+
if com.Options.Typescript && (ent.FullName = Types.reference)
983+
then makeGenTypeParamInst com ctx genArgs
984+
else None
985+
Expression.newExpression(consRef, values, ?typeArguments=typeParamInst, ?loc=r)
970986
| Fable.NewAnonymousRecord(values, fieldNames, _genArgs) ->
971987
let values = List.mapToArray (fun x -> com.TransformAsExpr(ctx, x)) values
972-
Array.zip fieldNames values |> makeJsObject
988+
if com.Options.EraseTypes then
989+
values |> Expression.arrayExpression
990+
else
991+
Array.zip fieldNames values |> makeJsObject
973992
| Fable.NewUnion(values, tag, ent, genArgs) ->
974993
let ent = com.GetEntity(ent)
975994
let values = List.map (fun x -> com.TransformAsExpr(ctx, x)) values
976-
let consRef = ent |> jsConstructor com ctx
977-
let typeParamInst =
978-
if com.Options.Typescript
979-
then makeGenTypeParamInst com ctx genArgs
980-
else None
981-
// let caseName = ent.UnionCases |> List.item tag |> getUnionCaseName |> ofString
982-
let values = (ofInt tag)::values |> List.toArray
983-
Expression.newExpression(consRef, values, ?typeArguments=typeParamInst, ?loc=r)
995+
if FSharp2Fable.Util.isErasedEntity com ent then
996+
let unionCase = ent.UnionCases |> List.item tag
997+
let caseTag = tag |> ofInt
998+
let caseName = unionCase.FullName |> ofString
999+
caseTag::caseName::values |> List.toArray |> Expression.arrayExpression
1000+
else
1001+
let consRef = ent |> jsConstructor com ctx
1002+
let typeParamInst =
1003+
if com.Options.Typescript
1004+
then makeGenTypeParamInst com ctx genArgs
1005+
else None
1006+
// let caseName = ent.UnionCases |> List.item tag |> getUnionCaseName |> ofString
1007+
let values = (ofInt tag)::values |> List.toArray
1008+
Expression.newExpression(consRef, values, ?typeArguments=typeParamInst, ?loc=r)
9841009

9851010
let enumerator2iterator com ctx =
9861011
let enumerator = Expression.callExpression(get None (Expression.identifier("this")) "GetEnumerator", [||])
@@ -1203,7 +1228,10 @@ module Util =
12031228

12041229
| Fable.FieldGet (field, index) ->
12051230
let expr = com.TransformAsExpr(ctx, fableExpr)
1206-
get range expr field.Name
1231+
match fableExpr.Type with
1232+
| Replacements.ErasedType com (offset, _, _) ->
1233+
getExpr range expr (ofInt (index + offset))
1234+
| _ -> get range expr field.Name
12071235

12081236
| Fable.ListHead ->
12091237
// get range (com.TransformAsExpr(ctx, fableExpr)) "head"
@@ -1231,7 +1259,11 @@ module Util =
12311259

12321260
| Fable.UnionField(index, _) ->
12331261
let expr = com.TransformAsExpr(ctx, fableExpr)
1234-
getExpr range (getExpr None expr (Expression.stringLiteral("fields"))) (ofInt index)
1262+
match fableExpr.Type with
1263+
| Replacements.ErasedType com (offset, _, _) ->
1264+
getExpr range expr (ofInt (index + offset))
1265+
| _ ->
1266+
getExpr range (getExpr None expr (Expression.stringLiteral("fields"))) (ofInt index)
12351267

12361268
let transformSet (com: IBabelCompiler) ctx range fableExpr (value: Fable.Expr) kind =
12371269
let expr = com.TransformAsExpr(ctx, fableExpr)
@@ -1241,7 +1273,12 @@ module Util =
12411273
| Fable.ValueSet -> expr
12421274
| Fable.ByKeySet(Fable.FieldKey fi) -> get None expr fi.Name
12431275
| Fable.ByKeySet(Fable.ExprKey(TransformExpr com ctx e)) -> getExpr None expr e
1244-
| Fable.FieldSet (field, index) -> get None expr field.Name
1276+
| Fable.FieldSet (field, index) ->
1277+
match fableExpr.Type with
1278+
| Replacements.ErasedType com (offset, _, _) ->
1279+
getExpr None expr (ofInt (index + offset))
1280+
| _ ->
1281+
get None expr field.Name
12451282
assign range ret value
12461283

12471284
let transformBindingExprBody (com: IBabelCompiler) (ctx: Context) (var: Fable.Ident) (value: Fable.Expr) =

‎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: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,17 @@ let (|NewAnonymousRecord|_|) = function
279279
Some([], exprs, fieldNames, genArgs, r)
280280
| _ -> None
281281

282+
let (|ErasedType|_|) (com: Compiler) = function
283+
| Fable.AnonymousRecordType (fieldNames, genArgs) when com.Options.EraseTypes ->
284+
Some (0, false, genArgs)
285+
| Fable.DeclaredType (ent, genArgs) ->
286+
let ent = com.GetEntity(ent)
287+
if FSharp2Fable.Util.isErasedEntity com ent then
288+
let offset = if ent.IsFSharpUnion then 2 else 1
289+
Some (offset, ent.IsFSharpUnion, genArgs)
290+
else None
291+
| _ -> None
292+
282293
let coreModFor = function
283294
| BclGuid -> "Guid"
284295
| BclDateTime -> "Date"
@@ -414,6 +425,9 @@ let toString com (ctx: Context) r (args: Expr list) =
414425
| Number _ -> Helper.InstanceCall(head, "toString", String, tail)
415426
| Array _ | List _ ->
416427
Helper.LibCall(com, "Types", "seqToString", String, [head], ?loc=r)
428+
| ErasedType com (offset, isUnion, _) ->
429+
let args = [makeIntConst offset; makeBoolConst isUnion; head]
430+
Helper.LibCall(com, "Types", "erasedTypeToString", String, args, ?loc=r)
417431
// | DeclaredType(ent, _) when ent.IsFSharpUnion || ent.IsFSharpRecord || ent.IsValueType ->
418432
// Helper.InstanceCall(head, "toString", String, [], ?loc=r)
419433
// | DeclaredType(ent, _) ->
@@ -710,6 +724,7 @@ let identityHash com r (arg: Expr) =
710724
// | Array _ -> "arrayHash"
711725
// | Builtin (BclDateTime|BclDateTimeOffset) -> "dateHash"
712726
// | Builtin (BclInt64|BclUInt64|BclDecimal) -> "fastStructuralHash"
727+
| ErasedType com _ -> "structuralHash"
713728
| DeclaredType _ -> "safeHash"
714729
| _ -> "identityHash"
715730
Helper.LibCall(com, "Util", methodName, Number Int32, [arg], ?loc=r)
@@ -726,6 +741,7 @@ let structuralHash (com: ICompiler) r (arg: Expr) =
726741
| Array _ -> "arrayHash"
727742
| Builtin (BclDateTime|BclDateTimeOffset) -> "dateHash"
728743
| Builtin (BclInt64|BclUInt64|BclDecimal) -> "fastStructuralHash"
744+
| ErasedType com _ -> "structuralHash"
729745
| DeclaredType(ent, _) ->
730746
let ent = com.GetEntity(ent)
731747
if not ent.IsInterface then "safeHash"
@@ -748,6 +764,8 @@ let rec equals (com: ICompiler) ctx r equal (left: Expr) (right: Expr) =
748764
Helper.InstanceCall(left, "Equals", Boolean, [right]) |> is equal
749765
| Builtin (BclInt64|BclUInt64|BclDecimal|BclBigInt as bt) ->
750766
Helper.LibCall(com, coreModFor bt, "equals", Boolean, [left; right], ?loc=r) |> is equal
767+
| ErasedType com _ ->
768+
Helper.LibCall(com, "Util", "equalArrays", Boolean, [left; right], ?loc=r) |> is equal
751769
| DeclaredType _ ->
752770
Helper.LibCall(com, "Util", "equals", Boolean, [left; right], ?loc=r) |> is equal
753771
| Array t ->
@@ -772,6 +790,8 @@ and compare (com: ICompiler) ctx r (left: Expr) (right: Expr) =
772790
Helper.LibCall(com, "Date", "compare", Number Int32, [left; right], ?loc=r)
773791
| Builtin (BclInt64|BclUInt64|BclDecimal|BclBigInt as bt) ->
774792
Helper.LibCall(com, coreModFor bt, "compare", Number Int32, [left; right], ?loc=r)
793+
| ErasedType com _ ->
794+
Helper.LibCall(com, "Util", "compareArrays", Number Int32, [left; right], ?loc=r)
775795
| DeclaredType _ ->
776796
Helper.LibCall(com, "Util", "compare", Number Int32, [left; right], ?loc=r)
777797
| Array t ->

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

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

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

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

156156
let parseFable (res, fileName) =
157157
fable.CompileToBabelAst(libDir, res, fileName,
158+
eraseTypes = options.eraseTypes,
158159
typedArrays = options.typedArrays,
159160
typescript = options.typescript)
160161

@@ -239,6 +240,7 @@ let run opts projectFileName outDir =
239240
benchmark = opts |> hasFlag "--benchmark"
240241
optimize = opts |> hasFlag "--optimize"
241242
// sourceMaps = opts |> hasFlag "--sourceMaps"
243+
eraseTypes = opts |> hasFlag "--eraseTypes"
242244
typedArrays = opts |> tryFlag "--typedArrays"
243245
|> Option.defaultValue (opts |> hasFlag "--typescript" |> not)
244246
typescript = opts |> hasFlag "--typescript"

‎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
@@ -64,7 +64,9 @@ type IFableManager =
6464
abstract GetToolTipText: parseResults: IParseResults * line: int * col: int * lineText: string -> string[]
6565
abstract GetCompletionsAtLocation: parseResults: IParseResults * line: int * col: int * lineText: string -> Completion[]
6666
abstract CompileToBabelAst: fableLibrary: string * parseResults: IParseResults * fileName: string
67+
* ?eraseTypes: bool
6768
* ?typedArrays: bool
68-
* ?typescript: bool -> IBabelResult
69+
* ?typescript: bool
70+
-> IBabelResult
6971
abstract PrintBabelAst: babelResult: IBabelResult * IWriter -> Async<unit>
7072
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
@@ -6,6 +6,7 @@ type CmdLineOptions = {
66
benchmark: bool
77
optimize: bool
88
// sourceMaps: bool
9+
eraseTypes: bool
910
typedArrays: bool
1011
typescript: bool
1112
printAst: bool

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

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

146146
let parseFable (res, fileName) =
147147
fable.CompileToBabelAst(libDir, res, fileName,
148+
eraseTypes = options.eraseTypes,
148149
typedArrays = options.typedArrays,
149150
typescript = options.typescript)
150151

@@ -229,6 +230,7 @@ let run opts projectFileName outDir =
229230
benchmark = opts |> hasFlag "--benchmark"
230231
optimize = opts |> hasFlag "--optimize"
231232
// sourceMaps = opts |> hasFlag "--sourceMaps"
233+
eraseTypes = opts |> hasFlag "--eraseTypes"
232234
typedArrays = opts |> tryFlag "--typedArrays"
233235
|> Option.defaultValue (opts |> hasFlag "--typescript" |> not)
234236
typescript = opts |> hasFlag "--typescript"

‎src/fable-standalone/test/bench-compiler/package.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
"build-opt": "npm run build --optimize",
1212
"postbuild": "npm run rollup-bundle",
1313

14+
"prebuild-dotnet-erased": "git clean -fdX && npm run build-lib -- --eraseTypes",
15+
"build-dotnet-erased": "dotnet run -c Release bench-compiler.fsproj out-node --fableLib out-lib --eraseTypes",
16+
"postbuild-dotnet-erased": "npm run rollup-bundle",
17+
1418
"build-node": "node dist/bundle.js bench-compiler.fsproj out-node2",
1519
"build-node-es": "node out-node/app.js bench-compiler.fsproj out-node2",
1620
"benchmark": "node dist/bundle.js bench-compiler.fsproj out-node2 --benchmark",
@@ -41,6 +45,12 @@
4145
"build-test-node-ts": "npm run build-test-node --typescript",
4246
"test": "node ./out-test/src/test.js",
4347

48+
"prebuild-test-erased": "git clean -fdX && npm run build-lib -- --eraseTypes",
49+
"build-test-erased": "dotnet run -c Release ../../../../../fable-test/fable-test.fsproj out-test --fableLib out-lib --eraseTypes",
50+
51+
"prebuild-tests-erased": "git clean -fdX && npm run build-lib -- --eraseTypes",
52+
"build-tests-erased": "dotnet run -c Release ../../../../tests/Main/Fable.Tests.fsproj out-tests --fableLib out-lib --eraseTypes",
53+
4454
"prebuild-tests": "git clean -fdX && npm run build-lib",
4555
"prebuild-tests-ts": "git clean -fdX && npm run build-lib-ts",
4656
"build-tests": "dotnet run -c Release ../../../../tests/Main/Fable.Tests.fsproj out-tests --fableLib out-lib",

0 commit comments

Comments
 (0)