Merge branch 'main' into add-bit-of-myriad

.config/dotnet-tools.json

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

.github/workflows/dotnet.yaml

@@ -29,7 +29,7 @@ jobs:
       with:
         fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
     - name: Install Nix
-      uses: cachix/install-nix-action@v31
+      uses: cachix/install-nix-action@v29
       with:
         extra_nix_config: |
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -50,7 +50,7 @@ jobs:
         with:
           fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
       - name: Install Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v29
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -67,7 +67,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v29
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -82,7 +82,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v29
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -97,7 +97,7 @@ jobs:
         with:
           fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
       - name: Install Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v29
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -116,7 +116,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v29
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -129,7 +129,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Install Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v29
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -142,7 +142,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Install Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v29
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -156,7 +156,7 @@ jobs:
       with:
         fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
     - name: Install Nix
-      uses: cachix/install-nix-action@v31
+      uses: cachix/install-nix-action@v29
       with:
         extra_nix_config: |
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -198,40 +198,27 @@ jobs:
         # Verify that there is exactly one nupkg in the artifact that would be NuGet published
         run: if [[ $(find packed-attribute -maxdepth 1 -name 'WoofWare.Myriad.Plugins.Attributes.*.nupkg' -printf c | wc -c) -ne "1" ]]; then exit 1; fi
 
-  github-release-dry-run:
-    strategy:
-      matrix:
-        artifact:
-        - nuget-package-plugin
-        - nuget-package-attribute
-    runs-on: ubuntu-latest
+  github-release-plugin-dry-run:
     needs: [nuget-pack]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Download NuGet artifact
+      - name: Download NuGet artifact (plugin)
         uses: actions/download-artifact@v4
         with:
-          name: ${{ matrix.artifact }}
-      - name: Compute package path
-        id: compute-path
-        run: |
-          find . -maxdepth 1 -type f -name 'WoofWare.Myriad.*.nupkg' -exec sh -c 'echo "output=$(basename "$1")" >> $GITHUB_OUTPUT' shell {} \;
-      - name: Compute tag name
-        id: compute-tag
-        env:
-          NUPKG_PATH: ${{ steps.compute-path.outputs.output }}
-        run: echo "output=$(basename "$NUPKG_PATH" .nupkg)" >> $GITHUB_OUTPUT
-      - name: Tag and release
-        uses: G-Research/common-actions/github-release@19d7281a0f9f83e13c78f99a610dbc80fc59ba3b
+          name: nuget-package-plugin
+      - name: Download NuGet artifact (attribute)
+        uses: actions/download-artifact@v4
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          target-commitish: ${{ github.sha }}
-          tag: ${{ steps.compute-tag.outputs.output }}
-          binary-contents: ${{ steps.compute-path.outputs.output }}
-          dry-run: true
+          name: nuget-package-attribute
+      - name: Tag and release plugin
+        env:
+          DRY_RUN: 1
+          GITHUB_TOKEN: mock-token
+        run: sh .github/workflows/tag.sh
 
   all-required-checks-complete:
-    needs: [check-dotnet-format, check-nix-format, check-accurate-generations, build, build-nix, linkcheck, flake-check, analyzers, nuget-pack, expected-pack, github-release-dry-run]
+    needs: [check-dotnet-format, check-nix-format, check-accurate-generations, build, build-nix, linkcheck, flake-check, analyzers, nuget-pack, expected-pack, github-release-plugin-dry-run]
     if: ${{ always() }}
     runs-on: ubuntu-latest
     steps:
@@ -254,7 +241,7 @@ jobs:
           name: nuget-package-attribute
           path: packed
       - name: Attest Build Provenance
-        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
+        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
         with:
           subject-path: "packed/*.nupkg"
 
@@ -273,7 +260,7 @@ jobs:
           name: nuget-package-plugin
           path: packed
       - name: Attest Build Provenance
-        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
+        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
         with:
           subject-path: "packed/*.nupkg"
 
@@ -289,7 +276,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v29
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -322,7 +309,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v31
+        uses: cachix/install-nix-action@v29
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -343,12 +330,7 @@ jobs:
           nupkg-dir: packed/
           dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
 
-  github-release:
-    strategy:
-      matrix:
-        artifact:
-        - nuget-package-attribute
-        - nuget-package-plugin
+  github-release-plugin:
     runs-on: ubuntu-latest
     if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/main' }}
     needs: [all-required-checks-complete]
@@ -357,23 +339,15 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - name: Download NuGet artifact
+      - name: Download NuGet artifact (plugin)
         uses: actions/download-artifact@v4
         with:
-          name: ${{ matrix.artifact }}
-      - name: Compute package path
-        id: compute-path
-        run: |
-          find . -maxdepth 1 -type f -name 'WoofWare.Myriad.*.nupkg' -exec sh -c 'echo "output=$(basename "$1")" >> $GITHUB_OUTPUT' shell {} \;
-      - name: Compute tag name
-        id: compute-tag
-        env:
-          NUPKG_PATH: ${{ steps.compute-path.outputs.output }}
-        run: echo "output=$(basename "$NUPKG_PATH" .nupkg)" >> $GITHUB_OUTPUT
-      - name: Tag and release
-        uses: G-Research/common-actions/github-release@19d7281a0f9f83e13c78f99a610dbc80fc59ba3b
+          name: nuget-package-plugin
+      - name: Download NuGet artifact (attribute)
+        uses: actions/download-artifact@v4
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          target-commitish: ${{ github.sha }}
-          tag: ${{ steps.compute-tag.outputs.output }}
-          binary-contents: ${{ steps.compute-path.outputs.output }}
+          name: nuget-package-attribute
+      - name: Tag and release plugin
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: sh .github/workflows/tag.sh

.github/workflows/flake_update.yaml

@@ -21,20 +21,20 @@ jobs:
       - name: Update Nix flake
         run: 'nix flake update'
 
-      - name: Build fetch-deps
-        run: 'nix build ".#default.fetch-deps"'
+      - name: Build passthru
+        run: 'nix build ".#default.passthru.fetch-deps"'
 
-      - name: Run fetch-deps
+      - name: Run passthru
         run: |
             set -o pipefail
-            ./result nix/deps.json
+            ./result nix/deps.nix
 
       - name: Format
         run: 'nix develop --command alejandra .'
 
       - name: Create token
         id: generate-token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v1
         with:
           # https://github.com/actions/create-github-app-token/issues/136
           app-id: ${{ secrets.APP_ID }}

.github/workflows/tag.sh

@@ -0,0 +1,120 @@
+#!/bin/bash
+
+echo "Dry-run? $DRY_RUN!"
+
+find . -maxdepth 1 -type f ! -name "$(printf "*\n*")" -name '*.nupkg' | while IFS= read -r file
+do
+    tag=$(basename "$file" .nupkg)
+    git tag "$tag"
+    ${DRY_RUN:+echo} git push origin "$tag"
+done
+
+export TAG
+TAG=$(find . -maxdepth 1 -type f -name 'WoofWare.Myriad.Plugins.*.nupkg' -exec sh -c 'basename "$1" .nupkg' shell {} \; | grep -v Attributes)
+
+case "$TAG" in
+  *"
+"*)
+    echo "Error: TAG contains a newline; multiple plugins found."
+    exit 1
+    ;;
+esac
+
+# target_commitish empty indicates the repo default branch
+curl_body='{"tag_name":"'"$TAG"'","target_commitish":"","name":"'"$TAG"'","draft":false,"prerelease":false,"generate_release_notes":false}'
+
+echo "cURL body: $curl_body"
+
+failed_output=$(cat <<'EOF'
+{
+  "message": "Validation Failed",
+  "errors": [
+    {
+      "resource": "Release",
+      "code": "already_exists",
+      "field": "tag_name"
+    }
+  ],
+  "documentation_url": "https://docs.github.com/rest/releases/releases#create-a-release"
+}
+EOF
+)
+
+success_output=$(cat <<'EOF'
+{
+  "url": "https://api.github.com/repos/Smaug123/WoofWare.Myriad/releases/158152116",
+  "assets_url": "https://api.github.com/repos/Smaug123/WoofWare.Myriad/releases/158152116/assets",
+  "upload_url": "https://uploads.github.com/repos/Smaug123/WoofWare.Myriad/releases/158152116/assets{?name,label}",
+  "html_url": "https://github.com/Smaug123/WoofWare.Myriad/releases/tag/WoofWare.Myriad.Plugins.2.1.30",
+  "id": 158152116,
+  "author": {
+    "login": "github-actions[bot]",
+    "id": 41898282,
+    "node_id": "MDM6Qm90NDE4OTgyODI=",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+    "html_url": "https://github.com/apps/github-actions",
+    "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+    "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+    "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+    "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+    "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+    "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+    "type": "Bot",
+    "site_admin": false
+  },
+  "node_id": "RE_kwDOJfksgc4JbTW0",
+  "tag_name": "WoofWare.Myriad.Plugins.2.1.30",
+  "target_commitish": "main",
+  "name": "WoofWare.Myriad.Plugins.2.1.30",
+  "draft": false,
+  "prerelease": false,
+  "created_at": "2024-05-30T11:00:55Z",
+  "published_at": "2024-05-30T11:03:02Z",
+  "assets": [
+
+  ],
+  "tarball_url": "https://api.github.com/repos/Smaug123/WoofWare.Myriad/tarball/WoofWare.Myriad.Plugins.2.1.30",
+  "zipball_url": "https://api.github.com/repos/Smaug123/WoofWare.Myriad/zipball/WoofWare.Myriad.Plugins.2.1.30",
+  "body": null
+}
+EOF
+)
+
+HANDLE_OUTPUT=''
+handle_error() {
+    ERROR_OUTPUT="$1"
+    exit_message=$(echo "$ERROR_OUTPUT" | jq -r --exit-status 'if .errors | length == 1 then .errors[0].code else null end')
+    if [ "$exit_message" = "already_exists" ] ; then
+        HANDLE_OUTPUT="Did not create GitHub release because it already exists at this version."
+    else
+        echo "Unexpected error output from curl: $(cat curl_output.json)"
+        echo "JQ output: $(exit_message)"
+        exit 2
+    fi
+}
+
+run_tests() {
+    handle_error "$failed_output"
+    if [ "$HANDLE_OUTPUT" != "Did not create GitHub release because it already exists at this version." ]; then
+        echo "Bad output from handler: $HANDLE_OUTPUT"
+        exit 3
+    fi
+    HANDLE_OUTPUT=''
+    echo "Tests passed."
+}
+
+run_tests
+
+if [ "$DRY_RUN" != 1 ] ; then
+    if curl --fail-with-body -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer $GITHUB_TOKEN" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/Smaug123/WoofWare.Myriad/releases -d "$curl_body" > curl_output.json; then
+        echo "Curl succeeded."
+    else
+        handle_error "$(cat curl_output.json)"
+        echo "$HANDLE_OUTPUT"
+    fi
+fi

