Account for anchors when appending version hash

Author: Mpdreamz

src/Elastic.Documentation.Site/Htmx.cs

@@ -4,15 +4,70 @@
 
 using System.Reflection;
 using System.Text;
+using System.Text.Encodings.Web;
 using Elastic.Documentation.Extensions;
 
 namespace Elastic.Documentation.Site;
 
+public static class UrlHelper
+{
+	private static readonly KeyValuePair<string, string?>[] VersionParameters = [new("v", Htmx.VersionHash)];
+
+	public static string AddVersionParameters(string uri) => AddQueryString(uri, VersionParameters);
+
+	/// <summary>
+	/// Append the given query keys and values to the URI.
+	/// </summary>
+	/// <param name="uri">The base URI.</param>
+	/// <param name="queryString">A collection of name value query pairs to append.</param>
+	/// <returns>The combined result.</returns>
+	/// <exception cref="ArgumentNullException"><paramref name="uri"/> is <c>null</c>.</exception>
+	/// <exception cref="ArgumentNullException"><paramref name="queryString"/> is <c>null</c>.</exception>
+	public static string AddQueryString(
+		string uri,
+		IEnumerable<KeyValuePair<string, string?>> queryString)
+	{
+		ArgumentNullException.ThrowIfNull(uri);
+		ArgumentNullException.ThrowIfNull(queryString);
+
+		var anchorIndex = uri.IndexOf('#');
+		var uriToBeAppended = uri.AsSpan();
+		var anchorText = ReadOnlySpan<char>.Empty;
+		// If there is an anchor, then the query string must be inserted before its first occurrence.
+		if (anchorIndex != -1)
+		{
+			anchorText = uriToBeAppended.Slice(anchorIndex);
+			uriToBeAppended = uriToBeAppended.Slice(0, anchorIndex);
+		}
+
+		var queryIndex = uriToBeAppended.IndexOf('?');
+		var hasQuery = queryIndex != -1;
+
+		var sb = new StringBuilder();
+		_ = sb.Append(uriToBeAppended);
+		foreach (var parameter in queryString)
+		{
+			if (parameter.Value == null)
+				continue;
+
+			_ = sb.Append(hasQuery ? '&' : '?')
+			  .Append(UrlEncoder.Default.Encode(parameter.Key))
+			  .Append('=')
+			  .Append(UrlEncoder.Default.Encode(parameter.Value));
+			hasQuery = true;
+		}
+
+		_ = sb.Append(anchorText);
+		return sb.ToString();
+	}
+}
+
 public static class Htmx
 {
 	private static readonly string Version =
 		Assembly.GetExecutingAssembly().GetCustomAttributes<AssemblyInformationalVersionAttribute>()
 			.FirstOrDefault()?.InformationalVersion ?? "0.0.0";
+
 	public static readonly string VersionHash = ShortId.Create(Version);
 
 	public static string GetHxSelectOob(bool hasSameTopLevelGroup) => hasSameTopLevelGroup ? "#content-container,#toc-nav" : "#main-container";
@@ -31,7 +86,8 @@ public static string GetHxAttributes(
 		string? hxIndicator = HxIndicator
 	)
 	{
-		var hxGetUrl = targetUrl.Contains('?') ? $"{targetUrl}&v={VersionHash}" : $"{targetUrl}?v={VersionHash}";
+		var hxGetUrl = UrlHelper.AddVersionParameters(targetUrl);
+
 		var attributes = new StringBuilder();
 		_ = attributes.Append($" hx-get={hxGetUrl}");
 		_ = attributes.Append($" hx-select-oob={hxSwapOob ?? GetHxSelectOob(hasSameTopLevelGroup)}");

src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs

@@ -30,7 +30,7 @@ protected override void Write(HtmlRenderer renderer, LinkInline link)
 			var url = link.GetDynamicUrl?.Invoke() ?? link.Url;
 			var hxGetUrl = url;
 			if (hxGetUrl is not null)
-				hxGetUrl = hxGetUrl.Contains('?') ? $"{hxGetUrl}&v={Htmx.VersionHash}" : $"{hxGetUrl}?v={Htmx.VersionHash}";
+				hxGetUrl = UrlHelper.AddVersionParameters(hxGetUrl);
 
 			var isCrossLink = (link.GetData("isCrossLink") as bool?) == true;
 			var isHttpLink = url?.StartsWith("http") ?? false;