Fixed more edge cases

Toolkit.Foundation/ComponentBuilder.cs

@@ -32,9 +32,8 @@ public class ComponentBuilder :
                 services.AddScoped<SubscriptionCollection>();
 
                 services.AddTransient<IHandlerProvider, HandlerProvider>();
-                services.AddTransient<ISubscription, Subscription>();
+                services.AddScoped<ISubscription, Subscription>();
 
-                services.AddTransient<ISubscription, Subscription>();
                 services.AddTransient<IPublisher, Publisher>();
 
                 services.AddTransient<IMediator, Mediator>();

Toolkit.Foundation/HandlerProvider.cs

@@ -7,6 +7,7 @@ public class HandlerProvider(SubscriptionCollection subscriptions) :
         object? key = null)
     {
         string subscriptionKey = $"{(key is not null ? $"{key}:" : "")}{type}";
+        var d = subscriptions;
         if (subscriptions.TryGetValue(subscriptionKey, out List<WeakReference>? subscribers))
         {
             foreach (WeakReference weakRef in subscribers.ToArray())

Toolkit.Foundation/IDisposerRequired.cs

@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface IDisposerRequired
+{
+    IDisposer Disposer { get; }
+}

Toolkit.Foundation/IHandlerProvider.cs

@@ -1,9 +1,8 @@
 
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation;
+
+public interface IHandlerProvider
 {
-    public interface IHandlerProvider
+    IEnumerable<object?> Get(Type type, 
-    {
+        object? key = null);
-        IEnumerable<object?> Get(Type type, 
-            object? key = null);
-    }
 }

Toolkit.Foundation/IMediatorRequired.cs

@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface IMediatorRequired
+{
+    IMediator Mediator { get; }
+}

Toolkit.Foundation/IPublisherRequired.cs

@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface IPublisherRequired
+{
+    IPublisher Publisher { get; }
+}

Toolkit.Foundation/IServiceFactoryRequired.cs

@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface IServiceFactoryRequired
+{
+    IServiceFactory Factory { get; }
+}

Toolkit.Foundation/IServiceProviderRequired.cs

@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface IServiceProviderRequired
+{
+    IServiceProvider Provider { get; }
+}

Toolkit.Foundation/ISubscriptionRequired.cs

@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface ISubscriptionRequired
+{
+    ISubscription Subscription { get; }
+}

Toolkit.Foundation/Mediator.cs

@@ -40,6 +40,7 @@ public class Mediator(IHandlerProvider handlerProvider,
                     handlerList = [];
                     handlers.Add(handlerType, handlerList);
                 }
+
                 handlerList.Add(handler);
             }
         }
