Use WidgetBuilder for Exprs and Patterns for simplicity

CHANGELOG.md

@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 _No unreleased changes_
 
+## [1.0.0-pre2] - 2024-03-27
+
+### Changed
+- Use `WidgetBuilder` for `Expr` and `Pattern` for simplicity by @edgarfgp in https://github.com/edgarfgp/Fabulous.AST/pull/79
+
 ## [1.0.0-pre1] - 2024-03-25
 
 ### Added

docs/widgets/records.fsx

@@ -65,11 +65,11 @@ Oak() {
                   Method(
                       "Create",
                       parameters,
-                      RecordExpr() {
-                          RecordFieldExpr("Name", ConstantExpr(Unquoted "name"))
-                          RecordFieldExpr("Age", ConstantExpr(Unquoted "age"))
-                          RecordFieldExpr("Address", ConstantExpr(Unquoted "address"))
-                      }
+                      RecordExpr(
+                          [ RecordFieldExpr("Name", ConstantExpr(Unquoted "name"))
+                            RecordFieldExpr("Age", ConstantExpr(Unquoted "age"))
+                            RecordFieldExpr("Address", ConstantExpr(Unquoted "address")) ]
+                      )
                   )
                       .toStatic ()
 

docs/widgets/unions.fsx

@@ -62,20 +62,18 @@ Oak() {
                   Method(
                       "this.GetColor",
                       ParameterPat("c", "Colors"),
-                      MatchExpr(Unquoted("c")) {
-                          MatchClauseExpr(Unquoted("Red"), Quoted "Red")
-                          MatchClauseExpr(NamedPat("Green"), Quoted "Green")
-                          MatchClauseExpr(Unquoted("Blue"), Quoted "Blue")
-                          MatchClauseExpr(NamedPat("Yellow"), ConstantExpr(Quoted "Yellow"))
-                      }
+                      MatchExpr(
+                          Unquoted("c"),
+                          [ MatchClauseExpr(Unquoted("Red"), Quoted "Red")
+                            MatchClauseExpr(NamedPat("Green"), Quoted "Green")
+                            MatchClauseExpr(Unquoted("Blue"), Quoted "Blue")
+                            MatchClauseExpr(NamedPat("Yellow"), ConstantExpr(Quoted "Yellow")) ]
+                      )
                   ) ]
             )
 
         (Union("Colors2") {
-            UnionParamsCase("Red") {
-                Field("a", LongIdent("string"))
-                Field("b", LongIdent "'other")
-            }
+            UnionCase("Red", [ Field("a", LongIdent("string")); Field("b", LongIdent "'other") ])
 
             UnionCase("Green")
             UnionCase("Blue")

src/Fabulous.AST.Tests/Expressions/Conditionals.fs

@@ -62,17 +62,18 @@ if x = 12 then
 
                 Value(
                     "res3",
-                    IfThenElifExpr(ConstantExpr(ConstantUnit())) {
-                        IfThenExpr(
-                            InfixAppExpr(ConstantExpr(Unquoted "x"), "=", ConstantExpr(Unquoted "12")),
-                            ConstantExpr(ConstantUnit())
-                        )
-
-                        ElIfThenExpr(
-                            InfixAppExpr(ConstantExpr(Constant(Unquoted "x")), "=", ConstantExpr(Unquoted "11")),
-                            ConstantExpr(ConstantUnit())
-                        )
-                    }
+                    IfThenElifExpr(
+                        [ IfThenExpr(
+                              InfixAppExpr(ConstantExpr(Unquoted "x"), "=", ConstantExpr(Unquoted "12")),
+                              ConstantExpr(ConstantUnit())
+                          )
+
+                          ElIfThenExpr(
+                              InfixAppExpr(ConstantExpr(Constant(Unquoted "x")), "=", ConstantExpr(Unquoted "11")),
+                              ConstantExpr(ConstantUnit())
+                          ) ],
+                        ConstantExpr(ConstantUnit())
+                    )
                 )
 
             }
@@ -179,17 +180,17 @@ module IfThenElif =
     let ``Produces If Then Elif Then expression with widgets``() =
         Oak() {
             AnonymousModule() {
-                IfThenElifExpr() {
-                    IfThenExpr(
-                        InfixAppExpr(ConstantExpr(Unquoted "x"), "=", ConstantExpr(Unquoted "12")),
-                        ConstantExpr(ConstantUnit())
-                    )
-
-                    ElIfThenExpr(
-                        InfixAppExpr(ConstantExpr(Constant(Unquoted "x")), "=", ConstantExpr(Unquoted "11")),
-                        ConstantExpr(ConstantUnit())
-                    )
-                }
+                IfThenElifExpr(
+                    [ IfThenExpr(
+                          InfixAppExpr(ConstantExpr(Unquoted "x"), "=", ConstantExpr(Unquoted "12")),
+                          ConstantExpr(ConstantUnit())
+                      )
+
+                      ElIfThenExpr(
+                          InfixAppExpr(ConstantExpr(Constant(Unquoted "x")), "=", ConstantExpr(Unquoted "11")),
+                          ConstantExpr(ConstantUnit())
+                      ) ]
+                )
             }
         }
         |> produces
@@ -204,17 +205,18 @@ elif x = 11 then
     let ``Produces If Then Elif Then Else expression with widgets``() =
         Oak() {
             AnonymousModule() {
-                IfThenElifExpr(ConstantExpr(ConstantUnit())) {
-                    IfThenExpr(
-                        InfixAppExpr(ConstantExpr(Unquoted "x"), "=", ConstantExpr(Unquoted "12")),
-                        ConstantExpr(ConstantUnit())
-                    )
-
-                    ElIfThenExpr(
-                        InfixAppExpr(ConstantExpr(Unquoted "x"), "=", ConstantExpr(Unquoted "11")),
-                        ConstantExpr(ConstantUnit())
-                    )
-                }
+                IfThenElifExpr(
+                    [ IfThenExpr(
+                          InfixAppExpr(ConstantExpr(Unquoted "x"), "=", ConstantExpr(Unquoted "12")),
+                          ConstantExpr(ConstantUnit())
+                      )
+
+                      ElIfThenExpr(
+                          InfixAppExpr(ConstantExpr(Unquoted "x"), "=", ConstantExpr(Unquoted "11")),
+                          ConstantExpr(ConstantUnit())
+                      ) ],
+                    ConstantExpr(ConstantUnit())
+                )
             }
         }
         |> produces

src/Fabulous.AST.Tests/Expressions/Constant.fs

@@ -29,6 +29,27 @@ let x = "a"
             """
 
 let x = 1.0<cm>
+"""
+
+    [<Fact>]
+    let ``let value with a ConstantExpr expression with ConstantMeasure seq``() =
+        Oak() {
+            AnonymousModule() {
+                Value(
+                    "x",
+                    ConstantExpr(
+                        ConstantMeasure(
+                            Constant(Unquoted "1.0"),
+                            MeasureSeq([ MeasureSingle("cm"); MeasureSingle("/"); MeasureSingle("m") ])
+                        )
+                    )
+                )
+            }
+        }
+        |> produces
+            """
+
+let x = 1.0<cm / m>
 """
 
     [<Fact>]

src/Fabulous.AST.Tests/Expressions/Match.fs

@@ -13,9 +13,10 @@ module Match =
     let ``Match expression``() =
         Oak() {
             AnonymousModule() {
-                MatchExpr(ListExpr([ ConstantExpr(Constant(Unquoted "1")); ConstantExpr(Constant(Unquoted "2")) ])) {
-                    MatchClauseExpr(NamedPat("a"), ConstantExpr(Constant(Unquoted "3")))
-                }
+                MatchExpr(
+                    ListExpr([ ConstantExpr(Constant(Unquoted "1")); ConstantExpr(Constant(Unquoted "2")) ]),
+                    [ MatchClauseExpr(NamedPat("a"), ConstantExpr(Constant(Unquoted "3"))) ]
+                )
             }
         }
         |> produces
@@ -27,7 +28,7 @@ match [ 1; 2 ] with
 
     [<Fact>]
     let ``Match expression 2``() =
-        Oak() { AnonymousModule() { MatchExpr(Unquoted "[ 1; 2 ]") { MatchClauseExpr(Unquoted("a"), Unquoted "3") } } }
+        Oak() { AnonymousModule() { MatchExpr(Unquoted "[ 1; 2 ]", [ MatchClauseExpr(Unquoted("a"), Unquoted "3") ]) } }
         |> produces
             """
 

src/Fabulous.AST.Tests/Expressions/Record.fs

@@ -18,7 +18,7 @@ module RecordExpr =
     [<InlineData("class", "``class``")>]
     [<InlineData("2013", "``2013``")>]
     let ``Produces an AnonRecordExpr with fields with backticks`` (value: string) (expected: string) =
-        Oak() { AnonymousModule() { AnonRecordExpr() { RecordFieldExpr(value, ConstantExpr(Unquoted "1")) } } }
+        Oak() { AnonymousModule() { AnonRecordExpr([ RecordFieldExpr(value, ConstantExpr(Unquoted "1")) ]) } }
         |> produces
             $$"""
 
@@ -33,7 +33,7 @@ module RecordExpr =
     [<InlineData("net6.0", "``net6.0``")>]
     [<InlineData(" net6.0 ", "``net6.0``")>]
     let ``Produces an RecordExpr with fields with backticks`` (value: string) (expected: string) =
-        Oak() { AnonymousModule() { RecordExpr() { RecordFieldExpr(value, ConstantExpr(Unquoted "1")) } } }
+        Oak() { AnonymousModule() { RecordExpr([ RecordFieldExpr(value, ConstantExpr(Unquoted "1")) ]) } }
         |> produces
             $$"""
 
@@ -43,7 +43,7 @@ module RecordExpr =
 
     [<Fact>]
     let ``RecordExpr expression``() =
-        Oak() { AnonymousModule() { RecordExpr() { RecordFieldExpr("A", ConstantExpr(Unquoted "1")) } } }
+        Oak() { AnonymousModule() { RecordExpr([ RecordFieldExpr("A", ConstantExpr(Unquoted "1")) ]) } }
         |> produces
             """
 { A = 1 }
@@ -53,7 +53,7 @@ module RecordExpr =
     let ``RecordExpr expression with copy info``() =
         Oak() {
             AnonymousModule() {
-                RecordExpr(ConstantExpr(Unquoted "A")) { RecordFieldExpr("B", ConstantExpr(Unquoted "1")) }
+                RecordExpr(ConstantExpr(Unquoted "A"), [ RecordFieldExpr("B", ConstantExpr(Unquoted "1")) ])
             }
         }
         |> produces
@@ -63,7 +63,7 @@ module RecordExpr =
 
     [<Fact>]
     let ``AnonRecordExpr expression``() =
-        Oak() { AnonymousModule() { AnonRecordExpr() { RecordFieldExpr("A", ConstantExpr(Unquoted "1")) } } }
+        Oak() { AnonymousModule() { AnonRecordExpr([ RecordFieldExpr("A", ConstantExpr(Unquoted "1")) ]) } }
         |> produces
             """
 {| A = 1 |}
@@ -73,7 +73,7 @@ module RecordExpr =
     let ``AnonRecordExpr expression with copy info``() =
         Oak() {
             AnonymousModule() {
-                AnonRecordExpr(ConstantExpr(Unquoted "A")) { RecordFieldExpr("B", ConstantExpr(Unquoted "1")) }
+                AnonRecordExpr(ConstantExpr(Unquoted "A"), [ RecordFieldExpr("B", ConstantExpr(Unquoted "1")) ])
             }
         }
         |> produces

src/Fabulous.AST.Tests/MemberDefinitions/InterfaceMember.fs

@@ -21,9 +21,10 @@ module InterfaceMembers =
                 })
                     .typeParams([ "'other" ])
                     .interfaces(
-                        [ InterfaceMember("IMyInterface") {
-                              Method("x.GetValue", UnitPat(), ConstantExpr(Unquoted "x.MyField2"))
-                          } ]
+                        [ InterfaceMember(
+                              "IMyInterface",
+                              [ Method("x.GetValue", UnitPat(), ConstantExpr(Unquoted "x.MyField2")) ]
+                          ) ]
                     )
             }
         }
@@ -58,9 +59,10 @@ type Colors<'other> =
                     Field("MyField2", LongIdent("string"))
                 })
                     .interfaces(
-                        [ InterfaceMember("IMyInterface") {
-                              Method("x.GetValue", UnitPat(), ConstantExpr(Unquoted "x.MyField2"))
-                          } ]
+                        [ InterfaceMember(
+                              "IMyInterface",
+                              [ Method("x.GetValue", UnitPat(), ConstantExpr(Unquoted "x.MyField2")) ]
+                          ) ]
                     )
             }
         }
@@ -85,7 +87,7 @@ type MyRecord =
             AnonymousModule() {
                 Interface("Meh") { AbstractProperty("Name", String()) }
 
-                Class("Person") { InterfaceMember("Meh") { Property("this.Name", ConstantExpr(Quoted "23")) } }
+                Class("Person") { InterfaceMember("Meh", [ Property("this.Name", ConstantExpr(Quoted "23")) ]) }
             }
         }
         |> produces

src/Fabulous.AST.Tests/ModuleDeclarations/TopLevelBindings/Function.fs

@@ -104,11 +104,7 @@ let x (i: int, j: string, k) = ()
             AnonymousModule() {
                 Function(
                     "x",
-                    LongIdentPat() {
-                        ParameterPat("i")
-                        ParameterPat("j")
-                        ParameterPat("k")
-                    },
+                    LongIdentPat([ ParameterPat("i"); ParameterPat("j"); ParameterPat("k") ]),
                     ConstantExpr(ConstantUnit())
                 )
             }