From f98f8484d06ad0707a84c3263deb17af35ecfd7c Mon Sep 17 00:00:00 2001
From: sha512sum <linuxnyasha@tutanota.com>
Date: Wed, 27 Mar 2024 23:50:08 +0000
Subject: [PATCH] Use utempl counter and injector instead custom realisation

---
 include/cserver/engine/components.hpp | 61 ++++-----------------------
 1 file changed, 9 insertions(+), 52 deletions(-)

diff --git a/include/cserver/engine/components.hpp b/include/cserver/engine/components.hpp
index 5c7b43c..3454218 100644
--- a/include/cserver/engine/components.hpp
+++ b/include/cserver/engine/components.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include <utempl/utils.hpp>
+#include <utempl/loopholes/counter.hpp>
 #include <thread>
 
 namespace cserver {
@@ -99,49 +100,6 @@ struct ServiceContext {
 
 namespace impl {
 
-namespace loopholes {
-
-template <auto I>
-struct Getter {
-  friend constexpr auto Magic(Getter<I>);
-};
-template <auto I, auto Value = 0>
-struct Injector {
-  friend constexpr auto Magic(Getter<I>) {return Value;};
-};
-
-
-template <auto I, typename...>
-concept Injected = requires{Magic(Getter<I>{});};
-
-template <typename Tag, auto Value>
-struct TagWithTalue {};
-
-
-template <auto I = 0, typename Tag, typename... Ts, auto = Injector<TagWithTalue<Tag, I>{}>{}>
-constexpr auto CounterImpl(...) {
-  return I;
-};
-
-template <auto I = 0, typename Tag, typename... Ts>
-consteval auto CounterImpl(std::size_t arg) requires Injected<TagWithTalue<Tag, I>{}, Ts...> {
-  return CounterImpl<I + 1, Tag, Ts...>(arg);
-};
-
-
-template <
-  typename Tag,
-  typename... Ts,
-  auto R = CounterImpl<0, Tag, Ts...>(std::size_t{})
->
-consteval auto Counter(auto...) {
-  return R;
-};
-
-
-} // namespace loopholes
-
-
 template <typename Current, std::size_t I>
 struct DependencyInfoKey {};
 
@@ -176,8 +134,8 @@ public:
   template <
     utempl::ConstexprString name,
     typename...,
-    std::size_t I = loopholes::Counter<Current, utempl::Wrapper<name>>(),
-    auto = loopholes::Injector<
+    std::size_t I = utempl::loopholes::Counter<Current, utempl::Wrapper<name>>(),
+    auto = utempl::loopholes::Injector<
       DependencyInfoKey<
         Current,
         I
@@ -186,12 +144,11 @@ public:
     >{}
   >
   static constexpr auto FindComponent() -> FindComponentType<name>&;
-
   template <
     typename T,
     typename...,
-    std::size_t I = loopholes::Counter<Current, utempl::Wrapper<FindComponentName<T>>>(),
-    auto = loopholes::Injector<
+    std::size_t I = utempl::loopholes::Counter<Current, utempl::Wrapper<FindComponentName<T>>>(),
+    auto = utempl::loopholes::Injector<
       DependencyInfoKey<
         Current,
         I
@@ -203,14 +160,14 @@ public:
 
   template <std::size_t I = 0, utempl::ConstexprString... names>
   static consteval auto GetDependencies() requires (I == 0 || 
-      requires {Magic(loopholes::Getter<DependencyInfoKey<Current, I>{}>{});}) {
-    if constexpr(I == 0 && !requires {Magic(loopholes::Getter<DependencyInfoKey<Current, I>{}>{});}) {
+      requires {Magic(utempl::loopholes::Getter<DependencyInfoKey<Current, I>{}>{});}) {
+    if constexpr(I == 0 && !requires {Magic(utempl::loopholes::Getter<DependencyInfoKey<Current, I>{}>{});}) {
       return utempl::Tuple{};
     } else {
       if constexpr(requires{GetDependencies<I + 1, names...>();}) {
-        return GetDependencies<I + 1, names..., Magic(loopholes::Getter<DependencyInfoKey<Current, I>{}>{})>();
+        return GetDependencies<I + 1, names..., Magic(utempl::loopholes::Getter<DependencyInfoKey<Current, I>{}>{})>();
       } else {
-        return utempl::Tuple{names..., Magic(loopholes::Getter<DependencyInfoKey<Current, I>{}>{})};
+        return utempl::Tuple{names..., Magic(utempl::loopholes::Getter<DependencyInfoKey<Current, I>{}>{})};
       };
     };
   };