More

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "7.0.3",
+      "version": "7.0.1",
       "commands": [
         "fantomas"
       ]
     },
     "fsharp-analyzers": {
-      "version": "0.32.1",
+      "version": "0.30.0",
       "commands": [
         "fsharp-analyzers"
       ]

.envrc

@@ -1,23 +1 @@
 use flake
-DOTNET_PATH=$(readlink "$(which dotnet)")
-SETTINGS_FILE=$(find . -maxdepth 1 -type f -name '*.sln.DotSettings.user')
-MSBUILD=$(realpath "$(find "$(dirname "$DOTNET_PATH")/../share/dotnet/sdk" -maxdepth 2 -type f -name MSBuild.dll)")
-if [ -f "$SETTINGS_FILE" ] ; then
-    xmlstarlet ed --inplace \
-    -N wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" \
-    -N x="http://schemas.microsoft.com/winfx/2006/xaml" \
-    -N s="clr-namespace:System;assembly=mscorlib" \
-    -N ss="urn:shemas-jetbrains-com:settings-storage-xaml" \
-    --update "//s:String[@x:Key='/Default/Environment/Hierarchy/Build/BuildTool/DotNetCliExePath/@EntryValue']" \
-    --value "$(realpath "$(dirname "$DOTNET_PATH")/../share/dotnet/dotnet")" \
-    "$SETTINGS_FILE"
-
-    xmlstarlet ed --inplace \
-    -N wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" \
-    -N x="http://schemas.microsoft.com/winfx/2006/xaml" \
-    -N s="clr-namespace:System;assembly=mscorlib" \
-    -N ss="urn:shemas-jetbrains-com:settings-storage-xaml" \
-    --update "//s:String[@x:Key='/Default/Environment/Hierarchy/Build/BuildTool/CustomBuildToolPath/@EntryValue']" \
-    --value "$MSBUILD" \
-    "$SETTINGS_FILE"
-fi

.github/workflows/dotnet.yaml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
     - name: Install Nix
@@ -46,7 +46,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
       - name: Install Nix
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
       - name: Install Nix
@@ -114,7 +114,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
@@ -152,7 +152,7 @@ jobs:
   nuget-pack:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
     - name: Install Nix
@@ -182,7 +182,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download NuGet artifact (plugin)
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: nuget-package-plugin
           path: packed-plugin
@@ -190,7 +190,7 @@ jobs:
         # Verify that there is exactly one nupkg in the artifact that would be NuGet published
         run: if [[ $(find packed-plugin -maxdepth 1 -name 'WoofWare.Myriad.Plugins.*.nupkg' -printf c | wc -c) -ne "1" ]]; then exit 1; fi
       - name: Download NuGet artifact (attributes)
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: nuget-package-attribute
           path: packed-attribute
@@ -207,9 +207,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [nuget-pack]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.artifact }}
       - name: Compute package path
@@ -249,12 +249,12 @@ jobs:
       contents: read
     steps:
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: nuget-package-attribute
           path: packed
       - name: Attest Build Provenance
-        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
+        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
         with:
           subject-path: "packed/*.nupkg"
 
@@ -268,12 +268,12 @@ jobs:
       contents: read
     steps:
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: nuget-package-plugin
           path: packed
       - name: Attest Build Provenance
-        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
+        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
         with:
           subject-path: "packed/*.nupkg"
 
@@ -287,31 +287,26 @@ jobs:
       attestations: write
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: nuget-package-attribute
           path: packed
       - name: Identify `dotnet`
         id: dotnet-identify
         run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
-      - name: Obtain NuGet key
-        uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
-        id: login
-        with:
-            user: ${{ secrets.NUGET_USER }}
       - name: Publish to NuGet
         id: publish-success
         uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
         with:
           package-name: WoofWare.Myriad.Plugins.Attributes
-          nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
+          nuget-key: ${{ secrets.NUGET_API_KEY }}
           nupkg-dir: packed/
           dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
 
@@ -325,31 +320,26 @@ jobs:
       attestations: write
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: nuget-package-plugin
           path: packed
       - name: Identify `dotnet`
         id: dotnet-identify
         run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
-      - name: Obtain NuGet key
-        uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
-        id: login
-        with:
-            user: ${{ secrets.NUGET_USER }}
       - name: Publish to NuGet
         id: publish-success
         uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
         with:
           package-name: WoofWare.Myriad.Plugins
-          nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
+          nuget-key: ${{ secrets.NUGET_API_KEY }}
           nupkg-dir: packed/
           dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
 
@@ -366,9 +356,9 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.artifact }}
       - name: Compute package path

.github/workflows/flake_update.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
@@ -41,12 +41,11 @@ jobs:
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
 
       - name: Raise pull request
-        uses: Smaug123/commit-action@d34807f26cb52c7a05bbd80efe9f964cdf29bc87
+        uses: Smaug123/commit-action@cc25e6d80a796c49669dda4a0aa36c54c573983d
         id: cpr
         with:
             bearer-token: ${{ steps.generate-token.outputs.token }}
             pr-title: "Upgrade Nix flake and deps"
-            branch-name: "auto-pr"
 
       - name: Enable Pull Request Automerge
         if: ${{ steps.cpr.outputs.pull-request-number }}

CHANGELOG.md

@@ -1,36 +1,5 @@
 Notable changes are recorded here.
 
-# WoofWare.Myriad.Plugins 8.1.1
-
-Adds `GenerateCapturingMock`, which is `GenerateMock` but additionally records the calls made to each function.
-
-# WoofWare.Myriad.Plugins 8.0.3
-
-The RestEase-style HTTP client generator now automatically adds the `application/json` content type header to requests which are POSTing a body that is known to be JSON-serialised.
-You can override this by setting the `[<RestEase.Header ("Content-Type", "desired content type")>]` header manually on any affected member.
-
-# WoofWare.Myriad.Plugins 7.0.1
-
-All generators should now be compatible with `<Nullable>enable</Nullable>`.
-
-**Please test the results and let me know of unexpected failures.**
-There are a number of heuristics in this code, because:
-
-* `System.Text.Json.Nodes` is an unfathomably weird API which simply requires us to make educated guesses about whether a user-provided type is supposed to be nullable, despite this being irrelevant to the operation of `System.Text.Json`;
-* Some types (like `Uri` and `String`) have `ToString` methods which can't return `null`, but in general `Object.ToString` can of course return `null`, and as far as I can tell there is simply no way to know from the source alone whether a given type will have a nullable `ToString`.
-
-# WoofWare.Myriad.Plugins 6.0.1
-
-The `ArgParser` generator's type signatures have changed.
-The `parse'` method no longer takes `getEnvironmentVariable : string -> string`; it's now `getEnvironmentVariable : string -> string option`.
-This is to permit satisfying the `<Nullable>enable</Nullable>` compiler setting.
-If you're calling `parse'`, give it `Environment.GetEnvironmentVariable >> Option.ofObj` instead.
-
-# WoofWare.Myriad.Plugins 5.0.1
-
-We now enforce non-nullability on more types during JSON parse.
-We have always expected you to consume nullable types wrapped in an `option`, but now we enforce this in more cases by throwing `ArgumentNullException`.
-
 # WoofWare.Myriad.Plugins 3.0.1
 
 Semantics of `HttpClient`'s URI component composition changed:

ConsumePlugin/Args.fs

@@ -235,3 +235,9 @@ type FlagsIntoPositionalArgs' =
         [<PositionalArgs false>]
         DontGrabEverything : string list
     }
+
+[<ArgParser true>]
+type PassThru =
+    {
+        A : ParentRecordChildPos
+    }

ConsumePlugin/ArgsWithUnions.fs

@@ -0,0 +1,35 @@
+namespace ConsumePlugin.ArgsWithUnions
+
+open System
+open System.IO
+open WoofWare.Myriad.Plugins
+
+type BasicNoPositionals =
+    {
+        Foo : int
+        Bar : string
+        Baz : bool
+        Rest : int list
+    }
+
+type UsernamePasswordAuth =
+    {
+        Username : string
+        Password : string
+    }
+
+type TokenAuth =
+    {
+        Token : string
+    }
+
+type AuthOptions =
+    | UsernamePassword of UsernamePasswordAuth
+    | Token of TokenAuth
+
+[<ArgParser>]
+type DoTheThing =
+    {
+        Basics : BasicNoPositionals
+        Auth : AuthOptions
+    }

ConsumePlugin/CapturingMockExample.fs

@@ -1,57 +0,0 @@
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<GenerateCapturingMock>]
-type IPublicType =
-    abstract Mem1 : foo : string * int -> string list
-    abstract Mem2 : string -> int
-    abstract Mem3 : x : int * ?ct : System.Threading.CancellationToken -> string
-
-[<GenerateCapturingMock false>]
-type IPublicTypeInternalFalse =
-    abstract Mem1 : string * int -> string list
-    abstract Mem2 : string -> int
-    abstract Mem3 : x : int * ?ct : System.Threading.CancellationToken -> string
-
-[<GenerateCapturingMock>]
-type internal InternalType =
-    abstract Mem1 : string * int -> unit
-    abstract Mem2 : string -> int
-
-[<GenerateCapturingMock>]
-type private PrivateType =
-    abstract Mem1 : string * int -> unit
-    abstract Mem2 : string -> int
-
-[<GenerateCapturingMock false>]
-type private PrivateTypeInternalFalse =
-    abstract Mem1 : string * int -> unit
-    abstract Mem2 : string -> int
-
-[<GenerateCapturingMock>]
-type VeryPublicType<'a, 'b> =
-    abstract Mem1 : 'a -> 'b
-
-[<GenerateCapturingMock>]
-type Curried<'a> =
-    abstract Mem1 : bar : int -> 'a -> string
-    abstract Mem2 : int * string -> baz : 'a -> string
-    abstract Mem3 : quux : (int * string) -> flurb : 'a -> string
-    abstract Mem4 : (int * string) -> ('a * int) -> string
-    abstract Mem5 : x : int * string -> ('a * int) -> string
-    abstract Mem6 : int * string -> y : 'a * int -> string
-
-[<GenerateCapturingMock>]
-type TypeWithInterface =
-    inherit IDisposable
-    abstract Mem1 : string option -> string[] Async
-    abstract Mem2 : unit -> string[] Async
-
-[<GenerateCapturingMock>]
-type TypeWithProperties =
-    inherit IDisposable
-    abstract Mem1 : string option -> string[] Async
-    abstract Prop1 : int
-    abstract Prop2 : unit Async

ConsumePlugin/CapturingMockExampleNoAttributes.fs

@@ -1,41 +0,0 @@
-namespace SomeNamespace.CapturingMock
-
-open System
-
-type IPublicTypeNoAttr =
-    abstract Mem1 : string * int -> string list
-    abstract Mem2 : string -> int
-    abstract Mem3 : x : int * ?ct : System.Threading.CancellationToken -> string
-
-type IPublicTypeInternalFalseNoAttr =
-    abstract Mem1 : string * int -> string list
-    abstract Mem2 : string -> int
-    abstract Mem3 : x : int * ?ct : System.Threading.CancellationToken -> string
-
-type internal InternalTypeNoAttr =
-    abstract Mem1 : string * int -> unit
-    abstract Mem2 : string -> int
-
-type private PrivateTypeNoAttr =
-    abstract Mem1 : string * int -> unit
-    abstract Mem2 : string -> int
-
-type private PrivateTypeInternalFalseNoAttr =
-    abstract Mem1 : string * int -> unit
-    abstract Mem2 : string -> int
-
-type VeryPublicTypeNoAttr<'a, 'b> =
-    abstract Mem1 : 'a -> 'b
-
-type CurriedNoAttr<'a> =
-    abstract Mem1 : int -> 'a -> string
-    abstract Mem2 : int * string -> 'a -> string
-    abstract Mem3 : (int * string) -> 'a -> string
-    abstract Mem4 : (int * string) -> ('a * int) -> string
-    abstract Mem5 : x : int * string -> ('a * int) -> string
-    abstract Mem6 : int * string -> y : 'a * int -> string
-
-type TypeWithInterfaceNoAttr =
-    inherit IDisposable
-    abstract Mem1 : string option -> string[] Async
-    abstract Mem2 : unit -> string[] Async

ConsumePlugin/ConsumePlugin.fsproj

@@ -4,7 +4,6 @@
     <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <OtherFlags>--reflectionfree $(OtherFlags)</OtherFlags>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)..\WoofWare.Myriad.Plugins\bin\$(Configuration)\net6.0\WoofWare.Myriad.Plugins.dll"/>
@@ -13,6 +12,7 @@
   <ItemGroup>
     <None Include="myriad.toml"/>
     <Compile Include="AssemblyInfo.fs" />
+    <!--
     <Compile Include="RecordFile.fs"/>
     <Compile Include="GeneratedRecord.fs">
       <MyriadFile>RecordFile.fs</MyriadFile>
@@ -33,10 +33,6 @@
     <Compile Include="GeneratedMock.fs">
       <MyriadFile>MockExample.fs</MyriadFile>
     </Compile>
-    <Compile Include="CapturingMockExample.fs" />
-    <Compile Include="GeneratedCapturingMock.fs">
-      <MyriadFile>CapturingMockExample.fs</MyriadFile>
-    </Compile>
     <Compile Include="MockExampleNoAttributes.fs" />
     <Compile Include="GeneratedMockNoAttributes.fs">
       <MyriadFile>MockExampleNoAttributes.fs</MyriadFile>
@@ -51,20 +47,6 @@
         <TypeWithInterfaceNoAttr>GenerateMock</TypeWithInterfaceNoAttr>
       </MyriadParams>
     </Compile>
-    <Compile Include="CapturingMockExampleNoAttributes.fs" />
-    <Compile Include="GeneratedCapturingMockNoAttributes.fs">
-      <MyriadFile>CapturingMockExampleNoAttributes.fs</MyriadFile>
-      <MyriadParams>
-        <IPublicTypeNoAttr>GenerateCapturingMock</IPublicTypeNoAttr>
-        <IPublicTypeInternalFalseNoAttr>GenerateCapturingMock(false)</IPublicTypeInternalFalseNoAttr>
-        <InternalTypeNoAttr>GenerateCapturingMock</InternalTypeNoAttr>
-        <PrivateTypeNoAttr>GenerateCapturingMock</PrivateTypeNoAttr>
-        <PrivateTypeInternalFalseNoAttr>GenerateCapturingMock(false)</PrivateTypeInternalFalseNoAttr>
-        <VeryPublicTypeNoAttr>GenerateCapturingMock</VeryPublicTypeNoAttr>
-        <CurriedNoAttr>GenerateCapturingMock</CurriedNoAttr>
-        <TypeWithInterfaceNoAttr>GenerateCapturingMock</TypeWithInterfaceNoAttr>
-      </MyriadParams>
-    </Compile>
     <Compile Include="Vault.fs" />
     <Compile Include="GeneratedVault.fs">
       <MyriadFile>Vault.fs</MyriadFile>
@@ -85,10 +67,16 @@
     <Compile Include="ListCata.fs">
       <MyriadFile>List.fs</MyriadFile>
     </Compile>
+    -->
     <Compile Include="Args.fs" />
     <Compile Include="GeneratedArgs.fs">
       <MyriadFile>Args.fs</MyriadFile>
     </Compile>
+    <Compile Include="ArgsWithUnions.fs" />
+    <Compile Include="GeneratedArgsWithUnions.fs">
+      <MyriadFile>ArgsWithUnions.fs</MyriadFile>
+    </Compile>
+    <!--
     <None Include="swagger-gitea.json" />
     <Compile Include="GeneratedSwaggerGitea.fs">
       <MyriadFile>swagger-gitea.json</MyriadFile>
@@ -100,6 +88,7 @@
     <Compile Include="Generated2SwaggerGitea.fs">
       <MyriadFile>GeneratedSwaggerGitea.fs</MyriadFile>
     </Compile>
+    -->
   </ItemGroup>
 
   <ItemGroup>

ConsumePlugin/GeneratedArgsWithUnions.fs

@@ -0,0 +1,686 @@
+//------------------------------------------------------------------------------
+//        This code was generated by myriad.
+//        Changes to this file will be lost when the code is regenerated.
+//------------------------------------------------------------------------------
+
+
+
+
+
+
+namespace ArgParserHelpers
+
+/// Helper types for arg parsing
+module internal ArgParseHelpers_ConsumePlugin_ArgsWithUnions =
+    open System
+    open System.IO
+    open WoofWare.Myriad.Plugins
+    open ConsumePlugin.ArgsWithUnions
+
+    /// A partially-parsed BasicNoPositionals.
+    type internal BasicNoPositionals_InProgress =
+        {
+            mutable Bar : string option
+            mutable Baz : bool option
+            mutable Foo : int option
+            mutable Rest : ResizeArray<int>
+        }
+
+        /// Freeze this in-progress type. On success, returns the frozen type and the arg (if any) which consumed the input positional args.
+        member this.Assemble_
+            (getEnvironmentVariable : string -> string)
+            (positionals : Choice<string * int, string * int> list)
+            : Result<BasicNoPositionals * string option, string list>
+            =
+            let errors = ResizeArray<string> ()
+            let positionalConsumers = ResizeArray<string> ()
+            let outOfPlacePositionals : ResizeArray<string> = ResizeArray ()
+
+            let arg0 : int =
+                match this.Foo with
+                | Some result -> result
+                | None ->
+                    errors.Add (sprintf "Required argument '--%s' received no value" "foo")
+                    Unchecked.defaultof<_>
+
+            let arg1 : string =
+                match this.Bar with
+                | Some result -> result
+                | None ->
+                    errors.Add (sprintf "Required argument '--%s' received no value" "bar")
+                    Unchecked.defaultof<_>
+
+            let arg2 : bool =
+                match this.Baz with
+                | Some result -> result
+                | None ->
+                    errors.Add (sprintf "Required argument '--%s' received no value" "baz")
+                    Unchecked.defaultof<_>
+
+            let arg3 : int list = this.Rest |> Seq.toList
+
+            if positionalConsumers.Count <= 1 then
+                if outOfPlacePositionals.Count > 0 then
+                    outOfPlacePositionals
+                    |> String.concat " "
+                    |> (fun x ->
+                        if 0 = outOfPlacePositionals.Count then
+                            "Unmatched args which look like they are meant to be flags. " + x
+                        else
+                            sprintf
+                                "Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `%s=` syntax, or place them after a trailing `--`. %s"
+                                positionalConsumers.[0]
+                                x
+                    )
+                    |> errors.Add
+                else
+                    ()
+
+                if errors.Count = 0 then
+                    Ok (
+                        {
+                            Foo = arg0
+                            Bar = arg1
+                            Baz = arg2
+                            Rest = arg3
+                        },
+                        Seq.tryExactlyOne positionalConsumers
+                    )
+                else
+                    errors |> Seq.toList |> Error
+            else
+                ("Multiple parsers consumed positional args; this is an error in the application, not an error by the user: "
+                 + String.concat ", " positionalConsumers)
+                |> List.singleton
+                |> Error
+
+        static member _Empty () : BasicNoPositionals_InProgress =
+            {
+                Bar = None
+                Baz = None
+                Foo = None
+                Rest = ResizeArray ()
+            }
+
+        /// Processes the key-value pair, returning Error if no key was matched.
+        /// If the key is an arg which can have arity 1, but throws when consuming that arg, we return Error(<the message>).
+        /// This can nevertheless be a successful parse, e.g. when the key may have arity 0.
+        member this.ProcessKeyValueSelf_
+            (argNum_ : int)
+            (errors_ : ResizeArray<string>)
+            (key : string)
+            (value : string)
+            : Result<unit, string option>
+            =
+            if System.String.Equals (key, sprintf "--%s" "rest", System.StringComparison.OrdinalIgnoreCase) then
+                value |> (fun x -> System.Int32.Parse x) |> (fun x -> x) |> this.Rest.Add
+                () |> Ok
+            else if System.String.Equals (key, sprintf "--%s" "foo", System.StringComparison.OrdinalIgnoreCase) then
+                match this.Foo with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "foo")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> errors_.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        this.Foo <- value |> (fun x -> System.Int32.Parse x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else if System.String.Equals (key, sprintf "--%s" "baz", System.StringComparison.OrdinalIgnoreCase) then
+                match this.Baz with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "baz")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> errors_.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        this.Baz <- value |> (fun x -> System.Boolean.Parse x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else if System.String.Equals (key, sprintf "--%s" "bar", System.StringComparison.OrdinalIgnoreCase) then
+                match this.Bar with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "bar")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> errors_.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        this.Bar <- value |> (fun x -> x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else
+                Error None
+
+        member this.ProcessKeyValue
+            (argNum_ : int)
+            (errors_ : ResizeArray<string>)
+            (key : string)
+            (value : string)
+            : Result<unit, string option>
+            =
+            match this.ProcessKeyValueSelf_ argNum_ errors_ key value with
+            | Ok () -> Ok ()
+            | Error None -> Error None
+            | Error (Some errorFromLeaf) -> Error (Some errorFromLeaf)
+
+        /// Returns false if we didn't set a value.
+        member this.SetFlagValue_ (errors_ : ResizeArray<string>) (key : string) : bool =
+            if System.String.Equals (key, sprintf "--%s" "baz", System.StringComparison.OrdinalIgnoreCase) then
+                match this.Baz with
+                | Some _ ->
+                    sprintf "Flag '%s' was supplied multiple times" (sprintf "--%s" "baz")
+                    |> errors_.Add
+
+                    true
+                | None ->
+                    this.Baz <- true |> Some
+                    true
+            else
+                false
+
+        /// Compute help text for this parser, optionally noting the given prefix on each argument and indenting each line by this many spaces.
+        static member HelpText_ (prefix : string option) (indent : int) : string = failwith "TODO"
+
+    /// A partially-parsed UsernamePasswordAuth.
+    type internal UsernamePasswordAuth_InProgress =
+        {
+            mutable Password : string option
+            mutable Username : string option
+        }
+
+        /// Freeze this in-progress type. On success, returns the frozen type and the arg (if any) which consumed the input positional args.
+        member this.Assemble_
+            (getEnvironmentVariable : string -> string)
+            (positionals : Choice<string * int, string * int> list)
+            : Result<UsernamePasswordAuth * string option, string list>
+            =
+            let errors = ResizeArray<string> ()
+            let positionalConsumers = ResizeArray<string> ()
+            let outOfPlacePositionals : ResizeArray<string> = ResizeArray ()
+
+            let arg0 : string =
+                match this.Username with
+                | Some result -> result
+                | None ->
+                    errors.Add (sprintf "Required argument '--%s' received no value" "username")
+                    Unchecked.defaultof<_>
+
+            let arg1 : string =
+                match this.Password with
+                | Some result -> result
+                | None ->
+                    errors.Add (sprintf "Required argument '--%s' received no value" "password")
+                    Unchecked.defaultof<_>
+
+            if positionalConsumers.Count <= 1 then
+                if outOfPlacePositionals.Count > 0 then
+                    outOfPlacePositionals
+                    |> String.concat " "
+                    |> (fun x ->
+                        if 0 = outOfPlacePositionals.Count then
+                            "Unmatched args which look like they are meant to be flags. " + x
+                        else
+                            sprintf
+                                "Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `%s=` syntax, or place them after a trailing `--`. %s"
+                                positionalConsumers.[0]
+                                x
+                    )
+                    |> errors.Add
+                else
+                    ()
+
+                if errors.Count = 0 then
+                    Ok (
+                        {
+                            Username = arg0
+                            Password = arg1
+                        },
+                        Seq.tryExactlyOne positionalConsumers
+                    )
+                else
+                    errors |> Seq.toList |> Error
+            else
+                ("Multiple parsers consumed positional args; this is an error in the application, not an error by the user: "
+                 + String.concat ", " positionalConsumers)
+                |> List.singleton
+                |> Error
+
+        static member _Empty () : UsernamePasswordAuth_InProgress =
+            {
+                Password = None
+                Username = None
+            }
+
+        /// Processes the key-value pair, returning Error if no key was matched.
+        /// If the key is an arg which can have arity 1, but throws when consuming that arg, we return Error(<the message>).
+        /// This can nevertheless be a successful parse, e.g. when the key may have arity 0.
+        member this.ProcessKeyValueSelf_
+            (argNum_ : int)
+            (errors_ : ResizeArray<string>)
+            (key : string)
+            (value : string)
+            : Result<unit, string option>
+            =
+            if System.String.Equals (key, sprintf "--%s" "username", System.StringComparison.OrdinalIgnoreCase) then
+                match this.Username with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "username")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> errors_.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        this.Username <- value |> (fun x -> x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else if
+                System.String.Equals (key, sprintf "--%s" "password", System.StringComparison.OrdinalIgnoreCase)
+            then
+                match this.Password with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "password")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> errors_.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        this.Password <- value |> (fun x -> x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else
+                Error None
+
+        member this.ProcessKeyValue
+            (argNum_ : int)
+            (errors_ : ResizeArray<string>)
+            (key : string)
+            (value : string)
+            : Result<unit, string option>
+            =
+            match this.ProcessKeyValueSelf_ argNum_ errors_ key value with
+            | Ok () -> Ok ()
+            | Error None -> Error None
+            | Error (Some errorFromLeaf) -> Error (Some errorFromLeaf)
+
+        /// Returns false if we didn't set a value.
+        member this.SetFlagValue_ (errors_ : ResizeArray<string>) (key : string) : bool = false
+        /// Compute help text for this parser, optionally noting the given prefix on each argument and indenting each line by this many spaces.
+        static member HelpText_ (prefix : string option) (indent : int) : string = failwith "TODO"
+
+    /// A partially-parsed TokenAuth.
+    type internal TokenAuth_InProgress =
+        {
+            mutable Token : string option
+        }
+
+        /// Freeze this in-progress type. On success, returns the frozen type and the arg (if any) which consumed the input positional args.
+        member this.Assemble_
+            (getEnvironmentVariable : string -> string)
+            (positionals : Choice<string * int, string * int> list)
+            : Result<TokenAuth * string option, string list>
+            =
+            let errors = ResizeArray<string> ()
+            let positionalConsumers = ResizeArray<string> ()
+            let outOfPlacePositionals : ResizeArray<string> = ResizeArray ()
+
+            let arg0 : string =
+                match this.Token with
+                | Some result -> result
+                | None ->
+                    errors.Add (sprintf "Required argument '--%s' received no value" "token")
+                    Unchecked.defaultof<_>
+
+            if positionalConsumers.Count <= 1 then
+                if outOfPlacePositionals.Count > 0 then
+                    outOfPlacePositionals
+                    |> String.concat " "
+                    |> (fun x ->
+                        if 0 = outOfPlacePositionals.Count then
+                            "Unmatched args which look like they are meant to be flags. " + x
+                        else
+                            sprintf
+                                "Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `%s=` syntax, or place them after a trailing `--`. %s"
+                                positionalConsumers.[0]
+                                x
+                    )
+                    |> errors.Add
+                else
+                    ()
+
+                if errors.Count = 0 then
+                    Ok (
+                        {
+                            Token = arg0
+                        },
+                        Seq.tryExactlyOne positionalConsumers
+                    )
+                else
+                    errors |> Seq.toList |> Error
+            else
+                ("Multiple parsers consumed positional args; this is an error in the application, not an error by the user: "
+                 + String.concat ", " positionalConsumers)
+                |> List.singleton
+                |> Error
+
+        static member _Empty () : TokenAuth_InProgress =
+            {
+                Token = None
+            }
+
+        /// Processes the key-value pair, returning Error if no key was matched.
+        /// If the key is an arg which can have arity 1, but throws when consuming that arg, we return Error(<the message>).
+        /// This can nevertheless be a successful parse, e.g. when the key may have arity 0.
+        member this.ProcessKeyValueSelf_
+            (argNum_ : int)
+            (errors_ : ResizeArray<string>)
+            (key : string)
+            (value : string)
+            : Result<unit, string option>
+            =
+            if System.String.Equals (key, sprintf "--%s" "token", System.StringComparison.OrdinalIgnoreCase) then
+                match this.Token with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "token")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> errors_.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        this.Token <- value |> (fun x -> x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else
+                Error None
+
+        member this.ProcessKeyValue
+            (argNum_ : int)
+            (errors_ : ResizeArray<string>)
+            (key : string)
+            (value : string)
+            : Result<unit, string option>
+            =
+            match this.ProcessKeyValueSelf_ argNum_ errors_ key value with
+            | Ok () -> Ok ()
+            | Error None -> Error None
+            | Error (Some errorFromLeaf) -> Error (Some errorFromLeaf)
+
+        /// Returns false if we didn't set a value.
+        member this.SetFlagValue_ (errors_ : ResizeArray<string>) (key : string) : bool = false
+        /// Compute help text for this parser, optionally noting the given prefix on each argument and indenting each line by this many spaces.
+        static member HelpText_ (prefix : string option) (indent : int) : string = failwith "TODO"
+
+    /// A partially-parsed AuthOptions.
+    type internal AuthOptions_InProgress =
+        {
+            Token : TokenAuth_InProgress
+            UsernamePassword : UsernamePasswordAuth_InProgress
+        }
+
+        /// Freeze this in-progress type. On success, returns the frozen type and the arg (if any) which consumed the input positional args.
+        member this.Assemble_
+            (getEnvironmentVariable : string -> string)
+            (positionals : Choice<string * int, string * int> list)
+            : Result<AuthOptions * string option, string list>
+            =
+            failwith "TODO"
+
+        static member _Empty () : AuthOptions_InProgress =
+            {
+                Token = TokenAuth_InProgress._Empty ()
+                UsernamePassword = UsernamePasswordAuth_InProgress._Empty ()
+            }
+
+        /// Compute help text for this parser, optionally noting the given prefix on each argument and indenting each line by this many spaces.
+        static member HelpText_ (prefix : string option) (indent : int) : string = failwith "TODO"
+
+    /// A partially-parsed DoTheThing.
+    type internal DoTheThing_InProgress =
+        {
+            mutable Auth : AuthOptions_InProgress
+            mutable Basics : BasicNoPositionals_InProgress
+        }
+
+        /// Freeze this in-progress type. On success, returns the frozen type and the arg (if any) which consumed the input positional args.
+        member this.Assemble_
+            (getEnvironmentVariable : string -> string)
+            (positionals : Choice<string * int, string * int> list)
+            : Result<DoTheThing * string option, string list>
+            =
+            let errors = ResizeArray<string> ()
+            let positionalConsumers = ResizeArray<string> ()
+            let outOfPlacePositionals : ResizeArray<string> = ResizeArray ()
+
+            let arg0 : BasicNoPositionals =
+                match this.Basics.Assemble_ getEnvironmentVariable positionals with
+                | Ok (result, consumedPositional) ->
+                    match consumedPositional with
+                    | None -> ()
+                    | Some positionalConsumer -> positionalConsumers.Add positionalConsumer
+
+                    result
+                | Error err ->
+                    errors.AddRange err
+                    Unchecked.defaultof<_>
+
+            let arg1 : AuthOptions =
+                match this.Auth.Assemble_ getEnvironmentVariable positionals with
+                | Ok (result, consumedPositional) ->
+                    match consumedPositional with
+                    | None -> ()
+                    | Some positionalConsumer -> positionalConsumers.Add positionalConsumer
+
+                    result
+                | Error err ->
+                    errors.AddRange err
+                    Unchecked.defaultof<_>
+
+            if positionalConsumers.Count <= 1 then
+                if outOfPlacePositionals.Count > 0 then
+                    outOfPlacePositionals
+                    |> String.concat " "
+                    |> (fun x ->
+                        if 0 = outOfPlacePositionals.Count then
+                            "Unmatched args which look like they are meant to be flags. " + x
+                        else
+                            sprintf
+                                "Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `%s=` syntax, or place them after a trailing `--`. %s"
+                                positionalConsumers.[0]
+                                x
+                    )
+                    |> errors.Add
+                else
+                    ()
+
+                if errors.Count = 0 then
+                    Ok (
+                        {
+                            Basics = arg0
+                            Auth = arg1
+                        },
+                        Seq.tryExactlyOne positionalConsumers
+                    )
+                else
+                    errors |> Seq.toList |> Error
+            else
+                ("Multiple parsers consumed positional args; this is an error in the application, not an error by the user: "
+                 + String.concat ", " positionalConsumers)
+                |> List.singleton
+                |> Error
+
+        static member _Empty () : DoTheThing_InProgress =
+            {
+                Basics = BasicNoPositionals_InProgress._Empty ()
+                Auth = AuthOptions_InProgress._Empty ()
+            }
+
+        /// Passes the key-value pair to any child records, returning Error if no key was matched.
+        /// If the key is an arg which can have arity 1, but throws when consuming that arg, we return Error(<the message>).
+        /// This can nevertheless be a successful parse, e.g. when the key may have arity 0.
+        member this.ProcessKeyValueRecord_
+            (argNum_ : int)
+            (errors_ : ResizeArray<string>)
+            (key : string)
+            (value : string)
+            : Result<unit, string option>
+            =
+            let errors : ResizeArray<string> = ResizeArray ()
+
+            match this.Basics.ProcessKeyValue argNum_ errors_ key value with
+            | Ok () -> Ok ()
+            | Error e -> Error None
+
+        member this.ProcessKeyValue
+            (argNum_ : int)
+            (errors_ : ResizeArray<string>)
+            (key : string)
+            (value : string)
+            : Result<unit, string option>
+            =
+            match this.ProcessKeyValueRecord_ argNum_ errors_ key value with
+            | Ok () -> Ok ()
+            | Error errorFromRecord -> Error errorFromRecord
+
+        /// Returns false if we didn't set a value.
+        member this.SetFlagValue_ (errors_ : ResizeArray<string>) (key : string) : bool = false
+        /// Compute help text for this parser, optionally noting the given prefix on each argument and indenting each line by this many spaces.
+        static member HelpText_ (prefix : string option) (indent : int) : string = failwith "TODO"
+namespace ConsumePlugin.ArgsWithUnions
+
+open ArgParserHelpers
+open System
+open System.IO
+open WoofWare.Myriad.Plugins
+
+/// Methods to parse arguments for the type DoTheThing
+[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module DoTheThing =
+    type internal ParseState_DoTheThing =
+        /// Ready to consume a key or positional arg
+        | AwaitingKey
+        /// Waiting to receive a value for the key we've already consumed
+        | AwaitingValue of key : string
+
+    let parse' (getEnvironmentVariable : string -> string) (args : string list) : DoTheThing =
+        let inProgress =
+            ArgParseHelpers_ConsumePlugin_ArgsWithUnions.DoTheThing_InProgress._Empty ()
+
+        let positionals : ResizeArray<Choice<string * int, string * int>> = ResizeArray ()
+        let errors_ = ResizeArray ()
+
+        let rec go (argNum_ : int) (state : ParseState_DoTheThing) (args : string list) =
+            match args with
+            | [] ->
+                match state with
+                | ParseState_DoTheThing.AwaitingKey -> ()
+                | ParseState_DoTheThing.AwaitingValue key ->
+                    if inProgress.SetFlagValue_ errors_ key then
+                        ()
+                    else
+                        sprintf
+                            "Trailing argument %s had no value. Use a double-dash to separate positional args from key-value args."
+                            key
+                        |> errors_.Add
+            | "--" :: rest -> positionals.AddRange (rest |> Seq.map (fun x -> (x, argNum_ + 1)) |> Seq.map Choice2Of2)
+            | arg :: args ->
+                match state with
+                | ParseState_DoTheThing.AwaitingKey ->
+                    if arg.StartsWith ("--", System.StringComparison.Ordinal) then
+                        if arg = "--help" then
+                            "TODO" |> failwithf "Help text requested.\n%s"
+                        else
+                            let equals = arg.IndexOf (char 61)
+
+                            if equals < 0 then
+                                go (argNum_ + 1) (ParseState_DoTheThing.AwaitingValue arg) args
+                            else
+                                let key = arg.[0 .. equals - 1]
+                                let value = arg.[equals + 1 ..]
+
+                                match inProgress.ProcessKeyValue argNum_ errors_ key value with
+                                | Ok () -> go (argNum_ + 1) ParseState_DoTheThing.AwaitingKey args
+                                | Error x ->
+                                    match x with
+                                    | None ->
+                                        positionals.Add (Choice1Of2 (arg, argNum_))
+                                        go (argNum_ + 1) ParseState_DoTheThing.AwaitingKey args
+                                    | Some msg ->
+                                        sprintf "%s (at arg %s)" msg arg |> errors_.Add
+                                        go (argNum_ + 1) ParseState_DoTheThing.AwaitingKey args
+                    else
+                        (arg, argNum_) |> Choice1Of2 |> positionals.Add
+                        go (argNum_ + 1) ParseState_DoTheThing.AwaitingKey args
+                | ParseState_DoTheThing.AwaitingValue key ->
+                    match inProgress.ProcessKeyValue argNum_ errors_ key arg with
+                    | Ok () -> go argNum_ ParseState_DoTheThing.AwaitingKey args
+                    | Error exc ->
+                        if inProgress.SetFlagValue_ errors_ key then
+                            go argNum_ ParseState_DoTheThing.AwaitingKey (arg :: args)
+                        else
+                            (key, argNum_) |> Choice1Of2 |> positionals.Add
+                            go (argNum_ + 1) ParseState_DoTheThing.AwaitingKey (arg :: args)
+
+        go 0 ParseState_DoTheThing.AwaitingKey args
+
+        if 0 = errors_.Count then
+            ()
+        else
+            errors_
+            |> String.concat System.Environment.NewLine
+            |> (fun x -> "Errors during parse!\n" + x)
+            |> failwith
+
+        match inProgress.Assemble_ getEnvironmentVariable (positionals |> Seq.toList) with
+        | Ok (result, posConsumer) ->
+            if positionals.Count > 0 && posConsumer.IsNone then
+                positionals
+                |> Seq.map (fun choiceValue ->
+                    match choiceValue with
+                    | Choice1Of2 (arg, _) -> arg
+                    | Choice2Of2 (arg, _) -> arg
+                )
+                |> String.concat " "
+                |> sprintf "Parse error: The following arguments were not consumed: %s"
+                |> failwith
+            else
+                result
+        | Error e ->
+            e
+            |> String.concat System.Environment.NewLine
+            |> (fun x -> "Errors during parse!\n" + x)
+            |> failwith
+
+    let parse (args : string list) : DoTheThing =
+        parse' System.Environment.GetEnvironmentVariable args

ConsumePlugin/GeneratedCapturingMock.fs

@@ -1,562 +0,0 @@
-//------------------------------------------------------------------------------
-//        This code was generated by myriad.
-//        Changes to this file will be lost when the code is regenerated.
-//------------------------------------------------------------------------------
-
-
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module internal PublicTypeMockCalls =
-    /// All the calls made to a PublicTypeMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-            Mem3 : ResizeArray<int * System.Threading.CancellationToken option>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-                Mem3 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal PublicTypeMock =
-    {
-        Calls : PublicTypeMockCalls.Calls
-        Mem1 : string * int -> string list
-        Mem2 : string -> int
-        Mem3 : int * System.Threading.CancellationToken option -> string
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : PublicTypeMock =
-        {
-            Calls = PublicTypeMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem3"))
-        }
-
-    interface IPublicType with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-
-        member this.Mem3 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem3 (fun _ -> this.Calls.Mem3.Add (arg_0_0, arg_0_1))
-            this.Mem3 (arg_0_0, arg_0_1)
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module public PublicTypeInternalFalseMockCalls =
-    /// All the calls made to a PublicTypeInternalFalseMock mock
-    type public Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-            Mem3 : ResizeArray<int * System.Threading.CancellationToken option>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-                Mem3 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type public PublicTypeInternalFalseMock =
-    {
-        Calls : PublicTypeInternalFalseMockCalls.Calls
-        Mem1 : string * int -> string list
-        Mem2 : string -> int
-        Mem3 : int * System.Threading.CancellationToken option -> string
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : PublicTypeInternalFalseMock =
-        {
-            Calls = PublicTypeInternalFalseMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem3"))
-        }
-
-    interface IPublicTypeInternalFalse with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-
-        member this.Mem3 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem3 (fun _ -> this.Calls.Mem3.Add (arg_0_0, arg_0_1))
-            this.Mem3 (arg_0_0, arg_0_1)
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module internal InternalTypeMockCalls =
-    /// All the calls made to a InternalTypeMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal InternalTypeMock =
-    {
-        Calls : InternalTypeMockCalls.Calls
-        Mem1 : string * int -> unit
-        Mem2 : string -> int
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : InternalTypeMock =
-        {
-            Calls = InternalTypeMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-        }
-
-    interface InternalType with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module internal PrivateTypeMockCalls =
-    /// All the calls made to a PrivateTypeMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type private PrivateTypeMock =
-    {
-        Calls : PrivateTypeMockCalls.Calls
-        Mem1 : string * int -> unit
-        Mem2 : string -> int
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : PrivateTypeMock =
-        {
-            Calls = PrivateTypeMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-        }
-
-    interface PrivateType with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module internal PrivateTypeInternalFalseMockCalls =
-    /// All the calls made to a PrivateTypeInternalFalseMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type private PrivateTypeInternalFalseMock =
-    {
-        Calls : PrivateTypeInternalFalseMockCalls.Calls
-        Mem1 : string * int -> unit
-        Mem2 : string -> int
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : PrivateTypeInternalFalseMock =
-        {
-            Calls = PrivateTypeInternalFalseMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-        }
-
-    interface PrivateTypeInternalFalse with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module internal VeryPublicTypeMockCalls =
-    /// All the calls made to a VeryPublicTypeMock mock
-    type internal Calls<'a, 'b> =
-        {
-            Mem1 : ResizeArray<'a>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls<'a, 'b> =
-            {
-                Mem1 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal VeryPublicTypeMock<'a, 'b> =
-    {
-        Calls : VeryPublicTypeMockCalls.Calls<'a, 'b>
-        Mem1 : 'a -> 'b
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : VeryPublicTypeMock<'a, 'b> =
-        {
-            Calls = VeryPublicTypeMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-        }
-
-    interface VeryPublicType<'a, 'b> with
-        member this.Mem1 arg_0_0 =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0))
-            this.Mem1 (arg_0_0)
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module internal CurriedMockCalls =
-    /// A single call to the Mem1 method
-    type internal Mem1Call<'a> =
-        {
-            bar : int
-            Arg1 : 'a
-        }
-
-    /// A single call to the Mem2 method
-    type internal Mem2Call<'a> =
-        {
-            Arg0 : int * string
-            baz : 'a
-        }
-
-    /// A single call to the Mem3 method
-    type internal Mem3Call<'a> =
-        {
-            quux : (int * string)
-            flurb : 'a
-        }
-
-    /// A single call to the Mem4 method
-    type internal Mem4Call<'a> =
-        {
-            Arg0 : int * string
-            Arg1 : 'a * int
-        }
-
-    /// A single call to the Mem5 method
-    type internal Mem5Call<'a> =
-        {
-            Arg0 : int * string
-            Arg1 : 'a * int
-        }
-
-    /// A single call to the Mem6 method
-    type internal Mem6Call<'a> =
-        {
-            Arg0 : int * string
-            Arg1 : 'a * int
-        }
-
-    /// All the calls made to a CurriedMock mock
-    type internal Calls<'a> =
-        {
-            Mem1 : ResizeArray<Mem1Call<'a>>
-            Mem2 : ResizeArray<Mem2Call<'a>>
-            Mem3 : ResizeArray<Mem3Call<'a>>
-            Mem4 : ResizeArray<Mem4Call<'a>>
-            Mem5 : ResizeArray<Mem5Call<'a>>
-            Mem6 : ResizeArray<Mem6Call<'a>>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls<'a> =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-                Mem3 = ResizeArray ()
-                Mem4 = ResizeArray ()
-                Mem5 = ResizeArray ()
-                Mem6 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal CurriedMock<'a> =
-    {
-        Calls : CurriedMockCalls.Calls<'a>
-        Mem1 : int -> 'a -> string
-        Mem2 : int * string -> 'a -> string
-        Mem3 : (int * string) -> 'a -> string
-        Mem4 : (int * string) -> ('a * int) -> string
-        Mem5 : int * string -> ('a * int) -> string
-        Mem6 : int * string -> 'a * int -> string
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : CurriedMock<'a> =
-        {
-            Calls = CurriedMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem3"))
-            Mem4 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem4"))
-            Mem5 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem5"))
-            Mem6 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem6"))
-        }
-
-    interface Curried<'a> with
-        member this.Mem1 arg_0_0 arg_1_0 =
-            lock
-                this.Calls.Mem1
-                (fun _ ->
-                    this.Calls.Mem1.Add
-                        {
-                            bar = arg_0_0
-                            Arg1 = arg_1_0
-                        }
-                )
-
-            this.Mem1 (arg_0_0) (arg_1_0)
-
-        member this.Mem2 (arg_0_0, arg_0_1) arg_1_0 =
-            lock
-                this.Calls.Mem2
-                (fun _ ->
-                    this.Calls.Mem2.Add
-                        {
-                            Arg0 = arg_0_0, arg_0_1
-                            baz = arg_1_0
-                        }
-                )
-
-            this.Mem2 (arg_0_0, arg_0_1) (arg_1_0)
-
-        member this.Mem3 arg_0_0 arg_1_0 =
-            lock
-                this.Calls.Mem3
-                (fun _ ->
-                    this.Calls.Mem3.Add
-                        {
-                            quux = arg_0_0
-                            flurb = arg_1_0
-                        }
-                )
-
-            this.Mem3 (arg_0_0) (arg_1_0)
-
-        member this.Mem4 ((arg_0_0, arg_0_1)) ((arg_1_0, arg_1_1)) =
-            lock
-                this.Calls.Mem4
-                (fun _ ->
-                    this.Calls.Mem4.Add
-                        {
-                            Arg0 = arg_0_0, arg_0_1
-                            Arg1 = arg_1_0, arg_1_1
-                        }
-                )
-
-            this.Mem4 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1)
-
-        member this.Mem5 (arg_0_0, arg_0_1) ((arg_1_0, arg_1_1)) =
-            lock
-                this.Calls.Mem5
-                (fun _ ->
-                    this.Calls.Mem5.Add
-                        {
-                            Arg0 = arg_0_0, arg_0_1
-                            Arg1 = arg_1_0, arg_1_1
-                        }
-                )
-
-            this.Mem5 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1)
-
-        member this.Mem6 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1) =
-            lock
-                this.Calls.Mem6
-                (fun _ ->
-                    this.Calls.Mem6.Add
-                        {
-                            Arg0 = arg_0_0, arg_0_1
-                            Arg1 = arg_1_0, arg_1_1
-                        }
-                )
-
-            this.Mem6 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1)
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module internal TypeWithInterfaceMockCalls =
-    /// All the calls made to a TypeWithInterfaceMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string option>
-            Mem2 : ResizeArray<unit>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal TypeWithInterfaceMock =
-    {
-        Calls : TypeWithInterfaceMockCalls.Calls
-        /// Implementation of IDisposable.Dispose
-        Dispose : unit -> unit
-        Mem1 : string option -> string[] Async
-        Mem2 : unit -> string[] Async
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : TypeWithInterfaceMock =
-        {
-            Calls = TypeWithInterfaceMockCalls.Calls.Empty ()
-            Dispose = (fun () -> ())
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-        }
-
-    interface TypeWithInterface with
-        member this.Mem1 arg_0_0 =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0))
-            this.Mem1 (arg_0_0)
-
-        member this.Mem2 () =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (()))
-            this.Mem2 (())
-
-    interface System.IDisposable with
-        member this.Dispose () : unit = this.Dispose ()
-namespace SomeNamespace.CapturingMock
-
-open System
-open WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module internal TypeWithPropertiesMockCalls =
-    /// All the calls made to a TypeWithPropertiesMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string option>
-            Prop1 : ResizeArray<unit>
-            Prop2 : ResizeArray<unit>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Prop1 = ResizeArray ()
-                Prop2 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal TypeWithPropertiesMock =
-    {
-        Calls : TypeWithPropertiesMockCalls.Calls
-        /// Implementation of IDisposable.Dispose
-        Dispose : unit -> unit
-        Mem1 : string option -> string[] Async
-        Prop1 : unit -> int
-        Prop2 : unit -> unit Async
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : TypeWithPropertiesMock =
-        {
-            Calls = TypeWithPropertiesMockCalls.Calls.Empty ()
-            Dispose = (fun () -> ())
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Prop1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Prop1"))
-            Prop2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Prop2"))
-        }
-
-    interface TypeWithProperties with
-        member this.Mem1 arg_0_0 =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0))
-            this.Mem1 (arg_0_0)
-
-        member this.Prop1 = this.Prop1 ()
-        member this.Prop2 = this.Prop2 ()
-
-    interface System.IDisposable with
-        member this.Dispose () : unit = this.Dispose ()

ConsumePlugin/GeneratedCapturingMockNoAttributes.fs

@@ -1,500 +0,0 @@
-//------------------------------------------------------------------------------
-//        This code was generated by myriad.
-//        Changes to this file will be lost when the code is regenerated.
-//------------------------------------------------------------------------------
-
-
-namespace SomeNamespace.CapturingMock
-
-open System
-
-[<RequireQualifiedAccess>]
-module internal PublicTypeNoAttrMockCalls =
-    /// All the calls made to a PublicTypeNoAttrMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-            Mem3 : ResizeArray<int * System.Threading.CancellationToken option>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-                Mem3 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal PublicTypeNoAttrMock =
-    {
-        Calls : PublicTypeNoAttrMockCalls.Calls
-        Mem1 : string * int -> string list
-        Mem2 : string -> int
-        Mem3 : int * System.Threading.CancellationToken option -> string
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : PublicTypeNoAttrMock =
-        {
-            Calls = PublicTypeNoAttrMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem3"))
-        }
-
-    interface IPublicTypeNoAttr with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-
-        member this.Mem3 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem3 (fun _ -> this.Calls.Mem3.Add (arg_0_0, arg_0_1))
-            this.Mem3 (arg_0_0, arg_0_1)
-namespace SomeNamespace.CapturingMock
-
-open System
-
-[<RequireQualifiedAccess>]
-module public PublicTypeInternalFalseNoAttrMockCalls =
-    /// All the calls made to a PublicTypeInternalFalseNoAttrMock mock
-    type public Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-            Mem3 : ResizeArray<int * System.Threading.CancellationToken option>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-                Mem3 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type public PublicTypeInternalFalseNoAttrMock =
-    {
-        Calls : PublicTypeInternalFalseNoAttrMockCalls.Calls
-        Mem1 : string * int -> string list
-        Mem2 : string -> int
-        Mem3 : int * System.Threading.CancellationToken option -> string
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : PublicTypeInternalFalseNoAttrMock =
-        {
-            Calls = PublicTypeInternalFalseNoAttrMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem3"))
-        }
-
-    interface IPublicTypeInternalFalseNoAttr with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-
-        member this.Mem3 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem3 (fun _ -> this.Calls.Mem3.Add (arg_0_0, arg_0_1))
-            this.Mem3 (arg_0_0, arg_0_1)
-namespace SomeNamespace.CapturingMock
-
-open System
-
-[<RequireQualifiedAccess>]
-module internal InternalTypeNoAttrMockCalls =
-    /// All the calls made to a InternalTypeNoAttrMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal InternalTypeNoAttrMock =
-    {
-        Calls : InternalTypeNoAttrMockCalls.Calls
-        Mem1 : string * int -> unit
-        Mem2 : string -> int
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : InternalTypeNoAttrMock =
-        {
-            Calls = InternalTypeNoAttrMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-        }
-
-    interface InternalTypeNoAttr with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-namespace SomeNamespace.CapturingMock
-
-open System
-
-[<RequireQualifiedAccess>]
-module internal PrivateTypeNoAttrMockCalls =
-    /// All the calls made to a PrivateTypeNoAttrMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type private PrivateTypeNoAttrMock =
-    {
-        Calls : PrivateTypeNoAttrMockCalls.Calls
-        Mem1 : string * int -> unit
-        Mem2 : string -> int
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : PrivateTypeNoAttrMock =
-        {
-            Calls = PrivateTypeNoAttrMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-        }
-
-    interface PrivateTypeNoAttr with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-namespace SomeNamespace.CapturingMock
-
-open System
-
-[<RequireQualifiedAccess>]
-module internal PrivateTypeInternalFalseNoAttrMockCalls =
-    /// All the calls made to a PrivateTypeInternalFalseNoAttrMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string * int>
-            Mem2 : ResizeArray<string>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type private PrivateTypeInternalFalseNoAttrMock =
-    {
-        Calls : PrivateTypeInternalFalseNoAttrMockCalls.Calls
-        Mem1 : string * int -> unit
-        Mem2 : string -> int
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : PrivateTypeInternalFalseNoAttrMock =
-        {
-            Calls = PrivateTypeInternalFalseNoAttrMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-        }
-
-    interface PrivateTypeInternalFalseNoAttr with
-        member this.Mem1 (arg_0_0, arg_0_1) =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0, arg_0_1))
-            this.Mem1 (arg_0_0, arg_0_1)
-
-        member this.Mem2 arg_0_0 =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (arg_0_0))
-            this.Mem2 (arg_0_0)
-namespace SomeNamespace.CapturingMock
-
-open System
-
-[<RequireQualifiedAccess>]
-module internal VeryPublicTypeNoAttrMockCalls =
-    /// All the calls made to a VeryPublicTypeNoAttrMock mock
-    type internal Calls<'a, 'b> =
-        {
-            Mem1 : ResizeArray<'a>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls<'a, 'b> =
-            {
-                Mem1 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal VeryPublicTypeNoAttrMock<'a, 'b> =
-    {
-        Calls : VeryPublicTypeNoAttrMockCalls.Calls<'a, 'b>
-        Mem1 : 'a -> 'b
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : VeryPublicTypeNoAttrMock<'a, 'b> =
-        {
-            Calls = VeryPublicTypeNoAttrMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-        }
-
-    interface VeryPublicTypeNoAttr<'a, 'b> with
-        member this.Mem1 arg_0_0 =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0))
-            this.Mem1 (arg_0_0)
-namespace SomeNamespace.CapturingMock
-
-open System
-
-[<RequireQualifiedAccess>]
-module internal CurriedNoAttrMockCalls =
-    /// A single call to the Mem1 method
-    type internal Mem1Call<'a> =
-        {
-            Arg0 : int
-            Arg1 : 'a
-        }
-
-    /// A single call to the Mem2 method
-    type internal Mem2Call<'a> =
-        {
-            Arg0 : int * string
-            Arg1 : 'a
-        }
-
-    /// A single call to the Mem3 method
-    type internal Mem3Call<'a> =
-        {
-            Arg0 : int * string
-            Arg1 : 'a
-        }
-
-    /// A single call to the Mem4 method
-    type internal Mem4Call<'a> =
-        {
-            Arg0 : int * string
-            Arg1 : 'a * int
-        }
-
-    /// A single call to the Mem5 method
-    type internal Mem5Call<'a> =
-        {
-            Arg0 : int * string
-            Arg1 : 'a * int
-        }
-
-    /// A single call to the Mem6 method
-    type internal Mem6Call<'a> =
-        {
-            Arg0 : int * string
-            Arg1 : 'a * int
-        }
-
-    /// All the calls made to a CurriedNoAttrMock mock
-    type internal Calls<'a> =
-        {
-            Mem1 : ResizeArray<Mem1Call<'a>>
-            Mem2 : ResizeArray<Mem2Call<'a>>
-            Mem3 : ResizeArray<Mem3Call<'a>>
-            Mem4 : ResizeArray<Mem4Call<'a>>
-            Mem5 : ResizeArray<Mem5Call<'a>>
-            Mem6 : ResizeArray<Mem6Call<'a>>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls<'a> =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-                Mem3 = ResizeArray ()
-                Mem4 = ResizeArray ()
-                Mem5 = ResizeArray ()
-                Mem6 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal CurriedNoAttrMock<'a> =
-    {
-        Calls : CurriedNoAttrMockCalls.Calls<'a>
-        Mem1 : int -> 'a -> string
-        Mem2 : int * string -> 'a -> string
-        Mem3 : (int * string) -> 'a -> string
-        Mem4 : (int * string) -> ('a * int) -> string
-        Mem5 : int * string -> ('a * int) -> string
-        Mem6 : int * string -> 'a * int -> string
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : CurriedNoAttrMock<'a> =
-        {
-            Calls = CurriedNoAttrMockCalls.Calls.Empty ()
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem3"))
-            Mem4 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem4"))
-            Mem5 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem5"))
-            Mem6 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem6"))
-        }
-
-    interface CurriedNoAttr<'a> with
-        member this.Mem1 arg_0_0 arg_1_0 =
-            lock
-                this.Calls.Mem1
-                (fun _ ->
-                    this.Calls.Mem1.Add
-                        {
-                            Arg0 = arg_0_0
-                            Arg1 = arg_1_0
-                        }
-                )
-
-            this.Mem1 (arg_0_0) (arg_1_0)
-
-        member this.Mem2 (arg_0_0, arg_0_1) arg_1_0 =
-            lock
-                this.Calls.Mem2
-                (fun _ ->
-                    this.Calls.Mem2.Add
-                        {
-                            Arg0 = arg_0_0, arg_0_1
-                            Arg1 = arg_1_0
-                        }
-                )
-
-            this.Mem2 (arg_0_0, arg_0_1) (arg_1_0)
-
-        member this.Mem3 ((arg_0_0, arg_0_1)) arg_1_0 =
-            lock
-                this.Calls.Mem3
-                (fun _ ->
-                    this.Calls.Mem3.Add
-                        {
-                            Arg0 = arg_0_0, arg_0_1
-                            Arg1 = arg_1_0
-                        }
-                )
-
-            this.Mem3 (arg_0_0, arg_0_1) (arg_1_0)
-
-        member this.Mem4 ((arg_0_0, arg_0_1)) ((arg_1_0, arg_1_1)) =
-            lock
-                this.Calls.Mem4
-                (fun _ ->
-                    this.Calls.Mem4.Add
-                        {
-                            Arg0 = arg_0_0, arg_0_1
-                            Arg1 = arg_1_0, arg_1_1
-                        }
-                )
-
-            this.Mem4 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1)
-
-        member this.Mem5 (arg_0_0, arg_0_1) ((arg_1_0, arg_1_1)) =
-            lock
-                this.Calls.Mem5
-                (fun _ ->
-                    this.Calls.Mem5.Add
-                        {
-                            Arg0 = arg_0_0, arg_0_1
-                            Arg1 = arg_1_0, arg_1_1
-                        }
-                )
-
-            this.Mem5 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1)
-
-        member this.Mem6 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1) =
-            lock
-                this.Calls.Mem6
-                (fun _ ->
-                    this.Calls.Mem6.Add
-                        {
-                            Arg0 = arg_0_0, arg_0_1
-                            Arg1 = arg_1_0, arg_1_1
-                        }
-                )
-
-            this.Mem6 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1)
-namespace SomeNamespace.CapturingMock
-
-open System
-
-[<RequireQualifiedAccess>]
-module internal TypeWithInterfaceNoAttrMockCalls =
-    /// All the calls made to a TypeWithInterfaceNoAttrMock mock
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<string option>
-            Mem2 : ResizeArray<unit>
-        }
-
-        /// A fresh calls object which has not yet had any calls made.
-        static member Empty () : Calls =
-            {
-                Mem1 = ResizeArray ()
-                Mem2 = ResizeArray ()
-            }
-
-/// Mock record type for an interface
-type internal TypeWithInterfaceNoAttrMock =
-    {
-        Calls : TypeWithInterfaceNoAttrMockCalls.Calls
-        /// Implementation of IDisposable.Dispose
-        Dispose : unit -> unit
-        Mem1 : string option -> string[] Async
-        Mem2 : unit -> string[] Async
-    }
-
-    /// An implementation where every non-unit method throws.
-    static member Empty () : TypeWithInterfaceNoAttrMock =
-        {
-            Calls = TypeWithInterfaceNoAttrMockCalls.Calls.Empty ()
-            Dispose = (fun () -> ())
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
-        }
-
-    interface TypeWithInterfaceNoAttr with
-        member this.Mem1 arg_0_0 =
-            lock this.Calls.Mem1 (fun _ -> this.Calls.Mem1.Add (arg_0_0))
-            this.Mem1 (arg_0_0)
-
-        member this.Mem2 () =
-            lock this.Calls.Mem2 (fun _ -> this.Calls.Mem2.Add (()))
-            this.Mem2 (())
-
-    interface System.IDisposable with
-        member this.Dispose () : unit = this.Dispose ()

ConsumePlugin/GeneratedCatamorphism.fs

@@ -7,7 +7,6 @@
 
 
 
-
 namespace ConsumePlugin
 
 open WoofWare.Myriad.Plugins

ConsumePlugin/GeneratedFileSystem.fs

@@ -7,7 +7,6 @@
 
 
 
-
 namespace ConsumePlugin
 
 open WoofWare.Myriad.Plugins

ConsumePlugin/GeneratedJson.fs

@@ -4,7 +4,6 @@
 //------------------------------------------------------------------------------
 
 
-
 namespace ConsumePlugin
 
 open System.Text.Json.Serialization
@@ -15,24 +14,7 @@ module internal InternalTypeNotExtensionSerial =
     /// Serialize to a JSON node
     let toJsonNode (input : InternalTypeNotExtensionSerial) : System.Text.Json.Nodes.JsonNode =
         let node = System.Text.Json.Nodes.JsonObject ()
-
-        do
-            node.Add (
-                (Literals.something),
-                (input.InternalThing2
-                 |> (fun field ->
-                     let field = System.Text.Json.Nodes.JsonValue.Create<string> field
-
-                     (match field with
-                      | null ->
-                          raise (
-                              System.ArgumentNullException
-                                  "Expected type string to be non-null, but received a null value when serialising"
-                          )
-                      | field -> field)
-                 ))
-            )
-
+        do node.Add ((Literals.something), (input.InternalThing2 |> System.Text.Json.Nodes.JsonValue.Create<string>))
         node :> _
 namespace ConsumePlugin
 
@@ -47,24 +29,7 @@ module internal InternalTypeExtensionJsonSerializeExtension =
         /// Serialize to a JSON node
         static member toJsonNode (input : InternalTypeExtension) : System.Text.Json.Nodes.JsonNode =
             let node = System.Text.Json.Nodes.JsonObject ()
-
-            do
-                node.Add (
-                    (Literals.something),
-                    (input.ExternalThing
-                     |> (fun field ->
-                         let field = System.Text.Json.Nodes.JsonValue.Create<string> field
-
-                         (match field with
-                          | null ->
-                              raise (
-                                  System.ArgumentNullException
-                                      "Expected type string to be non-null, but received a null value when serialising"
-                              )
-                          | field -> field)
-                     ))
-                )
-
+            do node.Add ((Literals.something), (input.ExternalThing |> System.Text.Json.Nodes.JsonValue.Create<string>))
             node :> _
 
 namespace ConsumePlugin
@@ -75,14 +40,16 @@ module InnerType =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : InnerType =
         let arg_0 =
-            match node.[(Literals.something)] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ((Literals.something))
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.[(Literals.something)] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ((Literals.something))
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         {
             Thing = arg_0
@@ -95,97 +62,79 @@ module JsonRecordType =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JsonRecordType =
         let arg_5 =
-            match node.["f"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("f")
-                    )
-                )
-            | Some node ->
-                node.AsArray ()
-                |> Seq.map (fun elt ->
-                    (match elt with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected element of array (element type int32) to be non-null, but found a null element"
-                         )
-                     | elt -> elt.AsValue().GetValue<System.Int32> ())
-                )
-                |> Array.ofSeq
+            (match node.["f"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("f")
+                     )
+                 )
+             | v -> v)
+                .AsArray ()
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.Int32> ())
+            |> Array.ofSeq
 
         let arg_4 =
-            match node.["e"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("e")
-                    )
-                )
-            | Some node ->
-                node.AsArray ()
-                |> Seq.map (fun elt ->
-                    (match elt with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected element of array (element type string) to be non-null, but found a null element"
-                         )
-                     | elt -> elt.AsValue().GetValue<System.String> ())
-                )
-                |> Array.ofSeq
+            (match node.["e"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("e")
+                     )
+                 )
+             | v -> v)
+                .AsArray ()
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.String> ())
+            |> Array.ofSeq
 
         let arg_3 =
-            match node.["d"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("d")
+            InnerType.jsonParse (
+                match node.["d"] with
+                | null ->
+                    raise (
+                        System.Collections.Generic.KeyNotFoundException (
+                            sprintf "Required key '%s' not found on JSON object" ("d")
+                        )
                     )
-                )
-            | Some node -> InnerType.jsonParse node
+                | v -> v
+            )
 
         let arg_2 =
-            match node.["hi"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("hi")
-                    )
-                )
-            | Some node ->
-                node.AsArray ()
-                |> Seq.map (fun elt ->
-                    (match elt with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected element of array (element type int32) to be non-null, but found a null element"
-                         )
-                     | elt -> elt.AsValue().GetValue<System.Int32> ())
-                )
-                |> List.ofSeq
+            (match node.["hi"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("hi")
+                     )
+                 )
+             | v -> v)
+                .AsArray ()
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.Int32> ())
+            |> List.ofSeq
 
         let arg_1 =
-            match node.["another-thing"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("another-thing")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.["another-thing"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("another-thing")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         let arg_0 =
-            match node.["a"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("a")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.Int32> ()
+            (match node.["a"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("a")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.Int32> ()
 
         {
             A = arg_0
@@ -203,14 +152,16 @@ module internal InternalTypeNotExtension =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : InternalTypeNotExtension =
         let arg_0 =
-            match node.[(Literals.something)] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ((Literals.something))
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.[(Literals.something)] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ((Literals.something))
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         {
             InternalThing = arg_0
@@ -226,14 +177,16 @@ module internal InternalTypeExtensionJsonParseExtension =
         /// Parse from a JSON node.
         static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : InternalTypeExtension =
             let arg_0 =
-                match node.[(Literals.something)] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ((Literals.something))
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.String> ()
+                (match node.[(Literals.something)] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ((Literals.something))
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.String> ()
 
             {
                 ExternalThing = arg_0
@@ -248,215 +201,248 @@ module ToGetExtensionMethodJsonParseExtension =
 
         /// Parse from a JSON node.
         static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : ToGetExtensionMethod =
-            let arg_20 =
-                match node.["whiskey"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("whiskey")
-                        )
-                    )
-                | Some node -> System.Numerics.BigInteger.Parse (node.ToJsonString ())
+            let arg_20 = System.Numerics.BigInteger.Parse (node.["whiskey"].ToJsonString ())
 
             let arg_19 =
-                match node.["victor"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("victor")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Char> ()
+                (match node.["victor"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("victor")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Char> ()
 
             let arg_18 =
-                match node.["uniform"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("uniform")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Decimal> ()
+                (match node.["uniform"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("uniform")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Decimal> ()
 
             let arg_17 =
-                match node.["tango"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("tango")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.SByte> ()
+                (match node.["tango"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("tango")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.SByte> ()
 
             let arg_16 =
-                match node.["quebec"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("quebec")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Byte> ()
+                (match node.["quebec"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("quebec")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Byte> ()
 
             let arg_15 =
-                match node.["papa"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("papa")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Byte> ()
+                (match node.["papa"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("papa")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Byte> ()
 
             let arg_14 =
-                match node.["oscar"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("oscar")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.SByte> ()
+                (match node.["oscar"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("oscar")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.SByte> ()
 
             let arg_13 =
-                match node.["november"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("november")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.UInt16> ()
+                (match node.["november"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("november")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.UInt16> ()
 
             let arg_12 =
-                match node.["mike"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("mike")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Int16> ()
+                (match node.["mike"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("mike")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Int16> ()
 
             let arg_11 =
-                match node.["lima"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("lima")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.UInt32> ()
+                (match node.["lima"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("lima")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.UInt32> ()
 
             let arg_10 =
-                match node.["kilo"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("kilo")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Int32> ()
+                (match node.["kilo"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("kilo")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Int32> ()
 
             let arg_9 =
-                match node.["juliette"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("juliette")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.UInt32> ()
+                (match node.["juliette"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("juliette")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.UInt32> ()
 
             let arg_8 =
-                match node.["india"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("india")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Int32> ()
+                (match node.["india"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("india")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Int32> ()
 
             let arg_7 =
-                match node.["hotel"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("hotel")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.UInt64> ()
+                (match node.["hotel"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("hotel")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.UInt64> ()
 
             let arg_6 =
-                match node.["golf"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("golf")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Int64> ()
+                (match node.["golf"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("golf")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Int64> ()
 
             let arg_5 =
-                match node.["foxtrot"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("foxtrot")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Double> ()
+                (match node.["foxtrot"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("foxtrot")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Double> ()
 
             let arg_4 =
-                match node.["echo"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("echo")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Single> ()
+                (match node.["echo"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("echo")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Single> ()
 
             let arg_3 =
-                match node.["delta"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("delta")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Single> ()
+                (match node.["delta"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("delta")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Single> ()
 
             let arg_2 =
-                match node.["charlie"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("charlie")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.Double> ()
+                (match node.["charlie"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("charlie")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.Double> ()
 
             let arg_1 =
-                match node.["bravo"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("bravo")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<string> () |> System.Uri
+                (match node.["bravo"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("bravo")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<string> ()
+                |> System.Uri
 
             let arg_0 =
-                match node.["alpha"] |> Option.ofObj with
-                | None ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("alpha")
-                        )
-                    )
-                | Some node -> node.AsValue().GetValue<System.String> ()
+                (match node.["alpha"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("alpha")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<System.String> ()
 
             {
                 Alpha = arg_0

ConsumePlugin/GeneratedRestClient.fs

@@ -6,7 +6,6 @@
 
 
 
-
 namespace PureGym
 
 open System
@@ -49,27 +48,7 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type Gym list"
-                             )
-                         | jsonNode -> jsonNode)
-
-                    return
-                        jsonNode.AsArray ()
-                        |> Seq.map (fun elt ->
-                            (match elt with
-                             | null ->
-                                 raise (
-                                     System.ArgumentNullException
-                                         "Expected element of array (element type Gym) to be non-null, but found a null element"
-                                 )
-                             | elt -> Gym.jsonParse elt)
-                        )
-                        |> List.ofSeq
+                    return jsonNode.AsArray () |> Seq.map (fun elt -> Gym.jsonParse elt) |> List.ofSeq
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -103,15 +82,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type GymAttendance"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return GymAttendance.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -146,15 +116,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type GymAttendance"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return GymAttendance.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -185,15 +146,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type Member"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return Member.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -227,15 +179,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type Gym"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return Gym.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -266,15 +209,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type MemberActivityDto"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return MemberActivityDto.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -305,15 +239,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type UriThing"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return UriThing.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -341,44 +266,23 @@ module PureGymApi =
                             foo
                             |> (fun field ->
                                 match field with
-                                | None -> None
+                                | None -> null :> System.Text.Json.Nodes.JsonNode
                                 | Some field ->
-                                    (field
-                                     |> (fun field ->
-                                         let ret = System.Text.Json.Nodes.JsonObject ()
+                                    ((fun field ->
+                                        let ret = System.Text.Json.Nodes.JsonObject ()
 
-                                         for (KeyValue (key, value)) in field do
-                                             let key = key.ToString ()
+                                        for (KeyValue (key, value)) in field do
+                                            ret.Add (
+                                                key.ToString (),
+                                                System.Text.Json.Nodes.JsonValue.Create<string> value
+                                            )
 
-                                             ret.Add (
-                                                 key,
-                                                 (fun field ->
-                                                     let field =
-                                                         System.Text.Json.Nodes.JsonValue.Create<string> field
-
-                                                     (match field with
-                                                      | null ->
-                                                          raise (
-                                                              System.ArgumentNullException
-                                                                  "Expected type string to be non-null, but received a null value when serialising"
-                                                          )
-                                                      | field -> field)
-                                                 )
-                                                     value
-                                             )
-
-                                         ret
-                                     ))
+                                        ret
+                                    )
+                                        field)
                                     :> System.Text.Json.Nodes.JsonNode
-                                    |> Some
                             )
-                            |> (fun node ->
-                                match node with
-                                | None -> "null"
-                                | Some node -> node.ToJsonString ()
-                            ),
-                            null,
-                            "application/json"
+                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
                         )
 
                     do httpMessage.Content <- queryParams
@@ -390,25 +294,15 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode = jsonNode |> Option.ofObj
-
                     return
                         match jsonNode with
-                        | None -> None
-                        | Some v ->
+                        | null -> None
+                        | v ->
                             v.AsObject ()
                             |> Seq.map (fun kvp ->
                                 let key = (kvp.Key)
-                                let value = kvp.Value
-
-                                key,
-                                (match value with
-                                 | null ->
-                                     raise (
-                                         System.ArgumentNullException
-                                             "Expected dictionary value of type string to be non-null, but it was null"
-                                     )
-                                 | value -> value.AsValue().GetValue<System.String> ())
+                                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                                key, value
                             )
                             |> Map.ofSeq
                             |> Some
@@ -452,15 +346,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type Sessions"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return Sessions.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -502,15 +387,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type Sessions"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return Sessions.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -670,9 +546,9 @@ module PureGymApi =
 
                     let queryParams =
                         new System.Net.Http.StringContent (
-                            user |> PureGym.Member.toJsonNode |> (fun node -> node.ToJsonString ()),
-                            null,
-                            "application/json"
+                            user
+                            |> PureGym.Member.toJsonNode
+                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
                         )
 
                     do httpMessage.Content <- queryParams
@@ -704,20 +580,8 @@ module PureGymApi =
                     let queryParams =
                         new System.Net.Http.StringContent (
                             user
-                            |> (fun field ->
-                                let field = System.Text.Json.Nodes.JsonValue.Create<Uri> field
-
-                                (match field with
-                                 | null ->
-                                     raise (
-                                         System.ArgumentNullException
-                                             "Expected type URI to be non-null, but received a null value when serialising"
-                                     )
-                                 | field -> field)
-                            )
-                            |> (fun node -> node.ToJsonString ()),
-                            null,
-                            "application/json"
+                            |> System.Text.Json.Nodes.JsonValue.Create<Uri>
+                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
                         )
 
                     do httpMessage.Content <- queryParams
@@ -749,20 +613,8 @@ module PureGymApi =
                     let queryParams =
                         new System.Net.Http.StringContent (
                             user
-                            |> (fun field ->
-                                let field = System.Text.Json.Nodes.JsonValue.Create<int> field
-
-                                (match field with
-                                 | null ->
-                                     raise (
-                                         System.ArgumentNullException
-                                             "Expected type int32 to be non-null, but received a null value when serialising"
-                                     )
-                                 | field -> field)
-                            )
-                            |> (fun node -> node.ToJsonString ()),
-                            null,
-                            "application/json"
+                            |> System.Text.Json.Nodes.JsonValue.Create<int>
+                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
                         )
 
                     do httpMessage.Content <- queryParams
@@ -1026,15 +878,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type Response<MemberActivityDto>"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return
                         new RestEase.Response<_> (
                             responseString,
@@ -1071,15 +914,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type RestEase.Response<MemberActivityDto>"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return
                         new RestEase.Response<_> (
                             responseString,
@@ -1116,15 +950,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type Response<MemberActivityDto>"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return
                         new RestEase.Response<_> (
                             responseString,
@@ -1161,15 +986,6 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type RestEase.Response<MemberActivityDto>"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return
                         new RestEase.Response<_> (
                             responseString,
@@ -1810,174 +1626,3 @@ module ApiWithHeaders2 =
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
         }
-namespace PureGym
-
-open System
-open System.Threading
-open System.Threading.Tasks
-open System.IO
-open System.Net
-open System.Net.Http
-open RestEase
-
-/// Module for constructing a REST client.
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
-module ClientWithJsonBody =
-    /// Create a REST client.
-    let make (client : System.Net.Http.HttpClient) : IClientWithJsonBody =
-        { new IClientWithJsonBody with
-            member _.GetPathParam (parameter : string, mem : PureGym.Member, ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null ->
-                                 raise (
-                                     System.ArgumentNullException (
-                                         nameof (client.BaseAddress),
-                                         "No base address was supplied on the type, and no BaseAddress was on the HttpClient."
-                                     )
-                                 )
-                             | v -> v),
-                            System.Uri (
-                                "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
-                                System.UriKind.Relative
-                            )
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
-                            RequestUri = uri
-                        )
-
-                    let queryParams =
-                        new System.Net.Http.StringContent (
-                            mem |> PureGym.Member.toJsonNode |> (fun node -> node.ToJsonString ()),
-                            null,
-                            "application/json"
-                        )
-
-                    do httpMessage.Content <- queryParams
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    return responseString
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-        }
-namespace PureGym
-
-open System
-open System.Threading
-open System.Threading.Tasks
-open System.IO
-open System.Net
-open System.Net.Http
-open RestEase
-
-/// Module for constructing a REST client.
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
-module ClientWithJsonBodyOverridden =
-    /// Create a REST client.
-    let make (client : System.Net.Http.HttpClient) : IClientWithJsonBodyOverridden =
-        { new IClientWithJsonBodyOverridden with
-            member _.GetPathParam (parameter : string, mem : PureGym.Member, ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null ->
-                                 raise (
-                                     System.ArgumentNullException (
-                                         nameof (client.BaseAddress),
-                                         "No base address was supplied on the type, and no BaseAddress was on the HttpClient."
-                                     )
-                                 )
-                             | v -> v),
-                            System.Uri (
-                                "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
-                                System.UriKind.Relative
-                            )
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
-                            RequestUri = uri
-                        )
-
-                    let queryParams =
-                        new System.Net.Http.StringContent (
-                            mem |> PureGym.Member.toJsonNode |> (fun node -> node.ToJsonString ()),
-                            null,
-                            "application/ecmascript"
-                        )
-
-                    do httpMessage.Content <- queryParams
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    return responseString
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-        }
-namespace PureGym
-
-open System
-open System.Threading
-open System.Threading.Tasks
-open System.IO
-open System.Net
-open System.Net.Http
-open RestEase
-
-/// Module for constructing a REST client.
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
-module ClientWithStringBody =
-    /// Create a REST client.
-    let make (client : System.Net.Http.HttpClient) : IClientWithStringBody =
-        { new IClientWithStringBody with
-            member _.GetPathParam (parameter : string, mem : string, ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null ->
-                                 raise (
-                                     System.ArgumentNullException (
-                                         nameof (client.BaseAddress),
-                                         "No base address was supplied on the type, and no BaseAddress was on the HttpClient."
-                                     )
-                                 )
-                             | v -> v),
-                            System.Uri (
-                                "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
-                                System.UriKind.Relative
-                            )
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Post,
-                            RequestUri = uri
-                        )
-
-                    let queryParams = new System.Net.Http.StringContent (mem)
-                    do httpMessage.Content <- queryParams
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    return responseString
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-        }

ConsumePlugin/GeneratedSwaggerGitea.fs

@@ -9,7 +9,6 @@
 
 
 
-
 namespace Gitea
 
 open WoofWare.Myriad.Plugins
@@ -3424,7 +3423,7 @@ type IGitea =
         [<RestEase.Path "id">] id : int * ?ct : System.Threading.CancellationToken -> Hook System.Threading.Tasks.Task
 
     /// Update a hook
-    [<RestEase.Patch "admin/hooks/{id}">]
+    [<RestEase.Post "admin/hooks/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract AdminEditHook :
         [<RestEase.Path "id">] id : int *
@@ -3495,7 +3494,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit an existing user
-    [<RestEase.Patch "admin/users/{username}">]
+    [<RestEase.Post "admin/users/{username}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract AdminEditUser :
         [<RestEase.Path "username">] username : string *
@@ -3602,7 +3601,7 @@ type IGitea =
             NotificationThread System.Threading.Tasks.Task
 
     /// Mark notification thread as read by ID
-    [<RestEase.Patch "notifications/threads/{id}">]
+    [<RestEase.Post "notifications/threads/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract NotifyReadThread :
         [<RestEase.Path "id">] id : string *
@@ -3650,7 +3649,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit an organization
-    [<RestEase.Patch "orgs/{org}">]
+    [<RestEase.Post "orgs/{org}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract OrgEdit :
         [<RestEase.Path "org">] org : string *
@@ -3696,7 +3695,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a hook
-    [<RestEase.Patch "orgs/{org}/hooks/{id}">]
+    [<RestEase.Post "orgs/{org}/hooks/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract OrgEditHook :
         [<RestEase.Path "org">] org : string *
@@ -3743,7 +3742,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a label
-    [<RestEase.Patch "orgs/{org}/labels/{id}">]
+    [<RestEase.Post "orgs/{org}/labels/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract OrgEditLabel :
         [<RestEase.Path "org">] org : string *
@@ -3985,7 +3984,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a repository's properties. Only fields that are set will be changed.
-    [<RestEase.Patch "repos/{owner}/{repo}">]
+    [<RestEase.Post "repos/{owner}/{repo}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEdit :
         [<RestEase.Path "owner">] owner : string *
@@ -4053,7 +4052,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a branch protections for a repository. Only fields that are set will be changed
-    [<RestEase.Patch "repos/{owner}/{repo}/branch_protections/{name}">]
+    [<RestEase.Post "repos/{owner}/{repo}/branch_protections/{name}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditBranchProtection :
         [<RestEase.Path "owner">] owner : string *
@@ -4426,7 +4425,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a Git hook in a repository
-    [<RestEase.Patch "repos/{owner}/{repo}/hooks/git/{id}">]
+    [<RestEase.Post "repos/{owner}/{repo}/hooks/git/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditGitHook :
         [<RestEase.Path "owner">] owner : string *
@@ -4457,7 +4456,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a hook in a repository
-    [<RestEase.Patch "repos/{owner}/{repo}/hooks/{id}">]
+    [<RestEase.Post "repos/{owner}/{repo}/hooks/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditHook :
         [<RestEase.Path "owner">] owner : string *
@@ -4574,7 +4573,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a comment attachment
-    [<RestEase.Patch "repos/{owner}/{repo}/issues/comments/{id}/assets/{attachment_id}">]
+    [<RestEase.Post "repos/{owner}/{repo}/issues/comments/{id}/assets/{attachment_id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditIssueCommentAttachment :
         [<RestEase.Path "owner">] owner : string *
@@ -4627,7 +4626,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit an issue. If using deadline only the date will be taken into account, and time of day ignored.
-    [<RestEase.Patch "repos/{owner}/{repo}/issues/{index}">]
+    [<RestEase.Post "repos/{owner}/{repo}/issues/{index}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditIssue :
         [<RestEase.Path "owner">] owner : string *
@@ -4670,7 +4669,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit an issue attachment
-    [<RestEase.Patch "repos/{owner}/{repo}/issues/{index}/assets/{attachment_id}">]
+    [<RestEase.Post "repos/{owner}/{repo}/issues/{index}/assets/{attachment_id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditIssueAttachment :
         [<RestEase.Path "owner">] owner : string *
@@ -5000,7 +4999,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a label
-    [<RestEase.Patch "repos/{owner}/{repo}/labels/{id}">]
+    [<RestEase.Post "repos/{owner}/{repo}/labels/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditLabel :
         [<RestEase.Path "owner">] owner : string *
@@ -5074,7 +5073,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a milestone
-    [<RestEase.Patch "repos/{owner}/{repo}/milestones/{id}">]
+    [<RestEase.Post "repos/{owner}/{repo}/milestones/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract IssueEditMilestone :
         [<RestEase.Path "owner">] owner : string *
@@ -5158,7 +5157,7 @@ type IGitea =
             PullRequest System.Threading.Tasks.Task
 
     /// Update a pull request. If using deadline only the date will be taken into account, and time of day ignored.
-    [<RestEase.Patch "repos/{owner}/{repo}/pulls/{index}">]
+    [<RestEase.Post "repos/{owner}/{repo}/pulls/{index}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditPullRequest :
         [<RestEase.Path "owner">] owner : string *
@@ -5496,7 +5495,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Update a release
-    [<RestEase.Patch "repos/{owner}/{repo}/releases/{id}">]
+    [<RestEase.Post "repos/{owner}/{repo}/releases/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditRelease :
         [<RestEase.Path "owner">] owner : string *
@@ -5539,7 +5538,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a release attachment
-    [<RestEase.Patch "repos/{owner}/{repo}/releases/{id}/assets/{attachment_id}">]
+    [<RestEase.Post "repos/{owner}/{repo}/releases/{id}/assets/{attachment_id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditReleaseAttachment :
         [<RestEase.Path "owner">] owner : string *
@@ -5846,7 +5845,7 @@ type IGitea =
             unit System.Threading.Tasks.Task
 
     /// Edit a wiki page
-    [<RestEase.Patch "repos/{owner}/{repo}/wiki/page/{pageName}">]
+    [<RestEase.Post "repos/{owner}/{repo}/wiki/page/{pageName}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract RepoEditWikiPage :
         [<RestEase.Path "owner">] owner : string *
@@ -5937,7 +5936,7 @@ type IGitea =
         [<RestEase.Path "id">] id : int * ?ct : System.Threading.CancellationToken -> unit System.Threading.Tasks.Task
 
     /// Edit a team
-    [<RestEase.Patch "teams/{id}">]
+    [<RestEase.Post "teams/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract OrgEditTeam :
         [<RestEase.Path "id">] id : int *
@@ -6067,7 +6066,7 @@ type IGitea =
         [<RestEase.Path "id">] id : int * ?ct : System.Threading.CancellationToken -> unit System.Threading.Tasks.Task
 
     /// update an OAuth2 Application, this includes regenerating the client secret
-    [<RestEase.Patch "user/applications/oauth2/{id}">]
+    [<RestEase.Post "user/applications/oauth2/{id}">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract UserUpdateOAuth2Application :
         [<RestEase.Path "id">] id : int *
@@ -6205,7 +6204,7 @@ type IGitea =
     abstract GetUserSettings : ?ct : System.Threading.CancellationToken -> UserSettings list System.Threading.Tasks.Task
 
     /// Update user settings
-    [<RestEase.Patch "user/settings">]
+    [<RestEase.Post "user/settings">]
     [<RestEase.Header("Content-Type", "json")>]
     abstract UpdateUserSettings :
         [<RestEase.Body>] body : UserSettingsOptions * ?ct : System.Threading.CancellationToken ->

ConsumePlugin/GeneratedVault.fs

@@ -5,7 +5,6 @@
 
 
 
-
 namespace ConsumePlugin
 
 /// Module containing JSON parsing methods for the JwtVaultAuthResponse type
@@ -14,147 +13,139 @@ module JwtVaultAuthResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtVaultAuthResponse =
         let arg_10 =
-            match node.["num_uses"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("num_uses")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.Int32> ()
+            (match node.["num_uses"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("num_uses")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.Int32> ()
 
         let arg_9 =
-            match node.["orphan"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("orphan")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.Boolean> ()
+            (match node.["orphan"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("orphan")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.Boolean> ()
 
         let arg_8 =
-            match node.["entity_id"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("entity_id")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.["entity_id"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("entity_id")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         let arg_7 =
-            match node.["token_type"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("token_type")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.["token_type"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("token_type")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         let arg_6 =
-            match node.["renewable"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("renewable")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.Boolean> ()
+            (match node.["renewable"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("renewable")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.Boolean> ()
 
         let arg_5 =
-            match node.["lease_duration"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("lease_duration")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.Int32> ()
+            (match node.["lease_duration"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("lease_duration")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.Int32> ()
 
         let arg_4 =
-            match node.["identity_policies"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("identity_policies")
-                    )
-                )
-            | Some node ->
-                node.AsArray ()
-                |> Seq.map (fun elt ->
-                    (match elt with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected element of array (element type string) to be non-null, but found a null element"
-                         )
-                     | elt -> elt.AsValue().GetValue<System.String> ())
-                )
-                |> List.ofSeq
+            (match node.["identity_policies"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("identity_policies")
+                     )
+                 )
+             | v -> v)
+                .AsArray ()
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.String> ())
+            |> List.ofSeq
 
         let arg_3 =
-            match node.["token_policies"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("token_policies")
-                    )
-                )
-            | Some node ->
-                node.AsArray ()
-                |> Seq.map (fun elt ->
-                    (match elt with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected element of array (element type string) to be non-null, but found a null element"
-                         )
-                     | elt -> elt.AsValue().GetValue<System.String> ())
-                )
-                |> List.ofSeq
+            (match node.["token_policies"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("token_policies")
+                     )
+                 )
+             | v -> v)
+                .AsArray ()
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.String> ())
+            |> List.ofSeq
 
         let arg_2 =
-            match node.["policies"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("policies")
-                    )
-                )
-            | Some node ->
-                node.AsArray ()
-                |> Seq.map (fun elt ->
-                    (match elt with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected element of array (element type string) to be non-null, but found a null element"
-                         )
-                     | elt -> elt.AsValue().GetValue<System.String> ())
-                )
-                |> List.ofSeq
+            (match node.["policies"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("policies")
+                     )
+                 )
+             | v -> v)
+                .AsArray ()
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.String> ())
+            |> List.ofSeq
 
         let arg_1 =
-            match node.["accessor"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("accessor")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.["accessor"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("accessor")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         let arg_0 =
-            match node.["client_token"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("client_token")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.["client_token"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("client_token")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         {
             ClientToken = arg_0
@@ -177,54 +168,64 @@ module JwtVaultResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtVaultResponse =
         let arg_4 =
-            match node.["auth"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("auth")
+            JwtVaultAuthResponse.jsonParse (
+                match node.["auth"] with
+                | null ->
+                    raise (
+                        System.Collections.Generic.KeyNotFoundException (
+                            sprintf "Required key '%s' not found on JSON object" ("auth")
+                        )
                     )
-                )
-            | Some node -> JwtVaultAuthResponse.jsonParse node
+                | v -> v
+            )
 
         let arg_3 =
-            match node.["lease_duration"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("lease_duration")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.Int32> ()
+            (match node.["lease_duration"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("lease_duration")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.Int32> ()
 
         let arg_2 =
-            match node.["renewable"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("renewable")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.Boolean> ()
+            (match node.["renewable"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("renewable")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.Boolean> ()
 
         let arg_1 =
-            match node.["lease_id"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("lease_id")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.["lease_id"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("lease_id")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         let arg_0 =
-            match node.["request_id"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("request_id")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.["request_id"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("request_id")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         {
             RequestId = arg_0
@@ -241,246 +242,190 @@ module JwtSecretResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtSecretResponse =
         let arg_11 =
-            match node.["data8"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("data8")
-                    )
-                )
-            | Some node ->
-                node.AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key)
-                    let value = kvp.Value
-
-                    key,
-                    (match value with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected dictionary value of type URI to be non-null, but it was null"
-                         )
-                     | value -> value.AsValue().GetValue<string> () |> System.Uri)
-                )
-                |> Seq.map System.Collections.Generic.KeyValuePair
-                |> System.Collections.Generic.Dictionary
+            (match node.["data8"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("data8")
+                     )
+                 )
+             | v -> v)
+                .AsObject ()
+            |> Seq.map (fun kvp ->
+                let key = (kvp.Key)
+                let value = (kvp.Value).AsValue().GetValue<string> () |> System.Uri
+                key, value
+            )
+            |> Seq.map System.Collections.Generic.KeyValuePair
+            |> System.Collections.Generic.Dictionary
 
         let arg_10 =
-            match node.["data7"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("data7")
-                    )
-                )
-            | Some node ->
-                node.AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key)
-                    let value = kvp.Value
-
-                    key,
-                    (match value with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected dictionary value of type int32 to be non-null, but it was null"
-                         )
-                     | value -> value.AsValue().GetValue<System.Int32> ())
-                )
-                |> Map.ofSeq
+            (match node.["data7"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("data7")
+                     )
+                 )
+             | v -> v)
+                .AsObject ()
+            |> Seq.map (fun kvp ->
+                let key = (kvp.Key)
+                let value = (kvp.Value).AsValue().GetValue<System.Int32> ()
+                key, value
+            )
+            |> Map.ofSeq
 
         let arg_9 =
-            match node.["data6"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("data6")
-                    )
-                )
-            | Some node ->
-                node.AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key) |> System.Uri
-                    let value = kvp.Value
-
-                    key,
-                    (match value with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected dictionary value of type string to be non-null, but it was null"
-                         )
-                     | value -> value.AsValue().GetValue<System.String> ())
-                )
-                |> dict
+            (match node.["data6"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("data6")
+                     )
+                 )
+             | v -> v)
+                .AsObject ()
+            |> Seq.map (fun kvp ->
+                let key = (kvp.Key) |> System.Uri
+                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                key, value
+            )
+            |> dict
 
         let arg_8 =
-            match node.["data5"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("data5")
-                    )
-                )
-            | Some node ->
-                node.AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key) |> System.Uri
-                    let value = kvp.Value
-
-                    key,
-                    (match value with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected dictionary value of type string to be non-null, but it was null"
-                         )
-                     | value -> value.AsValue().GetValue<System.String> ())
-                )
-                |> readOnlyDict
+            (match node.["data5"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("data5")
+                     )
+                 )
+             | v -> v)
+                .AsObject ()
+            |> Seq.map (fun kvp ->
+                let key = (kvp.Key) |> System.Uri
+                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                key, value
+            )
+            |> readOnlyDict
 
         let arg_7 =
-            match node.["data4"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("data4")
-                    )
-                )
-            | Some node ->
-                node.AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key)
-                    let value = kvp.Value
-
-                    key,
-                    (match value with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected dictionary value of type string to be non-null, but it was null"
-                         )
-                     | value -> value.AsValue().GetValue<System.String> ())
-                )
-                |> Map.ofSeq
+            (match node.["data4"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("data4")
+                     )
+                 )
+             | v -> v)
+                .AsObject ()
+            |> Seq.map (fun kvp ->
+                let key = (kvp.Key)
+                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                key, value
+            )
+            |> Map.ofSeq
 
         let arg_6 =
-            match node.["data3"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("data3")
-                    )
-                )
-            | Some node ->
-                node.AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key)
-                    let value = kvp.Value
-
-                    key,
-                    (match value with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected dictionary value of type string to be non-null, but it was null"
-                         )
-                     | value -> value.AsValue().GetValue<System.String> ())
-                )
-                |> Seq.map System.Collections.Generic.KeyValuePair
-                |> System.Collections.Generic.Dictionary
+            (match node.["data3"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("data3")
+                     )
+                 )
+             | v -> v)
+                .AsObject ()
+            |> Seq.map (fun kvp ->
+                let key = (kvp.Key)
+                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                key, value
+            )
+            |> Seq.map System.Collections.Generic.KeyValuePair
+            |> System.Collections.Generic.Dictionary
 
         let arg_5 =
-            match node.["data2"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("data2")
-                    )
-                )
-            | Some node ->
-                node.AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key)
-                    let value = kvp.Value
-
-                    key,
-                    (match value with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected dictionary value of type string to be non-null, but it was null"
-                         )
-                     | value -> value.AsValue().GetValue<System.String> ())
-                )
-                |> dict
+            (match node.["data2"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("data2")
+                     )
+                 )
+             | v -> v)
+                .AsObject ()
+            |> Seq.map (fun kvp ->
+                let key = (kvp.Key)
+                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                key, value
+            )
+            |> dict
 
         let arg_4 =
-            match node.["data"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("data")
-                    )
-                )
-            | Some node ->
-                node.AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key)
-                    let value = kvp.Value
-
-                    key,
-                    (match value with
-                     | null ->
-                         raise (
-                             System.ArgumentNullException
-                                 "Expected dictionary value of type string to be non-null, but it was null"
-                         )
-                     | value -> value.AsValue().GetValue<System.String> ())
-                )
-                |> readOnlyDict
+            (match node.["data"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("data")
+                     )
+                 )
+             | v -> v)
+                .AsObject ()
+            |> Seq.map (fun kvp ->
+                let key = (kvp.Key)
+                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                key, value
+            )
+            |> readOnlyDict
 
         let arg_3 =
-            match node.["lease_duration"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("lease_duration")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.Int32> ()
+            (match node.["lease_duration"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("lease_duration")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.Int32> ()
 
         let arg_2 =
-            match node.["renewable"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("renewable")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.Boolean> ()
+            (match node.["renewable"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("renewable")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.Boolean> ()
 
         let arg_1 =
-            match node.["lease_id"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("lease_id")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.["lease_id"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("lease_id")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         let arg_0 =
-            match node.["request_id"] |> Option.ofObj with
-            | None ->
-                raise (
-                    System.Collections.Generic.KeyNotFoundException (
-                        sprintf "Required key '%s' not found on JSON object" ("request_id")
-                    )
-                )
-            | Some node -> node.AsValue().GetValue<System.String> ()
+            (match node.["request_id"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("request_id")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<System.String> ()
 
         {
             RequestId = arg_0
@@ -551,15 +496,6 @@ module VaultClient =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type JwtSecretResponse"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return JwtSecretResponse.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -596,15 +532,6 @@ module VaultClient =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type JwtVaultResponse"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return JwtVaultResponse.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -663,15 +590,6 @@ module VaultClientNonExtensionMethod =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type JwtSecretResponse"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return JwtSecretResponse.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -708,15 +626,6 @@ module VaultClientNonExtensionMethod =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    let jsonNode =
-                        (match jsonNode with
-                         | null ->
-                             raise (
-                                 System.ArgumentNullException
-                                     "Response from server was the JSON null object; expected a non-nullable type JwtVaultResponse"
-                             )
-                         | jsonNode -> jsonNode)
-
                     return JwtVaultResponse.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -778,15 +687,6 @@ module VaultClientExtensionMethodHttpClientExtension =
                             System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                             |> Async.AwaitTask
 
-                        let jsonNode =
-                            (match jsonNode with
-                             | null ->
-                                 raise (
-                                     System.ArgumentNullException
-                                         "Response from server was the JSON null object; expected a non-nullable type JwtSecretResponse"
-                                 )
-                             | jsonNode -> jsonNode)
-
                         return JwtSecretResponse.jsonParse jsonNode
                     }
                     |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -823,15 +723,6 @@ module VaultClientExtensionMethodHttpClientExtension =
                             System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                             |> Async.AwaitTask
 
-                        let jsonNode =
-                            (match jsonNode with
-                             | null ->
-                                 raise (
-                                     System.ArgumentNullException
-                                         "Response from server was the JSON null object; expected a non-nullable type JwtVaultResponse"
-                                 )
-                             | jsonNode -> jsonNode)
-
                         return JwtVaultResponse.jsonParse jsonNode
                     }
                     |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))

ConsumePlugin/ListCata.fs

@@ -7,7 +7,6 @@
 
 
 
-
 namespace ConsumePlugin
 
 open WoofWare.Myriad.Plugins

ConsumePlugin/RestApiExample.fs

@@ -203,35 +203,3 @@ type IApiWithHeaders2 =
     [<Get "endpoint/{param}">]
     abstract GetPathParam :
         [<WoofWare.Myriad.Plugins.RestEase.Path "param">] parameter : string * ?ct : CancellationToken -> Task<string>
-
-[<WoofWare.Myriad.Plugins.HttpClient>]
-type IClientWithJsonBody =
-    // As a POST request of a JSON-serialised body, we automatically set Content-Type: application/json.
-    [<Post "endpoint/{param}">]
-    abstract GetPathParam :
-        [<RestEase.Path "param">] parameter : string *
-        [<WoofWare.Myriad.Plugins.RestEase.Body>] mem : PureGym.Member *
-        ?ct : CancellationToken ->
-            Task<string>
-
-[<WoofWare.Myriad.Plugins.HttpClient>]
-type IClientWithJsonBodyOverridden =
-    // As a POST request of a JSON-serialised body, we *would* automatically set Content-Type: application/json,
-    // but this method has overridden it.
-    [<Post "endpoint/{param}">]
-    [<Header("Content-Type", "application/ecmascript")>]
-    abstract GetPathParam :
-        [<RestEase.Path "param">] parameter : string *
-        [<WoofWare.Myriad.Plugins.RestEase.Body>] mem : PureGym.Member *
-        ?ct : CancellationToken ->
-            Task<string>
-
-[<WoofWare.Myriad.Plugins.HttpClient>]
-type IClientWithStringBody =
-    // As a POST request of a bare string body, we don't override the Content-Type.
-    [<Post "endpoint/{param}">]
-    abstract GetPathParam :
-        [<RestEase.Path "param">] parameter : string *
-        [<WoofWare.Myriad.Plugins.RestEase.Body>] mem : string *
-        ?ct : CancellationToken ->
-            Task<string>

Directory.Build.props

@@ -10,8 +10,8 @@
     <WarnOn>FS3388,FS3559</WarnOn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.8.118" PrivateAssets="all" />
-    <SourceLinkGitHubHost Include="github.com" ContentUrl="https://raw.githubusercontent.com" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.8.38-alpha" PrivateAssets="all"/>
+    <SourceLinkGitHubHost Include="github.com" ContentUrl="https://raw.githubusercontent.com"/>
   </ItemGroup>
   <PropertyGroup Condition="'$(GITHUB_ACTION)' != ''">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

Playground/Domain.fs

@@ -0,0 +1,47 @@
+namespace Playground
+
+open System
+open WoofWare.Myriad.Plugins
+
+[<ArgParser>]
+type SubMode1 =
+    {
+        Info1 : int
+        Info2 : string
+        Rest : string list
+    }
+
+[<ArgParser>]
+type SubMode2 =
+    {
+        Info1 : int
+        Info2 : string
+        Rest : int list
+    }
+
+[<ArgParser>]
+type Mode1 =
+    {
+        Things : SubMode1
+        Whatnot : int
+    }
+
+[<ArgParser>]
+type Mode2 =
+    {
+        Things : SubMode2
+        Whatnot : DateTime
+    }
+
+[<ArgParser>]
+type Modes =
+    | Mode1 of Mode1
+    | Mode2 of Mode2
+
+[<ArgParser>]
+type Args =
+    {
+        WhatToDo : Modes
+        [<PositionalArgs>]
+        OtherArgs : string list
+    }

Playground/Library.fs

@@ -0,0 +1,563 @@
+//------------------------------------------------------------------------------
+//        This code was generated by myriad.
+//        Changes to this file will be lost when the code is regenerated.
+//------------------------------------------------------------------------------
+
+namespace Playground // Assuming a namespace
+
+open System
+open System.IO
+open WoofWare.Myriad.Plugins // Assuming attributes are here
+
+// Assume original type definitions are accessible here
+// [<ArgParser>] type SubMode1 = { Info1 : int; Info2 : string; Rest : string list }
+// [<ArgParser>] type SubMode2 = { Info1 : int; Info2 : string; Rest : int list }
+// [<ArgParser>] type Mode1 = { Things : SubMode1; Whatnot : int }
+// [<ArgParser>] type Mode2 = { Things : SubMode2; Whatnot : DateTime }
+// [<ArgParser>] type Modes = | Mode1 of Mode1 | Mode2 of Mode2
+// [<ArgParser>] type Args = { WhatToDo : Modes; [<PositionalArgs>] OtherArgs : string list }
+
+
+/// Methods to parse arguments for the type Args
+[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module Args =
+
+    //--------------------------------------------------------------------------
+    // Internal state definitions (Non-Flattened with combined Assemble/Validate)
+    //--------------------------------------------------------------------------
+
+    /// State representing the parse progress for SubMode1 record
+    type private State_SubMode1 =
+        {
+            mutable Info1 : int option
+            mutable Info2 : string option
+            Rest : ResizeArray<string> // Corresponds to --rest
+        }
+
+        static member Create () =
+            {
+                Info1 = None
+                Info2 = None
+                Rest = ResizeArray ()
+            }
+
+        /// Check completeness and assemble the SubMode1 record from state.
+        member this.Assemble () : Result<SubMode1, string list> =
+            let errors = ResizeArray<string> ()
+            let mutable complete = true
+
+            if this.Info1.IsNone then
+                complete <- false
+                errors.Add ("Argument '--info1' is required.")
+
+            if this.Info2.IsNone then
+                complete <- false
+                errors.Add ("Argument '--info2' is required.")
+            // Rest is list, always 'complete'
+
+            if complete then
+                Ok
+                    {
+                        Info1 = this.Info1.Value
+                        Info2 = this.Info2.Value
+                        Rest = this.Rest |> Seq.toList
+                    }
+            else
+                Error (errors |> Seq.toList)
+
+    /// State representing the parse progress for SubMode2 record
+    type private State_SubMode2 =
+        {
+            mutable Info1 : int option
+            mutable Info2 : string option
+            Rest : ResizeArray<int> // Corresponds to --rest
+        }
+
+        static member Create () =
+            {
+                Info1 = None
+                Info2 = None
+                Rest = ResizeArray ()
+            }
+
+        /// Check completeness and assemble the SubMode2 record from state.
+        member this.Assemble () : Result<SubMode2, string list> =
+            let errors = ResizeArray<string> ()
+
+            if this.Info1.IsNone then
+                errors.Add ("Argument '--info1' is required.")
+
+            if this.Info2.IsNone then
+                errors.Add ("Argument '--info2' is required.")
+            // Rest is list, always 'complete'
+
+            if errors.Count = 0 then
+                Ok
+                    {
+                        Info1 = this.Info1.Value
+                        Info2 = this.Info2.Value
+                        Rest = this.Rest |> Seq.toList
+                    }
+            else
+                Error (errors |> Seq.toList)
+
+
+    /// State representing the parse progress for Mode1 record (references SubMode1 state)
+    type private State_Mode1 =
+        {
+            ThingsState : State_SubMode1 // Holds state for the nested record
+            mutable Whatnot : int option
+        }
+
+        static member Create () =
+            {
+                ThingsState = State_SubMode1.Create ()
+                Whatnot = None
+            }
+
+        /// Check completeness and assemble the Mode1 record from state (including nested).
+        member this.Assemble () : Result<Mode1, string list> =
+            let errors = ResizeArray<string> ()
+
+            // Check direct fields
+            if this.Whatnot.IsNone then
+                errors.Add ("Argument '--whatnot' is required for Mode1.")
+
+            // Assemble nested state (which includes its own validation)
+            let thingsResult = this.ThingsState.Assemble ()
+            let mutable thingsValue = None
+
+            match thingsResult with
+            | Ok v -> thingsValue <- Some v
+            | Error nestedErrors -> errors.AddRange (nestedErrors |> List.map (sprintf "Things: %s")) // Add context
+
+            if errors.Count = 0 then
+                Ok
+                    {
+                        Things = thingsValue.Value
+                        Whatnot = this.Whatnot.Value
+                    }
+            else
+                Error (errors |> Seq.toList)
+
+
+    /// State representing the parse progress for Mode2 record (references SubMode2 state)
+    type private State_Mode2 =
+        {
+            ThingsState : State_SubMode2 // Holds state for the nested record
+            mutable Whatnot : DateTime option
+        }
+
+        static member Create () =
+            {
+                ThingsState = State_SubMode2.Create ()
+                Whatnot = None
+            }
+
+        /// Check completeness and assemble the Mode2 record from state (including nested).
+        member this.Assemble () : Result<Mode2, string list> =
+            let errors = ResizeArray<string> ()
+
+            // Check direct fields
+            if this.Whatnot.IsNone then
+                errors.Add ("Argument '--whatnot' is required for Mode2.")
+
+            // Assemble nested state (which includes its own validation)
+            let thingsResult = this.ThingsState.Assemble ()
+            let mutable thingsValue = Unchecked.defaultof<_>
+
+            match thingsResult with
+            | Ok v -> thingsValue <- v
+            | Error nestedErrors -> errors.AddRange (nestedErrors |> List.map (sprintf "Things: %s")) // Add context
+
+            if errors.Count = 0 then
+                {
+                    Things = thingsValue
+                    Whatnot = this.Whatnot.Value
+                }
+                |> Ok
+            else
+                Error (errors |> Seq.toList)
+
+
+    /// State for a single candidate parse path for the Modes DU (Structure unchanged)
+    type private CandidateParseState_Modes =
+        {
+            CaseName : string // "Mode1" or "Mode2"
+            mutable IsViable : bool
+            Errors : ResizeArray<string> // Errors specific to this candidate's path
+            ConsumedArgIndices : System.Collections.Generic.HashSet<int> // Indices consumed *by this candidate*
+            CaseState : obj // Holds either State_Mode1 or State_Mode2
+        }
+
+        static member CreateMode1 () =
+            {
+                CaseName = "Mode1"
+                IsViable = true
+                Errors = ResizeArray ()
+                ConsumedArgIndices = System.Collections.Generic.HashSet ()
+                CaseState = State_Mode1.Create () :> obj
+            }
+
+        static member CreateMode2 () =
+            {
+                CaseName = "Mode2"
+                IsViable = true
+                Errors = ResizeArray ()
+                ConsumedArgIndices = System.Collections.Generic.HashSet ()
+                CaseState = State_Mode2.Create () :> obj
+            }
+
+    //--------------------------------------------------------------------------
+    // Main Parser Logic
+    //--------------------------------------------------------------------------
+
+    type private ParseState_Args =
+        | AwaitingArg
+        | AwaitingValue of keyIndex : int * key : string
+
+    let parse' (getEnvironmentVariable : string -> string) (args : string list) : Args =
+        let ArgParser_errors = ResizeArray () // Global errors accumulator
+
+        let helpText () =
+            // Help text generation unchanged
+            [
+                (sprintf "%s  int32%s%s" (sprintf "--%s" "info1") "" " (for Mode1/Mode2 Things)")
+                (sprintf "%s  string%s%s" (sprintf "--%s" "info2") "" " (for Mode1/Mode2 Things)")
+                (sprintf "%s  string%s%s" (sprintf "--%s" "rest") " (can be repeated)" " (for Mode1 Things)")
+                (sprintf "%s  int32%s%s" (sprintf "--%s" "rest") " (can be repeated)" " (for Mode2 Things)")
+                (sprintf "%s  int32%s%s" (sprintf "--%s" "whatnot") "" " (for Mode1)")
+                (sprintf "%s  DateTime%s%s" (sprintf "--%s" "whatnot") "" " (for Mode2)")
+                (sprintf "%s  string%s%s" (sprintf "--%s" "other-args") " (positional args) (can be repeated)" "")
+            ]
+            |> String.concat "\n"
+
+        let arg_OtherArgs : string ResizeArray = ResizeArray ()
+
+        let mutable candidates_WhatToDo : CandidateParseState_Modes list =
+            [
+                CandidateParseState_Modes.CreateMode1 ()
+                CandidateParseState_Modes.CreateMode2 ()
+            ]
+
+        let consumedArgIndices_WhatToDo = System.Collections.Generic.HashSet<int> ()
+
+        //----------------------------------------------------------------------
+        // Helper functions for applying args (applyKeyValueToSubModeXState unchanged)
+        //----------------------------------------------------------------------
+        let applyKeyValueToSubMode1State
+            (argIndex : int)
+            (keyIndex : int)
+            (key : string)
+            (value : string)
+            (subState : State_SubMode1)
+            (candidate : CandidateParseState_Modes)
+            : unit
+            =
+            // ... (Implementation identical to previous version) ...
+            if String.Equals (key, "--info1", StringComparison.OrdinalIgnoreCase) then
+                match subState.Info1 with
+                | Some _ ->
+                    candidate.Errors.Add (sprintf "Argument '--info1' supplied multiple times (SubMode1)")
+                    candidate.IsViable <- false
+                | None ->
+                    try
+                        subState.Info1 <- Some (Int32.Parse value)
+                        candidate.ConsumedArgIndices.Add argIndex |> ignore
+                        candidate.ConsumedArgIndices.Add keyIndex |> ignore
+                    with ex ->
+                        candidate.Errors.Add (
+                            sprintf "Failed to parse '%s' for --info1 (SubMode1): %s" value ex.Message
+                        )
+
+                        candidate.IsViable <- false
+            elif String.Equals (key, "--info2", StringComparison.OrdinalIgnoreCase) then
+                match subState.Info2 with
+                | Some _ ->
+                    candidate.Errors.Add (sprintf "Argument '--info2' supplied multiple times (SubMode1)")
+                    candidate.IsViable <- false
+                | None ->
+                    subState.Info2 <- Some value
+                    candidate.ConsumedArgIndices.Add argIndex |> ignore
+                    candidate.ConsumedArgIndices.Add keyIndex |> ignore
+            elif String.Equals (key, "--rest", StringComparison.OrdinalIgnoreCase) then
+                subState.Rest.Add value
+                candidate.ConsumedArgIndices.Add argIndex |> ignore
+                candidate.ConsumedArgIndices.Add keyIndex |> ignore
+            else
+                ()
+
+        let applyKeyValueToSubMode2State
+            (argIndex : int)
+            (keyIndex : int)
+            (key : string)
+            (value : string)
+            (subState : State_SubMode2)
+            (candidate : CandidateParseState_Modes)
+            : unit
+            =
+            // ... (Implementation identical to previous version) ...
+            if String.Equals (key, "--info1", StringComparison.OrdinalIgnoreCase) then
+                match subState.Info1 with
+                | Some _ ->
+                    candidate.Errors.Add (sprintf "Argument '--info1' supplied multiple times (SubMode2)")
+                    candidate.IsViable <- false
+                | None ->
+                    try
+                        subState.Info1 <- Some (Int32.Parse value)
+                        candidate.ConsumedArgIndices.Add argIndex |> ignore
+                        candidate.ConsumedArgIndices.Add keyIndex |> ignore
+                    with ex ->
+                        candidate.Errors.Add (
+                            sprintf "Failed to parse '%s' for --info1 (SubMode2): %s" value ex.Message
+                        )
+
+                        candidate.IsViable <- false
+            elif String.Equals (key, "--info2", StringComparison.OrdinalIgnoreCase) then
+                match subState.Info2 with
+                | Some _ ->
+                    candidate.Errors.Add (sprintf "Argument '--info2' supplied multiple times (SubMode2)")
+                    candidate.IsViable <- false
+                | None ->
+                    subState.Info2 <- Some value
+                    candidate.ConsumedArgIndices.Add argIndex |> ignore
+                    candidate.ConsumedArgIndices.Add keyIndex |> ignore
+            elif String.Equals (key, "--rest", StringComparison.OrdinalIgnoreCase) then
+                try
+                    subState.Rest.Add (Int32.Parse value)
+                    candidate.ConsumedArgIndices.Add argIndex |> ignore
+                    candidate.ConsumedArgIndices.Add keyIndex |> ignore
+                with ex ->
+                    candidate.Errors.Add (
+                        sprintf "Failed to parse '%s' as int32 for --rest (SubMode2): %s" value ex.Message
+                    )
+
+                    candidate.IsViable <- false
+            else
+                ()
+
+        //----------------------------------------------------------------------
+        // Routing and Main Application Logic (applyKeyValueToCandidate unchanged)
+        //----------------------------------------------------------------------
+        let applyKeyValueToCandidate
+            (argIndex : int, keyIndex : int, key : string, value : string)
+            (candidate : CandidateParseState_Modes)
+            : unit
+            =
+            // ... (Implementation identical to previous version, calling sub-state helpers) ...
+            if not candidate.IsViable then
+                ()
+            else
+
+            match candidate.CaseName with
+            | "Mode1" ->
+                let state = candidate.CaseState :?> State_Mode1
+
+                if String.Equals (key, "--whatnot", StringComparison.OrdinalIgnoreCase) then
+                    match state.Whatnot with
+                    | Some _ ->
+                        candidate.Errors.Add (
+                            sprintf "Argument '--whatnot' supplied multiple times for Mode1 candidate"
+                        )
+
+                        candidate.IsViable <- false
+                    | None ->
+                        try
+                            state.Whatnot <- Some (Int32.Parse value)
+                            candidate.ConsumedArgIndices.Add argIndex |> ignore
+                            candidate.ConsumedArgIndices.Add keyIndex |> ignore
+                        with ex ->
+                            candidate.Errors.Add (
+                                sprintf "Failed to parse '%s' as int32 for --whatnot (Mode1): %s" value ex.Message
+                            )
+
+                            candidate.IsViable <- false
+                elif key = "--info1" || key = "--info2" || key = "--rest" then
+                    applyKeyValueToSubMode1State argIndex keyIndex key value state.ThingsState candidate
+                else
+                    ()
+            | "Mode2" ->
+                let state = candidate.CaseState :?> State_Mode2
+
+                if String.Equals (key, "--whatnot", StringComparison.OrdinalIgnoreCase) then
+                    match state.Whatnot with
+                    | Some _ ->
+                        candidate.Errors.Add (
+                            sprintf "Argument '--whatnot' supplied multiple times for Mode2 candidate"
+                        )
+
+                        candidate.IsViable <- false
+                    | None ->
+                        try
+                            state.Whatnot <- Some (DateTime.Parse value)
+                            candidate.ConsumedArgIndices.Add argIndex |> ignore
+                            candidate.ConsumedArgIndices.Add keyIndex |> ignore
+                        with ex ->
+                            candidate.Errors.Add (
+                                sprintf "Failed to parse '%s' as DateTime for --whatnot (Mode2): %s" value ex.Message
+                            )
+
+                            candidate.IsViable <- false
+                elif key = "--info1" || key = "--info2" || key = "--rest" then
+                    applyKeyValueToSubMode2State argIndex keyIndex key value state.ThingsState candidate
+                else
+                    ()
+            | _ -> failwith "Internal error: Unknown case name"
+
+        // processKeyValue, setFlagValue, and main loop `go` are identical to previous version
+        let processKeyValue (keyIndex : int, key : string, valueIndex : int, value : string) : bool =
+            let mutable handled = false
+
+            for candidate in candidates_WhatToDo do
+                let initialConsumedCount = candidate.ConsumedArgIndices.Count
+
+                if candidate.IsViable then
+                    applyKeyValueToCandidate (valueIndex, keyIndex, key, value) candidate
+
+                if candidate.IsViable && candidate.ConsumedArgIndices.Count > initialConsumedCount then
+                    handled <- true
+                    consumedArgIndices_WhatToDo.Add keyIndex |> ignore
+                    consumedArgIndices_WhatToDo.Add valueIndex |> ignore
+
+            handled
+
+        let setFlagValue (keyIndex : int) (key : string) : bool = false // No flags
+
+        let rec go (state : ParseState_Args) (args : (int * string) list) =
+            // ... (Implementation identical to previous version) ...
+            match args with
+            | [] ->
+                match state with
+                | ParseState_Args.AwaitingArg -> ()
+                | ParseState_Args.AwaitingValue (i, k) ->
+                    if not (setFlagValue i k) then
+                        ArgParser_errors.Add (sprintf "Trailing argument '%s' (at index %d) requires a value." k i)
+            | (idx, arg) :: rest ->
+                match state with
+                | ParseState_Args.AwaitingArg ->
+                    if arg = "--" then
+                        rest
+                        |> List.iter (fun (i, v) ->
+                            if not (consumedArgIndices_WhatToDo.Contains i) then
+                                arg_OtherArgs.Add v
+                        )
+
+                        go ParseState_Args.AwaitingArg []
+                    elif arg.StartsWith ("--") then
+                        if arg = "--help" then
+                            helpText () |> failwithf "Help text requested:\n%s"
+                        else
+                            let eq = arg.IndexOf ('=')
+
+                            if eq > 0 then
+                                let k = arg.[.. eq - 1]
+                                let v = arg.[eq + 1 ..]
+
+                                if not (processKeyValue (idx, k, idx, v)) then
+                                    if not (consumedArgIndices_WhatToDo.Contains idx) then
+                                        arg_OtherArgs.Add arg
+
+                                go ParseState_Args.AwaitingArg rest
+                            elif setFlagValue idx arg then
+                                consumedArgIndices_WhatToDo.Add idx |> ignore
+                                go ParseState_Args.AwaitingArg rest
+                            else
+                                go (ParseState_Args.AwaitingValue (idx, arg)) rest
+                    else
+                        if not (consumedArgIndices_WhatToDo.Contains idx) then
+                            arg_OtherArgs.Add arg
+
+                        go ParseState_Args.AwaitingArg rest
+                | ParseState_Args.AwaitingValue (keyIdx, key) ->
+                    if processKeyValue (keyIdx, key, idx, arg) then
+                        go ParseState_Args.AwaitingArg rest
+                    elif setFlagValue keyIdx key then
+                        consumedArgIndices_WhatToDo.Add keyIdx |> ignore<bool>
+                        go ParseState_Args.AwaitingArg ((idx, arg) :: rest) // Reprocess arg
+                    elif not (consumedArgIndices_WhatToDo.Contains keyIdx) then
+                        arg_OtherArgs.Add key
+
+                        if not (consumedArgIndices_WhatToDo.Contains idx) then
+                            arg_OtherArgs.Add arg
+
+                        go ParseState_Args.AwaitingArg rest
+
+        args |> List.mapi (fun i s -> (i, s)) |> go ParseState_Args.AwaitingArg
+
+        //----------------------------------------------------------------------
+        // Final Validation and Assembly (Uses new Assemble methods)
+        //----------------------------------------------------------------------
+        let viableWinners = candidates_WhatToDo |> List.filter (fun c -> c.IsViable)
+        // No longer filter based on IsComplete here; Assemble handles it.
+        // Still need to check for relative leftovers if that logic were implemented.
+
+        let whatToDoResult =
+            match viableWinners with
+            | [] ->
+                // Add specific errors from candidates that were viable *before* Assemble check
+                ArgParser_errors.Add ("No valid parse found for 'WhatToDo'.")
+
+                candidates_WhatToDo
+                |> List.iter (fun c ->
+                    if c.Errors.Count <> 0 then
+                        ArgParser_errors.Add (
+                            sprintf "  Candidate %s parse errors: %s" c.CaseName (String.concat "; " c.Errors)
+                        )
+                // Potentially try to Assemble even non-viable ones to get completion errors? Maybe too complex.
+                )
+
+                Unchecked.defaultof<_> // Error path
+
+            | [ winner ] ->
+                // Assemble the winning case, checking the Result for completion errors
+                match winner.CaseName with
+                | "Mode1" ->
+                    match (winner.CaseState :?> State_Mode1).Assemble () with
+                    | Ok mode1Value -> Modes.Mode1 mode1Value
+                    | Error completionErrors ->
+                        ArgParser_errors.Add (sprintf "Validation failed for selected candidate Mode1:")
+                        ArgParser_errors.AddRange completionErrors
+                        Unchecked.defaultof<_> // Error path
+                | "Mode2" ->
+                    match (winner.CaseState :?> State_Mode2).Assemble () with
+                    | Ok mode2Value -> Modes.Mode2 mode2Value
+                    | Error completionErrors ->
+                        ArgParser_errors.Add (sprintf "Validation failed for selected candidate Mode2:")
+                        ArgParser_errors.AddRange completionErrors
+                        Unchecked.defaultof<_> // Error path
+                | _ -> failwith "Internal error: Unknown winning case name"
+
+            | winners -> // Ambiguous parse
+                ArgParser_errors.Add ("Ambiguous parse for 'WhatToDo'. Multiple modes potentially viable:")
+
+                winners
+                |> List.iter (fun c ->
+                    ArgParser_errors.Add (
+                        sprintf
+                            "  - %s (Initial Errors: %s)"
+                            c.CaseName
+                            (if c.Errors.Count = 0 then
+                                 "None"
+                             else
+                                 String.concat "; " c.Errors)
+                    )
+                )
+
+                Unchecked.defaultof<_> // Error path
+
+        // Finalize OtherArgs (unchanged)
+        let otherArgsResult = arg_OtherArgs |> Seq.toList
+
+        // Assemble Final Result or Fail (unchanged)
+        if ArgParser_errors.Count > 0 then
+            ArgParser_errors
+            |> String.concat "\n"
+            |> failwithf "Errors during parse!\n%s\n\nHelp Text:\n%s" (helpText ())
+        else
+            {
+                WhatToDo = whatToDoResult
+                OtherArgs = otherArgsResult
+            }
+
+    let parse (args : string list) : Args =
+        parse' System.Environment.GetEnvironmentVariable args

Playground/Playground.fsproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+      <OutputType>Exe</OutputType>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Include="Domain.fs" />
+        <Compile Include="Library.fs"/>
+        <Compile Include="Program.fs" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\WoofWare.Myriad.Plugins.Attributes\WoofWare.Myriad.Plugins.Attributes.fsproj" />
+    </ItemGroup>
+
+</Project>

Playground/Program.fs

@@ -0,0 +1,10 @@
+namespace Playground
+
+module Program =
+    [<EntryPoint>]
+    let main argv =
+        [ "--whatnot=2024-01-12" ; "--info1=4" ; "--info2=hi" ]
+        |> Args.parse
+        |> printfn "%O"
+
+        0

README.md

@@ -13,7 +13,7 @@ Currently implemented:
 * `JsonParse` (to stamp out `jsonParse : JsonNode -> 'T` methods).
 * `JsonSerialize` (to stamp out `toJsonNode : 'T -> JsonNode` methods).
 * `HttpClient` (to stamp out a [RestEase](https://github.com/canton7/RestEase)-style HTTP client).
-* `GenerateMock` and `GenerateCapturingMock` (to stamp out a record type corresponding to an interface, like a compile-time [Foq](https://github.com/fsprojects/Foq)).
+* `GenerateMock` (to stamp out a record type corresponding to an interface, like a compile-time [Foq](https://github.com/fsprojects/Foq)).
 * `ArgParser` (to stamp out a basic argument parser).
 * `SwaggerClient` (to stamp out an HTTP client for a Swagger API).
 * `CreateCatamorphism` (to stamp out a non-stack-overflowing [catamorphism](https://fsharpforfunandprofit.com/posts/recursive-types-and-folds/) for a discriminated union).
@@ -136,7 +136,7 @@ module InnerTypeWithBoth =
                         ret.Add (key.ToString (), System.Text.Json.Nodes.JsonValue.Create<Uri> value)
 
                     ret
-                ) input.ReadOnlyDict
+                ) input.Map
             )
 
         node
@@ -440,9 +440,9 @@ There are also some design decisions:
   so arguments are forced to be tupled.
 * The `[<Optional>]` attribute is not supported and will probably not be supported, because I consider it to be cursed.
 
-## `GenerateMock` and `GenerateCapturingMock`
+## `GenerateMock`
 
-`GenerateMock` takes a type like this:
+Takes a type like this:
 
 ```fsharp
 [<GenerateMock>]
@@ -472,59 +472,6 @@ type internal PublicTypeMock =
         member this.Mem2 (arg0) = this.Mem2 (arg0)
 ```
 
-`GenerateCapturingMock` additionally captures the calls made to each function (except for `Dispose`).
-It takes a type like this:
-
-```fsharp
-[<GenerateCapturingMock>]
-type IPublicType =
-    abstract Mem1 : string * int -> thing : bool -> string list
-    abstract Mem2 : baz : string -> unit -> int
-```
-
-and stamps out types like this:
-
-```fsharp
-[<RequireQualifiedAccess>]
-module internal PublicTypeCalls =
-    type internal Mem1Call =
-        {
-            Arg0 : string * int
-            thing : bool
-        }
-
-    type internal Calls =
-        {
-            Mem1 : ResizeArray<Mem1Call>
-            Mem2 : ResizeArray<string>
-        }
-
-        static member Empty () = { Mem1 = ResizeArray () ; Mem2 = ResizeArray () }
-
-/// Mock record type for an interface
-type internal PublicTypeMock =
-    {
-        Mem1 : string * int -> bool -> string list
-        Mem2 : string -> int
-        Calls : PublicTypeCalls.Calls
-    }
-
-    static member Empty : PublicTypeMock =
-        {
-            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
-            Calls = PublicTypeMockCalls.Calls.Empty ()
-        }
-
-    interface IPublicType with
-        member this.Mem1 (arg0, arg1) =
-            lock this.Calls.Mem1 (fun () -> this.Calls.Mem1.Add { Arg0 = arg0 ; thing = arg1 })
-            this.Mem1 (arg0, arg1)
-        member this.Mem2 (arg0) =
-            lock this.Calls.Mem2 (fun () -> this.Calls.Mem2.Add arg0)
-            this.Mem2 (arg0)
-```
-
 ### What's the point?
 
 Reflective mocking libraries like [Foq](https://github.com/fsprojects/Foq) in my experience are a rich source of flaky tests.
@@ -536,36 +483,6 @@ thereby allowing the programmer to use F#'s record-update syntax.
 
 * You may supply an `isInternal : bool` argument to the attribute. By default, we make the resulting record type at most internal (never public), since this is intended only to be used in tests; but you can instead make it public with `[<GenerateMock false>]`.
 
-### Gotchas (GenerateCapturingMock)
-
-We use the same name for the record field as the implementing interface member:
-
-```fsharp
-type FooMock =
-    {
-        Field : string -> unit
-    }
-    interface IFoo with
-        member _.Field x = ...
-```
-
-If you have an object of type `FooMock` in scope, you'll get the *record field*, not the *interface member*.
-You need to cast it to `IFoo` before using it (or pass it into a function which takes an `IFoo`):
-
-```fsharp
-let thing = FooMock.Empty () // of type FooMock
-thing.Field "hello" // the wrong one! bypasses the IFoo implementation which captures calls
-
-// correct:
-let thing' = FooMock.Empty ()
-let thing = thing' :> IFoo
-thing.Field "hello" // the right one: this call does get recorded in the mock, because this is the interface member
-
-// also correct, but beware because it leaves the chance of the above footgun lying around for later:
-let thing = FooMock.Empty () // of type FooMock
-doTheThing thing // where doTheThing : IFoo -> unit
-```
-
 ## `CreateCatamorphism`
 
 Takes a collection of mutually recursive discriminated unions:
@@ -652,13 +569,13 @@ For example, [PureGymDto.fs](./ConsumePlugin/PureGymDto.fs) is a real-world set
 * In your `.fsproj` file, define a helper variable so that subsequent steps don't all have to be kept in sync:
     ```xml
     <PropertyGroup>
-      <WoofWareMyriadPluginVersion>9.0.1</WoofWareMyriadPluginVersion>
+      <WoofWareMyriadPluginVersion>2.0.1</WoofWareMyriadPluginVersion>
     </PropertyGroup>
     ```
 * Take a reference on `WoofWare.Myriad.Plugins.Attributes` (which has no other dependencies), to obtain access to the attributes which the generator will recognise:
     ```xml
     <ItemGroup>
-        <PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="3.7.2" />
+        <PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="2.0.2" />
     </ItemGroup>
     ```
 * Take a reference (with private assets, to prevent these from propagating to your own assembly) on `WoofWare.Myriad.Plugins`, to obtain the plugins which Myriad will run, and on `Myriad.Sdk`, to obtain the Myriad binary itself:
@@ -730,7 +647,3 @@ I'm hopefully going to get round to writing a more powerful source generation sy
   You should probably add these files to your [fantomasignore](https://github.com/fsprojects/fantomas/blob/a999b77ca5a024fbc3409955faac797e29b39d27/docs/docs/end-users/IgnoreFiles.md)
   if you use Fantomas to format your repo;
   the alternative is to manually reformat every time Myriad changes the generated files.
-
-# Licence
-
-The code is MIT-licenced, except for the Swagger API examples in WoofWare.Myriad.Plugins.Test, which are [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/), copyright 2023 by the OpenAPI Initiative, and obtained from https://learn.openapis.org/examples/ with no changes made.

WoofWare.Myriad.Plugins.Attributes/Attributes.fs

@@ -14,9 +14,6 @@ type RemoveOptionsAttribute () =
 /// but where each method is represented as a record field, so you can use
 /// record update syntax to easily specify partially-implemented mock objects.
 /// You may optionally specify `isInternal = false` to get a mock with the public visibility modifier.
-///
-/// The default implementation of each field throws (except for default implementations of IDisposable, which are
-/// no-ops).
 type GenerateMockAttribute (isInternal : bool) =
     inherit Attribute ()
     /// The default value of `isInternal`, the optional argument to the GenerateMockAttribute constructor.
@@ -25,26 +22,6 @@ type GenerateMockAttribute (isInternal : bool) =
     /// Shorthand for the "isExtensionMethod = false" constructor; see documentation there for details.
     new () = GenerateMockAttribute GenerateMockAttribute.DefaultIsInternal
 
-/// Attribute indicating an interface type for which the "Generate Capturing Mock" Myriad
-/// generator should apply during build.
-/// This generator creates a record which implements the interface,
-/// but where each method is represented as a record field, so you can use
-/// record update syntax to easily specify partially-implemented mock objects.
-/// You may optionally specify `isInternal = false` to get a mock with the public visibility modifier.
-///
-/// The default implementation of each field throws.
-///
-/// The generated interface methods capture all calls made to them, before passing through to the relevant
-/// field of the mock record; the calls can be accessed later through the `Calls` field of the generated
-/// mock record.
-type GenerateCapturingMockAttribute (isInternal : bool) =
-    inherit Attribute ()
-    /// The default value of `isInternal`, the optional argument to the GenerateCapturingMockAttribute constructor.
-    static member DefaultIsInternal = true
-
-    /// Shorthand for the "isExtensionMethod = false" constructor; see documentation there for details.
-    new () = GenerateCapturingMockAttribute GenerateCapturingMockAttribute.DefaultIsInternal
-
 /// Attribute indicating a record type to which the "Add JSON serializer" Myriad
 /// generator should apply during build.
 /// The purpose of this generator is to create methods (possibly extension methods) of the form

WoofWare.Myriad.Plugins.Attributes/SurfaceBaseline.txt

@@ -15,11 +15,6 @@ WoofWare.Myriad.Plugins.ArgumentLongForm inherit System.Attribute
 WoofWare.Myriad.Plugins.ArgumentLongForm..ctor [constructor]: string
 WoofWare.Myriad.Plugins.CreateCatamorphismAttribute inherit System.Attribute
 WoofWare.Myriad.Plugins.CreateCatamorphismAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.GenerateCapturingMockAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.GenerateCapturingMockAttribute..ctor [constructor]: bool
-WoofWare.Myriad.Plugins.GenerateCapturingMockAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.GenerateCapturingMockAttribute.DefaultIsInternal [static property]: [read-only] bool
-WoofWare.Myriad.Plugins.GenerateCapturingMockAttribute.get_DefaultIsInternal [static method]: unit -> bool
 WoofWare.Myriad.Plugins.GenerateMockAttribute inherit System.Attribute
 WoofWare.Myriad.Plugins.GenerateMockAttribute..ctor [constructor]: bool
 WoofWare.Myriad.Plugins.GenerateMockAttribute..ctor [constructor]: unit

WoofWare.Myriad.Plugins.Attributes/Test/WoofWare.Myriad.Plugins.Attributes.Test.fsproj

@@ -17,8 +17,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="ApiSurface" Version="5.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
+        <PackageReference Include="ApiSurface" Version="4.1.20" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
         <PackageReference Include="NUnit" Version="4.3.2"/>
         <PackageReference Include="NUnit3TestAdapter" Version="5.0.0"/>
     </ItemGroup>

WoofWare.Myriad.Plugins.Attributes/version.json

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

WoofWare.Myriad.Plugins.Test/Assembly.fs

@@ -1,22 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open System
-open System.IO
-open System.Reflection
-
-[<RequireQualifiedAccess>]
-module Assembly =
-
-    let getEmbeddedResource (assembly : Assembly) (name : string) : string =
-        let names = assembly.GetManifestResourceNames ()
-
-        let names =
-            names |> Seq.filter (fun s -> s.EndsWith (name, StringComparison.Ordinal))
-
-        use s =
-            names
-            |> Seq.exactlyOne
-            |> assembly.GetManifestResourceStream
-            |> fun s -> new StreamReader (s)
-
-        s.ReadToEnd ()

WoofWare.Myriad.Plugins.Test/TestArgParser/TestArgParser.fs

@@ -68,7 +68,7 @@ module TestArgParser =
 
         let getEnvVar (_ : string) =
             Interlocked.Increment envCalls |> ignore<int>
-            None
+            ""
 
         let args = [ "--foo=3" ; "--non-existent" ; "--bar=4" ; "--baz=true" ]
 
@@ -79,11 +79,8 @@ module TestArgParser =
 
         exc.Message
         |> shouldEqual
-            """Unable to process supplied arg --non-existent. Help text follows.
---foo  int32 : This is a foo!
---bar  string
---baz  bool
---rest  string (positional args) (can be repeated) : Here's where the rest of the args go"""
+            """Errors during parse!
+Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `--rest=` syntax, or place them after a trailing `--`. --non-existent"""
 
     [<Test>]
     let ``Can supply positional args with key`` () =
@@ -91,7 +88,7 @@ module TestArgParser =
 
         let getEnvVar (_ : string) =
             Interlocked.Increment envCalls |> ignore<int>
-            None
+            ""
 
         let property (args : (int * bool) list) (afterDoubleDash : int list option) =
             let flatArgs =
@@ -127,7 +124,7 @@ module TestArgParser =
 
         let getEnvVar (_ : string) =
             Interlocked.Increment envCalls |> ignore<int>
-            None
+            ""
 
         let args = [ "--foo=3" ; "--rest" ; "7" ; "--bar=4" ; "--baz=true" ; "--rest=8" ]
 
@@ -150,7 +147,7 @@ module TestArgParser =
 
         let getEnvVar (_ : string) =
             Interlocked.Increment envCalls |> ignore<int>
-            None
+            ""
 
         let args = [ "--foo=3" ; "--foo" ; "9" ; "--bar=4" ; "--baz=true" ; "--baz=false" ]
 
@@ -171,7 +168,7 @@ Argument '--baz' was supplied multiple times: True and false"""
 
         let getEnvVar (_ : string) =
             Interlocked.Increment envCalls |> ignore<int>
-            None
+            ""
 
         let args = [ "--" ; "--foo=3" ; "--bar=4" ; "--baz=true" ]
 
@@ -191,7 +188,7 @@ Required argument '--baz' received no value"""
     let ``Help text`` () =
         let getEnvVar (s : string) =
             s |> shouldEqual "CONSUMEPLUGIN_THINGS"
-            Some "hi!"
+            "hi!"
 
         let exc =
             Assert.Throws<exn> (fun () -> Basic.parse' getEnvVar [ "--help" ] |> ignore<Basic>)
@@ -210,7 +207,7 @@ Required argument '--baz' received no value"""
 
         let getEnvVar (_ : string) =
             Interlocked.Increment envVars |> ignore<int>
-            None
+            ""
 
         let exc =
             Assert.Throws<exn> (fun () -> LoadsOfTypes.parse' getEnvVar [ "--help" ] |> ignore<LoadsOfTypes>)
@@ -236,7 +233,7 @@ Required argument '--baz' received no value"""
     let ``Default values`` () =
         let getEnvVar (s : string) =
             s |> shouldEqual "CONSUMEPLUGIN_THINGS"
-            Some "hi!"
+            "hi!"
 
         let args =
             [
@@ -264,7 +261,7 @@ Required argument '--baz' received no value"""
 
         let getEnvVar (_ : string) =
             Interlocked.Increment count |> ignore<int>
-            None
+            ""
 
         let exc =
             Assert.Throws<exn> (fun () -> DatesAndTimes.parse' getEnvVar [ "--help" ] |> ignore<DatesAndTimes>)
@@ -285,7 +282,7 @@ Required argument '--baz' received no value"""
 
         let getEnvVar (_ : string) =
             Interlocked.Increment count |> ignore<int>
-            None
+            ""
 
         let parsed =
             DatesAndTimes.parse'
@@ -318,8 +315,7 @@ Required argument '--baz' received no value"""
         exc.Message
         |> shouldEqual
             """Errors during parse!
-Input string was not in a correct format. (at arg --invariant-exact=23:59)
-Required argument '--invariant-exact' received no value"""
+Input string was not in a correct format. (at arg --invariant-exact=23:59)"""
 
         let exc =
             Assert.Throws<exn> (fun () ->
@@ -337,8 +333,7 @@ Required argument '--invariant-exact' received no value"""
         exc.Message
         |> shouldEqual
             """Errors during parse!
-Input string was not in a correct format. (at arg --exact=11:34)
-Required argument '--exact' received no value"""
+Input string was not in a correct format. (at arg --exact=11:34)"""
 
         count.Value |> shouldEqual 0
 
@@ -444,11 +439,11 @@ Required argument '--exact' received no value"""
         ]
         |> List.map TestCaseData
 
-    [<TestCaseSource(nameof (boolCases))>]
+    [<TestCaseSource(nameof boolCases)>]
     let ``Bool env vars can be populated`` (envValue : string, boolValue : bool) =
         let getEnvVar (s : string) =
             s |> shouldEqual "CONSUMEPLUGIN_THINGS"
-            Some envValue
+            envValue
 
         ContainsBoolEnvVar.parse' getEnvVar []
         |> shouldEqual
@@ -470,7 +465,7 @@ Required argument '--exact' received no value"""
     let ``Flag DUs can be parsed from env var`` (envValue : string, boolValue : bool) =
         let getEnvVar (s : string) =
             s |> shouldEqual "CONSUMEPLUGIN_THINGS"
-            Some envValue
+            envValue
 
         let boolValue = if boolValue then DryRunMode.Dry else DryRunMode.Wet
 
@@ -604,7 +599,10 @@ Required argument '--exact' received no value"""
             )
 
         exc.Message
-        |> shouldEqual """Unable to process argument --do-the-thing=foo as key --do-the-thing and value foo"""
+        |> shouldEqual
+            """Errors during parse!
+Required argument '--do-something-else' received no value
+Required argument '--turn-it-on' received no value"""
 
     [<Test>]
     let ``Long-form args help text`` () =
@@ -692,7 +690,9 @@ Required argument '--exact' received no value"""
             )
 
         exc.Message
-        |> shouldEqual """Unable to process argument --b=false as key --b and value false"""
+        |> shouldEqual
+            """Errors during parse!
+Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `--dont-grab-everything=` syntax, or place them after a trailing `--`. --b=false --c"""
 
         let exc =
             Assert.Throws<exn> (fun () ->
@@ -703,4 +703,6 @@ Required argument '--exact' received no value"""
         // Again perhaps eccentric!
         // Again, we don't try to detect that the user has missed out the desired argument to `--a`.
         exc.Message
-        |> shouldEqual """Unable to process argument --c=hi as key --c and value hi"""
+        |> shouldEqual
+            """Errors during parse!
+Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `--my-arg-name=` syntax, or place them after a trailing `--`. --c=hi"""

WoofWare.Myriad.Plugins.Test/TestArgParser/TestArgsWithUnions.fs

@@ -0,0 +1,21 @@
+namespace WoofWare.Myriad.Plugins.Test
+
+open FsUnitTyped
+open NUnit.Framework
+open ConsumePlugin.ArgsWithUnions
+
+[<TestFixture>]
+module TestArgsWithUnions =
+
+    let argsWithUnionsCases =
+        [
+            ["--token" ; "hello" ; "--foo" ; "3" ; "--bar=hi" ; "--baz"], { Auth = AuthOptions.Token { Token = "hello" } ; Basics = { Foo = 3 ; Bar = "hi" ; Baz = true ; Rest = [] } }
+        ]
+        |> List.map TestCaseData
+
+    [<TestCaseSource (nameof argsWithUnionsCases)>]
+    let ``foo`` (args : string list, expected : DoTheThing) : unit =
+        args
+        |> DoTheThing.parse' (fun _ -> failwith "didn't expect env var")
+        |> shouldEqual expected
+

WoofWare.Myriad.Plugins.Test/TestCapturingMockGenerator/TestCapturingMockGenerator.fs

@@ -1,72 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open System
-open SomeNamespace.CapturingMock
-open NUnit.Framework
-open FsUnitTyped
-
-[<TestFixture>]
-module TestCapturingMockGenerator =
-
-    [<Test>]
-    let ``Example of use: IPublicType`` () =
-        let mock : IPublicType =
-            { PublicTypeMock.Empty () with
-                Mem1 = fun (s, count) -> List.replicate count s
-            }
-            :> _
-
-        let _ =
-            Assert.Throws<NotImplementedException> (fun () -> mock.Mem2 "hi" |> ignore<int>)
-
-        mock.Mem1 ("hi", 3) |> shouldEqual [ "hi" ; "hi" ; "hi" ]
-
-    [<Test>]
-    let ``Example of use: curried args`` () =
-        let mock : Curried<_> =
-            { CurriedMock.Empty () with
-                Mem1 = fun i c -> Array.replicate i c |> String
-                Mem2 = fun (i, s) c -> String.concat $"%c{c}" (List.replicate i s)
-                Mem3 = fun (i, s) c -> String.concat $"%c{c}" (List.replicate i s)
-            }
-            :> _
-
-        mock.Mem1 3 'a' |> shouldEqual "aaa"
-        mock.Mem2 (3, "hi") 'a' |> shouldEqual "hiahiahi"
-        mock.Mem3 (3, "hi") 'a' |> shouldEqual "hiahiahi"
-
-    [<Test>]
-    let ``Example of use: properties`` () =
-        let mock : TypeWithProperties =
-            { TypeWithPropertiesMock.Empty () with
-                Mem1 = fun i -> async { return Option.toArray i }
-                Prop1 = fun () -> 44
-            }
-            :> _
-
-        mock.Mem1 (Some "hi") |> Async.RunSynchronously |> shouldEqual [| "hi" |]
-
-        mock.Prop1 |> shouldEqual 44
-
-    [<Test>]
-    let ``Example of curried use`` () =
-        let mock' =
-            { CurriedMock<string>.Empty () with
-                Mem1 =
-                    fun x y ->
-                        x |> shouldEqual 3
-                        y |> shouldEqual "hello"
-                        "it's me"
-            }
-
-        let mock = mock' :> Curried<_>
-
-        mock.Mem1 3 "hello" |> shouldEqual "it's me"
-
-        lock mock'.Calls.Mem1 (fun () -> Seq.toList mock'.Calls.Mem1)
-        |> List.exactlyOne
-        |> shouldEqual
-            {
-                bar = 3
-                Arg1 = "hello"
-            }

WoofWare.Myriad.Plugins.Test/TestCapturingMockGenerator/TestCapturingMockGeneratorNoAttr.fs

@@ -1,36 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open System
-open SomeNamespace.CapturingMock
-open NUnit.Framework
-open FsUnitTyped
-
-[<TestFixture>]
-module TestCapturingMockGeneratorNoAttr =
-
-    [<Test>]
-    let ``Example of use: IPublicType`` () =
-        let mock : IPublicTypeNoAttr =
-            { PublicTypeNoAttrMock.Empty () with
-                Mem1 = fun (s, count) -> List.replicate count s
-            }
-            :> _
-
-        let _ =
-            Assert.Throws<NotImplementedException> (fun () -> mock.Mem2 "hi" |> ignore<int>)
-
-        mock.Mem1 ("hi", 3) |> shouldEqual [ "hi" ; "hi" ; "hi" ]
-
-    [<Test>]
-    let ``Example of use: curried args`` () =
-        let mock : CurriedNoAttr<_> =
-            { CurriedNoAttrMock.Empty () with
-                Mem1 = fun i c -> Array.replicate i c |> String
-                Mem2 = fun (i, s) c -> String.concat $"%c{c}" (List.replicate i s)
-                Mem3 = fun (i, s) c -> String.concat $"%c{c}" (List.replicate i s)
-            }
-            :> _
-
-        mock.Mem1 3 'a' |> shouldEqual "aaa"
-        mock.Mem2 (3, "hi") 'a' |> shouldEqual "hiahiahi"
-        mock.Mem3 (3, "hi") 'a' |> shouldEqual "hiahiahi"

WoofWare.Myriad.Plugins.Test/TestHttpClient/TestVariableHeader.fs

@@ -3,12 +3,10 @@ namespace WoofWare.Myriad.Plugins.Test
 open System
 open System.Net
 open System.Net.Http
-open System.Text.Json.Nodes
 open System.Threading
 open NUnit.Framework
 open FsUnitTyped
 open PureGym
-open WoofWare.Expect
 
 [<TestFixture>]
 module TestVariableHeader =
@@ -52,17 +50,15 @@ module TestVariableHeader =
         someHeaderCount.Value |> shouldEqual 10
         someOtherHeaderCount.Value |> shouldEqual -100
 
-        expect {
-            snapshotJson
-                @"[
-  ""Authorization: -99"",
-  ""Header-Name: Header-Value"",
-  ""Something-Else: val"",
-  ""X-Foo: 11""
-]"
-
-            return api.GetPathParam("param").Result.Split "\n" |> Array.sort
-        }
+        api.GetPathParam("param").Result.Split "\n"
+        |> Array.sort
+        |> shouldEqual
+            [|
+                "Authorization: -99"
+                "Header-Name: Header-Value"
+                "Something-Else: val"
+                "X-Foo: 11"
+            |]
 
         someHeaderCount.Value |> shouldEqual 11
         someOtherHeaderCount.Value |> shouldEqual -99
@@ -106,156 +102,25 @@ module TestVariableHeader =
         someHeaderCount.Value |> shouldEqual 10
         someOtherHeaderCount.Value |> shouldEqual -100
 
-        expect {
-            snapshotJson
-                @"[
-  ""Authorization: -99"",
-  ""Header-Name: Header-Value"",
-  ""Something-Else: val"",
-  ""X-Foo: 11""
-]"
+        api.GetPathParam("param").Result.Split "\n"
+        |> Array.sort
+        |> shouldEqual
+            [|
+                "Authorization: -99"
+                "Header-Name: Header-Value"
+                "Something-Else: val"
+                "X-Foo: 11"
+            |]
 
-            return api.GetPathParam("param").Result.Split "\n" |> Array.sort
-        }
-
-        expect {
-            snapshotJson
-                @"[
-  ""Authorization: -98"",
-  ""Header-Name: Header-Value"",
-  ""Something-Else: val"",
-  ""X-Foo: 12""
-]"
-
-            return api.GetPathParam("param").Result.Split "\n" |> Array.sort
-        }
+        api.GetPathParam("param").Result.Split "\n"
+        |> Array.sort
+        |> shouldEqual
+            [|
+                "Authorization: -98"
+                "Header-Name: Header-Value"
+                "Something-Else: val"
+                "X-Foo: 12"
+            |]
 
         someHeaderCount.Value |> shouldEqual 12
         someOtherHeaderCount.Value |> shouldEqual -98
-
-    let pureGymMember =
-        {
-            Id = 3
-            CompoundMemberId = "compound"
-            FirstName = "Patrick"
-            LastName = "Stevens"
-            HomeGymId = 1223
-            HomeGymName = "Arnie's Temple o' Gainz"
-            EmailAddress = "patrick@home"
-            GymAccessPin = "1234"
-            DateOfBirth = DateOnly (1992, 03, 04)
-            MobileNumber = "number"
-            Postcode = "postcode"
-            MembershipName = "member"
-            MembershipLevel = 9999
-            SuspendedReason = -1
-            MemberStatus = 100
-        }
-
-    [<Test>]
-    let ``Content-Type header is automatically inserted`` () =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Post
-
-                message.RequestUri.ToString ()
-                |> shouldEqual "https://example.com/endpoint/param"
-
-                let headers =
-                    [
-                        for h in message.Content.Headers do
-                            yield $"%s{h.Key}: %s{Seq.exactlyOne h.Value}"
-                    ]
-                    |> String.concat "\n"
-
-                let! ct = Async.CancellationToken
-                let! content = message.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                content |> JsonNode.Parse |> Member.jsonParse |> shouldEqual pureGymMember
-
-                let content = new StringContent (headers)
-                let resp = new HttpResponseMessage (HttpStatusCode.OK)
-                resp.Content <- content
-                return resp
-            }
-
-        use client = HttpClientMock.make (Uri "https://example.com") proc
-
-        let api = ClientWithJsonBody.make client
-        let result = api.GetPathParam ("param", pureGymMember) |> _.Result
-
-        expect {
-            snapshot @"Content-Type: application/json; charset=utf-8"
-            return result
-        }
-
-    [<Test>]
-    let ``Content-Type header is respected if overridden`` () =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Post
-
-                message.RequestUri.ToString ()
-                |> shouldEqual "https://example.com/endpoint/param"
-
-                let headers =
-                    [
-                        for h in message.Content.Headers do
-                            yield $"%s{h.Key}: %s{Seq.exactlyOne h.Value}"
-                    ]
-                    |> String.concat "\n"
-
-                let! ct = Async.CancellationToken
-                let! content = message.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                content |> JsonNode.Parse |> Member.jsonParse |> shouldEqual pureGymMember
-
-                let content = new StringContent (headers)
-                let resp = new HttpResponseMessage (HttpStatusCode.OK)
-                resp.Content <- content
-                return resp
-            }
-
-        use client = HttpClientMock.make (Uri "https://example.com") proc
-
-        let api = ClientWithJsonBodyOverridden.make client
-        let result = api.GetPathParam ("param", pureGymMember) |> _.Result
-
-        expect {
-            snapshot @"Content-Type: application/ecmascript; charset=utf-8"
-            return result
-        }
-
-    [<Test>]
-    let ``Content-Type header is the default for strings`` () =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Post
-
-                message.RequestUri.ToString ()
-                |> shouldEqual "https://example.com/endpoint/param"
-
-                let headers =
-                    [
-                        for h in message.Content.Headers do
-                            yield $"%s{h.Key}: %s{Seq.exactlyOne h.Value}"
-                    ]
-                    |> String.concat "\n"
-
-                let! ct = Async.CancellationToken
-                let! content = message.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                content |> shouldEqual "hello!"
-
-                let content = new StringContent (headers)
-                let resp = new HttpResponseMessage (HttpStatusCode.OK)
-                resp.Content <- content
-                return resp
-            }
-
-        use client = HttpClientMock.make (Uri "https://example.com") proc
-
-        let api = ClientWithStringBody.make client
-        let result = api.GetPathParam ("param", "hello!") |> _.Result
-
-        expect {
-            snapshot @"Content-Type: text/plain; charset=utf-8"
-            return result
-        }

WoofWare.Myriad.Plugins.Test/TestSwagger/TestSwaggerParse.fs

@@ -3,7 +3,7 @@ namespace WoofWare.Myriad.Plugins.Test
 open System.Text.Json.Nodes
 open NUnit.Framework
 open FsUnitTyped
-open WoofWare.Myriad.Plugins.SwaggerV2
+open WoofWare.Myriad.Plugins
 
 [<TestFixture>]
 module TestSwaggerParse =

WoofWare.Myriad.Plugins.Test/TestSwagger/api-with-examples.json

@@ -1,192 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "info": {
-    "title": "Simple API overview",
-    "version": "2.0.0"
-  },
-  "paths": {
-    "/": {
-      "get": {
-        "operationId": "listVersionsv2",
-        "summary": "List API versions",
-        "responses": {
-          "200": {
-            "description": "200 response",
-            "content": {
-              "application/json": {
-                "examples": {
-                  "foo": {
-                    "value": {
-                      "versions": [
-                        {
-                          "status": "CURRENT",
-                          "updated": "2011-01-21T11:33:21Z",
-                          "id": "v2.0",
-                          "links": [
-                            {
-                              "href": "http://127.0.0.1:8774/v2/",
-                              "rel": "self"
-                            }
-                          ]
-                        },
-                        {
-                          "status": "EXPERIMENTAL",
-                          "updated": "2013-07-23T11:33:21Z",
-                          "id": "v3.0",
-                          "links": [
-                            {
-                              "href": "http://127.0.0.1:8774/v3/",
-                              "rel": "self"
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "300": {
-            "description": "300 response",
-            "content": {
-              "application/json": {
-                "examples": {
-                  "foo": {
-                    "value": {
-                      "versions": [
-                        {
-                          "status": "CURRENT",
-                          "updated": "2011-01-21T11:33:21Z",
-                          "id": "v2.0",
-                          "links": [
-                            {
-                              "href": "http://127.0.0.1:8774/v2/",
-                              "rel": "self"
-                            }
-                          ]
-                        },
-                        {
-                          "status": "EXPERIMENTAL",
-                          "updated": "2013-07-23T11:33:21Z",
-                          "id": "v3.0",
-                          "links": [
-                            {
-                              "href": "http://127.0.0.1:8774/v3/",
-                              "rel": "self"
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/v2": {
-      "get": {
-        "operationId": "getVersionDetailsv2",
-        "summary": "Show API version details",
-        "responses": {
-          "200": {
-            "description": "200 response",
-            "content": {
-              "application/json": {
-                "examples": {
-                  "foo": {
-                    "value": {
-                      "version": {
-                        "status": "CURRENT",
-                        "updated": "2011-01-21T11:33:21Z",
-                        "media-types": [
-                          {
-                            "base": "application/xml",
-                            "type": "application/vnd.openstack.compute+xml;version=2"
-                          },
-                          {
-                            "base": "application/json",
-                            "type": "application/vnd.openstack.compute+json;version=2"
-                          }
-                        ],
-                        "id": "v2.0",
-                        "links": [
-                          {
-                            "href": "http://127.0.0.1:8774/v2/",
-                            "rel": "self"
-                          },
-                          {
-                            "href": "http://docs.openstack.org/api/openstack-compute/2/os-compute-devguide-2.pdf",
-                            "type": "application/pdf",
-                            "rel": "describedby"
-                          },
-                          {
-                            "href": "http://docs.openstack.org/api/openstack-compute/2/wadl/os-compute-2.wadl",
-                            "type": "application/vnd.sun.wadl+xml",
-                            "rel": "describedby"
-                          },
-                          {
-                            "href": "http://docs.openstack.org/api/openstack-compute/2/wadl/os-compute-2.wadl",
-                            "type": "application/vnd.sun.wadl+xml",
-                            "rel": "describedby"
-                          }
-                        ]
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "203": {
-            "description": "203 response",
-            "content": {
-              "application/json": {
-                "examples": {
-                  "foo": {
-                    "value": {
-                      "version": {
-                        "status": "CURRENT",
-                        "updated": "2011-01-21T11:33:21Z",
-                        "media-types": [
-                          {
-                            "base": "application/xml",
-                            "type": "application/vnd.openstack.compute+xml;version=2"
-                          },
-                          {
-                            "base": "application/json",
-                            "type": "application/vnd.openstack.compute+json;version=2"
-                          }
-                        ],
-                        "id": "v2.0",
-                        "links": [
-                          {
-                            "href": "http://23.253.228.211:8774/v2/",
-                            "rel": "self"
-                          },
-                          {
-                            "href": "http://docs.openstack.org/api/openstack-compute/2/os-compute-devguide-2.pdf",
-                            "type": "application/pdf",
-                            "rel": "describedby"
-                          },
-                          {
-                            "href": "http://docs.openstack.org/api/openstack-compute/2/wadl/os-compute-2.wadl",
-                            "type": "application/vnd.sun.wadl+xml",
-                            "rel": "describedby"
-                          }
-                        ]
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

WoofWare.Myriad.Plugins.Test/TestSwagger/callback-example.json

@@ -1,82 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "info": {
-    "title": "Callback Example",
-    "version": "1.0.0"
-  },
-  "paths": {
-    "/streams": {
-      "post": {
-        "description": "subscribes a client to receive out-of-band data",
-        "parameters": [
-          {
-            "name": "callbackUrl",
-            "in": "query",
-            "required": true,
-            "description": "the location where data will be sent.  Must be network accessible\nby the source server\n",
-            "schema": {
-              "type": "string",
-              "format": "uri",
-              "example": "https://tonys-server.com"
-            }
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "subscription successfully created",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "description": "subscription information",
-                  "required": ["subscriptionId"],
-                  "properties": {
-                    "subscriptionId": {
-                      "description": "this unique identifier allows management of the subscription",
-                      "type": "string",
-                      "example": "2531329f-fb09-4ef7-887e-84e648214436"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "callbacks": {
-          "onData": {
-            "{$request.query.callbackUrl}/data": {
-              "post": {
-                "requestBody": {
-                  "description": "subscription payload",
-                  "content": {
-                    "application/json": {
-                      "schema": {
-                        "type": "object",
-                        "properties": {
-                          "timestamp": {
-                            "type": "string",
-                            "format": "date-time"
-                          },
-                          "userData": {
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "responses": {
-                  "202": {
-                    "description": "Your server implementation should return this HTTP status code\nif the data was received successfully\n"
-                  },
-                  "204": {
-                    "description": "Your server should return this HTTP status code if no longer interested\nin further updates\n"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

WoofWare.Myriad.Plugins.Test/TestSwagger/link-example.json

@@ -1,319 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "info": {
-    "title": "Link Example",
-    "version": "1.0.0"
-  },
-  "paths": {
-    "/2.0/users/{username}": {
-      "get": {
-        "operationId": "getUserByName",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The User",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/user"
-                }
-              }
-            },
-            "links": {
-              "userRepositories": {
-                "$ref": "#/components/links/UserRepositories"
-              }
-            }
-          }
-        }
-      }
-    },
-    "/2.0/repositories/{username}": {
-      "get": {
-        "operationId": "getRepositoriesByOwner",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "repositories owned by the supplied user",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/repository"
-                  }
-                }
-              }
-            },
-            "links": {
-              "userRepository": {
-                "$ref": "#/components/links/UserRepository"
-              }
-            }
-          }
-        }
-      }
-    },
-    "/2.0/repositories/{username}/{slug}": {
-      "get": {
-        "operationId": "getRepository",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "slug",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The repository",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/repository"
-                }
-              }
-            },
-            "links": {
-              "repositoryPullRequests": {
-                "$ref": "#/components/links/RepositoryPullRequests"
-              }
-            }
-          }
-        }
-      }
-    },
-    "/2.0/repositories/{username}/{slug}/pullrequests": {
-      "get": {
-        "operationId": "getPullRequestsByRepository",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "slug",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "state",
-            "in": "query",
-            "schema": {
-              "type": "string",
-              "enum": ["open", "merged", "declined"]
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "an array of pull request objects",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/pullrequest"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/2.0/repositories/{username}/{slug}/pullrequests/{pid}": {
-      "get": {
-        "operationId": "getPullRequestsById",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "slug",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "pid",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "a pull request object",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/pullrequest"
-                }
-              }
-            },
-            "links": {
-              "pullRequestMerge": {
-                "$ref": "#/components/links/PullRequestMerge"
-              }
-            }
-          }
-        }
-      }
-    },
-    "/2.0/repositories/{username}/{slug}/pullrequests/{pid}/merge": {
-      "post": {
-        "operationId": "mergePullRequest",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "slug",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "pid",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "the PR was successfully merged"
-          }
-        }
-      }
-    }
-  },
-  "components": {
-    "links": {
-      "UserRepositories": {
-        "operationId": "getRepositoriesByOwner",
-        "parameters": {
-          "username": "$response.body#/username"
-        }
-      },
-      "UserRepository": {
-        "operationId": "getRepository",
-        "parameters": {
-          "username": "$response.body#/owner/username",
-          "slug": "$response.body#/slug"
-        }
-      },
-      "RepositoryPullRequests": {
-        "operationId": "getPullRequestsByRepository",
-        "parameters": {
-          "username": "$response.body#/owner/username",
-          "slug": "$response.body#/slug"
-        }
-      },
-      "PullRequestMerge": {
-        "operationId": "mergePullRequest",
-        "parameters": {
-          "username": "$response.body#/author/username",
-          "slug": "$response.body#/repository/slug",
-          "pid": "$response.body#/id"
-        }
-      }
-    },
-    "schemas": {
-      "user": {
-        "type": "object",
-        "properties": {
-          "username": {
-            "type": "string"
-          },
-          "uuid": {
-            "type": "string"
-          }
-        }
-      },
-      "repository": {
-        "type": "object",
-        "properties": {
-          "slug": {
-            "type": "string"
-          },
-          "owner": {
-            "$ref": "#/components/schemas/user"
-          }
-        }
-      },
-      "pullrequest": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "integer"
-          },
-          "title": {
-            "type": "string"
-          },
-          "repository": {
-            "$ref": "#/components/schemas/repository"
-          },
-          "author": {
-            "$ref": "#/components/schemas/user"
-          }
-        }
-      }
-    }
-  }
-}

WoofWare.Myriad.Plugins.Test/TestSwagger/non-oauth-scopes.json

@@ -1,28 +0,0 @@
-{
-  "openapi": "3.1.0",
-  "info": {
-    "title": "Non-oAuth Scopes example",
-    "version": "1.0.0"
-  },
-  "paths": {
-    "/users": {
-      "get": {
-        "security": [
-          {
-            "bearerAuth": ["read:users", "public"]
-          }
-        ]
-      }
-    }
-  },
-  "components": {
-    "securitySchemes": {
-      "bearerAuth": {
-        "type": "http",
-        "scheme": "bearer",
-        "bearerFormat": "jwt",
-        "description": "note: non-oauth scopes are not defined at the securityScheme level"
-      }
-    }
-  }
-}

WoofWare.Myriad.Plugins.Test/TestSwagger/petstore-expanded.json

@@ -1,235 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "info": {
-    "version": "1.0.0",
-    "title": "Swagger Petstore",
-    "description": "A sample API that uses a petstore as an example to demonstrate features in the OpenAPI 3.0 specification",
-    "termsOfService": "http://swagger.io/terms/",
-    "contact": {
-      "name": "Swagger API Team",
-      "email": "apiteam@swagger.io",
-      "url": "http://swagger.io"
-    },
-    "license": {
-      "name": "Apache 2.0",
-      "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
-    }
-  },
-  "servers": [
-    {
-      "url": "https://petstore.swagger.io/v2"
-    }
-  ],
-  "paths": {
-    "/pets": {
-      "get": {
-        "description": "Returns all pets from the system that the user has access to\nNam sed condimentum est. Maecenas tempor sagittis sapien, nec rhoncus sem sagittis sit amet. Aenean at gravida augue, ac iaculis sem. Curabitur odio lorem, ornare eget elementum nec, cursus id lectus. Duis mi turpis, pulvinar ac eros ac, tincidunt varius justo. In hac habitasse platea dictumst. Integer at adipiscing ante, a sagittis ligula. Aenean pharetra tempor ante molestie imperdiet. Vivamus id aliquam diam. Cras quis velit non tortor eleifend sagittis. Praesent at enim pharetra urna volutpat venenatis eget eget mauris. In eleifend fermentum facilisis. Praesent enim enim, gravida ac sodales sed, placerat id erat. Suspendisse lacus dolor, consectetur non augue vel, vehicula interdum libero. Morbi euismod sagittis libero sed lacinia.\n\nSed tempus felis lobortis leo pulvinar rutrum. Nam mattis velit nisl, eu condimentum ligula luctus nec. Phasellus semper velit eget aliquet faucibus. In a mattis elit. Phasellus vel urna viverra, condimentum lorem id, rhoncus nibh. Ut pellentesque posuere elementum. Sed a varius odio. Morbi rhoncus ligula libero, vel eleifend nunc tristique vitae. Fusce et sem dui. Aenean nec scelerisque tortor. Fusce malesuada accumsan magna vel tempus. Quisque mollis felis eu dolor tristique, sit amet auctor felis gravida. Sed libero lorem, molestie sed nisl in, accumsan tempor nisi. Fusce sollicitudin massa ut lacinia mattis. Sed vel eleifend lorem. Pellentesque vitae felis pretium, pulvinar elit eu, euismod sapien.\n",
-        "operationId": "findPets",
-        "parameters": [
-          {
-            "name": "tags",
-            "in": "query",
-            "description": "tags to filter by",
-            "required": false,
-            "style": "form",
-            "schema": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          },
-          {
-            "name": "limit",
-            "in": "query",
-            "description": "maximum number of results to return",
-            "required": false,
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "pet response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/Pet"
-                  }
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Error"
-                }
-              }
-            }
-          }
-        }
-      },
-      "post": {
-        "description": "Creates a new pet in the store. Duplicates are allowed",
-        "operationId": "addPet",
-        "requestBody": {
-          "description": "Pet to add to the store",
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/NewPet"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "pet response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Pet"
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Error"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/pets/{id}": {
-      "get": {
-        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
-        "operationId": "find pet by id",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "description": "ID of pet to fetch",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "pet response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Pet"
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Error"
-                }
-              }
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "deletes a single pet based on the ID supplied",
-        "operationId": "deletePet",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "description": "ID of pet to delete",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            }
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "pet deleted"
-          },
-          "default": {
-            "description": "unexpected error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Error"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  "components": {
-    "schemas": {
-      "Pet": {
-        "allOf": [
-          {
-            "$ref": "#/components/schemas/NewPet"
-          },
-          {
-            "type": "object",
-            "required": ["id"],
-            "properties": {
-              "id": {
-                "type": "integer",
-                "format": "int64"
-              }
-            }
-          }
-        ]
-      },
-      "NewPet": {
-        "type": "object",
-        "required": ["name"],
-        "properties": {
-          "name": {
-            "type": "string"
-          },
-          "tag": {
-            "type": "string"
-          }
-        }
-      },
-      "Error": {
-        "type": "object",
-        "required": ["code", "message"],
-        "properties": {
-          "code": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "message": {
-            "type": "string"
-          }
-        }
-      }
-    }
-  }
-}

WoofWare.Myriad.Plugins.Test/TestSwagger/petstore.json

@@ -1,177 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "info": {
-    "version": "1.0.0",
-    "title": "Swagger Petstore",
-    "license": {
-      "name": "MIT"
-    }
-  },
-  "servers": [
-    {
-      "url": "http://petstore.swagger.io/v1"
-    }
-  ],
-  "paths": {
-    "/pets": {
-      "get": {
-        "summary": "List all pets",
-        "operationId": "listPets",
-        "tags": ["pets"],
-        "parameters": [
-          {
-            "name": "limit",
-            "in": "query",
-            "description": "How many items to return at one time (max 100)",
-            "required": false,
-            "schema": {
-              "type": "integer",
-              "maximum": 100,
-              "format": "int32"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "A paged array of pets",
-            "headers": {
-              "x-next": {
-                "description": "A link to the next page of responses",
-                "schema": {
-                  "type": "string"
-                }
-              }
-            },
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Pets"
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Error"
-                }
-              }
-            }
-          }
-        }
-      },
-      "post": {
-        "summary": "Create a pet",
-        "operationId": "createPets",
-        "tags": ["pets"],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/Pet"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "201": {
-            "description": "Null response"
-          },
-          "default": {
-            "description": "unexpected error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Error"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/pets/{petId}": {
-      "get": {
-        "summary": "Info for a specific pet",
-        "operationId": "showPetById",
-        "tags": ["pets"],
-        "parameters": [
-          {
-            "name": "petId",
-            "in": "path",
-            "required": true,
-            "description": "The id of the pet to retrieve",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Expected response to a valid request",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Pet"
-                }
-              }
-            }
-          },
-          "default": {
-            "description": "unexpected error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Error"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  "components": {
-    "schemas": {
-      "Pet": {
-        "type": "object",
-        "required": ["id", "name"],
-        "properties": {
-          "id": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "name": {
-            "type": "string"
-          },
-          "tag": {
-            "type": "string"
-          }
-        }
-      },
-      "Pets": {
-        "type": "array",
-        "maxItems": 100,
-        "items": {
-          "$ref": "#/components/schemas/Pet"
-        }
-      },
-      "Error": {
-        "type": "object",
-        "required": ["code", "message"],
-        "properties": {
-          "code": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "message": {
-            "type": "string"
-          }
-        }
-      }
-    }
-  }
-}

WoofWare.Myriad.Plugins.Test/TestSwagger/tictactoe.json

@@ -1,261 +0,0 @@
-{
-  "openapi": "3.1.0",
-  "info": {
-    "title": "Tic Tac Toe",
-    "description": "This API allows writing down marks on a Tic Tac Toe board\nand requesting the state of the board or of individual squares.\n",
-    "version": "1.0.0"
-  },
-  "tags": [
-    {
-      "name": "Gameplay"
-    }
-  ],
-  "paths": {
-    "/board": {
-      "get": {
-        "summary": "Get the whole board",
-        "description": "Retrieves the current state of the board and the winner.",
-        "tags": ["Gameplay"],
-        "operationId": "get-board",
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/status"
-                }
-              }
-            }
-          }
-        },
-        "security": [
-          {
-            "defaultApiKey": []
-          },
-          {
-            "app2AppOauth": ["board:read"]
-          }
-        ]
-      }
-    },
-    "/board/{row}/{column}": {
-      "parameters": [
-        {
-          "$ref": "#/components/parameters/rowParam"
-        },
-        {
-          "$ref": "#/components/parameters/columnParam"
-        }
-      ],
-      "get": {
-        "summary": "Get a single board square",
-        "description": "Retrieves the requested square.",
-        "tags": ["Gameplay"],
-        "operationId": "get-square",
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/mark"
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "The provided parameters are incorrect",
-            "content": {
-              "text/html": {
-                "schema": {
-                  "$ref": "#/components/schemas/errorMessage"
-                },
-                "example": "Illegal coordinates"
-              }
-            }
-          }
-        },
-        "security": [
-          {
-            "bearerHttpAuthentication": []
-          },
-          {
-            "user2AppOauth": ["board:read"]
-          }
-        ]
-      },
-      "put": {
-        "summary": "Set a single board square",
-        "description": "Places a mark on the board and retrieves the whole board and the winner (if any).",
-        "tags": ["Gameplay"],
-        "operationId": "put-square",
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/mark"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/status"
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "The provided parameters are incorrect",
-            "content": {
-              "text/html": {
-                "schema": {
-                  "$ref": "#/components/schemas/errorMessage"
-                },
-                "examples": {
-                  "illegalCoordinates": {
-                    "value": "Illegal coordinates."
-                  },
-                  "notEmpty": {
-                    "value": "Square is not empty."
-                  },
-                  "invalidMark": {
-                    "value": "Invalid Mark (X or O)."
-                  }
-                }
-              }
-            }
-          }
-        },
-        "security": [
-          {
-            "bearerHttpAuthentication": []
-          },
-          {
-            "user2AppOauth": ["board:write"]
-          }
-        ]
-      }
-    }
-  },
-  "components": {
-    "parameters": {
-      "rowParam": {
-        "description": "Board row (vertical coordinate)",
-        "name": "row",
-        "in": "path",
-        "required": true,
-        "schema": {
-          "$ref": "#/components/schemas/coordinate"
-        }
-      },
-      "columnParam": {
-        "description": "Board column (horizontal coordinate)",
-        "name": "column",
-        "in": "path",
-        "required": true,
-        "schema": {
-          "$ref": "#/components/schemas/coordinate"
-        }
-      }
-    },
-    "schemas": {
-      "errorMessage": {
-        "type": "string",
-        "maxLength": 256,
-        "description": "A text message describing an error"
-      },
-      "coordinate": {
-        "type": "integer",
-        "minimum": 1,
-        "maximum": 3,
-        "example": 1
-      },
-      "mark": {
-        "type": "string",
-        "enum": [".", "X", "O"],
-        "description": "Possible values for a board square. `.` means empty square.",
-        "example": "."
-      },
-      "board": {
-        "type": "array",
-        "maxItems": 3,
-        "minItems": 3,
-        "items": {
-          "type": "array",
-          "maxItems": 3,
-          "minItems": 3,
-          "items": {
-            "$ref": "#/components/schemas/mark"
-          }
-        }
-      },
-      "winner": {
-        "type": "string",
-        "enum": [".", "X", "O"],
-        "description": "Winner of the game. `.` means nobody has won yet.",
-        "example": "."
-      },
-      "status": {
-        "type": "object",
-        "properties": {
-          "winner": {
-            "$ref": "#/components/schemas/winner"
-          },
-          "board": {
-            "$ref": "#/components/schemas/board"
-          }
-        }
-      }
-    },
-    "securitySchemes": {
-      "defaultApiKey": {
-        "description": "API key provided in console",
-        "type": "apiKey",
-        "name": "api-key",
-        "in": "header"
-      },
-      "basicHttpAuthentication": {
-        "description": "Basic HTTP Authentication",
-        "type": "http",
-        "scheme": "Basic"
-      },
-      "bearerHttpAuthentication": {
-        "description": "Bearer token using a JWT",
-        "type": "http",
-        "scheme": "Bearer",
-        "bearerFormat": "JWT"
-      },
-      "app2AppOauth": {
-        "type": "oauth2",
-        "flows": {
-          "clientCredentials": {
-            "tokenUrl": "https://learn.openapis.org/oauth/2.0/token",
-            "scopes": {
-              "board:read": "Read the board"
-            }
-          }
-        }
-      },
-      "user2AppOauth": {
-        "type": "oauth2",
-        "flows": {
-          "authorizationCode": {
-            "authorizationUrl": "https://learn.openapis.org/oauth/2.0/auth",
-            "tokenUrl": "https://learn.openapis.org/oauth/2.0/token",
-            "scopes": {
-              "board:read": "Read the board",
-              "board:write": "Write to the board"
-            }
-          }
-        }
-      }
-    }
-  }
-}

WoofWare.Myriad.Plugins.Test/TestSwagger/uspto.json

@@ -1,241 +0,0 @@
-{
-  "openapi": "3.0.1",
-  "servers": [
-    {
-      "url": "{scheme}://developer.uspto.gov/ds-api",
-      "variables": {
-        "scheme": {
-          "description": "The Data Set API is accessible via https and http",
-          "enum": ["https", "http"],
-          "default": "https"
-        }
-      }
-    }
-  ],
-  "info": {
-    "description": "The Data Set API (DSAPI) allows the public users to discover and search USPTO exported data sets. This is a generic API that allows USPTO users to make any CSV based data files searchable through API. With the help of GET call, it returns the list of data fields that are searchable. With the help of POST call, data can be fetched based on the filters on the field names. Please note that POST call is used to search the actual data. The reason for the POST call is that it allows users to specify any complex search criteria without worry about the GET size limitations as well as encoding of the input parameters.",
-    "version": "1.0.0",
-    "title": "USPTO Data Set API",
-    "contact": {
-      "name": "Open Data Portal",
-      "url": "https://developer.uspto.gov",
-      "email": "developer@uspto.gov"
-    }
-  },
-  "tags": [
-    {
-      "name": "metadata",
-      "description": "Find out about the data sets"
-    },
-    {
-      "name": "search",
-      "description": "Search a data set"
-    }
-  ],
-  "paths": {
-    "/": {
-      "get": {
-        "tags": ["metadata"],
-        "operationId": "list-data-sets",
-        "summary": "List available data sets",
-        "responses": {
-          "200": {
-            "description": "Returns a list of data sets",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/dataSetList"
-                },
-                "example": {
-                  "total": 2,
-                  "apis": [
-                    {
-                      "apiKey": "oa_citations",
-                      "apiVersionNumber": "v1",
-                      "apiUrl": "https://developer.uspto.gov/ds-api/oa_citations/v1/fields",
-                      "apiDocumentationUrl": "https://developer.uspto.gov/ds-api-docs/index.html?url=https://developer.uspto.gov/ds-api/swagger/docs/oa_citations.json"
-                    },
-                    {
-                      "apiKey": "cancer_moonshot",
-                      "apiVersionNumber": "v1",
-                      "apiUrl": "https://developer.uspto.gov/ds-api/cancer_moonshot/v1/fields",
-                      "apiDocumentationUrl": "https://developer.uspto.gov/ds-api-docs/index.html?url=https://developer.uspto.gov/ds-api/swagger/docs/cancer_moonshot.json"
-                    }
-                  ]
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/{dataset}/{version}/fields": {
-      "get": {
-        "tags": ["metadata"],
-        "summary": "Provides the general information about the API and the list of fields that can be used to query the dataset.",
-        "description": "This GET API returns the list of all the searchable field names that are in the oa_citations. Please see the 'fields' attribute which returns an array of field names. Each field or a combination of fields can be searched using the syntax options shown below.",
-        "operationId": "list-searchable-fields",
-        "parameters": [
-          {
-            "name": "dataset",
-            "in": "path",
-            "description": "Name of the dataset.",
-            "required": true,
-            "example": "oa_citations",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "version",
-            "in": "path",
-            "description": "Version of the dataset.",
-            "required": true,
-            "example": "v1",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "The dataset API for the given version is found and it is accessible to consume.",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "string"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "The combination of dataset name and version is not found in the system or it is not published yet to be consumed by public.",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "string"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/{dataset}/{version}/records": {
-      "post": {
-        "tags": ["search"],
-        "summary": "Provides search capability for the data set with the given search criteria.",
-        "description": "This API is based on Solr/Lucene Search. The data is indexed using SOLR. This GET API returns the list of all the searchable field names that are in the Solr Index. Please see the 'fields' attribute which returns an array of field names. Each field or a combination of fields can be searched using the Solr/Lucene Syntax. Please refer https://lucene.apache.org/core/3_6_2/queryparsersyntax.html#Overview for the query syntax. List of field names that are searchable can be determined using above GET api.",
-        "operationId": "perform-search",
-        "parameters": [
-          {
-            "name": "version",
-            "in": "path",
-            "description": "Version of the dataset.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "default": "v1"
-            }
-          },
-          {
-            "name": "dataset",
-            "in": "path",
-            "description": "Name of the dataset. In this case, the default value is oa_citations",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "default": "oa_citations"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "additionalProperties": {
-                      "type": "object"
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "No matching record found for the given criteria."
-          }
-        },
-        "requestBody": {
-          "content": {
-            "application/x-www-form-urlencoded": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "criteria": {
-                    "description": "Uses Lucene Query Syntax in the format of propertyName:value, propertyName:[num1 TO num2] and date range format: propertyName:[yyyyMMdd TO yyyyMMdd]. In the response please see the 'docs' element which has the list of record objects. Each record structure would consist of all the fields and their corresponding values.",
-                    "type": "string",
-                    "default": "*:*"
-                  },
-                  "start": {
-                    "description": "Starting record number. Default value is 0.",
-                    "type": "integer",
-                    "default": 0
-                  },
-                  "rows": {
-                    "description": "Specify number of rows to be returned. If you run the search with default values, in the response you will see 'numFound' attribute which will tell the number of records available in the dataset.",
-                    "type": "integer",
-                    "default": 100
-                  }
-                },
-                "required": ["criteria"]
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  "components": {
-    "schemas": {
-      "dataSetList": {
-        "type": "object",
-        "properties": {
-          "total": {
-            "type": "integer"
-          },
-          "apis": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "properties": {
-                "apiKey": {
-                  "type": "string",
-                  "description": "To be used as a dataset parameter value"
-                },
-                "apiVersionNumber": {
-                  "type": "string",
-                  "description": "To be used as a version parameter value"
-                },
-                "apiUrl": {
-                  "type": "string",
-                  "format": "uriref",
-                  "description": "The URL describing the dataset's fields"
-                },
-                "apiDocumentationUrl": {
-                  "type": "string",
-                  "format": "uriref",
-                  "description": "A URL to the API console for each API"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

WoofWare.Myriad.Plugins.Test/TestSwagger/webhook-example.json

@@ -1,47 +0,0 @@
-{
-  "openapi": "3.1.0",
-  "info": {
-    "title": "Webhook Example",
-    "version": "1.0.0"
-  },
-  "webhooks": {
-    "newPet": {
-      "post": {
-        "requestBody": {
-          "description": "Information about a new pet in the system",
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/Pet"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Return a 200 status to indicate that the data was received successfully"
-          }
-        }
-      }
-    }
-  },
-  "components": {
-    "schemas": {
-      "Pet": {
-        "required": ["id", "name"],
-        "properties": {
-          "id": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "name": {
-            "type": "string"
-          },
-          "tag": {
-            "type": "string"
-          }
-        }
-      }
-    }
-  }
-}

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

@@ -13,9 +13,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Assembly.fs" />
-    <Compile Include="HttpClient.fs" />
-    <Compile Include="PureGymDtos.fs" />
+    <!--
+    <Compile Include="HttpClient.fs"/>
+    <Compile Include="PureGymDtos.fs"/>
     <Compile Include="TestJsonParse\TestJsonParse.fs" />
     <Compile Include="TestJsonParse\TestPureGymJson.fs" />
     <Compile Include="TestJsonParse\TestExtensionMethod.fs" />
@@ -29,44 +29,35 @@
     <Compile Include="TestHttpClient\TestVariableHeader.fs" />
     <Compile Include="TestMockGenerator\TestMockGenerator.fs" />
     <Compile Include="TestMockGenerator\TestMockGeneratorNoAttr.fs" />
-    <Compile Include="TestCapturingMockGenerator\TestCapturingMockGenerator.fs" />
-    <Compile Include="TestCapturingMockGenerator\TestCapturingMockGeneratorNoAttr.fs" />
     <Compile Include="TestJsonSerialize\TestJsonSerde.fs" />
     <Compile Include="TestCataGenerator\TestCataGenerator.fs" />
     <Compile Include="TestCataGenerator\TestDirectory.fs" />
     <Compile Include="TestCataGenerator\TestGift.fs" />
     <Compile Include="TestCataGenerator\TestMyList.fs" />
     <Compile Include="TestCataGenerator\TestMyList2.fs" />
+    -->
     <Compile Include="TestArgParser\TestArgParser.fs" />
+    <Compile Include="TestArgParser\TestArgsWithUnions.fs" />
+    <!--
     <Compile Include="TestSwagger\TestSwaggerParse.fs" />
-    <Compile Include="TestSwagger\TestOpenApi3Parse.fs" />
-    <EmbeddedResource Include="TestSwagger\api-with-examples.json" />
-    <EmbeddedResource Include="TestSwagger\callback-example.json" />
-    <EmbeddedResource Include="TestSwagger\link-example.json" />
-    <EmbeddedResource Include="TestSwagger\non-oauth-scopes.json" />
-    <EmbeddedResource Include="TestSwagger\petstore.json" />
-    <EmbeddedResource Include="TestSwagger\petstore-expanded.json" />
-    <EmbeddedResource Include="TestSwagger\tictactoe.json" />
-    <EmbeddedResource Include="TestSwagger\uspto.json" />
-    <EmbeddedResource Include="TestSwagger\webhook-example.json" />
-    <Compile Include="TestRemoveOptions.fs" />
-    <Compile Include="TestSurface.fs" />
+    <Compile Include="TestRemoveOptions.fs"/>
+    <Compile Include="TestSurface.fs"/>
+    -->
     <None Include="../.github/workflows/dotnet.yaml" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ApiSurface" Version="5.0.1" />
-    <PackageReference Include="FsCheck" Version="3.3.1" />
-    <PackageReference Include="FsUnit" Version="7.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
-    <PackageReference Include="WoofWare.Expect" Version="0.8.2" />
+    <PackageReference Include="ApiSurface" Version="4.1.20"/>
+    <PackageReference Include="FsCheck" Version="3.2.0"/>
+    <PackageReference Include="FsUnit" Version="7.0.1"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
+    <PackageReference Include="NUnit" Version="4.3.2"/>
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WoofWare.Myriad.Plugins\WoofWare.Myriad.Plugins.fsproj" />
-    <ProjectReference Include="..\ConsumePlugin\ConsumePlugin.fsproj" />
+    <ProjectReference Include="..\WoofWare.Myriad.Plugins\WoofWare.Myriad.Plugins.fsproj"/>
+    <ProjectReference Include="..\ConsumePlugin\ConsumePlugin.fsproj"/>
   </ItemGroup>
 
 </Project>

WoofWare.Myriad.Plugins/ApacheLicence.txt

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

WoofWare.Myriad.Plugins/ArgParserGenerator.fs

@@ -7,82 +7,6 @@ open Fantomas.FCS.Text.Range
 open TypeEquality
 open WoofWare.Whippet.Fantomas
 
-type internal ArgParserOutputSpec =
-    {
-        ExtensionMethods : bool
-    }
-
-type internal FlagDu =
-    {
-        Name : Ident
-        Case1Name : Ident
-        Case2Name : Ident
-        /// Hopefully this is simply the const bool True or False, but it might e.g. be a literal
-        Case1Arg : SynExpr
-        /// Hopefully this is simply the const bool True or False, but it might e.g. be a literal
-        Case2Arg : SynExpr
-    }
-
-    static member FromBoolean (flagDu : FlagDu) (value : SynExpr) =
-        SynExpr.ifThenElse
-            (SynExpr.equals value flagDu.Case1Arg)
-            (SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case2Name ])
-            (SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case1Name ])
-
-/// The default value of an argument which admits default values can be pulled from different sources.
-/// This defines which source a particular default value comes from.
-type private ArgumentDefaultSpec =
-    /// From parsing the environment variable with the given name (e.g. "WOOFWARE_DISABLE_FOO" or whatever).
-    | EnvironmentVariable of name : SynExpr
-    /// From calling the static member `{typeWeParseInto}.Default{name}()`
-    /// For example, if `type MyArgs = { Thing : Choice<int, int> }`, then
-    /// we would use `MyArgs.DefaultThing () : int`.
-    ///
-    | FunctionCall of name : Ident
-
-type private Accumulation<'choice> =
-    | Required
-    | Optional
-    | Choice of 'choice
-    | List of Accumulation<'choice>
-
-type private ParseFunction<'acc> =
-    {
-        FieldName : Ident
-        TargetVariable : Ident
-        /// Any of the forms in this set are acceptable, but make sure they all start with a dash, or we might
-        /// get confused with positional args or something! I haven't thought that hard about this.
-        /// In the default case, this is `Const("arg-name")` for the `ArgName : blah` field; note that we have
-        /// omitted the initial `--` that will be required at runtime.
-        ArgForm : SynExpr list
-        /// If this is a boolean-like field (e.g. a bool or a flag DU), the help text should look a bit different:
-        /// we should lie to the user about the value of the cases there.
-        /// Similarly, if we're reading from an environment variable with the laxer parsing rules of accepting e.g.
-        /// "0" instead of "false", we need to know if we're reading a bool.
-        /// In that case, `boolCases` is Some, and contains the construction of the flag (or boolean, in which case
-        /// you get no data).
-        BoolCases : Choice<FlagDu, unit> option
-        Help : SynExpr option
-        /// A function string -> %TargetType%, where TargetVariable is probably a `%TargetType% option`.
-        /// (Depending on `Accumulation`, we'll remove the `option` at the end of the parse, asserting that the
-        /// argument was supplied.)
-        /// This is allowed to throw if it fails to parse.
-        Parser : SynExpr
-        /// If `Accumulation` is `List`, then this is the type of the list *element*; analogously for optionals
-        /// and choices and so on.
-        TargetType : SynType
-        Accumulation : 'acc
-    }
-
-    /// A SynExpr of type `string` which we can display to the user at generated-program runtime to display all
-    /// the ways they can refer to this arg.
-    member arg.HumanReadableArgForm : SynExpr =
-        let formatString = List.replicate arg.ArgForm.Length "--%s" |> String.concat " / "
-
-        (SynExpr.applyFunction (SynExpr.createIdent "sprintf") (SynExpr.CreateConst formatString), arg.ArgForm)
-        ||> List.fold SynExpr.applyFunction
-        |> SynExpr.paren
-
 [<RequireQualifiedAccess>]
 type private ChoicePositional =
     | Normal of includeFlagLike : SynExpr option
@@ -114,14 +38,14 @@ type private ParseTree<'hasPositional> =
     /// `assemble` takes the SynExpr's (e.g. each record field contents) corresponding to each `Ident` in
     /// the branch (e.g. each record field name),
     /// and composes them into a `SynExpr` (e.g. the record-typed object).
-    | Branch of
+    | DescendRecord of
         fields : (Ident * ParseTree<HasNoPositional>) list *
         assemble : (Map<string, SynExpr> -> SynExpr) *
         Teq<'hasPositional, HasNoPositional>
     /// `assemble` takes the SynExpr's (e.g. each record field contents) corresponding to each `Ident` in
     /// the branch (e.g. each record field name),
     /// and composes them into a `SynExpr` (e.g. the record-typed object).
-    | BranchPos of
+    | DescendRecordPos of
         posField : Ident *
         fields : ParseTree<HasPositional> *
         (Ident * ParseTree<HasNoPositional>) list *
@@ -184,63 +108,6 @@ module private ParseTree =
 
         go None ([], None) subs
 
-    let rec accumulatorsNonPos (tree : ParseTree<HasNoPositional>) : ParseFunctionNonPositional list =
-        match tree with
-        | ParseTree.PositionalLeaf (_, teq) -> exFalso teq
-        | ParseTree.BranchPos (_, _, _, _, teq) -> exFalso teq
-        | ParseTree.NonPositionalLeaf (pf, _) -> [ pf ]
-        | ParseTree.Branch (trees, _, _) -> trees |> List.collect (snd >> accumulatorsNonPos)
-
-    /// Returns the positional arg separately.
-    let rec accumulatorsPos
-        (tree : ParseTree<HasPositional>)
-        : ParseFunctionNonPositional list * ParseFunctionPositional
-        =
-        match tree with
-        | ParseTree.PositionalLeaf (pf, _) -> [], pf
-        | ParseTree.NonPositionalLeaf (_, teq) -> exFalso' teq
-        | ParseTree.Branch (_, _, teq) -> exFalso' teq
-        | ParseTree.BranchPos (_, tree, trees, _, _) ->
-            let nonPos = trees |> List.collect (snd >> accumulatorsNonPos)
-
-            let nonPos2, pos = accumulatorsPos tree
-            nonPos @ nonPos2, pos
-
-    /// Collect all the ParseFunctions which are necessary to define variables, throwing away
-    /// all information relevant to composing the resulting variables into records.
-    /// Returns the list of non-positional parsers, and any positional parser that exists.
-    let accumulators<'a> (tree : ParseTree<'a>) : ParseFunctionNonPositional list * ParseFunctionPositional option =
-        // Sad duplication of some code here, but it was the easiest way to make it type-safe :(
-        match tree with
-        | ParseTree.PositionalLeaf (pf, _) -> [], Some pf
-        | ParseTree.NonPositionalLeaf (pf, _) -> [ pf ], None
-        | ParseTree.Branch (trees, _, _) -> trees |> List.collect (snd >> accumulatorsNonPos) |> (fun i -> i, None)
-        | ParseTree.BranchPos (_, tree, trees, _, _) ->
-            let nonPos = trees |> List.collect (snd >> accumulatorsNonPos)
-
-            let nonPos2, pos = accumulatorsPos tree
-            nonPos @ nonPos2, Some pos
-
-        |> fun (nonPos, pos) ->
-            let duplicateArgs =
-                // This is best-effort. We can't necessarily detect all SynExprs here, but usually it'll be strings.
-                Option.toList (pos |> Option.map _.ArgForm) @ (nonPos |> List.map _.ArgForm)
-                |> Seq.concat
-                |> Seq.choose (fun expr ->
-                    match expr |> SynExpr.stripOptionalParen with
-                    | SynExpr.Const (SynConst.String (s, _, _), _) -> Some s
-                    | _ -> None
-                )
-                |> List.ofSeq
-                |> List.groupBy id
-                |> List.choose (fun (key, v) -> if v.Length > 1 then Some key else None)
-
-            match duplicateArgs with
-            | [] -> nonPos, pos
-            | dups ->
-                let dups = dups |> String.concat " "
-                failwith $"Duplicate args detected! %s{dups}"
-
     /// Build the return value.
     let rec instantiate<'a> (tree : ParseTree<'a>) : SynExpr =
         match tree with
@@ -1396,7 +1263,7 @@ module internal ArgParserGenerator =
 
                             [
                                 SynMatchClause.create
-                                    (SynPat.named "None")
+                                    SynPat.createNull
                                     (SynExpr.sequential
                                         [
                                             errorMessage
@@ -1406,7 +1273,7 @@ module internal ArgParserGenerator =
                                             unchecked
                                         ])
 
-                                SynMatchClause.create (SynPat.nameWithArgs "Some" [ SynPat.named "x" ]) parser
+                                SynMatchClause.create (SynPat.named "x") parser
                             ]
                             |> SynExpr.createMatch result
                         | ArgumentDefaultSpec.FunctionCall name ->
@@ -1694,7 +1561,7 @@ module internal ArgParserGenerator =
                     [ Ident.create "parse'" ]
                     [
                         SynPat.named "getEnvironmentVariable"
-                        |> SynPat.annotateType (SynType.funFromDomain SynType.string (SynType.option SynType.string))
+                        |> SynPat.annotateType (SynType.funFromDomain SynType.string SynType.string)
                         argsParam
                     ]
                 |> SynBinding.withReturnAnnotation (SynType.createLongIdent [ taggedType.Name ])
@@ -1708,12 +1575,7 @@ module internal ArgParserGenerator =
 
             let parse =
                 SynExpr.createLongIdent' parsePrimeCall
-                |> SynExpr.applyTo (
-                    SynExpr.paren (
-                        SynExpr.createLongIdent [ "System" ; "Environment" ; "GetEnvironmentVariable" ]
-                        |> SynExpr.composeWith (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
-                    )
-                )
+                |> SynExpr.applyTo (SynExpr.createLongIdent [ "System" ; "Environment" ; "GetEnvironmentVariable" ])
                 |> SynExpr.applyTo (SynExpr.createIdent "args")
                 |> SynBinding.basic [ Ident.create "parse" ] [ argsParam ]
                 |> SynBinding.withReturnAnnotation (SynType.createLongIdent [ taggedType.Name ])

WoofWare.Myriad.Plugins/AssemblyInfo.fs

@@ -1,6 +0,0 @@
-module internal WoofWare.Myriad.Plugins.AssemblyInfo
-
-open System.Runtime.CompilerServices
-
-[<assembly : InternalsVisibleTo("WoofWare.Myriad.Plugins.Test")>]
-do ()

WoofWare.Myriad.Plugins/CapturingInterfaceMockGenerator.fs

@@ -1,677 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Xml
-open WoofWare.Whippet.Fantomas
-
-type internal CapturingInterfaceMockOutputSpec =
-    {
-        IsInternal : bool
-    }
-
-type private CallField =
-    | ArgsObject of Ident * SynTypeDefn * SynTyparDecls option
-    | Original of SynType
-
-[<RequireQualifiedAccess>]
-module internal CapturingInterfaceMockGenerator =
-    open Fantomas.FCS.Text.Range
-
-    [<RequireQualifiedAccess>]
-    type private KnownInheritance = | IDisposable
-
-    /// Expects the input `args` list to have more than one element.
-    let private createTypeForArgs
-        (spec : CapturingInterfaceMockOutputSpec)
-        (memberName : Ident)
-        (generics : SynTyparDecls option)
-        (args : TupledArg list)
-        : Ident * SynTypeDefn
-        =
-        let name = memberName.idText + "Call" |> Ident.create
-
-        let access =
-            if spec.IsInternal then
-                SynAccess.Internal range0
-            else
-                SynAccess.Public range0
-
-        let recordFields =
-            args
-            |> List.mapi (fun i tupledArg ->
-                {
-                    SynFieldData.Ident =
-                        match tupledArg.Args with
-                        | [ arg ] -> arg.Id
-                        | _ -> None
-                        |> Option.defaultValue (Ident.create $"Arg%i{i}")
-                        |> Some
-                    Attrs = []
-                    Type =
-                        tupledArg.Args
-                        |> List.map (fun pi ->
-                            if pi.IsOptional then
-                                pi.Type |> SynType.appPostfix "option"
-                            else
-                                pi.Type
-                        )
-                        |> SynType.tupleNoParen
-                        |> Option.get
-                }
-                |> SynField.make
-            )
-
-        let record =
-            {
-                Name = name
-                Fields = recordFields
-                Members = None
-                XmlDoc = Some (PreXmlDoc.create $"A single call to the %s{memberName.idText} method")
-                Generics = generics
-                TypeAccessibility = Some access
-                ImplAccessibility = None
-                Attributes = []
-            }
-
-        let typeDecl = AstHelper.defineRecordType record
-
-        name, typeDecl
-
-    let private buildType (x : ParameterInfo) : SynType =
-        if x.IsOptional then
-            SynType.appPostfix "option" x.Type
-        else
-            x.Type
-
-    let private constructMemberSinglePlace (tuple : TupledArg) : SynType =
-        tuple.Args
-        |> List.map buildType
-        |> SynType.tupleNoParen
-        |> Option.defaultWith (fun () -> failwith "no-arg functions not supported yet")
-        |> if tuple.HasParen then SynType.paren else id
-
-    let rec private collectGenerics' (ty : SynType) : Ident list =
-        match ty with
-        | SynType.Var (typar = SynTypar (ident = typar)) -> [ typar ]
-        | SynType.HashConstraint (innerType = ty)
-        | SynType.WithGlobalConstraints (typeName = ty)
-        | SynType.Paren (innerType = ty)
-        | SynType.MeasurePower (baseMeasure = ty)
-        | SynType.SignatureParameter (usedType = ty)
-        | SynType.Array (elementType = ty) -> collectGenerics' ty
-        | SynType.StaticConstant _
-        | SynType.StaticConstantNamed _
-        | SynType.StaticConstantExpr _
-        | SynType.FromParseError _
-        | SynType.Anon _
-        | SynType.LongIdent _ -> []
-        | SynType.LongIdentApp (typeArgs = tys)
-        | SynType.App (typeArgs = tys) -> tys |> List.collect collectGenerics'
-        | SynType.Tuple (path = path) ->
-            path
-            |> List.collect (fun seg ->
-                match seg with
-                | SynTupleTypeSegment.Type ty -> collectGenerics' ty
-                | SynTupleTypeSegment.Star _
-                | SynTupleTypeSegment.Slash _ -> []
-            )
-        | SynType.AnonRecd (fields = fields) -> fields |> List.collect (fun (_, ty) -> collectGenerics' ty)
-        | SynType.Fun (argType = t1 ; returnType = t2)
-        | SynType.Or (lhsType = t1 ; rhsType = t2) -> collectGenerics' t1 @ collectGenerics' t2
-
-    let private collectGenerics (ty : SynType) =
-        collectGenerics' ty |> List.distinctBy _.idText
-
-    /// Builds the record field for the mock object, and also if applicable a type representing a single call to
-    /// that object (packaging up the args of the call).
-    let private constructMember (spec : CapturingInterfaceMockOutputSpec) (mem : MemberInfo) : SynField * CallField =
-        let inputType = mem.Args |> List.map constructMemberSinglePlace
-
-        let funcType = SynType.toFun inputType mem.ReturnType
-
-        let field =
-            {
-                Type = funcType
-                Attrs = []
-                Ident = Some mem.Identifier
-            }
-            |> SynField.make
-            |> SynField.withDocString (mem.XmlDoc |> Option.defaultValue PreXmlDoc.Empty)
-
-        let argsType =
-            match mem.Args with
-            | [] -> failwith "expected args in member"
-            | [ ty ] ->
-                ty.Args
-                |> List.map (fun pi ->
-                    if pi.IsOptional then
-                        SynType.appPostfix "option" pi.Type
-                    else
-                        pi.Type
-                )
-                |> SynType.tupleNoParen
-                |> Option.get
-                |> CallField.Original
-            | args ->
-                let genericsUsed =
-                    args
-                    |> List.collect (fun arg -> arg.Args |> List.map _.Type |> List.collect collectGenerics)
-                    |> List.distinctBy _.idText
-
-                let genericsUsed =
-                    match genericsUsed with
-                    | [] -> None
-                    | genericsUsed ->
-                        genericsUsed
-                        |> List.map (fun i ->
-                            SynTyparDecl.SynTyparDecl ([], SynTypar.SynTypar (i, TyparStaticReq.None, false))
-                        )
-                        |> fun l -> SynTyparDecls.PostfixList (l, [], range0)
-                        |> Some
-
-                let name, defn = createTypeForArgs spec mem.Identifier genericsUsed args
-                CallField.ArgsObject (name, defn, genericsUsed)
-
-        field, argsType
-
-    let constructProperty (prop : PropertyInfo) : SynField =
-        {
-            Attrs = []
-            Ident = Some prop.Identifier
-            Type = SynType.toFun [ SynType.unit ] prop.Type
-        }
-        |> SynField.make
-        |> SynField.withDocString (prop.XmlDoc |> Option.defaultValue PreXmlDoc.Empty)
-
-    let createType
-        (spec : CapturingInterfaceMockOutputSpec)
-        (name : string)
-        (interfaceType : InterfaceType)
-        (xmlDoc : PreXmlDoc)
-        : SynModuleDecl option * SynModuleDecl
-        =
-        let fields =
-            interfaceType.Members
-            |> List.map (constructMember spec)
-            |> List.append (
-                interfaceType.Properties
-                |> List.map constructProperty
-                |> List.map (Tuple.withRight (CallField.Original SynType.unit))
-            )
-
-        let inherits =
-            interfaceType.Inherits
-            |> Seq.map (fun ty ->
-                match ty with
-                | SynType.LongIdent (SynLongIdent.SynLongIdent (name, _, _)) ->
-                    match name |> List.map _.idText with
-                    | [] -> failwith "Unexpected empty identifier in inheritance declaration"
-                    | [ "IDisposable" ]
-                    | [ "System" ; "IDisposable" ] -> KnownInheritance.IDisposable
-                    | _ -> failwithf $"Unrecognised inheritance identifier: %+A{name}"
-                | x -> failwithf $"Unrecognised type in inheritance: %+A{x}"
-            )
-            |> Set.ofSeq
-
-        // TODO: for each field, if there are multiple arguments to the member, stamp out a new type to represent them;
-        // then store that type name in this list alongside the field name
-        let fields =
-            fields
-            |> List.map (fun (SynField (idOpt = idOpt) as f, extraType) ->
-                let fieldName =
-                    match idOpt with
-                    | None -> failwith $"unexpectedly got a field with no identifier: %O{f}"
-                    | Some idOpt -> idOpt.idText
-
-                fieldName, (f, extraType)
-            )
-            |> Map.ofList
-
-        let failwithNotImplemented (fieldName : string) =
-            let failString = SynExpr.CreateConst $"Unimplemented mock function: %s{fieldName}"
-
-            SynExpr.createLongIdent [ "System" ; "NotImplementedException" ]
-            |> SynExpr.applyTo failString
-            |> SynExpr.paren
-            |> SynExpr.applyFunction (SynExpr.createIdent "raise")
-            |> SynExpr.createLambda "_"
-
-        let constructorReturnType =
-            match interfaceType.Generics with
-            | None -> SynType.createLongIdent' [ name ]
-            | Some generics ->
-
-            let generics =
-                generics.TyparDecls
-                |> List.map (fun (SynTyparDecl (_, typar)) -> SynType.var typar)
-
-            SynType.app name generics
-
-        let emptyRecordFieldInstantiations =
-            let interfaceExtras =
-                if inherits.Contains KnownInheritance.IDisposable then
-                    let unitFun = SynExpr.createThunk (SynExpr.CreateConst ())
-
-                    [ SynLongIdent.createS "Dispose", unitFun ]
-                else
-                    []
-
-            let originalMembers =
-                fields
-                |> Map.toList
-                |> List.map (fun (fieldName, _) -> SynLongIdent.createS fieldName, failwithNotImplemented fieldName)
-
-            let callsObject =
-                SynLongIdent.createS "Calls",
-                SynExpr.applyFunction
-                    (SynExpr.createLongIdent [ $"%s{name}Calls" ; "Calls" ; "Empty" ])
-                    (SynExpr.CreateConst ())
-
-            callsObject :: interfaceExtras @ originalMembers
-
-        let staticMemberEmpty =
-            SynBinding.basic
-                [ Ident.create "Empty" ]
-                [ SynPat.unit ]
-                (SynExpr.createRecord None emptyRecordFieldInstantiations)
-            |> SynBinding.withXmlDoc (PreXmlDoc.create "An implementation where every non-unit method throws.")
-            |> SynBinding.withReturnAnnotation constructorReturnType
-            |> SynMemberDefn.staticMember
-
-        let recordFields =
-            let extras =
-                if inherits.Contains KnownInheritance.IDisposable then
-                    {
-                        Attrs = []
-                        Ident = Some (Ident.create "Dispose")
-                        Type = SynType.funFromDomain SynType.unit SynType.unit
-                    }
-                    |> SynField.make
-                    |> SynField.withDocString (PreXmlDoc.create "Implementation of IDisposable.Dispose")
-                    |> List.singleton
-                else
-                    []
-
-            let nonExtras =
-                fields |> Map.toSeq |> Seq.map (fun (_, (field, _)) -> field) |> Seq.toList
-
-            let calls =
-                let ty =
-                    match interfaceType.Generics with
-                    | None -> SynType.createLongIdent' [ $"%s{name}Calls" ; "Calls" ]
-                    | Some generics ->
-                        generics.TyparDecls
-                        |> List.map (fun (SynTyparDecl (_, typar)) -> SynType.var typar)
-                        |> SynType.app' (SynType.createLongIdent' [ $"%s{name}Calls" ; "Calls" ])
-
-                {
-                    Attrs = []
-                    Ident = Ident.create "Calls" |> Some
-                    Type = ty
-                }
-                |> SynField.make
-
-            calls :: extras @ nonExtras
-
-        let access =
-            match interfaceType.Accessibility, spec.IsInternal with
-            | Some (SynAccess.Public _), true
-            | None, true -> SynAccess.Internal range0
-            | Some (SynAccess.Public _), false -> SynAccess.Public range0
-            | None, false -> SynAccess.Public range0
-            | Some (SynAccess.Internal _), _ -> SynAccess.Internal range0
-            | Some (SynAccess.Private _), _ -> SynAccess.Private range0
-
-        let accessAtLeastInternal =
-            match access with
-            | SynAccess.Private _ -> SynAccess.Internal range0
-            | access -> access
-
-        let callsObject =
-            let fields' =
-                fields
-                |> Map.toSeq
-                |> Seq.map (fun (fieldName, (_, callType)) ->
-                    match callType with
-                    | CallField.Original ty ->
-                        {
-                            Attrs = []
-                            Ident = Some (fieldName |> Ident.create)
-                            Type = SynType.app "ResizeArray" [ ty ]
-                        }
-                        |> SynField.make
-                    | CallField.ArgsObject (argsObjectName, _, generics) ->
-                        {
-                            Attrs = []
-                            Ident = Some (fieldName |> Ident.create)
-                            Type =
-                                match generics with
-                                | None -> SynType.named argsObjectName.idText
-                                | Some generics ->
-                                    generics.TyparDecls
-                                    |> List.map (fun (SynTyparDecl.SynTyparDecl (_, typar)) -> SynType.var typar)
-                                    |> SynType.app' (SynType.createLongIdent' [ argsObjectName.idText ])
-                                |> List.singleton
-                                |> SynType.app "ResizeArray"
-                        }
-                        |> SynField.make
-                )
-                |> Seq.toList
-
-            let emptyMember =
-                let returnType =
-                    match interfaceType.Generics with
-                    | None -> SynType.named "Calls"
-                    | Some generics ->
-                        let generics =
-                            match generics with
-                            | SynTyparDecls.PostfixList (decls = decls)
-                            | SynTyparDecls.PrefixList (decls = decls) -> decls
-                            | SynTyparDecls.SinglePrefix (decl = decl) -> [ decl ]
-                            |> List.map (fun (SynTyparDecl.SynTyparDecl (_, typar)) -> SynType.var typar)
-
-                        SynType.app "Calls" generics
-
-                fields
-                |> Map.toSeq
-                |> Seq.map (fun (name, _) ->
-                    SynLongIdent.createS name,
-                    SynExpr.applyFunction (SynExpr.createIdent "ResizeArray") (SynExpr.CreateConst ())
-                )
-                |> Seq.toList
-                |> SynExpr.createRecord None
-                |> SynBinding.basic [ Ident.create "Empty" ] [ SynPat.unit ]
-                |> SynBinding.withXmlDoc (PreXmlDoc.create "A fresh calls object which has not yet had any calls made.")
-                |> SynBinding.withReturnAnnotation returnType
-                |> SynMemberDefn.staticMember
-
-            {
-                RecordType.Name = Ident.create "Calls"
-                Fields = fields'
-                Members = Some [ emptyMember ]
-                XmlDoc = PreXmlDoc.create $"All the calls made to a %s{name} mock" |> Some
-                Generics = interfaceType.Generics
-                TypeAccessibility = Some accessAtLeastInternal
-                ImplAccessibility = None
-                Attributes = [ SynAttribute.requireQualifiedAccess ]
-            }
-            |> AstHelper.defineRecordType
-
-        let interfaceMembers =
-            let members =
-                interfaceType.Members
-                |> List.map (fun memberInfo ->
-                    let headArgs =
-                        memberInfo.Args
-                        |> List.mapi (fun i tupledArgs ->
-                            let args =
-                                tupledArgs.Args
-                                |> List.mapi (fun j ty ->
-                                    match ty.Type with
-                                    | UnitType -> SynPat.unit
-                                    | _ -> SynPat.named $"arg_%i{i}_%i{j}"
-                                )
-
-                            match args with
-                            | [] -> failwith "somehow got no args at all"
-                            | [ arg ] -> arg
-                            | args -> SynPat.tuple args
-                            |> fun i -> if tupledArgs.HasParen then SynPat.paren i else i
-                        )
-
-                    let body, addToCalls =
-                        let tupleContents =
-                            memberInfo.Args
-                            |> List.mapi (fun i args ->
-                                args.Args
-                                |> List.mapi (fun j arg ->
-                                    match arg.Type with
-                                    | UnitType -> SynExpr.CreateConst (), arg.Id
-                                    | _ -> SynExpr.createIdent $"arg_%i{i}_%i{j}", arg.Id
-                                )
-                            )
-
-                        let tuples = tupleContents |> List.map (List.map fst >> SynExpr.tuple)
-
-                        match tuples |> List.rev with
-                        | [] -> failwith "expected args but got none"
-                        | last :: rest ->
-
-                        let tuples = (last, rest) ||> List.fold SynExpr.applyTo
-
-                        let body =
-                            tuples
-                            |> SynExpr.applyFunction (
-                                SynExpr.createLongIdent' [ Ident.create "this" ; memberInfo.Identifier ]
-                            )
-
-                        let addToCalls =
-                            match Map.tryFind memberInfo.Identifier.idText fields with
-                            | None ->
-                                failwith
-                                    $"unexpectedly looking up a nonexistent field %s{memberInfo.Identifier.idText}"
-                            | Some (_, result) ->
-                                match result with
-                                | CallField.Original _ -> tuples
-                                | CallField.ArgsObject _ ->
-                                    tupleContents
-                                    |> List.mapi (fun i fields ->
-                                        match fields with
-                                        | [ contents, Some ident ] -> SynLongIdent.create [ ident ], contents
-                                        | [ contents, None ] -> SynLongIdent.createS $"Arg%i{i}", contents
-                                        | _ ->
-                                            SynLongIdent.createS $"Arg%i{i}",
-                                            SynExpr.tupleNoParen (fields |> List.map fst)
-                                    )
-                                    |> SynExpr.createRecord None
-                            |> SynExpr.applyFunction (
-                                SynExpr.createLongIdent [ "this" ; "Calls" ; memberInfo.Identifier.idText ; "Add" ]
-                            )
-                            |> SynExpr.createLambda "_"
-                            |> SynExpr.applyFunction (
-                                SynExpr.createIdent "lock"
-                                |> SynExpr.applyTo (
-                                    SynExpr.createLongIdent [ "this" ; "Calls" ; memberInfo.Identifier.idText ]
-                                )
-                            )
-
-                        body, addToCalls
-
-                    let body = [ addToCalls ; body ] |> SynExpr.sequential
-
-                    SynBinding.basic [ Ident.create "this" ; memberInfo.Identifier ] headArgs body
-                    |> SynMemberDefn.memberImplementation
-                )
-
-            let properties =
-                interfaceType.Properties
-                |> List.map (fun pi ->
-                    SynExpr.createLongIdent' [ Ident.create "this" ; pi.Identifier ]
-                    |> SynExpr.applyTo (SynExpr.CreateConst ())
-                    |> SynBinding.basic [ Ident.create "this" ; pi.Identifier ] []
-                    |> SynMemberDefn.memberImplementation
-                )
-
-            let interfaceName =
-                let baseName = SynType.createLongIdent interfaceType.Name
-
-                match interfaceType.Generics with
-                | None -> baseName
-                | Some generics ->
-                    let generics =
-                        match generics with
-                        | SynTyparDecls.PostfixList (decls, _, _) -> decls
-                        | SynTyparDecls.PrefixList (decls, _) -> decls
-                        | SynTyparDecls.SinglePrefix (decl, _) -> [ decl ]
-                        |> List.map (fun (SynTyparDecl (_, typar)) -> SynType.var typar)
-
-                    SynType.app' baseName generics
-
-            SynMemberDefn.Interface (interfaceName, Some range0, Some (members @ properties), range0)
-
-        let extraInterfaces =
-            inherits
-            |> Seq.map (fun inheritance ->
-                match inheritance with
-                | KnownInheritance.IDisposable ->
-                    let mem =
-                        SynExpr.createLongIdent [ "this" ; "Dispose" ]
-                        |> SynExpr.applyTo (SynExpr.CreateConst ())
-                        |> SynBinding.basic [ Ident.create "this" ; Ident.create "Dispose" ] [ SynPat.unit ]
-                        |> SynBinding.withReturnAnnotation SynType.unit
-                        |> SynMemberDefn.memberImplementation
-
-                    SynMemberDefn.Interface (
-                        SynType.createLongIdent' [ "System" ; "IDisposable" ],
-                        Some range0,
-                        Some [ mem ],
-                        range0
-                    )
-            )
-            |> Seq.toList
-
-        let record =
-            {
-                Name = Ident.create name
-                Fields = recordFields
-                Members = Some ([ staticMemberEmpty ; interfaceMembers ] @ extraInterfaces)
-                XmlDoc = Some xmlDoc
-                Generics = interfaceType.Generics
-                TypeAccessibility = Some access
-                ImplAccessibility = None
-                Attributes = []
-            }
-
-        let typeDecl = AstHelper.defineRecordType record
-
-        let callsModule =
-            let types =
-                fields
-                |> Map.toSeq
-                |> Seq.choose (fun (_, (_, field)) ->
-                    match field with
-                    | CallField.Original _ -> None
-                    | CallField.ArgsObject (_, callType, _) -> Some (SynModuleDecl.Types ([ callType ], range0))
-                )
-                |> Seq.toList
-
-            types @ [ SynModuleDecl.Types ([ callsObject ], range0) ]
-            |> SynModuleDecl.nestedModule (
-                SynComponentInfo.create (Ident.create $"%s{name}Calls")
-                |> SynComponentInfo.withAccessibility accessAtLeastInternal
-                |> SynComponentInfo.addAttributes [ SynAttribute.requireQualifiedAccess ]
-            )
-            |> Some
-
-        (callsModule, SynModuleDecl.Types ([ typeDecl ], range0))
-
-    let createRecord
-        (namespaceId : LongIdent)
-        (opens : SynOpenDeclTarget list)
-        (interfaceType : SynTypeDefn, spec : CapturingInterfaceMockOutputSpec)
-        : SynModuleOrNamespace
-        =
-        let interfaceType = AstHelper.parseInterface interfaceType
-
-        let docString = PreXmlDoc.create "Mock record type for an interface"
-
-        let name =
-            List.last interfaceType.Name
-            |> _.idText
-            |> fun s ->
-                if s.StartsWith 'I' && s.Length > 1 && Char.IsUpper s.[1] then
-                    s.Substring 1
-                else
-                    s
-            |> fun s -> s + "Mock"
-
-        let callsTypes, typeDecl = createType spec name interfaceType docString
-
-        [
-            yield! opens |> List.map SynModuleDecl.openAny
-            match callsTypes with
-            | None -> ()
-            | Some c -> yield c
-            yield typeDecl
-        ]
-        |> SynModuleOrNamespace.createNamespace namespaceId
-
-open Myriad.Core
-
-/// Myriad generator that creates a record which implements the given interface,
-/// but with every field mocked out.
-[<MyriadGenerator("capturing-interface-mock")>]
-type CapturingInterfaceMockGenerator () =
-
-    interface IMyriadGenerator with
-        member _.ValidInputExtensions = [ ".fs" ]
-
-        member _.Generate (context : GeneratorContext) =
-            let targetedTypes =
-                MyriadParamParser.render context.AdditionalParameters
-                |> Map.map (fun _ v -> v.Split '!' |> Array.toList |> List.map DesiredGenerator.Parse)
-
-            let ast, _ =
-                Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
-
-            let types = Ast.getTypes ast
-
-            let namespaceAndInterfaces =
-                types
-                |> List.choose (fun (ns, types) ->
-                    types
-                    |> List.choose (fun typeDef ->
-                        match SynTypeDefn.getAttribute typeof<GenerateCapturingMockAttribute>.Name typeDef with
-                        | None ->
-                            let name = SynTypeDefn.getName typeDef |> List.map _.idText |> String.concat "."
-
-                            match Map.tryFind name targetedTypes with
-                            | Some desired ->
-                                desired
-                                |> List.tryPick (fun generator ->
-                                    match generator with
-                                    | DesiredGenerator.CapturingInterfaceMock arg ->
-                                        let spec =
-                                            {
-                                                IsInternal =
-                                                    arg
-                                                    |> Option.defaultValue
-                                                        GenerateCapturingMockAttribute.DefaultIsInternal
-                                            }
-
-                                        Some (typeDef, spec)
-                                    | _ -> None
-                                )
-                            | _ -> None
-
-                        | Some attr ->
-                            let arg =
-                                match SynExpr.stripOptionalParen attr.ArgExpr with
-                                | SynExpr.Const (SynConst.Bool value, _) -> value
-                                | SynExpr.Const (SynConst.Unit, _) -> GenerateCapturingMockAttribute.DefaultIsInternal
-                                | arg ->
-                                    failwith
-                                        $"Unrecognised argument %+A{arg} to [<%s{nameof GenerateCapturingMockAttribute}>]. Literals are not supported. Use `true` or `false` (or unit) only."
-
-                            let spec =
-                                {
-                                    IsInternal = arg
-                                }
-
-                            Some (typeDef, spec)
-                    )
-                    |> function
-                        | [] -> None
-                        | ty -> Some (ns, ty)
-                )
-
-            let opens = AstHelper.extractOpens ast
-
-            let modules =
-                namespaceAndInterfaces
-                |> List.collect (fun (ns, records) ->
-                    records |> List.map (CapturingInterfaceMockGenerator.createRecord ns opens)
-                )
-
-            Output.Ast modules

WoofWare.Myriad.Plugins/CataGenerator.fs

@@ -1174,30 +1174,28 @@ module internal CataGenerator =
         ]
         |> SynModuleOrNamespace.createNamespace ns
 
-    /// For each namespace/module, grab the types which are defined in consecutive `and`-knots in that namespace/module,
-    /// and also return the fully-qualified namespace/module name alongside that group of types.
-    /// A given module LongIdent may show up many times in the output: once for each recursive knot.
-    // Function originally inspired by https://github.com/MoiraeSoftware/myriad/blob/3c9818faabf9d508c10c28d5ecd26e66fafb48a1/src/Myriad.Core/Ast.fs#L160
-    // but there's really only one reasonable implementation of this type signature and semantics.
+    /// This function comes from Myriad, and is therefore derived from an Apache 2.0-licenced work.
+    /// https://github.com/MoiraeSoftware/myriad/blob/3c9818faabf9d508c10c28d5ecd26e66fafb48a1/src/Myriad.Core/Ast.fs#L160
+    /// A copy of the Apache 2.0 licence is at ApacheLicence.txt.
     let groupedTypeDefns (ast : ParsedInput) : (LongIdent * SynTypeDefn list) list =
-        let rec extractTypes (decls : SynModuleDecl list) (ns : LongIdent) =
-            decls
-            |> List.collect (fun moduleDecl ->
-                match moduleDecl with
-                | SynModuleDecl.Types (types, _) -> [ ns, types ]
-                | SynModuleDecl.NestedModule (SynComponentInfo (_, _, _, longId, _, _, _, _), _, decls, _, _, _) ->
-                    let combined = longId |> List.append ns
-                    extractTypes decls combined
-                | _ -> []
-            )
+        let rec extractTypes (moduleDecls : SynModuleDecl list) (ns : LongIdent) =
+            [
+                for moduleDecl in moduleDecls do
+                    match moduleDecl with
+                    | SynModuleDecl.Types (types, _) -> yield (ns, types)
+                    | SynModuleDecl.NestedModule (SynComponentInfo (_, _, _, longId, _, _, _, _), _, decls, _, _, _) ->
+                        let combined = longId |> List.append ns
+                        yield! (extractTypes decls combined)
+                    | _ -> ()
+            ]
 
-        match ast with
-        | ParsedInput.ImplFile (ParsedImplFileInput (_, _, _, _, _, contents, _, _, _)) ->
-            contents
-            |> List.collect (fun (SynModuleOrNamespace (namespaceId, _, _, moduleDecls, _, _, _, _, _)) ->
-                extractTypes moduleDecls namespaceId
-            )
-        | _ -> []
+        [
+            match ast with
+            | ParsedInput.ImplFile (ParsedImplFileInput (_, _, _, _, _, modules, _, _, _)) ->
+                for SynModuleOrNamespace (namespaceId, _, _, moduleDecls, _, _, _, _, _) in modules do
+                    yield! extractTypes moduleDecls namespaceId
+            | _ -> ()
+        ]
 
 open Myriad.Core
 

WoofWare.Myriad.Plugins/HttpClientGenerator.fs

@@ -1,5 +1,6 @@
 namespace WoofWare.Myriad.Plugins
 
+open System.IO
 open System.Net.Http
 open Fantomas.FCS.Syntax
 open WoofWare.Whippet.Fantomas
@@ -13,6 +14,17 @@ type internal HttpClientGeneratorOutputSpec =
 module internal HttpClientGenerator =
     open Fantomas.FCS.Text.Range
 
+    let outputFile = FileInfo "/tmp/output.txt"
+
+    // do
+    //     use _ = File.Create outputFile.FullName
+    //     ()
+
+    let log (line : string) =
+        // use w = outputFile.AppendText ()
+        // w.WriteLine line
+        ()
+
     [<RequireQualifiedAccess>]
     type PathSpec =
         | Verbatim of string
@@ -70,7 +82,7 @@ module internal HttpClientGenerator =
         if m = HttpMethod.Get then "Get"
         elif m = HttpMethod.Post then "Post"
         elif m = HttpMethod.Delete then "Delete"
-        elif m = HttpMethod.Patch then "Patch"
+        elif m = HttpMethod.Patch then "Post"
         elif m = HttpMethod.Options then "Options"
         elif m = HttpMethod.Head then "Head"
         elif m = HttpMethod.Put then "Put"
@@ -397,76 +409,42 @@ module internal HttpClientGenerator =
             | String -> SynExpr.createIdent "responseString"
             | Stream -> SynExpr.createIdent "responseStream"
             | RestEaseResponseType contents ->
-                match JsonNodeWithNullability.Identify contents with
-                | CannotBeNull ->
-                    let deserialiser =
-                        JsonParseGenerator.parseNonNullableNode
-                            None
-                            JsonParseGenerator.JsonParseOption.None
-                            contents
-                            (SynExpr.createIdent "jsonNode")
-                        |> SynExpr.paren
-                        |> SynExpr.createThunk
+                let deserialiser =
+                    JsonParseGenerator.parseNode
+                        None
+                        JsonParseGenerator.JsonParseOption.None
+                        contents
+                        (SynExpr.createIdent "jsonNode")
+                    |> SynExpr.paren
+                    |> SynExpr.createThunk
 
-                    // new RestEase.Response (content : string, response : HttpResponseMessage, deserialiser : unit -> 'T)
-                    SynExpr.createNew
-                        (SynType.app' (SynType.createLongIdent' [ "RestEase" ; "Response" ]) [ SynType.Anon range0 ])
-                        (SynExpr.tupleNoParen
-                            [
-                                SynExpr.createIdent "responseString"
-                                SynExpr.createIdent "response"
-                                deserialiser
-                            ])
-                | Nullable ->
-                    let deserialiser =
-                        JsonParseGenerator.parseNullableNode
-                            None
-                            JsonParseGenerator.JsonParseOption.None
-                            contents
-                            (SynExpr.createIdent "jsonNode")
-                        |> SynExpr.paren
-                        |> SynExpr.createThunk
-
-                    // new RestEase.Response (content : string, response : HttpResponseMessage, deserialiser : unit -> 'T)
-                    SynExpr.createNew
-                        (SynType.app' (SynType.createLongIdent' [ "RestEase" ; "Response" ]) [ SynType.Anon range0 ])
-                        (SynExpr.tupleNoParen
-                            [
-                                SynExpr.createIdent "responseString"
-                                SynExpr.createIdent "response"
-                                deserialiser
-                            ])
+                // new RestEase.Response (content : string, response : HttpResponseMessage, deserialiser : unit -> 'T)
+                SynExpr.createNew
+                    (SynType.app' (SynType.createLongIdent' [ "RestEase" ; "Response" ]) [ SynType.Anon range0 ])
+                    (SynExpr.tupleNoParen
+                        [
+                            SynExpr.createIdent "responseString"
+                            SynExpr.createIdent "response"
+                            deserialiser
+                        ])
             | retType ->
-                match JsonNodeWithNullability.Identify retType with
-                | Nullable ->
-                    JsonParseGenerator.parseNullableNode
-                        None
-                        JsonParseGenerator.JsonParseOption.None
-                        retType
-                        (SynExpr.createIdent "jsonNode")
-                | CannotBeNull ->
-                    JsonParseGenerator.parseNonNullableNode
-                        None
-                        JsonParseGenerator.JsonParseOption.None
-                        retType
-                        (SynExpr.createIdent "jsonNode")
+                JsonParseGenerator.parseNode
+                    None
+                    JsonParseGenerator.JsonParseOption.None
+                    retType
+                    (SynExpr.createIdent "jsonNode")
 
         let contentTypeHeader, memberHeaders =
             info.Headers
-            |> List.partition (fun (headerName, _headerValue) ->
+            |> List.partition (fun (headerName, headerValue) ->
                 match headerName |> SynExpr.stripOptionalParen with
-                | SynExpr.Const (SynConst.String (s, _, _), _) ->
-                    System.String.Equals (s, "Content-Type", System.StringComparison.OrdinalIgnoreCase)
+                | SynExpr.Const (SynConst.String ("Content-Type", _, _), _) -> true
                 | _ -> false
             )
 
         let contentTypeHeader =
             match contentTypeHeader with
-            | [] ->
-                // Set application/json if we *know* we're sending JSON
-                match bodyParam with
-                | Some (BodyParamMethods.Serialise _, _) -> Some (SynExpr.CreateConst "application/json")
-                | _ -> None
+            | [] -> None
             | [ _, ct ] -> Some (SynExpr.stripOptionalParen ct)
             | _ -> failwith "Unexpectedly got multiple Content-Type headers"
 
@@ -527,45 +505,23 @@ module internal HttpClientGenerator =
                         )
                     ]
                 | BodyParamMethods.Serialise ty ->
-                    let isNullable =
-                        match JsonNodeWithNullability.Identify ty with
-                        | CannotBeNull -> false
-                        | Nullable -> true
-
                     [
                         Let (
                             "queryParams",
                             createStringContent (
                                 SynExpr.createIdent' bodyParamName
-                                |> SynExpr.pipeThroughFunction (
-                                    fst (
-                                        (if isNullable then
-                                             JsonSerializeGenerator.serializeNodeNullable
-                                         else
-                                             JsonSerializeGenerator.serializeNodeNonNullable)
-                                            ty
-                                    )
-                                )
+                                |> SynExpr.pipeThroughFunction (fst (JsonSerializeGenerator.serializeNode ty))
                                 |> SynExpr.pipeThroughFunction (
                                     SynExpr.createLambda
                                         "node"
-                                        (if isNullable then
-                                             SynExpr.createMatch
-                                                 (SynExpr.createIdent "node")
-                                                 [
-                                                     SynMatchClause.create
-                                                         (SynPat.named "None")
-                                                         (SynExpr.CreateConst "null")
-                                                     SynMatchClause.create
-                                                         (SynPat.nameWithArgs "Some" [ SynPat.named "node" ])
-                                                         (SynExpr.applyFunction
-                                                             (SynExpr.createLongIdent [ "node" ; "ToJsonString" ])
-                                                             (SynExpr.CreateConst ()))
-                                                 ]
-                                         else
-                                             (SynExpr.applyFunction
-                                                 (SynExpr.createLongIdent [ "node" ; "ToJsonString" ])
-                                                 (SynExpr.CreateConst ())))
+                                        (SynExpr.ifThenElse
+                                            (SynExpr.applyFunction
+                                                (SynExpr.createIdent "isNull")
+                                                (SynExpr.createIdent "node"))
+                                            (SynExpr.applyFunction
+                                                (SynExpr.createLongIdent [ "node" ; "ToJsonString" ])
+                                                (SynExpr.CreateConst ()))
+                                            (SynExpr.CreateConst "null"))
                                 )
                             )
                         )
@@ -612,24 +568,6 @@ module internal HttpClientGenerator =
                     )
                 )
 
-            let jsonNodeWithoutNull =
-                match JsonNodeWithNullability.Identify info.TaskReturnType with
-                | Nullable ->
-                    Let (
-                        "jsonNode",
-                        SynExpr.createIdent "jsonNode"
-                        |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
-                    )
-                | CannotBeNull ->
-                    Let (
-                        "jsonNode",
-                        JsonSerializeGenerator.assertNotNull
-                            (Ident.create "jsonNode")
-                            (SynExpr.CreateConst
-                                $"Response from server was the JSON null object; expected a non-nullable type %s{SynType.toHumanReadableString info.TaskReturnType}")
-                            (SynExpr.createIdent "jsonNode")
-                    )
-
             let setVariableHeaders =
                 variableHeaders
                 |> List.map (fun (headerName, callToGetValue) ->
@@ -704,7 +642,6 @@ module internal HttpClientGenerator =
                     yield responseString
                     yield responseStream
                     yield jsonNode
-                    yield jsonNodeWithoutNull
                 | String -> yield responseString
                 | Stream -> yield responseStream
                 | UnitType ->
@@ -713,7 +650,6 @@ module internal HttpClientGenerator =
                 | _ ->
                     yield responseStream
                     yield jsonNode
-                    yield jsonNodeWithoutNull
             ]
             |> SynExpr.createCompExpr "async" returnExpr
             |> SynExpr.startAsTask cancellationTokenArg

WoofWare.Myriad.Plugins/HttpMethod.fs

@@ -1,66 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System
-
-/// An HTTP method. This is System.Net.Http.HttpMethod, but
-/// a proper discriminated union.
-type HttpMethod =
-    /// HTTP Get
-    | Get
-    /// HTTP Post
-    | Post
-    /// HTTP Delete
-    | Delete
-    /// HTTP Patch
-    | Patch
-    /// HTTP Options
-    | Options
-    /// HTTP Head
-    | Head
-    /// HTTP Put
-    | Put
-    /// HTTP Trace
-    | Trace
-
-    /// Convert to the standard library's enum type.
-    member this.ToDotNet () : System.Net.Http.HttpMethod =
-        match this with
-        | HttpMethod.Get -> System.Net.Http.HttpMethod.Get
-        | HttpMethod.Post -> System.Net.Http.HttpMethod.Post
-        | HttpMethod.Delete -> System.Net.Http.HttpMethod.Delete
-        | HttpMethod.Patch -> System.Net.Http.HttpMethod.Patch
-        | HttpMethod.Options -> System.Net.Http.HttpMethod.Options
-        | HttpMethod.Head -> System.Net.Http.HttpMethod.Head
-        | HttpMethod.Put -> System.Net.Http.HttpMethod.Put
-        | HttpMethod.Trace -> System.Net.Http.HttpMethod.Trace
-
-    /// Human-readable string representation.
-    override this.ToString () : string =
-        match this with
-        | HttpMethod.Get -> "Get"
-        | HttpMethod.Post -> "Post"
-        | HttpMethod.Delete -> "Delete"
-        | HttpMethod.Patch -> "Patch"
-        | HttpMethod.Options -> "Options"
-        | HttpMethod.Head -> "Head"
-        | HttpMethod.Put -> "Put"
-        | HttpMethod.Trace -> "Trace"
-
-    /// Throws on invalid inputs.
-    static member Parse (s : string) : HttpMethod =
-        if String.Equals (s, "get", StringComparison.OrdinalIgnoreCase) then
-            HttpMethod.Get
-        elif String.Equals (s, "post", StringComparison.OrdinalIgnoreCase) then
-            HttpMethod.Post
-        elif String.Equals (s, "patch", StringComparison.OrdinalIgnoreCase) then
-            HttpMethod.Patch
-        elif String.Equals (s, "delete", StringComparison.OrdinalIgnoreCase) then
-            HttpMethod.Delete
-        elif String.Equals (s, "head", StringComparison.OrdinalIgnoreCase) then
-            HttpMethod.Head
-        elif String.Equals (s, "options", StringComparison.OrdinalIgnoreCase) then
-            HttpMethod.Options
-        elif String.Equals (s, "put", StringComparison.OrdinalIgnoreCase) then
-            HttpMethod.Put
-        else
-            failwith $"Unrecognised method: %s{s}"

WoofWare.Myriad.Plugins/JsonHelpers.fs

@@ -1,48 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System.Text.Json.Nodes
-
-[<AutoOpen>]
-module internal JsonHelpers =
-    let inline asString (n : JsonNode) (key : string) : string =
-        match n.[key] with
-        | null -> failwith $"Expected node to have a key '%s{key}', but it did not: %s{n.ToJsonString ()}"
-        | s -> s.GetValue<string> ()
-
-    [<RequiresExplicitTypeArguments>]
-    let inline asOpt<'ret> (n : JsonNode) (key : string) : 'ret option =
-        match n.[key] with
-        | null -> None
-        | s -> s.GetValue<'ret> () |> Some
-
-    let inline asObj (n : JsonNode) (key : string) : JsonObject =
-        match n.[key] with
-        | null -> failwith $"Expected node to have a key '%s{key}', but it did not: %s{n.ToJsonString ()}"
-        | o -> o.AsObject ()
-
-    let inline asObjOpt (n : JsonNode) (key : string) : JsonObject option =
-        match n.[key] with
-        | null -> None
-        | o -> o.AsObject () |> Some
-
-    let inline asArr (n : JsonNode) (key : string) : JsonArray =
-        match n.[key] with
-        | null -> failwith $"Expected node to have a key '%s{key}', but it did not: %s{n.ToJsonString ()}"
-        | o -> o.AsArray ()
-
-    let inline asArrOpt (n : JsonNode) (key : string) : JsonArray option =
-        match n.[key] with
-        | null -> None
-        | o -> o.AsArray () |> Some
-
-    [<RequiresExplicitTypeArguments>]
-    let inline asArr'<'v> (n : JsonNode) (key : string) : 'v list =
-        match n.[key] with
-        | null -> failwith $"Expected node to have a key '%s{key}', but it did not: %s{n.ToJsonString ()}"
-        | o -> o.AsArray () |> Seq.map (fun v -> v.GetValue<'v> ()) |> Seq.toList
-
-    [<RequiresExplicitTypeArguments>]
-    let inline asArrOpt'<'v> (n : JsonNode) (key : string) : 'v list option =
-        match n.[key] with
-        | null -> None
-        | o -> o.AsArray () |> Seq.map (fun v -> v.GetValue<'v> ()) |> Seq.toList |> Some

WoofWare.Myriad.Plugins/JsonParseGenerator.fs

@@ -26,7 +26,7 @@ module internal JsonParseGenerator =
             }
 
     /// (match {indexed} with | null -> raise (System.Collections.Generic.KeyNotFoundException ({propertyName} not found)) | v -> v)
-    let assertPropertyExists (propertyName : SynExpr) (indexed : SynExpr) =
+    let assertNotNull (propertyName : SynExpr) (indexed : SynExpr) =
         let raiseExpr =
             SynExpr.applyFunction
                 (SynExpr.createIdent "sprintf")
@@ -40,34 +40,34 @@ module internal JsonParseGenerator =
             |> SynExpr.applyFunction (SynExpr.createIdent "raise")
 
         [
-            SynMatchClause.create (SynPat.named "None") raiseExpr
-            SynMatchClause.create (SynPat.nameWithArgs "Some" [ SynPat.named "v" ]) (SynExpr.createIdent "v")
+            SynMatchClause.create SynPat.createNull raiseExpr
+            SynMatchClause.create (SynPat.named "v") (SynExpr.createIdent "v")
         ]
         |> SynExpr.createMatch indexed
         |> SynExpr.paren
 
     /// {node}.AsValue().GetValue<{typeName}> ()
-    /// If `propertyName` is Some, uses `assertPropertyExists {node}` instead of `{node}`.
+    /// If `propertyName` is Some, uses `assertNotNull {node}` instead of `{node}`.
     let asValueGetValue (propertyName : SynExpr option) (typeName : string) (node : SynExpr) : SynExpr =
         match propertyName with
         | None -> node
-        | Some propertyName -> assertPropertyExists propertyName node
+        | Some propertyName -> assertNotNull propertyName node
         |> SynExpr.callMethod "AsValue"
         |> SynExpr.callGenericMethod' "GetValue" typeName
 
     let asValueGetValueIdent (propertyName : SynExpr option) (typeName : LongIdent) (node : SynExpr) : SynExpr =
         match propertyName with
         | None -> node
-        | Some propertyName -> assertPropertyExists propertyName node
+        | Some propertyName -> assertNotNull propertyName node
         |> SynExpr.callMethod "AsValue"
         |> SynExpr.callGenericMethod (SynLongIdent.createS "GetValue") [ SynType.createLongIdent typeName ]
 
     /// {node}.AsObject()
-    /// If `propertyName` is Some, uses `assertPropertyExists {node}` instead of `{node}`.
+    /// If `propertyName` is Some, uses `assertNotNull {node}` instead of `{node}`.
     let asObject (propertyName : SynExpr option) (node : SynExpr) : SynExpr =
         match propertyName with
         | None -> node
-        | Some propertyName -> assertPropertyExists propertyName node
+        | Some propertyName -> assertNotNull propertyName node
         |> SynExpr.callMethod "AsObject"
 
     /// {type}.jsonParse {node}
@@ -77,12 +77,11 @@ module internal JsonParseGenerator =
 
     /// collectionType is e.g. "List"; we'll be calling `ofSeq` on it.
     /// body is the body of a lambda which takes a parameter `elt`.
-    /// {assertPropertyExists node}.AsArray()
-    /// |> Seq.map (fun elt -> {assertNotNull} {body})
+    /// {assertNotNull node}.AsArray()
+    /// |> Seq.map (fun elt -> {body})
     /// |> {collectionType}.ofSeq
     let asArrayMapped
         (propertyName : SynExpr option)
-        (elementType : SynType)
         (collectionType : string)
         (node : SynExpr)
         (body : SynExpr)
@@ -90,23 +89,10 @@ module internal JsonParseGenerator =
         =
         match propertyName with
         | None -> node
-        | Some propertyName -> assertPropertyExists propertyName node
+        | Some propertyName -> assertNotNull propertyName node
         |> SynExpr.callMethod "AsArray"
         |> SynExpr.pipeThroughFunction (
-            body
-            |> JsonSerializeGenerator.assertNotNull
-                (Ident.create "elt")
-                (match propertyName with
-                 | None ->
-                     SynExpr.CreateConst
-                         $"Expected element of array (element type %s{SynType.toHumanReadableString elementType}) to be non-null, but found a null element"
-                 | Some propertyName ->
-                     SynExpr.CreateConst
-                         $"Expected element of array (element type %s{SynType.toHumanReadableString elementType}) to be non-null, but found a null element, at %%s"
-                     |> SynExpr.applyFunction (SynExpr.createIdent "sprintf")
-                     |> SynExpr.applyTo propertyName)
-            |> SynExpr.createLambda "elt"
-            |> SynExpr.applyFunction (SynExpr.createLongIdent [ "Seq" ; "map" ])
+            SynExpr.applyFunction (SynExpr.createLongIdent [ "Seq" ; "map" ]) (SynExpr.createLambda "elt" body)
         )
         |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ collectionType ; "ofSeq" ])
 
@@ -115,41 +101,14 @@ 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
-        (propertyName : SynExpr option)
-        (valueTypeIsNullable : bool)
-        (key : SynExpr -> SynExpr)
-        (valueType : SynType)
-        (value : SynExpr -> SynExpr)
-        : SynExpr
-        =
+    let dictionaryMapper (key : SynExpr -> SynExpr) (value : SynExpr -> SynExpr) : SynExpr =
         let keyArg = SynExpr.createLongIdent [ "kvp" ; "Key" ] |> SynExpr.paren
 
-        let valueArg = SynExpr.createLongIdent [ "kvp" ; "Value" ]
-
-        let value =
-            if valueTypeIsNullable then
-                (value (SynExpr.createIdent "value"))
-            else
-                let errorMessage =
-                    match propertyName with
-                    | None ->
-                        SynExpr.CreateConst
-                            $"Expected dictionary value of type %s{SynType.toHumanReadableString valueType} to be non-null, but it was null"
-                    | Some propertyName ->
-                        SynExpr.CreateConst
-                            $"Expected dictionary value of type %s{SynType.toHumanReadableString valueType} to be non-null, but it was null, at key %%s"
-                        |> SynExpr.applyFunction (SynExpr.createIdent "sprintf")
-                        |> SynExpr.applyTo propertyName
-
-                JsonSerializeGenerator.assertNotNull
-                    (Ident.create "value")
-                    errorMessage
-                    (value (SynExpr.createIdent "value"))
+        let valueArg = SynExpr.createLongIdent [ "kvp" ; "Value" ] |> SynExpr.paren
 
         // No need to paren here, we're on the LHS of a `let`
-        SynExpr.tupleNoParen [ SynExpr.createIdent "key" ; value ]
-        |> SynExpr.createLet [ SynBinding.basic [ Ident.create "value" ] [] valueArg ]
+        SynExpr.tupleNoParen [ SynExpr.createIdent "key" ; SynExpr.createIdent "value" ]
+        |> SynExpr.createLet [ SynBinding.basic [ Ident.create "value" ] [] (value valueArg) ]
         |> SynExpr.createLet [ SynBinding.basic [ Ident.create "key" ] [] (key keyArg) ]
         |> SynExpr.createLambda "kvp"
 
@@ -206,61 +165,10 @@ module internal JsonParseGenerator =
                 ))
                 handler
 
-    let rec parseNullableNode
-        // TODO: unused?!
-        (propertyName : SynExpr option)
-        (options : JsonParseOption)
-        (fieldType : SynType)
-        (node : SynExpr)
-        : SynExpr
-        =
-        match fieldType with
-        | OptionType ty ->
-            match ty with
-            | OptionType _
-            | NullableType _ ->
-                failwith
-                    $"Nested nullable types are not supported, because we can't distinguish between None and Some None. %s{SynType.toHumanReadableString ty}"
-            | _ ->
-
-            let someClause =
-                parseNonNullableNode None options ty (SynExpr.createIdent "v")
-                |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
-                |> SynMatchClause.create (SynPat.nameWithArgs "Some" [ SynPat.named "v" ])
-
-            [
-                SynMatchClause.create (SynPat.named "None") (SynExpr.createIdent "None")
-                someClause
-            ]
-            |> SynExpr.createMatch node
-        | NullableType ty ->
-            match ty with
-            | OptionType _
-            | NullableType _ ->
-                failwith
-                    $"Nested nullable types are not supported, because we can't distinguish between None and Some None. %s{SynType.toHumanReadableString ty}"
-            | _ ->
-
-            let someClause =
-                parseNonNullableNode None options ty (SynExpr.createIdent "v")
-                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Nullable" ])
-                |> SynMatchClause.create (SynPat.nameWithArgs "Some" [ SynPat.named "v" ])
-
-            [
-                SynMatchClause.create
-                    (SynPat.named "None")
-                    (SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "Nullable" ]) (SynExpr.CreateConst ()))
-                someClause
-            ]
-            |> SynExpr.createMatch node
-        | _ ->
-            failwith
-                $"Encountered type %s{SynType.toHumanReadableString fieldType} which is expected to be nullable, but couldn't identify it"
-
     /// Given `node.["town"]`, for example, choose how to obtain a JSON value from it.
     /// The property name is used in error messages at runtime to show where a JSON
     /// parse error occurred; supply `None` to indicate "don't validate".
-    and parseNonNullableNode
+    let rec parseNode
         (propertyName : SynExpr option)
         (options : JsonParseOption)
         (fieldType : SynType)
@@ -269,184 +177,101 @@ module internal JsonParseGenerator =
         =
         // TODO: parsing format for DateTime etc
         match fieldType with
-        | OptionType _
-        | NullableType _ ->
-            failwith
-                $"Unexpectedly parsing nullable type %s{SynType.toHumanReadableString fieldType} as if it were non-nullable."
-        // Struct types
         | DateOnly ->
             node
             |> asValueGetValue propertyName "string"
             |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "DateOnly" ; "Parse" ])
-        | DateTime ->
-            node
-            |> asValueGetValue propertyName "string"
-            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "DateTime" ; "Parse" ])
-        | NumberType typeName -> parseNumberType options propertyName node typeName
-        | Guid ->
-            node
-            |> asValueGetValue propertyName "string"
-            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Guid" ; "Parse" ])
-        // Reference types
         | Uri ->
             node
             |> asValueGetValue propertyName "string"
             |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Uri" ])
+        | Guid ->
+            node
+            |> asValueGetValue propertyName "string"
+            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Guid" ; "Parse" ])
+        | DateTime ->
+            node
+            |> asValueGetValue propertyName "string"
+            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "DateTime" ; "Parse" ])
         | DateTimeOffset ->
             node
             |> asValueGetValue propertyName "string"
             |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "DateTimeOffset" ; "Parse" ])
+        | NumberType typeName -> parseNumberType options propertyName node typeName
         | PrimitiveType typeName -> asValueGetValueIdent propertyName typeName node
+        | OptionType ty ->
+            let someClause =
+                parseNode None options ty (SynExpr.createIdent "v")
+                |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
+                |> SynMatchClause.create (SynPat.named "v")
+
+            [
+                SynMatchClause.create SynPat.createNull (SynExpr.createIdent "None")
+                someClause
+            ]
+            |> SynExpr.createMatch node
+        | NullableType ty ->
+            let someClause =
+                parseNode None options ty (SynExpr.createIdent "v")
+                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Nullable" ])
+                |> SynMatchClause.create (SynPat.named "v")
+
+            [
+                SynMatchClause.create
+                    SynPat.createNull
+                    (SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "Nullable" ]) (SynExpr.CreateConst ()))
+                someClause
+            ]
+            |> SynExpr.createMatch node
         | ListType ty ->
-            match JsonNodeWithNullability.Identify ty with
-            | CannotBeNull ->
-                parseNonNullableNode None options ty (SynExpr.createIdent "elt")
-                |> asArrayMapped propertyName ty "List" node
-            | Nullable ->
-                parseNullableNode None options ty (SynExpr.createIdent "elt")
-                |> asArrayMapped propertyName ty "List" node
+            parseNode None options ty (SynExpr.createIdent "elt")
+            |> asArrayMapped propertyName "List" node
         | ArrayType ty ->
-            match JsonNodeWithNullability.Identify ty with
-            | CannotBeNull ->
-                parseNonNullableNode None options ty (SynExpr.createIdent "elt")
-                |> asArrayMapped propertyName ty "Array" node
-            | Nullable ->
-                parseNullableNode None options ty (SynExpr.createIdent "elt")
-                |> asArrayMapped propertyName ty "Array" node
+            parseNode None options ty (SynExpr.createIdent "elt")
+            |> asArrayMapped propertyName "Array" node
         | IDictionaryType (keyType, valueType) ->
-            match JsonNodeWithNullability.Identify valueType with
-            | CannotBeNull ->
-                node
-                |> asObject propertyName
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (dictionaryMapper
-                            propertyName
-                            false
-                            (parseKeyString keyType)
-                            valueType
-                            (parseNonNullableNode None options valueType))
-                )
-                |> SynExpr.pipeThroughFunction (SynExpr.createIdent "dict")
-            | Nullable ->
-                node
-                |> asObject propertyName
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (dictionaryMapper
-                            propertyName
-                            true
-                            (parseKeyString keyType)
-                            valueType
-                            (parseNullableNode None options valueType))
-                )
-                |> SynExpr.pipeThroughFunction (SynExpr.createIdent "dict")
+            node
+            |> asObject propertyName
+            |> SynExpr.pipeThroughFunction (
+                SynExpr.applyFunction
+                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
+                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
+            )
+            |> SynExpr.pipeThroughFunction (SynExpr.createIdent "dict")
         | DictionaryType (keyType, valueType) ->
-            match JsonNodeWithNullability.Identify valueType with
-            | CannotBeNull ->
-                node
-                |> asObject propertyName
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (dictionaryMapper
-                            propertyName
-                            false
-                            (parseKeyString keyType)
-                            valueType
-                            (parseNonNullableNode None options valueType))
-                )
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (SynExpr.createLongIdent [ "System" ; "Collections" ; "Generic" ; "KeyValuePair" ])
-                )
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.createLongIdent [ "System" ; "Collections" ; "Generic" ; "Dictionary" ]
-                )
-            | Nullable ->
-                node
-                |> asObject propertyName
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (dictionaryMapper
-                            propertyName
-                            true
-                            (parseKeyString keyType)
-                            valueType
-                            (parseNullableNode None options valueType))
-                )
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (SynExpr.createLongIdent [ "System" ; "Collections" ; "Generic" ; "KeyValuePair" ])
-                )
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.createLongIdent [ "System" ; "Collections" ; "Generic" ; "Dictionary" ]
-                )
+            node
+            |> asObject propertyName
+            |> SynExpr.pipeThroughFunction (
+                SynExpr.applyFunction
+                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
+                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
+            )
+            |> SynExpr.pipeThroughFunction (
+                SynExpr.applyFunction
+                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
+                    (SynExpr.createLongIdent [ "System" ; "Collections" ; "Generic" ; "KeyValuePair" ])
+            )
+            |> SynExpr.pipeThroughFunction (
+                SynExpr.createLongIdent [ "System" ; "Collections" ; "Generic" ; "Dictionary" ]
+            )
         | IReadOnlyDictionaryType (keyType, valueType) ->
-            match JsonNodeWithNullability.Identify valueType with
-            | CannotBeNull ->
-                node
-                |> asObject propertyName
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (dictionaryMapper
-                            propertyName
-                            false
-                            (parseKeyString keyType)
-                            valueType
-                            (parseNonNullableNode None options valueType))
-                )
-                |> SynExpr.pipeThroughFunction (SynExpr.createIdent "readOnlyDict")
-            | Nullable ->
-                node
-                |> asObject propertyName
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (dictionaryMapper
-                            propertyName
-                            true
-                            (parseKeyString keyType)
-                            valueType
-                            (parseNullableNode None options valueType))
-                )
-                |> SynExpr.pipeThroughFunction (SynExpr.createIdent "readOnlyDict")
+            node
+            |> asObject propertyName
+            |> SynExpr.pipeThroughFunction (
+                SynExpr.applyFunction
+                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
+                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
+            )
+            |> SynExpr.pipeThroughFunction (SynExpr.createIdent "readOnlyDict")
         | MapType (keyType, valueType) ->
-            match JsonNodeWithNullability.Identify valueType with
-            | CannotBeNull ->
-                node
-                |> asObject propertyName
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (dictionaryMapper
-                            propertyName
-                            false
-                            (parseKeyString keyType)
-                            valueType
-                            (parseNonNullableNode None options valueType))
-                )
-                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Map" ; "ofSeq" ])
-            | Nullable ->
-                node
-                |> asObject propertyName
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                        (dictionaryMapper
-                            propertyName
-                            true
-                            (parseKeyString keyType)
-                            valueType
-                            (parseNullableNode None options valueType))
-                )
-                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Map" ; "ofSeq" ])
+            node
+            |> asObject propertyName
+            |> SynExpr.pipeThroughFunction (
+                SynExpr.applyFunction
+                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
+                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
+            )
+            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Map" ; "ofSeq" ])
         | BigInt ->
             node
             |> SynExpr.callMethod "ToJsonString"
@@ -457,7 +282,7 @@ module internal JsonParseGenerator =
             |> SynExpr.pipeThroughFunction (Measure.getLanguagePrimitivesMeasure primType)
         | JsonNode -> node
         | UnitType -> SynExpr.CreateConst ()
-        | fieldType ->
+        | _ ->
             // Let's just hope that we've also got our own type annotation!
             let typeName =
                 match fieldType with
@@ -466,45 +291,14 @@ module internal JsonParseGenerator =
 
             match propertyName with
             | None -> node
-            | Some propertyName -> assertPropertyExists propertyName node
+            | Some propertyName -> assertNotNull propertyName node
             |> typeJsonParse typeName
 
     /// 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 =
-        match JsonNodeWithNullability.Identify fieldType with
-        | Nullable ->
-            let objectToParse =
-                SynExpr.createIdent "node"
-                |> SynExpr.index propertyName
-                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
-
-            parseNullableNode (Some propertyName) options fieldType objectToParse
-        | CannotBeNull ->
-            [
-                SynMatchClause.create
-                    (SynPat.named "None")
-                    (SynExpr.applyFunction
-                        (SynExpr.createIdent "raise")
-                        (SynExpr.paren (
-                            SynExpr.applyFunction
-                                (SynExpr.createLongIdent
-                                    [ "System" ; "Collections" ; "Generic" ; "KeyNotFoundException" ])
-                                (SynExpr.applyFunction
-                                    (SynExpr.createIdent "sprintf")
-                                    (SynExpr.CreateConst "Required key '%s' not found on JSON object")
-                                 |> SynExpr.applyTo (SynExpr.paren propertyName)
-                                 |> SynExpr.paren)
-                        )))
-                SynMatchClause.create
-                    (SynPat.nameWithArgs "Some" [ SynPat.named "node" ])
-                    (parseNonNullableNode None options fieldType (SynExpr.createIdent "node"))
-            ]
-            |> SynExpr.createMatch (
-                SynExpr.createIdent "node"
-                |> SynExpr.index propertyName
-                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
-            )
+        let objectToParse = SynExpr.createIdent "node" |> SynExpr.index propertyName
+        parseNode (Some propertyName) options fieldType objectToParse
 
     let isJsonNumberHandling (literal : LongIdent) : bool =
         match List.rev literal |> List.map (fun ident -> ident.idText) with
@@ -711,8 +505,7 @@ module internal JsonParseGenerator =
                     |> SynExpr.createLet
                         [
                             SynExpr.index (SynExpr.CreateConst "data") (SynExpr.createIdent "node")
-                            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
-                            |> assertPropertyExists (SynExpr.CreateConst "data")
+                            |> assertNotNull (SynExpr.CreateConst "data")
                             |> SynBinding.basic [ Ident.create "node" ] []
                         ]
 
@@ -760,8 +553,7 @@ module internal JsonParseGenerator =
 
                 SynExpr.createIdent "node"
                 |> SynExpr.index property
-                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
-                |> assertPropertyExists property
+                |> assertNotNull property
                 |> SynExpr.pipeThroughFunction (
                     SynExpr.createLambda "v" (SynExpr.callGenericMethod' "GetValue" "string" (SynExpr.createIdent "v"))
                 )

WoofWare.Myriad.Plugins/JsonSerializeGenerator.fs

@@ -10,100 +10,24 @@ type internal JsonSerializeOutputSpec =
         ExtensionMethods : bool
     }
 
-/// https://github.com/Smaug123/WoofWare.Myriad/issues/364
-/// The insane design of System.Text.Json is finally causing us to
-/// do vast amounts of coding rather than merely being very annoying.
-type internal JsonNodeWithNullability =
-    | CannotBeNull
-    | Nullable
-
-    static member Identify (ty : SynType) : JsonNodeWithNullability =
-        match ty with
-        | OptionType _
-        | NullableType _ -> JsonNodeWithNullability.Nullable
-        | _ -> JsonNodeWithNullability.CannotBeNull
-
 [<RequireQualifiedAccess>]
 module internal JsonSerializeGenerator =
     open Fantomas.FCS.Text.Range
 
 
     // The absolutely galaxy-brained implementation of JsonValue has `JsonValue.Parse "null"`
-    // identically equal to null, so it's hard to use that type. We use `None` instead to represent
-    // the JSON null value.
-    let private jsonNull () = SynExpr.createIdent "None"
-
-    let assertNotNull (boundIdent : Ident) (message : SynExpr) (body : SynExpr) : SynExpr =
-        let raiseExpr =
-            message
-            |> SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "ArgumentNullException" ])
-            |> SynExpr.paren
-            |> SynExpr.applyFunction (SynExpr.createIdent "raise")
-
-        [
-            SynMatchClause.create SynPat.createNull raiseExpr
-            SynMatchClause.create (SynPat.namedI boundIdent) body
-        ]
-        |> SynExpr.createMatch (SynExpr.createIdent' boundIdent)
-        |> SynExpr.paren
-
-    /// The output of this will be an *optional* JsonNode.
-    let rec serializeNodeNullable (fieldType : SynType) : SynExpr * bool =
-        match fieldType with
-        | NullableType ty ->
-            // fun field -> if field.HasValue then {serializeNode ty} field.Value else JsonValue.Create null
-            match JsonNodeWithNullability.Identify ty with
-            | JsonNodeWithNullability.Nullable ->
-                failwith
-                    $"We don't support nested nullable types, because we can't tell the difference between None and Some None: %s{SynType.toHumanReadableString ty}"
-            | JsonNodeWithNullability.CannotBeNull ->
-
-            let inner, innerIsJsonNode = serializeNodeNonNullable ty
-
-            SynExpr.applyFunction inner (SynExpr.createLongIdent [ "field" ; "Value" ])
-            |> SynExpr.upcast' (SynType.createLongIdent' [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ])
-            |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
-            |> SynExpr.ifThenElse (SynExpr.createLongIdent [ "field" ; "HasValue" ]) (jsonNull ())
-            |> SynExpr.createLambda "field"
-            |> fun e -> e, innerIsJsonNode
-        | OptionType ty ->
-            // fun field -> match field with | None -> None | Some v -> {serializeNode ty} field |> Some
-            match JsonNodeWithNullability.Identify ty with
-            | JsonNodeWithNullability.Nullable ->
-                failwith
-                    $"We don't support nested nullable types, because we can't tell the difference between None and Some None: %s{SynType.toHumanReadableString ty}"
-            | JsonNodeWithNullability.CannotBeNull ->
-
-            let noneClause = jsonNull () |> SynMatchClause.create (SynPat.named "None")
-
-            let someClause =
-                let inner, innerIsJsonNode = serializeNodeNonNullable ty
-                let target = SynExpr.pipeThroughFunction inner (SynExpr.createIdent "field")
-
-                if innerIsJsonNode then
-                    target
-                else
-                    target
-                    |> SynExpr.paren
-                    |> SynExpr.upcast' (SynType.createLongIdent' [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ])
-                |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
-                |> SynMatchClause.create (SynPat.nameWithArgs "Some" [ SynPat.named "field" ])
-
-            [ noneClause ; someClause ]
-            |> SynExpr.createMatch (SynExpr.createIdent "field")
-            |> SynExpr.createLambda "field"
-            |> fun e -> e, true
-        | _ -> failwith $"Did not recognise type %s{SynType.toHumanReadableString fieldType} as nullable"
+    // identically equal to null. We have to work around this later, but we might as well just
+    // be efficient here and whip up the null directly.
+    let private jsonNull () =
+        SynExpr.createNull ()
+        |> SynExpr.upcast' (SynType.createLongIdent' [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ])
 
     /// Given `input.Ident`, for example, choose how to add it to the ambient `node`.
     /// The result is a line like `(fun ident -> InnerType.toJsonNode ident)` or `(fun ident -> JsonValue.Create ident)`.
     /// Returns also a bool which is true if the resulting SynExpr represents something of type JsonNode.
-    and serializeNodeNonNullable (fieldType : SynType) : SynExpr * bool =
+    let rec serializeNode (fieldType : SynType) : SynExpr * bool =
         // TODO: serialization format for DateTime etc
         match fieldType with
-        | OptionType _
-        | NullableType _ ->
-            failwith $"Tried to treat the type %s{SynType.toHumanReadableString fieldType} as non-nullable"
         | DateOnly
         | DateTime
         | NumberType _
@@ -112,21 +36,8 @@ module internal JsonSerializeGenerator =
         | Guid
         | Uri ->
             // JsonValue.Create<type>
-            (SynExpr.createIdent "field")
-            |> assertNotNull
-                (Ident.create "field")
-                (SynExpr.CreateConst
-                    $"Expected type %s{SynType.toHumanReadableString fieldType} to be non-null, but received a null value when serialising")
-            |> SynExpr.createLet
-                [
-                    SynBinding.basic
-                        [ Ident.create "field" ]
-                        []
-                        (SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ]
-                         |> SynExpr.typeApp [ fieldType ]
-                         |> SynExpr.applyTo (SynExpr.createIdent "field"))
-                ]
-            |> SynExpr.createLambda "field"
+            SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ]
+            |> SynExpr.typeApp [ fieldType ]
             |> fun e -> e, false
         | DateTimeOffset ->
             // fun field -> field.ToString("o") |> JsonValue.Create<string>
@@ -139,17 +50,41 @@ module internal JsonSerializeGenerator =
             |> SynExpr.pipeThroughFunction create
             |> SynExpr.createLambda "field"
             |> fun e -> e, false
+        | NullableType ty ->
+            // fun field -> if field.HasValue then {serializeNode ty} field.Value else JsonValue.Create null
+            let inner, innerIsJsonNode = serializeNode ty
+
+            SynExpr.applyFunction inner (SynExpr.createLongIdent [ "field" ; "Value" ])
+            |> SynExpr.upcast' (SynType.createLongIdent' [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ])
+            |> SynExpr.ifThenElse (SynExpr.createLongIdent [ "field" ; "HasValue" ]) (jsonNull ())
+            |> SynExpr.createLambda "field"
+            |> fun e -> e, innerIsJsonNode
+        | OptionType ty ->
+            // fun field -> match field with | None -> JsonValue.Create null | Some v -> {serializeNode ty} field
+            let noneClause = jsonNull () |> SynMatchClause.create (SynPat.named "None")
+
+            let someClause =
+                let inner, innerIsJsonNode = serializeNode ty
+                let target = SynExpr.applyFunction inner (SynExpr.createIdent "field")
+
+                if innerIsJsonNode then
+                    target
+                else
+                    target
+                    |> SynExpr.paren
+                    |> SynExpr.upcast' (SynType.createLongIdent' [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ])
+                |> SynMatchClause.create (SynPat.nameWithArgs "Some" [ SynPat.named "field" ])
+
+            [ noneClause ; someClause ]
+            |> SynExpr.createMatch (SynExpr.createIdent "field")
+            |> SynExpr.createLambda "field"
+            |> fun e -> e, true
         | ArrayType ty
         | ListType ty ->
             // fun field ->
             //     let arr = JsonArray ()
             //     for mem in field do arr.Add ({serializeNode} mem)
             //     arr
-            let isNullableChild =
-                match JsonNodeWithNullability.Identify ty with
-                | CannotBeNull -> false
-                | Nullable -> true
-
             [
                 SynExpr.ForEach (
                     DebugPointAtFor.Yes range0,
@@ -160,17 +95,7 @@ module internal JsonSerializeGenerator =
                     SynExpr.createIdent "field",
                     SynExpr.applyFunction
                         (SynExpr.createLongIdent [ "arr" ; "Add" ])
-                        (SynExpr.paren (
-                            SynExpr.applyFunction
-                                (fst (
-                                    (if isNullableChild then
-                                         serializeNodeNullable
-                                     else
-                                         serializeNodeNonNullable)
-                                        ty
-                                ))
-                                (SynExpr.createIdent "mem")
-                        )),
+                        (SynExpr.paren (SynExpr.applyFunction (fst (serializeNode ty)) (SynExpr.createIdent "mem"))),
                     range0
                 )
                 SynExpr.createIdent "arr"
@@ -184,28 +109,15 @@ module internal JsonSerializeGenerator =
                 ]
             |> SynExpr.createLambda "field"
             |> fun e -> e, false
-        | IDictionaryType (keyType, valueType)
-        | DictionaryType (keyType, valueType)
-        | IReadOnlyDictionaryType (keyType, valueType)
-        | MapType (keyType, valueType) ->
+        | IDictionaryType (_keyType, valueType)
+        | DictionaryType (_keyType, valueType)
+        | IReadOnlyDictionaryType (_keyType, valueType)
+        | MapType (_keyType, valueType) ->
             // fun field ->
             //    let ret = JsonObject ()
             //    for (KeyValue(key, value)) in field do
             //        ret.Add (key.ToString (), {serializeNode} value)
             //    ret
-            let isNullableValueField =
-                match JsonNodeWithNullability.Identify valueType with
-                | CannotBeNull -> false
-                | Nullable -> true
-
-            // TODO: this is a bit dubious, because user-defined types will
-            // by default have non-null ToString
-            let keyTypeHasNonNullToString =
-                match keyType with
-                | String
-                | Uri -> true
-                | _ -> false
-
             [
                 SynExpr.ForEach (
                     DebugPointAtFor.Yes range0,
@@ -218,33 +130,10 @@ module internal JsonSerializeGenerator =
                         (SynExpr.createLongIdent [ "ret" ; "Add" ])
                         (SynExpr.tuple
                             [
-                                SynExpr.createIdent "key"
-                                |> if keyTypeHasNonNullToString then
-                                       id
-                                   else
-                                       assertNotNull
-                                           (Ident.create "key")
-                                           (SynExpr.CreateConst
-                                               "A map key unexpectedly yielded null when we `ToString`'ed it. Map keys must yield non-null strings on `ToString`.")
-
-                                SynExpr.applyFunction
-                                    (fst (
-                                        (if isNullableValueField then
-                                             serializeNodeNullable
-                                         else
-                                             serializeNodeNonNullable)
-                                            valueType
-                                    ))
-                                    (SynExpr.createIdent "value")
-                            ])
-                    |> SynExpr.createLet
-                        [
-                            SynBinding.basic
-                                [ Ident.create "key" ]
-                                []
-                                (SynExpr.createLongIdent [ "key" ; "ToString" ]
-                                 |> SynExpr.applyTo (SynExpr.CreateConst ()))
-                        ],
+                                SynExpr.createLongIdent [ "key" ; "ToString" ]
+                                |> SynExpr.applyTo (SynExpr.CreateConst ())
+                                SynExpr.applyFunction (fst (serializeNode valueType)) (SynExpr.createIdent "value")
+                            ]),
                     range0
                 )
                 SynExpr.createIdent "ret"
@@ -277,24 +166,13 @@ module internal JsonSerializeGenerator =
     /// 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 isNullableField =
-            match JsonNodeWithNullability.Identify fieldType with
-            | CannotBeNull -> false
-            | Nullable -> true
-
-        let serialised =
-            if isNullableField then
-                let value =
-                    serializeNodeNullable fieldType
-                    |> fst
-                    |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Option" ; "toObj" ])
-
-                SynExpr.pipeThroughFunction value (SynExpr.createLongIdent' [ Ident.create "input" ; fieldId ])
-            else
-                let value = serializeNodeNonNullable fieldType |> fst
-                SynExpr.pipeThroughFunction value (SynExpr.createLongIdent' [ Ident.create "input" ; fieldId ])
-
-        [ propertyName ; SynExpr.paren serialised ]
+        [
+            propertyName
+            SynExpr.pipeThroughFunction
+                (fst (serializeNode fieldType))
+                (SynExpr.createLongIdent' [ Ident.create "input" ; fieldId ])
+            |> SynExpr.paren
+        ]
         |> SynExpr.tuple
         |> SynExpr.applyFunction (SynExpr.createLongIdent [ "node" ; "Add" ])
 
@@ -400,10 +278,7 @@ module internal JsonSerializeGenerator =
                     | DictionaryType (String, v) -> v
                     | _ -> failwith "Expected JsonExtensionData to be a Dictionary<string, something>"
 
-                let serialise =
-                    match JsonNodeWithNullability.Identify valType with
-                    | CannotBeNull -> fst (serializeNodeNonNullable valType)
-                    | Nullable -> fst (serializeNodeNullable valType)
+                let serialise = fst (serializeNode valType)
 
                 SynExpr.createIdent "node"
                 |> SynExpr.callMethodArg
@@ -468,15 +343,7 @@ module internal JsonSerializeGenerator =
                     let propertyName = getPropertyName (Option.get fieldData.Ident) fieldData.Attrs
 
                     let node =
-                        match JsonNodeWithNullability.Identify fieldData.Type with
-                        | CannotBeNull ->
-                            SynExpr.applyFunction
-                                (fst (serializeNodeNonNullable fieldData.Type))
-                                (SynExpr.createIdent caseName)
-                        | Nullable ->
-                            SynExpr.applyFunction
-                                (fst (serializeNodeNullable fieldData.Type))
-                                (SynExpr.createIdent caseName)
+                        SynExpr.applyFunction (fst (serializeNode fieldData.Type)) (SynExpr.createIdent caseName)
 
                     [ propertyName ; node ]
                     |> SynExpr.tuple

WoofWare.Myriad.Plugins/List.fs

@@ -21,3 +21,13 @@ module private List =
             | Some head :: tail -> go (head :: acc) tail
 
         go [] l
+
+    /// Return the first error encountered, or the entire list.
+    let allOkOrError<'ok, 'err> (l : Result<'ok, 'err> list) : Result<'ok list, 'err> =
+        let rec go acc l =
+            match l with
+            | [] -> Ok (List.rev acc)
+            | Error e :: _ -> Error e
+            | Ok o :: rest -> go (o :: acc) rest
+
+        go [] l

WoofWare.Myriad.Plugins/Parameters.fs

@@ -2,7 +2,6 @@ namespace WoofWare.Myriad.Plugins
 
 type internal DesiredGenerator =
     | InterfaceMock of isInternal : bool option
-    | CapturingInterfaceMock of isInternal : bool option
     | JsonParse of extensionMethod : bool option
     | JsonSerialize of extensionMethod : bool option
     | HttpClient of extensionMethod : bool option
@@ -12,9 +11,6 @@ type internal DesiredGenerator =
         | "GenerateMock" -> DesiredGenerator.InterfaceMock None
         | "GenerateMock(true)" -> DesiredGenerator.InterfaceMock (Some true)
         | "GenerateMock(false)" -> DesiredGenerator.InterfaceMock (Some false)
-        | "GenerateCapturingMock" -> DesiredGenerator.CapturingInterfaceMock None
-        | "GenerateCapturingMock(true)" -> DesiredGenerator.CapturingInterfaceMock (Some true)
-        | "GenerateCapturingMock(false)" -> DesiredGenerator.CapturingInterfaceMock (Some false)
         | "JsonParse" -> DesiredGenerator.JsonParse None
         | "JsonParse(true)" -> DesiredGenerator.JsonParse (Some true)
         | "JsonParse(false)" -> DesiredGenerator.JsonParse (Some false)

WoofWare.Myriad.Plugins/SurfaceBaseline.txt

@@ -1,9 +1,84 @@
+WoofWare.Myriad.Plugins.AdditionalProperties inherit obj, implements WoofWare.Myriad.Plugins.AdditionalProperties System.IEquatable, System.Collections.IStructuralEquatable - union type with 2 cases
+WoofWare.Myriad.Plugins.AdditionalProperties+Constrained inherit WoofWare.Myriad.Plugins.AdditionalProperties
+WoofWare.Myriad.Plugins.AdditionalProperties+Constrained.get_Item [method]: unit -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.AdditionalProperties+Constrained.Item [property]: [read-only] WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.AdditionalProperties+Tags inherit obj
+WoofWare.Myriad.Plugins.AdditionalProperties+Tags.Constrained [static field]: int = 1
+WoofWare.Myriad.Plugins.AdditionalProperties+Tags.Never [static field]: int = 0
+WoofWare.Myriad.Plugins.AdditionalProperties.Equals [method]: (WoofWare.Myriad.Plugins.AdditionalProperties, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.AdditionalProperties.get_IsConstrained [method]: unit -> bool
+WoofWare.Myriad.Plugins.AdditionalProperties.get_IsNever [method]: unit -> bool
+WoofWare.Myriad.Plugins.AdditionalProperties.get_Never [static method]: unit -> WoofWare.Myriad.Plugins.AdditionalProperties
+WoofWare.Myriad.Plugins.AdditionalProperties.get_Tag [method]: unit -> int
+WoofWare.Myriad.Plugins.AdditionalProperties.IsConstrained [property]: [read-only] bool
+WoofWare.Myriad.Plugins.AdditionalProperties.IsNever [property]: [read-only] bool
+WoofWare.Myriad.Plugins.AdditionalProperties.Never [static property]: [read-only] WoofWare.Myriad.Plugins.AdditionalProperties
+WoofWare.Myriad.Plugins.AdditionalProperties.NewConstrained [static method]: WoofWare.Myriad.Plugins.Definition -> WoofWare.Myriad.Plugins.AdditionalProperties
+WoofWare.Myriad.Plugins.AdditionalProperties.Tag [property]: [read-only] int
 WoofWare.Myriad.Plugins.ArgParserGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.ArgParserGenerator..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.CapturingInterfaceMockGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
-WoofWare.Myriad.Plugins.CapturingInterfaceMockGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.ArrayTypeDefinition inherit obj, implements WoofWare.Myriad.Plugins.ArrayTypeDefinition System.IEquatable, System.Collections.IStructuralEquatable
+WoofWare.Myriad.Plugins.ArrayTypeDefinition..ctor [constructor]: WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.ArrayTypeDefinition.Equals [method]: (WoofWare.Myriad.Plugins.ArrayTypeDefinition, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.ArrayTypeDefinition.get_Items [method]: unit -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.ArrayTypeDefinition.Items [property]: [read-only] WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.ArrayTypeDefinition.Parse [static method]: System.Text.Json.Nodes.JsonNode -> WoofWare.Myriad.Plugins.ArrayTypeDefinition
 WoofWare.Myriad.Plugins.CreateCatamorphismGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.CreateCatamorphismGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.Definition inherit obj, implements WoofWare.Myriad.Plugins.Definition System.IEquatable, System.Collections.IStructuralEquatable - union type with 8 cases
+WoofWare.Myriad.Plugins.Definition+Array inherit WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition+Array.get_Item [method]: unit -> WoofWare.Myriad.Plugins.ArrayTypeDefinition
+WoofWare.Myriad.Plugins.Definition+Array.Item [property]: [read-only] WoofWare.Myriad.Plugins.ArrayTypeDefinition
+WoofWare.Myriad.Plugins.Definition+Handle inherit WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition+Handle.get_Item [method]: unit -> string
+WoofWare.Myriad.Plugins.Definition+Handle.Item [property]: [read-only] string
+WoofWare.Myriad.Plugins.Definition+Integer inherit WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition+Integer.format [property]: [read-only] string option
+WoofWare.Myriad.Plugins.Definition+Integer.get_format [method]: unit -> string option
+WoofWare.Myriad.Plugins.Definition+Object inherit WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition+Object.get_Item [method]: unit -> WoofWare.Myriad.Plugins.ObjectTypeDefinition
+WoofWare.Myriad.Plugins.Definition+Object.Item [property]: [read-only] WoofWare.Myriad.Plugins.ObjectTypeDefinition
+WoofWare.Myriad.Plugins.Definition+Tags inherit obj
+WoofWare.Myriad.Plugins.Definition+Tags.Array [static field]: int = 2
+WoofWare.Myriad.Plugins.Definition+Tags.Boolean [static field]: int = 4
+WoofWare.Myriad.Plugins.Definition+Tags.File [static field]: int = 7
+WoofWare.Myriad.Plugins.Definition+Tags.Handle [static field]: int = 0
+WoofWare.Myriad.Plugins.Definition+Tags.Integer [static field]: int = 6
+WoofWare.Myriad.Plugins.Definition+Tags.Object [static field]: int = 1
+WoofWare.Myriad.Plugins.Definition+Tags.String [static field]: int = 3
+WoofWare.Myriad.Plugins.Definition+Tags.Unspecified [static field]: int = 5
+WoofWare.Myriad.Plugins.Definition.Boolean [static property]: [read-only] WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.Equals [method]: (WoofWare.Myriad.Plugins.Definition, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.Definition.File [static property]: [read-only] WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.get_Boolean [static method]: unit -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.get_File [static method]: unit -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.get_IsArray [method]: unit -> bool
+WoofWare.Myriad.Plugins.Definition.get_IsBoolean [method]: unit -> bool
+WoofWare.Myriad.Plugins.Definition.get_IsFile [method]: unit -> bool
+WoofWare.Myriad.Plugins.Definition.get_IsHandle [method]: unit -> bool
+WoofWare.Myriad.Plugins.Definition.get_IsInteger [method]: unit -> bool
+WoofWare.Myriad.Plugins.Definition.get_IsObject [method]: unit -> bool
+WoofWare.Myriad.Plugins.Definition.get_IsString [method]: unit -> bool
+WoofWare.Myriad.Plugins.Definition.get_IsUnspecified [method]: unit -> bool
+WoofWare.Myriad.Plugins.Definition.get_String [static method]: unit -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.get_Tag [method]: unit -> int
+WoofWare.Myriad.Plugins.Definition.get_Unspecified [static method]: unit -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.IsArray [property]: [read-only] bool
+WoofWare.Myriad.Plugins.Definition.IsBoolean [property]: [read-only] bool
+WoofWare.Myriad.Plugins.Definition.IsFile [property]: [read-only] bool
+WoofWare.Myriad.Plugins.Definition.IsHandle [property]: [read-only] bool
+WoofWare.Myriad.Plugins.Definition.IsInteger [property]: [read-only] bool
+WoofWare.Myriad.Plugins.Definition.IsObject [property]: [read-only] bool
+WoofWare.Myriad.Plugins.Definition.IsString [property]: [read-only] bool
+WoofWare.Myriad.Plugins.Definition.IsUnspecified [property]: [read-only] bool
+WoofWare.Myriad.Plugins.Definition.NewArray [static method]: WoofWare.Myriad.Plugins.ArrayTypeDefinition -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.NewHandle [static method]: string -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.NewInteger [static method]: string option -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.NewObject [static method]: WoofWare.Myriad.Plugins.ObjectTypeDefinition -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.Parse [static method]: System.Text.Json.Nodes.JsonObject -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.String [static property]: [read-only] WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Definition.Tag [property]: [read-only] int
+WoofWare.Myriad.Plugins.Definition.Unspecified [static property]: [read-only] WoofWare.Myriad.Plugins.Definition
 WoofWare.Myriad.Plugins.HttpClientGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.HttpClientGenerator..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.HttpMethod inherit obj, implements WoofWare.Myriad.Plugins.HttpMethod System.IEquatable, System.Collections.IStructuralEquatable, WoofWare.Myriad.Plugins.HttpMethod System.IComparable, System.IComparable, System.Collections.IStructuralComparable - union type with 8 cases
@@ -59,7 +134,162 @@ WoofWare.Myriad.Plugins.JsonParseGenerator inherit obj, implements Myriad.Core.I
 WoofWare.Myriad.Plugins.JsonParseGenerator..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.JsonSerializeGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.JsonSerializeGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.MimeType inherit obj, implements WoofWare.Myriad.Plugins.MimeType System.IEquatable, System.Collections.IStructuralEquatable, WoofWare.Myriad.Plugins.MimeType System.IComparable, System.IComparable, System.Collections.IStructuralComparable - union type with 1 cases
+WoofWare.Myriad.Plugins.MimeType.Equals [method]: (WoofWare.Myriad.Plugins.MimeType, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.MimeType.get_Item [method]: unit -> string
+WoofWare.Myriad.Plugins.MimeType.get_Tag [method]: unit -> int
+WoofWare.Myriad.Plugins.MimeType.Item [property]: [read-only] string
+WoofWare.Myriad.Plugins.MimeType.NewMimeType [static method]: string -> WoofWare.Myriad.Plugins.MimeType
+WoofWare.Myriad.Plugins.MimeType.Tag [property]: [read-only] int
+WoofWare.Myriad.Plugins.ObjectTypeDefinition inherit obj, implements WoofWare.Myriad.Plugins.ObjectTypeDefinition System.IEquatable, System.Collections.IStructuralEquatable
+WoofWare.Myriad.Plugins.ObjectTypeDefinition..ctor [constructor]: (string option, Map<string, WoofWare.Myriad.Plugins.Definition> option, Map<string, System.Text.Json.Nodes.JsonNode>, string list option, WoofWare.Myriad.Plugins.AdditionalProperties option, System.Text.Json.Nodes.JsonObject option)
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.AdditionalProperties [property]: [read-only] WoofWare.Myriad.Plugins.AdditionalProperties option
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.Description [property]: [read-only] string option
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.Equals [method]: (WoofWare.Myriad.Plugins.ObjectTypeDefinition, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.Example [property]: [read-only] System.Text.Json.Nodes.JsonObject option
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.Extras [property]: [read-only] Map<string, System.Text.Json.Nodes.JsonNode>
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.get_AdditionalProperties [method]: unit -> WoofWare.Myriad.Plugins.AdditionalProperties option
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.get_Description [method]: unit -> string option
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.get_Example [method]: unit -> System.Text.Json.Nodes.JsonObject option
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.get_Extras [method]: unit -> Map<string, System.Text.Json.Nodes.JsonNode>
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.get_Properties [method]: unit -> Map<string, WoofWare.Myriad.Plugins.Definition> option
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.get_Required [method]: unit -> string list option
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.Parse [static method]: System.Text.Json.Nodes.JsonObject -> WoofWare.Myriad.Plugins.ObjectTypeDefinition
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.Properties [property]: [read-only] Map<string, WoofWare.Myriad.Plugins.Definition> option
+WoofWare.Myriad.Plugins.ObjectTypeDefinition.Required [property]: [read-only] string list option
+WoofWare.Myriad.Plugins.OperationId inherit obj, implements WoofWare.Myriad.Plugins.OperationId System.IEquatable, System.Collections.IStructuralEquatable, WoofWare.Myriad.Plugins.OperationId System.IComparable, System.IComparable, System.Collections.IStructuralComparable - union type with 1 cases
+WoofWare.Myriad.Plugins.OperationId.Equals [method]: (WoofWare.Myriad.Plugins.OperationId, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.OperationId.get_Item [method]: unit -> string
+WoofWare.Myriad.Plugins.OperationId.get_Tag [method]: unit -> int
+WoofWare.Myriad.Plugins.OperationId.Item [property]: [read-only] string
+WoofWare.Myriad.Plugins.OperationId.NewOperationId [static method]: string -> WoofWare.Myriad.Plugins.OperationId
+WoofWare.Myriad.Plugins.OperationId.Tag [property]: [read-only] int
+WoofWare.Myriad.Plugins.ParameterIn inherit obj, implements WoofWare.Myriad.Plugins.ParameterIn System.IEquatable, System.Collections.IStructuralEquatable, WoofWare.Myriad.Plugins.ParameterIn System.IComparable, System.IComparable, System.Collections.IStructuralComparable - union type with 4 cases
+WoofWare.Myriad.Plugins.ParameterIn+Path inherit WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.ParameterIn+Path.get_name [method]: unit -> string
+WoofWare.Myriad.Plugins.ParameterIn+Path.name [property]: [read-only] string
+WoofWare.Myriad.Plugins.ParameterIn+Query inherit WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.ParameterIn+Query.get_name [method]: unit -> string
+WoofWare.Myriad.Plugins.ParameterIn+Query.name [property]: [read-only] string
+WoofWare.Myriad.Plugins.ParameterIn+Tags inherit obj
+WoofWare.Myriad.Plugins.ParameterIn+Tags.Body [static field]: int = 2
+WoofWare.Myriad.Plugins.ParameterIn+Tags.Path [static field]: int = 0
+WoofWare.Myriad.Plugins.ParameterIn+Tags.Query [static field]: int = 1
+WoofWare.Myriad.Plugins.ParameterIn+Tags.Unrecognised [static field]: int = 3
+WoofWare.Myriad.Plugins.ParameterIn+Unrecognised inherit WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.ParameterIn+Unrecognised.get_name [method]: unit -> string
+WoofWare.Myriad.Plugins.ParameterIn+Unrecognised.get_op [method]: unit -> string
+WoofWare.Myriad.Plugins.ParameterIn+Unrecognised.name [property]: [read-only] string
+WoofWare.Myriad.Plugins.ParameterIn+Unrecognised.op [property]: [read-only] string
+WoofWare.Myriad.Plugins.ParameterIn.Body [static property]: [read-only] WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.ParameterIn.Equals [method]: (WoofWare.Myriad.Plugins.ParameterIn, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.ParameterIn.get_Body [static method]: unit -> WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.ParameterIn.get_IsBody [method]: unit -> bool
+WoofWare.Myriad.Plugins.ParameterIn.get_IsPath [method]: unit -> bool
+WoofWare.Myriad.Plugins.ParameterIn.get_IsQuery [method]: unit -> bool
+WoofWare.Myriad.Plugins.ParameterIn.get_IsUnrecognised [method]: unit -> bool
+WoofWare.Myriad.Plugins.ParameterIn.get_Tag [method]: unit -> int
+WoofWare.Myriad.Plugins.ParameterIn.IsBody [property]: [read-only] bool
+WoofWare.Myriad.Plugins.ParameterIn.IsPath [property]: [read-only] bool
+WoofWare.Myriad.Plugins.ParameterIn.IsQuery [property]: [read-only] bool
+WoofWare.Myriad.Plugins.ParameterIn.IsUnrecognised [property]: [read-only] bool
+WoofWare.Myriad.Plugins.ParameterIn.NewPath [static method]: string -> WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.ParameterIn.NewQuery [static method]: string -> WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.ParameterIn.NewUnrecognised [static method]: (string, string) -> WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.ParameterIn.Tag [property]: [read-only] int
 WoofWare.Myriad.Plugins.RemoveOptionsGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.RemoveOptionsGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.Response inherit obj, implements WoofWare.Myriad.Plugins.Response System.IEquatable, System.Collections.IStructuralEquatable
+WoofWare.Myriad.Plugins.Response..ctor [constructor]: (string, WoofWare.Myriad.Plugins.Definition)
+WoofWare.Myriad.Plugins.Response.Description [property]: [read-only] string
+WoofWare.Myriad.Plugins.Response.Equals [method]: (WoofWare.Myriad.Plugins.Response, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.Response.get_Description [method]: unit -> string
+WoofWare.Myriad.Plugins.Response.get_Schema [method]: unit -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Response.Parse [static method]: System.Text.Json.Nodes.JsonObject -> WoofWare.Myriad.Plugins.Response
+WoofWare.Myriad.Plugins.Response.Schema [property]: [read-only] WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.Scheme inherit obj, implements WoofWare.Myriad.Plugins.Scheme System.IEquatable, System.Collections.IStructuralEquatable, WoofWare.Myriad.Plugins.Scheme System.IComparable, System.IComparable, System.Collections.IStructuralComparable - union type with 1 cases
+WoofWare.Myriad.Plugins.Scheme.Equals [method]: (WoofWare.Myriad.Plugins.Scheme, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.Scheme.get_Item [method]: unit -> string
+WoofWare.Myriad.Plugins.Scheme.get_Tag [method]: unit -> int
+WoofWare.Myriad.Plugins.Scheme.Item [property]: [read-only] string
+WoofWare.Myriad.Plugins.Scheme.NewScheme [static method]: string -> WoofWare.Myriad.Plugins.Scheme
+WoofWare.Myriad.Plugins.Scheme.Tag [property]: [read-only] int
+WoofWare.Myriad.Plugins.Swagger inherit obj, implements WoofWare.Myriad.Plugins.Swagger System.IEquatable, System.Collections.IStructuralEquatable
+WoofWare.Myriad.Plugins.Swagger..ctor [constructor]: (WoofWare.Myriad.Plugins.MimeType list, WoofWare.Myriad.Plugins.MimeType list, WoofWare.Myriad.Plugins.Scheme list, System.Version, WoofWare.Myriad.Plugins.SwaggerInfo, string, Map<string, Map<WoofWare.Myriad.Plugins.HttpMethod, WoofWare.Myriad.Plugins.SwaggerEndpoint>>, Map<string, WoofWare.Myriad.Plugins.Definition>, Map<string, WoofWare.Myriad.Plugins.Response>)
+WoofWare.Myriad.Plugins.Swagger.BasePath [property]: [read-only] string
+WoofWare.Myriad.Plugins.Swagger.Consumes [property]: [read-only] WoofWare.Myriad.Plugins.MimeType list
+WoofWare.Myriad.Plugins.Swagger.Definitions [property]: [read-only] Map<string, WoofWare.Myriad.Plugins.Definition>
+WoofWare.Myriad.Plugins.Swagger.Equals [method]: (WoofWare.Myriad.Plugins.Swagger, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.Swagger.get_BasePath [method]: unit -> string
+WoofWare.Myriad.Plugins.Swagger.get_Consumes [method]: unit -> WoofWare.Myriad.Plugins.MimeType list
+WoofWare.Myriad.Plugins.Swagger.get_Definitions [method]: unit -> Map<string, WoofWare.Myriad.Plugins.Definition>
+WoofWare.Myriad.Plugins.Swagger.get_Info [method]: unit -> WoofWare.Myriad.Plugins.SwaggerInfo
+WoofWare.Myriad.Plugins.Swagger.get_Paths [method]: unit -> Map<string, Map<WoofWare.Myriad.Plugins.HttpMethod, WoofWare.Myriad.Plugins.SwaggerEndpoint>>
+WoofWare.Myriad.Plugins.Swagger.get_Produces [method]: unit -> WoofWare.Myriad.Plugins.MimeType list
+WoofWare.Myriad.Plugins.Swagger.get_Responses [method]: unit -> Map<string, WoofWare.Myriad.Plugins.Response>
+WoofWare.Myriad.Plugins.Swagger.get_Schemes [method]: unit -> WoofWare.Myriad.Plugins.Scheme list
+WoofWare.Myriad.Plugins.Swagger.get_Swagger [method]: unit -> System.Version
+WoofWare.Myriad.Plugins.Swagger.Info [property]: [read-only] WoofWare.Myriad.Plugins.SwaggerInfo
+WoofWare.Myriad.Plugins.Swagger.Paths [property]: [read-only] Map<string, Map<WoofWare.Myriad.Plugins.HttpMethod, WoofWare.Myriad.Plugins.SwaggerEndpoint>>
+WoofWare.Myriad.Plugins.Swagger.Produces [property]: [read-only] WoofWare.Myriad.Plugins.MimeType list
+WoofWare.Myriad.Plugins.Swagger.Responses [property]: [read-only] Map<string, WoofWare.Myriad.Plugins.Response>
+WoofWare.Myriad.Plugins.Swagger.Schemes [property]: [read-only] WoofWare.Myriad.Plugins.Scheme list
+WoofWare.Myriad.Plugins.Swagger.Swagger [property]: [read-only] System.Version
 WoofWare.Myriad.Plugins.SwaggerClientGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
-WoofWare.Myriad.Plugins.SwaggerClientGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.SwaggerClientGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.SwaggerEndpoint inherit obj, implements WoofWare.Myriad.Plugins.SwaggerEndpoint System.IEquatable, System.Collections.IStructuralEquatable
+WoofWare.Myriad.Plugins.SwaggerEndpoint..ctor [constructor]: (WoofWare.Myriad.Plugins.MimeType list option, WoofWare.Myriad.Plugins.MimeType list option, string list, string, WoofWare.Myriad.Plugins.OperationId, WoofWare.Myriad.Plugins.SwaggerParameter list option, Map<int, WoofWare.Myriad.Plugins.Definition>)
+WoofWare.Myriad.Plugins.SwaggerEndpoint.Consumes [property]: [read-only] WoofWare.Myriad.Plugins.MimeType list option
+WoofWare.Myriad.Plugins.SwaggerEndpoint.Equals [method]: (WoofWare.Myriad.Plugins.SwaggerEndpoint, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.SwaggerEndpoint.get_Consumes [method]: unit -> WoofWare.Myriad.Plugins.MimeType list option
+WoofWare.Myriad.Plugins.SwaggerEndpoint.get_OperationId [method]: unit -> WoofWare.Myriad.Plugins.OperationId
+WoofWare.Myriad.Plugins.SwaggerEndpoint.get_Parameters [method]: unit -> WoofWare.Myriad.Plugins.SwaggerParameter list option
+WoofWare.Myriad.Plugins.SwaggerEndpoint.get_Produces [method]: unit -> WoofWare.Myriad.Plugins.MimeType list option
+WoofWare.Myriad.Plugins.SwaggerEndpoint.get_Responses [method]: unit -> Map<int, WoofWare.Myriad.Plugins.Definition>
+WoofWare.Myriad.Plugins.SwaggerEndpoint.get_Summary [method]: unit -> string
+WoofWare.Myriad.Plugins.SwaggerEndpoint.get_Tags [method]: unit -> string list
+WoofWare.Myriad.Plugins.SwaggerEndpoint.OperationId [property]: [read-only] WoofWare.Myriad.Plugins.OperationId
+WoofWare.Myriad.Plugins.SwaggerEndpoint.Parameters [property]: [read-only] WoofWare.Myriad.Plugins.SwaggerParameter list option
+WoofWare.Myriad.Plugins.SwaggerEndpoint.Parse [static method]: System.Text.Json.Nodes.JsonObject -> WoofWare.Myriad.Plugins.SwaggerEndpoint
+WoofWare.Myriad.Plugins.SwaggerEndpoint.Produces [property]: [read-only] WoofWare.Myriad.Plugins.MimeType list option
+WoofWare.Myriad.Plugins.SwaggerEndpoint.Responses [property]: [read-only] Map<int, WoofWare.Myriad.Plugins.Definition>
+WoofWare.Myriad.Plugins.SwaggerEndpoint.Summary [property]: [read-only] string
+WoofWare.Myriad.Plugins.SwaggerEndpoint.Tags [property]: [read-only] string list
+WoofWare.Myriad.Plugins.SwaggerInfo inherit obj, implements WoofWare.Myriad.Plugins.SwaggerInfo System.IEquatable, System.Collections.IStructuralEquatable
+WoofWare.Myriad.Plugins.SwaggerInfo..ctor [constructor]: (string, string, WoofWare.Myriad.Plugins.SwaggerLicense, System.Version)
+WoofWare.Myriad.Plugins.SwaggerInfo.Description [property]: [read-only] string
+WoofWare.Myriad.Plugins.SwaggerInfo.Equals [method]: (WoofWare.Myriad.Plugins.SwaggerInfo, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.SwaggerInfo.get_Description [method]: unit -> string
+WoofWare.Myriad.Plugins.SwaggerInfo.get_License [method]: unit -> WoofWare.Myriad.Plugins.SwaggerLicense
+WoofWare.Myriad.Plugins.SwaggerInfo.get_Title [method]: unit -> string
+WoofWare.Myriad.Plugins.SwaggerInfo.get_Version [method]: unit -> System.Version
+WoofWare.Myriad.Plugins.SwaggerInfo.License [property]: [read-only] WoofWare.Myriad.Plugins.SwaggerLicense
+WoofWare.Myriad.Plugins.SwaggerInfo.Parse [static method]: System.Text.Json.Nodes.JsonObject -> WoofWare.Myriad.Plugins.SwaggerInfo
+WoofWare.Myriad.Plugins.SwaggerInfo.Title [property]: [read-only] string
+WoofWare.Myriad.Plugins.SwaggerInfo.Version [property]: [read-only] System.Version
+WoofWare.Myriad.Plugins.SwaggerLicense inherit obj, implements WoofWare.Myriad.Plugins.SwaggerLicense System.IEquatable, System.Collections.IStructuralEquatable
+WoofWare.Myriad.Plugins.SwaggerLicense..ctor [constructor]: (string, System.Uri option, string option)
+WoofWare.Myriad.Plugins.SwaggerLicense.Equals [method]: (WoofWare.Myriad.Plugins.SwaggerLicense, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.SwaggerLicense.get_Identifier [method]: unit -> string option
+WoofWare.Myriad.Plugins.SwaggerLicense.get_Name [method]: unit -> string
+WoofWare.Myriad.Plugins.SwaggerLicense.get_Url [method]: unit -> System.Uri option
+WoofWare.Myriad.Plugins.SwaggerLicense.Identifier [property]: [read-only] string option
+WoofWare.Myriad.Plugins.SwaggerLicense.Name [property]: [read-only] string
+WoofWare.Myriad.Plugins.SwaggerLicense.Parse [static method]: System.Text.Json.Nodes.JsonObject -> WoofWare.Myriad.Plugins.SwaggerLicense
+WoofWare.Myriad.Plugins.SwaggerLicense.Url [property]: [read-only] System.Uri option
+WoofWare.Myriad.Plugins.SwaggerModule inherit obj
+WoofWare.Myriad.Plugins.SwaggerModule.parse [static method]: string -> WoofWare.Myriad.Plugins.Swagger
+WoofWare.Myriad.Plugins.SwaggerParameter inherit obj, implements WoofWare.Myriad.Plugins.SwaggerParameter System.IEquatable, System.Collections.IStructuralEquatable
+WoofWare.Myriad.Plugins.SwaggerParameter..ctor [constructor]: (WoofWare.Myriad.Plugins.Definition, string option, WoofWare.Myriad.Plugins.ParameterIn, string, bool option)
+WoofWare.Myriad.Plugins.SwaggerParameter.Description [property]: [read-only] string option
+WoofWare.Myriad.Plugins.SwaggerParameter.Equals [method]: (WoofWare.Myriad.Plugins.SwaggerParameter, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.SwaggerParameter.get_Description [method]: unit -> string option
+WoofWare.Myriad.Plugins.SwaggerParameter.get_In [method]: unit -> WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.SwaggerParameter.get_Name [method]: unit -> string
+WoofWare.Myriad.Plugins.SwaggerParameter.get_Required [method]: unit -> bool option
+WoofWare.Myriad.Plugins.SwaggerParameter.get_Type [method]: unit -> WoofWare.Myriad.Plugins.Definition
+WoofWare.Myriad.Plugins.SwaggerParameter.In [property]: [read-only] WoofWare.Myriad.Plugins.ParameterIn
+WoofWare.Myriad.Plugins.SwaggerParameter.Name [property]: [read-only] string
+WoofWare.Myriad.Plugins.SwaggerParameter.Parse [static method]: System.Text.Json.Nodes.JsonObject -> WoofWare.Myriad.Plugins.SwaggerParameter
+WoofWare.Myriad.Plugins.SwaggerParameter.Required [property]: [read-only] bool option
+WoofWare.Myriad.Plugins.SwaggerParameter.Type [property]: [read-only] WoofWare.Myriad.Plugins.Definition

WoofWare.Myriad.Plugins/Swagger.fs

@@ -1,8 +1,53 @@
-module internal WoofWare.Myriad.Plugins.SwaggerV2
+namespace WoofWare.Myriad.Plugins
 
 open System
 open System.Text.Json.Nodes
 
+[<AutoOpen>]
+module internal JsonHelpers =
+    let inline asString (n : JsonNode) (key : string) : string =
+        match n.[key] with
+        | null -> failwith $"Expected node to have a key '%s{key}', but it did not: %s{n.ToJsonString ()}"
+        | s -> s.GetValue<string> ()
+
+    [<RequiresExplicitTypeArguments>]
+    let inline asOpt<'ret> (n : JsonNode) (key : string) : 'ret option =
+        match n.[key] with
+        | null -> None
+        | s -> s.GetValue<'ret> () |> Some
+
+    let inline asObj (n : JsonNode) (key : string) : JsonObject =
+        match n.[key] with
+        | null -> failwith $"Expected node to have a key '%s{key}', but it did not: %s{n.ToJsonString ()}"
+        | o -> o.AsObject ()
+
+    let inline asObjOpt (n : JsonNode) (key : string) : JsonObject option =
+        match n.[key] with
+        | null -> None
+        | o -> o.AsObject () |> Some
+
+    let inline asArr (n : JsonNode) (key : string) : JsonArray =
+        match n.[key] with
+        | null -> failwith $"Expected node to have a key '%s{key}', but it did not: %s{n.ToJsonString ()}"
+        | o -> o.AsArray ()
+
+    let inline asArrOpt (n : JsonNode) (key : string) : JsonArray option =
+        match n.[key] with
+        | null -> None
+        | o -> o.AsArray () |> Some
+
+    [<RequiresExplicitTypeArguments>]
+    let inline asArr'<'v> (n : JsonNode) (key : string) : 'v list =
+        match n.[key] with
+        | null -> failwith $"Expected node to have a key '%s{key}', but it did not: %s{n.ToJsonString ()}"
+        | o -> o.AsArray () |> Seq.map (fun v -> v.GetValue<'v> ()) |> Seq.toList
+
+    [<RequiresExplicitTypeArguments>]
+    let inline asArrOpt'<'v> (n : JsonNode) (key : string) : 'v list option =
+        match n.[key] with
+        | null -> None
+        | o -> o.AsArray () |> Seq.map (fun v -> v.GetValue<'v> ()) |> Seq.toList |> Some
+
 /// A MIME type, like "application/json"
 type MimeType =
     /// A MIME type, like "application/json"
@@ -153,14 +198,7 @@ and ObjectTypeDefinition =
                 |> Map.ofSeq
                 |> Some
 
-        let example =
-            match node.["example"] with
-            | null -> None
-            | :? JsonObject as o -> Some o
-            | _ ->
-                // Gitea returns a stringified and malformed JSON object here.
-                // Don't throw; just omit.
-                None
+        let example = asObjOpt node "example"
 
         let required = asArrOpt'<string> node "required"
 
@@ -389,8 +427,71 @@ type Response =
             Schema = schema
         }
 
+/// An HTTP method. This is System.Net.Http.HttpMethod, but
+/// a proper discriminated union.
+type HttpMethod =
+    /// HTTP Get
+    | Get
+    /// HTTP Post
+    | Post
+    /// HTTP Delete
+    | Delete
+    /// HTTP Patch
+    | Patch
+    /// HTTP Options
+    | Options
+    /// HTTP Head
+    | Head
+    /// HTTP Put
+    | Put
+    /// HTTP Trace
+    | Trace
+
+    /// Convert to the standard library's enum type.
+    member this.ToDotNet () : System.Net.Http.HttpMethod =
+        match this with
+        | HttpMethod.Get -> System.Net.Http.HttpMethod.Get
+        | HttpMethod.Post -> System.Net.Http.HttpMethod.Post
+        | HttpMethod.Delete -> System.Net.Http.HttpMethod.Delete
+        | HttpMethod.Patch -> System.Net.Http.HttpMethod.Patch
+        | HttpMethod.Options -> System.Net.Http.HttpMethod.Options
+        | HttpMethod.Head -> System.Net.Http.HttpMethod.Head
+        | HttpMethod.Put -> System.Net.Http.HttpMethod.Put
+        | HttpMethod.Trace -> System.Net.Http.HttpMethod.Trace
+
+    /// Human-readable string representation.
+    override this.ToString () : string =
+        match this with
+        | HttpMethod.Get -> "Get"
+        | HttpMethod.Post -> "Post"
+        | HttpMethod.Delete -> "Delete"
+        | HttpMethod.Patch -> "Post"
+        | HttpMethod.Options -> "Options"
+        | HttpMethod.Head -> "Head"
+        | HttpMethod.Put -> "Put"
+        | HttpMethod.Trace -> "Trace"
+
+    /// Throws on invalid inputs.
+    static member Parse (s : string) : HttpMethod =
+        if String.Equals (s, "get", StringComparison.OrdinalIgnoreCase) then
+            HttpMethod.Get
+        elif String.Equals (s, "post", StringComparison.OrdinalIgnoreCase) then
+            HttpMethod.Post
+        elif String.Equals (s, "patch", StringComparison.OrdinalIgnoreCase) then
+            HttpMethod.Patch
+        elif String.Equals (s, "delete", StringComparison.OrdinalIgnoreCase) then
+            HttpMethod.Delete
+        elif String.Equals (s, "head", StringComparison.OrdinalIgnoreCase) then
+            HttpMethod.Head
+        elif String.Equals (s, "options", StringComparison.OrdinalIgnoreCase) then
+            HttpMethod.Options
+        elif String.Equals (s, "put", StringComparison.OrdinalIgnoreCase) then
+            HttpMethod.Put
+        else
+            failwith $"Unrecognised method: %s{s}"
+
 /// A Swagger API specification.
-type SwaggerV2 =
+type Swagger =
     {
         /// Global collection of MIME types which any endpoint expects to consume its inputs in.
         /// This may be overridden on any individual endpoint by that endpoint.
@@ -418,63 +519,58 @@ type SwaggerV2 =
         Responses : Map<string, Response>
     }
 
-/// Parse a JSON-schema-based specification of a Swagger 2.0 API and
-/// build the strongly-typed version. Throws on invalid inputs; returns Error if the input is JSON but has a Swagger
-/// version that is not in the 2.0 series.
-let parse (s : string) : Result<SwaggerV2, JsonNode> =
-    let node = JsonNode.Parse s
-    let swagger = asString node "swagger" |> Version.Parse
+[<RequireQualifiedAccess>]
+module Swagger =
+    /// Parse a JSON-schema-based specification of a Swagger 2.0 API and
+    /// build the strongly-typed version. Throws on invalid inputs.
+    let parse (s : string) : Swagger =
+        let node = JsonNode.Parse s
+        let consumes = asArr'<string> node "consumes" |> List.map MimeType
+        let produces = asArr'<string> node "produces" |> List.map MimeType
+        let schemes = asArr'<string> node "schemes" |> List.map Scheme
+        let swagger = asString node "swagger" |> Version.Parse
+        let info = asObj node "info" |> SwaggerInfo.Parse
+        let basePath = asString node "basePath"
 
-    if swagger.Major <> 2 then
-        Error node
-    else
+        let definitions =
+            asObj node "definitions"
+            |> Seq.map (fun (KeyValue (key, value)) ->
+                let value = value.AsObject ()
+                key, Definition.Parse value
+            )
+            |> Map.ofSeq
 
-    let consumes = asArr'<string> node "consumes" |> List.map MimeType
-    let produces = asArr'<string> node "produces" |> List.map MimeType
-    let schemes = asArr'<string> node "schemes" |> List.map Scheme
-    let info = asObj node "info" |> SwaggerInfo.Parse
-    let basePath = asString node "basePath"
+        let paths =
+            asObj node "paths"
+            |> Seq.map (fun (KeyValue (key, value)) ->
+                let contents =
+                    value.AsObject ()
+                    |> Seq.map (fun (KeyValue (endpoint, contents)) ->
+                        let contents = contents.AsObject ()
+                        HttpMethod.Parse endpoint, SwaggerEndpoint.Parse contents
+                    )
+                    |> Map.ofSeq
 
-    let definitions =
-        asObj node "definitions"
-        |> Seq.map (fun (KeyValue (key, value)) ->
-            let value = value.AsObject ()
-            key, Definition.Parse value
-        )
-        |> Map.ofSeq
+                key, contents
+            )
+            |> Map.ofSeq
 
-    let paths =
-        asObj node "paths"
-        |> Seq.map (fun (KeyValue (key, value)) ->
-            let contents =
-                value.AsObject ()
-                |> Seq.map (fun (KeyValue (endpoint, contents)) ->
-                    let contents = contents.AsObject ()
-                    HttpMethod.Parse endpoint, SwaggerEndpoint.Parse contents
-                )
-                |> Map.ofSeq
+        let responses =
+            asObj node "responses"
+            |> Seq.map (fun (KeyValue (key, value)) ->
+                let value = value.AsObject ()
+                key, Response.Parse value
+            )
+            |> Map.ofSeq
 
-            key, contents
-        )
-        |> Map.ofSeq
-
-    let responses =
-        asObj node "responses"
-        |> Seq.map (fun (KeyValue (key, value)) ->
-            let value = value.AsObject ()
-            key, Response.Parse value
-        )
-        |> Map.ofSeq
-
-    {
-        Consumes = consumes
-        Produces = produces
-        Schemes = schemes
-        Swagger = swagger
-        Info = info
-        BasePath = basePath
-        Paths = paths
-        Definitions = definitions
-        Responses = responses
-    }
-    |> Ok
+        {
+            Consumes = consumes
+            Produces = produces
+            Schemes = schemes
+            Swagger = swagger
+            Info = info
+            BasePath = basePath
+            Paths = paths
+            Definitions = definitions
+            Responses = responses
+        }

WoofWare.Myriad.Plugins/SwaggerClientGenerator.fs

@@ -1,6 +1,7 @@
 namespace WoofWare.Myriad.Plugins
 
 open System.Collections.Generic
+open System.IO
 open System.Threading
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.Xml
@@ -18,16 +19,15 @@ type internal SwaggerClientConfig =
 type internal Produces =
     // TODO: this will cope with decoding JSON, plain text, etc
     | Produces of string
-    | OctetStream
 
 type internal Endpoint =
     {
         DocString : PreXmlDoc
         Produces : Produces
-        ReturnType : SwaggerV2.Definition
+        ReturnType : Definition
         Method : WoofWare.Myriad.Plugins.HttpMethod
-        Operation : SwaggerV2.OperationId
-        Parameters : SwaggerV2.SwaggerParameter list
+        Operation : OperationId
+        Parameters : SwaggerParameter list
         Endpoint : string
     }
 
@@ -42,41 +42,49 @@ type internal TypeEntry =
 type internal Types =
     {
         ByHandle : IReadOnlyDictionary<string, TypeEntry>
-        ByDefinition : IReadOnlyDictionary<SwaggerV2.Definition, TypeEntry>
+        ByDefinition : IReadOnlyDictionary<Definition, TypeEntry>
     }
 
 [<RequireQualifiedAccess>]
 module internal SwaggerClientGenerator =
+    let outputFile = FileInfo "/tmp/output.txt"
 
-    let internal log (_ : string) = ()
+    // do
+    //     use _ = File.Create outputFile.FullName
+    //     ()
 
-    let renderType (types : Types) (defn : SwaggerV2.Definition) : SynType option =
+    let log (line : string) =
+        // use w = outputFile.AppendText ()
+        // w.WriteLine line
+        ()
+
+    let renderType (types : Types) (defn : Definition) : SynType option =
         match types.ByDefinition.TryGetValue defn with
         | true, v -> Some v.Signature
         | false, _ ->
 
         match defn with
-        | SwaggerV2.Definition.Handle h ->
+        | Definition.Handle h ->
             match types.ByHandle.TryGetValue h with
             | false, _ -> None
             | true, v -> Some v.Signature
-        | SwaggerV2.Definition.Object _ -> failwith "should not hit"
-        | SwaggerV2.Definition.Array _ -> failwith "should not hit"
-        | SwaggerV2.Definition.Unspecified -> failwith "should not hit"
-        | SwaggerV2.Definition.String -> SynType.string |> Some
-        | SwaggerV2.Definition.Boolean -> SynType.bool |> Some
-        | SwaggerV2.Definition.Integer _ -> SynType.int |> Some
-        | SwaggerV2.Definition.File -> SynType.createLongIdent' [ "System" ; "IO" ; "Stream" ] |> Some
+        | Definition.Object _ -> failwith "should not hit"
+        | Definition.Array _ -> failwith "should not hit"
+        | Definition.Unspecified -> failwith "should not hit"
+        | Definition.String -> SynType.string |> Some
+        | Definition.Boolean -> SynType.bool |> Some
+        | Definition.Integer _ -> SynType.int |> Some
+        | Definition.File -> SynType.createLongIdent' [ "System" ; "IO" ; "Stream" ] |> Some
 
     /// Returns None if we lacked the information required to do this.
     /// bigCache is a map of e.g. {"securityDefinition": {Defn : F# type}}.
     let rec defnToType
         (anonymousTypeCount : int ref)
         (handlesMap : Dictionary<string, TypeEntry>)
-        (bigCache : Dictionary<string, Dictionary<SwaggerV2.Definition, TypeEntry>>)
+        (bigCache : Dictionary<string, Dictionary<Definition, TypeEntry>>)
         (thisKey : string)
         (typeName : string option)
-        (d : SwaggerV2.Definition)
+        (d : Definition)
         : TypeEntry option
         =
         let cache =
@@ -111,7 +119,7 @@ module internal SwaggerClientGenerator =
 
         let result =
             match d with
-            | SwaggerV2.Definition.Object obj ->
+            | Definition.Object obj ->
                 let requiredFields = obj.Required |> Option.defaultValue [] |> Set.ofList
 
                 let namedProperties =
@@ -123,7 +131,7 @@ module internal SwaggerClientGenerator =
                         // Special case for when this is a reference to this very type
                         let isOurself =
                             match defn with
-                            | SwaggerV2.Definition.Handle h ->
+                            | Definition.Handle h ->
                                 match h.Split '/' with
                                 | [| "#" ; location ; ty |] when location = thisKey && Some ty = typeName ->
                                     SynType.named ty |> Some
@@ -198,8 +206,8 @@ module internal SwaggerClientGenerator =
                         |> SynField.make
                         |> List.singleton
                         |> Some
-                    | Some SwaggerV2.AdditionalProperties.Never -> Some []
-                    | Some (SwaggerV2.AdditionalProperties.Constrained defn) ->
+                    | Some AdditionalProperties.Never -> Some []
+                    | Some (AdditionalProperties.Constrained defn) ->
                         let defn' = defnToType anonymousTypeCount handlesMap bigCache thisKey None defn
 
                         match defn' with
@@ -277,7 +285,7 @@ module internal SwaggerClientGenerator =
 
                 defn |> Some
 
-            | SwaggerV2.Definition.Array elt ->
+            | Definition.Array elt ->
                 let child = defnToType anonymousTypeCount handlesMap bigCache thisKey None elt.Items
 
                 match child with
@@ -290,37 +298,37 @@ module internal SwaggerClientGenerator =
                         }
 
                     Some defn
-            | SwaggerV2.Definition.String ->
+            | Definition.String ->
                 {
                     Signature = SynType.string
                     FSharpDefinition = None
                 }
                 |> Some
-            | SwaggerV2.Definition.Boolean ->
+            | Definition.Boolean ->
                 {
                     Signature = SynType.bool
                     FSharpDefinition = None
                 }
                 |> Some
-            | SwaggerV2.Definition.Unspecified ->
+            | Definition.Unspecified ->
                 {
                     Signature = SynType.unit
                     FSharpDefinition = None
                 }
                 |> Some
-            | SwaggerV2.Definition.Integer _ ->
+            | Definition.Integer _ ->
                 {
                     Signature = SynType.createLongIdent' [ "int" ]
                     FSharpDefinition = None
                 }
                 |> Some
-            | SwaggerV2.Definition.File ->
+            | Definition.File ->
                 {
                     Signature = SynType.createLongIdent' [ "System" ; "IO" ; "Stream" ]
                     FSharpDefinition = None
                 }
                 |> Some
-            | SwaggerV2.Definition.Handle s ->
+            | Definition.Handle s ->
                 let split = s.Split '/' |> List.ofArray
 
                 match split with
@@ -382,14 +390,14 @@ module internal SwaggerClientGenerator =
                 |> List.map (fun par ->
                     let inParam =
                         match par.In with
-                        | SwaggerV2.ParameterIn.Unrecognised (f, name) ->
+                        | ParameterIn.Unrecognised (f, name) ->
                             log
                                 $"Skipping %O{ep.Operation} at %s{ep.Endpoint}: unrecognised In parameter %s{f} with name %s{name}"
 
                             None
-                        | SwaggerV2.ParameterIn.Body -> Some IsIn.Body
-                        | SwaggerV2.ParameterIn.Query name -> Some (IsIn.Query name)
-                        | SwaggerV2.ParameterIn.Path name -> Some (IsIn.Path name)
+                        | ParameterIn.Body -> Some IsIn.Body
+                        | ParameterIn.Query name -> Some (IsIn.Query name)
+                        | ParameterIn.Path name -> Some (IsIn.Path name)
 
                     match inParam with
                     | None -> None
@@ -469,15 +477,6 @@ module internal SwaggerClientGenerator =
                             (SynLongIdent.createS' [ "RestEase" ; "Header" ])
                             // Gitea, at least, starts with a `/`, which `Uri` then takes to indicate an absolute path.
                             (SynExpr.tuple [ SynExpr.CreateConst "Content-Type" ; SynExpr.CreateConst contentType ])
-                    | Produces.OctetStream ->
-                        SynAttribute.create
-                            (SynLongIdent.createS' [ "RestEase" ; "Header" ])
-                            // Gitea, at least, starts with a `/`, which `Uri` then takes to indicate an absolute path.
-                            (SynExpr.tuple
-                                [
-                                    SynExpr.CreateConst "Content-Type"
-                                    SynExpr.CreateConst "application/octet-stream"
-                                ])
                 ]
 
             returnType
@@ -513,201 +512,6 @@ module internal SwaggerClientGenerator =
         |> List.singleton
 
 open Myriad.Core
-open System.IO
-
-[<RequireQualifiedAccess>]
-module internal SwaggerV2Generator =
-    let generate (pars : Map<string, string>) (contents : SwaggerV2.SwaggerV2) : Output =
-        let scheme =
-            let preferred = SwaggerV2.Scheme "https"
-
-            if List.isEmpty contents.Schemes then
-                failwith "no schemes specified in API spec!"
-
-            if List.contains preferred contents.Schemes then
-                preferred
-            else
-                List.head contents.Schemes
-
-        let clientDocstring = contents.Info.Description |> PreXmlDoc.create
-
-        let basePath = contents.BasePath
-
-        let typeDefs =
-            let bigCache = Dictionary<_, Dictionary<_, _>> ()
-
-            let countAll () =
-                (0, bigCache) ||> Seq.fold (fun count (KeyValue (_, v)) -> count + v.Count)
-
-            let byHandle = Dictionary ()
-            let anonymousTypeCount = ref 0
-
-            let rec go (contents : ((string * SwaggerV2.Definition) * string) list) =
-                let lastRound = countAll ()
-
-                contents
-                |> List.filter (fun ((name, defn), defnClass) ->
-                    let doIt =
-                        SwaggerClientGenerator.defnToType
-                            anonymousTypeCount
-                            byHandle
-                            bigCache
-                            defnClass
-                            (Some name)
-                            defn
-
-                    match doIt with
-                    | None -> true
-                    | Some _ -> false
-                )
-                |> fun remaining ->
-                    if not remaining.IsEmpty then
-                        let currentCount = countAll ()
-
-                        if currentCount = lastRound then
-                            for (name, remaining), kind in remaining do
-                                SwaggerClientGenerator.log $"Remaining: %s{name} (%s{kind})"
-
-                            SwaggerClientGenerator.log "--------"
-
-                            for KeyValue (handle, defn) in byHandle do
-                                SwaggerClientGenerator.log $"Known: %s{handle} %O{defn}"
-
-                            // TODO: ohh noooooo the Gitea spec is genuinely circular,
-                            // it's impossible to construct a Repository type
-                            // we're going to have to somehow detect this case and break the cycle
-                            // by artificially making a property optional
-                            // :sob: Gitea why are you like this
-                            // failwith "Made no further progress rendering types"
-                            ()
-                        else
-                            go remaining
-
-            seq {
-                for defnClass in [ "definitions" ; "responses" ] do
-                    match defnClass with
-                    | "definitions" ->
-                        for KeyValue (k, v) in contents.Definitions do
-                            yield (k, v), defnClass
-                    | "responses" ->
-                        for KeyValue (k, v) in contents.Responses do
-                            yield (k, v.Schema), defnClass
-                    | _ -> failwith "oh no"
-            }
-            |> Seq.toList
-            |> go
-
-            let result = Dictionary ()
-
-            for KeyValue (_container, types) in bigCache do
-                for KeyValue (defn, rendered) in types do
-                    result.TryAdd (defn, rendered) |> ignore<bool>
-
-            {
-                ByHandle = byHandle
-                ByDefinition = result :> IReadOnlyDictionary<_, _>
-            }
-
-        let summary =
-            contents.Paths
-            |> Seq.collect (fun (KeyValue (path, endpoints)) ->
-                endpoints
-                |> Seq.choose (fun (KeyValue (method, endpoint)) ->
-                    let docstring = endpoint.Summary |> PreXmlDoc.create
-
-                    let produces =
-                        match endpoint.Produces with
-                        | None -> Produces.Produces "json"
-                        | Some [] -> failwith $"API specified empty Produces: %s{path} (%O{method})"
-                        | Some [ SwaggerV2.MimeType "application/octet-stream" ] -> Produces.OctetStream
-                        | Some [ SwaggerV2.MimeType "application/json" ] -> Produces.Produces "json"
-                        | Some [ SwaggerV2.MimeType (StartsWith "text/" t) ] -> Produces.Produces t
-                        | Some [ SwaggerV2.MimeType s ] ->
-                            failwithf
-                                $"we don't support non-JSON Produces right now, got: %s{s} (%s{path} %O{method})"
-                        | Some (_ :: _) ->
-                            failwith $"we don't support multiple Produces right now, at %s{path} (%O{method})"
-
-                    let returnType =
-                        endpoint.Responses
-                        |> Seq.choose (fun (KeyValue (response, defn)) ->
-                            if 200 <= response && response < 300 then
-                                Some defn
-                            else
-                                None
-                        )
-                        |> Seq.toList
-
-                    let returnType =
-                        match returnType with
-                        | [ t ] -> Some t
-                        | [] -> failwith $"got no successful response results, %s{path} %O{method}"
-                        | _ ->
-                            SwaggerClientGenerator.log
-                                $"Ignoring %s{path} %O{method} due to multiple success responses"
-                            // can't be bothered to work out how to deal with multiple success
-                            // results right now
-                            None
-
-                    match returnType with
-                    | None -> None
-                    | Some returnType ->
-
-                    {
-                        Method = method
-                        Produces = produces
-                        DocString = docstring
-                        ReturnType = returnType
-                        Operation = endpoint.OperationId
-                        Parameters = endpoint.Parameters |> Option.defaultValue []
-                        Endpoint = path
-                    }
-                    |> Some
-                )
-                |> Seq.toList
-            )
-            |> Seq.toList
-
-        let config =
-            let createMock =
-                match Map.tryFind "GENERATEMOCKVISIBILITY" pars with
-                | None -> None
-                | Some v ->
-                    match v.ToLowerInvariant () with
-                    | "internal" -> Some true
-                    | "public" -> Some false
-                    | _ ->
-                        failwith
-                            $"Expected GenerateMockVisibility parameter to be 'internal' or 'public', but was: '%s{v.ToLowerInvariant ()}'"
-
-            let className =
-                match Map.tryFind "CLASSNAME" pars with
-                | None -> failwith "You must supply the <ClassName /> parameter in <MyriadParams />."
-                | Some v -> v
-
-            {
-                CreateMock = createMock
-                ClassName = className
-            }
-
-        let ty =
-            SwaggerClientGenerator.computeType config basePath typeDefs clientDocstring summary
-
-        [
-            yield
-                SynModuleDecl.Open (
-                    SynOpenDeclTarget.ModuleOrNamespace (
-                        SynLongIdent.createS' [ "WoofWare" ; "Myriad" ; "Plugins" ],
-                        range0
-                    ),
-                    range0
-                )
-            yield SwaggerClientGenerator.instantiateRequiredTypes typeDefs
-            yield! ty
-        ]
-        |> SynModuleOrNamespace.createNamespace [ Ident.create config.ClassName ]
-        |> List.singleton
-        |> Output.Ast
 
 /// Myriad generator that stamps out an interface and class to access a Swagger-specified API.
 [<MyriadGenerator("swagger-client")>]
@@ -717,19 +521,205 @@ type SwaggerClientGenerator () =
         member _.ValidInputExtensions = [ ".json" ]
 
         member _.Generate (context : GeneratorContext) =
-            let pars = MyriadParamParser.render context.AdditionalParameters
+            let contents = File.ReadAllText context.InputFilename |> Swagger.parse
 
-            let pars =
-                pars
-                |> Map.toSeq
-                |> Seq.map (fun (k, v) -> k.ToUpperInvariant (), v)
-                |> Map.ofSeq
+            let scheme =
+                let preferred = Scheme "https"
 
-            if pars.IsEmpty then
-                failwith "No parameters given. You must supply the <ClassName /> parameter in <MyriadParams />."
+                if List.isEmpty contents.Schemes then
+                    failwith "no schemes specified in API spec!"
 
-            let contents = File.ReadAllText context.InputFilename |> SwaggerV2.parse
+                if List.contains preferred contents.Schemes then
+                    preferred
+                else
+                    List.head contents.Schemes
 
-            match contents with
-            | Ok contents -> SwaggerV2Generator.generate pars contents
-            | Error node -> failwith "Input was not a Swagger 2 spec"
+            let clientDocstring = contents.Info.Description |> PreXmlDoc.create
+
+            let basePath = contents.BasePath
+
+            let typeDefs =
+                let bigCache = Dictionary<_, Dictionary<_, _>> ()
+
+                let countAll () =
+                    (0, bigCache) ||> Seq.fold (fun count (KeyValue (_, v)) -> count + v.Count)
+
+                let byHandle = Dictionary ()
+                let anonymousTypeCount = ref 0
+
+                let rec go (contents : ((string * Definition) * string) list) =
+                    let lastRound = countAll ()
+
+                    contents
+                    |> List.filter (fun ((name, defn), defnClass) ->
+                        let doIt =
+                            SwaggerClientGenerator.defnToType
+                                anonymousTypeCount
+                                byHandle
+                                bigCache
+                                defnClass
+                                (Some name)
+                                defn
+
+                        match doIt with
+                        | None -> true
+                        | Some _ -> false
+                    )
+                    |> fun remaining ->
+                        if not remaining.IsEmpty then
+                            let currentCount = countAll ()
+
+                            if currentCount = lastRound then
+                                for (name, remaining), kind in remaining do
+                                    SwaggerClientGenerator.log $"Remaining: %s{name} (%s{kind})"
+
+                                SwaggerClientGenerator.log "--------"
+
+                                for KeyValue (handle, defn) in byHandle do
+                                    SwaggerClientGenerator.log $"Known: %s{handle} %O{defn}"
+
+                                // TODO: ohh noooooo the Gitea spec is genuinely circular,
+                                // it's impossible to construct a Repository type
+                                // we're going to have to somehow detect this case and break the cycle
+                                // by artificially making a property optional
+                                // :sob: Gitea why are you like this
+                                // failwith "Made no further progress rendering types"
+                                ()
+                            else
+                                go remaining
+
+                seq {
+                    for defnClass in [ "definitions" ; "responses" ] do
+                        match defnClass with
+                        | "definitions" ->
+                            for KeyValue (k, v) in contents.Definitions do
+                                yield (k, v), defnClass
+                        | "responses" ->
+                            for KeyValue (k, v) in contents.Responses do
+                                yield (k, v.Schema), defnClass
+                        | _ -> failwith "oh no"
+                }
+                |> Seq.toList
+                |> go
+
+                let result = Dictionary ()
+
+                for KeyValue (_container, types) in bigCache do
+                    for KeyValue (defn, rendered) in types do
+                        result.TryAdd (defn, rendered) |> ignore<bool>
+
+                {
+                    ByHandle = byHandle
+                    ByDefinition = result :> IReadOnlyDictionary<_, _>
+                }
+
+            let summary =
+                contents.Paths
+                |> Seq.collect (fun (KeyValue (path, endpoints)) ->
+                    endpoints
+                    |> Seq.choose (fun (KeyValue (method, endpoint)) ->
+                        let docstring = endpoint.Summary |> PreXmlDoc.create
+
+                        let produces =
+                            match endpoint.Produces with
+                            | None -> Produces "json"
+                            | Some [] -> failwith $"API specified empty Produces: %s{path} (%O{method})"
+                            | Some [ MimeType "application/json" ] -> Produces "json"
+                            | Some [ MimeType (StartsWith "text/" t) ] -> Produces t
+                            | Some [ MimeType s ] ->
+                                failwithf
+                                    $"we don't support non-JSON Produces right now, got: %s{s} (%s{path} %O{method})"
+                            | Some (_ :: _) ->
+                                failwith $"we don't support multiple Produces right now, at %s{path} (%O{method})"
+
+                        let returnType =
+                            endpoint.Responses
+                            |> Seq.choose (fun (KeyValue (response, defn)) ->
+                                if 200 <= response && response < 300 then
+                                    Some defn
+                                else
+                                    None
+                            )
+                            |> Seq.toList
+
+                        let returnType =
+                            match returnType with
+                            | [ t ] -> Some t
+                            | [] -> failwith $"got no successful response results, %s{path} %O{method}"
+                            | _ ->
+                                SwaggerClientGenerator.log
+                                    $"Ignoring %s{path} %O{method} due to multiple success responses"
+                                // can't be bothered to work out how to deal with multiple success
+                                // results right now
+                                None
+
+                        match returnType with
+                        | None -> None
+                        | Some returnType ->
+
+                        {
+                            Method = method
+                            Produces = produces
+                            DocString = docstring
+                            ReturnType = returnType
+                            Operation = endpoint.OperationId
+                            Parameters = endpoint.Parameters |> Option.defaultValue []
+                            Endpoint = path
+                        }
+                        |> Some
+                    )
+                    |> Seq.toList
+                )
+                |> Seq.toList
+
+            let config =
+                let pars = MyriadParamParser.render context.AdditionalParameters
+
+                let pars =
+                    pars
+                    |> Map.toSeq
+                    |> Seq.map (fun (k, v) -> k.ToUpperInvariant (), v)
+                    |> Map.ofSeq
+
+                if pars.IsEmpty then
+                    failwith "No parameters given. You must supply the <ClassName /> parameter in <MyriadParams />."
+
+                let createMock =
+                    match Map.tryFind "GENERATEMOCKVISIBILITY" pars with
+                    | None -> None
+                    | Some v ->
+                        match v.ToLowerInvariant () with
+                        | "internal" -> Some true
+                        | "public" -> Some false
+                        | _ ->
+                            failwith
+                                $"Expected GenerateMockVisibility parameter to be 'internal' or 'public', but was: '%s{v.ToLowerInvariant ()}'"
+
+                let className =
+                    match Map.tryFind "CLASSNAME" pars with
+                    | None -> failwith "You must supply the <ClassName /> parameter in <MyriadParams />."
+                    | Some v -> v
+
+                {
+                    CreateMock = createMock
+                    ClassName = className
+                }
+
+            let ty =
+                SwaggerClientGenerator.computeType config basePath typeDefs clientDocstring summary
+
+            [
+                yield
+                    SynModuleDecl.Open (
+                        SynOpenDeclTarget.ModuleOrNamespace (
+                            SynLongIdent.createS' [ "WoofWare" ; "Myriad" ; "Plugins" ],
+                            range0
+                        ),
+                        range0
+                    )
+                yield SwaggerClientGenerator.instantiateRequiredTypes typeDefs
+                yield! ty
+            ]
+            |> SynModuleOrNamespace.createNamespace [ Ident.create config.ClassName ]
+            |> List.singleton
+            |> Output.Ast

WoofWare.Myriad.Plugins/Tuple.fs

@@ -1,6 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module internal Tuple =
-    let withLeft left right = left, right
-    let withRight right left = left, right

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

@@ -22,15 +22,13 @@
   <ItemGroup>
     <PackageReference Include="Myriad.Core" Version="0.8.3" />
     <PackageReference Include="TypeEquality" Version="0.3.0" />
-    <PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.6.3" />
+    <PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.5.1" />
     <!-- the lowest version allowed by Myriad.Core -->
     <PackageReference Update="FSharp.Core" Version="6.0.1" PrivateAssets="all"/>
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="List.fs"/>
-    <Compile Include="Tuple.fs" />
     <Compile Include="Text.fs" />
     <Compile Include="Measure.fs" />
     <Compile Include="AstHelper.fs" />
@@ -38,17 +36,15 @@
     <Compile Include="RemoveOptionsGenerator.fs"/>
     <Compile Include="MyriadParamParser.fs" />
     <Compile Include="InterfaceMockGenerator.fs"/>
-    <Compile Include="CapturingInterfaceMockGenerator.fs" />
     <Compile Include="JsonSerializeGenerator.fs"/>
     <Compile Include="JsonParseGenerator.fs"/>
     <Compile Include="HttpClientGenerator.fs"/>
     <Compile Include="CataGenerator.fs" />
-    <Compile Include="ArgParserGenerator.fs" />
-    <Compile Include="JsonHelpers.fs" />
-    <Compile Include="HttpMethod.fs" />
-    <Compile Include="SwaggerV2.fs" />
-    <Compile Include="OpenApi3.fs" />
+    <Compile Include="ShibaGenerator.fs" />
+    <None Include="ArgParserGenerator.fs" />
+    <Compile Include="Swagger.fs" />
     <Compile Include="SwaggerClientGenerator.fs" />
+    <None Include="ApacheLicence.txt" />
     <EmbeddedResource Include="version.json"/>
     <EmbeddedResource Include="SurfaceBaseline.txt"/>
     <None Include="..\README.md">

WoofWare.Myriad.Plugins/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "9.0",
+  "version": "4.0",
   "publicReleaseRefSpec": [
     "^refs/heads/main$"
   ],
@@ -11,4 +11,4 @@
     ":/README.md",
     ":/Directory.Build.props"
   ]
-}
+}

WoofWare.Myriad.sln

@@ -10,6 +10,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Myriad.Plugins.Att
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Myriad.Plugins.Attributes.Test", "WoofWare.Myriad.Plugins.Attributes\Test\WoofWare.Myriad.Plugins.Attributes.Test.fsproj", "{26DC0C94-85F2-45B4-8FA1-1B27201F7AFB}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Playground", "Playground\Playground.fsproj", "{6DF8C756-DE59-4AFF-A4BB-2D05C74192A4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,5 +38,9 @@ Global
 		{26DC0C94-85F2-45B4-8FA1-1B27201F7AFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{26DC0C94-85F2-45B4-8FA1-1B27201F7AFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26DC0C94-85F2-45B4-8FA1-1B27201F7AFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DF8C756-DE59-4AFF-A4BB-2D05C74192A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DF8C756-DE59-4AFF-A4BB-2D05C74192A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DF8C756-DE59-4AFF-A4BB-2D05C74192A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DF8C756-DE59-4AFF-A4BB-2D05C74192A4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

analyzers/analyzers.fsproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageDownload Include="G-Research.FSharp.Analyzers" Version="[0.17.0]" />
+    <PackageDownload Include="G-Research.FSharp.Analyzers" Version="[0.14.0]" />
   </ItemGroup>
 
 </Project>

flake.lock

@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758976413,
-        "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=",
+        "lastModified": 1744502386,
+        "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e3a3b32cc234f1683258d36c6232f150d57df015",
+        "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124",
         "type": "github"
       },
       "original": {

flake.nix

@@ -66,7 +66,6 @@
           pkgs.alejandra
           pkgs.nodePackages.markdown-link-check
           pkgs.shellcheck
-          pkgs.xmlstarlet
         ];
       };
     });

nix/deps.json

@@ -1,13 +1,13 @@
 [
   {
     "pname": "ApiSurface",
-    "version": "5.0.1",
-    "hash": "sha256-0GMXEMFgWbbE2OGxW+6h4zGgQHg+IZy1aI13Dn97xSU="
+    "version": "4.1.20",
+    "hash": "sha256-koWgO9FC9ax+Ij56ug8kxeyknl0yhLqnNLOUdxtqqo4="
   },
   {
     "pname": "fantomas",
-    "version": "7.0.3",
-    "hash": "sha256-0XlfV7SxXPDnk/CjkUesJSaH0cxlNHJ+Jj86zNUhkNA="
+    "version": "7.0.1",
+    "hash": "sha256-2aGD6Kjh83gmssRqqZ/Uihi7VbNqNUelX4otIfCuhTI="
   },
   {
     "pname": "Fantomas.Core",
@@ -19,20 +19,15 @@
     "version": "6.1.1",
     "hash": "sha256-NuZ8msPEHYA8T3EYREB28F1RcNgUU8V54eg2+UttYxw="
   },
-  {
-    "pname": "Fantomas.FCS",
-    "version": "7.0.3",
-    "hash": "sha256-BmCUq+ZQ3b25nrMBTc5tcxdO2soryEjNx9Fn/FJpi1c="
-  },
   {
     "pname": "FsCheck",
-    "version": "3.3.1",
-    "hash": "sha256-k65ksdOSOGz+meRUUND+yuqJtm5ChaKuaxmRIdKzx2Y="
+    "version": "3.2.0",
+    "hash": "sha256-ksZ4vLgWwyQOzFuK2BczdtDtWWYmedG7UBAg4pYuI8g="
   },
   {
     "pname": "fsharp-analyzers",
-    "version": "0.32.1",
-    "hash": "sha256-le6rPnAF7cKGBZ2w8H2u9glK+6rT2ZjiAVnrkH2IhrM="
+    "version": "0.30.0",
+    "hash": "sha256-7oaSwpHAU1opzpz4szLU/gDaJC/ww9eiFkPu0nr4Mj4="
   },
   {
     "pname": "FSharp.Core",
@@ -46,18 +41,13 @@
   },
   {
     "pname": "FSharp.Core",
-    "version": "9.0.303",
-    "hash": "sha256-AxR6wqodeU23KOTgkUfIgbavgbcSuzD4UBP+tiFydgA="
-  },
-  {
-    "pname": "FSharp.SystemTextJson",
-    "version": "1.4.36",
-    "hash": "sha256-zZEhjP0mdc5E3fBPS4/lqD7sxoaoT5SOspP546RWYdc="
+    "version": "9.0.202",
+    "hash": "sha256-64Gub0qemmCoMa1tDus6TeTuB1+5sHfE6KD2j4o84mA="
   },
   {
     "pname": "FsUnit",
-    "version": "7.1.1",
-    "hash": "sha256-UMCEGKxQ4ytjmPuVpiNaAPbi3RQH9gqa61JJIUS/6hg="
+    "version": "7.0.1",
+    "hash": "sha256-K85CIdxMeFSHEKZk6heIXp/oFjWAn7dBILKrw49pJUY="
   },
   {
     "pname": "Microsoft.ApplicationInsights",
@@ -91,13 +81,13 @@
   },
   {
     "pname": "Microsoft.CodeCoverage",
-    "version": "17.14.1",
-    "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs="
+    "version": "17.13.0",
+    "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.14.1",
-    "hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A="
+    "version": "17.13.0",
+    "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY="
   },
   {
     "pname": "Microsoft.NETCore.App.Host.linux-arm64",
@@ -154,6 +144,11 @@
     "version": "1.1.1",
     "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
   },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "2.0.0",
+    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
+  },
   {
     "pname": "Microsoft.NETCore.Targets",
     "version": "1.1.0",
@@ -196,13 +191,13 @@
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.14.1",
-    "hash": "sha256-QMf6O+w0IT+16Mrzo7wn+N20f3L1/mDhs/qjmEo1rYs="
+    "version": "17.13.0",
+    "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
   },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.14.1",
-    "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs="
+    "version": "17.13.0",
+    "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo="
   },
   {
     "pname": "Myriad.Core",
@@ -216,8 +211,8 @@
   },
   {
     "pname": "Nerdbank.GitVersioning",
-    "version": "3.8.118",
-    "hash": "sha256-Hmyy0ZKOmwN4zIhI4+MqoN8geZNc1sd033aZJ6APrO8="
+    "version": "3.8.38-alpha",
+    "hash": "sha256-gPMrVbjOZxXoofczF/pn6eVkLhjVSJIyQrLO2oljrDc="
   },
   {
     "pname": "NETStandard.Library",
@@ -236,33 +231,33 @@
   },
   {
     "pname": "NuGet.Common",
-    "version": "6.14.0",
-    "hash": "sha256-jDOwt3veI1GSG8CfBnf2+dJxD3E/Nmlc+vHtD4J76Ms="
+    "version": "6.13.2",
+    "hash": "sha256-ASLa/Jigg5Eop0ZrXPl98RW2rxnJRC7pbbxhuV74hFw="
   },
   {
     "pname": "NuGet.Configuration",
-    "version": "6.14.0",
-    "hash": "sha256-1PN9s6fhCw3wd2260U6hQ4vG3jIvcG8GIn1oQgxMXA0="
+    "version": "6.13.2",
+    "hash": "sha256-z8VW1YdRDanyyRTDYRvRkSv/XPR3c/hMM1y8cNNjx0Y="
   },
   {
     "pname": "NuGet.Frameworks",
-    "version": "6.14.0",
-    "hash": "sha256-3ViM3R1ucQMEL2hQYsivT86kI6veMQK2xDsiAcFcVQk="
+    "version": "6.13.2",
+    "hash": "sha256-caDyc+WgYOo43AUTjtbP0MyvYDb6JweEKDdIul61Cac="
   },
   {
     "pname": "NuGet.Packaging",
-    "version": "6.14.0",
-    "hash": "sha256-Yafbnxs3maj55bJ1oKQiZ0QkntFUzXdhorL94YEUOhY="
+    "version": "6.13.2",
+    "hash": "sha256-lhO+SFwIYZ4aPHxIGm5ubkkE2a5Ve2xgtroRbNh7hpw="
   },
   {
     "pname": "NuGet.Protocol",
-    "version": "6.14.0",
-    "hash": "sha256-uLDKfs+QN1MdnuQtTES8qfNzzsmYKM6XB9pwJc4G+eo="
+    "version": "6.13.2",
+    "hash": "sha256-5lnAHHZjy7A4vgv65AeBAs64mSNpuoUjxW3HnrMpuzY="
   },
   {
     "pname": "NuGet.Versioning",
-    "version": "6.14.0",
-    "hash": "sha256-DqdOJgsphKxSvqB8b60zNPCaiLfbiu3WnUJ/90feLrY="
+    "version": "6.13.2",
+    "hash": "sha256-gmpyBpKnt+GHqgx/2uFKp+J2csbxEAy1E7WdVT117sw="
   },
   {
     "pname": "NUnit",
@@ -309,25 +304,30 @@
     "version": "7.0.0",
     "hash": "sha256-9Wk8cHSkjKtqkN6xW7KnXoQVtF/VNbKeBq79WqDesMs="
   },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "8.0.1",
-    "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="
-  },
   {
     "pname": "System.Formats.Asn1",
     "version": "6.0.0",
     "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="
   },
   {
-    "pname": "System.Memory",
-    "version": "4.5.5",
-    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+    "pname": "System.Formats.Asn1",
+    "version": "8.0.1",
+    "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
+  },
+  {
+    "pname": "System.IO.Abstractions",
+    "version": "4.2.13",
+    "hash": "sha256-nkC/PiqE6+c1HJ2yTwg3x+qdBh844Z8n3ERWDW8k6Gg="
+  },
+  {
+    "pname": "System.IO.FileSystem.AccessControl",
+    "version": "4.5.0",
+    "hash": "sha256-ck44YBQ0M+2Im5dw0VjBgFD1s0XuY54cujrodjjSBL8="
   },
   {
     "pname": "System.Memory",
-    "version": "4.6.0",
-    "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
   },
   {
     "pname": "System.Private.Uri",
@@ -336,8 +336,8 @@
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "8.0.0",
-    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
+    "version": "1.6.0",
+    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
   {
     "pname": "System.Runtime",
@@ -349,6 +349,11 @@
     "version": "6.0.0",
     "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
   },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "4.5.0",
+    "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
+  },
   {
     "pname": "System.Security.Cryptography.Pkcs",
     "version": "6.0.4",
@@ -360,33 +365,23 @@
     "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="
   },
   {
-    "pname": "System.Text.Json",
-    "version": "6.0.10",
-    "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="
+    "pname": "System.Security.Principal.Windows",
+    "version": "4.5.0",
+    "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
   },
   {
     "pname": "System.Text.Json",
     "version": "8.0.5",
     "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
   },
-  {
-    "pname": "System.Text.Json",
-    "version": "9.0.0",
-    "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk="
-  },
   {
     "pname": "TypeEquality",
     "version": "0.3.0",
     "hash": "sha256-V50xAOzzyUJrY+MYPRxtnqW5MVeATXCes89wPprv1r4="
   },
-  {
-    "pname": "WoofWare.Expect",
-    "version": "0.8.2",
-    "hash": "sha256-iqt4FPkUr24/4dnRfh7P5nPNNlaPzaItP6/yrGRrQyo="
-  },
   {
     "pname": "WoofWare.Whippet.Fantomas",
-    "version": "0.6.3",
-    "hash": "sha256-FkW/HtVp8/HE2k6d7yFpnJcnP3FNNe9kGlkoIWmNgDw="
+    "version": "0.5.1",
+    "hash": "sha256-59CwnOZQAq5ZJoUkd87OiP8KUwx8xYDLMimMMTlKeZA="
   }
 ]