Add type-level help text support to ArgParser generator (#457)

The ArgumentHelpText attribute can now be applied to the record type itself
to display help text at the top of the --help output, before field descriptions.
This enables better documentation of command-line argument parsers.

Features:
- Type-level help text appears before argument list
- Multiline help text is supported
- Backward compatible with existing code
- Help text appears in both --help and error messages

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <noreply@anthropic.com>

.config/dotnet-tools.json

@@ -3,16 +3,22 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "6.3.12",
+      "version": "7.0.3",
       "commands": [
         "fantomas"
       ]
     },
     "fsharp-analyzers": {
-      "version": "0.27.0",
+      "version": "0.34.1",
       "commands": [
         "fsharp-analyzers"
       ]
+    },
+    "woofware.nunittestrunner": {
+      "version": "0.3.9",
+      "commands": [
+        "woofware.nunittestrunner"
+      ]
     }
   }
-}
+}

.envrc

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

.github/workflows/dotnet.yaml

@@ -25,11 +25,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
     - name: Install Nix
-      uses: cachix/install-nix-action@V27
+      uses: cachix/install-nix-action@v31
       with:
         extra_nix_config: |
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -46,11 +46,11 @@ jobs:
       security-events: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -65,9 +65,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -80,9 +80,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -93,11 +93,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -114,9 +114,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v31
         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@V27
+        uses: cachix/install-nix-action@v31
         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@V27
+        uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -152,11 +152,11 @@ jobs:
   nuget-pack:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
     - name: Install Nix
-      uses: cachix/install-nix-action@V27
+      uses: cachix/install-nix-action@v31
       with:
         extra_nix_config: |
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -167,12 +167,12 @@ jobs:
     - name: Pack
       run: nix develop --command dotnet pack --configuration Release
     - name: Upload NuGet artifact (plugin)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: nuget-package-plugin
         path: WoofWare.Myriad.Plugins/bin/Release/WoofWare.Myriad.Plugins.*.nupkg
     - name: Upload NuGet artifact (attributes)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: nuget-package-attribute
         path: WoofWare.Myriad.Plugins.Attributes/bin/Release/WoofWare.Myriad.Plugins.Attributes.*.nupkg
@@ -182,7 +182,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download NuGet artifact (plugin)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: nuget-package-plugin
           path: packed-plugin
@@ -190,7 +190,7 @@ jobs:
         # Verify that there is exactly one nupkg in the artifact that would be NuGet published
         run: if [[ $(find packed-plugin -maxdepth 1 -name 'WoofWare.Myriad.Plugins.*.nupkg' -printf c | wc -c) -ne "1" ]]; then exit 1; fi
       - name: Download NuGet artifact (attributes)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: nuget-package-attribute
           path: packed-attribute
@@ -198,27 +198,40 @@ 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-plugin-dry-run:
-    needs: [nuget-pack]
+  github-release-dry-run:
+    strategy:
+      matrix:
+        artifact:
+        - nuget-package-plugin
+        - nuget-package-attribute
     runs-on: ubuntu-latest
+    needs: [nuget-pack]
     steps:
-      - uses: actions/checkout@v4
-      - name: Download NuGet artifact (plugin)
-        uses: actions/download-artifact@v4
+      - uses: actions/checkout@v5
+      - name: Download NuGet artifact
+        uses: actions/download-artifact@v6
         with:
-          name: nuget-package-plugin
-      - name: Download NuGet artifact (attribute)
-        uses: actions/download-artifact@v4
-        with:
-          name: nuget-package-attribute
-      - name: Tag and release plugin
+          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:
-          DRY_RUN: 1
-          GITHUB_TOKEN: mock-token
-        run: sh .github/workflows/tag.sh
+          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
+        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
 
   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-plugin-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-dry-run]
     if: ${{ always() }}
     runs-on: ubuntu-latest
     steps:
@@ -236,12 +249,12 @@ jobs:
       contents: read
     steps:
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: nuget-package-attribute
           path: packed
       - name: Attest Build Provenance
-        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
+        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
         with:
           subject-path: "packed/*.nupkg"
 
@@ -255,12 +268,12 @@ jobs:
       contents: read
     steps:
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: nuget-package-plugin
           path: packed
       - name: Attest Build Provenance
-        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
+        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
         with:
           subject-path: "packed/*.nupkg"
 
@@ -274,26 +287,31 @@ jobs:
       attestations: write
       contents: read
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: nuget-package-attribute
           path: packed
       - name: Identify `dotnet`
         id: dotnet-identify
         run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
+      - name: Obtain NuGet key
+        uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
+        id: login
+        with:
+            user: ${{ secrets.NUGET_USER }}
       - name: Publish to NuGet
         id: publish-success
         uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
         with:
           package-name: WoofWare.Myriad.Plugins.Attributes
-          nuget-key: ${{ secrets.NUGET_API_KEY }}
+          nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
           nupkg-dir: packed/
           dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
 
@@ -307,30 +325,40 @@ jobs:
       attestations: write
       contents: read
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v31
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Download NuGet artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: nuget-package-plugin
           path: packed
       - name: Identify `dotnet`
         id: dotnet-identify
         run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
+      - name: Obtain NuGet key
+        uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
+        id: login
+        with:
+            user: ${{ secrets.NUGET_USER }}
       - name: Publish to NuGet
         id: publish-success
         uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
         with:
           package-name: WoofWare.Myriad.Plugins
-          nuget-key: ${{ secrets.NUGET_API_KEY }}
+          nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
           nupkg-dir: packed/
           dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
 
-  github-release-plugin:
+  github-release:
+    strategy:
+      matrix:
+        artifact:
+        - nuget-package-attribute
+        - nuget-package-plugin
     runs-on: ubuntu-latest
     if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/main' }}
     needs: [all-required-checks-complete]
@@ -338,16 +366,24 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
-      - name: Download NuGet artifact (plugin)
-        uses: actions/download-artifact@v4
+      - uses: actions/checkout@v5
+      - name: Download NuGet artifact
+        uses: actions/download-artifact@v6
         with:
-          name: nuget-package-plugin
-      - name: Download NuGet artifact (attribute)
-        uses: actions/download-artifact@v4
-        with:
-          name: nuget-package-attribute
-      - name: Tag and release plugin
+          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:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: sh .github/workflows/tag.sh
+          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
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          target-commitish: ${{ github.sha }}
+          tag: ${{ steps.compute-tag.outputs.output }}
+          binary-contents: ${{ steps.compute-path.outputs.output }}

.github/workflows/flake_update.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
@@ -21,32 +21,32 @@ jobs:
       - name: Update Nix flake
         run: 'nix flake update'
 
-      - name: Build passthru
-        run: 'nix build ".#default.passthru.fetch-deps"'
+      - name: Build fetch-deps
+        run: 'nix build ".#default.fetch-deps"'
 
-      - name: Run passthru
+      - name: Run fetch-deps
         run: |
             set -o pipefail
-            ./result | tee /tmp/passthru.txt
-            cp /"$(cat /tmp/passthru.txt | grep " wrote lockfile to " | cut -d / -f 2-)" nix/deps.nix
+            ./result nix/deps.json
 
       - name: Format
         run: 'nix develop --command alejandra .'
 
       - name: Create token
         id: generate-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         with:
           # https://github.com/actions/create-github-app-token/issues/136
           app-id: ${{ secrets.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
 
       - name: Raise pull request
-        uses: Smaug123/commit-action@cc25e6d80a796c49669dda4a0aa36c54c573983d
+        uses: Smaug123/commit-action@d34807f26cb52c7a05bbd80efe9f964cdf29bc87
         id: cpr
         with:
             bearer-token: ${{ steps.generate-token.outputs.token }}
             pr-title: "Upgrade Nix flake and deps"
+            branch-name: "auto-pr"
 
       - name: Enable Pull Request Automerge
         if: ${{ steps.cpr.outputs.pull-request-number }}

.github/workflows/tag.sh

@@ -1,120 +0,0 @@
-#!/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,5 +1,47 @@
 Notable changes are recorded here.
 
+# WoofWare.Myriad.Plugins 9.1.1, WoofWare.Myriad.Plugins.Attributes 3.8.1
+
+Adds the `[<ArgumentNegateWithPrefix>]` attribute, which can be placed on a boolean or flag-valued field when using the `ArgParser` generator.
+This causes the boolean to be specifiable with the `--no-` prefix to negate its value.
+(For example, `Foo : bool` is normally specified as `--foo`; this new attribute lets the user additionally give `--no-foo` to get the same semantics as `--foo=false`.)
+
+# WoofWare.Myriad.Plugins 9.0.1
+
+Converts the `static member Empty` field on each generated mock (from `GeneratedMock`) into a function, so as to permit the `GeneratedCapturingMock` to have the same signature.
+(`GeneratedCapturingMock` contains mutable state, so must be created afresh each time.)
+
+# WoofWare.Myriad.Plugins 8.1.1
+
+Adds `GenerateCapturingMock`, which is `GenerateMock` but additionally records the calls made to each function.
+
+# WoofWare.Myriad.Plugins 8.0.3
+
+The RestEase-style HTTP client generator now automatically adds the `application/json` content type header to requests which are POSTing a body that is known to be JSON-serialised.
+You can override this by setting the `[<RestEase.Header ("Content-Type", "desired content type")>]` header manually on any affected member.
+
+# WoofWare.Myriad.Plugins 7.0.1
+
+All generators should now be compatible with `<Nullable>enable</Nullable>`.
+
+**Please test the results and let me know of unexpected failures.**
+There are a number of heuristics in this code, because:
+
+* `System.Text.Json.Nodes` is an unfathomably weird API which simply requires us to make educated guesses about whether a user-provided type is supposed to be nullable, despite this being irrelevant to the operation of `System.Text.Json`;
+* Some types (like `Uri` and `String`) have `ToString` methods which can't return `null`, but in general `Object.ToString` can of course return `null`, and as far as I can tell there is simply no way to know from the source alone whether a given type will have a nullable `ToString`.
+
+# WoofWare.Myriad.Plugins 6.0.1
+
+The `ArgParser` generator's type signatures have changed.
+The `parse'` method no longer takes `getEnvironmentVariable : string -> string`; it's now `getEnvironmentVariable : string -> string option`.
+This is to permit satisfying the `<Nullable>enable</Nullable>` compiler setting.
+If you're calling `parse'`, give it `Environment.GetEnvironmentVariable >> Option.ofObj` instead.
+
+# WoofWare.Myriad.Plugins 5.0.1
+
+We now enforce non-nullability on more types during JSON parse.
+We have always expected you to consume nullable types wrapped in an `option`, but now we enforce this in more cases by throwing `ArgumentNullException`.
+
 # WoofWare.Myriad.Plugins 3.0.1
 
 Semantics of `HttpClient`'s URI component composition changed:

CONTRIBUTING.md

@@ -44,7 +44,7 @@ git config blame.ignoreRevsFile .git-blame-ignore-revs
 ## Dependencies
 
 I try to keep this repository's dependencies as few as possible, because (for example) any consumer of the source generator will also consume this project via the attributes.
-When adding dependencies, you will need to `nix run .#fetchDeps` to obtain a new copy of [the dependency lockfile](./nix/deps.nix).
+When adding dependencies, you will need to `nix run .#fetchDeps` to obtain a new copy of [the dependency lockfile](./nix/deps.json).
 
 ## Branch strategy
 

ConsumePlugin/ArgParserConflictTests.fs

@@ -0,0 +1,124 @@
+namespace ConsumePlugin
+
+open WoofWare.Myriad.Plugins
+
+// This file contains test cases for conflict detection in the ArgParser generator.
+// These are expected to FAIL at build time with appropriate error messages.
+// Uncomment each section one at a time to test the specific conflict detection.
+
+// ============================================================================
+// Test 1: Field named NoFooBar conflicts with FooBar's --no- variant
+// ============================================================================
+// Expected error: Argument name conflict: '--no-foo-bar' collides with the --no- variant
+// of field 'FooBar' (which has [<ArgumentNegateWithPrefix>])
+
+(*
+[<ArgParser>]
+type ConflictingFieldNames =
+    {
+        [<ArgumentNegateWithPrefix>]
+        FooBar : bool
+        NoFooBar : bool
+    }
+*)
+
+// ============================================================================
+// Test 2: ArgumentLongForm "no-foo" conflicts with Foo's --no- variant
+// ============================================================================
+// Expected error: Argument name conflict: '--no-foo' collides with the --no- variant
+// of field 'Foo' (which has [<ArgumentNegateWithPrefix>])
+
+(*
+[<ArgParser>]
+type ConflictingLongForm =
+    {
+        [<ArgumentNegateWithPrefix>]
+        Foo : bool
+        [<ArgumentLongForm "no-foo">]
+        Bar : bool
+    }
+*)
+
+// ============================================================================
+// Test 3: Multiple ArgumentLongForm, one conflicts
+// ============================================================================
+// Expected error: Argument name conflict: '--no-verbose' collides with...
+
+(*
+[<ArgParser>]
+type ConflictingMultipleLongForms =
+    {
+        [<ArgumentLongForm "verbose">]
+        [<ArgumentLongForm "v">]
+        [<ArgumentNegateWithPrefix>]
+        VerboseMode : bool
+
+        [<ArgumentLongForm "no-verbose">]
+        Quiet : bool
+    }
+*)
+
+// ============================================================================
+// Test 4: ArgumentNegateWithPrefix on non-boolean field
+// ============================================================================
+// Expected error: [<ArgumentNegateWithPrefix>] can only be applied to boolean
+// or flag DU fields, but was applied to field NotABool of type string
+
+(*
+[<ArgParser>]
+type InvalidAttributeOnNonBool =
+    {
+        [<ArgumentNegateWithPrefix>]
+        NotABool : string
+    }
+*)
+
+// ============================================================================
+// Test 5: ArgumentNegateWithPrefix on non-flag int field
+// ============================================================================
+// Expected error: [<ArgumentNegateWithPrefix>] can only be applied to boolean
+// or flag DU fields
+
+(*
+[<ArgParser>]
+type InvalidAttributeOnInt =
+    {
+        [<ArgumentNegateWithPrefix>]
+        NotAFlag : int
+    }
+*)
+
+// ============================================================================
+// Test 6: Complex conflict with custom names
+// ============================================================================
+// This tests a more complex scenario where a custom ArgumentLongForm creates
+// a conflict with a different field's negated form
+
+(*
+[<ArgParser>]
+type ComplexConflict =
+    {
+        [<ArgumentLongForm "enable">]
+        [<ArgumentNegateWithPrefix>]
+        FeatureA : bool
+
+        [<ArgumentLongForm "no-enable">]
+        DisableAll : bool
+    }
+*)
+
+// ============================================================================
+// Test 7: Valid usage - no conflicts (this SHOULD compile)
+// ============================================================================
+
+[<ArgParser>]
+type NoConflict =
+    {
+        [<ArgumentNegateWithPrefix>]
+        EnableFeature : bool
+
+        [<ArgumentNegateWithPrefix>]
+        VerboseMode : bool
+
+        NormalField : string
+    }

ConsumePlugin/ArgParserNegationTests.fs

@@ -0,0 +1,48 @@
+namespace ConsumePlugin
+
+open WoofWare.Myriad.Plugins
+
+// Test types for ArgumentNegateWithPrefix functionality
+
+type TestDryRunMode =
+    | [<ArgumentFlag false>] Wet
+    | [<ArgumentFlag true>] Dry
+
+[<ArgParser true>]
+type BoolNegation =
+    {
+        [<ArgumentNegateWithPrefix>]
+        EnableFeature : bool
+    }
+
+[<ArgParser true>]
+type FlagNegation =
+    {
+        [<ArgumentNegateWithPrefix>]
+        DryRun : TestDryRunMode
+    }
+
+[<ArgParser true>]
+type MultipleFormsNegation =
+    {
+        [<ArgumentLongForm "verbose">]
+        [<ArgumentLongForm "v">]
+        [<ArgumentNegateWithPrefix>]
+        VerboseMode : bool
+    }
+
+[<ArgParser true>]
+type CombinedFeatures =
+    {
+        [<ArgumentNegateWithPrefix>]
+        [<ArgumentDefaultFunction>]
+        Verbose : Choice<bool, bool>
+
+        [<ArgumentNegateWithPrefix>]
+        [<ArgumentHelpText "Enable debug mode">]
+        Debug : bool
+
+        NormalBool : bool
+    }
+
+    static member DefaultVerbose () = false

ConsumePlugin/Args.fs

@@ -235,3 +235,27 @@ type FlagsIntoPositionalArgs' =
         [<PositionalArgs false>]
         DontGrabEverything : string list
     }
+
+[<ArgParser>]
+[<ArgumentHelpText "Parse command-line arguments for a basic configuration. This help text appears before the argument list.">]
+type WithTypeHelp =
+    {
+        [<ArgumentHelpText "The configuration file path">]
+        ConfigFile : string
+        [<ArgumentHelpText "Enable verbose output">]
+        Verbose : bool
+        Port : int
+    }
+
+[<ArgParser>]
+[<ArgumentHelpText "This is a multiline help text example.
+It spans multiple lines to test that multiline strings work correctly.
+You can use this to provide detailed documentation for your argument parser.">]
+type WithMultilineTypeHelp =
+    {
+        [<ArgumentHelpText "Input file to process">]
+        InputFile : string
+        [<ArgumentHelpText "Output directory">]
+        OutputDir : string
+        Force : bool
+    }

ConsumePlugin/CapturingMockExample.fs

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

ConsumePlugin/CapturingMockExampleNoAttributes.fs

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

ConsumePlugin/ConsumePlugin.fsproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <OtherFlags>--reflectionfree $(OtherFlags)</OtherFlags>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)..\WoofWare.Myriad.Plugins\bin\$(Configuration)\net6.0\WoofWare.Myriad.Plugins.dll"/>
@@ -32,6 +33,38 @@
     <Compile Include="GeneratedMock.fs">
       <MyriadFile>MockExample.fs</MyriadFile>
     </Compile>
+    <Compile Include="CapturingMockExample.fs" />
+    <Compile Include="GeneratedCapturingMock.fs">
+      <MyriadFile>CapturingMockExample.fs</MyriadFile>
+    </Compile>
+    <Compile Include="MockExampleNoAttributes.fs" />
+    <Compile Include="GeneratedMockNoAttributes.fs">
+      <MyriadFile>MockExampleNoAttributes.fs</MyriadFile>
+      <MyriadParams>
+        <IPublicTypeNoAttr>GenerateMock</IPublicTypeNoAttr>
+        <IPublicTypeInternalFalseNoAttr>GenerateMock(false)</IPublicTypeInternalFalseNoAttr>
+        <InternalTypeNoAttr>GenerateMock</InternalTypeNoAttr>
+        <PrivateTypeNoAttr>GenerateMock</PrivateTypeNoAttr>
+        <PrivateTypeInternalFalseNoAttr>GenerateMock(false)</PrivateTypeInternalFalseNoAttr>
+        <VeryPublicTypeNoAttr>GenerateMock</VeryPublicTypeNoAttr>
+        <CurriedNoAttr>GenerateMock</CurriedNoAttr>
+        <TypeWithInterfaceNoAttr>GenerateMock</TypeWithInterfaceNoAttr>
+      </MyriadParams>
+    </Compile>
+    <Compile Include="CapturingMockExampleNoAttributes.fs" />
+    <Compile Include="GeneratedCapturingMockNoAttributes.fs">
+      <MyriadFile>CapturingMockExampleNoAttributes.fs</MyriadFile>
+      <MyriadParams>
+        <IPublicTypeNoAttr>GenerateCapturingMock</IPublicTypeNoAttr>
+        <IPublicTypeInternalFalseNoAttr>GenerateCapturingMock(false)</IPublicTypeInternalFalseNoAttr>
+        <InternalTypeNoAttr>GenerateCapturingMock</InternalTypeNoAttr>
+        <PrivateTypeNoAttr>GenerateCapturingMock</PrivateTypeNoAttr>
+        <PrivateTypeInternalFalseNoAttr>GenerateCapturingMock(false)</PrivateTypeInternalFalseNoAttr>
+        <VeryPublicTypeNoAttr>GenerateCapturingMock</VeryPublicTypeNoAttr>
+        <CurriedNoAttr>GenerateCapturingMock</CurriedNoAttr>
+        <TypeWithInterfaceNoAttr>GenerateCapturingMock</TypeWithInterfaceNoAttr>
+      </MyriadParams>
+    </Compile>
     <Compile Include="Vault.fs" />
     <Compile Include="GeneratedVault.fs">
       <MyriadFile>Vault.fs</MyriadFile>
@@ -56,6 +89,28 @@
     <Compile Include="GeneratedArgs.fs">
       <MyriadFile>Args.fs</MyriadFile>
     </Compile>
+    <Compile Include="ArgParserNegationTests.fs" />
+    <Compile Include="GeneratedArgParserNegationTests.fs">
+      <MyriadFile>ArgParserNegationTests.fs</MyriadFile>
+    </Compile>
+    <!-- Not compiled, because by design they *don't* compile. That makes them very hard to test in an automated way! -->
+    <None Include="ArgParserConflictTests.fs" />
+    <!-- To run the conflict tests:
+    <Compile Include="GeneratedArgParserConflictTests.fs">
+      <MyriadFile>ArgParserConflictTests.fs</MyriadFile>
+    </Compile>
+    -->
+    <None Include="swagger-gitea.json" />
+    <Compile Include="GeneratedSwaggerGitea.fs">
+      <MyriadFile>swagger-gitea.json</MyriadFile>
+      <MyriadParams>
+        <GenerateMockInternal>true</GenerateMockInternal>
+        <ClassName>Gitea</ClassName>
+      </MyriadParams>
+    </Compile>
+    <Compile Include="Generated2SwaggerGitea.fs">
+      <MyriadFile>GeneratedSwaggerGitea.fs</MyriadFile>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

ConsumePlugin/GeneratedArgs.fs

@@ -8,6 +8,7 @@
 
 
 
+
 namespace ConsumePlugin
 
 open System
@@ -23,7 +24,7 @@ module BasicNoPositionals =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string) (args : string list) : BasicNoPositionals =
+    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : BasicNoPositionals =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -223,7 +224,7 @@ module BasicNoPositionals =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : BasicNoPositionals =
-        parse' System.Environment.GetEnvironmentVariable args
+        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -239,7 +240,7 @@ module Basic =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string) (args : string list) : Basic =
+    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : Basic =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -430,7 +431,7 @@ module Basic =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : Basic =
-        parse' System.Environment.GetEnvironmentVariable args
+        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -446,7 +447,7 @@ module BasicWithIntPositionals =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string) (args : string list) : BasicWithIntPositionals =
+    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : BasicWithIntPositionals =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -633,7 +634,7 @@ module BasicWithIntPositionals =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : BasicWithIntPositionals =
-        parse' System.Environment.GetEnvironmentVariable args
+        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -649,7 +650,7 @@ module LoadsOfTypes =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string) (args : string list) : LoadsOfTypes =
+    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : LoadsOfTypes =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -1038,7 +1039,7 @@ module LoadsOfTypes =
             match arg_10 with
             | None ->
                 match "CONSUMEPLUGIN_THINGS" |> getEnvironmentVariable with
-                | null ->
+                | None ->
                     sprintf
                         "No value was supplied for %s, nor was environment variable %s set"
                         (sprintf "--%s" "yet-another-optional-thing")
@@ -1046,7 +1047,7 @@ module LoadsOfTypes =
                     |> ArgParser_errors.Add
 
                     Unchecked.defaultof<_>
-                | x -> x |> (fun x -> x)
+                | Some x -> x |> (fun x -> x)
                 |> Choice2Of2
             | Some x -> Choice1Of2 x
 
@@ -1068,7 +1069,7 @@ module LoadsOfTypes =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : LoadsOfTypes =
-        parse' System.Environment.GetEnvironmentVariable args
+        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -1084,7 +1085,7 @@ module LoadsOfTypesNoPositionals =
         /// Waiting to receive a value for the key we've already consumed
         | AwaitingValue of key : string
 
-    let parse' (getEnvironmentVariable : string -> string) (args : string list) : LoadsOfTypesNoPositionals =
+    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : LoadsOfTypesNoPositionals =
         let ArgParser_errors = ResizeArray ()
 
         let helpText () =
@@ -1476,7 +1477,7 @@ module LoadsOfTypesNoPositionals =
             match arg_9 with
             | None ->
                 match "CONSUMEPLUGIN_THINGS" |> getEnvironmentVariable with
-                | null ->
+                | None ->
                     sprintf
                         "No value was supplied for %s, nor was environment variable %s set"
                         (sprintf "--%s" "yet-another-optional-thing")
@@ -1484,7 +1485,7 @@ module LoadsOfTypesNoPositionals =
                     |> ArgParser_errors.Add
 
                     Unchecked.defaultof<_>
-                | x -> x |> (fun x -> x)
+                | Some x -> x |> (fun x -> x)
                 |> Choice2Of2
             | Some x -> Choice1Of2 x
 
@@ -1505,7 +1506,7 @@ module LoadsOfTypesNoPositionals =
             ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
 
     let parse (args : string list) : LoadsOfTypesNoPositionals =
-        parse' System.Environment.GetEnvironmentVariable args
+        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -1524,7 +1525,7 @@ module DatesAndTimesArgParse =
     /// Extension methods for argument parsing
     type DatesAndTimes with
 
-        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : DatesAndTimes =
+        static member parse' (getEnvironmentVariable : string -> string option) (args : string list) : DatesAndTimes =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -1787,7 +1788,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 args
+            DatesAndTimes.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -1806,7 +1807,7 @@ module ParentRecordArgParse =
     /// Extension methods for argument parsing
     type ParentRecord with
 
-        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ParentRecord =
+        static member parse' (getEnvironmentVariable : string -> string option) (args : string list) : ParentRecord =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2016,7 +2017,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 args
+            ParentRecord.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -2035,7 +2036,11 @@ module ParentRecordChildPosArgParse =
     /// Extension methods for argument parsing
     type ParentRecordChildPos with
 
-        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ParentRecordChildPos =
+        static member parse'
+            (getEnvironmentVariable : string -> string option)
+            (args : string list)
+            : ParentRecordChildPos
+            =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2209,7 +2214,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 args
+            ParentRecordChildPos.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -2228,7 +2233,11 @@ module ParentRecordSelfPosArgParse =
     /// Extension methods for argument parsing
     type ParentRecordSelfPos with
 
-        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ParentRecordSelfPos =
+        static member parse'
+            (getEnvironmentVariable : string -> string option)
+            (args : string list)
+            : ParentRecordSelfPos
+            =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2388,7 +2397,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 args
+            ParentRecordSelfPos.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -2407,7 +2416,11 @@ module ChoicePositionalsArgParse =
     /// Extension methods for argument parsing
     type ChoicePositionals with
 
-        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ChoicePositionals =
+        static member parse'
+            (getEnvironmentVariable : string -> string option)
+            (args : string list)
+            : ChoicePositionals
+            =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2502,7 +2515,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 args
+            ChoicePositionals.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -2521,7 +2534,11 @@ module ContainsBoolEnvVarArgParse =
     /// Extension methods for argument parsing
     type ContainsBoolEnvVar with
 
-        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ContainsBoolEnvVar =
+        static member parse'
+            (getEnvironmentVariable : string -> string option)
+            (args : string list)
+            : ContainsBoolEnvVar
+            =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2653,7 +2670,7 @@ module ContainsBoolEnvVarArgParse =
                 match arg_0 with
                 | None ->
                     match "CONSUMEPLUGIN_THINGS" |> getEnvironmentVariable with
-                    | null ->
+                    | None ->
                         sprintf
                             "No value was supplied for %s, nor was environment variable %s set"
                             (sprintf "--%s" "bool-var")
@@ -2661,7 +2678,7 @@ module ContainsBoolEnvVarArgParse =
                         |> ArgParser_errors.Add
 
                         Unchecked.defaultof<_>
-                    | x ->
+                    | Some x ->
                         if System.String.Equals (x, "1", System.StringComparison.OrdinalIgnoreCase) then
                             true
                         else if System.String.Equals (x, "0", System.StringComparison.OrdinalIgnoreCase) then
@@ -2679,7 +2696,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 args
+            ContainsBoolEnvVar.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -2698,7 +2715,7 @@ module WithFlagDuArgParse =
     /// Extension methods for argument parsing
     type WithFlagDu with
 
-        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : WithFlagDu =
+        static member parse' (getEnvironmentVariable : string -> string option) (args : string list) : WithFlagDu =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -2852,7 +2869,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 args
+            WithFlagDu.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -2871,7 +2888,11 @@ module ContainsFlagEnvVarArgParse =
     /// Extension methods for argument parsing
     type ContainsFlagEnvVar with
 
-        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ContainsFlagEnvVar =
+        static member parse'
+            (getEnvironmentVariable : string -> string option)
+            (args : string list)
+            : ContainsFlagEnvVar
+            =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -3018,7 +3039,7 @@ module ContainsFlagEnvVarArgParse =
                 match arg_0 with
                 | None ->
                     match "CONSUMEPLUGIN_THINGS" |> getEnvironmentVariable with
-                    | null ->
+                    | None ->
                         sprintf
                             "No value was supplied for %s, nor was environment variable %s set"
                             (sprintf "--%s" "dry-run")
@@ -3026,7 +3047,7 @@ module ContainsFlagEnvVarArgParse =
                         |> ArgParser_errors.Add
 
                         Unchecked.defaultof<_>
-                    | x ->
+                    | Some x ->
                         if System.String.Equals (x, "1", System.StringComparison.OrdinalIgnoreCase) then
                             if true = Consts.FALSE then
                                 DryRunMode.Wet
@@ -3056,7 +3077,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 args
+            ContainsFlagEnvVar.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -3076,7 +3097,7 @@ module ContainsFlagDefaultValueArgParse =
     type ContainsFlagDefaultValue with
 
         static member parse'
-            (getEnvironmentVariable : string -> string)
+            (getEnvironmentVariable : string -> string option)
             (args : string list)
             : ContainsFlagDefaultValue
             =
@@ -3239,7 +3260,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 args
+            ContainsFlagDefaultValue.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -3258,7 +3279,7 @@ module ManyLongFormsArgParse =
     /// Extension methods for argument parsing
     type ManyLongForms with
 
-        static member parse' (getEnvironmentVariable : string -> string) (args : string list) : ManyLongForms =
+        static member parse' (getEnvironmentVariable : string -> string option) (args : string list) : ManyLongForms =
             let ArgParser_errors = ResizeArray ()
 
             let helpText () =
@@ -3504,7 +3525,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 args
+            ManyLongForms.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -3524,7 +3545,7 @@ module FlagsIntoPositionalArgsArgParse =
     type FlagsIntoPositionalArgs with
 
         static member parse'
-            (getEnvironmentVariable : string -> string)
+            (getEnvironmentVariable : string -> string option)
             (args : string list)
             : FlagsIntoPositionalArgs
             =
@@ -3668,7 +3689,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 args
+            FlagsIntoPositionalArgs.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -3688,7 +3709,7 @@ module FlagsIntoPositionalArgsChoiceArgParse =
     type FlagsIntoPositionalArgsChoice with
 
         static member parse'
-            (getEnvironmentVariable : string -> string)
+            (getEnvironmentVariable : string -> string option)
             (args : string list)
             : FlagsIntoPositionalArgsChoice
             =
@@ -3832,7 +3853,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 args
+            FlagsIntoPositionalArgsChoice.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -3852,7 +3873,7 @@ module FlagsIntoPositionalArgsIntArgParse =
     type FlagsIntoPositionalArgsInt with
 
         static member parse'
-            (getEnvironmentVariable : string -> string)
+            (getEnvironmentVariable : string -> string option)
             (args : string list)
             : FlagsIntoPositionalArgsInt
             =
@@ -3996,7 +4017,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 args
+            FlagsIntoPositionalArgsInt.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -4016,7 +4037,7 @@ module FlagsIntoPositionalArgsIntChoiceArgParse =
     type FlagsIntoPositionalArgsIntChoice with
 
         static member parse'
-            (getEnvironmentVariable : string -> string)
+            (getEnvironmentVariable : string -> string option)
             (args : string list)
             : FlagsIntoPositionalArgsIntChoice
             =
@@ -4160,7 +4181,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 args
+            FlagsIntoPositionalArgsIntChoice.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
 namespace ConsumePlugin
 
 open System
@@ -4180,7 +4201,7 @@ module FlagsIntoPositionalArgs'ArgParse =
     type FlagsIntoPositionalArgs' with
 
         static member parse'
-            (getEnvironmentVariable : string -> string)
+            (getEnvironmentVariable : string -> string option)
             (args : string list)
             : FlagsIntoPositionalArgs'
             =
