NuGet dep on WoofWare.Myriad

PureGym.App/AuthArg.fs

@@ -5,8 +5,8 @@ open PureGym
 
 type AuthArg =
     | [<Unique ; CustomAppSettings "PUREGYM_BEARER_TOKEN">] Bearer_Token of string
-    | [<Unique>] User_Email of string
+    | [<Unique ; EqualsAssignmentOrSpaced>] User_Email of string
-    | [<Unique>] Pin of string
+    | [<Unique ; EqualsAssignmentOrSpaced>] Pin of string
     | [<GatherUnrecognized>] Others of string
 
     interface IArgParserTemplate with

PureGym.App/Authenticate.fs

@@ -14,7 +14,7 @@ type GetTokenArg =
             match s with
             | GetTokenArg.Pin _ -> "Eight-digit PureGym user's PIN"
             | GetTokenArg.User_Email _ -> "PureGym user's email address"
-            | GetTokenArg.StdIn _ -> "Read anything not specified on the command line from stdin"
+            | GetTokenArg.StdIn -> "Read anything not specified on the command line from stdin"
 
     static member Parse (args : ParseResults<GetTokenArg>) : Result<UsernamePin, ArguParseException> =
         let canUseStdin = args.TryGetResult(GetTokenArg.StdIn).IsSome

PureGym.App/Fullness.fs

