From b94f26dd141adfff52c8b67f3a5b29ce59c7e6bd Mon Sep 17 00:00:00 2001
From: Valentin Dosimont <valentin@pupucecorp.com>
Date: Fri, 28 Feb 2025 14:39:41 +0100
Subject: [PATCH] fix: recs component name matching

---
 .changeset/stupid-falcons-yawn.md                | 16 ++++++++++++++++
 .../src/dojo/generated/contractComponents.ts     |  6 ++++--
 packages/state/src/recs/index.ts                 |  4 +++-
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/stupid-falcons-yawn.md

diff --git a/.changeset/stupid-falcons-yawn.md b/.changeset/stupid-falcons-yawn.md
new file mode 100644
index 00000000..25e7298a
--- /dev/null
+++ b/.changeset/stupid-falcons-yawn.md
@@ -0,0 +1,16 @@
+---
+"@dojoengine/state": patch
+"template-vite-ts": patch
+"@dojoengine/core": patch
+"@dojoengine/create-burner": patch
+"@dojoengine/create-dojo": patch
+"@dojoengine/predeployed-connector": patch
+"@dojoengine/react": patch
+"@dojoengine/sdk": patch
+"@dojoengine/torii-client": patch
+"@dojoengine/torii-wasm": patch
+"@dojoengine/utils": patch
+"@dojoengine/utils-wasm": patch
+---
+
+fix: recs component matching
diff --git a/examples/example-vite-react-phaser-recs/src/dojo/generated/contractComponents.ts b/examples/example-vite-react-phaser-recs/src/dojo/generated/contractComponents.ts
index 596871c8..73c3d1a4 100644
--- a/examples/example-vite-react-phaser-recs/src/dojo/generated/contractComponents.ts
+++ b/examples/example-vite-react-phaser-recs/src/dojo/generated/contractComponents.ts
@@ -18,7 +18,8 @@ export function defineContractComponents(world: World) {
                 { player: RecsType.BigInt, directions: RecsType.StringArray },
                 {
                     metadata: {
-                        name: "dojo_starter-DirectionsAvailable",
+                        namespace: "dojo_starter",
+                        name: "DirectionsAvailable",
                         types: ["contractaddress"],
                         customTypes: ["Direction"],
                     },
@@ -36,7 +37,8 @@ export function defineContractComponents(world: World) {
                 },
                 {
                     metadata: {
-                        name: "dojo_starter-Moves",
+                        namespace: "dojo_starter",
+                        name: "Moves",
                         types: ["contractaddress", "u8", "enum", "bool"],
                         customTypes: ["Direction"],
                     },
diff --git a/packages/state/src/recs/index.ts b/packages/state/src/recs/index.ts
index 8573a84d..6fafafa5 100644
--- a/packages/state/src/recs/index.ts
+++ b/packages/state/src/recs/index.ts
@@ -418,7 +418,9 @@ export const setEntities = async <S extends Schema>(
                 continue;
             }
             const recsComponent = Object.values(components).find(
-                (component) => component.metadata?.name === componentName
+                (component) =>
+                    `${component.metadata?.namespace}-${component.metadata?.name}` ===
+                    componentName
             );
 
             if (recsComponent) {