- Use Singlton lifetime for all registered optimizer services.

- Add IServiceCollection extendion methods: AddDefaultOptimizerSelector, and AddDefaultMinifiers.

- Refactor code that creates DefaultOptimizerSelector into a factory class.

Author: ZarehD

src/AspNetStatic/AspNetStatic.csproj

@@ -28,7 +28,7 @@
 		<Product>AspNetStatic</Product>
 		<Copyright>Copyright 2023-2025 Zareh DerGevorkian. All rights reserved</Copyright>
 		<Description>Transforms ASP.NET Core into a static site generator.</Description>
-		<Version>0.26.1</Version>
+		<Version>0.26.2</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

src/AspNetStatic/Optimizer/DefaultOptimizerSelectorFactory.cs

@@ -0,0 +1,53 @@
+/*--------------------------------------------------------------------------------------------------------------------------------
+Copyright 2023-2025 Zareh DerGevorkian
+
+Licensed under the Apache License, Version 2.0 (the "License"); 
+you may not use this file except in compliance with the License. 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed 
+on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
+the specific language governing permissions and limitations under the License.
+--------------------------------------------------------------------------------------------------------------------------------*/
+
+using Microsoft.Extensions.DependencyInjection;
+using WebMarkupMin.Core;
+
+namespace AspNetStatic.Optimizer;
+
+public static class DefaultOptimizerSelectorFactory
+{
+	public static IOptimizerSelector Create(IServiceProvider services)
+	{
+		var markupOptimizer = services.GetService<IMarkupOptimizer>();
+		var cssOptimizer = services.GetService<ICssOptimizer>();
+		var jsOptimizer = services.GetService<IJsOptimizer>();
+		var binOptimizer = services.GetService<IBinOptimizer>() ?? new NullBinOptimizer();
+
+		var cssMinifier = services.GetService<ICssMinifier>();
+		var jsMinifier = services.GetService<IJsMinifier>();
+
+		if ((markupOptimizer is null) || (cssOptimizer is null) || (jsOptimizer is null))
+		{
+			cssMinifier ??= new KristensenCssMinifier();
+			jsMinifier ??= new CrockfordJsMinifier();
+		}
+
+		markupOptimizer ??= new DefaultMarkupOptimizer(
+			services.GetService<HtmlMinificationSettings>(),
+			services.GetService<XhtmlMinificationSettings>(),
+			services.GetService<XmlMinificationSettings>(),
+			cssMinifier, jsMinifier);
+
+		cssOptimizer ??= new DefaultCssOptimizer(cssMinifier!);
+
+		jsOptimizer ??= new DefaultJsOptimizer(jsMinifier!);
+
+		return
+			new DefaultOptimizerSelector(
+				markupOptimizer,
+				cssOptimizer,
+				jsOptimizer,
+				binOptimizer);
+	}
+}

src/AspNetStatic/Optimizer/RegisterDefaultOptimizers.cs

@@ -11,21 +11,50 @@ the specific language governing permissions and limitations under the License.
 --------------------------------------------------------------------------------------------------------------------------------*/
 
 using Microsoft.Extensions.DependencyInjection;
+using WebMarkupMin.Core;
 
 namespace AspNetStatic.Optimizer;
 
 public static class RegisterDefaultOptimizers
 {
+	public static IServiceCollection AddDefaultOptimizerSelector(
+		this IServiceCollection services)
+	{
+		Throw.IfNull(services);
+
+		services
+			.AddSingleton<IOptimizerSelector, DefaultOptimizerSelector>()
+			.AddDefaultOptimizers()
+			;
+
+		return services;
+	}
+
 	public static IServiceCollection AddDefaultOptimizers(
 		this IServiceCollection services)
 	{
 		Throw.IfNull(services);
 
 		services
-			.AddTransient<IMarkupOptimizer, DefaultMarkupOptimizer>()
-			.AddTransient<ICssOptimizer, DefaultCssOptimizer>()
-			.AddTransient<IJsOptimizer, DefaultJsOptimizer>()
-			.AddTransient<IBinOptimizer, NullBinOptimizer>()
+			.AddSingleton<IMarkupOptimizer, DefaultMarkupOptimizer>()
+			.AddSingleton<ICssOptimizer, DefaultCssOptimizer>()
+			.AddSingleton<IJsOptimizer, DefaultJsOptimizer>()
+			.AddSingleton<IBinOptimizer, NullBinOptimizer>()
+			;
+
+		services.AddDefaultMinifiers();
+
+		return services;
+	}
+
+	public static IServiceCollection AddDefaultMinifiers(
+		this IServiceCollection services)
+	{
+		Throw.IfNull(services);
+
+		services
+			.AddSingleton<ICssMinifier, KristensenCssMinifier>()
+			.AddSingleton<IJsMinifier, CrockfordJsMinifier>()
 			;
 
 		return services;

src/AspNetStatic/StaticGeneratorHostExtension.cs

@@ -658,41 +658,10 @@ private static HttpClient GetHttpClient(IHost host, string? httpClientName, ulon
 		{
 			if (dontOptimizeContent) return null;
 
-			var result = services.GetService<IOptimizerSelector>();
-
-			if (result is null)
-			{
-				var markupOptimizer = services.GetService<IMarkupOptimizer>();
-				var cssOptimizer = services.GetService<ICssOptimizer>();
-				var jsOptimizer = services.GetService<IJsOptimizer>();
-				var binOptimizer = services.GetService<IBinOptimizer>() ?? new NullBinOptimizer();
-
-				var cssMinifier = services.GetService<ICssMinifier>();
-				var jsMinifier = services.GetService<IJsMinifier>();
-
-				if ((markupOptimizer is null) ||
-					(cssOptimizer is null) ||
-					(jsOptimizer is null))
-				{
-					cssMinifier ??= new KristensenCssMinifier();
-					jsMinifier ??= new CrockfordJsMinifier();
-				}
-
-				markupOptimizer ??= new DefaultMarkupOptimizer(
-						services.GetService<HtmlMinificationSettings>(),
-						services.GetService<XhtmlMinificationSettings>(),
-						services.GetService<XmlMinificationSettings>(),
-						cssMinifier, jsMinifier);
-				cssOptimizer ??= new DefaultCssOptimizer(cssMinifier!);
-				jsOptimizer ??= new DefaultJsOptimizer(jsMinifier!);
-
-				result =
-					new DefaultOptimizerSelector(
-						markupOptimizer,
-						cssOptimizer,
-						jsOptimizer,
-						binOptimizer);
-			}
+			var result = 
+				services.GetService<IOptimizerSelector>() ??
+				DefaultOptimizerSelectorFactory.Create(services)
+				;
 
 			return result;
 		}