@@ -48,9 +48,10 @@ module Fullness =
 
     let run (args : FullnessArgs) =
         task {
-            let! client = Api.make args.Creds
+            let! client = Dto.make args.Creds
             let! id = GymSelector.canonicalId client args.Gym
             let! attendance = client.GetGymAttendance id
+            let attendance = failwith ""
 
             if args.Terse then
                 System.Console.WriteLine attendance.TotalPeopleInGym

PureGym.App/LookupGym.fs

@@ -44,7 +44,7 @@ module LookupGym =
 
     let run (args : LookupGymArgs) =
         task {
-            let! client = Api.make args.Creds
+            let! client = Dto.make args.Creds
             let! s = client.GetGym 19
             System.Console.WriteLine (string<Gym> s)
             return 0

PureGym.App/MemberActivity.fs

@@ -31,9 +31,8 @@ module MemberActivity =
 
     let run (args : MemberActivityArgs) =
         task {
-            let! client = Api.make args.Creds
+            let! client = Dto.make args.Creds
             let! activity = client.GetMemberActivity ()
-            let activity = activity.ToMemberActivity ()
             System.Console.WriteLine (string<MemberActivityThisMonth> activity)
             return 0
         }

PureGym.App/Program.fs

@@ -21,8 +21,12 @@ module Program =
              RequiresAuth (fun auth -> ArgsCrate.make (FullnessArgs.Parse auth) Fullness.run))
 
             "activity",
-            ("Get information about your gym usage",
+            ("Get information about your aggregate gym usage",
              RequiresAuth (fun auth -> ArgsCrate.make (MemberActivityArgs.Parse auth) MemberActivity.run))
+
+            "sessions",
+            ("Get information about your individual sessions",
+             RequiresAuth (fun auth -> ArgsCrate.make (SessionsArgs.Parse auth) Sessions.run))
         |]
         |> Map.ofArray
 

PureGym.App/PureGym.App.fsproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
@@ -14,6 +14,7 @@
       <Compile Include="Fullness.fs" />
       <Compile Include="LookupGym.fs" />
       <Compile Include="MemberActivity.fs" />
+      <Compile Include="Sessions.fs" />
       <Compile Include="Program.fs" />
     </ItemGroup>
 

PureGym.App/Sessions.fs

@@ -0,0 +1,49 @@
+namespace PureGym.App
+
+open Argu
+open PureGym
+open System
+
+type SessionsArgsFragment =
+    | [<Mandatory ; EqualsAssignmentOrSpaced>] From_Date of string
+    | [<Mandatory ; EqualsAssignmentOrSpaced>] To_Date of string
+
+    interface IArgParserTemplate with
+        member s.Usage =
+            match s with
+            | From_Date _ -> "start of date range (inclusive) for query, which needs to parse as a DateTime"
+            | To_Date _ -> "end of date range (inclusive) for query, which needs to parse as a DateTime"
+
+type SessionsArgs =
+    {
+        Creds : Auth
+        FromDate : DateTime
+        ToDate : DateTime
+    }
+
+    static member Parse
+        (auth : Auth)
+        (args : SessionsArgsFragment ParseResults)
+        : Result<SessionsArgs, ArguParseException>
+        =
+        let fromDate = args.GetResult SessionsArgsFragment.From_Date
+        let toDate = args.GetResult SessionsArgsFragment.To_Date
+
+        {
+            Creds = auth
+            FromDate = DateTime.Parse fromDate
+            ToDate = DateTime.Parse toDate
+        }
+        |> Ok
+
+[<RequireQualifiedAccess>]
+module Sessions =
+
+    let run (args : SessionsArgs) =
+        task {
+            let! client = Dto.make args.Creds
+            let! activity = client.GetSessions args.FromDate args.ToDate
+
+            System.Console.WriteLine (string<Sessions> activity)
+            return 0
+        }

PureGym.Test/PureGym.Test.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
@@ -9,12 +9,15 @@
 
     <ItemGroup>
         <Compile Include="TestSurface.fs" />
+        <Compile Include="TestJson.fs" />
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="ApiSurface" Version="4.0.12" />
+        <PackageReference Include="FsCheck" Version="2.16.6" />
+        <PackageReference Include="FsUnit" Version="5.6.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
-        <PackageReference Include="NUnit" Version="3.13.3"/>
+        <PackageReference Include="NUnit" Version="3.14.0"/>
         <PackageReference Include="NUnit3TestAdapter" Version="4.4.2"/>
         <PackageReference Include="NUnit.Analyzers" Version="3.6.1"/>
         <PackageReference Include="coverlet.collector" Version="3.2.0"/>

PureGym.Test/TestJson.fs

@@ -0,0 +1,312 @@
+namespace PureGym.Test
+
+open System
+open System.Text.Json.Nodes
+open NUnit.Framework
+open FsUnitTyped
+open PureGym
+
+[<TestFixture>]
+module TestJson =
+
+    let gymOpeningHoursCases =
+        [
+            """{"openingHours": [], "isAlwaysOpen": false}""",
+            {
+                GymOpeningHours.OpeningHours = []
+                IsAlwaysOpen = false
+            }
+            """{"openingHours": ["something"], "isAlwaysOpen": false}""",
+            {
+                GymOpeningHours.OpeningHours = [ "something" ]
+                IsAlwaysOpen = false
+            }
+        ]
+        |> List.map TestCaseData
+
+    [<TestCaseSource(nameof (gymOpeningHoursCases))>]
+    let ``GymOpeningHours JSON parse`` (json : string, expected : GymOpeningHours) =
+        JsonNode.Parse json |> GymOpeningHours.jsonParse |> shouldEqual expected
+
+    let gymAccessOptionsCases =
+        List.allPairs [ true ; false ] [ true ; false ]
+        |> List.map (fun (a, b) ->
+            let s = sprintf """{"pinAccess": %b, "qrCodeAccess": %b}""" a b
+
+            s,
+            {
+                GymAccessOptions.PinAccess = a
+                QrCodeAccess = b
+            }
+        )
+        |> List.map TestCaseData
+
+    [<TestCaseSource(nameof (gymAccessOptionsCases))>]
+    let ``GymAccessOptions JSON parse`` (json : string, expected : GymAccessOptions) =
+        JsonNode.Parse json |> GymAccessOptions.jsonParse |> shouldEqual expected
+
+    let gymLocationCases =
+        [
+            """{"latitude": 1.0, "longitude": 3.0}""",
+            {
+                GymLocation.Latitude = 1.0
+                Longitude = 3.0
+            }
+        ]
+        |> List.map TestCaseData
+
+    [<TestCaseSource(nameof (gymLocationCases))>]
+    let ``GymLocation JSON parse`` (json : string, expected : GymLocation) =
+        JsonNode.Parse json |> GymLocation.jsonParse |> shouldEqual expected
+
+    let gymAddressCases =
+        [
+            """{"addressLine1": "", "postCode": "hi", "town": ""}""",
+            {
+                GymAddress.AddressLine1 = ""
+                AddressLine2 = None
+                AddressLine3 = None
+                County = None
+                Postcode = "hi"
+                Town = ""
+            }
+            """{"addressLine1": "", "addressLine2": null, "postCode": "hi", "town": ""}""",
+            {
+                GymAddress.AddressLine1 = ""
+                AddressLine2 = None
+                AddressLine3 = None
+                County = None
+                Postcode = "hi"
+                Town = ""
+            }
+        ]
+        |> List.map TestCaseData
+
+    [<TestCaseSource(nameof (gymAddressCases))>]
+    let ``GymAddress JSON parse`` (json : string, expected : GymAddress) =
+        JsonNode.Parse (json, Nullable (JsonNodeOptions (PropertyNameCaseInsensitive = true)))
+        |> GymAddress.jsonParse
+        |> shouldEqual expected
+
+    let gymCases =
+        let ovalJson =
+            """{"name":"London Oval","id":19,"status":2,"address":{"addressLine1":"Canterbury Court","addressLine2":"Units 4, 4A, 5 And 5A","addressLine3":"Kennington Park","town":"LONDON","county":null,"postcode":"SW9 6DE"},"phoneNumber":"+44 3444770005","emailAddress":"info.londonoval@puregym.com","staffMembers":null,"gymOpeningHours":{"isAlwaysOpen":true,"openingHours":[]},"reasonsToJoin":null,"accessOptions":{"pinAccess":true,"qrCodeAccess":true},"virtualTourUrl":null,"personalTrainersUrl":null,"webViewUrl":null,"floorPlanUrl":null,"location":{"longitude":"-0.110252","latitude":"51.480401"},"timeZone":"Europe/London","reopenDate":"2021-04-12T00:00:00+01 Europe/London"}"""
+
+        let oval =
+            {
+                Gym.Name = "London Oval"
+                Id = 19
+                Status = 2
+                Address =
+                    {
+                        AddressLine1 = "Canterbury Court"
+                        AddressLine2 = Some "Units 4, 4A, 5 And 5A"
+                        AddressLine3 = Some "Kennington Park"
+                        Town = "LONDON"
+                        County = None
+                        Postcode = "SW9 6DE"
+                    }
+                PhoneNumber = "+44 3444770005"
+                EmailAddress = "info.londonoval@puregym.com"
+                GymOpeningHours =
+                    {
+                        IsAlwaysOpen = true
+                        OpeningHours = []
+                    }
+                AccessOptions =
+                    {
+                        PinAccess = true
+                        QrCodeAccess = true
+                    }
+                Location =
+                    {
+                        Longitude = -0.110252
+                        Latitude = 51.480401
+                    }
+                TimeZone = "Europe/London"
+                ReopenDate = "2021-04-12T00:00:00+01 Europe/London"
+            }
+
+        [ ovalJson, oval ] |> List.map TestCaseData
+
+    [<TestCaseSource(nameof (gymCases))>]
+    let ``Gym JSON parse`` (json : string, expected : Gym) =
+        JsonNode.Parse json |> Gym.jsonParse |> shouldEqual expected
+
+    let memberCases =
+        let me =
+            {
+                Id = 1234567
+                CompoundMemberId = "12A123456"
+                FirstName = "Patrick"
+                LastName = "Stevens"
+                HomeGymId = 19
+                HomeGymName = "London Oval"
+                EmailAddress = "someone@somewhere"
+                GymAccessPin = "00000000"
+                DateOfBirth = DateOnly (1994, 01, 02)
+                MobileNumber = "+44 1234567"
+                Postcode = "W1A 1AA"
+                MembershipName = "Corporate"
+                MembershipLevel = 12
+                SuspendedReason = 0
+                MemberStatus = 2
+            }
+
+        let meJson =
+            """{
+  "id": 1234567,
+  "compoundMemberId": "12A123456",
+  "firstName": "Patrick",
+  "lastName": "Stevens",
+  "homeGymId": 19,
+  "homeGymName": "London Oval",
+  "emailAddress": "someone@somewhere",
+  "gymAccessPin": "00000000",
+  "dateofBirth": "1994-01-02",
+  "mobileNumber": "+44 1234567",
+  "postCode": "W1A 1AA",
+  "membershipName": "Corporate",
+  "membershipLevel": 12,
+  "suspendedReason": 0,
+  "memberStatus": 2
+}"""
+
+        [ meJson, me ] |> List.map TestCaseData
+
+    [<TestCaseSource(nameof memberCases)>]
+    let ``Member JSON parse`` (json : string, expected : Member) =
+        json |> JsonNode.Parse |> Member.jsonParse |> shouldEqual expected
+
+    let gymAttendanceCases =
+        let json =
+            """{
+  "description": "65",
+  "totalPeopleInGym": 65,
+  "totalPeopleInClasses": 2,
+  "totalPeopleSuffix": null,
+  "isApproximate": false,
+  "attendanceTime": "2023-12-27T18:54:09.5101697",
+  "lastRefreshed": "2023-12-27T18:54:09.5101697Z",
+  "lastRefreshedPeopleInClasses": "2023-12-27T18:50:26.0782286Z",
+  "maximumCapacity": 0
+}"""
+
+        let expected =
+            {
+                Description = "65"
+                TotalPeopleInGym = 65
+                TotalPeopleInClasses = 2
+                TotalPeopleSuffix = None
+                IsApproximate = false
+                AttendanceTime =
+                    DateTime (2023, 12, 27, 18, 54, 09, 510, 169, DateTimeKind.Utc)
+                    + TimeSpan.FromTicks 7L
+                LastRefreshed =
+                    DateTime (2023, 12, 27, 18, 54, 09, 510, 169, DateTimeKind.Utc)
+                    + TimeSpan.FromTicks 7L
+                LastRefreshedPeopleInClasses =
+                    DateTime (2023, 12, 27, 18, 50, 26, 078, 228, DateTimeKind.Utc)
+                    + TimeSpan.FromTicks 6L
+                MaximumCapacity = 0
+            }
+
+        [ json, expected ] |> List.map TestCaseData
+
+    [<TestCaseSource(nameof gymAttendanceCases)>]
+    let ``GymAttendance JSON parse`` (json : string, expected : GymAttendance) =
+        json |> JsonNode.Parse |> GymAttendance.jsonParse |> shouldEqual expected
+
+    let memberActivityDtoCases =
+        let json =
+            """{"totalDuration":2217,"averageDuration":48,"totalVisits":46,"totalClasses":0,"isEstimated":false,"lastRefreshed":"2023-12-27T19:00:56.0309892Z"}"""
+
+        let value =
+            {
+                TotalDuration = 2217
+                AverageDuration = 48
+                TotalVisits = 46
+                TotalClasses = 0
+                IsEstimated = false
+                LastRefreshed =
+                    DateTime (2023, 12, 27, 19, 00, 56, 030, 989, DateTimeKind.Utc)
+                    + TimeSpan.FromTicks 2L
+            }
+
+        [ json, value ] |> List.map TestCaseData
+
+    [<TestCaseSource(nameof memberActivityDtoCases)>]
+    let ``MemberActivityDto JSON parse`` (json : string, expected : MemberActivityDto) =
+        json |> JsonNode.Parse |> MemberActivityDto.jsonParse |> shouldEqual expected
+
+    let sessionsCases =
+        let json =
+            """{
+    "Summary":{"Total":{"Activities":0,"Visits":10,"Duration":445},"ThisWeek":{"Activities":0,"Visits":0,"Duration":0}},
+    "Visits":[
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-21T10:12:00","Duration":50,"Name":null},
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-20T12:05:00","Duration":80,"Name":null},
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-17T19:37:00","Duration":46,"Name":null},
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-16T12:19:00","Duration":37,"Name":null},
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-15T11:14:00","Duration":47,"Name":null},
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-13T10:30:00","Duration":36,"Name":null},
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-10T16:18:00","Duration":32,"Name":null},
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-05T22:36:00","Duration":40,"Name":null},
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-03T17:59:00","Duration":48,"Name":null},
+        {"IsDurationEstimated":false,"Gym":{"Id":19,"Name":"London Oval","Status":"Blocked","Location":null,"GymAccess":null,"ContactInfo":null,"TimeZone":null},"StartTime":"2023-12-01T21:41:00","Duration":29,"Name":null}],
+        "Activities":[]}
+"""
+
+        let singleVisit startTime duration =
+            {
+                IsDurationEstimated = false
+                Gym =
+                    {
+                        Id = 19
+                        Name = "London Oval"
+                        Status = "Blocked"
+                    }
+                StartTime = startTime
+                Duration = duration
+            }
+
+        let expected =
+            {
+                Summary =
+                    {
+                        Total =
+                            {
+                                Activities = 0
+                                Visits = 10
+                                Duration = 445
+                            }
+                        ThisWeek =
+                            {
+                                Activities = 0
+                                Visits = 0
+                                Duration = 0
+                            }
+                    }
+                Visits =
+                    [
+                        singleVisit (DateTime (2023, 12, 21, 10, 12, 00)) 50
+                        singleVisit (DateTime (2023, 12, 20, 12, 05, 00)) 80
+                        singleVisit (DateTime (2023, 12, 17, 19, 37, 00)) 46
+                        singleVisit (DateTime (2023, 12, 16, 12, 19, 00)) 37
+                        singleVisit (DateTime (2023, 12, 15, 11, 14, 00)) 47
+                        singleVisit (DateTime (2023, 12, 13, 10, 30, 00)) 36
+                        singleVisit (DateTime (2023, 12, 10, 16, 18, 00)) 32
+                        singleVisit (DateTime (2023, 12, 05, 22, 36, 00)) 40
+                        singleVisit (DateTime (2023, 12, 03, 17, 59, 00)) 48
+                        singleVisit (DateTime (2023, 12, 01, 21, 41, 00)) 29
+                    ]
+            }
+
+        [ json, expected ] |> List.map TestCaseData
+
+    [<TestCaseSource(nameof sessionsCases)>]
+    let ``Sessions JSON parse`` (json : string, expected : Sessions) =
+        json
+        |> fun o -> JsonNode.Parse (o, Nullable (JsonNodeOptions (PropertyNameCaseInsensitive = true)))
+        |> Sessions.jsonParse
+        |> shouldEqual expected

PureGym/Auth.fs

@@ -10,11 +10,16 @@ open System.Threading.Tasks
 // System.Text.Json does not support internal F# records as of .NET 8, presumably because it can't find the constructor.
 // So we end up with this gruesome soup of C#.
 // TODO(net8): make this internal
+/// An internal type. Don't use it.
 type AuthResponseRaw [<JsonConstructor>] (access_token : string, expires_in : int, token_type : string, scope : string)
     =
+    /// Don't use this internal type.
     member _.access_token = access_token
+    /// Don't use this internal type.
     member _.expires_in = expires_in
+    /// Don't use this internal type.
     member _.token_type = token_type
+    /// Don't use this internal type.
     member _.scope = scope
 
 /// A token which can be used to authenticate with the PureGym API.

PureGym/Client.fs

@@ -0,0 +1,58 @@
+namespace PureGym
+
+open System
+open System.Net.Http
+open System.Threading.Tasks
+open RestEase
+
+/// The PureGym REST API. You probably want to instantiate one of these with `Api.make`.
+[<Header("User-Agent", "PureGym/1523 CFNetwork/1312 Darwin/21.0.0")>]
+type IPureGymApi =
+    /// Get the complete list of all gyms known to PureGym.
+    [<Get "v1/gyms/">]
+    abstract GetGyms : unit -> Task<Gym list>
+
+    /// Get information about the PureGym human whose credentials this client is authenticated with.
+    [<Get "v1/member">]
+    abstract GetMember : unit -> Task<Member>
+
+    /// Get information about how full the given gym currently is. The gym ID can be found from `GetGyms`.
+    [<Get "v1/gyms/{gym_id}/attendance">]
+    abstract GetGymAttendance : [<Path "gym_id">] gymId : int -> Task<GymAttendance>
+
+    /// Get information about a specific gym.
+    [<Get "v1/gyms/{gym_id}">]
+    abstract GetGym : [<Path "gym_id">] gymId : int -> Task<Gym>
+
+    /// Get information about the activities logged against the currently authenticated PureGym human.
+    [<Get "v1/member/activity">]
+    abstract GetMemberActivity : unit -> Task<MemberActivityThisMonth>
+
+    /// Get information about the individual visits to all PureGyms the currently-authenticated PureGym human has made.
+    [<Get "v2/gymSessions/member">]
+    abstract GetSessions : [<Query>] fromDate : DateTime -> [<Query>] toDate : DateTime -> Task<Sessions>
+
+// [<Get "v1/member/activity/history">]
+// abstract GetMemberActivityAll : unit -> Task<string>
+
+/// Methods for interacting with the PureGym REST API.
+[<RequireQualifiedAccess>]
+module Dto =
+    /// Create a REST client, authenticated as the specified user.
+    let make (auth : Auth) : IPureGymApi Task =
+        task {
+            let! token =
+                match auth with
+                | Auth.Token t -> Task.FromResult<_> t
+                | Auth.User cred -> AuthToken.get cred
+
+            let client = new HttpClient ()
+            client.BaseAddress <- Uri "https://capi.puregym.com/api"
+
+            client.DefaultRequestHeaders.Authorization <-
+                Headers.AuthenticationHeaderValue ("Bearer", token.AccessToken)
+
+            client.DefaultRequestHeaders.Add ("User-Agent", "PureGym/1523 CFNetwork/1312 Darwin/21.0.0")
+
+            return RestClient.For<IPureGymApi> client
+        }

PureGym/Dto.fs

@@ -1,12 +1,9 @@
 namespace PureGym
 
 open System
-open System.Net.Http
 open System.Text.Json.Serialization
-open System.Threading.Tasks
-open RestEase
 
-/// Describes the opening hours of a given gym.
+[<WoofWare.Myriad.Plugins.JsonParse>]
 type GymOpeningHours =
     {
         /// If this is true, there should be no OpeningHours (but nothing enforces that).
@@ -23,6 +20,7 @@ type GymOpeningHours =
             this.OpeningHours |> String.concat ", "
 
 /// How a human can authenticate with a gym when they physically try to enter it
+[<WoofWare.Myriad.Plugins.JsonParse>]
 type GymAccessOptions =
     {
         /// This gym has PIN entry pads
@@ -36,28 +34,32 @@ type GymAccessOptions =
         $"Pin access: %c{Char.emoji this.PinAccess}; QR code access: %c{Char.emoji this.QrCodeAccess}"
 
 /// Where a gym is on the Earth
+[<WoofWare.Myriad.Plugins.JsonParse>]
 type GymLocation =
     {
         /// Measured in degrees
+        [<JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)>]
         Longitude : float
         /// Measured in degrees
+        [<JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)>]
         Latitude : float
     }
 
 /// The postal address of a gym
+[<WoofWare.Myriad.Plugins.JsonParse>]
 type GymAddress =
     {
         /// E.g. "Canterbury Court"
         [<JsonRequired>]
         AddressLine1 : string
         /// E.g. "Units 4, 4A, 5 And 5A"
-        AddressLine2 : string
+        AddressLine2 : string option
         /// E.g. "Kennington Park"
-        AddressLine3 : string
+        AddressLine3 : string option
         /// E.g. "LONDON"
         [<JsonRequired>]
         Town : string
-        County : string
+        County : string option
         /// E.g. "SW9 6DE"
         [<JsonRequired>]
         Postcode : string
@@ -67,11 +69,11 @@ type GymAddress =
     override this.ToString () =
         [
             yield Some this.AddressLine1
-            yield this.AddressLine2 |> Option.ofObj
+            yield this.AddressLine2
-            yield this.AddressLine3 |> Option.ofObj
+            yield this.AddressLine3
             match this.County with
-            | null -> yield Some $"%s{this.Town} %s{this.Postcode}"
+            | None -> yield Some $"%s{this.Town} %s{this.Postcode}"
-            | county ->
+            | Some county ->
                 yield Some this.Town
                 yield Some $"%s{county} %s{this.Postcode}"
         ]
@@ -79,6 +81,7 @@ type GymAddress =
         |> String.concat "\n"
 
 /// Metadata about a physical gym
+[<WoofWare.Myriad.Plugins.JsonParse>]
 type Gym =
     {
         // The following fields are returned but are always null
@@ -133,6 +136,7 @@ Opening hours: %s{string<GymOpeningHours> this.GymOpeningHours}
 """
 
 /// A human member of PureGym
+[<WoofWare.Myriad.Plugins.JsonParse>]
 type Member =
     {
         /// This member's ID. This is a fairly large number.
@@ -153,10 +157,12 @@ type Member =
         /// This user's gym access pin, probably 8 digits
         GymAccessPin : string
         /// This user's recorded date of birth
+        [<JsonPropertyName "dateofBirth">]
         DateOfBirth : DateOnly
         /// This user's phone number, human-readable
         MobileNumber : string
         /// This user's registered home postcode
+        [<JsonPropertyName "postCode">]
         Postcode : string
         /// E.g. "Corporate"
         MembershipName : string
@@ -166,6 +172,7 @@ type Member =
     }
 
 /// Statistics for how many people are currently at a gym
+[<WoofWare.Myriad.Plugins.JsonParse>]
 type GymAttendance =
     {
         /// This appears always to be just equal to TotalPeopleInGym, but a string.
@@ -178,7 +185,7 @@ type GymAttendance =
         [<JsonRequired>]
         TotalPeopleInClasses : int
         /// E.g. " or fewer"
-        TotalPeopleSuffix : string
+        TotalPeopleSuffix : string option
         [<JsonRequired>]
         IsApproximate : bool
         /// When the query was received (I think)
@@ -195,8 +202,8 @@ type GymAttendance =
     override this.ToString () =
         let totalPeopleSuffix =
             match this.TotalPeopleSuffix with
-            | null -> ""
+            | None -> ""
-            | suffix -> suffix
+            | Some suffix -> suffix
 
         let capacity =
             if this.MaximumCapacity = 0 then
@@ -234,6 +241,7 @@ type MemberActivityThisMonth =
     }
 
 /// Don't use this type. It's public because System.Text.Json can't do private types.
+[<WoofWare.Myriad.Plugins.JsonParse>]
 type MemberActivityDto =
     {
         [<JsonRequired>]
@@ -260,50 +268,75 @@ type MemberActivityDto =
             LastRefreshed = this.LastRefreshed
         }
 
-/// The PureGym REST API. You probably want to instantiate one of these with `Api.make`.
+[<WoofWare.Myriad.Plugins.JsonParse>]
-[<Header("User-Agent", "PureGym/1523 CFNetwork/1312 Darwin/21.0.0")>]
+type SessionsAggregate =
-type IPureGymApi =
+    {
-    /// Get the complete list of all gyms known to PureGym.
+        /// Number of gym "activities" within some query-defined time period; presumably this is like classes?
-    [<Get "v1/gyms/">]
+        /// It's always 0 for me.
-    abstract GetGyms : unit -> Task<Gym list>
+        Activities : int
+        /// Number of visits to the gym within some query-defined time period.
+        Visits : int
+        /// In minutes: total time spent in gym during the query-defined time period.
+        Duration : int
+    }
 
-    /// Get information about the PureGym human whose credentials this client is authenticated with.
+/// The DTO for gym info returned from the Sessions endpoint.
-    [<Get "v1/member">]
+[<WoofWare.Myriad.Plugins.JsonParse>]
-    abstract GetMember : unit -> Task<Member>
+type VisitGym =
+    {
+        // Omitting Location, GymAccess, ContactInfo, TimeZone because these were all null for me
+        /// The PureGym ID of this gym, e.g. 19
+        Id : int
+        /// E.g. "London Oval", the canonical name of this gym
+        Name : string
+        /// For some reason this always seems to be "Blocked"
+        Status : string
+    }
 
-    /// Get information about how full the given gym currently is. The gym ID can be found from `GetGyms`.
+/// Summary of a single visit to a gym.
-    [<Get "v1/gyms/{gym_id}/attendance">]
+[<WoofWare.Myriad.Plugins.JsonParse>]
-    abstract GetGymAttendance : [<Path "gym_id">] gymId : int -> Task<GymAttendance>
+type Visit =
+    {
+        // Omitted Name because it always was null for me
+        /// Whether the Duration field is estimated.
+        IsDurationEstimated : bool
+        /// When the visit began.
+        StartTime : DateTime
+        /// In minutes.
+        Duration : int
+        /// Which gym was visited
+        Gym : VisitGym
+    }
 
-    /// Get information about a specific gym.
+    /// Human-readable non-round-trip representation.
-    [<Get "v1/gyms/{gym_id}">]
+    override this.ToString () =
-    abstract GetGym : [<Path "gym_id">] gymId : int -> Task<Gym>
+        let startTime = this.StartTime.ToString "yyyy-MM-dd HH:mm"
+        $"%s{this.Gym.Name}: %s{startTime} (%i{this.Duration} minutes)"
 
-    /// Get information about the activities logged against the currently authenticated PureGym human.
+/// Aggregate statistics for gym visits across a time period.
-    [<Get "v1/member/activity">]
+[<WoofWare.Myriad.Plugins.JsonParse>]
-    abstract GetMemberActivity : unit -> Task<MemberActivityDto>
+type SessionsSummary =
+    {
+        /// Aggregate stats for gym visits within the query-dependent time period.
+        Total : SessionsAggregate
+        /// Aggregate stats for gym visits "this week", whatever that means to PureGym.
+        ThisWeek : SessionsAggregate
+    }
 
-// [<Get "v1/member/activity/history">]
+    /// Human-readable non-round-trip representation.
-// abstract GetMemberActivityAll : unit -> Task<string>
+    override this.ToString () =
+        $"%i{this.Total.Visits} visits, totalling %i{this.Total.Duration} minutes"
 
-/// Methods for interacting with the PureGym REST API.
+[<WoofWare.Myriad.Plugins.JsonParse>]
-[<RequireQualifiedAccess>]
+type Sessions =
-module Api =
+    {
-    /// Create a REST client, authenticated as the specified user.
+        Summary : SessionsSummary
-    let make (auth : Auth) : IPureGymApi Task =
+        Visits : Visit list
-        task {
+    }
-            let! token =
-                match auth with
-                | Auth.Token t -> Task.FromResult<_> t
-                | Auth.User cred -> AuthToken.get cred
 
-            let client = new HttpClient ()
+    /// Human-readable non-round-trip representation.
-            client.BaseAddress <- Uri "https://capi.puregym.com/api"
+    override this.ToString () =
+        let summary = string<SessionsSummary> this.Summary
+        let visits = this.Visits |> Seq.map string<Visit> |> String.concat "\n"
 
-            client.DefaultRequestHeaders.Authorization <-
+        $"%s{summary}\n%s{visits}"
-                Headers.AuthenticationHeaderValue ("Bearer", token.AccessToken)
-
-            client.DefaultRequestHeaders.Add ("User-Agent", "PureGym/1523 CFNetwork/1312 Darwin/21.0.0")
-
-            return RestClient.For<IPureGymApi> client
-        }

PureGym/GeneratedDto.fs

@@ -0,0 +1,350 @@
+//------------------------------------------------------------------------------
+//        This code was generated by myriad.
+//        Changes to this file will be lost when the code is regenerated.
+//------------------------------------------------------------------------------
+
+namespace PureGym
+
+/// Module containing JSON parsing methods for the GymOpeningHours type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module GymOpeningHours =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymOpeningHours =
+        let OpeningHours =
+            node.["openingHours"].AsArray ()
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
+            |> List.ofSeq
+
+        let IsAlwaysOpen = node.["isAlwaysOpen"].AsValue().GetValue<bool> ()
+
+        {
+            IsAlwaysOpen = IsAlwaysOpen
+            OpeningHours = OpeningHours
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the GymAccessOptions type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module GymAccessOptions =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymAccessOptions =
+        let QrCodeAccess = node.["qrCodeAccess"].AsValue().GetValue<bool> ()
+        let PinAccess = node.["pinAccess"].AsValue().GetValue<bool> ()
+
+        {
+            PinAccess = PinAccess
+            QrCodeAccess = QrCodeAccess
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the GymLocation type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module GymLocation =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymLocation =
+        let Latitude =
+            try
+                node.["latitude"].AsValue().GetValue<float> ()
+            with :? System.InvalidOperationException as exc ->
+                if exc.Message.Contains "cannot be converted to" then
+                    if
+                        System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString
+                    then
+                        node.["latitude"].AsValue().GetValue<string> () |> System.Double.Parse
+                    else
+                        reraise ()
+                else
+                    reraise ()
+
+        let Longitude =
+            try
+                node.["longitude"].AsValue().GetValue<float> ()
+            with :? System.InvalidOperationException as exc ->
+                if exc.Message.Contains "cannot be converted to" then
+                    if
+                        System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString
+                    then
+                        node.["longitude"].AsValue().GetValue<string> () |> System.Double.Parse
+                    else
+                        reraise ()
+                else
+                    reraise ()
+
+        {
+            Longitude = Longitude
+            Latitude = Latitude
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the GymAddress type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module GymAddress =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymAddress =
+        let Postcode = node.["postcode"].AsValue().GetValue<string> ()
+
+        let County =
+            match node.["county"] with
+            | null -> None
+            | v -> v.AsValue().GetValue<string> () |> Some
+
+        let Town = node.["town"].AsValue().GetValue<string> ()
+
+        let AddressLine3 =
+            match node.["addressLine3"] with
+            | null -> None
+            | v -> v.AsValue().GetValue<string> () |> Some
+
+        let AddressLine2 =
+            match node.["addressLine2"] with
+            | null -> None
+            | v -> v.AsValue().GetValue<string> () |> Some
+
+        let AddressLine1 = node.["addressLine1"].AsValue().GetValue<string> ()
+
+        {
+            AddressLine1 = AddressLine1
+            AddressLine2 = AddressLine2
+            AddressLine3 = AddressLine3
+            Town = Town
+            County = County
+            Postcode = Postcode
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the Gym type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module Gym =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Gym =
+        let ReopenDate = node.["reopenDate"].AsValue().GetValue<string> ()
+        let TimeZone = node.["timeZone"].AsValue().GetValue<string> ()
+        let Location = GymLocation.jsonParse node.["location"]
+        let AccessOptions = GymAccessOptions.jsonParse node.["accessOptions"]
+        let GymOpeningHours = GymOpeningHours.jsonParse node.["gymOpeningHours"]
+        let EmailAddress = node.["emailAddress"].AsValue().GetValue<string> ()
+        let PhoneNumber = node.["phoneNumber"].AsValue().GetValue<string> ()
+        let Address = GymAddress.jsonParse node.["address"]
+        let Status = node.["status"].AsValue().GetValue<int> ()
+        let Id = node.["id"].AsValue().GetValue<int> ()
+        let Name = node.["name"].AsValue().GetValue<string> ()
+
+        {
+            Name = Name
+            Id = Id
+            Status = Status
+            Address = Address
+            PhoneNumber = PhoneNumber
+            EmailAddress = EmailAddress
+            GymOpeningHours = GymOpeningHours
+            AccessOptions = AccessOptions
+            Location = Location
+            TimeZone = TimeZone
+            ReopenDate = ReopenDate
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the Member type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module Member =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Member =
+        let MemberStatus = node.["memberStatus"].AsValue().GetValue<int> ()
+        let SuspendedReason = node.["suspendedReason"].AsValue().GetValue<int> ()
+        let MembershipLevel = node.["membershipLevel"].AsValue().GetValue<int> ()
+        let MembershipName = node.["membershipName"].AsValue().GetValue<string> ()
+        let Postcode = node.["postCode"].AsValue().GetValue<string> ()
+        let MobileNumber = node.["mobileNumber"].AsValue().GetValue<string> ()
+
+        let DateOfBirth =
+            node.["dateofBirth"].AsValue().GetValue<string> () |> System.DateOnly.Parse
+
+        let GymAccessPin = node.["gymAccessPin"].AsValue().GetValue<string> ()
+        let EmailAddress = node.["emailAddress"].AsValue().GetValue<string> ()
+        let HomeGymName = node.["homeGymName"].AsValue().GetValue<string> ()
+        let HomeGymId = node.["homeGymId"].AsValue().GetValue<int> ()
+        let LastName = node.["lastName"].AsValue().GetValue<string> ()
+        let FirstName = node.["firstName"].AsValue().GetValue<string> ()
+        let CompoundMemberId = node.["compoundMemberId"].AsValue().GetValue<string> ()
+        let Id = node.["id"].AsValue().GetValue<int> ()
+
+        {
+            Id = Id
+            CompoundMemberId = CompoundMemberId
+            FirstName = FirstName
+            LastName = LastName
+            HomeGymId = HomeGymId
+            HomeGymName = HomeGymName
+            EmailAddress = EmailAddress
+            GymAccessPin = GymAccessPin
+            DateOfBirth = DateOfBirth
+            MobileNumber = MobileNumber
+            Postcode = Postcode
+            MembershipName = MembershipName
+            MembershipLevel = MembershipLevel
+            SuspendedReason = SuspendedReason
+            MemberStatus = MemberStatus
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the GymAttendance type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module GymAttendance =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymAttendance =
+        let MaximumCapacity = node.["maximumCapacity"].AsValue().GetValue<int> ()
+
+        let LastRefreshedPeopleInClasses =
+            node.["lastRefreshedPeopleInClasses"].AsValue().GetValue<string> ()
+            |> System.DateTime.Parse
+
+        let LastRefreshed =
+            node.["lastRefreshed"].AsValue().GetValue<string> () |> System.DateTime.Parse
+
+        let AttendanceTime =
+            node.["attendanceTime"].AsValue().GetValue<string> () |> System.DateTime.Parse
+
+        let IsApproximate = node.["isApproximate"].AsValue().GetValue<bool> ()
+
+        let TotalPeopleSuffix =
+            match node.["totalPeopleSuffix"] with
+            | null -> None
+            | v -> v.AsValue().GetValue<string> () |> Some
+
+        let TotalPeopleInClasses = node.["totalPeopleInClasses"].AsValue().GetValue<int> ()
+        let TotalPeopleInGym = node.["totalPeopleInGym"].AsValue().GetValue<int> ()
+        let Description = node.["description"].AsValue().GetValue<string> ()
+
+        {
+            Description = Description
+            TotalPeopleInGym = TotalPeopleInGym
+            TotalPeopleInClasses = TotalPeopleInClasses
+            TotalPeopleSuffix = TotalPeopleSuffix
+            IsApproximate = IsApproximate
+            AttendanceTime = AttendanceTime
+            LastRefreshed = LastRefreshed
+            LastRefreshedPeopleInClasses = LastRefreshedPeopleInClasses
+            MaximumCapacity = MaximumCapacity
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the MemberActivityDto type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module MemberActivityDto =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : MemberActivityDto =
+        let LastRefreshed =
+            node.["lastRefreshed"].AsValue().GetValue<string> () |> System.DateTime.Parse
+
+        let IsEstimated = node.["isEstimated"].AsValue().GetValue<bool> ()
+        let TotalClasses = node.["totalClasses"].AsValue().GetValue<int> ()
+        let TotalVisits = node.["totalVisits"].AsValue().GetValue<int> ()
+        let AverageDuration = node.["averageDuration"].AsValue().GetValue<int> ()
+        let TotalDuration = node.["totalDuration"].AsValue().GetValue<int> ()
+
+        {
+            TotalDuration = TotalDuration
+            AverageDuration = AverageDuration
+            TotalVisits = TotalVisits
+            TotalClasses = TotalClasses
+            IsEstimated = IsEstimated
+            LastRefreshed = LastRefreshed
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the SessionsAggregate type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module SessionsAggregate =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : SessionsAggregate =
+        let Duration = node.["duration"].AsValue().GetValue<int> ()
+        let Visits = node.["visits"].AsValue().GetValue<int> ()
+        let Activities = node.["activities"].AsValue().GetValue<int> ()
+
+        {
+            Activities = Activities
+            Visits = Visits
+            Duration = Duration
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the VisitGym type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module VisitGym =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : VisitGym =
+        let Status = node.["status"].AsValue().GetValue<string> ()
+        let Name = node.["name"].AsValue().GetValue<string> ()
+        let Id = node.["id"].AsValue().GetValue<int> ()
+
+        {
+            Id = Id
+            Name = Name
+            Status = Status
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the Visit type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module Visit =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Visit =
+        let Gym = VisitGym.jsonParse node.["gym"]
+        let Duration = node.["duration"].AsValue().GetValue<int> ()
+
+        let StartTime =
+            node.["startTime"].AsValue().GetValue<string> () |> System.DateTime.Parse
+
+        let IsDurationEstimated = node.["isDurationEstimated"].AsValue().GetValue<bool> ()
+
+        {
+            IsDurationEstimated = IsDurationEstimated
+            StartTime = StartTime
+            Duration = Duration
+            Gym = Gym
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the SessionsSummary type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module SessionsSummary =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : SessionsSummary =
+        let ThisWeek = SessionsAggregate.jsonParse node.["thisWeek"]
+        let Total = SessionsAggregate.jsonParse node.["total"]
+
+        {
+            Total = Total
+            ThisWeek = ThisWeek
+        }
+namespace PureGym
+
+/// Module containing JSON parsing methods for the Sessions type
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module Sessions =
+    /// Parse from a JSON node.
+    let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Sessions =
+        let Visits =
+            node.["visits"].AsArray ()
+            |> Seq.map (fun elt -> Visit.jsonParse elt)
+            |> List.ofSeq
+
+        let Summary = SessionsSummary.jsonParse node.["summary"]
+
+        {
+            Summary = Summary
+            Visits = Visits
+        }

PureGym/PureGym.fsproj

@@ -3,22 +3,37 @@
     <PropertyGroup>
       <TargetFramework>net6.0</TargetFramework>
       <GenerateDocumentationFile>true</GenerateDocumentationFile>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+      <WarnOn>FS3559</WarnOn>
+      
+      <WoofWareMyriadPluginVersion>1.0.4</WoofWareMyriadPluginVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <Compile Include="String.fs" />
         <Compile Include="Auth.fs" />
-        <Compile Include="Api.fs" />
+        <Compile Include="Dto.fs" />
+      <Compile Include="GeneratedDto.fs"> <!--1-->
+        <MyriadFile>Dto.fs</MyriadFile> <!--2-->
+      </Compile>
+      <Compile Include="Client.fs" />
         <Compile Include="GymSelector.fs" />
         <EmbeddedResource Include="SurfaceBaseline.txt" />
         <EmbeddedResource Include="version.json" />
     </ItemGroup>
+  
+    <ItemGroup>
+      <MyriadSdkGenerator Include="$(NuGetPackageRoot)/woofware.myriad.plugins/$(WoofWareMyriadPluginVersion)/lib/net6.0/WoofWare.Myriad.Plugins.dll" />
+    </ItemGroup>
 
     <ItemGroup>
       <PackageReference Include="RestEase" Version="1.6.4" />
-      <PackageReference Update="FSharp.Core" Version="6.0.0" />
+      <PackageReference Update="FSharp.Core" Version="6.0.1" />
       <PackageReference Include="System.Text.Json" Version="7.0.3" />
       <PackageReference Include="Fastenshtein" Version="1.0.0.8" />
+      <PackageReference Include="Myriad.Core" Version="0.8.3" />
+      <PackageReference Include="Myriad.Sdk" Version="0.8.3" />
+      <PackageReference Include="WoofWare.Myriad.Plugins" Version="$(WoofWareMyriadPluginVersion)" />
     </ItemGroup>
 
 </Project>

PureGym/SurfaceBaseline.txt

@@ -1,5 +1,3 @@
-PureGym.Api inherit obj
-PureGym.Api.make [static method]: PureGym.Auth -> PureGym.IPureGymApi System.Threading.Tasks.Task
 PureGym.Auth inherit obj, implements PureGym.Auth System.IEquatable, System.Collections.IStructuralEquatable, PureGym.Auth System.IComparable, System.IComparable, System.Collections.IStructuralComparable - union type with 2 cases
 PureGym.Auth+Tags inherit obj
 PureGym.Auth+Tags.Token [static field]: int = 1
@@ -37,6 +35,8 @@ PureGym.AuthToken.get_ExpiryTime [method]: unit -> System.DateTime option
 PureGym.AuthTokenModule inherit obj
 PureGym.AuthTokenModule.get [static method]: PureGym.UsernamePin -> PureGym.AuthToken System.Threading.Tasks.Task
 PureGym.AuthTokenModule.ofBearerToken [static method]: string -> PureGym.AuthToken
+PureGym.Dto inherit obj
+PureGym.Dto.make [static method]: PureGym.Auth -> PureGym.IPureGymApi System.Threading.Tasks.Task
 PureGym.Gym inherit obj, implements PureGym.Gym System.IEquatable, System.Collections.IStructuralEquatable, PureGym.Gym System.IComparable, System.IComparable, System.Collections.IStructuralComparable
 PureGym.Gym..ctor [constructor]: (string, int, int, PureGym.GymAddress, string, string, PureGym.GymOpeningHours, PureGym.GymAccessOptions, PureGym.GymLocation, string, string)
 PureGym.Gym.AccessOptions [property]: [read-only] PureGym.GymAccessOptions
@@ -67,22 +67,26 @@ PureGym.GymAccessOptions.get_PinAccess [method]: unit -> bool
 PureGym.GymAccessOptions.get_QrCodeAccess [method]: unit -> bool
 PureGym.GymAccessOptions.PinAccess [property]: [read-only] bool
 PureGym.GymAccessOptions.QrCodeAccess [property]: [read-only] bool
+PureGym.GymAccessOptionsModule inherit obj
+PureGym.GymAccessOptionsModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.GymAccessOptions
 PureGym.GymAddress inherit obj, implements PureGym.GymAddress System.IEquatable, System.Collections.IStructuralEquatable, PureGym.GymAddress System.IComparable, System.IComparable, System.Collections.IStructuralComparable
-PureGym.GymAddress..ctor [constructor]: (string, string, string, string, string, string)
+PureGym.GymAddress..ctor [constructor]: (string, string option, string option, string, string option, string)
 PureGym.GymAddress.AddressLine1 [property]: [read-only] string
-PureGym.GymAddress.AddressLine2 [property]: [read-only] string
+PureGym.GymAddress.AddressLine2 [property]: [read-only] string option
-PureGym.GymAddress.AddressLine3 [property]: [read-only] string
+PureGym.GymAddress.AddressLine3 [property]: [read-only] string option
-PureGym.GymAddress.County [property]: [read-only] string
+PureGym.GymAddress.County [property]: [read-only] string option
 PureGym.GymAddress.get_AddressLine1 [method]: unit -> string
-PureGym.GymAddress.get_AddressLine2 [method]: unit -> string
+PureGym.GymAddress.get_AddressLine2 [method]: unit -> string option
-PureGym.GymAddress.get_AddressLine3 [method]: unit -> string
+PureGym.GymAddress.get_AddressLine3 [method]: unit -> string option
-PureGym.GymAddress.get_County [method]: unit -> string
+PureGym.GymAddress.get_County [method]: unit -> string option
 PureGym.GymAddress.get_Postcode [method]: unit -> string
 PureGym.GymAddress.get_Town [method]: unit -> string
 PureGym.GymAddress.Postcode [property]: [read-only] string
 PureGym.GymAddress.Town [property]: [read-only] string
+PureGym.GymAddressModule inherit obj
+PureGym.GymAddressModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.GymAddress
 PureGym.GymAttendance inherit obj, implements PureGym.GymAttendance System.IEquatable, System.Collections.IStructuralEquatable, PureGym.GymAttendance System.IComparable, System.IComparable, System.Collections.IStructuralComparable
-PureGym.GymAttendance..ctor [constructor]: (string, int, int, string, bool, System.DateTime, System.DateTime, System.DateTime, int)
+PureGym.GymAttendance..ctor [constructor]: (string, int, int, string option, bool, System.DateTime, System.DateTime, System.DateTime, int)
 PureGym.GymAttendance.AttendanceTime [property]: [read-only] System.DateTime
 PureGym.GymAttendance.Description [property]: [read-only] string
 PureGym.GymAttendance.get_AttendanceTime [method]: unit -> System.DateTime
@@ -93,26 +97,34 @@ PureGym.GymAttendance.get_LastRefreshedPeopleInClasses [method]: unit -> System.
 PureGym.GymAttendance.get_MaximumCapacity [method]: unit -> int
 PureGym.GymAttendance.get_TotalPeopleInClasses [method]: unit -> int
 PureGym.GymAttendance.get_TotalPeopleInGym [method]: unit -> int
-PureGym.GymAttendance.get_TotalPeopleSuffix [method]: unit -> string
+PureGym.GymAttendance.get_TotalPeopleSuffix [method]: unit -> string option
 PureGym.GymAttendance.IsApproximate [property]: [read-only] bool
 PureGym.GymAttendance.LastRefreshed [property]: [read-only] System.DateTime
 PureGym.GymAttendance.LastRefreshedPeopleInClasses [property]: [read-only] System.DateTime
 PureGym.GymAttendance.MaximumCapacity [property]: [read-only] int
 PureGym.GymAttendance.TotalPeopleInClasses [property]: [read-only] int
 PureGym.GymAttendance.TotalPeopleInGym [property]: [read-only] int
-PureGym.GymAttendance.TotalPeopleSuffix [property]: [read-only] string
+PureGym.GymAttendance.TotalPeopleSuffix [property]: [read-only] string option
+PureGym.GymAttendanceModule inherit obj
+PureGym.GymAttendanceModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.GymAttendance
 PureGym.GymLocation inherit obj, implements PureGym.GymLocation System.IEquatable, System.Collections.IStructuralEquatable, PureGym.GymLocation System.IComparable, System.IComparable, System.Collections.IStructuralComparable
 PureGym.GymLocation..ctor [constructor]: (float, float)
 PureGym.GymLocation.get_Latitude [method]: unit -> float
 PureGym.GymLocation.get_Longitude [method]: unit -> float
 PureGym.GymLocation.Latitude [property]: [read-only] float
 PureGym.GymLocation.Longitude [property]: [read-only] float
+PureGym.GymLocationModule inherit obj
+PureGym.GymLocationModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.GymLocation
+PureGym.GymModule inherit obj
+PureGym.GymModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.Gym
 PureGym.GymOpeningHours inherit obj, implements PureGym.GymOpeningHours System.IEquatable, System.Collections.IStructuralEquatable, PureGym.GymOpeningHours System.IComparable, System.IComparable, System.Collections.IStructuralComparable
 PureGym.GymOpeningHours..ctor [constructor]: (bool, string list)
 PureGym.GymOpeningHours.get_IsAlwaysOpen [method]: unit -> bool
 PureGym.GymOpeningHours.get_OpeningHours [method]: unit -> string list
 PureGym.GymOpeningHours.IsAlwaysOpen [property]: [read-only] bool
 PureGym.GymOpeningHours.OpeningHours [property]: [read-only] string list
+PureGym.GymOpeningHoursModule inherit obj
+PureGym.GymOpeningHoursModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.GymOpeningHours
 PureGym.GymSelector inherit obj, implements PureGym.GymSelector System.IEquatable, System.Collections.IStructuralEquatable, PureGym.GymSelector System.IComparable, System.IComparable, System.Collections.IStructuralComparable - union type with 3 cases
 PureGym.GymSelector+Id inherit PureGym.GymSelector
 PureGym.GymSelector+Id.get_Item [method]: unit -> int
@@ -138,12 +150,13 @@ PureGym.GymSelector.NewName [static method]: string -> PureGym.GymSelector
 PureGym.GymSelector.Tag [property]: [read-only] int
 PureGym.GymSelectorModule inherit obj
 PureGym.GymSelectorModule.canonicalId [static method]: PureGym.IPureGymApi -> PureGym.GymSelector -> int System.Threading.Tasks.Task
-PureGym.IPureGymApi - interface with 5 member(s)
+PureGym.IPureGymApi - interface with 6 member(s)
 PureGym.IPureGymApi.GetGym [method]: int -> PureGym.Gym System.Threading.Tasks.Task
 PureGym.IPureGymApi.GetGymAttendance [method]: int -> PureGym.GymAttendance System.Threading.Tasks.Task
 PureGym.IPureGymApi.GetGyms [method]: unit -> PureGym.Gym list System.Threading.Tasks.Task
 PureGym.IPureGymApi.GetMember [method]: unit -> PureGym.Member System.Threading.Tasks.Task
-PureGym.IPureGymApi.GetMemberActivity [method]: unit -> PureGym.MemberActivityDto System.Threading.Tasks.Task
+PureGym.IPureGymApi.GetMemberActivity [method]: unit -> string System.Threading.Tasks.Task
+PureGym.IPureGymApi.GetSessions [method]: System.DateTime -> System.DateTime -> string System.Threading.Tasks.Task
 PureGym.Member inherit obj, implements PureGym.Member System.IEquatable, System.Collections.IStructuralEquatable, PureGym.Member System.IComparable, System.IComparable, System.Collections.IStructuralComparable
 PureGym.Member..ctor [constructor]: (int, string, string, string, int, string, string, string, System.DateOnly, string, string, string, int, int, int)
 PureGym.Member.CompoundMemberId [property]: [read-only] string
@@ -191,6 +204,8 @@ PureGym.MemberActivityDto.ToMemberActivity [method]: unit -> PureGym.MemberActiv
 PureGym.MemberActivityDto.TotalClasses [property]: [read-only] int
 PureGym.MemberActivityDto.TotalDuration [property]: [read-only] int
 PureGym.MemberActivityDto.TotalVisits [property]: [read-only] int
+PureGym.MemberActivityDtoModule inherit obj
+PureGym.MemberActivityDtoModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.MemberActivityDto
 PureGym.MemberActivityThisMonth inherit obj, implements PureGym.MemberActivityThisMonth System.IEquatable, System.Collections.IStructuralEquatable, PureGym.MemberActivityThisMonth System.IComparable, System.IComparable, System.Collections.IStructuralComparable
 PureGym.MemberActivityThisMonth..ctor [constructor]: (int, int, int, int, bool, System.DateTime)
 PureGym.MemberActivityThisMonth.AverageDurationMinutes [property]: [read-only] int
@@ -205,9 +220,59 @@ PureGym.MemberActivityThisMonth.LastRefreshed [property]: [read-only] System.Dat
 PureGym.MemberActivityThisMonth.TotalClasses [property]: [read-only] int
 PureGym.MemberActivityThisMonth.TotalDurationMinutes [property]: [read-only] int
 PureGym.MemberActivityThisMonth.TotalVisits [property]: [read-only] int
+PureGym.MemberModule inherit obj
+PureGym.MemberModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.Member
+PureGym.Sessions inherit obj, implements PureGym.Sessions System.IEquatable, System.Collections.IStructuralEquatable, PureGym.Sessions System.IComparable, System.IComparable, System.Collections.IStructuralComparable
+PureGym.Sessions..ctor [constructor]: (PureGym.SessionsSummary, PureGym.Visit list)
+PureGym.Sessions.get_Summary [method]: unit -> PureGym.SessionsSummary
+PureGym.Sessions.get_Visits [method]: unit -> PureGym.Visit list
+PureGym.Sessions.Summary [property]: [read-only] PureGym.SessionsSummary
+PureGym.Sessions.Visits [property]: [read-only] PureGym.Visit list
+PureGym.SessionsAggregate inherit obj, implements PureGym.SessionsAggregate System.IEquatable, System.Collections.IStructuralEquatable, PureGym.SessionsAggregate System.IComparable, System.IComparable, System.Collections.IStructuralComparable
+PureGym.SessionsAggregate..ctor [constructor]: (int, int, int)
+PureGym.SessionsAggregate.Activities [property]: [read-only] int
+PureGym.SessionsAggregate.Duration [property]: [read-only] int
+PureGym.SessionsAggregate.get_Activities [method]: unit -> int
+PureGym.SessionsAggregate.get_Duration [method]: unit -> int
+PureGym.SessionsAggregate.get_Visits [method]: unit -> int
+PureGym.SessionsAggregate.Visits [property]: [read-only] int
+PureGym.SessionsAggregateModule inherit obj
+PureGym.SessionsAggregateModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.SessionsAggregate
+PureGym.SessionsModule inherit obj
+PureGym.SessionsModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.Sessions
+PureGym.SessionsSummary inherit obj, implements PureGym.SessionsSummary System.IEquatable, System.Collections.IStructuralEquatable, PureGym.SessionsSummary System.IComparable, System.IComparable, System.Collections.IStructuralComparable
+PureGym.SessionsSummary..ctor [constructor]: (PureGym.SessionsAggregate, PureGym.SessionsAggregate)
+PureGym.SessionsSummary.get_ThisWeek [method]: unit -> PureGym.SessionsAggregate
+PureGym.SessionsSummary.get_Total [method]: unit -> PureGym.SessionsAggregate
+PureGym.SessionsSummary.ThisWeek [property]: [read-only] PureGym.SessionsAggregate
+PureGym.SessionsSummary.Total [property]: [read-only] PureGym.SessionsAggregate
+PureGym.SessionsSummaryModule inherit obj
+PureGym.SessionsSummaryModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.SessionsSummary
 PureGym.UsernamePin inherit obj, implements PureGym.UsernamePin System.IEquatable, System.Collections.IStructuralEquatable, PureGym.UsernamePin System.IComparable, System.IComparable, System.Collections.IStructuralComparable
 PureGym.UsernamePin..ctor [constructor]: (string, string)
 PureGym.UsernamePin.get_Pin [method]: unit -> string
 PureGym.UsernamePin.get_Username [method]: unit -> string
 PureGym.UsernamePin.Pin [property]: [read-only] string
-PureGym.UsernamePin.Username [property]: [read-only] string
+PureGym.UsernamePin.Username [property]: [read-only] string
+PureGym.Visit inherit obj, implements PureGym.Visit System.IEquatable, System.Collections.IStructuralEquatable, PureGym.Visit System.IComparable, System.IComparable, System.Collections.IStructuralComparable
+PureGym.Visit..ctor [constructor]: (bool, System.DateTime, int, PureGym.VisitGym)
+PureGym.Visit.Duration [property]: [read-only] int
+PureGym.Visit.get_Duration [method]: unit -> int
+PureGym.Visit.get_Gym [method]: unit -> PureGym.VisitGym
+PureGym.Visit.get_IsDurationEstimated [method]: unit -> bool
+PureGym.Visit.get_StartTime [method]: unit -> System.DateTime
+PureGym.Visit.Gym [property]: [read-only] PureGym.VisitGym
+PureGym.Visit.IsDurationEstimated [property]: [read-only] bool
+PureGym.Visit.StartTime [property]: [read-only] System.DateTime
+PureGym.VisitGym inherit obj, implements PureGym.VisitGym System.IEquatable, System.Collections.IStructuralEquatable, PureGym.VisitGym System.IComparable, System.IComparable, System.Collections.IStructuralComparable
+PureGym.VisitGym..ctor [constructor]: (int, string, string)
+PureGym.VisitGym.get_Id [method]: unit -> int
+PureGym.VisitGym.get_Name [method]: unit -> string
+PureGym.VisitGym.get_Status [method]: unit -> string
+PureGym.VisitGym.Id [property]: [read-only] int
+PureGym.VisitGym.Name [property]: [read-only] string
+PureGym.VisitGym.Status [property]: [read-only] string
+PureGym.VisitGymModule inherit obj
+PureGym.VisitGymModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.VisitGym
+PureGym.VisitModule inherit obj
+PureGym.VisitModule.jsonParse [static method]: System.Text.Json.Nodes.JsonNode -> PureGym.Visit

PureGym/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0",
+  "version": "3.0",
   "publicReleaseRefSpec": [
     "^refs/heads/main$"
   ],

flake.nix

@@ -17,8 +17,8 @@
       projectFile = "./PureGym.App/PureGym.App.fsproj";
       testProjectFile = "./PureGym.Test/PureGym.Test.fsproj";
       pname = "puregym";
-      dotnet-sdk = pkgs.dotnet-sdk_7;
+      dotnet-sdk = pkgs.dotnet-sdk_8;
-      dotnet-runtime = pkgs.dotnetCorePackages.runtime_7_0;
+      dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0;
       version = "0.1";
       dotnetTool = toolName: toolVersion: sha256:
         pkgs.stdenvNoCC.mkDerivation rec {
@@ -81,7 +81,7 @@
       };
       devShells.default = pkgs.mkShell {
         buildInputs =
-          [pkgs.alejandra pkgs.dotnet-sdk_7 pkgs.python3 pkgs.nodePackages.markdown-link-check]
+          [pkgs.alejandra pkgs.dotnet-sdk_8 pkgs.python3 pkgs.nodePackages.markdown-link-check]
           ++ (
             if pkgs.stdenv.isDarwin
             then [pkgs.darwin.apple_sdk.frameworks.CoreServices]

nix/deps.nix

@@ -1,21 +1,6 @@
 # This file was automatically generated by passthru.fetch-deps.
 # Please don't edit it manually, your changes might get overwritten!
 {fetchNuGet}: [
-  (fetchNuGet {
-    pname = "Fastenshtein";
-    version = "1.0.0.8";
-    sha256 = "1rvw27rz7qb2n68i0jvvcr224fcpy5yzzxaj1bp89jw41cpdabp2";
-  })
-  (fetchNuGet {
-    pname = "Argu";
-    version = "6.1.1";
-    sha256 = "1v996g0760qhiys2ahdpnvkldaxr2jn5f1falf789glnk4a6f3xl";
-  })
-  (fetchNuGet {
-    pname = "System.Configuration.ConfigurationManager";
-    version = "4.4.0";
-    sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v";
-  })
   (fetchNuGet {
     pname = "fantomas";
     version = "6.2.0";
@@ -26,20 +11,50 @@
     version = "4.0.12";
     sha256 = "0v56sv4cz8bgrfqjjg0q96619qs9dvvi0a6lp7hzz2mi82i1inmq";
   })
+  (fetchNuGet {
+    pname = "Argu";
+    version = "6.1.1";
+    sha256 = "1v996g0760qhiys2ahdpnvkldaxr2jn5f1falf789glnk4a6f3xl";
+  })
   (fetchNuGet {
     pname = "coverlet.collector";
     version = "3.2.0";
     sha256 = "1qxpv8v10p5wn162lzdm193gdl6c5f81zadj8h889dprlnj3g8yr";
   })
   (fetchNuGet {
-    pname = "FSharp.Core";
+    pname = "Fantomas.Core";
-    version = "6.0.0";
+    version = "6.1.1";
-    sha256 = "1hjhvr39c1vpgrdmf8xln5q86424fqkvy9nirkr29vl2461d2039";
+    sha256 = "1h2wsiy4fzwsg9vrlpk6w7zsvx6bc4wg4x25zqc48akg04fwpi0m";
+  })
+  (fetchNuGet {
+    pname = "Fantomas.FCS";
+    version = "6.1.1";
+    sha256 = "0733dm5zjdp8w5wwalqlv1q52pghfr04863i9wy807f4qfd7rrin";
+  })
+  (fetchNuGet {
+    pname = "Fastenshtein";
+    version = "1.0.0.8";
+    sha256 = "1rvw27rz7qb2n68i0jvvcr224fcpy5yzzxaj1bp89jw41cpdabp2";
+  })
+  (fetchNuGet {
+    pname = "FsCheck";
+    version = "2.16.6";
+    sha256 = "176rwky6b5rk8dzldiz4068p7m9c5y9ygzbhadrs14jkl94pc56n";
   })
   (fetchNuGet {
     pname = "FSharp.Core";
-    version = "7.0.400";
+    version = "6.0.1";
-    sha256 = "1pl6iqqcpm9djfn7f6ms5j1xbcyz00nb808qd6pmsjrnylflalgp";
+    sha256 = "0qks2aadkhsffg9a6xq954ll9xacnph852avd7ljh9n2g6vj06qj";
+  })
+  (fetchNuGet {
+    pname = "FSharp.Core";
+    version = "8.0.100-beta.23418.2";
+    sha256 = "05wfbfqphk27qp1v8pmssl3fhs4yggyrmzvxwcx6m3xryix7bjkk";
+  })
+  (fetchNuGet {
+    pname = "FsUnit";
+    version = "5.6.1";
+    sha256 = "1zffn9dm2c44v8qjzwfg6y3psydiv2bn3n305rf7mc57cmm4ygv3";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Ref";
@@ -53,8 +68,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23421.29";
-    sha256 = "0hmsqy4yc3023mcp5rg0h59yv3f8cnjhxw1g4i8md67vm5y04lfv";
+    sha256 = "1sz6skh1ddvdcib8ydi6km593ah3cchgz2fs61kj03z6jg2vz9la";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
@@ -63,8 +78,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23421.29";
-    sha256 = "18sk9wka8z5354ca77q43hi0615yjssdjbyi0hqq92w6zmg43vgc";
+    sha256 = "1m6a47bnrl8n9ahnh01mg2fkc20lmfjjg3f7xzbdngnikm6vzcxv";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
@@ -73,8 +88,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23421.29";
-    sha256 = "1j0zbd4rmmd3ylgixsvyj145g2r6px6b9d9k4yxxg6d61x90c165";
+    sha256 = "16vy79c7byrqwd9f7vm0xbah3k4y6yis0flm9jkfk0hp4bb0y0js";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
@@ -83,8 +98,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23421.29";
-    sha256 = "0wxw7vgygg6hqzq479n0pfjizr69wq7ja03a0qh8bma8b9q2mn6f";
+    sha256 = "0ygb60mpk1rkz67v1d9vf3f7zfvdzg5a4ckc1yqcfb2n4a64rdbv";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
@@ -93,8 +108,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23421.29";
-    sha256 = "05ywwfn5lzx6y999f7gwmablkxi2zvska4sg20ihmjzp3xakcmk0";
+    sha256 = "0cir3vy94ki9v0zzkm49f33mxmp25i2v0c3gp4fhmnhpsfn0x7rb";
   })
   (fetchNuGet {
     pname = "Microsoft.CodeCoverage";
@@ -113,8 +128,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.linux-arm64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23419.4";
-    sha256 = "03nkxjn4wq30rw0163rqi8sngfxmcvwgm0wg7sgyb1cdh0q1ai68";
+    sha256 = "1254rvx06wjblf0y2msh1zdg0fky861l8x5f5w7hm5l14ys1firb";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.linux-x64";
@@ -123,8 +138,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.linux-x64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23419.4";
-    sha256 = "12hh69sr4wf8sjcw3q71vky51sn854ffahbq6rgz3njzvbvc0dbj";
+    sha256 = "10kjms0wx5iialcvd0fp64vriv4cyk7k22wqh3km9mh43i620px7";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.osx-arm64";
@@ -138,8 +153,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.osx-x64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23419.4";
-    sha256 = "1j1k735gkwba93n5yck87wppfpsbny979hppcygwrk81myf3fv03";
+    sha256 = "03sgkb2ar63wllisx8rmpc3yrngl61yhlmqinwbc5bhyaxpmqnk5";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.win-x64";
@@ -148,8 +163,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.win-x64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23419.4";
-    sha256 = "0ifshdx19bgnbgynbk6iy6gybnxmp63nylrn7068x66hvcavh7kh";
+    sha256 = "0lnxq6risl59ig9svhra6papn0i9rs2pr4zgnysnbfg7gvd3fiwh";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Ref";
@@ -163,8 +178,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23419.4";
-    sha256 = "1gzwc96fs222ddia0k1924cn7gxm2a4anqgcxhmavx56x76wsy6f";
+    sha256 = "1x5pq1y4gn1gwnqmq9mj02wki5yncidlnmaf2przz8yingfw0hq6";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.linux-x64";
@@ -173,8 +188,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23419.4";
-    sha256 = "0vxza49wwiia0d3m887yiaprp3xnax2bgzhj5bf080b4ayapzkf9";
+    sha256 = "1arzm0mqdj0hnlsfcki8z3zbbp5mpv73133wc8yxpymh6f000bv2";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
@@ -183,8 +198,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23419.4";
-    sha256 = "15b62hxrpfy19xvyxlyligixxpa9sysfgi47xi4imx5055fhwphh";
+    sha256 = "04k93say7b842bvh2x853skj5ymxsq3b11vf6rkfcqz6b7hvn7pj";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.osx-x64";
@@ -193,8 +208,8 @@
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23419.4";
-    sha256 = "018qf23b0jixfh3fm74zqaakk01qx6yq21gk2mdn68b0xhnvlzma";
+    sha256 = "0f403j2sis8p7y1w2nkbp03xq8qq06f7q94d8clm9c98vppw75sj";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.win-x64";
@@ -203,19 +218,29 @@
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.win-x64";
-    version = "7.0.11";
+    version = "8.0.0-rc.1.23419.4";
-    sha256 = "12xmw2kcpf5rh8sv4y0mqzp917f7q8g4mfh5navqw4jmnxyb26qq";
+    sha256 = "00whfl9s9qd43jv68rff5g6da0k6y11yc2pg6v681967fnq31jqp";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.Platforms";
     version = "1.1.0";
     sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm";
   })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Platforms";
+    version = "1.1.1";
+    sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj";
+  })
   (fetchNuGet {
     pname = "Microsoft.NETCore.Platforms";
     version = "2.0.0";
     sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0";
   })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Targets";
+    version = "1.1.3";
+    sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq";
+  })
   (fetchNuGet {
     pname = "Microsoft.TestPlatform.ObjectModel";
     version = "17.6.0";
@@ -226,6 +251,16 @@
     version = "17.6.0";
     sha256 = "16vpicp4q2kbpgr3qwpsxg7srabxqszx23x6smjvvrvz7qmr5v8i";
   })
+  (fetchNuGet {
+    pname = "Myriad.Core";
+    version = "0.8.3";
+    sha256 = "0s5pdckjw4x0qrbd4i3cz9iili5cppg5qnjbr7zjbbhhmxzb24xw";
+  })
+  (fetchNuGet {
+    pname = "Myriad.Sdk";
+    version = "0.8.3";
+    sha256 = "0qv78c5s5m04xb8h17nnn2ig26zcyya91k2dpj745cm1cbnzvvgc";
+  })
   (fetchNuGet {
     pname = "NETStandard.Library";
     version = "2.0.0";
@@ -273,8 +308,8 @@
   })
   (fetchNuGet {
     pname = "NUnit";
-    version = "3.13.3";
+    version = "3.14.0";
-    sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6";
+    sha256 = "19p8911lrfds1k9rv47jk1bbn665s0pvghkd06gzbg78j6mzzqqa";
   })
   (fetchNuGet {
     pname = "NUnit.Analyzers";
@@ -291,6 +326,31 @@
     version = "1.6.4";
     sha256 = "1mvi3nbrr450g3fgd1y4wg3bwl9k1agyjfd9wdkqk12714bsln8l";
   })
+  (fetchNuGet {
+    pname = "runtime.any.System.Runtime";
+    version = "4.3.0";
+    sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b";
+  })
+  (fetchNuGet {
+    pname = "runtime.native.System";
+    version = "4.3.0";
+    sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.System.Private.Uri";
+    version = "4.3.0";
+    sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk";
+  })
+  (fetchNuGet {
+    pname = "System.Configuration.ConfigurationManager";
+    version = "4.4.0";
+    sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v";
+  })
+  (fetchNuGet {
+    pname = "System.Diagnostics.DiagnosticSource";
+    version = "7.0.0";
+    sha256 = "1jxhvsh5mzdf0sgb4dfmbys1b12ylyr5pcfyj1map354fiq3qsgm";
+  })
   (fetchNuGet {
     pname = "System.Formats.Asn1";
     version = "5.0.0";
@@ -306,11 +366,26 @@
     version = "4.5.0";
     sha256 = "1gq4s8w7ds1sp8f9wqzf8nrzal40q5cd2w4pkf4fscrl2ih3hkkj";
   })
+  (fetchNuGet {
+    pname = "System.Memory";
+    version = "4.5.5";
+    sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h";
+  })
+  (fetchNuGet {
+    pname = "System.Private.Uri";
+    version = "4.3.0";
+    sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx";
+  })
   (fetchNuGet {
     pname = "System.Reflection.Metadata";
     version = "1.6.0";
     sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4";
   })
+  (fetchNuGet {
+    pname = "System.Runtime";
+    version = "4.3.1";
+    sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27";
+  })
   (fetchNuGet {
     pname = "System.Runtime.CompilerServices.Unsafe";
     version = "6.0.0";
@@ -361,4 +436,9 @@
     version = "7.0.3";
     sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9";
   })
+  (fetchNuGet {
+    pname = "WoofWare.Myriad.Plugins";
+    version = "1.0.4";
+    sha256 = "077aldkb3va1azdm5g9sms074flkjwwbml6la0alk2cazw6xqj77";
+  })
 ]