From 9e5b44e3fa9e43785b47de532e5b13195371edfa Mon Sep 17 00:00:00 2001
From: BELLIER Sacha <bellier.sacha2@gmail.com>
Date: Tue, 29 Oct 2024 18:41:46 +0100
Subject: [PATCH] fix: module deps

---
 BUILD.bazel                        | 4 ++--
 Examples/MODULE.bazel              | 3 +++
 Examples/Workflow/BUILD.bazel      | 2 +-
 MODULE.bazel                       | 3 +++
 src/LittleECS/Detail/ComponentId.h | 5 +++--
 src/LittleECS/Detail/EntityId.h    | 5 +++--
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index e3af315..b9ffc9c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -26,7 +26,7 @@ cc_test(
         "@rules_cc//cc/compiler:msvc-cl": ["/std:c++20"],
         "//conditions:default": ["-std=c++20"],
     }),
-    deps = [ "@StreamFormat//:StreamFormat", ":LittleECS" ],
+    deps = [ "@streamformat//:StreamFormat", ":LittleECS" ],
     visibility = ["//visibility:public"],
 )
 
@@ -39,6 +39,6 @@ cc_test(
         "@rules_cc//cc/compiler:msvc-cl": ["/std:c++20"],
         "//conditions:default": ["-std=c++20"],
     }),
-    deps = [ "@StreamFormat//:StreamFormat", ":LittleECS" ],
+    deps = [ "@streamformat//:StreamFormat", ":LittleECS" ],
     visibility = ["//visibility:public"],
 )
diff --git a/Examples/MODULE.bazel b/Examples/MODULE.bazel
index 7442c2c..5ce0e1c 100644
--- a/Examples/MODULE.bazel
+++ b/Examples/MODULE.bazel
@@ -9,12 +9,15 @@ module(
 git_override(module_name="bazel_utilities", remote="https://github.com/0-Sacha/bazel_utilities.git", commit="7f6c3585c41278918428ed48d45b12413c197fc0")
 git_override(module_name="bazel_buildbuddy", remote="https://github.com/0-Sacha/bazel_buildbuddy.git", commit="b60314cac7826edb87efe285b032b877ad725f84")
 git_override(module_name="bazel_winlibs", remote="https://github.com/0-Sacha/bazel_winlibs.git", commit="e2cc97b61cb9115fbc2b7169dc9d1cb36b351935")
+git_override(module_name="streamformat", remote="https://github.com/0-Sacha/StreamFormat.git", commit="6faa20c9176b14e81903d0d65ad06e6a6e36332b")
 local_path_override(module_name = "littleecs", path = "../")
 
 bazel_dep(name = "rules_cc", version = "0.0.10")
 bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "bazel_utilities", version = "0.0.1")
 bazel_dep(name = "bazel_winlibs", version = "0.0.1")
+
+bazel_dep(name = "streamformat", version = "0.1")
 bazel_dep(name = "littleecs")
 
 winlibs_toolchain_extension = use_extension("@bazel_winlibs//:rules.bzl", "winlibs_toolchain_extension")
diff --git a/Examples/Workflow/BUILD.bazel b/Examples/Workflow/BUILD.bazel
index 3679cdf..a6fc47d 100644
--- a/Examples/Workflow/BUILD.bazel
+++ b/Examples/Workflow/BUILD.bazel
@@ -10,6 +10,6 @@ cc_binary(
         "@rules_cc//cc/compiler:msvc-cl": ["/std:c++20"],
         "//conditions:default": ["-std=c++20"],
     }),
-    deps = [ "@StreamFormat//:StreamFormat", "@littleecs//:LittleECS" ],
+    deps = [ "@streamformat//:StreamFormat", "@littleecs//:LittleECS" ],
     visibility = ["//visibility:public"],
 )
diff --git a/MODULE.bazel b/MODULE.bazel
index 8fab659..60f7630 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -9,6 +9,7 @@ module(
 git_override(module_name="bazel_utilities", remote="https://github.com/0-Sacha/bazel_utilities.git", commit="7f6c3585c41278918428ed48d45b12413c197fc0")
 git_override(module_name="bazel_buildbuddy", remote="https://github.com/0-Sacha/bazel_buildbuddy.git", commit="b60314cac7826edb87efe285b032b877ad725f84")
 git_override(module_name="bazel_winlibs", remote="https://github.com/0-Sacha/bazel_winlibs.git", commit="e2cc97b61cb9115fbc2b7169dc9d1cb36b351935")
+git_override(module_name="streamformat", remote="https://github.com/0-Sacha/StreamFormat.git", commit="6faa20c9176b14e81903d0d65ad06e6a6e36332b")
 
 bazel_dep(name = "rules_cc", version = "0.0.10")
 bazel_dep(name = "platforms", version = "0.0.10")
@@ -16,6 +17,8 @@ bazel_dep(name = "bazel_utilities", version = "0.0.1")
 bazel_dep(name = "bazel_buildbuddy", version = "0.0.1")
 bazel_dep(name = "bazel_winlibs", version = "0.0.1")
 
+bazel_dep(name = "streamformat", version = "0.1")
+
 bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
 git_override(
     module_name = "hedron_compile_commands",
diff --git a/src/LittleECS/Detail/ComponentId.h b/src/LittleECS/Detail/ComponentId.h
index b1df616..fb10159 100644
--- a/src/LittleECS/Detail/ComponentId.h
+++ b/src/LittleECS/Detail/ComponentId.h
@@ -52,10 +52,11 @@ namespace LECS
 namespace StreamFormat::FMT
 {
     template<typename FormatterContext>
-    struct FormatterType<LECS::ComponentId, FormatterContext> {
+    struct FormatterType<LECS::ComponentId, FormatterContext>
+    {
         static void Format(LECS::ComponentId typeId, FormatterContext& context)
         {
-            FormatterType<Detail::ForwardAsUInt<typename LECS::ComponentId::Type>, FormatterContext>::Format(typeId, context);
+            FormatterType<typename LECS::ComponentId::Type, FormatterContext>::Format(typeId, context);
         }
     };
 }
diff --git a/src/LittleECS/Detail/EntityId.h b/src/LittleECS/Detail/EntityId.h
index 7fa24b1..c3e57da 100644
--- a/src/LittleECS/Detail/EntityId.h
+++ b/src/LittleECS/Detail/EntityId.h
@@ -53,10 +53,11 @@ namespace LECS
     namespace StreamFormat::FMT
     {
         template<typename FormatterContext>
-        struct FormatterType<LECS::EntityId, FormatterContext> {
+        struct FormatterType<LECS::EntityId, FormatterContext>
+        {
             static void Format(LECS::EntityId typeId, FormatterContext& context)
             {
-                FormatterType<Detail::ForwardAsUInt<typename LECS::EntityId::Type>, FormatterContext>::Format(typeId, context);
+                FormatterType<typename LECS::EntityId::Type, FormatterContext>::Format(typeId, context);
             }
         };
     }