psimsa/handlebars.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update statement node ASTs

Browse Source
This commit is contained in:
kpdecker
2014-11-26 12:46:38 -06:00
parent 5cfe6a0be1
commit 2a4819d75c
10 changed files with 179 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec/ast.js
+27 -36
View File
@@ -168,18 +168,9 @@ describe('ast', function() {
});
});
describe("PartialNameNode", function(){
it('stores location info', function(){
var pnn = new handlebarsEnv.AST.PartialNameNode({original: "YES"}, LOCATION_INFO);
testLocationInfoStorage(pnn);
});
});
describe("PartialNode", function(){
it('stores location info', function(){
var pn = new handlebarsEnv.AST.PartialNode("so_partial", {}, {}, {}, LOCATION_INFO);
var pn = new handlebarsEnv.AST.PartialNode('so_partial', {}, LOCATION_INFO);
testLocationInfoStorage(pn);
});
});
@@ -248,8 +239,8 @@ describe('ast', function() {
describe('mustache', function() {
it('does not mark mustaches as standalone', function() {
var ast = Handlebars.parse(' {{comment}} ');
equals(!!ast.body[0].string, true);
equals(!!ast.body[2].string, true);
equals(!!ast.body[0].value, true);
equals(!!ast.body[2].value, true);
});
});
describe('blocks', function() {
@@ -257,38 +248,38 @@ describe('ast', function() {
var ast = Handlebars.parse(' {{# comment}} \nfoo\n {{else}} \n bar \n {{/comment}} '),
block = ast.body[1];
equals(ast.body[0].string, '');
equals(ast.body[0].value, '');
equals(block.program.body[0].string, 'foo\n');
equals(block.inverse.body[0].string, ' bar \n');
equals(block.program.body[0].value, 'foo\n');
equals(block.inverse.body[0].value, ' bar \n');
equals(ast.body[2].string, '');
equals(ast.body[2].value, '');
});
it('marks initial block mustaches as standalone', function() {
var ast = Handlebars.parse('{{# comment}} \nfoo\n {{/comment}}'),
block = ast.body[0];
equals(block.program.body[0].string, 'foo\n');
equals(block.program.body[0].value, 'foo\n');
});
it('marks mustaches with children as standalone', function() {
var ast = Handlebars.parse('{{# comment}} \n{{foo}}\n {{/comment}}'),
block = ast.body[0];
equals(block.program.body[0].string, '');
equals(block.program.body[0].value, '');
equals(block.program.body[1].sexpr.id.original, 'foo');
equals(block.program.body[2].string, '\n');
equals(block.program.body[2].value, '\n');
});
it('marks nested block mustaches as standalone', function() {
var ast = Handlebars.parse('{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n bar \n {{/comment}} \n{{/foo}}'),
body = ast.body[0].program.body,
block = body[1];
equals(body[0].string, '');
equals(body[0].value, '');
equals(block.program.body[0].string, 'foo\n');
equals(block.inverse.body[0].string, ' bar \n');
equals(block.program.body[0].value, 'foo\n');
equals(block.inverse.body[0].value, ' bar \n');
equals(body[0].string, '');
equals(body[0].value, '');
});
it('does not mark nested block mustaches as standalone', function() {
var ast = Handlebars.parse('{{#foo}} {{# comment}} \nfoo\n {{else}} \n bar \n {{/comment}} {{/foo}}'),
@@ -297,8 +288,8 @@ describe('ast', function() {
equals(body[0].omit, undefined);
equals(block.program.body[0].string, ' \nfoo\n');
equals(block.inverse.body[0].string, ' bar \n ');
equals(block.program.body[0].value, ' \nfoo\n');
equals(block.inverse.body[0].value, ' bar \n ');
equals(body[0].omit, undefined);
});
@@ -307,8 +298,8 @@ describe('ast', function() {
body = ast.body[0].program.body,
block = body[0];
equals(block.program.body[0].string, ' \nfoo\n');
equals(block.inverse.body[0].string, ' bar \n ');
equals(block.program.body[0].value, ' \nfoo\n');
equals(block.inverse.body[0].value, ' bar \n ');
equals(body[0].omit, undefined);
});
@@ -319,22 +310,22 @@ describe('ast', function() {
equals(ast.body[0].omit, undefined);
equals(block.program.body[0].string, 'foo\n');
equals(block.inverse.body[0].string, ' bar \n');
equals(block.program.body[0].value, 'foo\n');
equals(block.inverse.body[0].value, ' bar \n');
equals(ast.body[2].string, '');
equals(ast.body[2].value, '');
});
});
describe('partials', function() {
it('marks partial as standalone', function() {
var ast = Handlebars.parse('{{> partial }} ');
equals(ast.body[1].string, '');
equals(ast.body[1].value, '');
});
it('marks indented partial as standalone', function() {
var ast = Handlebars.parse(' {{> partial }} ');
equals(ast.body[0].string, '');
equals(ast.body[0].value, '');
equals(ast.body[1].indent, ' ');
equals(ast.body[2].string, '');
equals(ast.body[2].value, '');
});
it('marks those around content as not standalone', function() {
var ast = Handlebars.parse('a{{> partial }}');
@@ -347,12 +338,12 @@ describe('ast', function() {
describe('comments', function() {
it('marks comment as standalone', function() {
var ast = Handlebars.parse('{{! comment }} ');
equals(ast.body[1].string, '');
equals(ast.body[1].value, '');
});
it('marks indented comment as standalone', function() {
var ast = Handlebars.parse(' {{! comment }} ');
equals(ast.body[0].string, '');
equals(ast.body[2].string, '');
equals(ast.body[0].value, '');
equals(ast.body[2].value, '');
});
it('marks those around content as not standalone', function() {
var ast = Handlebars.parse('a{{! comment }}');
spec/parser.js
+2
View File
@@ -82,6 +82,8 @@ describe('parser', function() {
it('parses a partial', function() {
equals(ast_for("{{> foo }}"), "{{> PARTIAL:foo }}\n");
equals(ast_for("{{> 'foo' }}"), "{{> PARTIAL:foo }}\n");
equals(ast_for("{{> 1 }}"), "{{> PARTIAL:1 }}\n");
});
it('parses a partial with context', function() {
spec/partials.js
+6
View File
@@ -23,6 +23,12 @@ describe('partials', function() {
shouldCompileToWithPartials(string, [hash, {}, {dude: partial}], true, "Dudes: Empty");
});
it('partials with duplicate parameters', function() {
shouldThrow(function() {
CompilerContext.compile('Dudes: {{>dude dudes foo bar=baz}}');
}, Error, 'Unsupported number of partial arguments: 2 - 1:7');
});
it("partials with parameters", function() {
var string = "Dudes: {{#dudes}}{{> dude others=..}}{{/dudes}}";
var partial = "{{others.foo}}{{name}} ({{url}}) ";
spec/visitor.js
+5 -9
View File
@@ -14,16 +14,12 @@ describe('Visitor', function() {
// Simply run the thing and make sure it does not fail and that all of the
// stub methods are executed
var visitor = new Handlebars.Visitor();
visitor.accept(Handlebars.parse('{{#foo (bar 1 "1" true) foo=@data}}{{!comment}}{{> bar }} {{/foo}}'));
visitor.accept(Handlebars.parse('{{foo}}{{#foo (bar 1 "1" true) foo=@data}}{{!comment}}{{> bar }} {{/foo}}'));
});
it('should traverse to stubs', function() {
var visitor = new Handlebars.Visitor();
visitor.PARTIAL_NAME = function(partialName) {
equal(partialName.name, 'bar');
};
visitor.STRING = function(string) {
equal(string.string, '2');
};
@@ -36,11 +32,11 @@ describe('Visitor', function() {
visitor.ID = function(id) {
equal(id.original, 'foo.bar');
};
visitor.content = function(content) {
equal(content.string, ' ');
visitor.ContentStatement = function(content) {
equal(content.value, ' ');
};
visitor.comment = function(comment) {
equal(comment.comment, 'comment');
visitor.CommentStatement = function(comment) {
equal(comment.value, 'comment');
};
visitor.accept(Handlebars.parse('{{#foo.bar (foo.bar 1 "2" true) foo=@foo.bar}}{{!comment}}{{> bar }} {{/foo.bar}}'));