fix(schema): add variant name to GENERIC_SCHEMA_CACHE to differenti…

…ate enum variants
fishfolk · Nov 20, 2024 · df3e274 · df3e274
1 parent 046a493
commit df3e274
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/framework_crates/bones_schema/macros/src/lib.rs b/framework_crates/bones_schema/macros/src/lib.rs
@@ -285,15 +285,15 @@ pub fn derive_has_schema(input: TokenStream) -> TokenStream {
                             let schema = {
                                 #schema_mod::registry::GENERIC_SCHEMA_CACHE
                                     .read()
-                                    .get(&TypeId::of::<Self>())
+                                    .get(&(TypeId::of::<Self>(), #variant_schema_name))
                                     .copied()
                             };
                             schema.unwrap_or_else(|| {
                                 let schema = compute_schema();
 
                                 #schema_mod::registry::GENERIC_SCHEMA_CACHE
                                     .write()
-                                    .insert(TypeId::of::<Self>(), schema);
+                                    .insert((TypeId::of::<Self>(), #variant_schema_name), schema);
 
                                 schema
                             })
@@ -398,15 +398,15 @@ pub fn derive_has_schema(input: TokenStream) -> TokenStream {
                     let schema = {
                         #schema_mod::registry::GENERIC_SCHEMA_CACHE
                             .read()
-                            .get(&TypeId::of::<Self>())
+                            .get(&(TypeId::of::<Self>(), stringify!(#name)))
                             .copied()
                     };
                     schema.unwrap_or_else(|| {
                         let schema = #schema_register;
 
                         #schema_mod::registry::GENERIC_SCHEMA_CACHE
                             .write()
-                            .insert(TypeId::of::<Self>(), schema);
+                            .insert((TypeId::of::<Self>(), stringify!(name)), schema);
 
                         schema
                     })

diff --git a/framework_crates/bones_schema/src/registry.rs b/framework_crates/bones_schema/src/registry.rs
@@ -149,8 +149,9 @@ pub static SCHEMA_REGISTRY: SchemaRegistry = SchemaRegistry {
 };
 
 #[doc(hidden)]
-pub static GENERIC_SCHEMA_CACHE: LazyLock<RwLock<HashMap<TypeId, &'static Schema>>> =
-    LazyLock::new(Default::default);
+pub static GENERIC_SCHEMA_CACHE: LazyLock<
+    RwLock<HashMap<(TypeId, &'static str), &'static Schema>>,
+> = LazyLock::new(Default::default);
 
 #[cfg(test)]
 mod test {