CHANGELOG.md

@@ -1,27 +1,5 @@
 Notable changes are recorded here.
 
-# 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/ConsumePlugin.fsproj

@@ -1,10 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.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"/>

ConsumePlugin/GeneratedArgs.fs

@@ -23,7 +23,7 @@ module BasicNoPositionals =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : BasicNoPositionals =
+    let parse' (getEnvironmentVariable : string -> string) (args : string list) : BasicNoPositionals =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -223,7 +223,7 @@ module BasicNoPositionals =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : BasicNoPositionals =
-        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+        parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -239,7 +239,7 @@ module Basic =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : Basic =
+    let parse' (getEnvironmentVariable : string -> string) (args : string list) : Basic =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -430,7 +430,7 @@ module Basic =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : Basic =
-        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+        parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -446,7 +446,7 @@ module BasicWithIntPositionals =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : BasicWithIntPositionals =
+    let parse' (getEnvironmentVariable : string -> string) (args : string list) : BasicWithIntPositionals =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -633,7 +633,7 @@ module BasicWithIntPositionals =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : BasicWithIntPositionals =
-        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+        parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -649,7 +649,7 @@ module LoadsOfTypes =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : LoadsOfTypes =
+    let parse' (getEnvironmentVariable : string -> string) (args : string list) : LoadsOfTypes =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -1038,7 +1038,7 @@ module LoadsOfTypes =
             match arg_10 with
             | None ->
                 match "CONSUMEPLUGIN_THINGS" |> getEnvironmentVariable with
-                | None ->
+                | null ->
                     sprintf
                         "No value was supplied for %s, nor was environment variable %s set"
                         (sprintf "--%s" "yet-another-optional-thing")
@@ -1046,7 +1046,7 @@ module LoadsOfTypes =
                     |> ArgParser_errors.Add
 
                     Unchecked.defaultof<_>
-                | Some x -> x |> (fun x -> x)
+                | x -> x |> (fun x -> x)
                 |> Choice2Of2
             | Some x -> Choice1Of2 x
 
@@ -1068,7 +1068,7 @@ module LoadsOfTypes =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : LoadsOfTypes =
-        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+        parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -1084,7 +1084,7 @@ module LoadsOfTypesNoPositionals =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : LoadsOfTypesNoPositionals =
+    let parse' (getEnvironmentVariable : string -> string) (args : string list) : LoadsOfTypesNoPositionals =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -1476,7 +1476,7 @@ module LoadsOfTypesNoPositionals =
             match arg_9 with
             | None ->
                 match "CONSUMEPLUGIN_THINGS" |> getEnvironmentVariable with
-                | None ->
+                | null ->
                     sprintf
                         "No value was supplied for %s, nor was environment variable %s set"
                         (sprintf "--%s" "yet-another-optional-thing")
@@ -1484,7 +1484,7 @@ module LoadsOfTypesNoPositionals =
                     |> ArgParser_errors.Add
 
                     Unchecked.defaultof<_>
-                | Some x -> x |> (fun x -> x)
+                | x -> x |> (fun x -> x)
                 |> Choice2Of2
             | Some x -> Choice1Of2 x
 
@@ -1505,7 +1505,7 @@ module LoadsOfTypesNoPositionals =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : LoadsOfTypesNoPositionals =
-        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+        parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -1524,7 +1524,7 @@ module DatesAndTimesArgParse =
     /// Extension methods for argument parsing
     type DatesAndTimes with
 
-        static member parse' (getEnvironmentVariable : string -> string option) (args : string list) : DatesAndTimes =
+        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : DatesAndTimes =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -1787,7 +1787,7 @@ module DatesAndTimesArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : DatesAndTimes =
-            DatesAndTimes.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            DatesAndTimes.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -1806,7 +1806,7 @@ module ParentRecordArgParse =
     /// Extension methods for argument parsing
     type ParentRecord with
 
-        static member parse' (getEnvironmentVariable : string -> string option) (args : string list) : ParentRecord =
+        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ParentRecord =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2016,7 +2016,7 @@ module ParentRecordArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : ParentRecord =
-            ParentRecord.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            ParentRecord.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -2035,11 +2035,7 @@ module ParentRecordChildPosArgParse =
     /// Extension methods for argument parsing
     type ParentRecordChildPos with
 
-        static member parse'
-            (getEnvironmentVariable : string -> string option)
-            (args : string list)
-            : ParentRecordChildPos
-            =
+        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ParentRecordChildPos =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2213,7 +2209,7 @@ module ParentRecordChildPosArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : ParentRecordChildPos =
-            ParentRecordChildPos.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            ParentRecordChildPos.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -2232,11 +2228,7 @@ module ParentRecordSelfPosArgParse =
     /// Extension methods for argument parsing
     type ParentRecordSelfPos with
 
-        static member parse'
-            (getEnvironmentVariable : string -> string option)
-            (args : string list)
-            : ParentRecordSelfPos
-            =
+        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ParentRecordSelfPos =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2396,7 +2388,7 @@ module ParentRecordSelfPosArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : ParentRecordSelfPos =
-            ParentRecordSelfPos.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            ParentRecordSelfPos.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -2415,11 +2407,7 @@ module ChoicePositionalsArgParse =
     /// Extension methods for argument parsing
     type ChoicePositionals with
 
-        static member parse'
-            (getEnvironmentVariable : string -> string option)
-            (args : string list)
-            : ChoicePositionals
-            =
+        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ChoicePositionals =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2514,7 +2502,7 @@ module ChoicePositionalsArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : ChoicePositionals =
-            ChoicePositionals.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            ChoicePositionals.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -2533,11 +2521,7 @@ module ContainsBoolEnvVarArgParse =
     /// Extension methods for argument parsing
     type ContainsBoolEnvVar with
 
-        static member parse'
-            (getEnvironmentVariable : string -> string option)
-            (args : string list)
-            : ContainsBoolEnvVar
-            =
+        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ContainsBoolEnvVar =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2669,7 +2653,7 @@ module ContainsBoolEnvVarArgParse =
                 match arg_0 with
                 | None ->
                     match "CONSUMEPLUGIN_THINGS" |> getEnvironmentVariable with
-                    | None ->
+                    | null ->
                         sprintf
                             "No value was supplied for %s, nor was environment variable %s set"
                             (sprintf "--%s" "bool-var")
@@ -2677,7 +2661,7 @@ module ContainsBoolEnvVarArgParse =
                         |> ArgParser_errors.Add
 
                         Unchecked.defaultof<_>
-                    | Some x ->
+                    | x ->
                         if System.String.Equals (x, "1", System.StringComparison.OrdinalIgnoreCase) then
                             true
                         else if System.String.Equals (x, "0", System.StringComparison.OrdinalIgnoreCase) then
@@ -2695,7 +2679,7 @@ module ContainsBoolEnvVarArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : ContainsBoolEnvVar =
-            ContainsBoolEnvVar.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            ContainsBoolEnvVar.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -2714,7 +2698,7 @@ module WithFlagDuArgParse =
     /// Extension methods for argument parsing
     type WithFlagDu with
 
-        static member parse' (getEnvironmentVariable : string -> string option) (args : string list) : WithFlagDu =
+        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : WithFlagDu =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2868,7 +2852,7 @@ module WithFlagDuArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : WithFlagDu =
-            WithFlagDu.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            WithFlagDu.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -2887,11 +2871,7 @@ module ContainsFlagEnvVarArgParse =
     /// Extension methods for argument parsing
     type ContainsFlagEnvVar with
 
-        static member parse'
-            (getEnvironmentVariable : string -> string option)
-            (args : string list)
-            : ContainsFlagEnvVar
-            =
+        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ContainsFlagEnvVar =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -3038,7 +3018,7 @@ module ContainsFlagEnvVarArgParse =
                 match arg_0 with
                 | None ->
                     match "CONSUMEPLUGIN_THINGS" |> getEnvironmentVariable with
-                    | None ->
+                    | null ->
                         sprintf
                             "No value was supplied for %s, nor was environment variable %s set"
                             (sprintf "--%s" "dry-run")
@@ -3046,7 +3026,7 @@ module ContainsFlagEnvVarArgParse =
                         |> ArgParser_errors.Add
 
                         Unchecked.defaultof<_>
-                    | Some x ->
+                    | x ->
                         if System.String.Equals (x, "1", System.StringComparison.OrdinalIgnoreCase) then
                             if true = Consts.FALSE then
                                 DryRunMode.Wet
@@ -3076,7 +3056,7 @@ module ContainsFlagEnvVarArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : ContainsFlagEnvVar =
-            ContainsFlagEnvVar.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            ContainsFlagEnvVar.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -3096,7 +3076,7 @@ module ContainsFlagDefaultValueArgParse =
     type ContainsFlagDefaultValue with
 
         static member parse'
