Move FSharp.Core version to .fsproj files

- Change event DU to struct
v1.9.10 (#9 )
2024-01-02 19:26:09 -05:00 · 2024-01-02 19:02:24 -05:00 · 2023-11-22 16:13:57 -05:00 · 2023-11-22 16:09:52 -05:00 · 2023-09-27 20:31:56 -04:00 · 2023-08-25 12:36:30 -04:00
26 changed files with 2205 additions and 1097 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,56 @@
+name: CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build-and-test:
+
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        dotnet-version: [ "6.0", "7.0", "8.0" ]
+    
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET ${{ matrix.dotnet-version }}.x
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: ${{ matrix.dotnet-version }}.x
+    - name: Restore dependencies
+      run: dotnet restore src/Giraffe.Htmx.sln
+    - name: Build
+      run: dotnet build src/Giraffe.Htmx.sln --no-restore
+    - name: Test (.NET ${{ matrix.dotnet-version }})
+      run: dotnet run --project src/Tests/Tests.fsproj -f net${{ matrix.dotnet-version }}
+  publish:
+    runs-on: ubuntu-latest
+    needs: build-and-test
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: "7.0"
+    - name: Package Common library
+      run: dotnet pack src/Common/Giraffe.Htmx.Common.fsproj -c Release
+    - name: Move Common package
+      run: cp src/Common/bin/Release/Giraffe.Htmx.Common.*.nupkg .
+    - name: Package Server library
+      run: dotnet pack src/Htmx/Giraffe.Htmx.fsproj -c Release
+    - name: Move Server package
+      run: cp src/Htmx/bin/Release/Giraffe.Htmx.*.nupkg .
+    - name: Package View Engine library
+      run: dotnet pack src/ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj -c Release
+    - name: Move View Engine package
+      run: cp src/ViewEngine.Htmx/bin/Release/Giraffe.ViewEngine.Htmx.*.nupkg .
+    - name: Save Packages
+      uses: actions/upload-artifact@v3
+      with:
+        name: packages
+        path: |
+          *.nupkg
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 .ionide
 .idea
 *.user
+.vscode
--- a/README.md
+++ b/README.md
@@ -63,12 +63,14 @@ Some attributes have known values, such as `hx-trigger` and `hx-swap`; for these
      ]
 ```

+If you want to load htmx from unpkg, `Htmx.Script.minified` or `Htmx.Script.unminified` can be used to load the script in your HTML trees.
+
 ## Feedback / Help

-The author hangs out in the #htmx-general channel of the [htmx Discord server](https://htmx.org/discord) and the #web channel of the [F# Software Foundation's Slack server](https://fsharp.org/guides/slack/).
+The author hangs out in the #dotnet-htmx channel (and most others) of the [htmx Discord server](https://htmx.org/discord) and the #web channel of the [F# Software Foundation's Slack server](https://fsharp.org/guides/slack/).

 ## Thanks
-|[<img src="https://giraffe.wiki/giraffe.png" alt="Giraffe logo" width="200">](https://giraffe.wiki)|[<img src="https://bitbadger.solutions/htmx-black-transparent.svg" alt="htmx logo" width="200">](https://htmx.org)|[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo (Main)" width="200">](https://jb.gg/OpenSource)|
-| :---: | :---: | :---: |
+|[<img src="https://giraffe.wiki/giraffe.png" alt="Giraffe logo" width="200">](https://giraffe.wiki)| [<img src="https://bitbadger.solutions/upload/bit-badger/2024/01/htmx-black-transparent.svg" alt="htmx logo" width="200">](https://htmx.org) |[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo (Main)" width="200">](https://jb.gg/OpenSource)|
+| :---: |:------------------------------------------------------------------------------------------------------------------------------------:| :---: |
 |for making ASP.NET Core functional|                                                      for making HTML cool again                                                      |for licensing their tools to this project|

--- a/src/Common/Common.fs
+++ b/src/Common/Common.fs
@@ -0,0 +1,28 @@
+/// Common definitions shared between attribute values and response headers
+[<AutoOpen>]
+module Giraffe.Htmx.Common
+
+/// Valid values for the `hx-swap` attribute / `HX-Reswap` header (may be combined with swap/settle/scroll/show config)
+[<RequireQualifiedAccess>]
+module HxSwap =
+    
+    /// The default, replace the inner html of the target element
+    let InnerHtml = "innerHTML"
+    
+    /// Replace the entire target element with the response
+    let OuterHtml = "outerHTML"
+    
+    /// Insert the response before the target element
+    let BeforeBegin = "beforebegin"
+    
+    /// Insert the response before the first child of the target element
+    let AfterBegin = "afterbegin"
+    
+    /// Insert the response after the last child of the target element
+    let BeforeEnd = "beforeend"
+    
+    /// Insert the response after the target element
+    let AfterEnd = "afterend"
+    
+    /// Does not append content from response (out of band items will still be processed).
+    let None = "none"
--- a/src/Common/Giraffe.Htmx.Common.fsproj
+++ b/src/Common/Giraffe.Htmx.Common.fsproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Description>Common definitions for Giraffe.Htmx</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Common.fs" />
+    <None Include="README.md" Pack="true" PackagePath="\" />
+    <None Include="..\icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="6.0.0" />
+  </ItemGroup>
+
+</Project>
--- a/src/Common/README.md
+++ b/src/Common/README.md
@@ -0,0 +1,5 @@
+## Giraffe.Htmx.Common
+
+This package contains common code shared between [`Giraffe.Htmx`](https://www.nuget.org/packages/Giraffe.Htmx) and [`Giraffe.ViewEngine.Htmx`](https://www.nuget.org/packages/Giraffe.ViewEngine.Htmx), and will be automatically installed when you install either one.
+
+**htmx version: 1.9.10**
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <PropertyGroup>
-        <VersionPrefix>0.9.3</VersionPrefix>
-        <PackageReleaseNotes>Add support for HX-Retarget header (added in htmx 1.6.1)</PackageReleaseNotes>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <VersionPrefix>1.9.10</VersionPrefix>
+        <PackageReleaseNotes>Update script tags to pull htmx 1.9.10; add support for hx-on:* attributes; require lowest FSharp.Core version; fix _hxDisabledElt spelling</PackageReleaseNotes>
        <Authors>danieljsummers</Authors>
        <Company>Bit Badger Solutions</Company>
        <PackageProjectUrl>https://github.com/bit-badger/Giraffe.Htmx</PackageProjectUrl>
--- a/src/Giraffe.Htmx.sln
+++ b/src/Giraffe.Htmx.sln
@@ -0,0 +1,40 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.Htmx", "Htmx\Giraffe.Htmx.fsproj", "{8AB3085C-5236-485A-8565-A09106E72E1E}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.ViewEngine.Htmx", "ViewEngine.Htmx\Giraffe.ViewEngine.Htmx.fsproj", "{F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.Htmx.Common", "Common\Giraffe.Htmx.Common.fsproj", "{75D66845-F93A-4463-AD29-A8B16E4D4BA9}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Tests", "Tests\Tests.fsproj", "{39823773-4311-4E79-9CA0-F9DDC40CAF6A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8AB3085C-5236-485A-8565-A09106E72E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AB3085C-5236-485A-8565-A09106E72E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AB3085C-5236-485A-8565-A09106E72E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8AB3085C-5236-485A-8565-A09106E72E1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75D66845-F93A-4463-AD29-A8B16E4D4BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75D66845-F93A-4463-AD29-A8B16E4D4BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75D66845-F93A-4463-AD29-A8B16E4D4BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75D66845-F93A-4463-AD29-A8B16E4D4BA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39823773-4311-4E79-9CA0-F9DDC40CAF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39823773-4311-4E79-9CA0-F9DDC40CAF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39823773-4311-4E79-9CA0-F9DDC40CAF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39823773-4311-4E79-9CA0-F9DDC40CAF6A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
--- a/src/Htmx.Tests/Giraffe.Htmx.Tests.fsproj
+++ b/src/Htmx.Tests/Giraffe.Htmx.Tests.fsproj
@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-    <GenerateProgramFile>false</GenerateProgramFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Tests.fs" />
-    <Compile Include="Program.fs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Giraffe" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Htmx\Giraffe.Htmx.fsproj" />
-  </ItemGroup>
-
-</Project>
--- a/src/Htmx.Tests/Program.fs
+++ b/src/Htmx.Tests/Program.fs
@@ -1 +0,0 @@
-module Program = let [<EntryPoint>] main _ = 0
--- a/src/Htmx.Tests/Tests.fs
+++ b/src/Htmx.Tests/Tests.fs
@@ -1,329 +0,0 @@
-module Giraffe.Htmx.Tests
-
-open System
-open Giraffe.Htmx
-open Microsoft.AspNetCore.Http
-open NSubstitute
-open Xunit
-
-/// Tests for the IHeaderDictionary extension properties
-module IHeaderDictionaryExtensions =
-  
-  [<Fact>]
-  let ``HxBoosted succeeds when the header is not present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Option.isNone ctx.Request.Headers.HxBoosted |> Assert.True
-  
-  [<Fact>]
-  let ``HxBoosted succeeds when the header is present and true`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Boosted", "true")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxBoosted |> Assert.True
-    Option.get ctx.Request.Headers.HxBoosted |> Assert.True
-
-  [<Fact>]
-  let ``HxBoosted succeeds when the header is present and false`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Boosted", "false")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxBoosted |> Assert.True
-    Option.get ctx.Request.Headers.HxBoosted |> Assert.False
-
-  [<Fact>]
-  let ``HxCurrentUrl succeeds when the header is not present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Option.isNone ctx.Request.Headers.HxCurrentUrl |> Assert.True
-  
-  [<Fact>]
-  let ``HxCurrentUrl succeeds when the header is present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Current-URL", "http://localhost/test.htm")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxCurrentUrl |> Assert.True
-    Assert.Equal (Uri "http://localhost/test.htm", Option.get ctx.Request.Headers.HxCurrentUrl)
-  
-  [<Fact>]
-  let ``HxHistoryRestoreRequest succeeds when the header is not present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Option.isNone ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.True
-  
-  [<Fact>]
-  let ``HxHistoryRestoreRequest succeeds when the header is present and true`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-History-Restore-Request", "true")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.True
-    Option.get ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.True
-
-  [<Fact>]
-  let ``HxHistoryRestoreRequest succeeds when the header is present and false`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-History-Restore-Request", "false")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.True
-    Option.get ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.False
-
-  [<Fact>]
-  let ``HxPrompt succeeds when the header is not present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Option.isNone ctx.Request.Headers.HxPrompt |> Assert.True
-  
-  [<Fact>]
-  let ``HxPrompt succeeds when the header is present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Prompt", "of course")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxPrompt |> Assert.True
-    Assert.Equal("of course", Option.get ctx.Request.Headers.HxPrompt)
-
-  [<Fact>]
-  let ``HxRequest succeeds when the header is not present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Option.isNone ctx.Request.Headers.HxRequest |> Assert.True
-  
-  [<Fact>]
-  let ``HxRequest succeeds when the header is present and true`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Request", "true")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxRequest |> Assert.True
-    Option.get ctx.Request.Headers.HxRequest |> Assert.True
-
-  [<Fact>]
-  let ``HxRequest succeeds when the header is present and false`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Request", "false")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxRequest |> Assert.True
-    Option.get ctx.Request.Headers.HxRequest |> Assert.False
-
-  [<Fact>]
-  let ``HxTarget succeeds when the header is not present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Option.isNone ctx.Request.Headers.HxTarget |> Assert.True
-  
-  [<Fact>]
-  let ``HxTarget succeeds when the header is present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Target", "#leItem")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxTarget |> Assert.True
-    Assert.Equal("#leItem", Option.get ctx.Request.Headers.HxTarget)
-
-  [<Fact>]
-  let ``HxTrigger succeeds when the header is not present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Option.isNone ctx.Request.Headers.HxTrigger |> Assert.True
-  
-  [<Fact>]
-  let ``HxTrigger succeeds when the header is present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Trigger", "#trig")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxTrigger |> Assert.True
-    Assert.Equal("#trig", Option.get ctx.Request.Headers.HxTrigger)
-
-  [<Fact>]
-  let ``HxTriggerName succeeds when the header is not present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Option.isNone ctx.Request.Headers.HxTriggerName |> Assert.True
-  
-  [<Fact>]
-  let ``HxTriggerName succeeds when the header is present`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Trigger-Name", "click")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Option.isSome ctx.Request.Headers.HxTriggerName |> Assert.True
-    Assert.Equal("click", Option.get ctx.Request.Headers.HxTriggerName)
-
-
-/// Tests for the HttpRequest extension properties
-module HttpRequestExtensions =
-  
-  [<Fact>]
-  let ``IsHtmx succeeds when request is not from htmx`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Assert.False ctx.Request.IsHtmx
-  
-  [<Fact>]
-  let ``IsHtmx succeeds when request is from htmx`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Request", "true")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Assert.True ctx.Request.IsHtmx
-  
-  [<Fact>]
-  let ``IsHtmxRefresh succeeds when request is not from htmx`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
-    Assert.False ctx.Request.IsHtmxRefresh
-
-  [<Fact>]
-  let ``IsHtmxRefresh succeeds when request is from htmx, but not a refresh`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Request", "true")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Assert.False ctx.Request.IsHtmxRefresh
-
-  [<Fact>]
-  let ``IsHtmxRefresh succeeds when request is from htmx and is a refresh`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    dic.Add ("HX-Request", "true")
-    dic.Add ("HX-History-Restore-Request", "true")
-    ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
-    Assert.True ctx.Request.IsHtmxRefresh
-
-
-/// Tests for the HttpHandler functions provided in the Handlers module
-module HandlerTests =
-  
-  open System.Threading.Tasks
-  
-  /// Dummy "next" parameter to get the pipeline to execute/terminate
-  let next (ctx : HttpContext) = Task.FromResult (Some ctx)
-  
-  [<Fact>]
-  let ``withHxPush succeeds`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxPush "/a-new-url" next ctx
-      Assert.True (dic.ContainsKey "HX-Push")
-      Assert.Equal ("/a-new-url", dic.["HX-Push"].[0])
-      }
-
-  [<Fact>]
-  let ``withHxRedirect succeeds`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxRedirect "/somewhere-else" next ctx
-      Assert.True (dic.ContainsKey "HX-Redirect")
-      Assert.Equal ("/somewhere-else", dic.["HX-Redirect"].[0])
-      }
-
-  [<Fact>]
-  let ``withHxRefresh succeeds when set to true`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxRefresh true next ctx
-      Assert.True (dic.ContainsKey "HX-Refresh")
-      Assert.Equal ("true", dic.["HX-Refresh"].[0])
-      }
-
-  [<Fact>]
-  let ``withHxRefresh succeeds when set to false`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxRefresh false next ctx
-      Assert.True (dic.ContainsKey "HX-Refresh")
-      Assert.Equal ("false", dic.["HX-Refresh"].[0])
-      }
-
-  [<Fact>]
-  let ``withHxRetarget succeeds`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxRetarget "#somewhereElse" next ctx
-      Assert.True (dic.ContainsKey "HX-Retarget")
-      Assert.Equal ("#somewhereElse", dic.["HX-Retarget"].[0])
-      }
-    
-  [<Fact>]
-  let ``withHxTrigger succeeds`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxTrigger "doSomething" next ctx
-      Assert.True (dic.ContainsKey "HX-Trigger")
-      Assert.Equal ("doSomething", dic.["HX-Trigger"].[0])
-      }
-
-  [<Fact>]
-  let ``withHxTriggerMany succeeds`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxTriggerMany [ "blah", "foo"; "bleh", "bar" ] next ctx
-      Assert.True (dic.ContainsKey "HX-Trigger")
-      Assert.Equal ("""{ "blah": "foo", "bleh": "bar" }""", dic.["HX-Trigger"].[0])
-      }
-
-  [<Fact>]
-  let ``withHxTriggerAfterSettle succeeds`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxTriggerAfterSettle "byTheWay" next ctx
-      Assert.True (dic.ContainsKey "HX-Trigger-After-Settle")
-      Assert.Equal ("byTheWay", dic.["HX-Trigger-After-Settle"].[0])
-      }
-
-  [<Fact>]
-  let ``withHxTriggerManyAfterSettle succeeds`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxTriggerManyAfterSettle [ "oof", "ouch"; "hmm", "uh" ] next ctx
-      Assert.True (dic.ContainsKey "HX-Trigger-After-Settle")
-      Assert.Equal ("""{ "oof": "ouch", "hmm": "uh" }""", dic.["HX-Trigger-After-Settle"].[0])
-      }
-
-  [<Fact>]
-  let ``withHxTriggerAfterSwap succeeds`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxTriggerAfterSwap "justASec" next ctx
-      Assert.True (dic.ContainsKey "HX-Trigger-After-Swap")
-      Assert.Equal ("justASec", dic.["HX-Trigger-After-Swap"].[0])
-      }
-
-  [<Fact>]
-  let ``withHxTriggerManyAfterSwap succeeds`` () =
-    let ctx = Substitute.For<HttpContext> ()
-    let dic = HeaderDictionary ()
-    ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
-    task {
-      let! _ = withHxTriggerManyAfterSwap [ "this", "1"; "that", "2" ] next ctx
-      Assert.True (dic.ContainsKey "HX-Trigger-After-Swap")
-      Assert.Equal ("""{ "this": "1", "that": "2" }""", dic.["HX-Trigger-After-Swap"].[0])
-      }
-
--- a/src/Htmx/Giraffe.Htmx.fsproj
+++ b/src/Htmx/Giraffe.Htmx.fsproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <Description>htmx header extensions and helpers for Giraffe</Description>
    <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -10,10 +9,16 @@
  <ItemGroup>
    <Compile Include="Htmx.fs" />
    <None Include="README.md" Pack="true" PackagePath="\" />
+    <None Include="..\icon.png" Pack="true" PackagePath="\" />
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Giraffe" Version="5.0.0" />
+    <PackageReference Include="Giraffe" Version="6.2.0" />
+    <PackageReference Update="FSharp.Core" Version="6.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Giraffe.Htmx.Common.fsproj" />
  </ItemGroup>

 </Project>
--- a/src/Htmx/Htmx.fs
+++ b/src/Htmx/Htmx.fs
@@ -1,4 +1,4 @@
-module Giraffe.Htmx
+module Giraffe.Htmx

 open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Primitives
@@ -6,7 +6,7 @@ open System

 /// Determine if the given header is present
 let private hdr (headers : IHeaderDictionary) hdr =
-  match headers.[hdr] with it when it = StringValues.Empty -> None | it -> Some it.[0]
+    match headers[hdr] with it when it = StringValues.Empty -> None | it -> Some it[0]

 /// Extensions to the header dictionary
 type IHeaderDictionary with
@@ -39,10 +39,10 @@ type IHeaderDictionary with
 /// Extensions for the request object
 type HttpRequest with

-  /// Whether this request was initiated from HTMX
+    /// Whether this request was initiated from htmx
    member this.IsHtmx with get () = this.Headers.HxRequest |> Option.defaultValue false

-  /// Whether this request is an HTMX history-miss refresh request
+    /// Whether this request is an htmx history-miss refresh request
    member this.IsHtmxRefresh with get () =
        this.IsHtmx && (this.Headers.HxHistoryRestoreRequest |> Option.defaultValue false)

@@ -62,9 +62,21 @@ module Handlers =
        |> String.concat ", "
        |> sprintf "{ %s }"

-  // Pushes a new url into the history stack
-  let withHxPush : string -> HttpHandler =
-    setHttpHeader "HX-Push"
+    /// Pushes a new url into the history stack
+    let withHxPushUrl : string -> HttpHandler =
+        setHttpHeader "HX-Push-Url"
+
+    /// Explicitly do not push a new URL into the history stack
+    let withHxNoPushUrl : HttpHandler =
+        toLowerBool false |> withHxPushUrl
+      
+    /// Pushes a new url into the history stack
+    [<Obsolete "Use withHxPushUrl; HX-Push was replaced by HX-Push-Url in v1.8.0">]
+    let withHxPush = withHxPushUrl
+    
+    /// Explicitly do not push a new URL into the history stack
+    [<Obsolete "Use withHxNoPushUrl; HX-Push was replaced by HX-Push-Url in v1.8.0">]
+    let withHxNoPush = withHxNoPushUrl
      
    /// Can be used to do a client-side redirect to a new location
    let withHxRedirect : string -> HttpHandler =
@@ -74,6 +86,22 @@ module Handlers =
    let withHxRefresh : bool -> HttpHandler =
        toLowerBool >> setHttpHeader "HX-Refresh"

+    /// Replaces the current URL in the history stack
+    let withHxReplaceUrl : string -> HttpHandler =
+        setHttpHeader "HX-Replace-Url"
+
+    /// Explicitly do not replace the current URL in the history stack
+    let withHxNoReplaceUrl : HttpHandler =
+        toLowerBool false |> withHxReplaceUrl
+    
+    /// Override which portion of the response will be swapped into the target document
+    let withHxReselect : string -> HttpHandler =
+        setHttpHeader "HX-Reselect"
+    
+    /// Override the `hx-swap` attribute from the initiating element
+    let withHxReswap : string -> HttpHandler =
+        setHttpHeader "HX-Reswap"
+
    /// Allows you to override the `hx-target` attribute
    let withHxRetarget : string -> HttpHandler =
        setHttpHeader "HX-Retarget"
--- a/src/Htmx/README.md
+++ b/src/Htmx/README.md
@@ -2,6 +2,8 @@

 This package enables server-side support for [htmx](https://htmx.org) within [Giraffe](https://giraffe.wiki) and ASP.NET's `HttpContext`.

+**htmx version: 1.9.10**
+
 ### Setup

 1. Install the package.
@@ -25,9 +27,11 @@ To set a response header:
  let myHandler : HttpHander =
    fun next ctx ->
      // some meaningful work
-      withHxPush "/some/new/url" >=> [other handlers]
+      withHxPushUrl "/some/new/url" >=> [other handlers]
 ```

