We now have some tabs & nav stacks picking up properly

Sample/AnotherPage.xaml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:sample="clr-namespace:Sample"
+             x:DataType="sample:AnotherViewModel"
+             x:Class="Sample.AnotherPage"
+             Title="Another Page">
+    <ContentPage.Content>
+        <Label Text="This Page will now participate in the event handler chain as long as it stays in this navigation stack"
+               HorizontalTextAlignment="Center"
+               HorizontalOptions="Fill" />
+    </ContentPage.Content>
+</ContentPage>

Sample/AnotherPage.xaml.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sample;
+
+public partial class AnotherPage : ContentPage
+{
+    public AnotherPage()
+    {
+        InitializeComponent();
+    }
+}

Sample/AnotherViewModel.cs

@@ -0,0 +1,8 @@
+namespace Sample;
+
+
+public class AnotherViewModel(BaseServices services, AppSqliteConnection conn) : ViewModel(services), IEventHandler<MyMessageEvent>
+{
+    public Task Handle(MyMessageEvent @event, CancellationToken cancellationToken) =>
+        conn.Log("AnotherViewModel", @event);
+}

Sample/BlazorPage.xaml

@@ -2,8 +2,16 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:Sample.Components"
+             xmlns:sample="clr-namespace:Sample"
+             x:DataType="sample:BlazorViewModel"
              x:Class="Sample.BlazorPage"
              Title="Blazor">
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="Another Page" 
+                     Command="{Binding Navigate}"
+                     CommandParameter="AnotherPage" />
+    </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <BlazorWebView x:Name="blazorWebView" 
                        HostPage="wwwroot/index.html">

Sample/BlazorViewModel.cs

@@ -1,8 +1,5 @@
 namespace Sample;
 
-public class BlazorViewModel : ViewModel
+public class BlazorViewModel(BaseServices services) : ViewModel(services)
 {
-    public BlazorViewModel(BaseServices services) : base(services)
-    {
-    }
 }

Sample/EventViewModel.cs

@@ -1,5 +1,3 @@
-
-
 namespace Sample;
 
 
@@ -19,7 +17,7 @@ AppSqliteConnection conn
                     x.Arg,
                     x.FireAndForget,
                     x.ParallelEvents,
-                    x.Timestamp.ToString("g")
+                    x.Timestamp.ToLocalTime().ToString("g")
                 ))
                 .ToList();
         });
@@ -40,7 +38,6 @@ AppSqliteConnection conn
     public ICommand Load { get; }
     [Reactive] public List<EventItemViewModel> List { get; private set; }
 
-
     public override void OnAppearing()
     {
         base.OnAppearing();

Sample/MauiProgram.cs

@@ -50,6 +50,7 @@ public static MauiApp CreateMauiApp()
         builder.Services.RegisterForNavigation<TriggerPage, TriggerViewModel>();
         builder.Services.RegisterForNavigation<EventPage, EventViewModel>();
         builder.Services.RegisterForNavigation<BlazorPage, BlazorViewModel>();
+        builder.Services.RegisterForNavigation<AnotherPage, AnotherViewModel>();
 
         return builder.Build();
     }

Sample/Sample.csproj

@@ -100,6 +100,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\src\Shiny.Mediator.Contracts\Shiny.Mediator.Contracts.csproj" />
       <ProjectReference Include="..\src\Shiny.Mediator.Maui\Shiny.Mediator.Maui.csproj" />
       <ProjectReference Include="..\src\Shiny.Mediator\Shiny.Mediator.csproj" />
     </ItemGroup>

readme.md

@@ -15,6 +15,10 @@ and dependency injection can't reach.
 * Fire & Forget as well as Parallel Event execution 
 * Our MAUI & Blazor integrations allow your viewmodels or pages to implement an IEventHandler<TEvent> interface(s) without them having to participate in the dependency injection provider
 * We still have a "messagingcenter" type subscribe off IMediator for cases where you can't have your current type implement an interface
+* Instead of Assembly Scanning, we have source generators to automatically wireup the necessary registrations for you!
+* Lightweight, No external dependencies, tiny bit of reflection 
+* Help remove service overrun and reduce your constructor fat
+* Easy to Unit Test
 
 ## Works With
 * .NET MAUI - all platforms
