forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add helper trait for registering schema types

Browse Source
This commit is contained in:
Piotr Siuszko 2025-07-05 11:43:27 +02:00
parent daf03b5b3a
commit a58f697363
3 changed files with 65 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/bevy_remote/src/builtin_methods.rs
View File

@ -1751,7 +1751,12 @@ mod tests {
world.insert_resource(SchemaTypesMetadata::default());
let response = export_registry_types_ext(BrpJsonSchemaQueryFilter::default(), &world);
assert_eq!(response.definitions.len(), 5);
assert_eq!(
response.definitions.len(),
5,
"Expected 5 definitions, got: {:#?}",
response.definitions.keys()
);
let response = export_registry_types_ext(
BrpJsonSchemaQueryFilter {
without_crates: vec!["bevy_remote".to_string()],

6
crates/bevy_remote/src/lib.rs
View File

@ -517,6 +517,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;
use std::sync::RwLock;
use crate::schemas::RegisterReflectJsonSchemas;
pub mod builtin_methods;
#[cfg(feature = "http")]
pub mod http;
@ -653,9 +655,7 @@ impl Default for RemotePlugin {
impl Plugin for RemotePlugin {
fn build(&self, app: &mut App) {
app.register_type::<schemas::open_rpc::OpenRpcDocument>()
.register_type_data::<schemas::open_rpc::OpenRpcDocument, schemas::ReflectJsonSchema>();
app.register_schema_base_types();
let mut remote_methods = RemoteMethods::new();
let plugin_methods = &mut *self.methods.write().unwrap();

57
crates/bevy_remote/src/schemas/mod.rs
View File

@ -12,7 +12,7 @@ use bevy_reflect::{
};
use core::any::TypeId;
use crate::schemas::json_schema::JsonSchemaBevyType;
use crate::schemas::{json_schema::JsonSchemaBevyType, open_rpc::OpenRpcDocument};
pub mod json_schema;
pub mod open_rpc;
@ -37,6 +37,61 @@ impl<T: Reflect> FromType<T> for ReflectJsonSchemaForceAsArray {
}
}
/// Helper trait
pub(crate) trait RegisterReflectJsonSchemas {
/// Register types and or type data that are implemented by this crate
fn register_schema_base_types(&mut self) {
#[cfg(feature = "bevy_math")]
{
// self.register_type_data_internal::<bevy_math::Vec2, ReflectJsonSchemaForceAsArray>();
self.register_type_data_internal::<bevy_math::Vec3, ReflectJsonSchemaForceAsArray>();
}
self.register_type_internal::<OpenRpcDocument>();
self.register_type_data_internal::<OpenRpcDocument, ReflectJsonSchema>();
}
fn register_type_internal<T>(&mut self)
where
T: bevy_reflect::GetTypeRegistration;
fn register_type_data_internal<T, D>(&mut self)
where
T: Reflect + bevy_reflect::TypePath,
D: TypeData + FromType<T>;
}
impl RegisterReflectJsonSchemas for bevy_reflect::TypeRegistry {
fn register_type_data_internal<T, D>(&mut self)
where
T: Reflect + bevy_reflect::TypePath,
D: TypeData + FromType<T>,
{
self.register_type_data::<T, D>();
}
fn register_type_internal<T>(&mut self)
where
T: bevy_reflect::GetTypeRegistration,
{
self.register::<T>();
}
}
impl RegisterReflectJsonSchemas for bevy_app::App {
fn register_type_data_internal<T, D>(&mut self)
where
T: Reflect + bevy_reflect::TypePath,
D: TypeData + FromType<T>,
{
self.register_type_data::<T, D>();
}
fn register_type_internal<T>(&mut self)
where
T: bevy_reflect::GetTypeRegistration,
{
self.register_type::<T>();
}
}
/// Reflect-compatible custom JSON Schema for this type
#[derive(Clone, Deref)]
pub struct ReflectJsonSchema(pub JsonSchemaBevyType);