From a83f9d5be8c32bbb07ecc2ee6b8d932b3577d676 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Wed, 27 Mar 2024 10:42:23 -0700
Subject: [PATCH] module: rename NamespacedComponents -> ComponentTypesByName

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 src/ecs/entities.zig |  6 +++---
 src/ecs/query.zig    |  4 ++--
 src/module.zig       | 19 +++++++++++--------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/ecs/entities.zig b/src/ecs/entities.zig
index a92a8e3d..753caa32 100644
--- a/src/ecs/entities.zig
+++ b/src/ecs/entities.zig
@@ -7,7 +7,7 @@ const query_mod = @import("query.zig");
 const Archetype = @import("Archetype.zig");
 const StringTable = @import("StringTable.zig");
 const comp = @import("comptime.zig");
-const NamespacedComponents = @import("../module.zig").NamespacedComponents;
+const ComponentTypesByName = @import("../module.zig").ComponentTypesByName;
 
 /// An entity ID uniquely identifies an entity globally within an Entities set.
 pub const EntityID = u64;
@@ -750,7 +750,7 @@ test "example" {
 
     const Rotation = struct { degrees: f32 };
 
-    const all_components = NamespacedComponents(.{
+    const all_components = ComponentTypesByName(.{
         struct {
             pub const name = .game;
             pub const events = .{};
@@ -855,7 +855,7 @@ test "many entities" {
 
     const Rotation = struct { degrees: f32 };
 
-    const all_components = NamespacedComponents(.{
+    const all_components = ComponentTypesByName(.{
         struct {
             pub const name = .game;
             pub const events = .{};
diff --git a/src/ecs/query.zig b/src/ecs/query.zig
index 51ee74d0..5c7e0f6c 100644
--- a/src/ecs/query.zig
+++ b/src/ecs/query.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const testing = std.testing;
-const NamespacedComponents = @import("../module.zig").NamespacedComponents;
+const ComponentTypesByName = @import("../module.zig").ComponentTypesByName;
 
 pub const QueryTag = enum {
     any,
@@ -70,7 +70,7 @@ test "query" {
 
     const Rotation = struct { degrees: f32 };
 
-    const all_components = NamespacedComponents(.{
+    const all_components = ComponentTypesByName(.{
         struct {
             pub const name = .game;
             pub const events = .{};
diff --git a/src/module.zig b/src/module.zig
index 7cd020da..e59f03a9 100644
--- a/src/module.zig
+++ b/src/module.zig
@@ -43,6 +43,11 @@ pub fn Modules(comptime mods: anytype) type {
         pub const GlobalEvent = GlobalEventEnum(mods);
         pub const LocalEvent = LocalEventEnum(mods);
 
+        /// Enables looking up a component type by module name and component name.
+        /// e.g. @field(@field(ComponentTypesByName, "module_name"), "component_name")
+        pub const component_types_by_name = ComponentTypesByName(mods){};
+
+        const ModulesT = @This();
         const Event = struct {
             module_name: ?ModuleID,
             event_name: EventID,
@@ -50,24 +55,22 @@ pub fn Modules(comptime mods: anytype) type {
         };
         const EventQueue = std.fifo.LinearFifo(Event, .Dynamic);
 
-        const ModulesT = @This();
-
         events_mu: std.Thread.RwLock = .{},
         args_queue: std.ArrayListUnmanaged(u8) = .{},
         events: EventQueue,
         mod: ModsByName(mods, ModulesT),
-        // TODO: pass mods directly instead of NamespacedComponents?
-        entities: Entities(NamespacedComponents(mods){}),
+        // TODO: pass mods directly instead of ComponentTypesByName?
+        entities: Entities(component_types_by_name),
 
         pub fn Mod(comptime M: type) type {
             const StateT = NamespacedState(ModulesT.modules);
-            const NSComponents = NamespacedComponents(ModulesT.modules);
+            const NSComponents = ComponentTypesByName(ModulesT.modules);
             return Module(M, ModulesT, StateT, NSComponents);
         }
 
         pub fn init(m: *@This(), allocator: std.mem.Allocator) !void {
             // TODO: switch Entities to stack allocation like Modules is
-            var entities = try Entities(NamespacedComponents(mods){}).init(allocator);
+            var entities = try Entities(component_types_by_name).init(allocator);
             errdefer entities.deinit();
 
             // TODO: custom event queue allocation sizes
@@ -344,7 +347,7 @@ pub fn ModsByName(comptime mods: anytype, comptime ModulesT: type) type {
     var fields: []const std.builtin.Type.StructField = &[0]std.builtin.Type.StructField{};
     for (mods) |M| {
         const StateT = NamespacedState(mods);
-        const NSComponents = NamespacedComponents(mods);
+        const NSComponents = ComponentTypesByName(mods);
         const Mod = Module(M, ModulesT, StateT, NSComponents);
         fields = fields ++ [_]std.builtin.Type.StructField{.{
             .name = @tagName(M.name),
@@ -695,7 +698,7 @@ fn validateEvents(comptime error_prefix: anytype, comptime events: anytype) void
 ///     },
 /// }
 /// ```
-pub fn NamespacedComponents(comptime modules: anytype) type {
+pub fn ComponentTypesByName(comptime modules: anytype) type {
     var fields: []const std.builtin.Type.StructField = &[0]std.builtin.Type.StructField{};
     inline for (modules) |M| {
         const MC = MComponents(M);