@@ -159,6 +163,6 @@ Focus on the interfaces from the mediator & the mediator calls itself
 * Pipelines
   * Error handlers - requests and events?
   * Pre/Post Execution - Time how long events took, time how long a command took
-
 * Explain Event Handlers 
 * Streams - IAsyncEnumerable or IObservable
+* Source Generator Registration

src/Shiny.Mediator.Maui/MauiEventCollector.cs

@@ -4,31 +4,58 @@ public class MauiEventCollector : IEventCollector
 {
     public IReadOnlyList<IEventHandler<TEvent>> GetHandlers<TEvent>() where TEvent : IEvent
     {
+        // I need to make this crawl the tree, but really I don't need a ton of use-cases here
         var list = new List<IEventHandler<TEvent>>();
-        var proxy = Application.Current?.NavigationProxy;
-        if (proxy != null)
+        var mainPage = Application.Current?.MainPage;
+        if (mainPage == null)
+            return list;
+
+        if (mainPage is TabbedPage tabs)
         {
-            foreach (var page in proxy.NavigationStack)
+            foreach (var tab in tabs.Children)
             {
-                // if (page is TabbedPage tabs)
-                // {
-                //     foreach (var tab in tabs.Children)
-                //     {
-                //         tab.NavigationProxy
-                //     }
-                // }
-                // if (page is NavigationPage nav)
-                // {
-                //     nav.NavigationProxy
-                // }
-
-                if (page is IEventHandler<TEvent> handler1)
-                    list.Add(handler1);
-
-                if (page.BindingContext is IEventHandler<TEvent> handler2)
-                    list.Add(handler2);
+                if (tab is NavigationPage navPage)
+                {
+                    TryAppendEvents(navPage, list);
+                }
+                else
+                {
+                    TryAppendEvents(tab, list);
+                }
             }
         }
+        else if (mainPage is NavigationPage navPage)
+        {
+            TryAppendEvents(navPage, list);
+        }
+        else
+        {
+            TryAppendEvents(mainPage!, list);
+        }
+
         return list;
     }
+
+
+    static void TryAppendEvents<TEvent>(Page page, List<IEventHandler<TEvent>> list) where TEvent : IEvent
+    {
+        if (page is IEventHandler<TEvent> handler1)
+            list.Add(handler1);
+
+        if (page.BindingContext is IEventHandler<TEvent> handler2)
+            list.Add(handler2);
+    }
+
+
+    static void TryAppendEvents<TEvent>(NavigationPage navPage, List<IEventHandler<TEvent>> list) where TEvent : IEvent
+    {
+        var navStack = navPage.Navigation?.NavigationStack;
+        if (navStack != null)
+        {
+            foreach (var page in navStack)
+            {
+                TryAppendEvents(page, list);
+            }
+        }        
+    }
 }

src/Shiny.Mediator/Impl/Mediator.cs

@@ -19,7 +19,10 @@ public async Task Send<TRequest>(TRequest request, CancellationToken cancellatio
         AssertRequestHandlers(handlers.Count, request);
 
         // TODO: pipelines
-        await handlers.First().Handle(request, cancellationToken).ConfigureAwait(false);
+        await handlers
+            .First()
+            .Handle(request, cancellationToken)
+            .ConfigureAwait(false);
     }
 
 
@@ -46,11 +49,12 @@ public async Task Publish<TEvent>(
         CancellationToken cancellationToken = default
     ) where TEvent : IEvent
     {
+        // TODO: filter out the dupes from the collector by instance (viewmodels may be in DI and MAUI collector)
         var handlers = services.GetServices<IEventHandler<TEvent>>().ToList();
         AppendHandlersIf(handlers, this.subscriptions);
         if (collector != null)
             AppendHandlersIf(handlers, collector);
-
+        
         if (handlers.Count == 0)
             return;
 
@@ -114,7 +118,13 @@ static void AppendHandlersIf<TEvent>(List<IEventHandler<TEvent>> list, IEventCol
     {
         var handlers = collector.GetHandlers<TEvent>();
         if (handlers.Count > 0)
-            list.AddRange(handlers);
+        {
+            foreach (var handler in handlers)
+            {
+                if (!list.Contains(handler))
+                    list.Add(handler);
+            }
+        }
     }