-            (getEnvironmentVariable : string -> string option)
+            (getEnvironmentVariable : string -> string)
             (args : string list)
             : ContainsFlagDefaultValue
             =
@@ -3259,7 +3239,7 @@ module ContainsFlagDefaultValueArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : ContainsFlagDefaultValue =
-            ContainsFlagDefaultValue.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            ContainsFlagDefaultValue.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -3278,7 +3258,7 @@ module ManyLongFormsArgParse =
     /// Extension methods for argument parsing
     type ManyLongForms with
 
-        static member parse' (getEnvironmentVariable : string -> string option) (args : string list) : ManyLongForms =
+        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ManyLongForms =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -3524,7 +3504,7 @@ module ManyLongFormsArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : ManyLongForms =
-            ManyLongForms.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            ManyLongForms.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -3544,7 +3524,7 @@ module FlagsIntoPositionalArgsArgParse =
     type FlagsIntoPositionalArgs with
 
         static member parse'
-            (getEnvironmentVariable : string -> string option)
+            (getEnvironmentVariable : string -> string)
             (args : string list)
             : FlagsIntoPositionalArgs
             =
@@ -3688,7 +3668,7 @@ module FlagsIntoPositionalArgsArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : FlagsIntoPositionalArgs =
-            FlagsIntoPositionalArgs.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            FlagsIntoPositionalArgs.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -3708,7 +3688,7 @@ module FlagsIntoPositionalArgsChoiceArgParse =
     type FlagsIntoPositionalArgsChoice with
 
         static member parse'
-            (getEnvironmentVariable : string -> string option)
+            (getEnvironmentVariable : string -> string)
             (args : string list)
             : FlagsIntoPositionalArgsChoice
             =
@@ -3852,7 +3832,7 @@ module FlagsIntoPositionalArgsChoiceArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : FlagsIntoPositionalArgsChoice =
-            FlagsIntoPositionalArgsChoice.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            FlagsIntoPositionalArgsChoice.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -3872,7 +3852,7 @@ module FlagsIntoPositionalArgsIntArgParse =
     type FlagsIntoPositionalArgsInt with
 
         static member parse'
-            (getEnvironmentVariable : string -> string option)
+            (getEnvironmentVariable : string -> string)
             (args : string list)
             : FlagsIntoPositionalArgsInt
             =
@@ -4016,7 +3996,7 @@ module FlagsIntoPositionalArgsIntArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : FlagsIntoPositionalArgsInt =
-            FlagsIntoPositionalArgsInt.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            FlagsIntoPositionalArgsInt.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -4036,7 +4016,7 @@ module FlagsIntoPositionalArgsIntChoiceArgParse =
     type FlagsIntoPositionalArgsIntChoice with
 
         static member parse'
-            (getEnvironmentVariable : string -> string option)
+            (getEnvironmentVariable : string -> string)
             (args : string list)
             : FlagsIntoPositionalArgsIntChoice
             =
@@ -4180,7 +4160,7 @@ module FlagsIntoPositionalArgsIntChoiceArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : FlagsIntoPositionalArgsIntChoice =
-            FlagsIntoPositionalArgsIntChoice.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            FlagsIntoPositionalArgsIntChoice.parse' System.Environment.GetEnvironmentVariable args
 namespace ConsumePlugin
 
 open System
@@ -4200,7 +4180,7 @@ module FlagsIntoPositionalArgs'ArgParse =
     type FlagsIntoPositionalArgs' with
 
         static member parse'
-            (getEnvironmentVariable : string -> string option)
+            (getEnvironmentVariable : string -> string)
             (args : string list)
             : FlagsIntoPositionalArgs'
             =
@@ -4344,4 +4324,4 @@ module FlagsIntoPositionalArgs'ArgParse =
                 ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
         static member parse (args : string list) : FlagsIntoPositionalArgs' =
-            FlagsIntoPositionalArgs'.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+            FlagsIntoPositionalArgs'.parse' System.Environment.GetEnvironmentVariable args

ConsumePlugin/GeneratedJson.fs

@@ -14,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
 
@@ -46,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
@@ -74,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
@@ -94,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
@@ -202,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
@@ -225,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
@@ -247,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/GeneratedMock.fs

@@ -206,34 +206,3 @@ type internal TypeWithInterfaceMock =
 
     interface System.IDisposable with
         member this.Dispose () : unit = this.Dispose ()
-namespace SomeNamespace
-
-open System
-open WoofWare.Myriad.Plugins
-
-/// Mock record type for an interface
-type internal TypeWithPropertiesMock =
-    {
-        /// Implementation of IDisposable.Dispose
-        Dispose : unit -> unit
-        Prop1 : unit -> int
-        Prop2 : unit -> unit Async
-        Mem1 : string option -> string[] Async
-    }
-
-    /// An implementation where every method throws.
-    static member Empty : TypeWithPropertiesMock =
-        {
-            Dispose = (fun () -> ())
-            Prop1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Prop1"))
-            Prop2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Prop2"))
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-        }
-
-    interface TypeWithProperties with
-        member this.Mem1 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/GeneratedRestClient.fs

@@ -48,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))
 
@@ -102,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))
@@ -145,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))
@@ -184,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))
@@ -207,7 +160,8 @@ module PureGymApi =
                              | null -> System.Uri "https://whatnot.com/"
                              | v -> v),
                             System.Uri (
-                                "v1/gyms/{gym}".Replace ("{gym}", gym.ToString () |> System.Uri.EscapeDataString),
+                                "v1/gyms/{gym}"
+                                    .Replace ("{gym}", gym.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -226,15 +180,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))
@@ -265,15 +210,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))
@@ -304,15 +240,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))
@@ -340,42 +267,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 ()
                             )
+                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
                         )
 
                     do httpMessage.Content <- queryParams
@@ -387,25 +295,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
@@ -449,15 +347,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))
@@ -499,15 +388,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))
@@ -667,7 +547,9 @@ module PureGymApi =
 
                     let queryParams =
                         new System.Net.Http.StringContent (
-                            user |> PureGym.Member.toJsonNode |> (fun node -> node.ToJsonString ())
+                            user
+                            |> PureGym.Member.toJsonNode
+                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
                         )
 
                     do httpMessage.Content <- queryParams
@@ -699,18 +581,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 ())
+                            |> System.Text.Json.Nodes.JsonValue.Create<Uri>
+                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
                         )
 
                     do httpMessage.Content <- queryParams
@@ -742,18 +614,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 ())
+                            |> System.Text.Json.Nodes.JsonValue.Create<int>
+                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
                         )
 
                     do httpMessage.Content <- queryParams
@@ -1017,15 +879,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,
@@ -1062,15 +915,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,
@@ -1107,15 +951,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,
@@ -1152,15 +987,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,

ConsumePlugin/GeneratedVault.fs

@@ -13,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
@@ -176,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
@@ -240,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
@@ -550,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))
@@ -595,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))
@@ -662,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))
@@ -707,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))
@@ -777,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))
@@ -822,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/MockExample.fs

@@ -48,10 +48,3 @@ type TypeWithInterface =
     inherit IDisposable
     abstract Mem1 : string option -> string[] Async
     abstract Mem2 : unit -> string[] Async
-
-[<GenerateMock>]
-type TypeWithProperties =
-    inherit IDisposable
-    abstract Mem1 : string option -> string[] Async
-    abstract Prop1 : int
-    abstract Prop2 : unit Async

Directory.Build.props

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

WoofWare.Myriad.Plugins.Attributes/ArgParserAttributes.fs

@@ -26,11 +26,6 @@ type ArgParserAttribute (isExtensionMethod : bool) =
 /// an argument which looks like a flag but which we don't recognise.)
 /// We will still interpret `--help` as requesting help, unless it comes after
 /// a standalone `--` separator.
-///
-/// If the type of the PositionalArgs field is `Choice<'a, 'a>`, then we will
-/// tell you whether each arg came before or after a standalone `--` separator.
-/// For example, `MyApp foo bar -- baz` with PositionalArgs of `Choice<string, string>`
-/// would yield `Choice1Of2 foo, Choice1Of2 bar, Choice2Of2 baz`.
 type PositionalArgsAttribute (includeFlagLike : bool) =
     inherit Attribute ()
 

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFramework>net9.0</TargetFramework>
+      <TargetFramework>net8.0</TargetFramework>
 
       <IsPackable>false</IsPackable>
       <IsTestProject>true</IsTestProject>
@@ -17,10 +17,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <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"/>
+        <PackageReference Include="ApiSurface" Version="4.1.5" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
+        <PackageReference Include="NUnit" Version="4.2.2"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
     </ItemGroup>
 
     <ItemGroup>

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" ]
 
@@ -91,7 +91,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 +127,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 +150,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 +171,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 +191,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 +210,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 +236,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 +264,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 +285,7 @@ Required argument '--baz' received no value"""
 
         let getEnvVar (_ : string) =
             Interlocked.Increment count |> ignore<int>
-            None
+            ""
 
         let parsed =
             DatesAndTimes.parse'
@@ -448,7 +448,7 @@ Required argument '--exact' received no value"""
     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 +470,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
 

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

@@ -3,7 +3,7 @@ namespace WoofWare.Myriad.Plugins.Test
 open System
 open System.Collections.Generic
 open System.Text.Json.Nodes
-open FsCheck.FSharp
+open FsCheck.Random
 open Microsoft.FSharp.Reflection
 open NUnit.Framework
 open FsCheck
