Blazor streaming markers (<!--bl:…-->, <!--/bl:…--> and <!--bab39c12-73f9-4e04-b6b9-76cb2b324662-->) are no longer removed

Author: Taritsyn

src/WebMarkupMin.Core/GenericHtmlMinifier.cs

@@ -700,12 +700,12 @@ private void CommentHandler(MarkupParsingContext context, string commentText)
 				// Processing of end Knockout containerless comment
 				processedCommentText = "/ko";
 			}
-			else if (KnockoutHelpers.IsBeginContainerlessComment(commentText))
+			else if (KnockoutHelpers.IsStartContainerlessComment(commentText))
 			{
 				// Processing of begin Knockout containerless comment
 				string koExpression = string.Empty;
 
-				KnockoutHelpers.ParseBeginContainerlessComment(commentText,
+				KnockoutHelpers.ParseStartContainerlessComment(commentText,
 					(localContext, expression) =>
 					{
 						SourceCodeNodeCoordinates expressionCoordinates = localContext.NodeCoordinates;

src/WebMarkupMin.Core/Helpers/BlazorHelpers.cs

@@ -18,27 +18,42 @@ internal static class BlazorHelpers
 		/// <summary>
 		/// Blazor component marker prefix
 		/// </summary>
-		const string COMPONENT_MARKER_PREFIX = "Blazor:";
+		const string COMPONENT_MARKER_PREFIX = MARKER_PREFIX_COMMON_PART + ":";
 
 		/// <summary>
 		/// Blazor server persisted state marker prefix
 		/// </summary>
-		const string SERVER_STATE_MARKER_PREFIX = "Blazor-Server-Component-State:";
+		const string SERVER_STATE_MARKER_PREFIX = MARKER_PREFIX_COMMON_PART + "-Server-Component-State:";
 
 		/// <summary>
 		/// Blazor WebAssembly persisted state marker prefix
 		/// </summary>
-		const string WEBASSEMBLY_STATE_MARKER_PREFIX = "Blazor-WebAssembly-Component-State:";
+		const string WEBASSEMBLY_STATE_MARKER_PREFIX = MARKER_PREFIX_COMMON_PART + "-WebAssembly-Component-State:";
 
 		/// <summary>
 		/// Blazor web initializer marker prefix
 		/// </summary>
-		const string WEB_INITIALIZER_MARKER_PREFIX = "Blazor-Web-Initializers:";
+		const string WEB_INITIALIZER_MARKER_PREFIX = MARKER_PREFIX_COMMON_PART + "-Web-Initializers:";
 
 		/// <summary>
-		/// List of Blazor marker prefixes
+		/// Blazor streaming boundary marker prefix common part
 		/// </summary>
-		private static readonly string[] _markerPrefixes = new string[]
+		const string STREAMING_BOUNDARY_MARKER_PREFIX_COMMON_PART = "bl:";
+
+		/// <summary>
+		/// Blazor start streaming boundary marker prefix
+		/// </summary>
+		const string START_STREAMING_BOUNDARY_MARKER_PREFIX = STREAMING_BOUNDARY_MARKER_PREFIX_COMMON_PART;
+
+		/// <summary>
+		/// Blazor end streaming boundary marker prefix
+		/// </summary>
+		const string END_STREAMING_BOUNDARY_MARKER_PREFIX = "/" + STREAMING_BOUNDARY_MARKER_PREFIX_COMMON_PART;
+
+		/// <summary>
+		/// List of Blazor ordinary marker prefixes
+		/// </summary>
+		private static readonly string[] _ordinaryMarkerPrefixes = new string[]
 		{
 			COMPONENT_MARKER_PREFIX,
 			SERVER_STATE_MARKER_PREFIX,
@@ -58,6 +73,13 @@ internal static class BlazorHelpers
 		private static readonly Regex _base64EncodedDataRegex = new Regex(@"[a-zA-Z0-9+/=]+$",
 			TargetFrameworkShortcuts.PerformanceRegexOptions);
 
+		/// <summary>
+		/// Regular expression for working with the Globally Unique Identifier (GUID)
+		/// </summary>
+		private static readonly Regex _guidRegex = new Regex(
+			@"^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$",
+			TargetFrameworkShortcuts.PerformanceRegexOptions);
+
 
 		/// <summary>
 		/// Checks whether the comment is the Blazor marker
@@ -66,6 +88,21 @@ internal static class BlazorHelpers
 		/// <returns>Result of check (<c>true</c> - is marker;
 		/// <c>false</c> - is not marker)</returns>
 		public static bool IsMarker(string commentText)
+		{
+			return IsOrdinaryMarker(commentText)
+				|| IsStartStreamingBoundaryMarker(commentText)
+				|| IsEndStreamingBoundaryMarker(commentText)
+				|| IsStreamingFramingMarker(commentText)
+				;
+		}
+
+		/// <summary>
+		/// Checks whether the comment is the Blazor ordinary marker
+		/// </summary>
+		/// <param name="commentText">Comment text</param>
+		/// <returns>Result of check (<c>true</c> - is ordinary marker;
+		/// <c>false</c> - is not ordinary marker)</returns>
+		private static bool IsOrdinaryMarker(string commentText)
 		{
 			int commentTextLength = commentText.Length;
 			if (commentTextLength == 0)
@@ -89,7 +126,7 @@ public static bool IsMarker(string commentText)
 				return false;
 			}
 
-			foreach (string prefix in _markerPrefixes)
+			foreach (string prefix in _ordinaryMarkerPrefixes)
 			{
 				if (commentText.CustomStartsWith(prefix, firstNonWhitespaceCharPosition, StringComparison.Ordinal))
 				{
@@ -119,5 +156,42 @@ public static bool IsMarker(string commentText)
 
 			return false;
 		}
+
+		/// <summary>
+		/// Checks whether the comment is the Blazor start streaming boundary marker
+		/// </summary>
+		/// <param name="commentText">Comment text</param>
+		/// <returns>Result of check (<c>true</c> - is start streaming boundary marker;
+		/// <c>false</c> - is not start streaming boundary marker)</returns>
+		private static bool IsStartStreamingBoundaryMarker(string commentText)
+		{
+			return commentText.StartsWith(START_STREAMING_BOUNDARY_MARKER_PREFIX, StringComparison.Ordinal)
+				&& commentText.Length > START_STREAMING_BOUNDARY_MARKER_PREFIX.Length
+				;
+		}
+
+		/// <summary>
+		/// Checks whether the comment is the Blazor end streaming boundary marker
+		/// </summary>
+		/// <param name="commentText">Comment text</param>
+		/// <returns>Result of check (<c>true</c> - is end streaming boundary marker;
+		/// <c>false</c> - is not end streaming boundary marker)</returns>
+		private static bool IsEndStreamingBoundaryMarker(string commentText)
+		{
+			return commentText.StartsWith(END_STREAMING_BOUNDARY_MARKER_PREFIX, StringComparison.Ordinal)
+				&& commentText.Length > END_STREAMING_BOUNDARY_MARKER_PREFIX.Length
+				;
+		}
+
+		/// <summary>
+		/// Checks whether the comment is the Blazor streaming framing marker
+		/// </summary>
+		/// <param name="commentText">Comment text</param>
+		/// <returns>Result of check (<c>true</c> - is streaming framing marker;
+		/// <c>false</c> - is not streaming framing marker)</returns>
+		private static bool IsStreamingFramingMarker(string commentText)
+		{
+			return _guidRegex.IsMatch(commentText);
+		}
 	}
 }

src/WebMarkupMin.Core/Helpers/KnockoutHelpers.cs

@@ -17,9 +17,9 @@ internal static class KnockoutHelpers
 		const string KO_CONTAINERLESS_COMMENT_PREFIX = "ko";
 
 		/// <summary>
-		/// Regular expression for working with the Knockout begin containerless comment
+		/// Regular expression for working with the Knockout start containerless comment
 		/// </summary>
-		private static readonly Regex _koBeginContainerlessCommentRegex =
+		private static readonly Regex _koStartContainerlessCommentRegex =
 			new Regex(@"^\s*" + KO_CONTAINERLESS_COMMENT_PREFIX + @"(?:\s+(?<expression>[\s\S]+))?\s*$",
 				TargetFrameworkShortcuts.PerformanceRegexOptions);
 
@@ -32,30 +32,30 @@ internal static class KnockoutHelpers
 
 
 		/// <summary>
-		/// Checks whether the comment is the Knockout begin containerless comment
+		/// Checks whether the comment is the Knockout start containerless comment
 		/// </summary>
 		/// <param name="commentText">Comment text</param>
-		/// <returns>Result of check (<c>true</c> - is begin containerless comment;
-		/// <c>false</c> - is not begin containerless comment)</returns>
-		public static bool IsBeginContainerlessComment(string commentText)
+		/// <returns>Result of check (<c>true</c> - is start containerless comment;
+		/// <c>false</c> - is not start containerless comment)</returns>
+		public static bool IsStartContainerlessComment(string commentText)
 		{
 			if (commentText.IndexOf(KO_CONTAINERLESS_COMMENT_PREFIX, StringComparison.Ordinal) == -1)
 			{
 				return false;
 			}
 
-			return _koBeginContainerlessCommentRegex.IsMatch(commentText);
+			return _koStartContainerlessCommentRegex.IsMatch(commentText);
 		}
 
 		/// <summary>
-		/// Parses a Knockout begin containerless comment
+		/// Parses a Knockout start containerless comment
 		/// </summary>
 		/// <param name="commentText">Comment text</param>
 		/// <param name="expressionHandler">Binding expression handler</param>
-		public static void ParseBeginContainerlessComment(string commentText,
+		public static void ParseStartContainerlessComment(string commentText,
 			ExpressionDelegate expressionHandler)
 		{
-			Match match = _koBeginContainerlessCommentRegex.Match(commentText);
+			Match match = _koStartContainerlessCommentRegex.Match(commentText);
 			if (match.Success)
 			{
 				var innerContext = new InnerMarkupParsingContext(commentText);

src/WebMarkupMin.Core/Helpers/ReactHelpers.cs

@@ -16,9 +16,9 @@ internal static class ReactHelpers
 		const string REACT_DOM_COMPONENT_PREFIX = "react-";
 
 		/// <summary>
-		/// Regular expression for working with the React begin DOM component comment
+		/// Regular expression for working with the React start DOM component comment
 		/// </summary>
-		private static readonly Regex _reactBeginDomComponentCommentRegex = new Regex(
+		private static readonly Regex _reactStartDomComponentCommentRegex = new Regex(
 			@"^ " + REACT_DOM_COMPONENT_PREFIX + @"[a-z]+\: \d+ $",
 			TargetFrameworkShortcuts.PerformanceRegexOptions);
 
@@ -31,14 +31,14 @@ internal static class ReactHelpers
 
 
 		/// <summary>
-		/// Checks whether the comment is the React begin DOM component comment
+		/// Checks whether the comment is the React start DOM component comment
 		/// </summary>
 		/// <param name="commentText">Comment text</param>
-		/// <returns>Result of check (<c>true</c> - is begin DOM component comment;
-		/// <c>false</c> - is not begin DOM component comment)</returns>
-		public static bool IsBeginDomComponentComment(string commentText)
+		/// <returns>Result of check (<c>true</c> - is start DOM component comment;
+		/// <c>false</c> - is not start DOM component comment)</returns>
+		private static bool IsStartDomComponentComment(string commentText)
 		{
-			return _reactBeginDomComponentCommentRegex.IsMatch(commentText);
+			return _reactStartDomComponentCommentRegex.IsMatch(commentText);
 		}
 
 		/// <summary>
@@ -47,7 +47,7 @@ public static bool IsBeginDomComponentComment(string commentText)
 		/// <param name="commentText">Comment text</param>
 		/// <returns>Result of check (<c>true</c> - is end DOM component comment;
 		/// <c>false</c> - is not end DOM component comment)</returns>
-		public static bool IsEndDomComponentComment(string commentText)
+		private static bool IsEndDomComponentComment(string commentText)
 		{
 			return _reactEndDomComponentCommentRegex.IsMatch(commentText);
 		}
@@ -65,7 +65,7 @@ public static bool IsDomComponentComment(string commentText)
 				return false;
 			}
 
-			return IsBeginDomComponentComment(commentText)
+			return IsStartDomComponentComment(commentText)
 				|| IsEndDomComponentComment(commentText)
 				;
 		}

src/WebMarkupMin.Core/WebMarkupMin.Core.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Product>Web Markup Minifier: Core</Product>
-    <VersionPrefix>2.16.1</VersionPrefix>
+    <VersionPrefix>2.16.2</VersionPrefix>
     <TargetFrameworks>net40-client;net45;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
     <OutputType>Library</OutputType>
@@ -26,7 +26,7 @@ Minification of markup produces by removing extra whitespaces, comments and redu
 
 Also supports minification of views of popular JavaScript template engines: KnockoutJS, Kendo UI MVVM and AngularJS 1.X.</Description>
     <PackageTags>$(PackageCommonTags);XML;Performance;Optimization;Compression</PackageTags>
-    <PackageReleaseNotes>New Blazor markers (`&lt;!--Blazor-Server-Component-State:…--&gt;`, `&lt;!--Blazor-WebAssembly-Component-State:…--&gt;` and `&lt;!--Blazor-Web-Initializers:…--&gt;`) are no longer removed.</PackageReleaseNotes>
+    <PackageReleaseNotes>Blazor streaming markers (`&lt;!--bl:…--&gt;`, `&lt;!--/bl:…--&gt;` and `&lt;!--bab39c12-73f9-4e04-b6b9-76cb2b324662--&gt;`) are no longer removed.</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>

src/WebMarkupMin.Core/readme.txt

@@ -46,9 +46,8 @@
    =============
    RELEASE NOTES
    =============
-   New Blazor markers (`<!--Blazor-Server-Component-State:…-->`,
-   `<!--Blazor-WebAssembly-Component-State:…-->` and
-   `<!--Blazor-Web-Initializers:…-->`) are no longer removed.
+   Blazor streaming markers (`<!--bl:…-->`, `<!--/bl:…-->` and
+   `<!--bab39c12-73f9-4e04-b6b9-76cb2b324662-->`) are no longer removed.
 
    =============
    DOCUMENTATION

test/WebMarkupMin.Tests/Html/Blazor/Minification/ProcessingMarkersTests.cs

@@ -154,6 +154,93 @@ public void ProcessingWebInitializerMarkers()
 			Assert.Equal(input, output);
 		}
 
+		[Fact]
+		public void ProcessingStreamingBoundaryMarkers()
+		{
+			// Arrange
+			const string input = "<main b-j65y7q72mt>\r\n" +
+				"	<article class=\"content px-4\" b-j65y7q72mt>" +
+				"<!--bl:13--><!--bl:17--><!--bl:18--><!--/bl:18--><!--/bl:17-->\r\n\r\n" +
+				"		<h1>Weather</h1>\r\n\r\n" +
+				"		<p>This component demonstrates showing data.</p>\r\n" +
+				"		<p><em>Loading...</em></p><!--/bl:13-->\r\n" +
+				"	</article>\r\n" +
+				"</main>"
+				;
+
+			// Act
+			string output = _removingHtmlCommentsMinifier.Minify(input).MinifiedContent;
+
+			// Assert
+			Assert.Equal(input, output);
+		}
+
+		[Fact]
+		public void ProcessingStreamingFramingMarkers()
+		{
+			// Arrange
+			const string input = "<!--bab39c12-73f9-4e04-b6b9-76cb2b324662--><blazor-ssr>\n" +
+				"	<template blazor-component-id=\"19\" enhanced-nav=\"true\">\n" +
+				"		<title>Weather</title>\n" +
+				"	</template>\n" +
+				"	<template blazor-component-id=\"13\" enhanced-nav=\"true\">" +
+				"<!--bl:17--><!--bl:18--><!--/bl:18--><!--/bl:17-->\n\n" +
+				"		<h1>Weather</h1>\n\n" +
+				"		<p>This component demonstrates showing data.</p>\n" +
+				"		<table class=\"table\">\n" +
+				"			<thead>\n" +
+				"				<tr>\n" +
+				"					<th>Date</th>\n" +
+				"					<th>Temp. (C)</th>\n" +
+				"					<th>Temp. (F)</th>\n" +
+				"					<th>Summary</th>\n" +
+				"				</tr>\n" +
+				"			</thead>\n" +
+				"			<tbody>\n" +
+				"				<tr>\n" +
+				"					<td>25.06.2024</td>\n" +
+				"					<td>2</td>\n" +
+				"					<td>35</td>\n" +
+				"					<td>Warm</td>\n" +
+				"				</tr>\n" +
+				"				<tr>\n" +
+				"					<td>26.06.2024</td>\n" +
+				"					<td>26</td>\n" +
+				"					<td>78</td>\n" +
+				"					<td>Cool</td>\n" +
+				"				</tr>\n" +
+				"				<tr>\n" +
+				"					<td>27.06.2024</td>\n" +
+				"					<td>8</td>\n" +
+				"					<td>46</td>\n" +
+				"					<td>Hot</td>\n" +
+				"				</tr>\n" +
+				"				<tr>\n" +
+				"					<td>28.06.2024</td>\n" +
+				"					<td>39</td>\n" +
+				"					<td>102</td>\n" +
+				"					<td>Scorching</td>\n" +
+				"				</tr>\n" +
+				"				<tr>\n" +
+				"					<td>29.06.2024</td>\n" +
+				"					<td>46</td>\n" +
+				"					<td>114</td>\n" +
+				"					<td>Bracing</td>\n" +
+				"				</tr>\n" +
+				"			</tbody>\n" +
+				"		</table>\n" +
+				"	</template>\n" +
+				"	<blazor-ssr-end></blazor-ssr-end>\n" +
+				"</blazor-ssr><!--bab39c12-73f9-4e04-b6b9-76cb2b324662-->"
+				;
+
+			// Act
+			string output = _removingHtmlCommentsMinifier.Minify(input).MinifiedContent;
+
+			// Assert
+			Assert.Equal(input, output);
+		}
+
 		#region IDisposable implementation
 
 		public void Dispose()