Implement the new partial type in the renderer.

master
Tom Alexander 4 years ago
parent 402d8679e2
commit 10c8b25817
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE

@ -8,6 +8,7 @@ pub use parser::DustTag;
pub use parser::Filter;
pub use parser::KVPair;
pub use parser::OwnedLiteral;
pub use parser::PartialNameElement;
pub use parser::RValue;
pub use parser::Special;
pub use parser::Template;

@ -193,6 +193,24 @@ impl From<TemplateElement<'_>> for PartialNameElement {
}
}
impl<'a> From<&'a PartialNameElement> for TemplateElement<'a> {
fn from(original: &'a PartialNameElement) -> Self {
match original {
PartialNameElement::PNSpan { contents } => {
TemplateElement::TESpan(Span { contents: contents })
}
PartialNameElement::PNReference { path, filters } => {
TemplateElement::TETag(DustTag::DTReference(Reference {
path: Path {
keys: path.into_iter().map(|s| s.as_str()).collect(),
},
filters: filters.into_iter().map(|f| f.clone()).collect(),
}))
}
}
}
}
/// Any element significant to dust that isn't plain text
///
/// These elements are always wrapped in curly braces

@ -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());

Loading…
Cancel
Save