Initial support for unit of measures

src/Fabulous.AST.Tests/Fabulous.AST.Tests.fsproj

@@ -28,6 +28,7 @@
         <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" />
         <Compile Include="TypeDefinitions\Record.fs" />
         <Compile Include="TypeDefinitions\GenericRecord.fs" />

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

@@ -18,14 +18,16 @@ module InterfaceMembers =
 
             (GenericRecord("Colors", [ "'other" ]) {
                 Field("Green", CommonType.String)
-                Field("Blue", CommonType.mkType("'other"))
+                Field("Blue", CommonType.mkLongIdent("'other"))
                 Field("Yellow", CommonType.Int32)
             })
                 .members() {
                 let expr =
                     Expr.Constant(Constant.FromText(SingleTextNode("x.MyField2", Range.Zero)))
 
-                InterfaceMember(CommonType.mkType("IMyInterface")) { MethodMember("x.GetValue") { EscapeHatch(expr) } }
+                InterfaceMember(CommonType.mkLongIdent("IMyInterface")) {
+                    MethodMember("x.GetValue") { EscapeHatch(expr) }
+                }
             }
         }
 
@@ -61,7 +63,9 @@ type Colors<'other> =
                 let expr =
                     Expr.Constant(Constant.FromText(SingleTextNode("x.MyField2", Range.Zero)))
 
-                InterfaceMember(CommonType.mkType("IMyInterface")) { MethodMember("x.GetValue") { EscapeHatch(expr) } }
+                InterfaceMember(CommonType.mkLongIdent("IMyInterface")) {
+                    MethodMember("x.GetValue") { EscapeHatch(expr) }
+                }
             }
         }
         |> produces
@@ -86,7 +90,7 @@ type MyRecord =
             Interface("Meh") { AbstractPropertyMember("Name", CommonType.String) }
 
             (Class("Person") {
-                InterfaceMember(CommonType.mkType("Meh")) { PropertyMember("this.Name") { EscapeHatch(expr) } }
+                InterfaceMember(CommonType.mkLongIdent("Meh")) { PropertyMember("this.Name") { EscapeHatch(expr) } }
             })
                 .implicitConstructorParameters([])
         }

src/Fabulous.AST.Tests/Members/MethodMember.fs

@@ -14,7 +14,7 @@ module MethodMembers =
         AnonymousModule() {
             (GenericRecord("Colors", [ "'other" ]) {
                 Field("Green", CommonType.String)
-                Field("Blue", CommonType.mkType("'other"))
+                Field("Blue", CommonType.mkLongIdent("'other"))
                 Field("Yellow", CommonType.Int32)
             })
                 .members() {
@@ -44,7 +44,7 @@ type Colors<'other> =
         AnonymousModule() {
             (GenericRecord("Colors", [ "'other" ]) {
                 Field("Green", CommonType.String)
-                Field("Blue", CommonType.mkType("'other"))
+                Field("Blue", CommonType.mkLongIdent("'other"))
                 Field("Yellow", CommonType.Int32)
             })
                 .members() {
@@ -272,7 +272,7 @@ type Person =
             (GenericUnion("Colors", [ "'other" ]) {
                 UnionParameterizedCase("Red") {
                     Field("a", CommonType.String)
-                    Field("b", CommonType.mkType "'other")
+                    Field("b", CommonType.mkLongIdent "'other")
                 }
 
                 UnionCase("Green")

src/Fabulous.AST.Tests/Members/PropertyMember.fs

@@ -55,7 +55,7 @@ type Colors =
         AnonymousModule() {
             (GenericRecord("Colors", [ "'other" ]) {
                 Field("Green", CommonType.String)
-                Field("Blue", CommonType.mkType("'other"))
+                Field("Blue", CommonType.mkLongIdent("'other"))
                 Field("Yellow", CommonType.Int32)
             })
                 .members() {
@@ -81,7 +81,7 @@ type Colors<'other> =
         AnonymousModule() {
             (GenericRecord("Colors", [ "'other" ]) {
                 Field("Green", CommonType.String)
-                Field("Blue", CommonType.mkType("'other"))
+                Field("Blue", CommonType.mkLongIdent("'other"))
                 Field("Yellow", CommonType.Int32)
             })
                 .members() {
@@ -258,7 +258,7 @@ type Person =
         let constExpr = Expr.Constant(Constant.FromText(SingleTextNode.Create("\"name\"")))
 
         AnonymousModule() {
-            (GenericRecord("Person", [ "'other" ]) { Field("Name", CommonType.mkType("'other")) })
+            (GenericRecord("Person", [ "'other" ]) { Field("Name", CommonType.mkLongIdent("'other")) })
                 .members() {
                 PropertyMember("this.Name") { EscapeHatch(constExpr) }
             }
@@ -317,7 +317,7 @@ type Person =
             (GenericUnion("Colors", [ "'other" ]) {
                 UnionParameterizedCase("Red") {
                     Field("a", CommonType.String)
-                    Field("b", CommonType.mkType "'other")
+                    Field("b", CommonType.mkLongIdent "'other")
                 }
 
                 UnionCase("Green")
@@ -349,7 +349,7 @@ type Colors<'other> =
             (GenericUnion("Colors", [ "'other" ]) {
                 UnionParameterizedCase("Red") {
                     Field("a", CommonType.String)
-                    Field("b", CommonType.mkType "'other")
+                    Field("b", CommonType.mkLongIdent "'other")
                 }
 
                 UnionCase("Green")

src/Fabulous.AST.Tests/Namespaces/Namespace.fs

@@ -117,9 +117,9 @@ module AST =
                     let rec mkType value =
                         match value with
                         | [] -> failwith "unexpected"
-                        | [ single ] -> CommonType.mkType single
+                        | [ single ] -> CommonType.mkLongIdent single
                         | head :: tail ->
-                            TypeAppPostFixNode(mkType tail, CommonType.mkType head, Range.Zero)
+                            TypeAppPostFixNode(mkType tail, CommonType.mkLongIdent head, Range.Zero)
                             |> Type.AppPostfix
 
                     let myFields =

src/Fabulous.AST.Tests/TypeDefinitions/GenericRecord.fs

@@ -13,7 +13,7 @@ module GenericRecord =
         AnonymousModule() {
             GenericRecord("Colors", [ "'other" ]) {
                 Field("Green", CommonType.String)
-                Field("Blue", CommonType.mkType("'other"))
+                Field("Blue", CommonType.mkLongIdent("'other"))
                 Field("Yellow", CommonType.Int32)
             }
         }
@@ -33,7 +33,7 @@ type Colors<'other> =
         AnonymousModule() {
             (GenericRecord("Colors", [ "'other" ]) {
                 Field("Green", CommonType.String)
-                Field("Blue", CommonType.mkType("'other"))
+                Field("Blue", CommonType.mkLongIdent("'other"))
                 Field("Yellow", CommonType.Int32)
             })
                 .isStruct()

src/Fabulous.AST.Tests/TypeDefinitions/GenericUnion.fs

@@ -17,7 +17,7 @@ module GenericUnion =
             GenericUnion("Colors", [ "'other" ]) {
                 UnionParameterizedCase("Red") {
                     Field("a", CommonType.String)
-                    Field("b", CommonType.mkType("'other"))
+                    Field("b", CommonType.mkLongIdent("'other"))
                 }
 
                 UnionCase("Green")
@@ -48,7 +48,7 @@ type Colors<'other> =
             (GenericUnion("Colors", [ "'other" ]) {
                 UnionParameterizedCase("Red") {
                     Field("a", CommonType.String)
-                    Field("b", CommonType.mkType("'other"))
+                    Field("b", CommonType.mkLongIdent("'other"))
                 }
 
                 UnionCase("Green")
@@ -58,7 +58,9 @@ type Colors<'other> =
                 .members() {
                 let expr = Expr.Constant(Constant.FromText(SingleTextNode("\"\"", Range.Zero)))
 
-                InterfaceMember(CommonType.mkType("IMyInterface")) { MethodMember("x.GetValue") { EscapeHatch(expr) } }
+                InterfaceMember(CommonType.mkLongIdent("IMyInterface")) {
+                    MethodMember("x.GetValue") { EscapeHatch(expr) }
+                }
             }
         }
 
@@ -84,7 +86,7 @@ type Colors<'other> =
             (GenericUnion("Colors", [ "'other" ]) {
                 UnionParameterizedCase("Red") {
                     Field("a", CommonType.String)
-                    Field("b", CommonType.mkType("'other"))
+                    Field("b", CommonType.mkLongIdent("'other"))
                 }
 
                 UnionCase("Green")

src/Fabulous.AST.Tests/TypeDefinitions/Union.fs

@@ -51,7 +51,9 @@ type Colors =
                 .members() {
                 let expr = Expr.Constant(Constant.FromText(SingleTextNode("\"\"", Range.Zero)))
 
-                InterfaceMember(CommonType.mkType("IMyInterface")) { MethodMember("x.GetValue") { EscapeHatch(expr) } }
+                InterfaceMember(CommonType.mkLongIdent("IMyInterface")) {
+                    MethodMember("x.GetValue") { EscapeHatch(expr) }
+                }
             }
 
         }

src/Fabulous.AST.Tests/TypeDefinitions/UnitsOfMeasure.fs

@@ -0,0 +1,107 @@
+namespace Fabulous.AST.Tests.TypeDefinitions
+
+open Fabulous.AST.Tests
+open NUnit.Framework
+
+open Fabulous.AST
+
+open type Fabulous.AST.Ast
+open type Fantomas.Core.SyntaxOak.Type
+
+
+module UnitsOfMeasure =
+
+    [<Test>]
+    let ``Produces type Unit of measure`` () =
+        AnonymousModule() {
+            UnitsOfMeasure("cm").xmlDocs([ "Cm, centimeters." ])
+
+            UnitsOfMeasure("ml", MeasurePower("cm", "3"))
+                .xmlDocs([ "Ml, milliliters." ])
+
+            UnitsOfMeasure("g").xmlDocs([ "Mass, grams." ])
+            UnitsOfMeasure("kg").xmlDocs([ "Mass, kilograms." ])
+            UnitsOfMeasure("lb").xmlDocs([ "Weight, pounds." ])
+            UnitsOfMeasure("m").xmlDocs([ "Distance, meters." ])
+            UnitsOfMeasure("cm").xmlDocs([ "Distance, cm" ])
+            UnitsOfMeasure("inch").xmlDocs([ "Distance, inches." ])
+            UnitsOfMeasure("ft").xmlDocs([ "Distance, feet" ])
+            UnitsOfMeasure("s").xmlDocs([ "Time, seconds." ])
+
+            UnitsOfMeasure("N", Tuple("kg", "m", MeasurePower([ "s" ], "2")))
+                .xmlDocs([ "Force, Newtons." ])
+
+            UnitsOfMeasure("bar").xmlDocs([ "Pressure, bar." ])
+
+            UnitsOfMeasure("Pa", Tuple("N", MeasurePower([ "m" ], "2")))
+                .xmlDocs([ "Pressure, Pascals" ])
+
+            UnitsOfMeasure("ml").xmlDocs([ "Volume, milliliters." ])
+
+            UnitsOfMeasure("L").xmlDocs([ "Volume, liters." ])
+        }
+
+        |> produces
+            """
+
+/// Cm, centimeters.
+[<Measure>]
+type cm
+
+/// Ml, milliliters.
+[<Measure>]
+type ml = cm^3
+
+/// Mass, grams.
+[<Measure>]
+type g
+
+/// Mass, kilograms.
+[<Measure>]
+type kg
+
+/// Weight, pounds.
+[<Measure>]
+type lb
+
+/// Distance, meters.
+[<Measure>]
+type m
+
+/// Distance, cm
+[<Measure>]
+type cm
+
+/// Distance, inches.
+[<Measure>]
+type inch
+
+/// Distance, feet
+[<Measure>]
+type ft
+
+/// Time, seconds.
+[<Measure>]
+type s
+
+/// Force, Newtons.
+[<Measure>]
+type N = kg m / s^2
+
+/// Pressure, bar.
+[<Measure>]
+type bar
+
+/// Pressure, Pascals
+[<Measure>]
+type Pa = N / m^2
+
+/// Volume, milliliters.
+[<Measure>]
+type ml
+
+/// Volume, liters.
+[<Measure>]
+type L
+
+"""

src/Fabulous.AST.Tests/WidgetTests.fs

@@ -13,7 +13,7 @@ module WidgetTests =
         let source =
             """
 
-open type ABC
+[<Measure>] type ml = cm^3
 
 """
 

src/Fabulous.AST/Fabulous.AST.fsproj

@@ -64,6 +64,7 @@
         <Compile Include="Widgets\TypeDefinitions\EnumCase.fs" />
         <Compile Include="Widgets\TypeDefinitions\Enum.fs" />
         <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" />