From 8e5f8de8c926105d71bfcf8dc88c927925f0181e Mon Sep 17 00:00:00 2001
From: Denis Seleznev <hcodes@yandex.ru>
Date: Sun, 26 Apr 2015 15:26:49 +0300
Subject: [PATCH] Refactoring

---
 lib/compiler.js        | 334 +++++++++++++++++++-------------------
 lib/kernel.js          | 354 +++++++++++++++++++++++++++++------------
 template/all.jst.js    | 120 +++++++-------
 template/block.jst.js  | 102 ++++++------
 template/filter.jst.js |  10 +-
 5 files changed, 518 insertions(+), 402 deletions(-)

diff --git a/lib/compiler.js b/lib/compiler.js
index 7d3393f..8a9bee1 100644
--- a/lib/compiler.js
+++ b/lib/compiler.js
@@ -4,17 +4,13 @@ require('./kernel');
 var fs = require('fs'),
     vm = require('vm'),
     log = require('./logger');
-    
+
 var Compiler = {
-    defaultNamespace: 'jst._tmpl',
-    _tab: '    ',
-    // Построение шаблонов
     build: function(text, fileName, prefs) {
         var res = [];
-        
+
         this._sameTemplateName = {};
-        
-        // Для размещения шаблонов из нескольких файлов в один общий файл
+
         if(Array.isArray(text)) {
             text.forEach(function(el) {
                 this._fileName = el[1];
@@ -25,45 +21,36 @@ var Compiler = {
             text += this.fileMark();
             res.push(this._build(text));
         }
-        
+
         res = res.join('');
-        
-        // Есть шаблоны в виде функций, чтобы не помещать в каждую функцию служебные переменные,
-        // вынесим их в одно место через замыкание
+
         if(res.search(/function/) !== -1) {
             res = '\n(function() {' +
                 ['',
-                    'var attr = jst.attr;',
-                    'var block = jst.block;',
-                    'var each = jst.each;',
-                    'var filter = jst.filter;',
-                    'var template = jst;'
+                    'var attr = jst.attr,',
+                    '    block = jst.block,',
+                    '    each = jst.each,',
+                    '    filter = jst.filter,',
+                    '    template = jst;'
                 ].join('\n    ') + res + '\n\n})();';
         }
-        
+
         if(prefs && !prefs.withoutKernel) {
             res = this.includeKernel(res);
         }
-        
+
         return res;
     },
-    fileMark: function() {
-        return '\n\n/* --- ' + this._fileName + ' --- */\n';
-    },
-    _sameTemplateName: {},
-    _sameBlockName: {},
-    _extend: [],
-    _init: [],
     _build: function(text) {
         var inFile = this._inFile();
-        
+
         if(!this.checkOpenCloseTag(text)) {
             return this.templateConsole('Unequal number of open and closed tags <template> ' + inFile);
         }
-        
+
         var buf = [];
         var templates = text.match(/<template(([\n\r]|.)*?)<\/template>/gm);
-        
+
         if(!templates) {
             return this.templateConsole('No jst-templates ' + inFile);
         }
@@ -72,30 +59,35 @@ var Compiler = {
             var res =  this._template(el, num + 1);
             buf.push(res.error ? this.templateConsole(res.error.text) : res);
         }, this);
-        
-        this._init.forEach(function(el) {
-            buf.push(this._tab + 'jst._init(\'' + el + '\');');
-        }, this);
-        
-        this._init = [];
-        
-        this._extend.forEach(function(el) {
-            buf.push(this._tab + 'jst._extend(\'' + el[0] + '\', \'' + el[1] + '\');');
-        }, this);
-        
-        this._extend = [];
-        
+
+        if(this._init.length) {
+            buf.push(this._tab + 'jst._init([\'' + this._init.join('\', \'') + '\']);');
+            this._init = [];
+        }
+
+        var bufExtend = [];
+        if(this._extend.length) {
+            this._extend.forEach(function(el) {
+                bufExtend.push('[\'' + el[0] + '\', \'' + el[1] + '\']');
+            }, this);
+
+            buf.push(this._tab + 'jst._extend([' + bufExtend.join(', ') + ']);');
+            this._extend = [];
+        }
+
         return buf.join('\n');
     },
+    fileMark: function() {
+        return '\n\n/* --- ' + this._fileName + ' --- */\n';
+    },
     templateConsole: function(text) {
-        this.error(text);
-        
+        log.error('Error: ' + text + '\n');
+
         return 'console.error(\'' + this.quot(text) + '\');';
     },
-    // Построение одного шаблона
     template: function(text, num) {
         var res = this._template(text, num);
-       
+
         return '\n' + (res.error ?  this.templateConsole(res.error.text) : res.normal);
     },
     _inFile: function() {
@@ -103,7 +95,7 @@ var Compiler = {
     },
     _template: function(text, num) {
         var buf = text.match(/(?:<template)(?:.*>)(([\n\r]|.)*)(?:<\/template>)/m);
-        
+
         var params = this.getAttr(text, 'params');
         var name =  this.getAttr(text, 'name');
         var trimm = this.getAttr(text, 'trim');
@@ -117,7 +109,7 @@ var Compiler = {
         if(hasBlock) {
             content = content.replace(/<block(([\n\r]|.)*?)<\/block>/gm, '');
         }
-        
+
         if(!name) {
             return {
                 error: {
@@ -126,14 +118,14 @@ var Compiler = {
                 }
             };
         }
-        
+
         if(typeof this._sameTemplateName[name] !== 'undefined') {
             var files = [this._fileName, this._sameTemplateName[name]];
             log.warn('Warning: multiple templates with the same name "' + name + '". ' + (files[0] === files[1] ? 'File: ' + files[0] : 'Files:' + files.join(', ')));
         } else {
             this._sameTemplateName[name] = this._fileName;
-        }        
-        
+        }
+
         if(!this.checkParams(params)) {
             return {
                 error: {
@@ -142,25 +134,26 @@ var Compiler = {
                 }
             };
         }
-        
+
         if(this.isOn(trimm)) {
             content = content.trim();
         }
-        
+
         if(this.isOn(deleteSpaces)) {
             content = this.deleteSpaces(content);
-        }        
+        }
+
         var f = this.transform({
             name: name,
             template: name,
-            namespace: this.defaultNamespace,
+            namespace: this._defaultNamespace,
             params: params,
             concatenation: concatenation,
             content: content,
             extend: extend,
             hasBlock: hasBlock
         });
-        
+
         try {
             eval(f.test);
         } catch(e) {
@@ -173,47 +166,47 @@ var Compiler = {
                 }
             };
         }
-        
+
         if(hasBlock || extend) {
                 var tab = this._tab,
                     bufBlock = '(function() {\n';
-                    
+
                 bufBlock += tab  + 'var f = function() {\n';
                 bufBlock += tab + tab + 'this[\'__jstConstructor\'] = ' + f.withoutNamespace + ';\n';
                 if(hasBlock) {
-                    bufBlock += this.blocks(text, name);
+                    bufBlock += this.block(text, name);
                 }
                 bufBlock += tab + '};\n\n';
-                bufBlock += tab + this.defaultNamespace + 'Extend[\'' + this.quot(name) + '\'] = f;\n';
+                bufBlock += tab + this._defaultNamespace + 'Extend[\'' + this.quot(name) + '\'] = f;\n';
                 bufBlock += tab + 'f.extend  = \'' + this.quot(extend) + '\';\n';
                 bufBlock += '})();\n';
-                
+
                 if(extend) {
                     this._extend.push([name, extend]);
                 }
-                
+
                 if(hasBlock && !extend) {
                     this._init.push(name);
                 }
-                
+
                 return bufBlock;
         }
-        
+
         return f.normal;
     },
     hasBlock: function(text) {
         return text.search(/(?:<block)(?:.*>)(([\n\r]|.)*)(?:<\/block>)/) !== -1;
     },
-    blocks: function(text, template) {
+    block: function(text, template) {
         var buf = [],
             blocks = text.match(/<block(([\n\r]|.)*?)<\/block>/gm);
-        
+
         this._sameBlockName = {};
         blocks.forEach(function(el, num) {
             var res =  this._block(el, num + 1, template);
             buf.push(res.error ? this.templateConsole(res.error.text) : res);
         }, this);
-    
+
         return '\n' + buf.join('\n') + '\n';
     },
     _block: function(text, num, template) {
@@ -226,7 +219,7 @@ var Compiler = {
             content = ('' + (buf[1] || '')),
             inFile = this._inFile(),
             tab = this._tab;
-        
+
         if(!name) {
             return {
                 error: {
@@ -235,7 +228,7 @@ var Compiler = {
                 }
             };
         }
-        
+
         if(typeof this._sameBlockName[name] !== 'undefined') {
             var files = [this._fileName, this._sameBlockName[name]];
             log.warn('Warning: several blocks with the same name "' + name + '" in the template "' +
@@ -243,8 +236,8 @@ var Compiler = {
                 (files[0] === files[1] ? 'The file: ' + files[0] : 'Files:' + files.join(', ')));
         } else {
             this._sameBlockName[name] = this._fileName;
-        }        
-        
+        }
+
         if(!this.checkParams(params)) {
             return {
                 error: {
@@ -253,25 +246,25 @@ var Compiler = {
                 }
             };
         }
-        
+
         if(this.isOn(trimm)) {
             content = content.trim();
         }
-        
+
         if(this.isOn(deleteSpaces)) {
             content = this.deleteSpaces(content);
-        }        
-        
+        }
+
         var f = this.transform({
             name: name,
             template: template,
-            namespace: this.defaultNamespace,
+            namespace: this._defaultNamespace,
             params: params,
             concatenation: concatenation,
             content: content,
             hasBlock: true
         });
-        
+
         try {
             eval(f.test);
         } catch(e) {
@@ -284,31 +277,23 @@ var Compiler = {
                 }
             };
         }
-        
+
         return tab + tab + 'this[\'' + this.quot(name) + '\'] = ' + f.withoutNamespace + ';';
     },
-    // Получить значение атрибута
     getAttr: function(text, attr, isBlock) {
         var res = isBlock ? text.match('(?:\<block)(?:.*)(?:' + attr + '=")(.*?)(?:")') : text.match('(?:\<template)(?:.*)(?:' + attr + '=")(.*?)(?:")');
         res = res ? res[1] : '';
-        
+
         return ('' + (res || '')).trim();
     },
-    // Проверка атрибута на включение
     isOn: function(t) {
         return !!(t !== 'no' && t !== 'none' && t !== 'false' && t !== 'off');
     },
-    // Проверка на корректность названия переменной в js
     isCorrectNameVariable: function(name) {
         var re  = /^[a-z$_][\w$_]*$/i;
-        
+
         return re.test(name);
     },
-    // Вывод ошибки
-    error: function(text) {
-        log.error('Error: ' + text + '\n');
-    },
-    // Построение шаблона в строку или js-функцию
     transform: function(data) {
         if(data.content.search(/<\%/) === -1) {
             return this.withoutInlineJS(data);
@@ -316,18 +301,16 @@ var Compiler = {
             return this.withInlineJS(data);
         }
     },
-    // Построение из шаблона строки (без логики и вставки переменных)
     withoutInlineJS: function(data) {
         var text = '\'' + this._fixLineEnd(this.fixQuotes(data.content)).replace(/[\r\t\n]/g, ' ') + '\'';
         var code = data.namespace + '[\'' + this.quot(data.name) + '\'] = ' + text + ';';
-        
+
         return {
             test: 'var jst = {};\n' + data.namespace + ' = {};\n' + code,
             normal: code,
             withoutNamespace: text
         };
     },
-    // Построение из шаблона js-функцию
     withInlineJS: function(data) {
         var that = this,
             tab = this._tab,
@@ -340,31 +323,31 @@ var Compiler = {
                 ret: '__jst'
             },
             js = this.defaultValues(data.params) + tab + 'var __jst = ' + con.init + ';\n';
-        
+
         if(data.hasBlock || data.extend) {
-            js += 'var __jst_template = \'' + this.quot(data.template) + '\';\n';
-            js += 'var __jst_this = this;\n';
-            js += 'var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; \n';
-            js += 'var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; \n';
+            js += 'var __jstTemplate = \'' + this.quot(data.template) + '\';\n';
+            js += 'var __jstThis = this;\n';
+            js += 'var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; \n';
+            js += 'var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; \n';
         }
-        
+
         var content = this._fixLineEnd(this.fixQuotes(data.content));
         content = content
             .replace(/[\n\t]/g, ' ')
-            .replace(/\s+(<%[^=!\+])/g, '$1') // удаление пробелов между HTML-тегами и тегами шаблонизатора
-            .replace(/\s+(<%=[^\+])/g, '$1') // удаление пробелов перед jst-тегами - <%=-
-            .replace(/\s+(<%![^\+])/g, '$1') // удаление пробелов перед jst-тегами - <%!-
-            .replace(/([^\+]%>) +/g, '$1') // удаление пробелов после jst-тегов - -%>
-            .replace(/<%(=|!)?(\+|-)/g, '<%$1') // удаление режима пробелов в начале jst-тега
-            .replace(/(\+|-)%>/g, '%>') // удаление режима пробелов в конце jst-тега
-            .replace(/(<%)\s+/g, '$1 ') // удаление пробелов в начале внутри jst-тегов шаблонизатора
-            .replace(/\s+(%>)/g, '$1')// удаление пробелов в конце внутри jst-тегов шаблонизатора
-            .replace(/<%#.*?%>/g, '') // удаление комментариев
-            .replace(/<%(=|!)? *?%>/g, '') // удаление пустых тегов <% %>, <%= %>, <%! %>
+            .replace(/\s+(<%[^=!\+])/g, '$1') // Remove spaces between jst and HTML tags
+            .replace(/\s+(<%=[^\+])/g, '$1') // Remove spaces before jst tags - <%=-
+            .replace(/\s+(<%![^\+])/g, '$1') // Remove spaces before jst tags - <%!-
+            .replace(/([^\+]%>) +/g, '$1') // Remove spaces after jst - -%>
+            .replace(/<%(=|!)?(\+|-)/g, '<%$1') // Remove mode spaces at the start jst-tag
+            .replace(/(\+|-)%>/g, '%>') // Remove mode spaces at the end jst-tag
+            .replace(/(<%)\s+/g, '$1 ') // Remove spaces at the beginning inside jst-templating tags
+            .replace(/\s+(%>)/g, '$1')// Remove spaces at the end inside jst-tags
+            .replace(/<%#.*?%>/g, '') // Removing comments
+            .replace(/<%(=|!)? *?%>/g, '') // Removing empty tags <% %>, <%= %>, <%! %>
             .split('<%').join('\t')
             .replace(/((^|%>)[^\t]*)'/g, '$1\r')
-             // короткая форма фильтров
-            .replace(/\t! ?(.*?)%>/g, function() { 
+             // Short form filters
+            .replace(/\t! ?(.*?)%>/g, function() {
                 return con.above.replace(/\$1/, that.addShortFilters(arguments[1]));
             })
             .replace(/\t= ?(.*?)%>/g, function() {
@@ -373,43 +356,41 @@ var Compiler = {
             .split('\t').join('\';\n')
             .split('%>').join('\n' + tab + con.push)
             .split('\r').join('\'');
-        
+
         js += tab + con.push + content + con.close + '\n\n' + tab + 'return ' + con.ret + ';';
-            
-        js = js.replace(/\+ \'\' \+ __jst-empty-quotes__ /g, '+ ');
-        js = js.replace(/= \'\' \+ __jst-empty-quotes__ /g, '= ');
-        js = js.replace(/\! \'\' \+ __jst-empty-quotes__ /g, '= ');
-        js = js.replace(/ \+ '' __jst-empty-quotes__;/g, ';');
-        js = js.replace(/ __jst-empty-quotes__/g, '');
-        js = js.replace(/    __jst \+= '';/g, '');
-            
+
+        js = js
+            .replace(/\+ \'\' \+ __jst-empty-quotes__ /g, '+ ')
+            .replace(/= \'\' \+ __jst-empty-quotes__ /g, '= ')
+            .replace(/\! \'\' \+ __jst-empty-quotes__ /g, '= ')
+            .replace(/ \+ '' __jst-empty-quotes__;/g, ';')
+            .replace(/ __jst-empty-quotes__/g, '')
+            .replace(/    __jst \+= '';/g, '');
+
         var text = 'function(' + this.params(data.params) + ') {\n';
         text += js;
         text += '\n}';
-        
-        var code = data.namespace + '[\'' + this.quot(data.name) + '\'] = ' + text + ';'; 
+
+        var code = data.namespace + '[\'' + this.quot(data.name) + '\'] = ' + text + ';';
         return {
             test: 'var jst = {};\n' + data.namespace + ' = {};\n' + code,
             normal: code,
             withoutNamespace: text
         };
     },
-    // Приводим к одному виду окончания строк
     _fixLineEnd: function(text) {
-        text = text.replace(/\r\n/g, '\n'); // фикс для Windows
-        text = text.replace(/$\r|\r[^n]/mg, '\n'); // фикс для MacOS
-        
+        text = text.replace(/\r\n/g, '\n'); // Windows
+        text = text.replace(/$\r|\r[^n]/mg, '\n'); // MacOS
+
         return text;
     },
-    // Экранирование одинарной кавычки
     quot: function(text) {
         return ('' + text).replace(/\\/g, '\\\\').replace(/'/g, '\\\'');
     },
-    // Экранирование одинарной кавычки в шаблоне
     fixQuotes: function(text) {
         var buf = text.split('<%'),
             newBuf = [];
-            
+
         buf.forEach(function(el) {
             if(el.search(/%>/) !== -1) {
                 var buf2 = el.split('%>');
@@ -418,65 +399,54 @@ var Compiler = {
             } else {
                 el = this.quot(el);
             }
-            
+
             newBuf.push(el);
         }, this);
-        
+
         return newBuf.join('<%');
     },
-    // Добавить фильтры
     addShortFilters: function(str) {
         var res = '',
             buf = str.split(/(?:[^|])\|(?!\|)/);
-            
-        // Если нет фильтров, то возвращаем строку как есть
+
         if(buf.length < 2) {
             return str;
         }
-        
+
         buf.forEach(function(el, i) {
             var textParams = '';
-            
-            // Первый элемент не может быть фильтром
+
             if(!i) {
                 res = el;
             } else {
                 var f = el.split('(');
                 var params = [];
-                
-                // Копируем параметры
+
                 f.forEach(function(el, i) {
                     if(i) {
                         params.push(el);
                     }
                 });
-                
-                // Удаляем из строки последнюю скобку
+
                 if(params.length) {
                     params[params.length - 1] = params[params.length - 1].trim().replace(/\)$/, '');
                     textParams = params.join('(');
                 }
-                
+
                 var filter = f[0].trim();
-                // Если в фильтре не должно быть параметров, а в коде шаблона указаны, значит удаляем параметры
                 if(jst.filter[filter] && jst.filter[filter].length < 2) {
                     textParams = '';
                 }
-                
+
                 res = 'filter.' + filter + '(' + res + (textParams ? ',' + textParams : '') + ')';
             }
         });
-        
+
         return res;
     },
-    // Удаление пробелов между тегами
     deleteSpaces: function(text) {
-        text = text.replace(/[\n\r\t]/g, ' ');
-        text = text.replace(/ {2,}/g, ' ');
-        
-        return text;
+        return text.replace(/[\n\r\t]/g, ' ').replace(/ {2,}/g, ' ');
     },
-    // Проверка на корректность названия параметров у шаблона и значений по умолчанию
     checkParams: function(params) {
         var isError = false;
         if(params) {
@@ -486,10 +456,9 @@ var Compiler = {
                 isError = true;
             }
         }
-        
+
         return !isError;
     },
-    // Построение параметров у шаблона
     params: function(params) {
         var res = [],
             resWithIndex = [],
@@ -497,24 +466,22 @@ var Compiler = {
             script,
             len = 0,
             that = this;
-        
-        // Позиция параметра в параметрах - params="a, b, c"
+
         var getPosition = function(params, name) {
             var p = params.split(',');
-            
+
             p = p.map(function(el) {
                 return ('' + el.split('=')[0]).trim();
             });
-            
+
             p = p.filter(function(el) {
                     return that.isCorrectNameVariable(el);
             }, this);
-            
+
             return p.indexOf(name);
         };
-        
+
         if(params) {
-            // Если есть параметры по умолчанию, честно разбираем их
             if(params.search('=') !== -1) {
                 script = vm.createScript('var ' + params);
                 script.runInNewContext(sandbox);
@@ -524,13 +491,13 @@ var Compiler = {
                         resWithIndex.push({name: i, index: getPosition(params, i)});
                     }
                 }
-                
+
                 if(len > 1) {
                     resWithIndex.sort(function(a, b) {
                         return a.index > b.index;
                     });
                 }
-                
+
                 resWithIndex.forEach(function(el) {
                     res.push(el.name);
                 });
@@ -540,52 +507,64 @@ var Compiler = {
                 });
             }
         }
-        
+
         return res.join(', ');
     },
-    // Построение значений по умолчанию у параметров шаблона
     defaultValues: function(params) {
         var res = '',
             tab = this._tab,
             sandbox = {},
             script;
-        
+
         if(params.search('=') !== -1) {
             script = vm.createScript('var ' + params);
             script.runInNewContext(sandbox);
             for(var i in sandbox) {
                 if(sandbox.hasOwnProperty(i) && sandbox[i] !== undefined) {
-                    res += tab + i + ' = typeof ' + i + ' === "undefined" ? ' + JSON.stringify(sandbox[i]) + ' : ' + i + ';\n';
+                    res += tab + i + ' = typeof ' + i + ' === "undefined" ? ' +
+                        JSON.stringify(sandbox[i]) + ' : ' + i + ';\n';
                 }
             }
         }
-            
+
         return res;
     },
-    // Проверка на одинаковое количество открытых и закрытых тегов <template>
     checkOpenCloseTag: function(text) {
         var isError = false,
             open = text.match(/<template/g),
             close = text.match(/<\/template>/g);
-        
+
         if(!open || !close) {
             isError = true;
         }
-        
+
         if(open && close && open.length !== close.length) {
             isError = true;
         }
-        
+
         return !isError;
     },
     includeKernel: function(text) {
         return fs.readFileSync(__dirname + '/kernel.js') + '\n\n' + (text || '');
-    }
+    },
+    _defaultNamespace: 'jst._tmpl',
+    _tab: '    ',
+    _sameTemplateName: {},
+    _sameBlockName: {},
+    _extend: [],
+    _init: [],
 };
 
 module.exports = {
-    compileFiles: function(files, prefs) {
-        var res = [];            
+    /**
+     * Compile files.
+     *
+     * @param {Array|string} files
+     * @param {Object} settings
+     * @return {string}
+    */
+    compileFiles: function(files, settings) {
+        var res = [];
         if(typeof files === 'string') {
             files = [files];
         }
@@ -594,9 +573,16 @@ module.exports = {
             res.push([fs.readFileSync(el, 'utf-8'), el]);
         });
 
-        return Compiler.build(res, '', prefs);
+        return Compiler.build(res, '', settings);
     },
-    compileText: function(text, prefs) {
-        return Compiler.build(text, '', prefs);
+    /**
+     * Compile text.
+     *
+     * @param {string} text
+     * @param {Object} settings
+     * @return {string}
+    */
+    compileText: function(text, settings) {
+        return Compiler.build(text, '', settings);
     }
 };
diff --git a/lib/kernel.js b/lib/kernel.js
index dcdfed6..03be99b 100644
--- a/lib/kernel.js
+++ b/lib/kernel.js
@@ -19,7 +19,7 @@ if(typeof glob.jst === 'function') {
 }
 
 /**
- * Вызов шаблонизатора
+ * Template call.
  *
  * @param {...*} name
  *
@@ -31,9 +31,9 @@ var jst = function(name) {
         res = '';
 
     if(tf === 'undefined') {
-        throw new Error('Вызов несуществующего jst-шаблона "' + name + '".');
+        throw new Error('Calling a non-existent jst-template "' + name + '".');
     }
-    
+
     switch(tf) {
         case 'function':
             f._name = name;
@@ -53,7 +53,7 @@ var jst = function(name) {
 };
 
 /**
- * Вызов блока
+ * Block call.
  *
  * @param {string} templateName
  * @param {string} blockName
@@ -68,26 +68,26 @@ jst.block = function(templateName, blockName) {
             typeObj = typeof obj;
 
         if(typeObj === 'undefined') {
-            throw new Error('Вызов несуществующего jst-блока "' + blockName + '" у шаблона "' + templateName + '".');
+            throw new Error('Calling a non-existent jst-block"' + blockName + '", template "' + templateName + '".');
         } else {
             return typeObj === 'string' ? obj : obj.apply(f, slice.call(arguments, 2));
         }
     } else {
-        throw new Error('Вызов несуществующего jst-шаблона "' + templateName + '".');
+        throw new Error('Calling a non-existent jst-template "' + templateName + '".');
     }
 
     return '';
 };
 
 /**
- * Цикличный вызов шаблона
+ * Cyclic call template.
  *
  * @param {string} templateName
- * @param {(Array|Object)} data
- * @param {*} templateParams
+ * @param {Array|Object} data
+ * @param {*} params
  * @return {string}
 */
-jst.each = function(templateName, data, templateParams) {
+jst.each = function(templateName, data, params) {
     if(!data) {
         return '';
     }
@@ -98,12 +98,12 @@ jst.each = function(templateName, data, templateParams) {
 
     if(isArray(data)) {
         for(i = 0; i < len; i++) {
-            text.push(jst(templateName, data[i], i, data, templateParams));
+            text.push(jst(templateName, data[i], i, data, params));
         }
     } else if(typeof data === 'object') {
         for(i in data) {
             if(data.hasOwnProperty(i)) {
-                text.push(jst(templateName, data[i], i, data, templateParams));
+                text.push(jst(templateName, data[i], i, data, params));
             }
         }
     }
@@ -112,15 +112,15 @@ jst.each = function(templateName, data, templateParams) {
 };
 
 /**
- * Цикличный вызов блока у шаблона
+ * Cyclic block call from a template.
  *
- * @param {string} template - название шаблона
- * @param {string} blockName - название блока
- * @param {(Array|Object)} data - данные для перебора
- * @param {*} params - параметры
+ * @param {string} templateName
+ * @param {string} blockName
+ * @param {(Array|Object)} data 
+ * @param {*} params
  * @return {string}
 */
-jst.eachBlock = function(template, blockName, data, params) {
+jst.eachBlock = function(templateName, blockName, data, params) {
     if(!data) {
         return '';
     }
@@ -131,12 +131,12 @@ jst.eachBlock = function(template, blockName, data, params) {
 
     if(isArray(data)) {
         for(i = 0; i < len; i++) {
-            text.push(jst.block(template, blockName, data[i], i, data, params));
+            text.push(jst.block(templateName, blockName, data[i], i, data, params));
         }
     } else {
         for(i in data) {
             if(data.hasOwnProperty(i)) {
-                text.push(jst.block(template, blockName, data[i], i, data, params));
+                text.push(jst.block(templateName, blockName, data[i], i, data, params));
             }
         }
     }
@@ -157,55 +157,58 @@ var attr = function(name, value) {
 };
 
 /**
- * Генерирует HTML-код для атрибута или атрибутов
+ * Generates HTML-code for the attribute or attributes.
  *
- * @param {string|Object} name - название атрибута или хеш с атрибутами
- * @param {string} value - значение атрибута
+ * @param {string|Object} attrName - Attribute name or hash with attributes.
+ * @param {string} attrValue
  * @return {string}
 */
-jst.attr = function(name, value) {
+jst.attr = function(attrName, attrValue) {
     var buf = [];
-    if(isPlainObject(name)) {
-        for(var i in name) {
-            if(name.hasOwnProperty(i)) {
-                buf.push(attr(i, name[i]));
+    if(isPlainObject(attrName)) {
+        for(var i in attrName) {
+            if(attrName.hasOwnProperty(i)) {
+                buf.push(attr(i, attrName[i]));
             }
         }
 
         return buf.join('');
     } else {
-        return attr(name, value);
+        return attr(attrName, attrValue);
     }
 };
 
 /**
- * Инициализация шаблона с блоками
+ * Initialization templates with blocks.
  *
- * @param {string} name - имя шаблона
+ * @param {Array} templates
 */
-jst._init = function(name) {
+jst._init = function(templates) {
     var tmpl = jst._tmpl;
-    var Buf = jst._tmplExtend[name];
 
-    if(!Buf.extended) {
-        tmpl[name] = new Buf();
-        Buf.extended = true;
+    for(var i = 0; i < templates.length; i++) {
+        var name = templates[i],
+            Buf = jst._tmplExtend[name];
+
+        if(!Buf.extended) {
+            tmpl[name] = new Buf();
+            Buf.extended = true;
+        }
     }
 };
 
 /**
- * Наследование шаблона
+ * Inheritance template.
  *
- * @param {string} childName
- * @param {string} parentName
+ * @param {Array} data
 */
-jst._extend = function(childName, parentName) {
+jst._extend = function(data) {
     var f = function(childName, parentName) {
         var tmpl = jst._tmpl,
             Child = jst._tmplExtend[childName],
             Parent = jst._tmplExtend[parentName],
             warning = function(template) {
-                return 'При наследовании не найден jst-шаблон "' + childName + '".';
+                return 'Not found jst-pattern for inheritance "' + childName + '".';
             };
 
         if(typeof Child === 'undefined') {
@@ -232,22 +235,24 @@ jst._extend = function(childName, parentName) {
         }
     };
 
-    f(childName, parentName);
+    for(var i = 0; i < data.length; i++) {
+        f(data[i][0], data[i][1]);
+    }
 };
 
 /**
- * Привязка шаблона с данными к DOM ноде и последующим обновлением по методу update()
+ * Binding template data to the DOM node.
  *
- * @param {string|DOMNode} container - id или DOM нода вставки результаты выполнения шаблона
- * @param {string} name - название шаблона
+ * @param {string|DOMNode} container
+ * @param {string} templateName
  * @return {Object}
 */
-jst.bind = function(container, name) {
+jst.bind = function(container, templateName) {
     var elem = typeof container === 'string' ? document.getElementById(container) : container,
         params = slice.call(arguments, 2);
 
-    if(elem && name) {
-        var jstParams = [name];
+    if(elem && templateName) {
+        var jstParams = [templateName];
         if(params.length) {
             jstParams = jstParams.concat(params);
         }
@@ -257,7 +262,7 @@ jst.bind = function(container, name) {
 
     return {
         update: function() {
-            var bufJstParams = [name];
+            var bufJstParams = [templateName];
             if(arguments.length) {
                 bufJstParams = bufJstParams.concat(slice.call(arguments));
                 jstParams = bufJstParams;
@@ -271,36 +276,66 @@ jst.bind = function(container, name) {
 };
 
 /**
- * Фильтры шаблонизатора
+ * Filters
  * @namespace
 */
 jst.filter = {
-    // Удаление HTML-тегов
+    /**
+     * Remove HTML tags.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     stripTags: function(str) {
         return  this._undef(str).replace(/<\/?[^>]+>/g, '');
     },
-    // Экранирование урла
+    
+    /**
+     * Escape url.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     uri: function(str) {
         return glob.encodeURI(this._undef(str)).replace(/%5B/g, '[').replace(/%5D/g, ']');
     },
-    // Обрезание строки нужной длины
-    truncate: function(str, length) {
+    
+    /**
+     * Truncate text.
+     *
+     * @param {string} str
+     * @param {number} len
+     * @return {string}
+    */
+    truncate: function(str, len) {
         str = this._undef(str);
-        if(!str || str.length <= length) {
+        if(!str || str.length <= len) {
             return str;
         }
 
-       return str.substr(0, length);
+       return str.substr(0, len);
     },
-    // Первый элемент для массива, для строки первый символ
+    
+    /**
+     * The first element of the array, the first character of a string.
+     *
+     * @param {Array|string} obj
+     * @return {string}
+    */
     first: function(obj) {
         if(isArray(obj) || typeof obj === 'string') {
-            return obj[0];
+            return this._undef(obj[0]);
         }
 
         return this._undef(obj);
     },
-    // Последний элемент для массива, для строки последний символ
+    
+    /**
+     * The last element of the array, the last character of a string.
+     *
+     * @param {Array|string} obj
+     * @return {string}
+    */
     last: function(obj) {
         if(isArray(obj) || typeof obj === 'string') {
             return obj[obj.length - 1];
@@ -308,66 +343,156 @@ jst.filter = {
 
         return this._undef(obj);
     },
-    // Перевод символов в верхний регистр
+
+    /**
+     * Convert characters to uppercase.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     upper: function(str) {
         return this._undef(str).toUpperCase();
     },
-    // Перевод символов в нижний регистр
+
+    /**
+     * Convert characters to lowercase.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     lower: function(str) {
         return this._undef(str).toLowerCase();
     },
-    // Первый символ в верхний регистр
+
+    /**
+     * The first character to uppercase.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     ucfirst: function(str) {
         str = this._undef(str);
 
         return str.substr(0, 1).toUpperCase() + str.substr(1);
     },
-    // Первый символ в нижний регистр
+
+    /**
+     * The first character to lowercase.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     lcfirst: function(str) {
         str = this._undef(str);
 
         return str.substr(0, 1).toLowerCase() + str.substr(1);
     },
-    // Удаление повторяющихся пробелов
+
+    /**
+     * Remove duplicate spaces.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     collapse: function(str) {
         return this._undef(str).replace(/\s{2,}/g, ' ').trim();
     },
-    // Повторить строку нужное количество раз
+
+    /**
+     * Repeat text.
+     *
+     * @param {string} str
+     * @param {number} num
+     * @return {string}
+    */
     repeat: function(str, num) {
         num = num || 1;
         num++;
 
         return new Array(num).join(this._undef(str));
     },
-    // Удаление текста по рег. выражению
+
+    /**
+     * Delete text.
+     *
+     * @param {string} str
+     * @param {string|RegExp} search
+     * @return {string}
+    */
     remove: function(str, search) {
         return this._undef(str).split(search).join('');
     },
-    // Замена текста по рег. выражению
+
+    /**
+     * Replace text.
+     *
+     * @param {string} str
+     * @param {string|RegExp} search
+     * @param {string} replace
+     * @return {string}
+    */
     replace: function(str, search, replace) {
         return this._undef(str).split(search).join(replace);
     },
-    // Удаление пробелов с начала и конца строки
+
+    /**
+     * Remove spaces from the beginning and end of the line.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     trim: function(str) {
         return this._trim(this._undef(str));
     },
-    // Удаление пробелов с начала
+
+    /**
+     * Remove spaces at the beginning of the text.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     ltrim: function(str) {
         return this._undef(str).replace(/^\s+/g, '');
     },
-    // Удаление пробелов c конца строки
+    /**
+     * Remove spaces at the end of the text.
+     *
+     * @param {string} str
+     * @return {string}
+    */
     rtrim: function(str) {
         return this._undef(str).replace(/\s+$/g, '');
     },
-    // Добавить текст перед вставкой текста
+
+    /**
+     * Add text before inserting text.
+     *
+     * @param {string} str
+     * @param {string} text
+     * @return {string}
+    */
     prepend: function(str, text) {
         return this._undef(text) + this._undef(str);
     },
-    // Добавить текст после вставкой текста
+
+    /**
+     * Add text after inserting text.
+     *
+     * @param {string} str
+     * @param {string} text
+     * @return {string}
+    */
     append: function(str, text) {
         return this._undef(str) + this._undef(text);
     },
-    // Сгруппировать массив по разделителю
+
+    /**
+     * Join a array on separator.
+     *
+     * @param {Array} obj
+     * @param {string} separator
+     * @return {string}
+    */
     join: function(obj, separator) {
         if(isArray(obj)) {
             return obj.join(separator);
@@ -375,46 +500,68 @@ jst.filter = {
 
         return this._undef(obj);
     },
-    // Вывод пустоты (для отладки)
-    'void': function() {
-        return;
-    },
-    // Построение CSS-класса для HTML-атрибута class
+
+    /**
+     * Print the void (for debugging)
+    */
+    'void': function() {},
+
+    /**
+     * Building a CSS-class for HTML.
+     *
+     * @param {Array|string} arr
+     * @return {string}
+    */
     className: function(arr) {
-        return isArray(arr) ? arr.join(' ') : arr;
+        return isArray(arr) ? arr.join(' ') : this._undef(arr);
     },
-    // Замена undefined или null на пустую строку (для служебного использования)
+
+    /**
+     * Replacing undefined or null to an empty string (for internal use).
+     *
+     * @param {*} str
+     * @return {string}
+    */
     _undef: function(str) {
         return typeof str === 'undefined' || str === null ? '' : '' + str;
     }
 };
 
 var entityMap = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    '\'': '&#39;',
-    '/': '&#x2F;'
-};
-
-var unEntityMap = {
-    '&amp;': '&',
-    '&lt;': '<',
-    '&gt;': '>',
-    '&quot;': '"',
-    '&#39;': '\'',
-    '&#x2F;': '/'
-};
+        '&': '&amp;',
+        '<': '&lt;',
+        '>': '&gt;',
+        '"': '&quot;',
+        '\'': '&#39;',
+        '/': '&#x2F;'
+    },
+    unEntityMap = {
+        '&amp;': '&',
+        '&lt;': '<',
+        '&gt;': '>',
+        '&quot;': '"',
+        '&#39;': '\'',
+        '&#x2F;': '/'
+    };
 
-// Экранирование HTML
+/**
+ * Escape html.
+ *
+ * @param {string} str
+ * @return {string}
+*/
 jst.filter.html = function(str) {
     return this._undef(str).replace(/[&<>"'\/]/g, function(s) {
         return entityMap[s];
     });
 };
 
-// Разэкранирование HTML
+/**
+ * Unescape html.
+ *
+ * @param {string} str
+ * @return {string}
+*/
 jst.filter.unhtml = function(str) {
     return this._undef(str).replace(/&amp;|&lt;|&gt;|&quot;|&#39;|&#x2F;/g, function(s) {
         return unEntityMap[s];
@@ -422,7 +569,8 @@ jst.filter.unhtml = function(str) {
 };
 
 /**
- * Удаление пробелов с начала и конца строки
+ * Remove spaces from the beginning and end of the line.
+ *
  * @param {string} str
  * @return {string}
 */
@@ -435,13 +583,13 @@ jst.filter._trim = String.prototype.trim ? function(str) {
 jst.isArray = isArray;
 
 /**
- * Место хранения шаблонов (функций или строк)
+ * Place templates (function or string)
  * @namespace
 */
 jst._tmpl = {};
 
 /**
- * Место хранения шаблонов для наследования
+ * Place templates for inheritance
  * @namespace
 */
 jst._tmplExtend = {};
@@ -450,9 +598,7 @@ glob.jst = jst;
 
 if(!hasGlobal) {
     /**
-     * jst-хелпер для jQuery
-     * @param {string} template - название шаблона
-     * @param {...*} var_args
+     * jst-helpers for jQuery
     */
     if(typeof jQuery !== 'undefined') {
         var fn = window.jQuery.fn;
diff --git a/template/all.jst.js b/template/all.jst.js
index b33acc7..cafc9a0 100644
--- a/template/all.jst.js
+++ b/template/all.jst.js
@@ -1,20 +1,20 @@
 
 (function() {
-    var attr = jst.attr;
-    var block = jst.block;
-    var each = jst.each;
-    var filter = jst.filter;
-    var template = jst;
+    var attr = jst.attr,
+        block = jst.block,
+        each = jst.each,
+        filter = jst.filter,
+        template = jst;
 
 /* --- template\block.jst.html --- */
 (function() {
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'block1x';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'block1x';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += 'Blocks:' + filter.html(block('block1')) + '<br />' + filter.html(block('block2')) + '<br />' + filter.html(block('block3'));
 
     return __jst;
@@ -33,10 +33,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'block2x';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'block2x';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += 'Blocks:' + filter.html(block('block1')) + '<br />' + filter.html(block('block2')) + '<br />' + filter.html(block('block3'));
 
     return __jst;
@@ -54,10 +54,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'block3x';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'block3x';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += 'Blocks:' + filter.html(block('block1')) + '<br />' + filter.html(block('block2')) + '<br />' + filter.html(block('block3'));
 
     return __jst;
@@ -74,10 +74,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'foreach-block';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'foreach-block';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(forEachBlock('block1', [1,2,3])) + filter.html(forEachBlock('block2', [1,2,3]));
 
     return __jst;
@@ -86,10 +86,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
         this['block1'] = '1';
         this['block2'] = function(name) {
     var __jst = '';
-var __jst_template = 'foreach-block';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'foreach-block';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(name);
 
     return __jst;
@@ -109,10 +109,10 @@ jst._tmpl['nnn'] = '1 2 3 4 999';
         this['footer'] = '101112';
         this['main'] = function() {
     var __jst = '';
-var __jst_template = 'page';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'page';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('head')) + filter.html(block('content')) + filter.html(block('footer'));
 
     return __jst;
@@ -127,10 +127,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'block.page';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'block.page';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('main'));
 
     return __jst;
@@ -147,10 +147,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'page.constructor';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'page.constructor';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('head')) + filter.html(block('content')) + filter.html(block('footer'));
 
     return __jst;
@@ -179,10 +179,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'withBlocks';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'withBlocks';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('block1')) + filter.html(block('block2'));
 
     return __jst;
@@ -200,10 +200,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'withoutBlocks';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'withoutBlocks';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('block1'));
 
     return __jst;
@@ -214,16 +214,8 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     f.extend  = 'withBlocks';
 })();
 
-    jst._init('block1x');
-    jst._init('foreach-block');
-    jst._init('page');
-    jst._init('page.constructor');
-    jst._init('withBlocks');
-    jst._extend('block2x', 'block1x');
-    jst._extend('block3x', 'block2x');
-    jst._extend('block.page', 'page');
-    jst._extend('block.page.empty.constructor', 'page.constructor');
-    jst._extend('withoutBlocks', 'withBlocks');
+    jst._init(['block1x', 'foreach-block', 'page', 'page.constructor', 'withBlocks']);
+    jst._extend([['block2x', 'block1x'], ['block3x', 'block2x'], ['block.page', 'page'], ['block.page.empty.constructor', 'page.constructor'], ['withoutBlocks', 'withBlocks']]);
 
 /* --- template\filter.jst.html --- */
 jst._tmpl['filter-html'] = function(a) {
@@ -530,10 +522,10 @@ jst._tmpl['each-inside'] = function(data) {
     var f = function() {
         this['__jstConstructor'] = function(data) {
     var __jst = '';
-var __jst_template = 'each-block';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'each-block';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(eachBlock('first', data));
 
     return __jst;
@@ -541,10 +533,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
 
         this['first'] = function(element, index) {
     var __jst = '';
-var __jst_template = 'each-block';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'each-block';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(element) + ',' + filter.html(index) + ';';
 
     return __jst;
@@ -555,7 +547,7 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     f.extend  = '';
 })();
 
-    jst._init('each-block');
+    jst._init(['each-block']);
 
 /* --- template\params.jst.html --- */
 jst._tmpl['without-params'] = function() {
diff --git a/template/block.jst.js b/template/block.jst.js
index 8598841..7453d5e 100644
--- a/template/block.jst.js
+++ b/template/block.jst.js
@@ -1,20 +1,20 @@
 
 (function() {
-    var attr = jst.attr;
-    var block = jst.block;
-    var each = jst.each;
-    var filter = jst.filter;
-    var template = jst;
+    var attr = jst.attr,
+        block = jst.block,
+        each = jst.each,
+        filter = jst.filter,
+        template = jst;
 
 /* --- ./template/block.jst.html --- */
 (function() {
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'block1x';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'block1x';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += 'Blocks:' + filter.html(block('block1')) + '<br />' + filter.html(block('block2')) + '<br />' + filter.html(block('block3'));
 
     return __jst;
@@ -33,10 +33,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'block2x';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'block2x';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += 'Blocks:' + filter.html(block('block1')) + '<br />' + filter.html(block('block2')) + '<br />' + filter.html(block('block3'));
 
     return __jst;
@@ -54,10 +54,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'block3x';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'block3x';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += 'Blocks:' + filter.html(block('block1')) + '<br />' + filter.html(block('block2')) + '<br />' + filter.html(block('block3'));
 
     return __jst;
@@ -74,10 +74,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'foreach-block';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'foreach-block';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(forEachBlock('block1', [1,2,3])) + filter.html(forEachBlock('block2', [1,2,3]));
 
     return __jst;
@@ -86,10 +86,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
         this['block1'] = '1';
         this['block2'] = function(name) {
     var __jst = '';
-var __jst_template = 'foreach-block';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'foreach-block';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(name);
 
     return __jst;
@@ -109,10 +109,10 @@ jst._tmpl['nnn'] = '1 2 3 4 999';
         this['footer'] = '101112';
         this['main'] = function() {
     var __jst = '';
-var __jst_template = 'page';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'page';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('head')) + filter.html(block('content')) + filter.html(block('footer'));
 
     return __jst;
@@ -127,10 +127,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'block.page';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'block.page';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('main'));
 
     return __jst;
@@ -147,10 +147,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'page.constructor';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'page.constructor';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('head')) + filter.html(block('content')) + filter.html(block('footer'));
 
     return __jst;
@@ -179,10 +179,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'withBlocks';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'withBlocks';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('block1')) + filter.html(block('block2'));
 
     return __jst;
@@ -200,10 +200,10 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     var f = function() {
         this['__jstConstructor'] = function() {
     var __jst = '';
-var __jst_template = 'withoutBlocks';
-var __jst_this = this;
-var block = function(name) { return jst.block.apply(__jst_this, [__jst_this._name].concat(Array.prototype.slice.call(arguments)));}; 
-var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_template, blockName, data, params); }; 
+var __jstTemplate = 'withoutBlocks';
+var __jstThis = this;
+var block = function(name) { return jst.block.apply(__jstThis, [__jstThis._name].concat(Array.prototype.slice.call(arguments)));}; 
+var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jstTemplate, blockName, data, params); }; 
     __jst += filter.html(block('block1'));
 
     return __jst;
@@ -214,15 +214,7 @@ var eachBlock = function(blockName, data, params) { return jst.eachBlock(__jst_t
     f.extend  = 'withBlocks';
 })();
 
-    jst._init('block1x');
-    jst._init('foreach-block');
-    jst._init('page');
-    jst._init('page.constructor');
-    jst._init('withBlocks');
-    jst._extend('block2x', 'block1x');
-    jst._extend('block3x', 'block2x');
-    jst._extend('block.page', 'page');
-    jst._extend('block.page.empty.constructor', 'page.constructor');
-    jst._extend('withoutBlocks', 'withBlocks');
+    jst._init(['block1x', 'foreach-block', 'page', 'page.constructor', 'withBlocks']);
+    jst._extend([['block2x', 'block1x'], ['block3x', 'block2x'], ['block.page', 'page'], ['block.page.empty.constructor', 'page.constructor'], ['withoutBlocks', 'withBlocks']]);
 
 })();
\ No newline at end of file
diff --git a/template/filter.jst.js b/template/filter.jst.js
index 417784e..b995dec 100644
--- a/template/filter.jst.js
+++ b/template/filter.jst.js
@@ -1,10 +1,10 @@
 
 (function() {
-    var attr = jst.attr;
-    var block = jst.block;
-    var each = jst.each;
-    var filter = jst.filter;
-    var template = jst;
+    var attr = jst.attr,
+        block = jst.block,
+        each = jst.each,
+        filter = jst.filter,
+        template = jst;
 
 /* --- ./template/filter.jst.html --- */
 jst._tmpl['filter-html'] = function(a) {