fix: checking dependencies for valid components (#42)

Author: zaucy

.vscode/launch.json

@@ -7,6 +7,7 @@
 			"program": "${workspaceFolder}/bazel-bin/runtime/test/test",
 			"cwd": "${workspaceFolder}",
 			"args": [
+				"--gtest_catch_exceptions",
 				"--gtest_break_on_failure"
 			],
 			"type": "cppdbg",

WORKSPACE.bazel

@@ -11,23 +11,23 @@ http_archive(
 
 http_archive(
     name = "rules_ecsact",
-    sha256 = "e6d888c63aa536b5b7c6af10d217cdb8ad98b2262fa9d02515a99edbd0d94eea",
-    strip_prefix = "rules_ecsact-0.2.1",
-    url = "https://github.com/ecsact-dev/rules_ecsact/archive/refs/tags/0.2.1.tar.gz",
+    sha256 = "8eaaf1f05eccbfcf4a0123c951436519672190a7a908fa847c24adf0778041f6",
+    strip_prefix = "rules_ecsact-0.2.2",
+    url = "https://github.com/ecsact-dev/rules_ecsact/archive/refs/tags/0.2.2.tar.gz",
 )
 
 http_archive(
     name = "ecsact_lang_cpp",
-    sha256 = "2866569ed8d58f3e42b705bf38f77455fe9acf8ab2d1b05f611b847d4c291a67",
-    strip_prefix = "ecsact_lang_cpp-b1fa28b445b98d5ba62ede19cd6a5bdfa51141be",
-    url = "https://github.com/ecsact-dev/ecsact_lang_cpp/archive/b1fa28b445b98d5ba62ede19cd6a5bdfa51141be.zip",
+    sha256 = "2fa208f81a8422f8bce9ed7200fa726622b77af7c8e08fdae4fa723d2e8fc163",
+    strip_prefix = "ecsact_lang_cpp-3b70f5d276a4b29c709c687295d36ab804042e1a",
+    url = "https://github.com/ecsact-dev/ecsact_lang_cpp/archive/3b70f5d276a4b29c709c687295d36ab804042e1a.zip",
 )
 
 http_archive(
     name = "ecsact_runtime",
-    sha256 = "",  # https://github.com/ecsact-dev/ecsact_runtime/pull/140
-    strip_prefix = "ecsact_runtime-e9689a232254c56107ff022c546ee03f53e1f04a",
-    url = "https://github.com/ecsact-dev/ecsact_runtime/archive/e9689a232254c56107ff022c546ee03f53e1f04a.zip",
+    sha256 = "ba5b8f1649fc86b9c803ab852d0612e2d100a64e2a06a13b612e111bf8d18735",
+    strip_prefix = "ecsact_runtime-c6cdc81000bbee028a8e7a2bc95fc35711db1b75",
+    url = "https://github.com/ecsact-dev/ecsact_runtime/archive/c6cdc81000bbee028a8e7a2bc95fc35711db1b75.zip",
 )
 
 load("@rules_ecsact//ecsact:repositories.bzl", "ecsact_register_toolchains", "rules_ecsact_dependencies")

ecsact/entt/detail/meta_util.hh

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <map>
+#include <boost/mp11.hpp>
+#include "ecsact/runtime/common.h"
+
+namespace ecsact::entt::detail {
+
+template<typename Package, typename Callback>
+void mp_for_each_available_component(Callback&& cb) {
+	using boost::mp11::mp_for_each;
+	using components = typename Package::components;
+	using dependencies = typename Package::dependencies;
+
+	mp_for_each<components>([&]<typename C>(const C& c) { cb(c); });
+	mp_for_each<dependencies>([&]<typename D>(const D& d) {
+		mp_for_each_available_component<D>(cb);
+	});
+}
+
+template<typename Package, typename Callback>
+void mp_for_each_available_action(Callback&& cb) {
+	using boost::mp11::mp_for_each;
+	using actions = typename Package::actions;
+	using dependencies = typename Package::dependencies;
+
+	mp_for_each<actions>([&]<typename A>(const A& a) { cb(a); });
+	mp_for_each<dependencies>([&]<typename D>(const D& d) {
+		mp_for_each_available_components<D>(cb);
+	});
+}
+
+} // namespace ecsact::entt::detail

ecsact/entt/detail/registry_info.hh

@@ -8,6 +8,7 @@
 #include <entt/entt.hpp>
 #include "ecsact/runtime/common.h"
 #include "ecsact/runtime/core.h"
+#include "ecsact/entt/detail/meta_util.hh"
 
 #include "ecsact/entt/event_markers.hh"
 #include "ecsact/entt/detail/internal_markers.hh"
@@ -36,14 +37,14 @@ struct registry_info {
 	};
 
 	void init_registry() {
-		using boost::mp11::mp_for_each;
 		using ecsact::entt::component_added;
 		using ecsact::entt::component_changed;
 		using ecsact::entt::component_removed;
 		using ecsact::entt::detail::beforechange_storage;
+		using ecsact::entt::detail::mp_for_each_available_component;
 		using ecsact::entt::detail::temp_storage;
 
-		mp_for_each<typename package::components>([&]<typename C>(C) {
+		mp_for_each_available_component<package>([&]<typename C>(C) {
 			registry.storage<C>();
 			registry.storage<temp_storage<C>>();
 			registry.storage<component_added<C>>();
@@ -108,12 +109,12 @@ struct registry_info {
 	template<typename C, typename... Args>
 		requires(!std::is_empty_v<C>)
 	void add_component(::entt::entity entity, Args&&... args) {
-		using boost::mp11::mp_for_each;
 		using boost::mp11::mp_with_index;
+		using ecsact::entt::detail::mp_for_each_available_component;
 
 		auto& comp = registry.emplace<C>(entity, std::forward<Args>(args)...);
 
-		mp_for_each<typename package::components>([&]<typename O>(O) {
+		mp_for_each_available_component<package>([&]<typename O>(O) {
 			if constexpr(std::is_same_v<std::remove_cvref_t<C>, O>) {
 				using ecsact::entt::detail::beforechange_storage;
 				beforechange_storage<O> beforechange = {
@@ -139,7 +140,7 @@ struct registry_info {
 
 	template<typename C>
 	void remove_component(::entt::entity entity) {
-		using boost::mp11::mp_for_each;
+		using ecsact::entt::detail::mp_for_each_available_component;
 
 		constexpr auto fields_info = ecsact::fields_info<C>();
 		if constexpr(!fields_info.empty()) {
@@ -154,7 +155,7 @@ struct registry_info {
 		registry.erase<C>(entity);
 
 		if constexpr(!std::is_empty_v<C>) {
-			mp_for_each<typename package::components>([&]<typename O>(O) {
+			mp_for_each_available_component<package>([&]<typename O>(O) {
 				if constexpr(std::is_same_v<std::remove_cvref_t<C>, O>) {
 					using ecsact::entt::detail::beforechange_storage;
 					registry.erase<beforechange_storage<O>>(entity);

ecsact/entt/detail/system_execution_context.hh

@@ -11,6 +11,7 @@
 #include "ecsact/runtime/common.h"
 #include "ecsact/entt/event_markers.hh"
 #include "ecsact/entt/system_view.hh"
+#include "ecsact/entt/detail/meta_util.hh"
 
 #include "registry_info.hh"
 
@@ -141,9 +142,9 @@ struct system_execution_context : system_execution_context_base {
 	}
 
 	void add(ecsact_component_like_id component_id, const void* component_data) {
-		using boost::mp11::mp_for_each;
+		using ecsact::entt::detail::mp_for_each_available_component;
 
-		mp_for_each<typename package::components>([&]<typename C>(const C&) {
+		mp_for_each_available_component<package>([&]<typename C>(const C&) {
 			if(ecsact_id_cast<ecsact_component_like_id>(C::id) == component_id) {
 				add<C>(*static_cast<const C*>(component_data));
 			}
@@ -197,9 +198,9 @@ struct system_execution_context : system_execution_context_base {
 	}
 
 	void remove(ecsact_component_like_id component_id) {
-		using boost::mp11::mp_for_each;
+		using ecsact::entt::detail::mp_for_each_available_component;
 
-		mp_for_each<typename package::components>([&]<typename C>(const C&) {
+		mp_for_each_available_component<package>([&]<typename C>(const C&) {
 			if(ecsact_id_cast<ecsact_component_like_id>(C::id) == component_id) {
 				remove<C>();
 			}
@@ -338,9 +339,9 @@ struct system_execution_context : system_execution_context_base {
 		ecsact_component_id* component_ids,
 		const void**         components_data
 	) {
-		using boost::mp11::mp_for_each;
 		using ecsact::entt::component_added;
 		using ecsact::entt::detail::created_entity;
+		using ecsact::entt::detail::mp_for_each_available_component;
 		using ecsact::entt::detail::pending_add;
 
 		auto new_entity = info.create_entity().entt_entity_id;
@@ -351,7 +352,7 @@ struct system_execution_context : system_execution_context_base {
 		for(int i = 0; component_count > i; ++i) {
 			auto component_id = component_ids[i];
 			auto component_data = components_data[i];
-			mp_for_each<typename package::components>([&]<typename C>(const C&) {
+			mp_for_each_available_component<package>([&]<typename C>(const C&) {
 				if(C::id == component_id) {
 					if constexpr(std::is_empty_v<C>) {
 						info.registry.template emplace<pending_add<C>>(new_entity);