feat: recursive types in model definition

Cargo.toml

@@ -71,8 +71,8 @@ debug = true
 inherits = "release"
 
 [workspace.dependencies]
-cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.8", features = [ "abigen-rs" ] }
-cainome-cairo-serde = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.8" }
+cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.10", features = [ "abigen-rs" ] }
+cainome-cairo-serde = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.10" }
 dojo-utils = { path = "crates/dojo/utils" }
 
 # metrics

crates/dojo/bindgen/src/plugins/typescript/generator/enum.rs

@@ -1,13 +1,14 @@
 use cainome::parser::tokens::{Composite, CompositeType};
 
+use super::constants::{CAIRO_ENUM_IMPORT, CAIRO_ENUM_TOKEN, SN_IMPORT_SEARCH};
+use super::token_is_custom_enum;
 use crate::error::BindgenResult;
 use crate::plugins::typescript::generator::JsType;
 use crate::plugins::{BindgenModelGenerator, Buffer};
 
-use super::constants::{CAIRO_ENUM_IMPORT, CAIRO_ENUM_TOKEN, SN_IMPORT_SEARCH};
-use super::token_is_custom_enum;
-
-const CAIRO_ENUM_TYPE_IMPL: &str = "export type TypedCairoEnum<T> = CairoCustomEnum & {\n\tvariant: { [K in keyof T]: T[K] | undefined };\n\tunwrap(): T[keyof T];\n}\n";
+const CAIRO_ENUM_TYPE_IMPL: &str = "export type TypedCairoEnum<T> = CairoCustomEnum & \
+                                    {\n\tvariant: { [K in keyof T]: T[K] | undefined \
+                                    };\n\tunwrap(): T[keyof T];\n}\n";
 
 pub(crate) struct TsEnumGenerator;
 

crates/dojo/bindgen/src/plugins/typescript/generator/interface.rs

@@ -40,6 +40,11 @@ impl BindgenModelGenerator for TsInterfaceGenerator {
         if token.r#type != CompositeType::Struct || token.inners.is_empty() {
             return Ok(String::new());
         }
+        if buffer
+            .has(format!("// Type definition for `{path}` struct", path = token.type_path).as_str())
+        {
+            return Ok(String::new());
+        }
 
         self.check_import(token, buffer);
         self.add_input_type(buffer);
@@ -124,7 +129,8 @@ mod tests {
             result,
             "// Type definition for `core::test::TestStruct` struct\nexport interface TestStruct \
              {\n\tfieldOrder: string[];\n\tfield1: BigNumberish;\n\tfield2: \
-             BigNumberish;\n\tfield3: BigNumberish;\n}\nexport type InputTestStruct = RemoveFieldOrder<TestStruct>;\n"
+             BigNumberish;\n\tfield3: BigNumberish;\n}\nexport type InputTestStruct = \
+             RemoveFieldOrder<TestStruct>;\n"
         );
     }