Merge main

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "6.3.10",
+      "version": "6.3.0-alpha-005",
       "commands": [
         "fantomas"
       ]
     },
     "fsharp-analyzers": {
-      "version": "0.26.1",
+      "version": "0.23.0",
       "commands": [
         "fsharp-analyzers"
       ]

.editorconfig

@@ -2,6 +2,7 @@ root=true
 
 [*]
 charset=utf-8
+end_of_line=crlf
 trim_trailing_whitespace=true
 insert_final_newline=true
 indent_style=space

.envrc

@@ -1 +0,0 @@
-use flake

.github/workflows/dotnet.yaml

@@ -1,4 +1,3 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json
 name: .NET
 
 on:
@@ -29,7 +28,7 @@ jobs:
       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@v25
       with:
         extra_nix_config: |
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -50,7 +49,7 @@ jobs:
         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@v25
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -59,7 +58,7 @@ jobs:
       - name: Build project
         run: nix develop --command dotnet build ./WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj
       - name: Run analyzers
-        run: nix run .#fsharp-analyzers -- --project ./WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj --analyzers-path ./.analyzerpackages/g-research.fsharp.analyzers/*/ --verbosity detailed --report ./analysis.sarif --treat-as-error GRA-STRING-001 GRA-STRING-002 GRA-STRING-003 GRA-UNIONCASE-001 GRA-INTERPOLATED-001 GRA-TYPE-ANNOTATE-001 GRA-VIRTUALCALL-001 GRA-IMMUTABLECOLLECTIONEQUALITY-001 GRA-JSONOPTS-001 GRA-LOGARGFUNCFULLAPP-001 GRA-DISPBEFOREASYNC-001 --exclude-analyzers PartialAppAnalyzer
+        run: nix run .#fsharp-analyzers -- --project ./WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj --analyzers-path ./.analyzerpackages/g-research.fsharp.analyzers/0.6.0/ --verbosity detailed --report ./analysis.sarif --treat-as-error GRA-STRING-001 GRA-STRING-002 GRA-STRING-003 GRA-UNIONCASE-001 GRA-INTERPOLATED-001 GRA-TYPE-ANNOTATE-001 GRA-VIRTUALCALL-001 GRA-IMMUTABLECOLLECTIONEQUALITY-001 GRA-JSONOPTS-001 GRA-LOGARGFUNCFULLAPP-001
 
   build-nix:
     runs-on: ubuntu-latest
@@ -67,14 +66,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v25
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Build
         run: nix build
-      - name: Reproducibility check
-        run: nix build --rebuild
 
   check-dotnet-format:
     runs-on: ubuntu-latest
@@ -82,41 +79,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v25
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Run Fantomas
         run: nix run .#fantomas -- --check .
 
-  check-accurate-generations:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
-      - name: Install Nix
-        uses: cachix/install-nix-action@V27
-        with:
-          extra_nix_config: |
-            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - name: Whitespace change
-        run: "echo ' ' >> ConsumePlugin/List.fs"
-      - name: Generate code
-        run: nix develop --command dotnet build
-      - name: Run Fantomas
-        run: nix run .#fantomas -- .
-      - name: Verify there is no diff
-        run: git diff --name-only --no-color --exit-code
-
   check-nix-format:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v25
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -129,7 +105,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v25
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -142,7 +118,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v25
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -156,7 +132,7 @@ jobs:
       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@v25
       with:
         extra_nix_config: |
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -166,188 +142,45 @@ jobs:
       run: nix develop --command dotnet build --no-restore --configuration Release
     - name: Pack
       run: nix develop --command dotnet pack --configuration Release
-    - name: Upload NuGet artifact (plugin)
+    - name: Upload NuGet artifact
       uses: actions/upload-artifact@v4
       with:
-        name: nuget-package-plugin
+        name: nuget-package
         path: WoofWare.Myriad.Plugins/bin/Release/WoofWare.Myriad.Plugins.*.nupkg
-    - name: Upload NuGet artifact (attributes)
-      uses: actions/upload-artifact@v4
-      with:
-        name: nuget-package-attribute
-        path: WoofWare.Myriad.Plugins.Attributes/bin/Release/WoofWare.Myriad.Plugins.Attributes.*.nupkg
 
   expected-pack:
     needs: [nuget-pack]
     runs-on: ubuntu-latest
     steps:
-      - name: Download NuGet artifact (plugin)
+      - name: Download NuGet artifact
         uses: actions/download-artifact@v4
         with:
-          name: nuget-package-plugin
-          path: packed-plugin
+          name: nuget-package
       - name: Check NuGet contents
         # 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
-        with:
-          name: nuget-package-attribute
-          path: packed-attribute
-      - name: Check NuGet contents
-        # 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]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download NuGet artifact (plugin)
-        uses: actions/download-artifact@v4
-        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
-        env:
-          DRY_RUN: 1
-          GITHUB_TOKEN: mock-token
-        run: sh .github/workflows/tag.sh
+        run: if [[ $(find . -maxdepth 1 -name 'WoofWare.Myriad.Plugins.*.nupkg' -printf c | wc -c) -ne "1" ]]; then exit 1; fi
 
   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]
-    if: ${{ always() }}
+    needs: [check-dotnet-format, check-nix-format, build, build-nix, linkcheck, flake-check, analyzers, nuget-pack, expected-pack]
     runs-on: ubuntu-latest
     steps:
-      - uses: Smaug123/all-required-checks-complete-action@d0ef051668d922e3591cc7c97156702946437f8d
-        with:
-          needs-context: ${{ toJSON(needs) }}
+      - run: echo "All required checks complete."
 
-  attestation-attribute:
-    runs-on: ubuntu-latest
-    needs: [all-required-checks-complete]
-    if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/main' }}
-    permissions:
-      id-token: write
-      attestations: write
-      contents: read
-    steps:
-      - name: Download NuGet artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: nuget-package-attribute
-          path: packed
-      - name: Attest Build Provenance
-        uses: actions/attest-build-provenance@310b0a4a3b0b78ef57ecda988ee04b132db73ef8 # v1.4.1
-        with:
-          subject-path: "packed/*.nupkg"
-
-  attestation-plugin:
-    runs-on: ubuntu-latest
-    needs: [all-required-checks-complete]
-    if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/main' }}
-    permissions:
-      id-token: write
-      attestations: write
-      contents: read
-    steps:
-      - name: Download NuGet artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: nuget-package-plugin
-          path: packed
-      - name: Attest Build Provenance
-        uses: actions/attest-build-provenance@310b0a4a3b0b78ef57ecda988ee04b132db73ef8 # v1.4.1
-        with:
-          subject-path: "packed/*.nupkg"
-
-  nuget-publish-attribute:
+  nuget-publish:
     runs-on: ubuntu-latest
     if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/main' }}
     needs: [all-required-checks-complete]
     environment: main-deploy
-    permissions:
-      id-token: write
-      attestations: write
-      contents: read
     steps:
       - uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v25
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Download NuGet artifact
         uses: actions/download-artifact@v4
         with:
-          name: nuget-package-attribute
-          path: packed
-      - name: Identify `dotnet`
-        id: dotnet-identify
-        run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
+          name: nuget-package
       - name: Publish to NuGet
-        id: publish-success
-        uses: Smaug123/publish-nuget-action@76df889166633c2dc613560c092882aabe260df0
-        with:
-          package-name: WoofWare.Myriad.Plugins.Attributes
-          nuget-key: ${{ secrets.NUGET_API_KEY }}
-          nupkg-dir: packed/
-          dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
-
-  nuget-publish-plugin:
-    runs-on: ubuntu-latest
-    if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/main' }}
-    needs: [all-required-checks-complete]
-    environment: main-deploy
-    permissions:
-      id-token: write
-      attestations: write
-      contents: read
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Nix
-        uses: cachix/install-nix-action@V27
-        with:
-          extra_nix_config: |
-            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - name: Download NuGet artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: nuget-package-plugin
-          path: packed
-      - name: Identify `dotnet`
-        id: dotnet-identify
-        run: nix develop --command bash -c 'echo "dotnet=$(which dotnet)" >> $GITHUB_OUTPUT'
-      - name: Publish to NuGet
-        id: publish-success
-        uses: Smaug123/publish-nuget-action@76df889166633c2dc613560c092882aabe260df0
-        with:
-          package-name: WoofWare.Myriad.Plugins
-          nuget-key: ${{ secrets.NUGET_API_KEY }}
-          nupkg-dir: packed/
-          dotnet: ${{ steps.dotnet-identify.outputs.dotnet }}
-
-  github-release-plugin:
-    runs-on: ubuntu-latest
-    if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/main' }}
-    needs: [all-required-checks-complete]
-    environment: main-deploy
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download NuGet artifact (plugin)
-        uses: actions/download-artifact@v4
-        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
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: sh .github/workflows/tag.sh
+        run: nix develop --command dotnet nuget push "WoofWare.Myriad.Plugins.*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json

.github/workflows/flake_update.yaml

@@ -1,57 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json
-name: Weekly Nix Flake Update
-
-on:
-  schedule:
-    - cron: '0 0 * * 0'  # Runs at 00:00 every Sunday
-  workflow_dispatch:  # Allows manual triggering
-
-jobs:
-  update-nix-flake:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@main
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Update Nix flake
-        run: 'nix flake update'
-
-      - name: Build passthru
-        run: 'nix build ".#default.passthru.fetch-deps"'
-
-      - name: Run passthru
-        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
-
-      - name: Format
-        run: 'nix develop --command alejandra .'
-
-      - name: Create token
-        id: generate-token
-        uses: actions/create-github-app-token@v1
-        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
-        id: cpr
-        with:
-            bearer-token: ${{ steps.generate-token.outputs.token }}
-            pr-title: "Upgrade Nix flake and deps"
-
-      - name: Enable Pull Request Automerge
-        if: ${{ steps.cpr.outputs.pull-request-number }}
-        uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: squash

.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

.gitignore

@@ -9,5 +9,3 @@ riderModule.iml
 result
 .analyzerpackages/
 analysis.sarif
-.direnv/
-.venv/

CHANGELOG.md

@@ -1,32 +0,0 @@
-Notable changes are recorded here.
-
-# WoofWare.Myriad.Plugins 2.1.45, WoofWare.Myriad.Plugins.Attributes 3.1.7
-
-The NuGet packages are now attested to through [GitHub Attestations](https://github.blog/2024-05-02-introducing-artifact-attestations-now-in-public-beta/).
-You can run `gh attestation verify ~/.nuget/packages/woofware.myriad.plugins/2.1.45/woofware.myriad.plugins.2.1.45.nupkg -o Smaug123`, for example, to verify with GitHub that the GitHub Actions pipeline on this repository produced a nupkg file with the same hash as the one you were served from NuGet.
-
-# WoofWare.Myriad.Plugins 2.1.33
-
-`JsonParse` can now deserialize the discriminated unions which `JsonSerialize` wrote out.
-
-# WoofWare.Myriad.Plugins 2.1.32, WoofWare.Myriad.Plugins.Attributes 3.1.4
-
-`JsonSerialize` can now serialize many discriminated unions.
-(This operation is inherently opinionated, because JSON does not model discriminated unions.)
-
-# WoofWare.Myriad.Plugins 2.1.20, WoofWare.Myriad.Plugins.Attributes 3.0.1
-
-We now bundle copies of the RestEase attributes in `WoofWare.Myriad.Plugins.Attributes`, in case you don't want to take a dependency on RestEase.
-
-# WoofWare.Myriad.Plugins 2.1.15
-
-The `GenerateMock` generator now permits a limited amount of inheritance in the record we're mocking out (specifically, `IDisposable`).
-
-# WoofWare.Myriad.Plugins 2.1.8
-
-No change to the packages, but this is when we started creating and tagging GitHub releases, which are a better source of truth than this file.
-
-# WoofWare.Myriad.Plugins 2.0
-
-This transition split the attributes (e.g. `[<JsonParseAttribute>]`) into their own assembly, WoofWare.Myriad.Plugins.Attributes.
-The new assembly has minimal dependencies, so you may safely use it from your own code.

ConsumePlugin/Args.fs

@@ -1,95 +0,0 @@
-namespace ConsumePlugin
-
-open System
-open System.IO
-open WoofWare.Myriad.Plugins
-
-[<ArgParser>]
-type BasicNoPositionals =
-    {
-        Foo : int
-        Bar : string
-        Baz : bool
-        Rest : int list
-    }
-
-[<ArgParser>]
-type Basic =
-    {
-        [<ArgumentHelpText "This is a foo!">]
-        Foo : int
-        Bar : string
-        Baz : bool
-        [<ArgumentHelpText "Here's where the rest of the args go">]
-        [<PositionalArgs>]
-        Rest : string list
-    }
-
-[<ArgParser>]
-type BasicWithIntPositionals =
-    {
-        Foo : int
-        Bar : string
-        Baz : bool
-        [<PositionalArgs>]
-        Rest : int list
-    }
-
-[<ArgParser>]
-type LoadsOfTypes =
-    {
-        Foo : int
-        Bar : string
-        Baz : bool
-        SomeFile : FileInfo
-        SomeDirectory : DirectoryInfo
-        SomeList : DirectoryInfo list
-        OptionalThingWithNoDefault : int option
-        [<PositionalArgs>]
-        Positionals : int list
-        [<ArgumentDefaultFunction>]
-        OptionalThing : Choice<bool, bool>
-        [<ArgumentDefaultFunction>]
-        AnotherOptionalThing : Choice<int, int>
-        [<ArgumentDefaultEnvironmentVariable "CONSUMEPLUGIN_THINGS">]
-        YetAnotherOptionalThing : Choice<string, string>
-    }
-
-    static member DefaultOptionalThing () = true
-
-    static member DefaultAnotherOptionalThing () = 3
-
-[<ArgParser>]
-type LoadsOfTypesNoPositionals =
-    {
-        Foo : int
-        Bar : string
-        Baz : bool
-        SomeFile : FileInfo
-        SomeDirectory : DirectoryInfo
-        SomeList : DirectoryInfo list
-        OptionalThingWithNoDefault : int option
-        [<ArgumentDefaultFunction>]
-        OptionalThing : Choice<bool, bool>
-        [<ArgumentDefaultFunction>]
-        AnotherOptionalThing : Choice<int, int>
-        [<ArgumentDefaultEnvironmentVariable "CONSUMEPLUGIN_THINGS">]
-        YetAnotherOptionalThing : Choice<string, string>
-    }
-
-    static member DefaultOptionalThing () = false
-
-    static member DefaultAnotherOptionalThing () = 3
-
-[<ArgParser true>]
-type DatesAndTimes =
-    {
-        Plain : TimeSpan
-        [<InvariantCulture>]
-        Invariant : TimeSpan
-        [<ParseExact @"hh\:mm\:ss">]
-        [<ArgumentHelpText "An exact time please">]
-        Exact : TimeSpan
-        [<InvariantCulture ; ParseExact @"hh\:mm\:ss">]
-        InvariantExact : TimeSpan
-    }

ConsumePlugin/Catamorphism.fs

@@ -1,22 +0,0 @@
-namespace ConsumePlugin
-
-open WoofWare.Myriad.Plugins
-
-type Const<'a> =
-    | Verbatim of 'a
-    | String of string
-
-type PairOpKind =
-    | NormalSeq
-    | ThenDoSeq
-
-[<CreateCatamorphism "TreeCata">]
-type Tree<'a, 'b> =
-    | Const of Const<'a> * 'b
-    | Pair of Tree<'a, 'b> * Tree<'a, 'b> * PairOpKind
-    | Sequential of Tree<'a, 'b> list
-    | Builder of Tree<'a, 'b> * TreeBuilder<'b, 'a>
-
-and TreeBuilder<'b, 'a> =
-    | Child of TreeBuilder<'b, 'a>
-    | Parent of Tree<'a, 'b>

ConsumePlugin/ConsumePlugin.fsproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <OtherFlags>--reflectionfree $(OtherFlags)</OtherFlags>
   </PropertyGroup>
   <ItemGroup>
     <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)..\WoofWare.Myriad.Plugins\bin\$(Configuration)\net6.0\WoofWare.Myriad.Plugins.dll"/>
@@ -36,33 +35,13 @@
     <Compile Include="GeneratedVault.fs">
       <MyriadFile>Vault.fs</MyriadFile>
     </Compile>
-    <Compile Include="SerializationAndDeserialization.fs" />
-    <Compile Include="GeneratedSerde.fs">
-      <MyriadFile>SerializationAndDeserialization.fs</MyriadFile>
-    </Compile>
-    <Compile Include="Catamorphism.fs" />
-    <Compile Include="GeneratedCatamorphism.fs">
-      <MyriadFile>Catamorphism.fs</MyriadFile>
-    </Compile>
-    <Compile Include="FSharpForFunAndProfitCata.fs" />
-    <Compile Include="GeneratedFileSystem.fs">
-      <MyriadFile>FSharpForFunAndProfitCata.fs</MyriadFile>
-    </Compile>
-    <Compile Include="List.fs" />
-    <Compile Include="ListCata.fs">
-      <MyriadFile>List.fs</MyriadFile>
-    </Compile>
-    <Compile Include="Args.fs" />
-    <Compile Include="GeneratedArgs.fs">
-      <MyriadFile>Args.fs</MyriadFile>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="RestEase" Version="1.6.4"/>
-    <ProjectReference Include="..\WoofWare.Myriad.Plugins.Attributes\WoofWare.Myriad.Plugins.Attributes.fsproj" />
-    <ProjectReference Include="..\WoofWare.Myriad.Plugins\WoofWare.Myriad.Plugins.fsproj" PrivateAssets="all" />
-    <PackageReference Include="Myriad.Sdk" Version="0.8.3" PrivateAssets="all" />
+    <ProjectReference Include="..\WoofWare.Myriad.Plugins\WoofWare.Myriad.Plugins.fsproj"/>
+    <PackageReference Include="Myriad.Sdk" Version="0.8.3"/>
+    <PackageReference Include="Myriad.Core" Version="0.8.3"/>
   </ItemGroup>
 
 </Project>

ConsumePlugin/FSharpForFunAndProfitCata.fs

@@ -1,64 +0,0 @@
-namespace ConsumePlugin
-
-open WoofWare.Myriad.Plugins
-
-type File =
-    {
-        Name : string
-        FileSize : int
-    }
-
-type Directory =
-    {
-        Name : string
-        DirSize : int
-        Contents : FileSystemItem list
-    }
-
-and [<CreateCatamorphism "FileSystemCata">] FileSystemItem =
-    | Directory of Directory
-    | File of File
-
-type Book =
-    {
-        title : string
-        price : decimal
-    }
-
-type ChocolateType =
-    | Dark
-    | Milk
-    | SeventyPercent
-
-    override this.ToString () =
-        match this with
-        | ChocolateType.Dark -> "Dark"
-        | ChocolateType.Milk -> "Milk"
-        | ChocolateType.SeventyPercent -> "SeventyPercent"
-
-type Chocolate =
-    {
-        chocType : ChocolateType
-        price : decimal
-    }
-
-    override this.ToString () = this.chocType.ToString ()
-
-type WrappingPaperStyle =
-    | HappyBirthday
-    | HappyHolidays
-    | SolidColor
-
-    override this.ToString () =
-        match this with
-        | WrappingPaperStyle.HappyBirthday -> "HappyBirthday"
-        | WrappingPaperStyle.HappyHolidays -> "HappyHolidays"
-        | WrappingPaperStyle.SolidColor -> "SolidColor"
-
-[<CreateCatamorphism "GiftCata">]
-type Gift =
-    | Book of Book
-    | Chocolate of Chocolate
-    | Wrapped of Gift * WrappingPaperStyle
-    | Boxed of Gift
-    | WithACard of Gift * message : string

ConsumePlugin/GeneratedCatamorphism.fs

@@ -1,138 +0,0 @@
-//------------------------------------------------------------------------------
-//        This code was generated by myriad.
-//        Changes to this file will be lost when the code is regenerated.
-//------------------------------------------------------------------------------
-
-
-
-
-
-namespace ConsumePlugin
-
-open WoofWare.Myriad.Plugins
-
-/// Description of how to combine cases during a fold
-type TreeBuilderCataCase<'b, 'a, 'TreeBuilder, 'Tree> =
-    /// How to operate on the Child case
-    abstract Child : 'TreeBuilder -> 'TreeBuilder
-    /// How to operate on the Parent case
-    abstract Parent : 'Tree -> 'TreeBuilder
-
-/// Description of how to combine cases during a fold
-type TreeCataCase<'a, 'b, 'TreeBuilder, 'Tree> =
-    /// How to operate on the Const case
-    abstract Const : Const<'a> -> 'b -> 'Tree
-    /// How to operate on the Pair case
-    abstract Pair : 'Tree -> 'Tree -> PairOpKind -> 'Tree
-    /// How to operate on the Sequential case
-    abstract Sequential : 'Tree list -> 'Tree
-    /// How to operate on the Builder case
-    abstract Builder : 'Tree -> 'TreeBuilder -> 'Tree
-
-/// Specifies how to perform a fold (catamorphism) over the type Tree and its friends.
-type TreeCata<'b, 'a, 'TreeBuilder, 'Tree> =
-    {
-        /// How to perform a fold (catamorphism) over the type TreeBuilder
-        TreeBuilder : TreeBuilderCataCase<'b, 'a, 'TreeBuilder, 'Tree>
-        /// How to perform a fold (catamorphism) over the type Tree
-        Tree : TreeCataCase<'a, 'b, 'TreeBuilder, 'Tree>
-    }
-
-/// Methods to perform a catamorphism over the type Tree
-[<RequireQualifiedAccess>]
-module TreeCata =
-    [<RequireQualifiedAccess>]
-    type private Instruction<'b, 'a> =
-        | Process__TreeBuilder of TreeBuilder<'b, 'a>
-        | Process__Tree of Tree<'a, 'b>
-        | TreeBuilder_Child
-        | TreeBuilder_Parent
-        | Tree_Pair of PairOpKind
-        | Tree_Sequential of int
-        | Tree_Builder
-
-    let private loop (cata : TreeCata<'b, 'a, 'TreeBuilder, 'Tree>) (instructions : ResizeArray<Instruction<'b, 'a>>) =
-        let treeStack = ResizeArray<'Tree> ()
-        let treeBuilderStack = ResizeArray<'TreeBuilder> ()
-
-        while instructions.Count > 0 do
-            let currentInstruction = instructions.[instructions.Count - 1]
-            instructions.RemoveAt (instructions.Count - 1)
-
-            match currentInstruction with
-            | Instruction.Process__TreeBuilder x ->
-                match x with
-                | TreeBuilder.Child (arg0_0) ->
-                    instructions.Add Instruction.TreeBuilder_Child
-                    instructions.Add (Instruction.Process__TreeBuilder arg0_0)
-                | TreeBuilder.Parent (arg0_0) ->
-                    instructions.Add Instruction.TreeBuilder_Parent
-                    instructions.Add (Instruction.Process__Tree arg0_0)
-            | Instruction.Process__Tree x ->
-                match x with
-                | Tree.Const (arg0_0, arg1_0) -> cata.Tree.Const arg0_0 arg1_0 |> treeStack.Add
-                | Tree.Pair (arg0_0, arg1_0, arg2_0) ->
-                    instructions.Add (Instruction.Tree_Pair (arg2_0))
-                    instructions.Add (Instruction.Process__Tree arg0_0)
-                    instructions.Add (Instruction.Process__Tree arg1_0)
-                | Tree.Sequential (arg0_0) ->
-                    instructions.Add (Instruction.Tree_Sequential ((List.length arg0_0)))
-
-                    for elt in arg0_0 do
-                        instructions.Add (Instruction.Process__Tree elt)
-                | Tree.Builder (arg0_0, arg1_0) ->
-                    instructions.Add Instruction.Tree_Builder
-                    instructions.Add (Instruction.Process__Tree arg0_0)
-                    instructions.Add (Instruction.Process__TreeBuilder arg1_0)
-            | Instruction.TreeBuilder_Child ->
-                let arg0_0 = treeBuilderStack.[treeBuilderStack.Count - 1]
-                treeBuilderStack.RemoveAt (treeBuilderStack.Count - 1)
-                cata.TreeBuilder.Child arg0_0 |> treeBuilderStack.Add
-            | Instruction.TreeBuilder_Parent ->
-                let arg0_0 = treeStack.[treeStack.Count - 1]
-                treeStack.RemoveAt (treeStack.Count - 1)
-                cata.TreeBuilder.Parent arg0_0 |> treeBuilderStack.Add
-            | Instruction.Tree_Pair arg2_0 ->
-                let arg0_0 = treeStack.[treeStack.Count - 1]
-                treeStack.RemoveAt (treeStack.Count - 1)
-                let arg1_0 = treeStack.[treeStack.Count - 1]
-                treeStack.RemoveAt (treeStack.Count - 1)
-                cata.Tree.Pair arg0_0 arg1_0 arg2_0 |> treeStack.Add
-            | Instruction.Tree_Sequential arg0_0 ->
-                let arg0_0_len = arg0_0
-
-                let arg0_0 =
-                    seq {
-                        for i = treeStack.Count - 1 downto treeStack.Count - arg0_0 do
-                            yield treeStack.[i]
-                    }
-                    |> Seq.toList
-
-                treeStack.RemoveRange (treeStack.Count - arg0_0_len, arg0_0_len)
-                cata.Tree.Sequential arg0_0 |> treeStack.Add
-            | Instruction.Tree_Builder ->
-                let arg0_0 = treeStack.[treeStack.Count - 1]
-                treeStack.RemoveAt (treeStack.Count - 1)
-                let arg1_0 = treeBuilderStack.[treeBuilderStack.Count - 1]
-                treeBuilderStack.RemoveAt (treeBuilderStack.Count - 1)
-                cata.Tree.Builder arg0_0 arg1_0 |> treeStack.Add
-
-        treeBuilderStack, treeStack
-
-    /// Execute the catamorphism.
-    let runTreeBuilder
-        (cata : TreeCata<'b, 'a, 'TreeBuilderRet, 'TreeRet>)
-        (x : TreeBuilder<'b, 'a>)
-        : 'TreeBuilderRet
-        =
-        let instructions = ResizeArray ()
-        instructions.Add (Instruction.Process__TreeBuilder x)
-        let treeBuilderRetStack, treeRetStack = loop cata instructions
-        Seq.exactlyOne treeBuilderRetStack
-
-    /// Execute the catamorphism.
-    let runTree (cata : TreeCata<'b, 'a, 'TreeBuilderRet, 'TreeRet>) (x : Tree<'a, 'b>) : 'TreeRet =
-        let instructions = ResizeArray ()
-        instructions.Add (Instruction.Process__Tree x)
-        let treeBuilderRetStack, treeRetStack = loop cata instructions
-        Seq.exactlyOne treeRetStack

ConsumePlugin/GeneratedFileSystem.fs

@@ -1,152 +0,0 @@
-//------------------------------------------------------------------------------
-//        This code was generated by myriad.
-//        Changes to this file will be lost when the code is regenerated.
-//------------------------------------------------------------------------------
-
-
-
-
-
-namespace ConsumePlugin
-
-open WoofWare.Myriad.Plugins
-
-/// Description of how to combine cases during a fold
-type FileSystemItemCataCase<'FileSystemItem> =
-    /// How to operate on the Directory case
-    abstract Directory : name : string -> dirSize : int -> contents : 'FileSystemItem list -> 'FileSystemItem
-    /// How to operate on the File case
-    abstract File : File -> 'FileSystemItem
-
-/// Specifies how to perform a fold (catamorphism) over the type FileSystemItem and its friends.
-type FileSystemCata<'FileSystemItem> =
-    {
-        /// How to perform a fold (catamorphism) over the type FileSystemItem
-        FileSystemItem : FileSystemItemCataCase<'FileSystemItem>
-    }
-
-/// Methods to perform a catamorphism over the type FileSystemItem
-[<RequireQualifiedAccess>]
-module FileSystemItemCata =
-    [<RequireQualifiedAccess>]
-    type private Instruction =
-        | Process__FileSystemItem of FileSystemItem
-        | FileSystemItem_Directory of string * int * int
-
-    let private loop (cata : FileSystemCata<'FileSystemItem>) (instructions : ResizeArray<Instruction>) =
-        let fileSystemItemStack = ResizeArray<'FileSystemItem> ()
-
-        while instructions.Count > 0 do
-            let currentInstruction = instructions.[instructions.Count - 1]
-            instructions.RemoveAt (instructions.Count - 1)
-
-            match currentInstruction with
-            | Instruction.Process__FileSystemItem x ->
-                match x with
-                | FileSystemItem.Directory ({
-                                                Name = name
-                                                DirSize = dirSize
-                                                Contents = contents
-                                            }) ->
-                    instructions.Add (Instruction.FileSystemItem_Directory (name, dirSize, (List.length contents)))
-
-                    for elt in contents do
-                        instructions.Add (Instruction.Process__FileSystemItem elt)
-                | FileSystemItem.File (arg0_0) -> cata.FileSystemItem.File arg0_0 |> fileSystemItemStack.Add
-            | Instruction.FileSystemItem_Directory (name, dirSize, contents) ->
-                let contents_len = contents
-
-                let contents =
-                    seq {
-                        for i = fileSystemItemStack.Count - 1 downto fileSystemItemStack.Count - contents do
-                            yield fileSystemItemStack.[i]
-                    }
-                    |> Seq.toList
-
-                fileSystemItemStack.RemoveRange (fileSystemItemStack.Count - contents_len, contents_len)
-                cata.FileSystemItem.Directory name dirSize contents |> fileSystemItemStack.Add
-
-        fileSystemItemStack
-
-    /// Execute the catamorphism.
-    let runFileSystemItem (cata : FileSystemCata<'FileSystemItemRet>) (x : FileSystemItem) : 'FileSystemItemRet =
-        let instructions = ResizeArray ()
-        instructions.Add (Instruction.Process__FileSystemItem x)
-        let fileSystemItemRetStack = loop cata instructions
-        Seq.exactlyOne fileSystemItemRetStack
-namespace ConsumePlugin
-
-open WoofWare.Myriad.Plugins
-
-/// Description of how to combine cases during a fold
-type GiftCataCase<'Gift> =
-    /// How to operate on the Book case
-    abstract Book : Book -> 'Gift
-    /// How to operate on the Chocolate case
-    abstract Chocolate : Chocolate -> 'Gift
-    /// How to operate on the Wrapped case
-    abstract Wrapped : 'Gift -> WrappingPaperStyle -> 'Gift
-    /// How to operate on the Boxed case
-    abstract Boxed : 'Gift -> 'Gift
-    /// How to operate on the WithACard case
-    abstract WithACard : 'Gift -> message : string -> 'Gift
-
-/// Specifies how to perform a fold (catamorphism) over the type Gift and its friends.
-type GiftCata<'Gift> =
-    {
-        /// How to perform a fold (catamorphism) over the type Gift
-        Gift : GiftCataCase<'Gift>
-    }
-
-/// Methods to perform a catamorphism over the type Gift
-[<RequireQualifiedAccess>]
-module GiftCata =
-    [<RequireQualifiedAccess>]
-    type private Instruction =
-        | Process__Gift of Gift
-        | Gift_Wrapped of WrappingPaperStyle
-        | Gift_Boxed
-        | Gift_WithACard of string
-
-    let private loop (cata : GiftCata<'Gift>) (instructions : ResizeArray<Instruction>) =
-        let giftStack = ResizeArray<'Gift> ()
-
-        while instructions.Count > 0 do
-            let currentInstruction = instructions.[instructions.Count - 1]
-            instructions.RemoveAt (instructions.Count - 1)
-
-            match currentInstruction with
-            | Instruction.Process__Gift x ->
-                match x with
-                | Gift.Book (arg0_0) -> cata.Gift.Book arg0_0 |> giftStack.Add
-                | Gift.Chocolate (arg0_0) -> cata.Gift.Chocolate arg0_0 |> giftStack.Add
-                | Gift.Wrapped (arg0_0, arg1_0) ->
-                    instructions.Add (Instruction.Gift_Wrapped (arg1_0))
-                    instructions.Add (Instruction.Process__Gift arg0_0)
-                | Gift.Boxed (arg0_0) ->
-                    instructions.Add Instruction.Gift_Boxed
-                    instructions.Add (Instruction.Process__Gift arg0_0)
-                | Gift.WithACard (arg0_0, message) ->
-                    instructions.Add (Instruction.Gift_WithACard (message))
-                    instructions.Add (Instruction.Process__Gift arg0_0)
-            | Instruction.Gift_Wrapped arg1_0 ->
-                let arg0_0 = giftStack.[giftStack.Count - 1]
-                giftStack.RemoveAt (giftStack.Count - 1)
-                cata.Gift.Wrapped arg0_0 arg1_0 |> giftStack.Add
-            | Instruction.Gift_Boxed ->
-                let arg0_0 = giftStack.[giftStack.Count - 1]
-                giftStack.RemoveAt (giftStack.Count - 1)
-                cata.Gift.Boxed arg0_0 |> giftStack.Add
-            | Instruction.Gift_WithACard message ->
-                let arg0_0 = giftStack.[giftStack.Count - 1]
-                giftStack.RemoveAt (giftStack.Count - 1)
-                cata.Gift.WithACard arg0_0 message |> giftStack.Add
-
-        giftStack
-
-    /// Execute the catamorphism.
-    let runGift (cata : GiftCata<'GiftRet>) (x : Gift) : 'GiftRet =
-        let instructions = ResizeArray ()
-        instructions.Add (Instruction.Process__Gift x)
-        let giftRetStack = loop cata instructions
-        Seq.exactlyOne giftRetStack

ConsumePlugin/GeneratedJson.fs

@@ -4,42 +4,15 @@
 //------------------------------------------------------------------------------
 
 
-namespace ConsumePlugin
-
-open System.Text.Json.Serialization
-
-/// Module containing JSON serializing methods for the InternalTypeNotExtensionSerial type
-[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
-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>))
-        node :> _
-namespace ConsumePlugin
-
-open System.Text.Json.Serialization
-
-/// Module containing JSON serializing extension members for the InternalTypeExtension type
-[<AutoOpen>]
-module internal InternalTypeExtensionJsonSerializeExtension =
-    /// Extension methods for JSON parsing
-    type InternalTypeExtension with
-
-        /// 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>))
-            node :> _
-
 namespace ConsumePlugin
 
 /// Module containing JSON parsing methods for the InnerType type
-[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module InnerType =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : InnerType =
-        let arg_0 =
+        let Thing =
             (match node.[(Literals.something)] with
              | null ->
                  raise (
@@ -49,19 +22,20 @@ module InnerType =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
         {
-            Thing = arg_0
+            Thing = Thing
         }
 namespace ConsumePlugin
 
 /// Module containing JSON parsing methods for the JsonRecordType type
-[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module JsonRecordType =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JsonRecordType =
-        let arg_5 =
+        let F =
             (match node.["f"] with
              | null ->
                  raise (
@@ -71,10 +45,10 @@ module JsonRecordType =
                  )
              | v -> v)
                 .AsArray ()
-            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.Int32> ())
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<int> ())
             |> Array.ofSeq
 
-        let arg_4 =
+        let E =
             (match node.["e"] with
              | null ->
                  raise (
@@ -84,10 +58,10 @@ module JsonRecordType =
                  )
              | v -> v)
                 .AsArray ()
-            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.String> ())
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> Array.ofSeq
 
-        let arg_3 =
+        let D =
             InnerType.jsonParse (
                 match node.["d"] with
                 | null ->
@@ -99,7 +73,7 @@ module JsonRecordType =
                 | v -> v
             )
 
-        let arg_2 =
+        let C =
             (match node.["hi"] with
              | null ->
                  raise (
@@ -109,10 +83,10 @@ module JsonRecordType =
                  )
              | v -> v)
                 .AsArray ()
-            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.Int32> ())
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<int> ())
             |> List.ofSeq
 
-        let arg_1 =
+        let B =
             (match node.["another-thing"] with
              | null ->
                  raise (
@@ -122,9 +96,9 @@ module JsonRecordType =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
-        let arg_0 =
+        let A =
             (match node.["a"] with
              | null ->
                  raise (
@@ -134,62 +108,15 @@ module JsonRecordType =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.Int32> ()
+                .GetValue<int> ()
 
         {
-            A = arg_0
-            B = arg_1
-            C = arg_2
-            D = arg_3
-            E = arg_4
-            F = arg_5
-        }
-namespace ConsumePlugin
-
-/// Module containing JSON parsing methods for the InternalTypeNotExtension type
-[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
-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> ()
-
-        {
-            InternalThing = arg_0
-        }
-namespace ConsumePlugin
-
-/// Module containing JSON parsing extension members for the InternalTypeExtension type
-[<AutoOpen>]
-module internal InternalTypeExtensionJsonParseExtension =
-    /// Extension methods for JSON parsing
-    type InternalTypeExtension with
-
-        /// 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> ()
-
-            {
-                ExternalThing = arg_0
+            A = A
+            B = B
+            C = C
+            D = D
+            E = E
+            F = F
         }
 namespace ConsumePlugin
 
@@ -201,230 +128,24 @@ 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_19 =
-                (match node.["victor"] with
+            let Sailor =
+                (match node.["sailor"] with
                  | null ->
                      raise (
                          System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("victor")
+                             sprintf "Required key '%s' not found on JSON object" ("sailor")
                          )
                      )
                  | v -> v)
                     .AsValue()
-                    .GetValue<System.Char> ()
+                    .GetValue<float> ()
 
-            let arg_18 =
-                (match node.["uniform"] with
+            let Soldier =
+                (match node.["soldier"] with
                  | null ->
                      raise (
                          System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("uniform")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Decimal> ()
-
-            let arg_17 =
-                (match node.["tango"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("tango")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.SByte> ()
-
-            let arg_16 =
-                (match node.["quebec"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("quebec")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Byte> ()
-
-            let arg_15 =
-                (match node.["papa"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("papa")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Byte> ()
-
-            let arg_14 =
-                (match node.["oscar"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("oscar")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.SByte> ()
-
-            let arg_13 =
-                (match node.["november"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("november")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.UInt16> ()
-
-            let arg_12 =
-                (match node.["mike"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("mike")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Int16> ()
-
-            let arg_11 =
-                (match node.["lima"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("lima")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.UInt32> ()
-
-            let arg_10 =
-                (match node.["kilo"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("kilo")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Int32> ()
-
-            let arg_9 =
-                (match node.["juliette"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("juliette")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.UInt32> ()
-
-            let arg_8 =
-                (match node.["india"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("india")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Int32> ()
-
-            let arg_7 =
-                (match node.["hotel"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("hotel")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.UInt64> ()
-
-            let arg_6 =
-                (match node.["golf"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("golf")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Int64> ()
-
-            let arg_5 =
-                (match node.["foxtrot"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("foxtrot")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Double> ()
-
-            let arg_4 =
-                (match node.["echo"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("echo")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Single> ()
-
-            let arg_3 =
-                (match node.["delta"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("delta")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Single> ()
-
-            let arg_2 =
-                (match node.["charlie"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("charlie")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Double> ()
-
-            let arg_1 =
-                (match node.["bravo"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("bravo")
+                             sprintf "Required key '%s' not found on JSON object" ("soldier")
                          )
                      )
                  | v -> v)
@@ -432,38 +153,33 @@ module ToGetExtensionMethodJsonParseExtension =
                     .GetValue<string> ()
                 |> System.Uri
 
-            let arg_0 =
-                (match node.["alpha"] with
+            let Tailor =
+                (match node.["tailor"] with
                  | null ->
                      raise (
                          System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("alpha")
+                             sprintf "Required key '%s' not found on JSON object" ("tailor")
                          )
                      )
                  | v -> v)
                     .AsValue()
-                    .GetValue<System.String> ()
+                    .GetValue<int> ()
+
+            let Tinker =
+                (match node.["tinker"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("tinker")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<string> ()
 
             {
-                Alpha = arg_0
-                Bravo = arg_1
-                Charlie = arg_2
-                Delta = arg_3
-                Echo = arg_4
-                Foxtrot = arg_5
-                Golf = arg_6
-                Hotel = arg_7
-                India = arg_8
-                Juliette = arg_9
-                Kilo = arg_10
-                Lima = arg_11
-                Mike = arg_12
-                November = arg_13
-                Oscar = arg_14
-                Papa = arg_15
-                Quebec = arg_16
-                Tango = arg_17
-                Uniform = arg_18
-                Victor = arg_19
-                Whiskey = arg_20
+                Tinker = Tinker
+                Tailor = Tailor
+                Soldier = Soldier
+                Sailor = Sailor
             }

ConsumePlugin/GeneratedMock.fs

@@ -5,9 +5,6 @@
 
 namespace SomeNamespace
 
-open System
-open WoofWare.Myriad.Plugins
-
 /// Mock record type for an interface
 type internal PublicTypeMock =
     {
@@ -16,48 +13,19 @@ type internal PublicTypeMock =
         Mem3 : int * option<System.Threading.CancellationToken> -> string
     }
 
-    /// An implementation where every method throws.
     static member Empty : PublicTypeMock =
         {
-            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"))
+            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem3 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface IPublicType 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.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
-open WoofWare.Myriad.Plugins
-
-/// Mock record type for an interface
-type public PublicTypeInternalFalseMock =
-    {
-        Mem1 : string * int -> string list
-        Mem2 : string -> int
-        Mem3 : int * option<System.Threading.CancellationToken> -> string
-    }
-
-    /// An implementation where every method throws.
-    static member Empty : PublicTypeInternalFalseMock =
-        {
-            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) = 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
-open WoofWare.Myriad.Plugins
-
 /// Mock record type for an interface
 type internal InternalTypeMock =
     {
@@ -65,21 +33,17 @@ type internal InternalTypeMock =
         Mem2 : string -> int
     }
 
-    /// An implementation where every method throws.
     static member Empty : InternalTypeMock =
         {
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface InternalType 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.Mem2 (arg_0_0) = this.Mem2 (arg_0_0)
 namespace SomeNamespace
 
-open System
-open WoofWare.Myriad.Plugins
-
 /// Mock record type for an interface
 type private PrivateTypeMock =
     {
@@ -87,62 +51,32 @@ type private PrivateTypeMock =
         Mem2 : string -> int
     }
 
-    /// An implementation where every method throws.
     static member Empty : PrivateTypeMock =
         {
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
-            Mem2 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem2"))
+            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface PrivateType 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.Mem2 (arg_0_0) = this.Mem2 (arg_0_0)
 namespace SomeNamespace
 
-open System
-open WoofWare.Myriad.Plugins
-
-/// Mock record type for an interface
-type private PrivateTypeInternalFalseMock =
-    {
-        Mem1 : string * int -> unit
-        Mem2 : string -> int
-    }
-
-    /// An implementation where every method throws.
-    static member Empty : PrivateTypeInternalFalseMock =
-        {
-            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) = this.Mem1 (arg_0_0, arg_0_1)
-        member this.Mem2 arg_0_0 = this.Mem2 (arg_0_0)
-namespace SomeNamespace
-
-open System
-open WoofWare.Myriad.Plugins
-
 /// Mock record type for an interface
 type internal VeryPublicTypeMock<'a, 'b> =
     {
         Mem1 : 'a -> 'b
     }
 
-    /// An implementation where every method throws.
     static member Empty () : VeryPublicTypeMock<'a, 'b> =
         {
-            Mem1 = (fun _ -> raise (System.NotImplementedException "Unimplemented mock function: Mem1"))
+            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface VeryPublicType<'a, 'b> with
-        member this.Mem1 arg_0_0 = this.Mem1 (arg_0_0)
+        member this.Mem1 (arg_0_0) = this.Mem1 (arg_0_0)
 namespace SomeNamespace
 
-open System
-open WoofWare.Myriad.Plugins
-
 /// Mock record type for an interface
 type internal CurriedMock<'a> =
     {
@@ -154,21 +88,20 @@ type internal CurriedMock<'a> =
         Mem6 : int * string -> 'a * int -> string
     }
 
-    /// An implementation where every method throws.
     static member Empty () : CurriedMock<'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"))
+            Mem1 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem2 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem3 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem4 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem5 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
+            Mem6 = (fun x -> raise (System.NotImplementedException "Unimplemented mock function"))
         }
 
     interface Curried<'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.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)
@@ -178,31 +111,3 @@ type internal CurriedMock<'a> =
 
         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
-open WoofWare.Myriad.Plugins
-
-/// Mock record type for an interface
-type internal TypeWithInterfaceMock =
-    {
-        /// Implementation of IDisposable.Dispose
-        Dispose : unit -> unit
-        Mem1 : string option -> string[] Async
-        Mem2 : unit -> string[] Async
-    }
-
-    /// An implementation where every method throws.
-    static member Empty : TypeWithInterfaceMock =
-        {
-            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 = this.Mem1 (arg_0_0)
-        member this.Mem2 () = this.Mem2 (())
-
-    interface System.IDisposable with
-        member this.Dispose () : unit = this.Dispose ()

ConsumePlugin/GeneratedRestClient.fs

@@ -5,7 +5,6 @@
 
 
 
-
 namespace PureGym
 
 open System
@@ -17,7 +16,8 @@ open System.Net.Http
 open RestEase
 
 /// Module for constructing a REST client.
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
 module PureGymApi =
     /// Create a REST client.
     let make (client : System.Net.Http.HttpClient) : IPureGymApi =
@@ -31,7 +31,7 @@ module PureGymApi =
                             (match client.BaseAddress with
                              | null -> System.Uri "https://whatnot.com"
                              | v -> v),
-                            System.Uri (("v1/gyms/"), System.UriKind.Relative)
+                            System.Uri ("v1/gyms/", System.UriKind.Relative)
                         )
 
                     let httpMessage =
@@ -42,13 +42,13 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    let! stream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
 
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
+                    let! node =
+                        System.Text.Json.Nodes.JsonNode.ParseAsync (stream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return jsonNode.AsArray () |> Seq.map (fun elt -> Gym.jsonParse elt) |> List.ofSeq
+                    return node.AsArray () |> Seq.map (fun elt -> Gym.jsonParse elt) |> List.ofSeq
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -76,47 +76,13 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    let! stream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
 
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
+                    let! node =
+                        System.Text.Json.Nodes.JsonNode.ParseAsync (stream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return GymAttendance.jsonParse jsonNode
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-            member _.GetGymAttendance' (gymId : int, ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri (
-                                "v1/gyms/{gym_id}/attendance"
-                                    .Replace ("{gym_id}", gymId.ToString () |> System.Web.HttpUtility.UrlEncode),
-                                System.UriKind.Relative
-                            )
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                        |> Async.AwaitTask
-
-                    return GymAttendance.jsonParse jsonNode
+                    return GymAttendance.jsonParse node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -140,17 +106,17 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    let! stream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
 
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
+                    let! node =
+                        System.Text.Json.Nodes.JsonNode.ParseAsync (stream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return Member.jsonParse jsonNode
+                    return Member.jsonParse node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
-            member _.GetGym (gym : int, ct : CancellationToken option) =
+            member _.GetGym (gymId : int, ct : CancellationToken option) =
                 async {
                     let! ct = Async.CancellationToken
 
@@ -160,8 +126,8 @@ 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_id}"
+                                    .Replace ("{gym_id}", gymId.ToString () |> System.Web.HttpUtility.UrlEncode),
                                 System.UriKind.Relative
                             )
                         )
@@ -174,13 +140,13 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    let! stream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
 
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
+                    let! node =
+                        System.Text.Json.Nodes.JsonNode.ParseAsync (stream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return Gym.jsonParse jsonNode
+                    return Gym.jsonParse node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -204,13 +170,13 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    let! stream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
 
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
+                    let! node =
+                        System.Text.Json.Nodes.JsonNode.ParseAsync (stream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return MemberActivityDto.jsonParse jsonNode
+                    return MemberActivityDto.jsonParse node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -234,79 +200,13 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    let! stream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
 
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
+                    let! node =
+                        System.Text.Json.Nodes.JsonNode.ParseAsync (stream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return UriThing.jsonParse jsonNode
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-            member _.PostStringToString (foo : Map<string, string> option, ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri ("some/url", 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 (
-                            foo
-                            |> (fun field ->
-                                match field with
-                                | None -> null :> System.Text.Json.Nodes.JsonNode
-                                | Some 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
-                                            )
-
-                                        ret
-                                    )
-                                        field)
-                                    :> System.Text.Json.Nodes.JsonNode
-                            )
-                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
-                        )
-
-                    do httpMessage.Content <- queryParams
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                        |> Async.AwaitTask
-
-                    return
-                        match jsonNode with
-                        | null -> None
-                        | v ->
-                            v.AsObject ()
-                            |> Seq.map (fun kvp ->
-                                let key = (kvp.Key)
-                                let value = (kvp.Value).AsValue().GetValue<System.String> ()
-                                key, value
-                            )
-                            |> Map.ofSeq
-                            |> Some
+                    return UriThing.jsonParse node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -321,11 +221,7 @@ module PureGymApi =
                              | v -> v),
                             System.Uri (
                                 ("/v2/gymSessions/member"
-                                 + (if "/v2/gymSessions/member".IndexOf (char 63) >= 0 then
-                                        "&"
-                                    else
-                                        "?")
-                                 + "fromDate="
+                                 + "?fromDate="
                                  + ((fromDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)
                                  + "&toDate="
                                  + ((toDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)),
@@ -341,54 +237,13 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    let! stream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
 
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
+                    let! node =
+                        System.Text.Json.Nodes.JsonNode.ParseAsync (stream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return Sessions.jsonParse jsonNode
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-            member _.GetSessionsWithQuery (fromDate : DateOnly, toDate : DateOnly, ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri (
-                                ("/v2/gymSessions/member?foo=1"
-                                 + (if "/v2/gymSessions/member?foo=1".IndexOf (char 63) >= 0 then
-                                        "&"
-                                    else
-                                        "?")
-                                 + "fromDate="
-                                 + ((fromDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)
-                                 + "&toDate="
-                                 + ((toDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)),
-                                System.UriKind.Relative
-                            )
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                        |> Async.AwaitTask
-
-                    return Sessions.jsonParse jsonNode
+                    return Sessions.jsonParse node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -414,8 +269,8 @@ module PureGymApi =
                     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
+                    let! node = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -441,8 +296,8 @@ module PureGymApi =
                     do httpMessage.Content <- queryParams
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-                    return responseStream
+                    let! node = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -468,8 +323,8 @@ module PureGymApi =
                     do httpMessage.Content <- queryParams
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-                    return responseStream
+                    let! node = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -495,8 +350,8 @@ module PureGymApi =
                     do httpMessage.Content <- queryParams
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-                    return responseStream
+                    let! node = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -522,107 +377,8 @@ module PureGymApi =
                     do httpMessage.Content <- queryParams
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-                    return responseStream
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-            member _.CreateUserSerialisedBody (user : PureGym.Member, ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri ("users/new", 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 (
-                            user
-                            |> PureGym.Member.toJsonNode
-                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
-                        )
-
-                    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))
-
-            member _.CreateUserSerialisedUrlBody (user : Uri, ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri ("users/new", 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 (
-                            user
-                            |> System.Text.Json.Nodes.JsonValue.Create<Uri>
-                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
-                        )
-
-                    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))
-
-            member _.CreateUserSerialisedIntBody (user : int, ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri ("users/new", 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 (
-                            user
-                            |> System.Text.Json.Nodes.JsonValue.Create<int>
-                            |> (fun node -> if isNull node then "null" else node.ToJsonString ())
-                        )
-
-                    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
+                    let! node = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -647,8 +403,8 @@ module PureGymApi =
                     do httpMessage.Content <- user
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    return responseString
+                    let! node = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -676,8 +432,8 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    return responseString
+                    let! node = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -701,8 +457,8 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-                    return responseStream
+                    let! node = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -726,8 +482,8 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-                    return responseStream
+                    let! node = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -751,8 +507,8 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-                    return responseStream
+                    let! node = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -776,7 +532,8 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    return response
+                    let node = response
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -800,7 +557,8 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    return response
+                    let node = response
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -824,7 +582,8 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    return response
+                    let node = response
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -848,151 +607,8 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    return response
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-            member _.GetResponse (ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri ("endpoint", System.UriKind.Relative)
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                        |> Async.AwaitTask
-
-                    return
-                        new RestEase.Response<_> (
-                            responseString,
-                            response,
-                            (fun () -> (MemberActivityDto.jsonParse jsonNode))
-                        )
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-            member _.GetResponse' (ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri ("endpoint", System.UriKind.Relative)
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                        |> Async.AwaitTask
-
-                    return
-                        new RestEase.Response<_> (
-                            responseString,
-                            response,
-                            (fun () -> (MemberActivityDto.jsonParse jsonNode))
-                        )
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-            member _.GetResponse'' (ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri ("endpoint", System.UriKind.Relative)
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                        |> Async.AwaitTask
-
-                    return
-                        new RestEase.Response<_> (
-                            responseString,
-                            response,
-                            (fun () -> (MemberActivityDto.jsonParse jsonNode))
-                        )
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-            member _.GetResponse''' (ct : CancellationToken option) =
-                async {
-                    let! ct = Async.CancellationToken
-
-                    let uri =
-                        System.Uri (
-                            (match client.BaseAddress with
-                             | null -> System.Uri "https://whatnot.com"
-                             | v -> v),
-                            System.Uri ("endpoint", System.UriKind.Relative)
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                        |> Async.AwaitTask
-
-                    return
-                        new RestEase.Response<_> (
-                            responseString,
-                            response,
-                            (fun () -> (MemberActivityDto.jsonParse jsonNode))
-                        )
+                    let node = response
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -1015,7 +631,8 @@ module PureGymApi =
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    return response
+                    let node = response
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -1039,7 +656,8 @@ module PureGymApi =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    return response
+                    let node = response
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
         }
@@ -1054,7 +672,8 @@ open System.Net.Http
 open RestEase
 
 /// Module for constructing a REST client.
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
 module internal ApiWithoutBaseAddress =
     /// Create a REST client.
     let make (client : System.Net.Http.HttpClient) : IApiWithoutBaseAddress =
@@ -1089,8 +708,8 @@ module internal ApiWithoutBaseAddress =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    return responseString
+                    let! node = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
         }
@@ -1105,12 +724,13 @@ open System.Net.Http
 open RestEase
 
 /// Module for constructing a REST client.
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
 module ApiWithBasePath =
     /// Create a REST client.
     let make (client : System.Net.Http.HttpClient) : IApiWithBasePath =
         { new IApiWithBasePath with
-            member _.GetPathParam (parameter : string, cancellationToken : CancellationToken option) =
+            member _.GetPathParam (parameter : string, ct : CancellationToken option) =
                 async {
                     let! ct = Async.CancellationToken
 
@@ -1140,10 +760,10 @@ module ApiWithBasePath =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    return responseString
+                    let! node = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
+                    return node
                 }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = cancellationToken))
+                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
         }
 namespace PureGym
 
@@ -1156,7 +776,8 @@ open System.Net.Http
 open RestEase
 
 /// Module for constructing a REST client.
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
 module ApiWithBasePathAndAddress =
     /// Create a REST client.
     let make (client : System.Net.Http.HttpClient) : IApiWithBasePathAndAddress =
@@ -1185,132 +806,8 @@ module ApiWithBasePathAndAddress =
 
                     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 ApiWithHeaders =
-    /// Create a REST client. The input functions will be re-evaluated on every HTTP request to obtain the required values for the corresponding header properties.
-    let make
-        (someHeader : unit -> string)
-        (someOtherHeader : unit -> int)
-        (client : System.Net.Http.HttpClient)
-        : IApiWithHeaders
-        =
-        { new IApiWithHeaders with
-            member _.SomeHeader : string = someHeader ()
-            member _.SomeOtherHeader : int = someOtherHeader ()
-
-            member this.GetPathParam (parameter : 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.Web.HttpUtility.UrlEncode),
-                                System.UriKind.Relative
-                            )
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    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")
-                    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 ApiWithHeaders2 =
-    /// Create a REST client. The input functions will be re-evaluated on every HTTP request to obtain the required values for the corresponding header properties.
-    let make
-        (someHeader : unit -> string)
-        (someOtherHeader : unit -> int)
-        (client : System.Net.Http.HttpClient)
-        : IApiWithHeaders2
-        =
-        { new IApiWithHeaders2 with
-            member _.SomeHeader : string = someHeader ()
-            member _.SomeOtherHeader : int = someOtherHeader ()
-
-            member this.GetPathParam (parameter : 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.Web.HttpUtility.UrlEncode),
-                                System.UriKind.Relative
-                            )
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    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")
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseString = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
-                    return responseString
+                    let! node = response.Content.ReadAsStringAsync ct |> Async.AwaitTask
+                    return node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
         }

ConsumePlugin/GeneratedSerde.fs

@@ -1,844 +0,0 @@
-//------------------------------------------------------------------------------
-//        This code was generated by myriad.
-//        Changes to this file will be lost when the code is regenerated.
-//------------------------------------------------------------------------------
-
-
-namespace ConsumePlugin
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Serialization
-
-/// Module containing JSON serializing extension members for the InnerTypeWithBoth type
-[<AutoOpen>]
-module InnerTypeWithBothJsonSerializeExtension =
-    /// Extension methods for JSON parsing
-    type InnerTypeWithBoth with
-
-        /// Serialize to a JSON node
-        static member toJsonNode (input : InnerTypeWithBoth) : System.Text.Json.Nodes.JsonNode =
-            let node = System.Text.Json.Nodes.JsonObject ()
-
-            do
-                node.Add (("it's-a-me"), (input.Thing |> System.Text.Json.Nodes.JsonValue.Create<Guid>))
-
-                node.Add (
-                    "map",
-                    (input.Map
-                     |> (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<Uri> value)
-
-                         ret
-                     ))
-                )
-
-                node.Add (
-                    "readOnlyDict",
-                    (input.ReadOnlyDict
-                     |> (fun field ->
-                         let ret = System.Text.Json.Nodes.JsonObject ()
-
-                         for (KeyValue (key, value)) in field do
-                             ret.Add (
-                                 key.ToString (),
-                                 (fun field ->
-                                     let arr = System.Text.Json.Nodes.JsonArray ()
-
-                                     for mem in field do
-                                         arr.Add (System.Text.Json.Nodes.JsonValue.Create<char> mem)
-
-                                     arr
-                                 )
-                                     value
-                             )
-
-                         ret
-                     ))
-                )
-
-                node.Add (
-                    "dict",
-                    (input.Dict
-                     |> (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<bool> value)
-
-                         ret
-                     ))
-                )
-
-                node.Add (
-                    "concreteDict",
-                    (input.ConcreteDict
-                     |> (fun field ->
-                         let ret = System.Text.Json.Nodes.JsonObject ()
-
-                         for (KeyValue (key, value)) in field do
-                             ret.Add (key.ToString (), InnerTypeWithBoth.toJsonNode value)
-
-                         ret
-                     ))
-                )
-
-            node :> _
-namespace ConsumePlugin
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Serialization
-
-/// Module containing JSON serializing extension members for the SomeEnum type
-[<AutoOpen>]
-module SomeEnumJsonSerializeExtension =
-    /// Extension methods for JSON parsing
-    type SomeEnum with
-
-        /// Serialize to a JSON node
-        static member toJsonNode (input : SomeEnum) : System.Text.Json.Nodes.JsonNode =
-            match input with
-            | SomeEnum.Blah -> System.Text.Json.Nodes.JsonValue.Create 1
-            | SomeEnum.Thing -> System.Text.Json.Nodes.JsonValue.Create 0
-            | v -> failwith (sprintf "Unrecognised value for enum: %O" v)
-namespace ConsumePlugin
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Serialization
-
-/// Module containing JSON serializing extension members for the JsonRecordTypeWithBoth type
-[<AutoOpen>]
-module JsonRecordTypeWithBothJsonSerializeExtension =
-    /// Extension methods for JSON parsing
-    type JsonRecordTypeWithBoth with
-
-        /// Serialize to a JSON node
-        static member toJsonNode (input : JsonRecordTypeWithBoth) : System.Text.Json.Nodes.JsonNode =
-            let node = System.Text.Json.Nodes.JsonObject ()
-
-            do
-                node.Add ("a", (input.A |> System.Text.Json.Nodes.JsonValue.Create<int>))
-                node.Add ("b", (input.B |> System.Text.Json.Nodes.JsonValue.Create<string>))
-
-                node.Add (
-                    "c",
-                    (input.C
-                     |> (fun field ->
-                         let arr = System.Text.Json.Nodes.JsonArray ()
-
-                         for mem in field do
-                             arr.Add (System.Text.Json.Nodes.JsonValue.Create<int> mem)
-
-                         arr
-                     ))
-                )
-
-                node.Add ("d", (input.D |> InnerTypeWithBoth.toJsonNode))
-
-                node.Add (
-                    "e",
-                    (input.E
-                     |> (fun field ->
-                         let arr = System.Text.Json.Nodes.JsonArray ()
-
-                         for mem in field do
-                             arr.Add (System.Text.Json.Nodes.JsonValue.Create<string> mem)
-
-                         arr
-                     ))
-                )
-
-                node.Add (
-                    "arr",
-                    (input.Arr
-                     |> (fun field ->
-                         let arr = System.Text.Json.Nodes.JsonArray ()
-
-                         for mem in field do
-                             arr.Add (System.Text.Json.Nodes.JsonValue.Create<int> mem)
-
-                         arr
-                     ))
-                )
-
-                node.Add ("byte", (input.Byte |> System.Text.Json.Nodes.JsonValue.Create<byte<measure>>))
-                node.Add ("sbyte", (input.Sbyte |> System.Text.Json.Nodes.JsonValue.Create<sbyte<measure>>))
-                node.Add ("i", (input.I |> System.Text.Json.Nodes.JsonValue.Create<int<measure>>))
-                node.Add ("i32", (input.I32 |> System.Text.Json.Nodes.JsonValue.Create<int32<measure>>))
-                node.Add ("i64", (input.I64 |> System.Text.Json.Nodes.JsonValue.Create<int64<measure>>))
-                node.Add ("u", (input.U |> System.Text.Json.Nodes.JsonValue.Create<uint<measure>>))
-                node.Add ("u32", (input.U32 |> System.Text.Json.Nodes.JsonValue.Create<uint32<measure>>))
-                node.Add ("u64", (input.U64 |> System.Text.Json.Nodes.JsonValue.Create<uint64<measure>>))
-                node.Add ("f", (input.F |> System.Text.Json.Nodes.JsonValue.Create<float<measure>>))
-                node.Add ("f32", (input.F32 |> System.Text.Json.Nodes.JsonValue.Create<float32<measure>>))
-                node.Add ("single", (input.Single |> System.Text.Json.Nodes.JsonValue.Create<single<measure>>))
-
-                node.Add (
-                    "intMeasureOption",
-                    (input.IntMeasureOption
-                     |> (fun field ->
-                         match field with
-                         | None -> null :> System.Text.Json.Nodes.JsonNode
-                         | Some field ->
-                             (System.Text.Json.Nodes.JsonValue.Create<int<measure>> field)
-                             :> System.Text.Json.Nodes.JsonNode
-                     ))
-                )
-
-                node.Add (
-                    "intMeasureNullable",
-                    (input.IntMeasureNullable
-                     |> (fun field ->
-                         if field.HasValue then
-                             System.Text.Json.Nodes.JsonValue.Create<int<measure>> field.Value
-                             :> System.Text.Json.Nodes.JsonNode
-                         else
-                             null :> System.Text.Json.Nodes.JsonNode
-                     ))
-                )
-
-                node.Add ("enum", (input.Enum |> SomeEnum.toJsonNode))
-
-                node.Add (
-                    "timestamp",
-                    (input.Timestamp
-                     |> (fun field -> field.ToString "o" |> System.Text.Json.Nodes.JsonValue.Create<string>))
-                )
-
-            node :> _
-namespace ConsumePlugin
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Serialization
-
-/// Module containing JSON serializing extension members for the FirstDu type
-[<AutoOpen>]
-module FirstDuJsonSerializeExtension =
-    /// Extension methods for JSON parsing
-    type FirstDu with
-
-        /// Serialize to a JSON node
-        static member toJsonNode (input : FirstDu) : System.Text.Json.Nodes.JsonNode =
-            let node = System.Text.Json.Nodes.JsonObject ()
-
-            match input with
-            | FirstDu.EmptyCase -> node.Add ("type", System.Text.Json.Nodes.JsonValue.Create "emptyCase")
-            | FirstDu.Case1 arg0 ->
-                node.Add ("type", System.Text.Json.Nodes.JsonValue.Create "case1")
-                let dataNode = System.Text.Json.Nodes.JsonObject ()
-                dataNode.Add ("data", System.Text.Json.Nodes.JsonValue.Create<string> arg0)
-                node.Add ("data", dataNode)
-            | FirstDu.Case2 (arg0, arg1) ->
-                node.Add ("type", System.Text.Json.Nodes.JsonValue.Create "case2")
-                let dataNode = System.Text.Json.Nodes.JsonObject ()
-                dataNode.Add ("record", JsonRecordTypeWithBoth.toJsonNode arg0)
-                dataNode.Add ("i", System.Text.Json.Nodes.JsonValue.Create<int> arg1)
-                node.Add ("data", dataNode)
-
-            node :> _
-namespace ConsumePlugin
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Serialization
-
-/// Module containing JSON serializing extension members for the HeaderAndValue type
-[<AutoOpen>]
-module HeaderAndValueJsonSerializeExtension =
-    /// Extension methods for JSON parsing
-    type HeaderAndValue with
-
-        /// Serialize to a JSON node
-        static member toJsonNode (input : HeaderAndValue) : System.Text.Json.Nodes.JsonNode =
-            let node = System.Text.Json.Nodes.JsonObject ()
-
-            do
-                node.Add ("header", (input.Header |> System.Text.Json.Nodes.JsonValue.Create<string>))
-                node.Add ("value", (input.Value |> System.Text.Json.Nodes.JsonValue.Create<string>))
-
-            node :> _
-namespace ConsumePlugin
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Serialization
-
-/// Module containing JSON serializing extension members for the Foo type
-[<AutoOpen>]
-module FooJsonSerializeExtension =
-    /// Extension methods for JSON parsing
-    type Foo with
-
-        /// Serialize to a JSON node
-        static member toJsonNode (input : Foo) : System.Text.Json.Nodes.JsonNode =
-            let node = System.Text.Json.Nodes.JsonObject ()
-
-            do
-                node.Add (
-                    "message",
-                    (input.Message
-                     |> (fun field ->
-                         match field with
-                         | None -> null :> System.Text.Json.Nodes.JsonNode
-                         | Some field -> HeaderAndValue.toJsonNode field
-                     ))
-                )
-
-            node :> _
-
-namespace ConsumePlugin
-
-/// Module containing JSON parsing extension members for the InnerTypeWithBoth type
-[<AutoOpen>]
-module InnerTypeWithBothJsonParseExtension =
-    /// Extension methods for JSON parsing
-    type InnerTypeWithBoth with
-
-        /// Parse from a JSON node.
-        static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : InnerTypeWithBoth =
-            let arg_4 =
-                (match node.["concreteDict"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("concreteDict")
-                         )
-                     )
-                 | v -> v)
-                    .AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key)
-                    let value = InnerTypeWithBoth.jsonParse (kvp.Value)
-                    key, value
-                )
-                |> Seq.map System.Collections.Generic.KeyValuePair
-                |> System.Collections.Generic.Dictionary
-
-            let arg_3 =
-                (match node.["dict"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("dict")
-                         )
-                     )
-                 | v -> v)
-                    .AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key) |> System.Uri
-                    let value = (kvp.Value).AsValue().GetValue<System.Boolean> ()
-                    key, value
-                )
-                |> dict
-
-            let arg_2 =
-                (match node.["readOnlyDict"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("readOnlyDict")
-                         )
-                     )
-                 | v -> v)
-                    .AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key)
-
-                    let value =
-                        (kvp.Value).AsArray ()
-                        |> Seq.map (fun elt -> elt.AsValue().GetValue<System.Char> ())
-                        |> List.ofSeq
-
-                    key, value
-                )
-                |> readOnlyDict
-
-            let arg_1 =
-                (match node.["map"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("map")
-                         )
-                     )
-                 | v -> v)
-                    .AsObject ()
-                |> Seq.map (fun kvp ->
-                    let key = (kvp.Key)
-                    let value = (kvp.Value).AsValue().GetValue<string> () |> System.Uri
-                    key, value
-                )
-                |> Map.ofSeq
-
-            let arg_0 =
-                (match node.[("it's-a-me")] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" (("it's-a-me"))
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<string> ()
-                |> System.Guid.Parse
-
-            {
-                Thing = arg_0
-                Map = arg_1
-                ReadOnlyDict = arg_2
-                Dict = arg_3
-                ConcreteDict = arg_4
-            }
-namespace ConsumePlugin
-
-/// Module containing JSON parsing extension members for the SomeEnum type
-[<AutoOpen>]
-module SomeEnumJsonParseExtension =
-    /// Extension methods for JSON parsing
-    type SomeEnum with
-
-        /// Parse from a JSON node.
-        static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : SomeEnum =
-            match node.GetValueKind () with
-            | System.Text.Json.JsonValueKind.Number -> node.AsValue().GetValue<int> () |> enum<SomeEnum>
-            | System.Text.Json.JsonValueKind.String ->
-                match node.AsValue().GetValue<string>().ToLowerInvariant () with
-                | "blah" -> SomeEnum.Blah
-                | "thing" -> SomeEnum.Thing
-                | v -> failwith ("Unrecognised value for enum: %i" + v)
-            | _ -> failwith ("Unrecognised kind for enum of type: " + "SomeEnum")
-namespace ConsumePlugin
-
-/// Module containing JSON parsing extension members for the JsonRecordTypeWithBoth type
-[<AutoOpen>]
-module JsonRecordTypeWithBothJsonParseExtension =
-    /// Extension methods for JSON parsing
-    type JsonRecordTypeWithBoth with
-
-        /// Parse from a JSON node.
-        static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : JsonRecordTypeWithBoth =
-            let arg_20 =
-                (match node.["timestamp"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("timestamp")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<string> ()
-                |> System.DateTimeOffset.Parse
-
-            let arg_19 =
-                SomeEnum.jsonParse (
-                    match node.["enum"] with
-                    | null ->
-                        raise (
-                            System.Collections.Generic.KeyNotFoundException (
-                                sprintf "Required key '%s' not found on JSON object" ("enum")
-                            )
-                        )
-                    | v -> v
-                )
-
-            let arg_18 =
-                match node.["intMeasureNullable"] with
-                | null -> System.Nullable ()
-                | v ->
-                    v.AsValue().GetValue<System.Int32> ()
-                    |> LanguagePrimitives.Int32WithMeasure
-                    |> System.Nullable
-
-            let arg_17 =
-                match node.["intMeasureOption"] with
-                | null -> None
-                | v ->
-                    v.AsValue().GetValue<System.Int32> ()
-                    |> LanguagePrimitives.Int32WithMeasure
-                    |> Some
-
-            let arg_16 =
-                (match node.["single"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("single")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Single> ()
-                |> LanguagePrimitives.Float32WithMeasure
-
-            let arg_15 =
-                (match node.["f32"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("f32")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Single> ()
-                |> LanguagePrimitives.Float32WithMeasure
-
-            let arg_14 =
-                (match node.["f"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("f")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Double> ()
-                |> LanguagePrimitives.FloatWithMeasure
-
-            let arg_13 =
-                (match node.["u64"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("u64")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.UInt64> ()
-                |> LanguagePrimitives.UInt64WithMeasure
-
-            let arg_12 =
-                (match node.["u32"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("u32")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.UInt32> ()
-                |> LanguagePrimitives.UInt32WithMeasure
-
-            let arg_11 =
-                (match node.["u"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("u")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.UInt32> ()
-                |> LanguagePrimitives.UInt32WithMeasure
-
-            let arg_10 =
-                (match node.["i64"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("i64")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Int64> ()
-                |> LanguagePrimitives.Int64WithMeasure
-
-            let arg_9 =
-                (match node.["i32"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("i32")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Int32> ()
-                |> LanguagePrimitives.Int32WithMeasure
-
-            let arg_8 =
-                (match node.["i"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("i")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Int32> ()
-                |> LanguagePrimitives.Int32WithMeasure
-
-            let arg_7 =
-                (match node.["sbyte"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("sbyte")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.SByte> ()
-                |> LanguagePrimitives.SByteWithMeasure
-
-            let arg_6 =
-                (match node.["byte"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("byte")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.Byte> ()
-                |> LanguagePrimitives.ByteWithMeasure
-
-            let arg_5 =
-                (match node.["arr"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("arr")
-                         )
-                     )
-                 | v -> v)
-                    .AsArray ()
-                |> Seq.map (fun 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
-
-            let arg_3 =
-                InnerTypeWithBoth.jsonParse (
-                    match node.["d"] with
-                    | null ->
-                        raise (
-                            System.Collections.Generic.KeyNotFoundException (
-                                sprintf "Required key '%s' not found on JSON object" ("d")
-                            )
-                        )
-                    | v -> v
-                )
-
-            let arg_2 =
-                (match node.["c"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("c")
-                         )
-                     )
-                 | v -> v)
-                    .AsArray ()
-                |> Seq.map (fun elt -> elt.AsValue().GetValue<System.Int32> ())
-                |> List.ofSeq
-
-            let arg_1 =
-                (match node.["b"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("b")
-                         )
-                     )
-                 | v -> v)
-                    .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> ()
-
-            {
-                A = arg_0
-                B = arg_1
-                C = arg_2
-                D = arg_3
-                E = arg_4
-                Arr = arg_5
-                Byte = arg_6
-                Sbyte = arg_7
-                I = arg_8
-                I32 = arg_9
-                I64 = arg_10
-                U = arg_11
-                U32 = arg_12
-                U64 = arg_13
-                F = arg_14
-                F32 = arg_15
-                Single = arg_16
-                IntMeasureOption = arg_17
-                IntMeasureNullable = arg_18
-                Enum = arg_19
-                Timestamp = arg_20
-            }
-namespace ConsumePlugin
-
-/// Module containing JSON parsing extension members for the FirstDu type
-[<AutoOpen>]
-module FirstDuJsonParseExtension =
-    /// Extension methods for JSON parsing
-    type FirstDu with
-
-        /// Parse from a JSON node.
-        static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : FirstDu =
-            let ty =
-                (match node.["type"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("type")
-                         )
-                     )
-                 | v -> v)
-                |> (fun v -> v.GetValue<string> ())
-
-            match ty with
-            | "emptyCase" -> FirstDu.EmptyCase
-            | "case1" ->
-                let node =
-                    (match node.["data"] with
-                     | null ->
-                         raise (
-                             System.Collections.Generic.KeyNotFoundException (
-                                 sprintf "Required key '%s' not found on JSON object" ("data")
-                             )
-                         )
-                     | v -> v)
-
-                FirstDu.Case1 (
-                    (match node.["data"] with
-                     | null ->
-                         raise (
-                             System.Collections.Generic.KeyNotFoundException (
-                                 sprintf "Required key '%s' not found on JSON object" ("data")
-                             )
-                         )
-                     | v -> v)
-                        .AsValue()
-                        .GetValue<System.String> ()
-                )
-            | "case2" ->
-                let node =
-                    (match node.["data"] with
-                     | null ->
-                         raise (
-                             System.Collections.Generic.KeyNotFoundException (
-                                 sprintf "Required key '%s' not found on JSON object" ("data")
-                             )
-                         )
-                     | v -> v)
-
-                FirstDu.Case2 (
-                    JsonRecordTypeWithBoth.jsonParse (
-                        match node.["record"] with
-                        | null ->
-                            raise (
-                                System.Collections.Generic.KeyNotFoundException (
-                                    sprintf "Required key '%s' not found on JSON object" ("record")
-                                )
-                            )
-                        | v -> v
-                    ),
-                    (match node.["i"] with
-                     | null ->
-                         raise (
-                             System.Collections.Generic.KeyNotFoundException (
-                                 sprintf "Required key '%s' not found on JSON object" ("i")
-                             )
-                         )
-                     | v -> v)
-                        .AsValue()
-                        .GetValue<System.Int32> ()
-                )
-            | v -> failwith ("Unrecognised 'type' field value: " + v)
-namespace ConsumePlugin
-
-/// Module containing JSON parsing extension members for the HeaderAndValue type
-[<AutoOpen>]
-module HeaderAndValueJsonParseExtension =
-    /// Extension methods for JSON parsing
-    type HeaderAndValue with
-
-        /// Parse from a JSON node.
-        static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : HeaderAndValue =
-            let arg_1 =
-                (match node.["value"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("value")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.String> ()
-
-            let arg_0 =
-                (match node.["header"] with
-                 | null ->
-                     raise (
-                         System.Collections.Generic.KeyNotFoundException (
-                             sprintf "Required key '%s' not found on JSON object" ("header")
-                         )
-                     )
-                 | v -> v)
-                    .AsValue()
-                    .GetValue<System.String> ()
-
-            {
-                Header = arg_0
-                Value = arg_1
-            }
-namespace ConsumePlugin
-
-/// Module containing JSON parsing extension members for the Foo type
-[<AutoOpen>]
-module FooJsonParseExtension =
-    /// Extension methods for JSON parsing
-    type Foo with
-
-        /// Parse from a JSON node.
-        static member jsonParse (node : System.Text.Json.Nodes.JsonNode) : Foo =
-            let arg_0 =
-                match node.["message"] with
-                | null -> None
-                | v -> HeaderAndValue.jsonParse v |> Some
-
-            {
-                Message = arg_0
-            }

ConsumePlugin/GeneratedVault.fs

@@ -4,15 +4,15 @@
 //------------------------------------------------------------------------------
 
 
-
 namespace ConsumePlugin
 
 /// Module containing JSON parsing methods for the JwtVaultAuthResponse type
-[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module JwtVaultAuthResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtVaultAuthResponse =
-        let arg_10 =
+        let NumUses =
             (match node.["num_uses"] with
              | null ->
                  raise (
@@ -22,9 +22,9 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.Int32> ()
+                .GetValue<int> ()
 
-        let arg_9 =
+        let Orphan =
             (match node.["orphan"] with
              | null ->
                  raise (
@@ -34,9 +34,9 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.Boolean> ()
+                .GetValue<bool> ()
 
-        let arg_8 =
+        let EntityId =
             (match node.["entity_id"] with
              | null ->
                  raise (
@@ -46,9 +46,9 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
-        let arg_7 =
+        let TokenType =
             (match node.["token_type"] with
              | null ->
                  raise (
@@ -58,9 +58,9 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
-        let arg_6 =
+        let Renewable =
             (match node.["renewable"] with
              | null ->
                  raise (
@@ -70,9 +70,9 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.Boolean> ()
+                .GetValue<bool> ()
 
-        let arg_5 =
+        let LeaseDuration =
             (match node.["lease_duration"] with
              | null ->
                  raise (
@@ -82,9 +82,9 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.Int32> ()
+                .GetValue<int> ()
 
-        let arg_4 =
+        let IdentityPolicies =
             (match node.["identity_policies"] with
              | null ->
                  raise (
@@ -94,10 +94,10 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsArray ()
-            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.String> ())
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> List.ofSeq
 
-        let arg_3 =
+        let TokenPolicies =
             (match node.["token_policies"] with
              | null ->
                  raise (
@@ -107,10 +107,10 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsArray ()
-            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.String> ())
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> List.ofSeq
 
-        let arg_2 =
+        let Policies =
             (match node.["policies"] with
              | null ->
                  raise (
@@ -120,10 +120,10 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsArray ()
-            |> Seq.map (fun elt -> elt.AsValue().GetValue<System.String> ())
+            |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> List.ofSeq
 
-        let arg_1 =
+        let Accessor =
             (match node.["accessor"] with
              | null ->
                  raise (
@@ -133,9 +133,9 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
-        let arg_0 =
+        let ClientToken =
             (match node.["client_token"] with
              | null ->
                  raise (
@@ -145,29 +145,30 @@ module JwtVaultAuthResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
         {
-            ClientToken = arg_0
-            Accessor = arg_1
-            Policies = arg_2
-            TokenPolicies = arg_3
-            IdentityPolicies = arg_4
-            LeaseDuration = arg_5
-            Renewable = arg_6
-            TokenType = arg_7
-            EntityId = arg_8
-            Orphan = arg_9
-            NumUses = arg_10
+            ClientToken = ClientToken
+            Accessor = Accessor
+            Policies = Policies
+            TokenPolicies = TokenPolicies
+            IdentityPolicies = IdentityPolicies
+            LeaseDuration = LeaseDuration
+            Renewable = Renewable
+            TokenType = TokenType
+            EntityId = EntityId
+            Orphan = Orphan
+            NumUses = NumUses
         }
 namespace ConsumePlugin
 
 /// Module containing JSON parsing methods for the JwtVaultResponse type
-[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module JwtVaultResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtVaultResponse =
-        let arg_4 =
+        let Auth =
             JwtVaultAuthResponse.jsonParse (
                 match node.["auth"] with
                 | null ->
@@ -179,7 +180,7 @@ module JwtVaultResponse =
                 | v -> v
             )
 
-        let arg_3 =
+        let LeaseDuration =
             (match node.["lease_duration"] with
              | null ->
                  raise (
@@ -189,9 +190,9 @@ module JwtVaultResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.Int32> ()
+                .GetValue<int> ()
 
-        let arg_2 =
+        let Renewable =
             (match node.["renewable"] with
              | null ->
                  raise (
@@ -201,9 +202,9 @@ module JwtVaultResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.Boolean> ()
+                .GetValue<bool> ()
 
-        let arg_1 =
+        let LeaseId =
             (match node.["lease_id"] with
              | null ->
                  raise (
@@ -213,9 +214,9 @@ module JwtVaultResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
-        let arg_0 =
+        let RequestId =
             (match node.["request_id"] with
              | null ->
                  raise (
@@ -225,23 +226,24 @@ module JwtVaultResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
         {
-            RequestId = arg_0
-            LeaseId = arg_1
-            Renewable = arg_2
-            LeaseDuration = arg_3
-            Auth = arg_4
+            RequestId = RequestId
+            LeaseId = LeaseId
+            Renewable = Renewable
+            LeaseDuration = LeaseDuration
+            Auth = Auth
         }
 namespace ConsumePlugin
 
 /// Module containing JSON parsing methods for the JwtSecretResponse type
-[<RequireQualifiedAccess ; CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module JwtSecretResponse =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : JwtSecretResponse =
-        let arg_11 =
+        let Data8 =
             (match node.["data8"] with
              | null ->
                  raise (
@@ -259,7 +261,7 @@ module JwtSecretResponse =
             |> Seq.map System.Collections.Generic.KeyValuePair
             |> System.Collections.Generic.Dictionary
 
-        let arg_10 =
+        let Data7 =
             (match node.["data7"] with
              | null ->
                  raise (
@@ -271,12 +273,12 @@ module JwtSecretResponse =
                 .AsObject ()
             |> Seq.map (fun kvp ->
                 let key = (kvp.Key)
-                let value = (kvp.Value).AsValue().GetValue<System.Int32> ()
+                let value = (kvp.Value).AsValue().GetValue<int> ()
                 key, value
             )
             |> Map.ofSeq
 
-        let arg_9 =
+        let Data6 =
             (match node.["data6"] with
              | null ->
                  raise (
@@ -288,12 +290,12 @@ module JwtSecretResponse =
                 .AsObject ()
             |> Seq.map (fun kvp ->
                 let key = (kvp.Key) |> System.Uri
-                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                let value = (kvp.Value).AsValue().GetValue<string> ()
                 key, value
             )
             |> dict
 
-        let arg_8 =
+        let Data5 =
             (match node.["data5"] with
              | null ->
                  raise (
@@ -305,12 +307,12 @@ module JwtSecretResponse =
                 .AsObject ()
             |> Seq.map (fun kvp ->
                 let key = (kvp.Key) |> System.Uri
-                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                let value = (kvp.Value).AsValue().GetValue<string> ()
                 key, value
             )
             |> readOnlyDict
 
-        let arg_7 =
+        let Data4 =
             (match node.["data4"] with
              | null ->
                  raise (
@@ -322,12 +324,12 @@ module JwtSecretResponse =
                 .AsObject ()
             |> Seq.map (fun kvp ->
                 let key = (kvp.Key)
-                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                let value = (kvp.Value).AsValue().GetValue<string> ()
                 key, value
             )
             |> Map.ofSeq
 
-        let arg_6 =
+        let Data3 =
             (match node.["data3"] with
              | null ->
                  raise (
@@ -339,13 +341,13 @@ module JwtSecretResponse =
                 .AsObject ()
             |> Seq.map (fun kvp ->
                 let key = (kvp.Key)
-                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                let value = (kvp.Value).AsValue().GetValue<string> ()
                 key, value
             )
             |> Seq.map System.Collections.Generic.KeyValuePair
             |> System.Collections.Generic.Dictionary
 
-        let arg_5 =
+        let Data2 =
             (match node.["data2"] with
              | null ->
                  raise (
@@ -357,12 +359,12 @@ module JwtSecretResponse =
                 .AsObject ()
             |> Seq.map (fun kvp ->
                 let key = (kvp.Key)
-                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                let value = (kvp.Value).AsValue().GetValue<string> ()
                 key, value
             )
             |> dict
 
-        let arg_4 =
+        let Data =
             (match node.["data"] with
              | null ->
                  raise (
@@ -374,12 +376,12 @@ module JwtSecretResponse =
                 .AsObject ()
             |> Seq.map (fun kvp ->
                 let key = (kvp.Key)
-                let value = (kvp.Value).AsValue().GetValue<System.String> ()
+                let value = (kvp.Value).AsValue().GetValue<string> ()
                 key, value
             )
             |> readOnlyDict
 
-        let arg_3 =
+        let LeaseDuration =
             (match node.["lease_duration"] with
              | null ->
                  raise (
@@ -389,9 +391,9 @@ module JwtSecretResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.Int32> ()
+                .GetValue<int> ()
 
-        let arg_2 =
+        let Renewable =
             (match node.["renewable"] with
              | null ->
                  raise (
@@ -401,9 +403,9 @@ module JwtSecretResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.Boolean> ()
+                .GetValue<bool> ()
 
-        let arg_1 =
+        let LeaseId =
             (match node.["lease_id"] with
              | null ->
                  raise (
@@ -413,9 +415,9 @@ module JwtSecretResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
-        let arg_0 =
+        let RequestId =
             (match node.["request_id"] with
              | null ->
                  raise (
@@ -425,21 +427,21 @@ module JwtSecretResponse =
                  )
              | v -> v)
                 .AsValue()
-                .GetValue<System.String> ()
+                .GetValue<string> ()
 
         {
-            RequestId = arg_0
-            LeaseId = arg_1
-            Renewable = arg_2
-            LeaseDuration = arg_3
-            Data = arg_4
-            Data2 = arg_5
-            Data3 = arg_6
-            Data4 = arg_7
-            Data5 = arg_8
-            Data6 = arg_9
-            Data7 = arg_10
-            Data8 = arg_11
+            RequestId = RequestId
+            LeaseId = LeaseId
+            Renewable = Renewable
+            LeaseDuration = LeaseDuration
+            Data = Data
+            Data2 = Data2
+            Data3 = Data3
+            Data4 = Data4
+            Data5 = Data5
+            Data6 = Data6
+            Data7 = Data7
+            Data8 = Data8
         }
 
 namespace ConsumePlugin
@@ -452,13 +454,19 @@ open System.Threading.Tasks
 open RestEase
 
 /// Module for constructing a REST client.
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+[<RequireQualifiedAccess>]
 module VaultClient =
     /// Create a REST client.
     let make (client : System.Net.Http.HttpClient) : IVaultClient =
         { new IVaultClient with
             member _.GetSecret
-                (jwt : JwtVaultResponse, path : string, mountPoint : string, ct : CancellationToken option)
+                (
+                    jwt : JwtVaultResponse,
+                    path : string,
+                    mountPoint : string,
+                    ct : CancellationToken option
+                )
                 =
                 async {
                     let! ct = Async.CancellationToken
@@ -493,13 +501,13 @@ module VaultClient =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    let! stream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
 
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
+                    let! node =
+                        System.Text.Json.Nodes.JsonNode.ParseAsync (stream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return JwtSecretResponse.jsonParse jsonNode
+                    return JwtSecretResponse.jsonParse node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
 
@@ -529,210 +537,13 @@ module VaultClient =
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
                     let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
+                    let! stream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
 
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
+                    let! node =
+                        System.Text.Json.Nodes.JsonNode.ParseAsync (stream, cancellationToken = ct)
                         |> Async.AwaitTask
 
-                    return JwtVaultResponse.jsonParse jsonNode
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-        }
-namespace ConsumePlugin
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Serialization
-open System.Threading
-open System.Threading.Tasks
-open RestEase
-
-/// Module for constructing a REST client.
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix) ; RequireQualifiedAccess>]
-module VaultClientNonExtensionMethod =
-    /// Create a REST client.
-    let make (client : System.Net.Http.HttpClient) : IVaultClientNonExtensionMethod =
-        { new IVaultClientNonExtensionMethod with
-            member _.GetSecret
-                (jwt : JwtVaultResponse, path : string, mountPoint : 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 (
-                                "v1/{mountPoint}/{path}"
-                                    .Replace("{path}", path.ToString () |> System.Web.HttpUtility.UrlEncode)
-                                    .Replace (
-                                        "{mountPoint}",
-                                        mountPoint.ToString () |> System.Web.HttpUtility.UrlEncode
-                                    ),
-                                System.UriKind.Relative
-                            )
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                        |> Async.AwaitTask
-
-                    return JwtSecretResponse.jsonParse jsonNode
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-            member _.GetJwt (role : string, jwt : 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 ("v1/auth/jwt/login", System.UriKind.Relative)
-                        )
-
-                    let httpMessage =
-                        new System.Net.Http.HttpRequestMessage (
-                            Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = uri
-                        )
-
-                    let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                    let response = response.EnsureSuccessStatusCode ()
-                    let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                    let! jsonNode =
-                        System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                        |> Async.AwaitTask
-
-                    return JwtVaultResponse.jsonParse jsonNode
-                }
-                |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-        }
-namespace ConsumePlugin
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Serialization
-open System.Threading
-open System.Threading.Tasks
-open RestEase
-
-/// Extension methods for constructing a REST client.
-[<AutoOpen>]
-module VaultClientExtensionMethodHttpClientExtension =
-    /// Extension methods for HTTP clients
-    type VaultClientExtensionMethod with
-
-        /// Create a REST client.
-        static member make (client : System.Net.Http.HttpClient) : IVaultClientExtensionMethod =
-            { new IVaultClientExtensionMethod with
-                member _.GetSecret
-                    (jwt : JwtVaultResponse, path : string, mountPoint : 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 (
-                                    "v1/{mountPoint}/{path}"
-                                        .Replace("{path}", path.ToString () |> System.Web.HttpUtility.UrlEncode)
-                                        .Replace (
-                                            "{mountPoint}",
-                                            mountPoint.ToString () |> System.Web.HttpUtility.UrlEncode
-                                        ),
-                                    System.UriKind.Relative
-                                )
-                            )
-
-                        let httpMessage =
-                            new System.Net.Http.HttpRequestMessage (
-                                Method = System.Net.Http.HttpMethod.Get,
-                                RequestUri = uri
-                            )
-
-                        let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                        let response = response.EnsureSuccessStatusCode ()
-                        let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                        let! jsonNode =
-                            System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                            |> Async.AwaitTask
-
-                        return JwtSecretResponse.jsonParse jsonNode
-                    }
-                    |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
-
-                member _.GetJwt (role : string, jwt : 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 ("v1/auth/jwt/login", System.UriKind.Relative)
-                            )
-
-                        let httpMessage =
-                            new System.Net.Http.HttpRequestMessage (
-                                Method = System.Net.Http.HttpMethod.Get,
-                                RequestUri = uri
-                            )
-
-                        let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
-                        let response = response.EnsureSuccessStatusCode ()
-                        let! responseStream = response.Content.ReadAsStreamAsync ct |> Async.AwaitTask
-
-                        let! jsonNode =
-                            System.Text.Json.Nodes.JsonNode.ParseAsync (responseStream, cancellationToken = ct)
-                            |> Async.AwaitTask
-
-                        return JwtVaultResponse.jsonParse jsonNode
+                    return JwtVaultResponse.jsonParse node
                 }
                 |> (fun a -> Async.StartAsTask (a, ?cancellationToken = ct))
         }

ConsumePlugin/JsonRecord.fs

@@ -29,52 +29,13 @@ type JsonRecordType =
         F : int[]
     }
 
-[<WoofWare.Myriad.Plugins.JsonParse>]
-type internal InternalTypeNotExtension =
-    {
-        [<JsonPropertyName(Literals.something)>]
-        InternalThing : string
-    }
-
-[<WoofWare.Myriad.Plugins.JsonSerialize>]
-type internal InternalTypeNotExtensionSerial =
-    {
-        [<JsonPropertyName(Literals.something)>]
-        InternalThing2 : string
-    }
-
-[<WoofWare.Myriad.Plugins.JsonParse true>]
-[<WoofWare.Myriad.Plugins.JsonSerialize true>]
-type internal InternalTypeExtension =
-    {
-        [<JsonPropertyName(Literals.something)>]
-        ExternalThing : string
-    }
-
 [<WoofWare.Myriad.Plugins.JsonParse true>]
 type ToGetExtensionMethod =
     {
-        Alpha : string
-        Bravo : System.Uri
-        Charlie : float
-        Delta : float32
-        Echo : single
-        Foxtrot : double
-        Golf : int64
-        Hotel : uint64
-        India : int
-        Juliette : uint
-        Kilo : int32
-        Lima : uint32
-        Mike : int16
-        November : uint16
-        Oscar : int8
-        Papa : uint8
-        Quebec : byte
-        Tango : sbyte
-        Uniform : decimal
-        Victor : char
-        Whiskey : bigint
+        Tinker : string
+        Tailor : int
+        Soldier : System.Uri
+        Sailor : float
     }
 
 [<RequireQualifiedAccess>]

ConsumePlugin/List.fs

@@ -1,19 +0,0 @@
-namespace ConsumePlugin
-
-open WoofWare.Myriad.Plugins
-
-[<CreateCatamorphism "MyListCata">]
-type MyList<'a> =
-    | Nil
-    | Cons of ConsCase<'a>
-
-and ConsCase<'a> =
-    {
-        Head : 'a
-        Tail : MyList<'a>
-    }
-
-[<CreateCatamorphism "MyList2Cata">]
-type MyList2<'a> =
-    | Nil
-    | Cons of 'a * MyList2<'a>

ConsumePlugin/ListCata.fs

@@ -1,118 +0,0 @@
-//------------------------------------------------------------------------------
-//        This code was generated by myriad.
-//        Changes to this file will be lost when the code is regenerated.
-//------------------------------------------------------------------------------
-
-
-
-
-
-namespace ConsumePlugin
-
-open WoofWare.Myriad.Plugins
-
-/// Description of how to combine cases during a fold
-type MyListCataCase<'a, 'MyList> =
-    /// How to operate on the Nil case
-    abstract Nil : 'MyList
-    /// How to operate on the Cons case
-    abstract Cons : head : 'a -> tail : 'MyList -> 'MyList
-
-/// Specifies how to perform a fold (catamorphism) over the type MyList and its friends.
-type MyListCata<'a, 'MyList> =
-    {
-        /// How to perform a fold (catamorphism) over the type MyList
-        MyList : MyListCataCase<'a, 'MyList>
-    }
-
-/// Methods to perform a catamorphism over the type MyList
-[<RequireQualifiedAccess>]
-module MyListCata =
-    [<RequireQualifiedAccess>]
-    type private Instruction<'a> =
-        | Process__MyList of MyList<'a>
-        | MyList_Cons of 'a
-
-    let private loop (cata : MyListCata<'a, 'MyList>) (instructions : ResizeArray<Instruction<'a>>) =
-        let myListStack = ResizeArray<'MyList> ()
-
-        while instructions.Count > 0 do
-            let currentInstruction = instructions.[instructions.Count - 1]
-            instructions.RemoveAt (instructions.Count - 1)
-
-            match currentInstruction with
-            | Instruction.Process__MyList x ->
-                match x with
-                | MyList.Nil -> cata.MyList.Nil |> myListStack.Add
-                | MyList.Cons ({
-                                   Head = head
-                                   Tail = tail
-                               }) ->
-                    instructions.Add (Instruction.MyList_Cons (head))
-                    instructions.Add (Instruction.Process__MyList tail)
-            | Instruction.MyList_Cons head ->
-                let tail = myListStack.[myListStack.Count - 1]
-                myListStack.RemoveAt (myListStack.Count - 1)
-                cata.MyList.Cons head tail |> myListStack.Add
-
-        myListStack
-
-    /// Execute the catamorphism.
-    let runMyList (cata : MyListCata<'a, 'MyListRet>) (x : MyList<'a>) : 'MyListRet =
-        let instructions = ResizeArray ()
-        instructions.Add (Instruction.Process__MyList x)
-        let myListRetStack = loop cata instructions
-        Seq.exactlyOne myListRetStack
-namespace ConsumePlugin
-
-open WoofWare.Myriad.Plugins
-
-/// Description of how to combine cases during a fold
-type MyList2CataCase<'a, 'MyList2> =
-    /// How to operate on the Nil case
-    abstract Nil : 'MyList2
-    /// How to operate on the Cons case
-    abstract Cons : 'a -> 'MyList2 -> 'MyList2
-
-/// Specifies how to perform a fold (catamorphism) over the type MyList2 and its friends.
-type MyList2Cata<'a, 'MyList2> =
-    {
-        /// How to perform a fold (catamorphism) over the type MyList2
-        MyList2 : MyList2CataCase<'a, 'MyList2>
-    }
-
-/// Methods to perform a catamorphism over the type MyList2
-[<RequireQualifiedAccess>]
-module MyList2Cata =
-    [<RequireQualifiedAccess>]
-    type private Instruction<'a> =
-        | Process__MyList2 of MyList2<'a>
-        | MyList2_Cons of 'a
-
-    let private loop (cata : MyList2Cata<'a, 'MyList2>) (instructions : ResizeArray<Instruction<'a>>) =
-        let myList2Stack = ResizeArray<'MyList2> ()
-
-        while instructions.Count > 0 do
-            let currentInstruction = instructions.[instructions.Count - 1]
-            instructions.RemoveAt (instructions.Count - 1)
-
-            match currentInstruction with
-            | Instruction.Process__MyList2 x ->
-                match x with
-                | MyList2.Nil -> cata.MyList2.Nil |> myList2Stack.Add
-                | MyList2.Cons (arg0_0, arg1_0) ->
-                    instructions.Add (Instruction.MyList2_Cons (arg0_0))
-                    instructions.Add (Instruction.Process__MyList2 arg1_0)
-            | Instruction.MyList2_Cons arg0_0 ->
-                let arg1_0 = myList2Stack.[myList2Stack.Count - 1]
-                myList2Stack.RemoveAt (myList2Stack.Count - 1)
-                cata.MyList2.Cons arg0_0 arg1_0 |> myList2Stack.Add
-
-        myList2Stack
-
-    /// Execute the catamorphism.
-    let runMyList2 (cata : MyList2Cata<'a, 'MyList2Ret>) (x : MyList2<'a>) : 'MyList2Ret =
-        let instructions = ResizeArray ()
-        instructions.Add (Instruction.Process__MyList2 x)
-        let myList2RetStack = loop cata instructions
-        Seq.exactlyOne myList2RetStack

ConsumePlugin/MockExample.fs

@@ -1,6 +1,5 @@
 namespace SomeNamespace
 
-open System
 open WoofWare.Myriad.Plugins
 
 [<GenerateMock>]
@@ -9,12 +8,6 @@ type IPublicType =
     abstract Mem2 : string -> int
     abstract Mem3 : x : int * ?ct : System.Threading.CancellationToken -> string
 
-[<GenerateMock false>]
-type IPublicTypeInternalFalse =
-    abstract Mem1 : string * int -> string list
-    abstract Mem2 : string -> int
-    abstract Mem3 : x : int * ?ct : System.Threading.CancellationToken -> string
-
 [<GenerateMock>]
 type internal InternalType =
     abstract Mem1 : string * int -> unit
@@ -25,11 +18,6 @@ type private PrivateType =
     abstract Mem1 : string * int -> unit
     abstract Mem2 : string -> int
 
-[<GenerateMock false>]
-type private PrivateTypeInternalFalse =
-    abstract Mem1 : string * int -> unit
-    abstract Mem2 : string -> int
-
 [<GenerateMock>]
 type VeryPublicType<'a, 'b> =
     abstract Mem1 : 'a -> 'b
@@ -42,9 +30,3 @@ type Curried<'a> =
     abstract Mem4 : (int * string) -> ('a * int) -> string
     abstract Mem5 : x : int * string -> ('a * int) -> string
     abstract Mem6 : int * string -> y : 'a * int -> string
-
-[<GenerateMock>]
-type TypeWithInterface =
-    inherit IDisposable
-    abstract Mem1 : string option -> string[] Async
-    abstract Mem2 : unit -> string[] Async

ConsumePlugin/PureGymDto.fs

@@ -19,16 +19,13 @@ type GymAccessOptions =
         QrCodeAccess : bool
     }
 
-[<Measure>]
-type measure
-
 [<WoofWare.Myriad.Plugins.JsonParse>]
 type GymLocation =
     {
         [<JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)>]
         Longitude : float
         [<JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)>]
-        Latitude : float<measure>
+        Latitude : float
     }
 
 [<WoofWare.Myriad.Plugins.JsonParse>]
@@ -71,8 +68,7 @@ type Gym =
         ReopenDate : string
     }
 
-[<WoofWare.Myriad.Plugins.JsonParse true>]
-[<WoofWare.Myriad.Plugins.JsonSerialize true>]
+[<WoofWare.Myriad.Plugins.JsonParse>]
 type Member =
     {
         Id : int

ConsumePlugin/RecordFile.fs

@@ -1,5 +1,9 @@
 namespace ConsumePlugin
 
+type ParseState =
+    | AwaitingKey
+    | AwaitingValue of string
+
 /// My whatnot
 [<WoofWare.Myriad.Plugins.RemoveOptions>]
 type RecordType =

ConsumePlugin/RestApiExample.fs

@@ -11,20 +11,17 @@ open RestEase
 [<WoofWare.Myriad.Plugins.HttpClient>]
 [<BaseAddress "https://whatnot.com">]
 type IPureGymApi =
-    [<Get("v1/gyms/")>]
+    [<Get "v1/gyms/">]
     abstract GetGyms : ?ct : CancellationToken -> Task<Gym list>
 
     [<Get "v1/gyms/{gym_id}/attendance">]
     abstract GetGymAttendance : [<Path "gym_id">] gymId : int * ?ct : CancellationToken -> Task<GymAttendance>
 
-    [<Get "v1/gyms/{gym_id}/attendance">]
-    abstract GetGymAttendance' : [<Path("gym_id")>] gymId : int * ?ct : CancellationToken -> Task<GymAttendance>
-
     [<RestEase.GetAttribute "v1/member">]
     abstract GetMember : ?ct : CancellationToken -> Member Task
 
-    [<RestEase.Get "v1/gyms/{gym}">]
-    abstract GetGym : [<Path>] gym : int * ?ct : CancellationToken -> Task<Gym>
+    [<RestEase.Get "v1/gyms/{gym_id}">]
+    abstract GetGym : [<Path "gym_id">] gymId : int * ?ct : CancellationToken -> Task<Gym>
 
     [<GetAttribute "v1/member/activity">]
     abstract GetMemberActivity : ?ct : CancellationToken -> Task<MemberActivityDto>
@@ -32,19 +29,11 @@ type IPureGymApi =
     [<Get "some/url">]
     abstract GetUrl : ?ct : CancellationToken -> Task<UriThing>
 
-    [<Post "some/url">]
-    abstract PostStringToString :
-        [<Body>] foo : Map<string, string> option * ?ct : CancellationToken -> Task<Map<string, string> option>
-
     // We'll use this one to check handling of absolute URIs too
     [<Get "/v2/gymSessions/member">]
     abstract GetSessions :
         [<Query>] fromDate : DateOnly * [<Query>] toDate : DateOnly * ?ct : CancellationToken -> Task<Sessions>
 
-    [<Get "/v2/gymSessions/member?foo=1">]
-    abstract GetSessionsWithQuery :
-        [<Query>] fromDate : DateOnly * [<Query>] toDate : DateOnly * ?ct : CancellationToken -> Task<Sessions>
-
     // An example from RestEase's own docs
     [<Post "users/new">]
     abstract CreateUserString : [<Body>] user : string * ?ct : CancellationToken -> Task<string>
@@ -61,15 +50,6 @@ type IPureGymApi =
     [<Post "users/new">]
     abstract CreateUserByteArr'' : [<Body>] user : byte array * ?ct : CancellationToken -> Task<Stream>
 
-    [<Post "users/new">]
-    abstract CreateUserSerialisedBody : [<Body>] user : PureGym.Member * ?ct : CancellationToken -> Task<string>
-
-    [<Post "users/new">]
-    abstract CreateUserSerialisedUrlBody : [<Body>] user : Uri * ?ct : CancellationToken -> Task<string>
-
-    [<Post "users/new">]
-    abstract CreateUserSerialisedIntBody : [<Body>] user : int * ?ct : CancellationToken -> Task<string>
-
     [<Post "users/new">]
     abstract CreateUserHttpContent :
         [<Body>] user : System.Net.Http.HttpContent * ?ct : CancellationToken -> Task<string>
@@ -127,9 +107,8 @@ type internal IApiWithoutBaseAddress =
 [<WoofWare.Myriad.Plugins.HttpClient>]
 [<BasePath "foo">]
 type IApiWithBasePath =
-    // Example where we use the bundled attributes rather than RestEase's
-    [<WoofWare.Myriad.Plugins.RestEase.Get "endpoint/{param}">]
-    abstract GetPathParam : [<Path "param">] parameter : string * ?cancellationToken : CancellationToken -> Task<string>
+    [<Get "endpoint/{param}">]
+    abstract GetPathParam : [<Path "param">] parameter : string * ?ct : CancellationToken -> Task<string>
 
 [<WoofWare.Myriad.Plugins.HttpClient>]
 [<BaseAddress "https://whatnot.com">]
@@ -137,28 +116,3 @@ type IApiWithBasePath =
 type IApiWithBasePathAndAddress =
     [<Get "endpoint/{param}">]
     abstract GetPathParam : [<Path "param">] parameter : string * ?ct : CancellationToken -> Task<string>
-
-[<WoofWare.Myriad.Plugins.HttpClient>]
-[<Header("Header-Name", "Header-Value")>]
-type IApiWithHeaders =
-    [<Header "X-Foo">]
-    abstract SomeHeader : string
-
-    [<Header "Authorization">]
-    abstract SomeOtherHeader : int
-
-    [<Get "endpoint/{param}">]
-    abstract GetPathParam : [<Path "param">] parameter : string * ?ct : CancellationToken -> Task<string>
-
-[<WoofWare.Myriad.Plugins.HttpClient>]
-[<WoofWare.Myriad.Plugins.RestEase.Header("Header-Name", "Header-Value")>]
-type IApiWithHeaders2 =
-    [<WoofWare.Myriad.Plugins.RestEase.Header "X-Foo">]
-    abstract SomeHeader : string
-
-    [<WoofWare.Myriad.Plugins.RestEase.Header "Authorization">]
-    abstract SomeOtherHeader : int
-
-    [<Get "endpoint/{param}">]
-    abstract GetPathParam :
-        [<WoofWare.Myriad.Plugins.RestEase.Path "param">] parameter : string * ?ct : CancellationToken -> Task<string>

ConsumePlugin/SerializationAndDeserialization.fs

@@ -1,75 +0,0 @@
-namespace ConsumePlugin
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Serialization
-
-[<WoofWare.Myriad.Plugins.JsonParse true>]
-[<WoofWare.Myriad.Plugins.JsonSerialize true>]
-type InnerTypeWithBoth =
-    {
-        [<JsonPropertyName("it's-a-me")>]
-        Thing : Guid
-        Map : Map<string, Uri>
-        ReadOnlyDict : IReadOnlyDictionary<string, char list>
-        Dict : IDictionary<Uri, bool>
-        ConcreteDict : Dictionary<string, InnerTypeWithBoth>
-    }
-
-[<WoofWare.Myriad.Plugins.JsonParse true>]
-[<WoofWare.Myriad.Plugins.JsonSerialize true>]
-type SomeEnum =
-    | Blah = 1
-    | Thing = 0
-
-[<Measure>]
-type measure
-
-[<WoofWare.Myriad.Plugins.JsonParse true>]
-[<WoofWare.Myriad.Plugins.JsonSerialize true>]
-type JsonRecordTypeWithBoth =
-    {
-        A : int
-        B : string
-        C : int list
-        D : InnerTypeWithBoth
-        E : string array
-        Arr : int[]
-        Byte : byte<measure>
-        Sbyte : sbyte<measure>
-        I : int<measure>
-        I32 : int32<measure>
-        I64 : int64<measure>
-        U : uint<measure>
-        U32 : uint32<measure>
-        U64 : uint64<measure>
-        F : float<measure>
-        F32 : float32<measure>
-        Single : single<measure>
-        IntMeasureOption : int<measure> option
-        IntMeasureNullable : int<measure> Nullable
-        Enum : SomeEnum
-        Timestamp : DateTimeOffset
-    }
-
-[<WoofWare.Myriad.Plugins.JsonSerialize true>]
-[<WoofWare.Myriad.Plugins.JsonParse true>]
-type FirstDu =
-    | EmptyCase
-    | Case1 of data : string
-    | Case2 of record : JsonRecordTypeWithBoth * i : int
-
-[<WoofWare.Myriad.Plugins.JsonParse true>]
-[<WoofWare.Myriad.Plugins.JsonSerialize true>]
-type HeaderAndValue =
-    {
-        Header : string
-        Value : string
-    }
-
-[<WoofWare.Myriad.Plugins.JsonSerialize true>]
-[<WoofWare.Myriad.Plugins.JsonParse true>]
-type Foo =
-    {
-        Message : HeaderAndValue option
-    }

ConsumePlugin/Vault.fs

@@ -76,33 +76,3 @@ type IVaultClient =
 
     [<Get "v1/auth/jwt/login">]
     abstract GetJwt : role : string * jwt : string * ?ct : CancellationToken -> Task<JwtVaultResponse>
-
-[<WoofWare.Myriad.Plugins.HttpClient false>]
-type IVaultClientNonExtensionMethod =
-    [<Get "v1/{mountPoint}/{path}">]
-    abstract GetSecret :
-        jwt : JwtVaultResponse *
-        [<Path "path">] path : string *
-        [<Path "mountPoint">] mountPoint : string *
-        ?ct : CancellationToken ->
-            Task<JwtSecretResponse>
-
-    [<Get "v1/auth/jwt/login">]
-    abstract GetJwt : role : string * jwt : string * ?ct : CancellationToken -> Task<JwtVaultResponse>
-
-[<WoofWare.Myriad.Plugins.HttpClient(true)>]
-type IVaultClientExtensionMethod =
-    [<Get "v1/{mountPoint}/{path}">]
-    abstract GetSecret :
-        jwt : JwtVaultResponse *
-        [<Path "path">] path : string *
-        [<Path "mountPoint">] mountPoint : string *
-        ?ct : CancellationToken ->
-            Task<JwtSecretResponse>
-
-    [<Get "v1/auth/jwt/login">]
-    abstract GetJwt : role : string * jwt : string * ?ct : CancellationToken -> Task<JwtVaultResponse>
-
-[<RequireQualifiedAccess>]
-type VaultClientExtensionMethod =
-    static member thisClashes = 99

Directory.Build.props

@@ -10,10 +10,19 @@
     <WarnOn>FS3388,FS3559</WarnOn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.141" PrivateAssets="all"/>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     <SourceLinkGitHubHost Include="github.com" ContentUrl="https://raw.githubusercontent.com"/>
   </ItemGroup>
-  <PropertyGroup Condition="'$(GITHUB_ACTION)' != ''">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
+  <!--
+    SourceLink doesn't support F# deterministic builds out of the box,
+    so tell SourceLink that our source root is going to be remapped.
+  -->
+  <Target Name="MapSourceRoot" BeforeTargets="_GenerateSourceLinkFile" Condition="'$(SourceRootMappedPathsFeatureSupported)' != 'true'">
+    <ItemGroup>
+      <SourceRoot Update="@(SourceRoot)">
+        <MappedPath>Z:\CheckoutRoot\WoofWare.Myriad\</MappedPath>
+      </SourceRoot>
+    </ItemGroup>
+  </Target>
 </Project>

README.md

@@ -8,20 +8,15 @@
 
 Some helpers in [Myriad](https://github.com/MoiraeSoftware/myriad/) which might be useful.
 
+These are currently somewhat experimental, and I personally am their primary customer.
+The `RemoveOptions` generator in particular is extremely half-baked.
+
 Currently implemented:
 
-* `JsonParse` (to stamp out `jsonParse : JsonNode -> 'T` methods).
-* `JsonSerialize` (to stamp out `toJsonNode : 'T -> JsonNode` methods).
+* `JsonParse` (to stamp out `jsonParse : JsonNode -> 'T` methods);
+* `RemoveOptions` (to strip `option` modifiers from a type).
 * `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)
-* `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!
-
-If you would like to ensure that your particular use-case remains unbroken, please do contribute tests to this repository.
-The `ConsumePlugin` assembly contains a number of invocations of these source generators,
-so you just need to add copies of your types to that assembly to ensure that I will at least notice if I break the build;
-and if you add tests to `WoofWare.Myriad.Plugins.Test` then I will also notice if I break the runtime semantics of the generated code.
+* `GenerateMock` (to stamp out a record type corresponding to an interface).
 
 ## `JsonParse`
 
@@ -79,11 +74,6 @@ module JsonRecordType =
         { A = A; B = B; C = C; D = D }
 ```
 
-You can optionally supply the boolean `true` to the attribute,
-which will cause Myriad to stamp out an extension method rather than a module with the same name as the type.
-This is useful if you want to reuse the type name as a module name yourself,
-or if you want to apply multiple source generators which each want to use the module name.
-
 ### What's the point?
 
 `System.Text.Json`, in a `PublishAot` context, relies on C# source generators.
@@ -102,122 +92,6 @@ However, there is *far* more that could be done.
 * Make it possible to reject parsing if extra fields are present.
 * Generally support all the `System.Text.Json` attributes.
 
-For an example of using both `JsonParse` and `JsonSerialize` together with complex types, see [the type definitions](./ConsumePlugin/SerializationAndDeserialization.fs) and [tests](./WoofWare.Myriad.Plugins.Test/TestJsonSerialize/TestJsonSerde.fs).
-
-## `JsonSerialize`
-
-Takes records like this:
-```fsharp
-[<WoofWare.Myriad.Plugins.JsonSerialize true>]
-type InnerTypeWithBoth =
-    {
-        [<JsonPropertyName("it's-a-me")>]
-        Thing : string
-        ReadOnlyDict : IReadOnlyDictionary<string, Uri list>
-    }
-```
-
-and stamps out modules like this:
-```fsharp
-module InnerTypeWithBoth =
-    let toJsonNode (input : InnerTypeWithBoth) : System.Text.Json.Nodes.JsonNode =
-        let node = System.Text.Json.Nodes.JsonObject ()
-
-        do
-            node.Add (("it's-a-me"), System.Text.Json.Nodes.JsonValue.Create<string> input.Thing)
-
-            node.Add (
-                "ReadOnlyDict",
-                (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<Uri> value)
-
-                    ret
-                ) input.Map
-            )
-
-        node
-```
-
-Also includes an *opinionated* serializer for discriminated unions.
-(Any such serializer must be opinionated, because JSON does not natively model DUs.)
-
-As in `JsonParse`, you can optionally supply the boolean `true` to the attribute,
-which will cause Myriad to stamp out an extension method rather than a module with the same name as the type.
-
-The same limitations generally apply to `JsonSerialize` as do to `JsonParse`.
-
-For an example of using both `JsonParse` and `JsonSerialize` together with complex types, see [the type definitions](./ConsumePlugin/SerializationAndDeserialization.fs) and [tests](./WoofWare.Myriad.Plugins.Test/TestJsonSerialize/TestJsonSerde.fs).
-
-## `ArgParser`
-
-Takes a record like this:
-
-```fsharp
-[<ArgParser>]
-type Foo =
-    {
-        [<ArgumentHelpText "Enable the frobnicator">]
-        SomeFlag : bool
-        A : int option
-        [<ArgumentDefaultFunction>]
-        B : Choice<int, int>
-        [<ArgumentDefaultEnvironmentVariable "MY_ENV_VAR">]
-        BWithEnv : Choice<int, int>
-        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
-```
-
-and stamps out a basic `parse` method of this signature:
-
-```fsharp
-[<RequireQualifiedAccess>]
-module Foo =
-    // in case you want to test it
-    let parse' (getEnvVar : string -> string) (args : string list) : Foo = ...
-    // the one we expect you actually want to use
-    let parse (args : string list) : Foo = ...
-```
-
-Default arguments are handled as `Choice<'a, 'a>`:
-you get a `Choice1Of2` if the user provided the input, or a `Choice2Of2` if the parser filled in your specified default value.
-
-You can control `TimeSpan` and friends with the `[<InvariantCulture>]` and `[<ParseExact @"hh\:mm\:ss">]` attributes.
-
-You can generate extension methods for the type, instead of a module with the type's name, using `[<ArgParser (* isExtensionMethod = *) true>]`.
-
-If `--help` appears in a position where the parser is expecting a key (e.g. in the first position, or after a `--foo=bar`), the parser fails with help text.
-The parser also makes a limited effort to supply help text when encountering an invalid parse.
-
-### What's the point?
-
-I got fed up of waiting for us to find time to rewrite the in-house one at work.
-That one has a bunch of nice compositional properties, which my version lacks:
-I can basically only deal with primitive types, and e.g. you can't stack records and discriminated unions inside each other.
-
-But I *do* want an F#-native argument parser suitable for AOT-compilation.
-
-Why not [Argu](https://fsprojects.github.io/Argu/)?
-Answer: I got annoyed with having to construct my records by hand even after Argu returned and said the parsing was all "done".
-
-### Limitations
-
-This is very bare-bones, but do raise GitHub issues if you like (or if you find cases where the parser does the wrong thing).
-
-* Help is signalled by throwing an exception, so you'll get an unsightly stack trace and a nonzero exit code.
-* Help doesn't take into account any arguments the user has entered. Ideally you'd get contextual information like an identification of which args the user has supplied at the point where the parse failed or help was requested.
-* I don't handle very many types, and in particular a real arg parser would handle DUs and records with nesting.
-* I don't try very hard to find a valid parse. It may well be possible to find a case where I fail to parse despite there existing a valid parse.
-* There's no subcommand support (you'll have to do that yourself).
-
-It should work fine if you just want to compose a few primitive types, though.
-
 ## `RemoveOptions`
 
 Takes a record like this:
@@ -327,11 +201,6 @@ module PureGymApi =
 
 The motivating example is again ahead-of-time compilation: we wish to avoid the reflection which RestEase does.
 
-### Features
-
-* Variable and constant header values are supported:
-  see [the definition of `IApiWithHeaders`](./ConsumePlugin/RestApiExample.fs).
-
 ### Limitations
 
 RestEase is complex, and handles a lot of different stuff.
@@ -339,18 +208,17 @@ RestEase is complex, and handles a lot of different stuff.
 * If you set the `BaseAddress` on your input `HttpClient`, make sure to end with a trailing slash
   on any trailing directories (so `"blah/foo/"` rather than `"blah/foo"`).
   We combine URIs using `UriKind.Relative`, so without a trailing slash, the last component may be chopped off.
-* Parameters are serialised naively with `toJsonNode` as though the `JsonSerialize` generator were applied,
-  and you can't control the serialisation. You can't yet serialise e.g. a primitive type this way (other than `String`);
-  all body parameters must be types which have a suitable `toJsonNode : 'a -> JsonNode` method.
+* Parameters are serialised solely with `ToString`, and there's no control over this;
+  nor is there control over encoding in any sense.
 * Deserialisation follows the same logic as the `JsonParse` generator,
   and it generally assumes you're using types which `JsonParse` is applied to.
+* Headers are not yet supported.
 * Anonymous parameters are currently forbidden.
 
 There are also some design decisions:
 
 * Every function must take an optional `CancellationToken` (which is good practice anyway);
   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`
 
@@ -391,85 +259,11 @@ The [Grug-brained developer](https://grugbrain.dev/) would prefer to do this wit
 But since F# does not let you partially update an interface definition, we instead stamp out a record,
 thereby allowing the programmer to use F#'s record-update syntax.
 
-### Features
-
-* 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>]`.
-
-## `CreateCatamorphism`
-
-Takes a collection of mutually recursive discriminated unions:
-
-```fsharp
-[<CreateCatamorphism "MyCata">]
-type Expr =
-    | Const of Const
-    | Pair of Expr * Expr * PairOpKind
-    | Sequential of Expr list
-    | Builder of Expr * ExprBuilder
-
-and ExprBuilder =
-    | Child of ExprBuilder
-    | Parent of Expr
-```
-
-and stamps out a type like this:
-```fsharp
-type ExprCata<'Expr, 'ExprBuilder> =
-    abstract Const : Const -> 'Expr
-    abstract Pair : 'Expr -> 'Expr -> PairOpKind -> 'Expr
-    abstract Sequential : 'Expr list -> 'Expr
-    abstract Builder : 'Expr -> 'ExprBuilder -> 'Expr
-
-type ExprBuilderCata<'Expr, 'ExprBuilder> =
-    abstract Child : 'ExprBuilder -> 'ExprBuilder
-    abstract Parent : 'Expr -> 'ExprBuilder
-
-type MyCata<'Expr, 'ExprBuilder> =
-    {
-        Expr : ExprCata<'Expr, 'ExprBuilder>
-        ExprBuilder : ExprBuilderCata<'Expr, 'ExprBuilder>
-    }
-
-[<RequireQualifiedAccess>]
-module ExprCata =
-    let runExpr (cata : MyCata<'ExprRet, 'ExprBuilderRet>) (x : Expr) : 'ExprRet =
-        failwith "this is implemented"
-
-    let runExprBuilder (cata : MyCata<'ExprRet, 'ExprBuilderRet>) (x : ExprBuilder) : 'ExprBuilderRet =
-        failwith "this is implemented"
-```
-
-### What's the point?
-Recursing over a tree is not easy to get right, especially if you want to avoid stack overflows.
-Instead of writing the recursion many times, it's better to do it once,
-and then each time you only plug in what you want to do.
-
-### Features
-
-* Mutually recursive DUs are supported (as in the example above).
-  Every DU in a recursive `type Foo... and Bar...` knot will be given an appropriate cata, as long as any one of those DUs has the `[<CreateCatamorphism>]` attribute.
-* There is *limited* support for records and for lists.
-* There is *extremely brittle* support for generics in the DUs you are cata'ing over.
-  It is based on the names of the generic parameters, so you must ensure that generic parameters with the same name have the same meaning across the various cases in your recursive knot of DUs.
-  (If you overstep the bounds of what this generator can do, you will get compile-time errors, e.g. with generics being constrained to each other's values.)
-  See the [List tests](./WoofWare.Myriad.Plugins.Test/TestCataGenerator/TestMyList2.fs) for an example, where we re-implement `FSharpList<'a>`.
-
 ### Limitations
 
-**I am not at all convinced of the correctness of this generator**, and I know it is very incomplete (in the sense that there are many possible DUs you could write for which the generator will bail out).
-I *strongly* recommend implementing the identity catamorphism for your type and using property-based tests ([as I do](./WoofWare.Myriad.Plugins.Test/TestCataGenerator/TestDirectory.fs)) to assert that the correct thing happens.
-Feel free to raise GitHub issues with code I can copy-paste to reproduce a case where the wrong thing happens (though I can't promise to look at them).
-
-* This is a particularly half-baked generator which has so far seen no real-world use.
-  It likely has a bunch of [80/20](https://en.wikipedia.org/wiki/Pareto_principle) low-hanging fruit remaining, but it also likely has impossible problems to solve which I don't know about yet.
-* Only a very few kinds of DU field are currently implemented.
-  For example, this generator can't see through an interface (e.g. the kind of interface one would use to implement the [crate pattern](https://www.patrickstevens.co.uk/posts/2021-10-19-crates/) to represent a [GADT](https://en.wikipedia.org/wiki/Generalized_algebraic_data_type)),
-  so the generated cata will simply grant you access to the interface (rather than attempting to descend into it to discover recursive references).
-  You can't nest lists deeply. All sorts of other cases are unaddressed.
-* This generator does not try to solve the "exponential diamond dependency" problem.
-  If you have a case of the form `type Expr = | Branch of Expr * Expr`, the cata will walk into both `Expr`s separately.
-  If the `Expr`s happen to be equal, the cata will nevertheless traverse them individually (that is, it will traverse the same `Expr` twice).
-  Your type may represent a [DAG](https://en.wikipedia.org/wiki/Directed_acyclic_graph), but we will always effectively expand it into a tree of paths and operate on each of the exponentially-many paths.
+* We currently only support interfaces with tupled arguments.
+* We make the resulting record type at most internal (never public), since this is intended only to be used in tests.
+  You will therefore need an `AssemblyInfo.fs` file [like the one in WoofWare.Myriad's own tests](./ConsumePlugin/AssemblyInfo.fs).
 
 # Detailed examples
 
@@ -481,20 +275,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>1.1.5</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:
+* Take a reference on `WoofWare.Myriad.Plugins`:
     ```xml
     <ItemGroup>
-        <PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="2.0.2" />
-    </ItemGroup>
-    ```
-* Take a reference (with private assets, to prevent these from propagating to your own assembly) on `WoofWare.Myriad.Plugins`, to obtain the plugins which Myriad will run, and on `Myriad.Sdk`, to obtain the Myriad binary itself:
-    ```xml
-    <ItemGroup>
-        <PackageReference Include="WoofWare.Myriad.Plugins" Version="$(WoofWareMyriadPluginVersion)" PrivateAssets="all" />
-        <PackageReference Include="Myriad.Sdk" Version="0.8.3" PrivateAssets="all" />
+        <PackageReference Include="WoofWare.Myriad.Plugins" Version="$(WoofWareMyriadPluginVersion)" />
     </ItemGroup>
     ```
 * Point Myriad to the DLL within the NuGet package which is the source of the plugins:

WoofWare.Myriad.Plugins.Attributes/ArgParserAttributes.fs

@@ -1,63 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System
-
-/// Attribute indicating a record type to which the "build arg parser" Myriad
-/// generator should apply during build.
-///
-/// If you supply isExtensionMethod = true, you will get extension methods.
-/// These can only be consumed from F#, but the benefit is that they don't use up the module name
-/// (since by default we create a module called "{TypeName}").
-type ArgParserAttribute (isExtensionMethod : bool) =
-    inherit Attribute ()
-
-    /// The default value of `isExtensionMethod`, the optional argument to the ArgParserAttribute constructor.
-    static member DefaultIsExtensionMethod = false
-
-    /// Shorthand for the "isExtensionMethod = false" constructor; see documentation there for details.
-    new () = ArgParserAttribute ArgParserAttribute.DefaultIsExtensionMethod
-
-/// Attribute indicating that this field shall accumulate all unmatched args,
-/// as well as any that appear after a bare `--`.
-type PositionalArgsAttribute () =
-    inherit Attribute ()
-
-/// Attribute indicating that this field shall have a default value derived
-/// from calling an appropriately named static method on the type.
-///
-/// This attribute can only be placed on fields of type `Choice<_, _>` where both type parameters
-/// are the same.
-/// After a successful parse, the value is Choice1Of2 if the user supplied an input,
-/// or Choice2Of2 if the input was obtained by calling the default function.
-///
-/// The static method we call for field `FieldName : 'a` is `DefaultFieldName : unit -> 'a`.
-type ArgumentDefaultFunctionAttribute () =
-    inherit Attribute ()
-
-/// Attribute indicating that this field shall have a default value derived
-/// from an environment variable (whose name you give in the attribute constructor).
-///
-/// This attribute can only be placed on fields of type `Choice<_, _>` where both type parameters
-/// are the same.
-/// After a successful parse, the value is Choice1Of2 if the user supplied an input,
-/// or Choice2Of2 if the input was obtained by pulling a value from `Environment.GetEnvironmentVariable`.
-type ArgumentDefaultEnvironmentVariableAttribute (envVar : string) =
-    inherit Attribute ()
-
-/// Attribute indicating that this field shall have the given help text, when `--help` is invoked
-/// or when a parse error causes us to print help text.
-type ArgumentHelpTextAttribute (helpText : string) =
-    inherit Attribute ()
-
-/// Attribute indicating that this field should be parsed with a ParseExact method on its type.
-/// For example, on a TimeSpan field, with [<ArgumentParseExact @"hh\:mm\:ss">], we will call
-/// `TimeSpan.ParseExact (s, @"hh\:mm\:ss", CultureInfo.CurrentCulture).
-type ParseExactAttribute (format : string) =
-    inherit Attribute ()
-
-/// Attribute indicating that this field should be parsed in the invariant culture, rather than the
-/// default current culture.
-/// For example, on a TimeSpan field, with [<InvariantCulture>] and [<ArgumentParseExact @"hh\:mm\:ss">], we will call
-/// `TimeSpan.ParseExact (s, @"hh\:mm\:ss", CultureInfo.InvariantCulture).
-type InvariantCultureAttribute () =
-    inherit Attribute ()

WoofWare.Myriad.Plugins.Attributes/Attributes.fs

@@ -1,81 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System
-
-/// Attribute indicating a record type to which the "Remove Options" Myriad
-/// generator should apply during build.
-/// The purpose of this generator is to strip the `option` modifier from types.
-type RemoveOptionsAttribute () =
-    inherit Attribute ()
-
-/// Attribute indicating an interface type for which the "Generate 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.
-type GenerateMockAttribute (isInternal : bool) =
-    inherit Attribute ()
-    /// The default value of `isInternal`, the optional argument to the GenerateMockAttribute constructor.
-    static member DefaultIsInternal = true
-
-    /// Shorthand for the "isExtensionMethod = false" constructor; see documentation there for details.
-    new () = GenerateMockAttribute GenerateMockAttribute.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
-/// `{TypeName}.toJsonNode : {TypeName} -> System.Text.Json.Nodes.JsonNode`.
-///
-/// If you supply isExtensionMethod = true, you will get extension methods.
-/// These can only be consumed from F#, but the benefit is that they don't use up the module name
-/// (since by default we create a module called "{TypeName}").
-type JsonSerializeAttribute (isExtensionMethod : bool) =
-    inherit Attribute ()
-
-    /// The default value of `isExtensionMethod`, the optional argument to the JsonSerializeAttribute constructor.
-    static member DefaultIsExtensionMethod = false
-
-    /// Shorthand for the "isExtensionMethod = false" constructor; see documentation there for details.
-    new () = JsonSerializeAttribute JsonSerializeAttribute.DefaultIsExtensionMethod
-
-/// Attribute indicating a record type to which the "Add JSON parse" Myriad
-/// generator should apply during build.
-/// The purpose of this generator is to create methods (possibly extension methods) of the form
-/// `{TypeName}.jsonParse : System.Text.Json.Nodes.JsonNode -> {TypeName}`.
-///
-/// If you supply isExtensionMethod = true, you will get extension methods.
-/// These can only be consumed from F#, but the benefit is that they don't use up the module name
-/// (since by default we create a module called "{TypeName}").
-type JsonParseAttribute (isExtensionMethod : bool) =
-    inherit Attribute ()
-
-    /// The default value of `isExtensionMethod`, the optional argument to the JsonParseAttribute constructor.
-    static member DefaultIsExtensionMethod = false
-
-    /// Shorthand for the "isExtensionMethod = false" constructor; see documentation there for details.
-    new () = JsonParseAttribute JsonParseAttribute.DefaultIsExtensionMethod
-
-/// Attribute indicating a record type to which the "create HTTP client" Myriad
-/// generator should apply during build.
-/// This generator is intended to replicate much of the functionality of RestEase,
-/// i.e. to stamp out HTTP REST clients from interfaces defining the API.
-///
-/// If you supply isExtensionMethod = true, you will get extension methods.
-/// These can only be consumed from F#, but the benefit is that they don't use up the module name
-/// (since by default we create a module called "{TypeName}").
-type HttpClientAttribute (isExtensionMethod : bool) =
-    inherit Attribute ()
-    /// The default value of `isExtensionMethod`, the optional argument to the HttpClientAttribute constructor.
-    static member DefaultIsExtensionMethod = false
-
-    /// Shorthand for the "isExtensionMethod = false" constructor; see documentation there for details.
-    new () = HttpClientAttribute HttpClientAttribute.DefaultIsExtensionMethod
-
-/// Attribute indicating a DU type to which the "create catamorphism" Myriad
-/// generator should apply during build.
-/// Supply the `typeName` for the name of the record type we will generate, which contains
-/// all the catas required; for example, "MyThing" would generate:
-/// type MyThing<'a, 'b> = { Du1 : Du1Cata<'a, 'b> ; Du2 : Du2Cata<'a, 'b> }.
-type CreateCatamorphismAttribute (typeName : string) =
-    inherit Attribute ()

WoofWare.Myriad.Plugins.Attributes/RestEase.fs

@@ -1,63 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System
-
-/// Module containing duplicates of the supported RestEase attributes, in case you don't want
-/// to take a dependency on RestEase.
-[<RequireQualifiedAccess>]
-module RestEase =
-    /// Indicates that a method represents an HTTP Get query to the specified endpoint.
-    type GetAttribute (path : string) =
-        inherit Attribute ()
-
-    /// Indicates that a method represents an HTTP Post query to the specified endpoint.
-    type PostAttribute (path : string) =
-        inherit Attribute ()
-
-    /// Indicates that a method represents an HTTP Delete query to the specified endpoint.
-    type DeleteAttribute (path : string) =
-        inherit Attribute ()
-
-    /// Indicates that a method represents an HTTP Head query to the specified endpoint.
-    type HeadAttribute (path : string) =
-        inherit Attribute ()
-
-    /// Indicates that a method represents an HTTP Options query to the specified endpoint.
-    type OptionsAttribute (path : string) =
-        inherit Attribute ()
-
-    /// Indicates that a method represents an HTTP Put query to the specified endpoint.
-    type PutAttribute (path : string) =
-        inherit Attribute ()
-
-    /// Indicates that a method represents an HTTP Patch query to the specified endpoint.
-    type PatchAttribute (path : string) =
-        inherit Attribute ()
-
-    /// Indicates that a method represents an HTTP Trace query to the specified endpoint.
-    type TraceAttribute (path : string) =
-        inherit Attribute ()
-
-    /// Indicates that this argument to a method is interpolated into the HTTP request at runtime
-    /// by setting a query parameter (with the given name) to the value of the annotated argument.
-    type QueryAttribute (paramName : string) =
-        inherit Attribute ()
-
-    /// Indicates that this interface represents a REST client which accesses an API whose paths are
-    /// all relative to the given address.
-    type BaseAddressAttribute (addr : string) =
-        inherit Attribute ()
-
-    /// Indicates that this interface member causes the interface to set a header with the given name,
-    /// whose value is obtained whenever required by a fresh call to the interface member.
-    type HeaderAttribute (header : string, value : string option) =
-        inherit Attribute ()
-        new (header : string) = HeaderAttribute (header, None)
-        new (header : string, value : string) = HeaderAttribute (header, Some value)
-
-    /// Indicates that this argument to a method is interpolated into the request path at runtime
-    /// by writing it into the templated string that specifies the HTTP query e.g. in the `[<Get "/foo/{template}">]`.
-    type PathAttribute (path : string option) =
-        inherit Attribute ()
-        new (path : string) = PathAttribute (Some path)
-        new () = PathAttribute None

WoofWare.Myriad.Plugins.Attributes/SurfaceBaseline.txt

@@ -1,70 +0,0 @@
-WoofWare.Myriad.Plugins.ArgParserAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.ArgParserAttribute..ctor [constructor]: bool
-WoofWare.Myriad.Plugins.ArgParserAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.ArgParserAttribute.DefaultIsExtensionMethod [static property]: [read-only] bool
-WoofWare.Myriad.Plugins.ArgParserAttribute.get_DefaultIsExtensionMethod [static method]: unit -> bool
-WoofWare.Myriad.Plugins.ArgumentDefaultEnvironmentVariableAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.ArgumentDefaultEnvironmentVariableAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.ArgumentDefaultFunctionAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.ArgumentDefaultFunctionAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.ArgumentHelpTextAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.ArgumentHelpTextAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.CreateCatamorphismAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.CreateCatamorphismAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.GenerateMockAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.GenerateMockAttribute..ctor [constructor]: bool
-WoofWare.Myriad.Plugins.GenerateMockAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.GenerateMockAttribute.DefaultIsInternal [static property]: [read-only] bool
-WoofWare.Myriad.Plugins.GenerateMockAttribute.get_DefaultIsInternal [static method]: unit -> bool
-WoofWare.Myriad.Plugins.HttpClientAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.HttpClientAttribute..ctor [constructor]: bool
-WoofWare.Myriad.Plugins.HttpClientAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.HttpClientAttribute.DefaultIsExtensionMethod [static property]: [read-only] bool
-WoofWare.Myriad.Plugins.HttpClientAttribute.get_DefaultIsExtensionMethod [static method]: unit -> bool
-WoofWare.Myriad.Plugins.InvariantCultureAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.InvariantCultureAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.JsonParseAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.JsonParseAttribute..ctor [constructor]: bool
-WoofWare.Myriad.Plugins.JsonParseAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.JsonParseAttribute.DefaultIsExtensionMethod [static property]: [read-only] bool
-WoofWare.Myriad.Plugins.JsonParseAttribute.get_DefaultIsExtensionMethod [static method]: unit -> bool
-WoofWare.Myriad.Plugins.JsonSerializeAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.JsonSerializeAttribute..ctor [constructor]: bool
-WoofWare.Myriad.Plugins.JsonSerializeAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.JsonSerializeAttribute.DefaultIsExtensionMethod [static property]: [read-only] bool
-WoofWare.Myriad.Plugins.JsonSerializeAttribute.get_DefaultIsExtensionMethod [static method]: unit -> bool
-WoofWare.Myriad.Plugins.ParseExactAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.ParseExactAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.PositionalArgsAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.PositionalArgsAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.RemoveOptionsAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RemoveOptionsAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.RestEase inherit obj
-WoofWare.Myriad.Plugins.RestEase+BaseAddressAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+BaseAddressAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+DeleteAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+DeleteAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+GetAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+GetAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+HeadAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+HeadAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+HeaderAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+HeaderAttribute..ctor [constructor]: (string, string option)
-WoofWare.Myriad.Plugins.RestEase+HeaderAttribute..ctor [constructor]: (string, string)
-WoofWare.Myriad.Plugins.RestEase+HeaderAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+OptionsAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+OptionsAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+PatchAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+PatchAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+PathAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+PathAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+PathAttribute..ctor [constructor]: string option
-WoofWare.Myriad.Plugins.RestEase+PathAttribute..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.RestEase+PostAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+PostAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+PutAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+PutAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+QueryAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+QueryAttribute..ctor [constructor]: string
-WoofWare.Myriad.Plugins.RestEase+TraceAttribute inherit System.Attribute
-WoofWare.Myriad.Plugins.RestEase+TraceAttribute..ctor [constructor]: string

WoofWare.Myriad.Plugins.Attributes/Test/TestSurface.fs

@@ -1,24 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Attributes.Test
-
-open NUnit.Framework
-open WoofWare.Myriad.Plugins
-open ApiSurface
-
-[<TestFixture>]
-module TestSurface =
-    let assembly = typeof<RemoveOptionsAttribute>.Assembly
-
-    [<Test>]
-    let ``Ensure API surface has not been modified`` () = ApiSurface.assertIdentical assembly
-
-    [<Test>]
-    let ``Check version against remote`` () =
-        MonotonicVersion.validate assembly "WoofWare.Myriad.Plugins.Attributes"
-
-    [<Test ; Explicit>]
-    let ``Update API surface`` () =
-        ApiSurface.writeAssemblyBaseline assembly
-
-    [<Test>]
-    let ``Ensure public API is fully documented`` () =
-        DocCoverage.assertFullyDocumented assembly

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

@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-
-        <IsPackable>false</IsPackable>
-        <IsTestProject>true</IsTestProject>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <Compile Include="TestSurface.fs" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="ApiSurface" Version="4.0.44" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
-        <PackageReference Include="NUnit" Version="4.1.0"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\WoofWare.Myriad.Plugins.Attributes.fsproj" />
-    </ItemGroup>
-
-</Project>

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

@@ -1,40 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Authors>Patrick Stevens</Authors>
-    <Copyright>Copyright (c) Patrick Stevens 2024</Copyright>
-    <Description>Attributes to accompany the WoofWare.Myriad.Plugins source generator, so that you need take no runtime dependencies to use them.</Description>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/Smaug123/WoofWare.Myriad</RepositoryUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageTags>myriad;fsharp;source-generator;source-gen;json</PackageTags>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarnOn>FS3559</WarnOn>
-    <PackageId>WoofWare.Myriad.Plugins.Attributes</PackageId>
-    <PackageIcon>logo.png</PackageIcon>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Attributes.fs"/>
-    <Compile Include="ArgParserAttributes.fs" />
-    <Compile Include="RestEase.fs" />
-    <EmbeddedResource Include="version.json"/>
-    <EmbeddedResource Include="SurfaceBaseline.txt"/>
-    <None Include="..\README.md">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-    <None Include="../WoofWare.Myriad.Plugins/logo.png">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.3.4"/>
-  </ItemGroup>
-
-</Project>

WoofWare.Myriad.Plugins.Attributes/version.json

@@ -1,15 +0,0 @@
-{
-  "version": "3.2",
-  "publicReleaseRefSpec": [
-    "^refs/heads/main$"
-  ],
-  "pathFilters": [
-    ":/README.md",
-    ":/LICENSE",
-    ":/WoofWare.Myriad.Plugins/logo.png",
-    ":/Directory.Build.props",
-    ":/global.json",
-    "./",
-    ":^Test"
-  ]
-}

WoofWare.Myriad.Plugins.Test/PureGymDtos.fs

@@ -58,7 +58,7 @@ module PureGymDtos =
         [
             """{"latitude": 1.0, "longitude": 3.0}""",
             {
-                GymLocation.Latitude = 1.0<measure>
+                GymLocation.Latitude = 1.0
                 Longitude = 3.0
             }
         ]
@@ -96,7 +96,7 @@ module PureGymDtos =
                 Location =
                     {
                         Longitude = -0.110252
-                        Latitude = 51.480401<measure>
+                        Latitude = 51.480401
                     }
                 TimeZone = "Europe/London"
                 ReopenDate = "2021-04-12T00:00:00+01 Europe/London"

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

@@ -1,343 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open System
-open System.Threading
-open NUnit.Framework
-open FsUnitTyped
-open ConsumePlugin
-open FsCheck
-
-[<TestFixture>]
-module TestArgParser =
-
-    [<TestCase true>]
-    [<TestCase false>]
-    let ``Positionals get parsed: they don't have to be strings`` (sep : bool) =
-        let getEnvVar (_ : string) = failwith "should not call"
-
-        let property
-            (fooSep : bool)
-            (barSep : bool)
-            (bazSep : bool)
-            (pos0 : int list)
-            (pos1 : int list)
-            (pos2 : int list)
-            (pos3 : int list)
-            (pos4 : int list)
-            =
-            let args =
-                [
-                    yield! pos0 |> List.map string<int>
-                    if fooSep then
-                        yield "--foo=3"
-                    else
-                        yield "--foo"
-                        yield "3"
-                    yield! pos1 |> List.map string<int>
-                    if barSep then
-                        yield "--bar=4"
-                    else
-                        yield "--bar"
-                        yield "4"
-                    yield! pos2 |> List.map string<int>
-                    if bazSep then
-                        yield "--baz=true"
-                    else
-                        yield "--baz"
-                        yield "true"
-                    yield! pos3 |> List.map string<int>
-                    if sep then
-                        yield "--"
-                    yield! pos4 |> List.map string<int>
-                ]
-
-            BasicWithIntPositionals.parse' getEnvVar args
-            |> shouldEqual
-                {
-                    Foo = 3
-                    Bar = "4"
-                    Baz = true
-                    Rest = pos0 @ pos1 @ pos2 @ pos3 @ pos4
-                }
-
-        Check.QuickThrowOnFailure property
-
-    [<Test>]
-    let ``Arg-like thing appearing before double dash`` () =
-        let envCalls = ref 0
-
-        let getEnvVar (_ : string) =
-            Interlocked.Increment envCalls |> ignore<int>
-            ""
-
-        let args = [ "--foo=3" ; "--non-existent" ; "--bar=4" ; "--baz=true" ]
-
-        let exc =
-            Assert.Throws<exn> (fun () -> Basic.parse' getEnvVar args |> ignore<Basic>)
-
-        envCalls.Value |> shouldEqual 0
-
-        exc.Message
-        |> shouldEqual
-            """Unable to process supplied arg --non-existent. Help text follows.
---foo  int32 : This is a foo!
---bar  string
---baz  bool
---rest  string (positional args) (can be repeated) : Here's where the rest of the args go"""
-
-    [<Test>]
-    let ``Can supply positional args with key`` () =
-        let envCalls = ref 0
-
-        let getEnvVar (_ : string) =
-            Interlocked.Increment envCalls |> ignore<int>
-            ""
-
-        let property (args : (int * bool) list) (afterDoubleDash : int list option) =
-            let flatArgs =
-                args
-                |> List.collect (fun (value, sep) ->
-                    if sep then
-                        [ $"--rest=%i{value}" ]
-                    else
-                        [ "--rest" ; string<int> value ]
-                )
-                |> fun l -> l @ [ "--foo=3" ; "--bar=4" ; "--baz=true" ]
-
-            let flatArgs, expected =
-                match afterDoubleDash with
-                | None -> flatArgs, List.map fst args
-                | Some rest -> flatArgs @ [ "--" ] @ (List.map string<int> rest), List.map fst args @ rest
-
-            BasicWithIntPositionals.parse' getEnvVar flatArgs
-            |> shouldEqual
-                {
-                    Foo = 3
-                    Bar = "4"
-                    Baz = true
-                    Rest = expected
-                }
-
-        Check.QuickThrowOnFailure property
-        envCalls.Value |> shouldEqual 0
-
-    [<Test>]
-    let ``Consume multiple occurrences of required arg`` () =
-        let envCalls = ref 0
-
-        let getEnvVar (_ : string) =
-            Interlocked.Increment envCalls |> ignore<int>
-            ""
-
-        let args = [ "--foo=3" ; "--rest" ; "7" ; "--bar=4" ; "--baz=true" ; "--rest=8" ]
-
-        let result = BasicNoPositionals.parse' getEnvVar args
-
-        envCalls.Value |> shouldEqual 0
-
-        result
-        |> shouldEqual
-            {
-                Foo = 3
-                Bar = "4"
-                Baz = true
-                Rest = [ 7 ; 8 ]
-            }
-
-    [<Test>]
-    let ``Gracefully handle invalid multiple occurrences of required arg`` () =
-        let envCalls = ref 0
-
-        let getEnvVar (_ : string) =
-            Interlocked.Increment envCalls |> ignore<int>
-            ""
-
-        let args = [ "--foo=3" ; "--foo" ; "9" ; "--bar=4" ; "--baz=true" ; "--baz=false" ]
-
-        let exc =
-            Assert.Throws<exn> (fun () -> Basic.parse' getEnvVar args |> ignore<Basic>)
-
-        envCalls.Value |> shouldEqual 0
-
-        exc.Message
-        |> shouldEqual
-            """Errors during parse!
-Argument '--foo' was supplied multiple times: 3 and 9
-Argument '--baz' was supplied multiple times: True and false"""
-
-    [<Test>]
-    let ``Args appearing after double dash are positional`` () =
-        let envCalls = ref 0
-
-        let getEnvVar (_ : string) =
-            Interlocked.Increment envCalls |> ignore<int>
-            ""
-
-        let args = [ "--" ; "--foo=3" ; "--bar=4" ; "--baz=true" ]
-
-        let exc =
-            Assert.Throws<exn> (fun () -> Basic.parse' getEnvVar args |> ignore<Basic>)
-
-        exc.Message
-        |> shouldEqual
-            """Errors during parse!
-Required argument '--foo' received no value
-Required argument '--bar' received no value
-Required argument '--baz' received no value"""
-
-        envCalls.Value |> shouldEqual 0
-
-    [<Test>]
-    let ``Help text`` () =
-        let getEnvVar (s : string) =
-            s |> shouldEqual "CONSUMEPLUGIN_THINGS"
-            "hi!"
-
-        let exc =
-            Assert.Throws<exn> (fun () -> Basic.parse' getEnvVar [ "--help" ] |> ignore<Basic>)
-
-        exc.Message
-        |> shouldEqual
-            """Help text requested.
---foo  int32 : This is a foo!
---bar  string
---baz  bool
---rest  string (positional args) (can be repeated) : Here's where the rest of the args go"""
-
-    [<Test>]
-    let ``Help text, with default values`` () =
-        let envVars = ref 0
-
-        let getEnvVar (_ : string) =
-            Interlocked.Increment envVars |> ignore<int>
-            ""
-
-        let exc =
-            Assert.Throws<exn> (fun () -> LoadsOfTypes.parse' getEnvVar [ "--help" ] |> ignore<LoadsOfTypes>)
-
-        exc.Message
-        |> shouldEqual
-            """Help text requested.
---foo  int32
---bar  string
---baz  bool
---some-file  FileInfo
---some-directory  DirectoryInfo
---some-list  DirectoryInfo (can be repeated)
---optional-thing-with-no-default  int32 (optional)
---optional-thing  bool (default value: True)
---another-optional-thing  int32 (default value: 3)
---yet-another-optional-thing  string (default value populated from env var CONSUMEPLUGIN_THINGS)
---positionals  int32 (positional args) (can be repeated)"""
-
-        envVars.Value |> shouldEqual 0
-
-    [<Test>]
-    let ``Default values`` () =
-        let getEnvVar (s : string) =
-            s |> shouldEqual "CONSUMEPLUGIN_THINGS"
-            "hi!"
-
-        let args =
-            [
-                "--foo"
-                "3"
-                "--bar=some string"
-                "--baz"
-                "--some-file=/path/to/file"
-                "--some-directory"
-                "/a/dir"
-                "--another-optional-thing"
-                "3000"
-            ]
-
-        let result = LoadsOfTypes.parse' getEnvVar args
-
-        result.OptionalThing |> shouldEqual (Choice2Of2 true)
-        result.OptionalThingWithNoDefault |> shouldEqual None
-        result.AnotherOptionalThing |> shouldEqual (Choice1Of2 3000)
-        result.YetAnotherOptionalThing |> shouldEqual (Choice2Of2 "hi!")
-
-    [<Test>]
-    let ``ParseExact and help`` () =
-        let count = ref 0
-
-        let getEnvVar (_ : string) =
-            Interlocked.Increment count |> ignore<int>
-            ""
-
-        let exc =
-            Assert.Throws<exn> (fun () -> DatesAndTimes.parse' getEnvVar [ "--help" ] |> ignore<DatesAndTimes>)
-
-        exc.Message
-        |> shouldEqual
-            @"Help text requested.
---plain  TimeSpan
---invariant  TimeSpan
---exact  TimeSpan : An exact time please [Parse format (.NET): hh\:mm\:ss]
---invariant-exact  TimeSpan : [Parse format (.NET): hh\:mm\:ss]"
-
-        count.Value |> shouldEqual 0
-
-    [<Test>]
-    let rec ``TimeSpans and their attributes`` () =
-        let count = ref 0
-
-        let getEnvVar (_ : string) =
-            Interlocked.Increment count |> ignore<int>
-            ""
-
-        let parsed =
-            DatesAndTimes.parse'
-                getEnvVar
-                [
-                    "--exact=11:34:00"
-                    "--plain=1"
-                    "--invariant=23:59"
-                    "--invariant-exact=23:59:00"
-                ]
-
-        parsed.Plain |> shouldEqual (TimeSpan (1, 0, 0, 0))
-        parsed.Invariant |> shouldEqual (TimeSpan (23, 59, 00))
-        parsed.Exact |> shouldEqual (TimeSpan (11, 34, 00))
-        parsed.InvariantExact |> shouldEqual (TimeSpan (23, 59, 00))
-
-        let exc =
-            Assert.Throws<exn> (fun () ->
-                DatesAndTimes.parse'
-                    getEnvVar
-                    [
-                        "--exact=11:34:00"
-                        "--plain=1"
-                        "--invariant=23:59"
-                        "--invariant-exact=23:59"
-                    ]
-                |> ignore<DatesAndTimes>
-            )
-
-        exc.Message
-        |> shouldEqual
-            """Errors during parse!
-Input string was not in a correct format. (at arg --invariant-exact=23:59)
-Required argument '--invariant-exact' received no value"""
-
-        let exc =
-            Assert.Throws<exn> (fun () ->
-                DatesAndTimes.parse'
-                    getEnvVar
-                    [
-                        "--exact=11:34"
-                        "--plain=1"
-                        "--invariant=23:59"
-                        "--invariant-exact=23:59:00"
-                    ]
-                |> ignore<DatesAndTimes>
-            )
-
-        exc.Message
-        |> shouldEqual
-            """Errors during parse!
-Input string was not in a correct format. (at arg --exact=11:34)
-Required argument '--exact' received no value"""
-
-        count.Value |> shouldEqual 0

WoofWare.Myriad.Plugins.Test/TestCataGenerator/TestCataGenerator.fs

@@ -1,47 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open System.Threading
-open NUnit.Framework
-open FsUnitTyped
-open ConsumePlugin
-open FsCheck
-
-[<TestFixture>]
-module TestCataGenerator =
-    let idCata<'a, 'b> : TreeCata<'a, 'b, _, _> =
-        {
-            Tree =
-                { new TreeCataCase<_, _, _, _> with
-                    member _.Const x y = Const (x, y)
-                    member _.Pair x y z = Pair (x, y, z)
-                    member _.Sequential xs = Sequential xs
-                    member _.Builder x b = Builder (x, b)
-                }
-            TreeBuilder =
-                { new TreeBuilderCataCase<_, _, _, _> with
-                    member _.Child x = Child x
-                    member _.Parent x = Parent x
-                }
-        }
-
-    [<Test>]
-    let ``Example`` () =
-        let x =
-            Tree.Pair (Tree.Const (Const.Verbatim 0, "hi"), Tree.Const (Const.String "", "bye"), PairOpKind.ThenDoSeq)
-
-        TreeCata.runTree idCata x |> shouldEqual x
-
-
-    [<Test>]
-    let ``Cata works`` () =
-        let builderCases = ref 0
-
-        let property (x : Tree<int, string>) =
-            match x with
-            | Tree.Builder _ -> Interlocked.Increment builderCases |> ignore
-            | _ -> ()
-
-            TreeCata.runTree idCata x = x
-
-        Check.QuickThrowOnFailure property
-        builderCases.Value |> shouldBeGreaterThan 10

WoofWare.Myriad.Plugins.Test/TestCataGenerator/TestDirectory.fs

@@ -1,37 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open NUnit.Framework
-open ConsumePlugin
-open FsCheck
-
-[<TestFixture>]
-module TestDirectory =
-    let idCata : FileSystemCata<_> =
-        {
-            FileSystemItem =
-                { new FileSystemItemCataCase<_> with
-                    member _.File file = FileSystemItem.File file
-
-                    member _.Directory name dirSize results =
-                        FileSystemItem.Directory
-                            {
-                                Name = name
-                                DirSize = dirSize
-                                Contents = results
-                            }
-                }
-
-        }
-
-    // Note: this file is preserved as an example of writing an identity cata.
-    // Don't add anything else to this file, because that will muddy the example.
-
-    [<Test>]
-    let ``Cata works`` () =
-        let property (x : FileSystemItem) =
-            FileSystemItemCata.runFileSystemItem idCata x = x
-
-        Check.QuickThrowOnFailure property
-
-// Note: this file is preserved as an example of writing an identity cata.
-// Don't add anything else to this file, because that will muddy the example.

WoofWare.Myriad.Plugins.Test/TestCataGenerator/TestGift.fs

@@ -1,99 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open NUnit.Framework
-open ConsumePlugin
-open FsCheck
-open FsUnitTyped
-
-[<TestFixture>]
-module TestGift =
-
-    let idCata : GiftCata<_> =
-        {
-            Gift =
-                { new GiftCataCase<_> with
-                    member _.Book b = Gift.Book b
-                    member _.Boxed g = Gift.Boxed g
-                    member _.Chocolate g = Gift.Chocolate g
-                    member _.WithACard g message = Gift.WithACard (g, message)
-                    member _.Wrapped g paper = Gift.Wrapped (g, paper)
-                }
-        }
-
-    let totalCostCata : GiftCata<_> =
-        {
-            Gift =
-                { new GiftCataCase<_> with
-                    member _.Book b = b.price
-                    member _.Boxed g = g + 1.0m
-                    member _.Chocolate c = c.price
-                    member _.WithACard g message = g + 2.0m
-                    member _.Wrapped g paper = g + 0.5m
-                }
-        }
-
-    let descriptionCata : GiftCata<_> =
-        {
-            Gift =
-                { new GiftCataCase<_> with
-                    member _.Book b = b.title
-                    member _.Boxed g = $"%s{g} in a box"
-                    member _.Chocolate c = $"%O{c} chocolate"
-
-                    member _.WithACard g message =
-                        $"%s{g} with a card saying '%s{message}'"
-
-                    member _.Wrapped g paper = $"%s{g} wrapped in %O{paper} paper"
-                }
-        }
-
-    [<Test>]
-    let ``Cata works`` () =
-        let property (x : Gift) = GiftCata.runGift idCata x = x
-
-        Check.QuickThrowOnFailure property
-
-    [<Test>]
-    let ``Example from docs`` () =
-        let wolfHall =
-            {
-                title = "Wolf Hall"
-                price = 20m
-            }
-
-        let yummyChoc =
-            {
-                chocType = SeventyPercent
-                price = 5m
-            }
-
-        let birthdayPresent =
-            WithACard (Wrapped (Book wolfHall, HappyBirthday), "Happy Birthday")
-
-        let christmasPresent = Wrapped (Boxed (Chocolate yummyChoc), HappyHolidays)
-
-        GiftCata.runGift totalCostCata birthdayPresent |> shouldEqual 22.5m
-
-        GiftCata.runGift descriptionCata christmasPresent
-        |> shouldEqual "SeventyPercent chocolate in a box wrapped in HappyHolidays paper"
-
-        let deeplyNestedBox depth =
-            let rec loop depth boxSoFar =
-                match depth with
-                | 0 -> boxSoFar
-                | n -> loop (n - 1) (Boxed boxSoFar)
-
-            loop depth (Book wolfHall)
-
-        deeplyNestedBox 10 |> GiftCata.runGift totalCostCata |> shouldEqual 30.0M
-        deeplyNestedBox 100 |> GiftCata.runGift totalCostCata |> shouldEqual 120.0M
-        deeplyNestedBox 1000 |> GiftCata.runGift totalCostCata |> shouldEqual 1020.0M
-        deeplyNestedBox 10000 |> GiftCata.runGift totalCostCata |> shouldEqual 10020.0M
-
-        deeplyNestedBox 100000
-        |> GiftCata.runGift totalCostCata
-        |> shouldEqual 100020.0M
-
-        deeplyNestedBox 1000000
-        |> GiftCata.runGift totalCostCata
-        |> shouldEqual 1000020.0M

WoofWare.Myriad.Plugins.Test/TestCataGenerator/TestMyList.fs

@@ -1,77 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open NUnit.Framework
-open FsCheck
-open FsUnitTyped
-open ConsumePlugin
-
-[<TestFixture>]
-module TestMyList =
-
-    let idCata<'a> : MyListCata<'a, _> =
-        {
-            MyList =
-                { new MyListCataCase<'a, _> with
-                    member _.Nil = MyList.Nil
-
-                    member _.Cons head tail =
-                        MyList.Cons
-                            {
-                                Head = head
-                                Tail = tail
-                            }
-                }
-        }
-
-    [<Test>]
-    let ``Cata works`` () =
-        let property (x : MyList<int>) = MyListCata.runMyList idCata x = x
-
-        Check.QuickThrowOnFailure property
-
-    let toListCata<'a> =
-        {
-            MyList =
-                { new MyListCataCase<'a, 'a list> with
-                    member _.Nil = []
-                    member _.Cons (head : 'a) (tail : 'a list) = head :: tail
-                }
-        }
-
-    let toListViaCata<'a> (l : MyList<'a>) : 'a list = MyListCata.runMyList toListCata l
-
-
-    [<Test>]
-    let ``Example of a fold converting to a new data structure`` () =
-        let rec toListNaive (l : MyList<int>) : int list =
-            match l with
-            | MyList.Nil -> []
-            | MyList.Cons consCell -> consCell.Head :: toListNaive consCell.Tail
-
-        Check.QuickThrowOnFailure (fun l -> toListNaive l = toListViaCata l)
-
-    [<Test>]
-    let ``Example of equivalence with FoldBack`` () =
-        let baseCase = 0L
-        let atLeaf (head : int) (tail : int64) : int64 = int64 head + tail
-
-        let sumCata =
-            {
-                MyList =
-                    { new MyListCataCase<int, int64> with
-                        member _.Nil = baseCase
-                        member _.Cons (head : int) (tail : int64) = atLeaf head tail
-                    }
-            }
-
-        let viaCata (l : MyList<int>) : int64 = MyListCata.runMyList sumCata l
-
-        let viaFold (l : MyList<int>) : int64 =
-            // choose your favourite "to list" method - here I use the cata
-            // but that could have been done naively
-            (toListViaCata l, baseCase)
-            ||> List.foldBack (fun elt state -> atLeaf elt state)
-
-        let property (l : MyList<int>) = viaCata l = viaFold l
-
-        Check.QuickThrowOnFailure property

WoofWare.Myriad.Plugins.Test/TestCataGenerator/TestMyList2.fs

@@ -1,25 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open NUnit.Framework
-open FsCheck
-open FsUnitTyped
-open ConsumePlugin
-
-[<TestFixture>]
-module TestMyList2 =
-
-    let idCata<'a> : MyList2Cata<'a, _> =
-        {
-            MyList2 =
-                { new MyList2CataCase<'a, _> with
-                    member _.Nil = MyList2.Nil
-
-                    member _.Cons (head : 'a) (tail : MyList2<'a>) = MyList2.Cons (head, tail)
-                }
-        }
-
-    [<Test>]
-    let ``Cata works`` () =
-        let property (x : MyList2<int>) = MyList2Cata.runMyList2 idCata x = x
-
-        Check.QuickThrowOnFailure property

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

@@ -4,6 +4,7 @@ open System
 open System.IO
 open System.Net
 open System.Net.Http
+open System.Text.Json.Nodes
 open NUnit.Framework
 open PureGym
 open FsUnitTyped
@@ -102,87 +103,3 @@ module TestBodyParam =
         let buf = Array.zeroCreate 10
         let written = observedContent.ReadAtLeast (buf.AsSpan (), 5, false)
         buf |> Array.take written |> shouldEqual contents
-
-    [<Test>]
-    let ``Body param of serialised thing`` () =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Post
-                let! content = message.Content.ReadAsStringAsync () |> Async.AwaitTask
-                let content = new StringContent ("Done! " + content)
-                let resp = new HttpResponseMessage (HttpStatusCode.OK)
-                resp.Content <- content
-                return resp
-            }
-
-        use client = HttpClientMock.make (Uri "https://example.com") proc
-        let api = PureGymApi.make client
-
-        let expected =
-            {
-                Id = 3
-                CompoundMemberId = "compound!"
-                FirstName = "Patrick"
-                LastName = "Stevens"
-                HomeGymId = 100
-                HomeGymName = "Big Boy Gym"
-                EmailAddress = "woof@ware"
-                GymAccessPin = "l3tm31n"
-                // To the reader: what's the significance of this date?
-                // answer rot13: ghevatpbzchgnovyvglragfpurvqhatfceboyrzcncre
-                DateOfBirth = DateOnly (1936, 05, 28)
-                MobileNumber = "+44-GHOST-BUSTERS"
-                Postcode = "W1A 111"
-                MembershipName = "mario"
-                MembershipLevel = 4
-                SuspendedReason = 1090
-                MemberStatus = -3
-            }
-
-        let result = api.CreateUserSerialisedBody(expected).Result
-
-        result.StartsWith ("Done! ", StringComparison.Ordinal) |> shouldEqual true
-        let result = result.[6..]
-
-        result
-        |> System.Text.Json.Nodes.JsonNode.Parse
-        |> PureGym.Member.jsonParse
-        |> shouldEqual expected
-
-    [<Test>]
-    let ``Body param of primitive: int`` () =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Post
-                let! content = message.Content.ReadAsStringAsync () |> Async.AwaitTask
-                let content = new StringContent ("Done! " + content)
-                let resp = new HttpResponseMessage (HttpStatusCode.OK)
-                resp.Content <- content
-                return resp
-            }
-
-        use client = HttpClientMock.make (Uri "https://example.com") proc
-        let api = PureGymApi.make client
-
-        let result = api.CreateUserSerialisedIntBody(3).Result
-
-        result |> shouldEqual "Done! 3"
-
-    [<Test>]
-    let ``Body param of primitive: Uri`` () =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Post
-                let! content = message.Content.ReadAsStringAsync () |> Async.AwaitTask
-                let content = new StringContent ("Done! " + content)
-                let resp = new HttpResponseMessage (HttpStatusCode.OK)
-                resp.Content <- content
-                return resp
-            }
-
-        use client = HttpClientMock.make (Uri "https://example.com") proc
-        let api = PureGymApi.make client
-
-        let result = api.CreateUserSerialisedUrlBody(Uri "https://mything.com/blah").Result
-
-        result |> shouldEqual "Done! \"https://mything.com/blah\""

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

@@ -89,7 +89,6 @@ module TestPureGymRestApi =
         let api = PureGymApi.make client
 
         api.GetGymAttendance(requestedGym).Result |> shouldEqual expected
-        api.GetGymAttendance'(requestedGym).Result |> shouldEqual expected
 
     let memberCases =
         PureGymDtos.memberCases |> List.allPairs baseUris |> List.map TestCaseData
@@ -210,7 +209,10 @@ module TestPureGymRestApi =
 
     [<TestCaseSource(nameof sessionsCases)>]
     let ``Test GetSessions``
-        (baseUri : Uri, (startDate : DateOnly, (endDate : DateOnly, (json : string, expected : Sessions))))
+        (
+            baseUri : Uri,
+            (startDate : DateOnly, (endDate : DateOnly, (json : string, expected : Sessions)))
+        )
         =
         let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
             async {
@@ -235,33 +237,6 @@ module TestPureGymRestApi =
 
         api.GetSessions(startDate, endDate).Result |> shouldEqual expected
 
-    [<TestCaseSource(nameof sessionsCases)>]
-    let ``Test GetSessionsWithQuery``
-        (baseUri : Uri, (startDate : DateOnly, (endDate : DateOnly, (json : string, expected : Sessions))))
-        =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Get
-
-                // This one is specified as being absolute, in its attribute on the IPureGymApi type
-                let expectedUri =
-                    let fromDate = dateOnlyToString startDate
-                    let toDate = dateOnlyToString endDate
-                    $"https://example.com/v2/gymSessions/member?foo=1&fromDate=%s{fromDate}&toDate=%s{toDate}"
-
-                message.RequestUri.ToString () |> shouldEqual expectedUri
-
-                let content = new StringContent (json)
-                let resp = new HttpResponseMessage (HttpStatusCode.OK)
-                resp.Content <- content
-                return resp
-            }
-
-        use client = HttpClientMock.make baseUri proc
-        let api = PureGymApi.make client
-
-        api.GetSessionsWithQuery(startDate, endDate).Result |> shouldEqual expected
-
     [<Test>]
     let ``URI example`` () =
         let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
@@ -285,37 +260,3 @@ module TestPureGymRestApi =
         uri.ToString () |> shouldEqual "https://patrick@en.wikipedia.org/wiki/foo"
         uri.UserInfo |> shouldEqual "patrick"
         uri.Host |> shouldEqual "en.wikipedia.org"
-
-    [<TestCase false>]
-    [<TestCase true>]
-    let ``Map<string, string> option example`` (isSome : bool) =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Post
-
-                message.RequestUri.ToString () |> shouldEqual "https://whatnot.com/some/url"
-                let! content = message.Content.ReadAsStringAsync () |> Async.AwaitTask
-
-                if isSome then
-                    content |> shouldEqual """{"hi":"bye"}"""
-                else
-                    content |> shouldEqual "null"
-
-                let content = new StringContent (content)
-
-                let resp = new HttpResponseMessage (HttpStatusCode.OK)
-                resp.Content <- content
-                return resp
-            }
-
-        use client = HttpClientMock.makeNoUri proc
-        let api = PureGymApi.make client
-
-        let expected =
-            if isSome then
-                [ "hi", "bye" ] |> Map.ofList |> Some
-            else
-                None
-
-        let actual = api.PostStringToString(expected).Result
-        actual |> shouldEqual expected

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

@@ -1,108 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open System
-open System.Net
-open System.Net.Http
-open System.Threading
-open NUnit.Framework
-open FsUnitTyped
-open PureGym
-
-[<TestFixture>]
-module TestVariableHeader =
-
-    [<Test>]
-    let ``Headers are set`` () : unit =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Get
-
-                message.RequestUri.ToString ()
-                |> shouldEqual "https://example.com/endpoint/param"
-
-                let headers =
-                    [
-                        for h in message.Headers do
-                            yield $"%s{h.Key}: %s{Seq.exactlyOne h.Value}"
-                    ]
-                    |> String.concat "\n"
-
-                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 someHeaderCount = ref 10
-
-        let someHeader () =
-            (Interlocked.Increment someHeaderCount : int).ToString ()
-
-        let someOtherHeaderCount = ref -100
-
-        let someOtherHeader () =
-            Interlocked.Increment someOtherHeaderCount
-
-        let api = ApiWithHeaders.make someHeader someOtherHeader client
-
-        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" |]
-
-        someHeaderCount.Value |> shouldEqual 11
-        someOtherHeaderCount.Value |> shouldEqual -99
-
-    [<Test>]
-    let ``Headers get re-evaluated every time`` () : unit =
-        let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
-            async {
-                message.Method |> shouldEqual HttpMethod.Get
-
-                message.RequestUri.ToString ()
-                |> shouldEqual "https://example.com/endpoint/param"
-
-                let headers =
-                    [
-                        for h in message.Headers do
-                            yield $"%s{h.Key}: %s{Seq.exactlyOne h.Value}"
-                    ]
-                    |> String.concat "\n"
-
-                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 someHeaderCount = ref 10
-
-        let someHeader () =
-            (Interlocked.Increment someHeaderCount : int).ToString ()
-
-        let someOtherHeaderCount = ref -100
-
-        let someOtherHeader () =
-            Interlocked.Increment someOtherHeaderCount
-
-        let api = ApiWithHeaders.make someHeader someOtherHeader client
-
-        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" |]
-
-        api.GetPathParam("param").Result.Split "\n"
-        |> Array.sort
-        |> shouldEqual [| "Authorization: -98" ; "Header-Name: Header-Value" ; "X-Foo: 12" |]
-
-        someHeaderCount.Value |> shouldEqual 12
-        someOtherHeaderCount.Value |> shouldEqual -98

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

@@ -87,10 +87,8 @@ module TestVaultClient =
     }
 }"""
 
-    [<TestCase 1>]
-    [<TestCase 2>]
-    [<TestCase 3>]
-    let ``URI example`` (vaultClientId : int) =
+    [<Test>]
+    let ``URI example`` () =
         let proc (message : HttpRequestMessage) : HttpResponseMessage Async =
             async {
                 message.Method |> shouldEqual HttpMethod.Get
@@ -114,25 +112,10 @@ module TestVaultClient =
             }
 
         use client = HttpClientMock.make (Uri "https://my-vault.com") proc
-
-        let value =
-            match vaultClientId with
-            | 1 ->
         let api = VaultClient.make client
+
         let vaultResponse = api.GetJwt("role", "jwt").Result
         let value = api.GetSecret(vaultResponse, "path", "mount").Result
-                value
-            | 2 ->
-                let api = VaultClientNonExtensionMethod.make client
-                let vaultResponse = api.GetJwt("role", "jwt").Result
-                let value = api.GetSecret(vaultResponse, "path", "mount").Result
-                value
-            | 3 ->
-                let api = VaultClientExtensionMethod.make client
-                let vaultResponse = api.GetJwt("role", "jwt").Result
-                let value = api.GetSecret(vaultResponse, "path", "mount").Result
-                value
-            | _ -> failwith $"Unrecognised ID: %i{vaultClientId}"
 
         value.Data
         |> Seq.toList
@@ -185,5 +168,3 @@ module TestVaultClient =
                 "key8_1", "https://example.com/data8/1"
                 "key8_2", "https://example.com/data8/2"
             ]
-
-    let _canSeePastExtensionMethod = VaultClientExtensionMethod.thisClashes

WoofWare.Myriad.Plugins.Test/TestJsonParse/TestExtensionMethod.fs

@@ -1,7 +1,6 @@
 namespace WoofWare.Myriad.Plugins.Test
 
 open System
-open System.Numerics
 open System.Text.Json.Nodes
 open ConsumePlugin
 open NUnit.Framework
@@ -13,62 +12,15 @@ module TestExtensionMethod =
     [<Test>]
     let ``Parse via extension method`` () =
         let json =
-            """{
-    "alpha": "hello!",
-    "bravo": "https://example.com",
-    "charlie": 0.3341,
-    "delta": 110033.4,
-    "echo": -0.000993,
-    "foxtrot": -999999999999,
-    "golf": -123456789101112,
-    "hotel": 18446744073709551615,
-    "india": 99884,
-    "juliette": 12223334,
-    "kilo": -2147483642,
-    "lima": 4294967293,
-    "mike": -32767,
-    "november": 65533,
-    "oscar": -125,
-    "papa": 253,
-    "quebec": 254,
-    "tango": -3,
-    "uniform": 1004443.300988393349583009,
-    "victor": "x",
-    "whiskey": 123456123456123456123456123456123456123456
-}"""
+            """{"tinker": "job", "tailor": 3, "soldier": "https://example.com", "sailor": 3.1}"""
             |> JsonNode.Parse
 
         let expected =
             {
-                Alpha = "hello!"
-                Bravo = Uri "https://example.com"
-                Charlie = 0.3341
-                Delta = 110033.4f
-                Echo = -0.000993f
-                Foxtrot = -999999999999.0
-                Golf = -123456789101112L
-                Hotel = 18446744073709551615UL
-                India = 99884
-                Juliette = 12223334u
-                Kilo = -2147483642
-                Lima = 4294967293u
-                Mike = -32767s
-                November = 65533us
-                Oscar = -125y
-                Papa = 253uy
-                Quebec = 254uy
-                Tango = -3y
-                Uniform = 1004443.300988393349583009m
-                Victor = 'x'
-                Whiskey =
-                    let mutable i = BigInteger 0
-
-                    for _ = 0 to 6 do
-                        i <- i * BigInteger 1000000 + BigInteger 123456
-
-                    i
+                Tinker = "job"
+                Tailor = 3
+                Soldier = Uri "https://example.com"
+                Sailor = 3.1
             }
 
-        let actual = ToGetExtensionMethod.jsonParse json
-
-        actual |> shouldEqual expected
+        ToGetExtensionMethod.jsonParse json |> shouldEqual expected

WoofWare.Myriad.Plugins.Test/TestJsonParse/TestJsonParse.fs

@@ -7,8 +7,6 @@ open FsUnitTyped
 
 [<TestFixture>]
 module TestJsonParse =
-    let _canSeePastExtensionMethod = ToGetExtensionMethod.thisModuleWouldClash
-
     [<Test>]
     let ``Single example`` () =
         let s =
@@ -49,15 +47,3 @@ module TestJsonParse =
 
         let actual = s |> JsonNode.Parse |> InnerType.jsonParse
         actual |> shouldEqual expected
-
-    [<TestCase("thing", SomeEnum.Thing)>]
-    [<TestCase("Thing", SomeEnum.Thing)>]
-    [<TestCase("THING", SomeEnum.Thing)>]
-    [<TestCase("blah", SomeEnum.Blah)>]
-    [<TestCase("Blah", SomeEnum.Blah)>]
-    [<TestCase("BLAH", SomeEnum.Blah)>]
-    let ``Can deserialise enum`` (str : string, expected : SomeEnum) =
-        sprintf "\"%s\"" str
-        |> JsonNode.Parse
-        |> SomeEnum.jsonParse
-        |> shouldEqual expected

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

@@ -1,308 +0,0 @@
-namespace WoofWare.Myriad.Plugins.Test
-
-open System
-open System.Collections.Generic
-open System.Text.Json.Nodes
-open FsCheck.Random
-open Microsoft.FSharp.Reflection
-open NUnit.Framework
-open FsCheck
-open FsUnitTyped
-open ConsumePlugin
-
-[<TestFixture>]
-module TestJsonSerde =
-
-    let uriGen : Gen<Uri> =
-        gen {
-            let! suffix = Arb.generate<int>
-            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 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>>
-                else
-                    Gen.constant []
-
-            let concreteDictKeys =
-                concreteDictKeys
-                |> List.map _.Get
-                |> List.distinct
-                |> fun x -> List.take (min 3 x.Length) x
-
-            let! concreteDictValues =
-                if count > 0 then
-                    Gen.listOfLength concreteDictKeys.Length (innerGen (count - 1))
-                else
-                    Gen.constant []
-
-            let concreteDict =
-                List.zip concreteDictKeys concreteDictValues
-                |> List.map KeyValuePair
-                |> Dictionary
-
-            let! readOnlyDictKeys = Gen.listOf Arb.generate<NonNull<string>>
-            let readOnlyDictKeys = readOnlyDictKeys |> List.map _.Get |> List.distinct
-            let! readOnlyDictValues = Gen.listOfLength readOnlyDictKeys.Length (Gen.listOf Arb.generate<char>)
-            let readOnlyDict = List.zip readOnlyDictKeys readOnlyDictValues |> readOnlyDict
-
-            let! dictKeys = Gen.listOf uriGen
-            let! dictValues = Gen.listOfLength dictKeys.Length Arb.generate<bool>
-            let dict = List.zip dictKeys dictValues |> dict
-
-            return
-                {
-                    Thing = guid
-                    Map = map
-                    ReadOnlyDict = readOnlyDict
-                    Dict = dict
-                    ConcreteDict = concreteDict
-                }
-        }
-
-    let outerGen : Gen<JsonRecordTypeWithBoth> =
-        gen {
-            let! a = Arb.generate<int>
-            let! b = Arb.generate<NonNull<string>>
-            let! c = Gen.listOf Arb.generate<int>
-            let! depth = Gen.choose (0, 2)
-            let! d = innerGen depth
-            let! e = Gen.arrayOf Arb.generate<NonNull<string>>
-            let! arr = Gen.arrayOf Arb.generate<int>
-            let! byte = Arb.generate
-            let! sbyte = Arb.generate
-            let! i = Arb.generate
-            let! i32 = Arb.generate
-            let! i64 = Arb.generate
-            let! u = Arb.generate
-            let! u32 = Arb.generate
-            let! u64 = Arb.generate
-            let! f = Arb.generate |> Gen.filter (fun s -> Double.IsFinite (s / 1.0<measure>))
-            let! f32 = Arb.generate |> Gen.filter (fun s -> Single.IsFinite (s / 1.0f<measure>))
-            let! single = Arb.generate |> Gen.filter (fun s -> Single.IsFinite (s / 1.0f<measure>))
-            let! intMeasureOption = Arb.generate
-            let! intMeasureNullable = Arb.generate
-            let! someEnum = Gen.choose (0, 1)
-            let! timestamp = Arb.generate
-
-            return
-                {
-                    A = a
-                    B = b.Get
-                    C = c
-                    D = d
-                    E = e |> Array.map _.Get
-                    Arr = arr
-                    Byte = byte
-                    Sbyte = sbyte
-                    I = i
-                    I32 = i32
-                    I64 = i64
-                    U = u
-                    U32 = u32
-                    U64 = u64
-                    F = f
-                    F32 = f32
-                    Single = single
-                    IntMeasureOption = intMeasureOption
-                    IntMeasureNullable = intMeasureNullable
-                    Enum = enum<SomeEnum> someEnum
-                    Timestamp = timestamp
-                }
-        }
-
-    [<Test>]
-    let ``It just works`` () =
-        let property (o : JsonRecordTypeWithBoth) : bool =
-            o
-            |> JsonRecordTypeWithBoth.toJsonNode
-            |> fun s -> s.ToJsonString ()
-            |> JsonNode.Parse
-            |> JsonRecordTypeWithBoth.jsonParse
-            |> shouldEqual o
-
-            true
-
-        property |> Prop.forAll (Arb.fromGen outerGen) |> Check.QuickThrowOnFailure
-
-    [<Test>]
-    let ``Single example of big record`` () =
-        let guid = Guid.Parse "dfe24db5-9f8d-447b-8463-4c0bcf1166d5"
-
-        let data =
-            {
-                A = 3
-                B = "hello!"
-                C = [ 1 ; -9 ]
-                D =
-                    {
-                        Thing = guid
-                        Map = Map.ofList []
-                        ReadOnlyDict = readOnlyDict []
-                        Dict = dict []
-                        ConcreteDict = Dictionary ()
-                    }
-                E = [| "I'm-a-string" |]
-                Arr = [| -18883 ; 9100 |]
-                Byte = 87uy<measure>
-                Sbyte = 89y<measure>
-                I = 199993345<measure>
-                I32 = -485832<measure>
-                I64 = -13458625689L<measure>
-                U = 458582u<measure>
-                U32 = 857362147u<measure>
-                U64 = 1234567892123414596UL<measure>
-                F = 8833345667.1<measure>
-                F32 = 1000.98f<measure>
-                Single = 0.334f<measure>
-                IntMeasureOption = Some 981<measure>
-                IntMeasureNullable = Nullable -883<measure>
-                Enum = enum<SomeEnum> 1
-                Timestamp = DateTimeOffset (2024, 07, 01, 17, 54, 00, TimeSpan.FromHours 1.0)
-            }
-
-        let expected =
-            """{
-    "a": 3,
-    "b": "hello!",
-    "c": [1, -9],
-    "d": {
-      "it\u0027s-a-me": "dfe24db5-9f8d-447b-8463-4c0bcf1166d5",
-      "map": {},
-      "readOnlyDict": {},
-      "dict": {},
-      "concreteDict": {}
-    },
-    "e": ["I\u0027m-a-string"],
-    "arr": [-18883, 9100],
-    "byte": 87,
-    "sbyte": 89,
-    "i": 199993345,
-    "i32": -485832,
-    "i64": -13458625689,
-    "u": 458582,
-    "u32": 857362147,
-    "u64": 1234567892123414596,
-    "f": 8833345667.1,
-    "f32": 1000.98,
-    "single": 0.334,
-    "intMeasureOption": 981,
-    "intMeasureNullable": -883,
-    "enum": 1,
-    "timestamp": "2024-07-01T17:54:00.0000000\u002B01:00"
-}
-"""
-            |> fun s -> s.ToCharArray ()
-            |> Array.filter (fun c -> not (Char.IsWhiteSpace c))
-            |> fun s -> new String (s)
-
-        JsonRecordTypeWithBoth.toJsonNode(data).ToJsonString () |> shouldEqual expected
-        JsonRecordTypeWithBoth.jsonParse (JsonNode.Parse expected) |> shouldEqual data
-
-    [<Test>]
-    let ``Guids are treated just like strings`` () =
-        let guidStr = "b1e7496e-6e79-4158-8579-a01de355d3b2"
-        let guid = Guid.Parse guidStr
-
-        let node =
-            {
-                Thing = guid
-                Map = Map.empty
-                ReadOnlyDict = readOnlyDict []
-                Dict = dict []
-                ConcreteDict = Dictionary ()
-            }
-            |> InnerTypeWithBoth.toJsonNode
-
-        node.ToJsonString ()
-        |> shouldEqual (
-            sprintf """{"it\u0027s-a-me":"%s","map":{},"readOnlyDict":{},"dict":{},"concreteDict":{}}""" guidStr
-        )
-
-    type Generators =
-        static member TestCase () =
-            { new Arbitrary<InnerTypeWithBoth>() with
-                override x.Generator = innerGen 5
-            }
-
-    let sanitiseInner (r : InnerTypeWithBoth) : InnerTypeWithBoth =
-        {
-            Thing = r.Thing
-            Map = r.Map
-            ReadOnlyDict = r.ReadOnlyDict
-            Dict = r.Dict
-            ConcreteDict = r.ConcreteDict
-        }
-
-    let sanitiseRec (r : JsonRecordTypeWithBoth) : JsonRecordTypeWithBoth =
-        { r with
-            B = if isNull r.B then "<null>" else r.B
-            C =
-                if Object.ReferenceEquals (r.C, (null : obj)) then
-                    []
-                else
-                    r.C
-            D = sanitiseInner r.D
-            E = if isNull r.E then [||] else r.E
-            Arr =
-                if Object.ReferenceEquals (r.Arr, (null : obj)) then
-                    [||]
-                else
-                    r.Arr
-        }
-
-    let duGen =
-        gen {
-            let! case = Gen.choose (0, 2)
-
-            match case with
-            | 0 -> return FirstDu.EmptyCase
-            | 1 ->
-                let! s = Arb.generate<NonNull<string>>
-                return FirstDu.Case1 s.Get
-            | 2 ->
-                let! i = Arb.generate<int>
-                let! record = outerGen
-                return FirstDu.Case2 (record, i)
-            | _ -> return failwith $"unexpected: %i{case}"
-        }
-
-    [<Test>]
-    let ``Discriminated union works`` () =
-        let property (du : FirstDu) : unit =
-            du
-            |> FirstDu.toJsonNode
-            |> fun s -> s.ToJsonString ()
-            |> JsonNode.Parse
-            |> FirstDu.jsonParse
-            |> shouldEqual du
-
-        property |> Prop.forAll (Arb.fromGen duGen) |> Check.QuickThrowOnFailure
-
-    [<Test>]
-    let ``DU generator covers all cases`` () =
-        let rand = Random ()
-        let cases = FSharpType.GetUnionCases typeof<FirstDu>
-        let counts = Array.zeroCreate<int> cases.Length
-
-        let decompose = FSharpValue.PreComputeUnionTagReader typeof<FirstDu>
-
-        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 tag = decompose du
-            counts.[tag] <- counts.[tag] + 1
-            i <- i + 1
-
-        for i in counts do
-            i |> shouldBeGreaterThan 0

WoofWare.Myriad.Plugins.Test/TestSurface.fs

@@ -6,14 +6,13 @@ open ApiSurface
 
 [<TestFixture>]
 module TestSurface =
-    let assembly = typeof<RemoveOptionsGenerator>.Assembly
+    let assembly = typeof<RemoveOptionsAttribute>.Assembly
 
     [<Test>]
     let ``Ensure API surface has not been modified`` () = ApiSurface.assertIdentical assembly
 
     [<Test>]
-    // https://github.com/nunit/nunit3-vs-adapter/issues/876
-    let CheckVersionAgainstRemote () =
+    let ``Check version against remote`` () =
         MonotonicVersion.validate assembly "WoofWare.Myriad.Plugins"
 
     [<Test ; Explicit>]

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

@@ -19,27 +19,20 @@
     <Compile Include="TestHttpClient\TestBasePath.fs" />
     <Compile Include="TestHttpClient\TestBodyParam.fs" />
     <Compile Include="TestHttpClient\TestVaultClient.fs" />
-    <Compile Include="TestHttpClient\TestVariableHeader.fs" />
     <Compile Include="TestMockGenerator\TestMockGenerator.fs" />
-    <Compile Include="TestJsonSerialize\TestJsonSerde.fs" />
-    <Compile Include="TestCataGenerator\TestCataGenerator.fs" />
-    <Compile Include="TestCataGenerator\TestDirectory.fs" />
-    <Compile Include="TestCataGenerator\TestGift.fs" />
-    <Compile Include="TestCataGenerator\TestMyList.fs" />
-    <Compile Include="TestCataGenerator\TestMyList2.fs" />
-    <Compile Include="TestArgParser\TestArgParser.fs" />
     <Compile Include="TestRemoveOptions.fs"/>
     <Compile Include="TestSurface.fs"/>
-    <None Include="../.github/workflows/dotnet.yaml" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ApiSurface" Version="4.0.44"/>
+    <PackageReference Include="ApiSurface" Version="4.0.25"/>
     <PackageReference Include="FsCheck" Version="2.16.6"/>
     <PackageReference Include="FsUnit" Version="6.0.0"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
-    <PackageReference Include="NUnit" Version="4.1.0"/>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+    <PackageReference Include="NUnit" Version="4.0.1"/>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
+    <PackageReference Include="NUnit.Analyzers" Version="3.10.0"/>
+    <PackageReference Include="coverlet.collector" Version="6.0.0"/>
   </ItemGroup>
 
   <ItemGroup>

WoofWare.Myriad.Plugins/AstHelper.fs

@@ -1,8 +1,10 @@
 namespace WoofWare.Myriad.Plugins
 
 open Fantomas.FCS.Syntax
+open Fantomas.FCS.SyntaxTrivia
 open Fantomas.FCS.Text.Range
 open Fantomas.FCS.Xml
+open Myriad.Core.AstExtensions
 
 type internal ParameterInfo =
     {
@@ -31,30 +33,11 @@ type internal MemberInfo =
         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
     }
@@ -62,97 +45,93 @@ type internal InterfaceType =
 type internal RecordType =
     {
         Name : Ident
-        Fields : SynField list
-        /// Any additional members which are not record fields.
+        Fields : SynField seq
         Members : SynMemberDefns option
         XmlDoc : PreXmlDoc option
         Generics : SynTyparDecls option
         Accessibility : SynAccess option
-        Attributes : SynAttribute list
-    }
-
-    /// Parse from the AST.
-    static member OfRecord (record : SynTypeDefn) : RecordType =
-        let sci, sdr, smd, smdo =
-            match record with
-            | SynTypeDefn.SynTypeDefn (sci, sdr, smd, smdo, _, _) -> sci, sdr, smd, smdo
-
-        let synAccessOption, recordFields =
-            match sdr with
-            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (sa, fields, _), _) -> sa, fields
-            | _ -> failwith $"expected a record; got: %+A{record}"
-
-        match sci with
-        | SynComponentInfo.SynComponentInfo (attrs, typars, _, longId, doc, _, access, _) ->
-            if access <> synAccessOption then
-                failwith
-                    $"TODO what's happened, two different accessibility modifiers: %O{access} and %O{synAccessOption}"
-
-            match smdo with
-            | Some v -> failwith $"TODO what's happened, got a synMemberDefn of %O{v}"
-            | None -> ()
-
-            {
-                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
-                Accessibility = synAccessOption
-                Attributes = attrs |> List.collect (fun l -> l.Attributes)
-            }
-
-/// Anything that is part of an ADT.
-/// A record is a product of stuff; this type represents one of those stuffs.
-type internal AdtNode =
-    {
-        Type : SynType
-        Name : Ident option
-        /// An ordered list, so you can look up any given generic within `this.Type`
-        /// to discover what its index is in the parent DU which defined it.
-        GenericsOfParent : SynTyparDecl list
-    }
-
-/// A DU is a sum of products (e.g. `type Thing = Foo of a * b`);
-/// similarly a record is a product.
-/// This type represents a product in that sense.
-type internal AdtProduct =
-    {
-        Name : SynIdent
-        Fields : AdtNode list
-        /// This AdtProduct represents a product in which there might be
-        /// some bound type parameters. This field lists the bound
-        /// type parameters in the order they appeared on the parent type.
-        Generics : SynTyparDecl list
     }
 
 [<RequireQualifiedAccess>]
 module internal AstHelper =
 
-    let isEnum (SynTypeDefn.SynTypeDefn (_, repr, _, _, _, _)) : bool =
-        match repr with
-        | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Enum _, _) -> true
-        | _ -> false
-
-    let instantiateRecord (fields : (SynLongIdent * SynExpr) list) : SynExpr =
+    let instantiateRecord (fields : (RecordFieldName * SynExpr option) list) : SynExpr =
         let fields =
             fields
-            |> List.map (fun (rfn, synExpr) -> SynExprRecordField ((rfn, true), Some range0, Some synExpr, None))
+            |> List.map (fun (rfn, synExpr) -> SynExprRecordField (rfn, Some range0, synExpr, None))
 
         SynExpr.Record (None, None, fields, range0)
 
     let defineRecordType (record : RecordType) : SynTypeDefn =
-        let name =
-            SynComponentInfo.create record.Name
-            |> SynComponentInfo.setAccessibility record.Accessibility
-            |> match record.XmlDoc with
-               | None -> id
-               | Some doc -> SynComponentInfo.withDocString doc
-            |> SynComponentInfo.setGenerics record.Generics
+        let repr =
+            SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (None, Seq.toList record.Fields, range0), range0)
 
-        SynTypeDefnRepr.record (Seq.toList record.Fields)
-        |> SynTypeDefn.create name
-        |> SynTypeDefn.withMemberDefns (defaultArg record.Members SynMemberDefns.Empty)
+        let name =
+            SynComponentInfo.Create (
+                [ record.Name ],
+                ?xmldoc = record.XmlDoc,
+                ?parameters = record.Generics,
+                access = record.Accessibility
+            )
+
+        let trivia : SynTypeDefnTrivia =
+            {
+                LeadingKeyword = SynTypeDefnLeadingKeyword.Type range0
+                EqualsRange = Some range0
+                WithKeyword = Some range0
+            }
+
+        SynTypeDefn (name, repr, defaultArg record.Members SynMemberDefns.Empty, None, range0, trivia)
+
+    let isOptionIdent (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 isListIdent (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 isArrayIdent (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 isMapIdent (ident : SynLongIdent) : bool =
+        match ident.LongIdent |> List.map _.idText with
+        | [ "Map" ] -> true
+        | _ -> false
+
+    let isReadOnlyDictionaryIdent (ident : SynLongIdent) : bool =
+        match ident.LongIdent |> List.map _.idText with
+        | [ "IReadOnlyDictionary" ]
+        | [ "Generic" ; "IReadOnlyDictionary" ]
+        | [ "Collections" ; "Generic" ; "IReadOnlyDictionary" ]
+        | [ "System" ; "Collections" ; "Generic" ; "IReadOnlyDictionary" ] -> true
+        | _ -> false
+
+    let isDictionaryIdent (ident : SynLongIdent) : bool =
+        match ident.LongIdent |> List.map _.idText with
+        | [ "Dictionary" ]
+        | [ "Generic" ; "Dictionary" ]
+        | [ "Collections" ; "Generic" ; "Dictionary" ]
+        | [ "System" ; "Collections" ; "Generic" ; "Dictionary" ] -> true
+        | _ -> false
+
+    let isIDictionaryIdent (ident : SynLongIdent) : bool =
+        match ident.LongIdent |> List.map _.idText with
+        | [ "IDictionary" ]
+        | [ "Generic" ; "IDictionary" ]
+        | [ "Collections" ; "Generic" ; "IDictionary" ]
+        | [ "System" ; "Collections" ; "Generic" ; "IDictionary" ] -> true
+        | _ -> false
 
     let rec private extractOpensFromDecl (moduleDecls : SynModuleDecl list) : SynOpenDeclTarget list =
         moduleDecls
@@ -174,12 +153,12 @@ module internal AstHelper =
         | SynType.Paren (inner, _) ->
             let result, _ = convertSigParam inner
             result, true
-        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
+        | SynType.LongIdent ident ->
             {
                 Attributes = []
                 IsOptional = false
                 Id = None
-                Type = SynType.createLongIdent ident
+                Type = SynType.CreateLongIdent ident
             },
             false
         | SynType.SignatureParameter (attrs, opt, id, usedType, _) ->
@@ -197,7 +176,7 @@ module internal AstHelper =
                 Attributes = []
                 IsOptional = false
                 Id = None
-                Type = SynType.var typar
+                Type = SynType.Var (typar, range0)
             },
             false
         | _ -> failwithf "expected SignatureParameter, got: %+A" ty
@@ -226,6 +205,10 @@ module internal AstHelper =
             }
         | _ -> failwithf "Didn't have alternating type-and-star in interface member definition: %+A" tupleType
 
+    let toFun (inputs : SynType list) (ret : SynType) : SynType =
+        (ret, List.rev inputs)
+        ||> List.fold (fun ty input -> SynType.CreateFun (input, ty))
+
     /// Returns the args (where these are tuple types if curried) in order, and the return type.
     let rec getType (ty : SynType) : (SynType * bool) list * SynType =
         match ty with
@@ -238,27 +221,41 @@ module internal AstHelper =
                 | SynType.Paren (argType, _) -> getType argType, true
                 | _ -> getType argType, false
 
-            ((SynType.toFun (List.map fst inputArgs) inputRet), hasParen) :: args, ret
+            ((toFun (List.map fst inputArgs) inputRet), hasParen) :: args, ret
         | _ -> [], ty
 
-    let private parseMember (slotSig : SynValSig) (flags : SynMemberFlags) : Choice<MemberInfo, PropertyInfo> =
+    /// Assumes that the input type is an ObjectModel, i.e. a `type Foo = member ...`
+    let parseInterface (interfaceType : SynTypeDefn) : InterfaceType =
+        let (SynTypeDefn (SynComponentInfo (attrs, typars, _, interfaceName, _, _, accessibility, _),
+                          synTypeDefnRepr,
+                          _,
+                          _,
+                          _,
+                          _)) =
+            interfaceType
+
+        let attrs = attrs |> List.collect (fun s -> s.Attributes)
+
+        let members =
+            match synTypeDefnRepr with
+            | SynTypeDefnRepr.ObjectModel (_kind, members, _) ->
+                members
+                |> List.map (fun defn ->
+                    match defn with
+                    | SynMemberDefn.AbstractSlot (slotSig, flags, _, _) ->
+                        match flags.MemberKind with
+                        | SynMemberKind.Member -> ()
+                        | kind -> failwithf "Unrecognised member kind: %+A" kind
+
                         if not flags.IsInstance then
                             failwith "member was not an instance member"
 
-        let propertyAccessors =
-            match flags.MemberKind with
-            | SynMemberKind.Member -> None
-            | SynMemberKind.PropertyGet -> Some PropertyAccessors.Get
-            | SynMemberKind.PropertySet -> Some PropertyAccessors.Set
-            | SynMemberKind.PropertyGetSet -> Some PropertyAccessors.GetSet
-            | kind -> failwithf "Unrecognised member kind: %+A" kind
-
                         match slotSig with
                         | SynValSig (attrs,
                                      SynIdent.SynIdent (ident, _),
                                      _typeParams,
                                      synType,
-                     _arity,
+                                     arity,
                                      isInline,
                                      isMutable,
                                      xmlDoc,
@@ -271,7 +268,7 @@ module internal AstHelper =
                             | Some _ -> failwith "literal members are not supported"
                             | None -> ()
 
-            let attrs = attrs |> List.collect _.Attributes
+                            let attrs = attrs |> List.collect (fun attr -> attr.Attributes)
 
                             let args, ret = getType synType
 
@@ -295,7 +292,10 @@ module internal AstHelper =
                                                     Attributes = []
                                                     IsOptional = false
                                                     Id = None
-                                    Type = SynType.createLongIdent ident
+                                                    Type =
+                                                        SynType.CreateLongIdent (
+                                                            SynLongIdent.CreateFromLongIdent ident
+                                                        )
                                                 }
                                                 |> List.singleton
                                         }
@@ -307,30 +307,17 @@ module internal AstHelper =
                                                     Attributes = []
                                                     IsOptional = false
                                                     Id = None
-                                    Type = SynType.var typar
-                                }
-                                |> List.singleton
-                        }
-                    | arg ->
-                        {
-                            HasParen = false
-                            Args =
-                                {
-                                    Attributes = []
-                                    IsOptional = false
-                                    Id = None
-                                    Type = arg
+                                                    Type = SynType.Var (typar, range0)
                                                 }
                                                 |> List.singleton
                                         }
+                                    | _ -> failwith $"Unrecognised args in interface method declaration: %+A{args}"
                                     |> fun ty ->
                                         { ty with
                                             HasParen = ty.HasParen || hasParen
                                         }
                                 )
 
-            match propertyAccessors with
-            | None ->
                             {
                                 ReturnType = ret
                                 Args = args
@@ -341,123 +328,178 @@ module internal AstHelper =
                                 IsInline = isInline
                                 IsMutable = isMutable
                             }
-                |> Choice1Of2
-            | Some accessors ->
-                {
-                    Type = ret
-                    Accessibility = accessibility
-                    Attributes = attrs
-                    XmlDoc = Some xmlDoc
-                    Accessors = accessors
-                    IsInline = isInline
-                    Identifier = ident
-                }
-                |> Choice2Of2
-
-    /// Assumes that the input type is an ObjectModel, i.e. a `type Foo = member ...`
-    let parseInterface (interfaceType : SynTypeDefn) : InterfaceType =
-        let (SynTypeDefn (SynComponentInfo (attrs, typars, _, interfaceName, _, _, accessibility, _),
-                          synTypeDefnRepr,
-                          _,
-                          _,
-                          _,
-                          _)) =
-            interfaceType
-
-        let attrs = attrs |> List.collect (fun s -> s.Attributes)
-
-        let members, inherits =
-            match synTypeDefnRepr with
-            | SynTypeDefnRepr.ObjectModel (_kind, members, _) ->
-                members
-                |> List.map (fun defn ->
-                    match defn with
-                    | SynMemberDefn.AbstractSlot (slotSig, flags, _, _) -> Choice1Of2 (parseMember slotSig flags)
-                    | SynMemberDefn.Inherit (baseType, _asIdent, _) -> Choice2Of2 baseType
                     | _ -> failwith $"Unrecognised member definition: %+A{defn}"
                 )
             | _ -> failwith $"Unrecognised SynTypeDefnRepr for an interface type: %+A{synTypeDefnRepr}"
-            |> List.partitionChoice
-
-        let members, properties = members |> List.partitionChoice
 
         {
             Members = members
-            Properties = properties
             Name = interfaceName
-            Inherits = inherits
             Attributes = attrs
             Generics = typars
             Accessibility = accessibility
         }
 
-    let getUnionCases
-        (SynTypeDefn.SynTypeDefn (info, repr, _, _, _, _))
-        : AdtProduct list * SynTyparDecl list * SynAccess option
-        =
-        let typars, access =
-            match info with
-            | SynComponentInfo (_, typars, _, _, _, _, access, _) -> typars, access
 
-        let typars =
-            match typars with
-            | None -> []
-            | Some (SynTyparDecls.PrefixList (decls, _)) -> decls
-            | Some (SynTyparDecls.SinglePrefix (l, _)) -> [ l ]
-            | Some (SynTyparDecls.PostfixList (decls, constraints, _)) ->
-                if not constraints.IsEmpty then
-                    failwith "Constrained type parameters not currently supported"
+[<AutoOpen>]
+module internal SynTypePatterns =
+    let (|OptionType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.App (SynType.LongIdent ident, _, [ innerType ], _, _, _, _) when AstHelper.isOptionIdent ident ->
+            Some innerType
+        | _ -> None
 
-                decls
+    let (|ListType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.App (SynType.LongIdent ident, _, [ innerType ], _, _, _, _) when AstHelper.isListIdent ident ->
+            Some innerType
+        | _ -> None
 
-        match repr with
-        | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Union (_, cases, _), _) ->
-            let cases =
-                cases
-                |> List.map (fun (SynUnionCase.SynUnionCase (_, ident, kind, _, _, _, _)) ->
-                    match kind with
-                    | SynUnionCaseKind.FullType _ -> failwith "FullType union cases not supported"
-                    | SynUnionCaseKind.Fields fields ->
-                        {
-                            Name = ident
-                            Fields =
-                                fields
-                                |> List.map (fun (SynField.SynField (_, _, id, ty, _, _, _, _, _)) ->
-                                    {
-                                        Type = ty
-                                        Name = id
-                                        GenericsOfParent = typars
-                                    }
-                                )
-                            Generics = typars
-                        }
-                )
+    let (|ArrayType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.App (SynType.LongIdent ident, _, [ innerType ], _, _, _, _) when AstHelper.isArrayIdent ident ->
+            Some innerType
+        | SynType.Array (1, innerType, _) -> Some innerType
+        | _ -> None
 
-            cases, typars, access
-        | _ -> failwithf "Failed to get union cases for type that was: %+A" repr
+    let (|RestEaseResponseType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.App (SynType.LongIdent ident, _, [ innerType ], _, _, _, _) when AstHelper.isArrayIdent ident ->
+            Some innerType
+        | SynType.Array (1, innerType, _) -> Some innerType
+        | _ -> None
 
-    let getRecordFields (SynTypeDefn.SynTypeDefn (typeInfo, repr, _, _, _, _)) : AdtNode list =
-        let (SynComponentInfo.SynComponentInfo (typeParams = typars)) = typeInfo
+    let (|DictionaryType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.App (SynType.LongIdent ident, _, [ key ; value ], _, _, _, _) when AstHelper.isDictionaryIdent ident ->
+            Some (key, value)
+        | _ -> None
 
-        let typars =
-            match typars with
-            | None -> []
-            | Some (SynTyparDecls.PrefixList (decls, _)) -> decls
-            | Some (SynTyparDecls.SinglePrefix (l, _)) -> [ l ]
-            | Some (SynTyparDecls.PostfixList (decls, constraints, _)) ->
-                if not constraints.IsEmpty then
-                    failwith "Constrained type parameters not currently supported"
+    let (|IDictionaryType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.App (SynType.LongIdent ident, _, [ key ; value ], _, _, _, _) when AstHelper.isIDictionaryIdent ident ->
+            Some (key, value)
+        | _ -> None
 
-                decls
+    let (|IReadOnlyDictionaryType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.App (SynType.LongIdent ident, _, [ key ; value ], _, _, _, _) when
+            AstHelper.isReadOnlyDictionaryIdent ident
+            ->
+            Some (key, value)
+        | _ -> None
 
-        match repr with
-        | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (_, fields, _), _) ->
-            fields
-            |> List.map (fun (SynField.SynField (_, _, ident, ty, _, _, _, _, _)) ->
-                {
-                    Name = ident
-                    Type = ty
-                    GenericsOfParent = typars
-                }
-            )
-        | _ -> failwithf "Failed to get record elements for type that was: %+A" repr
+    let (|MapType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.App (SynType.LongIdent ident, _, [ key ; value ], _, _, _, _) when AstHelper.isMapIdent ident ->
+            Some (key, value)
+        | _ -> None
+
+    /// Returns the string name of the type.
+    let (|PrimitiveType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.LongIdent ident ->
+            match ident.LongIdent with
+            | [ i ] -> [ "string" ; "float" ; "int" ; "bool" ] |> List.tryFind (fun s -> s = i.idText)
+            | _ -> None
+        | _ -> None
+
+    let (|String|_|) (fieldType : SynType) : unit option =
+        match fieldType with
+        | SynType.LongIdent ident ->
+            match ident.LongIdent with
+            | [ i ] ->
+                [ "string" ]
+                |> List.tryFind (fun s -> s = i.idText)
+                |> Option.map ignore<string>
+            | _ -> None
+        | _ -> None
+
+    let (|Byte|_|) (fieldType : SynType) : unit option =
+        match fieldType with
+        | SynType.LongIdent ident ->
+            match ident.LongIdent with
+            | [ i ] -> [ "byte" ] |> List.tryFind (fun s -> s = i.idText) |> Option.map ignore<string>
+            | _ -> None
+        | _ -> None
+
+    let (|HttpResponseMessage|_|) (fieldType : SynType) : unit option =
+        match fieldType with
+        | SynType.LongIdent ident ->
+            match ident.LongIdent |> List.map (fun i -> i.idText) with
+            | [ "System" ; "Net" ; "Http" ; "HttpResponseMessage" ]
+            | [ "Net" ; "Http" ; "HttpResponseMessage" ]
+            | [ "Http" ; "HttpResponseMessage" ]
+            | [ "HttpResponseMessage" ] -> Some ()
+            | _ -> None
+        | _ -> None
+
+    let (|HttpContent|_|) (fieldType : SynType) : unit option =
+        match fieldType with
+        | SynType.LongIdent ident ->
+            match ident.LongIdent |> List.map (fun i -> i.idText) with
+            | [ "System" ; "Net" ; "Http" ; "HttpContent" ]
+            | [ "Net" ; "Http" ; "HttpContent" ]
+            | [ "Http" ; "HttpContent" ]
+            | [ "HttpContent" ] -> Some ()
+            | _ -> None
+        | _ -> None
+
+    let (|Stream|_|) (fieldType : SynType) : unit option =
+        match fieldType with
+        | SynType.LongIdent ident ->
+            match ident.LongIdent |> List.map (fun i -> i.idText) with
+            | [ "System" ; "IO" ; "Stream" ]
+            | [ "IO" ; "Stream" ]
+            | [ "Stream" ] -> Some ()
+            | _ -> None
+        | _ -> None
+
+    let (|NumberType|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.LongIdent ident ->
+            match ident.LongIdent with
+            | [ i ] -> [ "string" ; "float" ; "int" ; "bool" ] |> List.tryFind (fun s -> s = i.idText)
+            | _ -> None
+        | _ -> None
+
+    let (|DateOnly|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
+            match ident |> List.map (fun i -> i.idText) with
+            | [ "System" ; "DateOnly" ]
+            | [ "DateOnly" ] -> Some ()
+            | _ -> None
+        | _ -> None
+
+    let (|DateTime|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
+            match ident |> List.map (fun i -> i.idText) with
+            | [ "System" ; "DateTime" ]
+            | [ "DateTime" ] -> Some ()
+            | _ -> None
+        | _ -> None
+
+    let (|Uri|_|) (fieldType : SynType) =
+        match fieldType with
+        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
+            match ident |> List.map (fun i -> i.idText) with
+            | [ "System" ; "Uri" ]
+            | [ "Uri" ] -> Some ()
+            | _ -> None
+        | _ -> None
+
+    let (|Task|_|) (fieldType : SynType) : SynType option =
+        match fieldType with
+        | SynType.App (SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)), _, args, _, _, _, _) ->
+            match ident |> List.map (fun i -> i.idText) with
+            | [ "Task" ]
+            | [ "Tasks" ; "Task" ]
+            | [ "Threading" ; "Tasks" ; "Task" ]
+            | [ "System" ; "Threading" ; "Tasks" ; "Task" ] ->
+                match args with
+                | [ arg ] -> Some arg
+                | _ -> failwithf "Expected Task to be applied to exactly one arg, but got: %+A" args
+            | _ -> None
+        | _ -> None

WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs

@@ -2,133 +2,186 @@ namespace WoofWare.Myriad.Plugins
 
 open System
 open Fantomas.FCS.Syntax
+open Fantomas.FCS.SyntaxTrivia
 open Fantomas.FCS.Xml
+open Myriad.Core
 
-type internal GenerateMockOutputSpec =
-    {
-        IsInternal : bool
-    }
+/// Attribute indicating an interface type for which the "Generate 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.
+type GenerateMockAttribute () =
+    inherit Attribute ()
 
 [<RequireQualifiedAccess>]
 module internal InterfaceMockGenerator =
     open Fantomas.FCS.Text.Range
+    open Myriad.Core.Ast
 
     let private getName (SynField (_, _, id, _, _, _, _, _, _)) =
         match id with
         | None -> failwith "Expected record field to have a name, but it was somehow anonymous"
         | Some id -> id
 
-    [<RequireQualifiedAccess>]
-    type private KnownInheritance = | IDisposable
-
     let createType
-        (spec : GenerateMockOutputSpec)
         (name : string)
         (interfaceType : InterfaceType)
         (xmlDoc : PreXmlDoc)
         (fields : SynField list)
         : SynModuleDecl
         =
-        let inherits =
-            interfaceType.Inherits
-            |> Seq.map (fun ty ->
-                match ty with
-                | SynType.LongIdent (SynLongIdent.SynLongIdent (name, _, _)) ->
-                    match name |> List.map _.idText with
-                    | [] -> failwith "Unexpected empty identifier in inheritance declaration"
-                    | [ "IDisposable" ]
-                    | [ "System" ; "IDisposable" ] -> KnownInheritance.IDisposable
-                    | _ -> failwithf "Unrecognised inheritance identifier: %+A" name
-                | x -> failwithf "Unrecognised type in inheritance: %+A" x
+        let synValData =
+            {
+                SynMemberFlags.IsInstance = false
+                SynMemberFlags.IsDispatchSlot = false
+                SynMemberFlags.IsOverrideOrExplicitImpl = false
+                SynMemberFlags.IsFinal = false
+                SynMemberFlags.GetterOrSetterIsCompilerGenerated = false
+                SynMemberFlags.MemberKind = SynMemberKind.Member
+            }
+
+        let failwithFun =
+            SynExpr.createLambda
+                "x"
+                (SynExpr.CreateApp (
+                    SynExpr.CreateIdentString "raise",
+                    SynExpr.CreateParen (
+                        SynExpr.CreateApp (
+                            SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "NotImplementedException" ]),
+                            SynExpr.CreateConstString "Unimplemented mock function"
                         )
-            |> Set.ofSeq
+                    )
+                ))
 
-        let failwithFun (SynField (_, _, idOpt, _, _, _, _, _, _)) =
-            let failString =
-                match idOpt with
-                | None -> SynExpr.CreateConst "Unimplemented mock function"
-                | Some ident -> SynExpr.CreateConst $"Unimplemented mock function: %s{ident.idText}"
+        let constructorIdent =
+            let generics =
+                interfaceType.Generics
+                |> Option.map (fun generics -> SynValTyparDecls (Some generics, false))
 
-            SynExpr.createLongIdent [ "System" ; "NotImplementedException" ]
-            |> SynExpr.applyTo failString
-            |> SynExpr.paren
-            |> SynExpr.applyFunction (SynExpr.createIdent "raise")
-            |> SynExpr.createLambda "_"
+            SynPat.LongIdent (
+                SynLongIdent.CreateString "Empty",
+                None,
+                None, // no generics on the "Empty", only on the return type
+                SynArgPats.Pats (
+                    if generics.IsNone then
+                        []
+                    else
+                        [ SynPat.CreateParen (SynPat.CreateConst SynConst.Unit) ]
+                ),
+                None,
+                range0
+            )
 
         let constructorReturnType =
             match interfaceType.Generics with
-            | None -> SynType.createLongIdent' [ name ]
+            | None -> SynType.CreateLongIdent name
             | Some generics ->
-
                 let generics =
                     generics.TyparDecls
-                |> List.map (fun (SynTyparDecl (_, typar)) -> SynType.var typar)
+                    |> List.map (fun (SynTyparDecl (_, typar)) -> SynType.Var (typar, range0))
 
-            SynType.app name generics
-
-        let constructorFields =
-            let extras =
-                if inherits.Contains KnownInheritance.IDisposable then
-                    let unitFun = SynExpr.createThunk (SynExpr.CreateConst ())
-
-                    [ SynLongIdent.createS "Dispose", unitFun ]
-                else
-                    []
-
-            let nonExtras =
-                fields
-                |> List.map (fun field -> SynLongIdent.createI (getName field), failwithFun field)
-
-            extras @ nonExtras
+                SynType.App (
+                    SynType.CreateLongIdent name,
+                    Some range0,
+                    generics,
+                    List.replicate (generics.Length - 1) range0,
+                    Some range0,
+                    false,
+                    range0
+                )
+            |> SynBindingReturnInfo.Create
 
         let constructor =
-            SynBinding.basic
-                [ Ident.create "Empty" ]
-                (if interfaceType.Generics.IsNone then
-                     []
-                 else
-                     [ SynPat.unit ])
-                (AstHelper.instantiateRecord constructorFields)
-            |> SynBinding.withXmlDoc (PreXmlDoc.create "An implementation where every 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
+            SynMemberDefn.Member (
+                SynBinding.SynBinding (
+                    None,
+                    SynBindingKind.Normal,
+                    false,
+                    false,
+                    [],
+                    PreXmlDoc.Empty,
+                    SynValData.SynValData (Some synValData, SynValInfo.Empty, None),
+                    constructorIdent,
+                    Some constructorReturnType,
+                    AstHelper.instantiateRecord (
+                        fields
+                        |> List.map (fun field ->
+                            ((SynLongIdent.CreateFromLongIdent [ getName field ], true), Some failwithFun)
+                        )
+                    ),
+                    range0,
+                    DebugPointAtBinding.Yes range0,
+                    { SynExpr.synBindingTriviaZero true with
+                        LeadingKeyword = SynLeadingKeyword.StaticMember (range0, range0)
                     }
-                    |> SynField.make
-                    |> SynField.withDocString (PreXmlDoc.create "Implementation of IDisposable.Dispose")
-                    |> List.singleton
-                else
-                    []
-
-            extras @ fields
+                ),
+                range0
+            )
 
         let interfaceMembers =
             let members =
                 interfaceType.Members
                 |> List.map (fun memberInfo ->
+
+                    let synValData =
+                        SynValData.SynValData (
+                            Some
+                                {
+                                    IsInstance = true
+                                    IsDispatchSlot = false
+                                    IsOverrideOrExplicitImpl = true
+                                    IsFinal = false
+                                    GetterOrSetterIsCompilerGenerated = false
+                                    MemberKind = SynMemberKind.Member
+                                },
+                            valInfo =
+                                SynValInfo.SynValInfo (
+                                    curriedArgInfos =
+                                        [
+                                            yield
+                                                [
+                                                    SynArgInfo.SynArgInfo (
+                                                        attributes = [],
+                                                        optional = false,
+                                                        ident = None
+                                                    )
+                                                ]
+                                            yield!
+                                                memberInfo.Args
+                                                |> List.mapi (fun i arg ->
+                                                    arg.Args
+                                                    |> List.mapi (fun j arg ->
+                                                        SynArgInfo.CreateIdString $"arg_%i{i}_%i{j}"
+                                                    )
+                                                )
+                                        ],
+                                    returnInfo =
+                                        SynArgInfo.SynArgInfo (attributes = [], optional = false, ident = None)
+                                ),
+                            thisIdOpt = None
+                        )
+
                     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}"
+                                |> List.mapi (fun j _ -> SynPat.CreateNamed (Ident.Create $"arg_%i{i}_%i{j}"))
+
+                            SynPat.Tuple (false, args, List.replicate (args.Length - 1) range0, range0)
+                            |> SynPat.CreateParen
+                            |> fun i -> if tupledArgs.HasParen then SynPat.Paren (i, range0) else i
                         )
 
-                            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 headPat =
+                        SynPat.LongIdent (
+                            SynLongIdent.CreateFromLongIdent [ Ident.Create "this" ; memberInfo.Identifier ],
+                            None,
+                            None,
+                            SynArgPats.Pats headArgs,
+                            None,
+                            range0
                         )
 
                     let body =
@@ -136,12 +189,8 @@ module internal InterfaceMockGenerator =
                             memberInfo.Args
                             |> List.mapi (fun i args ->
                                 args.Args
-                                |> List.mapi (fun j arg ->
-                                    match arg.Type with
-                                    | UnitType -> SynExpr.CreateConst ()
-                                    | _ -> SynExpr.createIdent $"arg_%i{i}_%i{j}"
-                                )
-                                |> SynExpr.tuple
+                                |> List.mapi (fun j args -> SynExpr.CreateIdentString $"arg_%i{i}_%i{j}")
+                                |> SynExpr.CreateParenedTuple
                             )
 
                         match tuples |> List.rev with
@@ -149,17 +198,42 @@ module internal InterfaceMockGenerator =
                         | last :: rest ->
 
                         (last, rest)
-                        ||> List.fold SynExpr.applyTo
-                        |> SynExpr.applyFunction (
-                            SynExpr.createLongIdent' [ Ident.create "this" ; memberInfo.Identifier ]
+                        ||> List.fold (fun trail next -> SynExpr.CreateApp (next, trail))
+                        |> fun args ->
+                            SynExpr.CreateApp (
+                                SynExpr.CreateLongIdent (
+                                    SynLongIdent.CreateFromLongIdent [ Ident.Create "this" ; memberInfo.Identifier ]
+                                ),
+                                args
                             )
 
-                    SynBinding.basic [ Ident.create "this" ; memberInfo.Identifier ] headArgs body
-                    |> SynMemberDefn.memberImplementation
+                    SynMemberDefn.Member (
+                        SynBinding.SynBinding (
+                            None,
+                            SynBindingKind.Normal,
+                            false,
+                            false,
+                            [],
+                            PreXmlDoc.Empty,
+                            synValData,
+                            headPat,
+                            None,
+                            body,
+                            range0,
+                            DebugPointAtBinding.Yes range0,
+                            {
+                                LeadingKeyword = SynLeadingKeyword.Member range0
+                                InlineKeyword = None
+                                EqualsRange = Some range0
+                            }
+                        ),
+                        range0
+                    )
                 )
 
             let interfaceName =
-                let baseName = SynType.createLongIdent interfaceType.Name
+                let baseName =
+                    SynType.CreateLongIdent (SynLongIdent.CreateFromLongIdent interfaceType.Name)
 
                 match interfaceType.Generics with
                 | None -> baseName
@@ -169,51 +243,36 @@ module internal InterfaceMockGenerator =
                         | SynTyparDecls.PostfixList (decls, _, _) -> decls
                         | SynTyparDecls.PrefixList (decls, _) -> decls
                         | SynTyparDecls.SinglePrefix (decl, _) -> [ decl ]
-                        |> List.map (fun (SynTyparDecl (_, typar)) -> SynType.var typar)
+                        |> List.map (fun (SynTyparDecl (_, typar)) -> SynType.Var (typar, range0))
 
-                    SynType.app' baseName generics
+                    SynType.App (
+                        baseName,
+                        Some range0,
+                        generics,
+                        List.replicate (generics.Length - 1) range0,
+                        Some range0,
+                        false,
+                        range0
+                    )
 
             SynMemberDefn.Interface (interfaceName, Some range0, Some members, range0)
 
+        // TODO: allow an arg to the attribute, specifying a custom visibility
         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 extraInterfaces =
-            inherits
-            |> Seq.map (fun inheritance ->
-                match inheritance with
-                | KnownInheritance.IDisposable ->
-                    let mem =
-                        SynExpr.createLongIdent [ "this" ; "Dispose" ]
-                        |> SynExpr.applyTo (SynExpr.CreateConst ())
-                        |> SynBinding.basic [ Ident.create "this" ; Ident.create "Dispose" ] [ SynPat.unit ]
-                        |> SynBinding.withReturnAnnotation SynType.unit
-                        |> SynMemberDefn.memberImplementation
-
-                    SynMemberDefn.Interface (
-                        SynType.createLongIdent' [ "System" ; "IDisposable" ],
-                        Some range0,
-                        Some [ mem ],
-                        range0
-                    )
-            )
-            |> Seq.toList
+            match interfaceType.Accessibility with
+            | Some (SynAccess.Public _)
+            | Some (SynAccess.Internal _)
+            | None -> SynAccess.Internal range0
+            | Some (SynAccess.Private _) -> SynAccess.Private range0
 
         let record =
             {
-                Name = Ident.create name
+                Name = Ident.Create name
                 Fields = fields
-                Members = Some ([ constructor ; interfaceMembers ] @ extraInterfaces)
+                Members = Some [ constructor ; interfaceMembers ]
                 XmlDoc = Some xmlDoc
                 Generics = interfaceType.Generics
                 Accessibility = Some access
-                Attributes = []
             }
 
         let typeDecl = AstHelper.defineRecordType record
@@ -222,7 +281,7 @@ module internal InterfaceMockGenerator =
 
     let private buildType (x : ParameterInfo) : SynType =
         if x.IsOptional then
-            SynType.app "option" [ x.Type ]
+            SynType.App (SynType.CreateLongIdent "option", Some range0, [ x.Type ], [], Some range0, false, range0)
         else
             x.Type
 
@@ -239,42 +298,38 @@ module internal InterfaceMockGenerator =
     let constructMember (mem : MemberInfo) : SynField =
         let inputType = mem.Args |> List.map constructMemberSinglePlace
 
-        let funcType = SynType.toFun inputType mem.ReturnType
+        let funcType = AstHelper.toFun inputType mem.ReturnType
 
-        {
-            Type = funcType
-            Attrs = []
-            Ident = Some mem.Identifier
-        }
-        |> SynField.make
-        |> SynField.withDocString (mem.XmlDoc |> Option.defaultValue PreXmlDoc.Empty)
+        SynField.SynField (
+            [],
+            false,
+            Some mem.Identifier,
+            funcType,
+            false,
+            mem.XmlDoc |> Option.defaultValue PreXmlDoc.Empty,
+            None,
+            range0,
+            SynFieldTrivia.Zero
+        )
 
-    let createRecord
-        (namespaceId : LongIdent)
-        (opens : SynOpenDeclTarget list)
-        (interfaceType : SynTypeDefn, spec : GenerateMockOutputSpec)
-        : SynModuleOrNamespace
-        =
+    let createRecord (namespaceId : LongIdent) (interfaceType : SynTypeDefn) : SynModuleOrNamespace =
         let interfaceType = AstHelper.parseInterface interfaceType
         let fields = interfaceType.Members |> List.map constructMember
-        let docString = PreXmlDoc.create "Mock record type for an interface"
+        let docString = PreXmlDoc.Create " Mock record type for an interface"
 
         let name =
             List.last interfaceType.Name
-            |> _.idText
+            |> fun s -> s.idText
             |> fun s ->
                 if s.StartsWith 'I' && s.Length > 1 && Char.IsUpper s.[1] then
-                    s.Substring 1
+                    s.[1..]
                 else
                     s
             |> fun s -> s + "Mock"
 
-        let typeDecl = createType spec name interfaceType docString fields
+        let typeDecl = createType name interfaceType docString fields
 
-        [ yield! opens |> List.map SynModuleDecl.openAny ; yield typeDecl ]
-        |> SynModuleOrNamespace.createNamespace namespaceId
-
-open Myriad.Core
+        SynModuleOrNamespace.CreateNamespace (namespaceId, decls = [ typeDecl ])
 
 /// Myriad generator that creates a record which implements the given interface,
 /// but with every field mocked out.
@@ -293,37 +348,15 @@ type InterfaceMockGenerator () =
             let namespaceAndInterfaces =
                 types
                 |> List.choose (fun (ns, types) ->
-                    types
-                    |> List.choose (fun typeDef ->
-                        match Ast.getAttribute<GenerateMockAttribute> typeDef with
-                        | None -> None
-                        | Some attr ->
-                            let arg =
-                                match SynExpr.stripOptionalParen attr.ArgExpr with
-                                | SynExpr.Const (SynConst.Bool value, _) -> value
-                                | SynExpr.Const (SynConst.Unit, _) -> GenerateMockAttribute.DefaultIsInternal
-                                | arg ->
-                                    failwith
-                                        $"Unrecognised argument %+A{arg} to [<%s{nameof GenerateMockAttribute}>]. Literals are not supported. Use `true` or `false` (or unit) only."
-
-                            let spec =
-                                {
-                                    IsInternal = arg
-                                }
-
-                            Some (typeDef, spec)
-                    )
-                    |> function
+                    match types |> List.filter Ast.hasAttribute<GenerateMockAttribute> with
                     | [] -> None
-                        | ty -> Some (ns, ty)
+                    | types -> Some (ns, types)
                 )
 
             let opens = AstHelper.extractOpens ast
 
             let modules =
                 namespaceAndInterfaces
-                |> List.collect (fun (ns, records) ->
-                    records |> List.map (InterfaceMockGenerator.createRecord ns opens)
-                )
+                |> List.collect (fun (ns, records) -> records |> List.map (InterfaceMockGenerator.createRecord ns))
 
             Output.Ast modules

WoofWare.Myriad.Plugins/JsonParseGenerator.fs

@@ -4,6 +4,25 @@ open System
 open System.Text
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.SyntaxTrivia
+open Fantomas.FCS.Xml
+open Myriad.Core
+
+/// Attribute indicating a record type to which the "Add JSON parse" Myriad
+/// generator should apply during build.
+/// The purpose of this generator is to create methods (possibly extension methods) of the form
+/// `{TypeName}.jsonParse : System.Text.Json.Nodes.JsonNode -> {TypeName}`.
+///
+/// If you supply isExtensionMethod = true, you will get extension methods.
+/// These can only be consumed from F#, but the benefit is that they don't use up the module name
+/// (since by default we create a module called "{TypeName}").
+type JsonParseAttribute (isExtensionMethod : bool) =
+    inherit Attribute ()
+
+    /// If changing this, *adjust the documentation strings*
+    static member internal DefaultIsExtensionMethod = false
+
+    /// Shorthand for the "isExtensionMethod = false" constructor; see documentation there for details.
+    new () = JsonParseAttribute JsonParseAttribute.DefaultIsExtensionMethod
 
 type internal JsonParseOutputSpec =
     {
@@ -13,6 +32,7 @@ type internal JsonParseOutputSpec =
 [<RequireQualifiedAccess>]
 module internal JsonParseGenerator =
     open Fantomas.FCS.Text.Range
+    open Myriad.Core.Ast
 
     type JsonParseOption =
         {
@@ -24,37 +44,41 @@ module internal JsonParseGenerator =
                 JsonNumberHandlingArg = None
             }
 
-    /// (match {indexed} with | null -> raise (System.Collections.Generic.KeyNotFoundException ({propertyName} not found)) | v -> v)
+    /// (match {indexed} with | null -> raise (System.Collections.Generic.KeyNotFoundException ()) | v -> v)
     let assertNotNull (propertyName : SynExpr) (indexed : SynExpr) =
         let raiseExpr =
-            SynExpr.applyFunction
-                (SynExpr.createIdent "sprintf")
-                (SynExpr.CreateConst "Required key '%s' not found on JSON object")
-            |> SynExpr.applyTo (SynExpr.paren propertyName)
-            |> SynExpr.paren
-            |> SynExpr.applyFunction (
-                SynExpr.createLongIdent [ "System" ; "Collections" ; "Generic" ; "KeyNotFoundException" ]
+            SynExpr.CreateApp (
+                SynExpr.CreateIdentString "raise",
+                SynExpr.CreateParen (
+                    SynExpr.CreateApp (
+                        SynExpr.CreateLongIdent (
+                            SynLongIdent.Create [ "System" ; "Collections" ; "Generic" ; "KeyNotFoundException" ]
+                        ),
+                        SynExpr.CreateParen (
+                            SynExpr.CreateApp (
+                                SynExpr.CreateApp (
+                                    SynExpr.CreateIdentString "sprintf",
+                                    SynExpr.CreateConstString "Required key '%s' not found on JSON object"
+                                ),
+                                SynExpr.CreateParen propertyName
+                            )
+                        )
+                    )
+                )
             )
-            |> SynExpr.paren
-            |> SynExpr.applyFunction (SynExpr.createIdent "raise")
 
+        SynExpr.CreateMatch (
+            indexed,
             [
-            SynMatchClause.create SynPat.createNull raiseExpr
-            SynMatchClause.create (SynPat.named "v") (SynExpr.createIdent "v")
+                SynMatchClause.Create (SynPat.CreateNull, None, raiseExpr)
+                SynMatchClause.Create (SynPat.CreateNamed (Ident.Create "v"), None, SynExpr.CreateIdentString "v")
             ]
-        |> SynExpr.createMatch indexed
-        |> SynExpr.paren
+        )
+        |> SynExpr.CreateParen
 
     /// {node}.AsValue().GetValue<{typeName}> ()
     /// If `propertyName` is Some, uses `assertNotNull {node}` instead of `{node}`.
     let asValueGetValue (propertyName : SynExpr option) (typeName : string) (node : SynExpr) : SynExpr =
-        match propertyName with
-        | None -> node
-        | Some propertyName -> assertNotNull propertyName node
-        |> SynExpr.callMethod "AsValue"
-        |> SynExpr.callGenericMethod' "GetValue" typeName
-
-    let asValueGetValueIdent (propertyName : SynExpr option) (typeName : LongIdent) (node : SynExpr) : SynExpr =
         match propertyName with
         | None -> node
         | Some propertyName -> assertNotNull propertyName node
@@ -71,8 +95,10 @@ module internal JsonParseGenerator =
 
     /// {type}.jsonParse {node}
     let typeJsonParse (typeName : LongIdent) (node : SynExpr) : SynExpr =
+        SynExpr.CreateApp (
+            SynExpr.CreateLongIdent (SynLongIdent.CreateFromLongIdent (typeName @ [ Ident.Create "jsonParse" ])),
             node
-        |> SynExpr.applyFunction (SynExpr.createLongIdent' (typeName @ [ Ident.create "jsonParse" ]))
+        )
 
     /// collectionType is e.g. "List"; we'll be calling `ofSeq` on it.
     /// body is the body of a lambda which takes a parameter `elt`.
@@ -91,24 +117,64 @@ module internal JsonParseGenerator =
         | Some propertyName -> assertNotNull propertyName node
         |> SynExpr.callMethod "AsArray"
         |> SynExpr.pipeThroughFunction (
-            SynExpr.applyFunction (SynExpr.createLongIdent [ "Seq" ; "map" ]) (SynExpr.createLambda "elt" body)
+            SynExpr.CreateApp (
+                SynExpr.CreateLongIdent (SynLongIdent.Create [ "Seq" ; "map" ]),
+                SynExpr.createLambda "elt" body
             )
-        |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ collectionType ; "ofSeq" ])
+        )
+        |> SynExpr.pipeThroughFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ collectionType ; "ofSeq" ]))
 
-    let dotParse (typeName : LongIdent) : LongIdent =
-        List.append typeName [ Ident.create "Parse" ]
+    /// match {node} with | null -> None | v -> {body} |> Some
+    /// Use the variable `v` to get access to the `Some`.
+    let createParseLineOption (node : SynExpr) (body : SynExpr) : SynExpr =
+        let body = SynExpr.pipeThroughFunction (SynExpr.CreateIdentString "Some") body
+
+        SynExpr.CreateMatch (
+            node,
+            [
+                SynMatchClause.Create (SynPat.CreateNull, None, SynExpr.CreateIdent (Ident.Create "None"))
+                SynMatchClause.Create (SynPat.CreateNamed (Ident.Create "v"), None, body)
+            ]
+        )
+
+    /// Given e.g. "float", returns "System.Double.Parse"
+    let parseFunction (typeName : string) : LongIdent =
+        List.append (SynExpr.qualifyPrimitiveType typeName) [ Ident.Create "Parse" ]
 
     /// fun kvp -> let key = {key(kvp)} in let value = {value(kvp)} in (key, value))
     /// The inputs will be fed with appropriate SynExprs to apply them to the `kvp.Key` and `kvp.Value` args.
     let dictionaryMapper (key : SynExpr -> SynExpr) (value : SynExpr -> SynExpr) : SynExpr =
-        let keyArg = SynExpr.createLongIdent [ "kvp" ; "Key" ] |> SynExpr.paren
+        let keyArg =
+            SynExpr.CreateLongIdent (SynLongIdent.Create [ "kvp" ; "Key" ])
+            |> SynExpr.CreateParen
 
-        let valueArg = SynExpr.createLongIdent [ "kvp" ; "Value" ] |> SynExpr.paren
+        let valueArg =
+            SynExpr.CreateLongIdent (SynLongIdent.Create [ "kvp" ; "Value" ])
+            |> SynExpr.CreateParen
 
-        // 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.createLet [ SynBinding.basic [ Ident.create "key" ] [] (key keyArg) ]
+        SynExpr.LetOrUse (
+            false,
+            false,
+            [
+                SynBinding.Let (pattern = SynPat.CreateNamed (Ident.Create "key"), expr = key keyArg)
+            ],
+            SynExpr.LetOrUse (
+                false,
+                false,
+                [
+                    SynBinding.Let (pattern = SynPat.CreateNamed (Ident.Create "value"), expr = value valueArg)
+                ],
+                SynExpr.CreateTuple [ SynExpr.CreateIdentString "key" ; SynExpr.CreateIdentString "value" ],
+                range0,
+                {
+                    InKeyword = None
+                }
+            ),
+            range0,
+            {
+                InKeyword = None
+            }
+        )
         |> SynExpr.createLambda "kvp"
 
     /// A conforming JSON object has only strings as keys. But it would be reasonable to allow the user
@@ -118,52 +184,11 @@ module internal JsonParseGenerator =
         | String -> key
         | Uri ->
             key
-            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "Uri" ])
+            |> SynExpr.pipeThroughFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "Uri" ]))
         | _ ->
             failwithf
                 $"Unable to parse the key type %+A{desiredType} of a JSON object. Keys are strings, and this plugin does not know how to convert to that from a string."
 
-    let private parseNumberType
-        (options : JsonParseOption)
-        (propertyName : SynExpr option)
-        (node : SynExpr)
-        (typeName : LongIdent)
-        =
-        let basic = asValueGetValueIdent propertyName typeName node
-
-        match options.JsonNumberHandlingArg with
-        | None -> basic
-        | Some option ->
-            let cond =
-                SynExpr.DotGet (SynExpr.createIdent "exc", range0, SynLongIdent.createS "Message", range0)
-                |> SynExpr.callMethodArg "Contains" (SynExpr.CreateConst "cannot be converted to")
-
-            let handler =
-                asValueGetValue propertyName "string" node
-                |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent' (typeName |> dotParse))
-                |> SynExpr.ifThenElse
-                    (SynExpr.equals
-                        option
-                        (SynExpr.createLongIdent
-                            [
-                                "System"
-                                "Text"
-                                "Json"
-                                "Serialization"
-                                "JsonNumberHandling"
-                                "AllowReadingFromString"
-                            ]))
-                    SynExpr.reraise
-                |> SynExpr.ifThenElse cond SynExpr.reraise
-
-            basic
-            |> SynExpr.pipeThroughTryWith
-                (SynPat.IsInst (
-                    SynType.LongIdent (SynLongIdent.createS' [ "System" ; "InvalidOperationException" ]),
-                    range0
-                ))
-                handler
-
     /// 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".
@@ -179,106 +204,125 @@ module internal JsonParseGenerator =
         | DateOnly ->
             node
             |> asValueGetValue propertyName "string"
-            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "DateOnly" ; "Parse" ])
+            |> SynExpr.pipeThroughFunction (
+                SynExpr.CreateLongIdent (SynLongIdent.Create [ "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" ])
+            |> SynExpr.pipeThroughFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "Uri" ]))
         | DateTime ->
             node
             |> asValueGetValue propertyName "string"
-            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "DateTime" ; "Parse" ])
-        | DateTimeOffset ->
-            node
-            |> asValueGetValue propertyName "string"
-            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "System" ; "DateTimeOffset" ; "Parse" ])
-        | NumberType typeName -> parseNumberType options propertyName node typeName
-        | PrimitiveType typeName -> asValueGetValueIdent propertyName typeName node
+            |> SynExpr.pipeThroughFunction (
+                SynExpr.CreateLongIdent (SynLongIdent.Create [ "System" ; "DateTime" ; "Parse" ])
+            )
+        | NumberType typeName ->
+            let basic = asValueGetValue propertyName typeName node
+
+            match options.JsonNumberHandlingArg with
+            | None -> basic
+            | Some option ->
+                let cond =
+                    SynExpr.DotGet (
+                        SynExpr.CreateIdentString "exc",
+                        range0,
+                        SynLongIdent.CreateString "Message",
+                        range0
+                    )
+                    |> SynExpr.callMethodArg
+                        "Contains"
+                        (SynExpr.CreateConst (SynConst.CreateString "cannot be converted to"))
+
+                let handler =
+                    asValueGetValue propertyName "string" node
+                    |> SynExpr.pipeThroughFunction (
+                        SynExpr.CreateLongIdent (SynLongIdent.CreateFromLongIdent (parseFunction typeName))
+                    )
+                    |> SynExpr.ifThenElse
+                        (SynExpr.equals
+                            option
+                            (SynExpr.CreateLongIdent (
+                                SynLongIdent.Create
+                                    [
+                                        "System"
+                                        "Text"
+                                        "Json"
+                                        "Serialization"
+                                        "JsonNumberHandling"
+                                        "AllowReadingFromString"
+                                    ]
+                            )))
+                        SynExpr.reraise
+                    |> SynExpr.ifThenElse cond SynExpr.reraise
+
+                basic
+                |> SynExpr.pipeThroughTryWith
+                    (SynPat.IsInst (
+                        SynType.LongIdent (SynLongIdent.Create [ "System" ; "InvalidOperationException" ]),
+                        range0
+                    ))
+                    handler
+        | PrimitiveType typeName -> asValueGetValue 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
+            parseNode None options ty (SynExpr.CreateIdentString "v")
+            |> createParseLineOption node
         | ListType ty ->
-            parseNode None options ty (SynExpr.createIdent "elt")
+            parseNode None options ty (SynExpr.CreateLongIdent (SynLongIdent.CreateString "elt"))
             |> asArrayMapped propertyName "List" node
         | ArrayType ty ->
-            parseNode None options ty (SynExpr.createIdent "elt")
+            parseNode None options ty (SynExpr.CreateLongIdent (SynLongIdent.CreateString "elt"))
             |> asArrayMapped propertyName "Array" node
         | IDictionaryType (keyType, valueType) ->
             node
             |> asObject propertyName
             |> SynExpr.pipeThroughFunction (
-                SynExpr.applyFunction
-                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
+                SynExpr.CreateApp (
+                    SynExpr.CreateLongIdent (SynLongIdent.Create [ "Seq" ; "map" ]),
+                    dictionaryMapper (parseKeyString keyType) (parseNode None options valueType)
                 )
-            |> SynExpr.pipeThroughFunction (SynExpr.createIdent "dict")
+            )
+            |> SynExpr.pipeThroughFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ "dict" ]))
         | DictionaryType (keyType, valueType) ->
             node
             |> asObject propertyName
             |> SynExpr.pipeThroughFunction (
-                SynExpr.applyFunction
-                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
+                SynExpr.CreateApp (
+                    SynExpr.CreateLongIdent (SynLongIdent.Create [ "Seq" ; "map" ]),
+                    dictionaryMapper (parseKeyString keyType) (parseNode None options valueType)
+                )
             )
             |> SynExpr.pipeThroughFunction (
-                SynExpr.applyFunction
-                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                    (SynExpr.createLongIdent [ "System" ; "Collections" ; "Generic" ; "KeyValuePair" ])
+                SynExpr.CreateApp (
+                    SynExpr.CreateLongIdent (SynLongIdent.Create [ "Seq" ; "map" ]),
+                    SynExpr.CreateLongIdent (
+                        SynLongIdent.Create [ "System" ; "Collections" ; "Generic" ; "KeyValuePair" ]
+                    )
+                )
             )
             |> SynExpr.pipeThroughFunction (
-                SynExpr.createLongIdent [ "System" ; "Collections" ; "Generic" ; "Dictionary" ]
+                SynExpr.CreateLongIdent (SynLongIdent.Create [ "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.CreateApp (
+                    SynExpr.CreateLongIdent (SynLongIdent.Create [ "Seq" ; "map" ]),
+                    dictionaryMapper (parseKeyString keyType) (parseNode None options valueType)
                 )
-            |> SynExpr.pipeThroughFunction (SynExpr.createIdent "readOnlyDict")
+            )
+            |> SynExpr.pipeThroughFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ "readOnlyDict" ]))
         | MapType (keyType, valueType) ->
             node
             |> asObject propertyName
             |> SynExpr.pipeThroughFunction (
-                SynExpr.applyFunction
-                    (SynExpr.createLongIdent [ "Seq" ; "map" ])
-                    (dictionaryMapper (parseKeyString keyType) (parseNode None options valueType))
+                SynExpr.CreateApp (
+                    SynExpr.CreateLongIdent (SynLongIdent.Create [ "Seq" ; "map" ]),
+                    dictionaryMapper (parseKeyString keyType) (parseNode None options valueType)
                 )
-            |> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Map" ; "ofSeq" ])
-        | BigInt ->
-            node
-            |> SynExpr.callMethod "ToJsonString"
-            |> SynExpr.paren
-            |> SynExpr.applyFunction (SynExpr.createLongIdent [ "System" ; "Numerics" ; "BigInteger" ; "Parse" ])
-        | Measure (_measure, primType) ->
-            parseNumberType options propertyName node primType
-            |> SynExpr.pipeThroughFunction (Measure.getLanguagePrimitivesMeasure primType)
+            )
+            |> SynExpr.pipeThroughFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ "Map" ; "ofSeq" ]))
         | _ ->
             // Let's just hope that we've also got our own type annotation!
             let typeName =
@@ -294,8 +338,9 @@ module internal JsonParseGenerator =
     /// propertyName is probably a string literal, but it could be a [<Literal>] variable
     /// The result of this function is the body of a let-binding (not including the LHS of that let-binding).
     let createParseRhs (options : JsonParseOption) (propertyName : SynExpr) (fieldType : SynType) : SynExpr =
-        let objectToParse = SynExpr.createIdent "node" |> SynExpr.index propertyName
-        parseNode (Some propertyName) options fieldType objectToParse
+        SynExpr.CreateIdentString "node"
+        |> SynExpr.index propertyName
+        |> parseNode (Some propertyName) options fieldType
 
     let isJsonNumberHandling (literal : LongIdent) : bool =
         match List.rev literal |> List.map (fun ident -> ident.idText) with
@@ -306,57 +351,66 @@ module internal JsonParseGenerator =
         | [ _ ; "JsonNumberHandling" ; "Serialization" ; "Json" ; "Text" ; "System" ] -> true
         | _ -> false
 
-    /// `populateNode` will be inserted before we return the `node` variable.
-    ///
-    /// That is, we give you access to a `JsonNode` called `node`,
-    /// and you must return a `typeName`.
-    let scaffolding (spec : JsonParseOutputSpec) (typeName : LongIdent) (functionBody : SynExpr) : SynModuleDecl =
-        let xmlDoc = PreXmlDoc.create "Parse from a JSON node."
+    let createMaker (spec : JsonParseOutputSpec) (typeName : LongIdent) (fields : SynField list) =
+        let xmlDoc = PreXmlDoc.Create " Parse from a JSON node."
 
-        let returnInfo = SynType.createLongIdent typeName
+        let returnInfo =
+            SynBindingReturnInfo.Create (SynType.LongIdent (SynLongIdent.CreateFromLongIdent typeName))
 
-        let inputArg = "node"
-        let functionName = Ident.create "jsonParse"
-
-        let arg =
-            SynPat.named inputArg
-            |> SynPat.annotateType (SynType.createLongIdent' [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ])
+        let inputArg = Ident.Create "node"
+        let functionName = Ident.Create "jsonParse"
 
+        let inputVal =
+            let memberFlags =
                 if spec.ExtensionMethods then
-            let binding =
-                SynBinding.basic [ functionName ] [ arg ] functionBody
-                |> SynBinding.withXmlDoc xmlDoc
-                |> SynBinding.withReturnAnnotation returnInfo
-                |> SynMemberDefn.staticMember
-
-            let componentInfo =
-                SynComponentInfo.createLong typeName
-                |> SynComponentInfo.withDocString (PreXmlDoc.create "Extension methods for JSON parsing")
-
-            let containingType =
-                SynTypeDefnRepr.augmentation ()
-                |> SynTypeDefn.create componentInfo
-                |> SynTypeDefn.withMemberDefns [ binding ]
-
-            SynModuleDecl.Types ([ containingType ], range0)
+                    {
+                        SynMemberFlags.IsInstance = false
+                        SynMemberFlags.IsDispatchSlot = false
+                        SynMemberFlags.IsOverrideOrExplicitImpl = false
+                        SynMemberFlags.IsFinal = false
+                        SynMemberFlags.GetterOrSetterIsCompilerGenerated = false
+                        SynMemberFlags.MemberKind = SynMemberKind.Member
+                    }
+                    |> Some
                 else
-            SynBinding.basic [ functionName ] [ arg ] functionBody
-            |> SynBinding.withXmlDoc xmlDoc
-            |> SynBinding.withReturnAnnotation returnInfo
-            |> SynModuleDecl.createLet
+                    None
 
-    let getParseOptions (fieldAttrs : SynAttribute list) =
-        (JsonParseOption.None, fieldAttrs)
+            let thisIdOpt = if spec.ExtensionMethods then None else Some inputArg
+
+            SynValData.SynValData (
+                memberFlags,
+                SynValInfo.SynValInfo ([ [ SynArgInfo.CreateId functionName ] ], SynArgInfo.Empty),
+                thisIdOpt
+            )
+
+        let assignments =
+            fields
+            |> List.map (fun (SynField (attrs, _, id, fieldType, _, _, _, _, _)) ->
+                let id =
+                    match id with
+                    | None -> failwith "didn't get an ID on field"
+                    | Some id -> id
+
+                let attrs = attrs |> List.collect (fun l -> l.Attributes)
+
+                let propertyNameAttr =
+                    attrs
+                    |> List.tryFind (fun attr ->
+                        attr.TypeName.AsString.EndsWith ("JsonPropertyName", StringComparison.Ordinal)
+                    )
+
+                let options =
+                    (JsonParseOption.None, attrs)
                     ||> List.fold (fun options attr ->
-            if
-                (SynLongIdent.toString attr.TypeName)
-                    .EndsWith ("JsonNumberHandling", StringComparison.Ordinal)
-            then
+                        if attr.TypeName.AsString.EndsWith ("JsonNumberHandling", StringComparison.Ordinal) then
                             let qualifiedEnumValue =
                                 match SynExpr.stripOptionalParen attr.ArgExpr with
-                    | SynExpr.LongIdent (_, SynLongIdent (ident, _, _), _, _) when isJsonNumberHandling ident ->
+                                | SynExpr.LongIdent (_, SynLongIdent (ident, _, _), _, _) when
+                                    isJsonNumberHandling ident
+                                    ->
                                     // Make sure it's fully qualified
-                        SynExpr.createLongIdent
+                                    SynExpr.CreateLongIdent (
+                                        SynLongIdent.Create
                                             [
                                                 "System"
                                                 "Text"
@@ -365,6 +419,7 @@ module internal JsonParseGenerator =
                                                 "JsonNumberHandling"
                                                 "AllowReadingFromString"
                                             ]
+                                    )
                                 | _ -> attr.ArgExpr
 
                             {
@@ -374,190 +429,160 @@ module internal JsonParseGenerator =
                             options
                     )
 
-    let createRecordMaker (spec : JsonParseOutputSpec) (fields : SynFieldData<Ident> list) =
-        let assignments =
-            fields
-            |> List.mapi (fun i fieldData ->
-                let propertyNameAttr =
-                    fieldData.Attrs
-                    |> List.tryFind (fun attr ->
-                        (SynLongIdent.toString attr.TypeName)
-                            .EndsWith ("JsonPropertyName", StringComparison.Ordinal)
-                    )
-
-                let options = getParseOptions fieldData.Attrs
-
                 let propertyName =
                     match propertyNameAttr with
                     | None ->
-                        let sb = StringBuilder fieldData.Ident.idText.Length
+                        let sb = StringBuilder id.idText.Length
+                        sb.Append (Char.ToLowerInvariant id.idText.[0]) |> ignore
 
-                        sb.Append (Char.ToLowerInvariant fieldData.Ident.idText.[0])
-                        |> ignore<StringBuilder>
+                        if id.idText.Length > 1 then
+                            sb.Append id.idText.[1..] |> ignore
 
-                        if fieldData.Ident.idText.Length > 1 then
-                            sb.Append (fieldData.Ident.idText.Substring 1) |> ignore<StringBuilder>
-
-                        sb.ToString () |> SynExpr.CreateConst
+                        sb.ToString () |> SynConst.CreateString |> SynExpr.CreateConst
                     | Some name -> name.ArgExpr
 
-                createParseRhs options propertyName fieldData.Type
-                |> SynBinding.basic [ Ident.create $"arg_%i{i}" ] []
+                let pattern =
+                    SynPat.LongIdent (
+                        SynLongIdent.CreateFromLongIdent [ id ],
+                        None,
+                        None,
+                        SynArgPats.Empty,
+                        None,
+                        range0
+                    )
+
+                SynBinding.Let (
+                    isInline = false,
+                    isMutable = false,
+                    expr = createParseRhs options propertyName fieldType,
+                    valData = inputVal,
+                    pattern = pattern
+                )
             )
 
         let finalConstruction =
             fields
-            |> List.mapi (fun i fieldData -> SynLongIdent.createI fieldData.Ident, SynExpr.createIdent $"arg_%i{i}")
+            |> List.map (fun (SynField (_, _, id, _, _, _, _, _, _)) ->
+                let id =
+                    match id with
+                    | None -> failwith "Expected record field to have an identifying name"
+                    | Some id -> id
+
+                (SynLongIdent.CreateFromLongIdent [ id ], true),
+                Some (SynExpr.CreateLongIdent (SynLongIdent.CreateFromLongIdent [ id ]))
+            )
             |> AstHelper.instantiateRecord
 
+        let assignments =
             (finalConstruction, assignments)
-        ||> List.fold (fun final assignment -> SynExpr.createLet [ assignment ] final)
+            ||> List.fold (fun final assignment ->
+                SynExpr.LetOrUse (
+                    false,
+                    false,
+                    [ assignment ],
+                    final,
+                    range0,
+                    {
+                        InKeyword = None
+                    }
+                )
+            )
 
-    let createUnionMaker (spec : JsonParseOutputSpec) (typeName : LongIdent) (fields : UnionCase<Ident> list) =
-        fields
-        |> List.map (fun case ->
-            let propertyName = JsonSerializeGenerator.getPropertyName case.Ident case.Attrs
+        let pattern =
+            SynPat.LongIdent (
+                SynLongIdent.CreateFromLongIdent [ functionName ],
+                None,
+                None,
+                SynArgPats.Pats
+                    [
+                        SynPat.CreateTyped (
+                            SynPat.CreateNamed inputArg,
+                            SynType.LongIdent (
+                                SynLongIdent.Create [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
+                            )
+                        )
+                        |> SynPat.CreateParen
+                    ],
+                None,
+                range0
+            )
 
-            let body =
-                if case.Fields.IsEmpty then
-                    SynExpr.createLongIdent' (typeName @ [ case.Ident ])
+        if spec.ExtensionMethods then
+            let binding =
+                SynBinding.SynBinding (
+                    None,
+                    SynBindingKind.Normal,
+                    false,
+                    false,
+                    [],
+                    xmlDoc,
+                    inputVal,
+                    pattern,
+                    Some returnInfo,
+                    assignments,
+                    range0,
+                    DebugPointAtBinding.NoneAtInvisible,
+                    {
+                        LeadingKeyword = SynLeadingKeyword.StaticMember (range0, range0)
+                        InlineKeyword = None
+                        EqualsRange = Some range0
+                    }
+                )
+
+            let mem = SynMemberDefn.Member (binding, range0)
+
+            let containingType =
+                SynTypeDefn.SynTypeDefn (
+                    SynComponentInfo.Create (typeName, xmldoc = PreXmlDoc.Create "Extension methods for JSON parsing"),
+                    SynTypeDefnRepr.ObjectModel (SynTypeDefnKind.Augmentation range0, [], range0),
+                    [ mem ],
+                    None,
+                    range0,
+                    {
+                        LeadingKeyword = SynTypeDefnLeadingKeyword.Type range0
+                        EqualsRange = None
+                        WithKeyword = None
+                    }
+                )
+
+            SynModuleDecl.Types ([ containingType ], range0)
         else
-                    case.Fields
-                    |> List.map (fun field ->
-                        let propertyName = JsonSerializeGenerator.getPropertyName field.Ident field.Attrs
-                        let options = getParseOptions field.Attrs
-                        createParseRhs options propertyName field.Type
-                    )
-                    |> SynExpr.tuple
-                    |> SynExpr.applyFunction (SynExpr.createLongIdent' (typeName @ [ case.Ident ]))
-                    |> SynExpr.createLet
-                        [
-                            SynExpr.index (SynExpr.CreateConst "data") (SynExpr.createIdent "node")
-                            |> assertNotNull (SynExpr.CreateConst "data")
-                            |> SynBinding.basic [ Ident.create "node" ] []
-                        ]
-
-            match propertyName with
-            | SynExpr.Const (synConst, _) ->
-                SynMatchClause.SynMatchClause (
-                    SynPat.createConst synConst,
-                    None,
-                    body,
-                    range0,
-                    DebugPointAtTarget.Yes,
-                    {
-                        ArrowRange = Some range0
-                        BarRange = Some range0
-                    }
-                )
-            | _ ->
-                SynMatchClause.create (SynPat.named "x") body
-                |> SynMatchClause.withWhere (SynExpr.equals (SynExpr.createIdent "x") propertyName)
-        )
-        |> fun l ->
-            l
-            @ [
-                let fail =
-                    SynExpr.plus (SynExpr.CreateConst "Unrecognised 'type' field value: ") (SynExpr.createIdent "v")
-                    |> SynExpr.paren
-                    |> SynExpr.applyFunction (SynExpr.createIdent "failwith")
-
-                SynMatchClause.SynMatchClause (
-                    SynPat.named "v",
-                    None,
-                    fail,
-                    range0,
-                    DebugPointAtTarget.Yes,
-                    {
-                        ArrowRange = Some range0
-                        BarRange = Some range0
-                    }
-                )
-            ]
-        |> SynExpr.createMatch (SynExpr.createIdent "ty")
-        |> SynExpr.createLet
-            [
-                let property = SynExpr.CreateConst "type"
-
-                SynExpr.createIdent "node"
-                |> SynExpr.index property
-                |> assertNotNull property
-                |> SynExpr.pipeThroughFunction (
-                    SynExpr.createLambda
-                        "v"
-                        (SynExpr.callGenericMethod "GetValue" [ Ident.create "string" ] (SynExpr.createIdent "v"))
-                )
-                |> SynBinding.basic [ Ident.create "ty" ] []
-            ]
-
-    let createEnumMaker
-        (spec : JsonParseOutputSpec)
-        (typeName : LongIdent)
-        (fields : (Ident * SynExpr) list)
-        : SynExpr
-        =
-        let numberKind =
-            [ "System" ; "Text" ; "Json" ; "JsonValueKind" ; "Number" ]
-            |> List.map Ident.create
-
-        let stringKind =
-            [ "System" ; "Text" ; "Json" ; "JsonValueKind" ; "String" ]
-            |> List.map Ident.create
-
-        let fail =
-            SynExpr.plus
-                (SynExpr.CreateConst "Unrecognised kind for enum of type: ")
-                (SynExpr.CreateConst (typeName |> List.map _.idText |> String.concat "."))
-            |> SynExpr.paren
-            |> SynExpr.applyFunction (SynExpr.createIdent "failwith")
-
-        let failString =
-            SynExpr.plus (SynExpr.CreateConst "Unrecognised value for enum: %i") (SynExpr.createIdent "v")
-            |> SynExpr.paren
-            |> SynExpr.applyFunction (SynExpr.createIdent "failwith")
-
-        let parseString =
-            fields
-            |> List.map (fun (ident, _) ->
-                SynMatchClause.create
-                    (SynPat.createConst (
-                        SynConst.String (ident.idText.ToLowerInvariant (), SynStringKind.Regular, range0)
-                    ))
-                    (SynExpr.createLongIdent' (typeName @ [ ident ]))
-            )
-            |> fun l -> l @ [ SynMatchClause.create (SynPat.named "v") failString ]
-            |> SynExpr.createMatch (
-                asValueGetValue None "string" (SynExpr.createIdent "node")
-                |> SynExpr.callMethod "ToLowerInvariant"
+            let binding =
+                SynBinding.Let (
+                    isInline = false,
+                    isMutable = false,
+                    xmldoc = xmlDoc,
+                    returnInfo = returnInfo,
+                    expr = assignments,
+                    valData = inputVal,
+                    pattern = pattern
                 )
 
-        [
-            SynMatchClause.create
-                (SynPat.identWithArgs numberKind (SynArgPats.create []))
-                (asValueGetValue None "int" (SynExpr.createIdent "node")
-                 |> SynExpr.pipeThroughFunction (
-                     SynExpr.typeApp [ SynType.createLongIdent typeName ] (SynExpr.createIdent "enum")
-                 ))
-            SynMatchClause.create (SynPat.identWithArgs stringKind (SynArgPats.create [])) parseString
-            SynMatchClause.create (SynPat.named "_") fail
-        ]
-        |> SynExpr.createMatch (SynExpr.callMethod "GetValueKind" (SynExpr.createIdent "node"))
+            SynModuleDecl.CreateLet [ binding ]
 
-    let createModule (namespaceId : LongIdent) (spec : JsonParseOutputSpec) (typeDefn : SynTypeDefn) =
+    let createRecordModule (namespaceId : LongIdent) (spec : JsonParseOutputSpec) (typeDefn : SynTypeDefn) =
         let (SynTypeDefn (synComponentInfo, synTypeDefnRepr, _members, _implicitCtor, _, _)) =
             typeDefn
 
-        let (SynComponentInfo (_attributes, _typeParams, _constraints, ident, _, _preferPostfix, access, _)) =
+        let (SynComponentInfo (_attributes, _typeParams, _constraints, recordId, _, _preferPostfix, _access, _)) =
             synComponentInfo
 
+        match synTypeDefnRepr with
+        | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (_accessibility, recordFields, _recordRange), _) ->
+
+            let decls = [ createMaker spec recordId recordFields ]
+
             let attributes =
                 if spec.ExtensionMethods then
-                [ SynAttribute.autoOpen ]
+                    [ SynAttributeList.Create SynAttribute.autoOpen ]
                 else
-                [ SynAttribute.requireQualifiedAccess ; SynAttribute.compilationRepresentation ]
+                    [
+                        SynAttributeList.Create (SynAttribute.RequireQualifiedAccess ())
+                        SynAttributeList.Create SynAttribute.compilationRepresentation
+                    ]
 
             let xmlDoc =
-            let fullyQualified = ident |> Seq.map (fun i -> i.idText) |> String.concat "."
+                let fullyQualified = recordId |> Seq.map (fun i -> i.idText) |> String.concat "."
 
                 let description =
                     if spec.ExtensionMethods then
@@ -566,58 +591,30 @@ module internal JsonParseGenerator =
                         "methods"
 
                 $" Module containing JSON parsing %s{description} for the %s{fullyQualified} type"
-            |> PreXmlDoc.create
+                |> PreXmlDoc.Create
 
             let moduleName =
                 if spec.ExtensionMethods then
-                match ident with
+                    match recordId with
                     | [] -> failwith "unexpectedly got an empty identifier for record name"
-                | ident ->
+                    | recordId ->
                         let expanded =
-                        List.last ident
+                            List.last recordId
                             |> fun i -> i.idText
                             |> fun s -> s + "JsonParseExtension"
-                        |> Ident.create
+                            |> Ident.Create
 
-                    List.take (List.length ident - 1) ident @ [ expanded ]
+                        List.take (List.length recordId - 1) recordId @ [ expanded ]
                 else
-                ident
+                    recordId
 
             let info =
-            SynComponentInfo.createLong moduleName
-            |> SynComponentInfo.withDocString xmlDoc
-            |> SynComponentInfo.setAccessibility access
-            |> SynComponentInfo.addAttributes attributes
+                SynComponentInfo.Create (moduleName, attributes = attributes, xmldoc = xmlDoc)
 
-        let decl =
-            match synTypeDefnRepr with
-            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (_accessibility, fields, _range), _) ->
-                fields |> List.map SynField.extractWithIdent |> createRecordMaker spec
-            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Union (_accessibility, cases, _range), _) ->
-                let optionGet (i : Ident option) =
-                    match i with
-                    | None -> failwith "WoofWare.Myriad requires union cases to have identifiers on each field."
-                    | Some i -> i
+            let mdl = SynModuleDecl.CreateNestedModule (info, decls)
 
-                cases
-                |> List.map SynUnionCase.extract
-                |> List.map (UnionCase.mapIdentFields optionGet)
-                |> createUnionMaker spec ident
-            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Enum (cases, _range), _) ->
-                cases
-                |> List.map (fun c ->
-                    match c with
-                    | SynEnumCase.SynEnumCase (_, SynIdent.SynIdent (ident, _), value, _, _, _) -> ident, value
-                )
-                |> createEnumMaker spec ident
-            | _ -> failwithf "Not a record or union type"
-
-        [ scaffolding spec ident decl ]
-        |> SynModuleDecl.nestedModule info
-        |> List.singleton
-        |> SynModuleOrNamespace.createNamespace namespaceId
-
-open Myriad.Core
+            SynModuleOrNamespace.CreateNamespace (namespaceId, decls = [ mdl ])
+        | _ -> failwithf "Not a record type"
 
 /// Myriad generator that provides a method (possibly an extension method) for a record type,
 /// containing a JSON parse function.
@@ -631,21 +628,10 @@ type JsonParseGenerator () =
             let ast, _ =
                 Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
 
-            let relevantTypes =
-                Ast.extractTypeDefn 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
-                        else None
-                    )
-                    |> fun defns -> name, defns
-                )
+            let records = Ast.extractRecords ast
 
-            let namespaceAndTypes =
-                relevantTypes
+            let namespaceAndRecords =
+                records
                 |> List.choose (fun (ns, types) ->
                     types
                     |> List.choose (fun typeDef ->
@@ -658,7 +644,7 @@ type JsonParseGenerator () =
                                 | SynExpr.Const (SynConst.Unit, _) -> JsonParseAttribute.DefaultIsExtensionMethod
                                 | arg ->
                                     failwith
-                                        $"Unrecognised argument %+A{arg} to [<%s{nameof JsonParseAttribute}>]. Literals are not supported. Use `true` or `false` (or unit) only."
+                                        $"Unrecognised argument %+A{arg} to [<JsonParseAttribute>]. Literals are not supported. Use `true` or `false` (or unit) only."
 
                             let spec =
                                 {
@@ -673,9 +659,13 @@ type JsonParseGenerator () =
                 )
 
             let modules =
-                namespaceAndTypes
-                |> List.collect (fun (ns, types) ->
-                    types |> List.map (fun (ty, spec) -> JsonParseGenerator.createModule ns spec ty)
+                namespaceAndRecords
+                |> List.collect (fun (ns, records) ->
+                    records
+                    |> List.map (fun (record, spec) ->
+                        let recordModule = JsonParseGenerator.createRecordModule ns spec record
+                        recordModule
+                    )
                 )
 
             Output.Ast modules

WoofWare.Myriad.Plugins/JsonSerializeGenerator.fs

@@ -1,536 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System
-open System.Text
-open Fantomas.FCS.Syntax
-
-type internal JsonSerializeOutputSpec =
-    {
-        ExtensionMethods : bool
-    }
-
-[<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" ])
-
-    /// 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 =
-        // TODO: serialization format for DateTime etc
-        match fieldType with
-        | DateOnly
-        | DateTime
-        | NumberType _
-        | Measure _
-        | PrimitiveType _
-        | Guid
-        | Uri ->
-            // JsonValue.Create<type>
-            SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ]
-            |> SynExpr.typeApp [ fieldType ]
-            |> fun e -> e, false
-        | DateTimeOffset ->
-            // fun field -> field.ToString("o") |> JsonValue.Create<string>
-            let create =
-                SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ]
-                |> SynExpr.typeApp [ SynType.named "string" ]
-
-            SynExpr.createIdent "field"
-            |> SynExpr.callMethodArg "ToString" (SynExpr.CreateConst "o")
-            |> 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
-            [
-                SynExpr.ForEach (
-                    DebugPointAtFor.Yes range0,
-                    DebugPointAtInOrTo.Yes range0,
-                    SeqExprOnly.SeqExprOnly false,
-                    true,
-                    SynPat.named "mem",
-                    SynExpr.createIdent "field",
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "arr" ; "Add" ])
-                        (SynExpr.paren (SynExpr.applyFunction (fst (serializeNode ty)) (SynExpr.createIdent "mem"))),
-                    range0
-                )
-                SynExpr.createIdent "arr"
-            ]
-            |> SynExpr.sequential
-            |> SynExpr.createLet
-                [
-                    SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonArray" ]
-                    |> SynExpr.applyTo (SynExpr.CreateConst ())
-                    |> SynBinding.basic [ Ident.create "arr" ] []
-                ]
-            |> SynExpr.createLambda "field"
-            |> fun e -> e, false
-        | 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
-            [
-                SynExpr.ForEach (
-                    DebugPointAtFor.Yes range0,
-                    DebugPointAtInOrTo.Yes range0,
-                    SeqExprOnly.SeqExprOnly false,
-                    true,
-                    SynPat.paren (SynPat.nameWithArgs "KeyValue" [ SynPat.named "key" ; SynPat.named "value" ]),
-                    SynExpr.createIdent "field",
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "ret" ; "Add" ])
-                        (SynExpr.tuple
-                            [
-                                SynExpr.createLongIdent [ "key" ; "ToString" ]
-                                |> SynExpr.applyTo (SynExpr.CreateConst ())
-                                SynExpr.applyFunction (fst (serializeNode valueType)) (SynExpr.createIdent "value")
-                            ]),
-                    range0
-                )
-                SynExpr.createIdent "ret"
-            ]
-            |> SynExpr.sequential
-            |> SynExpr.createLet
-                [
-                    SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonObject" ]
-                    |> SynExpr.applyTo (SynExpr.CreateConst ())
-                    |> SynBinding.basic [ Ident.create "ret" ] []
-                ]
-            |> SynExpr.createLambda "field"
-            |> fun e -> e, false
-        | _ ->
-            // {type}.toJsonNode
-            let typeName =
-                match fieldType with
-                | SynType.LongIdent ident -> ident.LongIdent
-                | _ -> failwith $"Unrecognised type: %+A{fieldType}"
-
-            SynExpr.createLongIdent' (typeName @ [ Ident.create "toJsonNode" ]), true
-
-    /// 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
-        ]
-        |> SynExpr.tuple
-        |> SynExpr.applyFunction (SynExpr.createLongIdent [ "node" ; "Add" ])
-
-    let getPropertyName (fieldId : Ident) (attrs : SynAttribute list) : SynExpr =
-        let propertyNameAttr =
-            attrs
-            |> List.tryFind (fun attr ->
-                (SynLongIdent.toString attr.TypeName)
-                    .EndsWith ("JsonPropertyName", StringComparison.Ordinal)
-            )
-
-        match propertyNameAttr with
-        | None ->
-            let sb = StringBuilder fieldId.idText.Length
-            sb.Append (Char.ToLowerInvariant fieldId.idText.[0]) |> ignore
-
-            if fieldId.idText.Length > 1 then
-                sb.Append fieldId.idText.[1..] |> ignore
-
-            sb.ToString () |> SynExpr.CreateConst
-        | Some name -> name.ArgExpr
-
-    /// `populateNode` will be inserted before we return the `node` variable.
-    ///
-    /// That is, we give you access to a `JsonObject` called `node`,
-    /// and you have access to a variable `inputArgName` which is of type `typeName`.
-    /// Your job is to provide a `populateNode` expression which has the side effect
-    /// of mutating `node` to faithfully reflect the value of `inputArgName`.
-    let scaffolding
-        (spec : JsonSerializeOutputSpec)
-        (typeName : LongIdent)
-        (inputArgName : Ident)
-        (populateNode : SynExpr)
-        : SynModuleDecl
-        =
-        let xmlDoc = PreXmlDoc.create "Serialize to a JSON node"
-
-        let returnInfo =
-            SynLongIdent.createS' [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
-            |> SynType.LongIdent
-
-        let functionName = Ident.create "toJsonNode"
-
-        let assignments =
-            [
-                populateNode
-                SynExpr.Upcast (SynExpr.createIdent "node", SynType.Anon range0, range0)
-            ]
-            |> SynExpr.sequential
-            |> SynExpr.createLet
-                [
-                    SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonObject" ]
-                    |> SynExpr.applyTo (SynExpr.CreateConst ())
-                    |> SynBinding.basic [ Ident.create "node" ] []
-                ]
-
-        let pattern =
-            SynPat.namedI inputArgName
-            |> SynPat.annotateType (SynType.LongIdent (SynLongIdent.create typeName))
-
-        if spec.ExtensionMethods then
-            let componentInfo =
-                SynComponentInfo.createLong typeName
-                |> SynComponentInfo.withDocString (PreXmlDoc.create "Extension methods for JSON parsing")
-
-            let memberDef =
-                assignments
-                |> SynBinding.basic [ functionName ] [ pattern ]
-                |> SynBinding.withXmlDoc xmlDoc
-                |> SynBinding.withReturnAnnotation returnInfo
-                |> SynMemberDefn.staticMember
-
-            let containingType =
-                SynTypeDefnRepr.augmentation ()
-                |> SynTypeDefn.create componentInfo
-                |> SynTypeDefn.withMemberDefns [ memberDef ]
-
-            SynModuleDecl.Types ([ containingType ], range0)
-        else
-            assignments
-            |> SynBinding.basic [ functionName ] [ pattern ]
-            |> SynBinding.withReturnAnnotation returnInfo
-            |> SynBinding.withXmlDoc xmlDoc
-            |> SynModuleDecl.createLet
-
-    let recordModule (spec : JsonSerializeOutputSpec) (_typeName : LongIdent) (fields : SynField list) =
-        let fields = fields |> List.map SynField.extractWithIdent
-
-        fields
-        |> List.map (fun fieldData ->
-            let propertyName = getPropertyName fieldData.Ident fieldData.Attrs
-            createSerializeRhsRecord propertyName fieldData.Ident fieldData.Type
-        )
-        |> SynExpr.sequential
-        |> fun expr -> SynExpr.Do (expr, range0)
-
-    let unionModule (spec : JsonSerializeOutputSpec) (typeName : LongIdent) (cases : SynUnionCase list) =
-        let inputArg = Ident.create "input"
-        let fields = cases |> List.map SynUnionCase.extract
-
-        fields
-        |> List.map (fun unionCase ->
-            let propertyName = getPropertyName unionCase.Ident unionCase.Attrs
-
-            let caseNames = unionCase.Fields |> List.mapi (fun i _ -> $"arg%i{i}")
-
-            let argPats = SynArgPats.createNamed caseNames
-
-            let pattern =
-                SynPat.LongIdent (
-                    SynLongIdent.create (typeName @ [ unionCase.Ident ]),
-                    None,
-                    None,
-                    argPats,
-                    None,
-                    range0
-                )
-
-            let typeLine =
-                [
-                    SynExpr.CreateConst "type"
-                    SynExpr.applyFunction
-                        (SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ])
-                        propertyName
-                ]
-                |> SynExpr.tuple
-                |> SynExpr.applyFunction (SynExpr.createLongIdent [ "node" ; "Add" ])
-
-            let dataNode =
-                SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonObject" ]
-                |> SynExpr.applyTo (SynExpr.CreateConst ())
-                |> SynBinding.basic [ Ident.create "dataNode" ] []
-
-            let dataBindings =
-                (unionCase.Fields, caseNames)
-                ||> List.zip
-                |> List.map (fun (fieldData, caseName) ->
-                    let propertyName = getPropertyName (Option.get fieldData.Ident) fieldData.Attrs
-
-                    let node =
-                        SynExpr.applyFunction (fst (serializeNode fieldData.Type)) (SynExpr.createIdent caseName)
-
-                    [ propertyName ; node ]
-                    |> SynExpr.tuple
-                    |> SynExpr.applyFunction (SynExpr.createLongIdent [ "dataNode" ; "Add" ])
-                )
-
-            let assignToNode =
-                [ SynExpr.CreateConst "data" ; SynExpr.createIdent "dataNode" ]
-                |> SynExpr.tuple
-                |> SynExpr.applyFunction (SynExpr.createLongIdent [ "node" ; "Add" ])
-
-            let dataNode =
-                SynExpr.sequential (dataBindings @ [ assignToNode ])
-                |> SynExpr.createLet [ dataNode ]
-
-            let action =
-                [
-                    yield typeLine
-                    if not dataBindings.IsEmpty then
-                        yield dataNode
-                ]
-                |> SynExpr.sequential
-
-            SynMatchClause.create pattern action
-        )
-        |> SynExpr.createMatch (SynExpr.createIdent' inputArg)
-
-    let enumModule
-        (spec : JsonSerializeOutputSpec)
-        (typeName : LongIdent)
-        (cases : (Ident * SynExpr) list)
-        : SynModuleDecl
-        =
-        let fail =
-            SynExpr.CreateConst "Unrecognised value for enum: %O"
-            |> SynExpr.applyFunction (SynExpr.createIdent "sprintf")
-            |> SynExpr.applyTo (SynExpr.createIdent "v")
-            |> SynExpr.paren
-            |> SynExpr.applyFunction (SynExpr.createIdent "failwith")
-
-        let body =
-            cases
-            |> List.map (fun (caseName, value) ->
-                value
-                |> SynExpr.applyFunction (
-                    SynExpr.createLongIdent [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonValue" ; "Create" ]
-                )
-                |> SynMatchClause.create (SynPat.identWithArgs (typeName @ [ caseName ]) (SynArgPats.create []))
-            )
-            |> fun l -> l @ [ SynMatchClause.create (SynPat.named "v") fail ]
-            |> SynExpr.createMatch (SynExpr.createIdent "input")
-
-        let xmlDoc = PreXmlDoc.create "Serialize to a JSON node"
-
-        let returnInfo =
-            SynLongIdent.createS' [ "System" ; "Text" ; "Json" ; "Nodes" ; "JsonNode" ]
-            |> SynType.LongIdent
-
-        let functionName = Ident.create "toJsonNode"
-
-        let pattern =
-            SynPat.named "input"
-            |> SynPat.annotateType (SynType.LongIdent (SynLongIdent.create typeName))
-
-        if spec.ExtensionMethods then
-            let componentInfo =
-                SynComponentInfo.createLong typeName
-                |> SynComponentInfo.withDocString (PreXmlDoc.create "Extension methods for JSON parsing")
-
-            let memberDef =
-                body
-                |> SynBinding.basic [ functionName ] [ pattern ]
-                |> SynBinding.withXmlDoc xmlDoc
-                |> SynBinding.withReturnAnnotation returnInfo
-                |> SynMemberDefn.staticMember
-
-            let containingType =
-                SynTypeDefnRepr.augmentation ()
-                |> SynTypeDefn.create componentInfo
-                |> SynTypeDefn.withMemberDefns [ memberDef ]
-
-            SynModuleDecl.Types ([ containingType ], range0)
-        else
-            body
-            |> SynBinding.basic [ functionName ] [ pattern ]
-            |> SynBinding.withReturnAnnotation returnInfo
-            |> SynBinding.withXmlDoc xmlDoc
-            |> SynModuleDecl.createLet
-
-    let createModule
-        (namespaceId : LongIdent)
-        (opens : SynOpenDeclTarget list)
-        (spec : JsonSerializeOutputSpec)
-        (typeDefn : SynTypeDefn)
-        =
-        let (SynTypeDefn (synComponentInfo, synTypeDefnRepr, _members, _implicitCtor, _, _)) =
-            typeDefn
-
-        let (SynComponentInfo (_attributes, _typeParams, _constraints, ident, _, _preferPostfix, access, _)) =
-            synComponentInfo
-
-        let attributes =
-            if spec.ExtensionMethods then
-                [ SynAttribute.autoOpen ]
-            else
-                [ SynAttribute.requireQualifiedAccess ; SynAttribute.compilationRepresentation ]
-
-        let xmlDoc =
-            let fullyQualified = ident |> Seq.map (fun i -> i.idText) |> String.concat "."
-
-            let description =
-                if spec.ExtensionMethods then
-                    "extension members"
-                else
-                    "methods"
-
-            $"Module containing JSON serializing %s{description} for the %s{fullyQualified} type"
-            |> PreXmlDoc.create
-
-        let moduleName =
-            if spec.ExtensionMethods then
-                match ident with
-                | [] -> failwith "unexpectedly got an empty identifier for type name"
-                | ident ->
-                    let expanded =
-                        List.last ident
-                        |> fun i -> i.idText
-                        |> fun s -> s + "JsonSerializeExtension"
-                        |> Ident.create
-
-                    List.take (List.length ident - 1) ident @ [ expanded ]
-            else
-                ident
-
-        let info =
-            SynComponentInfo.createLong moduleName
-            |> SynComponentInfo.addAttributes attributes
-            |> SynComponentInfo.setAccessibility access
-            |> SynComponentInfo.withDocString xmlDoc
-
-        let decls =
-            match synTypeDefnRepr with
-            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (_accessibility, recordFields, _range), _) ->
-                recordModule spec ident recordFields
-                |> scaffolding spec ident (Ident.create "input")
-            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Union (_accessibility, unionFields, _range), _) ->
-                unionModule spec ident unionFields
-                |> scaffolding spec ident (Ident.create "input")
-            | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Enum (cases, _range), _) ->
-                cases
-                |> List.map (fun c ->
-                    match c with
-                    | SynEnumCase.SynEnumCase (_, SynIdent.SynIdent (ident, _), value, _, _, _) -> ident, value
-                )
-                |> enumModule spec ident
-            | ty -> failwithf "Unsupported type: got %O" ty
-
-        [
-            yield! opens |> List.map SynModuleDecl.openAny
-            yield decls |> List.singleton |> SynModuleDecl.nestedModule info
-        ]
-        |> SynModuleOrNamespace.createNamespace namespaceId
-
-open Myriad.Core
-
-/// Myriad generator that provides a method (possibly an extension method) for a record type,
-/// containing a JSON serialization function.
-[<MyriadGenerator("json-serialize")>]
-type JsonSerializeGenerator () =
-
-    interface IMyriadGenerator with
-        member _.ValidInputExtensions = [ ".fs" ]
-
-        member _.Generate (context : GeneratorContext) =
-            let ast, _ =
-                Ast.fromFilename context.InputFilename |> Async.RunSynchronously |> Array.head
-
-            let relevantTypes =
-                Ast.extractTypeDefn 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
-                        else None
-                    )
-                    |> fun defns -> name, defns
-                )
-
-            let namespaceAndTypes =
-                relevantTypes
-                |> List.choose (fun (ns, types) ->
-                    types
-                    |> List.choose (fun typeDef ->
-                        match Ast.getAttribute<JsonSerializeAttribute> typeDef with
-                        | None -> None
-                        | Some attr ->
-                            let arg =
-                                match SynExpr.stripOptionalParen attr.ArgExpr with
-                                | SynExpr.Const (SynConst.Bool value, _) -> value
-                                | SynExpr.Const (SynConst.Unit, _) -> JsonSerializeAttribute.DefaultIsExtensionMethod
-                                | arg ->
-                                    failwith
-                                        $"Unrecognised argument %+A{arg} to [<%s{nameof JsonSerializeAttribute}>]. Literals are not supported. Use `true` or `false` (or unit) only."
-
-                            let spec =
-                                {
-                                    ExtensionMethods = arg
-                                }
-
-                            Some (typeDef, spec)
-                    )
-                    |> function
-                        | [] -> None
-                        | ty -> Some (ns, ty)
-                )
-
-            let opens = AstHelper.extractOpens ast
-
-            let modules =
-                namespaceAndTypes
-                |> List.collect (fun (ns, types) ->
-                    types
-                    |> List.map (fun (ty, spec) -> JsonSerializeGenerator.createModule ns opens spec ty)
-                )
-
-            Output.Ast modules

WoofWare.Myriad.Plugins/List.fs

@@ -1,14 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-[<RequireQualifiedAccess>]
-module private List =
-    let partitionChoice<'a, 'b> (xs : Choice<'a, 'b> list) : 'a list * 'b list =
-        let xs, ys =
-            (([], []), xs)
-            ||> List.fold (fun (xs, ys) v ->
-                match v with
-                | Choice1Of2 x -> x :: xs, ys
-                | Choice2Of2 y -> xs, y :: ys
-            )
-
-        List.rev xs, List.rev ys

WoofWare.Myriad.Plugins/Measure.fs

@@ -1,24 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-
-[<RequireQualifiedAccess>]
-module internal Measure =
-
-    let getLanguagePrimitivesMeasure (typeName : LongIdent) : SynExpr =
-        match typeName |> List.map _.idText with
-        | [ "System" ; "Single" ] -> [ "LanguagePrimitives" ; "Float32WithMeasure" ]
-        | [ "System" ; "Double" ] -> [ "LanguagePrimitives" ; "FloatWithMeasure" ]
-        | [ "System" ; "Byte" ] -> [ "LanguagePrimitives" ; "ByteWithMeasure" ]
-        | [ "System" ; "SByte" ] -> [ "LanguagePrimitives" ; "SByteWithMeasure" ]
-        | [ "System" ; "Int16" ] -> [ "LanguagePrimitives" ; "Int16WithMeasure" ]
-        | [ "System" ; "Int32" ] -> [ "LanguagePrimitives" ; "Int32WithMeasure" ]
-        | [ "System" ; "Int64" ] -> [ "LanguagePrimitives" ; "Int64WithMeasure" ]
-        | [ "System" ; "UInt16" ] -> [ "LanguagePrimitives" ; "UInt16WithMeasure" ]
-        | [ "System" ; "UInt32" ] -> [ "LanguagePrimitives" ; "UInt32WithMeasure" ]
-        | [ "System" ; "UInt64" ] -> [ "LanguagePrimitives" ; "UInt64WithMeasure" ]
-        | l ->
-            let l = String.concat "." l
-            failwith $"unrecognised type for measure: %s{l}"
-
-        |> SynExpr.createLongIdent

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,11 +1,21 @@
 namespace WoofWare.Myriad.Plugins
 
+open System
 open Fantomas.FCS.Syntax
+open Fantomas.FCS.SyntaxTrivia
 open Fantomas.FCS.Xml
+open Myriad.Core
+
+/// Attribute indicating a record type to which the "Remove Options" Myriad
+/// generator should apply during build.
+/// The purpose of this generator is to strip the `option` modifier from types.
+type RemoveOptionsAttribute () =
+    inherit Attribute ()
 
 [<RequireQualifiedAccess>]
 module internal RemoveOptionsGenerator =
     open Fantomas.FCS.Text.Range
+    open Myriad.Core.Ast
 
     let private removeOption (s : SynField) : SynField =
         let (SynField.SynField (synAttributeLists,
@@ -42,10 +52,9 @@ module internal RemoveOptionsGenerator =
         (accessibility : SynAccess option)
         (generics : SynTyparDecls option)
         (fields : SynField list)
-        : SynModuleDecl
         =
         let fields : SynField list = fields |> List.map removeOption
-        let name = Ident.create "Short"
+        let name = Ident.Create "Short"
 
         let record =
             {
@@ -55,58 +64,100 @@ module internal RemoveOptionsGenerator =
                 XmlDoc = xmlDoc
                 Generics = generics
                 Accessibility = accessibility
-                Attributes = []
             }
 
         let typeDecl = AstHelper.defineRecordType record
 
         SynModuleDecl.Types ([ typeDecl ], range0)
 
-    let createMaker (withOptionsType : LongIdent) (withoutOptionsType : LongIdent) (fields : SynFieldData<Ident> list) =
-        let xmlDoc = PreXmlDoc.create "Remove the optional members of the input."
+    let createMaker (withOptionsType : LongIdent) (withoutOptionsType : LongIdent) (fields : SynField list) =
+        let xmlDoc = PreXmlDoc.Create " Remove the optional members of the input."
 
-        let inputArg = Ident.create "input"
-        let functionName = Ident.create "shorten"
+        let returnInfo =
+            SynBindingReturnInfo.Create (SynType.LongIdent (SynLongIdent.CreateFromLongIdent withOptionsType))
+
+        let inputArg = Ident.Create "input"
+        let functionName = Ident.Create "shorten"
+
+        let inputVal =
+            SynValData.SynValData (
+                None,
+                SynValInfo.SynValInfo ([ [ SynArgInfo.CreateId functionName ] ], SynArgInfo.Empty),
+                Some inputArg
+            )
 
         let body =
             fields
-            |> List.map (fun fieldData ->
+            |> List.map (fun (SynField (_, _, id, fieldType, _, _, _, _, _)) ->
+                let id =
+                    match id with
+                    | None -> failwith "Expected record field to have an identifying name"
+                    | Some id -> id
+
                 let accessor =
+                    SynExpr.LongIdent (false, SynLongIdent ([ inputArg ; id ], [ range0 ], []), None, range0)
+
+                let body =
+                    match fieldType with
+                    | OptionType _ ->
+                        SynExpr.CreateApp (
+                            SynExpr.CreateAppInfix (
                                 SynExpr.LongIdent (
                                     false,
-                        SynLongIdent ([ inputArg ; fieldData.Ident ], [ range0 ], []),
+                                    SynLongIdent.SynLongIdent (
+                                        [ Ident.Create "op_PipeRight" ],
+                                        [],
+                                        [ Some (IdentTrivia.OriginalNotation "|>") ]
+                                    ),
+                                    None,
+                                    range0
+                                ),
+                                accessor
+                            ),
+                            SynExpr.CreateApp (
+                                SynExpr.CreateLongIdent (SynLongIdent.CreateString "Option.defaultWith"),
+                                SynExpr.CreateLongIdent (
+                                    SynLongIdent.CreateFromLongIdent (
+                                        withoutOptionsType @ [ Ident.Create (sprintf "Default%s" id.idText) ]
+                                    )
+                                )
+                            )
+                        )
+                    | _ -> accessor
+
+                (SynLongIdent.CreateFromLongIdent [ id ], true), Some body
+            )
+            |> AstHelper.instantiateRecord
+
+        let pattern =
+            SynPat.LongIdent (
+                SynLongIdent.CreateFromLongIdent [ functionName ],
+                None,
+                None,
+                SynArgPats.Pats
+                    [
+                        SynPat.CreateTyped (
+                            SynPat.CreateNamed inputArg,
+                            SynType.LongIdent (SynLongIdent.CreateFromLongIdent withoutOptionsType)
+                        )
+                        |> SynPat.CreateParen
+                    ],
                 None,
                 range0
             )
 
-                let body =
-                    match fieldData.Type with
-                    | OptionType _ ->
-                        accessor
-                        |> SynExpr.pipeThroughFunction (
-                            SynExpr.applyFunction
-                                (SynExpr.createLongIdent [ "Option" ; "defaultWith" ])
-                                (SynExpr.createLongIdent' (
-                                    withoutOptionsType
-                                    @ [ Ident.create (sprintf "Default%s" fieldData.Ident.idText) ]
-                                ))
+        let binding =
+            SynBinding.Let (
+                isInline = false,
+                isMutable = false,
+                xmldoc = xmlDoc,
+                returnInfo = returnInfo,
+                expr = body,
+                valData = inputVal,
+                pattern = pattern
             )
-                    | _ -> accessor
 
-                SynLongIdent.createI fieldData.Ident, body
-            )
-            |> AstHelper.instantiateRecord
-
-        SynBinding.basic
-            [ functionName ]
-            [
-                SynPat.named inputArg.idText
-                |> SynPat.annotateType (SynType.LongIdent (SynLongIdent.create withoutOptionsType))
-            ]
-            body
-        |> SynBinding.withXmlDoc xmlDoc
-        |> SynBinding.withReturnAnnotation (SynType.LongIdent (SynLongIdent.create withOptionsType))
-        |> SynModuleDecl.createLet
+        SynModuleDecl.CreateLet [ binding ]
 
     let createRecordModule (namespaceId : LongIdent) (typeDefn : SynTypeDefn) =
         let (SynTypeDefn (synComponentInfo, synTypeDefnRepr, _members, _implicitCtor, _, _)) =
@@ -116,13 +167,18 @@ module internal RemoveOptionsGenerator =
             synComponentInfo
 
         match synTypeDefnRepr with
-        | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (accessibility, fields, _range), _) ->
-            let fieldData = fields |> List.map SynField.extractWithIdent
+        | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (accessibility, recordFields, _recordRange), _) ->
 
             let decls =
                 [
-                    createType (Some doc) accessibility typeParams fields
-                    createMaker [ Ident.create "Short" ] recordId fieldData
+                    createType (Some doc) accessibility typeParams recordFields
+                    createMaker [ Ident.Create "Short" ] recordId recordFields
+                ]
+
+            let attributes =
+                [
+                    SynAttributeList.Create (SynAttribute.RequireQualifiedAccess ())
+                    SynAttributeList.Create SynAttribute.compilationRepresentation
                 ]
 
             let xmlDoc =
@@ -130,21 +186,16 @@ module internal RemoveOptionsGenerator =
                 |> Seq.map (fun i -> i.idText)
                 |> String.concat "."
                 |> sprintf " Module containing an option-truncated version of the %s type"
-                |> PreXmlDoc.create
+                |> PreXmlDoc.Create
 
             let info =
-                SynComponentInfo.createLong recordId
-                |> SynComponentInfo.withDocString xmlDoc
-                |> SynComponentInfo.addAttributes [ SynAttribute.compilationRepresentation ]
-                |> SynComponentInfo.addAttributes [ SynAttribute.requireQualifiedAccess ]
+                SynComponentInfo.Create (recordId, attributes = attributes, xmldoc = xmlDoc)
 
-            SynModuleDecl.nestedModule info decls
-            |> List.singleton
-            |> SynModuleOrNamespace.createNamespace namespaceId
+            let mdl = SynModuleDecl.CreateNestedModule (info, decls)
+
+            SynModuleOrNamespace.CreateNamespace (namespaceId, decls = [ mdl ])
         | _ -> failwithf "Not a record type"
 
-open Myriad.Core
-
 /// Myriad generator that stamps out a record with option types stripped
 /// from the fields at the top level.
 [<MyriadGenerator("remove-options")>]

WoofWare.Myriad.Plugins/SurfaceBaseline.txt

@@ -1,14 +1,17 @@
-WoofWare.Myriad.Plugins.ArgParserGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
-WoofWare.Myriad.Plugins.ArgParserGenerator..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.CreateCatamorphismGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
-WoofWare.Myriad.Plugins.CreateCatamorphismGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.GenerateMockAttribute inherit System.Attribute
+WoofWare.Myriad.Plugins.GenerateMockAttribute..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.HttpClientAttribute inherit System.Attribute
+WoofWare.Myriad.Plugins.HttpClientAttribute..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.HttpClientGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.HttpClientGenerator..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.InterfaceMockGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.InterfaceMockGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.JsonParseAttribute inherit System.Attribute
+WoofWare.Myriad.Plugins.JsonParseAttribute..ctor [constructor]: bool
+WoofWare.Myriad.Plugins.JsonParseAttribute..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.JsonParseGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.JsonParseGenerator..ctor [constructor]: unit
-WoofWare.Myriad.Plugins.JsonSerializeGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
-WoofWare.Myriad.Plugins.JsonSerializeGenerator..ctor [constructor]: unit
+WoofWare.Myriad.Plugins.RemoveOptionsAttribute inherit System.Attribute
+WoofWare.Myriad.Plugins.RemoveOptionsAttribute..ctor [constructor]: unit
 WoofWare.Myriad.Plugins.RemoveOptionsGenerator inherit obj, implements Myriad.Core.IMyriadGenerator
 WoofWare.Myriad.Plugins.RemoveOptionsGenerator..ctor [constructor]: unit

WoofWare.Myriad.Plugins/SynAttribute.fs

@@ -0,0 +1,31 @@
+namespace WoofWare.Myriad.Plugins
+
+open Fantomas.FCS.Syntax
+open Fantomas.FCS.Text.Range
+open Myriad.Core
+
+[<RequireQualifiedAccess>]
+module internal SynAttribute =
+    let internal compilationRepresentation : SynAttribute =
+        {
+            TypeName = SynLongIdent.CreateString "CompilationRepresentation"
+            ArgExpr =
+                SynExpr.CreateLongIdent (
+                    false,
+                    SynLongIdent.Create [ "CompilationRepresentationFlags" ; "ModuleSuffix" ],
+                    None
+                )
+                |> SynExpr.CreateParen
+            Target = None
+            AppliesToGetterAndSetter = false
+            Range = range0
+        }
+
+    let internal autoOpen : SynAttribute =
+        {
+            TypeName = SynLongIdent.CreateString "AutoOpen"
+            ArgExpr = SynExpr.CreateConst SynConst.Unit
+            Target = None
+            AppliesToGetterAndSetter = false
+            Range = range0
+        }

WoofWare.Myriad.Plugins/SynExpr.fs

@@ -0,0 +1,275 @@
+namespace WoofWare.Myriad.Plugins
+
+open Fantomas.FCS.Syntax
+open Fantomas.FCS.SyntaxTrivia
+open Myriad.Core
+open Myriad.Core.Ast
+open Fantomas.FCS.Text.Range
+
+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
+
+[<RequireQualifiedAccess>]
+module internal SynExpr =
+
+    /// {expr} |> {func}
+    let pipeThroughFunction (func : SynExpr) (expr : SynExpr) : SynExpr =
+        SynExpr.CreateApp (
+            SynExpr.CreateAppInfix (
+                SynExpr.CreateLongIdent (
+                    SynLongIdent.SynLongIdent (
+                        [ Ident.Create "op_PipeRight" ],
+                        [],
+                        [ Some (IdentTrivia.OriginalNotation "|>") ]
+                    )
+                ),
+                expr
+            ),
+            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.CreateNamed (Ident.Create "exc"), range0), None, 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.CreateApp (
+            SynExpr.CreateAppInfix (
+                SynExpr.CreateLongIdent (
+                    SynLongIdent.SynLongIdent (
+                        Ident.CreateLong "op_Equality",
+                        [],
+                        [ Some (IdentTrivia.OriginalNotation "=") ]
+                    )
+                ),
+                a
+            ),
+            b
+        )
+
+    /// {a} + {b}
+    let plus (a : SynExpr) (b : SynExpr) =
+        SynExpr.CreateApp (
+            SynExpr.CreateAppInfix (
+                SynExpr.CreateLongIdent (
+                    SynLongIdent.SynLongIdent (
+                        Ident.CreateLong "op_Addition",
+                        [],
+                        [ Some (IdentTrivia.OriginalNotation "+") ]
+                    )
+                ),
+                a
+            ),
+            b
+        )
+
+    let rec stripOptionalParen (expr : SynExpr) : SynExpr =
+        match expr with
+        | SynExpr.Paren (expr, _, _, _) -> stripOptionalParen expr
+        | expr -> expr
+
+    /// Given e.g. "byte", returns "System.Byte".
+    let qualifyPrimitiveType (typeName : string) : LongIdent =
+        match typeName with
+        | "float32" -> [ "System" ; "Single" ]
+        | "float" -> [ "System" ; "Double" ]
+        | "byte"
+        | "uint8" -> [ "System" ; "Byte" ]
+        | "sbyte" -> [ "System" ; "SByte" ]
+        | "int16" -> [ "System" ; "Int16" ]
+        | "int" -> [ "System" ; "Int32" ]
+        | "int64" -> [ "System" ; "Int64" ]
+        | "uint16" -> [ "System" ; "UInt16" ]
+        | "uint"
+        | "uint32" -> [ "System" ; "UInt32" ]
+        | "uint64" -> [ "System" ; "UInt64" ]
+        | _ -> failwith $"Unable to identify a parsing function `string -> %s{typeName}`"
+        |> List.map Ident.Create
+
+    /// {obj}.{meth} {arg}
+    let callMethodArg (meth : string) (arg : SynExpr) (obj : SynExpr) : SynExpr =
+        SynExpr.CreateApp (
+            SynExpr.DotGet (
+                obj,
+                range0,
+                SynLongIdent.SynLongIdent (id = [ Ident.Create meth ], dotRanges = [], trivia = [ None ]),
+                range0
+            ),
+            arg
+        )
+
+    /// {obj}.{meth}()
+    let callMethod (meth : string) (obj : SynExpr) : SynExpr =
+        callMethodArg meth (SynExpr.CreateConst SynConst.Unit) obj
+
+    /// {obj}.{meth}<ty>()
+    let callGenericMethod (meth : string) (ty : string) (obj : SynExpr) : SynExpr =
+        SynExpr.CreateApp (
+            SynExpr.TypeApp (
+                SynExpr.DotGet (obj, range0, SynLongIdent.Create [ meth ], range0),
+                range0,
+                [ SynType.CreateLongIdent ty ],
+                [],
+                Some range0,
+                range0,
+                range0
+            ),
+            SynExpr.CreateConst SynConst.Unit
+        )
+
+    let index (property : SynExpr) (obj : SynExpr) : SynExpr =
+        SynExpr.DotIndexedGet (obj, property, range0, range0)
+
+    /// (fun {varName} -> {body})
+    let createLambda (varName : string) (body : SynExpr) : SynExpr =
+        let parsedDataPat = [ SynPat.CreateNamed (Ident.Create varName) ]
+
+        SynExpr.Lambda (
+            false,
+            false,
+            SynSimplePats.Create [ SynSimplePat.CreateId (Ident.Create varName) ],
+            body,
+            Some (parsedDataPat, body),
+            range0,
+            {
+                ArrowRange = Some range0
+            }
+        )
+        |> SynExpr.CreateParen
+
+    let reraise : SynExpr =
+        SynExpr.CreateApp (SynExpr.CreateIdent (Ident.Create "reraise"), SynExpr.CreateConst SynConst.Unit)
+
+    /// {body} |> fun a -> Async.StartAsTask (a, ?cancellationToken=ct)
+    let startAsTask (body : SynExpr) =
+        let lambda =
+            SynExpr.CreateApp (
+                SynExpr.CreateLongIdent (SynLongIdent.Create [ "Async" ; "StartAsTask" ]),
+                SynExpr.CreateParenedTuple
+                    [
+                        SynExpr.CreateLongIdent (SynLongIdent.CreateString "a")
+                        equals
+                            (SynExpr.LongIdent (true, SynLongIdent.CreateString "cancellationToken", None, range0))
+                            (SynExpr.CreateLongIdent (SynLongIdent.CreateString "ct"))
+                    ]
+            )
+            |> createLambda "a"
+
+        pipeThroughFunction lambda body
+
+    /// {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.CreateNamed (Ident.Create lhs),
+                        rhs,
+                        [],
+                        state,
+                        range0,
+                        {
+                            EqualsRange = Some range0
+                        }
+                    )
+                | Let (lhs, rhs) ->
+                    SynExpr.LetOrUse (
+                        false,
+                        false,
+                        [ SynBinding.Let (pattern = SynPat.CreateNamed (Ident.Create lhs), expr = rhs) ],
+                        state,
+                        range0,
+                        {
+                            SynExprLetOrUseTrivia.InKeyword = None
+                        }
+                    )
+                | Use (lhs, rhs) ->
+                    SynExpr.LetOrUse (
+                        false,
+                        true,
+                        [ SynBinding.Let (pattern = SynPat.CreateNamed (Ident.Create lhs), expr = rhs) ],
+                        state,
+                        range0,
+                        {
+                            SynExprLetOrUseTrivia.InKeyword = None
+                        }
+                    )
+                | Do body -> SynExpr.CreateSequential [ SynExpr.Do (body, range0) ; state ]
+            )
+
+        SynExpr.CreateApp (
+            SynExpr.CreateIdent (Ident.Create compExpr),
+            SynExpr.ComputationExpr (false, contents, range0)
+        )
+
+    /// {expr} |> Async.AwaitTask
+    let awaitTask (expr : SynExpr) : SynExpr =
+        expr
+        |> pipeThroughFunction (SynExpr.CreateLongIdent (SynLongIdent.Create [ "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.CreateConstString "yyyy-MM-dd")
+        | DateTime ->
+            ident
+            |> callMethodArg "ToString" (SynExpr.CreateConstString "yyyy-MM-ddTHH:mm:ss")
+        | _ -> callMethod "ToString" ident
+
+    let synBindingTriviaZero (isMember : bool) =
+        {
+            SynBindingTrivia.EqualsRange = Some range0
+            InlineKeyword = None
+            LeadingKeyword =
+                if isMember then
+                    SynLeadingKeyword.Member range0
+                else
+                    SynLeadingKeyword.Let range0
+        }

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,16 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System
-open System.Text
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal Ident =
-    let inline create (s : string) = Ident (s, 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,12 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Xml
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal PreXmlDoc =
-    let create (s : string) : PreXmlDoc =
-        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.SynIdent (Ident.create caseNames.[0], None), false, None, range0)
-            |> List.singleton
-            |> SynArgPats.Pats
-        | len ->
-            caseNames
-            |> List.map (fun name -> SynPat.Named (SynIdent.SynIdent (Ident.create name, None), 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,36 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynAttribute =
-    let internal compilationRepresentation : SynAttribute =
-        {
-            TypeName = SynLongIdent.createS "CompilationRepresentation"
-            ArgExpr =
-                [ "CompilationRepresentationFlags" ; "ModuleSuffix" ]
-                |> SynExpr.createLongIdent
-                |> SynExpr.paren
-            Target = None
-            AppliesToGetterAndSetter = false
-            Range = range0
-        }
-
-    let internal requireQualifiedAccess : SynAttribute =
-        {
-            TypeName = SynLongIdent.createS "RequireQualifiedAccess"
-            ArgExpr = SynExpr.CreateConst ()
-            Target = None
-            AppliesToGetterAndSetter = false
-            Range = range0
-        }
-
-    let internal autoOpen : SynAttribute =
-        {
-            TypeName = SynLongIdent.createS "AutoOpen"
-            ArgExpr = SynExpr.CreateConst ()
-            Target = None
-            AppliesToGetterAndSetter = false
-            Range = range0
-        }

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,365 +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 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)
-
-    let callGenericMethod (meth : string) (ty : LongIdent) (obj : SynExpr) : SynExpr =
-        SynExpr.DotGet (obj, range0, SynLongIdent.createS meth, range0)
-        |> typeApp [ SynType.LongIdent (SynLongIdent.create ty) ]
-        |> applyTo (SynExpr.CreateConst ())
-
-    /// {obj}.{meth}<ty>()
-    let callGenericMethod' (meth : string) (ty : string) (obj : SynExpr) : SynExpr =
-        SynExpr.DotGet (obj, range0, SynLongIdent.createS meth, range0)
-        |> typeApp [ SynType.createLongIdent' [ ty ] ]
-        |> applyTo (SynExpr.CreateConst ())
-
-    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 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,69 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Text.Range
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.SyntaxTrivia
-open Fantomas.FCS.Xml
-
-type internal SynFieldData<'Ident> =
-    {
-        Attrs : SynAttribute list
-        Ident : 'Ident
-        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/SynLongIdent.fs

@@ -1,128 +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 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,65 +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
-        (ident : SynIdent)
-        (typars : SynTyparDecls option)
-        (arity : SynValInfo)
-        (xmlDoc : PreXmlDoc)
-        (returnType : SynType)
-        : SynMemberDefn
-        =
-        let slot =
-            SynValSig.SynValSig (
-                [],
-                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
-            }
-        )

WoofWare.Myriad.Plugins/SynExpr/SynPat.fs

@@ -1,54 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynPat =
-    let inline paren (pat : SynPat) : SynPat = SynPat.Paren (pat, range0)
-
-    let anon : SynPat = SynPat.Wild range0
-
-    let inline annotateTypeNoParen (ty : SynType) (pat : SynPat) = SynPat.Typed (pat, ty, range0)
-
-    let inline annotateType (ty : SynType) (pat : SynPat) = paren (annotateTypeNoParen ty pat)
-
-    let inline named (s : string) : SynPat =
-        SynPat.Named (SynIdent.SynIdent (Ident (s, range0), None), false, None, range0)
-
-    let inline namedI (i : Ident) : SynPat =
-        SynPat.Named (SynIdent.SynIdent (i, None), false, None, range0)
-
-    let inline identWithArgs (i : LongIdent) (args : SynArgPats) : SynPat =
-        SynPat.LongIdent (SynLongIdent.create i, None, None, args, None, range0)
-
-    let inline nameWithArgs (i : string) (args : SynPat list) : SynPat =
-        identWithArgs [ Ident.create i ] (SynArgPats.create args)
-
-    let inline tupleNoParen (elements : SynPat list) : SynPat =
-        match elements with
-        | [] -> failwith "Can't tuple no elements in a pattern"
-        | [ p ] -> p
-        | elements -> SynPat.Tuple (false, elements, List.replicate (elements.Length - 1) range0, range0)
-
-    let inline tuple (elements : SynPat list) : SynPat = tupleNoParen elements |> paren
-
-    let inline createConst (c : SynConst) = SynPat.Const (c, range0)
-
-    let unit = createConst SynConst.Unit
-
-    let createNull = SynPat.Null range0
-
-    let emptyList = SynPat.ArrayOrList (false, [], range0)
-
-    let listCons (lhs : SynPat) (rhs : SynPat) =
-        SynPat.ListCons (
-            lhs,
-            rhs,
-            range0,
-            {
-                ColonColonRange = range0
-            }
-        )
-
-    let emptyArray = SynPat.ArrayOrList (true, [], range0)

WoofWare.Myriad.Plugins/SynExpr/SynType.fs

@@ -1,457 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open System
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<AutoOpen>]
-module internal SynTypePatterns =
-    let (|OptionType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, [ innerType ], _, _, _, _) when SynLongIdent.isOption ident ->
-            Some innerType
-        | _ -> None
-
-    let (|ChoiceType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, inner, _, _, _, _) when SynLongIdent.isChoice ident -> Some inner
-        | _ -> None
-
-    let (|NullableType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, [ innerType ], _, _, _, _) when SynLongIdent.isNullable ident ->
-            Some innerType
-        | _ -> None
-
-    let (|UnitType|_|) (fieldType : SynType) : unit option =
-        match fieldType with
-        | SynType.LongIdent ident when SynLongIdent.isUnit ident -> Some ()
-        | _ -> None
-
-    let (|ListType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, [ innerType ], _, _, _, _) when SynLongIdent.isList ident ->
-            Some innerType
-        | _ -> None
-
-    let (|ArrayType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, [ innerType ], _, _, _, _) when SynLongIdent.isArray ident ->
-            Some innerType
-        | SynType.Array (1, innerType, _) -> Some innerType
-        | _ -> None
-
-    let (|RestEaseResponseType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, [ innerType ], _, _, _, _) when SynLongIdent.isResponse ident ->
-            Some innerType
-        | _ -> None
-
-    let (|DictionaryType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, [ key ; value ], _, _, _, _) when SynLongIdent.isDictionary ident ->
-            Some (key, value)
-        | _ -> None
-
-    let (|IDictionaryType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, [ key ; value ], _, _, _, _) when SynLongIdent.isIDictionary ident ->
-            Some (key, value)
-        | _ -> None
-
-    let (|IReadOnlyDictionaryType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, [ key ; value ], _, _, _, _) when
-            SynLongIdent.isReadOnlyDictionary ident
-            ->
-            Some (key, value)
-        | _ -> None
-
-    let (|MapType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.App (SynType.LongIdent ident, _, [ key ; value ], _, _, _, _) when SynLongIdent.isMap ident ->
-            Some (key, value)
-        | _ -> None
-
-    let (|BigInt|_|) (fieldType : SynType) : unit option =
-        match fieldType with
-        | SynType.LongIdent ident ->
-            match ident.LongIdent |> List.map _.idText with
-            | [ "bigint" ]
-            | [ "BigInteger" ]
-            | [ "Numerics" ; "BigInteger" ]
-            | [ "System" ; "Numerics" ; "BigInteger" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    /// Returns the type, qualified as in e.g. `System.Boolean`.
-    let (|PrimitiveType|_|) (fieldType : SynType) : LongIdent option =
-        match fieldType with
-        | SynType.LongIdent ident ->
-            match ident.LongIdent with
-            | [ i ] -> Primitives.qualifyType i.idText
-            | _ -> None
-        | _ -> None
-
-    let (|String|_|) (fieldType : SynType) : unit option =
-        match fieldType with
-        | SynType.LongIdent ident ->
-            match ident.LongIdent with
-            | [ i ] ->
-                [ "string" ]
-                |> List.tryFind (fun s -> s = i.idText)
-                |> Option.map ignore<string>
-            | _ -> None
-        | _ -> None
-
-    let (|Byte|_|) (fieldType : SynType) : unit option =
-        match fieldType with
-        | SynType.LongIdent ident ->
-            match ident.LongIdent with
-            | [ i ] -> [ "byte" ] |> List.tryFind (fun s -> s = i.idText) |> Option.map ignore<string>
-            | _ -> None
-        | _ -> None
-
-    let (|Guid|_|) (fieldType : SynType) : unit option =
-        match fieldType with
-        | SynType.LongIdent ident ->
-            match ident.LongIdent |> List.map (fun i -> i.idText) with
-            | [ "System" ; "Guid" ]
-            | [ "Guid" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|HttpResponseMessage|_|) (fieldType : SynType) : unit option =
-        match fieldType with
-        | SynType.LongIdent ident ->
-            match ident.LongIdent |> List.map (fun i -> i.idText) with
-            | [ "System" ; "Net" ; "Http" ; "HttpResponseMessage" ]
-            | [ "Net" ; "Http" ; "HttpResponseMessage" ]
-            | [ "Http" ; "HttpResponseMessage" ]
-            | [ "HttpResponseMessage" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|HttpContent|_|) (fieldType : SynType) : unit option =
-        match fieldType with
-        | SynType.LongIdent ident ->
-            match ident.LongIdent |> List.map (fun i -> i.idText) with
-            | [ "System" ; "Net" ; "Http" ; "HttpContent" ]
-            | [ "Net" ; "Http" ; "HttpContent" ]
-            | [ "Http" ; "HttpContent" ]
-            | [ "HttpContent" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|Stream|_|) (fieldType : SynType) : unit option =
-        match fieldType with
-        | SynType.LongIdent ident ->
-            match ident.LongIdent |> List.map (fun i -> i.idText) with
-            | [ "System" ; "IO" ; "Stream" ]
-            | [ "IO" ; "Stream" ]
-            | [ "Stream" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|NumberType|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.LongIdent ident ->
-            match ident.LongIdent with
-            | [ i ] ->
-                // We won't bother with the case that the user has done e.g. `Single` (relying on `System` being open).
-                match Primitives.qualifyType i.idText with
-                | Some qualified ->
-                    match i.idText with
-                    | "char"
-                    | "string" -> None
-                    | _ -> Some qualified
-                | None -> None
-            | _ -> None
-        | _ -> None
-
-    /// Returns the name of the measure, and the outer type.
-    let (|Measure|_|) (fieldType : SynType) : (Ident * LongIdent) option =
-        match fieldType with
-        | SynType.App (NumberType outer,
-                       _,
-                       [ SynType.LongIdent (SynLongIdent.SynLongIdent ([ ident ], _, _)) ],
-                       _,
-                       _,
-                       _,
-                       _) -> Some (ident, outer)
-        | _ -> None
-
-    let (|DateOnly|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
-            match ident |> List.map (fun i -> i.idText) with
-            | [ "System" ; "DateOnly" ]
-            | [ "DateOnly" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|DateTime|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
-            match ident |> List.map (fun i -> i.idText) with
-            | [ "System" ; "DateTime" ]
-            | [ "DateTime" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|DateTimeOffset|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
-            match ident |> List.map (fun i -> i.idText) with
-            | [ "System" ; "DateTimeOffset" ]
-            | [ "DateTimeOffset" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|Uri|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
-            match ident |> List.map (fun i -> i.idText) with
-            | [ "System" ; "Uri" ]
-            | [ "Uri" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|Task|_|) (fieldType : SynType) : SynType option =
-        match fieldType with
-        | SynType.App (SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)), _, args, _, _, _, _) ->
-            match ident |> List.map (fun i -> i.idText) with
-            | [ "Task" ]
-            | [ "Tasks" ; "Task" ]
-            | [ "Threading" ; "Tasks" ; "Task" ]
-            | [ "System" ; "Threading" ; "Tasks" ; "Task" ] ->
-                match args with
-                | [ arg ] -> Some arg
-                | _ -> failwithf "Expected Task to be applied to exactly one arg, but got: %+A" args
-            | _ -> None
-        | _ -> None
-
-    let (|DirectoryInfo|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
-            match ident |> List.map (fun i -> i.idText) with
-            | [ "System" ; "IO" ; "DirectoryInfo" ]
-            | [ "IO" ; "DirectoryInfo" ]
-            | [ "DirectoryInfo" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|FileInfo|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
-            match ident |> List.map (fun i -> i.idText) with
-            | [ "System" ; "IO" ; "FileInfo" ]
-            | [ "IO" ; "FileInfo" ]
-            | [ "FileInfo" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-    let (|TimeSpan|_|) (fieldType : SynType) =
-        match fieldType with
-        | SynType.LongIdent (SynLongIdent.SynLongIdent (ident, _, _)) ->
-            match ident |> List.map (fun i -> i.idText) with
-            | [ "System" ; "TimeSpan" ]
-            | [ "TimeSpan" ] -> Some ()
-            | _ -> None
-        | _ -> None
-
-[<RequireQualifiedAccess>]
-module internal SynType =
-    let rec stripOptionalParen (ty : SynType) : SynType =
-        match ty with
-        | SynType.Paren (ty, _) -> stripOptionalParen ty
-        | ty -> ty
-
-    let inline createLongIdent (ident : LongIdent) : SynType =
-        SynType.LongIdent (SynLongIdent.create ident)
-
-    let inline createLongIdent' (ident : string list) : SynType =
-        SynType.LongIdent (SynLongIdent.createS' ident)
-
-    let inline named (name : string) = createLongIdent' [ name ]
-
-    let inline app' (name : SynType) (args : SynType list) : SynType =
-        if args.IsEmpty then
-            failwith "Type cannot be applied to no arguments"
-
-        SynType.App (name, Some range0, args, List.replicate (args.Length - 1) range0, Some range0, false, range0)
-
-    let inline app (name : string) (args : SynType list) : SynType = app' (named name) args
-
-    let inline appPostfix (name : string) (arg : SynType) : SynType =
-        SynType.App (named name, None, [ arg ], [], None, true, range0)
-
-    let inline appPostfix' (name : string list) (arg : SynType) : SynType =
-        SynType.App (createLongIdent' name, None, [ arg ], [], None, true, range0)
-
-    let inline funFromDomain (domain : SynType) (range : SynType) : SynType =
-        SynType.Fun (
-            domain,
-            range,
-            range0,
-            {
-                ArrowRange = range0
-            }
-        )
-
-    let inline signatureParamOfType (ty : SynType) (name : Ident option) : SynType =
-        SynType.SignatureParameter ([], false, name, ty, range0)
-
-    let inline var (ty : SynTypar) : SynType = SynType.Var (ty, range0)
-
-    let unit : SynType = named "unit"
-    let int : SynType = named "int"
-
-    let anon : SynType = SynType.Anon range0
-
-    let string : SynType = named "string"
-
-    /// Given ['a1, 'a2] and 'ret, returns 'a1 -> 'a2 -> 'ret.
-    let toFun (inputs : SynType list) (ret : SynType) : SynType =
-        (ret, List.rev inputs) ||> List.fold (fun ty input -> funFromDomain input ty)
-
-    let primitiveToHumanReadableString (name : LongIdent) : string =
-        match name |> List.map _.idText with
-        | [ "System" ; "Single" ] -> "single"
-        | [ "System" ; "Double" ] -> "double"
-        | [ "System" ; "Byte" ] -> "byte"
-        | [ "System" ; "SByte" ] -> "signed byte"
-        | [ "System" ; "Int16" ] -> "int16"
-        | [ "System" ; "Int32" ] -> "int32"
-        | [ "System" ; "Int64" ] -> "int64"
-        | [ "System" ; "UInt16" ] -> "uint16"
-        | [ "System" ; "UInt32" ] -> "uint32"
-        | [ "System" ; "UInt64" ] -> "uint64"
-        | [ "System" ; "Char" ] -> "char"
-        | [ "System" ; "Decimal" ] -> "decimal"
-        | [ "System" ; "String" ] -> "string"
-        | [ "System" ; "Boolean" ] -> "bool"
-        | ty ->
-            ty
-            |> String.concat "."
-            |> failwithf "could not create human-readable string for primitive type %s"
-
-    let rec toHumanReadableString (ty : SynType) : string =
-        match ty with
-        | PrimitiveType t1 -> primitiveToHumanReadableString t1
-        | OptionType t1 -> toHumanReadableString t1 + " option"
-        | NullableType t1 -> toHumanReadableString t1 + " Nullable"
-        | ChoiceType ts ->
-            ts
-            |> List.map toHumanReadableString
-            |> String.concat ", "
-            |> sprintf "Choice<%s>"
-        | MapType (k, v)
-        | DictionaryType (k, v)
-        | IDictionaryType (k, v)
-        | IReadOnlyDictionaryType (k, v) -> sprintf "map<%s, %s>" (toHumanReadableString k) (toHumanReadableString v)
-        | ListType t1 -> toHumanReadableString t1 + " list"
-        | ArrayType t1 -> toHumanReadableString t1 + " array"
-        | Task t1 -> toHumanReadableString t1 + " Task"
-        | UnitType -> "unit"
-        | FileInfo -> "FileInfo"
-        | DirectoryInfo -> "DirectoryInfo"
-        | Uri -> "URI"
-        | Stream -> "Stream"
-        | Guid -> "GUID"
-        | BigInt -> "bigint"
-        | DateTimeOffset -> "DateTimeOffset"
-        | DateOnly -> "DateOnly"
-        | TimeSpan -> "TimeSpan"
-        | ty -> failwithf "could not compute human-readable string for type: %O" ty
-
-    /// Guess whether the types are equal. We err on the side of saying "no, they're different".
-    let rec provablyEqual (ty1 : SynType) (ty2 : SynType) : bool =
-        if Object.ReferenceEquals (ty1, ty2) then
-            true
-        else
-
-        match ty1 with
-        | PrimitiveType t1 ->
-            match ty2 with
-            | PrimitiveType t2 -> (t1 |> List.map _.idText) = (t2 |> List.map _.idText)
-            | _ -> false
-        | OptionType t1 ->
-            match ty2 with
-            | OptionType t2 -> provablyEqual t1 t2
-            | _ -> false
-        | NullableType t1 ->
-            match ty2 with
-            | NullableType t2 -> provablyEqual t1 t2
-            | _ -> false
-        | ChoiceType t1 ->
-            match ty2 with
-            | ChoiceType t2 ->
-                t1.Length = t2.Length
-                && List.forall (fun (a, b) -> provablyEqual a b) (List.zip t1 t2)
-            | _ -> false
-        | DictionaryType (k1, v1) ->
-            match ty2 with
-            | DictionaryType (k2, v2) -> provablyEqual k1 k2 && provablyEqual v1 v2
-            | _ -> false
-        | IDictionaryType (k1, v1) ->
-            match ty2 with
-            | IDictionaryType (k2, v2) -> provablyEqual k1 k2 && provablyEqual v1 v2
-            | _ -> false
-        | IReadOnlyDictionaryType (k1, v1) ->
-            match ty2 with
-            | IReadOnlyDictionaryType (k2, v2) -> provablyEqual k1 k2 && provablyEqual v1 v2
-            | _ -> false
-        | MapType (k1, v1) ->
-            match ty2 with
-            | MapType (k2, v2) -> provablyEqual k1 k2 && provablyEqual v1 v2
-            | _ -> false
-        | ListType t1 ->
-            match ty2 with
-            | ListType t2 -> provablyEqual t1 t2
-            | _ -> false
-        | ArrayType t1 ->
-            match ty2 with
-            | ArrayType t2 -> provablyEqual t1 t2
-            | _ -> false
-        | Task t1 ->
-            match ty2 with
-            | Task t2 -> provablyEqual t1 t2
-            | _ -> false
-        | UnitType ->
-            match ty2 with
-            | UnitType -> true
-            | _ -> false
-        | FileInfo ->
-            match ty2 with
-            | FileInfo -> true
-            | _ -> false
-        | DirectoryInfo ->
-            match ty2 with
-            | DirectoryInfo -> true
-            | _ -> false
-        | Uri ->
-            match ty2 with
-            | Uri -> true
-            | _ -> false
-        | Stream ->
-            match ty2 with
-            | Stream -> true
-            | _ -> false
-        | Guid ->
-            match ty2 with
-            | Guid -> true
-            | _ -> false
-        | BigInt ->
-            match ty2 with
-            | BigInt -> true
-            | _ -> false
-        | DateTimeOffset ->
-            match ty2 with
-            | DateTimeOffset -> true
-            | _ -> false
-        | DateOnly ->
-            match ty2 with
-            | DateOnly -> true
-            | _ -> false
-        | _ -> false

WoofWare.Myriad.Plugins/SynExpr/SynTypeDefn.fs

@@ -1,27 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.SyntaxTrivia
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynTypeDefn =
-
-    let inline create (componentInfo : SynComponentInfo) (repr : SynTypeDefnRepr) : SynTypeDefn =
-        SynTypeDefn.SynTypeDefn (
-            componentInfo,
-            repr,
-            [],
-            None,
-            range0,
-            {
-                LeadingKeyword = SynTypeDefnLeadingKeyword.Type range0
-                EqualsRange = Some range0
-                WithKeyword = None
-            }
-        )
-
-    let inline withMemberDefns (members : SynMemberDefn list) (r : SynTypeDefn) : SynTypeDefn =
-        match r with
-        | SynTypeDefn (typeInfo, typeRepr, _, ctor, range, trivia) ->
-            SynTypeDefn.SynTypeDefn (typeInfo, typeRepr, members, ctor, range, trivia)

WoofWare.Myriad.Plugins/SynExpr/SynTypeDefnRepr.fs

@@ -1,20 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-
-[<RequireQualifiedAccess>]
-module internal SynTypeDefnRepr =
-
-    let inline interfaceType (mems : SynMemberDefns) : SynTypeDefnRepr =
-        SynTypeDefnRepr.ObjectModel (SynTypeDefnKind.Unspecified, mems, range0)
-
-    /// Indicates the body of a `type Foo with {body}` extension type declaration.
-    let inline augmentation () : SynTypeDefnRepr =
-        SynTypeDefnRepr.ObjectModel (SynTypeDefnKind.Augmentation range0, [], range0)
-
-    let inline union (cases : SynUnionCase list) : SynTypeDefnRepr =
-        SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Union (None, cases, range0), range0)
-
-    let inline record (fields : SynField list) : SynTypeDefnRepr =
-        SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Record (None, fields, range0), range0)

WoofWare.Myriad.Plugins/SynExpr/SynUnionCase.fs

@@ -1,75 +0,0 @@
-namespace WoofWare.Myriad.Plugins
-
-open Fantomas.FCS.Syntax
-open Fantomas.FCS.Text.Range
-open Fantomas.FCS.Xml
-open Fantomas.FCS.SyntaxTrivia
-
-type internal UnionCase<'Ident> =
-    {
-        Fields : SynFieldData<'Ident> list
-        Attrs : SynAttribute list
-        Ident : Ident
-    }
-
-[<RequireQualifiedAccess>]
-module internal UnionCase =
-    let mapIdentFields<'a, 'b> (f : 'a -> 'b) (unionCase : UnionCase<'a>) : UnionCase<'b> =
-        {
-            Fields = unionCase.Fields |> List.map (SynField.mapIdent f)
-            Attrs = unionCase.Attrs
-            Ident = unionCase.Ident
-        }
-
-[<RequireQualifiedAccess>]
-module internal SynUnionCase =
-    let extract (SynUnionCase (attrs, id, caseType, _, _, _, _)) : UnionCase<Ident option> =
-        match caseType with
-        | SynUnionCaseKind.FullType _ -> failwith "WoofWare.Myriad does not support FullType union cases."
-        | SynUnionCaseKind.Fields fields ->
-
-        let fields = fields |> List.map SynField.extract
-
-        let id =
-            match id with
-            | SynIdent.SynIdent (ident, _) -> ident
-
-        // As far as I can tell, there's no way to get any attributes here? :shrug:
-        let attrs = attrs |> List.collect (fun l -> l.Attributes)
-
-        {
-            Fields = fields
-            Attrs = attrs
-            Ident = id
-        }
-
-    let create (case : UnionCase<Ident>) : SynUnionCase =
-        let fields =
-            case.Fields
-            |> List.map (fun field ->
-                SynField.SynField (
-                    SynAttributes.ofAttrs field.Attrs,
-                    false,
-                    Some field.Ident,
-                    field.Type,
-                    false,
-                    PreXmlDoc.Empty,
-                    None,
-                    range0,
-                    {
-                        LeadingKeyword = None
-                    }
-                )
-            )
-
-        SynUnionCase.SynUnionCase (
-            SynAttributes.ofAttrs case.Attrs,
-            SynIdent.SynIdent (case.Ident, None),
-            SynUnionCaseKind.Fields fields,
-            PreXmlDoc.Empty,
-            None,
-            range0,
-            {
-                BarRange = Some range0
-            }
-        )

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -20,42 +20,17 @@
   <ItemGroup>
     <PackageReference Include="Myriad.Core" Version="0.8.3"/>
     <!-- the lowest version allowed by Myriad.Core -->
-    <PackageReference Update="FSharp.Core" Version="6.0.1" PrivateAssets="all"/>
+    <PackageReference Update="FSharp.Core" Version="6.0.1"/>
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="List.fs"/>
-    <Compile Include="Primitives.fs" />
-    <Compile Include="SynExpr\SynAttributes.fs" />
-    <Compile Include="SynExpr\PreXmlDoc.fs" />
-    <Compile Include="SynExpr\Ident.fs" />
-    <Compile Include="SynExpr\SynLongIdent.fs" />
-    <Compile Include="SynExpr\SynExprLetOrUseTrivia.fs" />
-    <Compile Include="SynExpr\SynArgPats.fs" />
-    <Compile Include="SynExpr\SynPat.fs" />
-    <Compile Include="SynExpr\SynBinding.fs" />
-    <Compile Include="SynExpr\SynType.fs" />
-    <Compile Include="SynExpr\SynMatchClause.fs" />
-    <Compile Include="SynExpr\CompExpr.fs" />
-    <Compile Include="SynExpr\SynExpr.fs" />
-    <Compile Include="SynExpr\SynField.fs" />
-    <Compile Include="SynExpr\SynUnionCase.fs" />
-    <Compile Include="SynExpr\SynTypeDefnRepr.fs" />
-    <Compile Include="SynExpr\SynTypeDefn.fs" />
-    <Compile Include="SynExpr\SynComponentInfo.fs" />
-    <Compile Include="SynExpr\SynMemberDefn.fs" />
-    <Compile Include="SynExpr\SynAttribute.fs" />
-    <Compile Include="SynExpr\SynModuleDecl.fs" />
-    <Compile Include="SynExpr\SynModuleOrNamespace.fs" />
-    <Compile Include="Measure.fs" />
     <Compile Include="AstHelper.fs"/>
+    <Compile Include="SynExpr.fs"/>
+    <Compile Include="SynAttribute.fs"/>
     <Compile Include="RemoveOptionsGenerator.fs"/>
     <Compile Include="InterfaceMockGenerator.fs" />
-    <Compile Include="JsonSerializeGenerator.fs"/>
     <Compile Include="JsonParseGenerator.fs"/>
     <Compile Include="HttpClientGenerator.fs"/>
-    <Compile Include="CataGenerator.fs" />
-    <Compile Include="ArgParserGenerator.fs" />
     <EmbeddedResource Include="version.json"/>
     <EmbeddedResource Include="SurfaceBaseline.txt"/>
     <None Include="..\README.md">
@@ -68,11 +43,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\WoofWare.Myriad.Plugins.Attributes\WoofWare.Myriad.Plugins.Attributes.fsproj"/>
-    <!-- NuGet is such a clown package manager! Get the DLLs into the Nupkg artefact, I have no idea why this is needed,
-         but without this line, we don't get any dependency at all packaged into the resulting artefact. -->
-    <None Include="$(OutputPath)\WoofWare.Myriad.Plugins.Attributes.dll" Pack="true" PackagePath="lib\$(TargetFramework)"/>
-  </ItemGroup>
-
 </Project>

WoofWare.Myriad.Plugins/version.json

@@ -1,14 +1,7 @@
 {
-  "version": "2.2",
+  "version": "1.3",
   "publicReleaseRefSpec": [
     "^refs/heads/main$"
   ],
-  "pathFilters": [
-    "./",
-    ":/WoofWare.Myriad.Plugins.Attributes",
-    ":^/WoofWare.Myriad.Plugins.Attributes/Test",
-    ":/global.json",
-    ":/README.md",
-    ":/Directory.Build.props"
-  ]
+  "pathFilters": null
 }

WoofWare.Myriad.sln

@@ -6,10 +6,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Myriad.Plugins", "
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Myriad.Plugins.Test", "WoofWare.Myriad.Plugins.Test\WoofWare.Myriad.Plugins.Test.fsproj", "{EBFFA5D3-7F74-4824-8795-B6194E6FE0CB}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Myriad.Plugins.Attributes", "WoofWare.Myriad.Plugins.Attributes\WoofWare.Myriad.Plugins.Attributes.fsproj", "{17548737-9BAB-4B1E-B680-76D47C343AAC}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Myriad.Plugins.Attributes.Test", "WoofWare.Myriad.Plugins.Attributes\Test\WoofWare.Myriad.Plugins.Attributes.Test.fsproj", "{26DC0C94-85F2-45B4-8FA1-1B27201F7AFB}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -28,13 +24,5 @@ Global
 		{EBFFA5D3-7F74-4824-8795-B6194E6FE0CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EBFFA5D3-7F74-4824-8795-B6194E6FE0CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBFFA5D3-7F74-4824-8795-B6194E6FE0CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17548737-9BAB-4B1E-B680-76D47C343AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17548737-9BAB-4B1E-B680-76D47C343AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17548737-9BAB-4B1E-B680-76D47C343AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17548737-9BAB-4B1E-B680-76D47C343AAC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26DC0C94-85F2-45B4-8FA1-1B27201F7AFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26DC0C94-85F2-45B4-8FA1-1B27201F7AFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26DC0C94-85F2-45B4-8FA1-1B27201F7AFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26DC0C94-85F2-45B4-8FA1-1B27201F7AFB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

analyzers/analyzers.fsproj

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

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -20,18 +20,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724395761,
-        "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
+        "lastModified": 1703134684,
+        "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
+        "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
         "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "indirect"
       }
     },
     "root": {

flake.nix

@@ -3,10 +3,11 @@
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
   };
 
   outputs = {
+    self,
     nixpkgs,
     flake-utils,
     ...
@@ -17,7 +18,7 @@
       dotnet-sdk = pkgs.dotnet-sdk_8;
       dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0;
       version = "0.1";
-      dotnetTool = dllOverride: toolName: toolVersion: hash:
+      dotnetTool = dllOverride: toolName: toolVersion: sha256:
         pkgs.stdenvNoCC.mkDerivation rec {
           name = toolName;
           version = toolVersion;
@@ -25,7 +26,7 @@
           src = pkgs.fetchNuGet {
             pname = name;
             version = version;
-            hash = hash;
+            sha256 = sha256;
             installPhase = ''mkdir -p $out/bin && cp -r tools/net6.0/any/* $out/bin'';
           };
           installPhase = let
@@ -43,21 +44,46 @@
         };
     in {
       packages = {
-        fantomas = dotnetTool null "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version (builtins.head (builtins.filter (elem: elem.pname == "fantomas") ((import ./nix/deps.nix) {fetchNuGet = x: x;}))).hash;
-        fsharp-analyzers = dotnetTool "FSharp.Analyzers.Cli" "fsharp-analyzers" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fsharp-analyzers.version (builtins.head (builtins.filter (elem: elem.pname == "fsharp-analyzers") ((import ./nix/deps.nix) {fetchNuGet = x: x;}))).hash;
+        fantomas = dotnetTool null "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version "sha256-Jmo7s8JMdQ8SxvNvPnryfE7n24mIgKi5cbgNwcQw3yU=";
+        fsharp-analyzers = dotnetTool "FSharp.Analyzers.Cli" "fsharp-analyzers" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fsharp-analyzers.version "sha256-CWMW06ncSs8QkQvxNPNrgn3TAzMU6qCT1k2A3pnGrYQ=";
+        fetchDeps = let
+          flags = [];
+          runtimeIds = ["win-x64"] ++ map (system: pkgs.dotnetCorePackages.systemToDotnetRid system) dotnet-sdk.meta.platforms;
+        in
+          pkgs.writeShellScriptBin "fetch-${pname}-deps" (builtins.readFile (pkgs.substituteAll {
+            src = ./nix/fetchDeps.sh;
+            pname = pname;
+            binPath = pkgs.lib.makeBinPath [pkgs.coreutils dotnet-sdk (pkgs.nuget-to-nix.override {inherit dotnet-sdk;})];
+            projectFiles = toString ["./WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj" "./ConsumePlugin/ConsumePlugin.fsproj"];
+            testProjectFiles = ["./WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj"];
+            rids = pkgs.lib.concatStringsSep "\" \"" runtimeIds;
+            packages = dotnet-sdk.packages;
+            storeSrc = pkgs.srcOnly {
+              src = ./.;
+              pname = pname;
+              version = version;
+            };
+          }));
         default = pkgs.buildDotnetModule {
-          inherit pname version dotnet-sdk dotnet-runtime;
+          pname = pname;
           name = "WoofWare.Myriad.Plugins";
+          version = version;
           src = ./.;
           projectFile = "./WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj";
-          testProjectFile = "./WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj";
-          disabledTests = ["WoofWare.Myriad.Plugins.Test.TestSurface.CheckVersionAgainstRemote"];
-          nugetDeps = ./nix/deps.nix; # `nix build .#default.passthru.fetch-deps && ./result` and put the result here
+          nugetDeps = ./nix/deps.nix;
           doCheck = true;
+          dotnet-sdk = dotnet-sdk;
+          dotnet-runtime = dotnet-runtime;
         };
       };
       devShell = pkgs.mkShell {
-        buildInputs = [dotnet-sdk];
+        buildInputs = with pkgs; [
+          (with dotnetCorePackages;
+            combinePackages [
+              dotnet-sdk_8
+              dotnetPackages.Nuget
+            ])
+        ];
         packages = [
           pkgs.alejandra
           pkgs.nodePackages.markdown-link-check

nix/deps.nix

@@ -1,329 +1,444 @@
 # This file was automatically generated by passthru.fetch-deps.
-# Please dont edit it manually, your changes might get overwritten!
+# Please don't edit it manually, your changes might get overwritten!
 {fetchNuGet}: [
   (fetchNuGet {
-    pname = "ApiSurface";
-    version = "4.0.44";
-    hash = "sha256-1su3UcdsyG9OoPwiMqo07rUMKhkVKlohRK4fA8mbxvI=";
+    pname = "fsharp-analyzers";
+    version = "0.23.0";
+    sha256 = "sha256-CWMW06ncSs8QkQvxNPNrgn3TAzMU6qCT1k2A3pnGrYQ=";
   })
   (fetchNuGet {
     pname = "fantomas";
-    version = "6.3.10";
-    hash = "sha256-2m4YevDp9CRm/Ci2hguDXd6DUMElRg3hNAne9LHntWM=";
+    version = "6.3.0-alpha-005";
+    sha256 = "sha256-Jmo7s8JMdQ8SxvNvPnryfE7n24mIgKi5cbgNwcQw3yU=";
+  })
+  (fetchNuGet {
+    pname = "ApiSurface";
+    version = "4.0.25";
+    sha256 = "0zjq8an9cr0l7wxdmm9n9s3iyq5m0zl4x0h0wmy5cz7am8y15qc4";
+  })
+  (fetchNuGet {
+    pname = "coverlet.collector";
+    version = "6.0.0";
+    sha256 = "12j34vrkmph8lspbafnqmfnj2qvysz1jcrks2khw798s6dwv0j90";
   })
   (fetchNuGet {
     pname = "Fantomas.Core";
     version = "6.1.1";
-    hash = "sha256-FcTLHQFvKkQY/kV08jhhy/St/+FmXpp3epp/R3zUXMA=";
+    sha256 = "1h2wsiy4fzwsg9vrlpk6w7zsvx6bc4wg4x25zqc48akg04fwpi0m";
   })
   (fetchNuGet {
     pname = "Fantomas.FCS";
     version = "6.1.1";
-    hash = "sha256-NuZ8msPEHYA8T3EYREB28F1RcNgUU8V54eg2+UttYxw=";
+    sha256 = "0733dm5zjdp8w5wwalqlv1q52pghfr04863i9wy807f4qfd7rrin";
   })
   (fetchNuGet {
     pname = "FsCheck";
     version = "2.16.6";
-    hash = "sha256-1hR2SaJTkqBzU3D955MvLNVzkQHkx0Z/QzOXZfzk2Zw=";
-  })
-  (fetchNuGet {
-    pname = "fsharp-analyzers";
-    version = "0.26.1";
-    hash = "sha256-UqSK8PoXRJMZWKphMmWpl5klVn82EM1VczNZ1AOZ6Sw=";
-  })
-  (fetchNuGet {
-    pname = "FSharp.Core";
-    version = "4.3.4";
-    hash = "sha256-styyo+6mJy+yxE0NZG/b1hxkAjPOnJfMgd9zWzCJ5uk=";
+    sha256 = "176rwky6b5rk8dzldiz4068p7m9c5y9ygzbhadrs14jkl94pc56n";
   })
   (fetchNuGet {
     pname = "FSharp.Core";
     version = "6.0.1";
-    hash = "sha256-Ehsgt3nCJijpaVuJguC1TPVEKSkJd6PSc07D2ZQSemI=";
+    sha256 = "0qks2aadkhsffg9a6xq954ll9xacnph852avd7ljh9n2g6vj06qj";
   })
   (fetchNuGet {
     pname = "FSharp.Core";
-    version = "8.0.301";
-    hash = "sha256-LyP+zHxXFNksSQ/ExQ9CGkQYGvld8W6JNmxMg6lTRCs=";
+    version = "8.0.100";
+    sha256 = "06z3vg8yj7i83x6gmnzl2lka1bp4hzc07h6mrydpilxswnmy2a0l";
   })
   (fetchNuGet {
     pname = "FsUnit";
     version = "6.0.0";
-    hash = "sha256-q87WQf6MqGhzvaQ7WkkUlCdoE94DY0CD5PaXEj64A6M=";
+    sha256 = "18q3p0z155znwj1l0qq3vq9nh9wl2i4mlfx4pmrnia4czr0xdkmb";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Ref";
-    version = "6.0.32";
-    hash = "sha256-1mQTxwruzhm20YdlZefrYuy7xrBs17pH4Vo0K3Tl7Fc=";
+    version = "6.0.25";
+    sha256 = "1vrmqn5j6ibwkqasbf7x7n4w5jdclnz3giymiwvym2wa0y5zc59q";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Ref";
+    version = "8.0.0";
+    sha256 = "0k304yhpm92c46a1fscbzlgvdbhrm9vlbpyfgwp3cafz4f7z7a5y";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-    version = "6.0.32";
-    hash = "sha256-cIe0F+7rgwYSmh0VuFuQsUI9iEW5hn2KCD2H8Cs/k2g=";
+    version = "6.0.25";
+    sha256 = "0mgcs4si7mwd0f555s1vg17pf4nqfaijd1pci359l1pgrmv70rrg";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
+    version = "8.0.0";
+    sha256 = "05y1xb5fw8lzvb4si77a5qwfwfz1855crqbphrwky6x9llivbhkx";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-    version = "6.0.32";
-    hash = "sha256-TkYv7h9NBr3I+FIaXeLU4MawJtgT2RWhs35ewGRDKx8=";
+    version = "6.0.25";
+    sha256 = "0wvzhqhlmlbnpa18qp8m3wcrlcgj3ckvp3iv2n7g8vb60c3238aq";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
+    version = "8.0.0";
+    sha256 = "18zdbcb2bn7wy1dp14z5jyqiiwr9rkad1lcb158r5ikjfq1rg5iw";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-    version = "6.0.32";
-    hash = "sha256-RaC37ZQcJn7ykXJrtV7ibxh0GcalRyPKncxlqOLou+I=";
+    version = "6.0.25";
+    sha256 = "1pywgvb8ck1d5aadmijd5s3z6yclchd9pa6dsahijmm55ibplx36";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
+    version = "8.0.0";
+    sha256 = "1nbxzmj6cnccylxis67c54c0ik38ma4rwdvgg6sxd6r04219maqm";
   })
   (fetchNuGet {
     pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-    version = "6.0.32";
-    hash = "sha256-vh/e46xM/HbhbBvL5eP5/DCHwCP2Bg7WoMS28nBXWV0=";
+    version = "6.0.25";
+    sha256 = "1zlf0w7i6r02719dv3nw4jy14sa0rs53i89an5alz5qmywdy3f1d";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
+    version = "8.0.0";
+    sha256 = "1wqkbjd1ywv9w397l7rsb89mijc5n0hv7jq9h09xfz6wn9qsp152";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
+    version = "6.0.25";
+    sha256 = "1fbsnm4056cpd4avgpi5sq05m1yd9k4x229ckxpr4q7yc94sncwy";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
+    version = "8.0.0";
+    sha256 = "08vlmswmiyp2nxlr9d77716hk7kz7h9x5bl8wh76xzbj5id1xlb2";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.Build.Tasks.Git";
+    version = "8.0.0";
+    sha256 = "0055f69q3hbagqp8gl3nk0vfn4qyqyxsxyy7pd0g7wm3z28byzmx";
   })
   (fetchNuGet {
     pname = "Microsoft.CodeCoverage";
-    version = "17.10.0";
-    hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g=";
+    version = "17.8.0";
+    sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj";
   })
   (fetchNuGet {
     pname = "Microsoft.NET.Test.Sdk";
-    version = "17.10.0";
-    hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0=";
+    version = "17.8.0";
+    sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.linux-arm64";
-    version = "6.0.32";
-    hash = "sha256-yDOkSHEGuGG6u+rB5u+IC3rc2tQwvbjdqmgHcl7Gkn4=";
+    version = "6.0.25";
+    sha256 = "052388yjivzkfllkss0nljbzmjx787jqdjsbb6ls855sp6wh9xfd";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.linux-arm64";
+    version = "8.0.0";
+    sha256 = "0bpg3v9dnalz7yh7lsgriw9rnm9jx37mqhhvf7snznb3sfk7rgwb";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.linux-x64";
-    version = "6.0.32";
-    hash = "sha256-2aDGkn0QqXXHUUSAwtQQbjKl5I6S0fcQWPciqPnOiM4=";
+    version = "6.0.25";
+    sha256 = "103xy6kncjwbbchfnpqvsjpjy92x3dralcg9pw939jp0dwggwarz";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.linux-x64";
+    version = "8.0.0";
+    sha256 = "1c7l68bm05d94x5wk1y33mnd4v8m196vyprgrzqnh94yrqy6fkf7";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.osx-arm64";
-    version = "6.0.32";
-    hash = "sha256-n6hks4j88TRelq1O6SCeUH5GmxoSm5BWXGwnpnYJibI=";
+    version = "6.0.25";
+    sha256 = "13m14pdx5xfxky07xgxf6hjd7g9l4k6k40wvp9znhvn27pa0wdxv";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.osx-arm64";
+    version = "8.0.0";
+    sha256 = "1hdv825s964vfcgnk94pzhgxnj948f1vdj423jjxpkppcy30fl0m";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Host.osx-x64";
-    version = "6.0.32";
-    hash = "sha256-nBBq4RYAgimBYOn/bN6JTFvJFYaqYXMHae2pmCzRaS8=";
+    version = "6.0.25";
+    sha256 = "132pgjhv42mqzx4007sd59bkds0fwsv5xaz07y2yffbn3lzr228k";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.osx-x64";
+    version = "8.0.0";
+    sha256 = "0jmzf58vv45j0hqlxq8yalpjwi328vp2mjr3h0pdg0qr143iivnr";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.win-x64";
+    version = "6.0.25";
+    sha256 = "039433rm4w37h9qri11v3lrpddpz7zcly9kq8vmk6w1ixzlqwf01";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Host.win-x64";
+    version = "8.0.0";
+    sha256 = "1n8yr13df2f6jhxpfazs6rxahfqm18fhjvfm16g5d60c3za1hwnk";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Ref";
-    version = "6.0.32";
-    hash = "sha256-Fm3RUZNcro434rIu3c7unGviGeGBjXj2dGnr2mmrM2g=";
+    version = "6.0.25";
+    sha256 = "0jfhmfxpx1h4f3axgf60gc8d4cnlvbb853400kag6nk0875hr0x1";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Ref";
+    version = "8.0.0";
+    sha256 = "0hyvbh86433764qqqhw9i7ga0ax7bbdmzh77jw58pq0ggm41cff9";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-    version = "6.0.32";
-    hash = "sha256-kdj8ia/2du2oKGg4MJdO2XytpT3gQ9UOiHVCyfiX2V8=";
+    version = "6.0.25";
+    sha256 = "0jpcmva1l8z36r4phz055l7fz9s6z8pv8pqc4ia69mhhgvr0ks7y";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
+    version = "8.0.0";
+    sha256 = "0gwqmkmr7jy3sjh9gha82amlry41gp8nwswy2iqfw54f28db63n7";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-    version = "6.0.32";
-    hash = "sha256-/Hti30Ba12NDJQcG8pFTg6REVUDIrxZ/hRtEZNDlgxE=";
+    version = "6.0.25";
+    sha256 = "012jml0bqxbspahf1j4bvvd91pz85hsbcyhq00gxczcazhxpkhz4";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.linux-x64";
+    version = "8.0.0";
+    sha256 = "042cjvnwrrjs3mw5q8q5kinh0cwkks33i3n1vyifaid2jbr3wlc0";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-    version = "6.0.32";
-    hash = "sha256-A8MFGOMXFROH1QGUE7xzq5b5EskDyIQCQt7SLfGdSbU=";
+    version = "6.0.25";
+    sha256 = "0wgwxpyy1n550sw7npjg69zpxknwn0ay30m2qybvqb5mj857qzxi";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
+    version = "8.0.0";
+    sha256 = "06ndp4wh1cap01dql3nixka4g56bf6ipmqys7xaxvg4xisf79x8d";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-    version = "6.0.32";
-    hash = "sha256-y5YB62WlMrK10bR/+nNpI8luVRlD9W9ZG3GsX7AXzUM=";
+    version = "6.0.25";
+    sha256 = "08vr7c5bg5x3w35l54z1azif7ysfc2yiyz50ip1dl0mpqywvlswr";
   })
   (fetchNuGet {
-    pname = "Microsoft.NETCore.Platforms";
-    version = "1.1.0";
-    hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=";
+    pname = "Microsoft.NETCore.App.Runtime.osx-x64";
+    version = "8.0.0";
+    sha256 = "1kh5bnaf6h9mr4swcalrp304625frjiw6mlz1052rxwzsdq98a96";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.win-x64";
+    version = "6.0.25";
+    sha256 = "03snpmx204xvc9668riisvvdjjgdqhwj7yjp85w5lh8j8ygrqkif";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.NETCore.App.Runtime.win-x64";
+    version = "8.0.0";
+    sha256 = "054icf5jjnwnswrnv1r05x3pfjvacbz6g3dj8caar1zp53k49rkk";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.Platforms";
     version = "1.1.1";
-    hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=";
+    sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.Platforms";
     version = "2.0.0";
-    hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=";
+    sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0";
   })
   (fetchNuGet {
     pname = "Microsoft.NETCore.Targets";
     version = "1.1.3";
-    hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=";
+    sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.SourceLink.Common";
+    version = "8.0.0";
+    sha256 = "0xrr8yd34ij7dqnyddkp2awfmf9qn3c89xmw2f3npaa4wnajmx81";
+  })
+  (fetchNuGet {
+    pname = "Microsoft.SourceLink.GitHub";
+    version = "8.0.0";
+    sha256 = "1gdx7n45wwia3yvang3ls92sk3wrymqcx9p349j8wba2lyjf9m44";
   })
   (fetchNuGet {
     pname = "Microsoft.TestPlatform.ObjectModel";
-    version = "17.10.0";
-    hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4=";
+    version = "17.8.0";
+    sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m";
   })
   (fetchNuGet {
     pname = "Microsoft.TestPlatform.TestHost";
-    version = "17.10.0";
-    hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4=";
+    version = "17.8.0";
+    sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q";
   })
   (fetchNuGet {
     pname = "Myriad.Core";
     version = "0.8.3";
-    hash = "sha256-vBOxfq8QriX/yUtaXN69rEQaY/psRNJWxqATLidrt2g=";
+    sha256 = "0s5pdckjw4x0qrbd4i3cz9iili5cppg5qnjbr7zjbbhhmxzb24xw";
   })
   (fetchNuGet {
     pname = "Myriad.Sdk";
     version = "0.8.3";
-    hash = "sha256-7O397WKhskKOvE3MkJT37BvxorDWngDR6gTUogtDZ2M=";
+    sha256 = "0qv78c5s5m04xb8h17nnn2ig26zcyya91k2dpj745cm1cbnzvvgc";
   })
   (fetchNuGet {
     pname = "Nerdbank.GitVersioning";
-    version = "3.6.141";
-    hash = "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI=";
-  })
-  (fetchNuGet {
-    pname = "NETStandard.Library";
-    version = "2.0.3";
-    hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=";
+    version = "3.6.133";
+    sha256 = "1cdw8krvsnx0n34f7fm5hiiy7bs6h3asvncqcikc0g46l50w2j80";
   })
   (fetchNuGet {
     pname = "Newtonsoft.Json";
     version = "13.0.1";
-    hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=";
+    sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb";
   })
   (fetchNuGet {
     pname = "Newtonsoft.Json";
     version = "13.0.3";
-    hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=";
+    sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7";
   })
   (fetchNuGet {
     pname = "NuGet.Common";
-    version = "6.10.1";
-    hash = "sha256-2gZe1zwSaZsr0nipaMBJixLEVOvR7vp75kwecSSYyfw=";
+    version = "6.8.0";
+    sha256 = "0l3ij8iwy7wj6s7f93lzi9168r4wz8zyin6a08iwgk7hvq44cia1";
   })
   (fetchNuGet {
     pname = "NuGet.Configuration";
-    version = "6.10.1";
-    hash = "sha256-RmjvlbtJssxuWEiOcVJLtUVT0nPn7IUPb878NmJbwmM=";
+    version = "6.8.0";
+    sha256 = "0x03p408smkmv1gv7pmvsia4lkn0xaj4wfrkl58pjf8bbv51y0yw";
   })
   (fetchNuGet {
     pname = "NuGet.Frameworks";
-    version = "6.10.1";
-    hash = "sha256-AdfpuVDDy9zYAGgcMZoTf/fkFCJJVrxRFhsv6AI4Dd0=";
+    version = "6.5.0";
+    sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj";
+  })
+  (fetchNuGet {
+    pname = "NuGet.Frameworks";
+    version = "6.8.0";
+    sha256 = "0i2xvhgkjkjr496i3pg8hamwv6505fia45qhn7jg5m01wb3cvsjl";
   })
   (fetchNuGet {
     pname = "NuGet.Packaging";
-    version = "6.10.1";
-    hash = "sha256-ogsVjOao+LKUOMhGir1flDuMPjOeR2OpkNGHtr/riH4=";
+    version = "6.8.0";
+    sha256 = "031z4s905bxi94h3f0qy4j1b6jxdxgqgpkzqvvpfxch07szxcbim";
   })
   (fetchNuGet {
     pname = "NuGet.Protocol";
-    version = "6.10.1";
-    hash = "sha256-UeS/10z1EqswbeB0c7QgBIVOp0VGlN5ZDQqTY2/AhX8=";
+    version = "6.7.0";
+    sha256 = "1v5ibnq2mp801vw68zyj169hkj3xm7h55824i33n1jxxj2vs3vbk";
   })
   (fetchNuGet {
     pname = "NuGet.Versioning";
-    version = "6.10.1";
-    hash = "sha256-jOh27AORk0TIhVePDVAgVhh6FuUo2v3oh/Xapcw7UVI=";
+    version = "6.8.0";
+    sha256 = "1sd25h46fd12ng780r02q4ijcx1imkb53kj1y2y7cwg5myh537ks";
   })
   (fetchNuGet {
     pname = "NUnit";
-    version = "4.1.0";
-    hash = "sha256-srzj0lf2ReKw41TnigZwf8rqKKNzGRRVrgN3hR/vRjo=";
+    version = "4.0.1";
+    sha256 = "0jgiq3dbwli5r70j0bw7021d69r7bhr58s8kphlpjmf7k47l5pcd";
+  })
+  (fetchNuGet {
+    pname = "NUnit.Analyzers";
+    version = "3.10.0";
+    sha256 = "1zc6s7lmzw5avrnbbjwyzla9d6bafbpxgv62m4zlqxv14p85md0d";
   })
   (fetchNuGet {
     pname = "NUnit3TestAdapter";
-    version = "4.6.0";
-    hash = "sha256-9Yav2fYhC4w0OgsyUwU4/5rDy4FVDTpKnWHuwl/uKJQ=";
+    version = "4.5.0";
+    sha256 = "1srx1629s0k1kmf02nmz251q07vj6pv58mdafcr5dr0bbn1fh78i";
   })
   (fetchNuGet {
     pname = "RestEase";
     version = "1.6.4";
-    hash = "sha256-FFmqFwlHhIln46k56Z8KM1G+xuPEh/bceKCQnJcdcdc=";
+    sha256 = "1mvi3nbrr450g3fgd1y4wg3bwl9k1agyjfd9wdkqk12714bsln8l";
   })
   (fetchNuGet {
     pname = "runtime.any.System.Runtime";
     version = "4.3.0";
-    hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=";
+    sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b";
   })
   (fetchNuGet {
     pname = "runtime.native.System";
     version = "4.3.0";
-    hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=";
+    sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
   })
   (fetchNuGet {
     pname = "runtime.unix.System.Private.Uri";
     version = "4.3.0";
-    hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=";
+    sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk";
   })
   (fetchNuGet {
     pname = "System.Diagnostics.DiagnosticSource";
     version = "7.0.0";
-    hash = "sha256-9Wk8cHSkjKtqkN6xW7KnXoQVtF/VNbKeBq79WqDesMs=";
+    sha256 = "1jxhvsh5mzdf0sgb4dfmbys1b12ylyr5pcfyj1map354fiq3qsgm";
   })
   (fetchNuGet {
     pname = "System.Formats.Asn1";
     version = "6.0.0";
-    hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8=";
+    sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9";
   })
   (fetchNuGet {
     pname = "System.IO.Abstractions";
     version = "4.2.13";
-    hash = "sha256-nkC/PiqE6+c1HJ2yTwg3x+qdBh844Z8n3ERWDW8k6Gg=";
+    sha256 = "0s784iphsmj4vhkrzq9q3w39vsn76w44zclx3hsygsw458zbyh4y";
   })
   (fetchNuGet {
     pname = "System.IO.FileSystem.AccessControl";
     version = "4.5.0";
-    hash = "sha256-ck44YBQ0M+2Im5dw0VjBgFD1s0XuY54cujrodjjSBL8=";
+    sha256 = "1gq4s8w7ds1sp8f9wqzf8nrzal40q5cd2w4pkf4fscrl2ih3hkkj";
   })
   (fetchNuGet {
     pname = "System.Memory";
     version = "4.5.5";
-    hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=";
+    sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h";
   })
   (fetchNuGet {
     pname = "System.Private.Uri";
     version = "4.3.0";
-    hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=";
+    sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx";
   })
   (fetchNuGet {
     pname = "System.Reflection.Metadata";
     version = "1.6.0";
-    hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=";
+    sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4";
   })
   (fetchNuGet {
     pname = "System.Runtime";
     version = "4.3.1";
-    hash = "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=";
+    sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27";
   })
   (fetchNuGet {
     pname = "System.Runtime.CompilerServices.Unsafe";
     version = "6.0.0";
-    hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=";
+    sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc";
   })
   (fetchNuGet {
     pname = "System.Security.AccessControl";
     version = "4.5.0";
-    hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=";
+    sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0";
   })
   (fetchNuGet {
     pname = "System.Security.Cryptography.Pkcs";
     version = "6.0.4";
-    hash = "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI=";
+    sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr";
   })
   (fetchNuGet {
     pname = "System.Security.Cryptography.ProtectedData";
     version = "4.4.0";
-    hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=";
+    sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6";
   })
   (fetchNuGet {
     pname = "System.Security.Principal.Windows";
     version = "4.5.0";
-    hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=";
+    sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86";
   })
   (fetchNuGet {
     pname = "System.Text.Encodings.Web";
-    version = "7.0.0";
-    hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ=";
+    version = "6.0.0";
+    sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai";
   })
   (fetchNuGet {
     pname = "System.Text.Json";
-    version = "7.0.3";
-    hash = "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4=";
+    version = "6.0.0";
+    sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl";
   })
 ]

nix/fetchDeps.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# This file was adapted from
+# https://github.com/NixOS/nixpkgs/blob/b981d811453ab84fb3ea593a9b33b960f1ab9147/pkgs/build-support/dotnet/build-dotnet-module/default.nix#L173
+set -euo pipefail
+export PATH="@binPath@"
+for arg in "$@"; do
+    case "$arg" in
+        --keep-sources|-k)
+            keepSources=1
+            shift
+            ;;
+        --help|-h)
+            echo "usage: $0 [--keep-sources] [--help] <output path>"
+            echo "    <output path>   The path to write the lockfile to. A temporary file is used if this is not set"
+            echo "    --keep-sources  Don't remove temporary directories upon exit, useful for debugging"
+            echo "    --help          Show this help message"
+            exit
+            ;;
+    esac
+done
+tmp=$(mktemp -td "@pname@-tmp-XXXXXX")
+export tmp
+HOME=$tmp/home
+exitTrap() {
+    test -n "${ranTrap-}" && return
+    ranTrap=1
+    if test -n "${keepSources-}"; then
+        echo -e "Path to the source: $tmp/src\nPath to the fake home: $tmp/home"
+    else
+        rm -rf "$tmp"
+    fi
+    # Since mktemp is used this will be empty if the script didnt succesfully complete
+    if ! test -s "$depsFile"; then
+      rm -rf "$depsFile"
+    fi
+}
+trap exitTrap EXIT INT TERM
+dotnetRestore() {
+    local -r project="${1-}"
+    local -r rid="$2"
+    dotnet restore "${project-}" \
+        -p:ContinuousIntegrationBuild=true \
+        -p:Deterministic=true \
+        --packages "$tmp/nuget_pkgs" \
+        --runtime "$rid" \
+        --no-cache \
+        --force
+}
+declare -a projectFiles=( @projectFiles@ )
+declare -a testProjectFiles=( @testProjectFiles@ )
+export DOTNET_NOLOGO=1
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+depsFile=$(realpath "${1:-$(mktemp -t "@pname@-deps-XXXXXX.nix")}")
+mkdir -p "$tmp/nuget_pkgs"
+storeSrc="@storeSrc@"
+src="$tmp/src"
+cp -rT "$storeSrc" "$src"
+chmod -R +w "$src"
+cd "$src"
+echo "Restoring project..."
+rids=("@rids@")
+for rid in "${rids[@]}"; do
+    (( ${#projectFiles[@]} == 0 )) && dotnetRestore "" "$rid"
+    for project in "${projectFiles[@]-}" "${testProjectFiles[@]-}"; do
+        dotnetRestore "$project" "$rid"
+    done
+done
+echo "Successfully restored project"
+echo "Writing lockfile..."
+echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please don't edit it manually, your changes might get overwritten!\n" > "$depsFile"
+nuget-to-nix "$tmp/nuget_pkgs" "@packages@" >> "$depsFile"
+echo "Successfully wrote lockfile to $depsFile"