chore: remove unused code, clean up, reorder files

Author: egil

samples/BlazingPizza/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs

@@ -1,14 +1,14 @@
 using System.Security.Claims;
 using System.Text.Json;
+using BlazingPizza.Components.Account.Pages;
+using BlazingPizza.Components.Account.Pages.Manage;
+using BlazingPizza.Data;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
-using BlazingPizza.Components.Account.Pages;
-using BlazingPizza.Components.Account.Pages.Manage;
-using BlazingPizza.Data;
 
 namespace Microsoft.AspNetCore.Routing;
 

samples/BlazingPizza/Components/Account/IdentityNoOpEmailSender.cs

@@ -1,6 +1,6 @@
+using BlazingPizza.Data;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
-using BlazingPizza.Data;
 
 namespace BlazingPizza.Components.Account;
 
@@ -11,10 +11,10 @@ internal sealed class IdentityNoOpEmailSender : IEmailSender<PizzaStoreUser>
 
     public Task SendConfirmationLinkAsync(PizzaStoreUser user, string email, string confirmationLink) =>
         emailSender.SendEmailAsync(email, "Confirm your email", $"Please confirm your account by <a href='{confirmationLink}'>clicking here</a>.");
- 
+
     public Task SendPasswordResetLinkAsync(PizzaStoreUser user, string email, string resetLink) =>
         emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password by <a href='{resetLink}'>clicking here</a>.");
- 
+
     public Task SendPasswordResetCodeAsync(PizzaStoreUser user, string email, string resetCode) =>
         emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password using the following code: {resetCode}");
 }

samples/BlazingPizza/Components/Account/IdentityUserAccessor.cs

@@ -1,5 +1,5 @@
-using Microsoft.AspNetCore.Identity;
 using BlazingPizza.Data;
+using Microsoft.AspNetCore.Identity;
 
 namespace BlazingPizza.Components.Account;
 

samples/BlazingPizza/Components/Shared/ConfigurePizzaFormData.cs

@@ -9,10 +9,10 @@ public record class ConfigurePizzaFormData
 
     [Required, Range(Pizza.MinimumSize, Pizza.MaximumSize)]
     public int Size { get; set; }
-    
+
     public List<int>? Toppings { get; set; }
-    
+
     public int SelectTopping { get; set; }
-    
+
     public int RemoveTopping { get; set; }
 }

samples/BlazingPizza/Data/OrderWithStatus.cs

