Added support for array iteration. Examples: {{~ it.arr :value:index …

…}}, {{~ [1,2,3] :v}} etc.

README

@@ -8,8 +8,9 @@ Features:
 	runtime interpolation,
 	compile-time evaluation,
 	partials support,
-	conditionals,
 	encoding,
+	conditionals,
+	array iteration,
 	control whitespace - strip or preserve,
 	streaming friendly
 

benchmarks/templating/doT.js

@@ -25,7 +25,8 @@
 		encode:      	  /\{\{!([\s\S]+?)\}\}/g,
 		use:         	  /\{\{#([\s\S]+?)\}\}/g,
 		define:      	  /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,
-		conditional:	  /\{\{\?(\?)?\s*([\s\S]*?)\}\}/g,
+		conditional:	  /\{\{\?(\?)?\s*([\s\S]*?)\s*\}\}/g,
+		iterate:      	  /\{\{~\s*(?:\}\}|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\}\})/g,
 		varname: 'it',
 		strip : true,
 		append: true,
@@ -73,7 +74,7 @@
 
 	doT.template = function(tmpl, c, def) {
 		c = c || doT.templateSettings;
-		var cse = c.append ? startend.append : startend.split, str, needhtmlencode;
+		var cse = c.append ? startend.append : startend.split, str, needhtmlencode, sid=0, indv;
 
 		if (c.use || c.define) {
 			var olddef = global.def; global.def = def || {}; // workaround minifiers
@@ -96,6 +97,12 @@
 					(code ? "';}else if(" + unescape(code) + "){out+='" : "';}else{out+='") :
 					(code ? "';if(" + unescape(code) + "){out+='" : "';}out+='");
 			})
+			.replace(c.iterate, function(m, iterate, vname, iname) {
+				if (!iterate) return "'} };out+='";
+				sid+=1;indv = iname || "i"+sid;iterate=unescape(iterate);
+				return "';var arr"+sid+"="+iterate+";if(arr"+sid+"){var "+indv+"=-1,l"+sid+"=arr"+sid+".length-1;while("+indv+"<l"+sid+"){"
+					+vname+"=arr"+sid+"["+indv+"+=1];out+='";
+			})
 			.replace(c.evaluate, function(m, code) {
 				return "';" + unescape(code) + "out+='";
 			})

doT.js

@@ -25,7 +25,8 @@
 		encode:      	  /\{\{!([\s\S]+?)\}\}/g,
 		use:         	  /\{\{#([\s\S]+?)\}\}/g,
 		define:      	  /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,
-		conditional:	  /\{\{\?(\?)?\s*([\s\S]*?)\}\}/g,
+		conditional:	  /\{\{\?(\?)?\s*([\s\S]*?)\s*\}\}/g,
+		iterate:      	  /\{\{~\s*(?:\}\}|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\}\})/g,
 		varname: 'it',
 		strip : true,
 		append: true,
@@ -73,7 +74,7 @@
 
 	doT.template = function(tmpl, c, def) {
 		c = c || doT.templateSettings;
-		var cse = c.append ? startend.append : startend.split, str, needhtmlencode;
+		var cse = c.append ? startend.append : startend.split, str, needhtmlencode, sid=0, indv;
 
 		if (c.use || c.define) {
 			var olddef = global.def; global.def = def || {}; // workaround minifiers
@@ -96,6 +97,12 @@
 					(code ? "';}else if(" + unescape(code) + "){out+='" : "';}else{out+='") :
 					(code ? "';if(" + unescape(code) + "){out+='" : "';}out+='");
 			})
+			.replace(c.iterate, function(m, iterate, vname, iname) {
+				if (!iterate) return "'} };out+='";
+				sid+=1;indv = iname || "i"+sid;iterate=unescape(iterate);
+				return "';var arr"+sid+"="+iterate+";if(arr"+sid+"){var "+indv+"=-1,l"+sid+"=arr"+sid+".length-1;while("+indv+"<l"+sid+"){"
+					+vname+"=arr"+sid+"["+indv+"+=1];out+='";
+			})
 			.replace(c.evaluate, function(m, code) {
 				return "';" + unescape(code) + "out+='";
 			})

examples/advancedsnippet.txt

@@ -55,11 +55,30 @@ Compare xyz to 1, show 'xyz is not 1' if false:
 
 Conditionals:
 {{? !it.altEmail }}
-<p>
-second email: {{= it.altEmail }}
-</p>
+	<p>
+	second email: {{= it.altEmail }}
+	</p>
 {{?? true }}
-else case worked
+	else case worked
 {{?}}
 
-
+Array iterators
+{{~ it.farray :p }}
+	<h1>{{=p.farray}}<h1>
+	{{~ p.farray :value:i }}
+		<h2>{{=i}}: {{=value}}</h2>
+		{{~ value :w }}
+			<h3>{{=w}}</h3>
+		{{~}}
+	{{~}}
+{{~}}
+
+{{~ ["apple", "banana", "orange"] :k}}
+	{{=k}}
+{{~}}
+
+{{~ (function(){ return [1,2,3]})() :k}}
+	{{=k}}
+{{~}}
+
+The end

examples/withdoT.js

@@ -1,7 +1,7 @@
 (function() {
 	var doT = require('../doT.js'),
 		fs = require('fs'),
-		data = { f1: 1, f2: 2, f3: 3, altEmail: "conditional works"},
+		data = { f1: 1, f2: 2, f3: 3, altEmail: "conditional works", farray:[{farray:[1,2,3,[11,22,33]],person:{name:'Ell',age:23}},{farray:{how:'really'}}, {farray:[5,6,7,8]}]},
 		defs = { a: 100, b: 200};
 
 	defs.loadfile = function(path) {