Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 13 additions & 2 deletions src/cli_v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ enum Command {
#[arg(short, long)]
output_dir: Option<Utf8PathBuf>,

/// Optional JSON object available in templates as `context`.
#[arg(long)]
context: Option<String>,

/// Disable automatic postprocessing of the output (formatting and automatic style fixes).
#[arg(long)]
no_postprocess: bool,
Expand Down Expand Up @@ -136,12 +140,18 @@ pub fn run_cli_v1_main() -> anyhow::Result<()> {
Command::Generate {
template,
output_dir,
context,
no_postprocess,
..
} => {
let context: Option<minijinja::Value> = context
.map(|s| serde_json::from_str(&s).context("invalid 'context' argument"))
.transpose()?;

let generated_paths = match &output_dir {
Some(path) => {
let generated_paths = generate(&api, template.into(), path, no_postprocess)?;
let generated_paths =
generate(&api, template.into(), path, context, no_postprocess)?;
println!("done! output written to {path}");
generated_paths
}
Expand All @@ -167,7 +177,8 @@ pub fn run_cli_v1_main() -> anyhow::Result<()> {
.try_into()
.context("non-UTF8 tempdir path")?;

let generated_paths = generate(&api, template.into(), path, no_postprocess)?;
let generated_paths =
generate(&api, template.into(), path, context, no_postprocess)?;
println!("done! output written to {path}");

// Persist the TempDir if everything was successful
Expand Down
2 changes: 2 additions & 0 deletions src/generator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ pub fn generate(
api: &Api,
tpl_name: String,
output_dir: &Utf8Path,
context: Option<minijinja::Value>,
no_postprocess: bool,
) -> anyhow::Result<Vec<Utf8PathBuf>> {
let (name_without_jinja_suffix, tpl_path) = match tpl_name.strip_suffix(".jinja") {
Expand Down Expand Up @@ -58,6 +59,7 @@ pub fn generate(
.parent()
.with_context(|| format!("invalid template path `{tpl_path}`"))?,
)?;
minijinja_env.add_global("context", context);
minijinja_env.add_template(tpl_path, &tpl_source)?;
let tpl = minijinja_env.get_template(tpl_path)?;

Expand Down
Loading