bem · miripiruni · Dec 8, 2016 · Dec 7, 2016
diff --git a/docs/en/5-templates-syntax.md b/docs/en/5-templates-syntax.md
@@ -726,7 +726,8 @@ More information about [apply()](7-runtime.md#apply).
 
 ## BEMTREE
 
-Only the [def](#def), [content](#content), [replace](#replace),
+In BEMTREE engine only data related modes are avaliable: [def](#def), [js](#js), [mix](#mix),
+[mods](#mods), [elemMods](#elemMods), [content](#content), [replace](#replace),
 [extend](#extend) and [wrap](#wrap) modes are used by the BEMTREE engine. User-defined modes can also be used. The other modes described in the documentation above can only be used in BEMHTML.
 
 ***

diff --git a/docs/ru/5-templates-syntax.md b/docs/ru/5-templates-syntax.md
@@ -724,8 +724,10 @@ block('control')(
 
 ## BEMTREE
 
-Движком BEMTREE используются только режимы [def](#def), [content](#content) и
-режимы-хелперы [replace](#replace), [extend](#extend) и [wrap](#wrap). Пользовательские режимы тоже могут быть использованы. Остальные режимы, описанные в документации выше, применимы только к BEMHTML.
+В движке BEMTREE используются только режимы ориентированные на данные: [def](#def), [js](#js), [mix](#mix), [mods](#mods), [elemMods](#elemMods), [content](#content) и
+режимы-хелперы [replace](#replace), [extend](#extend) и [wrap](#wrap).
+Пользовательские режимы тоже могут быть использованы. Остальные режимы,
+ориентированные на HTML, описанные в документации выше, применимы только к BEMHTML.
 
 ***
 

diff --git a/lib/bemhtml/entity.js b/lib/bemhtml/entity.js
@@ -14,13 +14,9 @@ function Entity(bemxjst) {
 
   this.jsClass = null;
 
-  // "Fast modes"
+  // "Fast modes" about HTML
   this.tag = new Match(this, 'tag');
   this.attrs = new Match(this, 'attrs');
-  this.mix = new Match(this, 'mix');
-  this.js = new Match(this, 'js');
-  this.mods = new Match(this, 'mods');
-  this.elemMods = new Match(this, 'elemMods');
   this.bem = new Match(this, 'bem');
   this.cls = new Match(this, 'cls');
 
@@ -38,7 +34,7 @@ Entity.prototype.init = function init(block, elem) {
   this.jsClass = this.bemxjst.classBuilder.build(this.block, this.elem);
 };
 
-var keys = {
+Entity.prototype._keys = {
   tag: true,
   content: true,
   attrs: true,
@@ -50,17 +46,6 @@ var keys = {
   bem: true
 };
 
-Entity.prototype._initRest = function _initRest(key) {
-  if (key === 'default') {
-    this.rest[key] = this.def;
-  } else if (keys[key]) {
-    this.rest[key] = this[key];
-  } else {
-    if (!this.rest.hasOwnProperty(key))
-      this.rest[key] = new Match(this, key);
-  }
-};
-
 Entity.prototype.defaultBody = function defaultBody(context) {
   var mods = this.mods.exec(context);
   context.mods = mods;
@@ -73,23 +58,15 @@ Entity.prototype.defaultBody = function defaultBody(context) {
 
   // Notice: other modes must be after context.mods/context.elemMods changes
 
-  var tag = this.tag.exec(context);
-  var content = this.content.exec(context);
-  var attrs = this.attrs.exec(context);
-  var mix = this.mix.exec(context);
-  var js = this.js.exec(context);
-  var bem = this.bem.exec(context);
-  var cls = this.cls.exec(context);
-
   return this.bemxjst.render(context,
                              this,
-                             tag,
-                             js,
-                             bem,
-                             cls,
-                             mix,
-                             attrs,
-                             content,
+                             this.tag.exec(context),
+                             this.js.exec(context),
+                             this.bem.exec(context),
+                             this.cls.exec(context),
+                             this.mix.exec(context),
+                             this.attrs.exec(context),
+                             this.content.exec(context),
                              mods,
                              elemMods);
 };
diff --git a/lib/bemtree/entity.js b/lib/bemtree/entity.js
@@ -1,5 +1,4 @@
 var inherits = require('inherits');
-var Match = require('../bemxjst/match').Match;
 var BemxjstEntity = require('../bemxjst/entity').Entity;
 
 function Entity() {
@@ -9,17 +8,23 @@ function Entity() {
 inherits(Entity, BemxjstEntity);
 exports.Entity = Entity;
 
-Entity.prototype._initRest = function _initRest(key) {
-  if (key === 'default') {
-    this.rest[key] = this.def;
-  } else if (key === 'content') {
-    this.rest[key] = this[key];
-  } else {
-    if (!this.rest.hasOwnProperty(key))
-      this.rest[key] = new Match(this, key);
+Entity.prototype.defaultBody = function defaultBody(context) {
+  var mods = this.mods.exec(context);
+  context.mods = mods;
+
+  var elemMods;
+  if (context.ctx.elem) {
+    elemMods = this.elemMods.exec(context);
+    context.elemMods = elemMods;
   }
-};
 
-Entity.prototype.defaultBody = function defaultBody(context) {
-  return this.bemxjst.render(context, this, this.content.exec(context));
+  // Notice: other modes must be after context.mods/context.elemMods changes
+
+  return this.bemxjst.render(context,
+                             this,
+                             this.content.exec(context),
+                             this.js.exec(context),
+                             this.mix.exec(context),
+                             mods,
+                             elemMods);
 };
diff --git a/lib/bemtree/index.js b/lib/bemtree/index.js
@@ -1,6 +1,7 @@
 var inherits = require('inherits');
 var BEMXJST = require('../bemxjst');
 var Entity = require('./entity').Entity;
+var utils = require('../bemxjst/utils');
 
 function BEMTREE() {
   BEMXJST.apply(this, arguments);
@@ -39,11 +40,25 @@ BEMTREE.prototype.runMany = function runMany(arr) {
   return out;
 };
 
-BEMTREE.prototype.render = function render(context, entity, content) {
-  var ctx = context.ctx;
-  var isBEM = !!(ctx.block || ctx.elem || ctx.bem); // TODO: check
+BEMTREE.prototype.render = function render(context, entity, content, js, mix,
+                                           mods, elemMods) {
+  var ctx = utils.extend({}, context.ctx);
+  var isBEM = !!(ctx.block || ctx.elem || ctx.bem);
 
-  if (typeof content === 'undefined') return ctx;
+  if (typeof js !== 'undefined')
+    ctx.js = js;
+
+  if (typeof mix !== 'undefined')
+    ctx.mix = mix;
+
+  if (!entity.elem && mods && Object.keys(mods).length > 0)
+    ctx.mods = utils.extend(ctx.mods || {}, mods);
+
+  if (entity.elem && elemMods && Object.keys(elemMods).length > 0)
+    ctx.elemMods = utils.extend(ctx.elemMods || {}, elemMods);
+
+  if (typeof content === 'undefined')
+    return ctx;
 
   ctx.content = this.renderContent(content, isBEM);
 

diff --git a/lib/bemxjst/entity.js b/lib/bemxjst/entity.js
@@ -19,6 +19,10 @@ function Entity(bemxjst, block, elem, templates) {
 
   // "Fast modes"
   this.def = new Match(this);
+  this.mix = new Match(this, 'mix');
+  this.js = new Match(this, 'js');
+  this.mods = new Match(this, 'mods');
+  this.elemMods = new Match(this, 'elemMods');
   this.content = new Match(this, 'content');
 
   // "Slow modes"
@@ -35,6 +39,25 @@ Entity.prototype.init = function init(block, elem) {
   this.elem = elem;
 };
 
+Entity.prototype._keys = {
+  content: true,
+  mix: true,
+  js: true,
+  mods: true,
+  elemMods: true
+};
+
+Entity.prototype._initRest = function _initRest(key) {
+  if (key === 'default') {
+    this.rest[key] = this.def;
+  } else if (this._keys[key]) {
+    this.rest[key] = this[key];
+  } else {
+    if (!this.rest.hasOwnProperty(key))
+      this.rest[key] = new Match(this, key);
+  }
+};
+
 function contentMode() {
   return this.ctx.content;
 }