Update changelog (#152)

CHANGELOG.md

@@ -1,5 +1,14 @@
 Notable changes are recorded here.
 
+# WoofWare.Myriad.Plugins 2.1.33
+
+`JsonParse` can now deserialize the discriminated unions which `JsonSerialize` wrote out.
+
+# WoofWare.Myriad.Plugins 2.1.32, WoofWare.Myriad.Plugins.Attributes 3.1.4
+
+`JsonSerialize` can now serialize many discriminated unions.
+(This operation is inherently opinionated, because JSON does not model discriminated unions.)
+
 # WoofWare.Myriad.Plugins 2.1.20, WoofWare.Myriad.Plugins.Attributes 3.0.1
 
 We now bundle copies of the RestEase attributes in `WoofWare.Myriad.Plugins.Attributes`, in case you don't want to take a dependency on RestEase.

ConsumePlugin/GeneratedJson.fs

@@ -13,7 +13,7 @@ namespace ConsumePlugin
 module InnerType =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : InnerType =
-        let Thing =
+        let arg_0 =
             (match node.[(Literals.something)] with
              | null ->
                  raise (
@@ -26,7 +26,7 @@ module InnerType =
                 .GetValue<string> ()
 
         {
-            Thing = Thing
+            Thing = arg_0
         }
 namespace ConsumePlugin
 
@@ -36,7 +36,7 @@ namespace ConsumePlugin
 module JsonRecordType =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JsonRecordType =
-        let F =
+        let arg_5 =
             (match node.["f"] with
              | null ->
                  raise (
@@ -49,7 +49,7 @@ module JsonRecordType =
             |> Seq.map (fun elt -> elt.AsValue().GetValue<int> ())
             |> Array.ofSeq
 
-        let E =
+        let arg_4 =
             (match node.["e"] with
              | null ->
                  raise (
@@ -62,7 +62,7 @@ module JsonRecordType =
             |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> Array.ofSeq
 
-        let D =
+        let arg_3 =
             InnerType.jsonParse (
                 match node.["d"] with
                 | null ->
@@ -74,7 +74,7 @@ module JsonRecordType =
                 | v -> v
             )
 
-        let C =
+        let arg_2 =
             (match node.["hi"] with
              | null ->
                  raise (
@@ -87,7 +87,7 @@ module JsonRecordType =
             |> Seq.map (fun elt -> elt.AsValue().GetValue<int> ())
             |> List.ofSeq
 
-        let B =
+        let arg_1 =
             (match node.["another-thing"] with
              | null ->
                  raise (
@@ -99,7 +99,7 @@ module JsonRecordType =
                 .AsValue()
                 .GetValue<string> ()
 
-        let A =
+        let arg_0 =
             (match node.["a"] with
              | null ->
                  raise (
@@ -112,12 +112,12 @@ module JsonRecordType =
                 .GetValue<int> ()
 
         {
-            A = A
+            A = arg_0
-            B = B
+            B = arg_1
-            C = C
+            C = arg_2
-            D = D
+            D = arg_3
-            E = E
+            E = arg_4
-            F = F
+            F = arg_5
         }
 namespace ConsumePlugin
 
@@ -129,9 +129,9 @@ module ToGetExtensionMethodJsonParseExtension =
 
         /// Parse from a JSON node.
         static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : ToGetExtensionMethod =
-            let Whiskey = System.Numerics.BigInteger.Parse (node.["whiskey"].ToJsonString ())
+            let arg_20 = System.Numerics.BigInteger.Parse (node.["whiskey"].ToJsonString ())
 
-            let Victor =
+            let arg_19 =
                 (match node.["victor"] with
                  | null ->
                      raise (
@@ -143,7 +143,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Char> ()
 
-            let Uniform =
+            let arg_18 =
                 (match node.["uniform"] with
                  | null ->
                      raise (
@@ -155,7 +155,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Decimal> ()
 
-            let Tango =
+            let arg_17 =
                 (match node.["tango"] with
                  | null ->
                      raise (
@@ -167,7 +167,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.SByte> ()
 
-            let Quebec =
+            let arg_16 =
                 (match node.["quebec"] with
                  | null ->
                      raise (
@@ -179,7 +179,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Byte> ()
 
-            let Papa =
+            let arg_15 =
                 (match node.["papa"] with
                  | null ->
                      raise (
@@ -191,7 +191,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Byte> ()
 
-            let Oscar =
+            let arg_14 =
                 (match node.["oscar"] with
                  | null ->
                      raise (
@@ -203,7 +203,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.SByte> ()
 
-            let November =
+            let arg_13 =
                 (match node.["november"] with
                  | null ->
                      raise (
@@ -215,7 +215,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.UInt16> ()
 
-            let Mike =
+            let arg_12 =
                 (match node.["mike"] with
                  | null ->
                      raise (
@@ -227,7 +227,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Int16> ()
 
-            let Lima =
+            let arg_11 =
                 (match node.["lima"] with
                  | null ->
                      raise (
@@ -239,7 +239,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.UInt32> ()
 
-            let Kilo =
+            let arg_10 =
                 (match node.["kilo"] with
                  | null ->
                      raise (
@@ -251,7 +251,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Int32> ()
 
-            let Juliette =
+            let arg_9 =
                 (match node.["juliette"] with
                  | null ->
                      raise (
@@ -263,7 +263,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.UInt32> ()
 
-            let India =
+            let arg_8 =
                 (match node.["india"] with
                  | null ->
                      raise (
@@ -275,7 +275,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<int> ()
 
-            let Hotel =
+            let arg_7 =
                 (match node.["hotel"] with
                  | null ->
                      raise (
@@ -287,7 +287,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.UInt64> ()
 
-            let Golf =
+            let arg_6 =
                 (match node.["golf"] with
                  | null ->
                      raise (
@@ -299,7 +299,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Int64> ()
 
-            let Foxtrot =
+            let arg_5 =
                 (match node.["foxtrot"] with
                  | null ->
                      raise (
@@ -311,7 +311,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Double> ()
 
-            let Echo =
+            let arg_4 =
                 (match node.["echo"] with
                  | null ->
                      raise (
@@ -323,7 +323,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Single> ()
 
-            let Delta =
+            let arg_3 =
                 (match node.["delta"] with
                  | null ->
                      raise (
@@ -335,7 +335,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<System.Single> ()
 
-            let Charlie =
+            let arg_2 =
                 (match node.["charlie"] with
                  | null ->
                      raise (
@@ -347,7 +347,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .AsValue()
                     .GetValue<float> ()
 
-            let Bravo =
+            let arg_1 =
                 (match node.["bravo"] with
                  | null ->
                      raise (
@@ -360,7 +360,7 @@ module ToGetExtensionMethodJsonParseExtension =
                     .GetValue<string> ()
                 |> System.Uri
 
-            let Alpha =
+            let arg_0 =
                 (match node.["alpha"] with
                  | null ->
                      raise (
@@ -373,25 +373,25 @@ module ToGetExtensionMethodJsonParseExtension =
                     .GetValue<string> ()
 
             {
-                Alpha = Alpha
+                Alpha = arg_0
-                Bravo = Bravo
+                Bravo = arg_1
-                Charlie = Charlie
+                Charlie = arg_2
-                Delta = Delta
+                Delta = arg_3
-                Echo = Echo
+                Echo = arg_4
-                Foxtrot = Foxtrot
+                Foxtrot = arg_5
-                Golf = Golf
+                Golf = arg_6
-                Hotel = Hotel
+                Hotel = arg_7
-                India = India
+                India = arg_8
-                Juliette = Juliette
+                Juliette = arg_9
-                Kilo = Kilo
+                Kilo = arg_10
-                Lima = Lima
+                Lima = arg_11
-                Mike = Mike
+                Mike = arg_12
-                November = November
+                November = arg_13
-                Oscar = Oscar
+                Oscar = arg_14
-                Papa = Papa
+                Papa = arg_15
-                Quebec = Quebec
+                Quebec = arg_16
-                Tango = Tango
+                Tango = arg_17
-                Uniform = Uniform
+                Uniform = arg_18
-                Victor = Victor
+                Victor = arg_19
-                Whiskey = Whiskey
+                Whiskey = arg_20
             }

ConsumePlugin/GeneratedMock.fs

@@ -19,9 +19,9 @@ type internal PublicTypeMock =
     /// An implementation where every method throws.
     static member Empty : PublicTypeMock =
         {
-            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem3 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface IPublicType with
@@ -44,9 +44,9 @@ type public PublicTypeInternalFalseMock =
     /// An implementation where every method throws.
     static member Empty : PublicTypeInternalFalseMock =
         {
-            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem3 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface IPublicTypeInternalFalse with
@@ -68,8 +68,8 @@ type internal InternalTypeMock =
     /// An implementation where every method throws.
     static member Empty : InternalTypeMock =
         {
-            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface InternalType with
@@ -90,8 +90,8 @@ type private PrivateTypeMock =
     /// An implementation where every method throws.
     static member Empty : PrivateTypeMock =
         {
-            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface PrivateType with
@@ -112,8 +112,8 @@ type private PrivateTypeInternalFalseMock =
     /// An implementation where every method throws.
     static member Empty : PrivateTypeInternalFalseMock =
         {
-            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface PrivateTypeInternalFalse with
@@ -133,7 +133,7 @@ type internal VeryPublicTypeMock<'a, 'b> =
     /// An implementation where every method throws.
     static member Empty () : VeryPublicTypeMock<'a, 'b> =
         {
-            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface VeryPublicType<'a, 'b> with
@@ -157,12 +157,12 @@ type internal CurriedMock<'a> =
     /// An implementation where every method throws.
     static member Empty () : CurriedMock<'a> =
         {
-            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem3 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem4 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem4 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem5 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem5 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem6 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem6 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface Curried<'a> with
@@ -196,8 +196,8 @@ type internal TypeWithInterfaceMock =
     static member Empty : TypeWithInterfaceMock =
         {
             Dispose = (fun _ -> ())
-            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface TypeWithInterface with

ConsumePlugin/GeneratedPureGymDto.fs

@@ -46,7 +46,7 @@ namespace PureGym
 module GymOpeningHours =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymOpeningHours =
-        let OpeningHours =
+        let arg_1 =
             (match node.["openingHours"] with
              | null ->
                  raise (
@@ -59,7 +59,7 @@ module GymOpeningHours =
             |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> List.ofSeq
 
-        let IsAlwaysOpen =
+        let arg_0 =
             (match node.["isAlwaysOpen"] with
              | null ->
                  raise (
@@ -72,8 +72,8 @@ module GymOpeningHours =
                 .GetValue<bool> ()
 
         {
-            IsAlwaysOpen = IsAlwaysOpen
+            IsAlwaysOpen = arg_0
-            OpeningHours = OpeningHours
+            OpeningHours = arg_1
         }
 namespace PureGym
 
@@ -83,7 +83,7 @@ namespace PureGym
 module GymAccessOptions =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymAccessOptions =
-        let QrCodeAccess =
+        let arg_1 =
             (match node.["qrCodeAccess"] with
              | null ->
                  raise (
@@ -95,7 +95,7 @@ module GymAccessOptions =
                 .AsValue()
                 .GetValue<bool> ()
 
-        let PinAccess =
+        let arg_0 =
             (match node.["pinAccess"] with
              | null ->
                  raise (
@@ -108,8 +108,8 @@ module GymAccessOptions =
                 .GetValue<bool> ()
 
         {
-            PinAccess = PinAccess
+            PinAccess = arg_0
-            QrCodeAccess = QrCodeAccess
+            QrCodeAccess = arg_1
         }
 namespace PureGym
 
@@ -119,7 +119,7 @@ namespace PureGym
 module GymLocation =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymLocation =
-        let Latitude =
+        let arg_1 =
             try
                 (match node.["latitude"] with
                  | null ->
@@ -152,7 +152,7 @@ module GymLocation =
                 else
                     reraise ()
 
-        let Longitude =
+        let arg_0 =
             try
                 (match node.["longitude"] with
                  | null ->
@@ -186,8 +186,8 @@ module GymLocation =
                     reraise ()
 
         {
-            Longitude = Longitude
+            Longitude = arg_0
-            Latitude = Latitude
+            Latitude = arg_1
         }
 namespace PureGym
 
@@ -197,7 +197,7 @@ namespace PureGym
 module GymAddress =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymAddress =
-        let Postcode =
+        let arg_5 =
             (match node.["postcode"] with
              | null ->
                  raise (
@@ -209,12 +209,12 @@ module GymAddress =
                 .AsValue()
                 .GetValue<string> ()
 
-        let County =
+        let arg_4 =
             match node.["county"] with
             | null -> None
             | v -> v.AsValue().GetValue<string> () |> Some
 
-        let Town =
+        let arg_3 =
             (match node.["town"] with
              | null ->
                  raise (
@@ -226,17 +226,17 @@ module GymAddress =
                 .AsValue()
                 .GetValue<string> ()
 
-        let AddressLine3 =
+        let arg_2 =
             match node.["addressLine3"] with
             | null -> None
             | v -> v.AsValue().GetValue<string> () |> Some
 
-        let AddressLine2 =
+        let arg_1 =
             match node.["addressLine2"] with
             | null -> None
             | v -> v.AsValue().GetValue<string> () |> Some
 
-        let AddressLine1 =
+        let arg_0 =
             (match node.["addressLine1"] with
              | null ->
                  raise (
@@ -249,12 +249,12 @@ module GymAddress =
                 .GetValue<string> ()
 
         {
-            AddressLine1 = AddressLine1
+            AddressLine1 = arg_0
-            AddressLine2 = AddressLine2
+            AddressLine2 = arg_1
-            AddressLine3 = AddressLine3
+            AddressLine3 = arg_2
-            Town = Town
+            Town = arg_3
-            County = County
+            County = arg_4
-            Postcode = Postcode
+            Postcode = arg_5
         }
 namespace PureGym
 
@@ -264,7 +264,7 @@ namespace PureGym
 module Gym =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Gym =
-        let ReopenDate =
+        let arg_10 =
             (match node.["reopenDate"] with
              | null ->
                  raise (
@@ -276,7 +276,7 @@ module Gym =
                 .AsValue()
                 .GetValue<string> ()
 
-        let TimeZone =
+        let arg_9 =
             (match node.["timeZone"] with
              | null ->
                  raise (
@@ -288,7 +288,7 @@ module Gym =
                 .AsValue()
                 .GetValue<string> ()
 
-        let Location =
+        let arg_8 =
             GymLocation.jsonParse (
                 match node.["location"] with
                 | null ->
@@ -300,7 +300,7 @@ module Gym =
                 | v -> v
             )
 
-        let AccessOptions =
+        let arg_7 =
             GymAccessOptions.jsonParse (
                 match node.["accessOptions"] with
                 | null ->
@@ -312,7 +312,7 @@ module Gym =
                 | v -> v
             )
 
-        let GymOpeningHours =
+        let arg_6 =
             GymOpeningHours.jsonParse (
                 match node.["gymOpeningHours"] with
                 | null ->
@@ -324,7 +324,7 @@ module Gym =
                 | v -> v
             )
 
-        let EmailAddress =
+        let arg_5 =
             (match node.["emailAddress"] with
              | null ->
                  raise (
@@ -336,7 +336,7 @@ module Gym =
                 .AsValue()
                 .GetValue<string> ()
 
-        let PhoneNumber =
+        let arg_4 =
             (match node.["phoneNumber"] with
              | null ->
                  raise (
@@ -348,7 +348,7 @@ module Gym =
                 .AsValue()
                 .GetValue<string> ()
 
-        let Address =
+        let arg_3 =
             GymAddress.jsonParse (
                 match node.["address"] with
                 | null ->
@@ -360,7 +360,7 @@ module Gym =
                 | v -> v
             )
 
-        let Status =
+        let arg_2 =
             (match node.["status"] with
              | null ->
                  raise (
@@ -372,7 +372,7 @@ module Gym =
                 .AsValue()
                 .GetValue<int> ()
 
-        let Id =
+        let arg_1 =
             (match node.["id"] with
              | null ->
                  raise (
@@ -384,7 +384,7 @@ module Gym =
                 .AsValue()
                 .GetValue<int> ()
 
-        let Name =
+        let arg_0 =
             (match node.["name"] with
              | null ->
                  raise (
@@ -397,17 +397,17 @@ module Gym =
                 .GetValue<string> ()
 
         {
-            Name = Name
+            Name = arg_0
-            Id = Id
+            Id = arg_1
-            Status = Status
+            Status = arg_2
-            Address = Address
+            Address = arg_3
-            PhoneNumber = PhoneNumber
+            PhoneNumber = arg_4
-            EmailAddress = EmailAddress
+            EmailAddress = arg_5
-            GymOpeningHours = GymOpeningHours
+            GymOpeningHours = arg_6
-            AccessOptions = AccessOptions
+            AccessOptions = arg_7
-            Location = Location
+            Location = arg_8
-            TimeZone = TimeZone
+            TimeZone = arg_9
-            ReopenDate = ReopenDate
+            ReopenDate = arg_10
         }
 namespace PureGym
 
@@ -419,7 +419,7 @@ module MemberJsonParseExtension =
 
         /// Parse from a JSON node.
         static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : Member =
-            let MemberStatus =
+            let arg_14 =
                 (match node.["memberStatus"] with
                  | null ->
                      raise (
@@ -431,7 +431,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<int> ()
 
-            let SuspendedReason =
+            let arg_13 =
                 (match node.["suspendedReason"] with
                  | null ->
                      raise (
@@ -443,7 +443,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<int> ()
 
-            let MembershipLevel =
+            let arg_12 =
                 (match node.["membershipLevel"] with
                  | null ->
                      raise (
@@ -455,7 +455,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<int> ()
 
-            let MembershipName =
+            let arg_11 =
                 (match node.["membershipName"] with
                  | null ->
                      raise (
@@ -467,7 +467,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let Postcode =
+            let arg_10 =
                 (match node.["postCode"] with
                  | null ->
                      raise (
@@ -479,7 +479,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let MobileNumber =
+            let arg_9 =
                 (match node.["mobileNumber"] with
                  | null ->
                      raise (
@@ -491,7 +491,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let DateOfBirth =
+            let arg_8 =
                 (match node.["dateofBirth"] with
                  | null ->
                      raise (
@@ -504,7 +504,7 @@ module MemberJsonParseExtension =
                     .GetValue<string> ()
                 |> System.DateOnly.Parse
 
-            let GymAccessPin =
+            let arg_7 =
                 (match node.["gymAccessPin"] with
                  | null ->
                      raise (
@@ -516,7 +516,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let EmailAddress =
+            let arg_6 =
                 (match node.["emailAddress"] with
                  | null ->
                      raise (
@@ -528,7 +528,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let HomeGymName =
+            let arg_5 =
                 (match node.["homeGymName"] with
                  | null ->
                      raise (
@@ -540,7 +540,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let HomeGymId =
+            let arg_4 =
                 (match node.["homeGymId"] with
                  | null ->
                      raise (
@@ -552,7 +552,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<int> ()
 
-            let LastName =
+            let arg_3 =
                 (match node.["lastName"] with
                  | null ->
                      raise (
@@ -564,7 +564,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let FirstName =
+            let arg_2 =
                 (match node.["firstName"] with
                  | null ->
                      raise (
@@ -576,7 +576,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let CompoundMemberId =
+            let arg_1 =
                 (match node.["compoundMemberId"] with
                  | null ->
                      raise (
@@ -588,7 +588,7 @@ module MemberJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let Id =
+            let arg_0 =
                 (match node.["id"] with
                  | null ->
                      raise (
@@ -601,21 +601,21 @@ module MemberJsonParseExtension =
                     .GetValue<int> ()
 
             {
-                Id = Id
+                Id = arg_0
-                CompoundMemberId = CompoundMemberId
+                CompoundMemberId = arg_1
-                FirstName = FirstName
+                FirstName = arg_2
-                LastName = LastName
+                LastName = arg_3
-                HomeGymId = HomeGymId
+                HomeGymId = arg_4
-                HomeGymName = HomeGymName
+                HomeGymName = arg_5
-                EmailAddress = EmailAddress
+                EmailAddress = arg_6
-                GymAccessPin = GymAccessPin
+                GymAccessPin = arg_7
-                DateOfBirth = DateOfBirth
+                DateOfBirth = arg_8
-                MobileNumber = MobileNumber
+                MobileNumber = arg_9
-                Postcode = Postcode
+                Postcode = arg_10
-                MembershipName = MembershipName
+                MembershipName = arg_11
-                MembershipLevel = MembershipLevel
+                MembershipLevel = arg_12
-                SuspendedReason = SuspendedReason
+                SuspendedReason = arg_13
-                MemberStatus = MemberStatus
+                MemberStatus = arg_14
             }
 namespace PureGym
 
@@ -625,7 +625,7 @@ namespace PureGym
 module GymAttendance =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymAttendance =
-        let MaximumCapacity =
+        let arg_8 =
             (match node.["maximumCapacity"] with
              | null ->
                  raise (
@@ -637,7 +637,7 @@ module GymAttendance =
                 .AsValue()
                 .GetValue<int> ()
 
-        let LastRefreshedPeopleInClasses =
+        let arg_7 =
             (match node.["lastRefreshedPeopleInClasses"] with
              | null ->
                  raise (
@@ -650,7 +650,7 @@ module GymAttendance =
                 .GetValue<string> ()
             |> System.DateTime.Parse
 
-        let LastRefreshed =
+        let arg_6 =
             (match node.["lastRefreshed"] with
              | null ->
                  raise (
@@ -663,7 +663,7 @@ module GymAttendance =
                 .GetValue<string> ()
             |> System.DateTime.Parse
 
-        let AttendanceTime =
+        let arg_5 =
             (match node.["attendanceTime"] with
              | null ->
                  raise (
@@ -676,7 +676,7 @@ module GymAttendance =
                 .GetValue<string> ()
             |> System.DateTime.Parse
 
-        let IsApproximate =
+        let arg_4 =
             (match node.["isApproximate"] with
              | null ->
                  raise (
@@ -688,12 +688,12 @@ module GymAttendance =
                 .AsValue()
                 .GetValue<bool> ()
 
-        let TotalPeopleSuffix =
+        let arg_3 =
             match node.["totalPeopleSuffix"] with
             | null -> None
             | v -> v.AsValue().GetValue<string> () |> Some
 
-        let TotalPeopleInClasses =
+        let arg_2 =
             (match node.["totalPeopleInClasses"] with
              | null ->
                  raise (
@@ -705,7 +705,7 @@ module GymAttendance =
                 .AsValue()
                 .GetValue<int> ()
 
-        let TotalPeopleInGym =
+        let arg_1 =
             (match node.["totalPeopleInGym"] with
              | null ->
                  raise (
@@ -717,7 +717,7 @@ module GymAttendance =
                 .AsValue()
                 .GetValue<int> ()
 
-        let Description =
+        let arg_0 =
             (match node.["description"] with
              | null ->
                  raise (
@@ -730,15 +730,15 @@ module GymAttendance =
                 .GetValue<string> ()
 
         {
-            Description = Description
+            Description = arg_0
-            TotalPeopleInGym = TotalPeopleInGym
+            TotalPeopleInGym = arg_1
-            TotalPeopleInClasses = TotalPeopleInClasses
+            TotalPeopleInClasses = arg_2
-            TotalPeopleSuffix = TotalPeopleSuffix
+            TotalPeopleSuffix = arg_3
-            IsApproximate = IsApproximate
+            IsApproximate = arg_4
-            AttendanceTime = AttendanceTime
+            AttendanceTime = arg_5
-            LastRefreshed = LastRefreshed
+            LastRefreshed = arg_6
-            LastRefreshedPeopleInClasses = LastRefreshedPeopleInClasses
+            LastRefreshedPeopleInClasses = arg_7
-            MaximumCapacity = MaximumCapacity
+            MaximumCapacity = arg_8
         }
 namespace PureGym
 
@@ -748,7 +748,7 @@ namespace PureGym
 module MemberActivityDto =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : MemberActivityDto =
-        let LastRefreshed =
+        let arg_5 =
             (match node.["lastRefreshed"] with
              | null ->
                  raise (
@@ -761,7 +761,7 @@ module MemberActivityDto =
                 .GetValue<string> ()
             |> System.DateTime.Parse
 
-        let IsEstimated =
+        let arg_4 =
             (match node.["isEstimated"] with
              | null ->
                  raise (
@@ -773,7 +773,7 @@ module MemberActivityDto =
                 .AsValue()
                 .GetValue<bool> ()
 
-        let TotalClasses =
+        let arg_3 =
             (match node.["totalClasses"] with
              | null ->
                  raise (
@@ -785,7 +785,7 @@ module MemberActivityDto =
                 .AsValue()
                 .GetValue<int> ()
 
-        let TotalVisits =
+        let arg_2 =
             (match node.["totalVisits"] with
              | null ->
                  raise (
@@ -797,7 +797,7 @@ module MemberActivityDto =
                 .AsValue()
                 .GetValue<int> ()
 
-        let AverageDuration =
+        let arg_1 =
             (match node.["averageDuration"] with
              | null ->
                  raise (
@@ -809,7 +809,7 @@ module MemberActivityDto =
                 .AsValue()
                 .GetValue<int> ()
 
-        let TotalDuration =
+        let arg_0 =
             (match node.["totalDuration"] with
              | null ->
                  raise (
@@ -822,12 +822,12 @@ module MemberActivityDto =
                 .GetValue<int> ()
 
         {
-            TotalDuration = TotalDuration
+            TotalDuration = arg_0
-            AverageDuration = AverageDuration
+            AverageDuration = arg_1
-            TotalVisits = TotalVisits
+            TotalVisits = arg_2
-            TotalClasses = TotalClasses
+            TotalClasses = arg_3
-            IsEstimated = IsEstimated
+            IsEstimated = arg_4
-            LastRefreshed = LastRefreshed
+            LastRefreshed = arg_5
         }
 namespace PureGym
 
@@ -837,7 +837,7 @@ namespace PureGym
 module SessionsAggregate =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : SessionsAggregate =
-        let Duration =
+        let arg_2 =
             (match node.["Duration"] with
              | null ->
                  raise (
@@ -849,7 +849,7 @@ module SessionsAggregate =
                 .AsValue()
                 .GetValue<int> ()
 
-        let Visits =
+        let arg_1 =
             (match node.["Visits"] with
              | null ->
                  raise (
@@ -861,7 +861,7 @@ module SessionsAggregate =
                 .AsValue()
                 .GetValue<int> ()
 
-        let Activities =
+        let arg_0 =
             (match node.["Activities"] with
              | null ->
                  raise (
@@ -874,9 +874,9 @@ module SessionsAggregate =
                 .GetValue<int> ()
 
         {
-            Activities = Activities
+            Activities = arg_0
-            Visits = Visits
+            Visits = arg_1
-            Duration = Duration
+            Duration = arg_2
         }
 namespace PureGym
 
@@ -886,7 +886,7 @@ namespace PureGym
 module VisitGym =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : VisitGym =
-        let Status =
+        let arg_2 =
             (match node.["Status"] with
              | null ->
                  raise (
@@ -898,7 +898,7 @@ module VisitGym =
                 .AsValue()
                 .GetValue<string> ()
 
-        let Name =
+        let arg_1 =
             (match node.["Name"] with
              | null ->
                  raise (
@@ -910,7 +910,7 @@ module VisitGym =
                 .AsValue()
                 .GetValue<string> ()
 
-        let Id =
+        let arg_0 =
             (match node.["Id"] with
              | null ->
                  raise (
@@ -923,9 +923,9 @@ module VisitGym =
                 .GetValue<int> ()
 
         {
-            Id = Id
+            Id = arg_0
-            Name = Name
+            Name = arg_1
-            Status = Status
+            Status = arg_2
         }
 namespace PureGym
 
@@ -935,7 +935,7 @@ namespace PureGym
 module Visit =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Visit =
-        let Gym =
+        let arg_3 =
             VisitGym.jsonParse (
                 match node.["Gym"] with
                 | null ->
@@ -947,7 +947,7 @@ module Visit =
                 | v -> v
             )
 
-        let Duration =
+        let arg_2 =
             (match node.["Duration"] with
              | null ->
                  raise (
@@ -959,7 +959,7 @@ module Visit =
                 .AsValue()
                 .GetValue<int> ()
 
-        let StartTime =
+        let arg_1 =
             (match node.["StartTime"] with
              | null ->
                  raise (
@@ -972,7 +972,7 @@ module Visit =
                 .GetValue<string> ()
             |> System.DateTime.Parse
 
-        let IsDurationEstimated =
+        let arg_0 =
             (match node.["IsDurationEstimated"] with
              | null ->
                  raise (
@@ -985,10 +985,10 @@ module Visit =
                 .GetValue<bool> ()
 
         {
-            IsDurationEstimated = IsDurationEstimated
+            IsDurationEstimated = arg_0
-            StartTime = StartTime
+            StartTime = arg_1
-            Duration = Duration
+            Duration = arg_2
-            Gym = Gym
+            Gym = arg_3
         }
 namespace PureGym
 
@@ -998,7 +998,7 @@ namespace PureGym
 module SessionsSummary =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : SessionsSummary =
-        let ThisWeek =
+        let arg_1 =
             SessionsAggregate.jsonParse (
                 match node.["ThisWeek"] with
                 | null ->
@@ -1010,7 +1010,7 @@ module SessionsSummary =
                 | v -> v
             )
 
-        let Total =
+        let arg_0 =
             SessionsAggregate.jsonParse (
                 match node.["Total"] with
                 | null ->
@@ -1023,8 +1023,8 @@ module SessionsSummary =
             )
 
         {
-            Total = Total
+            Total = arg_0
-            ThisWeek = ThisWeek
+            ThisWeek = arg_1
         }
 namespace PureGym
 
@@ -1034,7 +1034,7 @@ namespace PureGym
 module Sessions =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Sessions =
-        let Visits =
+        let arg_1 =
             (match node.["Visits"] with
              | null ->
                  raise (
@@ -1047,7 +1047,7 @@ module Sessions =
             |> Seq.map (fun elt -> Visit.jsonParse elt)
             |> List.ofSeq
 
-        let Summary =
+        let arg_0 =
             SessionsSummary.jsonParse (
                 match node.["Summary"] with
                 | null ->
@@ -1060,8 +1060,8 @@ module Sessions =
             )
 
         {
-            Summary = Summary
+            Summary = arg_0
-            Visits = Visits
+            Visits = arg_1
         }
 namespace PureGym
 
@@ -1071,7 +1071,7 @@ namespace PureGym
 module UriThing =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : UriThing =
-        let SomeUri =
+        let arg_0 =
             (match node.["someUri"] with
              | null ->
                  raise (
@@ -1085,5 +1085,5 @@ module UriThing =
             |> System.Uri
 
         {
-            SomeUri = SomeUri
+            SomeUri = arg_0
         }

ConsumePlugin/GeneratedSerde.fs

@@ -191,7 +191,7 @@ module InnerTypeWithBothJsonParseExtension =
 
         /// Parse from a JSON node.
         static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : InnerTypeWithBoth =
-            let ConcreteDict =
+            let arg_4 =
                 (match node.["concreteDict"] with
                  | null ->
                      raise (
@@ -209,7 +209,7 @@ module InnerTypeWithBothJsonParseExtension =
                 |> Seq.map System.Collections.Generic.KeyValuePair
                 |> System.Collections.Generic.Dictionary
 
-            let Dict =
+            let arg_3 =
                 (match node.["dict"] with
                  | null ->
                      raise (
@@ -226,7 +226,7 @@ module InnerTypeWithBothJsonParseExtension =
                 )
                 |> dict
 
-            let ReadOnlyDict =
+            let arg_2 =
                 (match node.["readOnlyDict"] with
                  | null ->
                      raise (
@@ -248,7 +248,7 @@ module InnerTypeWithBothJsonParseExtension =
                 )
                 |> readOnlyDict
 
-            let Map =
+            let arg_1 =
                 (match node.["map"] with
                  | null ->
                      raise (
@@ -265,7 +265,7 @@ module InnerTypeWithBothJsonParseExtension =
                 )
                 |> Map.ofSeq
 
-            let Thing =
+            let arg_0 =
                 (match node.[("it's-a-me")] with
                  | null ->
                      raise (
@@ -279,11 +279,11 @@ module InnerTypeWithBothJsonParseExtension =
                 |> System.Guid.Parse
 
             {
-                Thing = Thing
+                Thing = arg_0
-                Map = Map
+                Map = arg_1
-                ReadOnlyDict = ReadOnlyDict
+                ReadOnlyDict = arg_2
-                Dict = Dict
+                Dict = arg_3
-                ConcreteDict = ConcreteDict
+                ConcreteDict = arg_4
             }
 namespace ConsumePlugin
 
@@ -295,7 +295,7 @@ module JsonRecordTypeWithBothJsonParseExtension =
 
         /// Parse from a JSON node.
         static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : JsonRecordTypeWithBoth =
-            let F =
+            let arg_5 =
                 (match node.["f"] with
                  | null ->
                      raise (
@@ -308,7 +308,7 @@ module JsonRecordTypeWithBothJsonParseExtension =
                 |> Seq.map (fun elt -> elt.AsValue().GetValue<int> ())
                 |> Array.ofSeq
 
-            let E =
+            let arg_4 =
                 (match node.["e"] with
                  | null ->
                      raise (
@@ -321,7 +321,7 @@ module JsonRecordTypeWithBothJsonParseExtension =
                 |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
                 |> Array.ofSeq
 
-            let D =
+            let arg_3 =
                 InnerTypeWithBoth.jsonParse (
                     match node.["d"] with
                     | null ->
@@ -333,7 +333,7 @@ module JsonRecordTypeWithBothJsonParseExtension =
                     | v -> v
                 )
 
-            let C =
+            let arg_2 =
                 (match node.["c"] with
                  | null ->
                      raise (
@@ -346,7 +346,7 @@ module JsonRecordTypeWithBothJsonParseExtension =
                 |> Seq.map (fun elt -> elt.AsValue().GetValue<int> ())
                 |> List.ofSeq
 
-            let B =
+            let arg_1 =
                 (match node.["b"] with
                  | null ->
                      raise (
@@ -358,7 +358,7 @@ module JsonRecordTypeWithBothJsonParseExtension =
                     .AsValue()
                     .GetValue<string> ()
 
-            let A =
+            let arg_0 =
                 (match node.["a"] with
                  | null ->
                      raise (
@@ -371,10 +371,90 @@ module JsonRecordTypeWithBothJsonParseExtension =
                     .GetValue<int> ()
 
             {
-                A = A
+                A = arg_0
-                B = B
+                B = arg_1
-                C = C
+                C = arg_2
-                D = D
+                D = arg_3
-                E = E
+                E = arg_4
-                F = F
+                F = arg_5
             }
+namespace ConsumePlugin
+
+/// Module containing JSON parsing extension members for the FirstDu type
+[<AutoOpen>]
+module FirstDuJsonParseExtension =
+    /// Extension methods for JSON parsing
+    type FirstDu with
+
+        /// Parse from a JSON node.
+        static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : FirstDu =
+            let ty =
+                (match node.["type"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("type")
+                         )
+                     )
+                 | v -> v)
+                |> (fun v -> v.GetValue<string> ())
+
+            match ty with
+            | "emptyCase" -> FirstDu.EmptyCase
+            | "case1" ->
+                let node =
+                    (match node.["data"] with
+                     | null ->
+                         raise (
+                             System.Collections.Generic.KeyNotFoundException (
+                                 sprintf "Required key '%s' not found on JSON object" ("data")
+                             )
+                         )
+                     | v -> v)
+
+                FirstDu.Case1 (
+                    (match node.["data"] with
+                     | null ->
+                         raise (
+                             System.Collections.Generic.KeyNotFoundException (
+                                 sprintf "Required key '%s' not found on JSON object" ("data")
+                             )
+                         )
+                     | v -> v)
+                        .AsValue()
+                        .GetValue<string> ()
+                )
+            | "case2" ->
+                let node =
+                    (match node.["data"] with
+                     | null ->
+                         raise (
+                             System.Collections.Generic.KeyNotFoundException (
+                                 sprintf "Required key '%s' not found on JSON object" ("data")
+                             )
+                         )
+                     | v -> v)
+
+                FirstDu.Case2 (
+                    JsonRecordTypeWithBoth.jsonParse (
+                        match node.["record"] with
+                        | null ->
+                            raise (
+                                System.Collections.Generic.KeyNotFoundException (
+                                    sprintf "Required key '%s' not found on JSON object" ("record")
+                                )
+                            )
+                        | v -> v
+                    ),
+                    (match node.["i"] with
+                     | null ->
+                         raise (
+                             System.Collections.Generic.KeyNotFoundException (
+                                 sprintf "Required key '%s' not found on JSON object" ("i")
+                             )
+                         )
+                     | v -> v)
+                        .AsValue()
+                        .GetValue<int> ()
+                )
+            | v -> failwith ("Unrecognised 'type' field value: " + v)

ConsumePlugin/GeneratedVault.fs

@@ -13,7 +13,7 @@ namespace ConsumePlugin
 module JwtVaultAuthResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtVaultAuthResponse =
-        let NumUses =
+        let arg_10 =
             (match node.["num_uses"] with
              | null ->
                  raise (
@@ -25,7 +25,7 @@ module JwtVaultAuthResponse =
                 .AsValue()
                 .GetValue<int> ()
 
-        let Orphan =
+        let arg_9 =
             (match node.["orphan"] with
              | null ->
                  raise (
@@ -37,7 +37,7 @@ module JwtVaultAuthResponse =
                 .AsValue()
                 .GetValue<bool> ()
 
-        let EntityId =
+        let arg_8 =
             (match node.["entity_id"] with
              | null ->
                  raise (
@@ -49,7 +49,7 @@ module JwtVaultAuthResponse =
                 .AsValue()
                 .GetValue<string> ()
 
-        let TokenType =
+        let arg_7 =
             (match node.["token_type"] with
              | null ->
                  raise (
@@ -61,7 +61,7 @@ module JwtVaultAuthResponse =
                 .AsValue()
                 .GetValue<string> ()
 
-        let Renewable =
+        let arg_6 =
             (match node.["renewable"] with
              | null ->
                  raise (
@@ -73,7 +73,7 @@ module JwtVaultAuthResponse =
                 .AsValue()
                 .GetValue<bool> ()
 
-        let LeaseDuration =
+        let arg_5 =
             (match node.["lease_duration"] with
              | null ->
                  raise (
@@ -85,7 +85,7 @@ module JwtVaultAuthResponse =
                 .AsValue()
                 .GetValue<int> ()
 
-        let IdentityPolicies =
+        let arg_4 =
             (match node.["identity_policies"] with
              | null ->
                  raise (
@@ -98,7 +98,7 @@ module JwtVaultAuthResponse =
             |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> List.ofSeq
 
-        let TokenPolicies =
+        let arg_3 =
             (match node.["token_policies"] with
              | null ->
                  raise (
@@ -111,7 +111,7 @@ module JwtVaultAuthResponse =
             |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> List.ofSeq
 
-        let Policies =
+        let arg_2 =
             (match node.["policies"] with
              | null ->
                  raise (
@@ -124,7 +124,7 @@ module JwtVaultAuthResponse =
             |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> List.ofSeq
 
-        let Accessor =
+        let arg_1 =
             (match node.["accessor"] with
              | null ->
                  raise (
@@ -136,7 +136,7 @@ module JwtVaultAuthResponse =
                 .AsValue()
                 .GetValue<string> ()
 
-        let ClientToken =
+        let arg_0 =
             (match node.["client_token"] with
              | null ->
                  raise (
@@ -149,17 +149,17 @@ module JwtVaultAuthResponse =
                 .GetValue<string> ()
 
         {
-            ClientToken = ClientToken
+            ClientToken = arg_0
-            Accessor = Accessor
+            Accessor = arg_1
-            Policies = Policies
+            Policies = arg_2
-            TokenPolicies = TokenPolicies
+            TokenPolicies = arg_3
-            IdentityPolicies = IdentityPolicies
+            IdentityPolicies = arg_4
-            LeaseDuration = LeaseDuration
+            LeaseDuration = arg_5
-            Renewable = Renewable
+            Renewable = arg_6
-            TokenType = TokenType
+            TokenType = arg_7
-            EntityId = EntityId
+            EntityId = arg_8
-            Orphan = Orphan
+            Orphan = arg_9
-            NumUses = NumUses
+            NumUses = arg_10
         }
 namespace ConsumePlugin
 
@@ -169,7 +169,7 @@ namespace ConsumePlugin
 module JwtVaultResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtVaultResponse =
-        let Auth =
+        let arg_4 =
             JwtVaultAuthResponse.jsonParse (
                 match node.["auth"] with
                 | null ->
@@ -181,7 +181,7 @@ module JwtVaultResponse =
                 | v -> v
             )
 
-        let LeaseDuration =
+        let arg_3 =
             (match node.["lease_duration"] with
              | null ->
                  raise (
@@ -193,7 +193,7 @@ module JwtVaultResponse =
                 .AsValue()
                 .GetValue<int> ()
 
-        let Renewable =
+        let arg_2 =
             (match node.["renewable"] with
              | null ->
                  raise (
@@ -205,7 +205,7 @@ module JwtVaultResponse =
                 .AsValue()
                 .GetValue<bool> ()
 
-        let LeaseId =
+        let arg_1 =
             (match node.["lease_id"] with
              | null ->
                  raise (
@@ -217,7 +217,7 @@ module JwtVaultResponse =
                 .AsValue()
                 .GetValue<string> ()
 
-        let RequestId =
+        let arg_0 =
             (match node.["request_id"] with
              | null ->
                  raise (
@@ -230,11 +230,11 @@ module JwtVaultResponse =
                 .GetValue<string> ()
 
         {
-            RequestId = RequestId
+            RequestId = arg_0
-            LeaseId = LeaseId
+            LeaseId = arg_1
-            Renewable = Renewable
+            Renewable = arg_2
-            LeaseDuration = LeaseDuration
+            LeaseDuration = arg_3
-            Auth = Auth
+            Auth = arg_4
         }
 namespace ConsumePlugin
 
@@ -244,7 +244,7 @@ namespace ConsumePlugin
 module JwtSecretResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtSecretResponse =
-        let Data8 =
+        let arg_11 =
             (match node.["data8"] with
              | null ->
                  raise (
@@ -262,7 +262,7 @@ module JwtSecretResponse =
             |> Seq.map System.Collections.Generic.KeyValuePair
             |> System.Collections.Generic.Dictionary
 
-        let Data7 =
+        let arg_10 =
             (match node.["data7"] with
              | null ->
                  raise (
@@ -279,7 +279,7 @@ module JwtSecretResponse =
             )
             |> Map.ofSeq
 
-        let Data6 =
+        let arg_9 =
             (match node.["data6"] with
              | null ->
                  raise (
@@ -296,7 +296,7 @@ module JwtSecretResponse =
             )
             |> dict
 
-        let Data5 =
+        let arg_8 =
             (match node.["data5"] with
              | null ->
                  raise (
@@ -313,7 +313,7 @@ module JwtSecretResponse =
             )
             |> readOnlyDict
 
-        let Data4 =
+        let arg_7 =
             (match node.["data4"] with
              | null ->
                  raise (
@@ -330,7 +330,7 @@ module JwtSecretResponse =
             )
             |> Map.ofSeq
 
-        let Data3 =
+        let arg_6 =
             (match node.["data3"] with
              | null ->
                  raise (
@@ -348,7 +348,7 @@ module JwtSecretResponse =
             |> Seq.map System.Collections.Generic.KeyValuePair
             |> System.Collections.Generic.Dictionary
 
-        let Data2 =
+        let arg_5 =
             (match node.["data2"] with
              | null ->
                  raise (
@@ -365,7 +365,7 @@ module JwtSecretResponse =
             )
             |> dict
 
-        let Data =
+        let arg_4 =
             (match node.["data"] with
              | null ->
                  raise (
@@ -382,7 +382,7 @@ module JwtSecretResponse =
             )
             |> readOnlyDict
 
-        let LeaseDuration =
+        let arg_3 =
             (match node.["lease_duration"] with
              | null ->
                  raise (
@@ -394,7 +394,7 @@ module JwtSecretResponse =
                 .AsValue()
                 .GetValue<int> ()
 
-        let Renewable =
+        let arg_2 =
             (match node.["renewable"] with
              | null ->
                  raise (
@@ -406,7 +406,7 @@ module JwtSecretResponse =
                 .AsValue()
                 .GetValue<bool> ()
 
-        let LeaseId =
+        let arg_1 =
             (match node.["lease_id"] with
              | null ->
                  raise (
@@ -418,7 +418,7 @@ module JwtSecretResponse =
                 .AsValue()
                 .GetValue<string> ()
 
-        let RequestId =
+        let arg_0 =
             (match node.["request_id"] with
              | null ->
                  raise (
@@ -431,18 +431,18 @@ module JwtSecretResponse =
                 .GetValue<string> ()
 
         {
-            RequestId = RequestId
+            RequestId = arg_0
-            LeaseId = LeaseId
+            LeaseId = arg_1
-            Renewable = Renewable
+            Renewable = arg_2
-            LeaseDuration = LeaseDuration
+            LeaseDuration = arg_3
-            Data = Data
+            Data = arg_4
-            Data2 = Data2
+            Data2 = arg_5
-            Data3 = Data3
+            Data3 = arg_6
-            Data4 = Data4
+            Data4 = arg_7
-            Data5 = Data5
+            Data5 = arg_8
-            Data6 = Data6
+            Data6 = arg_9
-            Data7 = Data7
+            Data7 = arg_10
-            Data8 = Data8
+            Data8 = arg_11
         }
 
 namespace ConsumePlugin

ConsumePlugin/SerializationAndDeserialization.fs

@@ -29,6 +29,7 @@ type JsonRecordTypeWithBoth =
     }
 
 [<WoofWare.Myriad.Plugins.JsonSerialize true>]
+[<WoofWare.Myriad.Plugins.JsonParse true>]
 type FirstDu =
     | EmptyCase
     | Case1 of data : string

WoofWare.Myriad.Plugins.Test/TestJsonSerialize/TestJsonSerde.fs

@@ -2,10 +2,9 @@ namespace WoofWare.Myriad.Plugins.Test
 
 open System
 open System.Collections.Generic
-open System.IO
-open System.Text
-open System.Text.Json
 open System.Text.Json.Nodes
+open FsCheck.Random
+open Microsoft.FSharp.Reflection
 open NUnit.Framework
 open FsCheck
 open FsUnitTyped
@@ -124,3 +123,82 @@ module TestJsonSerde =
         |> shouldEqual (
             sprintf """{"it\u0027s-a-me":"%s","map":{},"readOnlyDict":{},"dict":{},"concreteDict":{}}""" guidStr
         )
+
+    type Generators =
+        static member TestCase () =
+            { new Arbitrary<InnerTypeWithBoth>() with
+                override x.Generator = innerGen 5
+            }
+
+    let sanitiseInner (r : InnerTypeWithBoth) : InnerTypeWithBoth =
+        {
+            Thing = r.Thing
+            Map = r.Map
+            ReadOnlyDict = r.ReadOnlyDict
+            Dict = r.Dict
+            ConcreteDict = r.ConcreteDict
+        }
+
+    let sanitiseRec (r : JsonRecordTypeWithBoth) : JsonRecordTypeWithBoth =
+        {
+            A = r.A
+            B = if isNull r.B then "<null>" else r.B
+            C =
+                if Object.ReferenceEquals (r.C, (null : obj)) then
+                    []
+                else
+                    r.C
+            D = sanitiseInner r.D
+            E = if isNull r.E then [||] else r.E
+            F =
+                if Object.ReferenceEquals (r.F, (null : obj)) then
+                    [||]
+                else
+                    r.F
+        }
+
+    let duGen =
+        gen {
+            let! case = Gen.choose (0, 2)
+
+            match case with
+            | 0 -> return FirstDu.EmptyCase
+            | 1 ->
+                let! s = Arb.generate<NonNull<string>>
+                return FirstDu.Case1 s.Get
+            | 2 ->
+                let! i = Arb.generate<int>
+                let! record = outerGen
+                return FirstDu.Case2 (record, i)
+            | _ -> return failwith $"unexpected: %i{case}"
+        }
+
+    [<Test>]
+    let ``Discriminated union works`` () =
+        let property (du : FirstDu) : unit =
+            du
+            |> FirstDu.toJsonNode
+            |> fun s -> s.ToJsonString ()
+            |> JsonNode.Parse
+            |> FirstDu.jsonParse
+            |> shouldEqual du
+
+        property |> Prop.forAll (Arb.fromGen duGen) |> Check.QuickThrowOnFailure
+
+    [<Test>]
+    let ``DU generator covers all cases`` () =
+        let rand = Random ()
+        let cases = FSharpType.GetUnionCases typeof<FirstDu>
+        let counts = Array.zeroCreate<int> cases.Length
+
+        let decompose = FSharpValue.PreComputeUnionTagReader typeof<FirstDu>
+
+        Gen.listOf duGen
+        |> Gen.eval 100 (StdGen.StdGen (rand.Next (), rand.Next ()))
+        |> List.iter (fun du ->
+            let tag = decompose du
+            counts.[tag] <- counts.[tag] + 1
+        )
+
+        for i in counts do
+            i |> shouldBeGreaterThan 0

WoofWare.Myriad.Plugins/CataGenerator.fs

@@ -182,105 +182,53 @@ module internal CataGenerator =
                 )
             )
 
-        SynBinding.SynBinding (
+        [
-            None,
+            SynExpr.CreateLongIdent analysis.AssociatedProcessInstruction
-            SynBindingKind.Normal,
+            |> SynExpr.applyTo (SynExpr.CreateLongIdent (SynLongIdent.CreateString "x"))
-            false,
+            |> SynExpr.CreateParen
-            false,
+            |> SynExpr.applyFunction (SynExpr.createLongIdent [ "instructions" ; "Add" ])
-            [],
+
-            PreXmlDoc.Create " Execute the catamorphism.",
+            // TODO: add the "all other stacks are empty" sanity checks
-            SynValData.SynValData (
+            SynExpr.CreateIdent (Ident.Create (relevantTyparName.idText + "Stack") |> Ident.lowerFirstLetter)
-                None,
+            |> SynExpr.applyFunction (SynExpr.createLongIdent [ "Seq" ; "exactlyOne" ])
-                SynValInfo.SynValInfo (
+            |> SynExpr.createLet
-                    [ [ SynArgInfo.CreateIdString "cata" ] ; [ SynArgInfo.CreateIdString "x" ] ],
+                [
-                    SynArgInfo.SynArgInfo ([], false, None)
+                    SynBinding.Let (
-                ),
+                        valData = SynValData.SynValData (None, SynValInfo.Empty, None),
-                None
+                        pattern =
-            ),
+                            SynPat.Tuple (
-            SynPat.CreateLongIdent (
+                                false,
-                SynLongIdent.CreateString ("run" + List.last(relevantTypeName).idText),
+                                List.map
-                [ SynPat.CreateParen cataObject ; SynPat.CreateParen inputObject ]
+                                    (fun (t : Ident) ->
-            ),
+                                        SynPat.CreateNamed (
-            Some (SynBindingReturnInfo.Create relevantTypar),
+                                            Ident.Create (t.idText + "Stack") |> Ident.lowerFirstLetter
-            SynExpr.CreateTyped (
+                                        )
-                SynExpr.LetOrUse (
+                                    )
-                    false,
+                                    allArtificialTyparNames,
-                    false,
+                                List.replicate (allArtificialTyparNames.Length - 1) range0,
-                    [
+                                range0
-                        SynBinding.Let (
+                            ),
-                            valData = SynValData.SynValData (None, SynValInfo.Empty, None),
+                        expr =
-                            pattern = SynPat.CreateNamed (Ident.Create "instructions"),
-                            expr =
-                                SynExpr.CreateApp (
-                                    SynExpr.CreateIdentString "ResizeArray",
-                                    SynExpr.CreateConst SynConst.Unit
-                                )
-                        )
-                    ],
-                    SynExpr.CreateSequential
-                        [
                             SynExpr.CreateApp (
-                                SynExpr.CreateLongIdent (SynLongIdent.Create [ "instructions" ; "Add" ]),
+                                SynExpr.CreateApp (SynExpr.CreateIdentString "loop", SynExpr.CreateIdentString "cata"),
-                                SynExpr.CreateParen (
+                                SynExpr.CreateIdentString "instructions"
-                                    SynExpr.CreateApp (
-                                        SynExpr.CreateLongIdent analysis.AssociatedProcessInstruction,
-                                        SynExpr.CreateLongIdent (SynLongIdent.CreateString "x")
-                                    )
-                                )
                             )
-                            SynExpr.LetOrUse (
+                    )
-                                false,
+                ]
-                                false,
+        ]
-                                [
+        |> SynExpr.CreateSequential
-                                    SynBinding.Let (
+        |> SynExpr.createLet
-                                        valData = SynValData.SynValData (None, SynValInfo.Empty, None),
+            [
-                                        pattern =
+                SynExpr.CreateIdentString "ResizeArray"
-                                            SynPat.Tuple (
+                |> SynExpr.applyTo (SynExpr.CreateConst SynConst.Unit)
-                                                false,
+                |> SynBinding.basic (SynLongIdent.CreateString "instructions") []
-                                                List.map
+            ]
-                                                    (fun (t : Ident) ->
+        |> SynExpr.typeAnnotate relevantTypar
-                                                        SynPat.CreateNamed (
+        |> SynBinding.basic
-                                                            Ident.Create (t.idText + "Stack") |> Ident.lowerFirstLetter
+            (SynLongIdent.CreateString ("run" + List.last(relevantTypeName).idText))
-                                                        )
+            [ SynPat.CreateParen cataObject ; SynPat.CreateParen inputObject ]
-                                                    )
+        |> SynBinding.withReturnAnnotation relevantTypar
-                                                    allArtificialTyparNames,
+        |> SynBinding.withXmlDoc (PreXmlDoc.Create " Execute the catamorphism.")
-                                                List.replicate (allArtificialTyparNames.Length - 1) range0,
-                                                range0
-                                            ),
-                                        expr =
-                                            SynExpr.CreateApp (
-                                                SynExpr.CreateApp (
-                                                    SynExpr.CreateIdentString "loop",
-                                                    SynExpr.CreateIdentString "cata"
-                                                ),
-                                                SynExpr.CreateIdentString "instructions"
-                                            )
-                                    )
-                                ],
-                                // TODO: add the "all other stacks are empty" sanity checks
-                                SynExpr.CreateApp (
-                                    SynExpr.CreateLongIdent (SynLongIdent.Create [ "Seq" ; "exactlyOne" ]),
-                                    SynExpr.CreateIdent (
-                                        Ident.Create (relevantTyparName.idText + "Stack") |> Ident.lowerFirstLetter
-                                    )
-                                ),
-                                range0,
-                                {
-                                    SynExprLetOrUseTrivia.InKeyword = None
-                                }
-                            )
-                        ],
-                    range0,
-                    {
-                        InKeyword = None
-                    }
-                ),
-                relevantTypar
-            ),
-            range0,
-            DebugPointAtBinding.NoneAtLet,
-            SynExpr.synBindingTriviaZero false
-        )
 
     let getName (ty : SynTypeDefn) : LongIdent =
         match ty with
@@ -979,37 +927,29 @@ module internal CataGenerator =
 
                     // The instruction to process us again once our inputs are ready:
                     let reprocessCommand =
-                        SynExpr.CreateApp (
+                        if selfArgs.Length = unionCase.FlattenedFields.Length then
-                            SynExpr.CreateLongIdent (SynLongIdent.Create [ "instructions" ; "Add" ]),
+                            SynExpr.CreateLongIdent unionCase.AssociatedInstruction
-                            if selfArgs.Length = unionCase.FlattenedFields.Length then
+                        else
-                                SynExpr.CreateLongIdent unionCase.AssociatedInstruction
+                            // We need to tell ourselves each non-rec arg, and the length of each input list.
-                            else
+                            listSelfArgs
-                                // We need to tell ourselves each non-rec arg, and the length of each input list.
+                            |> List.map (fun (i, argName, _) ->
-                                SynExpr.CreateApp (
+                                i,
-                                    SynExpr.CreateLongIdent unionCase.AssociatedInstruction,
+                                SynExpr.CreateParen (
-                                    SynExpr.CreateParenedTuple (
+                                    SynExpr.CreateApp (
-                                        listSelfArgs
+                                        SynExpr.CreateLongIdent (SynLongIdent.Create [ "List" ; "length" ]),
-                                        |> List.map (fun (i, argName, _) ->
+                                        SynExpr.CreateIdent argName
-                                            i,
-                                            SynExpr.CreateParen (
-                                                SynExpr.CreateApp (
-                                                    SynExpr.CreateLongIdent (
-                                                        SynLongIdent.Create [ "List" ; "length" ]
-                                                    ),
-                                                    SynExpr.CreateIdent argName
-                                                )
-                                            )
-                                        )
-                                        |> List.append (
-                                            nonRecursiveArgs
-                                            |> List.map (fun (i, arg, _) -> i, SynExpr.CreateIdent arg)
-                                        )
-                                        |> List.sortBy fst
-                                        |> List.map snd
                                     )
                                 )
-                                |> SynExpr.CreateParen
+                            )
-                        )
+                            |> List.append (
+                                nonRecursiveArgs |> List.map (fun (i, arg, _) -> i, SynExpr.CreateIdent arg)
+                            )
+                            |> List.sortBy fst
+                            |> List.map snd
+                            |> SynExpr.CreateParenedTuple
+                            |> SynExpr.applyFunction (SynExpr.CreateLongIdent unionCase.AssociatedInstruction)
+                            |> SynExpr.CreateParen
+                        |> SynExpr.applyFunction (SynExpr.createLongIdent [ "instructions" ; "Add" ])
 
                     [
                         yield reprocessCommand
@@ -1044,51 +984,43 @@ module internal CataGenerator =
                                 // And push the instruction to process each recursive call
                                 // onto the stack.
                                 yield
-                                    SynExpr.CreateApp (
+                                    SynExpr.CreateLongIdent (
-                                        SynExpr.CreateLongIdent (SynLongIdent.Create [ "instructions" ; "Add" ]),
+                                        // TODO: use an AssociatedProcessInstruction instead
-                                        SynExpr.CreateParen (
+                                        SynLongIdent.Create
-                                            SynExpr.CreateApp (
+                                            [
-                                                SynExpr.CreateLongIdent (
+                                                "Instruction"
-                                                    // TODO: use an AssociatedProcessInstruction instead
+                                                // TODO wonky domain
-                                                    SynLongIdent.Create
+                                                "Process" + "__" + List.last(getNameUnion(synType).Value).idText
-                                                        [
+                                            ]
-                                                            "Instruction"
-                                                            // TODO wonky domain
-                                                            "Process"
-                                                            + "__"
-                                                            + List.last(getNameUnion(synType).Value).idText
-                                                        ]
-                                                ),
-                                                SynExpr.CreateIdent caseDesc.ArgName
-                                            )
-                                        )
                                     )
+                                    |> SynExpr.applyTo (SynExpr.CreateIdent caseDesc.ArgName)
+                                    |> SynExpr.CreateParen
+                                    |> SynExpr.applyFunction (SynExpr.createLongIdent [ "instructions" ; "Add" ])
                     ]
                     |> SynExpr.CreateSequential
 
                 let matchLhs =
                     if unionCase.Fields.Length > 0 then
-                        SynPat.CreateParen (
+                        SynPat.Tuple (
-                            SynPat.Tuple (
+                            false,
-                                false,
+                            unionCase.Fields
-                                unionCase.Fields
+                            |> List.mapi (fun i case ->
-                                |> List.mapi (fun i case ->
+                                match case with
-                                    match case with
+                                | CataUnionField.Basic case ->
-                                    | CataUnionField.Basic case ->
+                                    SynPat.CreateNamed (Ident.lowerFirstLetter case.ArgName)
-                                        SynPat.CreateNamed (Ident.lowerFirstLetter case.ArgName)
+                                | CataUnionField.Record fields ->
-                                    | CataUnionField.Record fields ->
+                                    let fields =
-                                        let fields =
+                                        fields
-                                            fields
+                                        |> List.map (fun (name, field) ->
-                                            |> List.map (fun (name, field) ->
+                                            ([], name), range0, SynPat.CreateNamed (Ident.lowerFirstLetter name)
-                                                ([], name), range0, SynPat.CreateNamed (Ident.lowerFirstLetter name)
+                                        )
-                                            )
 
-                                        SynPat.Record (fields, range0)
+                                    SynPat.Record (fields, range0)
-                                ),
+                            ),
-                                List.replicate (unionCase.Fields.Length - 1) range0,
+                            List.replicate (unionCase.Fields.Length - 1) range0,
-                                range0
+                            range0
-                            )
                         )
+                        |> SynPat.CreateParen
                         |> List.singleton
                     else
                         []
@@ -1187,160 +1119,81 @@ module internal CataGenerator =
                             // TODO: this is jank
                             let stackName = inputStacks.[List.last(getNameUnion(synType).Value).idText]
 
-                            SynExpr.LetOrUse (
+                            SynExpr.minusN (SynLongIdent.CreateFromLongIdent [ stackName ; Ident.Create "Count" ]) 1
-                                false,
+                            |> SynExpr.CreateParen
-                                false,
+                            |> SynExpr.applyFunction (
+                                SynExpr.createLongIdent' [ stackName ; Ident.Create "RemoveAt" ]
+                            )
+                            |> SynExpr.createLet
                                 [
-                                    SynBinding.SynBinding (
+                                    SynExpr.DotIndexedGet (
-                                        None,
+                                        SynExpr.CreateIdent stackName,
-                                        SynBindingKind.Normal,
-                                        false,
-                                        false,
-                                        [],
-                                        PreXmlDoc.Empty,
-                                        SynValData.SynValData (None, SynValInfo.Empty, None),
-                                        SynPat.CreateNamed field.ArgName,
-                                        None,
-                                        SynExpr.DotIndexedGet (
-                                            SynExpr.CreateIdent stackName,
-                                            SynExpr.minusN
-                                                (SynLongIdent.CreateFromLongIdent
-                                                    [ stackName ; Ident.Create "Count" ])
-                                                1,
-                                            range0,
-                                            range0
-                                        ),
-                                        range0,
-                                        DebugPointAtBinding.Yes range0,
-                                        SynExpr.synBindingTriviaZero false
-                                    )
-                                ],
-                                SynExpr.CreateApp (
-                                    SynExpr.CreateLongIdent (
-                                        SynLongIdent.CreateFromLongIdent [ stackName ; Ident.Create "RemoveAt" ]
-                                    ),
-                                    SynExpr.CreateParen (
                                         SynExpr.minusN
                                             (SynLongIdent.CreateFromLongIdent [ stackName ; Ident.Create "Count" ])
-                                            1
+                                            1,
+                                        range0,
+                                        range0
                                     )
-                                ),
+                                    |> SynBinding.basic (SynLongIdent.CreateFromLongIdent [ field.ArgName ]) []
-                                range0,
+                                ]
-                                {
-                                    InKeyword = None
-                                }
-                            )
                             |> Some
                         | ListSelf synType ->
                             // TODO: also jank
                             let stackName = inputStacks.[List.last(getNameUnion(synType).Value).idText]
 
                             let vals =
-                                SynBinding.SynBinding (
+                                SynExpr.ComputationExpr (
-                                    None,
-                                    SynBindingKind.Normal,
                                     false,
-                                    false,
+                                    SynExpr.For (
-                                    [],
+                                        DebugPointAtFor.Yes range0,
-                                    PreXmlDoc.Empty,
+                                        DebugPointAtInOrTo.Yes range0,
-                                    SynValData.SynValData (None, SynValInfo.Empty, None),
+                                        Ident.Create "i",
-                                    SynPat.CreateNamed field.ArgName,
+                                        Some range0,
-                                    None,
+                                        SynExpr.minusN
-                                    SynExpr.pipeThroughFunction
+                                            (SynLongIdent.CreateFromLongIdent [ stackName ; Ident.Create "Count" ])
-                                        (SynExpr.CreateLongIdent (SynLongIdent.Create [ "Seq" ; "toList" ]))
+                                            1,
-                                        (SynExpr.CreateApp (
+                                        false,
-                                            SynExpr.CreateIdentString "seq",
+                                        SynExpr.minus
-                                            SynExpr.ComputationExpr (
+                                            (SynLongIdent.CreateFromLongIdent [ stackName ; Ident.Create "Count" ])
-                                                false,
+                                            (SynExpr.CreateIdent field.ArgName),
-                                                SynExpr.For (
+                                        SynExpr.YieldOrReturn (
-                                                    DebugPointAtFor.Yes range0,
+                                            (true, false),
-                                                    DebugPointAtInOrTo.Yes range0,
+                                            SynExpr.DotIndexedGet (
-                                                    Ident.Create "i",
+                                                SynExpr.CreateIdent stackName,
-                                                    Some range0,
+                                                SynExpr.CreateIdentString "i",
-                                                    SynExpr.minusN
+                                                range0,
-                                                        (SynLongIdent.CreateFromLongIdent
-                                                            [ stackName ; Ident.Create "Count" ])
-                                                        1,
-                                                    false,
-                                                    SynExpr.minus
-                                                        (SynLongIdent.CreateFromLongIdent
-                                                            [ stackName ; Ident.Create "Count" ])
-                                                        (SynExpr.CreateIdent field.ArgName),
-                                                    SynExpr.YieldOrReturn (
-                                                        (true, false),
-                                                        SynExpr.DotIndexedGet (
-                                                            SynExpr.CreateIdent stackName,
-                                                            SynExpr.CreateIdentString "i",
-                                                            range0,
-                                                            range0
-                                                        ),
-                                                        range0
-                                                    ),
-                                                    range0
-                                                ),
                                                 range0
-                                            )
+                                            ),
-                                        )),
+                                            range0
-                                    range0,
+                                        ),
-                                    DebugPointAtBinding.Yes range0,
+                                        range0
-                                    SynExpr.synBindingTriviaZero false
+                                    ),
+                                    range0
                                 )
+                                |> SynExpr.applyFunction (SynExpr.CreateIdentString "seq")
+                                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Seq" ; "toList" ])
+                                |> SynBinding.basic (SynLongIdent.CreateFromLongIdent [ field.ArgName ]) []
 
                             let shadowedIdent = Ident.Create (field.ArgName.idText + "_len")
 
-                            SynExpr.LetOrUse (
+                            [
-                                false,
+                                SynExpr.minus
-                                false,
+                                    (SynLongIdent.CreateFromLongIdent [ stackName ; Ident.Create "Count" ])
-                                [
+                                    (SynExpr.CreateIdent shadowedIdent)
-                                    SynBinding.SynBinding (
+                                SynExpr.CreateIdent shadowedIdent
-                                        None,
+                            ]
-                                        SynBindingKind.Normal,
+                            |> SynExpr.CreateParenedTuple
-                                        false,
+                            |> SynExpr.applyFunction (
-                                        false,
+                                SynExpr.createLongIdent' [ stackName ; Ident.Create "RemoveRange" ]
-                                        [],
-                                        PreXmlDoc.Empty,
-                                        SynValData.SynValData (None, SynValInfo.Empty, None),
-                                        SynPat.CreateNamed shadowedIdent,
-                                        None,
-                                        SynExpr.CreateIdent field.ArgName,
-                                        range0,
-                                        DebugPointAtBinding.Yes range0,
-                                        SynExpr.synBindingTriviaZero false
-                                    )
-
-                                ],
-                                SynExpr.CreateSequential
-                                    [
-                                        SynExpr.LetOrUse (
-                                            false,
-                                            false,
-                                            [ vals ],
-                                            SynExpr.CreateApp (
-                                                SynExpr.CreateLongIdent (
-                                                    SynLongIdent.CreateFromLongIdent
-                                                        [ stackName ; Ident.Create "RemoveRange" ]
-                                                ),
-                                                SynExpr.CreateParenedTuple
-                                                    [
-                                                        SynExpr.minus
-                                                            (SynLongIdent.CreateFromLongIdent
-                                                                [ stackName ; Ident.Create "Count" ])
-                                                            (SynExpr.CreateIdent shadowedIdent)
-                                                        SynExpr.CreateIdent shadowedIdent
-                                                    ]
-                                            ),
-                                            range0,
-                                            {
-                                                InKeyword = None
-                                            }
-                                        )
-                                    ],
-
-                                range0,
-                                {
-                                    InKeyword = None
-                                }
                             )
+                            |> SynExpr.createLet [ vals ]
+                            |> SynExpr.createLet
+                                [
+                                    SynBinding.basic
+                                        (SynLongIdent.CreateFromLongIdent [ shadowedIdent ])
+                                        []
+                                        (SynExpr.CreateIdent field.ArgName)
+                                ]
                             |> Some
                     )
 
@@ -1359,19 +1212,6 @@ module internal CataGenerator =
         )
 
     let createLoopFunction (cataTypeName : Ident) (cataVarName : Ident) (analysis : UnionAnalysis list) : SynBinding =
-        let valData =
-            SynValData.SynValData (
-                None,
-                SynValInfo.SynValInfo (
-                    [
-                        [ SynArgInfo.SynArgInfo ([], false, Some cataVarName) ]
-                        [ SynArgInfo.SynArgInfo ([], false, Some (Ident.Create "instructions")) ]
-                    ],
-                    SynArgInfo.Empty
-                ),
-                None
-            )
-
         let userSuppliedGenerics =
             analysis
             |> List.collect _.Typars
@@ -1401,45 +1241,37 @@ module internal CataGenerator =
                     yield SynType.Var (SynTypar.SynTypar (case.GenericName, TyparStaticReq.None, false), range0)
             ]
 
-        let headPat =
+        let args =
-            SynPat.LongIdent (
+            [
-                SynLongIdent.CreateString "loop",
+                SynPat.CreateParen (
-                None,
+                    SynPat.CreateTyped (
-                None,
+                        SynPat.CreateNamed cataVarName,
-                SynArgPats.Pats
+                        SynType.App (
-                    [
+                            SynType.CreateLongIdent (SynLongIdent.CreateFromLongIdent [ cataTypeName ]),
-                        SynPat.CreateParen (
+                            Some range0,
-                            SynPat.CreateTyped (
+                            cataGenerics,
-                                SynPat.CreateNamed cataVarName,
+                            List.replicate (cataGenerics.Length - 1) range0,
-                                SynType.App (
+                            Some range0,
-                                    SynType.CreateLongIdent (SynLongIdent.CreateFromLongIdent [ cataTypeName ]),
+                            false,
-                                    Some range0,
+                            range0
-                                    cataGenerics,
-                                    List.replicate (cataGenerics.Length - 1) range0,
-                                    Some range0,
-                                    false,
-                                    range0
-                                )
-                            )
                         )
-                        SynPat.CreateParen (
+                    )
-                            SynPat.CreateTyped (
+                )
-                                SynPat.CreateNamed (Ident.Create "instructions"),
+                SynPat.CreateParen (
-                                SynType.App (
+                    SynPat.CreateTyped (
-                                    SynType.CreateLongIdent "ResizeArray",
+                        SynPat.CreateNamed (Ident.Create "instructions"),
-                                    Some range0,
+                        SynType.App (
-                                    [ instructionsArrType ],
+                            SynType.CreateLongIdent "ResizeArray",
-                                    [],
+                            Some range0,
-                                    Some range0,
+                            [ instructionsArrType ],
-                                    false,
+                            [],
-                                    range0
+                            Some range0,
-                                )
+                            false,
-                            )
+                            range0
                         )
-                    ],
+                    )
-                Some (SynAccess.Private range0),
+                )
-                range0
+            ]
-            )
 
         let baseMatchClauses = analysis |> List.map createBaseMatchClause
 
@@ -1449,47 +1281,24 @@ module internal CataGenerator =
             SynExpr.CreateMatch (SynExpr.CreateIdentString "currentInstruction", baseMatchClauses @ recMatchClauses)
 
         let body =
-            SynExpr.CreateSequential
+            [
+                SynExpr.CreateApp (
+                    SynExpr.createLongIdent [ "instructions" ; "RemoveAt" ],
+                    SynExpr.CreateParen (SynExpr.minusN (SynLongIdent.Create [ "instructions" ; "Count" ]) 1)
+                )
+                matchStatement
+            ]
+            |> SynExpr.CreateSequential
+            |> SynExpr.createLet
                 [
-                    SynExpr.CreateApp (
+                    SynExpr.DotIndexedGet (
-                        SynExpr.CreateLongIdent (SynLongIdent.Create [ "instructions" ; "RemoveAt" ]),
+                        SynExpr.CreateIdentString "instructions",
-                        SynExpr.CreateParen (SynExpr.minusN (SynLongIdent.Create [ "instructions" ; "Count" ]) 1)
+                        SynExpr.minusN (SynLongIdent.Create [ "instructions" ; "Count" ]) 1,
-                    )
-                    matchStatement
-                ]
-
-        let body =
-            SynExpr.LetOrUse (
-                false,
-                false,
-                [
-                    SynBinding.SynBinding (
-                        None,
-                        SynBindingKind.Normal,
-                        false,
-                        false,
-                        [],
-                        PreXmlDoc.Empty,
-                        SynValData.SynValData (None, SynValInfo.SynValInfo ([], SynArgInfo.Empty), None),
-                        SynPat.CreateNamed (Ident.Create "currentInstruction"),
-                        None,
-                        SynExpr.DotIndexedGet (
-                            SynExpr.CreateIdentString "instructions",
-                            SynExpr.minusN (SynLongIdent.Create [ "instructions" ; "Count" ]) 1,
-                            range0,
-                            range0
-                        ),
                         range0,
-                        DebugPointAtBinding.Yes range0,
+                        range0
-                        SynExpr.synBindingTriviaZero false
                     )
-                ],
+                    |> SynBinding.basic (SynLongIdent.CreateString "currentInstruction") []
-                body,
+                ]
-                range0,
-                {
-                    InKeyword = None
-                }
-            )
 
         let body =
             SynExpr.CreateSequential
@@ -1498,82 +1307,43 @@ module internal CataGenerator =
                         DebugPointAtWhile.Yes range0,
                         SynExpr.greaterThan
                             (SynExpr.CreateConst (SynConst.Int32 0))
-                            (SynExpr.CreateLongIdent (SynLongIdent.Create [ "instructions" ; "Count" ])),
+                            (SynExpr.createLongIdent [ "instructions" ; "Count" ]),
                         body,
                         range0
                     )
                     SynExpr.CreateTuple (
                         analysis
-                        |> List.map (fun unionAnalysis ->
+                        |> List.map (fun unionAnalysis -> [ unionAnalysis.StackName ] |> SynExpr.createLongIdent')
-                            [ unionAnalysis.StackName ]
-                            |> SynLongIdent.CreateFromLongIdent
-                            |> SynExpr.CreateLongIdent
-                        )
                     )
                 ]
 
         let body =
             (body, analysis)
             ||> List.fold (fun body unionCase ->
-                SynExpr.LetOrUse (
+                body
-                    false,
+                |> SynExpr.createLet
-                    false,
                     [
-                        SynBinding.SynBinding (
+                        SynExpr.TypeApp (
-                            None,
+                            SynExpr.CreateIdent (Ident.Create "ResizeArray"),
-                            SynBindingKind.Normal,
-                            false,
-                            false,
-                            [],
-                            PreXmlDoc.Empty,
-                            SynValData.SynValData (None, SynValInfo.Empty, None),
-                            SynPat.Named (SynIdent.SynIdent (unionCase.StackName, None), false, None, range0),
-                            None,
-                            SynExpr.CreateApp (
-                                SynExpr.TypeApp (
-                                    SynExpr.CreateIdent (Ident.Create "ResizeArray"),
-                                    range0,
-                                    [
-                                        SynType.Var (
-                                            SynTypar.SynTypar (unionCase.GenericName, TyparStaticReq.None, false),
-                                            range0
-                                        )
-                                    ],
-                                    [],
-                                    Some range0,
-                                    range0,
-                                    range0
-                                ),
-                                SynExpr.CreateConst SynConst.Unit
-                            ),
                             range0,
-                            DebugPointAtBinding.Yes range0,
+                            [
-                            SynExpr.synBindingTriviaZero false
+                                SynType.Var (
+                                    SynTypar.SynTypar (unionCase.GenericName, TyparStaticReq.None, false),
+                                    range0
+                                )
+                            ],
+                            [],
+                            Some range0,
+                            range0,
+                            range0
                         )
-                    ],
+                        |> SynExpr.applyTo (SynExpr.CreateConst SynConst.Unit)
-                    body,
+                        |> SynBinding.basic (SynLongIdent.CreateFromLongIdent [ unionCase.StackName ]) []
-                    range0,
+                    ]
-                    {
-                        SynExprLetOrUseTrivia.InKeyword = None
-                    }
-                )
             )
 
-        SynBinding.SynBinding (
+        SynBinding.basic (SynLongIdent.CreateString "loop") args body
-            Some (SynAccess.Private range0),
+        |> SynBinding.withAccessibility (Some (SynAccess.Private range0))
-            SynBindingKind.Normal,
-            false,
-            false,
-            [],
-            PreXmlDoc.Empty,
-            valData,
-            headPat,
-            None,
-            body,
-            range0,
-            DebugPointAtBinding.NoneAtLet,
-            trivia = SynExpr.synBindingTriviaZero false
-        )
 
     let createModule
         (opens : SynOpenDeclTarget list)

WoofWare.Myriad.Plugins/HttpClientGenerator.fs

@@ -274,9 +274,7 @@ module internal HttpClientGenerator =
                                     SynExpr.CreateConstString ("{" + substituteId + "}")
                                     SynExpr.callMethod "ToString" (SynExpr.CreateIdent varName)
                                     |> SynExpr.pipeThroughFunction (
-                                        SynExpr.CreateLongIdent (
+                                        SynExpr.createLongIdent [ "System" ; "Web" ; "HttpUtility" ; "UrlEncode" ]
-                                            SynLongIdent.Create [ "System" ; "Web" ; "HttpUtility" ; "UrlEncode" ]
-                                        )
                                     )
                                 ])
                     | _ -> template
@@ -316,12 +314,9 @@ module internal HttpClientGenerator =
                 let urlSeparator =
                     // apparent Myriad bug: `IndexOf '?'` gets formatted as `IndexOf ?` which is clearly wrong
                     let questionMark =
-                        SynExpr.CreateParen (
+                        SynExpr.CreateConst (SynConst.Int32 63)
-                            SynExpr.CreateApp (
+                        |> SynExpr.applyFunction (SynExpr.CreateIdentString "char")
-                                SynExpr.CreateIdentString "char",
+                        |> SynExpr.CreateParen
-                                SynExpr.CreateConst (SynConst.Int32 63)
-                            )
-                        )
 
                     let containsQuestion =
                         info.UrlTemplate
@@ -354,9 +349,7 @@ module internal HttpClientGenerator =
                     SynExpr.toString paramValue.Type (SynExpr.CreateIdent paramValueId)
                     |> SynExpr.CreateParen
                     |> SynExpr.pipeThroughFunction (
-                        SynExpr.CreateLongIdent (
+                        SynExpr.createLongIdent [ "System" ; "Web" ; "HttpUtility" ; "UrlEncode" ]
-                            SynLongIdent.Create [ "System" ; "Web" ; "HttpUtility" ; "UrlEncode" ]
-                        )
                     )
                     |> SynExpr.CreateParen
                     |> SynExpr.plus (SynExpr.plus uri (SynExpr.CreateConstString ("&" + paramKey + "=")))
@@ -365,48 +358,31 @@ module internal HttpClientGenerator =
                 |> SynExpr.CreateParen
 
         let requestUri =
-            let uriIdent = SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "Uri" ])
+            let uriIdent = SynExpr.createLongIdent [ "System" ; "Uri" ]
+
+            let baseAddress = SynExpr.createLongIdent [ "client" ; "BaseAddress" ]
 
             let baseAddress =
-                SynExpr.CreateLongIdent (SynLongIdent.Create [ "client" ; "BaseAddress" ])
+                [
-
+                    SynMatchClause.Create (
-            let baseAddress =
+                        SynPat.CreateNull,
-                SynExpr.CreateMatch (
+                        None,
-                    baseAddress,
+                        match info.BaseAddress with
-                    [
+                        | None ->
-                        SynMatchClause.Create (
+                            [
-                            SynPat.CreateNull,
+                                SynExpr.CreateApp (SynExpr.CreateIdentString "nameof", SynExpr.CreateParen baseAddress)
-                            None,
+                                SynExpr.CreateConstString
-                            match info.BaseAddress with
+                                    "No base address was supplied on the type, and no BaseAddress was on the HttpClient."
-                            | None ->
+                            ]
-                                SynExpr.CreateApp (
+                            |> SynExpr.CreateParenedTuple
-                                    SynExpr.CreateIdentString "raise",
+                            |> SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "ArgumentNullException" ])
-                                    SynExpr.CreateParen (
+                            |> SynExpr.CreateParen
-                                        SynExpr.CreateApp (
+                            |> SynExpr.applyFunction (SynExpr.CreateIdentString "raise")
-                                            SynExpr.CreateLongIdent (
+                        | Some expr -> SynExpr.CreateApp (uriIdent, expr)
-                                                SynLongIdent.Create [ "System" ; "ArgumentNullException" ]
+                    )
-                                            ),
+                    SynMatchClause.Create (SynPat.CreateNamed (Ident.Create "v"), None, SynExpr.CreateIdentString "v")
-                                            SynExpr.CreateParenedTuple
+                ]
-                                                [
+                |> SynExpr.createMatch baseAddress
-                                                    SynExpr.CreateApp (
-                                                        SynExpr.CreateIdentString "nameof",
-                                                        SynExpr.CreateParen baseAddress
-                                                    )
-                                                    SynExpr.CreateConstString
-                                                        "No base address was supplied on the type, and no BaseAddress was on the HttpClient."
-                                                ]
-                                        )
-                                    )
-                                )
-                            | Some expr -> SynExpr.CreateApp (uriIdent, expr)
-                        )
-                        SynMatchClause.Create (
-                            SynPat.CreateNamed (Ident.Create "v"),
-                            None,
-                            SynExpr.CreateIdentString "v"
-                        )
-                    ]
-                )
                 |> SynExpr.CreateParen
 
             SynExpr.App (
@@ -421,7 +397,7 @@ module internal HttpClientGenerator =
                             SynExpr.CreateParenedTuple
                                 [
                                     requestUriTrailer
-                                    SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "UriKind" ; "Relative" ])
+                                    SynExpr.createLongIdent [ "System" ; "UriKind" ; "Relative" ]
                                 ]
                         )
                     ],
@@ -461,10 +437,8 @@ module internal HttpClientGenerator =
             [
                 SynExpr.equals
                     (SynExpr.CreateIdentString "Method")
-                    (SynExpr.CreateLongIdent (
+                    (SynExpr.createLongIdent
-                        SynLongIdent.Create
+                        [ "System" ; "Net" ; "Http" ; "HttpMethod" ; httpMethodString info.HttpMethod ])
-                            [ "System" ; "Net" ; "Http" ; "HttpMethod" ; httpMethodString info.HttpMethod ]
-                    ))
                 SynExpr.equals (SynExpr.CreateIdentString "RequestUri") (SynExpr.CreateIdentString "uri")
             ]
             |> SynExpr.CreateParenedTuple
@@ -599,9 +573,7 @@ module internal HttpClientGenerator =
                     "responseString",
                     SynExpr.awaitTask (
                         SynExpr.CreateApp (
-                            SynExpr.CreateLongIdent (
+                            SynExpr.createLongIdent [ "response" ; "Content" ; "ReadAsStringAsync" ],
-                                SynLongIdent.Create [ "response" ; "Content" ; "ReadAsStringAsync" ]
-                            ),
                             SynExpr.CreateIdentString "ct"
                         )
                     )
@@ -612,9 +584,7 @@ module internal HttpClientGenerator =
                     "responseStream",
                     SynExpr.awaitTask (
                         SynExpr.CreateApp (
-                            SynExpr.CreateLongIdent (
+                            SynExpr.createLongIdent [ "response" ; "Content" ; "ReadAsStreamAsync" ],
-                                SynLongIdent.Create [ "response" ; "Content" ; "ReadAsStreamAsync" ]
-                            ),
                             SynExpr.CreateIdentString "ct"
                         )
                     )
@@ -625,9 +595,7 @@ module internal HttpClientGenerator =
                     "jsonNode",
                     SynExpr.awaitTask (
                         SynExpr.CreateApp (
-                            SynExpr.CreateLongIdent (
+                            SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ; "ParseAsync" ],
-                                SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ; "ParseAsync" ]
-                            ),
                             SynExpr.CreateParenedTuple
                                 [
                                     SynExpr.CreateIdentString "responseStream"
@@ -644,15 +612,13 @@ module internal HttpClientGenerator =
                 |> List.map (fun (headerName, callToGetValue) ->
                     Do (
                         SynExpr.CreateApp (
-                            SynExpr.CreateLongIdent (SynLongIdent.Create [ "httpMessage" ; "Headers" ; "Add" ]),
+                            SynExpr.createLongIdent [ "httpMessage" ; "Headers" ; "Add" ],
                             SynExpr.CreateParenedTuple
                                 [
                                     headerName
                                     SynExpr.CreateApp (
-                                        SynExpr.CreateLongIdent (
+                                        SynExpr.createLongIdent'
-                                            SynLongIdent.CreateFromLongIdent
+                                            [ Ident.Create "this" ; callToGetValue ; Ident.Create "ToString" ],
-                                                [ Ident.Create "this" ; callToGetValue ; Ident.Create "ToString" ]
-                                        ),
                                         SynExpr.CreateConst SynConst.Unit
                                     )
                                 ]
@@ -665,14 +631,14 @@ module internal HttpClientGenerator =
                 |> List.map (fun (headerName, headerValue) ->
                     Do (
                         SynExpr.CreateApp (
-                            SynExpr.CreateLongIdent (SynLongIdent.Create [ "httpMessage" ; "Headers" ; "Add" ]),
+                            SynExpr.createLongIdent [ "httpMessage" ; "Headers" ; "Add" ],
                             SynExpr.CreateParenedTuple [ headerName ; headerValue ]
                         )
                     )
                 )
 
             [
-                yield LetBang ("ct", SynExpr.CreateLongIdent (SynLongIdent.Create [ "Async" ; "CancellationToken" ]))
+                yield LetBang ("ct", SynExpr.createLongIdent [ "Async" ; "CancellationToken" ])
                 yield Let ("uri", requestUri)
                 yield
                     Use (
@@ -697,7 +663,7 @@ module internal HttpClientGenerator =
                         "response",
                         SynExpr.awaitTask (
                             SynExpr.CreateApp (
-                                SynExpr.CreateLongIdent (SynLongIdent.Create [ "client" ; "SendAsync" ]),
+                                SynExpr.createLongIdent [ "client" ; "SendAsync" ],
                                 SynExpr.CreateParenedTuple
                                     [ SynExpr.CreateIdentString "httpMessage" ; SynExpr.CreateIdentString "ct" ]
                             )
@@ -708,7 +674,7 @@ module internal HttpClientGenerator =
                         Let (
                             "response",
                             SynExpr.CreateApp (
-                                SynExpr.CreateLongIdent (SynLongIdent.Create [ "response" ; "EnsureSuccessStatusCode" ]),
+                                SynExpr.createLongIdent [ "response" ; "EnsureSuccessStatusCode" ],
                                 SynExpr.CreateConst SynConst.Unit
                             )
                         )
@@ -727,24 +693,23 @@ module internal HttpClientGenerator =
             |> SynExpr.createCompExpr "async" returnExpr
             |> SynExpr.startAsTask (SynLongIdent.CreateFromLongIdent [ cancellationTokenArg ])
 
-        SynMemberDefn.Member (
+        SynBinding.SynBinding (
-            SynBinding.SynBinding (
+            None,
-                info.Accessibility,
+            SynBindingKind.Normal,
-                SynBindingKind.Normal,
+            false,
-                false,
+            false,
-                false,
+            [],
-                [],
+            PreXmlDoc.Empty,
-                PreXmlDoc.Empty,
+            valData,
-                valData,
+            headPat,
-                headPat,
+            None,
-                None,
+            implementation,
-                implementation,
+            range0,
-                range0,
+            DebugPointAtBinding.Yes range0,
-                DebugPointAtBinding.Yes range0,
+            SynBinding.triviaZero true
-                SynExpr.synBindingTriviaZero true
-            ),
-            range0
         )
+        |> SynBinding.withAccessibility info.Accessibility
+        |> fun b -> SynMemberDefn.Member (b, range0)
 
     let getHttpAttributes (attrs : SynAttribute list) : HttpAttribute list =
         attrs
@@ -945,9 +910,7 @@ module internal HttpClientGenerator =
                         ),
                         Some (SynBindingReturnInfo.Create pi.Type),
                         SynExpr.CreateApp (
-                            SynExpr.CreateLongIdent (
+                            SynExpr.createLongIdent' [ Ident.lowerFirstLetter pi.Identifier ],
-                                SynLongIdent.CreateFromLongIdent [ Ident.lowerFirstLetter pi.Identifier ]
-                            ),
                             SynExpr.CreateConst SynConst.Unit
                         ),
                         range0,
@@ -1031,43 +994,30 @@ module internal HttpClientGenerator =
                 None
             )
 
-        let pattern =
+        let pattern = SynLongIdent.CreateString "make"
-            SynPat.CreateLongIdent (SynLongIdent.CreateString "make", headerArgs @ [ clientCreationArg ])
 
         let returnInfo =
-            SynBindingReturnInfo.Create (SynType.LongIdent (SynLongIdent.CreateFromLongIdent interfaceType.Name))
+            SynType.LongIdent (SynLongIdent.CreateFromLongIdent interfaceType.Name)
 
         let nameWithoutLeadingI =
             List.last interfaceType.Name
             |> _.idText
             |> fun s ->
                 if s.StartsWith 'I' then
-                    s.[1..]
+                    s.Substring 1
                 else
                     failwith $"Expected interface type to start with 'I', but was: %s{s}"
 
         let createFunc =
             if spec.ExtensionMethods then
                 let binding =
-                    SynBinding.SynBinding (
+                    SynBinding.basic
-                        None,
+                        (SynLongIdent.CreateString "make")
-                        SynBindingKind.Normal,
+                        (headerArgs @ [ clientCreationArg ])
-                        false,
+                        interfaceImpl
-                        false,
+                    |> SynBinding.withXmlDoc xmlDoc
-                        [],
+                    |> SynBinding.makeStaticMember
-                        xmlDoc,
+                    |> SynBinding.withReturnAnnotation returnInfo
-                        valData,
-                        pattern,
-                        Some returnInfo,
-                        interfaceImpl,
-                        range0,
-                        DebugPointAtBinding.NoneAtInvisible,
-                        {
-                            LeadingKeyword = SynLeadingKeyword.StaticMember (range0, range0)
-                            InlineKeyword = None
-                            EqualsRange = Some range0
-                        }
-                    )
 
                 let mem = SynMemberDefn.Member (binding, range0)
 
@@ -1091,21 +1041,9 @@ module internal HttpClientGenerator =
                 SynModuleDecl.Types ([ containingType ], range0)
 
             else
-                SynBinding.SynBinding (
+                SynBinding.basic (SynLongIdent.CreateString "make") (headerArgs @ [ clientCreationArg ]) interfaceImpl
-                    None,
+                |> SynBinding.withXmlDoc xmlDoc
-                    SynBindingKind.Normal,
+                |> SynBinding.withReturnAnnotation returnInfo
-                    false,
-                    false,
-                    [],
-                    xmlDoc,
-                    valData,
-                    pattern,
-                    Some returnInfo,
-                    interfaceImpl,
-                    range0,
-                    DebugPointAtBinding.NoneAtLet,
-                    SynExpr.synBindingTriviaZero false
-                )
                 |> List.singleton
                 |> SynModuleDecl.CreateLet
 

WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs

@@ -46,66 +46,31 @@ module internal InterfaceMockGenerator =
             )
             |> Set.ofSeq
 
-        let synValData =
-            {
-                SynMemberFlags.IsInstance = false
-                SynMemberFlags.IsDispatchSlot = false
-                SynMemberFlags.IsOverrideOrExplicitImpl = false
-                SynMemberFlags.IsFinal = false
-                SynMemberFlags.GetterOrSetterIsCompilerGenerated = false
-                SynMemberFlags.MemberKind = SynMemberKind.Member
-            }
-
         let failwithFun =
-            SynExpr.createLambda
+            SynExpr.createLongIdent [ "System" ; "NotImplementedException" ]
-                "x"
+            |> SynExpr.applyTo (SynExpr.CreateConstString "Unimplemented mock function")
-                (SynExpr.CreateApp (
+            |> SynExpr.CreateParen
-                    SynExpr.CreateIdentString "raise",
+            |> SynExpr.applyFunction (SynExpr.CreateIdentString "raise")
-                    SynExpr.CreateParen (
+            |> SynExpr.createLambda "_"
-                        SynExpr.CreateApp (
-                            SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "NotImplementedException" ]),
-                            SynExpr.CreateConstString "Unimplemented mock function"
-                        )
-                    )
-                ))
-
-        let constructorIdent =
-            let generics =
-                interfaceType.Generics
-                |> Option.map (fun generics -> SynValTyparDecls (Some generics, false))
-
-            SynPat.LongIdent (
-                SynLongIdent.CreateString "Empty",
-                None,
-                None, // no generics on the "Empty", only on the return type
-                SynArgPats.Pats (
-                    if generics.IsNone then
-                        []
-                    else
-                        [ SynPat.CreateParen (SynPat.CreateConst SynConst.Unit) ]
-                ),
-                None,
-                range0
-            )
 
         let constructorReturnType =
             match interfaceType.Generics with
             | None -> SynType.CreateLongIdent name
             | Some generics ->
-                let generics =
-                    generics.TyparDecls
-                    |> List.map (fun (SynTyparDecl (_, typar)) -> SynType.Var (typar, range0))
 
-                SynType.App (
+            let generics =
-                    SynType.CreateLongIdent name,
+                generics.TyparDecls
-                    Some range0,
+                |> List.map (fun (SynTyparDecl (_, typar)) -> SynType.Var (typar, range0))
-                    generics,
+
-                    List.replicate (generics.Length - 1) range0,
+            SynType.App (
-                    Some range0,
+                SynType.CreateLongIdent name,
-                    false,
+                Some range0,
-                    range0
+                generics,
-                )
+                List.replicate (generics.Length - 1) range0,
-            |> SynBindingReturnInfo.Create
+                Some range0,
+                false,
+                range0
+            )
 
         let constructorFields =
             let extras =
@@ -125,26 +90,17 @@ module internal InterfaceMockGenerator =
             extras @ nonExtras
 
         let constructor =
-            SynMemberDefn.Member (
+            SynBinding.basic
-                SynBinding.SynBinding (
+                (SynLongIdent.CreateString "Empty")
-                    None,
+                (if interfaceType.Generics.IsNone then
-                    SynBindingKind.Normal,
+                     []
-                    false,
+                 else
-                    false,
+                     [ SynPat.CreateConst SynConst.Unit ])
-                    [],
+                (AstHelper.instantiateRecord constructorFields)
-                    PreXmlDoc.Create " An implementation where every method throws.",
+            |> SynBinding.makeStaticMember
-                    SynValData.SynValData (Some synValData, SynValInfo.Empty, None),
+            |> SynBinding.withXmlDoc (PreXmlDoc.Create " An implementation where every method throws.")
-                    constructorIdent,
+            |> SynBinding.withReturnAnnotation constructorReturnType
-                    Some constructorReturnType,
+            |> fun m -> SynMemberDefn.Member (m, range0)
-                    AstHelper.instantiateRecord constructorFields,
-                    range0,
-                    DebugPointAtBinding.Yes range0,
-                    { SynExpr.synBindingTriviaZero true with
-                        LeadingKeyword = SynLeadingKeyword.StaticMember (range0, range0)
-                    }
-                ),
-                range0
-            )
 
         let fields =
             let extras =
@@ -255,13 +211,9 @@ module internal InterfaceMockGenerator =
 
                         (last, rest)
                         ||> List.fold (fun trail next -> SynExpr.CreateApp (next, trail))
-                        |> fun args ->
+                        |> SynExpr.applyFunction (
-                            SynExpr.CreateApp (
+                            SynExpr.createLongIdent' [ Ident.Create "this" ; memberInfo.Identifier ]
-                                SynExpr.CreateLongIdent (
+                        )
-                                    SynLongIdent.CreateFromLongIdent [ Ident.Create "this" ; memberInfo.Identifier ]
-                                ),
-                                args
-                            )
 
                     SynMemberDefn.Member (
                         SynBinding.SynBinding (
@@ -327,78 +279,13 @@ module internal InterfaceMockGenerator =
             |> Seq.map (fun inheritance ->
                 match inheritance with
                 | KnownInheritance.IDisposable ->
-                    let valData =
-                        SynValData.SynValData (
-                            Some
-                                {
-                                    IsInstance = true
-                                    IsDispatchSlot = false
-                                    IsOverrideOrExplicitImpl = true
-                                    IsFinal = false
-                                    GetterOrSetterIsCompilerGenerated = false
-                                    MemberKind = SynMemberKind.Member
-                                },
-                            valInfo =
-                                SynValInfo.SynValInfo (
-                                    curriedArgInfos =
-                                        [
-                                            yield
-                                                [
-                                                    SynArgInfo.SynArgInfo (
-                                                        attributes = [],
-                                                        optional = false,
-                                                        ident = None
-                                                    )
-                                                ]
-                                        ],
-                                    returnInfo =
-                                        SynArgInfo.SynArgInfo (attributes = [], optional = false, ident = None)
-                                ),
-                            thisIdOpt = None
-                        )
-
-                    let headArgs = [ SynPat.Const (SynConst.Unit, range0) ]
-
-                    let headPat =
-                        SynPat.LongIdent (
-                            SynLongIdent.CreateFromLongIdent [ Ident.Create "this" ; Ident.Create "Dispose" ],
-                            None,
-                            None,
-                            SynArgPats.Pats headArgs,
-                            None,
-                            range0
-                        )
-
                     let binding =
-                        SynBinding.SynBinding (
+                        SynBinding.basic
-                            None,
+                            (SynLongIdent.CreateFromLongIdent [ Ident.Create "this" ; Ident.Create "Dispose" ])
-                            SynBindingKind.Normal,
+                            [ SynPat.CreateConst SynConst.Unit ]
-                            false,
+                            (SynExpr.CreateApp (SynExpr.createLongIdent [ "this" ; "Dispose" ], SynExpr.CreateUnit))
-                            false,
+                        |> SynBinding.withReturnAnnotation (SynType.Unit ())
-                            [],
+                        |> SynBinding.makeInstanceMember
-                            PreXmlDoc.Empty,
-                            valData,
-                            headPat,
-                            Some (
-                                SynBindingReturnInfo.SynBindingReturnInfo (
-                                    SynType.Unit (),
-                                    range0,
-                                    [],
-                                    SynBindingReturnInfoTrivia.Zero
-                                )
-                            ),
-                            SynExpr.CreateApp (
-                                SynExpr.CreateLongIdent (SynLongIdent.Create [ "this" ; "Dispose" ]),
-                                SynExpr.CreateUnit
-                            ),
-                            range0,
-                            DebugPointAtBinding.Yes range0,
-                            {
-                                LeadingKeyword = SynLeadingKeyword.Member range0
-                                InlineKeyword = None
-                                EqualsRange = Some range0
-                            }
-                        )
 
                     let mem = SynMemberDefn.Member (binding, range0)
 
@@ -473,7 +360,7 @@ module internal InterfaceMockGenerator =
             |> _.idText
             |> fun s ->
                 if s.StartsWith 'I' && s.Length > 1 && Char.IsUpper s.[1] then
-                    s.[1..]
+                    s.Substring 1
                 else
                     s
             |> fun s -> s + "Mock"

WoofWare.Myriad.Plugins/JsonParseGenerator.fs

@@ -31,24 +31,20 @@ module internal JsonParseGenerator =
     let assertNotNull (propertyName : SynExpr) (indexed : SynExpr) =
         let raiseExpr =
             SynExpr.CreateApp (
-                SynExpr.CreateIdentString "raise",
+                SynExpr.CreateApp (
-                SynExpr.CreateParen (
+                    SynExpr.CreateIdentString "sprintf",
-                    SynExpr.CreateApp (
+                    SynExpr.CreateConstString "Required key '%s' not found on JSON object"
-                        SynExpr.CreateLongIdent (
+                ),
-                            SynLongIdent.Create [ "System" ; "Collections" ; "Generic" ; "KeyNotFoundException" ]
+                SynExpr.CreateParen propertyName
-                        ),
+            )
-                        SynExpr.CreateParen (
+            |> SynExpr.CreateParen
-                            SynExpr.CreateApp (
+            |> SynExpr.applyFunction (
-                                SynExpr.CreateApp (
+                SynExpr.CreateLongIdent (
-                                    SynExpr.CreateIdentString "sprintf",
+                    SynLongIdent.Create [ "System" ; "Collections" ; "Generic" ; "KeyNotFoundException" ]
-                                    SynExpr.CreateConstString "Required key '%s' not found on JSON object"
-                                ),
-                                SynExpr.CreateParen propertyName
-                            )
-                        )
-                    )
                 )
             )
+            |> SynExpr.CreateParen
+            |> SynExpr.applyFunction (SynExpr.CreateIdentString "raise")
 
         SynExpr.CreateMatch (
             indexed,
@@ -139,37 +135,19 @@ module internal JsonParseGenerator =
     /// fun kvp -> let key = {key(kvp)} in let value = {value(kvp)} in (key, value))
     /// The inputs will be fed with appropriate SynExprs to apply them to the `kvp.Key` and `kvp.Value` args.
     let dictionaryMapper (key : SynExpr -> SynExpr) (value : SynExpr -> SynExpr) : SynExpr =
-        let keyArg =
+        let keyArg = SynExpr.createLongIdent [ "kvp" ; "Key" ] |> SynExpr.CreateParen
-            SynExpr.CreateLongIdent (SynLongIdent.Create [ "kvp" ; "Key" ])
-            |> SynExpr.CreateParen
 
-        let valueArg =
+        let valueArg = SynExpr.createLongIdent [ "kvp" ; "Value" ] |> SynExpr.CreateParen
-            SynExpr.CreateLongIdent (SynLongIdent.Create [ "kvp" ; "Value" ])
-            |> SynExpr.CreateParen
 
-        SynExpr.LetOrUse (
+        SynExpr.CreateTuple [ SynExpr.CreateIdentString "key" ; SynExpr.CreateIdentString "value" ]
-            false,
+        |> SynExpr.createLet
-            false,
+            [
+                SynBinding.Let (pattern = SynPat.CreateNamed (Ident.Create "value"), expr = value valueArg)
+            ]
+        |> SynExpr.createLet
             [
                 SynBinding.Let (pattern = SynPat.CreateNamed (Ident.Create "key"), expr = key keyArg)
-            ],
+            ]
-            SynExpr.LetOrUse (
-                false,
-                false,
-                [
-                    SynBinding.Let (pattern = SynPat.CreateNamed (Ident.Create "value"), expr = value valueArg)
-                ],
-                SynExpr.CreateTuple [ SynExpr.CreateIdentString "key" ; SynExpr.CreateIdentString "value" ],
-                range0,
-                {
-                    InKeyword = None
-                }
-            ),
-            range0,
-            {
-                InKeyword = None
-            }
-        )
         |> SynExpr.createLambda "kvp"
 
     /// A conforming JSON object has only strings as keys. But it would be reasonable to allow the user
@@ -199,25 +177,19 @@ module internal JsonParseGenerator =
         | DateOnly ->
             node
             |> asValueGetValue propertyName "string"
-            |> SynExpr.pipeThroughFunction (
+            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "DateOnly" ; "Parse" ])
-                SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "DateOnly" ; "Parse" ])
-            )
         | Uri ->
             node
             |> asValueGetValue propertyName "string"
-            |> SynExpr.pipeThroughFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "Uri" ]))
+            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Uri" ])
         | Guid ->
             node
             |> asValueGetValue propertyName "string"
-            |> SynExpr.pipeThroughFunction (
+            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Guid" ; "Parse" ])
-                SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "Guid" ; "Parse" ])
-            )
         | DateTime ->
             node
             |> asValueGetValue propertyName "string"
-            |> SynExpr.pipeThroughFunction (
+            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "DateTime" ; "Parse" ])
-                SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "DateTime" ; "Parse" ])
-            )
         | NumberType typeName ->
             let basic = asValueGetValue propertyName typeName node
 
@@ -237,9 +209,7 @@ module internal JsonParseGenerator =
 
                 let handler =
                     asValueGetValue propertyName "string" node
-                    |> SynExpr.pipeThroughFunction (
+                    |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent' (parseFunction typeName))
-                        SynExpr.CreateLongIdent (SynLongIdent.CreateFromLongIdent (parseFunction typeName))
-                    )
                     |> SynExpr.ifThenElse
                         (SynExpr.equals
                             option
@@ -325,10 +295,10 @@ module internal JsonParseGenerator =
             )
             |> SynExpr.pipeThroughFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ "Map" ; "ofSeq" ]))
         | BigInt ->
-            SynExpr.CreateApp (
+            node
-                SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "Numerics" ; "BigInteger" ; "Parse" ]),
+            |> SynExpr.callMethod "ToJsonString"
-                SynExpr.CreateParen (node |> SynExpr.callMethod "ToJsonString")
+            |> SynExpr.CreateParen
-            )
+            |> SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "Numerics" ; "BigInteger" ; "Parse" ])
         | _ ->
             // Let's just hope that we've also got our own type annotation!
             let typeName =
@@ -344,9 +314,8 @@ module internal JsonParseGenerator =
     /// propertyName is probably a string literal, but it could be a [<Literal>] variable
     /// The result of this function is the body of a let-binding (not including the LHS of that let-binding).
     let createParseRhs (options : JsonParseOption) (propertyName : SynExpr) (fieldType : SynType) : SynExpr =
-        SynExpr.CreateIdentString "node"
+        let objectToParse = SynExpr.CreateIdentString "node" |> SynExpr.index propertyName
-        |> SynExpr.index propertyName
+        parseNode (Some propertyName) options fieldType objectToParse
-        |> parseNode (Some propertyName) options fieldType
 
     let isJsonNumberHandling (literal : LongIdent) : bool =
         match List.rev literal |> List.map (fun ident -> ident.idText) with
@@ -357,171 +326,30 @@ module internal JsonParseGenerator =
         | [ _ ; "JsonNumberHandling" ; "Serialization" ; "Json" ; "Text" ; "System" ] -> true
         | _ -> false
 
-    let createMaker (spec : JsonParseOutputSpec) (typeName : LongIdent) (fields : SynFieldData<Ident> list) =
+    /// `populateNode` will be inserted before we return the `node` variable.
+    ///
+    /// That is, we give you access to a `JsonNode` called `node`,
+    /// and you must return a `typeName`.
+    let scaffolding (spec : JsonParseOutputSpec) (typeName : LongIdent) (functionBody : SynExpr) : SynModuleDecl =
         let xmlDoc = PreXmlDoc.Create " Parse from a JSON node."
 
-        let returnInfo =
+        let returnInfo = SynType.LongIdent (SynLongIdent.CreateFromLongIdent typeName)
-            SynBindingReturnInfo.Create (SynType.LongIdent (SynLongIdent.CreateFromLongIdent typeName))
 
         let inputArg = Ident.Create "node"
         let functionName = Ident.Create "jsonParse"
 
-        let inputVal =
+        let arg =
-            let memberFlags =
+            SynPat.CreateNamed inputArg
-                if spec.ExtensionMethods then
+            |> SynPat.annotateType (
-                    {
+                SynType.LongIdent (SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ])
-                        SynMemberFlags.IsInstance = false
-                        SynMemberFlags.IsDispatchSlot = false
-                        SynMemberFlags.IsOverrideOrExplicitImpl = false
-                        SynMemberFlags.IsFinal = false
-                        SynMemberFlags.GetterOrSetterIsCompilerGenerated = false
-                        SynMemberFlags.MemberKind = SynMemberKind.Member
-                    }
-                    |> Some
-                else
-                    None
-
-            let thisIdOpt = if spec.ExtensionMethods then None else Some inputArg
-
-            SynValData.SynValData (
-                memberFlags,
-                SynValInfo.SynValInfo ([ [ SynArgInfo.CreateId functionName ] ], SynArgInfo.Empty),
-                thisIdOpt
-            )
-
-        let assignments =
-            fields
-            |> List.map (fun fieldData ->
-                let propertyNameAttr =
-                    fieldData.Attrs
-                    |> List.tryFind (fun attr ->
-                        attr.TypeName.AsString.EndsWith ("JsonPropertyName", StringComparison.Ordinal)
-                    )
-
-                let options =
-                    (JsonParseOption.None, fieldData.Attrs)
-                    ||> List.fold (fun options attr ->
-                        if attr.TypeName.AsString.EndsWith ("JsonNumberHandling", StringComparison.Ordinal) then
-                            let qualifiedEnumValue =
-                                match SynExpr.stripOptionalParen attr.ArgExpr with
-                                | SynExpr.LongIdent (_, SynLongIdent (ident, _, _), _, _) when
-                                    isJsonNumberHandling ident
-                                    ->
-                                    // Make sure it's fully qualified
-                                    SynExpr.CreateLongIdent (
-                                        SynLongIdent.Create
-                                            [
-                                                "System"
-                                                "Text"
-                                                "Json"
-                                                "Serialization"
-                                                "JsonNumberHandling"
-                                                "AllowReadingFromString"
-                                            ]
-                                    )
-                                | _ -> attr.ArgExpr
-
-                            {
-                                JsonNumberHandlingArg = Some qualifiedEnumValue
-                            }
-                        else
-                            options
-                    )
-
-                let propertyName =
-                    match propertyNameAttr with
-                    | None ->
-                        let sb = StringBuilder fieldData.Ident.idText.Length
-                        sb.Append (Char.ToLowerInvariant fieldData.Ident.idText.[0]) |> ignore
-
-                        if fieldData.Ident.idText.Length > 1 then
-                            sb.Append fieldData.Ident.idText.[1..] |> ignore
-
-                        sb.ToString () |> SynConst.CreateString |> SynExpr.CreateConst
-                    | Some name -> name.ArgExpr
-
-                let pattern =
-                    SynPat.LongIdent (
-                        SynLongIdent.CreateFromLongIdent [ fieldData.Ident ],
-                        None,
-                        None,
-                        SynArgPats.Empty,
-                        None,
-                        range0
-                    )
-
-                SynBinding.Let (
-                    isInline = false,
-                    isMutable = false,
-                    expr = createParseRhs options propertyName fieldData.Type,
-                    valData = inputVal,
-                    pattern = pattern
-                )
-            )
-
-        let finalConstruction =
-            fields
-            |> List.map (fun fieldData ->
-                (SynLongIdent.CreateFromLongIdent [ fieldData.Ident ], true),
-                Some (SynExpr.CreateLongIdent (SynLongIdent.CreateFromLongIdent [ fieldData.Ident ]))
-            )
-            |> AstHelper.instantiateRecord
-
-        let assignments =
-            (finalConstruction, assignments)
-            ||> List.fold (fun final assignment ->
-                SynExpr.LetOrUse (
-                    false,
-                    false,
-                    [ assignment ],
-                    final,
-                    range0,
-                    {
-                        InKeyword = None
-                    }
-                )
-            )
-
-        let pattern =
-            SynPat.LongIdent (
-                SynLongIdent.CreateFromLongIdent [ functionName ],
-                None,
-                None,
-                SynArgPats.Pats
-                    [
-                        SynPat.CreateTyped (
-                            SynPat.CreateNamed inputArg,
-                            SynType.LongIdent (
-                                SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
-                            )
-                        )
-                        |> SynPat.CreateParen
-                    ],
-                None,
-                range0
             )
 
         if spec.ExtensionMethods then
             let binding =
-                SynBinding.SynBinding (
+                SynBinding.basic (SynLongIdent.CreateFromLongIdent [ functionName ]) [ arg ] functionBody
-                    None,
+                |> SynBinding.makeStaticMember
-                    SynBindingKind.Normal,
+                |> SynBinding.withXmlDoc xmlDoc
-                    false,
+                |> SynBinding.withReturnAnnotation returnInfo
-                    false,
-                    [],
-                    xmlDoc,
-                    inputVal,
-                    pattern,
-                    Some returnInfo,
-                    assignments,
-                    range0,
-                    DebugPointAtBinding.NoneAtInvisible,
-                    {
-                        LeadingKeyword = SynLeadingKeyword.StaticMember (range0, range0)
-                        InlineKeyword = None
-                        EqualsRange = Some range0
-                    }
-                )
 
             let mem = SynMemberDefn.Member (binding, range0)
 
@@ -541,18 +369,180 @@ module internal JsonParseGenerator =
 
             SynModuleDecl.Types ([ containingType ], range0)
         else
-            let binding =
+            SynBinding.basic (SynLongIdent.CreateFromLongIdent [ functionName ]) [ arg ] functionBody
-                SynBinding.Let (
+            |> SynBinding.withXmlDoc xmlDoc
-                    isInline = false,
+            |> SynBinding.withReturnAnnotation returnInfo
-                    isMutable = false,
+            |> List.singleton
-                    xmldoc = xmlDoc,
+            |> SynModuleDecl.CreateLet
-                    returnInfo = returnInfo,
+
-                    expr = assignments,
+    let getParseOptions (fieldAttrs : SynAttribute list) =
-                    valData = inputVal,
+        (JsonParseOption.None, fieldAttrs)
-                    pattern = pattern
+        ||> List.fold (fun options attr ->
-                )
+            if attr.TypeName.AsString.EndsWith ("JsonNumberHandling", StringComparison.Ordinal) then
+                let qualifiedEnumValue =
+                    match SynExpr.stripOptionalParen attr.ArgExpr with
+                    | SynExpr.LongIdent (_, SynLongIdent (ident, _, _), _, _) when isJsonNumberHandling ident ->
+                        // Make sure it's fully qualified
+                        SynExpr.createLongIdent
+                            [
+                                "System"
+                                "Text"
+                                "Json"
+                                "Serialization"
+                                "JsonNumberHandling"
+                                "AllowReadingFromString"
+                            ]
+                    | _ -> attr.ArgExpr
+
+                {
+                    JsonNumberHandlingArg = Some qualifiedEnumValue
+                }
+            else
+                options
+        )
+
+
+    let createRecordMaker (spec : JsonParseOutputSpec) (typeName : LongIdent) (fields : SynFieldData<Ident> list) =
+        let assignments =
+            fields
+            |> List.mapi (fun i fieldData ->
+                let propertyNameAttr =
+                    fieldData.Attrs
+                    |> List.tryFind (fun attr ->
+                        attr.TypeName.AsString.EndsWith ("JsonPropertyName", StringComparison.Ordinal)
+                    )
+
+                let options = getParseOptions fieldData.Attrs
+
+                let propertyName =
+                    match propertyNameAttr with
+                    | None ->
+                        let sb = StringBuilder fieldData.Ident.idText.Length
+
+                        sb.Append (Char.ToLowerInvariant fieldData.Ident.idText.[0])
+                        |> ignore<StringBuilder>
+
+                        if fieldData.Ident.idText.Length > 1 then
+                            sb.Append (fieldData.Ident.idText.Substring 1) |> ignore<StringBuilder>
+
+                        sb.ToString () |> SynConst.CreateString |> SynExpr.CreateConst
+                    | Some name -> name.ArgExpr
+
+                createParseRhs options propertyName fieldData.Type
+                |> SynBinding.basic (SynLongIdent.CreateString $"arg_%i{i}") []
+            )
+
+        let finalConstruction =
+            fields
+            |> List.mapi (fun i fieldData ->
+                (SynLongIdent.CreateFromLongIdent [ fieldData.Ident ], true),
+                Some (SynExpr.CreateLongIdent (SynLongIdent.CreateString $"arg_%i{i}"))
+            )
+            |> AstHelper.instantiateRecord
+
+        (finalConstruction, assignments)
+        ||> List.fold (fun final assignment -> SynExpr.createLet [ assignment ] final)
+
+    let createUnionMaker (spec : JsonParseOutputSpec) (typeName : LongIdent) (fields : UnionCase<Ident> list) =
+        fields
+        |> List.map (fun case ->
+            let propertyName = JsonSerializeGenerator.getPropertyName case.Ident case.Attrs
+
+            let body =
+                if case.Fields.IsEmpty then
+                    SynExpr.createLongIdent' (typeName @ [ case.Ident ])
+                else
+                    case.Fields
+                    |> List.map (fun field ->
+                        let propertyName = JsonSerializeGenerator.getPropertyName field.Ident field.Attrs
+                        let options = getParseOptions field.Attrs
+                        createParseRhs options propertyName field.Type
+                    )
+                    |> SynExpr.CreateParenedTuple
+                    |> SynExpr.applyFunction (SynExpr.createLongIdent' (typeName @ [ case.Ident ]))
+                    |> SynExpr.createLet
+                        [
+                            SynExpr.index (SynExpr.CreateConstString "data") (SynExpr.CreateIdentString "node")
+                            |> assertNotNull (SynExpr.CreateConstString "data")
+                            |> SynBinding.basic (SynLongIdent.CreateString "node") []
+                        ]
+
+            match propertyName with
+            | SynExpr.Const (synConst, _) ->
+                SynMatchClause.SynMatchClause (
+                    SynPat.CreateConst synConst,
+                    None,
+                    body,
+                    range0,
+                    DebugPointAtTarget.Yes,
+                    {
+                        ArrowRange = Some range0
+                        BarRange = Some range0
+                    }
+                )
+            | _ ->
+                SynMatchClause.SynMatchClause (
+                    SynPat.CreateNamed (Ident.Create "x"),
+                    Some (SynExpr.equals (SynExpr.CreateIdentString "x") propertyName),
+                    body,
+                    range0,
+                    DebugPointAtTarget.Yes,
+                    {
+                        ArrowRange = Some range0
+                        BarRange = Some range0
+                    }
+                )
+        )
+        |> fun l ->
+            l
+            @ [
+                let fail =
+                    SynExpr.plus
+                        (SynExpr.CreateConstString "Unrecognised 'type' field value: ")
+                        (SynExpr.CreateIdentString "v")
+                    |> SynExpr.CreateParen
+                    |> SynExpr.applyFunction (SynExpr.CreateIdentString "failwith")
+
+                SynMatchClause.SynMatchClause (
+                    SynPat.CreateNamed (Ident.Create "v"),
+                    None,
+                    fail,
+                    range0,
+                    DebugPointAtTarget.Yes,
+                    {
+                        ArrowRange = Some range0
+                        BarRange = Some range0
+                    }
+                )
+            ]
+        |> SynExpr.createMatch (SynExpr.CreateIdentString "ty")
+        |> SynExpr.createLet
+            [
+                let property = SynExpr.CreateConstString "type"
+
+                SynExpr.CreateIdentString "node"
+                |> SynExpr.index property
+                |> assertNotNull property
+                |> SynExpr.pipeThroughFunction (
+                    SynExpr.createLambda
+                        "v"
+                        (SynExpr.callGenericMethod "GetValue" [ Ident.Create "string" ] (SynExpr.CreateIdentString "v"))
+                )
+                |> SynBinding.basic (SynLongIdent.CreateString "ty") []
+            ]
+    (*
+            let ty =
+                match node.["type"] with
+                | null -> raise (System.Collections.Generic.KeyNotFoundException ())
+                | v -> v.GetValue<string> ()
+            match ty with
+            | "emptyCase" -> FirstDu.EmptyCase
+            | "case1" ->
+                FirstDu.Case1
+            | "case2" -> FirstDu.Case2
+            | _ -> failwithf "Unrecognised case name: %s" ty
+            *)
 
-            SynModuleDecl.CreateLet [ binding ]
 
     let createModule (namespaceId : LongIdent) (spec : JsonParseOutputSpec) (typeDefn : SynTypeDefn) =
         let (SynTypeDefn (synComponentInfo, synTypeDefnRepr, _members, _implicitCtor, _, _)) =
@@ -600,17 +590,28 @@ module internal JsonParseGenerator =
         let info =
             SynComponentInfo.Create (moduleName, attributes = attributes, xmldoc = xmlDoc)
 
-        let decls =
+        let decl =
             match synTypeDefnRepr with
             | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (_accessibility, fields, _range), _) ->
                 let fields = fields |> List.map SynField.extractWithIdent
-                [ createMaker spec ident fields ]
+                createRecordMaker spec ident fields
             | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Union (_accessibility, cases, _range), _) ->
-                // [ createMaker spec ident cases ]
+                let optionGet (i : Ident option) =
-                failwith "Unions are not yet supported"
+                    match i with
+                    | None -> failwith "WoofWare.Myriad requires union cases to have identifiers on each field."
+                    | Some i -> i
+
+                let cases =
+                    cases
+                    |> List.map SynUnionCase.extract
+                    |> List.map (UnionCase.mapIdentFields optionGet)
+
+                createUnionMaker spec ident cases
             | _ -> failwithf "Not a record or union type"
 
-        let mdl = SynModuleDecl.CreateNestedModule (info, decls)
+        let mdl =
+            [ scaffolding spec ident decl ]
+            |> fun d -> SynModuleDecl.CreateNestedModule (info, d)
 
         SynModuleOrNamespace.CreateNamespace (namespaceId, decls = [ mdl ])
 

WoofWare.Myriad.Plugins/JsonSerializeGenerator.fs

@@ -30,9 +30,7 @@ module internal JsonSerializeGenerator =
         | Uri ->
             // JsonValue.Create<type>
             SynExpr.TypeApp (
-                SynExpr.CreateLongIdent (
+                SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ],
-                    SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ]
-                ),
                 range0,
                 [ fieldType ],
                 [],
@@ -42,39 +40,37 @@ module internal JsonSerializeGenerator =
             )
         | OptionType ty ->
             // fun field -> match field with | None -> JsonValue.Create null | Some v -> {serializeNode ty} field
-            SynExpr.CreateMatch (
+            [
-                SynExpr.CreateIdentString "field",
+                SynMatchClause.Create (
-                [
+                    SynPat.CreateLongIdent (SynLongIdent.CreateString "None", []),
-                    SynMatchClause.Create (
+                    None,
-                        SynPat.CreateLongIdent (SynLongIdent.CreateString "None", []),
+                    // The absolutely galaxy-brained implementation of JsonValue has `JsonValue.Parse "null"`
-                        None,
+                    // identically equal to null. We have to work around this later, but we might as well just
-                        // The absolutely galaxy-brained implementation of JsonValue has `JsonValue.Parse "null"`
+                    // be efficient here and whip up the null directly.
-                        // identically equal to null. We have to work around this later, but we might as well just
+                    SynExpr.CreateNull
-                        // be efficient here and whip up the null directly.
+                    |> SynExpr.upcast' (
-                        SynExpr.CreateNull
+                        SynType.CreateLongIdent (
-                        |> SynExpr.upcast' (
+                            SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
-                            SynType.CreateLongIdent (
-                                SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
-                            )
                         )
                     )
+                )
 
-                    SynMatchClause.Create (
+                SynMatchClause.Create (
-                        SynPat.CreateLongIdent (
+                    SynPat.CreateLongIdent (
-                            SynLongIdent.CreateString "Some",
+                        SynLongIdent.CreateString "Some",
-                            [ SynPat.CreateNamed (Ident.Create "field") ]
+                        [ SynPat.CreateNamed (Ident.Create "field") ]
-                        ),
+                    ),
-                        None,
+                    None,
-                        SynExpr.CreateApp (serializeNode ty, SynExpr.CreateIdentString "field")
+                    SynExpr.CreateApp (serializeNode ty, SynExpr.CreateIdentString "field")
-                        |> SynExpr.CreateParen
+                    |> SynExpr.CreateParen
-                        |> SynExpr.upcast' (
+                    |> SynExpr.upcast' (
-                            SynType.CreateLongIdent (
+                        SynType.CreateLongIdent (
-                                SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
+                            SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
-                            )
                         )
                     )
-                ]
+                )
-            )
+            ]
+            |> SynExpr.createMatch (SynExpr.CreateIdentString "field")
             |> SynExpr.createLambda "field"
         | ArrayType ty
         | ListType ty ->
@@ -82,43 +78,29 @@ module internal JsonSerializeGenerator =
             //     let arr = JsonArray ()
             //     for mem in field do arr.Add ({serializeNode} mem)
             //     arr
-            SynExpr.LetOrUse (
+            [
-                false,
+                SynExpr.ForEach (
-                false,
+                    DebugPointAtFor.Yes range0,
+                    DebugPointAtInOrTo.Yes range0,
+                    SeqExprOnly.SeqExprOnly false,
+                    true,
+                    SynPat.CreateNamed (Ident.Create "mem"),
+                    SynExpr.CreateIdent (Ident.Create "field"),
+                    SynExpr.CreateApp (
+                        SynExpr.CreateLongIdent (SynLongIdent.Create [ "arr" ; "Add" ]),
+                        SynExpr.CreateParen (SynExpr.CreateApp (serializeNode ty, SynExpr.CreateIdentString "mem"))
+                    ),
+                    range0
+                )
+                SynExpr.CreateIdentString "arr"
+            ]
+            |> SynExpr.CreateSequential
+            |> SynExpr.createLet
                 [
-                    SynBinding.Let (
+                    SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonArray" ]
-                        pattern = SynPat.CreateNamed (Ident.Create "arr"),
+                    |> SynExpr.applyTo (SynExpr.CreateConst SynConst.Unit)
-                        expr =
+                    |> SynBinding.basic (SynLongIdent.CreateString "arr") []
-                            SynExpr.CreateApp (
+                ]
-                                SynExpr.CreateLongIdent (
-                                    SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonArray" ]
-                                ),
-                                SynExpr.CreateConst SynConst.Unit
-                            )
-                    )
-                ],
-                SynExpr.CreateSequential
-                    [
-                        SynExpr.ForEach (
-                            DebugPointAtFor.Yes range0,
-                            DebugPointAtInOrTo.Yes range0,
-                            SeqExprOnly.SeqExprOnly false,
-                            true,
-                            SynPat.CreateNamed (Ident.Create "mem"),
-                            SynExpr.CreateIdent (Ident.Create "field"),
-                            SynExpr.CreateApp (
-                                SynExpr.CreateLongIdent (SynLongIdent.Create [ "arr" ; "Add" ]),
-                                SynExpr.CreateParen (
-                                    SynExpr.CreateApp (serializeNode ty, SynExpr.CreateIdentString "mem")
-                                )
-                            ),
-                            range0
-                        )
-                        SynExpr.CreateIdentString "arr"
-                    ],
-                range0,
-                SynExprLetOrUseTrivia.empty
-            )
             |> SynExpr.createLambda "field"
         | IDictionaryType (_keyType, valueType)
         | DictionaryType (_keyType, valueType)
@@ -129,65 +111,53 @@ module internal JsonSerializeGenerator =
             //    for (KeyValue(key, value)) in field do
             //        ret.Add (key.ToString (), {serializeNode} value)
             //    ret
-            SynExpr.LetOrUse (
+            [
-                false,
+                SynExpr.ForEach (
-                false,
+                    DebugPointAtFor.Yes range0,
-                [
+                    DebugPointAtInOrTo.Yes range0,
-                    SynBinding.Let (
+                    SeqExprOnly.SeqExprOnly false,
-                        pattern = SynPat.CreateNamed (Ident.Create "ret"),
+                    true,
-                        expr =
+                    SynPat.CreateParen (
-                            SynExpr.CreateApp (
+                        SynPat.CreateLongIdent (
-                                SynExpr.CreateLongIdent (
+                            SynLongIdent.CreateString "KeyValue",
-                                    SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonObject" ]
+                            [
-                                ),
+                                SynPat.CreateParen (
-                                SynExpr.CreateConst SynConst.Unit
+                                    SynPat.Tuple (
-                            )
+                                        false,
-                    )
+                                        [
-                ],
+                                            SynPat.CreateNamed (Ident.Create "key")
-                SynExpr.CreateSequential
+                                            SynPat.CreateNamed (Ident.Create "value")
-                    [
+                                        ],
-                        SynExpr.ForEach (
+                                        [ range0 ],
-                            DebugPointAtFor.Yes range0,
+                                        range0
-                            DebugPointAtInOrTo.Yes range0,
+                                    )
-                            SeqExprOnly.SeqExprOnly false,
-                            true,
-                            SynPat.CreateParen (
-                                SynPat.CreateLongIdent (
-                                    SynLongIdent.CreateString "KeyValue",
-                                    [
-                                        SynPat.CreateParen (
-                                            SynPat.Tuple (
-                                                false,
-                                                [
-                                                    SynPat.CreateNamed (Ident.Create "key")
-                                                    SynPat.CreateNamed (Ident.Create "value")
-                                                ],
-                                                [ range0 ],
-                                                range0
-                                            )
-                                        )
-                                    ]
                                 )
-                            ),
+                            ]
-                            SynExpr.CreateIdent (Ident.Create "field"),
-                            SynExpr.CreateApp (
-                                SynExpr.CreateLongIdent (SynLongIdent.Create [ "ret" ; "Add" ]),
-                                SynExpr.CreateParenedTuple
-                                    [
-                                        SynExpr.CreateApp (
-                                            SynExpr.CreateLongIdent (SynLongIdent.Create [ "key" ; "ToString" ]),
-                                            SynExpr.CreateConst SynConst.Unit
-                                        )
-                                        SynExpr.CreateApp (serializeNode valueType, SynExpr.CreateIdentString "value")
-                                    ]
-                            ),
-                            range0
                         )
-                        SynExpr.CreateIdentString "ret"
+                    ),
-                    ],
+                    SynExpr.CreateIdent (Ident.Create "field"),
-                range0,
+                    SynExpr.CreateApp (
-                SynExprLetOrUseTrivia.empty
+                        SynExpr.createLongIdent [ "ret" ; "Add" ],
-            )
+                        SynExpr.CreateParenedTuple
+                            [
+                                SynExpr.CreateApp (
+                                    SynExpr.createLongIdent [ "key" ; "ToString" ],
+                                    SynExpr.CreateConst SynConst.Unit
+                                )
+                                SynExpr.CreateApp (serializeNode valueType, SynExpr.CreateIdentString "value")
+                            ]
+                    ),
+                    range0
+                )
+                SynExpr.CreateIdentString "ret"
+            ]
+            |> SynExpr.CreateSequential
+            |> SynExpr.createLet
+                [
+                    SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonObject" ]
+                    |> SynExpr.applyTo (SynExpr.CreateConst SynConst.Unit)
+                    |> SynBinding.basic (SynLongIdent.CreateString "ret") []
+                ]
             |> SynExpr.createLambda "field"
         | _ ->
             // {type}.toJsonNode
@@ -196,24 +166,17 @@ module internal JsonSerializeGenerator =
                 | SynType.LongIdent ident -> ident.LongIdent
                 | _ -> failwith $"Unrecognised type: %+A{fieldType}"
 
-            SynExpr.CreateLongIdent (SynLongIdent.CreateFromLongIdent (typeName @ [ Ident.Create "toJsonNode" ]))
+            SynExpr.createLongIdent' (typeName @ [ Ident.Create "toJsonNode" ])
 
     /// propertyName is probably a string literal, but it could be a [<Literal>] variable
     /// `node.Add ({propertyName}, {toJsonNode})`
     let createSerializeRhsRecord (propertyName : SynExpr) (fieldId : Ident) (fieldType : SynType) : SynExpr =
-        let func = SynExpr.CreateLongIdent (SynLongIdent.Create [ "node" ; "Add" ])
+        [
-
+            propertyName
-        let args =
+            SynExpr.CreateApp (serializeNode fieldType, SynExpr.createLongIdent' [ Ident.Create "input" ; fieldId ])
-            [
+        ]
-                propertyName
+        |> SynExpr.CreateParenedTuple
-                SynExpr.CreateApp (
+        |> SynExpr.applyFunction (SynExpr.createLongIdent [ "node" ; "Add" ])
-                    serializeNode fieldType,
-                    SynExpr.CreateLongIdent (SynLongIdent.CreateFromLongIdent [ Ident.Create "input" ; fieldId ])
-                )
-            ]
-            |> SynExpr.CreateParenedTuple
-
-        SynExpr.CreateApp (func, args)
 
     let getPropertyName (fieldId : Ident) (attrs : SynAttribute list) : SynExpr =
         let propertyNameAttr =
@@ -247,98 +210,35 @@ module internal JsonSerializeGenerator =
         let xmlDoc = PreXmlDoc.Create " Serialize to a JSON node"
 
         let returnInfo =
-            SynBindingReturnInfo.Create (
+            SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
-                SynType.LongIdent (SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ])
+            |> SynType.LongIdent
-            )
 
         let functionName = Ident.Create "toJsonNode"
 
-        let inputVal =
-            let memberFlags =
-                if spec.ExtensionMethods then
-                    {
-                        SynMemberFlags.IsInstance = false
-                        SynMemberFlags.IsDispatchSlot = false
-                        SynMemberFlags.IsOverrideOrExplicitImpl = false
-                        SynMemberFlags.IsFinal = false
-                        SynMemberFlags.GetterOrSetterIsCompilerGenerated = false
-                        SynMemberFlags.MemberKind = SynMemberKind.Member
-                    }
-                    |> Some
-                else
-                    None
-
-            let thisIdOpt = if spec.ExtensionMethods then None else Some inputArgName
-
-            SynValData.SynValData (
-                memberFlags,
-                SynValInfo.SynValInfo ([ [ SynArgInfo.CreateId functionName ] ], SynArgInfo.Empty),
-                thisIdOpt
-            )
-
         let assignments =
-            SynExpr.LetOrUse (
+            [
-                false,
+                populateNode
-                false,
+                SynExpr.Upcast (SynExpr.CreateIdentString "node", SynType.Anon range0, range0)
+            ]
+            |> SynExpr.CreateSequential
+            |> SynExpr.createLet
                 [
-                    SynBinding.Let (
+                    SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonObject" ]
-                        pattern = SynPat.CreateNamed (Ident.Create "node"),
+                    |> SynExpr.applyTo (SynExpr.CreateConst SynConst.Unit)
-                        expr =
+                    |> SynBinding.basic (SynLongIdent.CreateString "node") []
-                            SynExpr.CreateApp (
+                ]
-                                SynExpr.CreateLongIdent (
-                                    SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonObject" ]
-                                ),
-                                SynExpr.CreateConst SynConst.Unit
-                            )
-                    )
-                ],
-                SynExpr.CreateSequential
-                    [
-                        populateNode
-                        SynExpr.Upcast (SynExpr.CreateIdentString "node", SynType.Anon range0, range0)
-                    ],
-                range0,
-                SynExprLetOrUseTrivia.empty
-            )
 
         let pattern =
-            SynPat.LongIdent (
+            SynPat.CreateNamed inputArgName
-                SynLongIdent.CreateFromLongIdent [ functionName ],
+            |> SynPat.annotateType (SynType.LongIdent (SynLongIdent.CreateFromLongIdent typeName))
-                None,
-                None,
-                SynArgPats.Pats
-                    [
-                        SynPat.CreateTyped (
-                            SynPat.CreateNamed inputArgName,
-                            SynType.LongIdent (SynLongIdent.CreateFromLongIdent typeName)
-                        )
-                        |> SynPat.CreateParen
-                    ],
-                None,
-                range0
-            )
 
         if spec.ExtensionMethods then
             let binding =
-                SynBinding.SynBinding (
+                assignments
-                    None,
+                |> SynBinding.basic (SynLongIdent.CreateFromLongIdent [ functionName ]) [ pattern ]
-                    SynBindingKind.Normal,
+                |> SynBinding.withXmlDoc xmlDoc
-                    false,
+                |> SynBinding.withReturnAnnotation returnInfo
-                    false,
+                |> SynBinding.makeStaticMember
-                    [],
-                    xmlDoc,
-                    inputVal,
-                    pattern,
-                    Some returnInfo,
-                    assignments,
-                    range0,
-                    DebugPointAtBinding.NoneAtInvisible,
-                    {
-                        LeadingKeyword = SynLeadingKeyword.StaticMember (range0, range0)
-                        InlineKeyword = None
-                        EqualsRange = Some range0
-                    }
-                )
 
             let mem = SynMemberDefn.Member (binding, range0)
 
@@ -359,15 +259,10 @@ module internal JsonSerializeGenerator =
             SynModuleDecl.Types ([ containingType ], range0)
         else
             let binding =
-                SynBinding.Let (
+                assignments
-                    isInline = false,
+                |> SynBinding.basic (SynLongIdent.CreateFromLongIdent [ functionName ]) [ pattern ]
-                    isMutable = false,
+                |> SynBinding.withReturnAnnotation returnInfo
-                    xmldoc = xmlDoc,
+                |> SynBinding.withXmlDoc xmlDoc
-                    returnInfo = returnInfo,
-                    expr = assignments,
-                    valData = inputVal,
-                    pattern = pattern
-                )
 
             SynModuleDecl.CreateLet [ binding ]
 
@@ -407,21 +302,15 @@ module internal JsonSerializeGenerator =
                 )
 
             let typeLine =
-                let func = SynExpr.CreateLongIdent (SynLongIdent.Create [ "node" ; "Add" ])
+                [
-
+                    SynExpr.CreateConstString "type"
-                let args =
+                    SynExpr.CreateApp (
-                    SynExpr.CreateParenedTuple
+                        SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ],
-                        [
+                        propertyName
-                            SynExpr.CreateConstString "type"
+                    )
-                            SynExpr.CreateApp (
+                ]
-                                SynExpr.CreateLongIdent (
+                |> SynExpr.CreateParenedTuple
-                                    SynLongIdent.CreateString "System.Text.Json.Nodes.JsonValue.Create"
+                |> SynExpr.applyFunction (SynExpr.createLongIdent [ "node" ; "Add" ])
-                                ),
-                                propertyName
-                            )
-                        ]
-
-                SynExpr.CreateApp (func, args)
 
             let dataNode =
                 SynBinding.Let (
@@ -440,32 +329,23 @@ module internal JsonSerializeGenerator =
                 ||> List.zip
                 |> List.map (fun (fieldData, caseName) ->
                     let propertyName = getPropertyName (Option.get fieldData.Ident) fieldData.Attrs
-                    let func = SynExpr.CreateLongIdent (SynLongIdent.Create [ "dataNode" ; "Add" ])
 
                     let node =
                         SynExpr.CreateApp (serializeNode fieldData.Type, SynExpr.CreateIdent caseName)
 
-                    SynExpr.CreateApp (func, SynExpr.CreateParenedTuple [ propertyName ; node ])
+                    [ propertyName ; node ]
+                    |> SynExpr.CreateParenedTuple
+                    |> SynExpr.applyFunction (SynExpr.createLongIdent [ "dataNode" ; "Add" ])
                 )
 
             let assignToNode =
-                let func = SynExpr.CreateLongIdent (SynLongIdent.Create [ "node" ; "Add" ])
+                [ SynExpr.CreateConstString "data" ; SynExpr.CreateIdentString "dataNode" ]
-
+                |> SynExpr.CreateParenedTuple
-                let args =
+                |> SynExpr.applyFunction (SynExpr.createLongIdent [ "node" ; "Add" ])
-                    SynExpr.CreateParenedTuple
-                        [ SynExpr.CreateConstString "data" ; SynExpr.CreateIdentString "dataNode" ]
-
-                SynExpr.CreateApp (func, args)
 
             let dataNode =
-                SynExpr.LetOrUse (
+                SynExpr.CreateSequential (dataBindings @ [ assignToNode ])
-                    false,
+                |> SynExpr.createLet [ dataNode ]
-                    false,
-                    [ dataNode ],
-                    SynExpr.CreateSequential (dataBindings @ [ assignToNode ]),
-                    range0,
-                    SynExprLetOrUseTrivia.empty
-                )
 
             let action =
                 [

WoofWare.Myriad.Plugins/SynExpr/SynBinding.fs

@@ -0,0 +1,173 @@
+namespace WoofWare.Myriad.Plugins
+
+open Fantomas.FCS.Syntax
+open Fantomas.FCS.SyntaxTrivia
+open Fantomas.FCS.Xml
+open Fantomas.FCS.Text.Range
+
+[<RequireQualifiedAccess>]
+module internal SynBinding =
+
+    let rec private stripParen (pat : SynPat) =
+        match pat with
+        | SynPat.Paren (p, _) -> stripParen p
+        | _ -> pat
+
+    let rec private getName (pat : SynPat) : Ident option =
+        match stripParen pat with
+        | SynPat.Named (SynIdent.SynIdent (name, _), _, _, _) -> Some name
+        | SynPat.Wild _ -> None
+        | SynPat.Typed (pat, _, _) -> getName pat
+        | SynPat.Const _ -> None
+        | SynPat.LongIdent (SynLongIdent.SynLongIdent (longIdent, _, _), _, _, _, _, _) ->
+            match longIdent with
+            | [ x ] -> Some x
+            | _ -> failwithf "got long ident %O ; can only get the name of a long ident with one component" longIdent
+        | _ -> failwithf "unrecognised pattern: %+A" pat
+
+    let triviaZero (isMember : bool) =
+        {
+            SynBindingTrivia.EqualsRange = Some range0
+            InlineKeyword = None
+            LeadingKeyword =
+                if isMember then
+                    SynLeadingKeyword.Member range0
+                else
+                    SynLeadingKeyword.Let range0
+        }
+
+    let basic (name : SynLongIdent) (args : SynPat list) (body : SynExpr) : SynBinding =
+        let valInfo : SynValInfo =
+            args
+            |> List.map (fun pat -> [ SynArgInfo.SynArgInfo (SynAttributes.Empty, false, getName pat) ])
+            |> fun x -> SynValInfo.SynValInfo (x, SynArgInfo.SynArgInfo ([], false, None))
+
+        SynBinding.SynBinding (
+            None,
+            SynBindingKind.Normal,
+            false,
+            false,
+            [],
+            PreXmlDoc.Empty,
+            SynValData.SynValData (None, valInfo, None),
+            SynPat.LongIdent (name, None, None, SynArgPats.Pats args, None, range0),
+            None,
+            body,
+            range0,
+            DebugPointAtBinding.Yes range0,
+            triviaZero false
+        )
+
+    let withAccessibility (acc : SynAccess option) (binding : SynBinding) : SynBinding =
+        match binding with
+        | SynBinding (_, kind, inl, mut, attrs, xml, valData, headPat, returnInfo, expr, range, debugPoint, trivia) ->
+            let headPat =
+                match headPat with
+                | SynPat.LongIdent (ident, extra, options, argPats, _, range) ->
+                    SynPat.LongIdent (ident, extra, options, argPats, acc, range)
+                | _ -> failwithf "unrecognised head pattern: %O" headPat
+
+            SynBinding (acc, kind, inl, mut, attrs, xml, valData, headPat, returnInfo, expr, range, debugPoint, trivia)
+
+    let withXmlDoc (doc : PreXmlDoc) (binding : SynBinding) : SynBinding =
+        match binding with
+        | SynBinding (acc, kind, inl, mut, attrs, _, valData, headPat, returnInfo, expr, range, debugPoint, trivia) ->
+            SynBinding (acc, kind, inl, mut, attrs, doc, valData, headPat, returnInfo, expr, range, debugPoint, trivia)
+
+    let withReturnAnnotation (ty : SynType) (binding : SynBinding) : SynBinding =
+        match binding with
+        | SynBinding (acc, kind, inl, mut, attrs, doc, valData, headPat, _, expr, range, debugPoint, trivia) ->
+            let retInfo =
+                SynBindingReturnInfo.SynBindingReturnInfo (
+                    ty,
+                    range0,
+                    [],
+                    {
+                        ColonRange = Some range0
+                    }
+                )
+
+            SynBinding (
+                acc,
+                kind,
+                inl,
+                mut,
+                attrs,
+                doc,
+                valData,
+                headPat,
+                Some retInfo,
+                expr,
+                range,
+                debugPoint,
+                trivia
+            )
+
+    let makeInline (binding : SynBinding) : SynBinding =
+        match binding with
+        | SynBinding (acc, kind, _, mut, attrs, doc, valData, headPat, ret, expr, range, debugPoint, trivia) ->
+            SynBinding (
+                acc,
+                kind,
+                true,
+                mut,
+                attrs,
+                doc,
+                valData,
+                headPat,
+                ret,
+                expr,
+                range,
+                debugPoint,
+                { trivia with
+                    InlineKeyword = Some range0
+                }
+            )
+
+    let makeStaticMember (binding : SynBinding) : SynBinding =
+        let memberFlags =
+            {
+                SynMemberFlags.IsInstance = false
+                SynMemberFlags.IsDispatchSlot = false
+                SynMemberFlags.IsOverrideOrExplicitImpl = false
+                SynMemberFlags.IsFinal = false
+                SynMemberFlags.GetterOrSetterIsCompilerGenerated = false
+                SynMemberFlags.MemberKind = SynMemberKind.Member
+            }
+
+        match binding with
+        | SynBinding (acc, kind, inl, mut, attrs, doc, valData, headPat, ret, expr, range, debugPoint, trivia) ->
+            let valData =
+                match valData with
+                | SynValData.SynValData (_, valInfo, _) -> SynValData.SynValData (Some memberFlags, valInfo, None)
+
+            let trivia =
+                { trivia with
+                    LeadingKeyword = SynLeadingKeyword.StaticMember (range0, range0)
+                }
+
+            SynBinding (acc, kind, inl, mut, attrs, doc, valData, headPat, ret, expr, range, debugPoint, trivia)
+
+    let makeInstanceMember (binding : SynBinding) : SynBinding =
+        let memberFlags =
+            {
+                SynMemberFlags.IsInstance = true
+                SynMemberFlags.IsDispatchSlot = false
+                SynMemberFlags.IsOverrideOrExplicitImpl = true
+                SynMemberFlags.IsFinal = false
+                SynMemberFlags.GetterOrSetterIsCompilerGenerated = false
+                SynMemberFlags.MemberKind = SynMemberKind.Member
+            }
+
+        match binding with
+        | SynBinding (acc, kind, inl, mut, attrs, doc, valData, headPat, ret, expr, range, debugPoint, trivia) ->
+            let valData =
+                match valData with
+                | SynValData.SynValData (_, valInfo, _) -> SynValData.SynValData (Some memberFlags, valInfo, None)
+
+            let trivia =
+                { trivia with
+                    LeadingKeyword = SynLeadingKeyword.Member range0
+                }
+
+            SynBinding (acc, kind, inl, mut, attrs, doc, valData, headPat, ret, expr, range, debugPoint, trivia)

WoofWare.Myriad.Plugins/SynExpr/SynExpr.fs

@@ -15,21 +15,25 @@ type internal CompExprBinding =
 [<RequireQualifiedAccess>]
 module internal SynExpr =
 
+    /// {f} {x}
+    let applyFunction (f : SynExpr) (x : SynExpr) : SynExpr = SynExpr.CreateApp (f, x)
+
+    /// {f} {x}
+    let applyTo (x : SynExpr) (f : SynExpr) : SynExpr = SynExpr.CreateApp (f, x)
+
     /// {expr} |> {func}
     let pipeThroughFunction (func : SynExpr) (expr : SynExpr) : SynExpr =
-        SynExpr.CreateApp (
+        SynExpr.CreateAppInfix (
-            SynExpr.CreateAppInfix (
+            SynExpr.CreateLongIdent (
-                SynExpr.CreateLongIdent (
+                SynLongIdent.SynLongIdent (
-                    SynLongIdent.SynLongIdent (
+                    [ Ident.Create "op_PipeRight" ],
-                        [ Ident.Create "op_PipeRight" ],
+                    [],
-                        [],
+                    [ Some (IdentTrivia.OriginalNotation "|>") ]
-                        [ Some (IdentTrivia.OriginalNotation "|>") ]
+                )
-                    )
-                ),
-                expr
             ),
-            func
+            expr
         )
+        |> applyTo func
 
     /// if {cond} then {trueBranch} else {falseBranch}
     /// Note that this function puts the trueBranch last, for pipelining convenience:
@@ -72,35 +76,31 @@ module internal SynExpr =
 
     /// {a} = {b}
     let equals (a : SynExpr) (b : SynExpr) =
-        SynExpr.CreateApp (
+        SynExpr.CreateAppInfix (
-            SynExpr.CreateAppInfix (
+            SynExpr.CreateLongIdent (
-                SynExpr.CreateLongIdent (
+                SynLongIdent.SynLongIdent (
-                    SynLongIdent.SynLongIdent (
+                    Ident.CreateLong "op_Equality",
-                        Ident.CreateLong "op_Equality",
+                    [],
-                        [],
+                    [ Some (IdentTrivia.OriginalNotation "=") ]
-                        [ Some (IdentTrivia.OriginalNotation "=") ]
+                )
-                    )
-                ),
-                a
             ),
-            b
+            a
         )
+        |> applyTo b
 
     /// {a} + {b}
     let plus (a : SynExpr) (b : SynExpr) =
-        SynExpr.CreateApp (
+        SynExpr.CreateAppInfix (
-            SynExpr.CreateAppInfix (
+            SynExpr.CreateLongIdent (
-                SynExpr.CreateLongIdent (
+                SynLongIdent.SynLongIdent (
-                    SynLongIdent.SynLongIdent (
+                    Ident.CreateLong "op_Addition",
-                        Ident.CreateLong "op_Addition",
+                    [],
-                        [],
+                    [ Some (IdentTrivia.OriginalNotation "+") ]
-                        [ Some (IdentTrivia.OriginalNotation "+") ]
+                )
-                    )
-                ),
-                a
             ),
-            b
+            a
         )
+        |> applyTo b
 
     let rec stripOptionalParen (expr : SynExpr) : SynExpr =
         match expr with
@@ -109,48 +109,42 @@ module internal SynExpr =
 
     /// {obj}.{meth} {arg}
     let callMethodArg (meth : string) (arg : SynExpr) (obj : SynExpr) : SynExpr =
-        SynExpr.CreateApp (
+        SynExpr.DotGet (
-            SynExpr.DotGet (
+            obj,
-                obj,
+            range0,
-                range0,
+            SynLongIdent.SynLongIdent (id = [ Ident.Create meth ], dotRanges = [], trivia = [ None ]),
-                SynLongIdent.SynLongIdent (id = [ Ident.Create meth ], dotRanges = [], trivia = [ None ]),
+            range0
-                range0
-            ),
-            arg
         )
+        |> applyTo arg
 
     /// {obj}.{meth}()
     let callMethod (meth : string) (obj : SynExpr) : SynExpr =
         callMethodArg meth (SynExpr.CreateConst SynConst.Unit) obj
 
     let callGenericMethod (meth : string) (ty : LongIdent) (obj : SynExpr) : SynExpr =
-        SynExpr.CreateApp (
+        SynExpr.TypeApp (
-            SynExpr.TypeApp (
+            SynExpr.DotGet (obj, range0, SynLongIdent.Create [ meth ], range0),
-                SynExpr.DotGet (obj, range0, SynLongIdent.Create [ meth ], range0),
+            range0,
-                range0,
+            [ SynType.LongIdent (SynLongIdent.CreateFromLongIdent ty) ],
-                [ SynType.LongIdent (SynLongIdent.CreateFromLongIdent ty) ],
+            [],
-                [],
+            Some range0,
-                Some range0,
+            range0,
-                range0,
+            range0
-                range0
-            ),
-            SynExpr.CreateConst SynConst.Unit
         )
+        |> applyTo (SynExpr.CreateConst SynConst.Unit)
 
     /// {obj}.{meth}<ty>()
     let callGenericMethod' (meth : string) (ty : string) (obj : SynExpr) : SynExpr =
-        SynExpr.CreateApp (
+        SynExpr.TypeApp (
-            SynExpr.TypeApp (
+            SynExpr.DotGet (obj, range0, SynLongIdent.Create [ meth ], range0),
-                SynExpr.DotGet (obj, range0, SynLongIdent.Create [ meth ], range0),
+            range0,
-                range0,
+            [ SynType.CreateLongIdent ty ],
-                [ SynType.CreateLongIdent ty ],
+            [],
-                [],
+            Some range0,
-                Some range0,
+            range0,
-                range0,
+            range0
-                range0
-            ),
-            SynExpr.CreateConst SynConst.Unit
         )
+        |> applyTo (SynExpr.CreateConst SynConst.Unit)
 
     let index (property : SynExpr) (obj : SynExpr) : SynExpr =
         SynExpr.DotIndexedGet (obj, property, range0, range0)
@@ -173,25 +167,37 @@ module internal SynExpr =
         |> SynExpr.CreateParen
 
     let reraise : SynExpr =
-        SynExpr.CreateApp (SynExpr.CreateIdent (Ident.Create "reraise"), SynExpr.CreateConst SynConst.Unit)
+        SynExpr.CreateIdent (Ident.Create "reraise")
+        |> applyTo (SynExpr.CreateConst SynConst.Unit)
 
     /// {body} |> fun a -> Async.StartAsTask (a, ?cancellationToken=ct)
     let startAsTask (ct : SynLongIdent) (body : SynExpr) =
         let lambda =
-            SynExpr.CreateApp (
+            [
-                SynExpr.CreateLongIdent (SynLongIdent.Create [ "Async" ; "StartAsTask" ]),
+                SynExpr.CreateLongIdent (SynLongIdent.CreateString "a")
-                SynExpr.CreateParenedTuple
+                equals
-                    [
+                    (SynExpr.LongIdent (true, SynLongIdent.CreateString "cancellationToken", None, range0))
-                        SynExpr.CreateLongIdent (SynLongIdent.CreateString "a")
+                    (SynExpr.CreateLongIdent ct)
-                        equals
+            ]
-                            (SynExpr.LongIdent (true, SynLongIdent.CreateString "cancellationToken", None, range0))
+            |> SynExpr.CreateParenedTuple
-                            (SynExpr.CreateLongIdent ct)
+            |> applyFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ "Async" ; "StartAsTask" ]))
-                    ]
-            )
             |> createLambda "a"
 
         pipeThroughFunction lambda body
 
+    let createLongIdent (ident : string list) : SynExpr =
+        SynExpr.CreateLongIdent (SynLongIdent.Create ident)
+
+    let createLongIdent' (ident : Ident list) : SynExpr =
+        SynExpr.CreateLongIdent (SynLongIdent.CreateFromLongIdent ident)
+
+    let createLet (bindings : SynBinding list) (body : SynExpr) : SynExpr =
+        SynExpr.LetOrUse (false, false, bindings, body, range0, SynExprLetOrUseTrivia.empty)
+
+    let createMatch (matchOn : SynExpr) (cases : SynMatchClause list) : SynExpr = SynExpr.CreateMatch (matchOn, cases)
+
+    let typeAnnotate (ty : SynType) (expr : SynExpr) : SynExpr = SynExpr.CreateTyped (expr, ty)
+
     /// {compExpr} { {lets} ; return {ret} }
     let createCompExpr (compExpr : string) (retBody : SynExpr) (lets : CompExprBinding list) : SynExpr =
         let retStatement = SynExpr.YieldOrReturn ((false, true), retBody, range0)
@@ -215,16 +221,7 @@ module internal SynExpr =
                         }
                     )
                 | Let (lhs, rhs) ->
-                    SynExpr.LetOrUse (
+                    createLet [ SynBinding.Let (pattern = SynPat.CreateNamed (Ident.Create lhs), expr = rhs) ] state
-                        false,
-                        false,
-                        [ SynBinding.Let (pattern = SynPat.CreateNamed (Ident.Create lhs), expr = rhs) ],
-                        state,
-                        range0,
-                        {
-                            SynExprLetOrUseTrivia.InKeyword = None
-                        }
-                    )
                 | Use (lhs, rhs) ->
                     SynExpr.LetOrUse (
                         false,
@@ -261,17 +258,6 @@ module internal SynExpr =
 
     let upcast' (ty : SynType) (e : SynExpr) = SynExpr.Upcast (e, ty, range0)
 
-    let synBindingTriviaZero (isMember : bool) =
-        {
-            SynBindingTrivia.EqualsRange = Some range0
-            InlineKeyword = None
-            LeadingKeyword =
-                if isMember then
-                    SynLeadingKeyword.Member range0
-                else
-                    SynLeadingKeyword.Let range0
-        }
-
     /// {ident} - {rhs}
     let minus (ident : SynLongIdent) (rhs : SynExpr) : SynExpr =
         SynExpr.CreateApp (
@@ -310,16 +296,14 @@ module internal SynExpr =
 
     /// {y} >= {x}
     let greaterThanOrEqual (x : SynExpr) (y : SynExpr) : SynExpr =
-        SynExpr.CreateApp (
+        SynExpr.CreateAppInfix (
-            SynExpr.CreateAppInfix (
+            SynExpr.CreateLongIdent (
-                SynExpr.CreateLongIdent (
+                SynLongIdent.SynLongIdent (
-                    SynLongIdent.SynLongIdent (
+                    [ Ident.Create "op_GreaterThanOrEqual" ],
-                        [ Ident.Create "op_GreaterThanOrEqual" ],
+                    [],
-                        [],
+                    [ Some (IdentTrivia.OriginalNotation ">=") ]
-                        [ Some (IdentTrivia.OriginalNotation ">=") ]
+                )
-                    )
-                ),
-                y
             ),
-            x
+            y
         )
+        |> applyTo x

WoofWare.Myriad.Plugins/SynExpr/SynPat.fs

@@ -0,0 +1,10 @@
+namespace WoofWare.Myriad.Plugins
+
+open Fantomas.FCS.Syntax
+open Fantomas.FCS.Text.Range
+
+[<RequireQualifiedAccess>]
+module internal SynPat =
+
+    let annotateType (ty : SynType) (pat : SynPat) =
+        SynPat.Paren (SynPat.Typed (pat, ty, range0), range0)

WoofWare.Myriad.Plugins/SynExpr/SynUnionCase.fs

@@ -9,6 +9,15 @@ type internal UnionCase<'Ident> =
         Ident : Ident
     }
 
+[<RequireQualifiedAccess>]
+module internal UnionCase =
+    let mapIdentFields<'a, 'b> (f : 'a -> 'b) (unionCase : UnionCase<'a>) : UnionCase<'b> =
+        {
+            Fields = unionCase.Fields |> List.map (SynField.mapIdent f)
+            Attrs = unionCase.Attrs
+            Ident = unionCase.Ident
+        }
+
 [<RequireQualifiedAccess>]
 module internal SynUnionCase =
     let extract (SynUnionCase (attrs, id, caseType, _, _, _, _)) : UnionCase<Ident option> =

WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj

@@ -27,13 +27,15 @@
     <Compile Include="List.fs"/>
     <Compile Include="Ident.fs" />
     <Compile Include="AstHelper.fs"/>
+    <Compile Include="SynExpr\SynExprLetOrUseTrivia.fs" />
+    <Compile Include="SynExpr\SynBinding.fs" />
     <Compile Include="SynExpr\SynExpr.fs" />
     <Compile Include="SynExpr\SynType.fs" />
     <Compile Include="SynExpr\SynAttribute.fs" />
     <Compile Include="SynExpr\SynArgPats.fs" />
-    <Compile Include="SynExpr\SynExprLetOrUseTrivia.fs" />
     <Compile Include="SynExpr\SynField.fs" />
     <Compile Include="SynExpr\SynUnionCase.fs" />
+    <Compile Include="SynExpr\SynPat.fs" />
     <Compile Include="RemoveOptionsGenerator.fs"/>
     <Compile Include="InterfaceMockGenerator.fs"/>
     <Compile Include="JsonSerializeGenerator.fs"/>

WoofWare.Myriad.Plugins/version.json

@@ -7,6 +7,7 @@
     ":/",
     ":^WoofWare.Myriad.Plugins.Test/",
     ":^WoofWare.Myriad.Plugins.Attributes/Test/",
-    ":^/.github/"
+    ":^/.github/",
+    ":^/CHANGELOG.md"
   ]
 }