From 5654b86cea25b27e57bd811f5856885746b6e466 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Fri, 5 Jul 2024 21:57:01 +0100
Subject: [PATCH] Bug fixes

---
 Toolkit.Foundation/Activate.cs            | 8 --------
 Toolkit.Foundation/ActivateEventArgs.cs   | 3 ---
 Toolkit.Foundation/Close.cs               | 8 ++++++++
 Toolkit.Foundation/CloseEventArgs.cs      | 3 +++
 Toolkit.Foundation/ComponentBuilder.cs    | 1 -
 Toolkit.Foundation/ConfigurationSource.cs | 9 +--------
 Toolkit.Foundation/DecoratorService.cs    | 4 ++--
 Toolkit.Foundation/IDecoratorService.cs   | 4 ++--
 Toolkit.Foundation/Open.cs                | 8 ++++++++
 Toolkit.Foundation/OpenEventArgs.cs       | 3 +++
 10 files changed, 27 insertions(+), 24 deletions(-)
 delete mode 100644 Toolkit.Foundation/Activate.cs
 delete mode 100644 Toolkit.Foundation/ActivateEventArgs.cs
 create mode 100644 Toolkit.Foundation/Close.cs
 create mode 100644 Toolkit.Foundation/CloseEventArgs.cs
 create mode 100644 Toolkit.Foundation/Open.cs
 create mode 100644 Toolkit.Foundation/OpenEventArgs.cs

diff --git a/Toolkit.Foundation/Activate.cs b/Toolkit.Foundation/Activate.cs
deleted file mode 100644
index 15a20be..0000000
--- a/Toolkit.Foundation/Activate.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Toolkit.Foundation;
-
-public record Activate
-{
-    public static ActivateEventArgs<TSender> As<TSender>(TSender sender) => new(sender);
-
-    public static ActivateEventArgs<TSender> As<TSender>() where TSender : new() => new(new TSender());
-}
diff --git a/Toolkit.Foundation/ActivateEventArgs.cs b/Toolkit.Foundation/ActivateEventArgs.cs
deleted file mode 100644
index dfe5d3e..0000000
--- a/Toolkit.Foundation/ActivateEventArgs.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Toolkit.Foundation;
-
-public record ActivateEventArgs<TSender>(TSender? Sender = default);
\ No newline at end of file
diff --git a/Toolkit.Foundation/Close.cs b/Toolkit.Foundation/Close.cs
new file mode 100644
index 0000000..3cc0cb3
--- /dev/null
+++ b/Toolkit.Foundation/Close.cs
@@ -0,0 +1,8 @@
+namespace Toolkit.Foundation;
+
+public record Close
+{
+    public static CloseEventArgs<TSender> As<TSender>(TSender sender) => new(sender);
+
+    public static CloseEventArgs<TSender> As<TSender>() where TSender : new() => new(new TSender());
+}
diff --git a/Toolkit.Foundation/CloseEventArgs.cs b/Toolkit.Foundation/CloseEventArgs.cs
new file mode 100644
index 0000000..663fe4f
--- /dev/null
+++ b/Toolkit.Foundation/CloseEventArgs.cs
@@ -0,0 +1,3 @@
+namespace Toolkit.Foundation;
+
+public record CloseEventArgs<TSender>(TSender? Sender = default);
\ No newline at end of file
diff --git a/Toolkit.Foundation/ComponentBuilder.cs b/Toolkit.Foundation/ComponentBuilder.cs
index 135eddd..5cc39b0 100644
--- a/Toolkit.Foundation/ComponentBuilder.cs
+++ b/Toolkit.Foundation/ComponentBuilder.cs
@@ -51,7 +51,6 @@ public class ComponentBuilder :
         where TConfiguration : ComponentConfiguration, new()
     {
         TConfiguration configuration = new();
-
         if (configurationDelegate is not null)
         {
             configurationDelegate(configuration);
diff --git a/Toolkit.Foundation/ConfigurationSource.cs b/Toolkit.Foundation/ConfigurationSource.cs
index 1538b76..7b8406c 100644
--- a/Toolkit.Foundation/ConfigurationSource.cs
+++ b/Toolkit.Foundation/ConfigurationSource.cs
@@ -74,14 +74,7 @@ public class ConfigurationSource<TConfiguration>(IConfigurationFile<TConfigurati
                 string currentKey = segments[i];
                 if (currentNode[currentKey] is null)
                 {
-                    if (int.TryParse(segments[i + 1], out int _))
-                    {
-                        currentNode[currentKey] = new JsonArray();
-                    }
-                    else
-                    {
-                        currentNode[currentKey] = new JsonObject();
-                    }
+                    currentNode[currentKey] = new JsonObject();
                 }
 
                 currentNode = currentNode[currentKey];
diff --git a/Toolkit.Foundation/DecoratorService.cs b/Toolkit.Foundation/DecoratorService.cs
index 0958361..c16325b 100644
--- a/Toolkit.Foundation/DecoratorService.cs
+++ b/Toolkit.Foundation/DecoratorService.cs
@@ -3,7 +3,7 @@
 public class DecoratorService<T> :
     IDecoratorService<T>
 {
-    public T? Service { get; private set; }
+    public T? Value { get; private set; }
 
-    public void Set(T value) => Service = value;
+    public void Set(T? value) => Value = value;
 }
\ No newline at end of file
diff --git a/Toolkit.Foundation/IDecoratorService.cs b/Toolkit.Foundation/IDecoratorService.cs
index b558d8d..1ed8d19 100644
--- a/Toolkit.Foundation/IDecoratorService.cs
+++ b/Toolkit.Foundation/IDecoratorService.cs
@@ -2,7 +2,7 @@
 
 public interface IDecoratorService<T>
 {
-    T? Service { get; }
+    T? Value { get; }
 
-    void Set(T service);
+    void Set(T? value);
 }
\ No newline at end of file
diff --git a/Toolkit.Foundation/Open.cs b/Toolkit.Foundation/Open.cs
new file mode 100644
index 0000000..abdc27b
--- /dev/null
+++ b/Toolkit.Foundation/Open.cs
@@ -0,0 +1,8 @@
+namespace Toolkit.Foundation;
+
+public record Open
+{
+    public static OpenEventArgs<TSender> As<TSender>(TSender sender) => new(sender);
+
+    public static OpenEventArgs<TSender> As<TSender>() where TSender : new() => new(new TSender());
+}
diff --git a/Toolkit.Foundation/OpenEventArgs.cs b/Toolkit.Foundation/OpenEventArgs.cs
new file mode 100644
index 0000000..74fb9b9
--- /dev/null
+++ b/Toolkit.Foundation/OpenEventArgs.cs
@@ -0,0 +1,3 @@
+namespace Toolkit.Foundation;
+
+public record OpenEventArgs<TSender>(TSender? Sender = default);