@@ -15,21 +15,21 @@ module TestJsonSerde =
 
     let uriGen : Gen<Uri> =
         gen {
-            let! suffix = ArbMap.generate<int> ArbMap.defaults
+            let! suffix = Arb.generate<int>
             return Uri $"https://example.com/%i{suffix}"
         }
 
     let rec innerGen (count : int) : Gen<InnerTypeWithBoth> =
         gen {
-            let! guid = ArbMap.generate<Guid> ArbMap.defaults
-            let! mapKeys = Gen.listOf (ArbMap.generate<NonNull<string>> ArbMap.defaults)
+            let! guid = Arb.generate<Guid>
+            let! mapKeys = Gen.listOf Arb.generate<NonNull<string>>
             let mapKeys = mapKeys |> List.map _.Get |> List.distinct
             let! mapValues = Gen.listOfLength mapKeys.Length uriGen
             let map = List.zip mapKeys mapValues |> Map.ofList
 
             let! concreteDictKeys =
                 if count > 0 then
-                    Gen.listOf (ArbMap.generate<NonNull<string>> ArbMap.defaults)
+                    Gen.listOf Arb.generate<NonNull<string>>
                 else
                     Gen.constant []
 
@@ -50,16 +50,13 @@ module TestJsonSerde =
                 |> List.map KeyValuePair
                 |> Dictionary
 
-            let! readOnlyDictKeys = Gen.listOf (ArbMap.generate<NonNull<string>> ArbMap.defaults)
+            let! readOnlyDictKeys = Gen.listOf Arb.generate<NonNull<string>>
             let readOnlyDictKeys = readOnlyDictKeys |> List.map _.Get |> List.distinct
-
-            let! readOnlyDictValues =
-                Gen.listOfLength readOnlyDictKeys.Length (Gen.listOf (ArbMap.generate<char> ArbMap.defaults))
-
+            let! readOnlyDictValues = Gen.listOfLength readOnlyDictKeys.Length (Gen.listOf Arb.generate<char>)
             let readOnlyDict = List.zip readOnlyDictKeys readOnlyDictValues |> readOnlyDict
 
             let! dictKeys = Gen.listOf uriGen
-            let! dictValues = Gen.listOfLength dictKeys.Length (ArbMap.generate<bool> ArbMap.defaults)
+            let! dictValues = Gen.listOfLength dictKeys.Length Arb.generate<bool>
             let dict = List.zip dictKeys dictValues |> dict
 
             return
@@ -74,38 +71,28 @@ module TestJsonSerde =
 
     let outerGen : Gen<JsonRecordTypeWithBoth> =
         gen {
-            let! a = ArbMap.generate<int> ArbMap.defaults
-            let! b = ArbMap.generate<NonNull<string>> ArbMap.defaults
-            let! c = Gen.listOf (ArbMap.generate<int> ArbMap.defaults)
+            let! a = Arb.generate<int>
+            let! b = Arb.generate<NonNull<string>>
+            let! c = Gen.listOf Arb.generate<int>
             let! depth = Gen.choose (0, 2)
             let! d = innerGen depth
-            let! e = Gen.arrayOf (ArbMap.generate<NonNull<string>> ArbMap.defaults)
-            let! arr = Gen.arrayOf (ArbMap.generate<int> ArbMap.defaults)
-            let! byte = ArbMap.generate ArbMap.defaults
-            let! sbyte = ArbMap.generate ArbMap.defaults
-            let! i = ArbMap.generate ArbMap.defaults
-            let! i32 = ArbMap.generate ArbMap.defaults
-            let! i64 = ArbMap.generate ArbMap.defaults
-            let! u = ArbMap.generate ArbMap.defaults
-            let! u32 = ArbMap.generate ArbMap.defaults
-            let! u64 = ArbMap.generate ArbMap.defaults
-
-            let! f =
-                ArbMap.generate ArbMap.defaults
-                |> Gen.filter (fun s -> Double.IsFinite (s / 1.0<measure>))
-
-            let! f32 =
-                ArbMap.generate ArbMap.defaults
-                |> Gen.filter (fun s -> Single.IsFinite (s / 1.0f<measure>))
-
-            let! single =
-                ArbMap.generate ArbMap.defaults
-                |> Gen.filter (fun s -> Single.IsFinite (s / 1.0f<measure>))
-
-            let! intMeasureOption = ArbMap.generate ArbMap.defaults
-            let! intMeasureNullable = ArbMap.generate ArbMap.defaults
+            let! e = Gen.arrayOf Arb.generate<NonNull<string>>
+            let! arr = Gen.arrayOf Arb.generate<int>
+            let! byte = Arb.generate
+            let! sbyte = Arb.generate
+            let! i = Arb.generate
+            let! i32 = Arb.generate
+            let! i64 = Arb.generate
+            let! u = Arb.generate
+            let! u32 = Arb.generate
+            let! u64 = Arb.generate
+            let! f = Arb.generate |> Gen.filter (fun s -> Double.IsFinite (s / 1.0<measure>))
+            let! f32 = Arb.generate |> Gen.filter (fun s -> Single.IsFinite (s / 1.0f<measure>))
+            let! single = Arb.generate |> Gen.filter (fun s -> Single.IsFinite (s / 1.0f<measure>))
+            let! intMeasureOption = Arb.generate
+            let! intMeasureNullable = Arb.generate
             let! someEnum = Gen.choose (0, 1)
-            let! timestamp = ArbMap.generate ArbMap.defaults
+            let! timestamp = Arb.generate
 
             return
                 {
@@ -283,10 +270,10 @@ module TestJsonSerde =
             match case with
             | 0 -> return FirstDu.EmptyCase
             | 1 ->
-                let! s = ArbMap.generate<NonNull<string>> ArbMap.defaults
+                let! s = Arb.generate<NonNull<string>>
                 return FirstDu.Case1 s.Get
             | 2 ->
-                let! i = ArbMap.generate<int> ArbMap.defaults
+                let! i = Arb.generate<int>
                 let! record = outerGen
                 return FirstDu.Case2 (record, i)
             | _ -> return failwith $"unexpected: %i{case}"
@@ -306,6 +293,7 @@ module TestJsonSerde =
 
     [<Test>]
     let ``DU generator covers all cases`` () =
+        let rand = Random ()
         let cases = FSharpType.GetUnionCases typeof<FirstDu>
         let counts = Array.zeroCreate<int> cases.Length
 
@@ -313,13 +301,11 @@ module TestJsonSerde =
 
         let mutable i = 0
 
-        let property (du : FirstDu) =
+        while i < 10_000 && Array.exists (fun i -> i = 0) counts do
+            let du = Gen.eval 10 (StdGen.StdGen (rand.Next (), rand.Next ())) duGen
             let tag = decompose du
             counts.[tag] <- counts.[tag] + 1
             i <- i + 1
-            true
-
-        Check.One (Config.Quick, Prop.forAll (Arb.fromGen duGen) property)
 
         for i in counts do
             i |> shouldBeGreaterThan 0

WoofWare.Myriad.Plugins.Test/TestMockGenerator/TestMockGenerator.fs

@@ -34,16 +34,3 @@ module TestMockGenerator =
         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

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <!--
@@ -9,7 +9,6 @@
       I have not yet seen a single instance where I care about this warning
     -->
     <NoWarn>$(NoWarn),NU1903</NoWarn>
-    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
 
   <ItemGroup>
@@ -42,12 +41,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <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"/>
+    <PackageReference Include="ApiSurface" Version="4.1.5"/>
+    <PackageReference Include="FsCheck" Version="2.16.6"/>
+    <PackageReference Include="FsUnit" Version="6.0.1"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
+    <PackageReference Include="NUnit" Version="4.2.2"/>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
   </ItemGroup>
 
   <ItemGroup>

WoofWare.Myriad.Plugins/ArgParserGenerator.fs

@@ -673,7 +673,7 @@ module internal ArgParserGenerator =
                 args
                 |> Map.toList
                 |> List.map (fun (ident, expr) -> SynLongIdent.create [ Ident.create ident ], expr)
-                |> SynExpr.createRecord None
+                |> AstHelper.instantiateRecord
             )
 
         tree, counter
@@ -1396,7 +1396,7 @@ module internal ArgParserGenerator =
 
                             [
                                 SynMatchClause.create
-                                    (SynPat.named "None")
+                                    SynPat.createNull
                                     (SynExpr.sequential
                                         [
                                             errorMessage
@@ -1406,7 +1406,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 +1694,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 +1708,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 ])
@@ -1763,7 +1758,10 @@ type ArgParserGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let types = Ast.getTypes ast
+            let types =
+                Ast.extractTypeDefn ast
+                |> List.groupBy (fst >> List.map _.idText >> String.concat ".")
+                |> List.map (fun (_, v) -> fst (List.head v), List.collect snd v)
 
             let opens = AstHelper.extractOpens ast
 

WoofWare.Myriad.Plugins/AstHelper.fs

@@ -36,6 +36,13 @@ module internal AstHelper =
         | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Enum _, _) -> true
         | _ -> false
 
+    let instantiateRecord (fields : (SynLongIdent * SynExpr) list) : SynExpr =
+        let fields =
+            fields
+            |> List.map (fun (rfn, synExpr) -> SynExprRecordField ((rfn, true), Some range0, Some synExpr, None))
+
+        SynExpr.Record (None, None, fields, range0)
+
     let defineRecordType (record : RecordType) : SynTypeDefn =
         let name =
             SynComponentInfo.create record.Name

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
@@ -397,59 +409,30 @@ 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
@@ -522,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"))
                                 )
                             )
                         )
@@ -607,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) ->
@@ -699,7 +642,6 @@ module internal HttpClientGenerator =
                     yield responseString
                     yield responseStream
                     yield jsonNode
-                    yield jsonNodeWithoutNull
                 | String -> yield responseString
                 | Stream -> yield responseStream
                 | UnitType ->
@@ -708,7 +650,6 @@ module internal HttpClientGenerator =
                 | _ ->
                     yield responseStream
                     yield jsonNode
-                    yield jsonNodeWithoutNull
             ]
             |> SynExpr.createCompExpr "async" returnExpr
             |> SynExpr.startAsTask cancellationTokenArg
@@ -1055,7 +996,7 @@ type HttpClientGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let types = Ast.getTypes ast
+            let types = Ast.extractTypeDefn ast
 
             let opens = AstHelper.extractOpens ast
 

WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs

