Merge pull request #485 from bem/issue-484__wrap-bug

bem-xjst: Wrap should save BEMContext

lib/bemxjst/index.js

@@ -78,6 +78,16 @@ BEMXJST.prototype.compile = function(code) {
     });
   }
 
+  function _applyCtxWrap(ctx, changes) {
+    // Fast case
+    if (!changes)
+      return self.local({ ctx: ctx }, _applyCtx);
+
+    return self.local(changes, function() {
+      return self.local({ ctx: ctx }, applyCtx);
+    });
+  }
+
   function apply(mode, changes) {
     return self.applyMode(mode, changes);
   }
@@ -91,6 +101,7 @@ BEMXJST.prototype.compile = function(code) {
   var tree = new Tree({
     refs: {
       applyCtx: applyCtxWrap,
+      _applyCtx: _applyCtxWrap,
       apply: apply
     }
   });

lib/bemxjst/tree.js

@@ -53,16 +53,16 @@ inherits(WrapMatch, MatchBase);
 exports.WrapMatch = WrapMatch;
 
 WrapMatch.prototype.wrapBody = function(body) {
-  var applyCtx = this.refs.applyCtx;
+  var _applyCtx = this.refs._applyCtx;
 
   if (typeof body !== 'function') {
     return function() {
-      return applyCtx(body);
+      return _applyCtx(body);
     };
   }
 
   return function() {
-    return applyCtx(body.call(this, this, this.ctx));
+    return _applyCtx(body.call(this, this, this.ctx));
   };
 };
 

test/modes-wrap-test.js

@@ -49,12 +49,25 @@ describe('Modes wrap', function() {
     } ], '<div class="wrap"><a class="b1"></a></div>');
   });
 
-  it('should protected from infinite loop', function () {
+  it('should protected from infinite loop', function() {
     test(function() {
       block('b1').wrap()(function() {
         return { block: 'b2' };
       });
       block('b2').wrap()({ block: 'b1' });
     }, { block: 'b1' }, '<div class="b1"></div>');
   });
+
+
+  it('should use current context (with simple value)', function() {
+    test(function() {
+      block('page').wrap()([ { elem: 'head' } ]);
+    }, { block: 'page' }, '<div class="page__head"></div>');
+  });
+
+  it('should use current context (with function)', function() {
+    test(function() {
+      block('page').wrap()(function() { return [ { elem: 'head' } ]; });
+    }, { block: 'page' }, '<div class="page__head"></div>');
+  });
 });