handlebars
Advanced tools
Comparing version 1.0.5-beta to 1.0.6
// BEGIN(BROWSER) | ||
var Handlebars = {}; | ||
Handlebars.VERSION = "1.0.beta.5"; | ||
/*jshint eqnull:true*/ | ||
this.Handlebars = {}; | ||
(function(Handlebars) { | ||
Handlebars.VERSION = "1.0.rc.1"; | ||
Handlebars.helpers = {}; | ||
@@ -55,9 +59,23 @@ Handlebars.partials = {}; | ||
Handlebars.K = function() {}; | ||
Handlebars.createFrame = Object.create || function(object) { | ||
Handlebars.K.prototype = object; | ||
var obj = new Handlebars.K(); | ||
Handlebars.K.prototype = null; | ||
return obj; | ||
}; | ||
Handlebars.registerHelper('each', function(context, options) { | ||
var fn = options.fn, inverse = options.inverse; | ||
var ret = ""; | ||
var ret = "", data; | ||
if (options.data) { | ||
data = Handlebars.createFrame(options.data); | ||
} | ||
if(context && context.length > 0) { | ||
for(var i=0, j=context.length; i<j; i++) { | ||
ret = ret + fn(context[i]); | ||
if (data) { data.index = i; } | ||
ret = ret + fn(context[i], { data: data }); | ||
} | ||
@@ -97,5 +115,7 @@ } else { | ||
}(this.Handlebars)); | ||
// END(BROWSER) | ||
module.exports = Handlebars; | ||
module.exports = this.Handlebars; | ||
@@ -14,8 +14,22 @@ var Handlebars = require('./base'); | ||
Handlebars.AST.MustacheNode = function(params, hash, unescaped) { | ||
Handlebars.AST.MustacheNode = function(rawParams, hash, unescaped) { | ||
this.type = "mustache"; | ||
this.id = params[0]; | ||
this.params = params.slice(1); | ||
this.escaped = !unescaped; | ||
this.hash = hash; | ||
this.escaped = !unescaped; | ||
var id = this.id = rawParams[0]; | ||
var params = this.params = rawParams.slice(1); | ||
// a mustache is an eligible helper if: | ||
// * its id is simple (a single part, not `this` or `..`) | ||
var eligibleHelper = this.eligibleHelper = id.isSimple; | ||
// a mustache is definitely a helper if: | ||
// * it is an eligible helper, and | ||
// * it has at least one parameter or hash segment | ||
this.isHelper = eligibleHelper && (params.length || hash); | ||
// if a mustache is an eligible helper but not a definite | ||
// helper, it is ambiguous, and will be resolved in a later | ||
// pass or at runtime. | ||
}; | ||
@@ -38,3 +52,3 @@ | ||
Handlebars.AST.BlockNode = function(mustache, program, close) { | ||
Handlebars.AST.BlockNode = function(mustache, program, inverse, close) { | ||
verifyMatch(mustache.id, close); | ||
@@ -44,9 +58,7 @@ this.type = "block"; | ||
this.program = program; | ||
}; | ||
this.inverse = inverse; | ||
Handlebars.AST.InverseNode = function(mustache, program, close) { | ||
verifyMatch(mustache.id, close); | ||
this.type = "inverse"; | ||
this.mustache = mustache; | ||
this.program = program; | ||
if (this.inverse && !this.program) { | ||
this.isInverse = true; | ||
} | ||
}; | ||
@@ -81,5 +93,13 @@ | ||
this.depth = depth; | ||
this.isSimple = (dig.length === 1) && (depth === 0); | ||
// an ID is simple if it only has one part, and that part is not | ||
// `..` or `this`. | ||
this.isSimple = parts.length === 1 && !this.isScoped && depth === 0; | ||
}; | ||
Handlebars.AST.DataNode = function(id) { | ||
this.type = "DATA"; | ||
this.id = id; | ||
}; | ||
Handlebars.AST.StringNode = function(string) { | ||
@@ -86,0 +106,0 @@ this.type = "STRING"; |
var Handlebars = require("./base"); | ||
// BEGIN(BROWSER) | ||
/*jshint eqnull:true*/ | ||
Handlebars.Compiler = function() {}; | ||
@@ -8,47 +10,7 @@ Handlebars.JavaScriptCompiler = function() {}; | ||
(function(Compiler, JavaScriptCompiler) { | ||
Compiler.OPCODE_MAP = { | ||
appendContent: 1, | ||
getContext: 2, | ||
lookupWithHelpers: 3, | ||
lookup: 4, | ||
append: 5, | ||
invokeMustache: 6, | ||
appendEscaped: 7, | ||
pushString: 8, | ||
truthyOrFallback: 9, | ||
functionOrFallback: 10, | ||
invokeProgram: 11, | ||
invokePartial: 12, | ||
push: 13, | ||
assignToHash: 15, | ||
pushStringParam: 16 | ||
}; | ||
// the foundHelper register will disambiguate helper lookup from finding a | ||
// function in a context. This is necessary for mustache compatibility, which | ||
// requires that context functions in blocks are evaluated by blockHelperMissing, | ||
// and then proceed as if the resulting value was provided to blockHelperMissing. | ||
Compiler.MULTI_PARAM_OPCODES = { | ||
appendContent: 1, | ||
getContext: 1, | ||
lookupWithHelpers: 2, | ||
lookup: 1, | ||
invokeMustache: 3, | ||
pushString: 1, | ||
truthyOrFallback: 1, | ||
functionOrFallback: 1, | ||
invokeProgram: 3, | ||
invokePartial: 1, | ||
push: 1, | ||
assignToHash: 1, | ||
pushStringParam: 1 | ||
}; | ||
Compiler.DISASSEMBLE_MAP = {}; | ||
for(var prop in Compiler.OPCODE_MAP) { | ||
var value = Compiler.OPCODE_MAP[prop]; | ||
Compiler.DISASSEMBLE_MAP[value] = prop; | ||
} | ||
Compiler.multiParamSize = function(code) { | ||
return Compiler.MULTI_PARAM_OPCODES[Compiler.DISASSEMBLE_MAP[code]]; | ||
}; | ||
Compiler.prototype = { | ||
@@ -58,31 +20,19 @@ compiler: Compiler, | ||
disassemble: function() { | ||
var opcodes = this.opcodes, opcode, nextCode; | ||
var out = [], str, name, value; | ||
var opcodes = this.opcodes, opcode, out = [], params, param; | ||
for(var i=0, l=opcodes.length; i<l; i++) { | ||
for (var i=0, l=opcodes.length; i<l; i++) { | ||
opcode = opcodes[i]; | ||
if(opcode === 'DECLARE') { | ||
name = opcodes[++i]; | ||
value = opcodes[++i]; | ||
out.push("DECLARE " + name + " = " + value); | ||
if (opcode.opcode === 'DECLARE') { | ||
out.push("DECLARE " + opcode.name + "=" + opcode.value); | ||
} else { | ||
str = Compiler.DISASSEMBLE_MAP[opcode]; | ||
var extraParams = Compiler.multiParamSize(opcode); | ||
var codes = []; | ||
for(var j=0; j<extraParams; j++) { | ||
nextCode = opcodes[++i]; | ||
if(typeof nextCode === "string") { | ||
nextCode = "\"" + nextCode.replace("\n", "\\n") + "\""; | ||
params = []; | ||
for (var j=0; j<opcode.args.length; j++) { | ||
param = opcode.args[j]; | ||
if (typeof param === "string") { | ||
param = "\"" + param.replace("\n", "\\n") + "\""; | ||
} | ||
codes.push(nextCode); | ||
params.push(param); | ||
} | ||
str = str + " " + codes.join(" "); | ||
out.push(str); | ||
out.push(opcode.opcode + " " + params.join(" ")); | ||
} | ||
@@ -144,3 +94,3 @@ } | ||
var result = new this.compiler().compile(program, this.options); | ||
var guid = this.guid++; | ||
var guid = this.guid++, depth; | ||
@@ -162,28 +112,38 @@ this.usePartial = this.usePartial || result.usePartial; | ||
block: function(block) { | ||
var mustache = block.mustache; | ||
var depth, child, inverse, inverseGuid; | ||
var mustache = block.mustache, | ||
program = block.program, | ||
inverse = block.inverse; | ||
var params = this.setupStackForMustache(mustache); | ||
if (program) { | ||
program = this.compileProgram(program); | ||
} | ||
var programGuid = this.compileProgram(block.program); | ||
if(block.program.inverse) { | ||
inverseGuid = this.compileProgram(block.program.inverse); | ||
this.declare('inverse', inverseGuid); | ||
if (inverse) { | ||
inverse = this.compileProgram(inverse); | ||
} | ||
this.opcode('invokeProgram', programGuid, params.length, !!mustache.hash); | ||
this.declare('inverse', null); | ||
this.opcode('append'); | ||
}, | ||
var type = this.classifyMustache(mustache); | ||
inverse: function(block) { | ||
var params = this.setupStackForMustache(block.mustache); | ||
if (type === "helper") { | ||
this.helperMustache(mustache, program, inverse); | ||
} else if (type === "simple") { | ||
this.simpleMustache(mustache); | ||
var programGuid = this.compileProgram(block.program); | ||
// now that the simple mustache is resolved, we need to | ||
// evaluate it by executing `blockHelperMissing` | ||
this.opcode('pushProgram', program); | ||
this.opcode('pushProgram', inverse); | ||
this.opcode('pushLiteral', '{}'); | ||
this.opcode('blockValue'); | ||
} else { | ||
this.ambiguousMustache(mustache, program, inverse); | ||
this.declare('inverse', programGuid); | ||
// now that the simple mustache is resolved, we need to | ||
// evaluate it by executing `blockHelperMissing` | ||
this.opcode('pushProgram', program); | ||
this.opcode('pushProgram', inverse); | ||
this.opcode('pushLiteral', '{}'); | ||
this.opcode('ambiguousBlockValue'); | ||
} | ||
this.opcode('invokeProgram', null, params.length, !!block.mustache.hash); | ||
this.declare('inverse', null); | ||
this.opcode('append'); | ||
@@ -225,7 +185,14 @@ }, | ||
mustache: function(mustache) { | ||
var params = this.setupStackForMustache(mustache); | ||
var options = this.options; | ||
var type = this.classifyMustache(mustache); | ||
this.opcode('invokeMustache', params.length, mustache.id.original, !!mustache.hash); | ||
if (type === "simple") { | ||
this.simpleMustache(mustache); | ||
} else if (type === "helper") { | ||
this.helperMustache(mustache); | ||
} else { | ||
this.ambiguousMustache(mustache); | ||
} | ||
if(mustache.escaped && !this.options.noEscape) { | ||
if(mustache.escaped && !options.noEscape) { | ||
this.opcode('appendEscaped'); | ||
@@ -237,9 +204,48 @@ } else { | ||
ambiguousMustache: function(mustache, program, inverse) { | ||
var id = mustache.id, name = id.parts[0]; | ||
this.opcode('getContext', id.depth); | ||
this.opcode('pushProgram', program); | ||
this.opcode('pushProgram', inverse); | ||
this.opcode('invokeAmbiguous', name); | ||
}, | ||
simpleMustache: function(mustache, program, inverse) { | ||
var id = mustache.id; | ||
if (id.type === 'DATA') { | ||
this.DATA(id); | ||
} else if (id.parts.length) { | ||
this.ID(id); | ||
} else { | ||
// Simplified ID for `this` | ||
this.addDepth(id.depth); | ||
this.opcode('getContext', id.depth); | ||
this.opcode('pushContext'); | ||
} | ||
this.opcode('resolvePossibleLambda'); | ||
}, | ||
helperMustache: function(mustache, program, inverse) { | ||
var params = this.setupFullMustacheParams(mustache, program, inverse), | ||
name = mustache.id.parts[0]; | ||
if (this.options.knownHelpers[name]) { | ||
this.opcode('invokeKnownHelper', params.length, name); | ||
} else if (this.knownHelpersOnly) { | ||
throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name); | ||
} else { | ||
this.opcode('invokeHelper', params.length, name); | ||
} | ||
}, | ||
ID: function(id) { | ||
this.addDepth(id.depth); | ||
this.opcode('getContext', id.depth); | ||
this.opcode('lookupOnContext', id.parts[0]); | ||
this.opcode('lookupWithHelpers', id.parts[0] || null, id.isScoped || false); | ||
for(var i=1, l=id.parts.length; i<l; i++) { | ||
@@ -250,2 +256,7 @@ this.opcode('lookup', id.parts[i]); | ||
DATA: function(data) { | ||
this.options.data = true; | ||
this.opcode('lookupData', data.id); | ||
}, | ||
STRING: function(string) { | ||
@@ -256,7 +267,7 @@ this.opcode('pushString', string.string); | ||
INTEGER: function(integer) { | ||
this.opcode('push', integer.integer); | ||
this.opcode('pushLiteral', integer.integer); | ||
}, | ||
BOOLEAN: function(bool) { | ||
this.opcode('push', bool.bool); | ||
this.opcode('pushLiteral', bool.bool); | ||
}, | ||
@@ -267,2 +278,41 @@ | ||
// HELPERS | ||
opcode: function(name) { | ||
this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) }); | ||
}, | ||
declare: function(name, value) { | ||
this.opcodes.push({ opcode: 'DECLARE', name: name, value: value }); | ||
}, | ||
addDepth: function(depth) { | ||
if(isNaN(depth)) { throw new Error("EWOT"); } | ||
if(depth === 0) { return; } | ||
if(!this.depths[depth]) { | ||
this.depths[depth] = true; | ||
this.depths.list.push(depth); | ||
} | ||
}, | ||
classifyMustache: function(mustache) { | ||
var isHelper = mustache.isHelper; | ||
var isEligible = mustache.eligibleHelper; | ||
var options = this.options; | ||
// if ambiguous, we can possibly resolve the ambiguity now | ||
if (isEligible && !isHelper) { | ||
var name = mustache.id.parts[0]; | ||
if (options.knownHelpers[name]) { | ||
isHelper = true; | ||
} else if (options.knownHelpersOnly) { | ||
isEligible = false; | ||
} | ||
} | ||
if (isHelper) { return "helper"; } | ||
else if (isEligible) { return "ambiguous"; } | ||
else { return "simple"; } | ||
}, | ||
pushParams: function(params) { | ||
@@ -287,35 +337,29 @@ var i = params.length, param; | ||
opcode: function(name, val1, val2, val3) { | ||
this.opcodes.push(Compiler.OPCODE_MAP[name]); | ||
if(val1 !== undefined) { this.opcodes.push(val1); } | ||
if(val2 !== undefined) { this.opcodes.push(val2); } | ||
if(val3 !== undefined) { this.opcodes.push(val3); } | ||
}, | ||
setupMustacheParams: function(mustache) { | ||
var params = mustache.params; | ||
this.pushParams(params); | ||
declare: function(name, value) { | ||
this.opcodes.push('DECLARE'); | ||
this.opcodes.push(name); | ||
this.opcodes.push(value); | ||
}, | ||
if(mustache.hash) { | ||
this.hash(mustache.hash); | ||
} else { | ||
this.opcode('pushLiteral', '{}'); | ||
} | ||
addDepth: function(depth) { | ||
if(depth === 0) { return; } | ||
if(!this.depths[depth]) { | ||
this.depths[depth] = true; | ||
this.depths.list.push(depth); | ||
} | ||
return params; | ||
}, | ||
setupStackForMustache: function(mustache) { | ||
// this will replace setupMustacheParams when we're done | ||
setupFullMustacheParams: function(mustache, program, inverse) { | ||
var params = mustache.params; | ||
this.pushParams(params); | ||
this.opcode('pushProgram', program); | ||
this.opcode('pushProgram', inverse); | ||
if(mustache.hash) { | ||
this.hash(mustache.hash); | ||
} else { | ||
this.opcode('pushLiteral', '{}'); | ||
} | ||
this.ID(mustache.id); | ||
return params; | ||
@@ -325,2 +369,6 @@ } | ||
var Literal = function(value) { | ||
this.value = value; | ||
}; | ||
JavaScriptCompiler.prototype = { | ||
@@ -359,2 +407,4 @@ // PUBLIC API: You can override these methods in a subclass to provide | ||
Handlebars.log(Handlebars.logger.DEBUG, this.environment.disassemble() + "\n\n"); | ||
this.name = this.environment.name; | ||
@@ -364,4 +414,3 @@ this.isChild = !!context; | ||
programs: [], | ||
aliases: { self: 'this' }, | ||
registers: {list: []} | ||
aliases: { } | ||
}; | ||
@@ -373,2 +422,4 @@ | ||
this.stackVars = []; | ||
this.registers = { list: [] }; | ||
this.compileStack = []; | ||
@@ -382,10 +433,8 @@ this.compileChildren(environment, options); | ||
for(l=opcodes.length; this.i<l; this.i++) { | ||
opcode = this.nextOpcode(0); | ||
opcode = opcodes[this.i]; | ||
if(opcode[0] === 'DECLARE') { | ||
this.i = this.i + 2; | ||
this[opcode[1]] = opcode[2]; | ||
if(opcode.opcode === 'DECLARE') { | ||
this[opcode.name] = opcode.value; | ||
} else { | ||
this.i = this.i + opcode[1].length; | ||
this[opcode[0]].apply(this, opcode[1]); | ||
this[opcode.opcode].apply(this, opcode.args); | ||
} | ||
@@ -397,26 +446,9 @@ } | ||
nextOpcode: function(n) { | ||
var opcodes = this.environment.opcodes, opcode = opcodes[this.i + n], name, val; | ||
var extraParams, codes; | ||
if(opcode === 'DECLARE') { | ||
name = opcodes[this.i + 1]; | ||
val = opcodes[this.i + 2]; | ||
return ['DECLARE', name, val]; | ||
} else { | ||
name = Compiler.DISASSEMBLE_MAP[opcode]; | ||
extraParams = Compiler.multiParamSize(opcode); | ||
codes = []; | ||
for(var j=0; j<extraParams; j++) { | ||
codes.push(opcodes[this.i + j + 1 + n]); | ||
} | ||
return [name, codes]; | ||
} | ||
nextOpcode: function() { | ||
var opcodes = this.environment.opcodes, opcode = opcodes[this.i + 1]; | ||
return opcodes[this.i + 1]; | ||
}, | ||
eat: function(opcode) { | ||
this.i = this.i + opcode.length; | ||
this.i = this.i + 1; | ||
}, | ||
@@ -427,12 +459,7 @@ | ||
// this register will disambiguate helper lookup from finding a function in | ||
// a context. This is necessary for mustache compatibility, which requires | ||
// that context functions in blocks are evaluated by blockHelperMissing, and | ||
// then proceed as if the resulting value was provided to blockHelperMissing. | ||
this.useRegister('foundHelper'); | ||
if (!this.isChild) { | ||
var namespace = this.namespace; | ||
var copies = "helpers = helpers || " + namespace + ".helpers;"; | ||
if(this.environment.usePartial) { copies = copies + " partials = partials || " + namespace + ".partials;"; } | ||
if (this.environment.usePartial) { copies = copies + " partials = partials || " + namespace + ".partials;"; } | ||
if (this.options.data) { copies = copies + " data = data || {};"; } | ||
out.push(copies); | ||
@@ -456,6 +483,3 @@ } else { | ||
createFunctionContext: function(asObject) { | ||
var locals = this.stackVars; | ||
if (!this.isChild) { | ||
locals = locals.concat(this.context.registers.list); | ||
} | ||
var locals = this.stackVars.concat(this.registers.list); | ||
@@ -504,2 +528,47 @@ if(locals.length > 0) { | ||
// [blockValue] | ||
// | ||
// On stack, before: hash, inverse, program, value | ||
// On stack, after: return value of blockHelperMissing | ||
// | ||
// The purpose of this opcode is to take a block of the form | ||
// `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and | ||
// replace it on the stack with the result of properly | ||
// invoking blockHelperMissing. | ||
blockValue: function() { | ||
this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing'; | ||
var params = ["depth0"]; | ||
this.setupParams(0, params); | ||
this.replaceStack(function(current) { | ||
params.splice(1, 0, current); | ||
return current + " = blockHelperMissing.call(" + params.join(", ") + ")"; | ||
}); | ||
}, | ||
// [ambiguousBlockValue] | ||
// | ||
// On stack, before: hash, inverse, program, value | ||
// Compiler value, before: lastHelper=value of last found helper, if any | ||
// On stack, after, if no lastHelper: same as [blockValue] | ||
// On stack, after, if lastHelper: value | ||
ambiguousBlockValue: function() { | ||
this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing'; | ||
var params = ["depth0"]; | ||
this.setupParams(0, params); | ||
var current = this.topStack(); | ||
params.splice(1, 0, current); | ||
this.source.push("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }"); | ||
}, | ||
// [appendContent] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: ... | ||
// | ||
// Appends the string value of `content` to the current buffer | ||
appendContent: function(content) { | ||
@@ -509,2 +578,11 @@ this.source.push(this.appendToBuffer(this.quotedString(content))); | ||
// [append] | ||
// | ||
// On stack, before: value, ... | ||
// On stack, after: ... | ||
// | ||
// Coerces `value` to a String and appends it to the current buffer. | ||
// | ||
// If `value` is truthy, or 0, it is coerced into a string and appended | ||
// Otherwise, the empty string is appended | ||
append: function() { | ||
@@ -518,8 +596,14 @@ var local = this.popStack(); | ||
// [appendEscaped] | ||
// | ||
// On stack, before: value, ... | ||
// On stack, after: ... | ||
// | ||
// Escape `value` and append it to the buffer | ||
appendEscaped: function() { | ||
var opcode = this.nextOpcode(1), extra = ""; | ||
var opcode = this.nextOpcode(), extra = ""; | ||
this.context.aliases.escapeExpression = 'this.escapeExpression'; | ||
if(opcode[0] === 'appendContent') { | ||
extra = " + " + this.quotedString(opcode[1][0]); | ||
if(opcode && opcode.opcode === 'appendContent') { | ||
extra = " + " + this.quotedString(opcode.args[0]); | ||
this.eat(opcode); | ||
@@ -531,2 +615,9 @@ } | ||
// [getContext] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: ... | ||
// Compiler value, after: lastContext=depth | ||
// | ||
// Set the value of the `lastContext` compiler value to the depth | ||
getContext: function(depth) { | ||
@@ -538,133 +629,191 @@ if(this.lastContext !== depth) { | ||
lookupWithHelpers: function(name, isScoped) { | ||
if(name) { | ||
var topStack = this.nextStack(); | ||
// [lookupOnContext] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: currentContext[name], ... | ||
// | ||
// Looks up the value of `name` on the current context and pushes | ||
// it onto the stack. | ||
lookupOnContext: function(name) { | ||
this.pushStack(this.nameLookup('depth' + this.lastContext, name, 'context')); | ||
}, | ||
this.usingKnownHelper = false; | ||
// [pushContext] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: currentContext, ... | ||
// | ||
// Pushes the value of the current context onto the stack. | ||
pushContext: function() { | ||
this.pushStackLiteral('depth' + this.lastContext); | ||
}, | ||
var toPush; | ||
if (!isScoped && this.options.knownHelpers[name]) { | ||
toPush = topStack + " = " + this.nameLookup('helpers', name, 'helper'); | ||
this.usingKnownHelper = true; | ||
} else if (isScoped || this.options.knownHelpersOnly) { | ||
toPush = topStack + " = " + this.nameLookup('depth' + this.lastContext, name, 'context'); | ||
} else { | ||
this.register('foundHelper', this.nameLookup('helpers', name, 'helper')); | ||
toPush = topStack + " = foundHelper || " + this.nameLookup('depth' + this.lastContext, name, 'context'); | ||
} | ||
// [resolvePossibleLambda] | ||
// | ||
// On stack, before: value, ... | ||
// On stack, after: resolved value, ... | ||
// | ||
// If the `value` is a lambda, replace it on the stack by | ||
// the return value of the lambda | ||
resolvePossibleLambda: function() { | ||
this.context.aliases.functionType = '"function"'; | ||
toPush += ';'; | ||
this.source.push(toPush); | ||
} else { | ||
this.pushStack('depth' + this.lastContext); | ||
} | ||
this.replaceStack(function(current) { | ||
return "typeof " + current + " === functionType ? " + current + "() : " + current; | ||
}); | ||
}, | ||
// [lookup] | ||
// | ||
// On stack, before: value, ... | ||
// On stack, after: value[name], ... | ||
// | ||
// Replace the value on the stack with the result of looking | ||
// up `name` on `value` | ||
lookup: function(name) { | ||
var topStack = this.topStack(); | ||
this.source.push(topStack + " = (" + topStack + " === null || " + topStack + " === undefined || " + topStack + " === false ? " + | ||
topStack + " : " + this.nameLookup(topStack, name, 'context') + ");"); | ||
this.replaceStack(function(current) { | ||
return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context'); | ||
}); | ||
}, | ||
// [lookupData] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: data[id], ... | ||
// | ||
// Push the result of looking up `id` on the current data | ||
lookupData: function(id) { | ||
this.pushStack(this.nameLookup('data', id, 'data')); | ||
}, | ||
// [pushStringParam] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: string, currentContext, ... | ||
// | ||
// This opcode is designed for use in string mode, which | ||
// provides the string value of a parameter along with its | ||
// depth rather than resolving it immediately. | ||
pushStringParam: function(string) { | ||
this.pushStack('depth' + this.lastContext); | ||
this.pushStackLiteral('depth' + this.lastContext); | ||
this.pushString(string); | ||
}, | ||
// [pushString] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: quotedString(string), ... | ||
// | ||
// Push a quoted version of `string` onto the stack | ||
pushString: function(string) { | ||
this.pushStack(this.quotedString(string)); | ||
this.pushStackLiteral(this.quotedString(string)); | ||
}, | ||
push: function(name) { | ||
this.pushStack(name); | ||
// [push] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: expr, ... | ||
// | ||
// Push an expression onto the stack | ||
push: function(expr) { | ||
this.pushStack(expr); | ||
}, | ||
invokeMustache: function(paramSize, original, hasHash) { | ||
this.populateParams(paramSize, this.quotedString(original), "{}", null, hasHash, function(nextStack, helperMissingString, id) { | ||
if (!this.usingKnownHelper) { | ||
this.context.aliases.helperMissing = 'helpers.helperMissing'; | ||
this.context.aliases.undef = 'void 0'; | ||
this.source.push("else if(" + id + "=== undef) { " + nextStack + " = helperMissing.call(" + helperMissingString + "); }"); | ||
if (nextStack !== id) { | ||
this.source.push("else { " + nextStack + " = " + id + "; }"); | ||
} | ||
} | ||
}); | ||
// [pushLiteral] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: value, ... | ||
// | ||
// Pushes a value onto the stack. This operation prevents | ||
// the compiler from creating a temporary variable to hold | ||
// it. | ||
pushLiteral: function(value) { | ||
this.pushStackLiteral(value); | ||
}, | ||
invokeProgram: function(guid, paramSize, hasHash) { | ||
var inverse = this.programExpression(this.inverse); | ||
var mainProgram = this.programExpression(guid); | ||
this.populateParams(paramSize, null, mainProgram, inverse, hasHash, function(nextStack, helperMissingString, id) { | ||
if (!this.usingKnownHelper) { | ||
this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing'; | ||
this.source.push("else { " + nextStack + " = blockHelperMissing.call(" + helperMissingString + "); }"); | ||
} | ||
}); | ||
}, | ||
populateParams: function(paramSize, helperId, program, inverse, hasHash, fn) { | ||
var needsRegister = hasHash || this.options.stringParams || inverse || this.options.data; | ||
var id = this.popStack(), nextStack; | ||
var params = [], param, stringParam, stringOptions; | ||
if (needsRegister) { | ||
this.register('tmp1', program); | ||
stringOptions = 'tmp1'; | ||
// [pushProgram] | ||
// | ||
// On stack, before: ... | ||
// On stack, after: program(guid), ... | ||
// | ||
// Push a program expression onto the stack. This takes | ||
// a compile-time guid and converts it into a runtime-accessible | ||
// expression. | ||
pushProgram: function(guid) { | ||
if (guid != null) { | ||
this.pushStackLiteral(this.programExpression(guid)); | ||
} else { | ||
stringOptions = '{ hash: {} }'; | ||
this.pushStackLiteral(null); | ||
} | ||
}, | ||
if (needsRegister) { | ||
var hash = (hasHash ? this.popStack() : '{}'); | ||
this.source.push('tmp1.hash = ' + hash + ';'); | ||
} | ||
// [invokeHelper] | ||
// | ||
// On stack, before: hash, inverse, program, params..., ... | ||
// On stack, after: result of helper invocation | ||
// | ||
// Pops off the helper's parameters, invokes the helper, | ||
// and pushes the helper's return value onto the stack. | ||
// | ||
// If the helper is not found, `helperMissing` is called. | ||
invokeHelper: function(paramSize, name) { | ||
this.context.aliases.helperMissing = 'helpers.helperMissing'; | ||
if(this.options.stringParams) { | ||
this.source.push('tmp1.contexts = [];'); | ||
} | ||
var helper = this.lastHelper = this.setupHelper(paramSize, name); | ||
this.register('foundHelper', helper.name); | ||
for(var i=0; i<paramSize; i++) { | ||
param = this.popStack(); | ||
params.push(param); | ||
this.pushStack("foundHelper ? foundHelper.call(" + | ||
helper.callParams + ") " + ": helperMissing.call(" + | ||
helper.helperMissingParams + ")"); | ||
}, | ||
if(this.options.stringParams) { | ||
this.source.push('tmp1.contexts.push(' + this.popStack() + ');'); | ||
} | ||
} | ||
// [invokeKnownHelper] | ||
// | ||
// On stack, before: hash, inverse, program, params..., ... | ||
// On stack, after: result of helper invocation | ||
// | ||
// This operation is used when the helper is known to exist, | ||
// so a `helperMissing` fallback is not required. | ||
invokeKnownHelper: function(paramSize, name) { | ||
var helper = this.setupHelper(paramSize, name); | ||
this.pushStack(helper.name + ".call(" + helper.callParams + ")"); | ||
}, | ||
if(inverse) { | ||
this.source.push('tmp1.fn = tmp1;'); | ||
this.source.push('tmp1.inverse = ' + inverse + ';'); | ||
} | ||
// [invokeAmbiguous] | ||
// | ||
// On stack, before: hash, inverse, program, params..., ... | ||
// On stack, after: result of disambiguation | ||
// | ||
// This operation is used when an expression like `{{foo}}` | ||
// is provided, but we don't know at compile-time whether it | ||
// is a helper or a path. | ||
// | ||
// This operation emits more code than the other options, | ||
// and can be avoided by passing the `knownHelpers` and | ||
// `knownHelpersOnly` flags at compile-time. | ||
invokeAmbiguous: function(name) { | ||
this.context.aliases.functionType = '"function"'; | ||
if(this.options.data) { | ||
this.source.push('tmp1.data = data;'); | ||
} | ||
this.pushStackLiteral('{}'); | ||
var helper = this.setupHelper(0, name); | ||
params.push(stringOptions); | ||
var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper'); | ||
this.register('foundHelper', helperName); | ||
this.populateCall(params, id, helperId || id, fn, program !== '{}'); | ||
}, | ||
populateCall: function(params, id, helperId, fn, program) { | ||
var paramString = ["depth0"].concat(params).join(", "); | ||
var helperMissingString = ["depth0"].concat(helperId).concat(params).join(", "); | ||
var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context'); | ||
var nextStack = this.nextStack(); | ||
if (this.usingKnownHelper) { | ||
this.source.push(nextStack + " = " + id + ".call(" + paramString + ");"); | ||
} else { | ||
this.context.aliases.functionType = '"function"'; | ||
var condition = program ? "foundHelper && " : ""; | ||
this.source.push("if(" + condition + "typeof " + id + " === functionType) { " + nextStack + " = " + id + ".call(" + paramString + "); }"); | ||
} | ||
fn.call(this, nextStack, helperMissingString, id); | ||
this.usingKnownHelper = false; | ||
this.source.push('if (foundHelper) { ' + nextStack + ' = foundHelper.call(' + helper.callParams + '); }'); | ||
this.source.push('else { ' + nextStack + ' = ' + nonHelper + '; ' + nextStack + ' = typeof ' + nextStack + ' === functionType ? ' + nextStack + '() : ' + nextStack + '; }'); | ||
}, | ||
invokePartial: function(context) { | ||
params = [this.nameLookup('partials', context, 'partial'), "'" + context + "'", this.popStack(), "helpers", "partials"]; | ||
// [invokePartial] | ||
// | ||
// On stack, before: context, ... | ||
// On stack after: result of partial invocation | ||
// | ||
// This operation pops off a context, invokes a partial with that context, | ||
// and pushes the result of the invocation back. | ||
invokePartial: function(name) { | ||
var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"]; | ||
@@ -675,5 +824,13 @@ if (this.options.data) { | ||
this.context.aliases.self = "this"; | ||
this.pushStack("self.invokePartial(" + params.join(", ") + ");"); | ||
}, | ||
// [assignToHash] | ||
// | ||
// On stack, before: value, hash, ... | ||
// On stack, after: hash, ... | ||
// | ||
// Pops a value and hash off the stack, assigns `hash[key] = value` | ||
// and pushes the hash back onto the stack. | ||
assignToHash: function(key) { | ||
@@ -706,6 +863,11 @@ var value = this.popStack(); | ||
programExpression: function(guid) { | ||
if(guid == null) { return "self.noop"; } | ||
this.context.aliases.self = "this"; | ||
if(guid == null) { | ||
return "self.noop"; | ||
} | ||
var child = this.environment.children[guid], | ||
depths = child.depths.list; | ||
depths = child.depths.list, depth; | ||
var programParams = [child.index, child.name, "data"]; | ||
@@ -734,14 +896,33 @@ | ||
useRegister: function(name) { | ||
if(!this.context.registers[name]) { | ||
this.context.registers[name] = true; | ||
this.context.registers.list.push(name); | ||
if(!this.registers[name]) { | ||
this.registers[name] = true; | ||
this.registers.list.push(name); | ||
} | ||
}, | ||
pushStackLiteral: function(item) { | ||
this.compileStack.push(new Literal(item)); | ||
return item; | ||
}, | ||
pushStack: function(item) { | ||
this.source.push(this.nextStack() + " = " + item + ";"); | ||
this.source.push(this.incrStack() + " = " + item + ";"); | ||
this.compileStack.push("stack" + this.stackSlot); | ||
return "stack" + this.stackSlot; | ||
}, | ||
nextStack: function() { | ||
replaceStack: function(callback) { | ||
var item = callback.call(this, this.topStack()); | ||
this.source.push(this.topStack() + " = " + item + ";"); | ||
return "stack" + this.stackSlot; | ||
}, | ||
nextStack: function(skipCompileStack) { | ||
var name = this.incrStack(); | ||
this.compileStack.push("stack" + this.stackSlot); | ||
return name; | ||
}, | ||
incrStack: function() { | ||
this.stackSlot++; | ||
@@ -753,7 +934,20 @@ if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); } | ||
popStack: function() { | ||
return "stack" + this.stackSlot--; | ||
var item = this.compileStack.pop(); | ||
if (item instanceof Literal) { | ||
return item.value; | ||
} else { | ||
this.stackSlot--; | ||
return item; | ||
} | ||
}, | ||
topStack: function() { | ||
return "stack" + this.stackSlot; | ||
var item = this.compileStack[this.compileStack.length - 1]; | ||
if (item instanceof Literal) { | ||
return item.value; | ||
} else { | ||
return item; | ||
} | ||
}, | ||
@@ -767,2 +961,63 @@ | ||
.replace(/\r/g, '\\r') + '"'; | ||
}, | ||
setupHelper: function(paramSize, name) { | ||
var params = []; | ||
this.setupParams(paramSize, params); | ||
var foundHelper = this.nameLookup('helpers', name, 'helper'); | ||
return { | ||
params: params, | ||
name: foundHelper, | ||
callParams: ["depth0"].concat(params).join(", "), | ||
helperMissingParams: ["depth0", this.quotedString(name)].concat(params).join(", ") | ||
}; | ||
}, | ||
// the params and contexts arguments are passed in arrays | ||
// to fill in | ||
setupParams: function(paramSize, params) { | ||
var options = [], contexts = [], param, inverse, program; | ||
options.push("hash:" + this.popStack()); | ||
inverse = this.popStack(); | ||
program = this.popStack(); | ||
// Avoid setting fn and inverse if neither are set. This allows | ||
// helpers to do a check for `if (options.fn)` | ||
if (program || inverse) { | ||
if (!program) { | ||
this.context.aliases.self = "this"; | ||
program = "self.noop"; | ||
} | ||
if (!inverse) { | ||
this.context.aliases.self = "this"; | ||
inverse = "self.noop"; | ||
} | ||
options.push("inverse:" + inverse); | ||
options.push("fn:" + program); | ||
} | ||
for(var i=0; i<paramSize; i++) { | ||
param = this.popStack(); | ||
params.push(param); | ||
if(this.options.stringParams) { | ||
contexts.push(this.popStack()); | ||
} | ||
} | ||
if (this.options.stringParams) { | ||
options.push("contexts:[" + contexts.join(",") + "]"); | ||
} | ||
if(this.options.data) { | ||
options.push("data:data"); | ||
} | ||
params.push("{" + options.join(",") + "}"); | ||
return params.join(", "); | ||
} | ||
@@ -769,0 +1024,0 @@ }; |
@@ -5,5 +5,5 @@ /* Jison generated parser */ | ||
yy: {}, | ||
symbols_: {"error":2,"root":3,"program":4,"EOF":5,"statements":6,"simpleInverse":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"OPEN_PARTIAL":24,"params":25,"hash":26,"param":27,"STRING":28,"INTEGER":29,"BOOLEAN":30,"hashSegments":31,"hashSegment":32,"ID":33,"EQUALS":34,"pathSegments":35,"SEP":36,"$accept":0,"$end":1}, | ||
terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"OPEN_PARTIAL",28:"STRING",29:"INTEGER",30:"BOOLEAN",33:"ID",34:"EQUALS",36:"SEP"}, | ||
productions_: [0,[3,2],[4,3],[4,1],[4,0],[6,1],[6,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[7,2],[17,3],[17,2],[17,2],[17,1],[25,2],[25,1],[27,1],[27,1],[27,1],[27,1],[26,1],[31,2],[31,1],[32,3],[32,3],[32,3],[32,3],[21,1],[35,3],[35,1]], | ||
symbols_: {"error":2,"root":3,"program":4,"EOF":5,"statements":6,"simpleInverse":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"OPEN_PARTIAL":24,"params":25,"hash":26,"DATA":27,"param":28,"STRING":29,"INTEGER":30,"BOOLEAN":31,"hashSegments":32,"hashSegment":33,"ID":34,"EQUALS":35,"pathSegments":36,"SEP":37,"$accept":0,"$end":1}, | ||
terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"OPEN_PARTIAL",27:"DATA",29:"STRING",30:"INTEGER",31:"BOOLEAN",34:"ID",35:"EQUALS",37:"SEP"}, | ||
productions_: [0,[3,2],[4,3],[4,1],[4,0],[6,1],[6,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[7,2],[17,3],[17,2],[17,2],[17,1],[17,1],[25,2],[25,1],[28,1],[28,1],[28,1],[28,1],[28,1],[26,1],[32,2],[32,1],[33,3],[33,3],[33,3],[33,3],[33,3],[21,1],[36,3],[36,1]], | ||
performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) { | ||
@@ -25,5 +25,5 @@ | ||
break; | ||
case 7: this.$ = new yy.InverseNode($$[$0-2], $$[$0-1], $$[$0]); | ||
case 7: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0]); | ||
break; | ||
case 8: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0]); | ||
case 8: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0]); | ||
break; | ||
@@ -62,38 +62,44 @@ case 9: this.$ = $$[$0]; | ||
break; | ||
case 25: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; | ||
case 25: this.$ = [[new yy.DataNode($$[$0])], null]; | ||
break; | ||
case 26: this.$ = [$$[$0]]; | ||
case 26: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; | ||
break; | ||
case 27: this.$ = $$[$0]; | ||
case 27: this.$ = [$$[$0]]; | ||
break; | ||
case 28: this.$ = new yy.StringNode($$[$0]); | ||
case 28: this.$ = $$[$0]; | ||
break; | ||
case 29: this.$ = new yy.IntegerNode($$[$0]); | ||
case 29: this.$ = new yy.StringNode($$[$0]); | ||
break; | ||
case 30: this.$ = new yy.BooleanNode($$[$0]); | ||
case 30: this.$ = new yy.IntegerNode($$[$0]); | ||
break; | ||
case 31: this.$ = new yy.HashNode($$[$0]); | ||
case 31: this.$ = new yy.BooleanNode($$[$0]); | ||
break; | ||
case 32: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; | ||
case 32: this.$ = new yy.DataNode($$[$0]); | ||
break; | ||
case 33: this.$ = [$$[$0]]; | ||
case 33: this.$ = new yy.HashNode($$[$0]); | ||
break; | ||
case 34: this.$ = [$$[$0-2], $$[$0]]; | ||
case 34: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; | ||
break; | ||
case 35: this.$ = [$$[$0-2], new yy.StringNode($$[$0])]; | ||
case 35: this.$ = [$$[$0]]; | ||
break; | ||
case 36: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])]; | ||
case 36: this.$ = [$$[$0-2], $$[$0]]; | ||
break; | ||
case 37: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])]; | ||
case 37: this.$ = [$$[$0-2], new yy.StringNode($$[$0])]; | ||
break; | ||
case 38: this.$ = new yy.IdNode($$[$0]); | ||
case 38: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])]; | ||
break; | ||
case 39: $$[$0-2].push($$[$0]); this.$ = $$[$0-2]; | ||
case 39: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])]; | ||
break; | ||
case 40: this.$ = [$$[$0]]; | ||
case 40: this.$ = [$$[$0-2], new yy.DataNode($$[$0])]; | ||
break; | ||
case 41: this.$ = new yy.IdNode($$[$0]); | ||
break; | ||
case 42: $$[$0-2].push($$[$0]); this.$ = $$[$0-2]; | ||
break; | ||
case 43: this.$ = [$$[$0]]; | ||
break; | ||
} | ||
}, | ||
table: [{3:1,4:2,5:[2,4],6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{1:[3]},{5:[1,16]},{5:[2,3],7:17,8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,19],20:[2,3],22:[1,13],23:[1,14],24:[1,15]},{5:[2,5],14:[2,5],15:[2,5],16:[2,5],19:[2,5],20:[2,5],22:[2,5],23:[2,5],24:[2,5]},{4:20,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{4:21,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],24:[2,9]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],24:[2,10]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],24:[2,11]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],24:[2,12]},{17:22,21:23,33:[1,25],35:24},{17:26,21:23,33:[1,25],35:24},{17:27,21:23,33:[1,25],35:24},{17:28,21:23,33:[1,25],35:24},{21:29,33:[1,25],35:24},{1:[2,1]},{6:30,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{5:[2,6],14:[2,6],15:[2,6],16:[2,6],19:[2,6],20:[2,6],22:[2,6],23:[2,6],24:[2,6]},{17:22,18:[1,31],21:23,33:[1,25],35:24},{10:32,20:[1,33]},{10:34,20:[1,33]},{18:[1,35]},{18:[2,24],21:40,25:36,26:37,27:38,28:[1,41],29:[1,42],30:[1,43],31:39,32:44,33:[1,45],35:24},{18:[2,38],28:[2,38],29:[2,38],30:[2,38],33:[2,38],36:[1,46]},{18:[2,40],28:[2,40],29:[2,40],30:[2,40],33:[2,40],36:[2,40]},{18:[1,47]},{18:[1,48]},{18:[1,49]},{18:[1,50],21:51,33:[1,25],35:24},{5:[2,2],8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,2],22:[1,13],23:[1,14],24:[1,15]},{14:[2,20],15:[2,20],16:[2,20],19:[2,20],22:[2,20],23:[2,20],24:[2,20]},{5:[2,7],14:[2,7],15:[2,7],16:[2,7],19:[2,7],20:[2,7],22:[2,7],23:[2,7],24:[2,7]},{21:52,33:[1,25],35:24},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],24:[2,8]},{14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],24:[2,14]},{18:[2,22],21:40,26:53,27:54,28:[1,41],29:[1,42],30:[1,43],31:39,32:44,33:[1,45],35:24},{18:[2,23]},{18:[2,26],28:[2,26],29:[2,26],30:[2,26],33:[2,26]},{18:[2,31],32:55,33:[1,56]},{18:[2,27],28:[2,27],29:[2,27],30:[2,27],33:[2,27]},{18:[2,28],28:[2,28],29:[2,28],30:[2,28],33:[2,28]},{18:[2,29],28:[2,29],29:[2,29],30:[2,29],33:[2,29]},{18:[2,30],28:[2,30],29:[2,30],30:[2,30],33:[2,30]},{18:[2,33],33:[2,33]},{18:[2,40],28:[2,40],29:[2,40],30:[2,40],33:[2,40],34:[1,57],36:[2,40]},{33:[1,58]},{14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],24:[2,13]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],24:[2,16]},{5:[2,17],14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],24:[2,17]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],24:[2,18]},{18:[1,59]},{18:[1,60]},{18:[2,21]},{18:[2,25],28:[2,25],29:[2,25],30:[2,25],33:[2,25]},{18:[2,32],33:[2,32]},{34:[1,57]},{21:61,28:[1,62],29:[1,63],30:[1,64],33:[1,25],35:24},{18:[2,39],28:[2,39],29:[2,39],30:[2,39],33:[2,39],36:[2,39]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],24:[2,19]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],24:[2,15]},{18:[2,34],33:[2,34]},{18:[2,35],33:[2,35]},{18:[2,36],33:[2,36]},{18:[2,37],33:[2,37]}], | ||
defaultActions: {16:[2,1],37:[2,23],53:[2,21]}, | ||
table: [{3:1,4:2,5:[2,4],6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{1:[3]},{5:[1,16]},{5:[2,3],7:17,8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,19],20:[2,3],22:[1,13],23:[1,14],24:[1,15]},{5:[2,5],14:[2,5],15:[2,5],16:[2,5],19:[2,5],20:[2,5],22:[2,5],23:[2,5],24:[2,5]},{4:20,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{4:21,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],24:[2,9]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],24:[2,10]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],24:[2,11]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],24:[2,12]},{17:22,21:23,27:[1,24],34:[1,26],36:25},{17:27,21:23,27:[1,24],34:[1,26],36:25},{17:28,21:23,27:[1,24],34:[1,26],36:25},{17:29,21:23,27:[1,24],34:[1,26],36:25},{21:30,34:[1,26],36:25},{1:[2,1]},{6:31,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{5:[2,6],14:[2,6],15:[2,6],16:[2,6],19:[2,6],20:[2,6],22:[2,6],23:[2,6],24:[2,6]},{17:22,18:[1,32],21:23,27:[1,24],34:[1,26],36:25},{10:33,20:[1,34]},{10:35,20:[1,34]},{18:[1,36]},{18:[2,24],21:41,25:37,26:38,27:[1,45],28:39,29:[1,42],30:[1,43],31:[1,44],32:40,33:46,34:[1,47],36:25},{18:[2,25]},{18:[2,41],27:[2,41],29:[2,41],30:[2,41],31:[2,41],34:[2,41],37:[1,48]},{18:[2,43],27:[2,43],29:[2,43],30:[2,43],31:[2,43],34:[2,43],37:[2,43]},{18:[1,49]},{18:[1,50]},{18:[1,51]},{18:[1,52],21:53,34:[1,26],36:25},{5:[2,2],8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,2],22:[1,13],23:[1,14],24:[1,15]},{14:[2,20],15:[2,20],16:[2,20],19:[2,20],22:[2,20],23:[2,20],24:[2,20]},{5:[2,7],14:[2,7],15:[2,7],16:[2,7],19:[2,7],20:[2,7],22:[2,7],23:[2,7],24:[2,7]},{21:54,34:[1,26],36:25},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],24:[2,8]},{14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],24:[2,14]},{18:[2,22],21:41,26:55,27:[1,45],28:56,29:[1,42],30:[1,43],31:[1,44],32:40,33:46,34:[1,47],36:25},{18:[2,23]},{18:[2,27],27:[2,27],29:[2,27],30:[2,27],31:[2,27],34:[2,27]},{18:[2,33],33:57,34:[1,58]},{18:[2,28],27:[2,28],29:[2,28],30:[2,28],31:[2,28],34:[2,28]},{18:[2,29],27:[2,29],29:[2,29],30:[2,29],31:[2,29],34:[2,29]},{18:[2,30],27:[2,30],29:[2,30],30:[2,30],31:[2,30],34:[2,30]},{18:[2,31],27:[2,31],29:[2,31],30:[2,31],31:[2,31],34:[2,31]},{18:[2,32],27:[2,32],29:[2,32],30:[2,32],31:[2,32],34:[2,32]},{18:[2,35],34:[2,35]},{18:[2,43],27:[2,43],29:[2,43],30:[2,43],31:[2,43],34:[2,43],35:[1,59],37:[2,43]},{34:[1,60]},{14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],24:[2,13]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],24:[2,16]},{5:[2,17],14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],24:[2,17]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],24:[2,18]},{18:[1,61]},{18:[1,62]},{18:[2,21]},{18:[2,26],27:[2,26],29:[2,26],30:[2,26],31:[2,26],34:[2,26]},{18:[2,34],34:[2,34]},{35:[1,59]},{21:63,27:[1,67],29:[1,64],30:[1,65],31:[1,66],34:[1,26],36:25},{18:[2,42],27:[2,42],29:[2,42],30:[2,42],31:[2,42],34:[2,42],37:[2,42]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],24:[2,19]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],24:[2,15]},{18:[2,36],34:[2,36]},{18:[2,37],34:[2,37]},{18:[2,38],34:[2,38]},{18:[2,39],34:[2,39]},{18:[2,40],34:[2,40]}], | ||
defaultActions: {16:[2,1],24:[2,25],38:[2,23],55:[2,21]}, | ||
parseError: function parseError(str, hash) { | ||
@@ -429,9 +435,9 @@ throw new Error(str); | ||
break; | ||
case 12: return 34; | ||
case 12: return 35; | ||
break; | ||
case 13: return 33; | ||
case 13: return 34; | ||
break; | ||
case 14: return 33; | ||
case 14: return 34; | ||
break; | ||
case 15: return 36; | ||
case 15: return 37; | ||
break; | ||
@@ -444,22 +450,24 @@ case 16: /*ignore whitespace*/ | ||
break; | ||
case 19: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 28; | ||
case 19: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 29; | ||
break; | ||
case 20: return 30; | ||
case 20: yy_.yytext = yy_.yytext.substr(1); return 27; | ||
break; | ||
case 21: return 30; | ||
case 21: return 31; | ||
break; | ||
case 22: return 29; | ||
case 22: return 31; | ||
break; | ||
case 23: return 33; | ||
case 23: return 30; | ||
break; | ||
case 24: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 33; | ||
case 24: return 34; | ||
break; | ||
case 25: return 'INVALID'; | ||
case 25: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 34; | ||
break; | ||
case 26: return 5; | ||
case 26: return 'INVALID'; | ||
break; | ||
case 27: return 5; | ||
break; | ||
} | ||
}; | ||
lexer.rules = [/^[^\x00]*?(?=(\{\{))/,/^[^\x00]+/,/^[^\x00]{2,}?(?=(\{\{))/,/^\{\{>/,/^\{\{#/,/^\{\{\//,/^\{\{\^/,/^\{\{\s*else\b/,/^\{\{\{/,/^\{\{&/,/^\{\{![\s\S]*?\}\}/,/^\{\{/,/^=/,/^\.(?=[} ])/,/^\.\./,/^[\/.]/,/^\s+/,/^\}\}\}/,/^\}\}/,/^"(\\["]|[^"])*"/,/^true(?=[}\s])/,/^false(?=[}\s])/,/^[0-9]+(?=[}\s])/,/^[a-zA-Z0-9_$-]+(?=[=}\s\/.])/,/^\[[^\]]*\]/,/^./,/^$/]; | ||
lexer.conditions = {"mu":{"rules":[3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"INITIAL":{"rules":[0,1,26],"inclusive":true}};return lexer;})() | ||
lexer.rules = [/^[^\x00]*?(?=(\{\{))/,/^[^\x00]+/,/^[^\x00]{2,}?(?=(\{\{))/,/^\{\{>/,/^\{\{#/,/^\{\{\//,/^\{\{\^/,/^\{\{\s*else\b/,/^\{\{\{/,/^\{\{&/,/^\{\{![\s\S]*?\}\}/,/^\{\{/,/^=/,/^\.(?=[} ])/,/^\.\./,/^[\/.]/,/^\s+/,/^\}\}\}/,/^\}\}/,/^"(\\["]|[^"])*"/,/^@[a-zA-Z]+/,/^true(?=[}\s])/,/^false(?=[}\s])/,/^[0-9]+(?=[}\s])/,/^[a-zA-Z0-9_$-]+(?=[=}\s\/.])/,/^\[[^\]]*\]/,/^./,/^$/]; | ||
lexer.conditions = {"mu":{"rules":[3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"INITIAL":{"rules":[0,1,27],"inclusive":true}};return lexer;})() | ||
parser.lexer = lexer; | ||
@@ -466,0 +474,0 @@ return parser; |
@@ -21,3 +21,3 @@ var Handlebars = require("./base"); | ||
Handlebars.PrintVisitor.prototype.program = function(program) { | ||
var out = this.pad("PROGRAM:"), | ||
var out = "", | ||
statements = program.statements, | ||
@@ -27,4 +27,2 @@ inverse = program.inverse, | ||
this.padding++; | ||
for(i=0, l=statements.length; i<l; i++) { | ||
@@ -36,14 +34,2 @@ out = out + this.accept(statements[i]); | ||
if(inverse) { | ||
out = out + this.pad("{{^}}"); | ||
this.padding++; | ||
for(i=0, l=inverse.statements.length; i<l; i++) { | ||
out = out + this.accept(inverse.statements[i]); | ||
} | ||
} | ||
this.padding--; | ||
return out; | ||
@@ -58,3 +44,16 @@ }; | ||
out = out + this.accept(block.mustache); | ||
out = out + this.accept(block.program); | ||
if (block.program) { | ||
out = out + this.pad("PROGRAM:"); | ||
this.padding++; | ||
out = out + this.accept(block.program); | ||
this.padding--; | ||
} | ||
if (block.inverse) { | ||
if (block.program) { this.padding++; } | ||
out = out + this.pad("{{^}}"); | ||
this.padding++; | ||
out = out + this.accept(block.inverse); | ||
this.padding--; | ||
if (block.program) { this.padding--; } | ||
} | ||
this.padding--; | ||
@@ -65,15 +64,2 @@ | ||
Handlebars.PrintVisitor.prototype.inverse = function(block) { | ||
var out = ""; | ||
out = out + this.pad("INVERSE:"); | ||
this.padding++; | ||
out = out + this.accept(block.mustache); | ||
out = out + this.accept(block.program); | ||
this.padding--; | ||
return out; | ||
}; | ||
Handlebars.PrintVisitor.prototype.mustache = function(mustache) { | ||
@@ -133,2 +119,6 @@ var params = mustache.params, paramStrings = [], hash; | ||
Handlebars.PrintVisitor.prototype.DATA = function(data) { | ||
return "@" + data.id; | ||
}; | ||
Handlebars.PrintVisitor.prototype.content = function(content) { | ||
@@ -135,0 +125,0 @@ return this.pad("CONTENT[ '" + content.string + "' ]"); |
{ | ||
"name": "handlebars", | ||
"description": "Extension of the Mustache logicless template language", | ||
"version": "1.0.5beta", | ||
"version": "1.0.6", | ||
"homepage": "http://www.handlebarsjs.com/", | ||
@@ -20,7 +20,13 @@ "keywords": [ | ||
}, | ||
"devDependencies": {}, | ||
"devDependencies": { | ||
"mocha": "*" | ||
}, | ||
"main": "lib/handlebars.js", | ||
"bin": { | ||
"handlebars": "bin/handlebars" | ||
} | ||
} | ||
}, | ||
"scripts": { | ||
"test": "node_modules/.bin/mocha -u qunit spec/qunit_spec.js" | ||
}, | ||
"optionalDependencies": {} | ||
} |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Manifest confusion
Supply chain riskThis package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.
Found 1 instance in 1 package
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
231229
20
1780
0
317
1
1