Start9/patch-db
2
0
Fork 0
mirror of https://github.com/Start9Labs/patch-db.git synced 2026-03-27 02:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

reorganize codebase

Browse Source
This commit is contained in:
Aiden McClelland
2021-03-30 12:32:40 -06:00
parent 42b4c74a14
commit 45bee2eda9
9 changed files with 1267 additions and 1070 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patch-db-macro-internals/src/lib.rs
View File

@@ -64,7 +64,7 @@ fn build_model_struct(
.attrs
.iter()
.filter(|attr| attr.path.is_ident("model"))
.filter_map(|attr| Some(attr.parse_args::<MetaNameValue>().unwrap()))
.filter_map(|attr| attr.parse_args::<MetaNameValue>().ok())
.filter(|nv| nv.path.is_ident("name"))
.find_map(|nv| match nv.lit {
Lit::Str(s) => Some(s),
@@ -127,6 +127,7 @@ fn build_model_struct(
}
Fields::Unnamed(f) => {
if f.unnamed.len() == 1 {
// newtype wrapper
let field = &f.unnamed[0];
let ty = &field.ty;
let inner_model: Type = if let Some(child_model_name) = field
@@ -145,7 +146,7 @@ fn build_model_struct(
} else if field.attrs.iter().any(|attr| attr.path.is_ident("model")) {
syn::parse2(quote! { <#ty as patch_db::HasModel>::Model }).unwrap()
} else {
syn::parse2(quote! { patch_db::Model<#ty> }).unwrap()
syn::parse2(quote! { patch_db::Model::<#ty> }).unwrap()
};
return quote! {
#[derive(Debug, Clone)]
@@ -156,14 +157,14 @@ fn build_model_struct(
&self.0
}
}
impl #model_name {
pub fn new(ptr: json_ptr::JsonPointer) -> Self {
#model_name(#inner_model::new(ptr))
impl From<json_ptr::JsonPointer> for #model_name {
fn from(ptr: json_ptr::JsonPointer) -> Self {
#model_name(#inner_model::from(ptr))
}
}
impl From<patch_db::Model<#base_name>> for #model_name {
fn from(model: patch_db::Model<#base_name>) -> Self {
#model_name(#inner_model::from(model))
#model_name(#inner_model::from(json_ptr::JsonPointer::from(model)))
}
}
impl From<#inner_model> for #model_name {
@@ -225,15 +226,17 @@ fn build_model_struct(
}
}
impl #model_name {
pub fn new(ptr: json_ptr::JsonPointer) -> Self {
#model_name(patch_db::Model::new(ptr))
}
#(
pub fn #child_fn_name(&self) -> #child_model {
self.0.child(#child_path).into()
}
)*
}
impl From<json_ptr::JsonPointer> for #model_name {
fn from(ptr: json_ptr::JsonPointer) -> Self {
#model_name(From::from(ptr))
}
}
impl From<patch_db::Model<#base_name>> for #model_name {
fn from(model: patch_db::Model<#base_name>) -> Self {
#model_name(model)