v4.0.0 initial release (#22 )

Reviewed-on: #22
v4, beta5 (#20 )
2026-09-01 00:08:19 +00:00 · 2026-06-30 02:03:15 +00:00 · 2026-06-15 01:07:38 +00:00 · 2026-03-22 22:21:22 +00:00 · 2026-01-07 11:37:26 +00:00 · 2025-12-28 16:53:44 +00:00
25 changed files with 2316 additions and 1190 deletions
@@ -6,3 +6,6 @@
 .idea
 *.user
 .vscode
+src/*.nupkg
+src/tests*.txt
+
@@ -10,13 +10,15 @@ htmx uses attributes and HTTP headers to attain its interactivity; the libraries

 `Giraffe.Htmx` provides extensions that facilitate using htmx on the server side, primarily reading and setting headers. `Giraffe.ViewEngine.Htmx` provides attributes and helpers to produce views that utilize htmx. Both can be installed from NuGet via standard methods.

-| Server Side | View Engine |
-|---|---|
-|[![Nuget](https://img.shields.io/nuget/v/Giraffe.Htmx?style=plastic)](https://www.nuget.org/packages/Giraffe.Htmx/)|[![Nuget](https://img.shields.io/nuget/v/Giraffe.ViewEngine.Htmx?style=plastic)](https://www.nuget.org/packages/Giraffe.ViewEngine.Htmx/)|
+| Server Side                                                                                                            | View Engine                                                                                                                                  |
+|------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------|
+| [![Nuget](https://img.shields.io/nuget/vpre/Giraffe.Htmx?style=plastic)](https://www.nuget.org/packages/Giraffe.Htmx/) | [![Nuget](https://img.shields.io/nuget/vpre/Giraffe.ViewEngine.Htmx?style=plastic)](https://www.nuget.org/packages/Giraffe.ViewEngine.Htmx/) |
+
+Both of these packages will also install `Giraffe.Htmx.Common`, which has some common definitions and provides a local-to-your-project version of the htmx JavaScript _(as of v2.0.8)_ and htmax htmx-plus-extensions bundle _(as of v4.0.0-beta4)_.

 ## Server Side (`Giraffe.Htmx`)

-In addition to the regular HTTP request payloads, htmx sets [one or more headers](https://htmx.org/docs/#request_headers) along with the request. Once `Giraffe.Htmx` is opened, these are available as properties on `HttpContext.Request.Headers`. These consist of the header name, translated to a .NET name (ex. `HX-Current-URL` becomes `HxCurrentUrl`), and a strongly-typed property based on the expected value of that header. Additionally, they are all exposed as `Option`s, as they may or may not be present for any given request.
+In addition to the regular HTTP request payloads, htmx sets [one or more headers](https://four.htmx.org/reference/headers#request) along with the request. Once `Giraffe.Htmx` is opened, these are available as properties on `HttpContext.Request.Headers`. These consist of the header name, translated to a .NET name (ex. `HX-Current-URL` becomes `HxCurrentUrl`), and a strongly-typed property based on the expected value of that header. Additionally, they are all exposed as `Option`s, as they may or may not be present for any given request.

 A server may want to respond to a request that originated from htmx differently than a regular request. One way htmx can provide the same feel as a Single Page Application (SPA) is by swapping out the `body` content (or an element within it) instead of reloading the entire page. In this case, the developer can provide a partial layout to be used for these responses, while returning the full page for regular requests. The `IsHtmx` property makes this easy...

@@ -31,7 +33,7 @@ let result view : HttpHandler =
            full view
 ```

-htmx also utilizes [response headers](https://htmx.org/docs/#response_headers) to affect client-side behavior. For each of these, this library provides `HttpHandler`s that can be chained along with the response. As an example, if the server returns a redirect response (301, 302, 303, 307), the `XMLHttpRequest` handler on the client will follow the redirection before htmx can do anything with it. To redirect to a new page, you would return an OK (200) response with an `HX-Redirect` header set in the response.
+htmx also utilizes [response headers](https://four.htmx.org/reference/headers#response) to affect client-side behavior. For each of these, this library provides `HttpHandler`s that can be chained along with the response. As an example, if the server returns a redirect response (301, 302, 303, 307), the `fetch` handler on the client may follow the redirection before htmx can do anything with it. To redirect to a new page, you would return an OK (200) response with an `HX-Redirect` header set in the response.

 ```fsharp
 let theHandler : HttpHandler =
@@ -42,9 +44,11 @@ let theHandler : HttpHandler =

 Of note is that the `HX-Trigger` headers can take either one or more events. For a single event with no parameters, use `withHxTrigger`; for a single event with parameters, or multiple events, use `withHxTriggerMany`. Both these have `AfterSettle` and `AfterSwap` versions as well.

+`HtmxScript.local` provides an `HtmlString` with a script tag to load the package-provided htmx library, along with `localMax` to load the htmx-plus-extensions bundle. This can be used in code, Razor templates, etc. (If you're using Giraffe.ViewEngine, see below.)
+
 ## View Engine (`Giraffe.ViewEngine.Htmx`)

-As htmx uses [attributes](https://htmx.org/docs/#attributes) to extend HTML, the primary part of this library defines attributes that can be used within Giraffe views. Simply open `Giraffe.ViewEngine.Htmx`, and these attributes, along with support modules, will be visible.
+As htmx uses [attributes](https://four.htmx.org/reference/attributes) to extend HTML, the primary part of this library defines attributes that can be used within Giraffe views. Simply open `Giraffe.ViewEngine.Htmx`, and these attributes, along with support modules, will be visible.

 As an example, creating a `div` that loads data once the HTML is rendered:

@@ -66,11 +70,11 @@ let shiftClick =
    ]
 ```

-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.
+If you want to use the package-provided htmx library, `Htmx.Script.local` will create the `script` tag for you (as well as `Htmx.Script.Max.local` to load the htmax bundle). To load htmx from jsDelivr, `Htmx.Script.cdnMinified` or `Htmx.Script.cdnUnminified` can be used to load the script in your HTML trees (these also have `.Max` variants). In this case, if you are using a Content Security Policy (CSP) header, `cdn.jsdelivr.net` will need to be added to the `script-src` list.

 ## Feedback / Help

-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/).
+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 (and most others) of the [F# Community Discord server](https://discord.gg/R6n7c54).

 ## Thanks
 |[<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)|
@@ -1,28 +1,113 @@
-/// 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"
+/// <summary>Common definitions shared between attribute values and response headers</summary>
+[<AutoOpen>]
+module Giraffe.Htmx.Common
+
+/// <summary>The version of htmx embedded in the package</summary>
+let HtmxVersion = "4.0.0"
+
+/// <summary>URLs for the included htmx library static web assets</summary>
+module StaticAssetUrl =
+    /// <summary>The path for the provided htmx script</summary>
+    let htmx = $"/_content/Giraffe.Htmx.Common/htmx.min.js?ver={HtmxVersion}"
+
+    /// <summary>The path for the provided htmax script</summary>
+    let htmax = $"/_content/Giraffe.Htmx.Common/htmax.min.js?ver={HtmxVersion}"
+
+/// <summary>Serialize a list of key/value pairs to JSON (very rudimentary)</summary>
+/// <param name="pairs">The key/value pairs to be serialized to JSON</param>
+/// <returns>A string with the key/value pairs serialized to JSON</returns>
+let internal toJson (pairs: (string * string) list) =
+    pairs
+    |> List.map (fun pair -> sprintf "\"%s\": \"%s\"" (fst pair) ((snd pair).Replace ("\"", "\\\"")))
+    |> String.concat ", "
+    |> sprintf "{ %s }"
+
+/// <summary>Convert a boolean to lowercase "true" or "false"</summary>
+/// <param name="boolValue">The boolean value to convert</param>
+/// <returns>"true" for <c>true</c>, "false" for <c>false</c></returns>
+let internal toLowerBool (boolValue: bool) =
+    (string boolValue).ToLowerInvariant()
+
+
+/// <summary>Valid values for the <c>hx-swap</c> attribute / <c>HX-Reswap</c> header</summary>
+/// <remarks>May be combined with <c>swap</c> / <c>scroll</c> / <c>show</c> config)</remarks>
+/// <seealso href="https://four.htmx.org/attributes/hx-swap/">Documentation</seealso>
+[<RequireQualifiedAccess>]
+module HxSwap =
+
+    /// <summary>The default, replace the inner HTML of the target element</summary>
+    [<Literal>]
+    let InnerHtml = "innerHTML"
+
+    /// <summary>Replace the entire target element with the response</summary>
+    [<Literal>]
+    let OuterHtml = "outerHTML"
+
+    /// <summary>Morph the inner HTML of the target to the new content</summary>
+    [<Literal>]
+    let InnerMorph = "innerMorph"
+
+    /// <summary>Morph the outer HTML of the target to the new content</summary>
+    [<Literal>]
+    let OuterMorph = "outerMorph"
+
+    /// <summary>Morph the outer HTML of the target to the new content, recreating all children</summary>
+    /// <remarks>This is used internally by the new history extension, but can be used by others if desired</remarks>
+    [<Literal>]
+    let OuterSync = "outerSync"
+
+    /// <summary>Replace the text content of the target without parsing the response as HTML</summary>
+    [<Literal>]
+    let TextContent = "textContent"
+
+    /// <summary>Insert the response before the target element</summary>
+    [<Literal>]
+    let Before = "before"
+
+    /// <summary>Insert the response before the target element (pre-v4 name)</summary>
+    [<Literal>]
+    let BeforeBegin = Before
+
+    /// <summary>Insert the response before the first child of the target element</summary>
+    [<Literal>]
+    let Prepend = "prepend"
+
+    /// <summary>Insert the response before the first child of the target element (pre-v4 name)</summary>
+    [<Literal>]
+    let AfterBegin = Prepend
+
+    /// <summary>Insert the response after the last child of the target element</summary>
+    [<Literal>]
+    let Append = "append"
+
+    /// <summary>Insert the response after the last child of the target element (pre-v4 name)</summary>
+    [<Literal>]
+    let BeforeEnd = Append
+
+    /// <summary>Insert the response after the target element</summary>
+    [<Literal>]
+    let After = "after"
+
+    /// <summary>Insert the response after the target element (pre-v4 name)</summary>
+    [<Literal>]
+    let AfterEnd = After
+
+    /// <summary>Delete the target element regardless of response</summary>
+    [<Literal>]
+    let Delete = "delete"
+
+    /// <summary>Does not append content from response (out of band items will still be processed)</summary>
+    [<Literal>]
+    let None = "none"
+
+    /// <summary>Update existing elements by <c>id</c> and add new ones</summary>
+    /// <remarks>This requires the <c>upsert</c> extension</remarks>
+    /// <seealso href="https://four.htmx.org/extensions/upsert">Extension</seealso>
+    [<Literal>]
+    let Upsert = "upsert"
+
+    /// <summary>Specify that the target of the htmx request should be downloaded</summary>
+    /// <remarks>This requires the <c>hx-download</c> extension (included in the htmax bundle)</remarks>
+    /// <seealso href="https://four.htmx.org/extensions/hx-download#explicit-swap-style">Documentation</seealso>
+    [<Literal>]
+    let Download = "download"
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">

  <PropertyGroup>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <Description>Common definitions for Giraffe.Htmx</Description>
    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
  </PropertyGroup>

  <ItemGroup>
@@ -13,7 +14,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="6.0.0" />
+    <PackageReference Include="FSharp.Core" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <InternalsVisibleTo Include="Giraffe.Htmx" />
+    <InternalsVisibleTo Include="Giraffe.ViewEngine.Htmx" />
  </ItemGroup>
-
 </Project>
@@ -1,5 +1,7 @@
 ## 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.
+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. It also contains htmx and htmax as static web assets, allowing them to be loaded from your local (or published) project.

-**htmx version: 2.0.0-beta3**
+**htmx version: 4.0.0**
+
+_**NOTE:** Pay special attention to breaking changes highlighted in the packages listed above._
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
-        <VersionPrefix>2.0.0</VersionPrefix>
-        <VersionSuffix>beta3</VersionSuffix>
-        <PackageReleaseNotes>Update script tags to pull htmx 2.0.0-beta3</PackageReleaseNotes>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+        <VersionPrefix>4.0.0</VersionPrefix>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageReleaseNotes>htmx 4.0.0 Initial Release
+
+See package and prior alpha/beta release READMEs; v2 to v4 is not an update-and-forget-it release. If you encounter build errors after installing this, install v4.0.0-beta5 instead; obsolete elements will generate a warning with suggestions of what to use instead.
+        </PackageReleaseNotes>
        <Authors>danieljsummers</Authors>
        <Company>Bit Badger Solutions</Company>
        <PackageProjectUrl>https://git.bitbadger.solutions/bit-badger/Giraffe.Htmx</PackageProjectUrl>
@@ -13,6 +16,6 @@
        <RepositoryType>Git</RepositoryType>
        <Copyright>MIT License</Copyright>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageTags>Giraffe htmx beta</PackageTags>
+        <PackageTags>Giraffe htmx</PackageTags>
    </PropertyGroup>
 </Project>
@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Expecto" Version="11.1.0" />
+    <PackageVersion Include="Giraffe" Version="8.3.0" />
+    <PackageVersion Include="Giraffe.ViewEngine" Version="1.4.0" />
+    <PackageVersion Include="NSubstitute" Version="6.2.0" />
+    <PackageVersion Include="FSharp.Core" Version="10.1.400" />
+    <!-- <PackageVersion Update="FSharp.Core" Version="10.0.0" /> -->
+  </ItemGroup>
+</Project>
@@ -1,40 +0,0 @@
-
-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
@@ -0,0 +1,6 @@
+<Solution>
+  <Project Path="Common/Giraffe.Htmx.Common.fsproj" />
+  <Project Path="Htmx/Giraffe.Htmx.fsproj" />
+  <Project Path="Tests/Tests.fsproj" />
+  <Project Path="ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj" />
+</Solution>
@@ -4,6 +4,7 @@
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <Description>htmx header extensions and helpers for Giraffe</Description>
    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
  </PropertyGroup>

  <ItemGroup>
@@ -13,8 +14,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Giraffe" Version="6.2.0" />
-    <PackageReference Update="FSharp.Core" Version="6.0.0" />
+    <PackageReference Include="Giraffe" />
+    <PackageReference Include="FSharp.Core" />
  </ItemGroup>

  <ItemGroup>
@@ -4,128 +4,211 @@ open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Primitives
 open System

+/// <summary>The request types which may be set in the <c>HX-Request</c> header</summary>
+type HxRequestTypes =
+    /// <summary>A request targeting the <c>body</c> tag or using an <c>hx-select</c> attribute</summary>
+    | HxFullRequest
+
+    /// <summary>A request for partial content</summary>
+    | HxPartialRequest
+
 /// 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]

 /// Extensions to the header dictionary
 type IHeaderDictionary with
-  
-    /// Indicates that the request is via an element using `hx-boost`
-    member this.HxBoosted with get () = hdr this "HX-Boosted" |> Option.map bool.Parse
-    
-    /// The current URL of the browser _(note that this does not update until after settle)_
-    member this.HxCurrentUrl with get () = hdr this "HX-Current-URL" |> Option.map Uri
-    
-    /// `true` if the request is for history restoration after a miss in the local history cache
-    member this.HxHistoryRestoreRequest with get () = hdr this "HX-History-Restore-Request" |> Option.map bool.Parse
-    
-    /// The user response to an `hx-prompt`
-    member this.HxPrompt with get () = hdr this "HX-Prompt"

-    /// `true` if the request came from HTMX
-    member this.HxRequest with get () = hdr this "HX-Request" |> Option.map bool.Parse
+    /// <summary>Indicates that the request is via an element using <c>hx-boost</c></summary>
+    member this.HxBoosted
+        with get () = hdr this "HX-Boosted" |> Option.map bool.Parse

-    /// The `id` of the target element if it exists
-    member this.HxTarget with get () = hdr this "HX-Target"
+    /// <summary>The current URL of the browser <em>(note that this does not update until after settle)</em></summary>
+    member this.HxCurrentUrl
+        with get () = hdr this "HX-Current-URL" |> Option.map Uri

-    /// The `id` of the triggered element if it exists
-    member this.HxTrigger with get () = hdr this "HX-Trigger"
+    /// <summary><c>true</c> if the request is for history restoration after a miss in the local history cache</summary>
+    member this.HxHistoryRestoreRequest
+        with get () = hdr this "HX-History-Restore-Request" |> Option.map bool.Parse

-    /// The `name` of the triggered element if it exists
-    member this.HxTriggerName with get () = hdr this "HX-Trigger-Name"
+    /// <summary><c>true</c> if the request has been fired by the preload extension</summary>
+    /// <remarks><c>preload</c> is part of the htmax htmx-plus-extensions bundle</remarks>
+    member this.HxPreloaded
+        with get () = hdr this "HX-Preloaded" |> Option.map bool.Parse
+
+    /// <summary>The user response to an <c>hx-prompt</c></summary>
+    /// <remarks><b>NEW IN v4:</b> This functionality is dependent on the hx-prompt extension being loaded</remarks>
+    member this.HxPrompt
+        with get () = hdr this "HX-Prompt"
+
+    /// <summary><c>true</c> if the request came from htmx</summary>
+    member this.HxRequest
+        with get () = hdr this "HX-Request" |> Option.map bool.Parse
+
+    /// <summary>The ID of the request (WebSocket extension requests only)</summary>
+    /// <remarks><c>hx-ws</c> is part of the htmax htmx-plus-extensions bundle</remarks>
+    member this.HxRequestId
+        with get () = hdr this "HX-Request-ID"
+
+    /// <summary>The request type sent by htmx</summary>
+    /// <seealso cref="HxRequestTypes" />
+    member this.HxRequestType
+        with get () =
+            match hdr this "HX-Request-Type" with
+            | Some typ when typ = "full" -> Some HxFullRequest
+            | Some typ when typ = "partial" -> Some HxPartialRequest
+            | Some _ -> None
+            | None -> None
+
+    /// <summary>The tag name (fst) and <c>id</c> attribute (snd) of the element triggering this request</summary>
+    member this.HxSource
+        with get () =
+            match hdr this "HX-Source" with
+            | Some src ->
+                let parts = src.Split "#"
+                if parts.Length = 1 then
+                    Some (parts[0], None)
+                else
+                    Some (parts[0], if parts[1] <> "" then Some parts[1] else None)
+            | None -> None
+
+    /// <summary>The <c>id</c> attribute of the target element if it exists</summary>
+    /// <remarks>
+    /// In v4, this changed to tag name (fst) and <c>id</c> (snd); to resolve build errors, and restore the prior
+    /// behavior of <c>[id] option</c>, replace
+    /// <code>ctx.HxTarget</code>
+    /// with
+    /// <code>ctx.HxTarget |> Option.iter snd</code>
+    /// </remarks>
+    member this.HxTarget
+        with get () =
+            match hdr this "HX-Target" with
+            | Some src ->
+                let parts = src.Split "#"
+                if parts.Length = 1 then
+                    Some (parts[0], None)
+                else
+                    Some (parts[0], if parts[1] <> "" then Some parts[1] else None)
+            | None -> None


 /// Extensions for the request object
 type HttpRequest with

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

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


-/// HTTP handlers for setting output headers
+/// <summary>HTTP handlers for setting output headers</summary>
 [<AutoOpen>]
 module Handlers =

-    /// Convert a boolean to lowercase `true` or `false`
-    let private toLowerBool (trueOrFalse : bool) =
-        (string trueOrFalse).ToLowerInvariant ()
+    open Giraffe.Htmx.Common

-    /// Serialize a list of key/value pairs to JSON (very rudimentary)
-    let private toJson (evts : (string * string) list) =
-        evts
-        |> List.map (fun evt -> sprintf "\"%s\": \"%s\"" (fst evt) ((snd evt).Replace ("\"", "\\\"")))
-        |> String.concat ", "
-        |> sprintf "{ %s }"
+    /// <summary>Instruct htmx to download a response from another path / URL</summary>
+    /// <param name="path">The path or URL where the downloadable content is found</param>
+    /// <returns>An HTTP handler with the <c>HX-Download</c> header set</returns>
+    /// <remarks>This requires the client-side <c>hx-download</c> extension (included in the htmax bundle)</remarks>
+    /// <seealso href="https://four.htmx.org/extensions/hx-download#hx-download-header">Documentation</seealso>
+    let withHxDownload (path: string) : HttpHandler =
+        setHttpHeader "HX-Download" path

-    /// Pushes a new url into the history stack
-    let withHxPushUrl : string -> HttpHandler =
-        setHttpHeader "HX-Push-Url"
+    /// <summary>Instruct htmx to perform a client-side redirect for content</summary>
+    /// <param name="path">The path where the content should be found</param>
+    /// <returns>An HTTP handler with the <c>HX-Location</c> header set</returns>
+    /// <seealso href="https://htmx.org/headers/hx-location/">Documentation</seealso>
+    let withHxLocation (path: string) : HttpHandler =
+        setHttpHeader "HX-Location" path

-    /// Explicitly do not push a new URL into the history stack
+    /// <summary>Pushes a new url into the history stack</summary>
+    /// <param name="url">The URL to be pushed</param>
+    /// <returns>An HTTP handler with the <c>HX-Push-Url</c> header set</returns>
+    /// <remarks>Use <see cref="withHxNoPushUrl" /> to explicitly not push a new URL</remarks>
+    /// <seealso href="https://htmx.org/headers/hx-push-url/">Documentation</seealso>
+    let withHxPushUrl (url: string) : HttpHandler =
+        setHttpHeader "HX-Push-Url" url
+
+    /// <summary>Explicitly do not push a new URL into the history stack</summary>
+    /// <returns>An HTTP handler with the <c>HX-Push-Url</c> header set to <c>false</c></returns>
+    /// <seealso href="https://htmx.org/headers/hx-push-url/">Documentation</seealso>
    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 =
-        setHttpHeader "HX-Redirect"

-    /// If set to `true` the client side will do a a full refresh of the page
-    let withHxRefresh : bool -> HttpHandler =
-        toLowerBool >> setHttpHeader "HX-Refresh"
+    /// <summary>Can be used to do a client-side redirect to a new location</summary>
+    /// <param name="url">The URL to which the client should be redirected</param>
+    /// <returns>An HTTP handler with the <c>HX-Redirect</c> header set</returns>
+    /// <seealso href="https://htmx.org/headers/hx-redirect/">Documentation</seealso>
+    let withHxRedirect (url: string) : HttpHandler =
+        setHttpHeader "HX-Redirect" url

-    /// Replaces the current URL in the history stack
-    let withHxReplaceUrl : string -> HttpHandler =
-        setHttpHeader "HX-Replace-Url"
+    /// <summary>If set to <c>true</c> the client side will do a full refresh of the page</summary>
+    /// <param name="shouldRefresh">Whether the client should refresh their page</param>
+    /// <returns>An HTTP handler with the <c>HX-Refresh</c> header set</returns>
+    let withHxRefresh shouldRefresh : HttpHandler =
+        (toLowerBool >> setHttpHeader "HX-Refresh") shouldRefresh

-    /// Explicitly do not replace the current URL in the history stack
+    /// <summary>Replaces the current URL in the history stack</summary>
+    /// <param name="url">The URL to place in the history stack in place of the current one</param>
+    /// <returns>An HTTP handler with the <c>HX-Replace-URL</c> header set</returns>
+    /// <remarks>Use <see cref="withHxNoRelaceUrl" /> to explicitly not replace the current URL</remarks>
+    /// <seealso href="https://htmx.org/headers/hx-replace-url/">Documentation</seealso>
+    let withHxReplaceUrl url : HttpHandler =
+        setHttpHeader "HX-Replace-Url" url
+
+    /// <summary>Explicitly do not replace the current URL in the history stack</summary>
+    /// <returns>An HTTP handler with the <c>HX-Replace-URL</c> header set to <c>false</c></returns>
+    /// <seealso href="https://htmx.org/headers/hx-replace-url/">Documentation</seealso>
    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"
+    /// <summary>Override which portion of the response will be swapped into the target document</summary>
+    /// <param name="target">The selector for the new response target</param>
+    /// <returns>An HTTP handler with the <c>HX-Reselect</c> header set</returns>
+    let withHxReselect (target: string) : HttpHandler =
+        setHttpHeader "HX-Reselect" target

-    /// Allows you to trigger a single client side event
-    let withHxTrigger : string -> HttpHandler =
-        setHttpHeader "HX-Trigger"
+    /// <summary>Override the <c>hx-swap</c> attribute from the initiating element</summary>
+    /// <param name="swap">The swap value to override</param>
+    /// <returns>An HTTP handler with the <c>HX-Reswap</c> header set</returns>
+    /// <remarks>Use <see cref="T:Giraffe.Htmx.Common.HxSwap">HxSwap</see> constants for best results</remarks>
+    let withHxReswap (swap: string) : HttpHandler =
+        setHttpHeader "HX-Reswap" swap

-    /// Allows you to trigger multiple client side events
+    /// <summary>Allows you to override the <c>hx-target</c> attribute</summary>
+    /// <param name="target">The new target for the response</param>
+    /// <returns>An HTTP handler with the <c>HX-Retarget</c> header set</returns>
+    let withHxRetarget (target: string) : HttpHandler =
+        setHttpHeader "HX-Retarget" target
+
+    /// <summary>Allows you to trigger a single client side event</summary>
+    /// <param name="evt">The call to the event that should be triggered</param>
+    /// <returns>An HTTP handler with the <c>HX-Trigger</c> header set</returns>
+    /// <seealso href="https://htmx.org/headers/hx-trigger/">Documentation</seealso>
+    let withHxTrigger (evt: string) : HttpHandler =
+        setHttpHeader "HX-Trigger" evt
+
+    /// <summary>Allows you to trigger multiple client side events</summary>
+    /// <param name="evts">The calls to events that should be triggered</param>
+    /// <returns>An HTTP handler with the <c>HX-Trigger</c> header set for all given events</returns>
+    /// <seealso href="https://htmx.org/headers/hx-trigger/">Documentation</seealso>
    let withHxTriggerMany evts : HttpHandler =
        toJson evts |> setHttpHeader "HX-Trigger"

-    /// Allows you to trigger a single client side event after changes have settled
-    let withHxTriggerAfterSettle : string -> HttpHandler =
-        setHttpHeader "HX-Trigger-After-Settle"

-    /// Allows you to trigger multiple client side events after changes have settled
-    let withHxTriggerManyAfterSettle evts : HttpHandler =
-        toJson evts |> setHttpHeader "HX-Trigger-After-Settle"
+/// <summary>Load the package-provided version of the htmx script</summary>
+[<RequireQualifiedAccess>]
+module HtmxScript =

-    /// Allows you to trigger a single client side event after DOM swapping occurs
-    let withHxTriggerAfterSwap : string -> HttpHandler =
-        setHttpHeader "HX-Trigger-After-Swap"
+    open Giraffe.Htmx.Common
+    open Microsoft.AspNetCore.Html

-    /// Allows you to trigger multiple client side events after DOM swapping occurs
-    let withHxTriggerManyAfterSwap evts : HttpHandler =
-        toJson evts |> setHttpHeader "HX-Trigger-After-Swap"
+    /// <summary><c>script</c> tag to load the package-provided version of the htmx script</summary>
+    let local = HtmlString $"""<script src="{StaticAssetUrl.htmx}"></script>"""
+
+    /// <summary><c>script</c> tag to load the package-provided version of the htmax script</summary>
+    let localMax = HtmlString $"""<script src="{StaticAssetUrl.htmax}"></script>"""
@@ -2,13 +2,15 @@

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

-**htmx version: 2.0.0-beta3**
+**htmx version: 4.0.0**

-_Note that htmx 2.0 is a BETA release. The [migration guide](https://v2-0v2-0.htmx.org/migration-guide-htmx-1/) does not currently specify any request or response header changes. This means that, as of this release, there are no required code changes in moving to this major version._
+_Upgrading from v2.x: the [migration guide](https://four.htmx.org/docs#migrating-from-htmx-2x-to-4x) lists changes for v4. For this package, the `HX-Trigger` and `HX-Trigger-Name` headers are marked obsolete. They are replaced by `HX-Source`, which provides the triggering tag name and `id` attribute. The `HX-Prompt` header has also been marked as obsolete, as the `hx-prompt` attribute which generated its content has been removed._
+
+_Obsolete elements will be removed in the first production v4 release._

 ### Setup

-1. Install the package (must use `--Prerelease` flag).
+1. Install the package.
 2. Prior to using the request header extension properties or the header-setting `HttpHandler`s, `open Giraffe.Htmx`.

 ### Use
@@ -18,9 +20,9 @@ To obtain a request header, using the `IHeaderDictionary` extension properties:
 ```fsharp
 let myHandler : HttpHander =
    fun next ctx ->
-        match ctx.HxPrompt with
-        | Some prompt -> ... // do something with the text the user provided
-        | None -> ... // no text provided
+        match ctx.Target with
+        | Some elt -> ... // do something with id of the target element
+        | None -> ... // no target element provided
 ```

 To set a response header:
@@ -34,6 +36,8 @@ let myHandler : HttpHander =

 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.

+To load the package-provided htmx library without using Giraffe.ViewEngine, use `HtmxScript.local`; to load the htmax bundle, use `HtmxScript.localMax`.
+
 ### 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.
@@ -3,6 +3,28 @@ module Common
 open Expecto
 open Giraffe.Htmx

+/// Test to ensure the version was updated
+let version =
+    test "HtmxVersion is correct" {
+        Expect.equal HtmxVersion "4.0.0" "htmx version incorrect"
+    }
+
+let staticAssetUrl =
+    testList "StaticAssetUrl" [
+        test "htmx is correct" {
+            Expect.equal
+                StaticAssetUrl.htmx
+                $"/_content/Giraffe.Htmx.Common/htmx.min.js?ver={HtmxVersion}"
+                "Static htmx URL incorrect"
+        }
+        test "htmax is correct" {
+            Expect.equal
+                StaticAssetUrl.htmax
+                $"/_content/Giraffe.Htmx.Common/htmax.min.js?ver={HtmxVersion}"
+                "Static htmx URL incorrect"
+        }
+    ]
+
 /// Tests for the HxSwap module
 let swap =
    testList "HxSwap" [
@@ -12,22 +34,55 @@ let swap =
        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 "InnerMorph is correct" {
+            Expect.equal HxSwap.InnerMorph "innerMorph" "Inner Morph swap value incorrect"
        }
-        test "BeforeEnd is correct" {
-            Expect.equal HxSwap.BeforeEnd "beforeend" "Before End swap value incorrect"
+        test "OuterMorph is correct" {
+            Expect.equal HxSwap.OuterMorph "outerMorph" "Outer Morph swap value incorrect"
+        }
+        test "OuterSync is correct" {
+            Expect.equal HxSwap.OuterSync "outerSync" "Outer Sync swap value incorrect"
+        }
+        test "TextContent is correct" {
+            Expect.equal HxSwap.TextContent "textContent" "Text Content swap value incorrect"
+        }
+        test "Before is correct" {
+            Expect.equal HxSwap.Before "before" "Before swap value incorrect"
+        }
+        test "BeforeBegin is correct" {
+            Expect.equal HxSwap.BeforeBegin HxSwap.Before "Before Begin swap value incorrect"
+        }
+        test "Prepend is correct" {
+            Expect.equal HxSwap.Prepend "prepend" "Prepend swap value incorrect"
        }
        test "AfterBegin is correct" {
-            Expect.equal HxSwap.AfterBegin "afterbegin" "After Begin swap value incorrect"
+            Expect.equal HxSwap.AfterBegin HxSwap.Prepend "Prepend swap value incorrect"
+        }
+        test "Append is correct" {
+            Expect.equal HxSwap.Append "append" "Append swap value incorrect"
+        }
+        test "BeforeEnd is correct" {
+            Expect.equal HxSwap.BeforeEnd HxSwap.Append "Before End swap value incorrect"
+        }
+        test "After is correct" {
+            Expect.equal HxSwap.After "after" "After swap value incorrect"
        }
        test "AfterEnd is correct" {
-            Expect.equal HxSwap.AfterEnd "afterend" "After End swap value incorrect"
+            Expect.equal HxSwap.AfterEnd HxSwap.After "After End swap value incorrect"
+        }
+        test "Delete is correct" {
+            Expect.equal HxSwap.Delete "delete" "Delete swap value incorrect"
        }
        test "None is correct" {
            Expect.equal HxSwap.None "none" "None swap value incorrect"
        }
+        test "Upsert is correct" {
+            Expect.equal HxSwap.Upsert "upsert" "Upsert swap value incorrect"
+        }
+        test "Download is correct" {
+            Expect.equal HxSwap.Download "download" "Download swap value incorrect"
+        }
    ]

 /// All tests for this module
-let allTests = testList "Htmx.Common" [ swap ]
+let allTests = testList "Htmx.Common" [ version; staticAssetUrl; swap ]
@@ -11,22 +11,22 @@ 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
+                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")
+                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")
+                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"
@@ -34,14 +34,14 @@ let dictExtensions =
        ]
        testList "HxCurrentUrl" [
            test "succeeds when the header is not present" {
-                let ctx = Substitute.For<HttpContext> ()
-                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                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")
+                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
@@ -51,38 +51,62 @@ let dictExtensions =
        ]
        testList "HxHistoryRestoreRequest" [
            test "succeeds when the header is not present" {
-                let ctx = Substitute.For<HttpContext> ()
-                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                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")
+                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")
+                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 "HxPreloaded" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext>()
+                ctx.Request.Headers.ReturnsForAnyArgs(HeaderDictionary()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxPreloaded "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-Preloaded", "true")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxPreloaded "There should be a header present"
+                Expect.isTrue ctx.Request.Headers.HxPreloaded.Value "The header should have been true"
+            }
+            // This is not a condition fired by the extension; the header will be either absent or true
+            test "succeeds when the header is present and false" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Preloaded", "false")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxPreloaded "There should be a header present"
+                Expect.isFalse ctx.Request.Headers.HxPreloaded.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
+                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")
+                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"
@@ -90,70 +114,146 @@ let dictExtensions =
        ]
        testList "HxRequest" [
            test "succeeds when the header is not present" {
-                let ctx = Substitute.For<HttpContext> ()
-                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                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")
+                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")
+                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 "HxRequestId" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext>()
+                ctx.Request.Headers.ReturnsForAnyArgs(HeaderDictionary()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxRequestId "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-Request-ID", "abcd1234")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxRequestId "There should be a header present"
+                Expect.equal ctx.Request.Headers.HxRequestId.Value "abcd1234" "The header value was incorrect"
+            }
+        ]
+        testList "HxRequestType" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext>()
+                ctx.Request.Headers.ReturnsForAnyArgs(HeaderDictionary()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxRequestType "There should not have been a header returned"
+            }
+            test "succeeds when the header is invalid" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Request-Type", "relaxed")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isNone ctx.Request.Headers.HxRequestType "There should not have been a header returned"
+            }
+            test "succeeds for a full request" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Request-Type", "full")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxRequestType "There have been a header returned"
+                Expect.equal ctx.Request.Headers.HxRequestType.Value HxFullRequest "The header value is incorrect"
+            }
+            test "succeeds for a partial request" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Request-Type", "partial")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                Expect.isSome ctx.Request.Headers.HxRequestType "There have been a header returned"
+                Expect.equal ctx.Request.Headers.HxRequestType.Value HxPartialRequest "The header value is incorrect"
+            }
+        ]
+        testList "HxSource" [
+            test "succeeds when the header is not present" {
+                let ctx = Substitute.For<HttpContext>()
+                ctx.Request.Headers.ReturnsForAnyArgs(HeaderDictionary()) |> ignore
+                Expect.isNone ctx.Request.Headers.HxSource "There should not have been a header returned"
+            }
+            test "succeeds when the header is present and both parts exist" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Source", "button#theId")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                let hdr = ctx.Request.Headers.HxSource
+                Expect.isSome hdr "There should be a header present"
+                Expect.equal (fst hdr.Value) "button" "The source tag was incorrect"
+                Expect.isSome (snd hdr.Value) "There should be a source ID present"
+                Expect.equal (snd hdr.Value).Value "theId" "The source ID was incorrect"
+            }
+            test "succeeds when the header is present and ID is blank" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Source", "a#")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                let hdr = ctx.Request.Headers.HxSource
+                Expect.isSome hdr "There should be a header present"
+                Expect.equal (fst hdr.Value) "a" "The source tag was incorrect"
+                Expect.isNone (snd hdr.Value) "There should not be a source ID present"
+            }
+            test "succeeds when the header is present and ID is missing" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Source", "form")
+                ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore
+                let hdr = ctx.Request.Headers.HxSource
+                Expect.isSome hdr "There should be a header present"
+                Expect.equal (fst hdr.Value) "form" "The source tag was incorrect"
+                Expect.isNone (snd hdr.Value) "There should not be a source ID present"
+            }
+        ]
        testList "HxTarget" [
            test "succeeds when the header is not present" {
-                let ctx = Substitute.For<HttpContext> ()
-                ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore
+                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")
+            test "succeeds when the header is present and both parts exist" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Target", "div#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"
+                let hdr = ctx.Request.Headers.HxTarget
+                Expect.isSome hdr "There should be a header present"
+                Expect.equal (fst hdr.Value) "div" "The target tag was incorrect"
+                Expect.isSome (snd hdr.Value) "There should be a target ID present"
+                Expect.equal (snd hdr.Value).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")
+            test "succeeds when the header is present and ID is blank" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Target", "span#")
                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"
+                let hdr = ctx.Request.Headers.HxTarget
+                Expect.isSome hdr "There should be a header present"
+                Expect.equal (fst hdr.Value) "span" "The target tag was incorrect"
+                Expect.isNone (snd hdr.Value) "There should not be a target ID present"
            }
-        ]
-        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")
+            test "succeeds when the header is present and ID is missing" {
+                let ctx = Substitute.For<HttpContext>()
+                let dic = HeaderDictionary()
+                dic.Add("HX-Target", "aside")
                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"
+                let hdr = ctx.Request.Headers.HxTarget
+                Expect.isSome hdr "There should be a header present"
+                Expect.equal (fst hdr.Value) "aside" "The target tag was incorrect"
+                Expect.isNone (snd hdr.Value) "There should not be a target ID present"
            }
        ]
    ]
@@ -163,36 +263,36 @@ 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
+                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")
+                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
+                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")
+                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")
+                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"
            }
@@ -202,30 +302,46 @@ let reqExtensions =
 open System.Threading.Tasks

 /// Dummy "next" parameter to get the pipeline to execute/terminate
-let next (ctx : HttpContext) = Task.FromResult (Some ctx)
-        
+let next (ctx: HttpContext) = Task.FromResult(Some ctx)
+
 /// Tests for the HttpHandler functions provided in the Handlers module
 let handlers =
    testList "HandlerTests" [
+        testTask "withHxDownload succeeds" {
+            let ctx = Substitute.For<HttpContext>()
+            let dic = HeaderDictionary()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxDownload "/files/stuff.pdf" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Download") "The HX-Download header should be present"
+            Expect.equal dic["HX-Download"].[0] "/files/stuff.pdf" "The HX-Download value was incorrect"
+        }
+        testTask "withHxLocation succeeds" {
+            let ctx = Substitute.For<HttpContext>()
+            let dic = HeaderDictionary()
+            ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore
+            let! _ = withHxLocation "/pagina-otro.html" next ctx
+            Expect.isTrue (dic.ContainsKey "HX-Location") "The HX-Location header should be present"
+            Expect.equal dic["HX-Location"].[0] "/pagina-otro.html" "The HX-Location value was incorrect"
+        }
        testTask "withHxPushUrl succeeds" {
-            let ctx = Substitute.For<HttpContext> ()
-            let dic = HeaderDictionary ()
+            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 ()
+            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 ()
+            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"
@@ -233,16 +349,16 @@ let handlers =
        }
        testList "withHxRefresh" [
            testTask "succeeds when set to true" {
-                let ctx = Substitute.For<HttpContext> ()
-                let dic = HeaderDictionary ()
+                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 ()
+                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"
@@ -250,101 +366,80 @@ let handlers =
            }
        ]
        testTask "withHxReplaceUrl succeeds" {
-            let ctx = Substitute.For<HttpContext> ()
-            let dic = HeaderDictionary ()
+            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 ()
+            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 ()
+            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 ()
+            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 ()
+            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 ()
+            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 ()
+            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"
+    ]
+
+/// Tests for the HtmxScript module
+let script =
+    testList "HtmxScript" [
+        test "local generates correct link" {
            Expect.equal
-                dic["HX-Trigger-After-Settle"].[0] """{ "oof": "ouch", "hmm": "uh" }"""
-                "The HX-Trigger-After-Settle value was incorrect"
+                (string HtmxScript.local)
+                $"""<script src="/_content/Giraffe.Htmx.Common/htmx.min.js?ver={HtmxVersion}"></script>"""
+                "htmx script link is 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"
+        test "localMax generates correct link" {
            Expect.equal
-                dic["HX-Trigger-After-Swap"].[0] """{ "this": "1", "that": "2" }"""
-                "The HX-Trigger-After-Swap value was incorrect"
+                (string HtmxScript.localMax)
+                $"""<script src="/_content/Giraffe.Htmx.Common/htmax.min.js?ver={HtmxVersion}"></script>"""
+                "htmx script link is incorrect"
        }
    ]

 /// All tests for this module
-let allTests = testList "Htmx" [ dictExtensions; reqExtensions; handlers ]
+let allTests = testList "Htmx" [ dictExtensions; reqExtensions; handlers; script ]
@@ -1,6 +1,6 @@
 open Expecto

-let allTests = testList "Giraffe" [ Common.allTests; Htmx.allTests; ViewEngine.allTests ]
+let allTests = testList "Giraffe" [ Common.allTests; Htmx.allTests; ViewEngine.allTests; ViewEngineMax.allTests ]

 [<EntryPoint>]
-let main args = runTestsWithArgs defaultConfig args allTests
+let main args = runTestsWithCLIArgs [] args allTests
@@ -8,6 +8,7 @@
    <Compile Include="Common.fs" />
    <Compile Include="Htmx.fs" />
    <Compile Include="ViewEngine.fs" />
+    <Compile Include="ViewEngineMax.fs" />
    <Compile Include="Program.fs" />
  </ItemGroup>

@@ -18,8 +19,9 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Expecto" Version="9.0.4" />
-    <PackageReference Include="NSubstitute" Version="5.0.0" />
+    <PackageReference Include="Expecto" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="FSharp.Core" />
  </ItemGroup>

 </Project>
@@ -1,9 +1,51 @@
 module ViewEngine

 open Expecto
+open Giraffe.Htmx
 open Giraffe.ViewEngine
 open Giraffe.ViewEngine.Htmx

+/// Tests for the HxConfig module
+let hxConfig =
+    testList "HxConfig" [
+        testList "Configure" [
+            test "succeeds with an empty list" {
+                Expect.equal (HxConfig.Configure []) "{  }" "Configure with empty list incorrect"
+            }
+            test "succeeds with a non-empty list" {
+                Expect.equal
+                    (HxConfig.Configure [ "\"a\": \"b\""; "\"c\": \"d\"" ]) """{ "a": "b", "c": "d" }"""
+                    "Configure with a non-empty list incorrect"
+            }
+            test "succeeds with all known params configured" {
+                Expect.equal
+                    (HxConfig.Configure
+                        [ HxConfig.Timeout 1000; HxConfig.Credentials false; HxConfig.NoHeaders true ])
+                    """{ "timeout": 1000, "credentials": false, "noHeaders": true }"""
+                    "Configure with all known params incorrect"
+            }
+        ]
+        test "Timeout succeeds" {
+            Expect.equal (HxConfig.Timeout 50) "\"timeout\": 50" "Timeout value incorrect"
+        }
+        testList "Credentials" [
+            test "succeeds when set to true" {
+                Expect.equal (HxConfig.Credentials true) "\"credentials\": true" "Credentials value incorrect"
+            }
+            test "succeeds when set to false" {
+                Expect.equal (HxConfig.Credentials false) "\"credentials\": false" "Credentials value incorrect"
+            }
+        ]
+        testList "NoHeaders" [
+            test "succeeds when set to true" {
+                Expect.equal (HxConfig.NoHeaders true) "\"noHeaders\": true" "NoHeaders value incorrect"
+            }
+            test "succeeds when set to false" {
+                Expect.equal (HxConfig.NoHeaders false) "\"noHeaders\": false" "NoHeaders value incorrect"
+            }
+        ]
+    ]
+
 /// Tests for the HxEncoding module
 let hxEncoding =
    testList "HxEncoding" [
@@ -15,6 +57,7 @@ let hxEncoding =
        }
    ]

+/// Tests for the HxEvent module
 let hxEvent =
    testList "HxEvent" [
        testList "Abort" [
@@ -25,23 +68,58 @@ let hxEvent =
                Expect.equal (Abort.ToHxOnString()) "abort" "Abort hx-on event name not correct"
            }
        ]
-        testList "AfterOnLoad" [
+        testList "AfterCleanup" [
            test "ToString succeeds" {
-                Expect.equal (string AfterOnLoad) "afterOnLoad" "AfterOnLoad event name not correct"
+                Expect.equal (string AfterCleanup) "afterCleanup" "AfterCleanup event name not correct"
            }
            test "ToHxOnString succeeds" {
-                Expect.equal (AfterOnLoad.ToHxOnString()) "after-on-load" "AfterOnLoad hx-on event name not correct"
+                Expect.equal (AfterCleanup.ToHxOnString()) "after:cleanup" "AfterCleanup hx-on event name not correct"
            }
        ]
-        testList "AfterProcessNode" [
+        testList "AfterHistoryUpdate" [
            test "ToString succeeds" {
-                Expect.equal (string AfterProcessNode) "afterProcessNode" "AfterProcessNode event name not correct"
+                Expect.equal
+                    (string AfterHistoryUpdate) "afterHistoryUpdate" "AfterHistoryUpdate event name not correct"
            }
            test "ToHxOnString succeeds" {
                Expect.equal
-                    (AfterProcessNode.ToHxOnString())
-                    "after-process-node"
-                    "AfterProcessNode hx-on event name not correct"
+                    (AfterHistoryUpdate.ToHxOnString())
+                    "after:history:update"
+                    "AfterHistoryUpdate hx-on event name not correct"
+            }
+        ]
+        testList "AfterInit" [
+            test "ToString succeeds" {
+                Expect.equal (string AfterInit) "afterInit" "AfterInit event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal (AfterInit.ToHxOnString()) "after:init" "AfterInit hx-on event name not correct"
+            }
+        ]
+        testList "AfterPushIntoHistory" [
+            test "ToString succeeds" {
+                Expect.equal
+                    (string AfterPushIntoHistory) "afterPushIntoHistory" "AfterPushIntoHistory event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (AfterPushIntoHistory.ToHxOnString())
+                    "after:push:into:history"
+                    "AfterOnLoad hx-on event name not correct"
+            }
+        ]
+        testList "AfterReplaceIntoHistory" [
+            test "ToString succeeds" {
+                Expect.equal
+                    (string AfterReplaceIntoHistory)
+                    "afterReplaceIntoHistory"
+                    "AfterReplaceIntoHistory event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (AfterPushIntoHistory.ToHxOnString())
+                    "after:push:into:history"
+                    "AfterOnLoad hx-on event name not correct"
            }
        ]
        testList "AfterRequest" [
@@ -49,7 +127,7 @@ let hxEvent =
                Expect.equal (string AfterRequest) "afterRequest" "AfterRequest event name not correct"
            }
            test "ToHxOnString succeeds" {
-                Expect.equal (AfterRequest.ToHxOnString()) "after-request" "AfterRequest hx-on event name not correct"
+                Expect.equal (AfterRequest.ToHxOnString()) "after:request" "AfterRequest hx-on event name not correct"
            }
        ]
        testList "AfterSettle" [
@@ -57,7 +135,7 @@ let hxEvent =
                Expect.equal (string AfterSettle) "afterSettle" "AfterSettle event name not correct"
            }
            test "ToHxOnString succeeds" {
-                Expect.equal (AfterSettle.ToHxOnString()) "after-settle" "AfterSettle hx-on event name not correct"
+                Expect.equal (AfterSettle.ToHxOnString()) "after:settle" "AfterSettle hx-on event name not correct"
            }
        ]
        testList "AfterSwap" [
@@ -65,38 +143,57 @@ let hxEvent =
                Expect.equal (string AfterSwap) "afterSwap" "AfterSwap event name not correct"
            }
            test "ToHxOnString succeeds" {
-                Expect.equal (AfterSwap.ToHxOnString()) "after-swap" "AfterSwap hx-on event name not correct"
+                Expect.equal (AfterSwap.ToHxOnString()) "after:swap" "AfterSwap hx-on event name not correct"
            }
        ]
-        testList "BeforeCleanupElement" [
+        testList "BeforeCleanup" [
            test "ToString succeeds" {
-                Expect.equal
-                    (string BeforeCleanupElement) "beforeCleanupElement" "BeforeCleanupElement event name not correct"
+                Expect.equal (string BeforeCleanup) "beforeCleanup" "BeforeCleanup event name not correct"
            }
            test "ToHxOnString succeeds" {
                Expect.equal
-                    (BeforeCleanupElement.ToHxOnString())
-                    "before-cleanup-element"
-                    "BeforeCleanupElement hx-on event name not correct"
+                    (BeforeCleanup.ToHxOnString()) "before:cleanup" "BeforeCleanup hx-on event name not correct"
            }
        ]
-        testList "BeforeOnLoad" [
+        testList "BeforeHistoryUpdate" [
            test "ToString succeeds" {
-                Expect.equal (string BeforeOnLoad) "beforeOnLoad" "BeforeOnLoad event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (BeforeOnLoad.ToHxOnString()) "before-on-load" "BeforeOnLoad hx-on event name not correct"
-            }
-        ]
-        testList "BeforeProcessNode" [
-            test "ToString succeeds" {
-                Expect.equal (string BeforeProcessNode) "beforeProcessNode" "BeforeProcessNode event name not correct"
+                Expect.equal
+                    (string BeforeHistoryUpdate) "beforeHistoryUpdate" "BeforeHistoryUpdate event name not correct"
            }
            test "ToHxOnString succeeds" {
                Expect.equal
-                    (BeforeProcessNode.ToHxOnString())
-                    "before-process-node"
-                    "BeforeProcessNode hx-on event name not correct"
+                    (BeforeHistoryUpdate.ToHxOnString())
+                    "before:history:update"
+                    "BeforeHistoryUpdate hx-on event name not correct"
+            }
+        ]
+        testList "BeforeInit" [
+            test "ToString succeeds" {
+                Expect.equal (string BeforeInit) "beforeInit" "BeforeInit event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal (BeforeInit.ToHxOnString()) "before:init" "BeforeInit hx-on event name not correct"
+            }
+        ]
+        testList "BeforeProcess" [
+            test "ToString succeeds" {
+                Expect.equal (string BeforeProcess) "beforeProcess" "BeforeProcess event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (BeforeProcess.ToHxOnString()) "before:process" "BeforeProcess hx-on event name not correct"
+            }
+        ]
+        testList "BeforeRestoreHistory" [
+            test "ToString succeeds" {
+                Expect.equal
+                    (string BeforeRestoreHistory) "beforeRestoreHistory" "BeforeRestoreHistory event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (BeforeRestoreHistory.ToHxOnString())
+                    "before:restore:history"
+                    "BeforeRestoreHistory hx-on event name not correct"
            }
        ]
        testList "BeforeRequest" [
@@ -105,7 +202,16 @@ let hxEvent =
            }
            test "ToHxOnString succeeds" {
                Expect.equal
-                    (BeforeRequest.ToHxOnString()) "before-request" "BeforeRequest hx-on event name not correct"
+                    (BeforeRequest.ToHxOnString()) "before:request" "BeforeRequest hx-on event name not correct"
+            }
+        ]
+        testList "BeforeResponse" [
+            test "ToString succeeds" {
+                Expect.equal (string BeforeResponse) "beforeResponse" "BeforeResponse event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (BeforeResponse.ToHxOnString()) "before:response" "BeforeResponse hx-on event name not correct"
            }
        ]
        testList "BeforeSwap" [
@@ -113,15 +219,7 @@ let hxEvent =
                Expect.equal (string BeforeSwap) "beforeSwap" "BeforeSwap event name not correct"
            }
            test "ToHxOnString succeeds" {
-                Expect.equal (BeforeSwap.ToHxOnString()) "before-swap" "BeforeSwap hx-on event name not correct"
-            }
-        ]
-        testList "BeforeSend" [
-            test "ToString succeeds" {
-                Expect.equal (string BeforeSend) "beforeSend" "BeforeSend event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (BeforeSend.ToHxOnString()) "before-send" "BeforeSend hx-on event name not correct"
+                Expect.equal (BeforeSwap.ToHxOnString()) "before:swap" "BeforeSwap hx-on event name not correct"
            }
        ]
        testList "ConfigRequest" [
@@ -130,7 +228,7 @@ let hxEvent =
            }
            test "ToHxOnString succeeds" {
                Expect.equal
-                    (ConfigRequest.ToHxOnString()) "config-request" "ConfigRequest hx-on event name not correct"
+                    (ConfigRequest.ToHxOnString()) "config:request" "ConfigRequest hx-on event name not correct"
            }
        ]
        testList "Confirm" [
@@ -141,146 +239,21 @@ let hxEvent =
                Expect.equal (Confirm.ToHxOnString()) "confirm" "Confirm hx-on event name not correct"
            }
        ]
-        testList "HistoryCacheError" [
+        testList "Error" [
            test "ToString succeeds" {
-                Expect.equal (string HistoryCacheError) "historyCacheError" "HistoryCacheError event name not correct"
+                Expect.equal (string Error) "error" "Error event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal (Error.ToHxOnString()) "error" "Error hx-on event name not correct"
+            }
+        ]
+        testList "FinallyRequest" [
+            test "ToString succeeds" {
+                Expect.equal (string FinallyRequest) "finallyRequest" "FinallyRequest event name not correct"
            }
            test "ToHxOnString succeeds" {
                Expect.equal
-                    (HistoryCacheError.ToHxOnString())
-                    "history-cache-error"
-                    "HistoryCacheError hx-on event name not correct"
-            }
-        ]
-        testList "HistoryCacheMiss" [
-            test "ToString succeeds" {
-                Expect.equal (string HistoryCacheMiss) "historyCacheMiss" "HistoryCacheMiss event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (HistoryCacheMiss.ToHxOnString())
-                    "history-cache-miss"
-                    "HistoryCacheMiss hx-on event name not correct"
-            }
-        ]
-        testList "HistoryCacheMissError" [
-            test "ToString succeeds" {
-                Expect.equal
-                    (string HistoryCacheMissError)
-                    "historyCacheMissError"
-                    "HistoryCacheMissError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (HistoryCacheMissError.ToHxOnString())
-                    "history-cache-miss-error"
-                    "HistoryCacheMissError hx-on event name not correct"
-            }
-        ]
-        testList "HistoryCacheMissLoad" [
-            test "ToString succeeds" {
-                Expect.equal
-                    (string HistoryCacheMissLoad) "historyCacheMissLoad" "HistoryCacheMissLoad event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (HistoryCacheMissLoad.ToHxOnString())
-                    "history-cache-miss-load"
-                    "HistoryCacheMissLoad hx-on event name not correct"
-            }
-        ]
-        testList "HistoryRestore" [
-            test "ToString succeeds" {
-                Expect.equal (string HistoryRestore) "historyRestore" "HistoryRestore event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (HistoryRestore.ToHxOnString()) "history-restore" "HistoryRestore hx-on event name not correct"
-            }
-        ]
-        testList "BeforeHistorySave" [
-            test "ToString succeeds" {
-                Expect.equal (string BeforeHistorySave) "beforeHistorySave" "BeforeHistorySave event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (BeforeHistorySave.ToHxOnString())
-                    "before-history-save"
-                    "BeforeHistorySave hx-on event name not correct"
-            }
-        ]
-        testList "Load" [
-            test "ToString succeeds" {
-                Expect.equal (string Load) "load" "Load event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (Load.ToHxOnString()) "load" "Load hx-on event name not correct"
-            }
-        ]
-        testList "NoSseSourceError" [
-            test "ToString succeeds" {
-                Expect.equal (string NoSseSourceError) "noSSESourceError" "NoSseSourceError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (NoSseSourceError.ToHxOnString())
-                    "no-sse-source-error"
-                    "NoSseSourceError hx-on event name not correct"
-            }
-        ]
-        testList "OnLoadError" [
-            test "ToString succeeds" {
-                Expect.equal (string OnLoadError) "onLoadError" "OnLoadError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (OnLoadError.ToHxOnString()) "on-load-error" "OnLoadError hx-on event name not correct"
-            }
-        ]
-        testList "OobAfterSwap" [
-            test "ToString succeeds" {
-                Expect.equal (string OobAfterSwap) "oobAfterSwap" "OobAfterSwap event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (OobAfterSwap.ToHxOnString()) "oob-after-swap" "OobAfterSwap hx-on event name not correct"
-            }
-        ]
-        testList "OobBeforeSwap" [
-            test "ToString succeeds" {
-                Expect.equal (string OobBeforeSwap) "oobBeforeSwap" "OobBeforeSwap event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (OobBeforeSwap.ToHxOnString()) "oob-before-swap" "OobBeforeSwap hx-on event name not correct"
-            }
-        ]
-        testList "OobErrorNoTarget" [
-            test "ToString succeeds" {
-                Expect.equal (string OobErrorNoTarget) "oobErrorNoTarget" "OobErrorNoTarget event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (OobErrorNoTarget.ToHxOnString())
-                    "oob-error-no-target"
-                    "OobErrorNoTarget hx-on event name not correct"
-            }
-        ]
-        testList "Prompt" [
-            test "ToString succeeds" {
-                Expect.equal (string Prompt) "prompt" "Prompt event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (Prompt.ToHxOnString()) "prompt" "Prompt hx-on event name not correct"
-            }
-        ]
-        testList "PushedIntoHistory" [
-            test "ToString succeeds" {
-                Expect.equal (string PushedIntoHistory) "pushedIntoHistory" "PushedIntoHistory event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (PushedIntoHistory.ToHxOnString())
-                    "pushed-into-history"
-                    "PushedIntoHistory hx-on event name not correct"
+                    (FinallyRequest.ToHxOnString()) "finally:request" "FinallyRequest hx-on event name not correct"
            }
        ]
        testList "ResponseError" [
@@ -289,125 +262,11 @@ let hxEvent =
            }
            test "ToHxOnString succeeds" {
                Expect.equal
-                    (ResponseError.ToHxOnString()) "response-error" "ResponseError hx-on event name not correct"
+                    (ResponseError.ToHxOnString()) "response:error" "ResponseError hx-on event name not correct"
            }
        ]
-        testList "SendError" [
-            test "ToString succeeds" {
-                Expect.equal (string SendError) "sendError" "SendError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (SendError.ToHxOnString()) "send-error" "SendError hx-on event name not correct"
-            }
-        ]
-        testList "SseError" [
-            test "ToString succeeds" {
-                Expect.equal (string SseError) "sseError" "SseError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (SseError.ToHxOnString()) "sse-error" "SseError hx-on event name not correct"
-            }
-        ]
-        testList "SseOpen" [
-            test "ToString succeeds" {
-                Expect.equal (string SseOpen) "sseOpen" "SseOpen event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (SseOpen.ToHxOnString()) "sse-open" "SseOpen hx-on event name not correct"
-            }
-        ]
-        testList "SwapError" [
-            test "ToString succeeds" {
-                Expect.equal (string SwapError) "swapError" "SwapError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (SwapError.ToHxOnString()) "swap-error" "SwapError hx-on event name not correct"
-            }
-        ]
-        testList "TargetError" [
-            test "ToString succeeds" {
-                Expect.equal (string TargetError) "targetError" "TargetError event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (TargetError.ToHxOnString()) "target-error" "TargetError hx-on event name not correct"
-            }
-        ]
-        testList "Timeout" [
-            test "ToString succeeds" {
-                Expect.equal (string Timeout) "timeout" "Timeout event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (Timeout.ToHxOnString()) "timeout" "Timeout hx-on event name not correct"
-            }
-        ]
-        testList "ValidationValidate" [
-            test "ToString succeeds" {
-                Expect.equal
-                    (string ValidationValidate) "validation:validate" "ValidationValidate event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (ValidationValidate.ToHxOnString())
-                    "validation:validate"
-                    "ValidationValidate hx-on event name not correct"
-            }
-        ]
-        testList "ValidationFailed" [
-            test "ToString succeeds" {
-                Expect.equal (string ValidationFailed) "validation:failed" "ValidationFailed event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (ValidationFailed.ToHxOnString())
-                    "validation:failed"
-                    "ValidationFailed hx-on event name not correct"
-            }
-        ]
-        testList "ValidationHalted" [
-            test "ToString succeeds" {
-                Expect.equal (string ValidationHalted) "validation:halted" "ValidationHalted event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal
-                    (ValidationHalted.ToHxOnString())
-                    "validation:halted"
-                    "ValidationHalted hx-on event name not correct"
-            }
-        ]
-        testList "XhrAbort" [
-            test "ToString succeeds" {
-                Expect.equal (string XhrAbort) "xhr:abort" "XhrAbort event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (XhrAbort.ToHxOnString()) "xhr:abort" "XhrAbort hx-on event name not correct"
-            }
-        ]
-        testList "XhrLoadEnd" [
-            test "ToString succeeds" {
-                Expect.equal (string XhrLoadEnd) "xhr:loadend" "XhrLoadEnd event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (XhrLoadEnd.ToHxOnString()) "xhr:loadend" "XhrLoadEnd hx-on event name not correct"
-            }
-        ]
-        testList "XhrLoadStart" [
-            test "ToString succeeds" {
-                Expect.equal (string XhrLoadStart) "xhr:loadstart" "XhrLoadStart event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (XhrLoadStart.ToHxOnString()) "xhr:loadstart" "XhrLoadStart hx-on event name not correct"
-            }
-        ]
-        testList "XhrProgress" [
-            test "ToString succeeds" {
-                Expect.equal (string XhrProgress) "xhr:progress" "XhrProgress event name not correct"
-            }
-            test "ToHxOnString succeeds" {
-                Expect.equal (XhrProgress.ToHxOnString()) "xhr:progress" "XhrProgress hx-on event name not correct"
-            }
-        ]
-        
    ]
+
 /// Tests for the HxHeaders module
 let hxHeaders =
    testList "HxHeaders" [
@@ -423,78 +282,30 @@ let hxHeaders =
        ]
    ]

-/// Tests for the HxParams module
-let hxParams =
-    testList "HxParams" [
-        test "All is correct" {
-            Expect.equal HxParams.All "*" "All is not correct"
+/// Tests for the HxSync module
+let hxSync =
+    testList "HxSync" [
+        test "Drop is correct" {
+            Expect.equal HxSync.Drop "drop" "Drop is incorrect"
        }
-        test "None is correct" {
-            Expect.equal HxParams.None "none" "None is not correct"
+        test "Abort is correct" {
+            Expect.equal HxSync.Abort "abort" "Abort is incorrect"
        }
-        testList "With" [
-            test "succeeds with empty list" {
-                Expect.equal (HxParams.With []) "" "With with empty list should have been blank"
-            }
-            test "succeeds with one list item" {
-                Expect.equal (HxParams.With [ "boo" ]) "boo" "With single item incorrect"
-            }
-            test "succeeds with multiple list items" {
-                Expect.equal (HxParams.With [ "foo"; "bar"; "baz" ]) "foo,bar,baz" "With multiple items incorrect"
-            }
-        ]
-        testList "Except" [
-            test "succeeds with empty list" {
-                Expect.equal (HxParams.Except []) "not " "Except with empty list incorrect"
-            }
-            test "succeeds with one list item" {
-                Expect.equal (HxParams.Except [ "that" ]) "not that" "Except single item incorrect"
-            }
-            test "succeeds with multiple list items" {
-                Expect.equal (HxParams.Except [ "blue"; "green" ]) "not blue,green" "Except multiple items incorrect"
-            }
-        ]
-    ]
-
-/// Tests for the HxRequest module
-let hxRequest =
-    testList "HxRequest" [
-        testList "Configure" [
-            test "succeeds with an empty list" {
-                Expect.equal (HxRequest.Configure []) "{  }" "Configure with empty list incorrect"
-            }
-            test "succeeds with a non-empty list" {
-                Expect.equal
-                    (HxRequest.Configure [ "\"a\": \"b\""; "\"c\": \"d\"" ]) """{ "a": "b", "c": "d" }"""
-                    "Configure with a non-empty list incorrect"
-            }
-            test "succeeds with all known params configured" {
-                Expect.equal
-                    (HxRequest.Configure
-                        [ HxRequest.Timeout 1000; HxRequest.Credentials false; HxRequest.NoHeaders true ])
-                    """{ "timeout": 1000, "credentials": false, "noHeaders": true }"""
-                    "Configure with all known params incorrect"
-            }
-        ]
-        test "Timeout succeeds" {
-            Expect.equal (HxRequest.Timeout 50) "\"timeout\": 50" "Timeout value incorrect"
+        test "Replace is correct" {
+            Expect.equal HxSync.Replace "replace" "Replace is incorrect"
+        }
+        test "Queue is correct" {
+            Expect.equal HxSync.Queue "queue" "Queue is incorrect"
+        }
+        test "QueueFirst is correct" {
+            Expect.equal HxSync.QueueFirst "queue first" "QueueFirst is incorrect"
+        }
+        test "QueueLast is correct" {
+            Expect.equal HxSync.QueueLast "queue last" "QueueLast is incorrect"
+        }
+        test "QueueAll is correct" {
+            Expect.equal HxSync.QueueAll "queue all" "QueueAll is incorrect"
        }
-        testList "Credentials" [
-            test "succeeds when set to true" {
-                Expect.equal (HxRequest.Credentials true) "\"credentials\": true" "Credentials value incorrect"
-            }
-            test "succeeds when set to false" {
-                Expect.equal (HxRequest.Credentials false) "\"credentials\": false" "Credentials value incorrect"
-            }
-        ]
-        testList "NoHeaders" [
-            test "succeeds when set to true" {
-                Expect.equal (HxRequest.NoHeaders true) "\"noHeaders\": true" "NoHeaders value incorrect"
-            }
-            test "succeeds when set to false" {
-                Expect.equal (HxRequest.NoHeaders false) "\"noHeaders\": false" "NoHeaders value incorrect"
-            }
-        ]
    ]

 /// Tests for the HxTrigger module
@@ -584,7 +395,7 @@ let hxTrigger =
        testList "FromDocument" [
            test "succeeds when it is the first modifier" {
                Expect.equal (HxTrigger.FromDocument "") "from:document" "FromDocument modifier incorrect"
-            } 
+            }
            test "succeeds when it is not the first modifier" {
                Expect.equal (HxTrigger.FromDocument "click") "click from:document" "FromDocument modifier incorrect"
            }
@@ -636,6 +447,9 @@ let hxTrigger =
            test "succeeds when it is not the first modifier" {
                Expect.equal (HxTrigger.Queue "def" "click") "click queue:def" "Queue modifier incorrect"
            }
+            test "succeeds when no type of queueing is given" {
+                Expect.equal (HxTrigger.Queue "" "blur") "blur queue" "Queue modifier incorrect"
+            }
        ]
        testList "QueueFirst" [
            test "succeeds when it is the first modifier" {
@@ -686,7 +500,7 @@ let hxVals =
        ]
    ]

-/// Pipe-able assertion for a rendered node 
+/// Pipe-able assertion for a rendered node
 let shouldRender expected node =
    Expect.equal (RenderView.AsString.htmlNode node) expected "Rendered HTML incorrect"

@@ -694,9 +508,16 @@ let shouldRender expected node =
 let attributes =
    testList "Attributes" [

+        test "_hxAction succeeds" {
+            form [ _hxAction "/endpoint/1" ] [] |> shouldRender """<form hx-action="/endpoint/1"></form>"""
+        }
        test "_hxBoost succeeds" {
            div [ _hxBoost ] [] |> shouldRender """<div hx-boost="true"></div>"""
        }
+        test "_hxConfig succeeds" {
+            body [ _hxConfig [ ("test", "that") ] ] []
+            |> shouldRender """<body hx-config="{ &quot;test&quot;: &quot;that&quot; }"></body>"""
+        }
        test "_hxConfirm succeeds" {
            button [ _hxConfirm "REALLY?!?" ] [] |> shouldRender """<button hx-confirm="REALLY?!?"></button>"""
        }
@@ -704,20 +525,11 @@ let attributes =
            span [ _hxDelete "/this-endpoint" ] [] |> shouldRender """<span hx-delete="/this-endpoint"></span>"""
        }
        test "_hxDisable succeeds" {
-            p [ _hxDisable ] [] |> shouldRender """<p hx-disable></p>"""
-        }
-        test "_hxDisabledElt succeeds" {
-            button [ _hxDisabledElt "this" ] [] |> shouldRender """<button hx-disabled-elt="this"></button>"""
-        }
-        test "_hxDisinherit succeeds" {
-            strong [ _hxDisinherit "*" ] [] |> shouldRender """<strong hx-disinherit="*"></strong>"""
+            p [ _hxDisable "#that" ] [] |> shouldRender """<p hx-disable="#that"></p>"""
        }
        test "_hxEncoding succeeds" {
            form [ _hxEncoding "utf-7" ] [] |> shouldRender """<form hx-encoding="utf-7"></form>"""
        }
-        test "_hxExt succeeds" {
-            section [ _hxExt "extendme" ] [] |> shouldRender """<section hx-ext="extendme"></section>"""
-        }
        test "_hxGet succeeds" {
            article [ _hxGet "/the-text" ] [] |> shouldRender """<article hx-get="/the-text"></article>"""
        }
@@ -725,11 +537,8 @@ let attributes =
            figure [ _hxHeaders """{ "X-Special-Header": "some-header" }""" ] []
            |> shouldRender """<figure hx-headers="{ &quot;X-Special-Header&quot;: &quot;some-header&quot; }"></figure>"""
        }
-        test "_hxHistory succeeds" {
-            span [ _hxHistory "false" ] [] |> shouldRender """<span hx-history="false"></span>"""
-        }
-        test "_hxHistoryElt succeeds" {
-            table [ _hxHistoryElt ] [] |> shouldRender """<table hx-history-elt></table>"""
+        test "_hxIgnore succeeds" {
+            span [ _hxIgnore ] [] |> shouldRender """<span hx-ignore></span>"""
        }
        test "_hxInclude succeeds" {
            a [ _hxInclude ".extra-stuff" ] [] |> shouldRender """<a hx-include=".extra-stuff"></a>"""
@@ -737,6 +546,10 @@ let attributes =
        test "_hxIndicator succeeds" {
            aside [ _hxIndicator "#spinner" ] [] |> shouldRender """<aside hx-indicator="#spinner"></aside>"""
        }
+        test "_hxMethod succeeds" {
+            div [ _hxMethod System.Net.Http.HttpMethod.Options ] []
+            |> shouldRender """<div hx-method="options"></div>"""
+        }
        test "_hxNoBoost succeeds" {
            td [ _hxNoBoost ] [] |> shouldRender """<td hx-boost="false"></td>"""
        }
@@ -745,10 +558,7 @@ let attributes =
        }
        test "_hxOnHxEvent succeeds" {
            strong [ _hxOnHxEvent BeforeSwap "changeStuff()" ] []
-            |> shouldRender """<strong hx-on::before-swap="changeStuff()"></strong>"""
-        }
-        test "_hxParams succeeds" {
-            br [ _hxParams "[p1,p2]" ] |> shouldRender """<br hx-params="[p1,p2]">"""
+            |> shouldRender """<strong hx-on:htmx:before:swap="changeStuff()"></strong>"""
        }
        test "_hxPatch succeeds" {
            div [ _hxPatch "/arrrgh" ] [] |> shouldRender """<div hx-patch="/arrrgh"></div>"""
@@ -757,7 +567,7 @@ let attributes =
            hr [ _hxPost "/hear-ye-hear-ye" ] |> shouldRender """<hr hx-post="/hear-ye-hear-ye">"""
        }
        test "_hxPreserve succeeds" {
-            img [ _hxPreserve ] |> shouldRender """<img hx-preserve="true">"""
+            img [ _hxPreserve ] |> shouldRender """<img hx-preserve>"""
        }
        test "_hxPrompt succeeds" {
            strong [ _hxPrompt "Who goes there?" ] []
@@ -772,19 +582,24 @@ let attributes =
        test "_hxReplaceUrl succeeds" {
            p [ _hxReplaceUrl "/something-else" ] [] |> shouldRender """<p hx-replace-url="/something-else"></p>"""
        }
-        test "_hxRequest succeeds" {
-            u [ _hxRequest "noHeaders" ] [] |> shouldRender """<u hx-request="noHeaders"></u>"""
-        }
        test "_hxSelect succeeds" {
            nav [ _hxSelect "#navbar" ] [] |> shouldRender """<nav hx-select="#navbar"></nav>"""
        }
        test "_hxSelectOob succeeds" {
            section [ _hxSelectOob "#oob" ] [] |> shouldRender """<section hx-select-oob="#oob"></section>"""
        }
-        test "_hxSse succeeds" {
-            footer [ _hxSse "connect:/my-events" ] []
-            |> shouldRender """<footer hx-sse="connect:/my-events"></footer>"""
-        }
+        testList "_hxStatus" [
+            test "succeeds for a full code with no action" {
+                div [ _hxStatus "403" HxSwap.After "" ] [] |> shouldRender """<div hx-status:403="swap:after"></div>"""
+            }
+            test "succeeds for a two-digit range with action" {
+                span [ _hxStatus "41" HxSwap.Before "target:main" ] []
+                |> shouldRender """<span hx-status:41x="swap:before target:main"></span>"""
+            }
+            test "succeeds for a one-digit range with no action" {
+                p [ _hxStatus "5" HxSwap.None "" ] [] |> shouldRender """<p hx-status:5xx="swap:none"></p>"""
+            }
+        ]
        test "_hxSwap succeeds" {
            del [ _hxSwap "innerHTML" ] [] |> shouldRender """<del hx-swap="innerHTML"></del>"""
        }
@@ -796,7 +611,8 @@ let attributes =
            li [ _hxSwapOob "true" ] [] |> shouldRender """<li hx-swap-oob="true"></li>"""
        }
        test "_hxSync succeeds" {
-            nav [ _hxSync "closest form:abort" ] [] |> shouldRender """<nav hx-sync="closest form:abort"></nav>"""
+            nav [ _hxSync "closest form" HxSync.Abort ] []
+            |> shouldRender """<nav hx-sync="closest form:abort"></nav>"""
        }
        test "_hxTarget succeeds" {
            header [ _hxTarget "#somewhereElse" ] [] |> shouldRender """<header hx-target="#somewhereElse"></header>"""
@@ -804,32 +620,100 @@ let attributes =
        test "_hxTrigger succeeds" {
            figcaption [ _hxTrigger "load" ] [] |> shouldRender """<figcaption hx-trigger="load"></figcaption>"""
        }
+        test "_hxValidate succeeds" {
+            form [ _hxValidate ] [] |> shouldRender """<form hx-validate></form>"""
+        }
        test "_hxVals succeeds" {
            dt [ _hxVals """{ "extra": "values" }""" ] []
            |> shouldRender """<dt hx-vals="{ &quot;extra&quot;: &quot;values&quot; }"></dt>"""
        }
-        test "_hxWs succeeds" {
-            ul [ _hxWs "connect:/web-socket" ] [] |> shouldRender """<ul hx-ws="connect:/web-socket"></ul>"""
+    ]
+
+/// Tests for the HxModifiers module
+let hxModifiers =
+    testList "HxModifiers" [
+        testList "hxAppend" [
+            test "succeeds with a value attribute" {
+                div [ hxAppend (_hxAction "/this/url") ] []
+                |> shouldRender """<div hx-action:append="/this/url"></div>"""
+            }
+            test "succeeds with a boolean attribute" {
+                form [ hxAppend _hxValidate ] []
+                |> shouldRender """<form hx-validate:append></form>"""
+            }
+        ]
+        testList "hxInherited" [
+            test "succeeds with a value attribute" {
+                span [ hxInherited (_hxGet "/some/link") ] []
+                |> shouldRender """<span hx-get:inherited="/some/link"></span>"""
+            }
+            test "succeeds with a boolean attribute" {
+                p [ hxInherited _hxValidate ] []
+                |> shouldRender """<p hx-validate:inherited></p>"""
+            }
+        ]
+        test "succeeds when both are applied" {
+            div [ hxAppend (hxInherited (_hxPost "/there")) ] []
+            |> shouldRender """<div hx-post:inherited:append="/there"></div>"""
+        }
+    ]
+
+/// Tests for the HxTags module
+let hxTags =
+    testList "HxTags" [
+        test "hxPartial succeeds" {
+            hxPartial [ _class "testy" ] [ str "Howdy" ]
+            |> shouldRender """<hx-partial class="testy">Howdy</hx-partial>"""
        }
    ]

 /// Tests for the Script module
 let script =
    testList "Script" [
-        test "minified succeeds" {
-            let html = RenderView.AsString.htmlNode Script.minified
+        test "local succeeds" {
+            let html = RenderView.AsString.htmlNode Script.local
            Expect.equal
                html
-                """<script src="https://unpkg.com/htmx.org@2.0.0-beta3" integrity="sha384-9wQIC/7bdsqgMwBWWcREHyQOU7vU6P9J2tgQq0056HPV9t35Ypm4vPYA6Ud1MgY9" crossorigin="anonymous"></script>"""
-                "Minified script tag is incorrect"
+                $"""<script src="/_content/Giraffe.Htmx.Common/htmx.min.js?ver={HtmxVersion}"></script>"""
+                "Local script tag is incorrect"
        }
-        test "unminified succeeds" {
-            let html = RenderView.AsString.htmlNode Script.unminified
+        test "cdnMinified succeeds" {
+            let html = RenderView.AsString.htmlNode Script.cdnMinified
            Expect.equal
                html
-                """<script src="https://unpkg.com/htmx.org@2.0.0-beta3/dist/htmx.js" integrity="sha384-lGcccsClz1aGJ47pTvGg8H69LcUEacfYDRwjlmFmRi35GGy8sBegHZaca5O4/Kai" crossorigin="anonymous"></script>"""
-                "Unminified script tag is incorrect"
+                $"""<script src="https://cdn.jsdelivr.net/npm/htmx.org@{HtmxVersion}/dist/htmx.min.js" integrity="sha384-BvJpBiO8Kh31EqtJe5DRIeWrHWnCGkwytKs9NKFi86Hhw96dEqdEMzZDeK9iEGTc" crossorigin="anonymous"></script>"""
+                "CDN minified script tag is incorrect"
        }
+        test "cdnUnminified succeeds" {
+            let html = RenderView.AsString.htmlNode Script.cdnUnminified
+            Expect.equal
+                html
+                $"""<script src="https://cdn.jsdelivr.net/npm/htmx.org@{HtmxVersion}/dist/htmx.js" integrity="sha384-ESzWv77gBOAGtF3d7B8QiQ786cghRRsyhuYVVJGsrFGxwT0Dj1fLxReX9Ul6t4n9" crossorigin="anonymous"></script>"""
+                "CDN unminified script tag is incorrect"
+        }
+        testList "Max" [
+            test "localMax succeeds" {
+                let html = RenderView.AsString.htmlNode Script.Max.local
+                Expect.equal
+                    html
+                    $"""<script src="/_content/Giraffe.Htmx.Common/htmax.min.js?ver={HtmxVersion}"></script>"""
+                    "Local script tag is incorrect"
+            }
+            test "cdnMaxMinified succeeds" {
+                let html = RenderView.AsString.htmlNode Script.Max.cdnMinified
+                Expect.equal
+                    html
+                    $"""<script src="https://cdn.jsdelivr.net/npm/htmx.org@{HtmxVersion}/dist/htmax.min.js" integrity="sha384-F2+P/m0g8+he+KLpgsCVZlZGvOx2z83bU4rmmISSNt7br4A0RTcJ7ddMrz0v45Nv" crossorigin="anonymous"></script>"""
+                    "CDN minified script tag is incorrect"
+            }
+            test "cdnMaxUnminified succeeds" {
+                let html = RenderView.AsString.htmlNode Script.Max.cdnUnminified
+                Expect.equal
+                    html
+                    $"""<script src="https://cdn.jsdelivr.net/npm/htmx.org@{HtmxVersion}/dist/htmax.js" integrity="sha384-wrTFbAj755gAdIPPR9n4aAVMkLWkzxjr1Zj+8D4kgr2App4h9doO6SXBH9wpivij" crossorigin="anonymous"></script>"""
+                    "CDN unminified script tag is incorrect"
+            }
+        ]
    ]

 open System.Text
@@ -837,11 +721,11 @@ open System.Text
 /// Tests for the RenderFragment module
 let renderFragment =
    testList "RenderFragment" [
-        
+
        /// Validate that the two object references are the same object
        let isSame obj1 obj2 message =
-            Expect.isTrue (obj.ReferenceEquals (obj1, obj2)) message
-        
+            Expect.isTrue (obj.ReferenceEquals(obj1, obj2)) message
+
        testList "findIdNode" [
            test "fails with a Text node" {
                Expect.isNone (RenderFragment.findIdNode "blue" (Text "")) "There should not have been a node found"
@@ -907,7 +791,7 @@ let renderFragment =
            ]
        ]
        testList "AsBytes" [
-            
+
            /// Alias for UTF-8 encoding
            let utf8 = Encoding.UTF8

@@ -922,7 +806,7 @@ let renderFragment =
                }
                test "fails when an ID is not matched" {
                    Expect.equal
-                        (RenderFragment.AsBytes.htmlFromNodes "whiff" []) (utf8.GetBytes (nodeNotFound "whiff"))
+                        (RenderFragment.AsBytes.htmlFromNodes "whiff" []) (utf8.GetBytes(nodeNotFound "whiff"))
                        "HTML bytes are incorrect"
                }
            ]
@@ -939,7 +823,7 @@ let renderFragment =
                }
                test "fails when an ID is not matched" {
                    Expect.equal
-                        (RenderFragment.AsBytes.htmlFromNode "foo" (hr [])) (utf8.GetBytes (nodeNotFound "foo"))
+                        (RenderFragment.AsBytes.htmlFromNode "foo" (hr [])) (utf8.GetBytes(nodeNotFound "foo"))
                        "HTML bytes are incorrect"
                }
            ]
@@ -947,31 +831,31 @@ let renderFragment =
        testList "IntoStringBuilder" [
            testList "htmlFromNodes" [
                test "succeeds when an ID is matched" {
-                    let sb = StringBuilder ()
+                    let sb = StringBuilder()
                    RenderFragment.IntoStringBuilder.htmlFromNodes sb "find-me"
                        [ p [] []; p [ _id "peekaboo" ] [ str "bzz"; str "nope"; span [ _id "find-me" ] [ str ";)" ] ]]
                    Expect.equal (string sb) """<span id="find-me">;)</span>""" "HTML is incorrect"
                }
                test "fails when an ID is not matched" {
-                    let sb = StringBuilder ()
+                    let sb = StringBuilder()
                    RenderFragment.IntoStringBuilder.htmlFromNodes sb "missing" []
                    Expect.equal (string sb) (nodeNotFound "missing") "HTML is incorrect"
                }
            ]
            testList "htmlFromNode" [
                test "succeeds when ID is matched at top level" {
-                    let sb = StringBuilder ()
+                    let sb = StringBuilder()
                    RenderFragment.IntoStringBuilder.htmlFromNode sb "top" (p [ _id "top" ] [ str "pinnacle" ])
                    Expect.equal (string sb) """<p id="top">pinnacle</p>""" "HTML is incorrect"
                }
                test "succeeds when ID is matched in child element" {
-                    let sb = StringBuilder ()
+                    let sb = StringBuilder()
                    div [] [ p [] [ str "nada" ]; p [ _id "it" ] [ str "is here" ]]
                    |> RenderFragment.IntoStringBuilder.htmlFromNode sb "it"
                    Expect.equal (string sb) """<p id="it">is here</p>""" "HTML is incorrect"
                }
                test "fails when an ID is not matched" {
-                    let sb = StringBuilder ()
+                    let sb = StringBuilder()
                    RenderFragment.IntoStringBuilder.htmlFromNode sb "bar" (hr [])
                    Expect.equal (string sb) (nodeNotFound "bar") "HTML is incorrect"
                }
@@ -985,11 +869,12 @@ let allTests =
        hxEncoding
        hxEvent
        hxHeaders
-        hxParams
-        hxRequest
+        hxSync
        hxTrigger
        hxVals
        attributes
+        hxModifiers
+        hxTags
        script
        renderFragment
    ]
@@ -0,0 +1,335 @@
+module ViewEngineMax
+
+open Expecto
+open Giraffe.ViewEngine.Htmax
+
+/// Tests for the HxBrowserIndicatorConfigItem type
+let hxBrowserIndicatorConfigItem =
+    testList "HxBrowserIndicatorConfigItem" [
+        testList "ToHcon" [
+            test "succeeds for BoostBrowserIndicator" {
+                Expect.equal
+                    ((BoostBrowserIndicator false).ToHcon())
+                    "boostBrowserIndicator:false"
+                    "The HCON value was incorrect"
+            }
+        ]
+    ]
+
+/// Tests for the HxPreloadConfigItem type
+let hxPreloadConfigItem =
+    testList "HxPreloadConfigItem" [
+        testList "ToHcon" [
+            test "succeeds for AutoBoost" {
+                Expect.equal ((AutoBoost false).ToHcon()) "autoBoost:false" "The HCON value was incorrect"
+            }
+            test "succeeds for BoostEvent" {
+                Expect.equal ((BoostEvent "mouseover").ToHcon()) "boostEvent:mouseover" "The HCON value was incorrect"
+            }
+            test "succeeds for BoostTimeout" {
+                Expect.equal ((BoostTimeout 30_000).ToHcon()) "boostTimeout:30000" "The HCON value was incorrect"
+            }
+        ]
+    ]
+
+/// Tests for the HxSseWsConfigItem type
+let hxSseWsConfigItem =
+    testList "HxSseWsConfigItem" [
+        testList "ToHcon" [
+            test "succeeds for Reconnect" {
+                Expect.equal ((Reconnect true).ToHcon()) "reconnect:true" "The HCON value was incorrect"
+            }
+            testList "ReconnectDelay" [
+                test "succeeds for numeric value" {
+                    Expect.equal ((ReconnectDelay "3000").ToHcon()) "reconnectDelay:3000" "The HCON value was incorrect"
+                }
+                test "succeeds for value with units" {
+                    Expect.equal ((ReconnectDelay "3s").ToHcon()) "reconnectDelay:3s" "The HCON value was incorrect"
+                }
+            ]
+            testList "ReconnectMaxDelay" [
+                test "succeeds for numeric value" {
+                    Expect.equal
+                        ((ReconnectMaxDelay "30000").ToHcon()) "reconnectMaxDelay:30000" "The HCON value was incorrect"
+                }
+                test "succeeds for value with units" {
+                    Expect.equal
+                        ((ReconnectMaxDelay "50s").ToHcon()) "reconnectMaxDelay:50s" "The HCON value was incorrect"
+                }
+            ]
+            testList "ReconnectMaxAttempts" [
+                test "succeeds for negative 1" {
+                    Expect.equal
+                        ((ReconnectMaxAttempts -1).ToHcon())
+                        "reconnectMaxAttempts:Infinity"
+                        "The HCON value was incorrect"
+                }
+                test "succeeds for zero" {
+                    Expect.equal
+                        ((ReconnectMaxAttempts 0).ToHcon()) "reconnectMaxAttempts:0" "The HCON value was incorrect"
+                }
+                test "succeeds for positive number" {
+                    Expect.equal
+                        ((ReconnectMaxAttempts 7).ToHcon()) "reconnectMaxAttempts:7" "The HCON value was incorrect"
+                }
+            ]
+            test "succeeds for ReconnectJitter" {
+                Expect.equal ((ReconnectJitter 0.7).ToHcon()) "reconnectJitter:0.7" "The HCON value was incorrect"
+            }
+            test "succeeds for PauseOnBackground" {
+                Expect.equal
+                    ((PauseOnBackground false).ToHcon()) "pauseOnBackground:false" "The HCON value was incorrect"
+            }
+            test "succeeds for PendingRequestTtl" {
+                Expect.equal ((PendingRequestTtl 5000).ToHcon()) "pendingRequestTTL:5000" "The HCON value was incorrect"
+            }
+        ]
+    ]
+
+/// Tests for the HxConfig module
+let hxConfig =
+    testList "HxConfig" [
+        test "hxBrowserIndicatorConfig succeeds" {
+            Expect.equal
+                (hxBrowserIndicatorConfig [ BoostBrowserIndicator true ])
+                "browser-indicator.boostBrowserIndicator:true"
+                "Config settings not correct"
+        }
+        test "hxPreloadConfig succeeds" {
+            Expect.equal
+                (hxPreloadConfig [ AutoBoost true; BoostTimeout 3_000 ])
+                "preload.autoBoost:true preload.boostTimeout:3000"
+                "Config settings not correct"
+        }
+        test "hxSseConfig succeeds" {
+            Expect.equal
+                (hxSseConfig [ ReconnectDelay "5s"; PauseOnBackground false ])
+                "sse.reconnectDelay:5s sse.pauseOnBackground:false"
+                "Config settings not correct"
+        }
+        test "hxWsConfig succeeds" {
+            Expect.equal
+                (hxWsConfig [ Reconnect false; PendingRequestTtl 40_000 ])
+                "ws.reconnect:false ws.pendingRequestTTL:40000"
+                "Config settings not correct"
+        }
+    ]
+    
+/// Tests for the HxEvent module
+let hxEvent =
+    testList "HxEvent" [
+        testList "AfterSseConnection" [
+            test "ToString succeeds" {
+                Expect.equal
+                    (string AfterSseConnection) "afterSseConnection" "AfterSseConnection event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (AfterSseConnection.ToHxOnString())
+                    "after:sse:connection"
+                    "AfterSseConnection hx-on event name not correct"
+            }
+        ]
+        testList "AfterSseMessage" [
+            test "ToString succeeds" {
+                Expect.equal (string AfterSseMessage) "afterSseMessage" "AfterSseMessage event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (AfterSseMessage.ToHxOnString()) "after:sse:message" "AfterSseMessage hx-on event name not correct"
+            }
+        ]
+        testList "AfterWsConnection" [
+            test "ToString succeeds" {
+                Expect.equal
+                    (string AfterWsConnection) "afterWsConnection" "AfterWsConnection event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (AfterWsConnection.ToHxOnString())
+                    "after:ws:connection"
+                    "AfterWsConnection hx-on event name not correct"
+            }
+        ]
+        testList "AfterWsMessage" [
+            test "ToString succeeds" {
+                Expect.equal (string AfterWsMessage) "afterWsMessage" "AfterWsMessage event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (AfterWsMessage.ToHxOnString()) "after:ws:message" "AfterWsMessage hx-on event name not correct"
+            }
+        ]
+        testList "AfterWsRequest" [
+            test "ToString succeeds" {
+                Expect.equal (string AfterWsRequest) "afterWsRequest" "AfterWsRequest event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (AfterWsRequest.ToHxOnString()) "after:ws:request" "AfterWsRequest hx-on event name not correct"
+            }
+        ]
+        testList "BeforeSseConnection" [
+            test "ToString succeeds" {
+                Expect.equal
+                    (string BeforeSseConnection) "beforeSseConnection" "BeforeSseConnection event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (BeforeSseConnection.ToHxOnString())
+                    "before:sse:connection"
+                    "BeforeSseConnection hx-on event name not correct"
+            }
+        ]
+        testList "BeforeSseMessage" [
+            test "ToString succeeds" {
+                Expect.equal (string BeforeSseMessage) "beforeSseMessage" "BeforeSseMessage event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (BeforeSseMessage.ToHxOnString())
+                    "before:sse:message"
+                    "BeforeSseMessage hx-on event name not correct"
+            }
+        ]
+        testList "BeforeWsConnection" [
+            test "ToString succeeds" {
+                Expect.equal
+                    (string BeforeWsConnection) "beforeWsConnection" "BeforeWsConnection event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (BeforeWsConnection.ToHxOnString())
+                    "before:ws:connection"
+                    "BeforeWsConnection hx-on event name not correct"
+            }
+        ]
+        testList "BeforeWsMessage" [
+            test "ToString succeeds" {
+                Expect.equal (string BeforeWsMessage) "beforeWsMessage" "BeforeWsMessage event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (BeforeWsMessage.ToHxOnString()) "before:ws:message" "BeforeWsMessage hx-on event name not correct"
+            }
+        ]
+        testList "BeforeWsRequest" [
+            test "ToString succeeds" {
+                Expect.equal (string BeforeWsRequest) "beforeWsRequest" "BeforeWsRequest event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (BeforeWsRequest.ToHxOnString()) "before:ws:request" "BeforeWsRequest hx-on event name not correct"
+            }
+        ]
+        testList "DownloadComplete" [
+            test "ToString succeeds" {
+                Expect.equal (string DownloadComplete) "downloadComplete" "DownloadComplete event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (DownloadComplete.ToHxOnString())
+                    "download:complete"
+                    "DownloadComplete hx-on event name not correct"
+            }
+        ]
+        testList "DownloadProgress" [
+            test "ToString succeeds" {
+                Expect.equal (string DownloadProgress) "downloadProgress" "DownloadProgress event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (DownloadProgress.ToHxOnString())
+                    "download:progress"
+                    "DownloadProgress hx-on event name not correct"
+            }
+        ]
+        testList "DownloadStart" [
+            test "ToString succeeds" {
+                Expect.equal (string DownloadStart) "downloadStart" "DownloadStart event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal
+                    (DownloadStart.ToHxOnString()) "download:start" "DownloadStart hx-on event name not correct"
+            }
+        ]
+        testList "SseClose" [
+            test "ToString succeeds" {
+                Expect.equal (string SseClose) "sseClose" "SseClose event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal (SseClose.ToHxOnString()) "sse:close" "SseClose hx-on event name not correct"
+            }
+        ]
+        testList "SseError" [
+            test "ToString succeeds" {
+                Expect.equal (string SseError) "sseError" "SseError event name not correct"
+            }
+            test "ToHxOnString succeeds" {
+                Expect.equal (SseError.ToHxOnString()) "sse:error" "SseError hx-on event name not correct"
+            }
+        ]
+    ]
+
+open Giraffe.ViewEngine
+
+/// Pipe-able assertion for a rendered node 
+let shouldRender expected node =
+    Expect.equal (RenderView.AsString.htmlNode node) expected "Rendered HTML incorrect"
+
+/// Tests for the HtmaxAttrs module
+let attributes =
+    testList "Attributes" [
+
+        test "_hxBrowserIndicator succeeds" {
+            a [ _hxBrowserIndicator ] [] |> shouldRender """<a hx-browser-indicator="true"></a>"""
+        }
+        test "_hxLive succeeds" {
+            main [ _hxLive "q().doStuff()" ] [] |> shouldRender """<main hx-live="q().doStuff()"></main>"""
+        }
+        test "_hxOnMax succeeds" {
+            body [ _hxOnMax SseClose "alert(done)" ] []
+            |> shouldRender """<body hx-on:htmx:sse:close="alert(done)"></body>"""
+        }
+        testList "_hxPreload" [
+            test "succeeds when given an event" {
+                blockquote [ _hxPreload (Some "focus") ] []
+                |> shouldRender """<blockquote hx-preload="focus"></blockquote>"""
+            }
+            test "succeeds when not given an event" {
+                em [ _hxPreload None ] [] |> shouldRender """<em hx-preload></em>"""
+            }
+        ]
+        test "_hxSseClose succeeds" {
+            form [ _hxSseClose "fin" ] [] |> shouldRender """<form hx-sse:close="fin"></form>"""
+        }
+        test "_hxSseConnect succeeds" {
+            div [ _hxSseConnect "/path/to/resource" ] []
+            |> shouldRender """<div hx-sse:connect="/path/to/resource"></div>"""
+        }
+        test "_hxTargets succeeds" {
+            dl [ _hxTargets ".ephemeral" ] [] |> shouldRender """<dl hx-targets=".ephemeral"></dl>"""
+        }
+        test "_hxWsConnect succeeds" {
+            p [ _hxWsConnect "/over/here" ] [] |> shouldRender """<p hx-ws:connect="/over/here"></p>"""
+        }
+        testList "_hxWsSend" [
+            test "succeeds when given a URL" {
+                span [ _hxWsSend (Some "/a/new/place") ] []
+                |> shouldRender """<span hx-ws:send="/a/new/place"></span>"""
+            }
+            test "succeeds when not given a URL" {
+                aside [ _hxWsSend None ] [] |> shouldRender """<aside hx-ws:send></aside>"""
+            }
+        ]
+    ]
+
+let allTests =
+    testList "ViewEngine.Htmax" [
+        hxBrowserIndicatorConfigItem
+        hxPreloadConfigItem
+        hxSseWsConfigItem
+        hxConfig
+        hxEvent
+        attributes
+    ]
@@ -4,17 +4,19 @@
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <Description>Extensions to Giraffe View Engine to support htmx attributes and their values</Description>
    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
  </PropertyGroup>

  <ItemGroup>
    <Compile Include="Htmx.fs" />
+    <Compile Include="Htmax.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" />
+    <PackageReference Include="Giraffe.ViewEngine" />
+    <PackageReference Include="FSharp.Core" />
  </ItemGroup>

  <ItemGroup>
@@ -0,0 +1,243 @@
+/// <summary>Types and functions supporting htmax-bundled extension attributes in Giraffe View Engine</summary>
+module Giraffe.ViewEngine.Htmax
+
+/// <summary>Items which can be configured for the <c>hx-browser-indicator</c> extension</summary>
+/// <seealso href="https://four.htmx.org/extensions/hx-browser-indicator#boosted-elements">Documentation</seealso>
+type HxBrowserIndicatorConfigItem =
+    /// <summary>Whether to show the browser's native loading indicator for <c>hx-boost</c>ed links</summary>
+    | BoostBrowserIndicator of bool
+    
+    /// <summary>Get the HCON representation of this configuration value</summary>
+    member this.ToHcon() =
+        match this with
+        | BoostBrowserIndicator it -> "boostBrowserIndicator:" + (string it).ToLowerInvariant()
+
+        
+/// <summary>Items which can be configured for the <c>hx-preload</c> extension</summary>
+/// <seealso href="https://four.htmx.org/extensions/hx-preload#configuration">Documentation</seealso>
+type HxPreloadConfigItem =
+    /// <summary>Whether items subject to <c>hx-boost</c> are automatically preloaded (default <c>true</c>)</summary>
+    | AutoBoost of bool
+    
+    /// <summary>The event to use for <c>hx-boost</c> auto-preloaded content (default "mousedown")</summary>
+    | BoostEvent of string
+    
+    /// <summary>The timeout (in ms) for <c>hx-boost</c> auto-preloaded requests (default 50_000)</summary>
+    | BoostTimeout of int
+    
+    /// <summary>Get the HCON representation of this configuration value</summary>
+    member this.ToHcon() =
+        match this with
+        | AutoBoost it -> "autoBoost:" + (string it).ToLowerInvariant()
+        | BoostEvent it -> $"boostEvent:{it}"
+        | BoostTimeout it -> $"boostTimeout:{it}"
+
+
+/// <summary>Items which can be configured for the <c>hx-sse</c> or <c>hx-ws</c> extensions</summary>
+/// <seealso href="https://four.htmx.org/extensions/hx-sse#configuration">SSE Documentation</seealso>
+/// <seealso href="https://four.htmx.org/extensions/hx-ws#configuration">WebSockets Documentation</seealso>
+type HxSseWsConfigItem =
+    /// <summary>Whether to automatically reconnect on stream end (default <c>true</c>)</summary>
+    | Reconnect of bool
+    
+    /// <summary>Delay for reconnect attempts (ms, or numbers with units "1s", "2m"; default "500")</summary>
+    | ReconnectDelay of string
+    
+    /// <summary>Maximum delay for reconnect attempts (ms, or numbers with units "1s, "2m"; default "60000")</summary>
+    | ReconnectMaxDelay of string
+    
+    /// <summary>Reconnect maximum attempts (use -1 for Infinity; default Infinity)</summary>
+    | ReconnectMaxAttempts of int
+    
+    /// <summary>Jitter to use when reconnecting (decimal between 0.0 and 1.0; default 0.3)</summary>
+    | ReconnectJitter of double
+    
+    /// <summary>Whether to pause when the current tab is in the background (default <c>true</c>)</summary>
+    | PauseOnBackground of bool
+    
+    /// <summary>Time-to-Live (TTL) for pending requests (<c>hx-ws</c> only)</summary>
+    | PendingRequestTtl of int
+
+    /// <summary>Get the HCON representation of this configuration value</summary>
+    member this.ToHcon() =
+        match this with
+        | Reconnect it -> "reconnect:" + (string it).ToLowerInvariant()
+        | ReconnectDelay it -> $"reconnectDelay:{it}"
+        | ReconnectMaxDelay it -> $"reconnectMaxDelay:{it}"
+        | ReconnectMaxAttempts it -> "reconnectMaxAttempts:" + if it = -1 then "Infinity" else string it
+        | ReconnectJitter it -> $"reconnectJitter:{it}"
+        | PauseOnBackground it -> "pauseOnBackground:" + (string it).ToLowerInvariant()
+        | PendingRequestTtl it -> $"pendingRequestTTL:{it}"
+
+
+/// <summary>Helpers for generating extension configuration parameters</summary>
+[<AutoOpen>]
+module HxConfig =
+    
+    /// Create an HCON section suitable for hx-config
+    let private hconSettings title values =
+        values |> Seq.map (sprintf "%s.%s" title) |> String.concat " "
+
+    /// <summary>Generate configuration items for preload suitable for <c>hx-config</c></summary>
+    /// <param name="items">The configuration items</param>
+    let hxBrowserIndicatorConfig (items: HxBrowserIndicatorConfigItem seq) =
+        items |> Seq.map _.ToHcon() |> hconSettings "browser-indicator"
+    
+    /// <summary>Generate configuration items for preload suitable for <c>hx-config</c></summary>
+    /// <param name="items">The configuration items</param>
+    let hxPreloadConfig (items: HxPreloadConfigItem seq) =
+        items |> Seq.map _.ToHcon() |> hconSettings "preload"
+    
+    /// <summary>Generate configuration items for SSE suitable for <c>hx-config</c></summary>
+    /// <param name="items">The configuration items</param>
+    let hxSseConfig (items: HxSseWsConfigItem seq) =
+        items |> Seq.map _.ToHcon() |> hconSettings "sse"
+
+    /// <summary>Generate configuration items for WebSockets suitable for <c>hx-config</c></summary>
+    /// <param name="items">The configuration items</param>
+    let hxWsConfig (items: HxSseWsConfigItem seq) =
+        items |> Seq.map _.ToHcon() |> hconSettings "ws"
+
+    
+/// <summary>The events recognized by htmax-bundled extensions</summary>
+[<Struct>]
+type HxEvent =
+    
+    /// <summary>Fired after an SSE connection is established</summary>
+    | AfterSseConnection
+    
+    /// <summary>Fired after an SSE message is received</summary>
+    | AfterSseMessage
+    
+    /// <summary>Fired after a WebSocket connection is established</summary>
+    | AfterWsConnection
+    
+    /// <summary>Fired after a WebSocket message is received</summary>
+    | AfterWsMessage
+    
+    /// <summary>Fired after a WebSocket request is sent</summary>
+    | AfterWsRequest
+    
+    /// <summary>Fired before an SSE connection is established (cancelable)</summary>
+    | BeforeSseConnection
+    
+    /// <summary>Fired before a received SSE message is processed (cancelable)</summary>
+    | BeforeSseMessage
+    
+    /// <summary>Fired before a WebSocket connection is established (cancelable)</summary>
+    | BeforeWsConnection
+    
+    /// <summary>Fired when a download handled by <c>hx-download</c> is complete</summary>
+    | DownloadComplete
+    
+    /// <summary>Fired when a download handled by <c>hx-download</c> is complete</summary>
+    | DownloadProgress
+    
+    /// <summary>Fired when a chunk is received for a download handled by <c>hx-download</c></summary>
+    | DownloadStart
+    
+    /// <summary>Fired before a received WebSocket message is processed (cancelable)</summary>
+    | BeforeWsMessage
+    
+    /// <summary>Fired before a WebSocket request is sent (cancelable)</summary>
+    | BeforeWsRequest
+    
+    /// <summary>Fired when an SSE connection is closed</summary>
+    | SseClose
+    
+    /// <summary>Fired when an SSE connection errors</summary>
+    | SseError
+
+    /// The htmx event name (fst) and kebab-case name (snd, for use with hx-on)
+    static member private Values = Map [
+        AfterSseConnection, ("afterSseConnection", "after:sse:connection")
+        AfterSseMessage, ("afterSseMessage", "after:sse:message")
+        AfterWsConnection, ("afterWsConnection", "after:ws:connection")
+        AfterWsMessage, ("afterWsMessage", "after:ws:message")
+        AfterWsRequest, ("afterWsRequest", "after:ws:request")
+        BeforeSseConnection, ("beforeSseConnection", "before:sse:connection")
+        BeforeSseMessage, ("beforeSseMessage", "before:sse:message")
+        BeforeWsConnection, ("beforeWsConnection", "before:ws:connection")
+        BeforeWsMessage, ("beforeWsMessage", "before:ws:message")
+        BeforeWsRequest, ("beforeWsRequest", "before:ws:request")
+        DownloadComplete, ("downloadComplete", "download:complete")
+        DownloadProgress, ("downloadProgress", "download:progress")
+        DownloadStart, ("downloadStart", "download:start")
+        SseClose, ("sseClose", "sse:close")
+        SseError, ("sseError", "sse:error")
+    ]
+
+    /// <summary>The htmx event name</summary> 
+    override this.ToString() = fst HxEvent.Values[this]
+    
+    /// <summary>The <c>hx-on</c> variant of the htmx event name</summary>
+    member this.ToHxOnString() = snd HxEvent.Values[this]
+
+
+/// <summary>Attributes and flags for htmax-bundled extensions</summary>
+[<AutoOpen>]
+module HtmaxAttrs =
+    
+    /// <summary>Display the browser's native loading indicator when an htmx request is in flight</summary>
+    /// <returns>A configured <c>hx-browser-indicator</c> attribute</returns>
+    /// <seealso href="https://four.htmx.org/extensions/hx-browser-indicator#usage">Documentation</seealso>
+    let _hxBrowserIndicator =
+        attr "hx-browser-indicator" "true"
+
+    /// <summary>Run script each time the DOM changes</summary>
+    /// <param name="script">The script to be run each time the DOM changes (may use <c>q</c> helper)</param>
+    /// <returns>A configured <c>hx-live</c> attribute</returns>
+    /// <seealso href="https://four.htmx.org/extensions/hx-live#the-hx-live-attribute">Documentation</seealso>
+    let _hxLive script =
+        attr "hx-live" script
+    
+    /// <summary>Generate an <c>hx-on:htmx</c> event for an htmax-bundled extension event</summary>
+    /// <param name="event">The <c>HxEvent</c> to be handled</param>
+    /// <param name="handler">The script to be executed when the event occurs</param>
+    /// <returns>A configured <c>hx-on:htmx:</c> attribute</returns>
+    /// <seealso href="https://htmx.org/attributes/hx-on/">Documentation</seealso>
+    let _hxOnMax (event: HxEvent) handler =
+        Htmx.HtmxAttrs._hxOnEvent $"htmx:{event.ToHxOnString()}" handler
+    
+    /// <summary>Identify a resource as one that should be preloaded</summary>
+    /// <param name="evt">The DOM event or htmx trigger which should cause the preload (optional; default behavior is
+    /// preloading on <c>mousedown</c>)</param>
+    /// <returns>A configured <c>hx-preload</c> attribute</returns>
+    /// <seealso href="https://four.htmx.org/extensions/hx-preload#usage">Documentation</seealso>
+    let _hxPreload evt =
+        match evt with Some it -> attr "hx-preload" it | None -> flag "hx-preload"
+    
+    /// <summary>Define an SSE message which indicates the connection should be closed</summary>
+    /// <param name="message">The text of the message which indicates the SSE connection should be closed</param>
+    /// <returns>A configured <c>hx-sse:close</c> attribute</returns>
+    /// <seealso href="https://four.htmx.org/extensions/hx-sse#hx-sseclose">Documentation</seealso>
+    let _hxSseClose message =
+        attr "hx-sse:close" message
+        
+    /// <summary>Define a URL to which an SSE connection should be established</summary>
+    /// <param name="url">The URL to which an SSE connection should be established</param>
+    /// <returns>A configured <c>hx-sse:connect</c> attribute</returns>
+    /// <seealso href="https://four.htmx.org/extensions/hx-sse#hx-sseconnect">Documentation</seealso>
+    let _hxSseConnect url =
+        attr "hx-sse:connect" url
+    
+    /// <summary>Replace multiple targets with the same content</summary>
+    /// <param name="selector">The CSS selector to identify targets for the replacement</param>
+    /// <returns>A configured <c>hx-targets</c> attribute</returns>
+    /// <seealso href="https://four.htmx.org/extensions/hx-targets#usage">Documentation</seealso>
+    let _hxTargets selector =
+        attr "hx-targets" selector
+    
+    /// <summary>Connect to a WebSocket URL</summary>
+    /// <param name="url">The URL to which a WebSocket connection should be established</param>
+    /// <returns>A configured <c>hx-ws:connect</c> attribute</returns>
+    /// <seealso href="https://four.htmx.org/extensions/hx-ws#usage">Documentation</seealso>
+    let _hxWsConnect url =
+        attr "hx-ws:connect" url
+
+    /// <summary>Send data via a WebSocket connection</summary>
+    /// <param name="url">The URL to which the data should be sent (optional; default is connection URL)</param>
+    /// <returns>A configured <c>hx-ws:send</c> attribute</returns>
+    /// <seealso href="https://four.htmx.org/extensions/hx-ws#usage">Documentation</seealso>
+    let _hxWsSend url =
+        match url with Some it -> attr "hx-ws:send" it | None -> flag "hx-ws:send"
@@ -2,14 +2,19 @@

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

-**htmx version: 2.0.0-beta3**
+**htmx version: 4.0.0**

-_Note that this is a BETA release of htmx 2.0; see [the migration guide](https://v2-0v2-0.htmx.org/migration-guide-htmx-1/) for changes_
+_Upgrading from v2.x: see [the migration guide](https://four.htmx.org/docs#migrating-from-htmx-2x-to-4x) for changes, which are plentiful. htmx switches from `XMLHTTPRequest` to `fetch`, and many changes are related to the new event cycle._
+
+_Inheritance is now explicit; to have an attribute's value inherited to its children, wrap the attribute in `hxInherited` (ex. `hxInherited (_hxTarget "#main")`). Values can be appended to inherited values as well using the `hxAppend` modifier._
+
+_Several constructs have been removed in this release. If you encounter compile errors, install version `4.0.0-beta5`; it will instead flag these with warnings and suggestions on how to mitigate them. Once the warnings are gone, you can reinstall this version._

 ### Setup

-1. Install the package (must use `--Prerelease` flag).
-2. Prior to using the attribute or support modules, `open Giraffe.ViewEngine.Htmx`.
+1. Install the package.
+1. Prior to using the attribute or support modules, `open Giraffe.ViewEngine.Htmx`.
+1. If the client is using the `htmax` bundle, also `open Giraffe.ViewEngine.Htmax`. 

 ### Use

@@ -21,15 +26,16 @@ let autoload =
 ```

 Support modules include:
+- `HxConfig` _(new in v4, replaces `HxRequest`)_
 - `HxEncoding`
 - `HxHeaders`
- `HxParams`
- `HxRequest`
 - `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).
+`Htmx.Script.local` creates an `XmlNode` to load the package-provided htmx library. There are also two `XmlNode`s that will load the htmx script from jsdelivr; `Htmx.Script.cdnMinified` loads the minified version, and `Htmx.Script.cdnUnminified` loads the unminified version (useful for debugging). htmx v4 also distributes a "max" bundle which contains some common extensions; these are available with the same names under `Htmx.Script.Max`.
+
+_NOTE: When using the CDN nodes and a Content Security Policy (CSP) header, `cdn.jsdelivr.net` needs to be listed as an allowable `script-src`._

 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).

@@ -42,10 +48,10 @@ htmx's attributes and these attribute functions map one-to-one. There are two ex
 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.
+- `HxConfig` has a `Configure` function, which takes a list of strings; the other functions in the module allow for configuring the request.

 ```fsharp
-HxRequest.Configure [ HxRequest.Timeout 500 ] |> _hxRequest 
+HxConfig.Configure [ HxRequest.Timeout 500 ] |> _hxConfig 
 ```
 - `HxTrigger` is _(by far)_ the most complex of these modules. Most uses won't need that complexity; however, complex triggers can be defined by piping into or composing with other functions. For example, to define an event that responds to a shift-click anywhere on the document, with a delay of 3 seconds before firing:

@@ -0,0 +1,7 @@
+#!/bin/bash
+dotnet pack Common/Giraffe.Htmx.Common.fsproj -c Release
+dotnet pack Htmx/Giraffe.Htmx.fsproj -c Release
+dotnet pack ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj -c Release
+cp Common/bin/Release/Giraffe.Htmx.Common.*.nupkg .
+cp Htmx/bin/Release/Giraffe.Htmx.*.nupkg .
+cp ViewEngine.Htmx/bin/Release/Giraffe.ViewEngine.Htmx.*.nupkg .
Author	SHA1	Message	Date
danieljsummers	6a762fbdd5	v4.0.0 initial release (#22 ) Reviewed-on: #22	2026-09-01 00:08:19 +00:00
danieljsummers	59b64ed834	v4, beta5 (#20 ) Reviewed-on: #20	2026-06-30 02:03:15 +00:00
danieljsummers	5c12ad7cef	v4, beta4 (#19 ) - Update with header/attribute changes between alpha8 and beta4 - Add support for htmax script, attributes, headers, and extension config Reviewed-on: #19	2026-06-15 01:07:38 +00:00
danieljsummers	d4a7e0c9ce	htmx v4, alpha8 (#18 ) Reviewed-on: #18	2026-03-22 22:21:22 +00:00
danieljsummers	de75672bb3	v4, alpha 6 (#17 ) Reviewed-on: #17	2026-01-07 11:37:26 +00:00
danieljsummers	121eb95d87	v2.0.8 (#16 ) - Embed htmx library to `Giraffe.Htmx.Common`, add links to load package-provided script - Update CDN links for v2.0.8 - Add .NET 10 support Reviewed-on: #16	2025-12-28 16:53:44 +00:00
danieljsummers	6b7458070b	v2.0.6 (#15 ) - Adds XML documentation (#13) - Adds `HxSync` module and attribute helper - Updates script version to 2.0.6 - Drops .NET 6 support (#14 ) Reviewed-on: #15	2025-07-03 00:15:24 +00:00
danieljsummers	10c31d77b5	Update version in READMEs	2024-12-13 17:02:28 -05:00
danieljsummers	f4cd184a15	Update script and version to 2.0.4; add .NET 9 support	2024-12-13 16:57:27 -05:00
danieljsummers	5626031593	Update script tags and package version to 2.0.3	2024-10-18 09:36:28 -04:00
danieljsummers	f0de18845f	Update script tags and package version to 2.0.2	2024-08-12 21:36:47 -04:00
danieljsummers	961307fd99	Update htmx script to 2.0.1	2024-07-29 18:06:19 -04:00
danieljsummers	a2960a79c6	Add pack script; drop beta tag	2024-06-18 19:38:28 -04:00
danieljsummers	541384a92f	htmx v2 - Drop `hx-sse` and `hx-ws` attributes - Drop explicit .NET 7 support - Update deps to latest versions	2024-06-18 19:16:10 -04:00
danieljsummers	8cb5d6bfa7	Merge pull request 'htmx v2-beta4' (#12 ) from v2-beta4 into main Reviewed-on: #12	2024-05-23 23:30:58 +00:00
danieljsummers	1a11e3511a	Update htmx to v2.0.0-beta4	2024-05-23 19:26:00 -04:00
danieljsummers	32e962416d	Migrate PR 10 from GitHub https://github.com/bit-badger/Giraffe.Htmx/pull/10	2024-05-23 19:19:07 -04:00