Labyricorn/liquidjs
1
0
Fork 0
mirror of https://github.com/harttle/liquidjs.git synced 2026-09-15 12:20:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use assert, fix: respect to express settings.views, close #16

Browse Source
This commit is contained in:
harttle
2016-11-03 00:43:23 +08:00
parent ce99bb56eb
commit f70b2ee203
25 changed files with 135 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/render.js
+14 -15
View File
@@ -2,13 +2,12 @@ const Syntax = require('./syntax.js');
const Promise = require('any-promise');
const mapSeries = require('./util/promise.js').mapSeries;
const RenderBreak = require('./util/error.js').RenderBreak;
const assert = require('./util/assert.js');
var render = {
renderTemplates: function(templates, scope, opts) {
if (!scope) throw new Error('unable to evalTemplates: scope undefined');
opts = opts || {};
opts.strict_filters = opts.strict_filters || false;
renderTemplates: function(templates, scope) {
assert(scope, 'unable to evalTemplates: scope undefined');
var html = '';
return mapSeries(templates, (tpl) => {
@@ -24,10 +23,10 @@ var render = {
function renderTemplate(template){
if (template.type === 'tag') {
return this.renderTag(template, scope, this.register)
return this.renderTag(template, scope)
.then(partial => partial === undefined ? '' : partial);
} else if (template.type === 'output') {
return Promise.resolve(this.evalOutput(template, scope, opts))
return Promise.resolve(this.evalOutput(template, scope))
.then(partial => partial === undefined ? '' : stringify(partial));
} else { // template.type === 'html'
return Promise.resolve(template.value);
@@ -35,25 +34,25 @@ var render = {
}
},
renderTag: function(template, scope, register) {
renderTag: function(template, scope) {
if (template.name === 'continue') {
return Promise.reject(new RenderBreak('continue'));
}
if (template.name === 'break') {
return Promise.reject(new RenderBreak('break'));
}
return template.render(scope, register);
return template.render(scope, this.register);
},
evalOutput: function(template, scope, opts) {
if (!scope) throw new Error('unable to evalOutput: scope undefined');
evalOutput: function(template, scope) {
assert(scope, 'unable to evalOutput: scope undefined');
var val = Syntax.evalExp(template.initial, scope);
template.filters.some(filter => {
if (filter.error) {
if (opts.strict_filters) {
if (this.register.strict_filters) {
throw filter.error;
} else { // render as null
val = '';
} else {
val = ''
return true;
}
}
@@ -62,8 +61,8 @@ var render = {
return val;
},
resetRegisters: function() {
return this.register = {};
initRegister: function(opts) {
return this.register = opts;
}
};