+The `HxSwap` module has constants to use for the `HX-Reswap` header. These may be extended with settle, show, and other qualifiers; see the htmx documentation for the `hx-swap` attribute for more information.
+
 ### Learn

 The naming conventions of this library were selected to mirror those provided by htmx. The header properties become `Hx*` on the `ctx.Request.Headers` object, and the response handlers are `withHx*` based on the header being set. The only part that does not line up is `withHxTrigger*` and `withHxTriggerMany`; the former set work with a single string (to trigger a single event with no arguments), while the latter set supports both arguments and multiple events.
--- a/src/Tests/Common.fs
+++ b/src/Tests/Common.fs
@@ -0,0 +1,33 @@
+module Common
+
+open Expecto
+open Giraffe.Htmx
+
+/// Tests for the HxSwap module
+let swap =
+    testList "HxSwap" [
+        test "InnerHtml is correct" {
+            Expect.equal HxSwap.InnerHtml "innerHTML" "Inner HTML swap value incorrect"
+        }
+        test "OuterHtml is correct" {
+            Expect.equal HxSwap.OuterHtml "outerHTML" "Outer HTML swap value incorrect"
+        }
+        test "BeforeBegin is correct" {
+            Expect.equal HxSwap.BeforeBegin "beforebegin" "Before Begin swap value incorrect"
+        }
+        test "BeforeEnd is correct" {
+            Expect.equal HxSwap.BeforeEnd "beforeend" "Before End swap value incorrect"
+        }
+        test "AfterBegin is correct" {
+            Expect.equal HxSwap.AfterBegin "afterbegin" "After Begin swap value incorrect"
+        }
+        test "AfterEnd is correct" {
+            Expect.equal HxSwap.AfterEnd "afterend" "After End swap value incorrect"
+        }
+        test "None is correct" {
+            Expect.equal HxSwap.None "none" "None swap value incorrect"
+        }
+    ]
+
+/// All tests for this module
+let allTests = testList "Htmx.Common" [ swap ]
--- a/src/Tests/Htmx.fs
+++ b/src/Tests/Htmx.fs
@@ -0,0 +1,350 @@
+module Htmx
+
+open System
+open Expecto
+open Giraffe.Htmx
+open Microsoft.AspNetCore.Http
+open NSubstitute
+
+/// Tests for the IHeaderDictionary extension properties
+let dictExtensions =
+    testList "IHeaderDictionaryExtensions" [
+        testList "HxBoosted" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxBoosted "There should not have been a header returned"
+            }
+            test "succeeds when the header is present and true" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Boosted", "true")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxBoosted "There should be a header present"
+                Expect.isTrue ctx.Request.Headers.HxBoosted.Value "The header value should have been true"
+            }
+            test "succeeds when the header is present and false" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Boosted", "false")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxBoosted "There should be a header present"
+                Expect.isFalse ctx.Request.Headers.HxBoosted.Value "The header value should have been false"
+            }
+        ]
+        testList "HxCurrentUrl" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxCurrentUrl "There should not have been a header returned"
+            }
+            test "succeeds when the header is present" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Current-URL", "http://localhost/test.htm")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxCurrentUrl "There should be a header present"
+                Expect.equal
+                    ctx.Request.Headers.HxCurrentUrl.Value (Uri "http://localhost/test.htm")
+                    "The header value was not correct"
+            }
+        ]
+        testList "HxHistoryRestoreRequest" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxHistoryRestoreRequest "There should not have been a header returned"
+            }
+            test "succeeds when the header is present and true" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-History-Restore-Request", "true")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxHistoryRestoreRequest "There should be a header present"
+                Expect.isTrue ctx.Request.Headers.HxHistoryRestoreRequest.Value "The header value should have been true"
+            }
+            test "succeeds when the header is present and false" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-History-Restore-Request", "false")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxHistoryRestoreRequest "There should be a header present"
+                Expect.isFalse
+                    ctx.Request.Headers.HxHistoryRestoreRequest.Value "The header should have been false"
+            }
+        ]
+        testList "HxPrompt" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxPrompt "There should not have been a header returned"
+            }
+            test "succeeds when the header is present" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Prompt", "of course")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxPrompt "There should be a header present"
+                Expect.equal ctx.Request.Headers.HxPrompt.Value "of course" "The header value was incorrect"
+            }
+        ]
+        testList "HxRequest" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxRequest "There should not have been a header returned"
+            }
+            test "succeeds when the header is present and true" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Request", "true")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxRequest "There should be a header present"
+                Expect.isTrue ctx.Request.Headers.HxRequest.Value "The header should have been true"
+            }
+            test "succeeds when the header is present and false" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Request", "false")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxRequest "There should be a header present"
+                Expect.isFalse ctx.Request.Headers.HxRequest.Value "The header should have been false"
+            }
+        ]
+        testList "HxTarget" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxTarget "There should not have been a header returned"
+            }
+            test "succeeds when the header is present" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Target", "#leItem")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxTarget "There should be a header present"
+                Expect.equal ctx.Request.Headers.HxTarget.Value "#leItem" "The header value was incorrect"
+            }
+        ]
+        testList "HxTrigger" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxTrigger "There should not have been a header returned"
+            }
+            test "succeeds when the header is present" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Trigger", "#trig")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxTrigger "There should be a header present"
+                Expect.equal ctx.Request.Headers.HxTrigger.Value "#trig" "The header value was incorrect"
+            }
+        ]
+        testList "HxTriggerName" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxTriggerName "There should not have been a header returned"
+            }
+            test "HxTriggerName succeeds when the header is present" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Trigger-Name", "click")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxTriggerName "There should be a header present"
+                Expect.equal ctx.Request.Headers.HxTriggerName.Value "click" "The header value was incorrect"
+            }
+        ]
+    ]
+
+/// Tests for the HttpRequest extension properties
+let reqExtensions =
+    testList "HttpRequestExtensions" [
+        testList "IsHtmx" [
+            test "succeeds when request is not from htmx" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isFalse ctx.Request.IsHtmx "The request should not be an htmx request"
+            }    
+            test "succeeds when request is from htmx" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Request", "true")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isTrue ctx.Request.IsHtmx "The request should have been an htmx request"
+            }
+        ]
+        testList "IsHtmxRefresh" [
+            test "succeeds when request is not from htmx" {
+                let ctx = Substitute.For<HttpContext> ()
+                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                Expect.isFalse ctx.Request.IsHtmxRefresh "The request should not have been an htmx refresh"
+            }
+            test "succeeds when request is from htmx, but not a refresh" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Request", "true")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isFalse ctx.Request.IsHtmxRefresh "The request should not have been an htmx refresh"
+            }
+            test "IsHtmxRefresh succeeds when request is from htmx and is a refresh" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                dic.Add ("HX-Request", "true")
+                dic.Add ("HX-History-Restore-Request", "true")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isTrue ctx.Request.IsHtmxRefresh "The request should have been an htmx refresh"
+            }
+        ]
+    ]
+
+open System.Threading.Tasks
+
+/// Dummy "next" parameter to get the pipeline to execute/terminate
+let next (ctx : HttpContext) = Task.FromResult (Some ctx)
+        
+/// Tests for the HttpHandler functions provided in the Handlers module
+let handlers =
+    testList "HandlerTests" [
+        testTask "withHxPushUrl succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxPushUrl "/a-new-url" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Push-Url") "The HX-Push-Url header should be present"
+            Expect.equal dic["HX-Push-Url"].[0] "/a-new-url" "The HX-Push-Url value was incorrect"
+        }
+        testTask "withHxNoPushUrl succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxNoPushUrl next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Push-Url") "The HX-Push-Url header should be present"
+            Expect.equal dic["HX-Push-Url"].[0] "false" "The HX-Push-Url value was incorrect"
+        }
+        testTask "withHxRedirect succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxRedirect "/somewhere-else" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Redirect") "The HX-Redirect header should be present"
+            Expect.equal dic["HX-Redirect"].[0] "/somewhere-else" "The HX-Redirect value was incorrect"
+        }
+        testList "withHxRefresh" [
+            testTask "succeeds when set to true" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+                let! _ = withHxRefresh true next ctx
+                Expect.isTrue (dic.ContainsKey "HX-Refresh") "The HX-Refresh header should be present"
+                Expect.equal dic["HX-Refresh"].[0] "true" "The HX-Refresh value was incorrect"
+            }
+            testTask "succeeds when set to false" {
+                let ctx = Substitute.For<HttpContext> ()
+                let dic = HeaderDictionary ()
+                ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+                let! _ = withHxRefresh false next ctx
+                Expect.isTrue (dic.ContainsKey "HX-Refresh") "The HX-Refresh header should be present"
+                Expect.equal dic["HX-Refresh"].[0] "false" "The HX-Refresh value was incorrect"
+            }
+        ]
+        testTask "withHxReplaceUrl succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxReplaceUrl "/a-substitute-url" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Replace-Url") "The HX-Replace-Url header should be present"
+            Expect.equal dic["HX-Replace-Url"].[0] "/a-substitute-url" "The HX-Replace-Url value was incorrect"
+        }
+        testTask "withHxNoReplaceUrl succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxNoReplaceUrl next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Replace-Url") "The HX-Replace-Url header should be present"
+            Expect.equal dic["HX-Replace-Url"].[0] "false" "The HX-Replace-Url value was incorrect"
+        }
+        testTask "withHxReselect succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxReselect "#test" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Reselect") "The HX-Reselect header should be present"
+            Expect.equal dic["HX-Reselect"].[0] "#test" "The HX-Reselect value was incorrect"
+        } 
+        testTask "withHxReswap succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxReswap HxSwap.BeforeEnd next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Reswap") "The HX-Reswap header should be present"
+            Expect.equal dic["HX-Reswap"].[0] HxSwap.BeforeEnd "The HX-Reswap value was incorrect"
+        } 
+        testTask "withHxRetarget succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxRetarget "#somewhereElse" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Retarget") "The HX-Retarget header should be present"
+            Expect.equal dic["HX-Retarget"].[0] "#somewhereElse" "The HX-Retarget value was incorrect"
+        }
+        testTask "withHxTrigger succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxTrigger "doSomething" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Trigger") "The HX-Trigger header should be present"
+            Expect.equal dic["HX-Trigger"].[0] "doSomething" "The HX-Trigger value was incorrect"
+        }
+        testTask "withHxTriggerMany succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxTriggerMany [ "blah", "foo"; "bleh", "bar" ] next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Trigger") "The HX-Trigger header should be present"
+            Expect.equal
+                dic["HX-Trigger"].[0] """{ "blah": "foo", "bleh": "bar" }""" "The HX-Trigger value was incorrect"
+        }
+        testTask "withHxTriggerAfterSettle succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxTriggerAfterSettle "byTheWay" next ctx
+            Expect.isTrue
+                (dic.ContainsKey "HX-Trigger-After-Settle") "The HX-Trigger-After-Settle header should be present"
+            Expect.equal dic["HX-Trigger-After-Settle"].[0] "byTheWay" "The HX-Trigger-After-Settle value was incorrect"
+        }
+        testTask "withHxTriggerManyAfterSettle succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxTriggerManyAfterSettle [ "oof", "ouch"; "hmm", "uh" ] next ctx
+            Expect.isTrue
+                (dic.ContainsKey "HX-Trigger-After-Settle") "The HX-Trigger-After-Settle header should be present"
+            Expect.equal
+                dic["HX-Trigger-After-Settle"].[0] """{ "oof": "ouch", "hmm": "uh" }"""
+                "The HX-Trigger-After-Settle value was incorrect"
+        }
+        testTask "withHxTriggerAfterSwap succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxTriggerAfterSwap "justASec" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Trigger-After-Swap") "The HX-Trigger-After-Swap header should be present"
+            Expect.equal dic["HX-Trigger-After-Swap"].[0] "justASec" "The HX-Trigger-After-Swap value was incorrect"
+        }
+        testTask "withHxTriggerManyAfterSwap succeeds" {
+            let ctx = Substitute.For<HttpContext> ()
+            let dic = HeaderDictionary ()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxTriggerManyAfterSwap [ "this", "1"; "that", "2" ] next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Trigger-After-Swap") "The HX-Trigger-After-Swap header should be present"
+            Expect.equal
+                dic["HX-Trigger-After-Swap"].[0] """{ "this": "1", "that": "2" }"""
+                "The HX-Trigger-After-Swap value was incorrect"
+        }
+    ]
+
+/// All tests for this module
+let allTests = testList "Htmx" [ dictExtensions; reqExtensions; handlers ]
--- a/src/Tests/Program.fs
+++ b/src/Tests/Program.fs
@@ -0,0 +1,6 @@
+open Expecto
+
+let allTests = testList "Giraffe" [ Common.allTests; Htmx.allTests; ViewEngine.allTests ]
+
+[<EntryPoint>]
+let main args = runTestsWithArgs defaultConfig args allTests
--- a/src/Tests/Tests.fsproj
+++ b/src/Tests/Tests.fsproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Common.fs" />
+    <Compile Include="Htmx.fs" />
+    <Compile Include="ViewEngine.fs" />
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Giraffe.Htmx.Common.fsproj" />
+    <ProjectReference Include="..\Htmx\Giraffe.Htmx.fsproj" />
+    <ProjectReference Include="..\ViewEngine.Htmx\Giraffe.ViewEngine.Htmx.fsproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Expecto" Version="9.0.4" />
+    <PackageReference Include="NSubstitute" Version="5.0.0" />
+  </ItemGroup>
+
+</Project>
--- a/src/Tests/ViewEngine.fs
+++ b/src/Tests/ViewEngine.fs
--- a/src/ViewEngine.Htmx.Tests/Giraffe.ViewEngine.Htmx.Tests.fsproj
+++ b/src/ViewEngine.Htmx.Tests/Giraffe.ViewEngine.Htmx.Tests.fsproj
@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-    <GenerateProgramFile>false</GenerateProgramFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Tests.fs" />
-    <Compile Include="Program.fs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ViewEngine.Htmx\Giraffe.ViewEngine.Htmx.fsproj" />
-  </ItemGroup>
-
-</Project>
--- a/src/ViewEngine.Htmx.Tests/Program.fs
+++ b/src/ViewEngine.Htmx.Tests/Program.fs
@@ -1 +0,0 @@
-module Program = let [<EntryPoint>] main _ = 0
--- a/src/ViewEngine.Htmx.Tests/Tests.fs
+++ b/src/ViewEngine.Htmx.Tests/Tests.fs
@@ -1,444 +0,0 @@
-module Giraffe.ViewEngine.Htmx.Tests
-
-open Giraffe.ViewEngine
-open Xunit
-
-/// Tests for the HxEncoding module
-module Encoding =
-  
-  [<Fact>]
-  let ``Form is correct`` () =
-    Assert.Equal ("application/x-www-form-urlencoded", HxEncoding.Form)
-  
-  [<Fact>]
-  let ``MultipartForm is correct`` () =
-    Assert.Equal ("multipart/form-data", HxEncoding.MultipartForm)
-
-
-/// Tests for the HxHeaders module
-module Headers =
-  
-  [<Fact>]
-  let ``From succeeds with an empty list`` () =
-    Assert.Equal ("{  }", HxHeaders.From [])
-  
-  [<Fact>]
-  let ``From succeeds and escapes quotes`` () =
-    Assert.Equal ("{ \"test\": \"one two three\", \"again\": \"four \\\"five\\\" six\" }",
-                  HxHeaders.From [ "test", "one two three"; "again", "four \"five\" six" ])
-
-
-/// Tests for the HxParams module
-module Params =
-  
-  [<Fact>]
-  let ``All is correct`` () =
-    Assert.Equal ("*", HxParams.All)
-  
-  [<Fact>]
-  let ``None is correct`` () =
-    Assert.Equal ("none", HxParams.None)
-
-  [<Fact>]
-  let ``With succeeds with empty list`` () =
-    Assert.Equal ("", HxParams.With [])
-  
-  [<Fact>]
-  let ``With succeeds with one list item`` () =
-    Assert.Equal ("boo", HxParams.With [ "boo" ])
-  
-  [<Fact>]
-  let ``With succeeds with multiple list items`` () =
-    Assert.Equal ("foo,bar,baz", HxParams.With [ "foo"; "bar"; "baz" ])
-
-  [<Fact>]
-  let ``Except succeeds with empty list`` () =
-    Assert.Equal ("not ", HxParams.Except [])
-  
-  [<Fact>]
-  let ``Except succeeds with one list item`` () =
-    Assert.Equal ("not that", HxParams.Except [ "that" ])
-  
-  [<Fact>]
-  let ``Except succeeds with multiple list items`` () =
-    Assert.Equal ("not blue,green", HxParams.Except [ "blue"; "green" ])
-
-
-/// Tests for the HxRequest module
-module Request =
-  
-  [<Fact>]
-  let ``Configure succeeds with an empty list`` () =
-    Assert.Equal ("{  }", HxRequest.Configure [])
-  
-  [<Fact>]
-  let ``Configure succeeds with a non-empty list`` () =
-    Assert.Equal ("{ \"a\": \"b\", \"c\": \"d\" }", HxRequest.Configure [ "\"a\": \"b\""; "\"c\": \"d\"" ])
-  
-  [<Fact>]
-  let ``Configure succeeds with all known params configured`` () =
-    Assert.Equal ("{ \"timeout\": 1000, \"credentials\": false, \"noHeaders\": true }",
-                  HxRequest.Configure [ HxRequest.Timeout 1000; HxRequest.Credentials false; HxRequest.NoHeaders true ])
-  
-  [<Fact>]
-  let ``Timeout succeeds`` () =
-    Assert.Equal ("\"timeout\": 50", HxRequest.Timeout 50)
-  
-  [<Fact>]
-  let ``Credentials succeeds when set to true`` () =
-    Assert.Equal ("\"credentials\": true", HxRequest.Credentials true)
-  
-  [<Fact>]
-  let ``Credentials succeeds when set to false`` () =
-    Assert.Equal ("\"credentials\": false", HxRequest.Credentials false)
-  
-  [<Fact>]
-  let ``NoHeaders succeeds when set to true`` () =
-    Assert.Equal ("\"noHeaders\": true", HxRequest.NoHeaders true)
-  
-  [<Fact>]
-  let ``NoHeaders succeeds when set to false`` () =
-    Assert.Equal ("\"noHeaders\": false", HxRequest.NoHeaders false)
-
-  
-/// Tests for the HxSwap module
-module Swap =
-  
-  [<Fact>]
-  let ``InnerHtml is correct`` () =
-    Assert.Equal ("innerHTML", HxSwap.InnerHtml)
-
-  [<Fact>]
-  let ``OuterHtml is correct`` () =
-    Assert.Equal ("outerHTML", HxSwap.OuterHtml)
-
-  [<Fact>]
-  let ``BeforeBegin is correct`` () =
-    Assert.Equal ("beforebegin", HxSwap.BeforeBegin)
-
-  [<Fact>]
-  let ``BeforeEnd is correct`` () =
-    Assert.Equal ("beforeend", HxSwap.BeforeEnd)
-
-  [<Fact>]
-  let ``AfterBegin is correct`` () =
-    Assert.Equal ("afterbegin", HxSwap.AfterBegin)
-
-  [<Fact>]
-  let ``AfterEnd is correct`` () =
-    Assert.Equal ("afterend", HxSwap.AfterEnd)
-
-  [<Fact>]
-  let ``None is correct`` () =
-    Assert.Equal ("none", HxSwap.None)
-
-
-/// Tests for the HxTrigger module
-module Trigger =
-  
-  [<Fact>]
-  let ``Click is correct`` () =
-    Assert.Equal ("click", HxTrigger.Click)
-  
-  [<Fact>]
-  let ``Load is correct`` () =
-    Assert.Equal ("load", HxTrigger.Load)
-  
-  [<Fact>]
-  let ``Revealed is correct`` () =
-    Assert.Equal ("revealed", HxTrigger.Revealed)
-  
-  [<Fact>]
-  let ``Every succeeds`` () =
-    Assert.Equal ("every 3s", HxTrigger.Every "3s")
-
-  [<Fact>]
-  let ``Filter.Alt succeeds`` () =
-    Assert.Equal ("click[altKey]", HxTrigger.Filter.Alt HxTrigger.Click)
-  
-  [<Fact>]
-  let ``Filter.Ctrl succeeds`` () =
-    Assert.Equal ("click[ctrlKey]", HxTrigger.Filter.Ctrl HxTrigger.Click)
-  
-  [<Fact>]
-  let ``Filter.Shift succeeds`` () =
-    Assert.Equal ("click[shiftKey]", HxTrigger.Filter.Shift HxTrigger.Click)
-  
-  [<Fact>]
-  let ``Filter.CtrlAlt succeeds`` () =
-    Assert.Equal ("click[ctrlKey&&altKey]", HxTrigger.Filter.CtrlAlt HxTrigger.Click)
-
-  [<Fact>]
-  let ``Filter.CtrlShift succeeds`` () =
-    Assert.Equal ("click[ctrlKey&&shiftKey]", HxTrigger.Filter.CtrlShift HxTrigger.Click)
-
-  [<Fact>]
-  let ``Filter.CtrlAltShift succeeds`` () =
-    Assert.Equal ("click[ctrlKey&&altKey&&shiftKey]", HxTrigger.Filter.CtrlAltShift HxTrigger.Click)
-
-  [<Fact>]
-  let ``Filter.AltShift succeeds`` () =
-    Assert.Equal ("click[altKey&&shiftKey]", HxTrigger.Filter.AltShift HxTrigger.Click)
-
-  [<Fact>]
-  let ``Once succeeds when it is the first modifier`` () =
-    Assert.Equal ("once", HxTrigger.Once "")
-    
-  [<Fact>]
-  let ``Once succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click once", HxTrigger.Once "click")
-
-  [<Fact>]
-  let ``Changed succeeds when it is the first modifier`` () =
-    Assert.Equal ("changed", HxTrigger.Changed "")
-    
-  [<Fact>]
-  let ``Changed succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click changed", HxTrigger.Changed "click")
-
-  [<Fact>]
-  let ``Delay succeeds when it is the first modifier`` () =
-    Assert.Equal ("delay:1s", HxTrigger.Delay "1s" "")
-    
-  [<Fact>]
-  let ``Delay succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click delay:2s", HxTrigger.Delay "2s" "click")
-
-  [<Fact>]
-  let ``Throttle succeeds when it is the first modifier`` () =
-    Assert.Equal ("throttle:4s", HxTrigger.Throttle "4s" "")
-    
-  [<Fact>]
-  let ``Throttle succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click throttle:7s", HxTrigger.Throttle "7s" "click")
-
-  [<Fact>]
-  let ``From succeeds when it is the first modifier`` () =
-    Assert.Equal ("from:.nav", HxTrigger.From ".nav" "")
-    
-  [<Fact>]
-  let ``From succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click from:#somewhere", HxTrigger.From "#somewhere" "click")
-
-  [<Fact>]
-  let ``FromDocument succeeds when it is the first modifier`` () =
-    Assert.Equal ("from:document", HxTrigger.FromDocument "")
-    
-  [<Fact>]
-  let ``FromDocument succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click from:document", HxTrigger.FromDocument "click")
-
-  [<Fact>]
-  let ``FromWindow succeeds when it is the first modifier`` () =
-    Assert.Equal ("from:window", HxTrigger.FromWindow "")
-    
-  [<Fact>]
-  let ``FromWindow succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click from:window", HxTrigger.FromWindow "click")
-
-  [<Fact>]
-  let ``FromClosest succeeds when it is the first modifier`` () =
-    Assert.Equal ("from:closest div", HxTrigger.FromClosest "div" "")
-    
-  [<Fact>]
-  let ``FromClosest succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click from:closest p", HxTrigger.FromClosest "p" "click")
-
-  [<Fact>]
-  let ``FromFind succeeds when it is the first modifier`` () =
-    Assert.Equal ("from:find li", HxTrigger.FromFind "li" "")
-    
-  [<Fact>]
-  let ``FromFind succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click from:find .spot", HxTrigger.FromFind ".spot" "click")
-
-  [<Fact>]
-  let ``Target succeeds when it is the first modifier`` () =
-    Assert.Equal ("target:main", HxTrigger.Target "main" "")
-    
-  [<Fact>]
-  let ``Target succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click target:footer", HxTrigger.Target "footer" "click")
-
-  [<Fact>]
-  let ``Consume succeeds when it is the first modifier`` () =
-    Assert.Equal ("consume", HxTrigger.Consume "")
-    
-  [<Fact>]
-  let ``Consume succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click consume", HxTrigger.Consume "click")
-
-  [<Fact>]
-  let ``Queue succeeds when it is the first modifier`` () =
-    Assert.Equal ("queue:abc", HxTrigger.Queue "abc" "")
-    
-  [<Fact>]
-  let ``Queue succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click queue:def", HxTrigger.Queue "def" "click")
-
-  [<Fact>]
-  let ``QueueFirst succeeds when it is the first modifier`` () =
-    Assert.Equal ("queue:first", HxTrigger.QueueFirst "")
-    
-  [<Fact>]
-  let ``QueueFirst succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click queue:first", HxTrigger.QueueFirst "click")
-
-  [<Fact>]
-  let ``QueueLast succeeds when it is the first modifier`` () =
-    Assert.Equal ("queue:last", HxTrigger.QueueLast "")
-    
-  [<Fact>]
-  let ``QueueLast succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click queue:last", HxTrigger.QueueLast "click")
-
-  [<Fact>]
-  let ``QueueAll succeeds when it is the first modifier`` () =
-    Assert.Equal ("queue:all", HxTrigger.QueueAll "")
-    
-  [<Fact>]
-  let ``QueueAll succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click queue:all", HxTrigger.QueueAll "click")
-
-  [<Fact>]
-  let ``QueueNone succeeds when it is the first modifier`` () =
-    Assert.Equal ("queue:none", HxTrigger.QueueNone "")
-    
-  [<Fact>]
-  let ``QueueNone succeeds when it is not the first modifier`` () =
-    Assert.Equal ("click queue:none", HxTrigger.QueueNone "click")
-
-
-/// Tests for the HxVals module
-module Vals =
-  
-  [<Fact>]
-  let ``From succeeds with an empty list`` () =
-    Assert.Equal ("{  }", HxVals.From [])
-  
-  [<Fact>]
-  let ``From succeeds and escapes quotes`` () =
-    Assert.Equal ("{ \"test\": \"a \\\"b\\\" c\", \"2\": \"d e f\" }",
-                  HxVals.From [ "test", "a \"b\" c"; "2", "d e f" ])
-
-
-/// Tests for the HtmxAttrs module
-module Attributes =
-  
-  /// Pipe-able assertion for a rendered node 
-  let shouldRender expected node = Assert.Equal (expected, RenderView.AsString.htmlNode node)
-  
-  [<Fact>]
-  let ``_hxBoost succeeds`` () =
-    div [ _hxBoost ] [] |> shouldRender """<div hx-boost="true"></div>"""
-
-  [<Fact>]
-  let ``_hxConfirm succeeds`` () =
-    button [ _hxConfirm "REALLY?!?" ] [] |> shouldRender """<button hx-confirm="REALLY?!?"></button>"""
-
-  [<Fact>]
-  let ``_hxDelete succeeds`` () =
-    span [ _hxDelete "/this-endpoint" ] [] |> shouldRender """<span hx-delete="/this-endpoint"></span>"""
-  
-  [<Fact>]
-  let ``_hxDisable succeeds`` () =
-    p [ _hxDisable ] [] |> shouldRender """<p hx-disable></p>"""
-  
-  [<Fact>]
-  let ``_hxEncoding succeeds`` () =
-    form [ _hxEncoding "utf-7" ] [] |> shouldRender """<form hx-encoding="utf-7"></form>"""
-  
-  [<Fact>]
-  let ``_hxExt succeeds`` () =
-    section [ _hxExt "extendme" ] [] |> shouldRender """<section hx-ext="extendme"></section>"""
-  
-  [<Fact>]
-  let ``_hxGet succeeds`` () =
-    article [ _hxGet "/the-text" ] [] |> shouldRender """<article hx-get="/the-text"></article>"""
-  
-  [<Fact>]
-  let ``_hxHeaders succeeds`` () =
-    figure [ _hxHeaders """{ "X-Special-Header": "some-header" }""" ] []
-    |> shouldRender """<figure hx-headers="{ &quot;X-Special-Header&quot;: &quot;some-header&quot; }"></figure>"""
-  
-  [<Fact>]
-  let ``_hxHistoryElt succeeds`` () =
-    table [ _hxHistoryElt ] [] |> shouldRender """<table hx-history-elt></table>"""
-  
-  [<Fact>]
-  let ``_hxInclude succeeds`` () =
-    a [ _hxInclude ".extra-stuff" ] [] |> shouldRender """<a hx-include=".extra-stuff"></a>"""
-  
-  [<Fact>]
-  let ``_hxIndicator succeeds`` () =
-    aside [ _hxIndicator "#spinner" ] [] |> shouldRender """<aside hx-indicator="#spinner"></aside>"""
-  
-  [<Fact>]
-  let ``_hxNoBoost succeeds`` () =
-    td [ _hxNoBoost ] [] |> shouldRender """<td hx-boost="false"></td>"""
-  
-  [<Fact>]
-  let ``_hxParams succeeds`` () =
-    br [ _hxParams "[p1,p2]" ] |> shouldRender """<br hx-params="[p1,p2]">"""
-  
-  [<Fact>]
-  let ``_hxPatch succeeds`` () =
-    div [ _hxPatch "/arrrgh" ] [] |> shouldRender """<div hx-patch="/arrrgh"></div>"""
-  
-  [<Fact>]
-  let ``_hxPost succeeds`` () =
-    hr [ _hxPost "/hear-ye-hear-ye" ] |> shouldRender """<hr hx-post="/hear-ye-hear-ye">"""
-  
-  [<Fact>]
-  let ``_hxPreserve succeeds`` () =
-    img [ _hxPreserve ] |> shouldRender """<img hx-preserve="true">"""
-  
-  [<Fact>]
-  let ``_hxPrompt succeeds`` () =
-    strong [ _hxPrompt "Who goes there?" ] [] |> shouldRender """<strong hx-prompt="Who goes there?"></strong>"""
-  
-  [<Fact>]
-  let ``_hxPushUrl succeeds`` () =
-    dl [ _hxPushUrl ] [] |> shouldRender """<dl hx-push-url></dl>"""
-  
-  [<Fact>]
-  let ``_hxPut succeeds`` () =
-    s [ _hxPut "/take-this" ] [] |> shouldRender """<s hx-put="/take-this"></s>"""
-  
-  [<Fact>]
-  let ``_hxRequest succeeds`` () =
-    u [ _hxRequest "noHeaders" ] [] |> shouldRender """<u hx-request="noHeaders"></u>"""
-  
-  [<Fact>]
-  let ``_hxSelect succeeds`` () =
-    nav [ _hxSelect "#navbar" ] [] |> shouldRender """<nav hx-select="#navbar"></nav>"""
-  
-  [<Fact>]
-  let ``_hxSse succeeds`` () =
-    footer [ _hxSse "connect:/my-events" ] [] |> shouldRender """<footer hx-sse="connect:/my-events"></footer>"""
-  
-  [<Fact>]
-  let ``_hxSwap succeeds`` () =
-    del [ _hxSwap "innerHTML" ] [] |> shouldRender """<del hx-swap="innerHTML"></del>"""
-
-  [<Fact>]
-  let ``_hxSwapOob succeeds`` () =
-    li [ _hxSwapOob "true" ] [] |> shouldRender """<li hx-swap-oob="true"></li>"""
-  
-  [<Fact>]
-  let ``_hxTarget succeeds`` () =
-    header [ _hxTarget "#somewhereElse" ] [] |> shouldRender """<header hx-target="#somewhereElse"></header>"""
-
-  [<Fact>]  
-  let ``_hxTrigger succeeds`` () =
-    figcaption [ _hxTrigger "load" ] [] |> shouldRender """<figcaption hx-trigger="load"></figcaption>"""
-  
-  [<Fact>]
-  let ``_hxVals succeeds`` () =
-    dt [ _hxVals """{ "extra": "values" }""" ] []
-    |> shouldRender """<dt hx-vals="{ &quot;extra&quot;: &quot;values&quot; }"></dt>"""
-  
-  [<Fact>]
-  let ``_hxWs succeeds`` () =
-    ul [ _hxWs "connect:/web-socket" ] [] |> shouldRender """<ul hx-ws="connect:/web-socket"></ul>"""
-  
--- a/src/ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj
+++ b/src/ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <Description>Extensions to Giraffe View Engine to support htmx attributes and their values</Description>
    <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -10,10 +9,16 @@
  <ItemGroup>
    <Compile Include="Htmx.fs" />
    <None Include="README.md" Pack="true" PackagePath="\" />
