fixed the rest part of lang bugs, added multilang test

examples/blocks/image/image.i18n/ru.js

@@ -0,0 +1,5 @@
+module.exports = {
+    image: {
+        title: 'Скачать картинку'
+    }
+};

examples/silly-multilang/.enb/make.js

@@ -0,0 +1,38 @@
+var path = require('path');
+var rootPath = path.join(__dirname, '..', '..', '..');
+
+module.exports = function (config) {
+    config.includeConfig(rootPath);
+
+    var tmplSpecs = config.module('enb-bem-tmpl-specs').createConfigurator('tmpl-specs');
+
+    tmplSpecs.configure({
+        destPath: 'tmpl-specs',
+        levels: ['blocks'],
+        langs: ['en', 'ru'],
+        sourceLevels: [
+            { path: '../libs/bem-core/common.blocks', check: false },
+            { path: '../blocks', check: true },
+            { path: 'blocks', check: true }
+        ],
+        coverage: true,
+        engines: {
+            'BH': {
+                tech: 'enb-bh/techs/bh-server-include',
+                options: {
+                    sourcemap: true,
+                    jsAttrName: 'data-bem',
+                    jsAttrScheme: 'json'
+                }
+            },
+            'BEMHTML dev': {
+                tech: 'enb-bemxjst/techs/bemhtml-old',
+                options: { devMode: true }
+            },
+            'BEMHTML prod': {
+                tech: 'enb-bemxjst/techs/bemhtml-old',
+                options: { devMode: false }
+            }
+        }
+    });
+};

examples/silly-multilang/blocks/image/image.tmpl-specs/10-simple.en.bemjson.js

@@ -0,0 +1,5 @@
+({
+    block : 'image',
+    url : 'download.svg',
+    alt : 'Download'
+})

examples/silly-multilang/blocks/image/image.tmpl-specs/10-simple.en.html

@@ -0,0 +1 @@
+<img alt="Download" class="image" src="download.svg" title="Download image" />

examples/silly-multilang/blocks/image/image.tmpl-specs/10-simple.ru.bemjson.js

@@ -0,0 +1,5 @@
+({
+    block : 'image',
+    url : 'download.svg',
+    alt : 'Скачать'
+})

examples/silly-multilang/blocks/image/image.tmpl-specs/10-simple.ru.html

@@ -0,0 +1 @@
+<img alt="Скачать" class="image" src="download.svg" title="Скачать картинку" />

examples/silly/.enb/make.js

@@ -12,6 +12,7 @@ module.exports = function (config) {
         langs: true,
         sourceLevels: [
             { path: '../libs/bem-core/common.blocks', check: false },
+            { path: '../blocks', check: true },
             { path: 'blocks', check: true }
         ],
         coverage: true,

lib/assets/it.jst

@@ -1,7 +1,7 @@
 <%
 // prepares
 var titleSuffix = lang ? ' in `' + lang + '` lang' : '';
-var subreference = lang ? '[' + lang + ']' : '';
+var subreference = lang ? '[\'' + lang + '\']' : '';
 var prettifyEngineName = function (ngn) {
     return lang ? String(ngn).toLowerCase().replace(' ', '-') + '.' + lang : ngn;
 };
@@ -13,6 +13,10 @@ it('should be equal `${ it }` by ${ engine.name }${ titleSuffix }', function (<%
     var bemjson = references['${ it }']${ subreference }.bemjson,
         expected = references['${ it }']${ subreference }.html;<%
 
+if (lang) { %>
+    lazies['${ engine.name }${ lang }']();
+<% }
+
 if (!engine.async) { %>
     // sync mode
     var actual = engines['${ engine.name }']${ subreference }.apply(bemjson);

lib/assets/tmpl-spec.jst

@@ -1,3 +1,14 @@
+<%
+function reRequire(where, what, lazy) {
+    var name = what.name,
+        target = what.target,
+        exportName = what.exportName;
+    lazy && print('lazies[\'' + lazy + '\'] = function () {\n');
+    print('dropRequireCache(require, require.resolve(\'' + target + '\'));\n');
+    print((lazy ? 'return ' : '') + where + '[\'' + name + '\'] = require(\'' + target + '\')' + exportName + ';\n');
+    lazy && print('};\n');
+}
+%>
 var assert = require('assert'),
     path = require('path'),
 <% if (saveHtml) { %>
@@ -23,6 +34,7 @@ var assert = require('assert'),
     htmlDiffer = new HtmlDiffer('bem'),
     referencesFilename = require.resolve('${ paths.references }'),
     engines,
+    lazies = {},
     references;
 
 describe('${ describe }', function() {
@@ -32,19 +44,11 @@ describe('${ describe }', function() {
 
         engines = {};
         <% _.forEach(engines, function(engine) {
-            function reRequire(where, what) {
-                var name = what.name,
-                    target = what.target,
-                    exportName = what.exportName;
-                print('dropRequireCache(require, require.resolve(\'' + target + '\'));\n');
-                print(where + '[\'' + name + '\'] = require(\'' + target + '\')' + exportName + ';\n');
-            }
-
             if (langs && langs.length) {
                 var engineObject = 'engines[\'' + engine.name + '\']';
                 print(engineObject + ' = {};\n');
                 _.forEach(engine.langs, function(lang) {
-                    reRequire(engineObject, lang);
+                    reRequire(engineObject, lang, engine.name + lang.name);
                 });
             } else {
                 reRequire('engines', engine);

lib/techs/references.js

@@ -10,26 +10,34 @@ module.exports = require('enb/lib/build-flow').create()
     .useDirList('tmpl-specs')
     .builder(function (dirs) {
         var references = {},
-            bemjsons = {},
-            htmls = {};
+            bemjsons = [],
+            htmls = [];
 
         dirs.forEach(function (dir) {
             dir.files.forEach(function (file) {
                 var filename = file.name,
-                    name = filename.split('.')[0];
+                    fullname = file.fullname,
+                    name = filename.split('.')[0],
+                    lang = getLang(fullname),
+                    item = {
+                        name: name,
+                        fullname: fullname,
+                        lang: lang
+                    };
 
                 if (hasExt(filename, '.bemjson.js')) {
-                    bemjsons[name] = file.fullname;
+                    bemjsons.push(item);
                 } else if (hasExt(filename, '.html')) {
-                    htmls[name] = file.fullname;
+                    htmls.push(item);
                 }
             });
         });
 
         return vow.all([
-            vow.all(Object.keys(bemjsons).map(function (name) {
-                var filename = bemjsons[name],
-                    lang = getLang(filename);
+            vow.all(bemjsons.map(function (file) {
+                var name = file.name,
+                    lang = file.lang,
+                    filename = file.fullname;
 
                 dropRequireCache(require, filename);
 
@@ -45,11 +53,11 @@ module.exports = require('enb/lib/build-flow').create()
                         }
                     });
             })),
-            vow.all(Object.keys(htmls).map(function (name) {
-                var filename = htmls[name],
-                    lang = getLang(filename);
+            vow.all(htmls.map(function (file) {
+                var name = file.name,
+                    lang = file.lang;
 
-                return vfs.read(filename, 'utf-8')
+                return vfs.read(file.fullname, 'utf-8')
                     .then(function (source) {
                         var reference = references[name] || (references[name] = {});
 

package.json

@@ -49,9 +49,11 @@
   "main": "lib/index.js",
   "scripts": {
     "test": "npm run lint && mocha test/techs",
+    "test-silly": "npm run deps && npm run clean && npm run build",
+    "test-travis": "npm run test && npm run test-silly",
     "lint": "jshint . && jscs -c .jscs.js .",
     "deps": "cd examples && bower i",
-    "build": "enb -d examples/silly make __magic__ tmpl-specs",
+    "build": "enb -d examples/silly make __magic__ tmpl-specs && enb -d examples/silly-multilang make __magic__ tmpl-specs",
     "clean": "rm -rf examples/*/*tmpl-specs && rm -rf examples/*/.enb/tmp && rm -rf coverage"
   }
 }