Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Parent_Child instead of Parent[Child] for generated intermediate type #340

Merged
merged 1 commit into from
Jul 26, 2022
Merged

Use Parent_Child instead of Parent[Child] for generated intermediate type #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion poem-openapi-derive/src/union.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pub(crate) fn generate(args: DeriveInput) -> GeneratorResult<TokenStream> {
1 => {
let object_ty = &variant.fields.fields[0];
let schema_name = quote! {
::std::format!("{}[{}]", <Self as #crate_name::types::Type>::name(), <#object_ty as #crate_name::types::Type>::name())
::std::format!("{}_{}", <Self as #crate_name::types::Type>::name(), <#object_ty as #crate_name::types::Type>::name())
};
let mapping_name = match &variant.mapping {
Some(mapping) => quote!(::std::string::ToString::to_string(#mapping)),
Expand Down
24 changes: 12 additions & 12 deletions poem-openapi/tests/union.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@ fn with_discriminator() {
discriminator: Some(MetaDiscriminatorObject {
property_name: "type",
mapping: vec![
("A".to_string(), "#/components/schemas/MyObj[A]".to_string()),
("B".to_string(), "#/components/schemas/MyObj[B]".to_string()),
("A".to_string(), "#/components/schemas/MyObj_A".to_string()),
("B".to_string(), "#/components/schemas/MyObj_B".to_string()),
]
}),
any_of: vec![
MetaSchemaRef::Reference("MyObj[A]".to_string()),
MetaSchemaRef::Reference("MyObj[B]".to_string()),
MetaSchemaRef::Reference("MyObj_A".to_string()),
MetaSchemaRef::Reference("MyObj_B".to_string()),
],
..MetaSchema::ANY
}
);

let schema_myobj_a = get_meta_by_name::<MyObj>("MyObj[A]");
let schema_myobj_a = get_meta_by_name::<MyObj>("MyObj_A");
assert_eq!(
schema_myobj_a,
MetaSchema {
Expand All @@ -83,7 +83,7 @@ fn with_discriminator() {
}
);

let schema_myobj_b = get_meta_by_name::<MyObj>("MyObj[B]");
let schema_myobj_b = get_meta_by_name::<MyObj>("MyObj_B");
assert_eq!(
schema_myobj_b,
MetaSchema {
Expand Down Expand Up @@ -181,19 +181,19 @@ fn with_discriminator_mapping() {
discriminator: Some(MetaDiscriminatorObject {
property_name: "type",
mapping: vec![
("c".to_string(), "#/components/schemas/MyObj[A]".to_string()),
("d".to_string(), "#/components/schemas/MyObj[B]".to_string()),
("c".to_string(), "#/components/schemas/MyObj_A".to_string()),
("d".to_string(), "#/components/schemas/MyObj_B".to_string()),
]
}),
any_of: vec![
MetaSchemaRef::Reference("MyObj[A]".to_string()),
MetaSchemaRef::Reference("MyObj[B]".to_string()),
MetaSchemaRef::Reference("MyObj_A".to_string()),
MetaSchemaRef::Reference("MyObj_B".to_string()),
],
..MetaSchema::ANY
}
);

let schema_myobj_a = get_meta_by_name::<MyObj>("MyObj[A]");
let schema_myobj_a = get_meta_by_name::<MyObj>("MyObj_A");
assert_eq!(
schema_myobj_a,
MetaSchema {
Expand All @@ -215,7 +215,7 @@ fn with_discriminator_mapping() {
}
);

let schema_myobj_b = get_meta_by_name::<MyObj>("MyObj[B]");
let schema_myobj_b = get_meta_by_name::<MyObj>("MyObj_B");
assert_eq!(
schema_myobj_b,
MetaSchema {
Expand Down