@@ -89,7 +89,7 @@ module internal InterfaceMockGenerator =
                      []
                  else
                      [ SynPat.unit ])
-                (SynExpr.createRecord None constructorFields)
+                (AstHelper.instantiateRecord constructorFields)
             |> SynBinding.withXmlDoc (PreXmlDoc.create "An implementation where every method throws.")
             |> SynBinding.withReturnAnnotation constructorReturnType
             |> SynMemberDefn.staticMember
@@ -159,15 +159,6 @@ module internal InterfaceMockGenerator =
                     |> 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
 
@@ -183,7 +174,7 @@ module internal InterfaceMockGenerator =
 
                     SynType.app' baseName generics
 
-            SynMemberDefn.Interface (interfaceName, Some range0, Some (members @ properties), range0)
+            SynMemberDefn.Interface (interfaceName, Some range0, Some members, range0)
 
         let access =
             match interfaceType.Accessibility, spec.IsInternal with
@@ -257,15 +248,6 @@ module internal InterfaceMockGenerator =
         |> SynField.make
         |> SynField.withDocString (mem.XmlDoc |> Option.defaultValue PreXmlDoc.Empty)
 
-    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 createRecord
         (namespaceId : LongIdent)
         (opens : SynOpenDeclTarget list)
@@ -273,12 +255,7 @@ module internal InterfaceMockGenerator =
         : SynModuleOrNamespace
         =
         let interfaceType = AstHelper.parseInterface interfaceType
-
-        let fields =
-            interfaceType.Members
-            |> List.map constructMember
-            |> List.append (interfaceType.Properties |> List.map constructProperty)
-
+        let fields = interfaceType.Members |> List.map constructMember
         let docString = PreXmlDoc.create "Mock record type for an interface"
 
         let name =