@@ -4324,4 +4345,439 @@ 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 args
+            FlagsIntoPositionalArgs'.parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+namespace ConsumePlugin
+
+open System
+open System.IO
+open WoofWare.Myriad.Plugins
+
+/// Methods to parse arguments for the type WithTypeHelp
+[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module WithTypeHelp =
+    type private ParseState_WithTypeHelp =
+        /// Ready to consume a key or positional arg
+        | AwaitingKey
+        /// Waiting to receive a value for the key we've already consumed
+        | AwaitingValue of key : string
+
+    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : WithTypeHelp =
+        let ArgParser_errors = ResizeArray ()
+
+        let helpText () =
+            [
+                "Parse command-line arguments for a basic configuration. This help text appears before the argument list."
+                ""
+
+                (sprintf
+                    "%s  string%s%s"
+                    (sprintf "--%s" "config-file")
+                    ""
+                    (sprintf " : %s" ("The configuration file path")))
+
+                (sprintf "%s  bool%s%s" (sprintf "--%s" "verbose") "" (sprintf " : %s" ("Enable verbose output")))
+                (sprintf "%s  int32%s%s" (sprintf "--%s" "port") "" "")
+            ]
+            |> String.concat "\n"
+
+        let parser_LeftoverArgs : string ResizeArray = ResizeArray ()
+        let mutable arg_0 : string option = None
+        let mutable arg_1 : bool option = None
+        let mutable arg_2 : int option = None
+
+        /// Processes the key-value pair, returning Error if no key was matched.
+        /// If the key is an arg which can have arity 1, but throws when consuming that arg, we return Error(<the message>).
+        /// This can nevertheless be a successful parse, e.g. when the key may have arity 0.
+        let processKeyValue (key : string) (value : string) : Result<unit, string option> =
+            if System.String.Equals (key, sprintf "--%s" "port", System.StringComparison.OrdinalIgnoreCase) then
+                match arg_2 with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "port")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> ArgParser_errors.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        arg_2 <- value |> (fun x -> System.Int32.Parse x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else if System.String.Equals (key, sprintf "--%s" "verbose", System.StringComparison.OrdinalIgnoreCase) then
+                match arg_1 with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "verbose")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> ArgParser_errors.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        arg_1 <- value |> (fun x -> System.Boolean.Parse x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else if
+                System.String.Equals (key, sprintf "--%s" "config-file", System.StringComparison.OrdinalIgnoreCase)
+            then
+                match arg_0 with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "config-file")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> ArgParser_errors.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        arg_0 <- value |> (fun x -> x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else
+                Error None
+
+        /// Returns false if we didn't set a value.
+        let setFlagValue (key : string) : bool =
+            if System.String.Equals (key, sprintf "--%s" "verbose", System.StringComparison.OrdinalIgnoreCase) then
+                match arg_1 with
+                | Some x ->
+                    sprintf "Flag '%s' was supplied multiple times" (sprintf "--%s" "verbose")
+                    |> ArgParser_errors.Add
+
+                    true
+                | None ->
+                    arg_1 <- true |> Some
+                    true
+            else
+                false
+
+        let rec go (state : ParseState_WithTypeHelp) (args : string list) =
+            match args with
+            | [] ->
+                match state with
+                | ParseState_WithTypeHelp.AwaitingKey -> ()
+                | ParseState_WithTypeHelp.AwaitingValue key ->
+                    if setFlagValue key then
+                        ()
+                    else
+                        sprintf
+                            "Trailing argument %s had no value. Use a double-dash to separate positional args from key-value args."
+                            key
+                        |> ArgParser_errors.Add
+            | "--" :: rest -> parser_LeftoverArgs.AddRange (rest |> Seq.map (fun x -> x))
+            | arg :: args ->
+                match state with
+                | ParseState_WithTypeHelp.AwaitingKey ->
+                    if arg.StartsWith ("--", System.StringComparison.Ordinal) then
+                        if arg = "--help" then
+                            helpText () |> failwithf "Help text requested.\n%s"
+                        else
+                            let equals = arg.IndexOf (char 61)
+
+                            if equals < 0 then
+                                args |> go (ParseState_WithTypeHelp.AwaitingValue arg)
+                            else
+                                let key = arg.[0 .. equals - 1]
+                                let value = arg.[equals + 1 ..]
+
+                                match processKeyValue key value with
+                                | Ok () -> go ParseState_WithTypeHelp.AwaitingKey args
+                                | Error x ->
+                                    match x with
+                                    | None ->
+                                        failwithf "Unable to process argument %s as key %s and value %s" arg key value
+                                    | Some msg ->
+                                        sprintf "%s (at arg %s)" msg arg |> ArgParser_errors.Add
+                                        go ParseState_WithTypeHelp.AwaitingKey args
+                    else
+                        arg |> (fun x -> x) |> parser_LeftoverArgs.Add
+                        go ParseState_WithTypeHelp.AwaitingKey args
+                | ParseState_WithTypeHelp.AwaitingValue key ->
+                    match processKeyValue key arg with
+                    | Ok () -> go ParseState_WithTypeHelp.AwaitingKey args
+                    | Error exc ->
+                        if setFlagValue key then
+                            go ParseState_WithTypeHelp.AwaitingKey (arg :: args)
+                        else
+                            match exc with
+                            | None ->
+                                failwithf "Unable to process supplied arg %s. Help text follows.\n%s" key (helpText ())
+                            | Some msg -> msg |> ArgParser_errors.Add
+
+        go ParseState_WithTypeHelp.AwaitingKey args
+
+        let parser_LeftoverArgs =
+            if 0 = parser_LeftoverArgs.Count then
+                ()
+            else
+                parser_LeftoverArgs
+                |> String.concat " "
+                |> sprintf "There were leftover args: %s"
+                |> ArgParser_errors.Add
+
+                Unchecked.defaultof<_>
+
+        let arg_0 =
+            match arg_0 with
+            | None ->
+                sprintf "Required argument '%s' received no value" (sprintf "--%s" "config-file")
+                |> ArgParser_errors.Add
+
+                Unchecked.defaultof<_>
+            | Some x -> x
+
+        let arg_1 =
+            match arg_1 with
+            | None ->
+                sprintf "Required argument '%s' received no value" (sprintf "--%s" "verbose")
+                |> ArgParser_errors.Add
+
+                Unchecked.defaultof<_>
+            | Some x -> x
+
+        let arg_2 =
+            match arg_2 with
+            | None ->
+                sprintf "Required argument '%s' received no value" (sprintf "--%s" "port")
+                |> ArgParser_errors.Add
+
+                Unchecked.defaultof<_>
+            | Some x -> x
+
+        if 0 = ArgParser_errors.Count then
+            {
+                ConfigFile = arg_0
+                Port = arg_2
+                Verbose = arg_1
+            }
+        else
+            ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
+
+    let parse (args : string list) : WithTypeHelp =
+        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args
+namespace ConsumePlugin
+
+open System
+open System.IO
+open WoofWare.Myriad.Plugins
+
+/// Methods to parse arguments for the type WithMultilineTypeHelp
+[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module WithMultilineTypeHelp =
+    type private ParseState_WithMultilineTypeHelp =
+        /// Ready to consume a key or positional arg
+        | AwaitingKey
+        /// Waiting to receive a value for the key we've already consumed
+        | AwaitingValue of key : string
+
+    let parse' (getEnvironmentVariable : string -> string option) (args : string list) : WithMultilineTypeHelp =
+        let ArgParser_errors = ResizeArray ()
+
+        let helpText () =
+            [
+                "This is a multiline help text example.
+It spans multiple lines to test that multiline strings work correctly.
+You can use this to provide detailed documentation for your argument parser."
+
+                ""
+                (sprintf "%s  string%s%s" (sprintf "--%s" "input-file") "" (sprintf " : %s" ("Input file to process")))
+                (sprintf "%s  string%s%s" (sprintf "--%s" "output-dir") "" (sprintf " : %s" ("Output directory")))
+                (sprintf "%s  bool%s%s" (sprintf "--%s" "force") "" "")
+            ]
+            |> String.concat "\n"
+
+        let parser_LeftoverArgs : string ResizeArray = ResizeArray ()
+        let mutable arg_0 : string option = None
+        let mutable arg_1 : string option = None
+        let mutable arg_2 : bool option = None
+
+        /// Processes the key-value pair, returning Error if no key was matched.
+        /// If the key is an arg which can have arity 1, but throws when consuming that arg, we return Error(<the message>).
+        /// This can nevertheless be a successful parse, e.g. when the key may have arity 0.
+        let processKeyValue (key : string) (value : string) : Result<unit, string option> =
+            if System.String.Equals (key, sprintf "--%s" "force", System.StringComparison.OrdinalIgnoreCase) then
+                match arg_2 with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "force")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> ArgParser_errors.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        arg_2 <- value |> (fun x -> System.Boolean.Parse x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else if
+                System.String.Equals (key, sprintf "--%s" "output-dir", System.StringComparison.OrdinalIgnoreCase)
+            then
+                match arg_1 with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "output-dir")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> ArgParser_errors.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        arg_1 <- value |> (fun x -> x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else if
+                System.String.Equals (key, sprintf "--%s" "input-file", System.StringComparison.OrdinalIgnoreCase)
+            then
+                match arg_0 with
+                | Some x ->
+                    sprintf
+                        "Argument '%s' was supplied multiple times: %s and %s"
+                        (sprintf "--%s" "input-file")
+                        (x.ToString ())
+                        (value.ToString ())
+                    |> ArgParser_errors.Add
+
+                    Ok ()
+                | None ->
+                    try
+                        arg_0 <- value |> (fun x -> x) |> Some
+                        Ok ()
+                    with _ as exc ->
+                        exc.Message |> Some |> Error
+            else
+                Error None
+
+        /// Returns false if we didn't set a value.
+        let setFlagValue (key : string) : bool =
+            if System.String.Equals (key, sprintf "--%s" "force", System.StringComparison.OrdinalIgnoreCase) then
+                match arg_2 with
+                | Some x ->
+                    sprintf "Flag '%s' was supplied multiple times" (sprintf "--%s" "force")
+                    |> ArgParser_errors.Add
+
+                    true
+                | None ->
+                    arg_2 <- true |> Some
+                    true
+            else
+                false
+
+        let rec go (state : ParseState_WithMultilineTypeHelp) (args : string list) =
+            match args with
+            | [] ->
+                match state with
+                | ParseState_WithMultilineTypeHelp.AwaitingKey -> ()
+                | ParseState_WithMultilineTypeHelp.AwaitingValue key ->
+                    if setFlagValue key then
+                        ()
+                    else
+                        sprintf
+                            "Trailing argument %s had no value. Use a double-dash to separate positional args from key-value args."
+                            key
+                        |> ArgParser_errors.Add
+            | "--" :: rest -> parser_LeftoverArgs.AddRange (rest |> Seq.map (fun x -> x))
+            | arg :: args ->
+                match state with
+                | ParseState_WithMultilineTypeHelp.AwaitingKey ->
+                    if arg.StartsWith ("--", System.StringComparison.Ordinal) then
+                        if arg = "--help" then
+                            helpText () |> failwithf "Help text requested.\n%s"
+                        else
+                            let equals = arg.IndexOf (char 61)
+
+                            if equals < 0 then
+                                args |> go (ParseState_WithMultilineTypeHelp.AwaitingValue arg)
+                            else
+                                let key = arg.[0 .. equals - 1]
+                                let value = arg.[equals + 1 ..]
+
+                                match processKeyValue key value with
+                                | Ok () -> go ParseState_WithMultilineTypeHelp.AwaitingKey args
+                                | Error x ->
+                                    match x with
+                                    | None ->
+                                        failwithf "Unable to process argument %s as key %s and value %s" arg key value
+                                    | Some msg ->
+                                        sprintf "%s (at arg %s)" msg arg |> ArgParser_errors.Add
+                                        go ParseState_WithMultilineTypeHelp.AwaitingKey args
+                    else
+                        arg |> (fun x -> x) |> parser_LeftoverArgs.Add
+                        go ParseState_WithMultilineTypeHelp.AwaitingKey args
+                | ParseState_WithMultilineTypeHelp.AwaitingValue key ->
+                    match processKeyValue key arg with
+                    | Ok () -> go ParseState_WithMultilineTypeHelp.AwaitingKey args
+                    | Error exc ->
+                        if setFlagValue key then
+                            go ParseState_WithMultilineTypeHelp.AwaitingKey (arg :: args)
+                        else
+                            match exc with
+                            | None ->
+                                failwithf "Unable to process supplied arg %s. Help text follows.\n%s" key (helpText ())
+                            | Some msg -> msg |> ArgParser_errors.Add
+
+        go ParseState_WithMultilineTypeHelp.AwaitingKey args
+
+        let parser_LeftoverArgs =
+            if 0 = parser_LeftoverArgs.Count then
+                ()
+            else
+                parser_LeftoverArgs
+                |> String.concat " "
+                |> sprintf "There were leftover args: %s"
+                |> ArgParser_errors.Add
+
+                Unchecked.defaultof<_>
+
+        let arg_0 =
+            match arg_0 with
+            | None ->
+                sprintf "Required argument '%s' received no value" (sprintf "--%s" "input-file")
+                |> ArgParser_errors.Add
+
+                Unchecked.defaultof<_>
+            | Some x -> x
+
+        let arg_1 =
+            match arg_1 with
+            | None ->
+                sprintf "Required argument '%s' received no value" (sprintf "--%s" "output-dir")
+                |> ArgParser_errors.Add
+
+                Unchecked.defaultof<_>
+            | Some x -> x
+
+        let arg_2 =
+            match arg_2 with
+            | None ->
+                sprintf "Required argument '%s' received no value" (sprintf "--%s" "force")
+                |> ArgParser_errors.Add
+
+                Unchecked.defaultof<_>
+            | Some x -> x
+
+        if 0 = ArgParser_errors.Count then
+            {
+                Force = arg_2
+                InputFile = arg_0
+                OutputDir = arg_1
+            }
+        else
+            ArgParser_errors |> String.concat "\n" |> failwithf "Errors during parse!\n%s"
+
+    let parse (args : string list) : WithMultilineTypeHelp =
+        parse' (System.Environment.GetEnvironmentVariable >> Option.ofObj) args

ConsumePlugin/GeneratedCapturingMock.fs

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

ConsumePlugin/GeneratedCapturingMockNoAttributes.fs

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

ConsumePlugin/GeneratedCatamorphism.fs

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

ConsumePlugin/GeneratedFileSystem.fs

@@ -7,6 +7,7 @@
 
 
 
+
 namespace ConsumePlugin
 
 open WoofWare.Myriad.Plugins
@@ -31,7 +32,7 @@ module FileSystemItemCata =
     [<RequireQualifiedAccess>]
     type private Instruction =
         | Process__FileSystemItem of FileSystemItem
-        | FileSystemItem_Directory of string * int * int
+        | FileSystemItem_Directory of name : string * dirSize : int * contents : int
 
     let private loop (cata : FileSystemCata<'FileSystemItem>) (instructions : ResizeArray<Instruction>) =
         let fileSystemItemStack = ResizeArray<'FileSystemItem> ()
@@ -106,7 +107,7 @@ module GiftCata =
         | Process__Gift of Gift
         | Gift_Wrapped of WrappingPaperStyle
         | Gift_Boxed
-        | Gift_WithACard of string
+        | Gift_WithACard of message : string
 
     let private loop (cata : GiftCata<'Gift>) (instructions : ResizeArray<Instruction>) =
         let giftStack = ResizeArray<'Gift> ()

ConsumePlugin/GeneratedJson.fs

@@ -4,6 +4,7 @@
 //------------------------------------------------------------------------------
 
 
+
 namespace ConsumePlugin
 
 open System.Text.Json.Serialization
@@ -14,7 +15,24 @@ 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 |> System.Text.Json.Nodes.JsonValue.Create<string>))
+
+        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)
+                 ))
+            )
+
         node :> _
 namespace ConsumePlugin
 
@@ -29,7 +47,24 @@ 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 |> System.Text.Json.Nodes.JsonValue.Create<string>))
+
+            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)
+                     ))
+                )
+
             node :> _
 
 namespace ConsumePlugin
@@ -40,16 +75,14 @@ module InnerType =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : InnerType =
         let arg_0 =