+    <None Include="..\icon.png" Pack="true" PackagePath="\" />
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" />
+    <PackageReference Update="FSharp.Core" Version="6.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Giraffe.Htmx.Common.fsproj" />
  </ItemGroup>

 </Project>
--- a/src/ViewEngine.Htmx/Htmx.fs
+++ b/src/ViewEngine.Htmx/Htmx.fs
@@ -1,4 +1,4 @@
-module Giraffe.ViewEngine.Htmx
+module Giraffe.ViewEngine.Htmx

 /// Serialize a list of key/value pairs to JSON (very rudimentary)
 let private toJson (kvps : (string * string) list) =
@@ -11,15 +11,159 @@ let private toJson (kvps : (string * string) list) =
 /// Valid values for the `hx-encoding` attribute
 [<RequireQualifiedAccess>]
 module HxEncoding =
+    
    /// A standard HTTP form
    let Form          = "application/x-www-form-urlencoded"
+    
    /// A multipart form (used for file uploads)
    let MultipartForm = "multipart/form-data"


+/// The events recognized by htmx
+[<Struct>]
+type HxEvent =
+    /// Send this event to an element to abort a request
+    | Abort
+    /// Triggered after an AJAX request has completed processing a successful response
+    | AfterOnLoad
+    /// Triggered after htmx has initialized a node
+    | AfterProcessNode
+    /// Triggered after an AJAX request has completed
+    | AfterRequest
+    /// Triggered after the DOM has settled
+    | AfterSettle
+    /// Triggered after new content has been swapped in
+    | AfterSwap
+    /// Triggered before htmx disables an element or removes it from the DOM
+    | BeforeCleanupElement
+    /// Triggered before any response processing occurs
+    | BeforeOnLoad
+    /// Triggered before htmx initializes a node
+    | BeforeProcessNode
+    /// Triggered before an AJAX request is made
+    | BeforeRequest
+    /// Triggered before a swap is done, allows you to configure the swap
+    | BeforeSwap
+    /// Triggered just before an ajax request is sent
+    | BeforeSend
+    /// Triggered before the request, allows you to customize parameters, headers
+    | ConfigRequest
+    /// Triggered after a trigger occurs on an element, allows you to cancel (or delay) issuing the AJAX request
+    | Confirm
+    /// Triggered on an error during cache writing
+    | HistoryCacheError
+    /// Triggered on a cache miss in the history subsystem
+    | HistoryCacheMiss
+    /// Triggered on a unsuccessful remote retrieval
+    | HistoryCacheMissError
+    /// Triggered on a successful remote retrieval
+    | HistoryCacheMissLoad
+    /// Triggered when htmx handles a history restoration action
+    | HistoryRestore
+    /// Triggered before content is saved to the history cache
+    | BeforeHistorySave
+    /// Triggered when new content is added to the DOM
+    | Load
+    /// Triggered when an element refers to a SSE event in its trigger, but no parent SSE source has been defined
+    | NoSseSourceError
+    /// Triggered when an exception occurs during the onLoad handling in htmx
+    | OnLoadError
+    /// Triggered after an out of band element as been swapped in
+    | OobAfterSwap
+    /// Triggered before an out of band element swap is done, allows you to configure the swap
+    | OobBeforeSwap
+    /// Triggered when an out of band element does not have a matching ID in the current DOM
+    | OobErrorNoTarget
+    /// Triggered after a prompt is shown
+    | Prompt
+    /// Triggered after an url is pushed into history
+    | PushedIntoHistory
+    /// Triggered when an HTTP response error (non-200 or 300 response code) occurs
+    | ResponseError
+    /// Triggered when a network error prevents an HTTP request from happening
+    | SendError
+    /// Triggered when an error occurs with a SSE source
+    | SseError
+    /// Triggered when a SSE source is opened
+    | SseOpen
+    /// Triggered when an error occurs during the swap phase
+    | SwapError
+    /// Triggered when an invalid target is specified
+    | TargetError
+    /// Triggered when a request timeout occurs
+    | Timeout
+    /// Triggered before an element is validated
+    | ValidationValidate
+    /// Triggered when an element fails validation
+    | ValidationFailed
+    /// Triggered when a request is halted due to validation errors
+    | ValidationHalted
+    /// Triggered when an ajax request aborts
+    | XhrAbort
+    /// Triggered when an ajax request ends
+    | XhrLoadEnd
+    /// Triggered when an ajax request starts
+    | XhrLoadStart
+    /// Triggered periodically during an ajax request that supports progress events
+    | XhrProgress
+    
+    /// The htmx event name (fst) and kebab-case name (snd, for use with hx-on)
+    static member private Values = Map [
+        Abort, ("abort", "abort")
+        AfterOnLoad, ("afterOnLoad", "after-on-load")
+        AfterProcessNode, ("afterProcessNode", "after-process-node")
+        AfterRequest, ("afterRequest", "after-request")
+        AfterSettle, ("afterSettle", "after-settle")
+        AfterSwap, ("afterSwap", "after-swap")
+        BeforeCleanupElement, ("beforeCleanupElement", "before-cleanup-element")
+        BeforeOnLoad, ("beforeOnLoad", "before-on-load")
+        BeforeProcessNode, ("beforeProcessNode", "before-process-node")
+        BeforeRequest, ("beforeRequest", "before-request")
+        BeforeSwap, ("beforeSwap", "before-swap")
+        BeforeSend, ("beforeSend", "before-send")
+        ConfigRequest, ("configRequest", "config-request")
+        Confirm, ("confirm", "confirm")
+        HistoryCacheError, ("historyCacheError", "history-cache-error")
+        HistoryCacheMiss, ("historyCacheMiss", "history-cache-miss")
+        HistoryCacheMissError, ("historyCacheMissError", "history-cache-miss-error")
+        HistoryCacheMissLoad, ("historyCacheMissLoad", "history-cache-miss-load")
+        HistoryRestore, ("historyRestore", "history-restore")
+        BeforeHistorySave, ("beforeHistorySave", "before-history-save")
+        Load, ("load", "load")
+        NoSseSourceError, ("noSSESourceError", "no-sse-source-error")
+        OnLoadError, ("onLoadError", "on-load-error")
+        OobAfterSwap, ("oobAfterSwap", "oob-after-swap")
+        OobBeforeSwap, ("oobBeforeSwap", "oob-before-swap")
+        OobErrorNoTarget, ("oobErrorNoTarget", "oob-error-no-target")
+        Prompt, ("prompt", "prompt")
+        PushedIntoHistory, ("pushedIntoHistory", "pushed-into-history")
+        ResponseError, ("responseError", "response-error")
+        SendError, ("sendError", "send-error")
+        SseError, ("sseError", "sse-error")
+        SseOpen, ("sseOpen", "sse-open")
+        SwapError, ("swapError", "swap-error")
+        TargetError, ("targetError", "target-error")
+        Timeout, ("timeout", "timeout")
+        ValidationValidate, ("validation:validate", "validation:validate")
+        ValidationFailed, ("validation:failed", "validation:failed")
+        ValidationHalted, ("validation:halted", "validation:halted")
+        XhrAbort, ("xhr:abort", "xhr:abort")
+        XhrLoadEnd, ("xhr:loadend", "xhr:loadend")
+        XhrLoadStart, ("xhr:loadstart", "xhr:loadstart")
+        XhrProgress, ("xhr:progress", "xhr:progress")
+    ]
+    
+    /// The htmx event name 
+    override this.ToString() = fst HxEvent.Values[this]
+    
+    /// The hx-on variant of the htmx event name
+    member this.ToHxOnString() = snd HxEvent.Values[this]
+
+
 /// Helper to create the `hx-headers` attribute
 [<RequireQualifiedAccess>]
 module HxHeaders =
