Rendering a reference appears to do a truthiness check because false renders an empty string despite rendering as "false" in an array element.

This commit is contained in:
Tom Alexander 2020-05-06 20:13:33 -04:00
parent 0f47000a9b
commit b45688351e
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
16 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1 @@
{"things": ["Alice", "Bob", "Chris"]}

View File

@ -0,0 +1 @@
{"things": {}}

View File

@ -0,0 +1 @@
["cat", "dog"]

View File

@ -0,0 +1 @@
{"things": {"name": "Alice", "keyboard": "K-Type"}}

View File

@ -0,0 +1 @@
{"there_are_no_things": 4}

View File

@ -0,0 +1 @@
{"things": "just a string"}

View File

@ -0,0 +1 @@
{"things": false}

View File

@ -0,0 +1 @@
{"things": null}

View File

@ -0,0 +1 @@
{"things": 0}

View File

@ -0,0 +1 @@
{"things": ""}

View File

@ -0,0 +1 @@
{"things": []}

View File

@ -0,0 +1,5 @@
{^things}
Thing: {things}
{:else}
No things {.}
{/things}

View File

@ -0,0 +1 @@
{"name": false}

View File

@ -0,0 +1 @@
{"name": true}

View File

@ -0,0 +1 @@
{"name": [[], {}, true, false, ""]}

View File

@ -99,7 +99,9 @@ impl<'a> DustRenderer<'a> {
}
DustTag::DTReference(reference) => {
let val = walk_path(breadcrumbs, &reference.path.keys);
if let Err(RenderError::NotFound { .. }) = val {
let loop_elements: Vec<&dyn ContextElement> = self.get_loop_elements(val)?;
if loop_elements.is_empty() {
// if let Err(RenderError::NotFound { .. }) = val {
// If reference does not exist in the context, it becomes an empty string
return Ok("".to_owned());
} else {
@ -151,6 +153,21 @@ impl<'a> DustRenderer<'a> {
};
}
}
DustTag::DTNotExists(container) => {
let val = walk_path(breadcrumbs, &container.path.keys);
let loop_elements: Vec<&dyn ContextElement> = self.get_loop_elements(val)?;
if !loop_elements.is_empty() {
return match &container.else_contents {
Some(body) => self.render_body(&body, breadcrumbs),
None => Ok("".to_owned()),
};
} else {
return match &container.contents {
None => Ok("".to_owned()),
Some(body) => self.render_body(&body, breadcrumbs),
};
}
}
_ => (), // TODO: Implement the rest
}
Ok("".to_owned())