lots of tidying up

Hyperbar.Widget/IServiceCollectionExtensions.cs

@@ -10,13 +10,11 @@ public static class IServiceCollectionExtensions
         services.AddTransient<IInitializer, WidgetInitializer>();
         services.AddTransient<IFactory<Type, IWidget>, WidgetFactory>();
 
-        services.AddHandler<WidgetEnumeratorHandler>();
+        services.AddHandler<WidgetEnumerator>();
         services.AddHandler<WidgetAssemblyHandler>();
         services.AddHandler<WidgetHandler>();
         services.AddHandler<WidgetHostHandler>();
 
-        services.AddTransient<IFactory<IWidgetHost, WidgetContainerViewModel?>, WidgetContainerFactory>();
-
         return services;
     }
 

Hyperbar.Widget/WidgetBuilder.cs

@@ -20,6 +20,8 @@ public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
         })
         .ConfigureServices((context, services) =>
         {
+            services.AddSingleton<IWidgetHost, WidgetHost>();
+
             services.AddScoped<IServiceFactory>(provider =>
                 new ServiceFactory((type, parameters) =>
                     ActivatorUtilities.CreateInstance(provider, type, parameters!)));
@@ -50,8 +52,7 @@ public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
     public IWidgetHost Build()
     {
         IHost host = hostBuilder.Build();
-        return (IWidgetHost)ActivatorUtilities.CreateInstance(host.Services,
-            typeof(WidgetHost), host);
+        return host.Services.GetRequiredService<IWidgetHost>();
     }
 
     public IWidgetBuilder ConfigureServices(Action<IServiceCollection> configureDelegate)

Hyperbar.Widget/WidgetContainerFactory.cs

@@ -1,17 +1,10 @@
-using Microsoft.Extensions.DependencyInjection;
-namespace Hyperbar.Widget;
+namespace Hyperbar.Widget;
 
 public class WidgetContainerFactory(IServiceFactory factory) :
     IFactory<IWidgetHost, WidgetContainerViewModel?>
 {
     public WidgetContainerViewModel? Create(IWidgetHost value)
     {
-        if (value.Services.GetServices<IWidgetViewModel>() is 
-                IEnumerable<IWidgetViewModel> viewModels)
-        {
-            return factory.Create<WidgetContainerViewModel>(value.Configuration.Id);
-        }
-
-        return default;
+        return factory.Create<WidgetContainerViewModel>(value.Configuration.Id);
     }
 }

Hyperbar.Widget/WidgetContainerViewModel.cs

@@ -3,6 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Hyperbar.Widget;
 
+[NotificationHandler(nameof(WidgetContainerViewModel))]
 public partial class WidgetContainerViewModel(ITemplateFactory templateFactory,
     IServiceFactory serviceFactory,
     IMediator mediator,

Hyperbar.Widget/WidgetEnumerator.cs

@@ -4,7 +4,7 @@ using System.Runtime.Loader;
 
 namespace Hyperbar.Widget;
 
-public class WidgetEnumeratorHandler(IHostEnvironment hostEnvironment, 
+public class WidgetEnumerator(IHostEnvironment hostEnvironment, 
     IMediator mediator) :
     INotificationHandler<Enumerate<IWidget>>
 {

Hyperbar.Widget/WidgetHost.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 
 namespace Hyperbar.Widget;
 
@@ -8,18 +7,18 @@ public class WidgetHost :
     IWidgetHost
 {
     private readonly IConfigurationInitializer<WidgetConfiguration> configurationInitializer;
-    private readonly IHost host;
+    private readonly IServiceProvider services;
     private readonly IEnumerable<IInitializer> initializers;
     private readonly IMediator mediator;
     private readonly IProxyService<IMediator> proxyMediator;
 
-    public WidgetHost(IHost host,
+    public WidgetHost(IServiceProvider services,
         IMediator mediator,
         IEnumerable<IInitializer> initializers,
         IProxyService<IMediator> proxyMediator,
         IConfigurationInitializer<WidgetConfiguration> configurationInitializer)
     {
-        this.host = host;
+        this.services = services;
         this.mediator = mediator;
         this.initializers = initializers;
         this.proxyMediator = proxyMediator;
@@ -28,9 +27,9 @@ public class WidgetHost :
         mediator.Subscribe(this);
     }
 
-    public WidgetConfiguration Configuration => host.Services.GetRequiredService<WidgetConfiguration>();
+    public WidgetConfiguration Configuration => services.GetRequiredService<WidgetConfiguration>();
    
-    public IServiceProvider Services => host.Services;
+    public IServiceProvider Services => services;
 
     public async Task Handle(Changed<WidgetAvailability> notification,
         CancellationToken cancellationToken)

Hyperbar.Widget/WidgetHostHandler.cs

@@ -1,7 +1,8 @@
-namespace Hyperbar.Widget;
+using Microsoft.Extensions.DependencyInjection;
 
-public class WidgetHostHandler(IMediator mediator,
-    IFactory<IWidgetHost, WidgetContainerViewModel?> factory) :
+namespace Hyperbar.Widget;
+
+public class WidgetHostHandler(IMediator mediator) :
     INotificationHandler<Started<IWidgetHost>>,
     INotificationHandler<Stopped<IWidgetHost>>
 {
@@ -10,10 +11,13 @@ public class WidgetHostHandler(IMediator mediator,
     {
         if (notification.Value is IWidgetHost host)
         {
-            if (factory.Create(host) is WidgetContainerViewModel containerViewModel)
+            if (host.Services.GetRequiredService<IFactory<IWidgetHost, WidgetContainerViewModel?>>() is { } factory)
             {
-                await mediator.PublishAsync(new Created<WidgetContainerViewModel>(containerViewModel), 
-                    nameof(WidgetBarViewModel), cancellationToken);
+                if (factory.Create(host) is WidgetContainerViewModel containerViewModel)
+                {
+                    await mediator.PublishAsync(new Created<WidgetContainerViewModel>(containerViewModel),
+                        nameof(WidgetBarViewModel), cancellationToken);
+                }
             }
         }
     }

Hyperbar.Widget/WidgetViewModelEnumerator.cs

@@ -1,11 +1,21 @@
-namespace Hyperbar.Widget;
+using Microsoft.Extensions.DependencyInjection;
 
-public class WidgetViewModelEnumerator :
+namespace Hyperbar.Widget;
+
+public class WidgetViewModelEnumerator(IWidgetHost host, 
+    IMediator mediator) :
     INotificationHandler<Enumerate<IWidgetViewModel>>
 {
-    public Task Handle(Enumerate<IWidgetViewModel> notification,
+    public async Task Handle(Enumerate<IWidgetViewModel> notification,
         CancellationToken cancellationToken)
     {
-        throw new NotImplementedException();
-    }
+        if (host.Services.GetServices<IWidgetViewModel>() is IEnumerable<IWidgetViewModel> viewModels)
+        {
+            foreach (IWidgetViewModel viewModel in viewModels)
+            {
+                await mediator.PublishAsync(new Created<IWidgetViewModel>(viewModel),
+                    nameof(WidgetContainerViewModel), cancellationToken);
+            }
+        }
+    }   
 }