Container/MeshNodePtr: Branch::operator[]

Author: MorganCaron

modules/Container/MeshNetwork.mpp

@@ -148,6 +148,28 @@ export namespace CppUtils::Container
 				node2Accessor.operator->()->detachChild(node1.get(), node1NetworkPtr);
 			}
 
+			[[nodiscard]] auto operator[](std::size_t index) const -> std::expected<MeshNodePtr, std::string_view>
+			{
+				using namespace std::literals;
+
+				if (not m_self)
+					return std::unexpected{"Invalid MeshNodePtr"sv};
+				auto sharedLocker = m_self->sharedAccess();
+				const auto& branches = sharedLocker->value.branches;
+				if (auto it = branches.find(m_key); it != std::cend(branches))
+				{
+					const auto& children = it->second;
+					if (index < std::size(children))
+						if (auto sharedChild = children[index].lock())
+							return MeshNodePtr{sharedChild};
+						else
+							return std::unexpected{"Failed to lock weak pointer for branch. Node might have been deleted"sv};
+					else
+						return std::unexpected{"Branch index out of bounds"sv};
+				}
+				return std::unexpected{"Branch key not found"sv};
+			}
+
 		private:
 			SharedPtr& m_self;
 			const Key& m_key;
@@ -202,28 +224,6 @@ export namespace CppUtils::Container
 			return sharedLocker->value.value;
 		}
 
-		[[nodiscard]] auto getNode(const Key& key, std::size_t index = 0) const -> std::expected<MeshNodePtr, std::string_view>
-		{
-			using namespace std::literals;
-
-			if (not m_node)
-				return std::unexpected{"Invalid MeshNodePtr"sv};
-			auto sharedLocker = m_node->sharedAccess();
-			const auto& branches = sharedLocker->value.branches;
-			if (auto it = branches.find(key); it != std::cend(branches))
-			{
-				const auto& children = it->second;
-				if (index < std::size(children))
-					if (auto sharedChild = children[index].lock())
-						return MeshNodePtr{sharedChild};
-					else
-						return std::unexpected{"Failed to lock weak pointer for branch. Node might have been deleted"sv};
-				else
-					return std::unexpected{"Branch index out of bounds"sv};
-			}
-			return std::unexpected{"Branch key not found"sv};
-		}
-
 		[[nodiscard]] auto getNodes(const Key& key) const -> std::expected<std::vector<MeshNodePtr>, std::string_view>
 		{
 			using namespace std::literals;

tests/Container/MeshNetwork.mpp

@@ -390,7 +390,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
 			auto child = StringMeshNodePtr::make("child");
 			root["Children"] >> child;
 
-			auto childExpected = root.getNode("Children", 0);
+			auto childExpected = root["Children"][0];
 
 			suite.expect(childExpected.has_value());
 			suite.expectEqual(childExpected.value().getValue().value(), "child");
@@ -401,7 +401,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
 			auto child = StringMeshNodePtr::make("child");
 			root["Children"] >> child;
 
-			auto invalidKeyExpected = root.getNode("NonExistentBranch");
+			auto invalidKeyExpected = root["NonExistentBranch"][0];
 
 			suite.expect(not invalidKeyExpected.has_value());
 			suite.expectEqual(invalidKeyExpected.error(), "Branch key not found"sv);
@@ -412,7 +412,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
 			auto child = StringMeshNodePtr::make("child");
 			root["Children"] >> child;
 
-			auto invalidIndexExpected = root.getNode("Children", 1);
+			auto invalidIndexExpected = root["Children"][1];
 
 			suite.expect(not invalidIndexExpected.has_value());
 			suite.expectEqual(invalidIndexExpected.error(), "Branch index out of bounds"sv);
@@ -421,7 +421,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
 		suite.addTest("Get node: Invalid node", [&] {
 			auto emptyNode = StringMeshNodePtr{};
 
-			auto emptyBranchExpected = emptyNode.getNode("Branch");
+			auto emptyBranchExpected = emptyNode["Branch"][0];
 
 			suite.expect(not emptyBranchExpected.has_value());
 			suite.expectEqual(emptyBranchExpected.error(), "Invalid MeshNodePtr"sv);