Configutation writer fixed

Framework/Avalonia/Contents/ContentTemplateSelector.cs

@@ -15,16 +15,20 @@ public class ContentTemplateSelector : IDataTemplate, IContentTemplateSelector
         this.templateFactory = templateFactory;
     }
 
-    public IControl? Build(object? item)
+    public IControl? Build(object? content)
     {
-        if (item is not null)
+        if (content is not null)
         {
-            if (dataTracking.TryGetValue(item, out IControl? control))
+            if (dataTracking.TryGetValue(content, out IControl? control))
             {
                 return control;
             }
+            else
+            {
+                control = (IControl?)templateFactory.Create(content);
+            }
 
-            return (IControl?)templateFactory.Create(item);
+            return control;
         }
 
         return null;

Framework/Avalonia/Navigation/NavigateHandler.cs

@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Mediator;
-using System.Diagnostics;
 using Toolkit.Framework.Foundation;
 
 namespace Toolkit.Framework.Avalonia;
@@ -92,14 +91,6 @@ public class NavigateHandler : IRequestHandler<Navigate>
             {
                 hasNavigated = await mediator.Send(new ContentControlNavigation(contentControl, content, template, keyedParameters));
             }
-
-            if (hasNavigated)
-            {
-                if (content is INavigated navigated)
-                {
-                    await navigated.Navigated();
-                }
-            }
         }
         else
         {

Framework/Foundation/Configurations/ConfigurationWriter.cs

@@ -1,17 +1,22 @@
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+using System.Diagnostics;
 
 namespace Toolkit.Framework.Foundation;
 
 public class ConfigurationWriter<TConfiguration> : IConfigurationWriter<TConfiguration> where TConfiguration : class, new()
 {
     private readonly IConfiguration rootConfiguration;
+    private readonly string section;
 
-    public ConfigurationWriter(IConfiguration rootConfiguration)
+    public ConfigurationWriter(IConfiguration rootConfiguration, string section)
     {
+        Trace.WriteLine(section);
         this.rootConfiguration = rootConfiguration;
+        this.section = section;
     }
 
-    public void Write(string section, TConfiguration configuration)
+    public void Write(TConfiguration configuration)
     {
         if (rootConfiguration is IConfigurationRoot root)
         {

Framework/Foundation/Configurations/IConfigurationWriter.cs

@@ -2,5 +2,5 @@
 
 public interface IConfigurationWriter<TConfiguration> where TConfiguration : class
 {
-    void Write(string section, TConfiguration args);
+    void Write(TConfiguration args);
 }

Framework/Foundation/Configurations/WritableJsonConfigurationProvider.cs

@@ -9,6 +9,7 @@ public class WritableJsonConfigurationProvider : JsonConfigurationProvider, IWri
 {
     public WritableJsonConfigurationProvider(JsonConfigurationSource source) : base(source)
     {
+
     }
 
     public void Write<TValue>(string section, TValue value) where TValue : class, new()

Framework/Foundation/Configurations/WritableJsonConfigurationSource.cs

@@ -20,7 +20,7 @@ public class WritableJsonConfigurationSource : JsonConfigurationSource
 
         if (FileProvider is PhysicalFileProvider physicalFileProvider)
         {
-            string? outputFile = System.IO.Path.Combine(physicalFileProvider.Root, Path);
+            string? outputFile = System.IO.Path.Combine(physicalFileProvider.Root, Path!);
             Factory?.Build(outputFile);
         }
     }

Framework/Foundation/Configurations/Write.cs

@@ -2,4 +2,4 @@
 
 namespace Toolkit.Framework.Foundation;
 
-public abstract record Write<TConfiguration>(string Section, Action<TConfiguration> UpdateDelegate) : IRequest where TConfiguration : class;
+public record Write<TConfiguration>(Action<TConfiguration> UpdateDelegate) : IRequest where TConfiguration : class;

Framework/Foundation/Configurations/WriteHandler.cs

@@ -20,7 +20,7 @@ public class WriteHandler<TConfiguration> : IRequestHandler<Write<TConfiguration
     public async ValueTask<Unit> Handle(Write<TConfiguration> request, CancellationToken cancellationToken)
     {
         request.UpdateDelegate.Invoke(configuration);
-        writer.Write(request.Section, configuration);
+        writer.Write(configuration);
 
         await mediator.Send(new ConfigurationChanged<TConfiguration>(configuration), cancellationToken);
 

Framework/Foundation/Extensions/IServiceCollectionExtensions.cs

@@ -105,11 +105,11 @@ public static class IServiceCollectionExtensions
     public static IServiceCollection AddWritableConfiguration<TConfiguration>(this IServiceCollection serviceCollection, IConfiguration configuration) where TConfiguration : class, new()
     {
         serviceCollection.Configure<TConfiguration>(configuration);
-        serviceCollection.AddTransient<IConfigurationWriter<TConfiguration>, ConfigurationWriter<TConfiguration>>();
+        serviceCollection.AddTransient<IConfigurationWriter<TConfiguration>>(provider => provider.GetService<IServiceFactory>()?.Create< ConfigurationWriter<TConfiguration>>(configuration is IConfigurationSection section ? section.Path : "")!);
         serviceCollection.AddTransient(provider => provider.GetService<IOptionsMonitor<TConfiguration>>()!.CurrentValue);
         serviceCollection.AddHandler<WriteHandler<TConfiguration>>();
         serviceCollection.AddTransient<ConfigurationInitializer<TConfiguration>>();
-
+        
         return serviceCollection;
     }
 }

Framework/Foundation/Extensions/WritableJsonConfigurationExtensions.cs

@@ -1,11 +1,12 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Hosting;
 
 namespace Toolkit.Framework.Foundation;
 
 public static class WritableJsonConfigurationExtensions
 {
-    public static IConfigurationBuilder AddWritableJsonFile(this IConfigurationBuilder builder,
+    public static IConfigurationBuilder AddWritableJsonFile(this IConfigurationBuilder builder, 
         string path)
     {
         return builder.AddWritableJsonFile(null, path, false, false, null);
@@ -38,7 +39,7 @@ public static class WritableJsonConfigurationExtensions
         bool optional,
         bool reloadOnChange)
     {
-        return builder.AddWritableJsonFile(null, path, optional, reloadOnChange, null);
+        return builder.AddWritableJsonFile( null, path, optional, reloadOnChange, null);
     }
 
     public static IConfigurationBuilder AddWritableJsonFile(this IConfigurationBuilder builder,

Framework/Foundation/Foundation.csproj

@@ -9,6 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="JsonCons.JsonPath" Version="1.1.0" />
+    <PackageReference Include="JsonCons.Utilities" Version="1.0.0" />
     <PackageReference Include="JsonPatch.Net" Version="2.0.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />