From a0386208b991ad3a4d19631331c7a8a4a61e767b Mon Sep 17 00:00:00 2001 From: Michael Vlach Date: Fri, 1 May 2026 21:16:55 +0200 Subject: [PATCH] remove obsolete derive alias --- agdb/src/db/db_element.rs | 2 +- agdb/src/db/db_f64.rs | 2 +- agdb/src/db/db_id.rs | 2 +- agdb/src/db/db_key_order.rs | 4 +- agdb/src/db/db_key_value.rs | 2 +- agdb/src/db/db_value.rs | 4 +- agdb/src/lib.rs | 2 +- agdb/src/query.rs | 2 +- agdb/src/query/insert_aliases_query.rs | 2 +- agdb/src/query/insert_edges_query.rs | 2 +- agdb/src/query/insert_index_query.rs | 2 +- agdb/src/query/insert_nodes_query.rs | 2 +- agdb/src/query/insert_values_query.rs | 2 +- agdb/src/query/query_aliases.rs | 2 +- agdb/src/query/query_condition.rs | 14 +++---- agdb/src/query/query_id.rs | 2 +- agdb/src/query/query_ids.rs | 2 +- agdb/src/query/query_result.rs | 2 +- agdb/src/query/query_values.rs | 6 +-- agdb/src/query/remove_aliases_query.rs | 2 +- agdb/src/query/remove_index_query.rs | 2 +- agdb/src/query/remove_query.rs | 2 +- agdb/src/query/remove_values_query.rs | 2 +- agdb/src/query/search_query.rs | 4 +- agdb/src/query/select_aliases_query.rs | 2 +- agdb/src/query/select_all_aliases_query.rs | 2 +- agdb/src/query/select_edge_count_query.rs | 2 +- agdb/src/query/select_indexes_query.rs | 2 +- agdb/src/query/select_key_count_query.rs | 2 +- agdb/src/query/select_keys_query.rs | 2 +- agdb/src/query/select_node_count.rs | 2 +- agdb/src/query/select_values_query.rs | 2 +- agdb/src/type_def.rs | 16 +++---- agdb/src/type_def/enum_def.rs | 26 ++++++------ agdb/src/type_def/expression_def.rs | 6 +-- agdb/src/type_def/function_def.rs | 2 +- agdb/src/type_def/impl_def.rs | 8 ++-- agdb/src/type_def/struct_def.rs | 24 +++++------ agdb/src/type_def/trait_def.rs | 2 +- agdb/tests/api_def_reflection_test.rs | 46 ++++++++++----------- agdb_api/rust/src/api_error.rs | 2 +- agdb_api/rust/src/api_types.rs | 28 ++++++------- agdb_api/rust/src/api_types/config_impl.rs | 2 +- agdb_api/rust/src/test_server/test_error.rs | 2 +- agdb_derive/src/lib.rs | 5 --- agdb_server/src/routes/admin.rs | 2 +- agdb_server/src/routes/admin/db.rs | 2 +- agdb_server/src/routes/db.rs | 8 ++-- agdb_server/src/routes/db/user.rs | 2 +- 49 files changed, 132 insertions(+), 137 deletions(-) diff --git a/agdb/src/db/db_element.rs b/agdb/src/db/db_element.rs index 0e9319b3..78964bfb 100644 --- a/agdb/src/db/db_element.rs +++ b/agdb/src/db/db_element.rs @@ -6,7 +6,7 @@ use crate::DbKeyValue; #[derive(Debug, PartialEq, Eq, Clone, PartialOrd, Ord)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct DbElement { /// Element id. pub id: DbId, diff --git a/agdb/src/db/db_f64.rs b/agdb/src/db/db_f64.rs index 3198cb2e..838e422c 100644 --- a/agdb/src/db/db_f64.rs +++ b/agdb/src/db/db_f64.rs @@ -14,7 +14,7 @@ use std::hash::Hasher; #[derive(Clone, Copy, Debug)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct DbF64(f64); impl DbF64 { diff --git a/agdb/src/db/db_id.rs b/agdb/src/db/db_id.rs index 0839fcb1..a2655e94 100644 --- a/agdb/src/db/db_id.rs +++ b/agdb/src/db/db_id.rs @@ -15,7 +15,7 @@ use crate::utilities::stable_hash::StableHash; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct DbId(pub i64); impl StableHash for DbId { diff --git a/agdb/src/db/db_key_order.rs b/agdb/src/db/db_key_order.rs index a6698fad..2451d27e 100644 --- a/agdb/src/db/db_key_order.rs +++ b/agdb/src/db/db_key_order.rs @@ -5,7 +5,7 @@ use crate::DbValue; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub enum DbKeyOrder { /// Ascending order (from smallest) Asc(DbValue), @@ -14,7 +14,7 @@ pub enum DbKeyOrder { Desc(DbValue), } -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct DbKeyOrders(pub Vec); impl From> for DbKeyOrders { diff --git a/agdb/src/db/db_key_value.rs b/agdb/src/db/db_key_value.rs index 699207ed..853fa8c7 100644 --- a/agdb/src/db/db_key_value.rs +++ b/agdb/src/db/db_key_value.rs @@ -16,7 +16,7 @@ use crate::utilities::serialize::SerializeStatic; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct DbKeyValue { /// Key of the property pub key: DbValue, diff --git a/agdb/src/db/db_value.rs b/agdb/src/db/db_value.rs index 885880c3..8d6d9a5d 100644 --- a/agdb/src/db/db_value.rs +++ b/agdb/src/db/db_value.rs @@ -29,7 +29,7 @@ use std::time::SystemTime; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub enum DbValue { /// Byte array, sometimes referred to as blob Bytes(Vec), @@ -59,7 +59,7 @@ pub enum DbValue { VecString(Vec), } -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct DbValues(pub Vec); const BYTES_META_VALUE: u8 = 1_u8; diff --git a/agdb/src/lib.rs b/agdb/src/lib.rs index d57eb726..6c2c2ab7 100644 --- a/agdb/src/lib.rs +++ b/agdb/src/lib.rs @@ -46,7 +46,7 @@ pub use agdb_derive::{DbElement, DbSerialize, DbType, DbTypeMarker, DbValue}; pub mod type_def; #[cfg(feature = "api")] -pub use agdb_derive::{TypeDef, TypeDefImpl, fn_def, impl_def, test_def, trait_def}; +pub use agdb_derive::{TypeDef, fn_def, impl_def, test_def, trait_def}; #[cfg(feature = "api")] #[rustfmt::skip] diff --git a/agdb/src/query.rs b/agdb/src/query.rs index 4c4b021f..97df8428 100644 --- a/agdb/src/query.rs +++ b/agdb/src/query.rs @@ -53,7 +53,7 @@ use crate::{ #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] #[expect(clippy::large_enum_variant)] pub enum QueryType { diff --git a/agdb/src/query/insert_aliases_query.rs b/agdb/src/query/insert_aliases_query.rs index f20b0031..435bbebc 100644 --- a/agdb/src/query/insert_aliases_query.rs +++ b/agdb/src/query/insert_aliases_query.rs @@ -16,7 +16,7 @@ use crate::StorageData; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct InsertAliasesQuery { /// Ids to be aliased diff --git a/agdb/src/query/insert_edges_query.rs b/agdb/src/query/insert_edges_query.rs index 36d6c5da..ba96d960 100644 --- a/agdb/src/query/insert_edges_query.rs +++ b/agdb/src/query/insert_edges_query.rs @@ -29,7 +29,7 @@ use crate::query::query_values::QueryValues; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct InsertEdgesQuery { /// Origins diff --git a/agdb/src/query/insert_index_query.rs b/agdb/src/query/insert_index_query.rs index 940e8817..f6064d63 100644 --- a/agdb/src/query/insert_index_query.rs +++ b/agdb/src/query/insert_index_query.rs @@ -10,7 +10,7 @@ use crate::StorageData; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct InsertIndexQuery(pub DbValue); diff --git a/agdb/src/query/insert_nodes_query.rs b/agdb/src/query/insert_nodes_query.rs index 8358f421..3468f6b8 100644 --- a/agdb/src/query/insert_nodes_query.rs +++ b/agdb/src/query/insert_nodes_query.rs @@ -28,7 +28,7 @@ use crate::query::query_values::QueryValues; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct InsertNodesQuery { /// Number of nodes to be inserted. diff --git a/agdb/src/query/insert_values_query.rs b/agdb/src/query/insert_values_query.rs index fc8815f1..975f66bd 100644 --- a/agdb/src/query/insert_values_query.rs +++ b/agdb/src/query/insert_values_query.rs @@ -25,7 +25,7 @@ use crate::query_builder::search::SearchQueryBuilder; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct InsertValuesQuery { /// Ids whose properties should be updated diff --git a/agdb/src/query/query_aliases.rs b/agdb/src/query/query_aliases.rs index 392310d6..d5756516 100644 --- a/agdb/src/query/query_aliases.rs +++ b/agdb/src/query/query_aliases.rs @@ -1,7 +1,7 @@ /// Wrapper around `Vec` to provide /// several convenient conversions for the /// [`QueryBuilder`]. -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct QueryAliases(pub Vec); impl> From> for QueryAliases { diff --git a/agdb/src/query/query_condition.rs b/agdb/src/query/query_condition.rs index 4b1850c7..0c56e837 100644 --- a/agdb/src/query/query_condition.rs +++ b/agdb/src/query/query_condition.rs @@ -7,7 +7,7 @@ use crate::graph_search::SearchControl; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub enum QueryConditionLogic { /// Logical AND (&&) And, @@ -21,7 +21,7 @@ pub enum QueryConditionLogic { #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub enum QueryConditionModifier { /// No modifier None, @@ -45,7 +45,7 @@ pub enum QueryConditionModifier { #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub enum QueryConditionData { /// Distance from the search origin. Takes count comparison /// (e.g. Equal, GreaterThan). @@ -93,7 +93,7 @@ pub enum QueryConditionData { #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct QueryCondition { /// Logic operator (e.g. And, Or) pub logic: QueryConditionLogic, @@ -114,7 +114,7 @@ pub struct QueryCondition { #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub enum CountComparison { /// property == this Equal(u64), @@ -147,7 +147,7 @@ pub enum CountComparison { #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub enum Comparison { /// property == this Equal(DbValue), @@ -183,7 +183,7 @@ pub enum Comparison { #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct KeyValueComparison { /// Property key pub key: DbValue, diff --git a/agdb/src/query/query_id.rs b/agdb/src/query/query_id.rs index 7736736c..e07e88bd 100644 --- a/agdb/src/query/query_id.rs +++ b/agdb/src/query/query_id.rs @@ -7,7 +7,7 @@ use crate::DbId; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub enum QueryId { /// Numerical id as [`DbId`] Id(DbId), diff --git a/agdb/src/query/query_ids.rs b/agdb/src/query/query_ids.rs index f25fb591..d2c8c746 100644 --- a/agdb/src/query/query_ids.rs +++ b/agdb/src/query/query_ids.rs @@ -12,7 +12,7 @@ use crate::SearchQuery; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub enum QueryIds { /// List of [`QueryId`]s Ids(Vec), diff --git a/agdb/src/query/query_result.rs b/agdb/src/query/query_result.rs index f53dd15f..d29b4838 100644 --- a/agdb/src/query/query_result.rs +++ b/agdb/src/query/query_result.rs @@ -12,7 +12,7 @@ use crate::db::db_element::DbElement; #[derive(Debug, Default, Eq, PartialOrd, Ord, PartialEq, Clone)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct QueryResult { /// Query result pub result: i64, diff --git a/agdb/src/query/query_values.rs b/agdb/src/query/query_values.rs index 435994d0..61f15abc 100644 --- a/agdb/src/query/query_values.rs +++ b/agdb/src/query/query_values.rs @@ -6,7 +6,7 @@ use crate::DbType; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub enum QueryValues { /// Single list of properties (key-value pairs) @@ -22,12 +22,12 @@ pub enum QueryValues { /// Convenient wrapper for the [`QueryBuilder`] to /// allow properties conversions. Represents `QueryValues::Single`. -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct SingleValues(pub Vec); /// Convenient wrapper for the [`QueryBuilder`] to /// allow properties conversions. Represents `QueryValues::Multi`. -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct MultiValues(pub Vec>); impl From> for SingleValues { diff --git a/agdb/src/query/remove_aliases_query.rs b/agdb/src/query/remove_aliases_query.rs index 2bef3579..e7bc907f 100644 --- a/agdb/src/query/remove_aliases_query.rs +++ b/agdb/src/query/remove_aliases_query.rs @@ -13,7 +13,7 @@ use crate::StorageData; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct RemoveAliasesQuery(pub Vec); diff --git a/agdb/src/query/remove_index_query.rs b/agdb/src/query/remove_index_query.rs index 6dec679a..83ae2133 100644 --- a/agdb/src/query/remove_index_query.rs +++ b/agdb/src/query/remove_index_query.rs @@ -10,7 +10,7 @@ use crate::StorageData; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct RemoveIndexQuery(pub DbValue); diff --git a/agdb/src/query/remove_query.rs b/agdb/src/query/remove_query.rs index 64a41a4d..cc1fbe6b 100644 --- a/agdb/src/query/remove_query.rs +++ b/agdb/src/query/remove_query.rs @@ -17,7 +17,7 @@ use crate::query_builder::search::SearchQueryBuilder; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct RemoveQuery(pub QueryIds); diff --git a/agdb/src/query/remove_values_query.rs b/agdb/src/query/remove_values_query.rs index d1bb5844..6525d1de 100644 --- a/agdb/src/query/remove_values_query.rs +++ b/agdb/src/query/remove_values_query.rs @@ -16,7 +16,7 @@ use crate::query_builder::search::SearchQueryBuilder; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct RemoveValuesQuery(pub SelectValuesQuery); diff --git a/agdb/src/query/search_query.rs b/agdb/src/query/search_query.rs index c7cde2fc..e7908608 100644 --- a/agdb/src/query/search_query.rs +++ b/agdb/src/query/search_query.rs @@ -17,7 +17,7 @@ use std::cmp::Ordering; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Debug, Clone, Copy, PartialEq)] pub enum SearchQueryAlgorithm { /// Examines each distance level from the search origin in full @@ -45,7 +45,7 @@ pub enum SearchQueryAlgorithm { #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct SearchQuery { /// Search algorithm to be used. Will be bypassed for path /// searches that unconditionally use A*. diff --git a/agdb/src/query/select_aliases_query.rs b/agdb/src/query/select_aliases_query.rs index 35467444..7215eb34 100644 --- a/agdb/src/query/select_aliases_query.rs +++ b/agdb/src/query/select_aliases_query.rs @@ -18,7 +18,7 @@ use crate::query_builder::search::SearchQueryBuilder; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct SelectAliasesQuery(pub QueryIds); diff --git a/agdb/src/query/select_all_aliases_query.rs b/agdb/src/query/select_all_aliases_query.rs index de7bb118..ca1e4d2f 100644 --- a/agdb/src/query/select_all_aliases_query.rs +++ b/agdb/src/query/select_all_aliases_query.rs @@ -13,7 +13,7 @@ use crate::StorageData; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct SelectAllAliasesQuery {} diff --git a/agdb/src/query/select_edge_count_query.rs b/agdb/src/query/select_edge_count_query.rs index 7d102bfd..54c5c672 100644 --- a/agdb/src/query/select_edge_count_query.rs +++ b/agdb/src/query/select_edge_count_query.rs @@ -23,7 +23,7 @@ use crate::query_builder::search::SearchQueryBuilder; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct SelectEdgeCountQuery { /// Ids of the nodes to select edge count for. diff --git a/agdb/src/query/select_indexes_query.rs b/agdb/src/query/select_indexes_query.rs index b7ff0693..56955cde 100644 --- a/agdb/src/query/select_indexes_query.rs +++ b/agdb/src/query/select_indexes_query.rs @@ -15,7 +15,7 @@ use crate::StorageData; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct SelectIndexesQuery {} diff --git a/agdb/src/query/select_key_count_query.rs b/agdb/src/query/select_key_count_query.rs index 22e784d1..204469b4 100644 --- a/agdb/src/query/select_key_count_query.rs +++ b/agdb/src/query/select_key_count_query.rs @@ -17,7 +17,7 @@ use crate::query_builder::search::SearchQueryBuilder; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct SelectKeyCountQuery(pub QueryIds); diff --git a/agdb/src/query/select_keys_query.rs b/agdb/src/query/select_keys_query.rs index 2e8348cc..d55214eb 100644 --- a/agdb/src/query/select_keys_query.rs +++ b/agdb/src/query/select_keys_query.rs @@ -17,7 +17,7 @@ use crate::query_builder::search::SearchQueryBuilder; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct SelectKeysQuery(pub QueryIds); diff --git a/agdb/src/query/select_node_count.rs b/agdb/src/query/select_node_count.rs index 13dc8b86..cd74cee8 100644 --- a/agdb/src/query/select_node_count.rs +++ b/agdb/src/query/select_node_count.rs @@ -14,7 +14,7 @@ use crate::StorageData; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct SelectNodeCountQuery {} diff --git a/agdb/src/query/select_values_query.rs b/agdb/src/query/select_values_query.rs index e4eaa8e6..ed9c3909 100644 --- a/agdb/src/query/select_values_query.rs +++ b/agdb/src/query/select_values_query.rs @@ -18,7 +18,7 @@ use crate::query_builder::search::SearchQueryBuilder; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))] #[cfg_attr(feature = "derive", derive(agdb::DbSerialize))] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[derive(Clone, Debug, PartialEq)] pub struct SelectValuesQuery { pub keys: Vec, diff --git a/agdb/src/type_def.rs b/agdb/src/type_def.rs index d0e1dec9..17a6f7aa 100644 --- a/agdb/src/type_def.rs +++ b/agdb/src/type_def.rs @@ -36,7 +36,7 @@ pub trait TypeDefinition { } } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub enum Type { Enum(Enum), Function(Function), @@ -88,40 +88,40 @@ impl Type { } } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub struct Variable { pub name: &'static str, pub ty: Option Type>, } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub struct Generic { pub kind: GenericKind, pub name: &'static str, pub bounds: &'static [fn() -> Type], } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub enum GenericKind { Type, Lifetime, Const, } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub struct Reference { pub mutable: bool, pub lifetime: Option<&'static str>, pub ty: fn() -> Type, } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub struct Pointer { pub kind: PointerKind, pub ty: fn() -> Type, } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub enum PointerKind { Arc, ArcWeak, @@ -142,7 +142,7 @@ pub enum PointerKind { UnsafeCell, } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub enum Literal { Bool, F32, diff --git a/agdb/src/type_def/enum_def.rs b/agdb/src/type_def/enum_def.rs index 01677f33..a0c9701f 100644 --- a/agdb/src/type_def/enum_def.rs +++ b/agdb/src/type_def/enum_def.rs @@ -1,7 +1,7 @@ use crate::type_def::Generic; use crate::type_def::Variable; -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub struct Enum { pub name: &'static str, pub generics: &'static [Generic], @@ -17,7 +17,7 @@ mod tests { #[test] fn empty_enum() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] enum E {} let Type::Enum(e) = E::type_def() else { @@ -29,7 +29,7 @@ mod tests { #[test] fn enum_with_variants() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E { A, @@ -64,7 +64,7 @@ mod tests { #[test] fn enum_with_typed_variant() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E { A(String), @@ -89,7 +89,7 @@ mod tests { #[test] fn enum_with_struct_variant() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E { A { _a: String }, @@ -119,7 +119,7 @@ mod tests { #[test] fn enum_with_tuple_variant() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E { A(String, i32), @@ -150,7 +150,7 @@ mod tests { #[test] fn generic_enum() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E { A(T), @@ -184,7 +184,7 @@ mod tests { impl MyTrait for i32 {} - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E { A(T), @@ -235,7 +235,7 @@ mod tests { #[test] fn generic_enum_with_where_clause() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E where @@ -277,7 +277,7 @@ mod tests { #[test] fn generic_enum_with_struct_variant() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E { A { _a: T }, @@ -310,7 +310,7 @@ mod tests { #[test] fn generic_enum_with_tuple_variant_multiple_types() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E { A(T, i32), @@ -348,7 +348,7 @@ mod tests { #[test] fn enum_with_lifetime() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E<'a> { A(&'a str), @@ -367,7 +367,7 @@ mod tests { #[test] fn enum_with_const_generic() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] enum E { A, diff --git a/agdb/src/type_def/expression_def.rs b/agdb/src/type_def/expression_def.rs index 6ea615b6..53447434 100644 --- a/agdb/src/type_def/expression_def.rs +++ b/agdb/src/type_def/expression_def.rs @@ -1,7 +1,7 @@ use crate::type_def::Function; use crate::type_def::Type; -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub enum Expression { Array(&'static [Expression]), Assign { @@ -93,7 +93,7 @@ pub enum Expression { Wild, } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub enum LiteralValue { Bool(bool), F32(f32), @@ -112,7 +112,7 @@ pub enum LiteralValue { Usize(usize), } -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub enum Op { Add, AddAssign, diff --git a/agdb/src/type_def/function_def.rs b/agdb/src/type_def/function_def.rs index 68c45eda..7815ef38 100644 --- a/agdb/src/type_def/function_def.rs +++ b/agdb/src/type_def/function_def.rs @@ -3,7 +3,7 @@ use crate::type_def::Type; use crate::type_def::Variable; use crate::type_def::expression_def::Expression; -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub struct Function { pub name: &'static str, pub generics: &'static [Generic], diff --git a/agdb/src/type_def/impl_def.rs b/agdb/src/type_def/impl_def.rs index 103f2d43..1c600dbe 100644 --- a/agdb/src/type_def/impl_def.rs +++ b/agdb/src/type_def/impl_def.rs @@ -2,7 +2,7 @@ use crate::type_def::Function; use crate::type_def::Generic; use crate::type_def::Type; -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub struct Impl { pub name: &'static str, pub generics: &'static [Generic], @@ -17,13 +17,13 @@ mod tests { use crate::type_def::Type; use crate::type_def::TypeDefinition; - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] struct ConstImplS; #[test] fn empty_impl() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S; assert!(S::impl_defs().is_empty()); @@ -35,7 +35,7 @@ mod tests { #[allow(dead_code)] trait MyTrait {} - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S; assert!(S::impl_defs().is_empty()); diff --git a/agdb/src/type_def/struct_def.rs b/agdb/src/type_def/struct_def.rs index 2df64453..7a80f94e 100644 --- a/agdb/src/type_def/struct_def.rs +++ b/agdb/src/type_def/struct_def.rs @@ -1,7 +1,7 @@ use crate::type_def::Generic; use crate::type_def::Variable; -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub struct Struct { pub name: &'static str, pub generics: &'static [Generic], @@ -17,7 +17,7 @@ mod tests { #[test] fn empty_struct() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S {} let Type::Struct(s) = S::type_def() else { @@ -29,7 +29,7 @@ mod tests { #[test] fn empty_struct_no_braces() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S; let Type::Struct(s) = S::type_def() else { @@ -41,7 +41,7 @@ mod tests { #[test] fn struct_with_fields() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S { _a: i32, _b: String, @@ -59,7 +59,7 @@ mod tests { #[test] fn tuple_struct_with_fields() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] struct S(i32, String); @@ -86,7 +86,7 @@ mod tests { #[test] fn field_types() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S { _a: i32, } @@ -104,7 +104,7 @@ mod tests { #[test] fn generic_struct() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S { _a: T, } @@ -134,7 +134,7 @@ mod tests { impl MyTrait for i32 {} - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S { _a: T, } @@ -170,7 +170,7 @@ mod tests { #[test] fn generic_struct_with_where_clause() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S where T: agdb::type_def::TypeDefinition, @@ -203,7 +203,7 @@ mod tests { #[test] fn generic_tuple_struct() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S(T); let Type::Struct(s) = S::::type_def() else { @@ -226,7 +226,7 @@ mod tests { #[test] fn struct_with_lifetime() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] struct S<'a> { _a: &'a str, @@ -245,7 +245,7 @@ mod tests { #[test] fn struct_with_const_generic() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[allow(dead_code)] struct S; diff --git a/agdb/src/type_def/trait_def.rs b/agdb/src/type_def/trait_def.rs index 8bee1d57..add6fe88 100644 --- a/agdb/src/type_def/trait_def.rs +++ b/agdb/src/type_def/trait_def.rs @@ -2,7 +2,7 @@ use crate::type_def::Function; use crate::type_def::Generic; use crate::type_def::Type; -#[derive(Debug, agdb::TypeDefImpl)] +#[derive(Debug, agdb::TypeDef)] pub struct Trait { pub name: &'static str, pub generics: &'static [Generic], diff --git a/agdb/tests/api_def_reflection_test.rs b/agdb/tests/api_def_reflection_test.rs index d8c84370..a7f438cf 100644 --- a/agdb/tests/api_def_reflection_test.rs +++ b/agdb/tests/api_def_reflection_test.rs @@ -126,7 +126,7 @@ fn function_pointer_type_def() { #[test] fn empty_struct() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S {} let Type::Struct(s) = S::type_def() else { @@ -138,7 +138,7 @@ fn empty_struct() { #[test] fn empty_struct_no_braces() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S; let Type::Struct(s) = S::type_def() else { @@ -150,7 +150,7 @@ fn empty_struct_no_braces() { #[test] fn struct_with_fields() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S { _a: i32, _b: String, @@ -167,7 +167,7 @@ fn struct_with_fields() { #[test] fn tuple_struct_with_fields() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] struct S(i32, String); @@ -190,7 +190,7 @@ fn tuple_struct_with_fields() { #[test] fn field_types() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S { _a: i32, } @@ -207,7 +207,7 @@ fn field_types() { #[test] fn generic_struct() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S { _a: T, } @@ -231,7 +231,7 @@ fn generic_struct_with_bounds() { impl MyTrait for i32 {} - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S { _a: T, } @@ -252,7 +252,7 @@ fn generic_struct_with_bounds() { #[test] fn generic_struct_with_where_clause() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S where T: agdb::type_def::TypeDefinition, @@ -275,7 +275,7 @@ fn generic_struct_with_where_clause() { #[test] fn generic_tuple_struct() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S(T); let Type::Struct(s) = S::::type_def() else { @@ -292,7 +292,7 @@ fn generic_tuple_struct() { #[test] fn struct_with_lifetime() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S<'a> { _a: &'a str, } @@ -308,7 +308,7 @@ fn struct_with_lifetime() { #[test] fn struct_with_const_generic() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] struct S; let Type::Struct(s) = S::<1>::type_def() else { @@ -327,7 +327,7 @@ fn struct_with_const_generic() { #[test] fn empty_enum() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] enum E {} let Type::Enum(e) = E::type_def() else { @@ -339,7 +339,7 @@ fn empty_enum() { #[test] fn enum_with_variants() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E { A, @@ -365,7 +365,7 @@ fn enum_with_variants() { #[test] fn enum_with_typed_variant() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E { A(String), @@ -383,7 +383,7 @@ fn enum_with_typed_variant() { #[test] fn enum_with_struct_variant() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E { A { _a: String }, @@ -406,7 +406,7 @@ fn enum_with_struct_variant() { #[test] fn enum_with_tuple_variant() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E { A(String, i32), @@ -426,7 +426,7 @@ fn enum_with_tuple_variant() { #[test] fn generic_enum() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E { A(T), @@ -451,7 +451,7 @@ fn generic_enum_with_bounds() { impl MyTrait for i32 {} - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E { A(T), @@ -470,7 +470,7 @@ fn generic_enum_with_bounds() { #[test] fn generic_enum_with_where_clause() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E where @@ -491,7 +491,7 @@ fn generic_enum_with_where_clause() { #[test] fn generic_enum_with_struct_variant() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E { A { _a: T }, @@ -512,7 +512,7 @@ fn generic_enum_with_struct_variant() { #[test] fn generic_enum_with_tuple_variant_multiple_types() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E { A(T, i32), @@ -534,7 +534,7 @@ fn generic_enum_with_tuple_variant_multiple_types() { #[test] fn enum_with_lifetime() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E<'a> { A(&'a str), @@ -550,7 +550,7 @@ fn enum_with_lifetime() { #[test] fn enum_with_const_generic() { - #[derive(agdb::TypeDefImpl)] + #[derive(agdb::TypeDef)] #[expect(dead_code)] enum E { A, diff --git a/agdb_api/rust/src/api_error.rs b/agdb_api/rust/src/api_error.rs index 0bed6c25..0814ec4a 100644 --- a/agdb_api/rust/src/api_error.rs +++ b/agdb_api/rust/src/api_error.rs @@ -1,5 +1,5 @@ #[derive(Debug)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct AgdbApiError { pub status: u16, pub description: String, diff --git a/agdb_api/rust/src/api_types.rs b/agdb_api/rust/src/api_types.rs index 49376e94..3a4a6f76 100644 --- a/agdb_api/rust/src/api_types.rs +++ b/agdb_api/rust/src/api_types.rs @@ -13,7 +13,7 @@ use utoipa::ToSchema; #[derive( Debug, Default, Clone, Copy, Serialize, Deserialize, ToSchema, PartialEq, Eq, PartialOrd, Ord, )] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[serde(rename_all = "snake_case")] pub enum LogLevelFilter { Off, @@ -39,7 +39,7 @@ pub enum LogLevelFilter { Ord, DbSerialize, )] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[serde(rename_all = "snake_case")] pub enum DbKind { #[default] @@ -62,7 +62,7 @@ pub enum DbKind { Ord, DbSerialize, )] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[serde(rename_all = "snake_case")] pub enum DbResource { #[default] @@ -73,7 +73,7 @@ pub enum DbResource { } #[derive(Debug, Deserialize, Serialize, ToSchema, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct DbUser { pub username: String, pub role: DbUserRole, @@ -93,7 +93,7 @@ pub struct DbUser { Ord, DbSerialize, )] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] #[serde(rename_all = "snake_case")] pub enum DbUserRole { #[default] @@ -103,14 +103,14 @@ pub enum DbUserRole { } #[derive(Deserialize, Serialize, ToSchema)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct ChangePassword { pub password: String, pub new_password: String, } #[derive(Debug, Default, Clone, Deserialize, Serialize, ToSchema, PartialEq)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct ClusterStatus { pub address: String, pub status: bool, @@ -118,7 +118,7 @@ pub struct ClusterStatus { } #[derive(Debug, Default, Clone, Deserialize, Serialize, ToSchema, PartialEq)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct AdminStatus { pub uptime: u64, pub dbs: u64, @@ -135,7 +135,7 @@ pub struct Queries(pub Vec); pub struct QueriesResults(pub Vec); #[derive(Debug, Deserialize, Serialize, ToSchema, PartialEq)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct QueryAudit { pub timestamp: u64, pub username: String, @@ -143,11 +143,11 @@ pub struct QueryAudit { } #[derive(Debug, Deserialize, Serialize, ToSchema, PartialEq)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct DbAudit(pub Vec); #[derive(Debug, Default, Deserialize, Serialize, ToSchema, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct ServerDatabase { pub db: String, pub owner: String, @@ -158,20 +158,20 @@ pub struct ServerDatabase { } #[derive(Deserialize, Serialize, ToSchema)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct UserCredentials { pub password: String, } #[derive(Deserialize, Serialize, ToSchema)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct UserLogin { pub username: String, pub password: String, } #[derive(Debug, Deserialize, Serialize, ToSchema, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct UserStatus { pub username: String, pub login: bool, diff --git a/agdb_api/rust/src/api_types/config_impl.rs b/agdb_api/rust/src/api_types/config_impl.rs index 6fb0aa93..fefde58b 100644 --- a/agdb_api/rust/src/api_types/config_impl.rs +++ b/agdb_api/rust/src/api_types/config_impl.rs @@ -5,7 +5,7 @@ pub const DEFAULT_LOG_BODY_LIMIT: u64 = 10 * 1024; pub const DEFAULT_REQUEST_BODY_LIMIT: u64 = 10 * 1024 * 1024; #[derive(Debug)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct ConfigImpl { pub bind: String, pub address: String, diff --git a/agdb_api/rust/src/test_server/test_error.rs b/agdb_api/rust/src/test_server/test_error.rs index 2713ccb2..59a118e2 100644 --- a/agdb_api/rust/src/test_server/test_error.rs +++ b/agdb_api/rust/src/test_server/test_error.rs @@ -2,7 +2,7 @@ use crate::AgdbApiError; use std::env::VarError; #[derive(Debug)] -#[cfg_attr(feature = "api", derive(agdb::TypeDefImpl))] +#[cfg_attr(feature = "api", derive(agdb::TypeDef))] pub struct TestError { description: String, } diff --git a/agdb_derive/src/lib.rs b/agdb_derive/src/lib.rs index 643a45fb..e5506511 100644 --- a/agdb_derive/src/lib.rs +++ b/agdb_derive/src/lib.rs @@ -142,11 +142,6 @@ pub fn type_def(item: TokenStream) -> TokenStream { type_def_parser::type_def_impl(item) } -#[proc_macro_derive(TypeDefImpl, attributes(type_def))] -pub fn type_def_impl(item: TokenStream) -> TokenStream { - type_def_parser::type_def_impl(item) -} - #[proc_macro_attribute] pub fn impl_def(attr: TokenStream, item: TokenStream) -> TokenStream { type_def_parser::impl_def_impl(attr, item) diff --git a/agdb_server/src/routes/admin.rs b/agdb_server/src/routes/admin.rs index f3818334..9868dce1 100644 --- a/agdb_server/src/routes/admin.rs +++ b/agdb_server/src/routes/admin.rs @@ -24,7 +24,7 @@ use tracing_subscriber::reload::Handle; use utoipa::IntoParams; use utoipa::ToSchema; -#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDefImpl)] +#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDef)] #[into_params(parameter_in = Query)] pub struct SetLogLevelRequest { pub new_level: LogLevelFilter, diff --git a/agdb_server/src/routes/admin/db.rs b/agdb_server/src/routes/admin/db.rs index 03b1485b..6b897aa5 100644 --- a/agdb_server/src/routes/admin/db.rs +++ b/agdb_server/src/routes/admin/db.rs @@ -39,7 +39,7 @@ use serde::Deserialize; use utoipa::IntoParams; use utoipa::ToSchema; -#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDefImpl)] +#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDef)] #[into_params(parameter_in = Query)] pub struct ServerDatabaseAdminRename { pub new_owner: String, diff --git a/agdb_server/src/routes/db.rs b/agdb_server/src/routes/db.rs index 9c4315df..a8708dbb 100644 --- a/agdb_server/src/routes/db.rs +++ b/agdb_server/src/routes/db.rs @@ -38,25 +38,25 @@ use serde::Deserialize; use utoipa::IntoParams; use utoipa::ToSchema; -#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDefImpl)] +#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDef)] #[into_params(parameter_in = Query)] pub struct ServerDatabaseRename { pub new_db: String, } -#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDefImpl)] +#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDef)] #[into_params(parameter_in = Query)] pub(crate) struct DbTypeParam { pub(crate) db_type: DbKind, } -#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDefImpl)] +#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDef)] #[into_params(parameter_in = Query)] pub struct ServerDatabaseResource { pub resource: DbResource, } -#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDefImpl)] +#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDef)] #[into_params(parameter_in = Query)] pub struct OptimizeParam { pub shrink_to_fit: Option, diff --git a/agdb_server/src/routes/db/user.rs b/agdb_server/src/routes/db/user.rs index ee33d163..ba7027cd 100644 --- a/agdb_server/src/routes/db/user.rs +++ b/agdb_server/src/routes/db/user.rs @@ -17,7 +17,7 @@ use serde::Deserialize; use utoipa::IntoParams; use utoipa::ToSchema; -#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDefImpl)] +#[derive(Deserialize, IntoParams, ToSchema, agdb::TypeDef)] #[into_params(parameter_in = Query)] pub(crate) struct DbUserRoleParam { pub(crate) db_role: DbUserRole,