From 676aa359e78c7953b32c9a39d7ca29f8ec8e7506 Mon Sep 17 00:00:00 2001
From: DH <dh.rpcs3@gmail.com>
Date: Tue, 12 Nov 2024 13:01:15 +0300
Subject: [PATCH] utilities: TypeId: store name of type

---
 rx/include/rx/TypeId.hpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/rx/include/rx/TypeId.hpp b/rx/include/rx/TypeId.hpp
index 1943493e2..84f02351c 100644
--- a/rx/include/rx/TypeId.hpp
+++ b/rx/include/rx/TypeId.hpp
@@ -1,35 +1,47 @@
 #pragma once
 
+#include "refl.hpp"
 #include <compare>
 #include <cstddef>
 #include <functional>
 
 namespace rx {
 namespace detail {
-template <typename> char mRawTypeId = 0;
-template <typename T> constexpr const void *getTypeIdImpl() {
+template <typename T> constexpr std::string_view mRawTypeId = getNameOf<T>();
+
+template <typename T>
+[[nodiscard]] constexpr const std::string_view *getTypeIdImpl() {
   return &mRawTypeId<T>;
 }
 } // namespace detail
 
 class TypeId {
-  const void *mId = detail::getTypeIdImpl<void>();
+  const std::string_view *mId = detail::getTypeIdImpl<void>();
 
 public:
-  constexpr const void *getOpaque() const { return mId; }
+  [[nodiscard]] constexpr const void *getOpaque() const { return mId; }
 
-  constexpr static TypeId createFromOpaque(const void *id) {
+  [[nodiscard]] constexpr static TypeId createFromOpaque(const void *id) {
     TypeId result;
-    result.mId = id;
+    result.mId = static_cast<const std::string_view *>(id);
     return result;
   }
 
-  template <typename T> constexpr static TypeId get() {
-    return createFromOpaque(detail::getTypeIdImpl<T>());
+  template <typename T> [[nodiscard]] constexpr static TypeId get() {
+    TypeId result;
+    result.mId = detail::getTypeIdImpl<T>();
+    return result;
   }
 
+  [[nodiscard]] constexpr std::string_view getName() const { return *mId; }
+
   constexpr auto operator<=>(const TypeId &other) const = default;
 };
+
+template <typename... Types>
+constexpr std::array<TypeId, sizeof...(Types)> getTypeIds() {
+  return std::array<TypeId, sizeof...(Types)>{TypeId::get<Types>()...};
+}
 } // namespace rx
 
 namespace std {