Skip to content

Obtain name from SchemaObject; otherwise, keep existing default subtype_{idx} #912

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

Open
dpezely wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Obtain name from SchemaObject; otherwise, keep existing default subtype_{idx} #912

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
16 changes: 14 additions & 2 deletions typify-impl/src/structs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,20 @@ impl TypeSpace {
}

// TODO we need a reasonable name that could be derived
// from the name of the type
let name = format!("subtype_{}", idx);
// from the name of the type. Use of SchemaObject here
// accommodates "anyOf" and "allOf" but others, TBD. e.g.,
// "foo":{"items":{"anyOf":[{"$ref": "#/$defs/bar-baz"}, ...]}}
// provides "bar_baz".
let name = match schema {
Schema::Object(SchemaObject {
reference: Some(s), ..
}) => match s.rsplit_once('/') {
Some((_, name)) => name,
None => s,
}
.replace('-', "_"),
_ => format!("subtype_{}", idx),
};

Ok(StructProperty {
name,
Expand Down