Read #[validate(...)] attributes
This commit is contained in:
parent
dada8582ee
commit
6ab567f3a5
13 changed files with 532 additions and 33 deletions
|
|
@ -390,32 +390,43 @@ fn expr_for_struct(
|
|||
|
||||
let mut type_defs = Vec::new();
|
||||
|
||||
let properties: Vec<_> = property_fields.into_iter().map(|field| {
|
||||
let name = field.name();
|
||||
let default = field_default_expr(field, set_container_default.is_some());
|
||||
let properties: Vec<_> = property_fields
|
||||
.into_iter()
|
||||
.map(|field| {
|
||||
let name = field.name();
|
||||
let default = field_default_expr(field, set_container_default.is_some());
|
||||
|
||||
let required = match default {
|
||||
Some(_) => quote!(false),
|
||||
None => quote!(true),
|
||||
};
|
||||
let required = match (&default, field.validation_attrs.required) {
|
||||
(Some(_), _) => quote!(Some(false)),
|
||||
(None, false) => quote!(None),
|
||||
(None, true) => quote!(Some(true)),
|
||||
};
|
||||
|
||||
let metadata = &SchemaMetadata {
|
||||
read_only: field.serde_attrs.skip_deserializing(),
|
||||
write_only: field.serde_attrs.skip_serializing(),
|
||||
default,
|
||||
..SchemaMetadata::from_attrs(&field.attrs)
|
||||
};
|
||||
let metadata = &SchemaMetadata {
|
||||
read_only: field.serde_attrs.skip_deserializing(),
|
||||
write_only: field.serde_attrs.skip_serializing(),
|
||||
default,
|
||||
..SchemaMetadata::from_attrs(&field.attrs)
|
||||
};
|
||||
|
||||
let (ty, type_def) = type_for_schema(field, type_defs.len());
|
||||
if let Some(type_def) = type_def {
|
||||
type_defs.push(type_def);
|
||||
}
|
||||
let (ty, type_def) = type_for_schema(field, type_defs.len());
|
||||
if let Some(type_def) = type_def {
|
||||
type_defs.push(type_def);
|
||||
}
|
||||
|
||||
quote_spanned! {ty.span()=>
|
||||
<#ty as schemars::JsonSchema>::add_schema_as_property(gen, &mut schema_object, #name.to_owned(), #metadata, #required);
|
||||
}
|
||||
let validation = field.validation_attrs.validation_statements(&name);
|
||||
|
||||
}).collect();
|
||||
quote_spanned! {ty.span()=>
|
||||
<#ty as schemars::JsonSchema>::add_schema_as_property(
|
||||
gen,
|
||||
&mut schema_object,
|
||||
#name.to_owned(),
|
||||
#metadata,
|
||||
#required);
|
||||
#validation
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
|
||||
let flattens: Vec<_> = flattened_fields
|
||||
.into_iter()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue