package: bump xjst version, better asserts

lib/bemhtml/compiler.js

@@ -94,9 +94,9 @@ Compiler.prototype.pretranslate = function pretranslate(ast) {
   return ast;
 };
 
-Compiler.prototype.translate = function translate(ast) {
+Compiler.prototype.translate = function translate(ast, code) {
   ast = this.pretranslate(ast);
-  return this.replaceContext(xjst.translate(ast, this.options));
+  return this.replaceContext(xjst.translate(ast, code, this.options));
 };
 
 Compiler.prototype.markMatches = function markMatches(ast) {
@@ -614,7 +614,9 @@ Compiler.prototype.traceChanges = function traceChanges(changes, expr) {
 };
 
 Compiler.prototype.pregenerate = function pregenerate(code) {
-  var ast = esprima.parse(code);
+  var ast = esprima.parse(code, {
+    loc: true
+  });
 
   ast = this.pretranslate(ast);
 
@@ -668,9 +670,11 @@ Compiler.prototype.generate = function generate(code) {
     return this.wrap(xjst.generate(source, this.options));
   }
 
-  var ast = esprima.parse(code);
+  var ast = esprima.parse(code, {
+    loc: true
+  });
 
-  ast = this.translate(ast);
+  ast = this.translate(ast, code);
 
   var out = uglify.AST_Node.from_mozilla_ast(ast).print_to_string({ beautify: true });
 

package.json

@@ -12,11 +12,11 @@
   "author": "Fedor Indutny",
   "license": "MIT",
   "dependencies": {
-    "estraverse": "~1.1.1",
-    "esprima": "~1.0.2",
+    "estraverse": "~1.5.0",
+    "esprima": "~1.1.1",
     "ometajs": "~3.2.4",
     "uglify-js": "~2.3.2",
-    "xjst": "~1.3.2",
+    "xjst": "~1.3.7",
     "coa": "~0.3.9",
     "q": "~0.9.3"
   },

test/api-test.js

@@ -10,12 +10,11 @@ describe('BEM.js compiler', function() {
                ';\n' +
                fn.toString().replace(/^function\s*\(\)\s*{|}$/g, '');
     var fns = [
-      bem.compile(body, utile.mixin({}, options, { optimize: false })),
       bem.compile(body, options)
     ];
 
-    fns.forEach(function(fn) {
-      assert.equal(fn.apply.call(data || {}), expected);
+    fns.forEach(function(fn, i) {
+      assert.equal(fn.apply.call(data || {}), expected, i);
     });
   }