VienDesu/schemars
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix schema generation for complex enum variants

Browse source
This commit is contained in:
Graham Esau 2019-08-08 22:45:21 +01:00
parent 94250fa037
commit 936fb8c96e
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
schemars/Cargo.toml
View file

@ -2,14 +2,14 @@
name = "schemars" name = "schemars"
description = "Generate JSON Schemas from Rust code" description = "Generate JSON Schemas from Rust code"
repository = "https://github.com/GREsau/schemars" repository = "https://github.com/GREsau/schemars"
version = "0.1.1" version = "0.1.2"
authors = ["Graham Esau <gesau@hotmail.co.uk>"] authors = ["Graham Esau <gesau@hotmail.co.uk>"]
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"
keywords = ["rust", "json-schema", "serde"] keywords = ["rust", "json-schema", "serde"]
[dependencies] [dependencies]
schemars_derive = { version = "0.1.0", path = "../schemars_derive" } schemars_derive = { version = "0.1.2", path = "../schemars_derive" }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"

2
schemars_derive/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "schemars_derive" name = "schemars_derive"
description = "Macros for #[derive(MakeSchema)], for use with schemars" description = "Macros for #[derive(MakeSchema)], for use with schemars"
repository = "https://github.com/GREsau/schemars" repository = "https://github.com/GREsau/schemars"
version = "0.1.0" version = "0.1.2"
authors = ["Graham Esau <gesau@hotmail.co.uk>"] authors = ["Graham Esau <gesau@hotmail.co.uk>"]
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

14
schemars_derive/src/lib.rs
View file

@ -70,7 +70,7 @@ pub fn derive_make_schema(input: proc_macro::TokenStream) -> proc_macro::TokenSt
} }
fn make_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::Result { fn make_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::Result {
#schema Ok(#schema)
} }
}; };
}; };
@ -79,11 +79,11 @@ pub fn derive_make_schema(input: proc_macro::TokenStream) -> proc_macro::TokenSt
fn wrap_schema_fields(schema_contents: TokenStream) -> TokenStream { fn wrap_schema_fields(schema_contents: TokenStream) -> TokenStream {
quote! { quote! {
Ok(schemars::schema::Schema::Object( schemars::schema::Schema::Object(
schemars::schema::SchemaObject { schemars::schema::SchemaObject {
#schema_contents #schema_contents
..Default::default() ..Default::default()
})) })
} }
} }
@ -139,7 +139,11 @@ fn schema_for_external_tagged_enum(variants: &[Variant], cattrs: &attr::Containe
props.insert(#name.to_owned(), #sub_schema); props.insert(#name.to_owned(), #sub_schema);
props props
}, },
required: vec![#name.to_owned()], required: {
let mut required = schemars::Set::new();
required.insert(#name.to_owned());
required
},
}) })
})); }));
@ -212,7 +216,7 @@ fn schema_for_struct(fields: &[Field], cattrs: &attr::Container) -> TokenStream
let flattens = flat.iter().map(|f| { let flattens = flat.iter().map(|f| {
let ty = f.ty; let ty = f.ty;
quote_spanned! {f.original.span()=> quote_spanned! {f.original.span()=>
?.flatten(<#ty>::make_schema(gen)?) .flatten(<#ty>::make_schema(gen)?)?
} }
}); });