+    
    /// Create headers from a list of key/value pairs
    let From = toJson

@@ -27,12 +171,16 @@ module HxHeaders =
 /// Values / helpers for the `hx-params` attribute
 [<RequireQualifiedAccess>]
 module HxParams =
+    
    /// Include all parameters
    let All  = "*"
+    
    /// Include no parameters
    let None = "none"
+    
    /// Include the specified parameters
    let With   fields = match fields with [] -> "" | _ -> fields |> List.reduce (fun acc it -> $"{acc},{it}")
+    
    /// Exclude the specified parameters
    let Except fields = With fields |> sprintf "not %s"

@@ -40,108 +188,124 @@ module HxParams =
 /// Helpers to define `hx-request` attribute values
 [<RequireQualifiedAccess>]
 module HxRequest =
+    
    /// Convert a boolean to its lowercase string equivalent
    let private toLowerBool (it : bool) =
        (string it).ToLowerInvariant ()
+    
    /// Configure the request with various options
    let Configure (opts : string list) =
        opts
        |> String.concat ", "
        |> sprintf "{ %s }"
+    
    /// Set a timeout (in milliseconds)
    let Timeout (ms : int) = $"\"timeout\": {ms}"
+    
    /// Include or exclude credentials from the request
    let Credentials = toLowerBool >> sprintf "\"credentials\": %s"
