Merge pull request #348 from edisontim/feat/support-options

feat: add support for option types

Author: MartianGreed

packages/state/src/utils/index.ts

@@ -2,17 +2,27 @@ import { Type as RecsType, Schema } from "@dojoengine/recs";
 
 export function convertValues(schema: Schema, values: any) {
     return Object.keys(schema).reduce<any>((acc, key) => {
-        const schemaType = schema[key];
-        const value = values[key];
+        let schemaType = schema[key];
+        let value = values[key];
 
         if (value == null) {
             acc[key] = value;
             return acc;
         }
 
         if (value.type === "enum") {
-            acc[key] = value.value.option;
-            return acc;
+            if (value.type_name && value.type_name.includes("Option")) {
+                if (value.value.option === "None") {
+                    acc[key] = null;
+                    return acc;
+                } else {
+                    schemaType = mapOptionalToRealType(schemaType);
+                    value = value.value.value;
+                }
+            } else {
+                acc[key] = value.value.option;
+                return acc;
+            }
         }
 
         switch (schemaType) {
@@ -45,6 +55,31 @@ export function convertValues(schema: Schema, values: any) {
     }, {});
 }
 
+function mapOptionalToRealType(schemaType: any) {
+    switch (schemaType) {
+        case RecsType.OptionalNumber:
+            return RecsType.Number;
+        case RecsType.OptionalBigInt:
+            return RecsType.BigInt;
+        case RecsType.OptionalString:
+            return RecsType.String;
+        case RecsType.OptionalNumberArray:
+            return RecsType.NumberArray;
+        case RecsType.OptionalBigIntArray:
+            return RecsType.BigIntArray;
+        case RecsType.OptionalStringArray:
+            return RecsType.StringArray;
+        case RecsType.OptionalEntity:
+            return RecsType.Entity;
+        case RecsType.OptionalEntityArray:
+            return RecsType.EntityArray;
+        case RecsType.OptionalT:
+            return RecsType.T;
+        default:
+            return schemaType;
+    }
+}
+
 function handleStringArray(value: any) {
     if (value.type === "array" && value.value.length === 0) {
         return [];