Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/compile-string.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export function compileBody(this: Eta, buff: Array<AstObject>): string {
const str = currentBlock;

// we know string exists
returnStr += "__eta.res+='" + str + "'\n";
returnStr += "__eta.res+='" + str + "';\n";
} else {
const type = currentBlock.t; // "r", "e", or "i"
let content = currentBlock.val || "";
Expand All @@ -107,7 +107,7 @@ export function compileBody(this: Eta, buff: Array<AstObject>): string {
content = "__eta.f(" + content + ")";
}

returnStr += "__eta.res+=" + content + "\n";
returnStr += "__eta.res+=" + content + ";\n";
} else if (type === "i") {
// interpolate

Expand All @@ -119,7 +119,7 @@ export function compileBody(this: Eta, buff: Array<AstObject>): string {
content = "__eta.e(" + content + ")";
}

returnStr += "__eta.res+=" + content + "\n";
returnStr += "__eta.res+=" + content + ";\n";
} else if (type === "e") {
// execute
returnStr += content + "\n";
Expand Down
46 changes: 23 additions & 23 deletions test/compile-string.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ function layout(path, data) {

function output(s){__eta.res+=s;}

__eta.res+='hi '
__eta.res+=__eta.e(it.name)
__eta.res+='hi ';
__eta.res+=__eta.e(it.name);

if (__eta.layout) {
__eta.res = include (__eta.layout, {...it, body: __eta.res, ...__eta.layoutData});
Expand All @@ -52,8 +52,8 @@ function layout(path, data) {

function output(s){__eta.res+=s;}

__eta.res+='hi '
__eta.res+=it.name
__eta.res+='hi ';
__eta.res+=it.name;

if (__eta.layout) {
__eta.res = include (__eta.layout, {...it, body: __eta.res, ...__eta.layoutData});
Expand All @@ -80,9 +80,9 @@ function layout(path, data) {

function output(s){__eta.res+=s;}

__eta.res+='hi'
__eta.res+=__eta.e(it.firstname)
__eta.res+=__eta.e(it.lastname)
__eta.res+='hi';
__eta.res+=__eta.e(it.firstname);
__eta.res+=__eta.e(it.lastname);

if (__eta.layout) {
__eta.res = include (__eta.layout, {...it, body: __eta.res, ...__eta.layoutData});
Expand All @@ -107,29 +107,29 @@ function layout(path, data) {

function output(s){__eta.res+=s;}

__eta.res+='Hi\\n'
__eta.res+='Hi\\n';
console.log("Hope you like Eta!")
__eta.res+=__eta.e(it.htmlstuff)
__eta.res+='\\n'
__eta.res+=__eta.e(it.htmlstuff);
__eta.res+='\\n';
for (var key in it.obj) {
__eta.res+='Value: '
__eta.res+=__eta.e(it.obj[key])
__eta.res+=', Key: '
__eta.res+=__eta.e(key)
__eta.res+='\\n'
__eta.res+='Value: ';
__eta.res+=__eta.e(it.obj[key]);
__eta.res+=', Key: ';
__eta.res+=__eta.e(key);
__eta.res+='\\n';
if (key === 'thirdchild') {
__eta.res+=' '
__eta.res+=' ';
for (var i = 0, arr = it.obj[key]; i < arr.length; i++) {
__eta.res+=' Salutations! Index: '
__eta.res+=__eta.e(i)
__eta.res+=', parent key: '
__eta.res+=__eta.e(key)
__eta.res+=' \\n '
__eta.res+=' Salutations! Index: ';
__eta.res+=__eta.e(i);
__eta.res+=', parent key: ';
__eta.res+=__eta.e(key);
__eta.res+=' \\n ';
}
}
}
__eta.res+='\\nThis is a partial: '
__eta.res+=include("mypartial")
__eta.res+='\\nThis is a partial: ';
__eta.res+=include("mypartial");

if (__eta.layout) {
__eta.res = include (__eta.layout, {...it, body: __eta.res, ...__eta.layoutData});
Expand Down
51 changes: 51 additions & 0 deletions test/render.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -312,3 +312,54 @@ describe("import values merging with the useWith", () => {
expect(res).toEqual("This is a partial.\nHello friend");
});
});

describe("forEach loops in included templates", () => {
const eta = new Eta();

it("renders forEach loop inside included partial", () => {
eta.loadTemplate(
"@loop-partial",
`<ul>
<% (it.items || []).forEach(item => { %>
<li><%= item %></li>
<% }) %>
</ul>`,
);

eta.loadTemplate(
"@loop-main",
`<%~ include('@loop-partial', {items: ['a', 'b', 'c']}) %>`,
);

const result = eta.render("@loop-main", {});

expect(result).toContain("<li>a</li>");
expect(result).toContain("<li>b</li>");
expect(result).toContain("<li>c</li>");
});

it("renders includes called from within a forEach loop", () => {
eta.loadTemplate(
"@nested-partial",
`<div>
<% (it.question.items || []).forEach(opt => { %>
<span><%= opt %></span>
<% }) %>
</div>`,
);

eta.loadTemplate(
"@nested-main",
`<% [{items: ['a', 'b']}, {items: ['c', 'd']}].forEach(q => { %>
<%~ include('@nested-partial', {question: q}) %>
<% }) %>`,
);

const result = eta.render("@nested-main", {});

expect(result).toContain("<span>a</span>");
expect(result).toContain("<span>b</span>");
expect(result).toContain("<span>c</span>");
expect(result).toContain("<span>d</span>");
});
});
Loading