+    
    /// Exclude or include headers from the request
    let NoHeaders = toLowerBool >> sprintf "\"noHeaders\": %s"


-/// Valid values for the `hx-swap` attribute (may be combined with swap/settle/scroll/show config)
-[<RequireQualifiedAccess>]
-module HxSwap =
-  /// The default, replace the inner html of the target element
-  let InnerHtml   = "innerHTML"
-  /// Replace the entire target element with the response
-  let OuterHtml   = "outerHTML"
-  /// Insert the response before the target element
-  let BeforeBegin = "beforebegin"
-  /// Insert the response before the first child of the target element
-  let AfterBegin  = "afterbegin"
-  /// Insert the response after the last child of the target element
-  let BeforeEnd   = "beforeend"
-  /// Insert the response after the target element
-  let AfterEnd    = "afterend"
-  /// Does not append content from response (out of band items will still be processed).
-  let None        = "none"
-
-
 /// Helpers for the `hx-trigger` attribute
 [<RequireQualifiedAccess>]
 module HxTrigger =
+    
    /// Append a filter to a trigger
    let private appendFilter filter (trigger : string) =
        match trigger.Contains "[" with
        | true ->
            let parts = trigger.Split ('[', ']')
-        $"{parts.[0]}[{parts.[1]}&&{filter}]"
+            $"{parts[0]}[{parts[1]}&&{filter}]"
        | false -> $"{trigger}[{filter}]"
