Merge pull request #53 from edgarfgp/unify-unions

Simplify union definitions
edgarfgp · Feb 1, 2024 · 06a0948 · 06a0948
2 parents d59d6da + 5852e2d
commit 06a0948
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 350 deletions.
diff --git a/src/Fabulous.AST.Tests/Fabulous.AST.Tests.fsproj b/src/Fabulous.AST.Tests/Fabulous.AST.Tests.fsproj
@@ -26,7 +26,6 @@
         <Compile Include="Members\InterfaceMember.fs" />
         <Compile Include="Members\AbstractMember.fs" />
         <Compile Include="TypeDefinitions\Union.fs" />
-        <Compile Include="TypeDefinitions\GenericUnion.fs" />
         <Compile Include="TypeDefinitions\Abbrev.fs" />
         <Compile Include="TypeDefinitions\UnitsOfMeasure.fs" />
         <Compile Include="TypeDefinitions\Enum.fs" />

diff --git a/src/Fabulous.AST.Tests/TypeDefinitions/GenericUnion.fs b/src/Fabulous.AST.Tests/TypeDefinitions/GenericUnion.fs
diff --git a/src/Fabulous.AST.Tests/TypeDefinitions/Union.fs b/src/Fabulous.AST.Tests/TypeDefinitions/Union.fs
@@ -169,3 +169,102 @@ type Colors = | Red
 [<Test>]
 type Colors = | [<Obsolete; Test>] Red
 """
+
+module GenericUnion =
+
+    [<Test>]
+    let ``Produces an union with TypeParams`` () =
+        AnonymousModule() {
+            GenericUnion("Colors", [ "'other" ]) {
+                UnionParameterizedCase("Red") {
+                    Field("a", CommonType.String)
+                    Field("b", CommonType.mkLongIdent("'other"))
+                }
+
+                UnionCase("Green")
+                UnionCase("Blue")
+                UnionCase("Yellow")
+            }
+        }
+
+        |> produces
+            """
+
+type Colors<'other> =
+    | Red of a: string * b: 'other
+    | Green
+    | Blue
+    | Yellow
+
+"""
+
+    [<Test>]
+    let ``Produces an union with TypeParams and interface member`` () =
+        AnonymousModule() {
+            Interface("IMyInterface") {
+                let parameters = [ CommonType.Unit ]
+                AbstractCurriedMethodMember("GetValue", parameters, CommonType.String)
+            }
+
+            (GenericUnion("Colors", [ "'other" ]) {
+                UnionParameterizedCase("Red") {
+                    Field("a", CommonType.String)
+                    Field("b", CommonType.mkLongIdent("'other"))
+                }
+
+                UnionCase("Green")
+                UnionCase("Blue")
+                UnionCase("Yellow")
+            })
+                .members() {
+                let expr = Expr.Constant(Constant.FromText(SingleTextNode("\"\"", Range.Zero)))
+
+                InterfaceMember(CommonType.mkLongIdent("IMyInterface")) {
+                    MethodMember("x.GetValue") { EscapeHatch(expr) }
+                }
+            }
+        }
+
+        |> produces
+            """
+type IMyInterface =
+    abstract member GetValue: unit -> string
+
+type Colors<'other> =
+    | Red of a: string * b: 'other
+    | Green
+    | Blue
+    | Yellow
+
+    interface IMyInterface with
+        member x.GetValue() = ""
+
+"""
+
+    [<Test>]
+    let ``Produces an struct union with TypeParams`` () =
+        AnonymousModule() {
+            (GenericUnion("Colors", [ "'other" ]) {
+                UnionParameterizedCase("Red") {
+                    Field("a", CommonType.String)
+                    Field("b", CommonType.mkLongIdent("'other"))
+                }
+
+                UnionCase("Green")
+                UnionCase("Blue")
+                UnionCase("Yellow")
+            })
+                .attributes([ "Struct" ])
+
+        }
+
+        |> produces
+            """
+[<Struct>]
+type Colors<'other> =
+    | Red of a: string * b: 'other
+    | Green
+    | Blue
+    | Yellow
+
+"""
diff --git a/src/Fabulous.AST/Fabulous.AST.fsproj b/src/Fabulous.AST/Fabulous.AST.fsproj
@@ -66,7 +66,6 @@
         <Compile Include="Widgets\TypeDefinitions\Abbrev.fs" />
         <Compile Include="Widgets\TypeDefinitions\UnitsOfMeasure.fs" />
         <Compile Include="Widgets\TypeDefinitions\Union.fs" />
-        <Compile Include="Widgets\TypeDefinitions\GenericUnion.fs" />
         <Compile Include="Widgets\TypeDefinitions\Record.fs" />
         <Compile Include="Widgets\TypeDefinitions\Interface.fs" />
         <Compile Include="Widgets\TypeDefinitions\Class.fs" />