From 21481a82d889566d51cba116a9d9159cc0584e90 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Sun, 21 Apr 2024 19:53:47 +0100
Subject: [PATCH] Amend reading config

---
 Toolkit.Foundation/ConfigurationSource.cs | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Toolkit.Foundation/ConfigurationSource.cs b/Toolkit.Foundation/ConfigurationSource.cs
index 2cc7e35..18800d6 100644
--- a/Toolkit.Foundation/ConfigurationSource.cs
+++ b/Toolkit.Foundation/ConfigurationSource.cs
@@ -135,11 +135,26 @@ public class ConfigurationSource<TConfiguration>(IConfigurationFile<TConfigurati
                 using StreamReader? reader = new(stream);
 
                 string? content = reader.ReadToEnd();
+                JsonNode? rootNode = JsonNode.Parse(content);
 
-                using JsonDocument jsonDocument = JsonDocument.Parse(content);
-                if (jsonDocument.RootElement.TryGetProperty(section, out JsonElement sectionValue))
+                string[] segments = section.Split(':');
+                JsonNode? currentNode = rootNode;
+                int lastIndex = segments.Length - 1;
+
+                for (int i = 0; i < lastIndex; i++)
                 {
-                    value = JsonSerializer.Deserialize<TConfiguration>(sectionValue.ToString(), serializerOptions ?? defaultSerializerOptions());
+                    if (currentNode is null)
+                    {
+                        value = default;
+                        return false;
+                    }
+
+                    currentNode = currentNode[segments[i]];
+                }
+
+                if (currentNode is not null)
+                {
+                    value = JsonSerializer.Deserialize<TConfiguration>(currentNode[segments[lastIndex]], serializerOptions ?? defaultSerializerOptions());
                     return true;
                 }
             }