+    
    /// Trigger the event on a click
    let Click = "click"
+    
    /// Trigger the event on page load
    let Load = "load"
+    
    /// Trigger the event when the item is visible
    let Revealed = "revealed"
+    
    /// Trigger this event every [timing declaration]
    let Every (duration : string) = $"every {duration}"
+    
    /// Helpers for defining filters
    module Filter =
+
        /// Only trigger the event if the `ALT` key is pressed
        let Alt          = appendFilter "altKey"
+        
        /// Only trigger the event if the `CTRL` key is pressed
        let Ctrl         = appendFilter "ctrlKey"
+        
        /// Only trigger the event if the `SHIFT` key is pressed
        let Shift        = appendFilter "shiftKey"
+        
        /// Only trigger the event if `CTRL+ALT` are pressed
        let CtrlAlt      = Ctrl    >> Alt
+        
        /// Only trigger the event if `CTRL+SHIFT` are pressed
        let CtrlShift    = Ctrl    >> Shift
+        
        /// Only trigger the event if `CTRL+ALT+SHIFT` are pressed
        let CtrlAltShift = CtrlAlt >> Shift
+        
        /// Only trigger the event if `ALT+SHIFT` are pressed
        let AltShift     = Alt     >> Shift
+    
    /// Append a modifier to the current trigger
    let private appendModifier modifier current =