-            (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> ()
+            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> ()
 
         {
             Thing = arg_0
@@ -62,79 +95,97 @@ module JsonRecordType =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JsonRecordType =
         let arg_5 =
-            (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
+            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
 
         let arg_4 =
-            (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
+            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
 
         let arg_3 =
-            InnerType.jsonParse (
-                match node.["d"] with
-                | null ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("d")
-                        )
+            match node.["d"] |> Option.ofObj with
+            | None ->
+                raise (
+                    System.Collections.Generic.KeyNotFoundException (
+                        sprintf "Required key '%s' not found on JSON object" ("d")
                     )
-                | v -> v
-            )
+                )
+            | Some node -> InnerType.jsonParse node
 
         let arg_2 =
-            (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
+            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
 
         let arg_1 =
-            (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> ()
+            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> ()
 
         let arg_0 =
-            (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> ()
+            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> ()
 
         {
             A = arg_0
@@ -152,16 +203,14 @@ module internal InternalTypeNotExtension =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : InternalTypeNotExtension =
         let arg_0 =
-            (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> ()
+            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> ()
 
         {
             InternalThing = arg_0
@@ -177,16 +226,14 @@ 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)] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ((Literals.something))
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.String> ()
+                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> ()
 
             {
                 ExternalThing = arg_0
@@ -201,248 +248,215 @@ module ToGetExtensionMethodJsonParseExtension =
 
         /// Parse from a JSON node.
         static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : ToGetExtensionMethod =
-            let arg_20 = System.Numerics.BigInteger.Parse (node.["whiskey"].ToJsonString ())
+            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_19 =
-                (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> ()
+                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> ()
 
             let arg_18 =
-                (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> ()
+                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> ()
 
             let arg_17 =
-                (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> ()
+                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> ()
 
             let arg_16 =
-                (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> ()
+                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> ()
 
             let arg_15 =
-                (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> ()
+                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> ()
 
             let arg_14 =
-                (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> ()
+                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> ()
 
             let arg_13 =
-                (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> ()
+                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> ()
 
             let arg_12 =
-                (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> ()
+                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> ()
 
             let arg_11 =
-                (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> ()
+                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> ()
 
             let arg_10 =
-                (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> ()
+                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> ()
 
             let arg_9 =
-                (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> ()
+                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> ()
 
             let arg_8 =
-                (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> ()
+                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> ()
 
             let arg_7 =
-                (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> ()
+                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> ()
 
             let arg_6 =
-                (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> ()
+                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> ()
 
             let arg_5 =
-                (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> ()
+                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> ()
 
             let arg_4 =
-                (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> ()
+                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> ()
 
             let arg_3 =
-                (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> ()
+                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> ()
 
             let arg_2 =
-                (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> ()
+                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> ()
 
             let arg_1 =
-                (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
+                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
 
             let arg_0 =
-                (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> ()
+                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> ()
 
             {
                 Alpha = arg_0

ConsumePlugin/GeneratedMock.fs

@@ -16,7 +16,7 @@ type internal PublicTypeMock =
         Mem3 : int * option<System.Threading.CancellationToken> -> string
     }
 
-    /// An implementation where every method throws.
+    /// An implementation where every non-disposal method throws.
     static member Empty : PublicTypeMock =
         {
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -41,7 +41,7 @@ type public PublicTypeInternalFalseMock =
         Mem3 : int * option<System.Threading.CancellationToken> -> string
     }
 
-    /// An implementation where every method throws.
+    /// An implementation where every non-disposal method throws.
     static member Empty : PublicTypeInternalFalseMock =
         {
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -65,7 +65,7 @@ type internal InternalTypeMock =
         Mem2 : string -> int
     }
 
-    /// An implementation where every method throws.
+    /// An implementation where every non-disposal method throws.
     static member Empty : InternalTypeMock =
         {
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -87,7 +87,7 @@ type private PrivateTypeMock =
         Mem2 : string -> int
     }
 
-    /// An implementation where every method throws.
+    /// An implementation where every non-disposal method throws.
     static member Empty : PrivateTypeMock =
         {
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -109,7 +109,7 @@ type private PrivateTypeInternalFalseMock =
         Mem2 : string -> int
     }
 
-    /// An implementation where every method throws.
+    /// An implementation where every non-disposal method throws.
     static member Empty : PrivateTypeInternalFalseMock =
         {
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -130,7 +130,7 @@ type internal VeryPublicTypeMock<'a, 'b> =
         Mem1 : 'a -> 'b
     }
 
-    /// An implementation where every method throws.
+    /// An implementation where every non-disposal method throws.
     static member Empty () : VeryPublicTypeMock<'a, 'b> =
         {
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -154,7 +154,7 @@ type internal CurriedMock<'a> =
         Mem6 : int * string -> 'a * int -> string
     }
 
-    /// An implementation where every method throws.
+    /// An implementation where every non-disposal method throws.
     static member Empty () : CurriedMock<'a> =
         {
             Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
@@ -192,7 +192,7 @@ type internal TypeWithInterfaceMock =
         Mem2 : unit -> string[] Async
     }
 
-    /// An implementation where every method throws.
+    /// An implementation where every non-disposal method throws.
     static member Empty : TypeWithInterfaceMock =
         {
             Dispose = (fun () -> ())
@@ -206,3 +206,93 @@ 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 non-disposal 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 ()
+namespace SomeNamespace
+
+open System
+open WoofWare.Myriad.Plugins
+
+/// Mock record type for an interface
+type internal TypeWithAsyncDisposableMock =
+    {
+        /// Implementation of IAsyncDisposable.DisposeAsync
+        DisposeAsync : unit -> System.Threading.Tasks.ValueTask
+        Mem1 : string option -> string[] Async
+        Mem2 : unit -> string[] Async
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty : TypeWithAsyncDisposableMock =
+        {
+            DisposeAsync = (fun () -> (System.Threading.Tasks.ValueTask ()))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+        }
+
+    interface TypeWithAsyncDisposable with
+        member this.Mem1 arg_0_0 = this.Mem1 (arg_0_0)
+        member this.Mem2 () = this.Mem2 (())
+
+    interface System.IAsyncDisposable with
+        member this.DisposeAsync () : System.Threading.Tasks.ValueTask = this.DisposeAsync ()
+namespace SomeNamespace
+
+open System
+open WoofWare.Myriad.Plugins
+
+/// Mock record type for an interface
+type internal TypeWithBothDisposablesMock =
+    {
+        /// Implementation of IDisposable.Dispose
+        Dispose : unit -> unit
+        /// Implementation of IAsyncDisposable.DisposeAsync
+        DisposeAsync : unit -> System.Threading.Tasks.ValueTask
+        Mem1 : string -> int
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty : TypeWithBothDisposablesMock =
+        {
+            Dispose = (fun () -> ())
+            DisposeAsync = (fun () -> (System.Threading.Tasks.ValueTask ()))
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+        }
+
+    interface TypeWithBothDisposables with
+        member this.Mem1 arg_0_0 = this.Mem1 (arg_0_0)
+
+    interface System.IDisposable with
+        member this.Dispose () : unit = this.Dispose ()
+
+    interface System.IAsyncDisposable with
+        member this.DisposeAsync () : System.Threading.Tasks.ValueTask = this.DisposeAsync ()

ConsumePlugin/GeneratedMockNoAttributes.fs

@@ -0,0 +1,200 @@
+//------------------------------------------------------------------------------
+//        This code was generated by myriad.
+//        Changes to this file will be lost when the code is regenerated.
+//------------------------------------------------------------------------------
+
+namespace SomeNamespace
+
+open System
+
+/// Mock record type for an interface
+type internal PublicTypeNoAttrMock =
+    {
+        Mem1 : string * int -> string list
+        Mem2 : string -> int
+        Mem3 : int * option<System.Threading.CancellationToken> -> string
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty : PublicTypeNoAttrMock =
+        {
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem3"))
+        }
+
+    interface IPublicTypeNoAttr with
+        member this.Mem1 (arg_0_0, arg_0_1) = this.Mem1 (arg_0_0, arg_0_1)
+        member this.Mem2 arg_0_0 = this.Mem2 (arg_0_0)
+        member this.Mem3 (arg_0_0, arg_0_1) = this.Mem3 (arg_0_0, arg_0_1)
+namespace SomeNamespace
+
+open System
+
+/// Mock record type for an interface
+type public PublicTypeInternalFalseNoAttrMock =
+    {
+        Mem1 : string * int -> string list
+        Mem2 : string -> int
+        Mem3 : int * option<System.Threading.CancellationToken> -> string
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty : PublicTypeInternalFalseNoAttrMock =
+        {
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem3"))
+        }
+
+    interface IPublicTypeInternalFalseNoAttr with
+        member this.Mem1 (arg_0_0, arg_0_1) = this.Mem1 (arg_0_0, arg_0_1)
+        member this.Mem2 arg_0_0 = this.Mem2 (arg_0_0)
+        member this.Mem3 (arg_0_0, arg_0_1) = this.Mem3 (arg_0_0, arg_0_1)
+namespace SomeNamespace
+
+open System
+
+/// Mock record type for an interface
+type internal InternalTypeNoAttrMock =
+    {
+        Mem1 : string * int -> unit
+        Mem2 : string -> int
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty : InternalTypeNoAttrMock =
+        {
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+        }
+
+    interface InternalTypeNoAttr with
+        member this.Mem1 (arg_0_0, arg_0_1) = this.Mem1 (arg_0_0, arg_0_1)
+        member this.Mem2 arg_0_0 = this.Mem2 (arg_0_0)
+namespace SomeNamespace
+
+open System
+
+/// Mock record type for an interface
+type private PrivateTypeNoAttrMock =
+    {
+        Mem1 : string * int -> unit
+        Mem2 : string -> int
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty : PrivateTypeNoAttrMock =
+        {
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+        }
+
+    interface PrivateTypeNoAttr with
+        member this.Mem1 (arg_0_0, arg_0_1) = this.Mem1 (arg_0_0, arg_0_1)
+        member this.Mem2 arg_0_0 = this.Mem2 (arg_0_0)
+namespace SomeNamespace
+
+open System
+
+/// Mock record type for an interface
+type private PrivateTypeInternalFalseNoAttrMock =
+    {
+        Mem1 : string * int -> unit
+        Mem2 : string -> int
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty : PrivateTypeInternalFalseNoAttrMock =
+        {
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+        }
+
+    interface PrivateTypeInternalFalseNoAttr with
+        member this.Mem1 (arg_0_0, arg_0_1) = this.Mem1 (arg_0_0, arg_0_1)
+        member this.Mem2 arg_0_0 = this.Mem2 (arg_0_0)
+namespace SomeNamespace
+
+open System
+
+/// Mock record type for an interface
+type internal VeryPublicTypeNoAttrMock<'a, 'b> =
+    {
+        Mem1 : 'a -> 'b
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty () : VeryPublicTypeNoAttrMock<'a, 'b> =
+        {
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+        }
+
+    interface VeryPublicTypeNoAttr<'a, 'b> with
+        member this.Mem1 arg_0_0 = this.Mem1 (arg_0_0)
+namespace SomeNamespace
+
+open System
+
+/// Mock record type for an interface
+type internal CurriedNoAttrMock<'a> =
+    {
+        Mem1 : int -> 'a -> string
+        Mem2 : int * string -> 'a -> string
+        Mem3 : (int * string) -> 'a -> string
+        Mem4 : (int * string) -> ('a * int) -> string
+        Mem5 : int * string -> ('a * int) -> string
+        Mem6 : int * string -> 'a * int -> string
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty () : CurriedNoAttrMock<'a> =
+        {
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+            Mem3 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem3"))
+            Mem4 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem4"))
+            Mem5 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem5"))
+            Mem6 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem6"))
+        }
+
+    interface CurriedNoAttr<'a> with
+        member this.Mem1 arg_0_0 arg_1_0 = this.Mem1 (arg_0_0) (arg_1_0)
+        member this.Mem2 (arg_0_0, arg_0_1) arg_1_0 = this.Mem2 (arg_0_0, arg_0_1) (arg_1_0)
+        member this.Mem3 ((arg_0_0, arg_0_1)) arg_1_0 = this.Mem3 (arg_0_0, arg_0_1) (arg_1_0)
+
+        member this.Mem4 ((arg_0_0, arg_0_1)) ((arg_1_0, arg_1_1)) =
+            this.Mem4 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1)
+
+        member this.Mem5 (arg_0_0, arg_0_1) ((arg_1_0, arg_1_1)) =
+            this.Mem5 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1)
+
+        member this.Mem6 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1) =
+            this.Mem6 (arg_0_0, arg_0_1) (arg_1_0, arg_1_1)
+namespace SomeNamespace
+
+open System
+
+/// Mock record type for an interface
+type internal TypeWithInterfaceNoAttrMock =
+    {
+        /// Implementation of IDisposable.Dispose
+        Dispose : unit -> unit
+        Mem1 : string option -> string[] Async
+        Mem2 : unit -> string[] Async
+    }
+
+    /// An implementation where every non-disposal method throws.
+    static member Empty : TypeWithInterfaceNoAttrMock =
+        {
+            Dispose = (fun () -> ())
+            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+        }
+
+    interface TypeWithInterfaceNoAttr with
+        member this.Mem1 arg_0_0 = this.Mem1 (arg_0_0)
+        member this.Mem2 () = this.Mem2 (())
+
+    interface System.IDisposable with
+        member this.Dispose () : unit = this.Dispose ()

ConsumePlugin/GeneratedRestClient.fs

@@ -6,6 +6,7 @@
 
 
 
+
 namespace PureGym
 
 open System
@@ -48,7 +49,27 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return jsonNode.AsArray () |> Seq.map (fun elt -> Gym.jsonParse elt) |> List.ofSeq
+                    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
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -63,7 +84,7 @@ module PureGymApi =
                              | v -> v),
                             System.Uri (
                                 "v1/gyms/{gym_id}/attendance"
-                                    .Replace ("{gym_id}", gymId.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{gym_id}", gymId.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -82,6 +103,15 @@ 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))
@@ -97,7 +127,7 @@ module PureGymApi =
                              | v -> v),
                             System.Uri (
                                 "v1/gyms/{gym_id}/attendance"
-                                    .Replace ("{gym_id}", gymId.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{gym_id}", gymId.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -116,6 +146,15 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
+                    let jsonNode =
+                        (match jsonNode with
+                         | null ->
+                             raise (
+                                 System.ArgumentNullException
+                                     "Response from server was the JSON null object; expected a non-nullable type GymAttendance"
+                             )
+                         | jsonNode -> jsonNode)
+
                     return GymAttendance.jsonParse jsonNode
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
@@ -146,6 +185,15 @@ 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))
@@ -160,8 +208,7 @@ module PureGymApi =
                              | null -> System.Uri "https://whatnot.com/"
                              | v -> v),
                             System.Uri (
-                                "v1/gyms/{gym}"
-                                    .Replace ("{gym}", gym.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                "v1/gyms/{gym}".Replace ("{gym}", gym.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -180,6 +227,15 @@ 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))
@@ -210,6 +266,15 @@ 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))
@@ -240,6 +305,15 @@ 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))
@@ -267,23 +341,44 @@ module PureGymApi =
                             foo
                             |> (fun field ->
                                 match field with
-                                | None -> null :> System.Text.Json.Nodes.JsonNode
+                                | None -> None
                                 | Some field ->
-                                    ((fun field ->
-                                        let ret = System.Text.Json.Nodes.JsonObject ()
+                                    (field
+                                     |> (fun field ->
+                                         let ret = System.Text.Json.Nodes.JsonObject ()
 
-                                        for (KeyValue (key, value)) in field do
-                                            ret.Add (
-                                                key.ToString (),
-                                                System.Text.Json.Nodes.JsonValue.Create<string> value
-                                            )
+                                         for (KeyValue (key, value)) in field do
+                                             let key = key.ToString ()
 
-                                        ret
-                                    )
-                                        field)
+                                             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
+                                     ))
                                     :> System.Text.Json.Nodes.JsonNode
+                                    |> Some
                             )
-                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
+                            |> (fun node ->
+                                match node with
+                                | None -> "null"
+                                | Some node -> node.ToJsonString ()
+                            ),
+                            null,
+                            "application/json"
                         )
 
                     do httpMessage.Content <- queryParams
@@ -295,15 +390,25 @@ module PureGymApi =
                         System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                         |> Async.AwaitTask
 
+                    let jsonNode = jsonNode |> Option.ofObj
+
                     return
                         match jsonNode with
-                        | null -> None
-                        | v ->
+                        | None -> None
+                        | Some v ->
                             v.AsObject ()
                             |> Seq.map (fun kvp ->
                                 let key = (kvp.Key)
-                                let value = (kvp.Value).AsValue().GetValue<System.String> ()
-                                key, value
+                                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
                             |> Some
@@ -326,9 +431,9 @@ module PureGymApi =
                                     else
                                         "?")
                                  + "fromDate="
-                                 + ((fromDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)
+                                 + ((fromDate.ToString "yyyy-MM-dd") |> System.Uri.EscapeDataString)
                                  + "&toDate="
-                                 + ((toDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)),
+                                 + ((toDate.ToString "yyyy-MM-dd") |> System.Uri.EscapeDataString)),
                                 System.UriKind.Relative
                             )
                         )
@@ -347,6 +452,15 @@ 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))
@@ -367,9 +481,9 @@ module PureGymApi =
                                     else
                                         "?")
                                  + "fromDate="
-                                 + ((fromDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)
+                                 + ((fromDate.ToString "yyyy-MM-dd") |> System.Uri.EscapeDataString)
                                  + "&toDate="
-                                 + ((toDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)),
+                                 + ((toDate.ToString "yyyy-MM-dd") |> System.Uri.EscapeDataString)),
                                 System.UriKind.Relative
                             )
                         )
@@ -388,6 +502,15 @@ 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))
@@ -547,9 +670,9 @@ module PureGymApi =
 
                     let queryParams =
                         new System.Net.Http.StringContent (
-                            user
-                            |> PureGym.Member.toJsonNode
-                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
+                            user |> PureGym.Member.toJsonNode |> (fun node -> node.ToJsonString ()),
+                            null,
+                            "application/json"
                         )
 
                     do httpMessage.Content <- queryParams
@@ -581,8 +704,20 @@ module PureGymApi =
                     let queryParams =
                         new System.Net.Http.StringContent (
                             user
-                            |> System.Text.Json.Nodes.JsonValue.Create<Uri>
-                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
+                            |> (fun field ->
+                                let field = System.Text.Json.Nodes.JsonValue.Create<Uri> field
+
+                                (match field with
+                                 | null ->
+                                     raise (
+                                         System.ArgumentNullException
+                                             "Expected type URI to be non-null, but received a null value when serialising"
+                                     )
+                                 | field -> field)
+                            )
+                            |> (fun node -> node.ToJsonString ()),
+                            null,
+                            "application/json"
                         )
 
                     do httpMessage.Content <- queryParams
@@ -614,8 +749,20 @@ module PureGymApi =
                     let queryParams =
                         new System.Net.Http.StringContent (
                             user
-                            |> System.Text.Json.Nodes.JsonValue.Create<int>
-                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
+                            |> (fun field ->
+                                let field = System.Text.Json.Nodes.JsonValue.Create<int> field
+
+                                (match field with
+                                 | null ->
+                                     raise (
+                                         System.ArgumentNullException
+                                             "Expected type int32 to be non-null, but received a null value when serialising"
+                                     )
+                                 | field -> field)
+                            )
+                            |> (fun node -> node.ToJsonString ()),
+                            null,
+                            "application/json"
                         )
 
                     do httpMessage.Content <- queryParams
@@ -663,7 +810,7 @@ module PureGymApi =
                              | v -> v),
                             System.Uri (
                                 "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -879,6 +1026,15 @@ 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,
@@ -915,6 +1071,15 @@ 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,
@@ -951,6 +1116,15 @@ 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,
@@ -987,6 +1161,15 @@ 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,
@@ -1076,7 +1259,7 @@ module internal ApiWithoutBaseAddress =
                              | v -> v),
                             System.Uri (
                                 "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1130,7 +1313,7 @@ module ApiWithBasePath =
                             ),
                             System.Uri (
                                 "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1178,7 +1361,7 @@ module ApiWithBasePathAndAddress =
                             ),
                             System.Uri (
                                 "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1232,7 +1415,7 @@ module ApiWithAbsoluteBasePath =
                             ),
                             System.Uri (
                                 "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1280,7 +1463,7 @@ module ApiWithAbsoluteBasePathAndAddress =
                             ),
                             System.Uri (
                                 "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1334,7 +1517,7 @@ module ApiWithBasePathAndAbsoluteEndpoint =
                             ),
                             System.Uri (
                                 "/endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1382,7 +1565,7 @@ module ApiWithBasePathAndAddressAndAbsoluteEndpoint =
                             ),
                             System.Uri (
                                 "/endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1436,7 +1619,7 @@ module ApiWithAbsoluteBasePathAndAbsoluteEndpoint =
                             ),
                             System.Uri (
                                 "/endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1484,7 +1667,7 @@ module ApiWithAbsoluteBasePathAndAddressAndAbsoluteEndpoint =
                             ),
                             System.Uri (
                                 "/endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1543,7 +1726,7 @@ module ApiWithHeaders =
                              | v -> v),
                             System.Uri (
                                 "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1557,6 +1740,7 @@ module ApiWithHeaders =
                     do httpMessage.Headers.Add ("X-Foo", this.SomeHeader.ToString ())
                     do httpMessage.Headers.Add ("Authorization", this.SomeOtherHeader.ToString ())
                     do httpMessage.Headers.Add ("Header-Name", "Header-Value")
+                    do httpMessage.Headers.Add ("Something-Else", "val")
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
                     let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
@@ -1605,7 +1789,7 @@ module ApiWithHeaders2 =
                              | v -> v),
                             System.Uri (
                                 "endpoint/{param}"
-                                    .Replace ("{param}", parameter.ToString () |> System.Web.HttpUtility.UrlEncode),
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -1626,3 +1810,174 @@ module ApiWithHeaders2 =
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
         }
+namespace PureGym
+
+open System
+open System.Threading
+open System.Threading.Tasks
+open System.IO
+open System.Net
+open System.Net.Http
+open RestEase
+
+/// Module for constructing a REST client.
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
+module ClientWithJsonBody =
+    /// Create a REST client.
+    let make (client : System.Net.Http.HttpClient) : IClientWithJsonBody =
+        { new IClientWithJsonBody with
+            member _.GetPathParam (parameter : string, mem : PureGym.Member, ct : CancellationToken option) =
+                async {
+                    let! ct = Async.CancellationToken
+
+                    let uri =
+                        System.Uri (
+                            (match client.BaseAddress with
+                             | null ->
+                                 raise (
+                                     System.ArgumentNullException (
+                                         nameof (client.BaseAddress),
+                                         "No base address was supplied on the type, and no BaseAddress was on the HttpClient."
+                                     )
+                                 )
+                             | v -> v),
+                            System.Uri (
+                                "endpoint/{param}"
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
+                                System.UriKind.Relative
+                            )
+                        )
+
+                    let httpMessage =
+                        new System.Net.Http.HttpRequestMessage (
+                            Method = System.Net.Http.HttpMethod.Post,
+                            RequestUri = uri
+                        )
+
+                    let queryParams =
+                        new System.Net.Http.StringContent (
+                            mem |> PureGym.Member.toJsonNode |> (fun node -> node.ToJsonString ()),
+                            null,
+                            "application/json"
+                        )
+
+                    do httpMessage.Content <- queryParams
+                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
+                    let response = response.EnsureSuccessStatusCode ()
+                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
+                    return responseString
+                }
+                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
+        }
+namespace PureGym
+
+open System
+open System.Threading
+open System.Threading.Tasks
+open System.IO
+open System.Net
+open System.Net.Http
+open RestEase
+
+/// Module for constructing a REST client.
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
+module ClientWithJsonBodyOverridden =
+    /// Create a REST client.
+    let make (client : System.Net.Http.HttpClient) : IClientWithJsonBodyOverridden =
+        { new IClientWithJsonBodyOverridden with
+            member _.GetPathParam (parameter : string, mem : PureGym.Member, ct : CancellationToken option) =
+                async {
+                    let! ct = Async.CancellationToken
+
+                    let uri =
+                        System.Uri (
+                            (match client.BaseAddress with
+                             | null ->
+                                 raise (
+                                     System.ArgumentNullException (
+                                         nameof (client.BaseAddress),
+                                         "No base address was supplied on the type, and no BaseAddress was on the HttpClient."
+                                     )
+                                 )
+                             | v -> v),
+                            System.Uri (
+                                "endpoint/{param}"
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
+                                System.UriKind.Relative
+                            )
+                        )
+
+                    let httpMessage =
+                        new System.Net.Http.HttpRequestMessage (
+                            Method = System.Net.Http.HttpMethod.Post,
+                            RequestUri = uri
+                        )
+
+                    let queryParams =
+                        new System.Net.Http.StringContent (
+                            mem |> PureGym.Member.toJsonNode |> (fun node -> node.ToJsonString ()),
+                            null,
+                            "application/ecmascript"
+                        )
+
+                    do httpMessage.Content <- queryParams
+                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
+                    let response = response.EnsureSuccessStatusCode ()
+                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
+                    return responseString
+                }
+                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
+        }
+namespace PureGym
+
+open System
+open System.Threading
+open System.Threading.Tasks
+open System.IO
+open System.Net
+open System.Net.Http
+open RestEase
+
+/// Module for constructing a REST client.
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
+module ClientWithStringBody =
+    /// Create a REST client.
+    let make (client : System.Net.Http.HttpClient) : IClientWithStringBody =
+        { new IClientWithStringBody with
+            member _.GetPathParam (parameter : string, mem : string, ct : CancellationToken option) =
+                async {
+                    let! ct = Async.CancellationToken
+
+                    let uri =
+                        System.Uri (
+                            (match client.BaseAddress with
+                             | null ->
+                                 raise (
+                                     System.ArgumentNullException (
+                                         nameof (client.BaseAddress),
+                                         "No base address was supplied on the type, and no BaseAddress was on the HttpClient."
+                                     )
+                                 )
+                             | v -> v),
+                            System.Uri (
+                                "endpoint/{param}"
+                                    .Replace ("{param}", parameter.ToString () |> System.Uri.EscapeDataString),
+                                System.UriKind.Relative
+                            )
+                        )
+
+                    let httpMessage =
+                        new System.Net.Http.HttpRequestMessage (
+                            Method = System.Net.Http.HttpMethod.Post,
+                            RequestUri = uri
+                        )
+
+                    let queryParams = new System.Net.Http.StringContent (mem)
+                    do httpMessage.Content <- queryParams
+                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
+                    let response = response.EnsureSuccessStatusCode ()
+                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
+                    return responseString
+                }
+                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
+        }

ConsumePlugin/GeneratedVault.fs

@@ -5,6 +5,7 @@
 
 
 
+
 namespace ConsumePlugin
 
 /// Module containing JSON parsing methods for the JwtVaultAuthResponse type
@@ -13,139 +14,147 @@ module JwtVaultAuthResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtVaultAuthResponse =
         let arg_10 =
-            (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> ()
+            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> ()
 
         let arg_9 =
-            (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> ()
+            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> ()
 
         let arg_8 =
-            (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> ()
+            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> ()
 
         let arg_7 =
-            (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> ()
+            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> ()
 
         let arg_6 =
-            (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> ()
+            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> ()
 
         let arg_5 =
-            (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> ()
+            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> ()
 
         let arg_4 =
-            (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
+            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
 
         let arg_3 =
-            (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
+            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
 
         let arg_2 =
-            (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
+            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
 
         let arg_1 =
-            (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> ()
+            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> ()
 
         let arg_0 =
-            (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> ()
+            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> ()
 
         {
             ClientToken = arg_0
@@ -168,64 +177,54 @@ module JwtVaultResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtVaultResponse =
         let arg_4 =
-            JwtVaultAuthResponse.jsonParse (
-                match node.["auth"] with
-                | null ->
-                    raise (
-                        System.Collections.Generic.KeyNotFoundException (
-                            sprintf "Required key '%s' not found on JSON object" ("auth")
-                        )
+            match node.["auth"] |> Option.ofObj with
+            | None ->
+                raise (
+                    System.Collections.Generic.KeyNotFoundException (
+                        sprintf "Required key '%s' not found on JSON object" ("auth")
                     )
-                | v -> v
-            )
+                )
+            | Some node -> JwtVaultAuthResponse.jsonParse node
 
         let arg_3 =
-            (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> ()
+            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> ()
 
         let arg_2 =
-            (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> ()
+            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> ()
 
         let arg_1 =
-            (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> ()
+            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> ()
 
         let arg_0 =
-            (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> ()
+            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> ()
 
         {
             RequestId = arg_0
@@ -242,190 +241,246 @@ module JwtSecretResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtSecretResponse =
         let arg_11 =
-            (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
+            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
 
         let arg_10 =
-            (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
+            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
 
         let arg_9 =
-            (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
+            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
 
         let arg_8 =
-            (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
+            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
 
         let arg_7 =
-            (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
+            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
 
         let arg_6 =
-            (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
+            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
 
         let arg_5 =
-            (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
+            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
 
         let arg_4 =
-            (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
+            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
 
         let arg_3 =
-            (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> ()
+            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> ()
 
         let arg_2 =
-            (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> ()
+            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> ()
 
         let arg_1 =
-            (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> ()
+            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> ()
 
         let arg_0 =
-            (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> ()
+            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> ()
 
         {
             RequestId = arg_0
@@ -476,11 +531,8 @@ module VaultClient =
                              | v -> v),
                             System.Uri (
                                 "v1/{mountPoint}/{path}"
-                                    .Replace("{path}", path.ToString () |> System.Web.HttpUtility.UrlEncode)
-                                    .Replace (
-                                        "{mountPoint}",
-                                        mountPoint.ToString () |> System.Web.HttpUtility.UrlEncode
-                                    ),
+                                    .Replace("{path}", path.ToString () |> System.Uri.EscapeDataString)
+                                    .Replace ("{mountPoint}", mountPoint.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -499,6 +551,15 @@ 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))
@@ -535,6 +596,15 @@ 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))
@@ -573,11 +643,8 @@ module VaultClientNonExtensionMethod =
                              | v -> v),
                             System.Uri (
                                 "v1/{mountPoint}/{path}"
-                                    .Replace("{path}", path.ToString () |> System.Web.HttpUtility.UrlEncode)
-                                    .Replace (
-                                        "{mountPoint}",
-                                        mountPoint.ToString () |> System.Web.HttpUtility.UrlEncode
-                                    ),
+                                    .Replace("{path}", path.ToString () |> System.Uri.EscapeDataString)
+                                    .Replace ("{mountPoint}", mountPoint.ToString () |> System.Uri.EscapeDataString),
                                 System.UriKind.Relative
                             )
                         )
@@ -596,6 +663,15 @@ 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))
@@ -632,6 +708,15 @@ 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))
@@ -673,11 +758,8 @@ module VaultClientExtensionMethodHttpClientExtension =
                                  | v -> v),
                                 System.Uri (
                                     "v1/{mountPoint}/{path}"
-                                        .Replace("{path}", path.ToString () |> System.Web.HttpUtility.UrlEncode)
-                                        .Replace (
-                                            "{mountPoint}",
-                                            mountPoint.ToString () |> System.Web.HttpUtility.UrlEncode
-                                        ),
+                                        .Replace("{path}", path.ToString () |> System.Uri.EscapeDataString)
+                                        .Replace ("{mountPoint}", mountPoint.ToString () |> System.Uri.EscapeDataString),
                                     System.UriKind.Relative
                                 )
                             )
@@ -696,6 +778,15 @@ 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))
@@ -732,6 +823,15 @@ module VaultClientExtensionMethodHttpClientExtension =
                             System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
                             |> Async.AwaitTask
 
+                        let jsonNode =
+                            (match jsonNode with
+                             | null ->
+                                 raise (
+                                     System.ArgumentNullException
+                                         "Response from server was the JSON null object; expected a non-nullable type JwtVaultResponse"
+                                 )
+                             | jsonNode -> jsonNode)
+
                         return JwtVaultResponse.jsonParse jsonNode
                     }
                     |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))

ConsumePlugin/ListCata.fs

@@ -7,6 +7,7 @@
 
 
 
+
 namespace ConsumePlugin
 
 open WoofWare.Myriad.Plugins
@@ -31,7 +32,7 @@ module MyListCata =
     [<RequireQualifiedAccess>]
     type private Instruction<'a> =
         | Process__MyList of MyList<'a>
-        | MyList_Cons of 'a
+        | MyList_Cons of head : 'a
 
     let private loop (cata : MyListCata<'a, 'MyList>) (instructions : ResizeArray<Instruction<'a>>) =
         let myListStack = ResizeArray<'MyList> ()

ConsumePlugin/MockExample.fs

@@ -48,3 +48,22 @@ 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
+
+[<GenerateMock>]
+type TypeWithAsyncDisposable =
+    inherit IAsyncDisposable
+    abstract Mem1 : string option -> string[] Async
+    abstract Mem2 : unit -> string[] Async
+
+[<GenerateMock>]
+type TypeWithBothDisposables =
+    inherit IDisposable
+    inherit IAsyncDisposable
+    abstract Mem1 : string -> int

ConsumePlugin/MockExampleNoAttributes.fs

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

ConsumePlugin/RestApiExample.fs

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

Directory.Build.props

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

README.md

@@ -13,8 +13,9 @@ Currently implemented:
 * `JsonParse` (to stamp out `jsonParse : JsonNode -> 'T` methods).
 * `JsonSerialize` (to stamp out `toJsonNode : 'T -> JsonNode` methods).
 * `HttpClient` (to stamp out a [RestEase](https://github.com/canton7/RestEase)-style HTTP client).
-* `GenerateMock` (to stamp out a record type corresponding to an interface, like a compile-time [Foq](https://github.com/fsprojects/Foq)).
-* `ArgParser` (to stamp out a basic argument parser)
+* `GenerateMock` and `GenerateCapturingMock` (to stamp out a record type corresponding to an interface, like a compile-time [Foq](https://github.com/fsprojects/Foq)).
+* `ArgParser` (to stamp out a basic argument parser).
+* `SwaggerClient` (to stamp out an HTTP client for a Swagger API).
 * `CreateCatamorphism` (to stamp out a non-stack-overflowing [catamorphism](https://fsharpforfunandprofit.com/posts/recursive-types-and-folds/) for a discriminated union).
 * `RemoveOptions` (to strip `option` modifiers from a type) - this one is particularly half-baked!
 
@@ -135,7 +136,7 @@ module InnerTypeWithBoth =
                         ret.Add (key.ToString (), System.Text.Json.Nodes.JsonValue.Create<Uri> value)
 
                     ret
-                ) input.Map
+                ) input.ReadOnlyDict
             )
 
         node
@@ -156,6 +157,10 @@ For an example of using both `JsonParse` and `JsonSerialize` together with compl
 Takes a record like this:
 
 ```fsharp
+type DryRunMode =
+    | [<ArgumentFlag true> Dry
+    | [<ArgumentFlag false> Wet
+
 [<ArgParser>]
 type Foo =
     {
@@ -166,12 +171,16 @@ type Foo =
         B : Choice<int, int>
         [<ArgumentDefaultEnvironmentVariable "MY_ENV_VAR">]
         BWithEnv : Choice<int, int>
+        [<ArgumentDefaultFunction>]
+        DryRun : DryRunMode
+        [<ArgumentLongForm "longer-form-replaces-c">]
         C : float list
         // optionally:
         [<PositionalArgs>]
         Rest : string list // or e.g. `int list` if you want them parsed into a type too
     }
     static member DefaultB () = 4
+    static member DefaultDryRun () = DryRunMode.Wet
 ```
 
 and stamps out a basic `parse` method of this signature:
@@ -218,6 +227,85 @@ This is very bare-bones, but do raise GitHub issues if you like (or if you find
 
 It should work fine if you just want to compose a few primitive types, though.
 
+## `SwaggerClient`
+
+Takes a JSON-schema definition of a [Swagger API](https://swagger.io/), and stamps out a client like this:
+
+```fsharp
+/// A type which was defined in the Swagger spec
+[<JsonParse true ; JsonSerialize true>]
+type SwaggerType1 =
+    {
+        [<System.Text.Json.Serialization.JsonExtensionData>]
+        AdditionalProperties : System.Collections.Generic.Dictionary<string, System.Text.Json.Nodes.JsonNode>
+        Message : string
+    }
+
+/// Documentation from the Swagger spec
+[<HttpClient false ; RestEase.BasePath "/api/v1">]
+type IGitea =
+    /// Returns the Person actor for a user
+    [<RestEase.Get "/activitypub/user/{username}">]
+    abstract ActivitypubPerson :
+        [<RestEase.Path "username">] username : string * ?ct : System.Threading.CancellationToken ->
+            ActivityPub System.Threading.Tasks.Task
+```
+
+Notice that we automatically decorate the type with our `[<HttpClient>]` attribute, so if you choose to do so, you can chain another Myriad generated file off this one and you'll get a RestEase-style client stamped out.
+(See below, searching on the string `"Generated2SwaggerGitea.fs"`, for an example.)
+
+You don't need to `Content Include` or `EmbeddedResource Include` the JSON schema.
+`None Include` will do; we only need the source to be available at build time.
+
+You *do* need to include the following configuration:
+
+```xml
+<Compile Include="GeneratedClient.fs">
+  <!-- This bit is normal: -->
+  <MyriadFile>swagger.json</MyriadFile>
+  <!-- This bit is new and required! -->
+  <MyriadParams>
+    <ClassName>GiteaClient</ClassName>
+    <!-- Optionally: -->
+    <GenerateMock>true</GenerateMock>
+  </MyriadParams>
+</Compile>
+```
+
+The `<ClassName />` key tells us what to name the resulting interface (it gets an `I` prepended for you).
+You can optionally also set `<GenerateMockVisibility>v</GenerateMockVisibility>` to add the `[<GenerateMock>]` attribute to the type
+(where `v` should be `internal` or `public`, indicating "resulting mock type is internal" vs "is public"),
+so that the following manoeuvre will result in a generated mock:
+
+```xml
+<None Include="swagger-gitea.json" />
+<Compile Include="GeneratedSwaggerGitea.fs">
+  <MyriadFile>swagger-gitea.json</MyriadFile>
+  <MyriadParams>
+    <GenerateMockVisibility>public</GenerateMockVisibility>
+    <ClassName>Gitea</ClassName>
+  </MyriadParams>
+</Compile>
+<Compile Include="Generated2SwaggerGitea.fs">
+  <MyriadFile>GeneratedSwaggerGitea.fs</MyriadFile>
+</Compile>
+```
+
+(Note that you do have to create the `GeneratedSwaggerGitea.fs` file manually before code generation happens. Myriad will throw if that file isn't there, because `Generated2SwaggerGitea.fs` depends on it so Myriad wants to compute its hash. Just make an empty file.)
+
+### What's the point?
+
+[`SwaggerProvider`](https://github.com/fsprojects/SwaggerProvider) is *absolutely magical*, but it's kind of witchcraft.
+I fear no man, but that thing… it scares me.
+
+Also, builds using `SwaggerProvider` appear to be inherently nondeterministic, even if the data source doesn't change.
+
+## Limitations
+
+Swagger API specs appear to be pretty cowboy in the wild.
+I try to cope with invalid schemas I have seen, but I can't guarantee I do so correctly.
+Definitely do perform integration tests and let me know of weird specs you encounter, and bits of the (very extensive) Swagger spec I have omitted!
+
 ## `RemoveOptions`
 
 Takes a record like this:
@@ -352,9 +440,9 @@ There are also some design decisions:
   so arguments are forced to be tupled.
 * The `[<Optional>]` attribute is not supported and will probably not be supported, because I consider it to be cursed.
 
-## `GenerateMock`
+## `GenerateMock` and `GenerateCapturingMock`
 
-Takes a type like this:
+`GenerateMock` takes a type like this:
 
 ```fsharp
 [<GenerateMock>]
@@ -384,6 +472,59 @@ type internal PublicTypeMock =
         member this.Mem2 (arg0) = this.Mem2 (arg0)
 ```
 
+`GenerateCapturingMock` additionally captures the calls made to each function (except for `Dispose`).
+It takes a type like this:
+
+```fsharp
+[<GenerateCapturingMock>]
+type IPublicType =
+    abstract Mem1 : string * int -> thing : bool -> string list
+    abstract Mem2 : baz : string -> unit -> int
+```
+
+and stamps out types like this:
+
+```fsharp
+[<RequireQualifiedAccess>]
+module internal PublicTypeCalls =
+    type internal Mem1Call =
+        {
+            Arg0 : string * int
+            thing : bool
+        }
+
+    type internal Calls =
+        {
+            Mem1 : ResizeArray<Mem1Call>
+            Mem2 : ResizeArray<string>
+        }
+
+        static member Empty () = { Mem1 = ResizeArray () ; Mem2 = ResizeArray () }
+
+/// Mock record type for an interface
+type internal PublicTypeMock =
+    {
+        Mem1 : string * int -> bool -> string list
+        Mem2 : string -> int
+        Calls : PublicTypeCalls.Calls
+    }
+
+    static member Empty : PublicTypeMock =
+        {
+            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Calls = PublicTypeMockCalls.Calls.Empty ()
+        }
+
+    interface IPublicType with
+        member this.Mem1 (arg0, arg1) =
+            lock this.Calls.Mem1 (fun () -> this.Calls.Mem1.Add { Arg0 = arg0 ; thing = arg1 })
+            this.Mem1 (arg0, arg1)
+        member this.Mem2 (arg0) =
+            lock this.Calls.Mem2 (fun () -> this.Calls.Mem2.Add arg0)
+            this.Mem2 (arg0)
+```
+
 ### What's the point?
 
 Reflective mocking libraries like [Foq](https://github.com/fsprojects/Foq) in my experience are a rich source of flaky tests.
@@ -395,6 +536,36 @@ thereby allowing the programmer to use F#'s record-update syntax.
 
 * You may supply an `isInternal : bool` argument to the attribute. By default, we make the resulting record type at most internal (never public), since this is intended only to be used in tests; but you can instead make it public with `[<GenerateMock false>]`.
 
+### Gotchas (GenerateCapturingMock)
+
+We use the same name for the record field as the implementing interface member:
+
+```fsharp
+type FooMock =
+    {
+        Field : string -> unit
+    }
+    interface IFoo with
+        member _.Field x = ...
+```
+
+If you have an object of type `FooMock` in scope, you'll get the *record field*, not the *interface member*.
+You need to cast it to `IFoo` before using it (or pass it into a function which takes an `IFoo`):
+
+```fsharp
+let thing = FooMock.Empty () // of type FooMock
+thing.Field "hello" // the wrong one! bypasses the IFoo implementation which captures calls
+
+// correct:
+let thing' = FooMock.Empty ()
+let thing = thing' :> IFoo
+thing.Field "hello" // the right one: this call does get recorded in the mock, because this is the interface member
+
+// also correct, but beware because it leaves the chance of the above footgun lying around for later:
+let thing = FooMock.Empty () // of type FooMock
+doTheThing thing // where doTheThing : IFoo -> unit
+```
+
 ## `CreateCatamorphism`
 
 Takes a collection of mutually recursive discriminated unions:
@@ -481,13 +652,13 @@ For example, [PureGymDto.fs](./ConsumePlugin/PureGymDto.fs) is a real-world set
 * In your `.fsproj` file, define a helper variable so that subsequent steps don't all have to be kept in sync:
     ```xml
     <PropertyGroup>
-      <WoofWareMyriadPluginVersion>2.0.1</WoofWareMyriadPluginVersion>
+      <WoofWareMyriadPluginVersion>9.0.1</WoofWareMyriadPluginVersion>
     </PropertyGroup>
     ```
 * Take a reference on `WoofWare.Myriad.Plugins.Attributes` (which has no other dependencies), to obtain access to the attributes which the generator will recognise:
     ```xml
     <ItemGroup>
-        <PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="2.0.2" />
+        <PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="3.7.2" />
     </ItemGroup>
     ```
 * Take a reference (with private assets, to prevent these from propagating to your own assembly) on `WoofWare.Myriad.Plugins`, to obtain the plugins which Myriad will run, and on `Myriad.Sdk`, to obtain the Myriad binary itself:
@@ -516,6 +687,36 @@ For example, this specifies that Myriad is to use the contents of `Client.fs` to
 </ItemGroup>
 ```
 
+## Alternative use without the attributes
+
+You can avoid taking a reference on the `WoofWare.Myriad.Plugins.Attributes` assembly, instead putting all the configuration into the project file.
+This is implemented for everything except the SwaggerClientGenerator.
+
+```xml
+<Project>
+  <ItemGroup>
+    <Compile Include="Client.fs" />
+    <Compile Include="GeneratedClient.fs">
+        <MyriadFile>Client.fs</MyriadFile>
+        <MyriadParams>
+          <MyTypeName1>GenerateMock(false)!JsonParse</MyTypeName1>
+          <SomeOtherTypeName>GenerateMock</SomeOtherTypeName>
+        </MyriadParams>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WoofWare.Myriad.Plugins" Version="$(WoofWareMyriadPluginVersion)" PrivateAssets="all" />
+    <PackageReference Include="Myriad.Sdk" Version="0.8.3" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
+```
+
+That is, you specify a `!`-delimited list of the attributes you *would* apply to the type.
+Supply "arguments" to the attribute name in the project file as you would to the attribute itself.
+
+(Yes, this is indeed incredibly cumbersome, and you're not interested in the reasons it's all so mad!
+I'm hopefully going to get round to writing a more powerful source generation system which won't have these limitations.)
+
 ### Myriad Gotchas
 
 * MsBuild doesn't always realise that it needs to invoke Myriad during rebuild.
@@ -529,3 +730,7 @@ For example, this specifies that Myriad is to use the contents of `Client.fs` to
   You should probably add these files to your [fantomasignore](https://github.com/fsprojects/fantomas/blob/a999b77ca5a024fbc3409955faac797e29b39d27/docs/docs/end-users/IgnoreFiles.md)
   if you use Fantomas to format your repo;
   the alternative is to manually reformat every time Myriad changes the generated files.
+
+# Licence
+
+The code is MIT-licenced, except for the Swagger API examples in WoofWare.Myriad.Plugins.Test, which are [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/), copyright 2023 by the OpenAPI Initiative, and obtained from https://learn.openapis.org/examples/ with no changes made.

WoofWare.Myriad.Plugins.Attributes/ArgParserAttributes.fs

@@ -26,6 +26,11 @@ 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 ()
 
@@ -57,8 +62,10 @@ type ArgumentDefaultFunctionAttribute () =
 type ArgumentDefaultEnvironmentVariableAttribute (envVar : string) =
     inherit Attribute ()
 
-/// Attribute indicating that this field shall have the given help text, when `--help` is invoked
+/// Attribute indicating that this field or type shall have the given help text, when `--help` is invoked
 /// or when a parse error causes us to print help text.
+/// When applied to a record type, the help text appears at the top of the help output, before the field descriptions.
+/// When applied to a field, the help text appears next to that field's description.
 type ArgumentHelpTextAttribute (helpText : string) =
     inherit Attribute ()
 
@@ -95,3 +102,24 @@ type ArgumentFlagAttribute (flagValue : bool) =
 [<AttributeUsage(AttributeTargets.Field, AllowMultiple = true)>]
 type ArgumentLongForm (s : string) =
     inherit Attribute ()
+
+/// Attribute indicating that this boolean or flag field should accept `--no-` prefix for negation.
+/// When this attribute is present on a boolean or flag DU field, the generated parser will accept
+/// both --field-name and --no-field-name as argument forms.
+///
+/// For boolean fields:
+///   --field-name (or --field-name=true) sets the value to true
+///   --no-field-name (or --no-field-name=true) sets the value to false
+///   --field-name=false sets the value to false
+///   --no-field-name=false sets the value to true
+///
+/// For flag DU fields with [<ArgumentFlag>]:
+///   --field-name (or --field-name=true) sets to the case marked with [<ArgumentFlag true>]
+///   --no-field-name (or --no-field-name=true) sets to the case marked with [<ArgumentFlag false>]
+///   --field-name=false sets to the [<ArgumentFlag false>] case
+///   --no-field-name=false sets to the [<ArgumentFlag true>] case
+///
+/// This attribute can only be applied to bool fields or flag DU fields (two-case DUs with [<ArgumentFlag>]).
+[<AttributeUsage(AttributeTargets.Field, AllowMultiple = false)>]
+type ArgumentNegateWithPrefixAttribute () =
+    inherit Attribute ()

WoofWare.Myriad.Plugins.Attributes/Attributes.fs

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

WoofWare.Myriad.Plugins.Attributes/SurfaceBaseline.txt

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

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

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

WoofWare.Myriad.Plugins.Attributes/version.json

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

WoofWare.Myriad.Plugins.Test/Assembly.fs

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

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

@@ -68,7 +68,7 @@ module TestArgParser =
 
         let getEnvVar (_ : string) =
             Interlocked.Increment envCalls |> ignore<int>
-            ""
+            None
 
         let args = [ "--foo=3" ; "--non-existent" ; "--bar=4" ; "--baz=true" ]
 
@@ -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"
-            "hi!"
+            Some "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"
-            "hi!"
+            Some "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'
@@ -444,11 +444,11 @@ Required argument '--exact' received no value"""
         ]
         |> List.map TestCaseData
 
-    [<TestCaseSource(nameof (boolCases))>]
+    [<TestCaseSource(nameof boolCases)>]
     let ``Bool env vars can be populated`` (envValue : string, boolValue : bool) =
         let getEnvVar (s : string) =
             s |> shouldEqual "CONSUMEPLUGIN_THINGS"
-            envValue
+            Some 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"
-            envValue
+            Some envValue
 
         let boolValue = if boolValue then DryRunMode.Dry else DryRunMode.Wet
 
@@ -704,3 +704,87 @@ Required argument '--exact' received no value"""
         // Again, we don't try to detect that the user has missed out the desired argument to `--a`.
         exc.Message
         |> shouldEqual """Unable to process argument --c=hi as key --c and value hi"""
+
+    [<Test>]
+    let ``Type-level help text appears in help output`` () =
+        let getEnvVar (_ : string) = None
+
+        let exc =
+            Assert.Throws<exn> (fun () -> WithTypeHelp.parse' getEnvVar [ "--help" ] |> ignore<WithTypeHelp>)
+
+        exc.Message
+        |> shouldContainText
+            "Parse command-line arguments for a basic configuration. This help text appears before the argument list."
+
+        exc.Message
+        |> shouldContainText "--config-file  string : The configuration file path"
+
+        exc.Message |> shouldContainText "--verbose  bool : Enable verbose output"
+        exc.Message |> shouldContainText "--port  int32"
+
+    [<Test>]
+    let ``Type-level help text appears before field help`` () =
+        let getEnvVar (_ : string) = None
+
+        let exc =
+            Assert.Throws<exn> (fun () -> WithTypeHelp.parse' getEnvVar [ "--help" ] |> ignore<WithTypeHelp>)
+
+        // Verify that the type help appears before the field help
+        let typeHelpIndex =
+            exc.Message.IndexOf "Parse command-line arguments for a basic configuration"
+
+        let fieldHelpIndex = exc.Message.IndexOf "--config-file"
+
+        typeHelpIndex |> shouldBeSmallerThan fieldHelpIndex
+
+    [<Test>]
+    let ``Multiline type-level help text works`` () =
+        let getEnvVar (_ : string) = None
+
+        let exc =
+            Assert.Throws<exn> (fun () ->
+                WithMultilineTypeHelp.parse' getEnvVar [ "--help" ]
+                |> ignore<WithMultilineTypeHelp>
+            )
+
+        exc.Message |> shouldContainText "This is a multiline help text example."
+
+        exc.Message
+        |> shouldContainText "It spans multiple lines to test that multiline strings work correctly."
+
+        exc.Message
+        |> shouldContainText "You can use this to provide detailed documentation for your argument parser."
+
+        exc.Message |> shouldContainText "--input-file  string : Input file to process"
+        exc.Message |> shouldContainText "--output-dir  string : Output directory"
+        exc.Message |> shouldContainText "--force  bool"
+
+    [<Test>]
+    let ``Type-level help text appears in error messages`` () =
+        let getEnvVar (_ : string) = None
+
+        let exc =
+            Assert.Throws<exn> (fun () ->
+                WithTypeHelp.parse' getEnvVar [ "--unknown-arg" ; "value" ]
+                |> ignore<WithTypeHelp>
+            )
+
+        // Verify that the type help appears in error messages too
+        exc.Message
+        |> shouldContainText
+            "Parse command-line arguments for a basic configuration. This help text appears before the argument list."
+
+        exc.Message |> shouldContainText "--config-file"
+
+    [<Test>]
+    let ``Types without type-level help still work`` () =
+        let getEnvVar (_ : string) = None
+
+        let exc =
+            Assert.Throws<exn> (fun () -> Basic.parse' getEnvVar [ "--help" ] |> ignore<Basic>)
+
+        // Should not contain any type-level help, just the field help
+        exc.Message |> shouldContainText "--foo  int32 : This is a foo!"
+        exc.Message |> shouldContainText "--bar  string"
+        // Make sure there's no extra blank line at the beginning
+        exc.Message.StartsWith '\n' |> shouldEqual false

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

@@ -0,0 +1,372 @@
+namespace WoofWare.Myriad.Plugins.Test
+
+open System.Threading
+open NUnit.Framework
+open FsUnitTyped
+open ConsumePlugin
+
+[<TestFixture>]
+module TestArgParserNegation =
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --foo sets to true`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--enable-feature" ]
+
+        result.EnableFeature |> shouldEqual true
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --foo=true sets to true`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--enable-feature=true" ]
+
+        result.EnableFeature |> shouldEqual true
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --foo true sets to true`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--enable-feature" ; "true" ]
+
+        result.EnableFeature |> shouldEqual true
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --foo=false sets to false`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--enable-feature=false" ]
+
+        result.EnableFeature |> shouldEqual false
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --foo false sets to false`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--enable-feature" ; "false" ]
+
+        result.EnableFeature |> shouldEqual false
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --no-foo sets to false`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature" ]
+
+        result.EnableFeature |> shouldEqual false
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --no-foo=true sets to false`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature=true" ]
+
+        result.EnableFeature |> shouldEqual false
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --no-foo true sets to false`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature" ; "true" ]
+
+        result.EnableFeature |> shouldEqual false
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --no-foo=false sets to true`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature=false" ]
+
+        result.EnableFeature |> shouldEqual true
+
+    [<Test>]
+    let ``Boolean field with ArgumentNegateWithPrefix: --no-foo false sets to true`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--no-enable-feature" ; "false" ]
+
+        result.EnableFeature |> shouldEqual true
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --dry-run sets to Dry`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--dry-run" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Dry
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --dry-run=true sets to Dry`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--dry-run=true" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Dry
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --dry-run true sets to Dry`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--dry-run" ; "true" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Dry
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --dry-run=false sets to Wet`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--dry-run=false" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Wet
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --dry-run false sets to Wet`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--dry-run" ; "false" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Wet
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run sets to Wet`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--no-dry-run" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Wet
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run=true sets to Wet`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--no-dry-run=true" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Wet
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run true sets to Wet`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--no-dry-run" ; "true" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Wet
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run=false sets to Dry`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--no-dry-run=false" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Dry
+
+    [<Test>]
+    let ``Flag DU with ArgumentNegateWithPrefix: --no-dry-run false sets to Dry`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--no-dry-run" ; "false" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Dry
+
+    [<Test>]
+    let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --verbose`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = MultipleFormsNegation.parse' getEnvVar [ "--verbose" ]
+
+        result.VerboseMode |> shouldEqual true
+
+    [<Test>]
+    let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --v`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = MultipleFormsNegation.parse' getEnvVar [ "--v" ]
+
+        result.VerboseMode |> shouldEqual true
+
+    [<Test>]
+    let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --no-verbose`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = MultipleFormsNegation.parse' getEnvVar [ "--no-verbose" ]
+
+        result.VerboseMode |> shouldEqual false
+
+    [<Test>]
+    let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --no-v`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = MultipleFormsNegation.parse' getEnvVar [ "--no-v" ]
+
+        result.VerboseMode |> shouldEqual false
+
+    [<Test>]
+    let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --verbose=false`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = MultipleFormsNegation.parse' getEnvVar [ "--verbose=false" ]
+
+        result.VerboseMode |> shouldEqual false
+
+    [<Test>]
+    let ``ArgumentNegateWithPrefix works with multiple ArgumentLongForm: --no-v=false`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = MultipleFormsNegation.parse' getEnvVar [ "--no-v=false" ]
+
+        result.VerboseMode |> shouldEqual true
+
+    [<Test>]
+    let ``Help text shows both standard and negated forms for boolean`` () =
+        let getEnvVar (_ : string) = failwith "do not call"
+
+        let exc =
+            Assert.Throws<exn> (fun () -> BoolNegation.parse' getEnvVar [ "--help" ] |> ignore<BoolNegation>)
+
+        exc.Message
+        |> shouldEqual
+            """Help text requested.
+--enable-feature / --no-enable-feature  bool"""
+
+    [<Test>]
+    let ``Help text shows both standard and negated forms for flag DU`` () =
+        let getEnvVar (_ : string) = failwith "do not call"
+
+        let exc =
+            Assert.Throws<exn> (fun () -> FlagNegation.parse' getEnvVar [ "--help" ] |> ignore<FlagNegation>)
+
+        exc.Message
+        |> shouldEqual
+            """Help text requested.
+--dry-run / --no-dry-run  bool"""
+
+    [<Test>]
+    let ``Help text with multiple long forms shows all variants`` () =
+        let getEnvVar (_ : string) = failwith "do not call"
+
+        let exc =
+            Assert.Throws<exn> (fun () ->
+                MultipleFormsNegation.parse' getEnvVar [ "--help" ]
+                |> ignore<MultipleFormsNegation>
+            )
+
+        exc.Message
+        |> shouldEqual
+            """Help text requested.
+--verbose / --v / --no-verbose / --no-v  bool"""
+
+    [<Test>]
+    let ``Multiple occurrences error: --foo and --no-foo both supplied`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let exc =
+            Assert.Throws<exn> (fun () ->
+                BoolNegation.parse' getEnvVar [ "--enable-feature" ; "--no-enable-feature" ]
+                |> ignore<BoolNegation>
+            )
+
+        // Should report as duplicate argument
+        exc.Message |> shouldContainText "supplied multiple times"
+
+    [<Test>]
+    let ``Multiple occurrences error: --no-foo and --foo both supplied`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let exc =
+            Assert.Throws<exn> (fun () ->
+                BoolNegation.parse' getEnvVar [ "--no-enable-feature" ; "--enable-feature" ]
+                |> ignore<BoolNegation>
+            )
+
+        // Should report as duplicate argument
+        exc.Message |> shouldContainText "supplied multiple times"
+
+    [<Test>]
+    let ``Multiple occurrences error: --foo=true and --no-foo=false both supplied`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let exc =
+            Assert.Throws<exn> (fun () ->
+                BoolNegation.parse' getEnvVar [ "--enable-feature=true" ; "--no-enable-feature=false" ]
+                |> ignore<BoolNegation>
+            )
+
+        // Should report as duplicate argument
+        exc.Message |> shouldContainText "supplied multiple times"
+
+    [<Test>]
+    let ``CombinedFeatures: verbose with default value works with negation`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = CombinedFeatures.parse' getEnvVar [ "--debug" ; "--normal-bool" ]
+
+        result.Verbose |> shouldEqual (Choice2Of2 false)
+        result.Debug |> shouldEqual true
+        result.NormalBool |> shouldEqual true
+
+    [<Test>]
+    let ``CombinedFeatures: can override default with --verbose`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result =
+            CombinedFeatures.parse' getEnvVar [ "--verbose" ; "--debug" ; "--normal-bool" ]
+
+        result.Verbose |> shouldEqual (Choice1Of2 true)
+        result.Debug |> shouldEqual true
+        result.NormalBool |> shouldEqual true
+
+    [<Test>]
+    let ``CombinedFeatures: can override default with --no-verbose`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result =
+            CombinedFeatures.parse' getEnvVar [ "--no-verbose" ; "--debug" ; "--normal-bool" ]
+
+        result.Verbose |> shouldEqual (Choice1Of2 false)
+        result.Debug |> shouldEqual true
+        result.NormalBool |> shouldEqual true
+
+    [<Test>]
+    let ``CombinedFeatures: --no-debug sets debug to false`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = CombinedFeatures.parse' getEnvVar [ "--no-debug" ; "--normal-bool" ]
+
+        result.Debug |> shouldEqual false
+
+    [<Test>]
+    let ``CombinedFeatures: help text shows negation for fields with attribute`` () =
+        let getEnvVar (_ : string) = failwith "do not call"
+
+        let exc =
+            Assert.Throws<exn> (fun () -> CombinedFeatures.parse' getEnvVar [ "--help" ] |> ignore<CombinedFeatures>)
+
+        // Verbose and Debug should have --no- forms, NormalBool should not
+        exc.Message |> shouldContainText "--verbose / --no-verbose"
+        exc.Message |> shouldContainText "--debug / --no-debug"
+        exc.Message |> shouldContainText "--normal-bool  bool"
+        exc.Message |> shouldNotContainText "--no-normal-bool"
+
+    [<Test>]
+    let ``Case insensitivity: --NO-ENABLE-FEATURE works`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--NO-ENABLE-FEATURE" ]
+
+        result.EnableFeature |> shouldEqual false
+
+    [<Test>]
+    let ``Case insensitivity: --No-Enable-Feature works`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = BoolNegation.parse' getEnvVar [ "--No-Enable-Feature" ]
+
+        result.EnableFeature |> shouldEqual false
+
+    [<Test>]
+    let ``Case insensitivity: --NO-DRY-RUN works`` () =
+        let getEnvVar (_ : string) = failwith "should not call"
+
+        let result = FlagNegation.parse' getEnvVar [ "--NO-DRY-RUN" ]
+
+        result.DryRun |> shouldEqual TestDryRunMode.Wet

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

@@ -0,0 +1,132 @@
+namespace WoofWare.Myriad.Plugins.Test
+
+open System
+open SomeNamespace.CapturingMock
+open NUnit.Framework
+open FsUnitTyped
+
+[<TestFixture>]
+module TestCapturingMockGenerator =
+
+    [<Test>]
+    let ``Example of use: IPublicType`` () =
+        let mock : IPublicType =
+            { PublicTypeMock.Empty () with
+                Mem1 = fun (s, count) -> List.replicate count s
+            }
+            :> _
+
+        let _ =
+            Assert.Throws<NotImplementedException> (fun () -> mock.Mem2 "hi" |> ignore<int>)
+
+        mock.Mem1 ("hi", 3) |> shouldEqual [ "hi" ; "hi" ; "hi" ]
+
+    [<Test>]
+    let ``Example of use: curried args`` () =
+        let mock : Curried<_> =
+            { CurriedMock.Empty () with
+                Mem1 = fun i c -> Array.replicate i c |> String
+                Mem2 = fun (i, s) c -> String.concat $"%c{c}" (List.replicate i s)
+                Mem3 = fun (i, s) c -> String.concat $"%c{c}" (List.replicate i s)
+            }
+            :> _
+
+        mock.Mem1 3 'a' |> shouldEqual "aaa"
+        mock.Mem2 (3, "hi") 'a' |> shouldEqual "hiahiahi"
+        mock.Mem3 (3, "hi") 'a' |> shouldEqual "hiahiahi"
+
+    [<Test>]
+    let ``Example of use: properties`` () =
+        let mock : TypeWithProperties =
+            { TypeWithPropertiesMock.Empty () with
+                Mem1 = fun i -> async { return Option.toArray i }
+                Prop1 = fun () -> 44
+            }
+            :> _
+
+        mock.Mem1 (Some "hi") |> Async.RunSynchronously |> shouldEqual [| "hi" |]
+
+        mock.Prop1 |> shouldEqual 44
+
+    [<Test>]
+    let ``Example of curried use`` () =
+        let mock' =
+            { CurriedMock<string>.Empty () with
+                Mem1 =
+                    fun x y ->
+                        x |> shouldEqual 3
+                        y |> shouldEqual "hello"
+                        "it's me"
+            }
+
+        let mock = mock' :> Curried<_>
+
+        mock.Mem1 3 "hello" |> shouldEqual "it's me"
+
+        lock mock'.Calls.Mem1 (fun () -> Seq.toList mock'.Calls.Mem1)
+        |> List.exactlyOne
+        |> shouldEqual
+            {
+                bar = 3
+                Arg1 = "hello"
+            }
+
+    [<Test>]
+    let ``Example of use IAsyncDisposable`` () =
+        let mock' =
+            { TypeWithAsyncDisposableMock.Empty () with
+                Mem1 = fun i -> async { return Option.toArray i }
+                Mem2 = fun () -> async { return [||] }
+            }
+
+        let mock = mock' :> TypeWithAsyncDisposable
+
+        mock.Mem1 (Some "hi") |> Async.RunSynchronously |> shouldEqual [| "hi" |]
+        mock.Mem2 () |> Async.RunSynchronously |> shouldEqual [||]
+
+        // Test that DisposeAsync returns a completed ValueTask
+        let asyncDisposable = mock :> IAsyncDisposable
+        let valueTask = asyncDisposable.DisposeAsync ()
+        valueTask.IsCompleted |> shouldEqual true
+
+        // Verify calls were captured
+        lock mock'.Calls.Mem1 (fun () -> Seq.toList mock'.Calls.Mem1)
+        |> List.exactlyOne
+        |> shouldEqual (Some "hi")
+
+        lock mock'.Calls.Mem2 (fun () -> Seq.toList mock'.Calls.Mem2)
+        |> List.exactlyOne
+        |> shouldEqual ()
+
+    [<Test>]
+    let ``Example of use: Both IDisposable and IAsyncDisposable`` () =
+        let mutable disposed = false
+        let mutable disposedAsync = false
+
+        let mock' =
+            { TypeWithBothDisposablesMock.Empty () with
+                Dispose = fun () -> disposed <- true
+                DisposeAsync =
+                    fun () ->
+                        disposedAsync <- true
+                        System.Threading.Tasks.ValueTask ()
+                Mem1 = fun s -> s.Length
+            }
+
+        let mock = mock' :> TypeWithBothDisposables
+
+        mock.Mem1 "hello" |> shouldEqual 5
+        mock.Mem1 "world" |> shouldEqual 5
+
+        // Test IDisposable.Dispose
+        (mock :> IDisposable).Dispose ()
+        disposed |> shouldEqual true
+
+        // Test IAsyncDisposable.DisposeAsync
+        let valueTask = (mock :> IAsyncDisposable).DisposeAsync ()
+        valueTask.IsCompleted |> shouldEqual true
+        disposedAsync |> shouldEqual true
+
+        // Verify calls were captured
+        lock mock'.Calls.Mem1 (fun () -> Seq.toList mock'.Calls.Mem1)
+        |> shouldEqual [ "hello" ; "world" ]

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

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

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

@@ -33,4 +33,4 @@ module TestPathParam =
         let api = PureGymApi.make client
 
         api.GetPathParam("hello/world?(hi)").Result
-        |> shouldEqual "hello%2fworld%3f(hi)"
+        |> shouldEqual "hello%2Fworld%3F%28hi%29"

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

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

WoofWare.Myriad.Plugins.Test/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.Random
+open FsCheck.FSharp
 open Microsoft.FSharp.Reflection
 open NUnit.Framework
 open FsCheck
@@ -15,21 +15,21 @@ module TestJsonSerde =
 
     let uriGen : Gen<Uri> =
         gen {
-            let! suffix = Arb.generate<int>
+            let! suffix = ArbMap.generate<int> ArbMap.defaults
             return Uri $"https://example.com/%i{suffix}"
         }
 
     let rec innerGen (count : int) : Gen<InnerTypeWithBoth> =
         gen {
-            let! guid = Arb.generate<Guid>
-            let! mapKeys = Gen.listOf Arb.generate<NonNull<string>>
+            let! guid = ArbMap.generate<Guid> ArbMap.defaults
+            let! mapKeys = Gen.listOf (ArbMap.generate<NonNull<string>> ArbMap.defaults)
             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 Arb.generate<NonNull<string>>
+                    Gen.listOf (ArbMap.generate<NonNull<string>> ArbMap.defaults)
                 else
                     Gen.constant []
 
@@ -50,13 +50,16 @@ module TestJsonSerde =
                 |> List.map KeyValuePair
                 |> Dictionary
 
-            let! readOnlyDictKeys = Gen.listOf Arb.generate<NonNull<string>>
+            let! readOnlyDictKeys = Gen.listOf (ArbMap.generate<NonNull<string>> ArbMap.defaults)
             let readOnlyDictKeys = readOnlyDictKeys |> List.map _.Get |> List.distinct
-            let! readOnlyDictValues = Gen.listOfLength readOnlyDictKeys.Length (Gen.listOf Arb.generate<char>)
+
+            let! readOnlyDictValues =
+                Gen.listOfLength readOnlyDictKeys.Length (Gen.listOf (ArbMap.generate<char> ArbMap.defaults))
+
             let readOnlyDict = List.zip readOnlyDictKeys readOnlyDictValues |> readOnlyDict
 
             let! dictKeys = Gen.listOf uriGen
-            let! dictValues = Gen.listOfLength dictKeys.Length Arb.generate<bool>
+            let! dictValues = Gen.listOfLength dictKeys.Length (ArbMap.generate<bool> ArbMap.defaults)
             let dict = List.zip dictKeys dictValues |> dict
 
             return
@@ -71,28 +74,38 @@ module TestJsonSerde =
 
     let outerGen : Gen<JsonRecordTypeWithBoth> =
         gen {
-            let! a = Arb.generate<int>
-            let! b = Arb.generate<NonNull<string>>
-            let! c = Gen.listOf Arb.generate<int>
+            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! depth = Gen.choose (0, 2)
             let! d = innerGen depth
-            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! 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! someEnum = Gen.choose (0, 1)
-            let! timestamp = Arb.generate
+            let! timestamp = ArbMap.generate ArbMap.defaults
 
             return
                 {
@@ -270,10 +283,10 @@ module TestJsonSerde =
             match case with
             | 0 -> return FirstDu.EmptyCase
             | 1 ->
-                let! s = Arb.generate<NonNull<string>>
+                let! s = ArbMap.generate<NonNull<string>> ArbMap.defaults
                 return FirstDu.Case1 s.Get
             | 2 ->
-                let! i = Arb.generate<int>
+                let! i = ArbMap.generate<int> ArbMap.defaults
                 let! record = outerGen
                 return FirstDu.Case2 (record, i)
             | _ -> return failwith $"unexpected: %i{case}"
@@ -293,7 +306,6 @@ 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
 
@@ -301,11 +313,13 @@ module TestJsonSerde =
 
         let mutable i = 0
 
-        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 property (du : FirstDu) =
             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,3 +34,58 @@ 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
+
+    [<Test>]
+    let ``Example of use: IAsyncDisposable`` () =
+        let mock : TypeWithAsyncDisposable =
+            { TypeWithAsyncDisposableMock.Empty with
+                Mem1 = fun i -> async { return Option.toArray i }
+            }
+            :> _
+
+        mock.Mem1 (Some "hi") |> Async.RunSynchronously |> shouldEqual [| "hi" |]
+
+        // Test that DisposeAsync returns a completed ValueTask
+        let asyncDisposable = mock :> IAsyncDisposable
+        let valueTask = asyncDisposable.DisposeAsync ()
+        valueTask.IsCompleted |> shouldEqual true
+
+    [<Test>]
+    let ``Example of use: Both IDisposable and IAsyncDisposable`` () =
+        let mutable disposed = false
+        let mutable disposedAsync = false
+
+        let mock : TypeWithBothDisposables =
+            { TypeWithBothDisposablesMock.Empty with
+                Dispose = fun () -> disposed <- true
+                DisposeAsync =
+                    fun () ->
+                        disposedAsync <- true
+                        System.Threading.Tasks.ValueTask ()
+                Mem1 = fun s -> s.Length
+            }
+            :> _
+
+        mock.Mem1 "hello" |> shouldEqual 5
+
+        // Test IDisposable.Dispose
+        (mock :> IDisposable).Dispose ()
+        disposed |> shouldEqual true
+
+        // Test IAsyncDisposable.DisposeAsync
+        let valueTask = (mock :> IAsyncDisposable).DisposeAsync ()
+        valueTask.IsCompleted |> shouldEqual true
+        disposedAsync |> shouldEqual true

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

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

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

@@ -0,0 +1,84 @@
+namespace WoofWare.Myriad.Plugins.Test
+
+open System.Text.Json.Nodes
+open NUnit.Framework
+open FsUnitTyped
+open WoofWare.Myriad.Plugins.SwaggerV2
+
+[<TestFixture>]
+module TestSwaggerParse =
+    [<Test>]
+    let ``Can parse parameters`` () : unit =
+        let s =
+            """{
+  "tags": [
+    "organization"
+  ],
+  "summary": "Check if a user is a member of an organization",
+  "operationId": "orgIsMember",
+  "parameters": [
+    {
+      "type": "string",
+      "description": "name of the organization",
+      "name": "org",
+      "in": "path",
+      "required": true
+    },
+    {
+      "type": "string",
+      "description": "username of the user",
+      "name": "username",
+      "in": "path",
+      "required": true
+    }
+  ],
+  "responses": {
+    "204": {
+      "description": "user is a member"
+    },
+    "303": {
+      "description": "redirection to /orgs/{org}/public_members/{username}"
+    },
+    "404": {
+      "description": "user is not a member"
+    }
+  }
+}
+"""
+            |> JsonNode.Parse
+
+        s.AsObject ()
+        |> SwaggerEndpoint.Parse
+        |> shouldEqual
+            {
+                Consumes = None
+                Produces = None
+                Tags = [ "organization" ]
+                Summary = "Check if a user is a member of an organization"
+                OperationId = OperationId "orgIsMember"
+                Parameters =
+                    [
+                        {
+                            Type = Definition.String
+                            Description = Some "name of the organization"
+                            Name = "org"
+                            In = ParameterIn.Path "org"
+                            Required = Some true
+                        }
+                        {
+                            Type = Definition.String
+                            Description = Some "username of the user"
+                            Name = "username"
+                            In = ParameterIn.Path "username"
+                            Required = Some true
+                        }
+                    ]
+                    |> Some
+                Responses =
+                    [
+                        204, Definition.Unspecified
+                        303, Definition.Unspecified
+                        404, Definition.Unspecified
+                    ]
+                    |> Map.ofList
+            }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <!--
@@ -12,8 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="HttpClient.fs"/>
-    <Compile Include="PureGymDtos.fs"/>
+    <Compile Include="Assembly.fs" />
+    <Compile Include="HttpClient.fs" />
+    <Compile Include="PureGymDtos.fs" />
     <Compile Include="TestJsonParse\TestJsonParse.fs" />
     <Compile Include="TestJsonParse\TestPureGymJson.fs" />
     <Compile Include="TestJsonParse\TestExtensionMethod.fs" />
@@ -26,6 +27,9 @@
     <Compile Include="TestHttpClient\TestVaultClient.fs" />
     <Compile Include="TestHttpClient\TestVariableHeader.fs" />
     <Compile Include="TestMockGenerator\TestMockGenerator.fs" />
+    <Compile Include="TestMockGenerator\TestMockGeneratorNoAttr.fs" />
+    <Compile Include="TestCapturingMockGenerator\TestCapturingMockGenerator.fs" />
+    <Compile Include="TestCapturingMockGenerator\TestCapturingMockGeneratorNoAttr.fs" />
     <Compile Include="TestJsonSerialize\TestJsonSerde.fs" />
     <Compile Include="TestCataGenerator\TestCataGenerator.fs" />
     <Compile Include="TestCataGenerator\TestDirectory.fs" />
@@ -33,23 +37,36 @@
     <Compile Include="TestCataGenerator\TestMyList.fs" />
     <Compile Include="TestCataGenerator\TestMyList2.fs" />
     <Compile Include="TestArgParser\TestArgParser.fs" />
-    <Compile Include="TestRemoveOptions.fs"/>
-    <Compile Include="TestSurface.fs"/>
+    <Compile Include="TestArgParser\TestArgParserNegation.fs" />
+    <Compile Include="TestSwagger\TestSwaggerParse.fs" />
+    <Compile Include="TestSwagger\TestOpenApi3Parse.fs" />
+    <EmbeddedResource Include="TestSwagger\api-with-examples.json" />
+    <EmbeddedResource Include="TestSwagger\callback-example.json" />
+    <EmbeddedResource Include="TestSwagger\link-example.json" />
+    <EmbeddedResource Include="TestSwagger\non-oauth-scopes.json" />
+    <EmbeddedResource Include="TestSwagger\petstore.json" />
+    <EmbeddedResource Include="TestSwagger\petstore-expanded.json" />
+    <EmbeddedResource Include="TestSwagger\tictactoe.json" />
+    <EmbeddedResource Include="TestSwagger\uspto.json" />
+    <EmbeddedResource Include="TestSwagger\webhook-example.json" />
+    <Compile Include="TestRemoveOptions.fs" />
+    <Compile Include="TestSurface.fs" />
     <None Include="../.github/workflows/dotnet.yaml" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ApiSurface" Version="4.1.5"/>
-    <PackageReference Include="FsCheck" Version="2.16.6"/>
-    <PackageReference Include="FsUnit" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
-    <PackageReference Include="NUnit" Version="4.2.2"/>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
+    <PackageReference Include="ApiSurface" Version="5.0.3" />
+    <PackageReference Include="FsCheck" Version="3.3.2" />
+    <PackageReference Include="FsUnit" Version="7.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
+    <PackageReference Include="WoofWare.Expect" Version="0.8.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WoofWare.Myriad.Plugins\WoofWare.Myriad.Plugins.fsproj"/>
-    <ProjectReference Include="..\ConsumePlugin\ConsumePlugin.fsproj"/>
+    <ProjectReference Include="..\WoofWare.Myriad.Plugins\WoofWare.Myriad.Plugins.fsproj" />
+    <ProjectReference Include="..\ConsumePlugin\ConsumePlugin.fsproj" />
   </ItemGroup>
 
 </Project>

WoofWare.Myriad.Plugins/ArgParserGenerator.fs

@@ -4,8 +4,8 @@ open System
 open System.Text
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.Text.Range
-open Fantomas.FCS.Xml
-open Myriad.Core
+open TypeEquality
+open WoofWare.Whippet.Fantomas
 
 type internal ArgParserOutputSpec =
     {
@@ -72,16 +72,38 @@ type private ParseFunction<'acc> =
         /// and choices and so on.
         TargetType : SynType
         Accumulation : 'acc
+        /// If true, this boolean/flag field accepts --no- prefix for negation (has [<ArgumentNegateWithPrefix>])
+        AcceptsNegation : bool
     }
 
     /// A SynExpr of type `string` which we can display to the user at generated-program runtime to display all
     /// the ways they can refer to this arg.
     member arg.HumanReadableArgForm : SynExpr =
-        let formatString = List.replicate arg.ArgForm.Length "--%s" |> String.concat " / "
+        if arg.AcceptsNegation then
+            // Include both standard and --no- variants
+            // E.g., "--foo / --bar / --no-foo / --no-bar"
+            let standardFormatString =
+                List.replicate arg.ArgForm.Length "--%s" |> String.concat " / "
 
-        (SynExpr.applyFunction (SynExpr.createIdent "sprintf") (SynExpr.CreateConst formatString), arg.ArgForm)
-        ||> List.fold SynExpr.applyFunction
-        |> SynExpr.paren
+            let negatedFormatString =
+                List.replicate arg.ArgForm.Length "--no-%s" |> String.concat " / "
+
+            let combinedFormatString = standardFormatString + " / " + negatedFormatString
+
+            // Apply all arg forms twice (once for standard, once for negated)
+            let allArgForms = arg.ArgForm @ arg.ArgForm
+
+            (SynExpr.applyFunction (SynExpr.createIdent "sprintf") (SynExpr.CreateConst combinedFormatString),
+             allArgForms)
+            ||> List.fold SynExpr.applyFunction
+            |> SynExpr.paren
+        else
+            // Standard behavior: just --foo / --bar
+            let formatString = List.replicate arg.ArgForm.Length "--%s" |> String.concat " / "
+
+            (SynExpr.applyFunction (SynExpr.createIdent "sprintf") (SynExpr.CreateConst formatString), arg.ArgForm)
+            ||> List.fold SynExpr.applyFunction
+            |> SynExpr.paren
 
 [<RequireQualifiedAccess>]
 type private ChoicePositional =
@@ -222,8 +244,8 @@ module private ParseTree =
             nonPos @ nonPos2, Some pos
 
         |> fun (nonPos, pos) ->
-            let duplicateArgs =
-                // This is best-effort. We can't necessarily detect all SynExprs here, but usually it'll be strings.
+            // Extract all arg form strings for validation
+            let allArgForms =
                 Option.toList (pos |> Option.map _.ArgForm) @ (nonPos |> List.map _.ArgForm)
                 |> Seq.concat
                 |> Seq.choose (fun expr ->
@@ -232,14 +254,57 @@ module private ParseTree =
                     | _ -> None
                 )
                 |> List.ofSeq
+
+            // Check for direct duplicates
+            let duplicateArgs =
+                allArgForms
                 |> List.groupBy id
                 |> List.choose (fun (key, v) -> if v.Length > 1 then Some key else None)
 
             match duplicateArgs with
-            | [] -> nonPos, pos
-            | dups ->
+            | dups when not dups.IsEmpty ->
                 let dups = dups |> String.concat " "
                 failwith $"Duplicate args detected! %s{dups}"
+            | _ ->
+
+            // Check for --no- prefix conflicts
+            // Build a map of arg names that have AcceptsNegation=true
+            let negatedForms =
+                nonPos
+                |> List.filter _.AcceptsNegation
+                |> List.collect (fun pf ->
+                    pf.ArgForm
+                    |> List.choose (fun expr ->
+                        match expr |> SynExpr.stripOptionalParen with
+                        | SynExpr.Const (SynConst.String (s, _, _), _) -> Some (pf.FieldName.idText, s)
+                        | _ -> None
+                    )
+                )
+                |> List.map (fun (fieldName, argForm) -> $"no-%s{argForm}", fieldName)
+                |> Map.ofList
+
+            // Check if any existing arg form conflicts with a --no- variant
+            let conflicts =
+                allArgForms
+                |> List.choose (fun argForm ->
+                    match negatedForms.TryFind argForm with
+                    | Some fieldWithNegation -> Some (argForm, fieldWithNegation)
+                    | None -> None
+                )
+
+            match conflicts with
+            | [] -> ()
+            | conflicts ->
+                let conflictMessages =
+                    conflicts
+                    |> List.map (fun (argForm, fieldWithNegation) ->
+                        $"Argument name conflict: '--%s{argForm}' collides with the --no- variant of field '%s{fieldWithNegation}' (which has [<ArgumentNegateWithPrefix>])"
+                    )
+                    |> String.concat "\n"
+
+                failwith $"Conflicting argument names detected:\n%s{conflictMessages}"
+
+            nonPos, pos
 
     /// Build the return value.
     let rec instantiate<'a> (tree : ParseTree<'a>) : SynExpr =
@@ -615,6 +680,7 @@ module internal ArgParserGenerator =
                             ArgForm = longForms
                             Help = helpText
                             BoolCases = isBoolLike
+                            AcceptsNegation = false
                         }
                         |> fun t -> ParseTree.PositionalLeaf (t, Teq.refl)
                     | Accumulation.List Accumulation.Required ->
@@ -627,6 +693,7 @@ module internal ArgParserGenerator =
                             ArgForm = longForms
                             Help = helpText
                             BoolCases = isBoolLike
+                            AcceptsNegation = false
                         }
                         |> fun t -> ParseTree.PositionalLeaf (t, Teq.refl)
                     | Accumulation.Choice _
@@ -651,6 +718,27 @@ module internal ArgParserGenerator =
                             Some (Choice2Of2 ())
                         | parseTy -> identifyAsFlag flagDus parseTy |> Option.map Choice1Of2
 
+                    let hasNegateAttr =
+                        attrs
+                        |> List.exists (fun attr ->
+                            match attr.TypeName with
+                            | SynLongIdent.SynLongIdent (ident, _, _) ->
+                                match (List.last ident).idText with
+                                | "ArgumentNegateWithPrefixAttribute"
+                                | "ArgumentNegateWithPrefix" -> true
+                                | _ -> false
+                        )
+
+                    let acceptsNegation =
+                        if hasNegateAttr then
+                            match isBoolLike with
+                            | Some _ -> true
+                            | None ->
+                                failwith
+                                    $"[<ArgumentNegateWithPrefix>] can only be applied to boolean or flag DU fields, but was applied to field %s{ident.idText} of type %O{fieldType}"
+                        else
+                            false
+
                     {
                         FieldName = ident
                         Parser = parser
@@ -660,6 +748,7 @@ module internal ArgParserGenerator =
                         ArgForm = longForms
                         Help = helpText
                         BoolCases = isBoolLike
+                        AcceptsNegation = acceptsNegation
                     }
                     |> fun t -> ParseTree.NonPositionalLeaf (t, Teq.refl)
                     |> ParseTreeCrate.make
@@ -673,13 +762,14 @@ module internal ArgParserGenerator =
                 args
                 |> Map.toList
                 |> List.map (fun (ident, expr) -> SynLongIdent.create [ Ident.create ident ], expr)
-                |> AstHelper.instantiateRecord
+                |> SynExpr.createRecord None
             )
 
         tree, counter
 
     /// let helpText : string = ...
     let private helpText
+        (typeHelp : SynExpr option)
         (typeName : Ident)
         (positional : ParseFunctionPositional option)
         (args : ParseFunctionNonPositional list)
@@ -761,18 +851,61 @@ module internal ArgParserGenerator =
             |> SynExpr.applyTo helpText
             |> SynExpr.paren
 
-        args
-        |> List.map (toPrintable describeNonPositional)
-        |> fun l ->
-            match positional with
-            | None -> l
-            | Some pos -> l @ [ toPrintable describePositional pos ]
+        let fieldHelp =
+            args
+            |> List.map (toPrintable describeNonPositional)
+            |> fun l ->
+                match positional with
+                | None -> l
+                | Some pos -> l @ [ toPrintable describePositional pos ]
+
+        let allHelp =
+            match typeHelp with
+            | Some helpExpr ->
+                // Prepend type help, followed by blank line, then field help
+                [ helpExpr ; SynExpr.CreateConst "" ] @ fieldHelp
+            | None ->
+                // No type help, just field help
+                fieldHelp
+
+        allHelp
         |> SynExpr.listLiteral
         |> SynExpr.pipeThroughFunction (
             SynExpr.applyFunction (SynExpr.createLongIdent [ "String" ; "concat" ]) (SynExpr.CreateConst @"\n")
         )
         |> SynBinding.basic [ Ident.create "helpText" ] [ SynPat.unit ]
 
+    /// Helper to create a negated parser for boolean/flag fields.
+    /// Returns a SynExpr that represents: string -> (negated bool or negated flag DU)
+    /// For booleans: `fun x -> not (Boolean.Parse x)`
+    /// For flag DUs: `fun x -> FlagDu.FromBoolean flagDu (not (Boolean.Parse x))`
+    let private createNegatedParser (arg : ParseFunction<'acc>) : SynExpr =
+        match arg.BoolCases with
+        | None -> failwith $"LOGIC ERROR: createNegatedParser called on non-boolean field %s{arg.FieldName.idText}"
+        | Some (Choice2Of2 ()) ->
+            // Boolean: parse and negate
+            // fun x -> not (System.Boolean.Parse x)
+            let parseExpr =
+                SynExpr.createIdent "x"
+                |> SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "Boolean" ; "Parse" ])
+                |> SynExpr.paren
+
+            parseExpr
+            |> SynExpr.applyFunction (SynExpr.createIdent "not")
+            |> SynExpr.createLambda "x"
+        | Some (Choice1Of2 flagDu) ->
+            // Flag DU: parse as bool, negate, then convert to flag DU
+            // fun x -> x |> System.Boolean.Parse |> not |> FlagDu.FromBoolean flagDu
+            let parseExpr =
+                SynExpr.createIdent "x"
+                |> SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "Boolean" ; "Parse" ])
+                |> SynExpr.paren
+
+            parseExpr
+            |> SynExpr.applyFunction (SynExpr.createIdent "not")
+            |> FlagDu.FromBoolean flagDu
+            |> SynExpr.createLambda "x"
+
     /// `let processKeyValue (key : string) (value : string) : Result<unit, string option> = ...`
     /// Returns a possible error.
     /// A parse failure might not be fatal (e.g. maybe the input was optionally of arity 0, and we failed to do
@@ -786,109 +919,209 @@ module internal ArgParserGenerator =
         let args =
             args
             |> List.map (fun arg ->
-                match arg.Accumulation with
-                | Accumulation.Required
-                | Accumulation.Choice _
-                | Accumulation.Optional ->
-                    let multipleErrorMessage =
-                        SynExpr.createIdent "sprintf"
-                        |> SynExpr.applyTo (SynExpr.CreateConst "Argument '%s' was supplied multiple times: %s and %s")
-                        |> SynExpr.applyTo arg.HumanReadableArgForm
-                        |> SynExpr.applyTo (SynExpr.createIdent "x" |> SynExpr.callMethod "ToString" |> SynExpr.paren)
-                        |> SynExpr.applyTo (
-                            SynExpr.createIdent "value" |> SynExpr.callMethod "ToString" |> SynExpr.paren
-                        )
+                let assignmentExpr =
+                    match arg.Accumulation with
+                    | Accumulation.Required
+                    | Accumulation.Choice _
+                    | Accumulation.Optional ->
+                        let multipleErrorMessage =
+                            SynExpr.createIdent "sprintf"
+                            |> SynExpr.applyTo (
+                                SynExpr.CreateConst "Argument '%s' was supplied multiple times: %s and %s"
+                            )
+                            |> SynExpr.applyTo arg.HumanReadableArgForm
+                            |> SynExpr.applyTo (
+                                SynExpr.createIdent "x" |> SynExpr.callMethod "ToString" |> SynExpr.paren
+                            )
+                            |> SynExpr.applyTo (
+                                SynExpr.createIdent "value" |> SynExpr.callMethod "ToString" |> SynExpr.paren
+                            )
 
-                    let performAssignment =
+                        let performAssignment =
+                            [
+                                SynExpr.createIdent "value"
+                                |> SynExpr.pipeThroughFunction arg.Parser
+                                |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
+                                |> SynExpr.assign (SynLongIdent.createI arg.TargetVariable)
+
+                                SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
+                            ]
+                            |> SynExpr.sequential
+
+                        [
+                            SynMatchClause.create
+                                (SynPat.nameWithArgs "Some" [ SynPat.named "x" ])
+                                (SynExpr.sequential
+                                    [
+                                        multipleErrorMessage
+                                        |> SynExpr.pipeThroughFunction (
+                                            SynExpr.dotGet "Add" (SynExpr.createIdent' argParseErrors)
+                                        )
+                                        SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
+                                    ])
+                            SynMatchClause.create
+                                (SynPat.named "None")
+                                (SynExpr.pipeThroughTryWith
+                                    SynPat.anon
+                                    (SynExpr.createLongIdent [ "exc" ; "Message" ]
+                                     |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
+                                     |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Error"))
+                                    performAssignment)
+                        ]
+                        |> SynExpr.createMatch (SynExpr.createIdent' arg.TargetVariable)
+                    | Accumulation.List (Accumulation.List _)
+                    | Accumulation.List Accumulation.Optional
+                    | Accumulation.List (Accumulation.Choice _) ->
+                        failwith
+                            "WoofWare.Myriad invariant violated: expected a list to contain only a Required accumulation. Non-positional lists cannot be optional or Choice, nor can they themselves contain lists."
+                    | Accumulation.List Accumulation.Required ->
                         [
                             SynExpr.createIdent "value"
                             |> SynExpr.pipeThroughFunction arg.Parser
-                            |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
-                            |> SynExpr.assign (SynLongIdent.createI arg.TargetVariable)
-
-                            SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
+                            |> SynExpr.pipeThroughFunction (
+                                SynExpr.createLongIdent' [ arg.TargetVariable ; Ident.create "Add" ]
+                            )
+                            SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
                         ]
                         |> SynExpr.sequential
 
-                    [
-                        SynMatchClause.create
-                            (SynPat.nameWithArgs "Some" [ SynPat.named "x" ])
-                            (SynExpr.sequential
-                                [
-                                    multipleErrorMessage
-                                    |> SynExpr.pipeThroughFunction (
-                                        SynExpr.dotGet "Add" (SynExpr.createIdent' argParseErrors)
-                                    )
-                                    SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
-                                ])
-                        SynMatchClause.create
-                            (SynPat.named "None")
-                            (SynExpr.pipeThroughTryWith
-                                SynPat.anon
-                                (SynExpr.createLongIdent [ "exc" ; "Message" ]
-                                 |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
-                                 |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Error"))
-                                performAssignment)
-                    ]
-                    |> SynExpr.createMatch (SynExpr.createIdent' arg.TargetVariable)
-                | Accumulation.List (Accumulation.List _)
-                | Accumulation.List Accumulation.Optional
-                | Accumulation.List (Accumulation.Choice _) ->
-                    failwith
-                        "WoofWare.Myriad invariant violated: expected a list to contain only a Required accumulation. Non-positional lists cannot be optional or Choice, nor can they themselves contain lists."
-                | Accumulation.List Accumulation.Required ->
-                    [
-                        SynExpr.createIdent "value"
-                        |> SynExpr.pipeThroughFunction arg.Parser
-                        |> SynExpr.pipeThroughFunction (
-                            SynExpr.createLongIdent' [ arg.TargetVariable ; Ident.create "Add" ]
-                        )
-                        SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
-                    ]
-                    |> SynExpr.sequential
-                |> fun expr -> arg.ArgForm, expr
+                // Return (argForms, assignmentExpr), argMetadata
+                (arg.ArgForm, assignmentExpr), Some arg
             )
 
         let posArg =
             match pos with
             | None -> []
             | Some pos ->
-                [
-                    SynExpr.createIdent "value"
-                    |> SynExpr.pipeThroughFunction pos.Parser
-                    |> fun p ->
-                        match pos.Accumulation with
-                        | ChoicePositional.Choice _ ->
-                            p |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Choice1Of2")
-                        | ChoicePositional.Normal _ -> p
-                    |> SynExpr.pipeThroughFunction (
-                        SynExpr.createLongIdent' [ pos.TargetVariable ; Ident.create "Add" ]
-                    )
-                    SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
-                ]
-                |> SynExpr.sequential
-                |> fun expr -> pos.ArgForm, expr
-                |> List.singleton
+                let posExpr =
+                    [
+                        SynExpr.createIdent "value"
+                        |> SynExpr.pipeThroughFunction pos.Parser
+                        |> fun p ->
+                            match pos.Accumulation with
+                            | ChoicePositional.Choice _ ->
+                                p |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Choice1Of2")
+                            | ChoicePositional.Normal _ -> p
+                        |> SynExpr.pipeThroughFunction (
+                            SynExpr.createLongIdent' [ pos.TargetVariable ; Ident.create "Add" ]
+                        )
+                        SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
+                    ]
+                    |> SynExpr.sequential
+
+                // Positional args don't support negation, so metadata is None
+                [ (pos.ArgForm, posExpr), None ]
 
         (SynExpr.applyFunction (SynExpr.createIdent "Error") (SynExpr.createIdent "None"), posArg @ args)
-        ||> List.fold (fun finalBranch (argForm, arg) ->
+        ||> List.fold (fun finalBranch ((argForm, arg), argMetadata) ->
             (finalBranch, argForm)
             ||> List.fold (fun finalBranch argForm ->
-                arg
-                |> SynExpr.ifThenElse
-                    (SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
-                        (SynExpr.tuple
+                // Standard match: --argForm
+                let standardMatch =
+                    arg
+                    |> SynExpr.ifThenElse
+                        (SynExpr.applyFunction
+                            (SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
+                            (SynExpr.tuple
+                                [
+                                    SynExpr.createIdent "key"
+                                    SynExpr.applyFunction
+                                        (SynExpr.applyFunction
+                                            (SynExpr.createIdent "sprintf")
+                                            (SynExpr.CreateConst "--%s"))
+                                        argForm
+                                    SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
+                                ]))
+                        finalBranch
+
+                // If this arg accepts negation, also match --no-argForm
+                match argMetadata with
+                | None -> standardMatch
+                | Some (parseFn : ParseFunctionNonPositional) when parseFn.AcceptsNegation ->
+                    // Create negated assignment (same structure as `arg` but with negated parser)
+                    let negatedParser = createNegatedParser parseFn
+
+                    let negatedArg =
+                        match parseFn.Accumulation with
+                        | Accumulation.Required
+                        | Accumulation.Choice _
+                        | Accumulation.Optional ->
+                            let multipleErrorMessage =
+                                SynExpr.createIdent "sprintf"
+                                |> SynExpr.applyTo (
+                                    SynExpr.CreateConst "Argument '%s' was supplied multiple times: %s and %s"
+                                )
+                                |> SynExpr.applyTo parseFn.HumanReadableArgForm
+                                |> SynExpr.applyTo (
+                                    SynExpr.createIdent "x" |> SynExpr.callMethod "ToString" |> SynExpr.paren
+                                )
+                                |> SynExpr.applyTo (
+                                    SynExpr.createIdent "value" |> SynExpr.callMethod "ToString" |> SynExpr.paren
+                                )
+
+                            let performNegatedAssignment =
+                                [
+                                    SynExpr.createIdent "value"
+                                    |> SynExpr.pipeThroughFunction negatedParser
+                                    |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
+                                    |> SynExpr.assign (SynLongIdent.createI parseFn.TargetVariable)
+
+                                    SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
+                                ]
+                                |> SynExpr.sequential
+
                             [
-                                SynExpr.createIdent "key"
-                                SynExpr.applyFunction
-                                    (SynExpr.applyFunction
-                                        (SynExpr.createIdent "sprintf")
-                                        (SynExpr.CreateConst "--%s"))
-                                    argForm
-                                SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
-                            ]))
-                    finalBranch
+                                SynMatchClause.create
+                                    (SynPat.nameWithArgs "Some" [ SynPat.named "x" ])
+                                    (SynExpr.sequential
+                                        [
+                                            multipleErrorMessage
+                                            |> SynExpr.pipeThroughFunction (
+                                                SynExpr.dotGet "Add" (SynExpr.createIdent' argParseErrors)
+                                            )
+                                            SynExpr.applyFunction (SynExpr.createIdent "Ok") (SynExpr.CreateConst ())
+                                        ])
+                                SynMatchClause.create
+                                    (SynPat.named "None")
+                                    (SynExpr.pipeThroughTryWith
+                                        SynPat.anon
+                                        (SynExpr.createLongIdent [ "exc" ; "Message" ]
+                                         |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Some")
+                                         |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Error"))
+                                        performNegatedAssignment)
+                            ]
+                            |> SynExpr.createMatch (SynExpr.createIdent' parseFn.TargetVariable)
+                        | Accumulation.List Accumulation.Required ->
+                            [
+                                SynExpr.createIdent "value"
+                                |> SynExpr.pipeThroughFunction negatedParser
+                                |> SynExpr.pipeThroughFunction (
+                                    SynExpr.createLongIdent' [ parseFn.TargetVariable ; Ident.create "Add" ]
+                                )
+                                SynExpr.CreateConst () |> SynExpr.pipeThroughFunction (SynExpr.createIdent "Ok")
+                            ]
+                            |> SynExpr.sequential
+                        | _ ->
+                            failwith
+                                "WoofWare.Myriad invariant violated: unexpected accumulation type for negated arg"
+
+                    // Match --no-argForm
+                    negatedArg
+                    |> SynExpr.ifThenElse
+                        (SynExpr.applyFunction
+                            (SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
+                            (SynExpr.tuple
+                                [
+                                    SynExpr.createIdent "key"
+                                    SynExpr.applyFunction
+                                        (SynExpr.applyFunction
+                                            (SynExpr.createIdent "sprintf")
+                                            (SynExpr.CreateConst "--no-%s"))
+                                        argForm
+                                    SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
+                                ]))
+                        standardMatch
+                | Some _ -> standardMatch
             )
         )
         |> SynBinding.basic
@@ -909,6 +1142,34 @@ module internal ArgParserGenerator =
             |> PreXmlDoc.create'
         )
 
+    /// Try to extract a constant bool value from a SynExpr.
+    /// Returns Some true/false if the expr is a constant bool, None otherwise.
+    let private tryGetConstBool (expr : SynExpr) : bool option =
+        match expr |> SynExpr.stripOptionalParen with
+        | SynExpr.Const (SynConst.Bool v, _) -> Some v
+        | _ -> None
+
+    /// Helper to get the "false" case for a boolean/flag field.
+    /// For booleans: `false`
+    /// For flag DUs: the case marked with [<ArgumentFlag false>]
+    let private getFalseCase (flag : ParseFunction<'a>) : SynExpr =
+        match flag.BoolCases with
+        | None -> failwith $"LOGIC ERROR: getFalseCase called on non-boolean field %s{flag.FieldName.idText}"
+        | Some (Choice2Of2 ()) ->
+            // Boolean: return false
+            SynExpr.CreateConst false
+        | Some (Choice1Of2 flagDu) ->
+            // Flag DU: return the case associated with false
+            // Check which case has false as its arg
+            match tryGetConstBool flagDu.Case1Arg, tryGetConstBool flagDu.Case2Arg with
+            | Some false, _ -> SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case1Name ]
+            | _, Some false -> SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case2Name ]
+            | Some true, _ -> SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case2Name ]
+            | _, Some true -> SynExpr.createLongIdent' [ flagDu.Name ; flagDu.Case1Name ]
+            | None, None ->
+                // Can't determine at compile time, use FlagDu.FromBoolean with false
+                FlagDu.FromBoolean flagDu (SynExpr.CreateConst false)
+
     /// `let setFlagValue (key : string) : bool = ...`
     /// The second member of the `flags` list tuple is the constant "true" with which we will interpret the
     /// arity-0 `--foo`. So in the case of a boolean-typed field, this is `true`; in the case of a Flag-typed field,
@@ -949,21 +1210,72 @@ module internal ArgParserGenerator =
 
             (finalExpr, flag.ArgForm)
             ||> List.fold (fun finalExpr argForm ->
-                SynExpr.ifThenElse
-                    (SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
-                        (SynExpr.tuple
-                            [
-                                SynExpr.createIdent "key"
-                                SynExpr.applyFunction
-                                    (SynExpr.applyFunction
-                                        (SynExpr.createIdent "sprintf")
-                                        (SynExpr.CreateConst "--%s"))
-                                    argForm
-                                SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
-                            ]))
-                    finalExpr
-                    matchFlag
+                // Standard match: --argForm sets to trueCase
+                let standardMatch =
+                    SynExpr.ifThenElse
+                        (SynExpr.applyFunction
+                            (SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
+                            (SynExpr.tuple
+                                [
+                                    SynExpr.createIdent "key"
+                                    SynExpr.applyFunction
+                                        (SynExpr.applyFunction
+                                            (SynExpr.createIdent "sprintf")
+                                            (SynExpr.CreateConst "--%s"))
+                                        argForm
+                                    SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
+                                ]))
+                        finalExpr
+                        matchFlag
+
+                // If this flag accepts negation, also match --no-argForm sets to falseCase
+                if flag.AcceptsNegation then
+                    let falseCase = getFalseCase flag
+
+                    let matchNegatedFlag =
+                        [
+                            SynMatchClause.create
+                                (SynPat.nameWithArgs "Some" [ SynPat.named "x" ])
+                                // This is an error, but it's one we can gracefully report at the end.
+                                (SynExpr.sequential
+                                    [
+                                        multipleErrorMessage
+                                        |> SynExpr.pipeThroughFunction (
+                                            SynExpr.dotGet "Add" (SynExpr.createIdent' argParseErrors)
+                                        )
+                                        SynExpr.CreateConst true
+                                    ])
+
+                            SynMatchClause.create
+                                (SynPat.named "None")
+                                ([
+                                    SynExpr.assign
+                                        (SynLongIdent.createI flag.TargetVariable)
+                                        (SynExpr.pipeThroughFunction (SynExpr.createIdent "Some") falseCase)
+                                    SynExpr.CreateConst true
+                                 ]
+                                 |> SynExpr.sequential)
+                        ]
+                        |> SynExpr.createMatch (SynExpr.createIdent' flag.TargetVariable)
+
+                    // Match --no-argForm
+                    SynExpr.ifThenElse
+                        (SynExpr.applyFunction
+                            (SynExpr.createLongIdent [ "System" ; "String" ; "Equals" ])
+                            (SynExpr.tuple
+                                [
+                                    SynExpr.createIdent "key"
+                                    SynExpr.applyFunction
+                                        (SynExpr.applyFunction
+                                            (SynExpr.createIdent "sprintf")
+                                            (SynExpr.CreateConst "--no-%s"))
+                                        argForm
+                                    SynExpr.createLongIdent [ "System" ; "StringComparison" ; "OrdinalIgnoreCase" ]
+                                ]))
+                        standardMatch
+                        matchNegatedFlag
+                else
+                    standardMatch
             )
         )
         |> SynBinding.basic [ Ident.create "setFlagValue" ] [ SynPat.annotateType SynType.string (SynPat.named "key") ]
@@ -1224,7 +1536,7 @@ module internal ArgParserGenerator =
                                     (SynExpr.CreateConst ()))
                         ])
                 SynMatchClause.create
-                    (SynPat.listCons (SynPat.createConst (SynConst.CreateString "--")) (SynPat.named "rest"))
+                    (SynPat.listCons (SynPat.createConst (SynConst.Create "--")) (SynPat.named "rest"))
                     (SynExpr.callMethodArg
                         "AddRange"
                         (SynExpr.paren (
@@ -1261,6 +1573,7 @@ module internal ArgParserGenerator =
 
     /// Takes a single argument, `args : string list`, and returns something of the type indicated by `recordType`.
     let createRecordParse
+        (typeHelpText : SynExpr option)
         (parseState : Ident)
         (flagDus : FlagDu list)
         (ambientRecords : RecordType list)
@@ -1327,7 +1640,7 @@ module internal ArgParserGenerator =
             |> SynExpr.applyTo (SynExpr.CreateConst ())
             |> SynBinding.basic [ argParseErrors ] []
 
-        let helpText = helpText recordType.Name pos nonPos
+        let helpText = helpText typeHelpText recordType.Name pos nonPos
 
         let bindings = errorCollection :: helpText :: bindings
 
@@ -1396,7 +1709,7 @@ module internal ArgParserGenerator =
 
                             [
                                 SynMatchClause.create
-                                    SynPat.createNull
+                                    (SynPat.named "None")
                                     (SynExpr.sequential
                                         [
                                             errorMessage
@@ -1406,7 +1719,7 @@ module internal ArgParserGenerator =
                                             unchecked
                                         ])
 
-                                SynMatchClause.create (SynPat.named "x") parser
+                                SynMatchClause.create (SynPat.nameWithArgs "Some" [ SynPat.named "x" ]) parser
                             ]
                             |> SynExpr.createMatch result
                         | ArgumentDefaultSpec.FunctionCall name ->
@@ -1624,14 +1937,25 @@ module internal ArgParserGenerator =
                 | _ -> None
             )
 
-        let taggedType =
+        let taggedType, typeHelpText =
             match taggedType with
-            | SynTypeDefn.SynTypeDefn (sci,
+            | SynTypeDefn.SynTypeDefn (SynComponentInfo.SynComponentInfo (attributes = attrs) as sci,
                                        SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (access, fields, _), _),
                                        smd,
                                        _,
                                        _,
-                                       _) -> RecordType.OfRecord sci smd access fields
+                                       _) ->
+                let typeHelp =
+                    attrs
+                    |> SynAttributes.toAttrs
+                    |> List.tryPick (fun a ->
+                        match (List.last a.TypeName.LongIdent).idText with
+                        | "ArgumentHelpTextAttribute"
+                        | "ArgumentHelpText" -> Some a.ArgExpr
+                        | _ -> None
+                    )
+
+                RecordType.OfRecord sci smd access fields, typeHelp
             | _ -> failwith "[<ArgParser>] currently only supports being placed on records."
 
         let modAttrs, modName =
@@ -1643,7 +1967,7 @@ module internal ArgParserGenerator =
         let modInfo =
             SynComponentInfo.create modName
             |> SynComponentInfo.withDocString (
-                PreXmlDoc.Create $" Methods to parse arguments for the type %s{taggedType.Name.idText}"
+                PreXmlDoc.create $"Methods to parse arguments for the type %s{taggedType.Name.idText}"
             )
             |> SynComponentInfo.addAttributes modAttrs
 
@@ -1666,7 +1990,7 @@ module internal ArgParserGenerator =
                             [
                                 {
                                     Attrs = []
-                                    Ident = Ident.create "key"
+                                    Ident = Some (Ident.create "key")
                                     Type = SynType.string
                                 }
                             ]
@@ -1689,12 +2013,12 @@ module internal ArgParserGenerator =
                 |> SynPat.annotateType (SynType.appPostfix "list" SynType.string)
 
             let parsePrime =
-                createRecordParse parseStateIdent flagDus allRecordTypes taggedType
+                createRecordParse typeHelpText parseStateIdent flagDus allRecordTypes taggedType
                 |> SynBinding.basic
                     [ Ident.create "parse'" ]
                     [
                         SynPat.named "getEnvironmentVariable"
-                        |> SynPat.annotateType (SynType.funFromDomain SynType.string SynType.string)
+                        |> SynPat.annotateType (SynType.funFromDomain SynType.string (SynType.option SynType.string))
                         argsParam
                     ]
                 |> SynBinding.withReturnAnnotation (SynType.createLongIdent [ taggedType.Name ])
@@ -1708,7 +2032,12 @@ module internal ArgParserGenerator =
 
             let parse =
                 SynExpr.createLongIdent' parsePrimeCall
-                |> SynExpr.applyTo (SynExpr.createLongIdent [ "System" ; "Environment" ; "GetEnvironmentVariable" ])
+                |> SynExpr.applyTo (
+                    SynExpr.paren (
+                        SynExpr.createLongIdent [ "System" ; "Environment" ; "GetEnvironmentVariable" ]
+                        |> SynExpr.composeWith (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
+                    )
+                )
                 |> SynExpr.applyTo (SynExpr.createIdent "args")
                 |> SynBinding.basic [ Ident.create "parse" ] [ argsParam ]
                 |> SynBinding.withReturnAnnotation (SynType.createLongIdent [ taggedType.Name ])
@@ -1740,75 +2069,12 @@ module internal ArgParserGenerator =
 
         [
             for openStatement in opens do
-                yield SynModuleDecl.CreateOpen openStatement
+                yield SynModuleDecl.openAny openStatement
             yield taggedMod
         ]
         |> SynModuleOrNamespace.createNamespace ns
 
-    let generate (context : GeneratorContext) : Output =
-        let ast, _ =
-            Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
-
-        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
-
-        let namespaceAndTypes =
-            types
-            |> List.collect (fun (ns, types) ->
-                let typeWithAttr =
-                    types
-                    |> List.choose (fun ty ->
-                        match Ast.getAttribute<ArgParserAttribute> ty with
-                        | None -> None
-                        | Some attr ->
-                            let arg =
-                                match SynExpr.stripOptionalParen attr.ArgExpr with
-                                | SynExpr.Const (SynConst.Bool value, _) -> value
-                                | SynExpr.Const (SynConst.Unit, _) -> ArgParserAttribute.DefaultIsExtensionMethod
-                                | arg ->
-                                    failwith
-                                        $"Unrecognised argument %+A{arg} to [<%s{nameof ArgParserAttribute}>]. Literals are not supported. Use `true` or `false` (or unit) only."
-
-                            let spec =
-                                {
-                                    ExtensionMethods = arg
-                                }
-
-                            Some (ty, spec)
-                    )
-
-                typeWithAttr
-                |> List.map (fun taggedType ->
-                    let unions, records, others =
-                        (([], [], []), types)
-                        ||> List.fold (fun
-                                           (unions, records, others)
-                                           (SynTypeDefn.SynTypeDefn (sci, repr, smd, _, _, _) as ty) ->
-                            match repr with
-                            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Union (access, cases, _), _) ->
-                                UnionType.OfUnion sci smd access cases :: unions, records, others
-                            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (access, fields, _), _) ->
-                                unions, RecordType.OfRecord sci smd access fields :: records, others
-                            | _ -> unions, records, ty :: others
-                        )
-
-                    if not others.IsEmpty then
-                        failwith
-                            $"Error: all types recursively defined together with an ArgParserGenerator type must be discriminated unions or records. %+A{others}"
-
-                    (ns, taggedType, unions, records)
-                )
-            )
-
-        let modules =
-            namespaceAndTypes
-            |> List.map (fun (ns, taggedType, unions, records) -> createModule opens ns taggedType unions records)
-
-        Output.Ast modules
+open Myriad.Core
 
 /// Myriad generator that provides a catamorphism for an algebraic data type.
 [<MyriadGenerator("arg-parser")>]
@@ -1817,4 +2083,66 @@ type ArgParserGenerator () =
     interface IMyriadGenerator with
         member _.ValidInputExtensions = [ ".fs" ]
 
-        member _.Generate (context : GeneratorContext) = ArgParserGenerator.generate context
+        member _.Generate (context : GeneratorContext) =
+            let ast, _ =
+                Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
+
+            let types = Ast.getTypes ast
+
+            let opens = AstHelper.extractOpens ast
+
+            let namespaceAndTypes =
+                types
+                |> List.collect (fun (ns, types) ->
+                    let typeWithAttr =
+                        types
+                        |> List.choose (fun ty ->
+                            match SynTypeDefn.getAttribute typeof<ArgParserAttribute>.Name ty with
+                            | None -> None
+                            | Some attr ->
+                                let arg =
+                                    match SynExpr.stripOptionalParen attr.ArgExpr with
+                                    | SynExpr.Const (SynConst.Bool value, _) -> value
+                                    | SynExpr.Const (SynConst.Unit, _) -> ArgParserAttribute.DefaultIsExtensionMethod
+                                    | arg ->
+                                        failwith
+                                            $"Unrecognised argument %+A{arg} to [<%s{nameof ArgParserAttribute}>]. Literals are not supported. Use `true` or `false` (or unit) only."
+
+                                let spec =
+                                    {
+                                        ExtensionMethods = arg
+                                    }
+
+                                Some (ty, spec)
+                        )
+
+                    typeWithAttr
+                    |> List.map (fun taggedType ->
+                        let unions, records, others =
+                            (([], [], []), types)
+                            ||> List.fold (fun
+                                               (unions, records, others)
+                                               (SynTypeDefn.SynTypeDefn (sci, repr, smd, _, _, _) as ty) ->
+                                match repr with
+                                | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Union (access, cases, _), _) ->
+                                    UnionType.OfUnion sci smd access cases :: unions, records, others
+                                | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (access, fields, _), _) ->
+                                    unions, RecordType.OfRecord sci smd access fields :: records, others
+                                | _ -> unions, records, ty :: others
+                            )
+
+                        if not others.IsEmpty then
+                            failwith
+                                $"Error: all types recursively defined together with an ArgParserGenerator type must be discriminated unions or records. %+A{others}"
+
+                        (ns, taggedType, unions, records)
+                    )
+                )
+
+            let modules =
+                namespaceAndTypes
+                |> List.map (fun (ns, taggedType, unions, records) ->
+                    ArgParserGenerator.createModule opens ns taggedType unions records
+                )
+
+            Output.Ast modules

WoofWare.Myriad.Plugins/AssemblyInfo.fs

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

WoofWare.Myriad.Plugins/AstHelper.fs

@@ -2,173 +2,7 @@ namespace WoofWare.Myriad.Plugins
 
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.Text.Range
-open Fantomas.FCS.Xml
-
-type internal ParameterInfo =
-    {
-        Attributes : SynAttribute list
-        IsOptional : bool
-        Id : Ident option
-        Type : SynType
-    }
-
-type internal TupledArg =
-    {
-        HasParen : bool
-        Args : ParameterInfo list
-    }
-
-type internal MemberInfo =
-    {
-        ReturnType : SynType
-        Accessibility : SynAccess option
-        /// Each element of this list is a list of args in a tuple, or just one arg if not a tuple.
-        Args : TupledArg list
-        Identifier : Ident
-        Attributes : SynAttribute list
-        XmlDoc : PreXmlDoc option
-        IsInline : bool
-        IsMutable : bool
-    }
-
-[<RequireQualifiedAccess>]
-type internal PropertyAccessors =
-    | Get
-    | Set
-    | GetSet
-
-type internal PropertyInfo =
-    {
-        Type : SynType
-        Accessibility : SynAccess option
-        Attributes : SynAttribute list
-        XmlDoc : PreXmlDoc option
-        Accessors : PropertyAccessors
-        IsInline : bool
-        Identifier : Ident
-    }
-
-type internal InterfaceType =
-    {
-        Attributes : SynAttribute list
-        Name : LongIdent
-        Inherits : SynType list
-        Members : MemberInfo list
-        Properties : PropertyInfo list
-        Generics : SynTyparDecls option
-        Accessibility : SynAccess option
-    }
-
-type internal RecordType =
-    {
-        Name : Ident
-        Fields : SynField list
-        /// Any additional members which are not record fields.
-        Members : SynMemberDefns option
-        XmlDoc : PreXmlDoc option
-        Generics : SynTyparDecls option
-        TypeAccessibility : SynAccess option
-        ImplAccessibility : SynAccess option
-        Attributes : SynAttribute list
-    }
-
-    /// Parse from the AST.
-    static member OfRecord
-        (sci : SynComponentInfo)
-        (smd : SynMemberDefns)
-        (access : SynAccess option)
-        (recordFields : SynField list)
-        : RecordType
-        =
-        match sci with
-        | SynComponentInfo.SynComponentInfo (attrs, typars, _, longId, doc, _, implAccess, _) ->
-            {
-                Name = List.last longId
-                Fields = recordFields
-                Members = if smd.IsEmpty then None else Some smd
-                XmlDoc = if doc.IsEmpty then None else Some doc
-                Generics = typars
-                ImplAccessibility = implAccess
-                TypeAccessibility = access
-                Attributes = attrs |> List.collect (fun l -> l.Attributes)
-            }
-
-/// Methods for manipulating UnionCase.
-[<RequireQualifiedAccess>]
-module UnionCase =
-    /// Construct our structured `UnionCase` from an FCS `SynUnionCase`: extract everything
-    /// we care about from the AST representation.
-    let ofSynUnionCase (case : SynUnionCase) : UnionCase<Ident option> =
-        match case with
-        | SynUnionCase.SynUnionCase (attributes, ident, caseType, xmlDoc, access, _, _) ->
-
-        let ident =
-            match ident with
-            | SynIdent.SynIdent (ident, _) -> ident
-
-        let fields =
-            match caseType with
-            | SynUnionCaseKind.Fields cases -> cases
-            | SynUnionCaseKind.FullType _ -> failwith "unexpected FullType union"
-
-        {
-            Name = ident
-            XmlDoc = if xmlDoc.IsEmpty then None else Some xmlDoc
-            Access = access
-            Attributes = attributes |> List.collect (fun t -> t.Attributes)
-            Fields = fields |> List.map SynField.extract
-        }
-
-    /// Functorial `map`.
-    let mapIdentFields<'a, 'b> (f : 'a -> 'b) (unionCase : UnionCase<'a>) : UnionCase<'b> =
-        {
-            Attributes = unionCase.Attributes
-            Name = unionCase.Name
-            Access = unionCase.Access
-            XmlDoc = unionCase.XmlDoc
-            Fields = unionCase.Fields |> List.map (SynField.mapIdent f)
-        }
-
-/// Everything you need to know about a discriminated union definition.
-type internal UnionType =
-    {
-        /// The name of the DU: for example, `type Foo = | Blah` has this being `Foo`.
-        Name : Ident
-        /// Any additional members which are not union cases.
-        Members : SynMemberDefns option
-        /// Any docstring associated with the DU itself (not its cases).
-        XmlDoc : PreXmlDoc option
-        /// Generic type parameters this DU takes: `type Foo<'a> = | ...`.
-        Generics : SynTyparDecls option
-        /// Attributes of the DU (not its cases): `[<Attr>] type Foo = | ...`
-        Attributes : SynAttribute list
-        /// Accessibility modifier of the DU: `type private Foo = ...`
-        TypeAccessibility : SynAccess option
-        /// Accessibility modifier of the DU's implementation: `type Foo = private | ...`
-        ImplAccessibility : SynAccess option
-        /// The actual DU cases themselves.
-        Cases : UnionCase<Ident option> list
-    }
-
-    static member OfUnion
-        (sci : SynComponentInfo)
-        (smd : SynMemberDefns)
-        (access : SynAccess option)
-        (cases : SynUnionCase list)
-        : UnionType
-        =
-        match sci with
-        | SynComponentInfo.SynComponentInfo (attrs, typars, _, longId, doc, _, implAccess, _) ->
-            {
-                Name = List.last longId
-                Members = if smd.IsEmpty then None else Some smd
-                XmlDoc = if doc.IsEmpty then None else Some doc
-                Generics = typars
-                Attributes = attrs |> List.collect (fun l -> l.Attributes)
-                TypeAccessibility = access
-                ImplAccessibility = implAccess
-                Cases = cases |> List.map UnionCase.ofSynUnionCase
-            }
+open WoofWare.Whippet.Fantomas
 
 /// Anything that is part of an ADT.
 /// A record is a product of stuff; this type represents one of those stuffs.
@@ -202,13 +36,6 @@ 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/CapturingInterfaceMockGenerator.fs

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

WoofWare.Myriad.Plugins/CataGenerator.fs

@@ -3,12 +3,11 @@ namespace WoofWare.Myriad.Plugins
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.SyntaxTrivia
 open Fantomas.FCS.Xml
-open Myriad.Core
+open WoofWare.Whippet.Fantomas
 
 [<RequireQualifiedAccess>]
 module internal CataGenerator =
     open Fantomas.FCS.Text.Range
-    open Myriad.Core.Ast
 
     /// The user-provided DU contains cases, each of which contains fields.
     /// We have a hard-coded set of things we know how to deal with as field contents.
@@ -175,20 +174,14 @@ module internal CataGenerator =
             |> SynExpr.applyFunction (SynExpr.createLongIdent [ "Seq" ; "exactlyOne" ])
             |> SynExpr.createLet
                 [
-                    SynBinding.Let (
-                        valData = SynValData.SynValData (None, SynValInfo.Empty, None),
-                        pattern =
-                            SynPat.tupleNoParen (
-                                allArtificialTyparNames
-                                |> List.map (fun (t : Ident) ->
-                                    SynPat.namedI (Ident.create (t.idText + "Stack") |> Ident.lowerFirstLetter)
-                                )
-                            ),
-                        expr =
-                            SynExpr.applyFunction
-                                (SynExpr.applyFunction (SynExpr.createIdent "loop") (SynExpr.createIdent "cata"))
-                                (SynExpr.createIdent "instructions")
-                    )
+                    SynBinding.basicTuple
+                        (allArtificialTyparNames
+                         |> List.map (fun (t : Ident) ->
+                             SynPat.namedI (Ident.create (t.idText + "Stack") |> Ident.lowerFirstLetter)
+                         ))
+                        (SynExpr.applyFunction
+                            (SynExpr.applyFunction (SynExpr.createIdent "loop") (SynExpr.createIdent "cata"))
+                            (SynExpr.createIdent "instructions"))
                 ]
         ]
         |> SynExpr.sequential
@@ -463,18 +456,39 @@ module internal CataGenerator =
                         {
                             SynFieldData.Type = field.Type
                             Attrs = []
-                            Ident = None
+                            Ident = field.Name
                         }
-                        |> SynField.make
                     )
 
-                SynUnionCase.Create (unionCase.Name, fields)
+                {
+                    Name = unionCase.Name
+                    XmlDoc = None
+                    Access = None
+                    Attributes = []
+                    Fields = fields
+                }
+                |> SynUnionCase.create
             )
 
         let casesFromCases =
             recursiveCases analysis
             |> List.map (fun case ->
-                SynUnionCase.Create (case.Name, case.Fields |> List.map (fun field -> SynField.Create field.Type))
+                {
+                    UnionCase.Name = case.Name
+                    XmlDoc = None
+                    Access = None
+                    Attributes = []
+                    Fields =
+                        case.Fields
+                        |> List.map (fun field ->
+                            {
+                                SynFieldData.Type = field.Type
+                                Attrs = []
+                                Ident = field.Name
+                            }
+                        )
+                }
+                |> SynUnionCase.create
             )
 
         let cases = casesFromProcess @ casesFromCases
@@ -539,8 +553,8 @@ module internal CataGenerator =
             |> List.map (fun case ->
                 let arity =
                     SynValInfo.SynValInfo (
-                        case.Fields |> List.map (fun field -> [ SynArgInfo.Empty ]),
-                        SynArgInfo.Empty
+                        case.Fields |> List.map (fun field -> [ SynArgInfo.empty ]),
+                        SynArgInfo.empty
                     )
 
                 (SynType.var generics.[analysis.GenericName.idText], List.rev case.FlattenedFields)
@@ -852,9 +866,7 @@ module internal CataGenerator =
                     else
                         []
 
-                SynMatchClause.create
-                    (SynPat.CreateLongIdent (SynLongIdent.create unionCase.Match, matchLhs))
-                    matchBody
+                SynMatchClause.create (SynPat.identWithArgs unionCase.Match (SynArgPats.create matchLhs)) matchBody
             )
 
         SynExpr.createMatch (SynExpr.createIdent "x") matchCases
@@ -1059,7 +1071,7 @@ module internal CataGenerator =
                             (SynExpr.CreateConst 0)
                             (SynExpr.createLongIdent [ "instructions" ; "Count" ]))
                         body
-                    SynExpr.CreateTuple (
+                    SynExpr.tupleNoParen (
                         analysis
                         |> List.map (fun unionAnalysis -> [ unionAnalysis.StackName ] |> SynExpr.createLongIdent')
                     )
@@ -1103,7 +1115,7 @@ module internal CataGenerator =
         let modInfo =
             SynComponentInfo.create moduleName
             |> SynComponentInfo.withDocString (
-                PreXmlDoc.Create $" Methods to perform a catamorphism over the type %s{parentName}"
+                PreXmlDoc.create $"Methods to perform a catamorphism over the type %s{parentName}"
             )
             |> SynComponentInfo.addAttributes [ SynAttribute.requireQualifiedAccess ]
 
@@ -1150,7 +1162,7 @@ module internal CataGenerator =
 
         [
             for openStatement in opens do
-                yield SynModuleDecl.CreateOpen openStatement
+                yield SynModuleDecl.openAny openStatement
             yield! cataStructures
             yield cataRecord
             yield
@@ -1162,53 +1174,32 @@ module internal CataGenerator =
         ]
         |> SynModuleOrNamespace.createNamespace ns
 
-    let generate (context : GeneratorContext) : Output =
-        let ast, _ =
-            Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
-
-        let types = Ast.extractTypeDefn ast
-
-        let opens = AstHelper.extractOpens ast
-
-        let namespaceAndTypes =
-            types
-            |> List.choose (fun (ns, types) ->
-                let typeWithAttr =
-                    types
-                    |> List.tryPick (fun ty ->
-                        match Ast.getAttribute<CreateCatamorphismAttribute> ty with
-                        | None -> None
-                        | Some attr -> Some (attr.ArgExpr, ty)
-                    )
-
-                match typeWithAttr with
-                | Some taggedType ->
-                    let unions, records, others =
-                        (([], [], []), types)
-                        ||> List.fold (fun
-                                           (unions, records, others)
-                                           (SynTypeDefn.SynTypeDefn (_, repr, _, _, _, _) as ty) ->
-                            match repr with
-                            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Union _, _) ->
-                                ty :: unions, records, others
-                            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record _, _) ->
-                                unions, ty :: records, others
-                            | _ -> unions, records, ty :: others
-                        )
-
-                    if not others.IsEmpty then
-                        failwith
-                            $"Error: all types recursively defined together with a CreateCatamorphism type must be discriminated unions or records. %+A{others}"
-
-                    Some (ns, taggedType, unions, records)
-                | _ -> None
+    /// For each namespace/module, grab the types which are defined in consecutive `and`-knots in that namespace/module,
+    /// and also return the fully-qualified namespace/module name alongside that group of types.
+    /// A given module LongIdent may show up many times in the output: once for each recursive knot.
+    // Function originally inspired by https://github.com/MoiraeSoftware/myriad/blob/3c9818faabf9d508c10c28d5ecd26e66fafb48a1/src/Myriad.Core/Ast.fs#L160
+    // but there's really only one reasonable implementation of this type signature and semantics.
+    let groupedTypeDefns (ast : ParsedInput) : (LongIdent * SynTypeDefn list) list =
+        let rec extractTypes (decls : SynModuleDecl list) (ns : LongIdent) =
+            decls
+            |> List.collect (fun moduleDecl ->
+                match moduleDecl with
+                | SynModuleDecl.Types (types, _) -> [ ns, types ]
+                | SynModuleDecl.NestedModule (SynComponentInfo (_, _, _, longId, _, _, _, _), _, decls, _, _, _) ->
+                    let combined = longId |> List.append ns
+                    extractTypes decls combined
+                | _ -> []
             )
 
-        let modules =
-            namespaceAndTypes
-            |> List.map (fun (ns, taggedType, unions, records) -> createModule opens ns taggedType unions records)
+        match ast with
+        | ParsedInput.ImplFile (ParsedImplFileInput (_, _, _, _, _, contents, _, _, _)) ->
+            contents
+            |> List.collect (fun (SynModuleOrNamespace (namespaceId, _, _, moduleDecls, _, _, _, _, _)) ->
+                extractTypes moduleDecls namespaceId
+            )
+        | _ -> []
 
-        Output.Ast modules
+open Myriad.Core
 
 /// Myriad generator that provides a catamorphism for an algebraic data type.
 [<MyriadGenerator("create-catamorphism")>]
@@ -1217,4 +1208,52 @@ type CreateCatamorphismGenerator () =
     interface IMyriadGenerator with
         member _.ValidInputExtensions = [ ".fs" ]
 
-        member _.Generate (context : GeneratorContext) = CataGenerator.generate context
+        member _.Generate (context : GeneratorContext) =
+            let ast, _ =
+                Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
+
+            let types = CataGenerator.groupedTypeDefns ast
+
+            let opens = AstHelper.extractOpens ast
+
+            let namespaceAndTypes =
+                types
+                |> List.choose (fun (ns, types) ->
+                    let typeWithAttr =
+                        types
+                        |> List.tryPick (fun ty ->
+                            match SynTypeDefn.getAttribute typeof<CreateCatamorphismAttribute>.Name ty with
+                            | None -> None
+                            | Some attr -> Some (attr.ArgExpr, ty)
+                        )
+
+                    match typeWithAttr with
+                    | Some taggedType ->
+                        let unions, records, others =
+                            (([], [], []), types)
+                            ||> List.fold (fun
+                                               (unions, records, others)
+                                               (SynTypeDefn.SynTypeDefn (_, repr, _, _, _, _) as ty) ->
+                                match repr with
+                                | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Union _, _) ->
+                                    ty :: unions, records, others
+                                | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record _, _) ->
+                                    unions, ty :: records, others
+                                | _ -> unions, records, ty :: others
+                            )
+
+                        if not others.IsEmpty then
+                            failwith
+                                $"Error: all types recursively defined together with a CreateCatamorphism type must be discriminated unions or records. %+A{others}"
+
+                        Some (ns, taggedType, unions, records)
+                    | _ -> None
+                )
+
+            let modules =
+                namespaceAndTypes
+                |> List.map (fun (ns, taggedType, unions, records) ->
+                    CataGenerator.createModule opens ns taggedType unions records
+                )
+
+            Output.Ast modules

WoofWare.Myriad.Plugins/HttpClientGenerator.fs

@@ -2,6 +2,7 @@ namespace WoofWare.Myriad.Plugins
 
 open System.Net.Http
 open Fantomas.FCS.Syntax
+open WoofWare.Whippet.Fantomas
 
 type internal HttpClientGeneratorOutputSpec =
     {
@@ -60,13 +61,16 @@ module internal HttpClientGenerator =
             BaseAddress : SynExpr option
             BasePath : SynExpr option
             Accessibility : SynAccess option
+            /// Headers which apply *only* to this endpoint.
+            /// For example, SynConst "Authorization" and SynConst "token BLAH".
+            Headers : (SynExpr * SynExpr) list
         }
 
     let httpMethodString (m : HttpMethod) : string =
         if m = HttpMethod.Get then "Get"
         elif m = HttpMethod.Post then "Post"
         elif m = HttpMethod.Delete then "Delete"
-        elif m = HttpMethod.Patch then "Post"
+        elif m = HttpMethod.Patch then "Patch"
         elif m = HttpMethod.Options then "Options"
         elif m = HttpMethod.Head then "Head"
         elif m = HttpMethod.Put then "Put"
@@ -219,7 +223,7 @@ module internal HttpClientGenerator =
                                     SynExpr.CreateConst ("{" + substituteId + "}")
                                     SynExpr.callMethod "ToString" (SynExpr.createIdent' varName)
                                     |> SynExpr.pipeThroughFunction (
-                                        SynExpr.createLongIdent [ "System" ; "Web" ; "HttpUtility" ; "UrlEncode" ]
+                                        SynExpr.createLongIdent [ "System" ; "Uri" ; "EscapeDataString" ]
                                     )
                                 ])
                     | _ -> template
@@ -271,9 +275,7 @@ module internal HttpClientGenerator =
                     SynExpr.createIdent' firstValueId
                     |> SynExpr.toString firstValue.Type
                     |> SynExpr.paren
-                    |> SynExpr.pipeThroughFunction (
-                        SynExpr.createLongIdent [ "System" ; "Web" ; "HttpUtility" ; "UrlEncode" ]
-                    )
+                    |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Uri" ; "EscapeDataString" ])
                     |> SynExpr.paren
                     |> SynExpr.plus (SynExpr.plus urlSeparator (SynExpr.CreateConst (firstKey + "=")))
 
@@ -286,9 +288,7 @@ module internal HttpClientGenerator =
 
                     SynExpr.toString paramValue.Type (SynExpr.createIdent' paramValueId)
                     |> SynExpr.paren
-                    |> SynExpr.pipeThroughFunction (
-                        SynExpr.createLongIdent [ "System" ; "Web" ; "HttpUtility" ; "UrlEncode" ]
-                    )
+                    |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Uri" ; "EscapeDataString" ])
                     |> SynExpr.paren
                     |> SynExpr.plus (SynExpr.plus uri (SynExpr.CreateConst ("&" + paramKey + "=")))
                 )
@@ -397,39 +397,113 @@ module internal HttpClientGenerator =
             | String -> SynExpr.createIdent "responseString"
             | Stream -> SynExpr.createIdent "responseStream"
             | RestEaseResponseType contents ->
-                let deserialiser =
-                    JsonParseGenerator.parseNode
+                match JsonNodeWithNullability.Identify contents with
+                | CannotBeNull ->
+                    let deserialiser =
+                        JsonParseGenerator.parseNonNullableNode
+                            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
+                            ])
+            | retType ->
+                match JsonNodeWithNullability.Identify retType with
+                | Nullable ->
+                    JsonParseGenerator.parseNullableNode
                         None
                         JsonParseGenerator.JsonParseOption.None
-                        contents
+                        retType
+                        (SynExpr.createIdent "jsonNode")
+                | CannotBeNull ->
+                    JsonParseGenerator.parseNonNullableNode
+                        None
+                        JsonParseGenerator.JsonParseOption.None
+                        retType
                         (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
-                        ])
-            | retType ->
-                JsonParseGenerator.parseNode
-                    None
-                    JsonParseGenerator.JsonParseOption.None
-                    retType
-                    (SynExpr.createIdent "jsonNode")
+        let contentTypeHeader, memberHeaders =
+            info.Headers
+            |> List.partition (fun (headerName, _headerValue) ->
+                match headerName |> SynExpr.stripOptionalParen with
+                | SynExpr.Const (SynConst.String (s, _, _), _) ->
+                    System.String.Equals (s, "Content-Type", System.StringComparison.OrdinalIgnoreCase)
+                | _ -> false
+            )
+
+        let contentTypeHeader =
+            match contentTypeHeader with
+            | [] ->
+                // Set application/json if we *know* we're sending JSON
+                match bodyParam with
+                | Some (BodyParamMethods.Serialise _, _) -> Some (SynExpr.CreateConst "application/json")
+                | _ -> None
+            | [ _, ct ] -> Some (SynExpr.stripOptionalParen ct)
+            | _ -> failwith "Unexpectedly got multiple Content-Type headers"
+
+        let createStringContent (contents : SynExpr) =
+            SynExpr.createNew
+                (SynType.createLongIdent' [ "System" ; "Net" ; "Http" ; "StringContent" ])
+                (SynExpr.tupleNoParen
+                    [
+                        yield contents
+                        match contentTypeHeader with
+                        | None -> ()
+                        | Some ch ->
+                            yield SynExpr.createNull ()
+                            // Sigh, Gitea in particular passes "json" here
+                            match ch with
+                            | SynExpr.Const (SynConst.String ("json", _, _), _) ->
+                                yield SynExpr.CreateConst "application/json"
+                            | SynExpr.Const (SynConst.String ("html", _, _), _) -> yield SynExpr.CreateConst "text/html"
+                            | _ -> yield ch
+                    ])
 
         let handleBodyParams =
             match bodyParam with
             | None -> []
             | Some (bodyParamType, bodyParamName) ->
                 match bodyParamType with
-                | BodyParamMethods.StreamContent
-                | BodyParamMethods.ByteArrayContent
                 | BodyParamMethods.StringContent ->
+                    [
+                        Let ("queryParams", createStringContent (SynExpr.createIdent' bodyParamName))
+                        Do (
+                            SynExpr.assign
+                                (SynLongIdent.createS' [ "httpMessage" ; "Content" ])
+                                (SynExpr.createIdent "queryParams")
+                        )
+                    ]
+                | BodyParamMethods.StreamContent
+                | BodyParamMethods.ByteArrayContent ->
                     [
                         Let (
                             "queryParams",
@@ -453,25 +527,47 @@ module internal HttpClientGenerator =
                         )
                     ]
                 | BodyParamMethods.Serialise ty ->
+                    let isNullable =
+                        match JsonNodeWithNullability.Identify ty with
+                        | CannotBeNull -> false
+                        | Nullable -> true
+
                     [
                         Let (
                             "queryParams",
-                            SynExpr.createNew
-                                (SynType.createLongIdent' [ "System" ; "Net" ; "Http" ; "StringContent" ])
-                                (SynExpr.createIdent' bodyParamName
-                                 |> SynExpr.pipeThroughFunction (fst (JsonSerializeGenerator.serializeNode ty))
-                                 |> SynExpr.pipeThroughFunction (
-                                     SynExpr.createLambda
-                                         "node"
-                                         (SynExpr.ifThenElse
-                                             (SynExpr.applyFunction
-                                                 (SynExpr.createIdent "isNull")
-                                                 (SynExpr.createIdent "node"))
+                            createStringContent (
+                                SynExpr.createIdent' bodyParamName
+                                |> SynExpr.pipeThroughFunction (
+                                    fst (
+                                        (if isNullable then
+                                             JsonSerializeGenerator.serializeNodeNullable
+                                         else
+                                             JsonSerializeGenerator.serializeNodeNonNullable)
+                                            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.CreateConst "null"))
-                                 ))
+                                                 (SynExpr.CreateConst ())))
+                                )
+                            )
                         )
                         Do (
                             SynExpr.assign
@@ -516,6 +612,24 @@ 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) ->
@@ -540,6 +654,16 @@ module internal HttpClientGenerator =
                     |> Do
                 )
 
+            let setMemberHeaders =
+                memberHeaders
+                |> List.map (fun (headerName, headerValue) ->
+                    // Best-effort: assume this is a message header.
+                    SynExpr.applyFunction
+                        (SynExpr.createLongIdent [ "httpMessage" ; "Headers" ; "Add" ])
+                        (SynExpr.tuple [ headerName ; headerValue ])
+                    |> Do
+                )
+
             [
                 yield LetBang ("ct", SynExpr.createLongIdent [ "Async" ; "CancellationToken" ])
                 yield Let ("uri", requestUri)
@@ -555,6 +679,7 @@ module internal HttpClientGenerator =
 
                 yield! setVariableHeaders
                 yield! setConstantHeaders
+                yield! setMemberHeaders
 
                 yield
                     LetBang (
@@ -579,11 +704,16 @@ module internal HttpClientGenerator =
                     yield responseString
                     yield responseStream
                     yield jsonNode
+                    yield jsonNodeWithoutNull
                 | String -> yield responseString
                 | Stream -> yield responseStream
+                | UnitType ->
+                    // What we're returning doesn't depend on the content, so don't bother!
+                    ()
                 | _ ->
                     yield responseStream
                     yield jsonNode
+                    yield jsonNodeWithoutNull
             ]
             |> SynExpr.createCompExpr "async" returnExpr
             |> SynExpr.startAsTask cancellationTokenArg
@@ -741,6 +871,16 @@ module internal HttpClientGenerator =
             |> List.map (fun mem ->
                 let httpMethod, url = extractHttpInformation mem.Attributes
 
+                let specificHeaders =
+                    extractHeaderInformation mem.Attributes
+                    |> List.map (fun l ->
+                        match l with
+                        | [ x ; y ] -> x, y
+                        | _ ->
+                            failwith
+                                $"Expected Header attribute on member %s{mem.Identifier.idText} to have exactly two arguments."
+                    )
+
                 let shouldEnsureSuccess = not (shouldAllowAnyStatusCode mem.Attributes)
 
                 let returnType =
@@ -781,6 +921,7 @@ module internal HttpClientGenerator =
                     BaseAddress = baseAddress
                     BasePath = basePath
                     Accessibility = mem.Accessibility
+                    Headers = specificHeaders
                 }
             )
             |> List.map (constructMember constantHeaders properties)
@@ -912,10 +1053,14 @@ type HttpClientGenerator () =
         member _.ValidInputExtensions = [ ".fs" ]
 
         member _.Generate (context : GeneratorContext) =
+            let targetedTypes =
+                MyriadParamParser.render context.AdditionalParameters
+                |> Map.map (fun _ v -> v.Split '!' |> Array.toList |> List.map DesiredGenerator.Parse)
+
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let types = Ast.extractTypeDefn ast
+            let types = Ast.getTypes ast
 
             let opens = AstHelper.extractOpens ast
 
@@ -924,13 +1069,33 @@ type HttpClientGenerator () =
                 |> List.choose (fun (ns, types) ->
                     types
                     |> List.choose (fun typeDef ->
-                        match Ast.getAttribute<HttpClientAttribute> typeDef with
-                        | None -> None
+                        match SynTypeDefn.getAttribute typeof<HttpClientAttribute>.Name typeDef with
+                        | None ->
+                            let name = SynTypeDefn.getName typeDef |> List.map _.idText |> String.concat "."
+
+                            match Map.tryFind name targetedTypes with
+                            | Some desired ->
+                                desired
+                                |> List.tryPick (fun generator ->
+                                    match generator with
+                                    | DesiredGenerator.HttpClient arg ->
+                                        let spec =
+                                            {
+                                                ExtensionMethods =
+                                                    arg
+                                                    |> Option.defaultValue
+                                                        HttpClientAttribute.DefaultIsExtensionMethod
+                                            }
+
+                                        Some (typeDef, spec)
+                                    | _ -> None
+                                )
+                            | _ -> None
                         | Some attr ->
                             let arg =
                                 match SynExpr.stripOptionalParen attr.ArgExpr with
                                 | SynExpr.Const (SynConst.Bool value, _) -> value
-                                | SynExpr.Const (SynConst.Unit, _) -> JsonParseAttribute.DefaultIsExtensionMethod
+                                | SynExpr.Const (SynConst.Unit, _) -> HttpClientAttribute.DefaultIsExtensionMethod
                                 | arg ->
                                     failwith
                                         $"Unrecognised argument %+A{arg} to [<%s{nameof HttpClientAttribute}>]. Literals are not supported. Use `true` or `false` (or unit) only."

WoofWare.Myriad.Plugins/HttpMethod.fs

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

WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs

@@ -3,6 +3,7 @@ namespace WoofWare.Myriad.Plugins
 open System
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.Xml
+open WoofWare.Whippet.Fantomas
 
 type internal GenerateMockOutputSpec =
     {
@@ -19,7 +20,9 @@ module internal InterfaceMockGenerator =
         | Some id -> id
 
     [<RequireQualifiedAccess>]
-    type private KnownInheritance = | IDisposable
+    type private KnownInheritance =
+        | IDisposable
+        | IAsyncDisposable
 
     let createType
         (spec : GenerateMockOutputSpec)
@@ -38,6 +41,8 @@ module internal InterfaceMockGenerator =
                     | [] -> failwith "Unexpected empty identifier in inheritance declaration"
                     | [ "IDisposable" ]
                     | [ "System" ; "IDisposable" ] -> KnownInheritance.IDisposable
+                    | [ "IAsyncDisposable" ]
+                    | [ "System" ; "IAsyncDisposable" ] -> KnownInheritance.IAsyncDisposable
                     | _ -> failwithf "Unrecognised inheritance identifier: %+A" name
                 | x -> failwithf "Unrecognised type in inheritance: %+A" x
             )
@@ -68,12 +73,26 @@ module internal InterfaceMockGenerator =
 
         let constructorFields =
             let extras =
-                if inherits.Contains KnownInheritance.IDisposable then
-                    let unitFun = SynExpr.createThunk (SynExpr.CreateConst ())
+                let disposable =
+                    if inherits.Contains KnownInheritance.IDisposable then
+                        let unitFun = SynExpr.createThunk (SynExpr.CreateConst ())
+                        [ SynLongIdent.createS "Dispose", unitFun ]
+                    else
+                        []
 
-                    [ SynLongIdent.createS "Dispose", unitFun ]
-                else
-                    []
+                let asyncDisposable =
+                    if inherits.Contains KnownInheritance.IAsyncDisposable then
+                        let valueTaskCtor =
+                            SynExpr.createLongIdent [ "System" ; "Threading" ; "Tasks" ; "ValueTask" ]
+                            |> SynExpr.applyTo (SynExpr.CreateConst ())
+                            |> SynExpr.paren
+                            |> SynExpr.createLambda "()"
+
+                        [ SynLongIdent.createS "DisposeAsync", valueTaskCtor ]
+                    else
+                        []
+
+                disposable @ asyncDisposable
 
             let nonExtras =
                 fields
@@ -88,24 +107,43 @@ module internal InterfaceMockGenerator =
                      []
                  else
                      [ SynPat.unit ])
-                (AstHelper.instantiateRecord constructorFields)
-            |> SynBinding.withXmlDoc (PreXmlDoc.create "An implementation where every method throws.")
+                (SynExpr.createRecord None constructorFields)
+            |> SynBinding.withXmlDoc (PreXmlDoc.create "An implementation where every non-disposal method throws.")
             |> SynBinding.withReturnAnnotation constructorReturnType
             |> SynMemberDefn.staticMember
 
         let fields =
             let extras =
-                if inherits.Contains KnownInheritance.IDisposable then
-                    {
-                        Attrs = []
-                        Ident = Some (Ident.create "Dispose")
-                        Type = SynType.funFromDomain SynType.unit SynType.unit
-                    }
-                    |> SynField.make
-                    |> SynField.withDocString (PreXmlDoc.create "Implementation of IDisposable.Dispose")
-                    |> List.singleton
-                else
-                    []
+                let disposable =
+                    if inherits.Contains KnownInheritance.IDisposable then
+                        {
+                            Attrs = []
+                            Ident = Some (Ident.create "Dispose")
+                            Type = SynType.funFromDomain SynType.unit SynType.unit
+                        }
+                        |> SynField.make
+                        |> SynField.withDocString (PreXmlDoc.create "Implementation of IDisposable.Dispose")
+                        |> List.singleton
+                    else
+                        []
+
+                let asyncDisposable =
+                    if inherits.Contains KnownInheritance.IAsyncDisposable then
+                        {
+                            Attrs = []
+                            Ident = Some (Ident.create "DisposeAsync")
+                            Type =
+                                SynType.funFromDomain
+                                    SynType.unit
+                                    (SynType.createLongIdent' [ "System" ; "Threading" ; "Tasks" ; "ValueTask" ])
+                        }
+                        |> SynField.make
+                        |> SynField.withDocString (PreXmlDoc.create "Implementation of IAsyncDisposable.DisposeAsync")
+                        |> List.singleton
+                    else
+                        []
+
+                disposable @ asyncDisposable
 
             extras @ fields
 
@@ -158,6 +196,15 @@ 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
 
@@ -173,7 +220,7 @@ module internal InterfaceMockGenerator =
 
                     SynType.app' baseName generics
 
-            SynMemberDefn.Interface (interfaceName, Some range0, Some members, range0)
+            SynMemberDefn.Interface (interfaceName, Some range0, Some (members @ properties), range0)
 
         let access =
             match interfaceType.Accessibility, spec.IsInternal with
@@ -202,6 +249,23 @@ module internal InterfaceMockGenerator =
                         Some [ mem ],
                         range0
                     )
+
+                | KnownInheritance.IAsyncDisposable ->
+                    let mem =
+                        SynExpr.createLongIdent [ "this" ; "DisposeAsync" ]
+                        |> SynExpr.applyTo (SynExpr.CreateConst ())
+                        |> SynBinding.basic [ Ident.create "this" ; Ident.create "DisposeAsync" ] [ SynPat.unit ]
+                        |> SynBinding.withReturnAnnotation (
+                            SynType.createLongIdent' [ "System" ; "Threading" ; "Tasks" ; "ValueTask" ]
+                        )
+                        |> SynMemberDefn.memberImplementation
+
+                    SynMemberDefn.Interface (
+                        SynType.createLongIdent' [ "System" ; "IAsyncDisposable" ],
+                        Some range0,
+                        Some [ mem ],
+                        range0
+                    )
             )
             |> Seq.toList
 
@@ -247,6 +311,15 @@ 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)
@@ -254,7 +327,12 @@ module internal InterfaceMockGenerator =
         : SynModuleOrNamespace
         =
         let interfaceType = AstHelper.parseInterface interfaceType
-        let fields = interfaceType.Members |> List.map constructMember
+
+        let fields =
+            interfaceType.Members
+            |> List.map constructMember
+            |> List.append (interfaceType.Properties |> List.map constructProperty)
+
         let docString = PreXmlDoc.create "Mock record type for an interface"
 
         let name =
@@ -283,18 +361,42 @@ type InterfaceMockGenerator () =
         member _.ValidInputExtensions = [ ".fs" ]
 
         member _.Generate (context : GeneratorContext) =
+            let targetedTypes =
+                MyriadParamParser.render context.AdditionalParameters
+                |> Map.map (fun _ v -> v.Split '!' |> Array.toList |> List.map DesiredGenerator.Parse)
+
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let types = Ast.extractTypeDefn ast
+            let types = Ast.getTypes ast
 
             let namespaceAndInterfaces =
                 types
                 |> List.choose (fun (ns, types) ->
                     types
                     |> List.choose (fun typeDef ->
-                        match Ast.getAttribute<GenerateMockAttribute> typeDef with
-                        | None -> None
+                        match SynTypeDefn.getAttribute typeof<GenerateMockAttribute>.Name typeDef with
+                        | None ->
+                            let name = SynTypeDefn.getName typeDef |> List.map _.idText |> String.concat "."
+
+                            match Map.tryFind name targetedTypes with
+                            | Some desired ->
+                                desired
+                                |> List.tryPick (fun generator ->
+                                    match generator with
+                                    | DesiredGenerator.InterfaceMock arg ->
+                                        let spec =
+                                            {
+                                                IsInternal =
+                                                    arg
+                                                    |> Option.defaultValue GenerateMockAttribute.DefaultIsInternal
+                                            }
+
+                                        Some (typeDef, spec)
+                                    | _ -> None
+                                )
+                            | _ -> None
+
                         | Some attr ->
                             let arg =
                                 match SynExpr.stripOptionalParen attr.ArgExpr with

WoofWare.Myriad.Plugins/JsonHelpers.fs

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

WoofWare.Myriad.Plugins/JsonParseGenerator.fs

@@ -4,6 +4,7 @@ open System
 open System.Text
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.SyntaxTrivia
+open WoofWare.Whippet.Fantomas
 
 type internal JsonParseOutputSpec =
     {
@@ -25,7 +26,7 @@ module internal JsonParseGenerator =
             }
 
     /// (match {indexed} with | null -> raise (System.Collections.Generic.KeyNotFoundException ({propertyName} not found)) | v -> v)
-    let assertNotNull (propertyName : SynExpr) (indexed : SynExpr) =
+    let assertPropertyExists (propertyName : SynExpr) (indexed : SynExpr) =
         let raiseExpr =
             SynExpr.applyFunction
                 (SynExpr.createIdent "sprintf")
@@ -39,34 +40,34 @@ module internal JsonParseGenerator =
             |> SynExpr.applyFunction (SynExpr.createIdent "raise")
 
         [
-            SynMatchClause.create SynPat.createNull raiseExpr
-            SynMatchClause.create (SynPat.named "v") (SynExpr.createIdent "v")
+            SynMatchClause.create (SynPat.named "None") raiseExpr
+            SynMatchClause.create (SynPat.nameWithArgs "Some" [ SynPat.named "v" ]) (SynExpr.createIdent "v")
         ]
         |> SynExpr.createMatch indexed
         |> SynExpr.paren
 
     /// {node}.AsValue().GetValue<{typeName}> ()
-    /// If `propertyName` is Some, uses `assertNotNull {node}` instead of `{node}`.
+    /// If `propertyName` is Some, uses `assertPropertyExists {node}` instead of `{node}`.
     let asValueGetValue (propertyName : SynExpr option) (typeName : string) (node : SynExpr) : SynExpr =
         match propertyName with
         | None -> node
-        | Some propertyName -> assertNotNull propertyName node
+        | Some propertyName -> assertPropertyExists 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 -> assertNotNull propertyName node
+        | Some propertyName -> assertPropertyExists propertyName node
         |> SynExpr.callMethod "AsValue"
         |> SynExpr.callGenericMethod (SynLongIdent.createS "GetValue") [ SynType.createLongIdent typeName ]
 
     /// {node}.AsObject()
-    /// If `propertyName` is Some, uses `assertNotNull {node}` instead of `{node}`.
+    /// If `propertyName` is Some, uses `assertPropertyExists {node}` instead of `{node}`.
     let asObject (propertyName : SynExpr option) (node : SynExpr) : SynExpr =
         match propertyName with
         | None -> node
-        | Some propertyName -> assertNotNull propertyName node
+        | Some propertyName -> assertPropertyExists propertyName node
         |> SynExpr.callMethod "AsObject"
 
     /// {type}.jsonParse {node}
@@ -76,11 +77,12 @@ 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`.
-    /// {assertNotNull node}.AsArray()
-    /// |> Seq.map (fun elt -> {body})
+    /// {assertPropertyExists node}.AsArray()
+    /// |> Seq.map (fun elt -> {assertNotNull} {body})
     /// |> {collectionType}.ofSeq
     let asArrayMapped
         (propertyName : SynExpr option)
+        (elementType : SynType)
         (collectionType : string)
         (node : SynExpr)
         (body : SynExpr)
@@ -88,10 +90,23 @@ module internal JsonParseGenerator =
         =
         match propertyName with
         | None -> node
-        | Some propertyName -> assertNotNull propertyName node
+        | Some propertyName -> assertPropertyExists propertyName node
         |> SynExpr.callMethod "AsArray"
         |> SynExpr.pipeThroughFunction (
-            SynExpr.applyFunction (SynExpr.createLongIdent [ "Seq" ; "map" ]) (SynExpr.createLambda "elt" body)
+            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.pipeThroughFunction (SynExpr.createLongIdent [ collectionType ; "ofSeq" ])
 
@@ -100,14 +115,41 @@ module internal JsonParseGenerator =
 
     /// fun kvp -> let key = {key(kvp)} in let value = {value(kvp)} in (key, value))
     /// The inputs will be fed with appropriate SynExprs to apply them to the `kvp.Key` and `kvp.Value` args.
-    let dictionaryMapper (key : SynExpr -> SynExpr) (value : SynExpr -> SynExpr) : SynExpr =
+    let dictionaryMapper
+        (propertyName : SynExpr option)
+        (valueTypeIsNullable : bool)
+        (key : SynExpr -> SynExpr)
+        (valueType : SynType)
+        (value : SynExpr -> SynExpr)
+        : SynExpr
+        =
         let keyArg = SynExpr.createLongIdent [ "kvp" ; "Key" ] |> SynExpr.paren
 
-        let valueArg = SynExpr.createLongIdent [ "kvp" ; "Value" ] |> 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"))
 
         // No need to paren here, we're on the LHS of a `let`
-        SynExpr.tupleNoParen [ SynExpr.createIdent "key" ; SynExpr.createIdent "value" ]
-        |> SynExpr.createLet [ SynBinding.basic [ Ident.create "value" ] [] (value valueArg) ]
+        SynExpr.tupleNoParen [ SynExpr.createIdent "key" ; value ]
+        |> SynExpr.createLet [ SynBinding.basic [ Ident.create "value" ] [] valueArg ]
         |> SynExpr.createLet [ SynBinding.basic [ Ident.create "key" ] [] (key keyArg) ]
         |> SynExpr.createLambda "kvp"
 
@@ -164,10 +206,61 @@ 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".
-    let rec parseNode
+    and parseNonNullableNode
         (propertyName : SynExpr option)
         (options : JsonParseOption)
         (fieldType : SynType)
@@ -176,101 +269,184 @@ 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" ])
-        | 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" ])
+        | 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" ])
         | 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 ->
-            parseNode None options ty (SynExpr.createIdent "elt")
-            |> asArrayMapped propertyName "List" node
+            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
         | ArrayType ty ->
-            parseNode None options ty (SynExpr.createIdent "elt")
-            |> asArrayMapped propertyName "Array" node
+            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
         | IDictionaryType (keyType, valueType) ->
-            node
-            |> asObject propertyName
-            |> SynExpr.pipeThroughFunction (
-                SynExpr.applyFunction
-                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
-            )
-            |> SynExpr.pipeThroughFunction (SynExpr.createIdent "dict")
+            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")
         | DictionaryType (keyType, valueType) ->
-            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" ]
-            )
+            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" ]
+                )
         | IReadOnlyDictionaryType (keyType, valueType) ->
-            node
-            |> asObject propertyName
-            |> SynExpr.pipeThroughFunction (
-                SynExpr.applyFunction
-                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
-            )
-            |> SynExpr.pipeThroughFunction (SynExpr.createIdent "readOnlyDict")
+            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")
         | MapType (keyType, valueType) ->
-            node
-            |> asObject propertyName
-            |> SynExpr.pipeThroughFunction (
-                SynExpr.applyFunction
-                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
-            )
-            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Map" ; "ofSeq" ])
+            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" ])
         | BigInt ->
             node
             |> SynExpr.callMethod "ToJsonString"
@@ -280,8 +456,8 @@ module internal JsonParseGenerator =
             parseNumberType options propertyName node primType
             |> SynExpr.pipeThroughFunction (Measure.getLanguagePrimitivesMeasure primType)
         | JsonNode -> node
-        | Unit -> SynExpr.CreateConst ()
-        | _ ->
+        | UnitType -> SynExpr.CreateConst ()
+        | fieldType ->
             // Let's just hope that we've also got our own type annotation!
             let typeName =
                 match fieldType with
@@ -290,14 +466,45 @@ module internal JsonParseGenerator =
 
             match propertyName with
             | None -> node
-            | Some propertyName -> assertNotNull propertyName node
+            | Some propertyName -> assertPropertyExists 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 =
-        let objectToParse = SynExpr.createIdent "node" |> SynExpr.index propertyName
-        parseNode (Some propertyName) options fieldType objectToParse
+        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 isJsonNumberHandling (literal : LongIdent) : bool =
         match List.rev literal |> List.map (fun ident -> ident.idText) with
@@ -350,10 +557,7 @@ 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 ->
@@ -383,15 +587,13 @@ 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 =
@@ -484,7 +686,7 @@ module internal JsonParseGenerator =
         let finalConstruction =
             fields
             |> List.mapi (fun i fieldData -> SynLongIdent.createI fieldData.Ident, SynExpr.createIdent $"arg_%i{i}")
-            |> AstHelper.instantiateRecord
+            |> SynExpr.createRecord None
 
         (finalConstruction, assignments)
         ||> List.fold (fun final assignment -> SynExpr.createLet [ assignment ] final)
@@ -509,7 +711,8 @@ module internal JsonParseGenerator =
                     |> SynExpr.createLet
                         [
                             SynExpr.index (SynExpr.CreateConst "data") (SynExpr.createIdent "node")
-                            |> assertNotNull (SynExpr.CreateConst "data")
+                            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
+                            |> assertPropertyExists (SynExpr.CreateConst "data")
                             |> SynBinding.basic [ Ident.create "node" ] []
                         ]
 
@@ -557,7 +760,8 @@ module internal JsonParseGenerator =
 
                 SynExpr.createIdent "node"
                 |> SynExpr.index property
-                |> assertNotNull property
+                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Option" ; "ofObj" ])
+                |> assertPropertyExists property
                 |> SynExpr.pipeThroughFunction (
                     SynExpr.createLambda "v" (SynExpr.callGenericMethod' "GetValue" "string" (SynExpr.createIdent "v"))
                 )
@@ -702,17 +906,21 @@ type JsonParseGenerator () =
         member _.ValidInputExtensions = [ ".fs" ]
 
         member _.Generate (context : GeneratorContext) =
+            let targetedTypes =
+                MyriadParamParser.render context.AdditionalParameters
+                |> Map.map (fun _ v -> v.Split '!' |> Array.toList |> List.map DesiredGenerator.Parse)
+
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
             let relevantTypes =
-                Ast.extractTypeDefn ast
+                Ast.getTypes ast
                 |> List.map (fun (name, defns) ->
                     defns
                     |> List.choose (fun defn ->
-                        if Ast.isRecord defn then Some defn
-                        elif Ast.isDu defn then Some defn
-                        elif AstHelper.isEnum defn then Some defn
+                        if SynTypeDefn.isRecord defn then Some defn
+                        elif SynTypeDefn.isDu defn then Some defn
+                        elif SynTypeDefn.isEnum defn then Some defn
                         else None
                     )
                     |> fun defns -> name, defns
@@ -723,8 +931,29 @@ type JsonParseGenerator () =
                 |> List.choose (fun (ns, types) ->
                     types
                     |> List.choose (fun typeDef ->
-                        match Ast.getAttribute<JsonParseAttribute> typeDef with
-                        | None -> None
+                        match SynTypeDefn.getAttribute typeof<JsonParseAttribute>.Name typeDef with
+                        | None ->
+                            let name = SynTypeDefn.getName typeDef |> List.map _.idText |> String.concat "."
+
+                            match Map.tryFind name targetedTypes with
+                            | Some desired ->
+                                desired
+                                |> List.tryPick (fun generator ->
+                                    match generator with
+                                    | DesiredGenerator.JsonParse arg ->
+                                        let spec =
+                                            {
+                                                ExtensionMethods =
+                                                    arg
+                                                    |> Option.defaultValue
+                                                        JsonParseAttribute.DefaultIsExtensionMethod
+                                            }
+
+                                        Some (typeDef, spec)
+                                    | _ -> None
+                                )
+                            | _ -> None
+
                         | Some attr ->
                             let arg =
                                 match SynExpr.stripOptionalParen attr.ArgExpr with

WoofWare.Myriad.Plugins/JsonSerializeGenerator.fs

@@ -3,30 +3,107 @@ namespace WoofWare.Myriad.Plugins
 open System
 open System.Text
 open Fantomas.FCS.Syntax
+open WoofWare.Whippet.Fantomas
 
 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. 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" ])
+    // 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"
 
     /// 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.
-    let rec serializeNode (fieldType : SynType) : SynExpr * bool =
+    and serializeNodeNonNullable (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 _
@@ -35,8 +112,21 @@ module internal JsonSerializeGenerator =
         | Guid
         | Uri ->
             // JsonValue.Create<type>
-            SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ]
-            |> SynExpr.typeApp [ fieldType ]
+            (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"
             |> fun e -> e, false
         | DateTimeOffset ->
             // fun field -> field.ToString("o") |> JsonValue.Create<string>
@@ -49,41 +139,17 @@ 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,
@@ -94,7 +160,17 @@ module internal JsonSerializeGenerator =
                     SynExpr.createIdent "field",
                     SynExpr.applyFunction
                         (SynExpr.createLongIdent [ "arr" ; "Add" ])
-                        (SynExpr.paren (SynExpr.applyFunction (fst (serializeNode ty)) (SynExpr.createIdent "mem"))),
+                        (SynExpr.paren (
+                            SynExpr.applyFunction
+                                (fst (
+                                    (if isNullableChild then
+                                         serializeNodeNullable
+                                     else
+                                         serializeNodeNonNullable)
+                                        ty
+                                ))
+                                (SynExpr.createIdent "mem")
+                        )),
                     range0
                 )
                 SynExpr.createIdent "arr"
@@ -108,15 +184,28 @@ 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,
@@ -129,10 +218,33 @@ module internal JsonSerializeGenerator =
                         (SynExpr.createLongIdent [ "ret" ; "Add" ])
                         (SynExpr.tuple
                             [
-                                SynExpr.createLongIdent [ "key" ; "ToString" ]
-                                |> SynExpr.applyTo (SynExpr.CreateConst ())
-                                SynExpr.applyFunction (fst (serializeNode valueType)) (SynExpr.createIdent "value")
-                            ]),
+                                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 ()))
+                        ],
                     range0
                 )
                 SynExpr.createIdent "ret"
@@ -147,7 +259,7 @@ module internal JsonSerializeGenerator =
             |> SynExpr.createLambda "field"
             |> fun e -> e, false
         | JsonNode -> SynExpr.createIdent "id", true
-        | Unit ->
+        | UnitType ->
             SynExpr.createLambda
                 "value"
                 (SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonObject" ]
@@ -165,13 +277,24 @@ 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 =
-        [
-            propertyName
-            SynExpr.pipeThroughFunction
-                (fst (serializeNode fieldType))
-                (SynExpr.createLongIdent' [ Ident.create "input" ; fieldId ])
-            |> SynExpr.paren
-        ]
+        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 ]
         |> SynExpr.tuple
         |> SynExpr.applyFunction (SynExpr.createLongIdent [ "node" ; "Add" ])
 
@@ -179,8 +302,7 @@ 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
@@ -197,8 +319,7 @@ 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
 
@@ -279,7 +400,10 @@ module internal JsonSerializeGenerator =
                     | DictionaryType (String, v) -> v
                     | _ -> failwith "Expected JsonExtensionData to be a Dictionary<string, something>"
 
-                let serialise = fst (serializeNode valType)
+                let serialise =
+                    match JsonNodeWithNullability.Identify valType with
+                    | CannotBeNull -> fst (serializeNodeNonNullable valType)
+                    | Nullable -> fst (serializeNodeNullable valType)
 
                 SynExpr.createIdent "node"
                 |> SynExpr.callMethodArg
@@ -344,7 +468,15 @@ module internal JsonSerializeGenerator =
                     let propertyName = getPropertyName (Option.get fieldData.Ident) fieldData.Attrs
 
                     let node =
-                        SynExpr.applyFunction (fst (serializeNode fieldData.Type)) (SynExpr.createIdent caseName)
+                        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)
 
                     [ propertyName ; node ]
                     |> SynExpr.tuple
@@ -519,17 +651,21 @@ type JsonSerializeGenerator () =
         member _.ValidInputExtensions = [ ".fs" ]
 
         member _.Generate (context : GeneratorContext) =
+            let targetedTypes =
+                MyriadParamParser.render context.AdditionalParameters
+                |> Map.map (fun _ v -> v.Split '!' |> Array.toList |> List.map DesiredGenerator.Parse)
+
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
             let relevantTypes =
-                Ast.extractTypeDefn ast
+                Ast.getTypes ast
                 |> List.map (fun (name, defns) ->
                     defns
                     |> List.choose (fun defn ->
-                        if Ast.isRecord defn then Some defn
-                        elif Ast.isDu defn then Some defn
-                        elif AstHelper.isEnum defn then Some defn
+                        if SynTypeDefn.isRecord defn then Some defn
+                        elif SynTypeDefn.isDu defn then Some defn
+                        elif SynTypeDefn.isEnum defn then Some defn
                         else None
                     )
                     |> fun defns -> name, defns
@@ -540,8 +676,29 @@ type JsonSerializeGenerator () =
                 |> List.choose (fun (ns, types) ->
                     types
                     |> List.choose (fun typeDef ->
-                        match Ast.getAttribute<JsonSerializeAttribute> typeDef with
-                        | None -> None
+                        match SynTypeDefn.getAttribute typeof<JsonSerializeAttribute>.Name typeDef with
+                        | None ->
+                            let name = SynTypeDefn.getName typeDef |> List.map _.idText |> String.concat "."
+
+                            match Map.tryFind name targetedTypes with
+                            | Some desired ->
+                                desired
+                                |> List.tryPick (fun generator ->
+                                    match generator with
+                                    | DesiredGenerator.JsonSerialize arg ->
+                                        let spec =
+                                            {
+                                                ExtensionMethods =
+                                                    arg
+                                                    |> Option.defaultValue
+                                                        JsonSerializeAttribute.DefaultIsExtensionMethod
+                                            }
+
+                                        Some (typeDef, spec)
+                                    | _ -> None
+                                )
+                            | _ -> None
+
                         | Some attr ->
                             let arg =
                                 match SynExpr.stripOptionalParen attr.ArgExpr with

WoofWare.Myriad.Plugins/List.fs

@@ -12,3 +12,12 @@ module private List =
             )
 
         List.rev xs, List.rev ys
+
+    let allSome<'a> (l : 'a option list) : 'a list option =
+        let rec go acc (l : 'a option list) =
+            match l with
+            | [] -> Some (List.rev acc)
+            | None :: _ -> None
+            | Some head :: tail -> go (head :: acc) tail
+
+        go [] l

WoofWare.Myriad.Plugins/Measure.fs

@@ -1,6 +1,7 @@
 namespace WoofWare.Myriad.Plugins
 
 open Fantomas.FCS.Syntax
+open WoofWare.Whippet.Fantomas
 
 [<RequireQualifiedAccess>]
 module internal Measure =
@@ -20,5 +21,4 @@ module internal Measure =
         | l ->
             let l = String.concat "." l
             failwith $"unrecognised type for measure: %s{l}"
-
         |> SynExpr.createLongIdent

WoofWare.Myriad.Plugins/MyriadParamParser.fs

@@ -0,0 +1,42 @@
+namespace WoofWare.Myriad.Plugins
+
+open System.Collections.Generic
+
+[<RequireQualifiedAccess>]
+module internal MyriadParamParser =
+    (*
+      An apparent bug in Myriad's argument parsing means that this:
+
+        <MyriadParams>
+            <Foo>bar</Foo>
+            <Baz>quux</Baz>
+        </MyriadParams>
+
+      leads to this:
+
+        Foo = "bar;Baz=quux"
+
+      I'm not going to put effort into fixing Myriad, though, because I want
+      to build something much more powerful instead.
+    *)
+
+    /// Call this with `context.AdditionalParameters`.
+    let render (pars : IDictionary<string, string>) : Map<string, string> =
+        match pars.Count with
+        | 0 -> Map.empty
+        | 1 ->
+            let (KeyValue (key, value)) = pars |> Seq.exactlyOne
+
+            match value.Split ';' |> Seq.toList with
+            | [] -> failwith "LOGIC ERROR"
+            | value :: rest ->
+                rest
+                |> Seq.map (fun v ->
+                    let split = v.Split '='
+                    split.[0], String.concat "=" split.[1..]
+                )
+                |> Seq.append (Seq.singleton (key, value))
+                |> Map.ofSeq
+        | _ ->
+            // assume the Myriad bug is fixed!
+            pars |> Seq.map (fun (KeyValue (k, v)) -> k, v) |> Map.ofSeq

WoofWare.Myriad.Plugins/Parameters.fs

@@ -0,0 +1,27 @@
+namespace WoofWare.Myriad.Plugins
+
+type internal DesiredGenerator =
+    | InterfaceMock of isInternal : bool option
+    | CapturingInterfaceMock of isInternal : bool option
+    | JsonParse of extensionMethod : bool option
+    | JsonSerialize of extensionMethod : bool option
+    | HttpClient of extensionMethod : bool option
+
+    static member Parse (s : string) =
+        match s with
+        | "GenerateMock" -> DesiredGenerator.InterfaceMock None
+        | "GenerateMock(true)" -> DesiredGenerator.InterfaceMock (Some true)
+        | "GenerateMock(false)" -> DesiredGenerator.InterfaceMock (Some false)
+        | "GenerateCapturingMock" -> DesiredGenerator.CapturingInterfaceMock None
+        | "GenerateCapturingMock(true)" -> DesiredGenerator.CapturingInterfaceMock (Some true)
+        | "GenerateCapturingMock(false)" -> DesiredGenerator.CapturingInterfaceMock (Some false)
+        | "JsonParse" -> DesiredGenerator.JsonParse None
+        | "JsonParse(true)" -> DesiredGenerator.JsonParse (Some true)
+        | "JsonParse(false)" -> DesiredGenerator.JsonParse (Some false)
+        | "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/Primitives.fs

@@ -1,32 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal Primitives =
-    /// Given e.g. "byte", returns "System.Byte".
-    let qualifyType (typeName : string) : LongIdent option =
-        match typeName with
-        | "float32"
-        | "single" -> [ "System" ; "Single" ] |> Some
-        | "float"
-        | "double" -> [ "System" ; "Double" ] |> Some
-        | "byte"
-        | "uint8" -> [ "System" ; "Byte" ] |> Some
-        | "sbyte"
-        | "int8" -> [ "System" ; "SByte" ] |> Some
-        | "int16" -> [ "System" ; "Int16" ] |> Some
-        | "int"
-        | "int32" -> [ "System" ; "Int32" ] |> Some
-        | "int64" -> [ "System" ; "Int64" ] |> Some
-        | "uint16" -> [ "System" ; "UInt16" ] |> Some
-        | "uint"
-        | "uint32" -> [ "System" ; "UInt32" ] |> Some
-        | "uint64" -> [ "System" ; "UInt64" ] |> Some
-        | "char" -> [ "System" ; "Char" ] |> Some
-        | "decimal" -> [ "System" ; "Decimal" ] |> Some
-        | "string" -> [ "System" ; "String" ] |> Some
-        | "bool" -> [ "System" ; "Boolean" ] |> Some
-        | _ -> None
-        |> Option.map (List.map (fun i -> (Ident (i, range0))))

WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs

@@ -1,7 +1,9 @@
 namespace WoofWare.Myriad.Plugins
 
+open System
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.Xml
+open WoofWare.Whippet.Fantomas
 
 [<RequireQualifiedAccess>]
 module internal RemoveOptionsGenerator =
@@ -58,7 +60,7 @@ module internal RemoveOptionsGenerator =
                 Attributes = []
             }
 
-        let typeDecl = AstHelper.defineRecordType record
+        let typeDecl = RecordType.ToAst record
 
         SynModuleDecl.Types ([ typeDecl ], range0)
 
@@ -95,7 +97,7 @@ module internal RemoveOptionsGenerator =
 
                 SynLongIdent.createI fieldData.Ident, body
             )
-            |> AstHelper.instantiateRecord
+            |> SynExpr.createRecord None
 
         SynBinding.basic
             [ functionName ]
@@ -145,41 +147,31 @@ type RemoveOptionsGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let records = Ast.extractRecords ast
+            let records = Ast.getRecords ast
 
             let namespaceAndRecords =
                 records
-                |> List.choose (fun (ns, types) ->
-                    match types |> List.filter Ast.hasAttribute<RemoveOptionsAttribute> 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)
+                |> 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)
                 )
 
             let modules =
                 namespaceAndRecords
-                |> List.collect (fun (ns, records) ->
-                    records
-                    |> List.map (fun record ->
-                        let recordModule = RemoveOptionsGenerator.createRecordModule ns record
-                        recordModule
-                    )
-                )
+                |> List.map (fun (ns, record) -> RemoveOptionsGenerator.createRecordModule ns record)
 
             Output.Ast modules

WoofWare.Myriad.Plugins/SurfaceBaseline.txt

@@ -1,9 +1,58 @@
 WoofWare.Myriad.Plugins.ArgParserGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.ArgParserGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.CapturingInterfaceMockGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
+WoofWare.Myriad.Plugins.CapturingInterfaceMockGenerator..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.CreateCatamorphismGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.CreateCatamorphismGenerator..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.HttpClientGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.HttpClientGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.HttpMethod inherit obj, implements WoofWare.Myriad.Plugins.HttpMethod System.IEquatable, System.Collections.IStructuralEquatable, WoofWare.Myriad.Plugins.HttpMethod System.IComparable, System.IComparable, System.Collections.IStructuralComparable - union type with 8 cases
+WoofWare.Myriad.Plugins.HttpMethod+Tags inherit obj
+WoofWare.Myriad.Plugins.HttpMethod+Tags.Delete [static field]: int = 2
+WoofWare.Myriad.Plugins.HttpMethod+Tags.Get [static field]: int = 0
+WoofWare.Myriad.Plugins.HttpMethod+Tags.Head [static field]: int = 5
+WoofWare.Myriad.Plugins.HttpMethod+Tags.Options [static field]: int = 4
+WoofWare.Myriad.Plugins.HttpMethod+Tags.Patch [static field]: int = 3
+WoofWare.Myriad.Plugins.HttpMethod+Tags.Post [static field]: int = 1
+WoofWare.Myriad.Plugins.HttpMethod+Tags.Put [static field]: int = 6
+WoofWare.Myriad.Plugins.HttpMethod+Tags.Trace [static field]: int = 7
+WoofWare.Myriad.Plugins.HttpMethod.Delete [static property]: [read-only] WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.Equals [method]: (WoofWare.Myriad.Plugins.HttpMethod, System.Collections.IEqualityComparer) -> bool
+WoofWare.Myriad.Plugins.HttpMethod.Get [static property]: [read-only] WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.get_Delete [static method]: unit -> WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.get_Get [static method]: unit -> WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.get_Head [static method]: unit -> WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.get_IsDelete [method]: unit -> bool
+WoofWare.Myriad.Plugins.HttpMethod.get_IsGet [method]: unit -> bool
+WoofWare.Myriad.Plugins.HttpMethod.get_IsHead [method]: unit -> bool
+WoofWare.Myriad.Plugins.HttpMethod.get_IsOptions [method]: unit -> bool
+WoofWare.Myriad.Plugins.HttpMethod.get_IsPatch [method]: unit -> bool
+WoofWare.Myriad.Plugins.HttpMethod.get_IsPost [method]: unit -> bool
+WoofWare.Myriad.Plugins.HttpMethod.get_IsPut [method]: unit -> bool
+WoofWare.Myriad.Plugins.HttpMethod.get_IsTrace [method]: unit -> bool
+WoofWare.Myriad.Plugins.HttpMethod.get_Options [static method]: unit -> WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.get_Patch [static method]: unit -> WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.get_Post [static method]: unit -> WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.get_Put [static method]: unit -> WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.get_Tag [method]: unit -> int
+WoofWare.Myriad.Plugins.HttpMethod.get_Trace [static method]: unit -> WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.Head [static property]: [read-only] WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.IsDelete [property]: [read-only] bool
+WoofWare.Myriad.Plugins.HttpMethod.IsGet [property]: [read-only] bool
+WoofWare.Myriad.Plugins.HttpMethod.IsHead [property]: [read-only] bool
+WoofWare.Myriad.Plugins.HttpMethod.IsOptions [property]: [read-only] bool
+WoofWare.Myriad.Plugins.HttpMethod.IsPatch [property]: [read-only] bool
+WoofWare.Myriad.Plugins.HttpMethod.IsPost [property]: [read-only] bool
+WoofWare.Myriad.Plugins.HttpMethod.IsPut [property]: [read-only] bool
+WoofWare.Myriad.Plugins.HttpMethod.IsTrace [property]: [read-only] bool
+WoofWare.Myriad.Plugins.HttpMethod.Options [static property]: [read-only] WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.Parse [static method]: string -> WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.Patch [static property]: [read-only] WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.Post [static property]: [read-only] WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.Put [static property]: [read-only] WoofWare.Myriad.Plugins.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.Tag [property]: [read-only] int
+WoofWare.Myriad.Plugins.HttpMethod.ToDotNet [method]: unit -> System.Net.Http.HttpMethod
+WoofWare.Myriad.Plugins.HttpMethod.Trace [static property]: [read-only] WoofWare.Myriad.Plugins.HttpMethod
 WoofWare.Myriad.Plugins.InterfaceMockGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.InterfaceMockGenerator..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.JsonParseGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
@@ -12,26 +61,5 @@ WoofWare.Myriad.Plugins.JsonSerializeGenerator inherit obj, implements Myriad.Co
 WoofWare.Myriad.Plugins.JsonSerializeGenerator..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.RemoveOptionsGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.RemoveOptionsGenerator..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.SynFieldData`1 inherit obj
-WoofWare.Myriad.Plugins.SynFieldData`1..ctor [constructor]: (Fantomas.FCS.Syntax.SynAttribute list, 'Ident, Fantomas.FCS.Syntax.SynType)
-WoofWare.Myriad.Plugins.SynFieldData`1.Attrs [property]: [read-only] Fantomas.FCS.Syntax.SynAttribute list
-WoofWare.Myriad.Plugins.SynFieldData`1.get_Attrs [method]: unit -> Fantomas.FCS.Syntax.SynAttribute list
-WoofWare.Myriad.Plugins.SynFieldData`1.get_Ident [method]: unit -> 'Ident
-WoofWare.Myriad.Plugins.SynFieldData`1.get_Type [method]: unit -> Fantomas.FCS.Syntax.SynType
-WoofWare.Myriad.Plugins.SynFieldData`1.Ident [property]: [read-only] 'Ident
-WoofWare.Myriad.Plugins.SynFieldData`1.Type [property]: [read-only] Fantomas.FCS.Syntax.SynType
-WoofWare.Myriad.Plugins.UnionCase inherit obj
-WoofWare.Myriad.Plugins.UnionCase.mapIdentFields [static method]: ('a -> 'b) -> 'a WoofWare.Myriad.Plugins.UnionCase -> 'b WoofWare.Myriad.Plugins.UnionCase
-WoofWare.Myriad.Plugins.UnionCase.ofSynUnionCase [static method]: Fantomas.FCS.Syntax.SynUnionCase -> Fantomas.FCS.Syntax.Ident option WoofWare.Myriad.Plugins.UnionCase
-WoofWare.Myriad.Plugins.UnionCase`1 inherit obj
-WoofWare.Myriad.Plugins.UnionCase`1..ctor [constructor]: (Fantomas.FCS.Syntax.Ident, Fantomas.FCS.Xml.PreXmlDoc option, Fantomas.FCS.Syntax.SynAccess option, Fantomas.FCS.Syntax.SynAttribute list, 'ident WoofWare.Myriad.Plugins.SynFieldData list)
-WoofWare.Myriad.Plugins.UnionCase`1.Access [property]: [read-only] Fantomas.FCS.Syntax.SynAccess option
-WoofWare.Myriad.Plugins.UnionCase`1.Attributes [property]: [read-only] Fantomas.FCS.Syntax.SynAttribute list
-WoofWare.Myriad.Plugins.UnionCase`1.Fields [property]: [read-only] 'ident WoofWare.Myriad.Plugins.SynFieldData list
-WoofWare.Myriad.Plugins.UnionCase`1.get_Access [method]: unit -> Fantomas.FCS.Syntax.SynAccess option
-WoofWare.Myriad.Plugins.UnionCase`1.get_Attributes [method]: unit -> Fantomas.FCS.Syntax.SynAttribute list
-WoofWare.Myriad.Plugins.UnionCase`1.get_Fields [method]: unit -> 'ident WoofWare.Myriad.Plugins.SynFieldData list
-WoofWare.Myriad.Plugins.UnionCase`1.get_Name [method]: unit -> Fantomas.FCS.Syntax.Ident
-WoofWare.Myriad.Plugins.UnionCase`1.get_XmlDoc [method]: unit -> Fantomas.FCS.Xml.PreXmlDoc option
-WoofWare.Myriad.Plugins.UnionCase`1.Name [property]: [read-only] Fantomas.FCS.Syntax.Ident
-WoofWare.Myriad.Plugins.UnionCase`1.XmlDoc [property]: [read-only] Fantomas.FCS.Xml.PreXmlDoc option
+WoofWare.Myriad.Plugins.SwaggerClientGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
+WoofWare.Myriad.Plugins.SwaggerClientGenerator..ctor [constructor]: unit

WoofWare.Myriad.Plugins/SwaggerClientGenerator.fs

@@ -0,0 +1,735 @@
+namespace WoofWare.Myriad.Plugins
+
+open System.Collections.Generic
+open System.Threading
+open Fantomas.FCS.Syntax
+open Fantomas.FCS.Xml
+open Fantomas.FCS.Text.Range
+open WoofWare.Whippet.Fantomas
+
+type internal SwaggerClientConfig =
+    {
+        /// Additionally create a mock with `InterfaceMockGenerator`, with the given boolean arg.
+        /// (`None` means "no mock".)
+        CreateMock : bool option
+        ClassName : string
+    }
+
+type internal Produces =
+    // TODO: this will cope with decoding JSON, plain text, etc
+    | Produces of string
+    | OctetStream
+
+type internal Endpoint =
+    {
+        DocString : PreXmlDoc
+        Produces : Produces
+        ReturnType : SwaggerV2.Definition
+        Method : WoofWare.Myriad.Plugins.HttpMethod
+        Operation : SwaggerV2.OperationId
+        Parameters : SwaggerV2.SwaggerParameter list
+        Endpoint : string
+    }
+
+type internal TypeEntry =
+    {
+        /// If we had to define a type for this, here it is.
+        FSharpDefinition : SynTypeDefn option
+        /// SynType you use in e.g. a type annotation to refer to this type in F# code.
+        Signature : SynType
+    }
+
+type internal Types =
+    {
+        ByHandle : IReadOnlyDictionary<string, TypeEntry>
+        ByDefinition : IReadOnlyDictionary<SwaggerV2.Definition, TypeEntry>
+    }
+
+[<RequireQualifiedAccess>]
+module internal SwaggerClientGenerator =
+
+    let internal log (_ : string) = ()
+
+    let renderType (types : Types) (defn : SwaggerV2.Definition) : SynType option =
+        match types.ByDefinition.TryGetValue defn with
+        | true, v -> Some v.Signature
+        | false, _ ->
+
+        match defn with
+        | SwaggerV2.Definition.Handle h ->
+            match types.ByHandle.TryGetValue h with
+            | false, _ -> None
+            | true, v -> Some v.Signature
+        | SwaggerV2.Definition.Object _ -> failwith "should not hit"
+        | SwaggerV2.Definition.Array _ -> failwith "should not hit"
+        | SwaggerV2.Definition.Unspecified -> failwith "should not hit"
+        | SwaggerV2.Definition.String -> SynType.string |> Some
+        | SwaggerV2.Definition.Boolean -> SynType.bool |> Some
+        | SwaggerV2.Definition.Integer _ -> SynType.int |> Some
+        | SwaggerV2.Definition.File -> SynType.createLongIdent' [ "System" ; "IO" ; "Stream" ] |> Some
+
+    /// Returns None if we lacked the information required to do this.
+    /// bigCache is a map of e.g. {"securityDefinition": {Defn : F# type}}.
+    let rec defnToType
+        (anonymousTypeCount : int ref)
+        (handlesMap : Dictionary<string, TypeEntry>)
+        (bigCache : Dictionary<string, Dictionary<SwaggerV2.Definition, TypeEntry>>)
+        (thisKey : string)
+        (typeName : string option)
+        (d : SwaggerV2.Definition)
+        : TypeEntry option
+        =
+        let cache =
+            match bigCache.TryGetValue thisKey with
+            | false, _ ->
+                let d = Dictionary ()
+                bigCache.Add (thisKey, d)
+                d
+            | true, d -> d
+
+        let handleKey =
+            match typeName with
+            | None -> None
+            | Some typeName -> $"#/%s{thisKey}/%s{typeName}" |> Some
+
+        match handleKey with
+        | Some hk when handlesMap.ContainsKey hk ->
+            let result = handlesMap.[hk]
+            cache.[d] <- result
+            Some result
+
+        | _ ->
+
+        match cache.TryGetValue d with
+        | true, v ->
+            match handleKey with
+            | None -> ()
+            | Some key -> handlesMap.Add (key, v)
+
+            Some v
+        | false, _ ->
+
+        let result =
+            match d with
+            | SwaggerV2.Definition.Object obj ->
+                let requiredFields = obj.Required |> Option.defaultValue [] |> Set.ofList
+
+                let namedProperties =
+                    obj.Properties
+                    |> Option.map Seq.cast
+                    |> Option.defaultValue Seq.empty
+                    |> Seq.map (fun (KeyValue (fieldName, defn)) ->
+                        // TODO this is a horrible hack and is incomplete, e.g. if we contain an array of ourself
+                        // Special case for when this is a reference to this very type
+                        let isOurself =
+                            match defn with
+                            | SwaggerV2.Definition.Handle h ->
+                                match h.Split '/' with
+                                | [| "#" ; location ; ty |] when location = thisKey && Some ty = typeName ->
+                                    SynType.named ty |> Some
+                                | _ -> None
+                            | _ -> None
+
+                        let jsonPropertyName =
+                            SynExpr.CreateConst (fieldName : string)
+                            |> SynAttribute.create (
+                                SynLongIdent.createS'
+                                    [ "System" ; "Text" ; "Json" ; "Serialization" ; "JsonPropertyName" ]
+                            )
+
+                        match isOurself with
+                        | Some alreadyDone ->
+                            let ty =
+                                if Set.contains fieldName requiredFields then
+                                    alreadyDone
+                                else
+                                    SynType.option alreadyDone
+
+                            {
+                                Attrs = [ jsonPropertyName ]
+                                Type = ty
+                                Ident = Some (Ident.createSanitisedTypeName fieldName)
+                            }
+                            |> SynField.make
+                            |> Some
+                        | None ->
+
+                        let defn' = defnToType anonymousTypeCount handlesMap bigCache thisKey None defn
+
+                        match defn' with
+                        | None -> None
+                        | Some defn' ->
+                            let ty =
+                                if Set.contains fieldName requiredFields then
+                                    defn'.Signature
+                                else
+                                    defn'.Signature |> SynType.option
+
+                            {
+                                Attrs = [ jsonPropertyName ]
+                                Ident = Ident.createSanitisedTypeName fieldName |> Some
+                                Type = ty
+                            }
+                            |> SynField.make
+                            |> Some
+                    )
+                    |> Seq.toList
+
+                let additionalProperties =
+                    match obj.AdditionalProperties with
+                    | None ->
+                        {
+                            Attrs =
+                                [
+                                    SynAttribute.create
+                                        (SynLongIdent.createS'
+                                            [ "System" ; "Text" ; "Json" ; "Serialization" ; "JsonExtensionData" ])
+                                        (SynExpr.CreateConst ())
+                                ]
+                            Ident = Ident.create "AdditionalProperties" |> Some
+                            Type =
+                                SynType.app'
+                                    (SynType.createLongIdent' [ "System" ; "Collections" ; "Generic" ; "Dictionary" ])
+                                    [
+                                        SynType.string
+                                        SynType.createLongIdent' [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
+                                    ]
+                        }
+                        |> SynField.make
+                        |> List.singleton
+                        |> Some
+                    | Some SwaggerV2.AdditionalProperties.Never -> Some []
+                    | Some (SwaggerV2.AdditionalProperties.Constrained defn) ->
+                        let defn' = defnToType anonymousTypeCount handlesMap bigCache thisKey None defn
+
+                        match defn' with
+                        | None -> None
+                        | Some defn' ->
+                            {
+                                Attrs =
+                                    [
+                                        SynAttribute.create
+                                            (SynLongIdent.createS'
+                                                [ "System" ; "Text" ; "Json" ; "Serialization" ; "JsonExtensionData" ])
+                                            (SynExpr.CreateConst ())
+                                    ]
+                                Ident = Ident.create "AdditionalProperties" |> Some
+                                Type =
+                                    SynType.app'
+                                        (SynType.createLongIdent'
+                                            [ "System" ; "Collections" ; "Generic" ; "Dictionary" ])
+                                        [ SynType.string ; defn'.Signature ]
+                            }
+                            |> SynField.make
+                            |> List.singleton
+                            |> Some
+
+                match additionalProperties with
+                | None -> None
+                | Some additionalProperties ->
+
+                match List.allSome namedProperties with
+                | None -> None
+                | Some namedProperties ->
+
+                let fSharpTypeName =
+                    match typeName with
+                    | None -> $"Type%i{Interlocked.Increment anonymousTypeCount}"
+                    | Some typeName -> typeName
+
+                let properties = additionalProperties @ namedProperties
+
+                let properties =
+                    if properties.IsEmpty then
+                        // sigh, they didn't give us any properties at all; let's make one up
+                        {
+                            Attrs = []
+                            Ident = Some (Ident.create "_SchemaUnspecified")
+                            Type = SynType.obj
+                        }
+                        |> SynField.make
+                        |> List.singleton
+                    else
+                        properties
+
+                let defn =
+                    let sci =
+                        SynComponentInfo.create (Ident.createSanitisedTypeName fSharpTypeName)
+                        |> SynComponentInfo.addAttributes
+                            [
+                                SynAttribute.create (SynLongIdent.createS' [ "JsonParse" ]) (SynExpr.CreateConst true)
+                                SynAttribute.create
+                                    (SynLongIdent.createS' [ "JsonSerialize" ])
+                                    (SynExpr.CreateConst true)
+                            ]
+                        |> fun sci ->
+                            match obj.Description with
+                            | None -> sci
+                            | Some doc -> sci |> SynComponentInfo.withDocString (PreXmlDoc.create doc)
+
+                    properties |> SynTypeDefnRepr.record |> SynTypeDefn.create sci
+
+                let defn =
+                    {
+                        Signature = SynType.named fSharpTypeName
+                        FSharpDefinition = Some defn
+                    }
+
+                defn |> Some
+
+            | SwaggerV2.Definition.Array elt ->
+                let child = defnToType anonymousTypeCount handlesMap bigCache thisKey None elt.Items
+
+                match child with
+                | None -> None
+                | Some child ->
+                    let defn =
+                        {
+                            Signature = SynType.list child.Signature
+                            FSharpDefinition = None
+                        }
+
+                    Some defn
+            | SwaggerV2.Definition.String ->
+                {
+                    Signature = SynType.string
+                    FSharpDefinition = None
+                }
+                |> Some
+            | SwaggerV2.Definition.Boolean ->
+                {
+                    Signature = SynType.bool
+                    FSharpDefinition = None
+                }
+                |> Some
+            | SwaggerV2.Definition.Unspecified ->
+                {
+                    Signature = SynType.unit
+                    FSharpDefinition = None
+                }
+                |> Some
+            | SwaggerV2.Definition.Integer _ ->
+                {
+                    Signature = SynType.createLongIdent' [ "int" ]
+                    FSharpDefinition = None
+                }
+                |> Some
+            | SwaggerV2.Definition.File ->
+                {
+                    Signature = SynType.createLongIdent' [ "System" ; "IO" ; "Stream" ]
+                    FSharpDefinition = None
+                }
+                |> Some
+            | SwaggerV2.Definition.Handle s ->
+                let split = s.Split '/' |> List.ofArray
+
+                match split with
+                | [ "#" ; _location ; _handle ] ->
+                    match handlesMap.TryGetValue s with
+                    | false, _ -> None
+                    | true, computed ->
+                        let defn =
+                            {
+                                FSharpDefinition = None
+                                Signature = computed.Signature
+                            }
+
+                        defn |> Some
+                | _ -> failwith $"we don't know how to deal with object handle %s{s}"
+
+        match result with
+        | None -> None
+        | Some result ->
+
+        match handleKey with
+        | None -> ()
+        | Some handleKey -> handlesMap.Add (handleKey, result)
+
+        cache.Add (d, result)
+        Some result
+
+    let instantiateRequiredTypes (types : Types) : SynModuleDecl =
+        types.ByDefinition
+        |> Seq.choose (fun (KeyValue (_defn, typeEntry)) -> typeEntry.FSharpDefinition)
+        |> Seq.toList
+        |> SynModuleDecl.createTypes
+
+    type private IsIn =
+        | Path of str : string
+        | Query of str : string
+        | Body
+
+    let computeType
+        (options : SwaggerClientConfig)
+        (basePath : string)
+        (types : Types)
+        (clientDocString : PreXmlDoc)
+        (endpoints : Endpoint list)
+        : SynModuleDecl list
+        =
+        endpoints
+        |> List.choose (fun ep ->
+            let name = (Ident.createSanitisedTypeName (ep.Operation.ToString ())).idText
+
+            match renderType types ep.ReturnType with
+            | None ->
+                log $"Skipping %O{ep.Operation}: Couldn't render return type: %O{ep.ReturnType}"
+                None
+            | Some returnType ->
+
+            let pars =
+                ep.Parameters
+                |> List.map (fun par ->
+                    let inParam =
+                        match par.In with
+                        | SwaggerV2.ParameterIn.Unrecognised (f, name) ->
+                            log
+                                $"Skipping %O{ep.Operation} at %s{ep.Endpoint}: unrecognised In parameter %s{f} with name %s{name}"
+
+                            None
+                        | SwaggerV2.ParameterIn.Body -> Some IsIn.Body
+                        | SwaggerV2.ParameterIn.Query name -> Some (IsIn.Query name)
+                        | SwaggerV2.ParameterIn.Path name -> Some (IsIn.Path name)
+
+                    match inParam with
+                    | None -> None
+                    | Some inParam ->
+
+                    match renderType types par.Type with
+                    | None ->
+                        // Couldn't render the return type
+                        // failwith "Did not have a type here"
+                        log $"Skipping %O{ep.Operation}: Couldn't render parameter: %O{par.Type}"
+                        None
+                    | Some v -> Some (Ident.createSanitisedParamName par.Name, inParam, v)
+                )
+                |> List.allSome
+
+            match pars with
+            | None -> None
+            | Some pars ->
+
+            let arity =
+                SynValInfo.SynValInfo (
+                    [
+                        ep.Parameters
+                        |> List.map (fun par ->
+                            let name = par.Name |> Ident.create |> Some
+                            SynArgInfo.SynArgInfo ([], false, name)
+                        )
+                        |> fun l -> l @ [ SynArgInfo.SynArgInfo ([], true, Some (Ident.create "ct")) ]
+                    ],
+                    SynArgInfo.SynArgInfo ([], false, None)
+                )
+
+            let domain =
+                let ctParam =
+                    SynType.signatureParamOfType
+                        []
+                        (SynType.createLongIdent' [ "System" ; "Threading" ; "CancellationToken" ])
+                        true
+                        (Some (Ident.create "ct"))
+
+                let argParams =
+                    pars
+                    |> List.map (fun (ident, isIn, t) ->
+                        let attr : SynAttribute list =
+                            match isIn with
+                            | IsIn.Path name ->
+                                SynAttribute.create
+                                    (SynLongIdent.createS' [ "RestEase" ; "Path" ])
+                                    (SynExpr.CreateConst name)
+                                |> List.singleton
+                            | IsIn.Query name ->
+                                SynAttribute.create
+                                    (SynLongIdent.createS' [ "RestEase" ; "Query" ])
+                                    (SynExpr.CreateConst name)
+                                |> List.singleton
+                            | IsIn.Body ->
+                                SynAttribute.create
+                                    (SynLongIdent.createS' [ "RestEase" ; "Body" ])
+                                    (SynExpr.CreateConst ())
+                                |> List.singleton
+
+                        SynType.signatureParamOfType attr t false (Some ident)
+                    )
+
+                SynType.tupleNoParen (argParams @ [ ctParam ]) |> Option.get
+
+            let attrs =
+                [
+                    SynAttribute.create
+                        (SynLongIdent.createS' [ "RestEase" ; ep.Method.ToString () ])
+                        // Gitea, at least, starts with a `/`, which `Uri` then takes to indicate an absolute path.
+                        (SynExpr.CreateConst (ep.Endpoint.TrimStart '/'))
+
+                    match ep.Produces with
+                    | Produces.Produces contentType ->
+                        SynAttribute.create
+                            (SynLongIdent.createS' [ "RestEase" ; "Header" ])
+                            // Gitea, at least, starts with a `/`, which `Uri` then takes to indicate an absolute path.
+                            (SynExpr.tuple [ SynExpr.CreateConst "Content-Type" ; SynExpr.CreateConst contentType ])
+                    | Produces.OctetStream ->
+                        SynAttribute.create
+                            (SynLongIdent.createS' [ "RestEase" ; "Header" ])
+                            // Gitea, at least, starts with a `/`, which `Uri` then takes to indicate an absolute path.
+                            (SynExpr.tuple
+                                [
+                                    SynExpr.CreateConst "Content-Type"
+                                    SynExpr.CreateConst "application/octet-stream"
+                                ])
+                ]
+
+            returnType
+            |> SynType.task
+            |> SynType.toFun [ domain ]
+            |> SynMemberDefn.abstractMember attrs (SynIdent.createS name) None arity ep.DocString
+            |> Some
+        )
+        |> SynTypeDefnRepr.interfaceType
+        |> SynTypeDefn.create (
+            let attrs =
+                [
+                    yield SynAttribute.create (SynLongIdent.createS' [ "HttpClient" ]) (SynExpr.CreateConst false)
+                    yield
+                        SynAttribute.create
+                            (SynLongIdent.createS' [ "RestEase" ; "BasePath" ])
+                            (SynExpr.CreateConst basePath)
+                    match options.CreateMock with
+                    | None -> ()
+                    | Some createMockValue ->
+                        yield
+                            SynAttribute.create
+                                (SynLongIdent.createS' [ "GenerateMock" ])
+                                (SynExpr.CreateConst createMockValue)
+                ]
+
+            SynComponentInfo.create (Ident.create ("I" + options.ClassName))
+            |> SynComponentInfo.withDocString clientDocString
+            |> SynComponentInfo.addAttributes attrs
+        )
+        |> List.singleton
+        |> SynModuleDecl.createTypes
+        |> List.singleton
+
+open Myriad.Core
+open System.IO
+
+[<RequireQualifiedAccess>]
+module internal SwaggerV2Generator =
+    let generate (pars : Map<string, string>) (contents : SwaggerV2.SwaggerV2) : Output =
+        let scheme =
+            let preferred = SwaggerV2.Scheme "https"
+
+            if List.isEmpty contents.Schemes then
+                failwith "no schemes specified in API spec!"
+
+            if List.contains preferred contents.Schemes then
+                preferred
+            else
+                List.head contents.Schemes
+
+        let clientDocstring = contents.Info.Description |> PreXmlDoc.create
+
+        let basePath = contents.BasePath
+
+        let typeDefs =
+            let bigCache = Dictionary<_, Dictionary<_, _>> ()
+
+            let countAll () =
+                (0, bigCache) ||> Seq.fold (fun count (KeyValue (_, v)) -> count + v.Count)
+
+            let byHandle = Dictionary ()
+            let anonymousTypeCount = ref 0
+
+            let rec go (contents : ((string * SwaggerV2.Definition) * string) list) =
+                let lastRound = countAll ()
+
+                contents
+                |> List.filter (fun ((name, defn), defnClass) ->
+                    let doIt =
+                        SwaggerClientGenerator.defnToType
+                            anonymousTypeCount
+                            byHandle
+                            bigCache
+                            defnClass
+                            (Some name)
+                            defn
+
+                    match doIt with
+                    | None -> true
+                    | Some _ -> false
+                )
+                |> fun remaining ->
+                    if not remaining.IsEmpty then
+                        let currentCount = countAll ()
+
+                        if currentCount = lastRound then
+                            for (name, remaining), kind in remaining do
+                                SwaggerClientGenerator.log $"Remaining: %s{name} (%s{kind})"
+
+                            SwaggerClientGenerator.log "--------"
+
+                            for KeyValue (handle, defn) in byHandle do
+                                SwaggerClientGenerator.log $"Known: %s{handle} %O{defn}"
+
+                            // TODO: ohh noooooo the Gitea spec is genuinely circular,
+                            // it's impossible to construct a Repository type
+                            // we're going to have to somehow detect this case and break the cycle
+                            // by artificially making a property optional
+                            // :sob: Gitea why are you like this
+                            // failwith "Made no further progress rendering types"
+                            ()
+                        else
+                            go remaining
+
+            seq {
+                for defnClass in [ "definitions" ; "responses" ] do
+                    match defnClass with
+                    | "definitions" ->
+                        for KeyValue (k, v) in contents.Definitions do
+                            yield (k, v), defnClass
+                    | "responses" ->
+                        for KeyValue (k, v) in contents.Responses do
+                            yield (k, v.Schema), defnClass
+                    | _ -> failwith "oh no"
+            }
+            |> Seq.toList
+            |> go
+
+            let result = Dictionary ()
+
+            for KeyValue (_container, types) in bigCache do
+                for KeyValue (defn, rendered) in types do
+                    result.TryAdd (defn, rendered) |> ignore<bool>
+
+            {
+                ByHandle = byHandle
+                ByDefinition = result :> IReadOnlyDictionary<_, _>
+            }
+
+        let summary =
+            contents.Paths
+            |> Seq.collect (fun (KeyValue (path, endpoints)) ->
+                endpoints
+                |> Seq.choose (fun (KeyValue (method, endpoint)) ->
+                    let docstring = endpoint.Summary |> PreXmlDoc.create
+
+                    let produces =
+                        match endpoint.Produces with
+                        | None -> Produces.Produces "json"
+                        | Some [] -> failwith $"API specified empty Produces: %s{path} (%O{method})"
+                        | Some [ SwaggerV2.MimeType "application/octet-stream" ] -> Produces.OctetStream
+                        | Some [ SwaggerV2.MimeType "application/json" ] -> Produces.Produces "json"
+                        | Some [ SwaggerV2.MimeType (StartsWith "text/" t) ] -> Produces.Produces t
+                        | Some [ SwaggerV2.MimeType s ] ->
+                            failwithf
+                                $"we don't support non-JSON Produces right now, got: %s{s} (%s{path} %O{method})"
+                        | Some (_ :: _) ->
+                            failwith $"we don't support multiple Produces right now, at %s{path} (%O{method})"
+
+                    let returnType =
+                        endpoint.Responses
+                        |> Seq.choose (fun (KeyValue (response, defn)) ->
+                            if 200 <= response && response < 300 then
+                                Some defn
+                            else
+                                None
+                        )
+                        |> Seq.toList
+
+                    let returnType =
+                        match returnType with
+                        | [ t ] -> Some t
+                        | [] -> failwith $"got no successful response results, %s{path} %O{method}"
+                        | _ ->
+                            SwaggerClientGenerator.log
+                                $"Ignoring %s{path} %O{method} due to multiple success responses"
+                            // can't be bothered to work out how to deal with multiple success
+                            // results right now
+                            None
+
+                    match returnType with
+                    | None -> None
+                    | Some returnType ->
+
+                    {
+                        Method = method
+                        Produces = produces
+                        DocString = docstring
+                        ReturnType = returnType
+                        Operation = endpoint.OperationId
+                        Parameters = endpoint.Parameters |> Option.defaultValue []
+                        Endpoint = path
+                    }
+                    |> Some
+                )
+                |> Seq.toList
+            )
+            |> Seq.toList
+
+        let config =
+            let createMock =
+                match Map.tryFind "GENERATEMOCKVISIBILITY" pars with
+                | None -> None
+                | Some v ->
+                    match v.ToLowerInvariant () with
+                    | "internal" -> Some true
+                    | "public" -> Some false
+                    | _ ->
+                        failwith
+                            $"Expected GenerateMockVisibility parameter to be 'internal' or 'public', but was: '%s{v.ToLowerInvariant ()}'"
+
+            let className =
+                match Map.tryFind "CLASSNAME" pars with
+                | None -> failwith "You must supply the <ClassName /> parameter in <MyriadParams />."
+                | Some v -> v
+
+            {
+                CreateMock = createMock
+                ClassName = className
+            }
+
+        let ty =
+            SwaggerClientGenerator.computeType config basePath typeDefs clientDocstring summary
+
+        [
+            yield
+                SynModuleDecl.Open (
+                    SynOpenDeclTarget.ModuleOrNamespace (
+                        SynLongIdent.createS' [ "WoofWare" ; "Myriad" ; "Plugins" ],
+                        range0
+                    ),
+                    range0
+                )
+            yield SwaggerClientGenerator.instantiateRequiredTypes typeDefs
+            yield! ty
+        ]
+        |> SynModuleOrNamespace.createNamespace [ Ident.create config.ClassName ]
+        |> List.singleton
+        |> Output.Ast
+
+/// Myriad generator that stamps out an interface and class to access a Swagger-specified API.
+[<MyriadGenerator("swagger-client")>]
+type SwaggerClientGenerator () =
+
+    interface IMyriadGenerator with
+        member _.ValidInputExtensions = [ ".json" ]
+
+        member _.Generate (context : GeneratorContext) =
+            let pars = MyriadParamParser.render context.AdditionalParameters
+
+            let pars =
+                pars
+                |> Map.toSeq
+                |> Seq.map (fun (k, v) -> k.ToUpperInvariant (), v)
+                |> Map.ofSeq
+
+            if pars.IsEmpty then
+                failwith "No parameters given. You must supply the <ClassName /> parameter in <MyriadParams />."
+
+            let contents = File.ReadAllText context.InputFilename |> SwaggerV2.parse
+
+            match contents with
+            | Ok contents -> SwaggerV2Generator.generate pars contents
+            | Error node -> failwith "Input was not a Swagger 2 spec"

WoofWare.Myriad.Plugins/SwaggerV2.fs

@@ -0,0 +1,480 @@
+module internal WoofWare.Myriad.Plugins.SwaggerV2
+
+open System
+open System.Text.Json.Nodes
+
+/// A MIME type, like "application/json"
+type MimeType =
+    /// A MIME type, like "application/json"
+    | MimeType of string
+
+/// A URL scheme, like "https"
+type Scheme =
+    /// A URL scheme, like "https"
+    | Scheme of string
+
+/// "Licence information for the exposed API", whatever that means.
+type SwaggerLicense =
+    {
+        /// "The license name used for the API", whatever that means.
+        Name : string
+        /// Link to the license used. Mutually exclusive with `Identifier`.
+        Url : Uri option
+        /// SPDX license identifier. Mutually exclusive with `Url`.
+        Identifier : string option
+    }
+
+    /// Render a JsonObject into the strongly-typed version, performing sanity
+    /// checks and throwing on input that can't be parsed.
+    static member Parse (node : JsonObject) : SwaggerLicense =
+        let name = asString node "name"
+        let url = asOpt<string> node "url" |> Option.map Uri
+        let identifier = asOpt<string> node "identifier"
+
+        match url, identifier with
+        | Some _, Some _ -> failwith "Invalid license spec: cannot supply both URL and identifier"
+        | _, _ -> ()
+
+        {
+            Name = name
+            Url = url
+            Identifier = identifier
+        }
+
+/// Overall information about the API described by this Swagger spec.
+type SwaggerInfo =
+    {
+        /// Human-readable description of what this Swagger API is for.
+        /// Supports GitHub-flavoured markdown, apparently.
+        Description : string
+        /// Human-readable title of the service to which this is an API.
+        Title : string
+        /// The license applying to this schema. It's very unclear what this means.
+        /// The spec just says:
+        /// "Licence information for the exposed API"
+        License : SwaggerLicense
+        /// The version of this API (not the version of Swagger or the file defining the API!).
+        /// Strictly speaking this can be anything, but I am assuming it's roughly
+        /// SemVer.
+        Version : Version
+    }
+
+    /// Render a JsonObject into the strongly-typed version, performing sanity
+    /// checks and throwing on input that can't be parsed.
+    static member Parse (node : JsonObject) : SwaggerInfo =
+        let description = asString node "description"
+        let title = asString node "title"
+        let version = asString node "version" |> Version.Parse
+        let license = asObj node "license" |> SwaggerLicense.Parse
+
+        {
+            Description = description
+            Title = title
+            License = license
+            Version = version
+        }
+
+/// An "optional unique string used to describe an operation".
+/// If present, these are assumed to be unique among all operations described
+/// in the API.
+type OperationId =
+    /// An "optional unique string used to describe an operation".
+    /// If present, these are assumed to be unique among all operations described
+    /// in the API.
+    | OperationId of string
+
+    /// Round-trip string representation.
+    override this.ToString () =
+        match this with
+        | OperationId.OperationId s -> s
+
+/// Constraints on the `additionalProperties` (in the JSON schema sense).
+/// "Additional properties" are properties of a JSON object which were not
+/// listed in the schema.
+type AdditionalProperties =
+    /// No additional properties are allowed: all properties must have been
+    /// mentioned in the schema.
+    | Never
+    /// Additional properties are permitted, but if they exist, they must
+    /// match this schema definition.
+    | Constrained of Definition
+
+/// The Swagger schema lets you define types. An ObjectTypeDefinition
+/// is specifically the information about types defined as `"type": "object"`.
+and ObjectTypeDefinition =
+    {
+        /// Human-readable description of the purpose of this type.
+        Description : string option
+        /// Fields which any object must have to satisfy this type.
+        Properties : Map<string, Definition> option
+        /// Extra properties in the type description. In Gitea, these are
+        /// (for example) "x-go-package":"code.gitea.io/gitea/modules/structs".
+        Extras : Map<string, JsonNode>
+        /// List of fields which are required; all other fields are optional.
+        Required : string list option
+        /// Constraints, if any, placed on fields which are not mentioned in
+        /// the schema. If absent, there are no constraints.
+        AdditionalProperties : AdditionalProperties option
+        /// Example of an object which satisfies this schema.
+        Example : JsonObject option
+    }
+
+    /// Render a JsonObject into the strongly-typed version, performing sanity
+    /// checks and throwing on input that can't be parsed.
+    static member Parse (node : JsonObject) : ObjectTypeDefinition =
+        let description =
+            match asOpt<string> node "description", asOpt<string> node "title" with
+            | None, None -> None
+            | Some v, None
+            | None, Some v -> Some v
+            | Some v1, Some v2 -> failwith "both description and title were given"
+
+        let additionalProperties =
+            match node.["additionalProperties"] with
+            | null -> None
+            | :? JsonValue as p ->
+                if not (p.GetValue<bool> ()) then
+                    Some AdditionalProperties.Never
+                else
+                    failwith $"additionalProperties should be 'false' or an object, but was: %s{p.ToJsonString ()}"
+            | p ->
+                let p = p.AsObject ()
+                Definition.Parse p |> AdditionalProperties.Constrained |> Some
+
+        let properties =
+            match node.["properties"] with
+            | null -> None
+            | p ->
+                p.AsObject ()
+                |> Seq.map (fun (KeyValue (key, value)) ->
+                    let value = value.AsObject ()
+                    key, Definition.Parse value
+                )
+                |> Map.ofSeq
+                |> Some
+
+        let example =
+            match node.["example"] with
+            | null -> None
+            | :? JsonObject as o -> Some o
+            | _ ->
+                // Gitea returns a stringified and malformed JSON object here.
+                // Don't throw; just omit.
+                None
+
+        let required = asArrOpt'<string> node "required"
+
+        let extras =
+            node.AsObject ()
+            |> Seq.choose (fun (KeyValue (key, value)) ->
+                match key with
+                | "type"
+                | "description"
+                | "title"
+                | "additionalProperties"
+                | "example"
+                | "required"
+                | "properties" -> None
+                | _ -> Some (key, value)
+            )
+            |> Map.ofSeq
+
+        {
+            Description = description
+            Properties = properties
+            AdditionalProperties = additionalProperties
+            Required = required
+            Extras = extras
+            Example = example
+        }
+
+/// The Swagger schema lets you define types. An ArrayTypeDefinition
+/// is specifically the information about types defined as `"type": "array"`.
+and ArrayTypeDefinition =
+    {
+        /// The type is `'a array`; this field describes `'a`.
+        Items : Definition
+    }
+
+    /// Render a JsonNode into the strongly-typed version, performing sanity
+    /// checks and throwing on input that can't be parsed.
+    static member Parse (n : JsonNode) : ArrayTypeDefinition =
+        let items = asObj n "items" |> Definition.Parse
+
+        {
+            Items = items
+        }
+
+/// Any definition of a type in the Swagger document. This is basically any
+/// information associated with the `"type": "blah"` field.
+and Definition =
+    /// For example, if `"$ref": "#/responses/Blah", then this is "#/responses/Blah".
+    | Handle of string
+    /// A type definition with "type": "object".
+    | Object of ObjectTypeDefinition
+    /// A type definition with "type": "array".
+    | Array of ArrayTypeDefinition
+    /// A type definition with "type": "string".
+    | String
+    /// A type definition with "type": "boolean".
+    | Boolean
+    /// A response without a body has no "schema" specified.
+    | Unspecified
+    /// A type definition with "type": "integer".
+    /// The format is an optional hint which could be e.g. "int64" or "int32".
+    /// https://swagger.io/docs/specification/data-models/data-types/#numbers
+    | Integer of format : string option
+    /// Not a JSON schema type, but a Swagger 2.0 type.
+    | File
+
+    /// Render a JsonObject into this strongly-typed specification.
+    static member Parse (n : JsonObject) : Definition =
+        match n.["$ref"] |> Option.ofObj with
+        | Some ref -> Definition.Handle (ref.GetValue<string> ())
+        | None ->
+
+        let ty = asOpt<string> n "type"
+
+        match ty with
+        | None -> Definition.Unspecified
+        | Some "object" -> ObjectTypeDefinition.Parse n |> Definition.Object
+        | Some "array" -> ArrayTypeDefinition.Parse n |> Definition.Array
+        | Some "string" -> Definition.String
+        | Some "boolean" -> Definition.Boolean
+        | Some "file" -> Definition.File
+        | Some "integer" ->
+            let format = asOpt<string> n "format"
+            Definition.Integer format
+        | Some ty -> failwith $"Unrecognised type: %s{ty}"
+
+/// REST APIs allow their parameters to be passed in various ways. This describes
+/// how one single parameter is passed.
+type ParameterIn =
+    /// The parameter is interpolated into the path, e.g. "/foo/{blah}".
+    /// The "name" is what we replace in the path: e.g. "/foo/{person}" would
+    /// have a name of "person".
+    | Path of name : string
+    /// The parameter is appended to the URL's query params, e.g. "?<name>=blah"
+    | Query of name : string
+    /// The parameter is passed in the body of the HTTP request.
+    | Body
+    /// Some spec that WoofWare.Myriad doesn't support.
+    | Unrecognised of op : string * name : string
+
+/// Description of a single input parameter to an endpoint.
+type SwaggerParameter =
+    {
+        /// The type schema to which this parameter must conform.
+        Type : Definition
+        /// Optional human-readable description of this parameter.
+        Description : string option
+        /// How this parameter is passed.
+        In : ParameterIn
+        /// Name of this parameter. For most `In` values, this name is the
+        /// name of the parameter as supplied to the API at runtime, and in WoofWare's
+        /// strongly-typed domain types this information is also contained in the `In` field.
+        /// For `Body` parameters, this is purely for dev-time information.
+        Name : string
+        /// Whether this parameter is required for validation to succeed.
+        /// I think this defaults to "no".
+        Required : bool option
+    }
+
+    /// Render a JsonObject into this strongly-typed specification.
+    static member Parse (node : JsonObject) : SwaggerParameter =
+        let ty =
+            match asObjOpt node "schema" with
+            | None -> Definition.Parse node
+            | Some node -> Definition.Parse node
+
+        let description = asOpt<string> node "description"
+        let name = asString node "name"
+
+        let paramIn =
+            match asString node "in" with
+            | "path" -> ParameterIn.Path name
+            | "query" -> ParameterIn.Query name
+            | "body" -> ParameterIn.Body
+            | f -> ParameterIn.Unrecognised (f, name)
+
+        let required = asOpt<bool> node "required"
+
+        {
+            Type = ty
+            Description = description
+            In = paramIn
+            Name = name
+            Required = required
+        }
+
+/// An "endpoint" is basically a single HTTP verb, applied to some path.
+type SwaggerEndpoint =
+    {
+        /// The MIME types we should send our request body in.
+        /// This overrides (does not extend) any global definitions on the spec itself.
+        Consumes : MimeType list option
+        /// The MIME types we should expect to receive in response to this request.
+        /// This overrides (does not extend) any global definitions on the spec itself.
+        Produces : MimeType list option
+        /// Arbitrary list of [tags](https://swagger.io/docs/specification/2-0/grouping-operations-with-tags/).
+        Tags : string list
+        /// Human-readable description of the endpoint.
+        Summary : string
+        /// Arbitrary identifier of this endpoint; this must be unique across *all* endpoints
+        /// in this entire spec.
+        OperationId : OperationId
+        /// Parameters that must be supplied at HTTP-request-time to the endpoint.
+        /// (Each parameter knows how it needs to be supplied: e.g. if it's a query parameter or
+        /// if it's interpolated into the path.)
+        Parameters : SwaggerParameter list option
+        /// Map of HTTP response code to the type that we expect to receive in the body if we
+        /// get that response code back.
+        Responses : Map<int, Definition>
+    }
+
+    /// Render a JsonObject into this strongly-typed specification.
+    static member Parse (r : JsonObject) : SwaggerEndpoint =
+        let produces = asArrOpt'<string> r "produces" |> Option.map (List.map MimeType)
+        let consumes = asArrOpt'<string> r "consumes" |> Option.map (List.map MimeType)
+        let tags = asArr'<string> r "tags"
+        let summary = asString r "summary"
+        let operationId = asString r "operationId" |> OperationId
+
+        let responses =
+            asObj r "responses"
+            |> Seq.map (fun (KeyValue (key, value)) ->
+                let value = value.AsObject ()
+                Int32.Parse key, Definition.Parse value
+            )
+            |> Map.ofSeq
+
+        let parameters =
+            asArrOpt r "parameters"
+            |> Option.map (fun pars ->
+                pars
+                |> Seq.map (fun par -> par.AsObject () |> SwaggerParameter.Parse)
+                |> Seq.toList
+            )
+
+        {
+            Produces = produces
+            Consumes = consumes
+            Tags = tags
+            Summary = summary
+            OperationId = operationId
+            Parameters = parameters
+            Responses = responses
+        }
+
+/// Specifies the form a response to an endpoint will take if it's complying with this spec.
+type Response =
+    {
+        /// Human-readable description.
+        Description : string
+        /// Specification of the type to which responses will conform under this spec.
+        Schema : Definition
+    }
+
+    /// Render a JsonObject into this strongly-typed specification.
+    static member Parse (r : JsonObject) : Response =
+        let desc = asString r "description"
+
+        let schema =
+            match asObjOpt r "schema" with
+            | None -> Definition.Unspecified
+            | Some s -> Definition.Parse s
+
+        {
+            Description = desc
+            Schema = schema
+        }
+
+/// A Swagger API specification.
+type SwaggerV2 =
+    {
+        /// Global collection of MIME types which any endpoint expects to consume its inputs in.
+        /// This may be overridden on any individual endpoint by that endpoint.
+        Consumes : MimeType list
+        /// Global collection of MIME types which any endpoint will produce.
+        /// This may be overridden on any individual endpoint by that endpoint.
+        Produces : MimeType list
+        /// HTTP or HTTPS, for example. Indicates which scheme to access the API on.
+        Schemes : Scheme list
+        /// The version of OpenAPI this specification is written against.
+        /// (As of this writing, we only support 2.0.)
+        Swagger : Version
+        /// General information about this API.
+        Info : SwaggerInfo
+        /// Path under the URI host, which should be prefixed (with trailing slash if necessary)
+        /// to all requests.
+        BasePath : string
+        /// Map from relative path to "what is served at that path".
+        Paths : Map<string, Map<HttpMethod, SwaggerEndpoint>>
+        /// Types defined in the schema. Requests may use these definitions just like in any other JSON schema.
+        /// Key is a domain type name, e.g. "APIError".
+        Definitions : Map<string, Definition>
+        /// Types of each response.
+        /// Key is a domain type name, e.g. "AccessToken".
+        Responses : Map<string, Response>
+    }
+
+/// Parse a JSON-schema-based specification of a Swagger 2.0 API and
+/// build the strongly-typed version. Throws on invalid inputs; returns Error if the input is JSON but has a Swagger
+/// version that is not in the 2.0 series.
+let parse (s : string) : Result<SwaggerV2, JsonNode> =
+    let node = JsonNode.Parse s
+    let swagger = asString node "swagger" |> Version.Parse
+
+    if swagger.Major <> 2 then
+        Error node
+    else
+
+    let consumes = asArr'<string> node "consumes" |> List.map MimeType
+    let produces = asArr'<string> node "produces" |> List.map MimeType
+    let schemes = asArr'<string> node "schemes" |> List.map Scheme
+    let info = asObj node "info" |> SwaggerInfo.Parse
+    let basePath = asString node "basePath"
+
+    let definitions =
+        asObj node "definitions"
+        |> Seq.map (fun (KeyValue (key, value)) ->
+            let value = value.AsObject ()
+            key, Definition.Parse value
+        )
+        |> Map.ofSeq
+
+    let paths =
+        asObj node "paths"
+        |> Seq.map (fun (KeyValue (key, value)) ->
+            let contents =
+                value.AsObject ()
+                |> Seq.map (fun (KeyValue (endpoint, contents)) ->
+                    let contents = contents.AsObject ()
+                    HttpMethod.Parse endpoint, SwaggerEndpoint.Parse contents
+                )
+                |> Map.ofSeq
+
+            key, contents
+        )
+        |> Map.ofSeq
+
+    let responses =
+        asObj node "responses"
+        |> Seq.map (fun (KeyValue (key, value)) ->
+            let value = value.AsObject ()
+            key, Response.Parse value
+        )
+        |> Map.ofSeq
+
+    {
+        Consumes = consumes
+        Produces = produces
+        Schemes = schemes
+        Swagger = swagger
+        Info = info
+        BasePath = basePath
+        Paths = paths
+        Definitions = definitions
+        Responses = responses
+    }
+    |> Ok

WoofWare.Myriad.Plugins/SynExpr/CompExpr.fs

@@ -1,49 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-
-type internal CompExprBinding =
-    | LetBang of varName : string * rhs : SynExpr
-    | Let of varName : string * rhs : SynExpr
-    | Use of varName : string * rhs : SynExpr
-    | Do of body : SynExpr
-
-(*
-Potential API!
-type internal CompExprBindings =
-    private
-        {
-            /// These are stored in reverse.
-            Bindings : CompExprBinding list
-            CompExprName : string
-        }
-
-[<RequireQualifiedAccess>]
-module internal CompExprBindings =
-    let make (name : string) : CompExprBindings =
-        {
-            Bindings = []
-            CompExprName = name
-        }
-
-    let thenDo (body : SynExpr) (bindings : CompExprBindings) =
-        { bindings with
-            Bindings = (Do body :: bindings.Bindings)
-        }
-
-    let thenLet (varName : string) (value : SynExpr) (bindings : CompExprBindings) =
-        { bindings with
-            Bindings = (Let (varName, value) :: bindings.Bindings)
-        }
-
-    let thenLetBang (varName : string) (value : SynExpr) (bindings : CompExprBindings) =
-        { bindings with
-            Bindings = (LetBang (varName, value) :: bindings.Bindings)
-        }
-
-
-    let thenUse (varName : string) (value : SynExpr) (bindings : CompExprBindings) =
-        { bindings with
-            Bindings = (LetBang (varName, value) :: bindings.Bindings)
-        }
-*)

WoofWare.Myriad.Plugins/SynExpr/Ident.fs

@@ -1,65 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System
-open System.Text
-open System.Text.RegularExpressions
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal Ident =
-    let inline create (s : string) = Ident (s, range0)
-
-    /// Fantomas bug, perhaps? "type" is not rendered as ``type``, although the ASTs are identical
-    /// apart from the ranges?
-    /// Awful hack: here is a function that does this sort of thing.
-    let createSanitisedParamName (s : string) =
-        match s with
-        | "type" -> create "type'"
-        | "private" -> create "private'"
-        | _ ->
-
-        let result = StringBuilder ()
-
-        for i = 0 to s.Length - 1 do
-            if Char.IsLetter s.[i] then
-                result.Append s.[i] |> ignore<StringBuilder>
-            elif Char.IsNumber s.[i] then
-                if result.Length > 0 then
-                    result.Append s.[i] |> ignore<StringBuilder>
-            elif s.[i] = '_' || s.[i] = '-' then
-                result.Append '_' |> ignore<StringBuilder>
-            else
-                failwith $"could not convert to ident: %s{s}"
-
-        create (result.ToString ())
-
-    let private alnum = Regex @"^[a-zA-Z][a-zA-Z0-9]*$"
-
-    let createSanitisedTypeName (s : string) =
-        let result = StringBuilder ()
-        let mutable capitalize = true
-
-        for i = 0 to s.Length - 1 do
-            if Char.IsLetter s.[i] then
-                if capitalize then
-                    result.Append (Char.ToUpperInvariant s.[i]) |> ignore<StringBuilder>
-                    capitalize <- false
-                else
-                    result.Append s.[i] |> ignore<StringBuilder>
-            elif Char.IsNumber s.[i] then
-                if result.Length > 0 then
-                    result.Append s.[i] |> ignore<StringBuilder>
-            elif s.[i] = '_' then
-                capitalize <- true
-
-        if result.Length = 0 then
-            failwith $"String %s{s} was not suitable as a type identifier"
-
-        Ident (result.ToString (), range0)
-
-    let lowerFirstLetter (x : Ident) : Ident =
-        let result = StringBuilder x.idText.Length
-        result.Append (Char.ToLowerInvariant x.idText.[0]) |> ignore
-        result.Append x.idText.[1..] |> ignore
-        create ((result : StringBuilder).ToString ())

WoofWare.Myriad.Plugins/SynExpr/PreXmlDoc.fs

@@ -1,17 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Xml
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal PreXmlDoc =
-    let create (s : string) : PreXmlDoc =
-        let s = s.Split "\n"
-
-        for i = 0 to s.Length - 1 do
-            s.[i] <- " " + s.[i]
-
-        PreXmlDoc.Create (s, range0)
-
-    let create' (s : string seq) : PreXmlDoc =
-        PreXmlDoc.Create (Array.ofSeq s, range0)

WoofWare.Myriad.Plugins/SynExpr/SynArgPats.fs

@@ -1,30 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynArgPats =
-    let createNamed (caseNames : string list) : SynArgPats =
-        match caseNames.Length with
-        | 0 -> SynArgPats.Pats []
-        | 1 ->
-            SynPat.Named (SynIdent.createS caseNames.[0], false, None, range0)
-            |> List.singleton
-            |> SynArgPats.Pats
-        | len ->
-            caseNames
-            |> List.map (fun name -> SynPat.Named (SynIdent.createS name, false, None, range0))
-            |> fun t -> SynPat.Tuple (false, t, List.replicate (len - 1) range0, range0)
-            |> fun t -> SynPat.Paren (t, range0)
-            |> List.singleton
-            |> SynArgPats.Pats
-
-    let create (pats : SynPat list) : SynArgPats =
-        match pats.Length with
-        | 0 -> SynArgPats.Pats []
-        | 1 -> [ pats.[0] ] |> SynArgPats.Pats
-        | len ->
-            SynPat.Paren (SynPat.Tuple (false, pats, List.replicate (len - 1) range0, range0), range0)
-            |> List.singleton
-            |> SynArgPats.Pats

WoofWare.Myriad.Plugins/SynExpr/SynAttribute.fs

@@ -1,27 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynAttribute =
-    let inline create (typeName : SynLongIdent) (arg : SynExpr) : SynAttribute =
-        {
-            TypeName = typeName
-            ArgExpr = arg
-            Target = None
-            AppliesToGetterAndSetter = false
-            Range = range0
-        }
-
-    let internal compilationRepresentation : SynAttribute =
-        [ "CompilationRepresentationFlags" ; "ModuleSuffix" ]
-        |> SynExpr.createLongIdent
-        |> SynExpr.paren
-        |> create (SynLongIdent.createS "CompilationRepresentation")
-
-    let internal requireQualifiedAccess : SynAttribute =
-        create (SynLongIdent.createS "RequireQualifiedAccess") (SynExpr.CreateConst ())
-
-    let internal autoOpen : SynAttribute =
-        create (SynLongIdent.createS "AutoOpen") (SynExpr.CreateConst ())

WoofWare.Myriad.Plugins/SynExpr/SynAttributes.fs

@@ -1,15 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynAttributes =
-    let ofAttrs (attrs : SynAttribute list) : SynAttributes =
-        attrs
-        |> List.map (fun a ->
-            {
-                Attributes = [ a ]
-                Range = range0
-            }
-        )

WoofWare.Myriad.Plugins/SynExpr/SynBinding.fs

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

WoofWare.Myriad.Plugins/SynExpr/SynComponentInfo.fs

@@ -1,50 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Xml
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynComponentInfo =
-    let inline createLong (name : LongIdent) =
-        SynComponentInfo.SynComponentInfo ([], None, [], name, PreXmlDoc.Empty, false, None, range0)
-
-    let inline create (name : Ident) = createLong [ name ]
-
-    let inline withDocString (doc : PreXmlDoc) (i : SynComponentInfo) : SynComponentInfo =
-        match i with
-        | SynComponentInfo.SynComponentInfo (attrs, typars, constraints, name, _, postfix, access, range) ->
-            SynComponentInfo (attrs, typars, constraints, name, doc, postfix, access, range)
-
-    let inline setGenerics (typars : SynTyparDecls option) (i : SynComponentInfo) : SynComponentInfo =
-        match i with
-        | SynComponentInfo.SynComponentInfo (attrs, _, constraints, name, doc, postfix, access, range) ->
-            SynComponentInfo (attrs, typars, constraints, name, doc, postfix, access, range)
-
-    let inline withGenerics (typars : SynTyparDecl list) (i : SynComponentInfo) : SynComponentInfo =
-        let inner =
-            if typars.IsEmpty then
-                None
-            else
-                Some (SynTyparDecls.PostfixList (typars, [], range0))
-
-        setGenerics inner i
-
-    let inline setAccessibility (acc : SynAccess option) (i : SynComponentInfo) : SynComponentInfo =
-        match i with
-        | SynComponentInfo.SynComponentInfo (attrs, typars, constraints, name, doc, postfix, _, range) ->
-            SynComponentInfo.SynComponentInfo (attrs, typars, constraints, name, doc, postfix, acc, range)
-
-    let inline withAccessibility (acc : SynAccess) (i : SynComponentInfo) : SynComponentInfo =
-        setAccessibility (Some acc) i
-
-    let inline addAttributes (attrs : SynAttribute list) (i : SynComponentInfo) : SynComponentInfo =
-        match i with
-        | SynComponentInfo.SynComponentInfo (oldAttrs, typars, constraints, name, doc, postfix, acc, range) ->
-            let attrs =
-                {
-                    SynAttributeList.Attributes = attrs
-                    SynAttributeList.Range = range0
-                }
-
-            SynComponentInfo.SynComponentInfo ((attrs :: oldAttrs), typars, constraints, name, doc, postfix, acc, range)

WoofWare.Myriad.Plugins/SynExpr/SynExpr.fs

@@ -1,376 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.SyntaxTrivia
-open Myriad.Core
-open Fantomas.FCS.Text.Range
-
-[<AutoOpen>]
-module internal SynExprExtensions =
-    type SynExpr with
-        static member CreateConst (s : string) : SynExpr =
-            SynExpr.Const (SynConst.String (s, SynStringKind.Regular, range0), range0)
-
-        static member CreateConst () : SynExpr = SynExpr.Const (SynConst.Unit, range0)
-
-        static member CreateConst (b : bool) : SynExpr = SynExpr.Const (SynConst.Bool b, range0)
-
-        static member CreateConst (c : char) : SynExpr =
-            // apparent Myriad bug: `IndexOf '?'` gets formatted as `IndexOf ?` which is clearly wrong
-            SynExpr.CreateApp (SynExpr.Ident (Ident.Create "char"), SynExpr.CreateConst (int c))
-            |> fun e -> SynExpr.Paren (e, range0, Some range0, range0)
-
-        static member CreateConst (i : int32) : SynExpr =
-            SynExpr.Const (SynConst.Int32 i, range0)
-
-[<RequireQualifiedAccess>]
-module internal SynExpr =
-
-    /// {f} {x}
-    let applyFunction (f : SynExpr) (x : SynExpr) : SynExpr = SynExpr.CreateApp (f, x)
-
-    /// {f} {x}
-    let inline applyTo (x : SynExpr) (f : SynExpr) : SynExpr = applyFunction f x
-
-    /// {expr} |> {func}
-    let pipeThroughFunction (func : SynExpr) (expr : SynExpr) : SynExpr =
-        SynExpr.CreateAppInfix (SynExpr.CreateLongIdent SynLongIdent.pipe, expr)
-        |> applyTo func
-
-    /// if {cond} then {trueBranch} else {falseBranch}
-    /// Note that this function puts the trueBranch last, for pipelining convenience:
-    /// we assume that the `else` branch is more like an error case and is less interesting.
-    let ifThenElse (cond : SynExpr) (falseBranch : SynExpr) (trueBranch : SynExpr) : SynExpr =
-        SynExpr.IfThenElse (
-            cond,
-            trueBranch,
-            Some falseBranch,
-            DebugPointAtBinding.Yes range0,
-            false,
-            range0,
-            {
-                IfKeyword = range0
-                IsElif = false
-                ThenKeyword = range0
-                ElseKeyword = Some range0
-                IfToThenRange = range0
-            }
-        )
-
-    /// try {body} with | {exc} as exc -> {handler}
-    let pipeThroughTryWith (exc : SynPat) (handler : SynExpr) (body : SynExpr) : SynExpr =
-        let clause =
-            SynMatchClause.create (SynPat.As (exc, SynPat.named "exc", range0)) handler
-
-        SynExpr.TryWith (
-            body,
-            [ clause ],
-            range0,
-            DebugPointAtTry.Yes range0,
-            DebugPointAtWith.Yes range0,
-            {
-                TryKeyword = range0
-                TryToWithRange = range0
-                WithKeyword = range0
-                WithToEndRange = range0
-            }
-        )
-
-    /// {a} = {b}
-    let equals (a : SynExpr) (b : SynExpr) =
-        SynExpr.CreateAppInfix (SynExpr.CreateLongIdent SynLongIdent.eq, a) |> applyTo b
-
-    /// {a} && {b}
-    let booleanAnd (a : SynExpr) (b : SynExpr) =
-        SynExpr.CreateAppInfix (SynExpr.CreateLongIdent SynLongIdent.booleanAnd, a)
-        |> applyTo b
-
-    /// {a} || {b}
-    let booleanOr (a : SynExpr) (b : SynExpr) =
-        SynExpr.CreateAppInfix (SynExpr.CreateLongIdent SynLongIdent.booleanOr, a)
-        |> applyTo b
-
-    /// {a} + {b}
-    let plus (a : SynExpr) (b : SynExpr) =
-        SynExpr.CreateAppInfix (
-            SynExpr.CreateLongIdent (
-                SynLongIdent.SynLongIdent (
-                    Ident.CreateLong "op_Addition",
-                    [],
-                    [ Some (IdentTrivia.OriginalNotation "+") ]
-                )
-            ),
-            a
-        )
-        |> applyTo b
-
-    /// {a} * {b}
-    let times (a : SynExpr) (b : SynExpr) =
-        SynExpr.CreateAppInfix (
-            SynExpr.CreateLongIdent (
-                SynLongIdent.SynLongIdent (
-                    Ident.CreateLong "op_Multiply",
-                    [],
-                    [ Some (IdentTrivia.OriginalNotation "*") ]
-                )
-            ),
-            a
-        )
-        |> applyTo b
-
-    let rec stripOptionalParen (expr : SynExpr) : SynExpr =
-        match expr with
-        | SynExpr.Paren (expr, _, _, _) -> stripOptionalParen expr
-        | expr -> expr
-
-    let dotGet (field : string) (obj : SynExpr) : SynExpr =
-        SynExpr.DotGet (
-            obj,
-            range0,
-            SynLongIdent.SynLongIdent (id = [ Ident.create field ], dotRanges = [], trivia = [ None ]),
-            range0
-        )
-
-    /// {obj}.{meth} {arg}
-    let callMethodArg (meth : string) (arg : SynExpr) (obj : SynExpr) : SynExpr = dotGet meth obj |> applyTo arg
-
-    /// {obj}.{meth}()
-    let callMethod (meth : string) (obj : SynExpr) : SynExpr =
-        callMethodArg meth (SynExpr.CreateConst ()) obj
-
-    let typeApp (types : SynType list) (operand : SynExpr) =
-        SynExpr.TypeApp (operand, range0, types, List.replicate (types.Length - 1) range0, Some range0, range0, range0)
-
-    /// {obj}.{meth}<types,...>()
-    let callGenericMethod (meth : SynLongIdent) (types : SynType list) (obj : SynExpr) : SynExpr =
-        SynExpr.DotGet (obj, range0, meth, range0)
-        |> typeApp types
-        |> applyTo (SynExpr.CreateConst ())
-
-    /// {obj}.{meth}<ty>()
-    let callGenericMethod' (meth : string) (ty : string) (obj : SynExpr) : SynExpr =
-        callGenericMethod (SynLongIdent.createS meth) [ SynType.createLongIdent' [ ty ] ] obj
-
-    let inline index (property : SynExpr) (obj : SynExpr) : SynExpr =
-        SynExpr.DotIndexedGet (obj, property, range0, range0)
-
-    let inline arrayIndexRange (start : SynExpr option) (endRange : SynExpr option) (arr : SynExpr) : SynExpr =
-        SynExpr.DotIndexedGet (
-            arr,
-            (SynExpr.IndexRange (start, range0, endRange, range0, range0, range0)),
-            range0,
-            range0
-        )
-
-    let inline paren (e : SynExpr) : SynExpr =
-        SynExpr.Paren (e, range0, Some range0, range0)
-
-    /// (fun {varName} -> {body})
-    let createLambda (varName : string) (body : SynExpr) : SynExpr =
-        let parsedDataPat = [ SynPat.named varName ]
-
-        SynExpr.Lambda (
-            false,
-            false,
-            SynSimplePats.Create [ SynSimplePat.CreateId (Ident.Create varName) ],
-            body,
-            Some (parsedDataPat, body),
-            range0,
-            {
-                ArrowRange = Some range0
-            }
-        )
-        |> paren
-
-    let createThunk (body : SynExpr) : SynExpr =
-        SynExpr.Lambda (
-            false,
-            false,
-            SynSimplePats.Create [],
-            body,
-            Some ([ SynPat.unit ], body),
-            range0,
-            {
-                ArrowRange = Some range0
-            }
-        )
-        |> paren
-
-    let inline createIdent (s : string) : SynExpr = SynExpr.Ident (Ident (s, range0))
-
-    let inline createIdent' (i : Ident) : SynExpr = SynExpr.Ident i
-
-    let inline createLongIdent' (ident : Ident list) : SynExpr =
-        SynExpr.LongIdent (false, SynLongIdent.create ident, None, range0)
-
-    let inline createLongIdent (ident : string list) : SynExpr =
-        createLongIdent' (ident |> List.map Ident.create)
-
-    let tupleNoParen (args : SynExpr list) : SynExpr =
-        SynExpr.Tuple (false, args, List.replicate (args.Length - 1) range0, range0)
-
-    let inline tuple (args : SynExpr list) = args |> tupleNoParen |> paren
-
-    /// {body} |> fun a -> Async.StartAsTask (a, ?cancellationToken=ct)
-    let startAsTask (ct : Ident) (body : SynExpr) =
-        let lambda =
-            [
-                createIdent "a"
-                equals
-                    (SynExpr.LongIdent (true, SynLongIdent.createS "cancellationToken", None, range0))
-                    (createIdent' ct)
-            ]
-            |> tuple
-            |> applyFunction (createLongIdent [ "Async" ; "StartAsTask" ])
-            |> createLambda "a"
-
-        pipeThroughFunction lambda body
-
-    let inline createForEach (pat : SynPat) (enumExpr : SynExpr) (body : SynExpr) : SynExpr =
-        SynExpr.ForEach (
-            DebugPointAtFor.No,
-            DebugPointAtInOrTo.No,
-            SeqExprOnly.SeqExprOnly false,
-            true,
-            pat,
-            enumExpr,
-            body,
-            range0
-        )
-
-    let inline createLet (bindings : SynBinding list) (body : SynExpr) : SynExpr =
-        SynExpr.LetOrUse (false, false, bindings, body, range0, SynExprLetOrUseTrivia.empty)
-
-    let inline createDo (body : SynExpr) : SynExpr = SynExpr.Do (body, range0)
-
-    let inline createMatch (matchOn : SynExpr) (cases : SynMatchClause list) : SynExpr =
-        SynExpr.Match (
-            DebugPointAtBinding.Yes range0,
-            matchOn,
-            cases,
-            range0,
-            {
-                MatchKeyword = range0
-                WithKeyword = range0
-            }
-        )
-
-    let typeAnnotate (ty : SynType) (expr : SynExpr) : SynExpr = SynExpr.Typed (expr, ty, range0)
-
-    let inline createNew (ty : SynType) (args : SynExpr) : SynExpr =
-        SynExpr.New (false, ty, paren args, range0)
-
-    let inline createWhile (cond : SynExpr) (body : SynExpr) : SynExpr =
-        SynExpr.While (DebugPointAtWhile.Yes range0, cond, body, range0)
-
-    let inline createNull () : SynExpr = SynExpr.Null range0
-
-    let reraise : SynExpr = createIdent "reraise" |> applyTo (SynExpr.CreateConst ())
-
-    let sequential (exprs : SynExpr list) : SynExpr =
-        exprs
-        |> List.reduce (fun a b -> SynExpr.Sequential (DebugPointAtSequential.SuppressNeither, false, a, b, range0))
-
-    let listLiteral (elts : SynExpr list) : SynExpr =
-        SynExpr.ArrayOrListComputed (false, sequential elts, range0)
-
-    let arrayLiteral (elts : SynExpr list) : SynExpr =
-        SynExpr.ArrayOrListComputed (true, sequential elts, range0)
-
-    /// {compExpr} { {lets} ; return {ret} }
-    let createCompExpr (compExpr : string) (retBody : SynExpr) (lets : CompExprBinding list) : SynExpr =
-        let retStatement = SynExpr.YieldOrReturn ((false, true), retBody, range0)
-
-        let contents : SynExpr =
-            (retStatement, List.rev lets)
-            ||> List.fold (fun state binding ->
-                match binding with
-                | LetBang (lhs, rhs) ->
-                    SynExpr.LetOrUseBang (
-                        DebugPointAtBinding.Yes range0,
-                        false,
-                        true,
-                        SynPat.named lhs,
-                        rhs,
-                        [],
-                        state,
-                        range0,
-                        {
-                            EqualsRange = Some range0
-                        }
-                    )
-                | Let (lhs, rhs) -> createLet [ SynBinding.basic [ Ident.create lhs ] [] rhs ] state
-                | Use (lhs, rhs) ->
-                    SynExpr.LetOrUse (
-                        false,
-                        true,
-                        [ SynBinding.basic [ Ident.create lhs ] [] rhs ],
-                        state,
-                        range0,
-                        {
-                            SynExprLetOrUseTrivia.InKeyword = None
-                        }
-                    )
-                | Do body -> sequential [ SynExpr.Do (body, range0) ; state ]
-            )
-
-        applyFunction (createIdent compExpr) (SynExpr.ComputationExpr (false, contents, range0))
-
-    /// {expr} |> Async.AwaitTask
-    let awaitTask (expr : SynExpr) : SynExpr =
-        expr |> pipeThroughFunction (createLongIdent [ "Async" ; "AwaitTask" ])
-
-    /// {ident}.ToString ()
-    /// with special casing for some types like DateTime
-    let toString (ty : SynType) (ident : SynExpr) =
-        match ty with
-        | DateOnly -> ident |> callMethodArg "ToString" (SynExpr.CreateConst "yyyy-MM-dd")
-        | DateTime -> ident |> callMethodArg "ToString" (SynExpr.CreateConst "yyyy-MM-ddTHH:mm:ss")
-        | _ -> callMethod "ToString" ident
-
-    let upcast' (ty : SynType) (e : SynExpr) = SynExpr.Upcast (e, ty, range0)
-
-    /// {ident} - {rhs}
-    let minus (ident : SynLongIdent) (rhs : SynExpr) : SynExpr =
-        SynExpr.CreateAppInfix (SynExpr.CreateLongIdent SynLongIdent.sub, SynExpr.CreateLongIdent ident)
-        |> applyTo rhs
-
-    /// {ident} - {n}
-    let minusN (ident : SynLongIdent) (n : int) : SynExpr = minus ident (SynExpr.CreateConst n)
-
-    /// {y} > {x}
-    let greaterThan (x : SynExpr) (y : SynExpr) : SynExpr =
-        SynExpr.CreateAppInfix (SynExpr.CreateLongIdent SynLongIdent.gt, y) |> applyTo x
-
-    /// {y} < {x}
-    let lessThan (x : SynExpr) (y : SynExpr) : SynExpr =
-        SynExpr.CreateAppInfix (SynExpr.CreateLongIdent SynLongIdent.lt, y) |> applyTo x
-
-    /// {y} >= {x}
-    let greaterThanOrEqual (x : SynExpr) (y : SynExpr) : SynExpr =
-        SynExpr.CreateAppInfix (SynExpr.CreateLongIdent SynLongIdent.geq, y)
-        |> applyTo x
-
-    /// {y} <= {x}
-    let lessThanOrEqual (x : SynExpr) (y : SynExpr) : SynExpr =
-        SynExpr.CreateAppInfix (SynExpr.CreateLongIdent SynLongIdent.leq, y)
-        |> applyTo x
-
-    /// {x} :: {y}
-    let listCons (x : SynExpr) (y : SynExpr) : SynExpr =
-        SynExpr.CreateAppInfix (
-            SynExpr.LongIdent (
-                false,
-                SynLongIdent.SynLongIdent (
-                    [ Ident.create "op_ColonColon" ],
-                    [],
-                    [ Some (IdentTrivia.OriginalNotation "::") ]
-                ),
-                None,
-                range0
-            ),
-            tupleNoParen [ x ; y ]
-        )
-        |> paren
-
-    let assign (lhs : SynLongIdent) (rhs : SynExpr) : SynExpr = SynExpr.LongIdentSet (lhs, rhs, range0)

WoofWare.Myriad.Plugins/SynExpr/SynExprLetOrUseTrivia.fs

@@ -1,10 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.SyntaxTrivia
-
-[<RequireQualifiedAccess>]
-module internal SynExprLetOrUseTrivia =
-    let empty : SynExprLetOrUseTrivia =
-        {
-            InKeyword = None
-        }

WoofWare.Myriad.Plugins/SynExpr/SynField.fs

@@ -1,76 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Text.Range
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.SyntaxTrivia
-open Fantomas.FCS.Xml
-
-/// The data needed to reconstitute a single piece of data within a union field, or a single record field.
-/// This is generic on whether the field is identified. For example, in `type Foo = Blah of int`, the `int`
-/// field is not identified; whereas in `type Foo = Blah of baz : int`, it is identified.
-type SynFieldData<'Ident> =
-    {
-        /// Attributes on this field. I think you can only get these if this is a *record* field.
-        Attrs : SynAttribute list
-        /// The identifier of this field (see docstring for SynFieldData).
-        Ident : 'Ident
-        /// The type of the data contained in this field. For example, `type Foo = { Blah : int }`
-        /// has this being `int`.
-        Type : SynType
-    }
-
-[<RequireQualifiedAccess>]
-module internal SynField =
-    /// Get the useful information out of a SynField.
-    let extract (SynField (attrs, _, id, fieldType, _, _, _, _, _)) : SynFieldData<Ident option> =
-        {
-            Attrs = attrs |> List.collect (fun l -> l.Attributes)
-            Ident = id
-            Type = fieldType
-        }
-
-    let mapIdent<'a, 'b> (f : 'a -> 'b) (x : SynFieldData<'a>) : SynFieldData<'b> =
-        let ident = f x.Ident
-
-        {
-            Attrs = x.Attrs
-            Ident = ident
-            Type = x.Type
-        }
-
-    /// Throws if the field has no identifier.
-    let extractWithIdent (f : SynField) : SynFieldData<Ident> =
-        f
-        |> extract
-        |> mapIdent (fun ident ->
-            match ident with
-            | None -> failwith "expected field identifier to have a value, but it did not"
-            | Some i -> i
-        )
-
-    let make (data : SynFieldData<Ident option>) : SynField =
-        let attrs : SynAttributeList list =
-            data.Attrs
-            |> List.map (fun l ->
-                {
-                    Attributes = [ l ]
-                    Range = range0
-                }
-            )
-
-        SynField.SynField (
-            attrs,
-            false,
-            data.Ident,
-            data.Type,
-            false,
-            PreXmlDoc.Empty,
-            None,
-            range0,
-            SynFieldTrivia.Zero
-        )
-
-    let withDocString (doc : PreXmlDoc) (f : SynField) : SynField =
-        match f with
-        | SynField (attributes, isStatic, idOpt, fieldType, isMutable, _, accessibility, range, trivia) ->
-            SynField (attributes, isStatic, idOpt, fieldType, isMutable, doc, accessibility, range, trivia)

WoofWare.Myriad.Plugins/SynExpr/SynIdent.fs

@@ -1,10 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-
-[<RequireQualifiedAccess>]
-module internal SynIdent =
-    let inline createI (i : Ident) : SynIdent = SynIdent.SynIdent (i, None)
-
-    let inline createS (i : string) : SynIdent =
-        SynIdent.SynIdent (Ident.create i, None)

WoofWare.Myriad.Plugins/SynExpr/SynLongIdent.fs

@@ -1,134 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.SyntaxTrivia
-open Fantomas.FCS.Text.Range
-open Fantomas.FCS.Syntax
-
-[<RequireQualifiedAccess>]
-module internal SynLongIdent =
-
-    let geq =
-        SynLongIdent.SynLongIdent (
-            [ Ident.create "op_GreaterThanOrEqual" ],
-            [],
-            [ Some (IdentTrivia.OriginalNotation ">=") ]
-        )
-
-    let leq =
-        SynLongIdent.SynLongIdent (
-            [ Ident.create "op_LessThanOrEqual" ],
-            [],
-            [ Some (IdentTrivia.OriginalNotation "<=") ]
-        )
-
-    let gt =
-        SynLongIdent.SynLongIdent ([ Ident.create "op_GreaterThan" ], [], [ Some (IdentTrivia.OriginalNotation ">") ])
-
-    let lt =
-        SynLongIdent.SynLongIdent ([ Ident.create "op_LessThan" ], [], [ Some (IdentTrivia.OriginalNotation "<") ])
-
-    let sub =
-        SynLongIdent.SynLongIdent ([ Ident.create "op_Subtraction" ], [], [ Some (IdentTrivia.OriginalNotation "-") ])
-
-    let eq =
-        SynLongIdent.SynLongIdent ([ Ident.create "op_Equality" ], [], [ Some (IdentTrivia.OriginalNotation "=") ])
-
-    let booleanAnd =
-        SynLongIdent.SynLongIdent ([ Ident.create "op_BooleanAnd" ], [], [ Some (IdentTrivia.OriginalNotation "&&") ])
-
-    let booleanOr =
-        SynLongIdent.SynLongIdent ([ Ident.create "op_BooleanOr" ], [], [ Some (IdentTrivia.OriginalNotation "||") ])
-
-    let pipe =
-        SynLongIdent.SynLongIdent ([ Ident.create "op_PipeRight" ], [], [ Some (IdentTrivia.OriginalNotation "|>") ])
-
-    let toString (sli : SynLongIdent) : string =
-        sli.LongIdent |> List.map _.idText |> String.concat "."
-
-    let create (ident : LongIdent) : SynLongIdent =
-        let commas =
-            match ident with
-            | [] -> []
-            | _ :: commas -> commas |> List.map (fun _ -> range0)
-
-        SynLongIdent.SynLongIdent (ident, commas, List.replicate ident.Length None)
-
-    let inline createI (i : Ident) : SynLongIdent = create [ i ]
-
-    let inline createS (s : string) : SynLongIdent = createI (Ident (s, range0))
-
-    let inline createS' (s : string list) : SynLongIdent =
-        create (s |> List.map (fun i -> Ident (i, range0)))
-
-    let isUnit (ident : SynLongIdent) : bool =
-        match ident.LongIdent with
-        | [ i ] when System.String.Equals (i.idText, "unit", System.StringComparison.OrdinalIgnoreCase) -> true
-        | _ -> false
-
-    let isList (ident : SynLongIdent) : bool =
-        match ident.LongIdent with
-        | [ i ] when System.String.Equals (i.idText, "list", System.StringComparison.OrdinalIgnoreCase) -> true
-        // TODO: consider FSharpList or whatever it is
-        | _ -> false
-
-    let isArray (ident : SynLongIdent) : bool =
-        match ident.LongIdent with
-        | [ i ] when
-            System.String.Equals (i.idText, "array", System.StringComparison.OrdinalIgnoreCase)
-            || System.String.Equals (i.idText, "[]", System.StringComparison.Ordinal)
-            ->
-            true
-        | _ -> false
-
-    let isOption (ident : SynLongIdent) : bool =
-        match ident.LongIdent with
-        | [ i ] when System.String.Equals (i.idText, "option", System.StringComparison.OrdinalIgnoreCase) -> true
-        // TODO: consider Microsoft.FSharp.Option or whatever it is
-        | _ -> false
-
-    let isChoice (ident : SynLongIdent) : bool =
-        match ident.LongIdent with
-        | [ i ] when System.String.Equals (i.idText, "Choice", System.StringComparison.Ordinal) -> true
-        // TODO: consider Microsoft.FSharp.Choice or whatever it is
-        | _ -> false
-
-    let isNullable (ident : SynLongIdent) : bool =
-        match ident.LongIdent |> List.map _.idText with
-        | [ "System" ; "Nullable" ]
-        | [ "Nullable" ] -> true
-        | _ -> false
-
-    let isResponse (ident : SynLongIdent) : bool =
-        match ident.LongIdent |> List.map _.idText with
-        | [ "Response" ]
-        | [ "RestEase" ; "Response" ] -> true
-        | _ -> false
-
-    let isMap (ident : SynLongIdent) : bool =
-        match ident.LongIdent |> List.map _.idText with
-        | [ "Map" ] -> true
-        | _ -> false
-
-    let isReadOnlyDictionary (ident : SynLongIdent) : bool =
-        match ident.LongIdent |> List.map _.idText with
-        | [ "IReadOnlyDictionary" ]
-        | [ "Generic" ; "IReadOnlyDictionary" ]
-        | [ "Collections" ; "Generic" ; "IReadOnlyDictionary" ]
-        | [ "System" ; "Collections" ; "Generic" ; "IReadOnlyDictionary" ] -> true
-        | _ -> false
-
-    let isDictionary (ident : SynLongIdent) : bool =
-        match ident.LongIdent |> List.map _.idText with
-        | [ "Dictionary" ]
-        | [ "Generic" ; "Dictionary" ]
-        | [ "Collections" ; "Generic" ; "Dictionary" ]
-        | [ "System" ; "Collections" ; "Generic" ; "Dictionary" ] -> true
-        | _ -> false
-
-    let isIDictionary (ident : SynLongIdent) : bool =
-        match ident.LongIdent |> List.map _.idText with
-        | [ "IDictionary" ]
-        | [ "Generic" ; "IDictionary" ]
-        | [ "Collections" ; "Generic" ; "IDictionary" ]
-        | [ "System" ; "Collections" ; "Generic" ; "IDictionary" ] -> true
-        | _ -> false

WoofWare.Myriad.Plugins/SynExpr/SynMatchClause.fs

@@ -1,24 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynMatchClause =
-    let create (lhs : SynPat) (rhs : SynExpr) : SynMatchClause =
-        SynMatchClause.SynMatchClause (
-            lhs,
-            None,
-            rhs,
-            range0,
-            DebugPointAtTarget.Yes,
-            {
-                ArrowRange = Some range0
-                BarRange = Some range0
-            }
-        )
-
-    let withWhere (where : SynExpr) (m : SynMatchClause) : SynMatchClause =
-        match m with
-        | SynMatchClause (synPat, _, resultExpr, range, debugPointAtTarget, synMatchClauseTrivia) ->
-            SynMatchClause (synPat, Some where, resultExpr, range, debugPointAtTarget, synMatchClauseTrivia)

WoofWare.Myriad.Plugins/SynExpr/SynMemberDefn.fs

@@ -1,71 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.SyntaxTrivia
-open Fantomas.FCS.Text.Range
-open Fantomas.FCS.Xml
-
-[<RequireQualifiedAccess>]
-module internal SynMemberDefn =
-    let private interfaceMemberSlotFlags =
-        {
-            SynMemberFlags.IsInstance = true
-            SynMemberFlags.IsDispatchSlot = true
-            SynMemberFlags.IsOverrideOrExplicitImpl = false
-            SynMemberFlags.IsFinal = false
-            SynMemberFlags.GetterOrSetterIsCompilerGenerated = false
-            SynMemberFlags.MemberKind = SynMemberKind.Member
-        }
-
-    let abstractMember
-        (attrs : SynAttribute list)
-        (ident : SynIdent)
-        (typars : SynTyparDecls option)
-        (arity : SynValInfo)
-        (xmlDoc : PreXmlDoc)
-        (returnType : SynType)
-        : SynMemberDefn
-        =
-        let slot =
-            SynValSig.SynValSig (
-                attrs
-                |> List.map (fun attr ->
-                    {
-                        Attributes = [ attr ]
-                        Range = range0
-                    }
-                ),
-                ident,
-                SynValTyparDecls.SynValTyparDecls (typars, true),
-                returnType,
-                arity,
-                false,
-                false,
-                xmlDoc,
-                None,
-                None,
-                range0,
-                {
-                    EqualsRange = None
-                    WithKeyword = None
-                    InlineKeyword = None
-                    LeadingKeyword = SynLeadingKeyword.Abstract range0
-                }
-            )
-
-        SynMemberDefn.AbstractSlot (
-            slot,
-            interfaceMemberSlotFlags,
-            range0,
-            {
-                GetSetKeywords = None
-            }
-        )
-
-    let staticMember (binding : SynBinding) : SynMemberDefn =
-        let binding = SynBinding.makeStaticMember binding
-        SynMemberDefn.Member (binding, range0)
-
-    let memberImplementation (binding : SynBinding) : SynMemberDefn =
-        let binding = SynBinding.makeInstanceMember binding
-        SynMemberDefn.Member (binding, range0)

WoofWare.Myriad.Plugins/SynExpr/SynModuleDecl.fs

@@ -1,30 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.SyntaxTrivia
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynModuleDecl =
-
-    let inline openAny (ident : SynOpenDeclTarget) : SynModuleDecl = SynModuleDecl.Open (ident, range0)
-
-    let inline createLets (bindings : SynBinding list) : SynModuleDecl =
-        SynModuleDecl.Let (false, bindings, range0)
-
-    let inline createLet (binding : SynBinding) : SynModuleDecl = createLets [ binding ]
-
-    let inline createTypes (tys : SynTypeDefn list) : SynModuleDecl = SynModuleDecl.Types (tys, range0)
-
-    let nestedModule (info : SynComponentInfo) (decls : SynModuleDecl list) : SynModuleDecl =
-        SynModuleDecl.NestedModule (
-            info,
-            false,
-            decls,
-            false,
-            range0,
-            {
-                ModuleKeyword = Some range0
-                EqualsRange = Some range0
-            }
-        )

WoofWare.Myriad.Plugins/SynExpr/SynModuleOrNamespace.fs

@@ -1,24 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.SyntaxTrivia
-open Fantomas.FCS.Xml
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynModuleOrNamespace =
-
-    let createNamespace (name : LongIdent) (decls : SynModuleDecl list) =
-        SynModuleOrNamespace.SynModuleOrNamespace (
-            name,
-            false,
-            SynModuleOrNamespaceKind.DeclaredNamespace,
-            decls,
-            PreXmlDoc.Empty,
-            [],
-            None,
-            range0,
-            {
-                LeadingKeyword = SynModuleOrNamespaceLeadingKeyword.Namespace range0
-            }
-        )