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 iteration over arrays and maps #28

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support explicit iteration over arrays and maps #28

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
10262a0
Support explicit iteration over arrays and maps
Feb 1, 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
60 changes: 58 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 All @@ -37,6 +43,18 @@ local function is_array(array)
return n == max
end

local function is_map(map)
if type(map) ~= "table" then
return false
end
for k, _ in pairs(map) do
if type(k) == "number" then
return false
end
end
return true
end

-- Low-level function that compiles the given `tokens` into a
-- function that accepts two arguments: a Context and a
-- Renderer.
Expand All @@ -58,6 +76,9 @@ local function compile_tokens(tokens, originalTemplate)
for i, token in ipairs(tokens) do
local t = token.type
buf[#buf+1] =
t == "*" and rnd:_iterate(
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 +110,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 +224,41 @@ function renderer:render(template, view, partials)
return fn(view)
end

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

if type(value) == "table" then
local sub_type
if is_array(value) then
sub_type = "array"
elseif is_map(value) then
sub_type = "map"
end

if sub_type == "array" then
local buffer = ""

for i,v in ipairs(value) do
buffer = buffer .. callback(context:push(v), self)
end

return buffer
elseif sub_type == "map" then
local buffer = ""

for k,v in pairs(value) do
buffer = buffer .. callback(context:push({k = k, v = v}), self)
end

return buffer
end

return error("Can only iterate over arrays and maps, got neither:" .. token.value)
end

return error("Can only iterate over pure arrays and maps (tables), got " .. type(value) .. ":" .. token.value)
end

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

Expand Down