-    match current with "" -> modifier | _ -> $"{current} {modifier}"
+        if current = "" then modifier else $"{current} {modifier}"
+    
    /// Only trigger once
    let Once = appendModifier "once"
+    
    /// Trigger when changed
    let Changed = appendModifier "changed"
+    
    /// Delay execution; resets every time the event is seen
    let Delay = sprintf "delay:%s" >> appendModifier
+    
    /// Throttle execution; ignore other events, fire when duration passes
    let Throttle = sprintf "throttle:%s" >> appendModifier
+    
    /// Trigger this event from a CSS selector
    let From = sprintf "from:%s" >> appendModifier
+    
    /// Trigger this event from the `document` object
    let FromDocument = From "document"
+    
    /// Trigger this event from the `window` object
    let FromWindow = From "window"
+    
    /// Trigger this event from the closest parent CSS selector
    let FromClosest = sprintf "closest %s" >> From
+    
    /// Trigger this event from the closest child CSS selector
    let FromFind = sprintf "find %s" >> From
+    
    /// Target the given CSS selector with the results of this event
    let Target = sprintf "target:%s" >> appendModifier
+    
    /// Prevent any further events from occurring after this one fires
    let Consume = appendModifier "consume"
+    
    /// Configure queueing when events fire when others are in flight; if unspecified, the default is "last"
    let Queue = sprintf "queue:%s" >> appendModifier
+    
    /// Queue the first event, discard all others (i.e., a FIFO queue of 1)
    let QueueFirst = Queue "first"
+    
    /// Queue the last event; discards current when another is received (i.e., a LIFO queue of 1)
    let QueueLast = Queue "last"
+    
    /// Queue all events; discard none
    let QueueAll = Queue "all"
+    
    /// Queue no events; discard all
    let QueueNone = Queue "none"

@@ -149,66 +313,224 @@ module HxTrigger =
 /// Helper to create the `hx-vals` attribute
 [<RequireQualifiedAccess>]
 module HxVals =
+    
    /// Create values from a list of key/value pairs
    let From = toJson

+open System

-/// Attributes and flags for HTMX
+/// Attributes and flags for htmx
 [<AutoOpen>]
 module HtmxAttrs =
+    
    /// Progressively enhances anchors and forms to use AJAX requests (use `_hxNoBoost` to set to false)
    let _hxBoost      = attr "hx-boost" "true"
+    
    /// Shows a confirm() dialog before issuing a request
    let _hxConfirm    = attr "hx-confirm"
+    
    /// Issues a DELETE to the specified URL
    let _hxDelete     = attr "hx-delete"
+    
    /// Disables htmx processing for the given node and any children nodes
    let _hxDisable    = flag "hx-disable"
+    
+    /// Specifies elements that should be disabled when an htmx request is in flight
+    let _hxDisabledElt = attr "hx-disabled-elt"
+
+    /// Disinherit all ("*") or specific htmx attributes
+    let _hxDisinherit = attr "hx-disinherit"
+    
    /// Changes the request encoding type
    let _hxEncoding   = attr "hx-encoding"
+    
    /// Extensions to use for this element
    let _hxExt        = attr "hx-ext"
+    
    /// Issues a GET to the specified URL
    let _hxGet        = attr "hx-get"
+    
    /// Adds to the headers that will be submitted with the request
    let _hxHeaders    = attr "hx-headers"
+    
+    /// Set to "false" to prevent pages with sensitive information from being stored in the history cache
+    let _hxHistory    = attr "hx-history"
+    
    /// The element to snapshot and restore during history navigation
    let _hxHistoryElt = flag "hx-history-elt"
+    
    /// Includes additional data in AJAX requests
    let _hxInclude    = attr "hx-include"
+    
    /// The element to put the htmx-request class on during the AJAX request
    let _hxIndicator  = attr "hx-indicator"
+    
    /// Overrides a previous `hx-boost`
    let _hxNoBoost    = attr "hx-boost" "false"
+    
+    /// Attach an event handler for DOM or htmx events
+    [<Obsolete "This will be removed in htmx 2; use _hxOnEvent or _hxOnHxEvent instead">]
+    let _hxOn         = attr "hx-on"
+
+    /// Attach an event handler for DOM events
+    let _hxOnEvent evtName =
+        attr $"hx-on:%s{evtName}"
+
+    /// Attach an event handler for htmx events
+    let _hxOnHxEvent (hxEvent: HxEvent) =
+        _hxOnEvent $":{hxEvent.ToHxOnString()}"
+
    /// Filters the parameters that will be submitted with a request
    let _hxParams     = attr "hx-params"
+    
    /// Issues a PATCH to the specified URL
    let _hxPatch      = attr "hx-patch"
+    
    /// Issues a POST to the specified URL
    let _hxPost       = attr "hx-post"
+    
    /// Preserves an element between requests
    let _hxPreserve   = attr "hx-preserve" "true"
+    
    /// Shows a prompt before submitting a request
    let _hxPrompt     = attr "hx-prompt"
+    
    /// Pushes the URL into the location bar, creating a new history entry
-  let _hxPushUrl    = flag "hx-push-url"
+    let _hxPushUrl    = attr "hx-push-url"
+    
    /// Issues a PUT to the specified URL
    let _hxPut        = attr "hx-put"
+    
+    /// Replaces the current URL in the browser's history stack
+    let _hxReplaceUrl = attr "hx-replace-url"
+    
    /// Configures various aspects of the request
    let _hxRequest    = attr "hx-request"
+    
    /// Selects a subset of the server response to process
    let _hxSelect     = attr "hx-select"
+    
+    /// Selects a subset of an out-of-band server response
+    let _hxSelectOob  = attr "hx-select-oob"
+    
    /// Establishes and listens to Server Sent Event (SSE) sources for events
    let _hxSse        = attr "hx-sse"
+    
    /// Controls how the response content is swapped into the DOM (e.g. 'outerHTML' or 'beforeEnd')
    let _hxSwap       = attr "hx-swap"
+    
+    /// Controls how the response content is swapped into the DOM (e.g. 'outerHTML' or 'beforeEnd'), enabling CSS
+    /// transitions
+    let _hxSwapWithTransition = sprintf "%s transition:true" >> _hxSwap
+    
    /// Marks content in a response as being "Out of Band", i.e. swapped somewhere other than the target
    let _hxSwapOob    = attr "hx-swap-oob"