@@ -48,7 +49,7 @@ public class Mediator(IHandlerProvider handlerProvider,
         {
             foreach (object? handler in handlerEntry.Value)
             {
-                if (handler?.GetType().GetMethod("Handle") is MethodInfo handleMethod)
+                if (handler?.GetType().GetMethod("Handle", [messageType, typeof(CancellationToken)]) is MethodInfo handleMethod)
                 {
                     return await (Task<TResponse?>)handleMethod.Invoke(handler, 
                         new object[] { message, cancellationToken })!;

Toolkit.Foundation/NavigateHandler.cs

@@ -3,16 +3,15 @@
 namespace Toolkit.Foundation;
 
 public class NavigateHandler(NamedComponent scope,
-    IComponentScopeProvider componentScopeProvider,
+    IComponentScopeProvider componentScopeProvider) :
-    IServiceProvider provider) :
     INotificationHandler<NavigateEventArgs>
 {
     public Task Handle(NavigateEventArgs args)
     {
         INavigationScope? navigationScope;
-        if (args.Scope == "self")
+        if (args.Scope == "self" && args.Sender is IServiceProviderRequired requireServiceProvider)
         {
-            navigationScope = provider.GetRequiredService<INavigationScope>();
+             navigationScope = requireServiceProvider.Provider.GetRequiredService<INavigationScope>();
         }
         else
         {

Toolkit.Foundation/NavigationScope.cs

@@ -10,8 +10,11 @@ public class NavigationScope(IPublisher publisher,
     IContentTemplateDescriptorProvider contentTemplateDescriptorProvider) :
     INavigationScope
 {
-    public void Navigate(string route, object? sender = null, object? context = null,
+    public void Navigate(string route, 
-        EventHandler? navigated = null, object[]? parameters = null)
+        object? sender = null, 
+        object? context = null,
+        EventHandler? navigated = null,
+        object[]? parameters = null)
     {
         string[] segments = route.Split('/');
         int segmentCount = segments.Length;
@@ -41,26 +44,25 @@ public class NavigationScope(IPublisher publisher,
 
                 if (provider.GetRequiredKeyedService(descriptor.TemplateType, segment) is object view)
                 {
-                    if ((parameters is { Length: > 0 }
+                    if (context is not null)
+                    {
+                        if (navigationContextProvider.TryGet(context, out object? scopedContext))
+                        {
+                            context = scopedContext;
+                        }
+                    }
+                    else
+                    {
+                        context = view;
+                    }
+
+                    if (context is not null)
+                    {
+                        if ((parameters is { Length: > 0 }
                         ? factory.Create(descriptor.ContentType, parameters)
                         : provider.GetRequiredKeyedService(descriptor.ContentType, segment)) is object viewModel)
-                    {
-                        if (context is not null)
                         {
-                            if (navigationContextProvider.TryGet(context, out object? scopedContext))
+                            if (navigationProvider.Get(context is Type type ? type : context.GetType()) is INavigation navigation)
-                            {
-                                context = scopedContext;
-                            }
-                        }
-                        else
-                        {
-                            context = view;
-                        }
-
-                        if (context is not null)
-                        {
-                            if (navigationProvider.Get(context is Type type ? type : context.GetType())
-                                is INavigation navigation)
                             {
                                 Type navigateType = typeof(NavigateEventArgs<>).MakeGenericType(navigation.Type);
                                 if (Activator.CreateInstance(navigateType, [context, view, viewModel, sender, parameters]) is object navigate)

Toolkit.Foundation/ObservableCollectionViewModel.cs

@@ -19,6 +19,11 @@ public partial class ObservableCollectionViewModel<TViewModel> :
     IList,
     IReadOnlyList<TViewModel>,
     INotifyCollectionChanged,
+    IServiceProviderRequired,
+    IServiceFactoryRequired,
+    IMediatorRequired,
+    IPublisherRequired,
+    IDisposerRequired,
     INotificationHandler<RemoveEventArgs<TViewModel>>,
     INotificationHandler<CreateEventArgs<TViewModel>>,
     INotificationHandler<InsertEventArgs<TViewModel>>,

Toolkit.Foundation/ObservableViewModel.cs

@@ -10,7 +10,12 @@ public partial class ObservableViewModel :
     IDeactivating,
     IDeactivated,
     IDeactivatable,
-    IDisposable
+    IDisposable,
+    IServiceProviderRequired,
+    IServiceFactoryRequired,
+    IMediatorRequired,
+    IPublisherRequired,
+    IDisposerRequired
 {
     [ObservableProperty]
     private bool isInitialized;

Toolkit.Foundation/Validation.cs

@@ -0,0 +1,10 @@
+namespace Toolkit.Foundation;
+
+public record Validation
+{
+    public static ValidationEventArgs<TValue> As<TValue>(TValue value) =>
+        new(value);
+
+    public static ValidationEventArgs<TValue> As<TValue>() where TValue : new() =>
+        new(new TValue());
+}

Toolkit.Foundation/ValidationEventArgs.cs

@@ -0,0 +1,3 @@
+namespace Toolkit.Foundation;
+
+public record ValidationEventArgs<TValue>(TValue Value);