Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support explicit conditional blocks #25

Merged
merged 2 commits into from
Jan 15, 2021
Merged

Support explicit conditional blocks #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d63d040
Make block-tag checks more flexible
Feb 1, 2017
526cfe3
Support explicit conditional blocks
Jan 28, 2017
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
23 changes: 21 additions & 2 deletions src/lustache/renderer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ local patterns = {
nonSpace = "%S",
eq = "%s*=",
curly = "%s*}",
tag = "[#\\^/>{&=!]"
tag = "[#\\^/>{&=!?]"
}

local html_escape_characters = {
Expand All @@ -24,6 +24,12 @@ local html_escape_characters = {
["/"] = "/"
}

local block_tags = {
["#"] = true,
["^"] = true,
["?"] = true,
}

local function is_array(array)
if type(array) ~= "table" then return false end
local max, n = 0, 0
Expand Down Expand Up @@ -58,6 +64,9 @@ local function compile_tokens(tokens, originalTemplate)
for i, token in ipairs(tokens) do
local t = token.type
buf[#buf+1] =
t == "?" and rnd:_conditional(
token, ctx, subrender(i, token.tokens)
) or
t == "#" and rnd:_section(
token, ctx, subrender(i, token.tokens), originalTemplate
) or
Expand Down Expand Up @@ -89,7 +98,7 @@ local function nest_tokens(tokens)
local token, section

for i,token in ipairs(tokens) do
if token.type == "#" or token.type == "^" then
if block_tags[token.type] then
token.tokens = {}
sections[#sections+1] = token
collector[#collector+1] = token
Expand Down Expand Up @@ -203,6 +212,16 @@ function renderer:render(template, view, partials)
return fn(view)
end

function renderer:_conditional(token, context, callback)
local value = context:lookup(token.value)

if value then
return callback(context, self)
end

return ""
end

function renderer:_section(token, context, callback, originalTemplate)
local value = context:lookup(token.value)

Expand Down