global arrays refactor & fix graphql

dojoengine · Nov 29, 2024 · 1de3f01 · 1de3f01
1 parent 5233b5f
commit 1de3f01
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/crates/torii/core/src/model.rs b/crates/torii/core/src/model.rs
@@ -2,10 +2,11 @@ use std::str::FromStr;
 
 use async_trait::async_trait;
 use crypto_bigint::U256;
-use dojo_types::primitive::Primitive;
+use dojo_types::primitive::{Primitive, PrimitiveError};
 use dojo_types::schema::Ty;
 use dojo_world::contracts::abigen::model::Layout;
 use dojo_world::contracts::model::ModelReader;
+use serde_json::Value as JsonValue;
 use sqlx::sqlite::SqliteRow;
 use sqlx::{Pool, Row, Sqlite};
 use starknet::core::types::Felt;
@@ -346,9 +347,19 @@ pub fn map_row_to_ty(
             }
         }
         Ty::Array(ty) => {
+            let schema = ty[0].clone();
             let serialized_array = row.try_get::<String, &str>(&column_name)?;
 
-            *ty = serde_json::from_str(&serialized_array).map_err(ParseError::FromJsonStr)?;
+            let values: Vec<JsonValue> =
+                serde_json::from_str(&serialized_array).map_err(ParseError::FromJsonStr)?;
+            *ty = values
+                .iter()
+                .map(|v| {
+                    let mut ty = schema.clone();
+                    ty.from_json_value(v.clone())?;
+                    Result::<_, PrimitiveError>::Ok(ty)
+            })
+            .collect::<Result<Vec<Ty>, _>>()?;
         }
         Ty::ByteArray(bytearray) => {
             let value = row.try_get::<String, &str>(&column_name)?;

diff --git a/crates/torii/core/src/sql/mod.rs b/crates/torii/core/src/sql/mod.rs
@@ -688,7 +688,9 @@ impl Sql {
                 }
                 Ty::Array(array) => {
                     columns.push(format!("\"{}\"", prefix));
-                    arguments.push(Argument::String(serde_json::to_string(array)?));
+                    let values =
+                        array.iter().map(|v| v.to_json_value()).collect::<Result<Vec<_>, _>>()?;
+                    arguments.push(Argument::String(serde_json::to_string(&values)?));
                 }
                 Ty::Primitive(ty) => {
                     columns.push(format!("\"{}\"", prefix));