@@ -4,8 +4,8 @@ namespace BlazingPizza.Data;
 
 public class OrderWithStatus
 {
-    public readonly static TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
-    public readonly static TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
+    public static readonly TimeSpan PreparationDuration = TimeSpan.FromSeconds(10);
+    public static readonly TimeSpan DeliveryDuration = TimeSpan.FromMinutes(1); // Unrealistic, but more interesting to watch
 
     // Set from DB
     public Order Order { get; set; } = null!;

samples/BlazorSSR/Components/FlashMessages/FlashMessageQueue.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Components;
+using System.Collections;
+using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Caching.Memory;
-using System.Collections;
 
 namespace BlazorSSR.Components.FlashMessages;
 

samples/BlazorSSR/DiskStorage.cs

@@ -17,9 +17,9 @@ public async Task Save(IReadOnlyList<Contact> contacts, CancellationToken cancel
     {
         using var stream = File.Open(ContactsFileName, FileMode.Create);
         await JsonSerializer.SerializeAsync(
-            stream, 
-            contacts.OrderBy(x => x.Id), 
-            contactsFileJsonOptions, 
+            stream,
+            contacts.OrderBy(x => x.Id),
+            contactsFileJsonOptions,
             cancellationToken);
         loadedContacts = null;
     }

samples/HtmxBlazorSSR/Components/FlashMessages/FlashMessageQueue.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Components;
+using System.Collections;
+using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Caching.Memory;
-using System.Collections;
 
 namespace HtmxBlazorSSR.Components.FlashMessages;
 

samples/HtmxBlazorSSR/Program.cs

@@ -1,8 +1,6 @@
 using HtmxBlazorSSR;
 using HtmxBlazorSSR.Components;
 using HtmxBlazorSSR.Components.FlashMessages;
-using Htmxor;
-using Htmxor.Antiforgery;
 
 var builder = WebApplication.CreateBuilder(args);
 

src/Htmxor/Builder/HtmxorComponentEndpointDataSource.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using Htmxor.Rendering;
 using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Components.Endpoints;
 using Microsoft.AspNetCore.Http;

src/Htmxor/Builder/HtmxorComponentEndpointMatcherPolicy.cs

@@ -1,9 +1,6 @@
-using Htmxor.Http;
-using Microsoft.AspNetCore.Components.Endpoints;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Matching;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Htmxor.Builder;
 

src/Htmxor/Builder/HtmxorComponentEndpointRouteBuilderExtensions.cs

@@ -3,7 +3,9 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Routing;
 
+#pragma warning disable IDE0130 
 namespace Microsoft.AspNetCore.Builder;
+#pragma warning restore IDE0130 
 
 public static class HtmxorComponentEndpointRouteBuilderExtensions
 {

src/Htmxor/Builder/HtmxorEndpointMetadata.cs

@@ -1,5 +1,4 @@
 using Htmxor.Http;
-using Microsoft.AspNetCore.Components;
 
 namespace Htmxor.Builder;
 

src/Htmxor/Builder/HtmxorLayoutComponentMetadata.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Htmxor.Builder;
 

src/Htmxor/Components/HtmxPartial.cs

@@ -1,5 +1,4 @@
-using Htmxor.Http;
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
 
 namespace Htmxor.Components;
 

src/Htmxor/Rendering/DefaultAntiforgeryStateProvider.cs src/Htmxor/DependencyInjection/DefaultAntiforgeryStateProvider.cs

@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Web;
 
-namespace Htmxor.Rendering;
+namespace Htmxor.DependencyInjection;
 
 internal class DefaultAntiforgeryStateProvider : AntiforgeryStateProvider, IDisposable
 {

src/Htmxor/Rendering/EndpointAntiforgeryStateProvider.cs src/Htmxor/DependencyInjection/EndpointAntiforgeryStateProvider.cs

@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Http;
 
-namespace Htmxor.Rendering;
+namespace Htmxor.DependencyInjection;
 
 internal class EndpointAntiforgeryStateProvider(IAntiforgery antiforgery, PersistentComponentState state) : DefaultAntiforgeryStateProvider(state)
 {

src/Htmxor/DependencyInjection/HtmxorApplicationBuilderExtensions.cs

@@ -8,16 +8,16 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Endpoints;
-using Microsoft.AspNetCore.Components.Forms.Mapping;
 using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
+#pragma warning disable IDE0130 
 namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 
 
 /// <summary>
 /// This class has extension methods for <see cref="IHostApplicationBuilder"/> and <see cref="IApplicationBuilder"/> 
@@ -48,7 +48,7 @@ public static IRazorComponentsBuilder AddHtmx(this IRazorComponentsBuilder razor
         services.AddScoped<IRazorComponentEndpointInvoker>(x => x.GetRequiredService<IHtmxorComponentEndpointInvoker>());
 
         services.Remove(services.Single(x => x.Lifetime is ServiceLifetime.Scoped && x.ServiceType.FullName?.Equals("Microsoft.AspNetCore.Components.Endpoints.EndpointHtmlRenderer") == true));
-        services.AddScoped<EndpointHtmxorRenderer>();
+        services.AddScoped<HtmxorRenderer>();
 
         // Adding the same cascading value does not seem to override existing values added previously.
         // Instead, the previous value is still used. Is this expected behavior or a bug?
@@ -59,8 +59,8 @@ public static IRazorComponentsBuilder AddHtmx(this IRazorComponentsBuilder razor
             .Single(x => x.ImplementationFactory?.Target?.ToString()?.Contains(typeof(HttpContext).FullName!) == true);
         services.Remove(existingCascadingHttpContextProvider);
 
-        services.AddCascadingValue(sp => sp.GetRequiredService<EndpointHtmxorRenderer>().HttpContext);
-        services.AddScoped(sp => sp.GetRequiredService<EndpointHtmxorRenderer>().HttpContext!);
+        services.AddCascadingValue(sp => sp.GetRequiredService<HtmxorRenderer>().HttpContext);
+        services.AddScoped(sp => sp.GetRequiredService<HtmxorRenderer>().HttpContext!);
 
         services.Remove(services.Single(x => x.ServiceType == typeof(NavigationManager)));
         services.AddScoped<NavigationManager, HtmxorNavigationManager>();
@@ -75,7 +75,7 @@ public static IRazorComponentsBuilder AddHtmx(this IRazorComponentsBuilder razor
             configurHtmx?.Invoke(config);
             return config;
         });
-        services.AddScoped(srv => srv.GetRequiredService<EndpointHtmxorRenderer>().HttpContext!.GetHtmxContext());
+        services.AddScoped(srv => srv.GetRequiredService<HtmxorRenderer>().HttpContext!.GetHtmxContext());
         services.AddCascadingValue(sp => sp.GetRequiredService<HtmxContext>());
 
         return razorComponentsBuilder;

src/Htmxor/EventHandlers.cs

@@ -5,11 +5,11 @@ namespace Htmxor;
 /// <summary>
 /// Custom Htmxor Blazor event handlers.
 /// </summary>
-[EventHandler("onget", typeof(HtmxContextEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
-[EventHandler("onpost", typeof(HtmxContextEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
-[EventHandler("onput", typeof(HtmxContextEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
-[EventHandler("onpatch", typeof(HtmxContextEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
-[EventHandler("ondelete", typeof(HtmxContextEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
+[EventHandler("onget", typeof(HtmxEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
+[EventHandler("onpost", typeof(HtmxEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
+[EventHandler("onput", typeof(HtmxEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
+[EventHandler("onpatch", typeof(HtmxEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
+[EventHandler("ondelete", typeof(HtmxEventArgs), enableStopPropagation: false, enablePreventDefault: false)]
 public static class EventHandlers
 {
 }

src/Htmxor/HtmxConfig.cs

@@ -1,14 +1,12 @@
-using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
 using Htmxor.Antiforgery;
 
 namespace Htmxor;
 
 /// <summary>
 /// Htmx configuration options.
 /// </summary>
-public record class HtmxConfig
+public partial record class HtmxConfig
 {
     /// <summary>
     /// Defaults to <see langword="true" /> if this property is null. really only useful for testing
@@ -211,27 +209,6 @@ public record class HtmxConfig
     [JsonPropertyName("scrollIntoViewOnBoost")]
     public bool? ScrollIntoViewOnBoost { get; set; }
 
-    //// V2 feature
-    //[JsonPropertyName("responseHandling")]
-    //public IList<ResponseHandlingRule>? ResponseHandling { get; set; }
-
     [JsonInclude, JsonPropertyName("antiforgery")]
     internal HtmxAntiforgeryOptions? Antiforgery { get; init; }
-}
-
-//public record class ResponseHandlingRule
-//{
-//    public required string Code { get; set; }
-//
-//    public bool Swap { get; set; }
-//
-//    public bool? Error { get; set; }
-//
-//    public bool? IgnoreTitle { get; set; }
-//
-//    public string? Select { get; set; }
-//
-//    public string? Target { get; set; }
-//
-//    public string? SwapOverride { get; set; }
-//}
+}

src/Htmxor/HtmxContextEventArgs.cs src/Htmxor/HtmxEventArgs.cs

@@ -2,18 +2,18 @@
 
 namespace Htmxor;
 
-public class HtmxContextEventArgs : EventArgs
+public class HtmxEventArgs : EventArgs
 {
     private readonly HtmxContext context;
 
     public HtmxRequest Request { get; }
 
     public HtmxResponse Response { get; }
 
-    public HtmxContextEventArgs(HtmxContext context)
+    public HtmxEventArgs(HtmxContext context)
     {
         Request = context.Request;
         Response = context.Response;
         this.context = context;
     }
-}
+}