Used bem-core and bem-bl values for version option

enb · Aug 10, 2015 · 7a7bbf5 · 7a7bbf5
1 parent 573de8b
commit 7a7bbf5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/lib/compile/compile-v1.js → lib/compile/bem-bl.js b/lib/compile/compile-v1.js → lib/compile/bem-bl.js
diff --git a/lib/compile/compile-v2.js → lib/compile/bem-core.js b/lib/compile/compile-v2.js → lib/compile/bem-core.js
diff --git a/lib/compile/index.js b/lib/compile/index.js
@@ -1,5 +1,5 @@
-var compile1 = require('./compile-v1'),
-    compile2 = require('./compile-v2');
+var compileForBemBL = require('./bem-bl'),
+    compileForBemCore = require('./bem-core');
 
 /**
  * Compiles code of i18n for `bem-core` or `bem-bl` localization system.
@@ -9,14 +9,17 @@ var compile1 = require('./compile-v1'),
  * @param {String} core — code that contains i18n core from bem-core or bem-bl library.
  * @param {Object} keysets — a sets of keys and their values (translations) for a language to internationalization.
  * @param {Object} opts
- * @param {String} opts.version — version of core. Use `1` for `bem-bl`, `2` for `bem-core`.
+ * @param {String} opts.version — version of core: `bem-bl` or `bem-core`.
  * @param {String} [opts.language] — language of keysets.
  *
  * @returns {String}
  */
 module.exports = function (core, keysets, opts) {
-    /*jslint eqeq: true*/
-    return opts.version == 1 ?
-        compile1(core, keysets, opts.language) :
-        compile2(core, keysets);
+    if (opts.version === 'bem-core') {
+        return compileForBemCore(core, keysets);
+    }
+
+    if (opts.version === 'bem-bl') {
+        return compileForBemBL(core, keysets, opts.language);
+    }
 };
diff --git a/lib/keysets.js b/lib/keysets.js
@@ -43,7 +43,7 @@ function read(filename, cache, root) {
 function parse(keysets) {
     var core,
         data = {},
-        version = 2;
+        version = 'bem-core';
 
     // Pull core from source keysets
     keysets && Object.keys(keysets).forEach(function (scope) {
@@ -58,7 +58,7 @@ function parse(keysets) {
         } else if (scope === 'all') {
             var possibleCore = keysets[scope][''];
             if (possibleCore && (typeof possibleCore === 'string') && possibleCore.match(/BEM\.I18N/g)) {
-                version = 1;
+                version = 'bem-bl';
                 core = possibleCore;
             }
         } else {