context: support this.reapply()

Fix: #42
bem · May 5, 2015 · dbed080 · dbed080
1 parent 6d26216
commit dbed080
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 12 deletions.
diff --git a/lib/bemhtml/runtime/context.js b/lib/bemhtml/runtime/context.js
@@ -1,6 +1,8 @@
 var utils = require('./utils');
 
-function Context() {
+function Context(bemhtml) {
+  this._bemhtml = bemhtml;
+
   this.ctx = null;
   this.block = '';
 
@@ -50,3 +52,7 @@ Context.prototype.generateId = function generateId() {
     this._uniq = utils.getUniq();
   return this._uniq;
 };
+
+Context.prototype.reapply = function reapply(ctx) {
+  return this._bemhtml.run(ctx);
+};
diff --git a/lib/bemhtml/runtime/index.js b/lib/bemhtml/runtime/index.js
@@ -26,7 +26,7 @@ BEMHTML.prototype.compile = function compile(templates) {
   var self = this;
 
   function applyCtx() {
-    return self.run(self.context.ctx);
+    return self._run(self.context.ctx);
   }
 
   function applyCtxWrap(changes) {
@@ -127,12 +127,7 @@ BEMHTML.prototype.transformEntities = function transformEntities(entities) {
   return entities;
 };
 
-BEMHTML.prototype.reset = function reset() {
-  this.match = null;
-  this.context = new Context();
-};
-
-BEMHTML.prototype.run = function run(context) {
+BEMHTML.prototype._run = function _run(context) {
   var res;
   if (!context)
     res = this.runEmpty();
@@ -145,6 +140,21 @@ BEMHTML.prototype.run = function run(context) {
   return res;
 };
 
+BEMHTML.prototype.run = function run(json) {
+  var match = this.match;
+  var context = this.context;
+
+  this.match = null;
+  this.context = new Context(this);
+  var res = this._run(json);
+
+  this.match = match;
+  this.context = context;
+
+  return res;
+};
+
+
 BEMHTML.prototype.runEmpty = function runEmpty() {
   this.context._listLength--;
   return '';
@@ -165,7 +175,7 @@ BEMHTML.prototype.runMany = function runMany(arr) {
   context._notNewList = true;
 
   for (var i = 0; i < arr.length; i++)
-    out += this.run(arr[i]);
+    out += this._run(arr[i]);
 
   if (!prevNotNewList)
     context.position = prevPos;
@@ -507,7 +517,7 @@ BEMHTML.prototype.renderContent = function renderContent(content, isBEM) {
     context._listLength = 1;
   }
 
-  var res = this.run(content);
+  var res = this._run(content);
 
   if (isBEM) {
     context.position = oldPos;
@@ -528,7 +538,7 @@ BEMHTML.prototype.renderNoTag = function renderNoTag(context,
 
   // TODO(indutny): skip apply next flags
   if (content || content === 0)
-    return this.run(content);
+    return this._run(content);
   return '';
 };
 
@@ -579,7 +589,6 @@ BEMHTML.prototype.applyMode = function applyMode(mode) {
 BEMHTML.prototype.exportApply = function exportApply(exports) {
   var self = this;
   exports.apply = function apply(context) {
-    self.reset();
     return self.run(context || this);
   };
 

diff --git a/test/runtime-test.js b/test/runtime-test.js
@@ -84,6 +84,19 @@ describe('BEMHTML compiler/Runtime', function() {
     }, { block: 'b1' }, '<div class="b1"><div class="b1__e1"></div></div>');
   });
 
+  it('should support this.reapply()', function() {
+    test(function() {
+      block('b1').content()(function() {
+        this.wtf = 'fail';
+        return this.reapply({ block: 'b2' });
+      });
+
+      block('b2').content()(function() {
+        return this.wtf || 'ok';
+      });
+    }, { block: 'b1' }, '<div class="b1"><div class="b2">ok</div></div>');
+  });
+
   describe('mods', function() {
     it('should lazily define mods', function() {
       test(function() {