Merge pull request #185 from dojoengine/recs-enum

feat: parses enums as string
dojoengine · Apr 9, 2024 · 25aba4d · 25aba4d
2 parents 149feee + 95df756
commit 25aba4d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/examples/react/react-app/src/App.tsx b/examples/react/react-app/src/App.tsx
@@ -29,6 +29,8 @@ function App() {
     const position = useComponentValue(Position, entityId);
     const moves = useComponentValue(Moves, entityId);
 
+    console.log(moves);
+
     const handleRestoreBurners = async () => {
         try {
             await account?.applyFromClipboard();
@@ -112,6 +114,8 @@ function App() {
                         ? `${position.vec.x}, ${position.vec.y}`
                         : "Need to Spawn"}
                 </div>
+
+                <div>{moves && moves.last_direction}</div>
             </div>
 
             <div className="card">

diff --git a/examples/react/react-app/src/dojo/generated/contractComponents.ts b/examples/react/react-app/src/dojo/generated/contractComponents.ts
@@ -14,7 +14,7 @@ export function defineContractComponents(world: World) {
                 {
                     player: RecsType.BigInt,
                     remaining: RecsType.Number,
-                    last_direction: RecsType.Number,
+                    last_direction: RecsType.String,
                 },
                 {
                     metadata: {

diff --git a/packages/core/bin/generateComponents.cjs b/packages/core/bin/generateComponents.cjs
@@ -62,6 +62,7 @@ const cairoToRecsType = {
     u256: "RecsType.BigInt",
     felt252: "RecsType.BigInt",
     contractaddress: "RecsType.BigInt",
+    enum: "RecsType.String",
 };
 
 const manifestStr = fs.readFileSync(manifestPath, "utf8");

diff --git a/packages/state/src/recs/index.ts b/packages/state/src/recs/index.ts
@@ -43,9 +43,9 @@ export const syncEntities = async <S extends Schema>(
     client: Client,
     components: Component<S, Metadata, undefined>[]
 ) => {
-    client.onEntityUpdated([], (entities: any) =>
-        setEntities(entities, components)
-    );
+    client.onEntityUpdated([], (entities: any) => {
+        setEntities(entities, components);
+    });
 };
 
 export const setEntities = async <S extends Schema>(

diff --git a/packages/state/src/utils/index.ts b/packages/state/src/utils/index.ts
@@ -5,21 +5,28 @@ export function convertValues(schema: Schema, values: any) {
         const schemaType = schema[key];
         const value = values[key];
 
+        console.log(schemaType, key, values[key]);
+
         if (value === null || value === undefined) {
             acc[key] = value;
             return acc;
         }
 
-        if (
+        // Check if the schemaType is a string, if so, assign the value directly
+        if (schemaType === RecsType.String) {
+            acc[key] = value;
+        } else if (
             typeof schemaType === "object" &&
             value &&
             typeof value === "object"
         ) {
             acc[key] = convertValues(schemaType, value);
         } else {
+            // Convert to BigInt or Number based on schemaType
             acc[key] =
                 schemaType === RecsType.BigInt ? BigInt(value) : Number(value);
         }
+
         return acc;
     }, {});
 }