caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-20 03:55:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to choose between minified and pretty-printed JSON (#4161)

Browse Source
This commit is contained in:
Ilia 2024-05-29 14:06:27 +03:00 committed by GitHub
parent b73b3ca335
commit 6d07f702e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/typst-cli/src/args.rs
View File

@ -153,6 +153,10 @@ pub struct QueryCommand {
/// The format to serialize in /// The format to serialize in
#[clap(long = "format", default_value = "json")] #[clap(long = "format", default_value = "json")]
pub format: SerializationFormat, pub format: SerializationFormat,
/// Whether to pretty-print the serialized output
#[clap(long)]
pub pretty: bool,
} }
// Output file format for query command // Output file format for query command

18
crates/typst-cli/src/query.rs
View File

@ -99,20 +99,28 @@ fn format(elements: Vec<Content>, command: &QueryCommand) -> StrResult<String> {
let Some(value) = mapped.first() else { let Some(value) = mapped.first() else {
bail!("no such field found for element"); bail!("no such field found for element");
}; };
serialize(value, command.format) serialize(value, command.format, command.pretty)
} else { } else {
serialize(&mapped, command.format) serialize(&mapped, command.format, command.pretty)
} }
} }
/// Serialize data to the output format. /// Serialize data to the output format.
fn serialize(data: &impl Serialize, format: SerializationFormat) -> StrResult<String> { fn serialize(
data: &impl Serialize,
format: SerializationFormat,
pretty: bool,
) -> StrResult<String> {
match format { match format {
SerializationFormat::Json => { SerializationFormat::Json => {
serde_json::to_string_pretty(data).map_err(|e| eco_format!("{e}")) if pretty {
serde_json::to_string_pretty(data).map_err(|e| eco_format!("{e}"))
} else {
serde_json::to_string(data).map_err(|e| eco_format!("{e}"))
}
} }
SerializationFormat::Yaml => { SerializationFormat::Yaml => {
serde_yaml::to_string(&data).map_err(|e| eco_format!("{e}")) serde_yaml::to_string(data).map_err(|e| eco_format!("{e}"))
} }
} }
} }