Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(schema): support generic bounds in structs & enums #490

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(schema): add variant name to GENERIC_SCHEMA_CACHE to differenti…
…ate enum variants
nelson137 committed Nov 20, 2024
commit df3e274c6d68e3f08ced7ae112ce2dc93f8dce52
8 changes: 4 additions & 4 deletions framework_crates/bones_schema/macros/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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
})
5 changes: 3 additions & 2 deletions framework_crates/bones_schema/src/registry.rs
Original file line number Diff line number Diff line change
@@ -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 {