@@ -314,14 +291,14 @@ type InterfaceMockGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let types = Ast.getTypes ast
+            let types = Ast.extractTypeDefn ast
 
             let namespaceAndInterfaces =
                 types
                 |> List.choose (fun (ns, types) ->
                     types
                     |> List.choose (fun typeDef ->
-                        match SynTypeDefn.getAttribute typeof<GenerateMockAttribute>.Name typeDef with
+                        match Ast.getAttribute<GenerateMockAttribute> typeDef with
                         | None ->
                             let name = SynTypeDefn.getName typeDef |> List.map _.idText |> String.concat "."
 

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
@@ -557,7 +351,10 @@ module internal JsonParseGenerator =
     let getParseOptions (fieldAttrs : SynAttribute list) =
         (JsonParseOption.None, fieldAttrs)
         ||> List.fold (fun options attr ->
-            if (SynLongIdent.toString attr.TypeName).EndsWith ("JsonNumberHandling", StringComparison.Ordinal) then
+            if
+                (SynLongIdent.toString attr.TypeName)
+                    .EndsWith ("JsonNumberHandling", StringComparison.Ordinal)
+            then
                 let qualifiedEnumValue =
                     match SynExpr.stripOptionalParen attr.ArgExpr with
                     | SynExpr.LongIdent (_, SynLongIdent (ident, _, _), _, _) when isJsonNumberHandling ident ->
@@ -587,13 +384,15 @@ module internal JsonParseGenerator =
                 let propertyNameAttr =
                     fieldData.Attrs
                     |> List.tryFind (fun attr ->
-                        (SynLongIdent.toString attr.TypeName).EndsWith ("JsonPropertyName", StringComparison.Ordinal)
+                        (SynLongIdent.toString attr.TypeName)
+                            .EndsWith ("JsonPropertyName", StringComparison.Ordinal)
                     )
 
                 let extensionDataAttr =
                     fieldData.Attrs
                     |> List.tryFind (fun attr ->
-                        (SynLongIdent.toString attr.TypeName).EndsWith ("JsonExtensionData", StringComparison.Ordinal)
+                        (SynLongIdent.toString attr.TypeName)
+                            .EndsWith ("JsonExtensionData", StringComparison.Ordinal)
                     )
 
                 let propertyName =
@@ -686,7 +485,7 @@ module internal JsonParseGenerator =
         let finalConstruction =
             fields
             |> List.mapi (fun i fieldData -> SynLongIdent.createI fieldData.Ident, SynExpr.createIdent $"arg_%i{i}")
-            |> SynExpr.createRecord None
+            |> AstHelper.instantiateRecord
 
         (finalConstruction, assignments)
         ||> List.fold (fun final assignment -> SynExpr.createLet [ assignment ] final)
@@ -711,8 +510,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 +558,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"))
                 )
@@ -914,13 +711,13 @@ type JsonParseGenerator () =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
             let relevantTypes =
-                Ast.getTypes ast
+                Ast.extractTypeDefn ast
                 |> List.map (fun (name, defns) ->
                     defns
                     |> List.choose (fun defn ->
-                        if SynTypeDefn.isRecord defn then Some defn
-                        elif SynTypeDefn.isDu defn then Some defn
-                        elif SynTypeDefn.isEnum defn then Some defn
+                        if Ast.isRecord defn then Some defn
+                        elif Ast.isDu defn then Some defn
+                        elif AstHelper.isEnum defn then Some defn
                         else None
                     )
                     |> fun defns -> name, defns

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" ])
 
@@ -302,7 +180,8 @@ module internal JsonSerializeGenerator =
         let propertyNameAttr =
             attrs
             |> List.tryFind (fun attr ->
-                (SynLongIdent.toString attr.TypeName).EndsWith ("JsonPropertyName", StringComparison.Ordinal)
+                (SynLongIdent.toString attr.TypeName)
+                    .EndsWith ("JsonPropertyName", StringComparison.Ordinal)
             )
 
         match propertyNameAttr with
@@ -319,7 +198,8 @@ module internal JsonSerializeGenerator =
     let getIsJsonExtension (attrs : SynAttribute list) : bool =
         attrs
         |> List.tryFind (fun attr ->
-            (SynLongIdent.toString attr.TypeName).EndsWith ("JsonExtensionData", StringComparison.Ordinal)
+            (SynLongIdent.toString attr.TypeName)
+                .EndsWith ("JsonExtensionData", StringComparison.Ordinal)
         )
         |> Option.isSome
 
@@ -400,10 +280,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 +345,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
@@ -659,13 +528,13 @@ type JsonSerializeGenerator () =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
             let relevantTypes =
-                Ast.getTypes ast
+                Ast.extractTypeDefn ast
                 |> List.map (fun (name, defns) ->
                     defns
                     |> List.choose (fun defn ->
-                        if SynTypeDefn.isRecord defn then Some defn
-                        elif SynTypeDefn.isDu defn then Some defn
-                        elif SynTypeDefn.isEnum defn then Some defn
+                        if Ast.isRecord defn then Some defn
+                        elif Ast.isDu defn then Some defn
+                        elif AstHelper.isEnum defn then Some defn
                         else None
                     )
                     |> fun defns -> name, defns

WoofWare.Myriad.Plugins/MyriadParamParser.fs

@@ -2,6 +2,28 @@ namespace WoofWare.Myriad.Plugins
 
 open System.Collections.Generic
 
+type internal DesiredGenerator =
+    | InterfaceMock of isInternal : bool option
+    | JsonParse of extensionMethod : bool option
+    | JsonSerialize of extensionMethod : bool option
+    | HttpClient of extensionMethod : bool option
+
+    static member Parse (s : string) =
+        match s with
+        | "GenerateMock" -> DesiredGenerator.InterfaceMock None
+        | "GenerateMock(true)" -> DesiredGenerator.InterfaceMock (Some true)
+        | "GenerateMock(false)" -> DesiredGenerator.InterfaceMock (Some false)
+        | "JsonParse" -> DesiredGenerator.JsonParse None
+        | "JsonParse(true)" -> DesiredGenerator.JsonParse (Some true)
+        | "JsonParse(false)" -> DesiredGenerator.JsonParse (Some false)
+        | "JsonSerialize" -> DesiredGenerator.JsonSerialize None
+        | "JsonSerialize(true)" -> DesiredGenerator.JsonSerialize (Some true)
+        | "JsonSerialize(false)" -> DesiredGenerator.JsonSerialize (Some false)
+        | "HttpClient" -> DesiredGenerator.HttpClient None
+        | "HttpClient(true)" -> DesiredGenerator.HttpClient (Some true)
+        | "HttpClient(false)" -> DesiredGenerator.HttpClient (Some false)
+        | _ -> failwith $"Failed to parse as a generator specification: %s{s}"
+
 [<RequireQualifiedAccess>]
 module internal MyriadParamParser =
     (*

WoofWare.Myriad.Plugins/Parameters.fs

@@ -1,23 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-type internal DesiredGenerator =
-    | InterfaceMock of isInternal : bool option
-    | JsonParse of extensionMethod : bool option
-    | JsonSerialize of extensionMethod : bool option
-    | HttpClient of extensionMethod : bool option
-
-    static member Parse (s : string) =
-        match s with
-        | "GenerateMock" -> DesiredGenerator.InterfaceMock None
-        | "GenerateMock(true)" -> DesiredGenerator.InterfaceMock (Some true)
-        | "GenerateMock(false)" -> DesiredGenerator.InterfaceMock (Some false)
-        | "JsonParse" -> DesiredGenerator.JsonParse None
-        | "JsonParse(true)" -> DesiredGenerator.JsonParse (Some true)
-        | "JsonParse(false)" -> DesiredGenerator.JsonParse (Some false)
-        | "JsonSerialize" -> DesiredGenerator.JsonSerialize None
-        | "JsonSerialize(true)" -> DesiredGenerator.JsonSerialize (Some true)
-        | "JsonSerialize(false)" -> DesiredGenerator.JsonSerialize (Some false)
-        | "HttpClient" -> DesiredGenerator.HttpClient None
-        | "HttpClient(true)" -> DesiredGenerator.HttpClient (Some true)
-        | "HttpClient(false)" -> DesiredGenerator.HttpClient (Some false)
-        | _ -> failwith $"Failed to parse as a generator specification: %s{s}"

WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs

@@ -1,6 +1,5 @@
 namespace WoofWare.Myriad.Plugins
 
-open System
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.Xml
 open WoofWare.Whippet.Fantomas
@@ -60,7 +59,7 @@ module internal RemoveOptionsGenerator =
                 Attributes = []
             }
 
-        let typeDecl = RecordType.ToAst record
+        let typeDecl = AstHelper.defineRecordType record
 
         SynModuleDecl.Types ([ typeDecl ], range0)
 
@@ -97,7 +96,7 @@ module internal RemoveOptionsGenerator =
 
                 SynLongIdent.createI fieldData.Ident, body
             )
-            |> SynExpr.createRecord None
+            |> AstHelper.instantiateRecord
 
         SynBinding.basic
             [ functionName ]
@@ -147,31 +146,44 @@ type RemoveOptionsGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let records = Ast.getRecords ast
+            let records = Ast.extractRecords ast
 
             let namespaceAndRecords =
                 records
-                |> List.collect (fun (ns, ty) ->
-                    ty
-                    |> List.filter (fun record ->
-                        record.Attributes
-                        |> List.exists (fun attr ->
-                            attr.TypeName.LongIdent
-                            |> List.last
-                            |> _.idText
-                            |> fun s ->
-                                if s.EndsWith ("Attribute", StringComparison.Ordinal) then
-                                    s
-                                else
-                                    $"%s{s}Attribute"
-                            |> (=) typeof<RemoveOptionsAttribute>.Name
-                        )
-                    )
-                    |> List.map (fun ty -> ns, ty)
+                |> List.choose (fun (ns, types) ->
+                    match
+                        types
+                        |> List.filter (SynTypeDefn.hasAttribute typeof<RemoveOptionsAttribute>.Name)
+                    with
+                    | [] -> None
+                    | types ->
+                        let types =
+                            types
+                            |> List.map (fun ty ->
+                                match ty with
+                                | SynTypeDefn.SynTypeDefn (sci,
+                                                           SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (access,
+                                                                                                                 fields,
+                                                                                                                 _),
+                                                                                   _),
+                                                           smd,
+                                                           smdo,
+                                                           _,
+                                                           _) -> RecordType.OfRecord sci smd access fields
+                                | _ -> failwith "unexpectedly not a record"
+                            )
+
+                        Some (ns, types)
                 )
 
             let modules =
                 namespaceAndRecords
-                |> List.map (fun (ns, record) -> RemoveOptionsGenerator.createRecordModule ns record)
+                |> List.collect (fun (ns, records) ->
+                    records
+                    |> List.map (fun record ->
+                        let recordModule = RemoveOptionsGenerator.createRecordModule ns record
+                        recordModule
+                    )
+                )
 
             Output.Ast modules

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

@@ -15,14 +15,13 @@
     <WarnOn>FS3559</WarnOn>
     <PackageId>WoofWare.Myriad.Plugins</PackageId>
     <PackageIcon>logo.png</PackageIcon>
-    <NoWarn>NU5118</NoWarn>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Myriad.Core" Version="0.8.3" />
     <PackageReference Include="TypeEquality" Version="0.3.0" />
-    <PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.6.2" />
+    <PackageReference Include="WoofWare.Whippet.Fantomas" Version="0.2.1" />
     <!-- the lowest version allowed by Myriad.Core -->
     <PackageReference Update="FSharp.Core" Version="6.0.1" PrivateAssets="all"/>
   </ItemGroup>
@@ -32,7 +31,6 @@
     <Compile Include="Text.fs" />
     <Compile Include="Measure.fs" />
     <Compile Include="AstHelper.fs" />
-    <Compile Include="Parameters.fs" />
     <Compile Include="RemoveOptionsGenerator.fs"/>
     <Compile Include="MyriadParamParser.fs" />
     <Compile Include="InterfaceMockGenerator.fs"/>
@@ -60,7 +58,7 @@
     <ProjectReference Include="..\WoofWare.Myriad.Plugins.Attributes\WoofWare.Myriad.Plugins.Attributes.fsproj"/>
     <!-- NuGet is such a clown package manager! Get the DLLs into the Nupkg artefact, I have no idea why this is needed,
          but without this line, we don't get any dependency at all packaged into the resulting artefact. -->
-    <None Include="$(OutputPath)\*.dll" Pack="true" PackagePath="lib\$(TargetFramework)"/>
+    <None Include="$(OutputPath)\WoofWare.Myriad.Plugins.Attributes.dll" Pack="true" PackagePath="lib\$(TargetFramework)"/>
   </ItemGroup>
 
 </Project>

WoofWare.Myriad.Plugins/version.json

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

analyzers/analyzers.fsproj

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

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744868846,
-        "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
+        "lastModified": 1728093190,
+        "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
+        "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da",
         "type": "github"
       },
       "original": {

flake.nix

@@ -14,8 +14,8 @@
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = nixpkgs.legacyPackages.${system};
       pname = "WoofWare.Myriad.Plugins";
-      dotnet-sdk = pkgs.dotnetCorePackages.sdk_9_0;
-      dotnet-runtime = pkgs.dotnetCorePackages.runtime_9_0;
+      dotnet-sdk = pkgs.dotnet-sdk_8;
+      dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0;
       version = "0.1";
       dotnetTool = dllOverride: toolName: toolVersion: hash:
         pkgs.stdenvNoCC.mkDerivation rec {
@@ -26,29 +26,25 @@
             pname = name;
             version = version;
             hash = hash;
-            installPhase = ''mkdir -p $out/bin && cp -r tools/net*/any/* $out/bin'';
+            installPhase = ''mkdir -p $out/bin && cp -r tools/net6.0/any/* $out/bin'';
           };
           installPhase = let
             dll =
               if isNull dllOverride
               then name
               else dllOverride;
-          in
-            # fsharp-analyzers requires the .NET SDK at runtime, so we use that instead of dotnet-runtime.
-            ''
-              runHook preInstall
-              mkdir -p "$out/lib"
-              cp -r ./bin/* "$out/lib"
-              makeWrapper "${dotnet-sdk}/bin/dotnet" "$out/bin/${name}" --set DOTNET_HOST_PATH "${dotnet-sdk}/bin/dotnet" --add-flags "$out/lib/${dll}.dll"
-              runHook postInstall
-            '';
+          in ''
+            runHook preInstall
+            mkdir -p "$out/lib"
+            cp -r ./bin/* "$out/lib"
+            makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${name}" --add-flags "$out/lib/${dll}.dll"
+            runHook postInstall
+          '';
         };
     in {
-      packages = let
-        deps = builtins.fromJSON (builtins.readFile ./nix/deps.json);
-      in {
-        fantomas = dotnetTool null "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version (builtins.head (builtins.filter (elem: elem.pname == "fantomas") deps)).hash;
-        fsharp-analyzers = dotnetTool "FSharp.Analyzers.Cli" "fsharp-analyzers" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fsharp-analyzers.version (builtins.head (builtins.filter (elem: elem.pname == "fsharp-analyzers") deps)).hash;
+      packages = {
+        fantomas = dotnetTool null "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version (builtins.head (builtins.filter (elem: elem.pname == "fantomas") ((import ./nix/deps.nix) {fetchNuGet = x: x;}))).hash;
+        fsharp-analyzers = dotnetTool "FSharp.Analyzers.Cli" "fsharp-analyzers" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fsharp-analyzers.version (builtins.head (builtins.filter (elem: elem.pname == "fsharp-analyzers") ((import ./nix/deps.nix) {fetchNuGet = x: x;}))).hash;
         default = pkgs.buildDotnetModule {
           inherit pname version dotnet-sdk dotnet-runtime;
           name = "WoofWare.Myriad.Plugins";
@@ -56,7 +52,7 @@
           projectFile = "./WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj";
           testProjectFile = "./WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj";
           disabledTests = ["WoofWare.Myriad.Plugins.Test.TestSurface.CheckVersionAgainstRemote"];
-          nugetDeps = ./nix/deps.json; # `nix build .#default.fetch-deps && ./result nix/deps.json`
+          nugetDeps = ./nix/deps.nix; # `nix build .#default.passthru.fetch-deps && ./result nix/deps.nix`
           doCheck = true;
         };
       };

global.json

@@ -1,6 +1,6 @@
-{
-  "sdk": {
-    "version": "9.0.100",
-    "rollForward": "latestMajor"
-  }
-}
+{
+  "sdk": {
+    "version": "8.0.100",
+    "rollForward": "latestMajor"
+  }
+}

nix/deps.json

@@ -1,387 +0,0 @@
-[
-  {
-    "pname": "ApiSurface",
-    "version": "4.1.20",
-    "hash": "sha256-koWgO9FC9ax+Ij56ug8kxeyknl0yhLqnNLOUdxtqqo4="
-  },
-  {
-    "pname": "fantomas",
-    "version": "7.0.1",
-    "hash": "sha256-2aGD6Kjh83gmssRqqZ/Uihi7VbNqNUelX4otIfCuhTI="
-  },
-  {
-    "pname": "Fantomas.Core",
-    "version": "6.1.1",
-    "hash": "sha256-FcTLHQFvKkQY/kV08jhhy/St/+FmXpp3epp/R3zUXMA="
-  },
-  {
-    "pname": "Fantomas.FCS",
-    "version": "6.1.1",
-    "hash": "sha256-NuZ8msPEHYA8T3EYREB28F1RcNgUU8V54eg2+UttYxw="
-  },
-  {
-    "pname": "FsCheck",
-    "version": "3.2.0",
-    "hash": "sha256-ksZ4vLgWwyQOzFuK2BczdtDtWWYmedG7UBAg4pYuI8g="
-  },
-  {
-    "pname": "fsharp-analyzers",
-    "version": "0.30.0",
-    "hash": "sha256-7oaSwpHAU1opzpz4szLU/gDaJC/ww9eiFkPu0nr4Mj4="
-  },
-  {
-    "pname": "FSharp.Core",
-    "version": "4.3.4",
-    "hash": "sha256-styyo+6mJy+yxE0NZG/b1hxkAjPOnJfMgd9zWzCJ5uk="
-  },
-  {
-    "pname": "FSharp.Core",
-    "version": "6.0.1",
-    "hash": "sha256-Ehsgt3nCJijpaVuJguC1TPVEKSkJd6PSc07D2ZQSemI="
-  },
-  {
-    "pname": "FSharp.Core",
-    "version": "9.0.202",
-    "hash": "sha256-64Gub0qemmCoMa1tDus6TeTuB1+5sHfE6KD2j4o84mA="
-  },
-  {
-    "pname": "FsUnit",
-    "version": "7.0.1",
-    "hash": "sha256-K85CIdxMeFSHEKZk6heIXp/oFjWAn7dBILKrw49pJUY="
-  },
-  {
-    "pname": "Microsoft.ApplicationInsights",
-    "version": "2.22.0",
-    "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "6.0.36",
-    "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
-    "version": "6.0.36",
-    "hash": "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "6.0.36",
-    "hash": "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
-    "version": "6.0.36",
-    "hash": "sha256-2seqZcz0JeUjkzh3QcGa9TcJ4LUafpFjTRk+Nm8T6T0="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
-    "version": "6.0.36",
-    "hash": "sha256-yxLafxiBKkvfkDggPk0P9YZIHBkDJOsFTO7/V9mEHuU="
-  },
-  {
-    "pname": "Microsoft.CodeCoverage",
-    "version": "17.13.0",
-    "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o="
-  },
-  {
-    "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.13.0",
-    "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-arm64",
-    "version": "6.0.36",
-    "hash": "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "6.0.36",
-    "hash": "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.osx-arm64",
-    "version": "6.0.36",
-    "hash": "sha256-DaSWwYACJGolEBuMhzDVCj/rQTdDt061xCVi+gyQnuo="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.osx-x64",
-    "version": "6.0.36",
-    "hash": "sha256-FrRny9EI6HKCKQbu6mcLj5w4ooSRrODD4Vj2ZMGnMd4="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "6.0.36",
-    "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
-    "version": "6.0.36",
-    "hash": "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "6.0.36",
-    "hash": "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
-    "version": "6.0.36",
-    "hash": "sha256-UfLcrL2Gj/OLz0s92Oo+OCJeDpZFAcQLPLiSNND8D5Y="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
-    "version": "6.0.36",
-    "hash": "sha256-0xIJYFzxdMcnCj3wzkFRQZSnQcPHzPHMzePRIOA3oJs="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.0",
-    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "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",
-    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
-  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.1.3",
-    "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="
-  },
-  {
-    "pname": "Microsoft.Testing.Extensions.Telemetry",
-    "version": "1.5.3",
-    "hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU="
-  },
-  {
-    "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
-    "version": "1.5.3",
-    "hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc="
-  },
-  {
-    "pname": "Microsoft.Testing.Extensions.VSTestBridge",
-    "version": "1.5.3",
-    "hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g="
-  },
-  {
-    "pname": "Microsoft.Testing.Platform",
-    "version": "1.5.3",
-    "hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM="
-  },
-  {
-    "pname": "Microsoft.Testing.Platform.MSBuild",
-    "version": "1.5.3",
-    "hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY="
-  },
-  {
-    "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.12.0",
-    "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w="
-  },
-  {
-    "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.13.0",
-    "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
-  },
-  {
-    "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.13.0",
-    "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo="
-  },
-  {
-    "pname": "Myriad.Core",
-    "version": "0.8.3",
-    "hash": "sha256-vBOxfq8QriX/yUtaXN69rEQaY/psRNJWxqATLidrt2g="
-  },
-  {
-    "pname": "Myriad.Sdk",
-    "version": "0.8.3",
-    "hash": "sha256-7O397WKhskKOvE3MkJT37BvxorDWngDR6gTUogtDZ2M="
-  },
-  {
-    "pname": "Nerdbank.GitVersioning",
-    "version": "3.8.38-alpha",
-    "hash": "sha256-gPMrVbjOZxXoofczF/pn6eVkLhjVSJIyQrLO2oljrDc="
-  },
-  {
-    "pname": "NETStandard.Library",
-    "version": "2.0.3",
-    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
-  },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "13.0.1",
-    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
-  },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "13.0.3",
-    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
-  },
-  {
-    "pname": "NuGet.Common",
-    "version": "6.13.2",
-    "hash": "sha256-ASLa/Jigg5Eop0ZrXPl98RW2rxnJRC7pbbxhuV74hFw="
-  },
-  {
-    "pname": "NuGet.Configuration",
-    "version": "6.13.2",
-    "hash": "sha256-z8VW1YdRDanyyRTDYRvRkSv/XPR3c/hMM1y8cNNjx0Y="
-  },
-  {
-    "pname": "NuGet.Frameworks",
-    "version": "6.13.2",
-    "hash": "sha256-caDyc+WgYOo43AUTjtbP0MyvYDb6JweEKDdIul61Cac="
-  },
-  {
-    "pname": "NuGet.Packaging",
-    "version": "6.13.2",
-    "hash": "sha256-lhO+SFwIYZ4aPHxIGm5ubkkE2a5Ve2xgtroRbNh7hpw="
-  },
-  {
-    "pname": "NuGet.Protocol",
-    "version": "6.13.2",
-    "hash": "sha256-5lnAHHZjy7A4vgv65AeBAs64mSNpuoUjxW3HnrMpuzY="
-  },
-  {
-    "pname": "NuGet.Versioning",
-    "version": "6.13.2",
-    "hash": "sha256-gmpyBpKnt+GHqgx/2uFKp+J2csbxEAy1E7WdVT117sw="
-  },
-  {
-    "pname": "NUnit",
-    "version": "4.3.2",
-    "hash": "sha256-0RWe8uFoxYp6qhPlDDEghOMcKJgyw2ybvEoAqBLebeE="
-  },
-  {
-    "pname": "NUnit3TestAdapter",
-    "version": "5.0.0",
-    "hash": "sha256-7jZM4qAbIzne3AcdFfMbvbgogqpxvVe6q2S7Ls8xQy0="
-  },
-  {
-    "pname": "RestEase",
-    "version": "1.6.4",
-    "hash": "sha256-FFmqFwlHhIln46k56Z8KM1G+xuPEh/bceKCQnJcdcdc="
-  },
-  {
-    "pname": "runtime.any.System.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
-  },
-  {
-    "pname": "runtime.native.System",
-    "version": "4.3.0",
-    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
-  },
-  {
-    "pname": "runtime.unix.System.Private.Uri",
-    "version": "4.3.0",
-    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
-  },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "8.0.0",
-    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
-  },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "5.0.0",
-    "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="
-  },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "7.0.0",
-    "hash": "sha256-9Wk8cHSkjKtqkN6xW7KnXoQVtF/VNbKeBq79WqDesMs="
-  },
-  {
-    "pname": "System.Formats.Asn1",
-    "version": "6.0.0",
-    "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="
-  },
-  {
-    "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.5.5",
-    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
-  },
-  {
-    "pname": "System.Private.Uri",
-    "version": "4.3.0",
-    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
-  },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "1.6.0",
-    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.3.1",
-    "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "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",
-    "hash": "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI="
-  },
-  {
-    "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "4.4.0",
-    "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="
-  },
-  {
-    "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": "TypeEquality",
-    "version": "0.3.0",
-    "hash": "sha256-V50xAOzzyUJrY+MYPRxtnqW5MVeATXCes89wPprv1r4="
-  },
-  {
-    "pname": "WoofWare.Whippet.Fantomas",
-    "version": "0.6.2",
-    "hash": "sha256-nDT/W5eBwM/E+Z2oQ80maAGYrEyRJQXL1unxR9q6ztU="
-  }
-]

nix/deps.nix

@@ -0,0 +1,339 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+{fetchNuGet}: [
+  (fetchNuGet {
+    pname = "ApiSurface";
+    version = "4.1.5";
+    hash = "sha256-Kbt18XLk1gvZfzGca885HaXZB119APay85KzI546PYM=";
+  })
+  (fetchNuGet {
+    pname = "fantomas";
+    version = "6.3.15";
+    hash = "sha256-Gjw7MxjUNckMWSfnOye4UTe5fZWnor6RHCls3PNsuG8=";
+  })
+  (fetchNuGet {
+    pname = "Fantomas.Core";
+    version = "6.1.1";
+    hash = "sha256-FcTLHQFvKkQY/kV08jhhy/St/+FmXpp3epp/R3zUXMA=";
+  })
+  (fetchNuGet {
+    pname = "Fantomas.FCS";
+    version = "6.1.1";
+    hash = "sha256-NuZ8msPEHYA8T3EYREB28F1RcNgUU8V54eg2+UttYxw=";
+  })
+  (fetchNuGet {
+    pname = "FsCheck";
+    version = "2.16.6";
+    hash = "sha256-1hR2SaJTkqBzU3D955MvLNVzkQHkx0Z/QzOXZfzk2Zw=";
+  })
+  (fetchNuGet {
+    pname = "fsharp-analyzers";
+    version = "0.27.0";
+    hash = "sha256-QhLi2veTY1wZlQKJLTyVPgx/ImkaZugQNjSN5VJCNEA=";
+  })
+  (fetchNuGet {
+    pname = "FSharp.Core";
+    version = "4.3.4";
+    hash = "sha256-styyo+6mJy+yxE0NZG/b1hxkAjPOnJfMgd9zWzCJ5uk=";
+  })
+  (fetchNuGet {
+    pname = "FSharp.Core";
+    version = "6.0.1";
+    hash = "sha256-Ehsgt3nCJijpaVuJguC1TPVEKSkJd6PSc07D2ZQSemI=";
+  })
+  (fetchNuGet {
+    pname = "FSharp.Core";
+    version = "8.0.400";
+    hash = "sha256-wlrcAjjvI5YtnHR7kFH8uRUA4GomJYmqr41K5LYjCGs=";
+  })
+  (fetchNuGet {
+    pname = "FsUnit";
+    version = "6.0.1";
+    hash = "sha256-vka/aAgWhDCl5tu+kgO7GtSaHOOvlSaWxG+tExwGXpI=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Ref";
+    version = "6.0.33";
+    hash = "sha256-GcPiO+iI0JsHYlqURAmzWjOnDX2jDCUY4jYaIwr8ojs=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
+    version = "6.0.33";
+    hash = "sha256-g5zbB1DnCSKuCOWtF09GEqGn1uJLdlTN6kqdnSCzRjQ=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
+    version = "6.0.33";
+    hash = "sha256-ToaiqVy5qonomAVBg5PO1GgrPKL4Cc1BZTJ0z/2LquA=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
+    version = "6.0.33";
+    hash = "sha256-OY/vdqAzZ99I4lEZbOOQw12TE0AIb5pXxKTvDxO2M2Q=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
+    version = "6.0.33";
+    hash = "sha256-53MAV3RO1kXzy5IpdZDZIOhoUzFqWHn7+A3aWwdTONQ=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.CodeCoverage";
+    version = "17.11.1";
+    hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NET.Test.Sdk";
+    version = "17.11.1";
+    hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.linux-arm64";
+    version = "6.0.33";
+    hash = "sha256-rwWOpf2Pdg84c8bKIUcMYuDTI0kXUELL/nl9psSmX+E=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.linux-x64";
+    version = "6.0.33";
+    hash = "sha256-5iYNZATXOePDsLA9lI80o1Gjxw4E+B4bJbwdYJJHcZY=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.osx-arm64";
+    version = "6.0.33";
+    hash = "sha256-k3LenomOlacyzq4FlBY/TwV7+ClbK4U0A/O9r0pZHT4=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.osx-x64";
+    version = "6.0.33";
+    hash = "sha256-tu72AwDH1+oAIXjOJcNbeyKm1s4pncYp0avbMSBrcJQ=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Ref";
+    version = "6.0.33";
+    hash = "sha256-BiGUcXo1FQTlZdR6ndhUQ8lrYG3KaGXNXRVF+Fc3L28=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
+    version = "6.0.33";
+    hash = "sha256-obRKiJEVpZ5E3TE7q2oHaYwFYhI23rMiHwp+8ORkwXY=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.linux-x64";
+    version = "6.0.33";
+    hash = "sha256-2xdhvnKsFc8utDWN09zeXzZ5op+WUqkoWLuzdtQAkrA=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
+    version = "6.0.33";
+    hash = "sha256-9KHubWicibZOcixiByzuBKPnJM2u5DSQC9jR3MAR1bI=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.osx-x64";
+    version = "6.0.33";
+    hash = "sha256-smh6SiTtCAuFglqWrXiGGsoIDP9dhGuIKdYjmw+xCyY=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Platforms";
+    version = "1.1.0";
+    hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Platforms";
+    version = "1.1.1";
+    hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Platforms";
+    version = "2.0.0";
+    hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.Targets";
+    version = "1.1.3";
+    hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.TestPlatform.ObjectModel";
+    version = "17.11.1";
+    hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4=";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.TestPlatform.TestHost";
+    version = "17.11.1";
+    hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU=";
+  })
+  (fetchNuGet {
+    pname = "Myriad.Core";
+    version = "0.8.3";
+    hash = "sha256-vBOxfq8QriX/yUtaXN69rEQaY/psRNJWxqATLidrt2g=";
+  })
+  (fetchNuGet {
+    pname = "Myriad.Sdk";
+    version = "0.8.3";
+    hash = "sha256-7O397WKhskKOvE3MkJT37BvxorDWngDR6gTUogtDZ2M=";
+  })
+  (fetchNuGet {
+    pname = "Nerdbank.GitVersioning";
+    version = "3.6.143";
+    hash = "sha256-OhOtMzP+2obDIR+npR7SsoXo0KrmcsL+VCE8Z3t5gzQ=";
+  })
+  (fetchNuGet {
+    pname = "NETStandard.Library";
+    version = "2.0.3";
+    hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=";
+  })
+  (fetchNuGet {
+    pname = "Newtonsoft.Json";
+    version = "13.0.1";
+    hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=";
+  })
+  (fetchNuGet {
+    pname = "Newtonsoft.Json";
+    version = "13.0.3";
+    hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=";
+  })
+  (fetchNuGet {
+    pname = "NuGet.Common";
+    version = "6.11.0";
+    hash = "sha256-eb7G07RyZv4AQT6ItRqdBuUf9e9BXcQygsy5RNEXfNE=";
+  })
+  (fetchNuGet {
+    pname = "NuGet.Configuration";
+    version = "6.11.0";
+    hash = "sha256-2SNZkX64SB15glzQx3k+vI7btr8Yqg4CayaaaK1B0AQ=";
+  })
+  (fetchNuGet {
+    pname = "NuGet.Frameworks";
+    version = "6.11.0";
+    hash = "sha256-8DC7V2IlCjiMDQ9yWbl7QQHia6OpBrbWh5rL0qa0Opw=";
+  })
+  (fetchNuGet {
+    pname = "NuGet.Packaging";
+    version = "6.11.0";
+    hash = "sha256-LVLvxcB6SMdayxAsrc5bCuLLt25fqPr6KfYcYoWWIQk=";
+  })
+  (fetchNuGet {
+    pname = "NuGet.Protocol";
+    version = "6.11.0";
+    hash = "sha256-3vdB/8IiJ2LMHhFXLWOzf0H59Ow/zcoq6W4uCHbihCQ=";
+  })
+  (fetchNuGet {
+    pname = "NuGet.Versioning";
+    version = "6.11.0";
+    hash = "sha256-03edgWvbqUtbzpBBTIxTwsSRoj1T2muGVL+vTuIHXag=";
+  })
+  (fetchNuGet {
+    pname = "NUnit";
+    version = "4.2.2";
+    hash = "sha256-+0OS67ITalmG9arYCgQF/+YbmPRnB3pIIykew0kvoCc=";
+  })
+  (fetchNuGet {
+    pname = "NUnit3TestAdapter";
+    version = "4.6.0";
+    hash = "sha256-9Yav2fYhC4w0OgsyUwU4/5rDy4FVDTpKnWHuwl/uKJQ=";
+  })
+  (fetchNuGet {
+    pname = "RestEase";
+    version = "1.6.4";
+    hash = "sha256-FFmqFwlHhIln46k56Z8KM1G+xuPEh/bceKCQnJcdcdc=";
+  })
+  (fetchNuGet {
+    pname = "runtime.any.System.Runtime";
+    version = "4.3.0";
+    hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=";
+  })
+  (fetchNuGet {
+    pname = "runtime.native.System";
+    version = "4.3.0";
+    hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=";
+  })
+  (fetchNuGet {
+    pname = "runtime.unix.System.Private.Uri";
+    version = "4.3.0";
+    hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=";
+  })
+  (fetchNuGet {
+    pname = "System.Diagnostics.DiagnosticSource";
+    version = "7.0.0";
+    hash = "sha256-9Wk8cHSkjKtqkN6xW7KnXoQVtF/VNbKeBq79WqDesMs=";
+  })
+  (fetchNuGet {
+    pname = "System.Formats.Asn1";
+    version = "6.0.0";
+    hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8=";
+  })
+  (fetchNuGet {
+    pname = "System.IO.Abstractions";
+    version = "4.2.13";
+    hash = "sha256-nkC/PiqE6+c1HJ2yTwg3x+qdBh844Z8n3ERWDW8k6Gg=";
+  })
+  (fetchNuGet {
+    pname = "System.IO.FileSystem.AccessControl";
+    version = "4.5.0";
+    hash = "sha256-ck44YBQ0M+2Im5dw0VjBgFD1s0XuY54cujrodjjSBL8=";
+  })
+  (fetchNuGet {
+    pname = "System.Memory";
+    version = "4.5.5";
+    hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=";
+  })
+  (fetchNuGet {
+    pname = "System.Private.Uri";
+    version = "4.3.0";
+    hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=";
+  })
+  (fetchNuGet {
+    pname = "System.Reflection.Metadata";
+    version = "1.6.0";
+    hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=";
+  })
+  (fetchNuGet {
+    pname = "System.Runtime";
+    version = "4.3.1";
+    hash = "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=";
+  })
+  (fetchNuGet {
+    pname = "System.Runtime.CompilerServices.Unsafe";
+    version = "6.0.0";
+    hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.AccessControl";
+    version = "4.5.0";
+    hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.Pkcs";
+    version = "6.0.4";
+    hash = "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Cryptography.ProtectedData";
+    version = "4.4.0";
+    hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=";
+  })
+  (fetchNuGet {
+    pname = "System.Security.Principal.Windows";
+    version = "4.5.0";
+    hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=";
+  })
+  (fetchNuGet {
+    pname = "System.Text.Encodings.Web";
+    version = "7.0.0";
+    hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ=";
+  })
+  (fetchNuGet {
+    pname = "System.Text.Json";
+    version = "7.0.3";
+    hash = "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=";
+  })
+  (fetchNuGet {
+    pname = "TypeEquality";
+    version = "0.3.0";
+    hash = "sha256-V50xAOzzyUJrY+MYPRxtnqW5MVeATXCes89wPprv1r4=";
+  })
+  (fetchNuGet {
+    pname = "WoofWare.Whippet.Fantomas";
+    version = "0.2.1";
+    hash = "sha256-38LPop5tQ14oqzi0dSzBp2m53fugIMyWed67xnZmJqk=";
+  })
+]