+    
+    /// Synchronize events based on another element
+    let _hxSync       = attr "hx-sync"
+    
    /// Specifies the target element to be swapped
    let _hxTarget     = attr "hx-target"
+    
    /// Specifies the event that triggers the request
    let _hxTrigger    = attr "hx-trigger"
+    
+    /// Validate an input element (uses HTML5 validation API)
+    let _hxValidate   = flag "hx-validate"
+    
    /// Adds to the parameters that will be submitted with the request
    let _hxVals       = attr "hx-vals"
+    
    /// Establishes a WebSocket or sends information to one
    let _hxWs         = attr "hx-ws"
+
+
+/// Script tags to pull htmx into an web page
+module Script =
+  
+    /// Script tag to load the minified version from unpkg.com
+    let minified =
+        script [ _src         "https://unpkg.com/htmx.org@1.9.10"
+                 _integrity   "sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC"
+                 _crossorigin "anonymous" ] []
+
+    /// Script tag to load the unminified version from unpkg.com
+    let unminified =
+        script [ _src         "https://unpkg.com/htmx.org@1.9.10/dist/htmx.js"
+                 _integrity   "sha384-j1TtLExqttdT7C3Z/rJy8UZcCGiuqwwN9++coZ6up+5O/l2FHdp3IGfuJOvst6d1"
+                 _crossorigin "anonymous" ] []
+
+
+/// Functions to extract and render an HTML fragment from a document
+[<RequireQualifiedAccess>]
+module RenderFragment =
+    
+    /// Does this element have an ID matching the requested ID name?
+    let private isIdElement nodeId (elt : XmlElement) =
+        snd elt
+        |> Array.exists (fun attr ->
+            match attr with
+            | KeyValue (name, value) -> name = "id" && value = nodeId
+            | Boolean _ -> false)
+
+    /// Generate a message if the requested ID node is not found
+    let private nodeNotFound (nodeId : string) =
+        $"<em>&ndash; ID {nodeId} not found &ndash;</em>"
+    
+    /// Find the node with the named ID
+    let rec findIdNode nodeId (node : XmlNode) : XmlNode option =
+        match node with
+        | Text _ -> None
+        | VoidElement elt -> if isIdElement nodeId elt then Some node else None
+        | ParentNode (elt, children) ->
+            if isIdElement nodeId elt then Some node else children |> List.tryPick (fun c -> findIdNode nodeId c)
+    
+    /// Functions to render a fragment as a string
+    [<RequireQualifiedAccess>]
+    module AsString =
+
+        /// Render to HTML for the given ID
+        let htmlFromNodes nodeId (nodes : XmlNode list) =
+            match nodes |> List.tryPick(fun node -> findIdNode nodeId node) with
+            | Some idNode -> RenderView.AsString.htmlNode idNode
+            | None -> nodeNotFound nodeId
+
+        /// Render to HTML for the given ID
+        let htmlFromNode nodeId node =
+            match findIdNode nodeId node with
+            | Some idNode -> RenderView.AsString.htmlNode idNode
+            | None -> nodeNotFound nodeId
+
+    /// Functions to render a fragment as bytes
+    [<RequireQualifiedAccess>]
+    module AsBytes =
+
+        let private utf8 = System.Text.Encoding.UTF8
+
+        /// Render to HTML for the given ID
+        let htmlFromNodes nodeId (nodes : XmlNode list) =
+            match nodes |> List.tryPick(fun node -> findIdNode nodeId node) with
+            | Some idNode -> RenderView.AsBytes.htmlNode idNode
+            | None -> nodeNotFound nodeId |> utf8.GetBytes
+
+        /// Render to HTML for the given ID
+        let htmlFromNode nodeId node =
+            match findIdNode nodeId node with
+            | Some idNode -> RenderView.AsBytes.htmlNode idNode
+            | None -> nodeNotFound nodeId |> utf8.GetBytes
+
+    /// Functions to render a fragment into a StringBuilder
+    [<RequireQualifiedAccess>]
+    module IntoStringBuilder =
+
+        /// Render to HTML for the given ID
+        let htmlFromNodes sb nodeId (nodes : XmlNode list) =
+            match nodes |> List.tryPick(fun node -> findIdNode nodeId node) with
+            | Some idNode -> RenderView.IntoStringBuilder.htmlNode sb idNode
+            | None -> nodeNotFound nodeId |> sb.Append |> ignore
+
+        /// Render to HTML for the given ID
+        let htmlFromNode sb nodeId node =
+            match findIdNode nodeId node with
+            | Some idNode -> RenderView.IntoStringBuilder.htmlNode sb idNode
+            | None -> nodeNotFound nodeId |> sb.Append |> ignore
--- a/src/ViewEngine.Htmx/README.md
+++ b/src/ViewEngine.Htmx/README.md
@@ -2,6 +2,8 @@

 This package enables [htmx](https://htmx.org) support within the [Giraffe](https://giraffe.wiki) view engine.

+**htmx version: 1.9.10**
+
 ### Setup

 1. Install the package.
@@ -21,13 +23,23 @@ Support modules include:
 - `HxHeaders`
 - `HxParams`
 - `HxRequest`
- `HxSwap`
+- `HxSwap` (requires `open Giraffe.Htmx`)
 - `HxTrigger`
 - `HxVals`

+There are two `XmlNode`s that will load the htmx script from unpkg; `Htmx.Script.minified` loads the minified version, and `Htmx.Script.unminified` loads the unminified version (useful for debugging).
+
+This also supports [fragment rendering](https://bitbadger.solutions/blog/2022/fragment-rendering-in-giraffe-view-engine.html), providing the flexibility to render an entire template, or only a portion of it (based on the element's `id` attribute).
+
 ### Learn

-htmx's attributes and these attribute functions map one-to-one. The lone exception is `_hxBoost`, which implies `true`; use `_hxNoBoost` to set it to `false`. The support modules contain named properties for known values (as illustrated with `HxTrigger.Load` above). A few of the modules are more than collections of names, though:
+htmx's attributes and these attribute functions map one-to-one. There are two exceptions:
+- `_hxBoost` implies `true`; use `_hxNoBoost` to set it to `false`.
+- `_hxSwapWithTransition` renders the standard `hx-swap` attribute and appends `transition:true` to the specified swap value.
+
+The htmx `hx-on` attribute supports multiple events if they are separated with a newline (`\n`) character. The value provided to this attribute will be attribute-escaped, but in testing, it was interpreted correctly.
+
+The support modules contain named properties for known values (as illustrated with `HxTrigger.Load` above). A few of the modules are more than collections of names, though:
 - `HxRequest` has a `Configure` function, which takes a list of strings; the other functions in the module allow for configuring the request.

 ```fsharp
--- a/src/icon.png
+++ b/src/icon.png
Author	SHA1	Message	Date
Daniel J. Summers	71286b9064	Move FSharp.Core version to .fsproj files - Change event DU to struct	2024-01-02 19:26:09 -05:00
Daniel J. Summers	85ac22877c	v1.9.10 (#9 )	2024-01-02 19:02:24 -05:00
Daniel J. Summers	dea2323499	Update NuGet READMEs	2023-11-22 16:13:57 -05:00
Daniel J. Summers	fcaaa693bc	Bump htmx version; add .NET 8 support	2023-11-22 16:09:52 -05:00
Daniel J. Summers	8fd6af8c26	Add support for hx-disabled-elt - Update script tag to 1.9.6	2023-09-27 20:31:56 -04:00
Daniel J. Summers	69a4034661	Update to htmx 1.9.5	2023-08-25 12:36:30 -04:00
Daniel J. Summers	5aa9408e60	Update to htmx 1.9.4	2023-07-26 12:54:48 -04:00
Daniel J. Summers	98f53a5e53	Add HX-Reselect; update for 1.9.3	2023-07-15 17:54:01 -04:00
Daniel J. Summers	7798314fb8	Update script tags for v1.9.2	2023-05-06 13:14:58 -04:00
Daniel J. Summers	50c66435e8	Add _hxOn and _hxSwapWithTransition - Update scripts and version to 1.9.0	2023-04-14 16:56:08 -04:00
Daniel J. Summers	5b3a1be87e	Update script for 1.8.6 - Sync version in package READMEs	2023-03-03 12:26:40 -05:00
Daniel J. Summers	168f434030	Remove PostgreSQL verbiage oops	2023-02-27 20:56:49 -05:00
Daniel J. Summers	e3db0bced0	Xunit -> Expecto (#7 )	2023-02-27 20:55:16 -05:00
Daniel J. Summers	fb5c4f1bcb	Change to main branch	2023-02-27 20:51:51 -05:00
Daniel J. Summers	c3229d51d1	Remove manual start	2023-02-27 20:42:42 -05:00
Daniel J. Summers	951edef8ad	Allow manual starting	2023-02-27 20:41:25 -05:00
Daniel J. Summers	3908451d6e	Add CI action	2023-02-27 20:38:33 -05:00
Daniel J. Summers	277d93dd99	Add hx-history attribute Add .NET 7 support	2023-01-17 20:41:54 -05:00
Daniel J. Summers	061f6e5a4e	Add link to frag render post	2022-11-24 11:34:07 -05:00
Daniel J. Summers	bb2df73175	Add _hxValidate, fragment rendering Also bump version to 1.8.4	2022-11-24 10:50:08 -05:00
Daniel J. Summers	e0c567098d	Add files to package common project	2022-07-14 11:32:42 -04:00
Daniel J. Summers	4be5bad8ef	Update package READMEs	2022-07-14 09:24:49 -04:00
Daniel J. Summers	a169000ce2	Update for version 1.8.0 (#6 ) - Bump library version - Bump htmx script version - Add hx-replace-url / HX-Replace-Url - Add hx-select-oob - Change hx-push-url to accept a string - Add HX-Push-Url, obsolete HX-Push - Implement HX-Reswap header - Rework project structure to add common project	2022-07-14 09:13:52 -04:00
Daniel J. Summers	c587a28770	Update for htmx 1.7.0 (#4 ) Fixes #3	2022-02-23 21:54:51 -05:00
Daniel J. Summers	b5292bffc4	HTMX -> htmx	2022-01-07 16:02:01 -05:00
Daniel J. Summers	86defea3c1	Add scripts to README Also prep for release	2022-01-06 21:31:36 -05:00
Daniel J. Summers	9a9f159cab	Add script functions Also bump version to match htmx	2022-01-04 12:54:36 -05:00
				`@@ -1 +0,0 @@`
				`module Program = let [<EntryPoint>] main _ = 0`