|
|
|
@ -2,6 +2,7 @@ use crate::parser::template;
|
|
|
|
|
use crate::parser::Body;
|
|
|
|
|
use crate::parser::DustTag;
|
|
|
|
|
use crate::parser::KVPair;
|
|
|
|
|
use crate::parser::PartialNameElement;
|
|
|
|
|
use crate::parser::RValue;
|
|
|
|
|
use crate::parser::Special;
|
|
|
|
|
use crate::parser::Template;
|
|
|
|
@ -108,6 +109,23 @@ impl<'a> DustRenderer<'a> {
|
|
|
|
|
Ok(output)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn render_partial_name(
|
|
|
|
|
&'a self,
|
|
|
|
|
body: &'a Vec<PartialNameElement>,
|
|
|
|
|
breadcrumbs: &Vec<&'a dyn ContextElement>,
|
|
|
|
|
blocks: &'a InlinePartialTreeElement<'a>,
|
|
|
|
|
) -> Result<String, RenderError> {
|
|
|
|
|
let converted_to_template_elements: Vec<TemplateElement<'a>> =
|
|
|
|
|
body.into_iter().map(|e| e.into()).collect();
|
|
|
|
|
self.render_body(
|
|
|
|
|
&Body {
|
|
|
|
|
elements: converted_to_template_elements,
|
|
|
|
|
},
|
|
|
|
|
breadcrumbs,
|
|
|
|
|
blocks,
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn render_tag(
|
|
|
|
|
&'a self,
|
|
|
|
|
tag: &'a DustTag,
|
|
|
|
@ -199,6 +217,21 @@ impl<'a> DustRenderer<'a> {
|
|
|
|
|
return Ok(rendered_content);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
DustTag::DTNewPartial(partial) => {
|
|
|
|
|
let partial_name = self.render_partial_name(&partial.name, breadcrumbs, blocks)?;
|
|
|
|
|
if partial.params.is_empty() {
|
|
|
|
|
let rendered_content =
|
|
|
|
|
self.render_template(&partial_name, breadcrumbs, Some(blocks))?;
|
|
|
|
|
return Ok(rendered_content);
|
|
|
|
|
} else {
|
|
|
|
|
let injected_context = ParametersContext::new(breadcrumbs, &partial.params);
|
|
|
|
|
let mut new_breadcrumbs = breadcrumbs.clone();
|
|
|
|
|
new_breadcrumbs.insert(new_breadcrumbs.len() - 1, &injected_context);
|
|
|
|
|
let rendered_content =
|
|
|
|
|
self.render_template(&partial_name, &new_breadcrumbs, Some(blocks))?;
|
|
|
|
|
return Ok(rendered_content);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
DustTag::DTInlinePartial(_named_block) => {
|
|
|
|
|
// Inline partials are blank during rendering (they get injected into blocks)
|
|
|
|
|
return Ok("".to_owned());
|
|
|
|
|