Skip to content

Add support for multi nested inheritance of the same parent #196

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for multi nested inheritance of the same parent #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions lib/compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
function stringifySubstitutions(obj) {
var items = [];
for (var key in obj) {
items.push('"' + esc(key) + '": function(c,p,t,i) {' + obj[key] + '}');
items.push('"' + esc(key) + '": { f: function(c,p,t,i) {' + obj[key].code + '}, lvl:' + obj[key].lvl + ' }');
}
return "{ " + items.join(",") + " }";
}
Expand All @@ -270,8 +270,10 @@
}

var serialNo = 0;
var lvl = 0;
Hogan.generate = function(tree, text, options) {
serialNo = 0;
lvl = 0;
var context = { code: '', subs: {}, partials: {} };
Hogan.walk(tree, context);

Expand Down Expand Up @@ -299,8 +301,10 @@
for (key in template.partials) {
template.partials[key] = this.makePartials(template.partials[key]);
}
var sub;
for (key in codeObj.subs) {
template.subs[key] = new Function('c', 'p', 't', 'i', codeObj.subs[key]);
sub = codeObj.subs[key];
template.subs[key] = { f: new Function('c', 'p', 't', 'i', sub.code), lvl:sub.lvl };
}
return template;
}
Expand Down Expand Up @@ -352,8 +356,9 @@

'$': function(node, context) {
var ctx = {subs: {}, code: '', partials: context.partials, prefix: node.n};
lvl++;
Hogan.walk(node.nodes, ctx);
context.subs[node.n] = ctx.code;
context.subs[node.n] = { code: ctx.code, lvl: lvl-- };
if (!context.inPartial) {
context.code += 't.sub("' + esc(node.n) + '",c,p,i);';
}
Expand Down
7 changes: 4 additions & 3 deletions lib/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ var Hogan = {};
},

sub: function(name, context, partials, indent) {
var f = this.subs[name];
var sub = (this.subs[name]?this.subs[name]:undefined);
var f = (sub?sub.f:undefined);
if (f) {
this.activeSub = name;
f(context, partials, this, indent);
Expand Down Expand Up @@ -293,10 +294,10 @@ var Hogan = {};
partial.stackSubs = stackSubs;
partial.subsText = stackText;
for (key in subs) {
if (!stackSubs[key]) stackSubs[key] = subs[key];
if (!stackSubs[key] || stackSubs[key].lvl < subs[key].lvl) stackSubs[key] = subs[key];
}
for (key in stackSubs) {
partial.subs[key] = stackSubs[key];
partial.subs[key] = (subs[key] && subs[key].lvl > stackSubs[key].lvl)?subs[key]:stackSubs[key];
}

stackPartials = stackPartials || {};
Expand Down
28 changes: 28 additions & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,34 @@ test("Recursion in inherited templates", function() {
is(s, "override override override don't recurse", "matches expected recursive output");
});

test("Overriden contents with nested inheritance", function() {
var child = Hogan.compile( '{{<parent}}{{$region}}a{{<parent}}{{$region}}b{{/region}}{{/parent}}{{/region}}{{/parent}}').render({}, {
parent: '...{{$region}}{{/region}}.'
});

is(child, "...a...b..", "should render both contents");

var child = Hogan.compile( '{{<parent}}{{$region}}a{{<parent}}{{$region}}b{{<parent}}{{$region}}c{{/region}}{{/parent}}{{/region}}{{/parent}}{{/region}}{{/parent}}').render({}, {
parent: '...{{$region}}{{/region}}.'
});
is( child, "...a...b...c...", "should render the three nested contents" );
});

test( "Overriden contents with nested inheritance twice", function(){
var child = Hogan.compile( '{{<parent}}{{$region}}a{{<parent}}{{$region}}b{{/region}}{{/parent}}{{/region}}{{/parent}}|{{<parent}}{{$region}}c{{<parent}}{{$region}}d{{/region}}{{/parent}}{{/region}}{{/parent}}').render({}, {
parent: '...{{$region}}{{/region}}.'
});
is( child, "...a...b..|...c...d..");
});

test( "Overriden contents with nested and multiple inheritance", function(){
var child = Hogan.compile( '{{<parent}}{{$region}}c{{<parent}}{{$region}}d{{/region}}{{/parent}}{{/region}}{{/parent}}').render({}, {
parent: '{{<grandParent}}{{$region}}a{{<grandParent}}{{$region}}b{{/region}}{{/grandParent}}{{/region}}{{/grandParent}}',
grandParent: '...{{$region}}{{/region}}.'
});
is( child, "...c...d..");
});

test("Cache contains old partials instances", function() {
var tests = [{
template: "{{<parent}}{{$a}}c{{/a}}{{/parent}}",
Expand Down