Skip to content

Report malformed schema JSON as a compile error instead of panicking #1030

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
danieleades wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Report malformed schema JSON as a compile error instead of panicking #1030

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
21 changes: 13 additions & 8 deletions typify-macro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,19 @@ fn do_import_types(item: TokenStream) -> Result<TokenStream, syn::Error> {

let path = dir.join(schema.value());

let root_schema: schemars::schema::RootSchema =
serde_json::from_reader(std::fs::File::open(&path).map_err(|e| {
syn::Error::new(
schema.span(),
format!("couldn't read file {}: {}", schema.value(), e),
)
})?)
.unwrap();
let file = std::fs::File::open(&path).map_err(|e| {
syn::Error::new(
schema.span(),
format!("couldn't read file {}: {}", schema.value(), e),
)
})?;

let root_schema: schemars::schema::RootSchema = serde_json::from_reader(file).map_err(|e| {
syn::Error::new(
schema.span(),
format!("couldn't parse file {}: {}", schema.value(), e),
)
})?;

let mut type_space = TypeSpace::new(&settings);
type_space
Expand Down