From d959bcb1693d1f7a0d7cba08995ff155ad002da9 Mon Sep 17 00:00:00 2001
From: Patric Eberle <line-in@derverstaerker.ch>
Date: Sun, 30 Sep 2018 20:26:47 +0200
Subject: [PATCH 1/5] Simplifies/refactors conditions, removes unneeded type
 checks and fallbacks, reduces duplicated code.

---
 dist/vue-bem-cn.es6.js         | 76 ++++++++++++++--------------------
 dist/vue-bem-cn.es6.js.map     |  2 +-
 dist/vue-bem-cn.umd.min.js     |  2 +-
 dist/vue-bem-cn.umd.min.js.map |  2 +-
 src/bem-cn/bem-names.js        | 18 +++-----
 src/bem-cn/index.js            | 32 +++++---------
 src/globals.js                 | 11 +++++
 src/utils.js                   |  9 ++--
 src/vue-plugin.js              | 12 +++---
 9 files changed, 71 insertions(+), 93 deletions(-)
 create mode 100644 src/globals.js

diff --git a/dist/vue-bem-cn.es6.js b/dist/vue-bem-cn.es6.js
index f01ac6b..f8f2e45 100644
--- a/dist/vue-bem-cn.es6.js
+++ b/dist/vue-bem-cn.es6.js
@@ -39,20 +39,33 @@ var _extends = Object.assign || function (target) {
 };
 
 var isString = function isString(val) {
-  return val && typeof val === 'string' && val.length > 0;
+  return val && typeof val === 'string';
 };
 var isPObject = function isPObject(val) {
-  return val && (typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object' && val !== null && val.constructor === Object && Object.keys(val).length > 0;
+  return !!(val && (typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object' && val.constructor === Object && Object.keys(val).length);
 };
 
 var hyphenate = function hyphenate(str) {
   return str.replace(/\B([A-Z])/g, '-$1').toLowerCase();
 };
+
 // eslint-disable-next-line no-restricted-globals
 var isNumber = function isNumber(val) {
   return typeof val === 'number' && isFinite(val);
 };
 
+var DEFAULT_DELIMITERS = {
+  ns: '',
+  el: '__',
+  mod: '--',
+  modVal: '-'
+};
+
+var DEFAULT_CONFIG = {
+  hyphenate: false,
+  methodName: 'b'
+};
+
 /**
  * Create String from BEM entitys
  * @param {Object} entitys BEM entitys
@@ -64,18 +77,9 @@ var isNumber = function isNumber(val) {
  * @returns {String}
  */
 function bemNames(entitys, delimiters) {
-  var resultString = '';
-  var names = entitys || { mods: {}, mixin: '' };
-  var delims = _extends({
-    ns: '',
-    el: '__',
-    mod: '--',
-    modVal: '-'
-  }, delimiters);
-  var mixin = isString(names.mixin) ? ' ' + names.mixin : '';
-
-  if (!names.block) return '';
-  resultString = delims.ns ? delims.ns + names.block : names.block;
+  var names = entitys || {};
+  var delims = _extends({}, DEFAULT_DELIMITERS, delimiters);
+  var resultString = (delims.ns || '') + names.block;
 
   if (names.el) resultString += delims.el + names.el;
 
@@ -86,25 +90,18 @@ function bemNames(entitys, delimiters) {
       if (val === true) {
         prev += ' ' + resultString + delims.mod + name;
       } else if (isString(val) || isNumber(val)) {
-        prev += ' ' + resultString + delims.mod + name + delims.modVal + names.mods[name];
+        prev += ' ' + resultString + delims.mod + name + delims.modVal + val;
       }
       /* eslint-enable no-param-reassign */
 
       return prev;
     }, '');
   }
-  return resultString + mixin;
+  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');
 }
 
 function bemCn(block) {
-  var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { delimiters: {} };
-
-  var options = _extends({
-    hyphenate: false
-  }, opt, {
-    delimiters: _extends({}, opt.delimiters)
-  });
-  if (!isString(block)) return '';
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { delimiters: {} };
 
   return function entitys(elem, mods, mix) {
     var resultObj = {
@@ -114,7 +111,11 @@ function bemCn(block) {
       mixin: ''
     };
 
-    if (isPObject(mods)) resultObj.mods = mods;
+    if (isPObject(mods)) {
+      resultObj.mods = mods;
+    } else if (isString(mods)) {
+      resultObj.mixin += mods;
+    }
 
     if (isString(elem)) {
       resultObj.el = elem;
@@ -122,18 +123,13 @@ function bemCn(block) {
       resultObj.mods = elem;
     }
 
-    if (isString(mods)) {
-      resultObj.mixin = resultObj.mixin.length > 0 ? resultObj.mixin + ' ' + mods : resultObj.mixin + mods;
-    }
     if (isString(mix)) {
-      resultObj.mixin = resultObj.mixin.length > 0 ? resultObj.mixin + ' ' + mix : resultObj.mixin + mix;
+      resultObj.mixin += resultObj.mixin.length ? ' ' + mix : mix;
     }
 
-    if (options.hyphenate) {
-      return hyphenate(bemNames(resultObj, options.delimiters));
-    }
+    var bemClasses = bemNames(resultObj, options.delimiters);
 
-    return bemNames(resultObj, options.delimiters);
+    return options.hyphenate ? hyphenate(bemClasses) : bemClasses;
   };
 }
 
@@ -141,16 +137,8 @@ var vuePlugin = {
   install: function install(Vue) {
     var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { delimiters: {} };
 
-    var cfg = _extends({
-      hyphenate: false,
-      methodName: 'b'
-    }, config, {
-      delimiters: _extends({
-        ns: '',
-        el: '__',
-        mod: '--',
-        modVal: '-'
-      }, config.delimiters)
+    var cfg = _extends({}, DEFAULT_CONFIG, config, {
+      delimiters: _extends({}, DEFAULT_DELIMITERS, config.delimiters)
     });
 
     Vue.mixin({
@@ -158,7 +146,7 @@ var vuePlugin = {
         var block = this.$options.block || this.$options.name;
         var generator = null;
 
-        if (typeof block !== 'string') return;
+        if (!isString(block)) return;
 
         generator = bemCn(block, cfg);
         this[cfg.methodName] = function () {
diff --git a/dist/vue-bem-cn.es6.js.map b/dist/vue-bem-cn.es6.js.map
index 9a7ac86..784cb9e 100644
--- a/dist/vue-bem-cn.es6.js.map
+++ b/dist/vue-bem-cn.es6.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string' && val.length > 0;\nexport const isPObject = val =>\n  val &&\n  typeof val === 'object' &&\n  val !== null &&\n  val.constructor === Object &&\n  Object.keys(val).length > 0;\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  let resultString = '';\n  const names = entitys || { mods: {}, mixin: '' };\n  const delims = {\n    ns: '',\n    el: '__',\n    mod: '--',\n    modVal: '-',\n    ...delimiters,\n  };\n  const mixin = isString(names.mixin) ? ' ' + names.mixin : '';\n\n  if (!names.block) return '';\n  resultString = delims.ns ? delims.ns + names.block : names.block;\n\n  if (names.el) resultString += delims.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delims.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delims.mod + name + delims.modVal + names.mods[name];\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + mixin;\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, opt = { delimiters: {} }) {\n  const options = {\n    hyphenate: false,\n    ...opt,\n    delimiters: {\n      ...opt.delimiters,\n    },\n  };\n  if (!isString(block)) return '';\n\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) resultObj.mods = mods;\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mods)) {\n      resultObj.mixin =\n        resultObj.mixin.length > 0 ? `${resultObj.mixin} ${mods}` : resultObj.mixin + mods;\n    }\n    if (isString(mix)) {\n      resultObj.mixin =\n        resultObj.mixin.length > 0 ? `${resultObj.mixin} ${mix}` : resultObj.mixin + mix;\n    }\n\n    if (options.hyphenate) {\n      return hyphenate(bemNames(resultObj, options.delimiters));\n    }\n\n    return bemNames(resultObj, options.delimiters);\n  };\n}\n","import bemCn from './bem-cn/index';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      hyphenate: false,\n      methodName: 'b',\n      ...config,\n      delimiters: {\n        ns: '',\n        el: '__',\n        mod: '--',\n        modVal: '-',\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (typeof block !== 'string') return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","length","isPObject","constructor","Object","keys","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemNames","entitys","delimiters","resultString","names","mods","mixin","delims","block","ns","el","reduce","prev","name","mod","modVal","bemCn","opt","options","elem","mix","resultObj","Vue","config","cfg","$options","generator","methodName"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/globals.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import { isPObject, isString, isNumber } from '../utils';\nimport { DEFAULT_DELIMITERS } from '../globals';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  const names = entitys || {};\n  const delims = {\n    ...DEFAULT_DELIMITERS,\n    ...delimiters,\n  };\n  let resultString = (delims.ns || '') + names.block;\n\n  if (names.el) resultString += delims.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delims.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delims.mod + name + delims.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options = { delimiters: {} }) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","DEFAULT_DELIMITERS","DEFAULT_CONFIG","bemNames","entitys","delimiters","names","delims","resultString","ns","block","el","mods","reduce","prev","name","mod","modVal","mixin","bemCn","options","elem","mix","resultObj","bemClasses","Vue","config","cfg","$options","generator","methodName"],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/vue-bem-cn.umd.min.js b/dist/vue-bem-cn.umd.min.js
index b9c78de..d12cfea 100644
--- a/dist/vue-bem-cn.umd.min.js
+++ b/dist/vue-bem-cn.umd.min.js
@@ -1,2 +1,2 @@
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):e.vueBemCn=n()}(this,function(){"use strict";var e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var t=arguments[n];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o])}return e},t=function(e){return e&&"string"==typeof e&&e.length>0},o=function(n){return n&&"object"===(void 0===n?"undefined":e(n))&&null!==n&&n.constructor===Object&&Object.keys(n).length>0},i=function(e){return e.replace(/\B([A-Z])/g,"-$1").toLowerCase()},r=function(e){return"number"==typeof e&&isFinite(e)};function m(e,i){var m="",l=e||{mods:{},mixin:""},s=n({ns:"",el:"__",mod:"--",modVal:"-"},i),u=t(l.mixin)?" "+l.mixin:"";return l.block?(m=s.ns?s.ns+l.block:l.block,l.el&&(m+=s.el+l.el),o(l.mods)&&(m+=Object.keys(l.mods).reduce(function(e,n){var o=l.mods[n];return!0===o?e+=" "+m+s.mod+n:(t(o)||r(o))&&(e+=" "+m+s.mod+n+s.modVal+l.mods[n]),e},"")),m+u):""}return{install:function(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},l=n({hyphenate:!1,methodName:"b"},r,{delimiters:n({ns:"",el:"__",mod:"--",modVal:"-"},r.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,r=null;"string"==typeof e&&(r=function(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},l=n({hyphenate:!1},r,{delimiters:n({},r.delimiters)});return t(e)?function(n,r,s){var u={block:e,el:"",mods:{},mixin:""};return o(r)&&(u.mods=r),t(n)?u.el=n:o(n)&&(u.mods=n),t(r)&&(u.mixin=u.mixin.length>0?u.mixin+" "+r:u.mixin+r),t(s)&&(u.mixin=u.mixin.length>0?u.mixin+" "+s:u.mixin+s),l.hyphenate?i(m(u,l.delimiters)):m(u,l.delimiters)}:""}(e,l),this[l.methodName]=function(){return r.apply(void 0,arguments)})}})}}});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.vueBemCn=t()}(this,function(){"use strict";var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},f=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},a=function(e){return e&&"string"==typeof e},y=function(e){return!(!e||"object"!==(void 0===e?"undefined":t(e))||e.constructor!==Object||!Object.keys(e).length)},p=function(e){return"number"==typeof e&&isFinite(e)},b={ns:"",el:"__",mod:"--",modVal:"-"},o={hyphenate:!1,methodName:"b"};function i(s){var d=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}};return function(e,t,n){var o={block:s,el:"",mods:{},mixin:""};y(t)?o.mods=t:a(t)&&(o.mixin+=t),a(e)?o.el=e:y(e)&&(o.mods=e),a(n)&&(o.mixin+=o.mixin.length?" "+n:n);var i,r,m,u,l,c=(i=o,r=d.delimiters,m=i||{},u=f({},b,r),l=(u.ns||"")+m.block,m.el&&(l+=u.el+m.el),y(m.mods)&&(l+=Object.keys(m.mods).reduce(function(e,t){var n=m.mods[t];return!0===n?e+=" "+l+u.mod+t:(a(n)||p(n))&&(e+=" "+l+u.mod+t+u.modVal+n),e},"")),l+(a(m.mixin)?" "+m.mixin:""));return d.hyphenate?c.replace(/\B([A-Z])/g,"-$1").toLowerCase():c}}return{install:function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},n=f({},o,t,{delimiters:f({},b,t.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,t=null;a(e)&&(t=i(e,n),this[n.methodName]=function(){return t.apply(void 0,arguments)})}})}}});
 //# sourceMappingURL=vue-bem-cn.umd.min.js.map
diff --git a/dist/vue-bem-cn.umd.min.js.map b/dist/vue-bem-cn.umd.min.js.map
index 6682a12..97d89dc 100644
--- a/dist/vue-bem-cn.umd.min.js.map
+++ b/dist/vue-bem-cn.umd.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/bem-cn/bem-names.js","../src/vue-plugin.js","../src/bem-cn/index.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string' && val.length > 0;\nexport const isPObject = val =>\n  val &&\n  typeof val === 'object' &&\n  val !== null &&\n  val.constructor === Object &&\n  Object.keys(val).length > 0;\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  let resultString = '';\n  const names = entitys || { mods: {}, mixin: '' };\n  const delims = {\n    ns: '',\n    el: '__',\n    mod: '--',\n    modVal: '-',\n    ...delimiters,\n  };\n  const mixin = isString(names.mixin) ? ' ' + names.mixin : '';\n\n  if (!names.block) return '';\n  resultString = delims.ns ? delims.ns + names.block : names.block;\n\n  if (names.el) resultString += delims.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delims.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delims.mod + name + delims.modVal + names.mods[name];\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + mixin;\n}\n","import bemCn from './bem-cn/index';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      hyphenate: false,\n      methodName: 'b',\n      ...config,\n      delimiters: {\n        ns: '',\n        el: '__',\n        mod: '--',\n        modVal: '-',\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (typeof block !== 'string') return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, opt = { delimiters: {} }) {\n  const options = {\n    hyphenate: false,\n    ...opt,\n    delimiters: {\n      ...opt.delimiters,\n    },\n  };\n  if (!isString(block)) return '';\n\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) resultObj.mods = mods;\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mods)) {\n      resultObj.mixin =\n        resultObj.mixin.length > 0 ? `${resultObj.mixin} ${mods}` : resultObj.mixin + mods;\n    }\n    if (isString(mix)) {\n      resultObj.mixin =\n        resultObj.mixin.length > 0 ? `${resultObj.mixin} ${mix}` : resultObj.mixin + mix;\n    }\n\n    if (options.hyphenate) {\n      return hyphenate(bemNames(resultObj, options.delimiters));\n    }\n\n    return bemNames(resultObj, options.delimiters);\n  };\n}\n"],"names":["isString","val","length","isPObject","constructor","Object","keys","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemNames","entitys","delimiters","resultString","names","mods","mixin","delims","block","ns","el","reduce","prev","name","mod","modVal","Vue","config","cfg","this","$options","generator","opt","options","elem","mix","resultObj","bemCn","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAAoBA,EAAIC,OAAS,GACjEC,EAAY,mBACvBF,GACe,qBAARA,gBAAAA,KACC,OAARA,GACAA,EAAIG,cAAgBC,QACpBA,OAAOC,KAAKL,GAAKC,OAAS,GAEfK,EAAY,mBAAOC,EAAIC,QAAQ,aAAc,OAAOC,eAEpDC,EAAW,kBAAsB,iBAARV,GAAoBW,SAASX,ICEnE,SAAwBY,EAASC,EAASC,OACpCC,EAAe,GACbC,EAAQH,IAAaI,QAAUC,MAAO,IACtCC,QACA,MACA,SACC,YACG,KACLL,GAECI,EAAQnB,EAASiB,EAAME,OAAS,IAAMF,EAAME,MAAQ,UAErDF,EAAMI,SACID,EAAOE,GAAKF,EAAOE,GAAKL,EAAMI,MAAQJ,EAAMI,MAEvDJ,EAAMM,KAAIP,GAAgBI,EAAOG,GAAKN,EAAMM,IAE5CpB,EAAUc,EAAMC,WACFb,OAAOC,KAAKW,EAAMC,MAAMM,OAAO,SAACC,EAAMC,OAC9CzB,EAAMgB,EAAMC,KAAKQ,UAEX,IAARzB,KACM,IAAMe,EAAeI,EAAOO,IAAMD,GACjC1B,EAASC,IAAQU,EAASV,SAC3B,IAAMe,EAAeI,EAAOO,IAAMD,EAAON,EAAOQ,OAASX,EAAMC,KAAKQ,IAIvED,GACN,KAEET,EAAeG,GAnBG,2BCrBjBU,OAAKC,0DAAWf,eAChBgB,gBACO,aACC,KACTD,oBAEG,MACA,SACC,YACG,KACLA,EAAOf,gBAIVI,8BAEME,EAAQW,KAAKC,SAASZ,OAASW,KAAKC,SAASP,KAC/CQ,EAAY,KAEK,iBAAVb,MCnBJ,SAAeA,OAAOc,0DAAQpB,eACrCqB,gBACO,GACRD,mBAEEA,EAAIpB,qBAGNf,EAASqB,GAEP,SAAiBgB,EAAMnB,EAAMoB,OAC5BC,cAEA,iBAEG,WAGLpC,EAAUe,KAAOqB,EAAUrB,KAAOA,GAElClB,EAASqC,KACDd,GAAKc,EACNlC,EAAUkC,OACTnB,KAAOmB,GAGfrC,EAASkB,OACDC,MACRoB,EAAUpB,MAAMjB,OAAS,EAAOqC,EAAUpB,UAASD,EAASqB,EAAUpB,MAAQD,GAE9ElB,EAASsC,OACDnB,MACRoB,EAAUpB,MAAMjB,OAAS,EAAOqC,EAAUpB,UAASmB,EAAQC,EAAUpB,MAAQmB,GAG7EF,EAAQ7B,UACHA,EAAUM,EAAS0B,EAAWH,EAAQrB,aAGxCF,EAAS0B,EAAWH,EAAQrB,aA/BR,GDaXyB,CAAMnB,EAAOU,QACpBA,EAAIU,YAAc,kBAAaP"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/globals.js","../src/bem-cn/index.js","../src/bem-cn/bem-names.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options = { delimiters: {} }) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import { isPObject, isString, isNumber } from '../utils';\nimport { DEFAULT_DELIMITERS } from '../globals';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  const names = entitys || {};\n  const delims = {\n    ...DEFAULT_DELIMITERS,\n    ...delimiters,\n  };\n  let resultString = (delims.ns || '') + names.block;\n\n  if (names.el) resultString += delims.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delims.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delims.mod + name + delims.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');\n}\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","isNumber","isFinite","DEFAULT_DELIMITERS","DEFAULT_CONFIG","bemCn","block","options","delimiters","elem","mods","mix","resultObj","mixin","el","entitys","names","delims","resultString","bemClasses","ns","reduce","prev","name","mod","modVal","hyphenate","replace","toLowerCase","Vue","config","cfg","this","$options","generator","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAChCC,EAAY,qBACpBD,GAAsB,qBAARA,gBAAAA,KAAoBA,EAAIE,cAAgBC,SAAUA,OAAOC,KAAKJ,GAAKK,SAKzEC,EAAW,kBAAsB,iBAARN,GAAoBO,SAASP,ICPtDQ,EAAqB,IAC5B,MACA,SACC,YACG,KAGGC,EAAiB,YACjB,aACC,KCNC,SAASC,EAAMC,OAAOC,yDAAU,CAAEC,WAAY,WACpD,SAAiBC,EAAMC,EAAMC,OAC5BC,EAAY,YAEZ,QACE,SACC,IAGLhB,EAAUc,KACFA,KAAOA,EACRhB,EAASgB,OACRG,OAASH,GAGjBhB,EAASe,KACDK,GAAKL,EACNb,EAAUa,OACTC,KAAOD,GAGff,EAASiB,OACDE,OAASD,EAAUC,MAAMb,WAAaW,EAAQA,OCZ7BI,EAASP,EAClCQ,EACAC,EAIFC,EDSIC,GCfuBJ,EDeDH,ECfUJ,EDeCD,EAAQC,WCd3CQ,EAAQD,GAAW,GACnBE,OACDd,EACAK,GAEDU,GAAgBD,EAAOG,IAAM,IAAMJ,EAAMV,MAEzCU,EAAMF,KAAII,GAAgBD,EAAOH,GAAKE,EAAMF,IAE5ClB,EAAUoB,EAAMN,WACFZ,OAAOC,KAAKiB,EAAMN,MAAMW,OAAO,SAACC,EAAMC,OAC9C5B,EAAMqB,EAAMN,KAAKa,UAEX,IAAR5B,KACM,IAAMuB,EAAeD,EAAOO,IAAMD,GACjC7B,EAASC,IAAQM,EAASN,SAC3B,IAAMuB,EAAeD,EAAOO,IAAMD,EAAON,EAAOQ,OAAS9B,GAI5D2B,GACN,KAEEJ,GAAgBxB,EAASsB,EAAMH,OAAS,IAAMG,EAAMH,MAAQ,YDP1DN,EAAQmB,UACDP,EF3BkBQ,QAAQ,aAAc,OAAOC,cE4BzDT,SE5BO,kBACLU,OAAKC,yDAAS,CAAEtB,WAAY,IAC5BuB,OACD3B,EACA0B,mBAEE3B,EACA2B,EAAOtB,gBAIVK,MAAM,wBAEAP,EAAQ0B,KAAKC,SAAS3B,OAAS0B,KAAKC,SAASV,KAC/CW,EAAY,KAEXxC,EAASY,OAEFD,EAAMC,EAAOyB,QACpBA,EAAII,YAAc,kBAAaD"}
\ No newline at end of file
diff --git a/src/bem-cn/bem-names.js b/src/bem-cn/bem-names.js
index c3ea367..ac71af4 100644
--- a/src/bem-cn/bem-names.js
+++ b/src/bem-cn/bem-names.js
@@ -1,4 +1,5 @@
 import { isPObject, isString, isNumber } from '../utils';
+import { DEFAULT_DELIMITERS } from '../globals';
 
 /**
  * Create String from BEM entitys
@@ -11,19 +12,12 @@ import { isPObject, isString, isNumber } from '../utils';
  * @returns {String}
  */
 export default function bemNames(entitys, delimiters) {
-  let resultString = '';
-  const names = entitys || { mods: {}, mixin: '' };
+  const names = entitys || {};
   const delims = {
-    ns: '',
-    el: '__',
-    mod: '--',
-    modVal: '-',
+    ...DEFAULT_DELIMITERS,
     ...delimiters,
   };
-  const mixin = isString(names.mixin) ? ' ' + names.mixin : '';
-
-  if (!names.block) return '';
-  resultString = delims.ns ? delims.ns + names.block : names.block;
+  let resultString = (delims.ns || '') + names.block;
 
   if (names.el) resultString += delims.el + names.el;
 
@@ -34,12 +28,12 @@ export default function bemNames(entitys, delimiters) {
       if (val === true) {
         prev += ' ' + resultString + delims.mod + name;
       } else if (isString(val) || isNumber(val)) {
-        prev += ' ' + resultString + delims.mod + name + delims.modVal + names.mods[name];
+        prev += ' ' + resultString + delims.mod + name + delims.modVal + val;
       }
       /* eslint-enable no-param-reassign */
 
       return prev;
     }, '');
   }
-  return resultString + mixin;
+  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');
 }
diff --git a/src/bem-cn/index.js b/src/bem-cn/index.js
index 6c9faa9..b8747f7 100644
--- a/src/bem-cn/index.js
+++ b/src/bem-cn/index.js
@@ -1,16 +1,7 @@
 import { isString, isPObject, hyphenate } from '../utils';
 import bemNames from './bem-names';
 
-export default function bemCn(block, opt = { delimiters: {} }) {
-  const options = {
-    hyphenate: false,
-    ...opt,
-    delimiters: {
-      ...opt.delimiters,
-    },
-  };
-  if (!isString(block)) return '';
-
+export default function bemCn(block, options = { delimiters: {} }) {
   return function entitys(elem, mods, mix) {
     const resultObj = {
       block,
@@ -19,7 +10,11 @@ export default function bemCn(block, opt = { delimiters: {} }) {
       mixin: '',
     };
 
-    if (isPObject(mods)) resultObj.mods = mods;
+    if (isPObject(mods)) {
+      resultObj.mods = mods;
+    } else if (isString(mods)) {
+      resultObj.mixin += mods;
+    }
 
     if (isString(elem)) {
       resultObj.el = elem;
@@ -27,19 +22,14 @@ export default function bemCn(block, opt = { delimiters: {} }) {
       resultObj.mods = elem;
     }
 
-    if (isString(mods)) {
-      resultObj.mixin =
-        resultObj.mixin.length > 0 ? `${resultObj.mixin} ${mods}` : resultObj.mixin + mods;
-    }
     if (isString(mix)) {
-      resultObj.mixin =
-        resultObj.mixin.length > 0 ? `${resultObj.mixin} ${mix}` : resultObj.mixin + mix;
+      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;
     }
 
-    if (options.hyphenate) {
-      return hyphenate(bemNames(resultObj, options.delimiters));
-    }
+    const bemClasses = bemNames(resultObj, options.delimiters);
 
-    return bemNames(resultObj, options.delimiters);
+    return options.hyphenate
+      ? hyphenate(bemClasses)
+      : bemClasses;
   };
 }
diff --git a/src/globals.js b/src/globals.js
new file mode 100644
index 0000000..8eed05a
--- /dev/null
+++ b/src/globals.js
@@ -0,0 +1,11 @@
+export const DEFAULT_DELIMITERS = {
+  ns: '',
+  el: '__',
+  mod: '--',
+  modVal: '-',
+};
+
+export const DEFAULT_CONFIG = {
+  hyphenate: false,
+  methodName: 'b',
+};
diff --git a/src/utils.js b/src/utils.js
index 40d6b32..fedf978 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,11 +1,8 @@
-export const isString = val => val && typeof val === 'string' && val.length > 0;
+export const isString = val => val && typeof val === 'string';
 export const isPObject = val =>
-  val &&
-  typeof val === 'object' &&
-  val !== null &&
-  val.constructor === Object &&
-  Object.keys(val).length > 0;
+  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);
 
 export const hyphenate = str => str.replace(/\B([A-Z])/g, '-$1').toLowerCase();
+
 // eslint-disable-next-line no-restricted-globals
 export const isNumber = val => typeof val === 'number' && isFinite(val);
diff --git a/src/vue-plugin.js b/src/vue-plugin.js
index 7f1e18f..872539c 100644
--- a/src/vue-plugin.js
+++ b/src/vue-plugin.js
@@ -1,16 +1,14 @@
 import bemCn from './bem-cn/index';
+import { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';
+import { isString } from './utils';
 
 export default {
   install(Vue, config = { delimiters: {} }) {
     const cfg = {
-      hyphenate: false,
-      methodName: 'b',
+      ...DEFAULT_CONFIG,
       ...config,
       delimiters: {
-        ns: '',
-        el: '__',
-        mod: '--',
-        modVal: '-',
+        ...DEFAULT_DELIMITERS,
         ...config.delimiters,
       },
     };
@@ -20,7 +18,7 @@ export default {
         const block = this.$options.block || this.$options.name;
         let generator = null;
 
-        if (typeof block !== 'string') return;
+        if (!isString(block)) return;
 
         generator = bemCn(block, cfg);
         this[cfg.methodName] = (...args) => generator(...args);

From 79c4b6684569379c68a97d58077c1e146863cc3e Mon Sep 17 00:00:00 2001
From: Patric Eberle <line-in@derverstaerker.ch>
Date: Sun, 30 Sep 2018 22:03:16 +0200
Subject: [PATCH 2/5] Removes duplicated option definition.

---
 dist/vue-bem-cn.es6.js         | 37 ++++++++++++++++------------------
 dist/vue-bem-cn.es6.js.map     |  2 +-
 dist/vue-bem-cn.umd.min.js     |  2 +-
 dist/vue-bem-cn.umd.min.js.map |  2 +-
 src/bem-cn/bem-names.js        | 13 ++++--------
 src/bem-cn/index.js            |  2 +-
 tests/bem-cn.test.js           | 16 +++++++++++----
 tests/bem-names.test.js        |  7 ++++---
 tests/testingEntitys.js        |  9 ---------
 9 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/dist/vue-bem-cn.es6.js b/dist/vue-bem-cn.es6.js
index f8f2e45..449ccd4 100644
--- a/dist/vue-bem-cn.es6.js
+++ b/dist/vue-bem-cn.es6.js
@@ -54,18 +54,6 @@ var isNumber = function isNumber(val) {
   return typeof val === 'number' && isFinite(val);
 };
 
-var DEFAULT_DELIMITERS = {
-  ns: '',
-  el: '__',
-  mod: '--',
-  modVal: '-'
-};
-
-var DEFAULT_CONFIG = {
-  hyphenate: false,
-  methodName: 'b'
-};
-
 /**
  * Create String from BEM entitys
  * @param {Object} entitys BEM entitys
@@ -78,19 +66,18 @@ var DEFAULT_CONFIG = {
  */
 function bemNames(entitys, delimiters) {
   var names = entitys || {};
-  var delims = _extends({}, DEFAULT_DELIMITERS, delimiters);
-  var resultString = (delims.ns || '') + names.block;
+  var resultString = (delimiters.ns || '') + names.block;
 
-  if (names.el) resultString += delims.el + names.el;
+  if (names.el) resultString += delimiters.el + names.el;
 
   if (isPObject(names.mods)) {
     resultString += Object.keys(names.mods).reduce(function (prev, name) {
       var val = names.mods[name];
       /* eslint-disable no-param-reassign */
       if (val === true) {
-        prev += ' ' + resultString + delims.mod + name;
+        prev += ' ' + resultString + delimiters.mod + name;
       } else if (isString(val) || isNumber(val)) {
-        prev += ' ' + resultString + delims.mod + name + delims.modVal + val;
+        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;
       }
       /* eslint-enable no-param-reassign */
 
@@ -100,9 +87,7 @@ function bemNames(entitys, delimiters) {
   return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');
 }
 
-function bemCn(block) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { delimiters: {} };
-
+function bemCn(block, options) {
   return function entitys(elem, mods, mix) {
     var resultObj = {
       block: block,
@@ -133,6 +118,18 @@ function bemCn(block) {
   };
 }
 
+var DEFAULT_DELIMITERS = {
+  ns: '',
+  el: '__',
+  mod: '--',
+  modVal: '-'
+};
+
+var DEFAULT_CONFIG = {
+  hyphenate: false,
+  methodName: 'b'
+};
+
 var vuePlugin = {
   install: function install(Vue) {
     var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : { delimiters: {} };
diff --git a/dist/vue-bem-cn.es6.js.map b/dist/vue-bem-cn.es6.js.map
index 784cb9e..47c2e01 100644
--- a/dist/vue-bem-cn.es6.js.map
+++ b/dist/vue-bem-cn.es6.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/globals.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import { isPObject, isString, isNumber } from '../utils';\nimport { DEFAULT_DELIMITERS } from '../globals';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  const names = entitys || {};\n  const delims = {\n    ...DEFAULT_DELIMITERS,\n    ...delimiters,\n  };\n  let resultString = (delims.ns || '') + names.block;\n\n  if (names.el) resultString += delims.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delims.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delims.mod + name + delims.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options = { delimiters: {} }) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","DEFAULT_DELIMITERS","DEFAULT_CONFIG","bemNames","entitys","delimiters","names","delims","resultString","ns","block","el","mods","reduce","prev","name","mod","modVal","mixin","bemCn","options","elem","mix","resultObj","bemClasses","Vue","config","cfg","$options","generator","methodName"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  const names = entitys || {};\n  let resultString = (delimiters.ns || '') + names.block;\n\n  if (names.el) resultString += delimiters.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemNames","entitys","delimiters","names","resultString","ns","block","el","mods","reduce","prev","name","mod","modVal","mixin","bemCn","options","elem","mix","resultObj","bemClasses","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","$options","generator","methodName"],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/vue-bem-cn.umd.min.js b/dist/vue-bem-cn.umd.min.js
index d12cfea..0a3dea9 100644
--- a/dist/vue-bem-cn.umd.min.js
+++ b/dist/vue-bem-cn.umd.min.js
@@ -1,2 +1,2 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.vueBemCn=t()}(this,function(){"use strict";var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},f=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},a=function(e){return e&&"string"==typeof e},y=function(e){return!(!e||"object"!==(void 0===e?"undefined":t(e))||e.constructor!==Object||!Object.keys(e).length)},p=function(e){return"number"==typeof e&&isFinite(e)},b={ns:"",el:"__",mod:"--",modVal:"-"},o={hyphenate:!1,methodName:"b"};function i(s){var d=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}};return function(e,t,n){var o={block:s,el:"",mods:{},mixin:""};y(t)?o.mods=t:a(t)&&(o.mixin+=t),a(e)?o.el=e:y(e)&&(o.mods=e),a(n)&&(o.mixin+=o.mixin.length?" "+n:n);var i,r,m,u,l,c=(i=o,r=d.delimiters,m=i||{},u=f({},b,r),l=(u.ns||"")+m.block,m.el&&(l+=u.el+m.el),y(m.mods)&&(l+=Object.keys(m.mods).reduce(function(e,t){var n=m.mods[t];return!0===n?e+=" "+l+u.mod+t:(a(n)||p(n))&&(e+=" "+l+u.mod+t+u.modVal+n),e},"")),l+(a(m.mixin)?" "+m.mixin:""));return d.hyphenate?c.replace(/\B([A-Z])/g,"-$1").toLowerCase():c}}return{install:function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},n=f({},o,t,{delimiters:f({},b,t.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,t=null;a(e)&&(t=i(e,n),this[n.methodName]=function(){return t.apply(void 0,arguments)})}})}}});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.vueBemCn=t()}(this,function(){"use strict";var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},f=function(e){return e&&"string"==typeof e},d=function(e){return!(!e||"object"!==(void 0===e?"undefined":t(e))||e.constructor!==Object||!Object.keys(e).length)},a=function(e){return"number"==typeof e&&isFinite(e)};function i(l,s){return function(e,t,n){var o={block:l,el:"",mods:{},mixin:""};d(t)?o.mods=t:f(t)&&(o.mixin+=t),f(e)?o.el=e:d(e)&&(o.mods=e),f(n)&&(o.mixin+=o.mixin.length?" "+n:n);var i,r,m,u,c=(i=o,r=s.delimiters,m=i||{},u=(r.ns||"")+m.block,m.el&&(u+=r.el+m.el),d(m.mods)&&(u+=Object.keys(m.mods).reduce(function(e,t){var n=m.mods[t];return!0===n?e+=" "+u+r.mod+t:(f(n)||a(n))&&(e+=" "+u+r.mod+t+r.modVal+n),e},"")),u+(f(m.mixin)?" "+m.mixin:""));return s.hyphenate?c.replace(/\B([A-Z])/g,"-$1").toLowerCase():c}}var r={ns:"",el:"__",mod:"--",modVal:"-"},m={hyphenate:!1,methodName:"b"};return{install:function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},n=o({},m,t,{delimiters:o({},r,t.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,t=null;f(e)&&(t=i(e,n),this[n.methodName]=function(){return t.apply(void 0,arguments)})}})}}});
 //# sourceMappingURL=vue-bem-cn.umd.min.js.map
diff --git a/dist/vue-bem-cn.umd.min.js.map b/dist/vue-bem-cn.umd.min.js.map
index 97d89dc..246e8fd 100644
--- a/dist/vue-bem-cn.umd.min.js.map
+++ b/dist/vue-bem-cn.umd.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/globals.js","../src/bem-cn/index.js","../src/bem-cn/bem-names.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options = { delimiters: {} }) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import { isPObject, isString, isNumber } from '../utils';\nimport { DEFAULT_DELIMITERS } from '../globals';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  const names = entitys || {};\n  const delims = {\n    ...DEFAULT_DELIMITERS,\n    ...delimiters,\n  };\n  let resultString = (delims.ns || '') + names.block;\n\n  if (names.el) resultString += delims.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delims.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delims.mod + name + delims.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');\n}\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","isNumber","isFinite","DEFAULT_DELIMITERS","DEFAULT_CONFIG","bemCn","block","options","delimiters","elem","mods","mix","resultObj","mixin","el","entitys","names","delims","resultString","bemClasses","ns","reduce","prev","name","mod","modVal","hyphenate","replace","toLowerCase","Vue","config","cfg","this","$options","generator","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAChCC,EAAY,qBACpBD,GAAsB,qBAARA,gBAAAA,KAAoBA,EAAIE,cAAgBC,SAAUA,OAAOC,KAAKJ,GAAKK,SAKzEC,EAAW,kBAAsB,iBAARN,GAAoBO,SAASP,ICPtDQ,EAAqB,IAC5B,MACA,SACC,YACG,KAGGC,EAAiB,YACjB,aACC,KCNC,SAASC,EAAMC,OAAOC,yDAAU,CAAEC,WAAY,WACpD,SAAiBC,EAAMC,EAAMC,OAC5BC,EAAY,YAEZ,QACE,SACC,IAGLhB,EAAUc,KACFA,KAAOA,EACRhB,EAASgB,OACRG,OAASH,GAGjBhB,EAASe,KACDK,GAAKL,EACNb,EAAUa,OACTC,KAAOD,GAGff,EAASiB,OACDE,OAASD,EAAUC,MAAMb,WAAaW,EAAQA,OCZ7BI,EAASP,EAClCQ,EACAC,EAIFC,EDSIC,GCfuBJ,EDeDH,ECfUJ,EDeCD,EAAQC,WCd3CQ,EAAQD,GAAW,GACnBE,OACDd,EACAK,GAEDU,GAAgBD,EAAOG,IAAM,IAAMJ,EAAMV,MAEzCU,EAAMF,KAAII,GAAgBD,EAAOH,GAAKE,EAAMF,IAE5ClB,EAAUoB,EAAMN,WACFZ,OAAOC,KAAKiB,EAAMN,MAAMW,OAAO,SAACC,EAAMC,OAC9C5B,EAAMqB,EAAMN,KAAKa,UAEX,IAAR5B,KACM,IAAMuB,EAAeD,EAAOO,IAAMD,GACjC7B,EAASC,IAAQM,EAASN,SAC3B,IAAMuB,EAAeD,EAAOO,IAAMD,EAAON,EAAOQ,OAAS9B,GAI5D2B,GACN,KAEEJ,GAAgBxB,EAASsB,EAAMH,OAAS,IAAMG,EAAMH,MAAQ,YDP1DN,EAAQmB,UACDP,EF3BkBQ,QAAQ,aAAc,OAAOC,cE4BzDT,SE5BO,kBACLU,OAAKC,yDAAS,CAAEtB,WAAY,IAC5BuB,OACD3B,EACA0B,mBAEE3B,EACA2B,EAAOtB,gBAIVK,MAAM,wBAEAP,EAAQ0B,KAAKC,SAAS3B,OAAS0B,KAAKC,SAASV,KAC/CW,EAAY,KAEXxC,EAASY,OAEFD,EAAMC,EAAOyB,QACpBA,EAAII,YAAc,kBAAaD"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/bem-cn/index.js","../src/bem-cn/bem-names.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  const names = entitys || {};\n  let resultString = (delimiters.ns || '') + names.block;\n\n  if (names.el) resultString += delimiters.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","isNumber","isFinite","bemCn","block","options","elem","mods","mix","resultObj","mixin","el","entitys","delimiters","names","resultString","bemClasses","ns","reduce","prev","name","mod","modVal","hyphenate","replace","toLowerCase","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","this","$options","generator","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAChCC,EAAY,qBACpBD,GAAsB,qBAARA,gBAAAA,KAAoBA,EAAIE,cAAgBC,SAAUA,OAAOC,KAAKJ,GAAKK,SAKzEC,EAAW,kBAAsB,iBAARN,GAAoBO,SAASP,aCJ3CQ,EAAMC,EAAOC,UAC5B,SAAiBC,EAAMC,EAAMC,OAC5BC,EAAY,YAEZ,QACE,SACC,IAGLb,EAAUW,KACFA,KAAOA,EACRb,EAASa,OACRG,OAASH,GAGjBb,EAASY,KACDK,GAAKL,EACNV,EAAUU,OACTC,KAAOD,GAGfZ,EAASc,OACDE,OAASD,EAAUC,MAAMV,WAAaQ,EAAQA,OCb7BI,EAASC,EAClCC,EACFC,EDcIC,GChBuBJ,EDgBDH,EChBUI,EDgBCR,EAAQQ,WCf3CC,EAAQF,GAAW,GACrBG,GAAgBF,EAAWI,IAAM,IAAMH,EAAMV,MAE7CU,EAAMH,KAAII,GAAgBF,EAAWF,GAAKG,EAAMH,IAEhDf,EAAUkB,EAAMP,WACFT,OAAOC,KAAKe,EAAMP,MAAMW,OAAO,SAACC,EAAMC,OAC9CzB,EAAMmB,EAAMP,KAAKa,UAEX,IAARzB,KACM,IAAMoB,EAAeF,EAAWQ,IAAMD,GACrC1B,EAASC,IAAQM,EAASN,SAC3B,IAAMoB,EAAeF,EAAWQ,IAAMD,EAAOP,EAAWS,OAAS3B,GAIpEwB,GACN,KAEEJ,GAAgBrB,EAASoB,EAAMJ,OAAS,IAAMI,EAAMJ,MAAQ,YDF1DL,EAAQkB,UACDP,ED3BkBQ,QAAQ,aAAc,OAAOC,cC4BzDT,OEhCKU,EAAqB,IAC5B,MACA,SACC,YACG,KAGGC,EAAiB,YACjB,aACC,WCLC,kBACLC,OAAKC,yDAAS,CAAEhB,WAAY,IAC5BiB,OACDH,EACAE,mBAEEH,EACAG,EAAOhB,gBAIVH,MAAM,wBAEAN,EAAQ2B,KAAKC,SAAS5B,OAAS2B,KAAKC,SAASZ,KAC/Ca,EAAY,KAEXvC,EAASU,OAEFD,EAAMC,EAAO0B,QACpBA,EAAII,YAAc,kBAAaD"}
\ No newline at end of file
diff --git a/src/bem-cn/bem-names.js b/src/bem-cn/bem-names.js
index ac71af4..7aadb73 100644
--- a/src/bem-cn/bem-names.js
+++ b/src/bem-cn/bem-names.js
@@ -1,5 +1,4 @@
 import { isPObject, isString, isNumber } from '../utils';
-import { DEFAULT_DELIMITERS } from '../globals';
 
 /**
  * Create String from BEM entitys
@@ -13,22 +12,18 @@ import { DEFAULT_DELIMITERS } from '../globals';
  */
 export default function bemNames(entitys, delimiters) {
   const names = entitys || {};
-  const delims = {
-    ...DEFAULT_DELIMITERS,
-    ...delimiters,
-  };
-  let resultString = (delims.ns || '') + names.block;
+  let resultString = (delimiters.ns || '') + names.block;
 
-  if (names.el) resultString += delims.el + names.el;
+  if (names.el) resultString += delimiters.el + names.el;
 
   if (isPObject(names.mods)) {
     resultString += Object.keys(names.mods).reduce((prev, name) => {
       const val = names.mods[name];
       /* eslint-disable no-param-reassign */
       if (val === true) {
-        prev += ' ' + resultString + delims.mod + name;
+        prev += ' ' + resultString + delimiters.mod + name;
       } else if (isString(val) || isNumber(val)) {
-        prev += ' ' + resultString + delims.mod + name + delims.modVal + val;
+        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;
       }
       /* eslint-enable no-param-reassign */
 
diff --git a/src/bem-cn/index.js b/src/bem-cn/index.js
index b8747f7..000088c 100644
--- a/src/bem-cn/index.js
+++ b/src/bem-cn/index.js
@@ -1,7 +1,7 @@
 import { isString, isPObject, hyphenate } from '../utils';
 import bemNames from './bem-names';
 
-export default function bemCn(block, options = { delimiters: {} }) {
+export default function bemCn(block, options) {
   return function entitys(elem, mods, mix) {
     const resultObj = {
       block,
diff --git a/tests/bem-cn.test.js b/tests/bem-cn.test.js
index e2e236a..da52163 100644
--- a/tests/bem-cn.test.js
+++ b/tests/bem-cn.test.js
@@ -1,8 +1,16 @@
 import { blocks, elements, block, delimiters, delimitersTest, hyphenate } from './testingEntitys';
+import { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from '../src/globals';
 import bemCn from '../src/bem-cn/index';
 
+const config = {
+  ...DEFAULT_CONFIG,
+  delimiters: {
+    ...DEFAULT_DELIMITERS,
+  },
+};
+
 describe('Block', () => {
-  const b = bemCn(block);
+  const b = bemCn(block, config);
   Object.keys(blocks).forEach((item) => {
     test(item, () => {
       expect(b(blocks[item].mods, blocks[item].mixin)).toBe(item);
@@ -16,7 +24,7 @@ describe('Block', () => {
 });
 
 describe('Elements', () => {
-  const b = bemCn(block);
+  const b = bemCn(block, config);
 
   Object.keys(elements).forEach((item) => {
     test(item, () => {
@@ -26,7 +34,7 @@ describe('Elements', () => {
 });
 
 describe('Delimiters', () => {
-  const b = bemCn(block, { delimiters });
+  const b = bemCn(block, { ...config, delimiters });
 
   Object.keys(delimitersTest).forEach((item) => {
     test(item, () => {
@@ -36,7 +44,7 @@ describe('Delimiters', () => {
 });
 
 describe('Hyphenate', () => {
-  const b = bemCn(block, { hyphenate: true });
+  const b = bemCn(block, { ...config, hyphenate: true });
 
   Object.keys(hyphenate).forEach((item) => {
     test(item, () => {
diff --git a/tests/bem-names.test.js b/tests/bem-names.test.js
index 542e777..2b4fb7d 100644
--- a/tests/bem-names.test.js
+++ b/tests/bem-names.test.js
@@ -1,10 +1,11 @@
 import { blocks, elements, delimiters, delimitersTest } from './testingEntitys';
 import bemNames from '../src/bem-cn/bem-names';
+import { DEFAULT_DELIMITERS } from '../src/globals';
 
 describe('Block', () => {
   Object.keys(blocks).forEach((item) => {
     test(item, () => {
-      expect(bemNames(blocks[item])).toBe(item);
+      expect(bemNames(blocks[item], DEFAULT_DELIMITERS)).toBe(item);
     });
   });
 });
@@ -12,7 +13,7 @@ describe('Block', () => {
 describe('Element', () => {
   Object.keys(elements).forEach((item) => {
     test(item, () => {
-      expect(bemNames(elements[item])).toBe(item);
+      expect(bemNames(elements[item], DEFAULT_DELIMITERS)).toBe(item);
     });
   });
 });
@@ -20,7 +21,7 @@ describe('Element', () => {
 describe('Delimiters', () => {
   Object.keys(delimitersTest).forEach((item) => {
     test(item, () => {
-      expect(bemNames(delimitersTest[item], delimiters)).toBe(item);
+      expect(bemNames(delimitersTest[item], { ...DEFAULT_DELIMITERS, ...delimiters })).toBe(item);
     });
   });
 });
diff --git a/tests/testingEntitys.js b/tests/testingEntitys.js
index f8dbddb..d282b48 100644
--- a/tests/testingEntitys.js
+++ b/tests/testingEntitys.js
@@ -55,12 +55,3 @@ export const delimitersTest = {
 export const hyphenate = {
   'block block--has-mod': { block, mods: { hasMod: true } },
 };
-
-export default {
-  block,
-  el,
-  blocks,
-  elements,
-  delimiters,
-  hyphenate,
-};

From 750d18e96fa621f1227187be8c89488db03c293b Mon Sep 17 00:00:00 2001
From: Patric Eberle <line-in@derverstaerker.ch>
Date: Sun, 30 Sep 2018 22:07:53 +0200
Subject: [PATCH 3/5] Removes unnecessary fallback.

---
 dist/vue-bem-cn.es6.js         | 25 ++++++++++++-------------
 dist/vue-bem-cn.es6.js.map     |  2 +-
 dist/vue-bem-cn.umd.min.js     |  2 +-
 dist/vue-bem-cn.umd.min.js.map |  2 +-
 src/bem-cn/bem-names.js        | 25 ++++++++++++-------------
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/dist/vue-bem-cn.es6.js b/dist/vue-bem-cn.es6.js
index 449ccd4..826e1ac 100644
--- a/dist/vue-bem-cn.es6.js
+++ b/dist/vue-bem-cn.es6.js
@@ -56,23 +56,22 @@ var isNumber = function isNumber(val) {
 
 /**
  * Create String from BEM entitys
- * @param {Object} entitys BEM entitys
- * @param {String} entitys.block Block
- * @param {String} [entitys.el] Element
- * @param {Object<string>} [entitys.mods] Modifiers
- * @param {String} [entitys.mixin] Mixin
+ * @param {Object} entities BEM entitys
+ * @param {String} entities.block Block
+ * @param {String} [entities.el] Element
+ * @param {Object<string>} [entities.mods] Modifiers
+ * @param {String} [entities.mixin] Mixin
  * @param {Object<string>} delimiters Delimiters for BEM entitys
  * @returns {String}
  */
-function bemNames(entitys, delimiters) {
-  var names = entitys || {};
-  var resultString = (delimiters.ns || '') + names.block;
+function bemNames(entities, delimiters) {
+  var resultString = (delimiters.ns || '') + entities.block;
 
-  if (names.el) resultString += delimiters.el + names.el;
+  if (entities.el) resultString += delimiters.el + entities.el;
 
-  if (isPObject(names.mods)) {
-    resultString += Object.keys(names.mods).reduce(function (prev, name) {
-      var val = names.mods[name];
+  if (isPObject(entities.mods)) {
+    resultString += Object.keys(entities.mods).reduce(function (prev, name) {
+      var val = entities.mods[name];
       /* eslint-disable no-param-reassign */
       if (val === true) {
         prev += ' ' + resultString + delimiters.mod + name;
@@ -84,7 +83,7 @@ function bemNames(entitys, delimiters) {
       return prev;
     }, '');
   }
-  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');
+  return resultString + (isString(entities.mixin) ? ' ' + entities.mixin : '');
 }
 
 function bemCn(block, options) {
diff --git a/dist/vue-bem-cn.es6.js.map b/dist/vue-bem-cn.es6.js.map
index 47c2e01..93e8912 100644
--- a/dist/vue-bem-cn.es6.js.map
+++ b/dist/vue-bem-cn.es6.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  const names = entitys || {};\n  let resultString = (delimiters.ns || '') + names.block;\n\n  if (names.el) resultString += delimiters.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemNames","entitys","delimiters","names","resultString","ns","block","el","mods","reduce","prev","name","mod","modVal","mixin","bemCn","options","elem","mix","resultObj","bemClasses","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","$options","generator","methodName"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = (delimiters.ns || '') + entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (isPObject(entities.mods)) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(entities.mixin) ? ` ${entities.mixin}` : '');\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemNames","entities","delimiters","resultString","ns","block","el","mods","reduce","prev","name","mod","modVal","mixin","bemCn","options","entitys","elem","mix","resultObj","bemClasses","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","$options","generator","methodName"],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/vue-bem-cn.umd.min.js b/dist/vue-bem-cn.umd.min.js
index 0a3dea9..f4cc87f 100644
--- a/dist/vue-bem-cn.umd.min.js
+++ b/dist/vue-bem-cn.umd.min.js
@@ -1,2 +1,2 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.vueBemCn=t()}(this,function(){"use strict";var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},f=function(e){return e&&"string"==typeof e},d=function(e){return!(!e||"object"!==(void 0===e?"undefined":t(e))||e.constructor!==Object||!Object.keys(e).length)},a=function(e){return"number"==typeof e&&isFinite(e)};function i(l,s){return function(e,t,n){var o={block:l,el:"",mods:{},mixin:""};d(t)?o.mods=t:f(t)&&(o.mixin+=t),f(e)?o.el=e:d(e)&&(o.mods=e),f(n)&&(o.mixin+=o.mixin.length?" "+n:n);var i,r,m,u,c=(i=o,r=s.delimiters,m=i||{},u=(r.ns||"")+m.block,m.el&&(u+=r.el+m.el),d(m.mods)&&(u+=Object.keys(m.mods).reduce(function(e,t){var n=m.mods[t];return!0===n?e+=" "+u+r.mod+t:(f(n)||a(n))&&(e+=" "+u+r.mod+t+r.modVal+n),e},"")),u+(f(m.mixin)?" "+m.mixin:""));return s.hyphenate?c.replace(/\B([A-Z])/g,"-$1").toLowerCase():c}}var r={ns:"",el:"__",mod:"--",modVal:"-"},m={hyphenate:!1,methodName:"b"};return{install:function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},n=o({},m,t,{delimiters:o({},r,t.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,t=null;f(e)&&(t=i(e,n),this[n.methodName]=function(){return t.apply(void 0,arguments)})}})}}});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.vueBemCn=t()}(this,function(){"use strict";var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},s=function(e){return e&&"string"==typeof e},f=function(e){return!(!e||"object"!==(void 0===e?"undefined":t(e))||e.constructor!==Object||!Object.keys(e).length)},d=function(e){return"number"==typeof e&&isFinite(e)};function i(c,l){return function(e,t,n){var o={block:c,el:"",mods:{},mixin:""};f(t)?o.mods=t:s(t)&&(o.mixin+=t),s(e)?o.el=e:f(e)&&(o.mods=e),s(n)&&(o.mixin+=o.mixin.length?" "+n:n);var i,r,m,u=(i=o,r=l.delimiters,m=(r.ns||"")+i.block,i.el&&(m+=r.el+i.el),f(i.mods)&&(m+=Object.keys(i.mods).reduce(function(e,t){var n=i.mods[t];return!0===n?e+=" "+m+r.mod+t:(s(n)||d(n))&&(e+=" "+m+r.mod+t+r.modVal+n),e},"")),m+(s(i.mixin)?" "+i.mixin:""));return l.hyphenate?u.replace(/\B([A-Z])/g,"-$1").toLowerCase():u}}var r={ns:"",el:"__",mod:"--",modVal:"-"},m={hyphenate:!1,methodName:"b"};return{install:function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},n=o({},m,t,{delimiters:o({},r,t.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,t=null;s(e)&&(t=i(e,n),this[n.methodName]=function(){return t.apply(void 0,arguments)})}})}}});
 //# sourceMappingURL=vue-bem-cn.umd.min.js.map
diff --git a/dist/vue-bem-cn.umd.min.js.map b/dist/vue-bem-cn.umd.min.js.map
index 246e8fd..22e3049 100644
--- a/dist/vue-bem-cn.umd.min.js.map
+++ b/dist/vue-bem-cn.umd.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/bem-cn/index.js","../src/bem-cn/bem-names.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entitys BEM entitys\n * @param {String} entitys.block Block\n * @param {String} [entitys.el] Element\n * @param {Object<string>} [entitys.mods] Modifiers\n * @param {String} [entitys.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entitys, delimiters) {\n  const names = entitys || {};\n  let resultString = (delimiters.ns || '') + names.block;\n\n  if (names.el) resultString += delimiters.el + names.el;\n\n  if (isPObject(names.mods)) {\n    resultString += Object.keys(names.mods).reduce((prev, name) => {\n      const val = names.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","isNumber","isFinite","bemCn","block","options","elem","mods","mix","resultObj","mixin","el","entitys","delimiters","names","resultString","bemClasses","ns","reduce","prev","name","mod","modVal","hyphenate","replace","toLowerCase","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","this","$options","generator","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAChCC,EAAY,qBACpBD,GAAsB,qBAARA,gBAAAA,KAAoBA,EAAIE,cAAgBC,SAAUA,OAAOC,KAAKJ,GAAKK,SAKzEC,EAAW,kBAAsB,iBAARN,GAAoBO,SAASP,aCJ3CQ,EAAMC,EAAOC,UAC5B,SAAiBC,EAAMC,EAAMC,OAC5BC,EAAY,YAEZ,QACE,SACC,IAGLb,EAAUW,KACFA,KAAOA,EACRb,EAASa,OACRG,OAASH,GAGjBb,EAASY,KACDK,GAAKL,EACNV,EAAUU,OACTC,KAAOD,GAGfZ,EAASc,OACDE,OAASD,EAAUC,MAAMV,WAAaQ,EAAQA,OCb7BI,EAASC,EAClCC,EACFC,EDcIC,GChBuBJ,EDgBDH,EChBUI,EDgBCR,EAAQQ,WCf3CC,EAAQF,GAAW,GACrBG,GAAgBF,EAAWI,IAAM,IAAMH,EAAMV,MAE7CU,EAAMH,KAAII,GAAgBF,EAAWF,GAAKG,EAAMH,IAEhDf,EAAUkB,EAAMP,WACFT,OAAOC,KAAKe,EAAMP,MAAMW,OAAO,SAACC,EAAMC,OAC9CzB,EAAMmB,EAAMP,KAAKa,UAEX,IAARzB,KACM,IAAMoB,EAAeF,EAAWQ,IAAMD,GACrC1B,EAASC,IAAQM,EAASN,SAC3B,IAAMoB,EAAeF,EAAWQ,IAAMD,EAAOP,EAAWS,OAAS3B,GAIpEwB,GACN,KAEEJ,GAAgBrB,EAASoB,EAAMJ,OAAS,IAAMI,EAAMJ,MAAQ,YDF1DL,EAAQkB,UACDP,ED3BkBQ,QAAQ,aAAc,OAAOC,cC4BzDT,OEhCKU,EAAqB,IAC5B,MACA,SACC,YACG,KAGGC,EAAiB,YACjB,aACC,WCLC,kBACLC,OAAKC,yDAAS,CAAEhB,WAAY,IAC5BiB,OACDH,EACAE,mBAEEH,EACAG,EAAOhB,gBAIVH,MAAM,wBAEAN,EAAQ2B,KAAKC,SAAS5B,OAAS2B,KAAKC,SAASZ,KAC/Ca,EAAY,KAEXvC,EAASU,OAEFD,EAAMC,EAAO0B,QACpBA,EAAII,YAAc,kBAAaD"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/bem-cn/index.js","../src/bem-cn/bem-names.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = (delimiters.ns || '') + entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (isPObject(entities.mods)) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(entities.mixin) ? ` ${entities.mixin}` : '');\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","isNumber","isFinite","bemCn","block","options","elem","mods","mix","resultObj","mixin","el","entities","delimiters","resultString","bemClasses","ns","reduce","prev","name","mod","modVal","hyphenate","replace","toLowerCase","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","this","$options","generator","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAChCC,EAAY,qBACpBD,GAAsB,qBAARA,gBAAAA,KAAoBA,EAAIE,cAAgBC,SAAUA,OAAOC,KAAKJ,GAAKK,SAKzEC,EAAW,kBAAsB,iBAARN,GAAoBO,SAASP,aCJ3CQ,EAAMC,EAAOC,UAC5B,SAAiBC,EAAMC,EAAMC,OAC5BC,EAAY,YAEZ,QACE,SACC,IAGLb,EAAUW,KACFA,KAAOA,EACRb,EAASa,OACRG,OAASH,GAGjBb,EAASY,KACDK,GAAKL,EACNV,EAAUU,OACTC,KAAOD,GAGfZ,EAASc,OACDE,OAASD,EAAUC,MAAMV,WAAaQ,EAAQA,OCb7BI,EAAUC,EACrCC,EDeIC,GChBuBH,EDgBDH,EChBWI,EDgBAR,EAAQQ,WCf7CC,GAAgBD,EAAWG,IAAM,IAAMJ,EAASR,MAEhDQ,EAASD,KAAIG,GAAgBD,EAAWF,GAAKC,EAASD,IAEtDf,EAAUgB,EAASL,WACLT,OAAOC,KAAKa,EAASL,MAAMU,OAAO,SAACC,EAAMC,OACjDxB,EAAMiB,EAASL,KAAKY,UAEd,IAARxB,KACM,IAAMmB,EAAeD,EAAWO,IAAMD,GACrCzB,EAASC,IAAQM,EAASN,SAC3B,IAAMmB,EAAeD,EAAWO,IAAMD,EAAON,EAAWQ,OAAS1B,GAIpEuB,GACN,KAEEJ,GAAgBpB,EAASkB,EAASF,WAAaE,EAASF,MAAU,YDDhEL,EAAQiB,UACDP,ED3BkBQ,QAAQ,aAAc,OAAOC,cC4BzDT,OEhCKU,EAAqB,IAC5B,MACA,SACC,YACG,KAGGC,EAAiB,YACjB,aACC,WCLC,kBACLC,OAAKC,yDAAS,CAAEf,WAAY,IAC5BgB,OACDH,EACAE,mBAEEH,EACAG,EAAOf,gBAIVH,MAAM,wBAEAN,EAAQ0B,KAAKC,SAAS3B,OAAS0B,KAAKC,SAASZ,KAC/Ca,EAAY,KAEXtC,EAASU,OAEFD,EAAMC,EAAOyB,QACpBA,EAAII,YAAc,kBAAaD"}
\ No newline at end of file
diff --git a/src/bem-cn/bem-names.js b/src/bem-cn/bem-names.js
index 7aadb73..4af4746 100644
--- a/src/bem-cn/bem-names.js
+++ b/src/bem-cn/bem-names.js
@@ -2,23 +2,22 @@ import { isPObject, isString, isNumber } from '../utils';
 
 /**
  * Create String from BEM entitys
- * @param {Object} entitys BEM entitys
- * @param {String} entitys.block Block
- * @param {String} [entitys.el] Element
- * @param {Object<string>} [entitys.mods] Modifiers
- * @param {String} [entitys.mixin] Mixin
+ * @param {Object} entities BEM entitys
+ * @param {String} entities.block Block
+ * @param {String} [entities.el] Element
+ * @param {Object<string>} [entities.mods] Modifiers
+ * @param {String} [entities.mixin] Mixin
  * @param {Object<string>} delimiters Delimiters for BEM entitys
  * @returns {String}
  */
-export default function bemNames(entitys, delimiters) {
-  const names = entitys || {};
-  let resultString = (delimiters.ns || '') + names.block;
+export default function bemNames(entities, delimiters) {
+  let resultString = (delimiters.ns || '') + entities.block;
 
-  if (names.el) resultString += delimiters.el + names.el;
+  if (entities.el) resultString += delimiters.el + entities.el;
 
-  if (isPObject(names.mods)) {
-    resultString += Object.keys(names.mods).reduce((prev, name) => {
-      const val = names.mods[name];
+  if (isPObject(entities.mods)) {
+    resultString += Object.keys(entities.mods).reduce((prev, name) => {
+      const val = entities.mods[name];
       /* eslint-disable no-param-reassign */
       if (val === true) {
         prev += ' ' + resultString + delimiters.mod + name;
@@ -30,5 +29,5 @@ export default function bemNames(entitys, delimiters) {
       return prev;
     }, '');
   }
-  return resultString + (isString(names.mixin) ? ' ' + names.mixin : '');
+  return resultString + (isString(entities.mixin) ? ` ${entities.mixin}` : '');
 }

From bb81fcc152dfa0d3d397d92e52ce29a3353ce181 Mon Sep 17 00:00:00 2001
From: Patric Eberle <line-in@derverstaerker.ch>
Date: Sun, 7 Oct 2018 23:09:23 +0200
Subject: [PATCH 4/5] Removes duplicated conditions, adds early exit if nothing
 but block defined, moves namespaces and block concatination to mixin init
 (adjusts tests therefore).

---
 dist/vue-bem-cn.es6.js         | 18 ++++++++++++------
 dist/vue-bem-cn.es6.js.map     |  2 +-
 dist/vue-bem-cn.umd.min.js     |  2 +-
 dist/vue-bem-cn.umd.min.js.map |  2 +-
 src/bem-cn/bem-names.js        |  9 +++++----
 src/bem-cn/index.js            |  8 ++++++--
 src/vue-plugin.js              |  3 ++-
 tests/bem-cn.test.js           |  2 +-
 tests/testingEntitys.js        |  2 +-
 9 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/dist/vue-bem-cn.es6.js b/dist/vue-bem-cn.es6.js
index 826e1ac..73cc4d5 100644
--- a/dist/vue-bem-cn.es6.js
+++ b/dist/vue-bem-cn.es6.js
@@ -65,11 +65,11 @@ var isNumber = function isNumber(val) {
  * @returns {String}
  */
 function bemNames(entities, delimiters) {
-  var resultString = (delimiters.ns || '') + entities.block;
+  var resultString = entities.block;
 
   if (entities.el) resultString += delimiters.el + entities.el;
 
-  if (isPObject(entities.mods)) {
+  if (entities.mods) {
     resultString += Object.keys(entities.mods).reduce(function (prev, name) {
       var val = entities.mods[name];
       /* eslint-disable no-param-reassign */
@@ -83,11 +83,12 @@ function bemNames(entities, delimiters) {
       return prev;
     }, '');
   }
-  return resultString + (isString(entities.mixin) ? ' ' + entities.mixin : '');
+
+  return resultString + (entities.mixin ? ' ' + entities.mixin : '');
 }
 
 function bemCn(block, options) {
-  return function entitys(elem, mods, mix) {
+  return function entities(elem, mods, mix) {
     var resultObj = {
       block: block,
       el: '',
@@ -95,6 +96,10 @@ function bemCn(block, options) {
       mixin: ''
     };
 
+    if (!elem && !mods && !mix) {
+      return block;
+    }
+
     if (isPObject(mods)) {
       resultObj.mods = mods;
     } else if (isString(mods)) {
@@ -108,7 +113,7 @@ function bemCn(block, options) {
     }
 
     if (isString(mix)) {
-      resultObj.mixin += resultObj.mixin.length ? ' ' + mix : mix;
+      resultObj.mixin += resultObj.mixin ? ' ' + mix : mix;
     }
 
     var bemClasses = bemNames(resultObj, options.delimiters);
@@ -144,7 +149,8 @@ var vuePlugin = {
 
         if (!isString(block)) return;
 
-        generator = bemCn(block, cfg);
+        generator = bemCn(cfg.delimiters.ns + block, cfg);
+
         this[cfg.methodName] = function () {
           return generator.apply(undefined, arguments);
         };
diff --git a/dist/vue-bem-cn.es6.js.map b/dist/vue-bem-cn.es6.js.map
index 93e8912..0ead4ef 100644
--- a/dist/vue-bem-cn.es6.js.map
+++ b/dist/vue-bem-cn.es6.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = (delimiters.ns || '') + entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (isPObject(entities.mods)) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(entities.mixin) ? ` ${entities.mixin}` : '');\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemNames","entities","delimiters","resultString","ns","block","el","mods","reduce","prev","name","mod","modVal","mixin","bemCn","options","entitys","elem","mix","resultObj","bemClasses","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","$options","generator","methodName"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (entities.mods) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n\n  return resultString + (entities.mixin ? ` ${entities.mixin}` : '');\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entities(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (!elem && !mods && !mix) {\n      return block;\n    }\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(cfg.delimiters.ns + block, cfg);\n\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemNames","entities","delimiters","resultString","block","el","mods","reduce","prev","name","mod","modVal","mixin","bemCn","options","elem","mix","resultObj","bemClasses","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","$options","generator","ns","methodName"],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/vue-bem-cn.umd.min.js b/dist/vue-bem-cn.umd.min.js
index f4cc87f..bd21afc 100644
--- a/dist/vue-bem-cn.umd.min.js
+++ b/dist/vue-bem-cn.umd.min.js
@@ -1,2 +1,2 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.vueBemCn=t()}(this,function(){"use strict";var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},s=function(e){return e&&"string"==typeof e},f=function(e){return!(!e||"object"!==(void 0===e?"undefined":t(e))||e.constructor!==Object||!Object.keys(e).length)},d=function(e){return"number"==typeof e&&isFinite(e)};function i(c,l){return function(e,t,n){var o={block:c,el:"",mods:{},mixin:""};f(t)?o.mods=t:s(t)&&(o.mixin+=t),s(e)?o.el=e:f(e)&&(o.mods=e),s(n)&&(o.mixin+=o.mixin.length?" "+n:n);var i,r,m,u=(i=o,r=l.delimiters,m=(r.ns||"")+i.block,i.el&&(m+=r.el+i.el),f(i.mods)&&(m+=Object.keys(i.mods).reduce(function(e,t){var n=i.mods[t];return!0===n?e+=" "+m+r.mod+t:(s(n)||d(n))&&(e+=" "+m+r.mod+t+r.modVal+n),e},"")),m+(s(i.mixin)?" "+i.mixin:""));return l.hyphenate?u.replace(/\B([A-Z])/g,"-$1").toLowerCase():u}}var r={ns:"",el:"__",mod:"--",modVal:"-"},m={hyphenate:!1,methodName:"b"};return{install:function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},n=o({},m,t,{delimiters:o({},r,t.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,t=null;s(e)&&(t=i(e,n),this[n.methodName]=function(){return t.apply(void 0,arguments)})}})}}});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.vueBemCn=t()}(this,function(){"use strict";var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},s=function(e){return e&&"string"==typeof e},f=function(e){return!(!e||"object"!==(void 0===e?"undefined":t(e))||e.constructor!==Object||!Object.keys(e).length)},d=function(e){return"number"==typeof e&&isFinite(e)};function i(c,l){return function(e,t,n){var o={block:c,el:"",mods:{},mixin:""};if(!e&&!t&&!n)return c;f(t)?o.mods=t:s(t)&&(o.mixin+=t),s(e)?o.el=e:f(e)&&(o.mods=e),s(n)&&(o.mixin+=o.mixin?" "+n:n);var i,r,m,u=(i=o,r=l.delimiters,m=i.block,i.el&&(m+=r.el+i.el),i.mods&&(m+=Object.keys(i.mods).reduce(function(e,t){var n=i.mods[t];return!0===n?e+=" "+m+r.mod+t:(s(n)||d(n))&&(e+=" "+m+r.mod+t+r.modVal+n),e},"")),m+(i.mixin?" "+i.mixin:""));return l.hyphenate?u.replace(/\B([A-Z])/g,"-$1").toLowerCase():u}}var r={ns:"",el:"__",mod:"--",modVal:"-"},m={hyphenate:!1,methodName:"b"};return{install:function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},n=o({},m,t,{delimiters:o({},r,t.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,t=null;s(e)&&(t=i(n.delimiters.ns+e,n),this[n.methodName]=function(){return t.apply(void 0,arguments)})}})}}});
 //# sourceMappingURL=vue-bem-cn.umd.min.js.map
diff --git a/dist/vue-bem-cn.umd.min.js.map b/dist/vue-bem-cn.umd.min.js.map
index 22e3049..4f15103 100644
--- a/dist/vue-bem-cn.umd.min.js.map
+++ b/dist/vue-bem-cn.umd.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/bem-cn/index.js","../src/bem-cn/bem-names.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entitys(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import { isPObject, isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = (delimiters.ns || '') + entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (isPObject(entities.mods)) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n  return resultString + (isString(entities.mixin) ? ` ${entities.mixin}` : '');\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(block, cfg);\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","isNumber","isFinite","bemCn","block","options","elem","mods","mix","resultObj","mixin","el","entities","delimiters","resultString","bemClasses","ns","reduce","prev","name","mod","modVal","hyphenate","replace","toLowerCase","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","this","$options","generator","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAChCC,EAAY,qBACpBD,GAAsB,qBAARA,gBAAAA,KAAoBA,EAAIE,cAAgBC,SAAUA,OAAOC,KAAKJ,GAAKK,SAKzEC,EAAW,kBAAsB,iBAARN,GAAoBO,SAASP,aCJ3CQ,EAAMC,EAAOC,UAC5B,SAAiBC,EAAMC,EAAMC,OAC5BC,EAAY,YAEZ,QACE,SACC,IAGLb,EAAUW,KACFA,KAAOA,EACRb,EAASa,OACRG,OAASH,GAGjBb,EAASY,KACDK,GAAKL,EACNV,EAAUU,OACTC,KAAOD,GAGfZ,EAASc,OACDE,OAASD,EAAUC,MAAMV,WAAaQ,EAAQA,OCb7BI,EAAUC,EACrCC,EDeIC,GChBuBH,EDgBDH,EChBWI,EDgBAR,EAAQQ,WCf7CC,GAAgBD,EAAWG,IAAM,IAAMJ,EAASR,MAEhDQ,EAASD,KAAIG,GAAgBD,EAAWF,GAAKC,EAASD,IAEtDf,EAAUgB,EAASL,WACLT,OAAOC,KAAKa,EAASL,MAAMU,OAAO,SAACC,EAAMC,OACjDxB,EAAMiB,EAASL,KAAKY,UAEd,IAARxB,KACM,IAAMmB,EAAeD,EAAWO,IAAMD,GACrCzB,EAASC,IAAQM,EAASN,SAC3B,IAAMmB,EAAeD,EAAWO,IAAMD,EAAON,EAAWQ,OAAS1B,GAIpEuB,GACN,KAEEJ,GAAgBpB,EAASkB,EAASF,WAAaE,EAASF,MAAU,YDDhEL,EAAQiB,UACDP,ED3BkBQ,QAAQ,aAAc,OAAOC,cC4BzDT,OEhCKU,EAAqB,IAC5B,MACA,SACC,YACG,KAGGC,EAAiB,YACjB,aACC,WCLC,kBACLC,OAAKC,yDAAS,CAAEf,WAAY,IAC5BgB,OACDH,EACAE,mBAEEH,EACAG,EAAOf,gBAIVH,MAAM,wBAEAN,EAAQ0B,KAAKC,SAAS3B,OAAS0B,KAAKC,SAASZ,KAC/Ca,EAAY,KAEXtC,EAASU,OAEFD,EAAMC,EAAOyB,QACpBA,EAAII,YAAc,kBAAaD"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/bem-cn/index.js","../src/bem-cn/bem-names.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entities(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (!elem && !mods && !mix) {\n      return block;\n    }\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import { isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (entities.mods) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n\n  return resultString + (entities.mixin ? ` ${entities.mixin}` : '');\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(cfg.delimiters.ns + block, cfg);\n\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","isNumber","isFinite","bemCn","block","options","elem","mods","mix","resultObj","mixin","el","entities","delimiters","resultString","bemClasses","reduce","prev","name","mod","modVal","hyphenate","replace","toLowerCase","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","this","$options","generator","ns","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAChCC,EAAY,qBACpBD,GAAsB,qBAARA,gBAAAA,KAAoBA,EAAIE,cAAgBC,SAAUA,OAAOC,KAAKJ,GAAKK,SAKzEC,EAAW,kBAAsB,iBAARN,GAAoBO,SAASP,aCJ3CQ,EAAMC,EAAOC,UAC5B,SAAkBC,EAAMC,EAAMC,OAC7BC,EAAY,YAEZ,QACE,SACC,QAGJH,IAASC,IAASC,SACdJ,EAGLR,EAAUW,KACFA,KAAOA,EACRb,EAASa,OACRG,OAASH,GAGjBb,EAASY,KACDK,GAAKL,EACNV,EAAUU,OACTC,KAAOD,GAGfZ,EAASc,OACDE,OAASD,EAAUC,UAAYF,EAAQA,OCjBtBI,EAAUC,EACrCC,EDmBIC,GCpBuBH,EDoBDH,ECpBWI,EDoBAR,EAAQQ,WCnB7CC,EAAeF,EAASR,MAExBQ,EAASD,KAAIG,GAAgBD,EAAWF,GAAKC,EAASD,IAEtDC,EAASL,UACKT,OAAOC,KAAKa,EAASL,MAAMS,OAAO,SAACC,EAAMC,OACjDvB,EAAMiB,EAASL,KAAKW,UAEd,IAARvB,KACM,IAAMmB,EAAeD,EAAWM,IAAMD,GACrCxB,EAASC,IAAQM,EAASN,SAC3B,IAAMmB,EAAeD,EAAWM,IAAMD,EAAOL,EAAWO,OAASzB,GAIpEsB,GACN,KAGEH,GAAgBF,EAASF,UAAYE,EAASF,MAAU,YDEtDL,EAAQgB,UACDN,ED/BkBO,QAAQ,aAAc,OAAOC,cCgCzDR,OEpCKS,EAAqB,IAC5B,MACA,SACC,YACG,KAGGC,EAAiB,YACjB,aACC,WCLC,kBACLC,OAAKC,yDAAS,CAAEd,WAAY,IAC5Be,OACDH,EACAE,mBAEEH,EACAG,EAAOd,gBAIVH,MAAM,wBAEAN,EAAQyB,KAAKC,SAAS1B,OAASyB,KAAKC,SAASZ,KAC/Ca,EAAY,KAEXrC,EAASU,OAEFD,EAAMyB,EAAIf,WAAWmB,GAAK5B,EAAOwB,QAExCA,EAAIK,YAAc,kBAAaF"}
\ No newline at end of file
diff --git a/src/bem-cn/bem-names.js b/src/bem-cn/bem-names.js
index 4af4746..8680a68 100644
--- a/src/bem-cn/bem-names.js
+++ b/src/bem-cn/bem-names.js
@@ -1,4 +1,4 @@
-import { isPObject, isString, isNumber } from '../utils';
+import { isString, isNumber } from '../utils';
 
 /**
  * Create String from BEM entitys
@@ -11,11 +11,11 @@ import { isPObject, isString, isNumber } from '../utils';
  * @returns {String}
  */
 export default function bemNames(entities, delimiters) {
-  let resultString = (delimiters.ns || '') + entities.block;
+  let resultString = entities.block;
 
   if (entities.el) resultString += delimiters.el + entities.el;
 
-  if (isPObject(entities.mods)) {
+  if (entities.mods) {
     resultString += Object.keys(entities.mods).reduce((prev, name) => {
       const val = entities.mods[name];
       /* eslint-disable no-param-reassign */
@@ -29,5 +29,6 @@ export default function bemNames(entities, delimiters) {
       return prev;
     }, '');
   }
-  return resultString + (isString(entities.mixin) ? ` ${entities.mixin}` : '');
+
+  return resultString + (entities.mixin ? ` ${entities.mixin}` : '');
 }
diff --git a/src/bem-cn/index.js b/src/bem-cn/index.js
index 000088c..24a0e0f 100644
--- a/src/bem-cn/index.js
+++ b/src/bem-cn/index.js
@@ -2,7 +2,7 @@ import { isString, isPObject, hyphenate } from '../utils';
 import bemNames from './bem-names';
 
 export default function bemCn(block, options) {
-  return function entitys(elem, mods, mix) {
+  return function entities(elem, mods, mix) {
     const resultObj = {
       block,
       el: '',
@@ -10,6 +10,10 @@ export default function bemCn(block, options) {
       mixin: '',
     };
 
+    if (!elem && !mods && !mix) {
+      return block;
+    }
+
     if (isPObject(mods)) {
       resultObj.mods = mods;
     } else if (isString(mods)) {
@@ -23,7 +27,7 @@ export default function bemCn(block, options) {
     }
 
     if (isString(mix)) {
-      resultObj.mixin += resultObj.mixin.length ? ` ${mix}` : mix;
+      resultObj.mixin += resultObj.mixin ? ` ${mix}` : mix;
     }
 
     const bemClasses = bemNames(resultObj, options.delimiters);
diff --git a/src/vue-plugin.js b/src/vue-plugin.js
index 872539c..4b6466c 100644
--- a/src/vue-plugin.js
+++ b/src/vue-plugin.js
@@ -20,7 +20,8 @@ export default {
 
         if (!isString(block)) return;
 
-        generator = bemCn(block, cfg);
+        generator = bemCn(cfg.delimiters.ns + block, cfg);
+
         this[cfg.methodName] = (...args) => generator(...args);
       },
     });
diff --git a/tests/bem-cn.test.js b/tests/bem-cn.test.js
index da52163..181561d 100644
--- a/tests/bem-cn.test.js
+++ b/tests/bem-cn.test.js
@@ -34,7 +34,7 @@ describe('Elements', () => {
 });
 
 describe('Delimiters', () => {
-  const b = bemCn(block, { ...config, delimiters });
+  const b = bemCn(delimiters.ns + block, { ...config, delimiters });
 
   Object.keys(delimitersTest).forEach((item) => {
     test(item, () => {
diff --git a/tests/testingEntitys.js b/tests/testingEntitys.js
index d282b48..777043d 100644
--- a/tests/testingEntitys.js
+++ b/tests/testingEntitys.js
@@ -42,7 +42,7 @@ export const elements = {
 
 export const delimitersTest = {
   'ns**block++elem ns**block++elem==mod~val ns**block++elem==modbool': {
-    block,
+    block: delimiters.ns + block,
     el,
     mods: {
       mod: 'val',

From e941f5b293dacb4d1428cfe505e36580b79aaa2d Mon Sep 17 00:00:00 2001
From: Patric Eberle <line-in@derverstaerker.ch>
Date: Mon, 8 Oct 2018 20:45:07 +0200
Subject: [PATCH 5/5] Adds missing hyphenate conversion for block, extends test
 to test early return.

---
 dist/vue-bem-cn.es6.js         |  3 ++-
 dist/vue-bem-cn.es6.js.map     |  2 +-
 dist/vue-bem-cn.umd.min.js     |  2 +-
 dist/vue-bem-cn.umd.min.js.map |  2 +-
 src/vue-plugin.js              |  5 +++--
 tests/bem-cn.test.js           | 11 +++++-----
 tests/testingEntitys.js        | 38 ++++++++++++++++++----------------
 tests/vue-plugin.test.js       | 36 +++++++++++++++++++++++++++-----
 8 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/dist/vue-bem-cn.es6.js b/dist/vue-bem-cn.es6.js
index 73cc4d5..8ecc616 100644
--- a/dist/vue-bem-cn.es6.js
+++ b/dist/vue-bem-cn.es6.js
@@ -145,11 +145,12 @@ var vuePlugin = {
     Vue.mixin({
       created: function created() {
         var block = this.$options.block || this.$options.name;
+        var nsBlock = cfg.delimiters.ns + block;
         var generator = null;
 
         if (!isString(block)) return;
 
-        generator = bemCn(cfg.delimiters.ns + block, cfg);
+        generator = bemCn(cfg.hyphenate ? hyphenate(nsBlock) : nsBlock, cfg);
 
         this[cfg.methodName] = function () {
           return generator.apply(undefined, arguments);
diff --git a/dist/vue-bem-cn.es6.js.map b/dist/vue-bem-cn.es6.js.map
index 0ead4ef..c8ac67a 100644
--- a/dist/vue-bem-cn.es6.js.map
+++ b/dist/vue-bem-cn.es6.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (entities.mods) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n\n  return resultString + (entities.mixin ? ` ${entities.mixin}` : '');\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entities(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (!elem && !mods && !mix) {\n      return block;\n    }\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(cfg.delimiters.ns + block, cfg);\n\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemNames","entities","delimiters","resultString","block","el","mods","reduce","prev","name","mod","modVal","mixin","bemCn","options","elem","mix","resultObj","bemClasses","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","$options","generator","ns","methodName"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.es6.js","sources":["../src/utils.js","../src/bem-cn/bem-names.js","../src/bem-cn/index.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (entities.mods) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n\n  return resultString + (entities.mixin ? ` ${entities.mixin}` : '');\n}\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entities(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (!elem && !mods && !mix) {\n      return block;\n    }\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport {hyphenate, isString} from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        const nsBlock = cfg.delimiters.ns + block;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(cfg.hyphenate ? hyphenate(nsBlock) : nsBlock, cfg);\n\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemNames","entities","delimiters","resultString","block","el","mods","reduce","prev","name","mod","modVal","mixin","bemCn","options","elem","mix","resultObj","bemClasses","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","$options","nsBlock","ns","generator","methodName"],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/vue-bem-cn.umd.min.js b/dist/vue-bem-cn.umd.min.js
index bd21afc..d91334b 100644
--- a/dist/vue-bem-cn.umd.min.js
+++ b/dist/vue-bem-cn.umd.min.js
@@ -1,2 +1,2 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.vueBemCn=t()}(this,function(){"use strict";var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},s=function(e){return e&&"string"==typeof e},f=function(e){return!(!e||"object"!==(void 0===e?"undefined":t(e))||e.constructor!==Object||!Object.keys(e).length)},d=function(e){return"number"==typeof e&&isFinite(e)};function i(c,l){return function(e,t,n){var o={block:c,el:"",mods:{},mixin:""};if(!e&&!t&&!n)return c;f(t)?o.mods=t:s(t)&&(o.mixin+=t),s(e)?o.el=e:f(e)&&(o.mods=e),s(n)&&(o.mixin+=o.mixin?" "+n:n);var i,r,m,u=(i=o,r=l.delimiters,m=i.block,i.el&&(m+=r.el+i.el),i.mods&&(m+=Object.keys(i.mods).reduce(function(e,t){var n=i.mods[t];return!0===n?e+=" "+m+r.mod+t:(s(n)||d(n))&&(e+=" "+m+r.mod+t+r.modVal+n),e},"")),m+(i.mixin?" "+i.mixin:""));return l.hyphenate?u.replace(/\B([A-Z])/g,"-$1").toLowerCase():u}}var r={ns:"",el:"__",mod:"--",modVal:"-"},m={hyphenate:!1,methodName:"b"};return{install:function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},n=o({},m,t,{delimiters:o({},r,t.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,t=null;s(e)&&(t=i(n.delimiters.ns+e,n),this[n.methodName]=function(){return t.apply(void 0,arguments)})}})}}});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.vueBemCn=t()}(this,function(){"use strict";var t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e},l=function(e){return e&&"string"==typeof e},s=function(e){return!(!e||"object"!==(void 0===e?"undefined":t(e))||e.constructor!==Object||!Object.keys(e).length)},d=function(e){return e.replace(/\B([A-Z])/g,"-$1").toLowerCase()},a=function(e){return"number"==typeof e&&isFinite(e)};function i(c,f){return function(e,t,n){var o={block:c,el:"",mods:{},mixin:""};if(!e&&!t&&!n)return c;s(t)?o.mods=t:l(t)&&(o.mixin+=t),l(e)?o.el=e:s(e)&&(o.mods=e),l(n)&&(o.mixin+=o.mixin?" "+n:n);var i,r,u,m=(i=o,r=f.delimiters,u=i.block,i.el&&(u+=r.el+i.el),i.mods&&(u+=Object.keys(i.mods).reduce(function(e,t){var n=i.mods[t];return!0===n?e+=" "+u+r.mod+t:(l(n)||a(n))&&(e+=" "+u+r.mod+t+r.modVal+n),e},"")),u+(i.mixin?" "+i.mixin:""));return f.hyphenate?d(m):m}}var r={ns:"",el:"__",mod:"--",modVal:"-"},u={hyphenate:!1,methodName:"b"};return{install:function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{delimiters:{}},o=n({},u,t,{delimiters:n({},r,t.delimiters)});e.mixin({created:function(){var e=this.$options.block||this.$options.name,t=o.delimiters.ns+e,n=null;l(e)&&(n=i(o.hyphenate?d(t):t,o),this[o.methodName]=function(){return n.apply(void 0,arguments)})}})}}});
 //# sourceMappingURL=vue-bem-cn.umd.min.js.map
diff --git a/dist/vue-bem-cn.umd.min.js.map b/dist/vue-bem-cn.umd.min.js.map
index 4f15103..c094bfa 100644
--- a/dist/vue-bem-cn.umd.min.js.map
+++ b/dist/vue-bem-cn.umd.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/bem-cn/index.js","../src/bem-cn/bem-names.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entities(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (!elem && !mods && !mix) {\n      return block;\n    }\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import { isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (entities.mods) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n\n  return resultString + (entities.mixin ? ` ${entities.mixin}` : '');\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport { isString } from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(cfg.delimiters.ns + block, cfg);\n\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","isNumber","isFinite","bemCn","block","options","elem","mods","mix","resultObj","mixin","el","entities","delimiters","resultString","bemClasses","reduce","prev","name","mod","modVal","hyphenate","replace","toLowerCase","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","this","$options","generator","ns","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAChCC,EAAY,qBACpBD,GAAsB,qBAARA,gBAAAA,KAAoBA,EAAIE,cAAgBC,SAAUA,OAAOC,KAAKJ,GAAKK,SAKzEC,EAAW,kBAAsB,iBAARN,GAAoBO,SAASP,aCJ3CQ,EAAMC,EAAOC,UAC5B,SAAkBC,EAAMC,EAAMC,OAC7BC,EAAY,YAEZ,QACE,SACC,QAGJH,IAASC,IAASC,SACdJ,EAGLR,EAAUW,KACFA,KAAOA,EACRb,EAASa,OACRG,OAASH,GAGjBb,EAASY,KACDK,GAAKL,EACNV,EAAUU,OACTC,KAAOD,GAGfZ,EAASc,OACDE,OAASD,EAAUC,UAAYF,EAAQA,OCjBtBI,EAAUC,EACrCC,EDmBIC,GCpBuBH,EDoBDH,ECpBWI,EDoBAR,EAAQQ,WCnB7CC,EAAeF,EAASR,MAExBQ,EAASD,KAAIG,GAAgBD,EAAWF,GAAKC,EAASD,IAEtDC,EAASL,UACKT,OAAOC,KAAKa,EAASL,MAAMS,OAAO,SAACC,EAAMC,OACjDvB,EAAMiB,EAASL,KAAKW,UAEd,IAARvB,KACM,IAAMmB,EAAeD,EAAWM,IAAMD,GACrCxB,EAASC,IAAQM,EAASN,SAC3B,IAAMmB,EAAeD,EAAWM,IAAMD,EAAOL,EAAWO,OAASzB,GAIpEsB,GACN,KAGEH,GAAgBF,EAASF,UAAYE,EAASF,MAAU,YDEtDL,EAAQgB,UACDN,ED/BkBO,QAAQ,aAAc,OAAOC,cCgCzDR,OEpCKS,EAAqB,IAC5B,MACA,SACC,YACG,KAGGC,EAAiB,YACjB,aACC,WCLC,kBACLC,OAAKC,yDAAS,CAAEd,WAAY,IAC5Be,OACDH,EACAE,mBAEEH,EACAG,EAAOd,gBAIVH,MAAM,wBAEAN,EAAQyB,KAAKC,SAAS1B,OAASyB,KAAKC,SAASZ,KAC/Ca,EAAY,KAEXrC,EAASU,OAEFD,EAAMyB,EAAIf,WAAWmB,GAAK5B,EAAOwB,QAExCA,EAAIK,YAAc,kBAAaF"}
\ No newline at end of file
+{"version":3,"file":"vue-bem-cn.umd.min.js","sources":["../src/utils.js","../src/bem-cn/index.js","../src/bem-cn/bem-names.js","../src/globals.js","../src/vue-plugin.js"],"sourcesContent":["export const isString = val => val && typeof val === 'string';\nexport const isPObject = val =>\n  !!(val && typeof val === 'object' && val.constructor === Object && Object.keys(val).length);\n\nexport const hyphenate = str => str.replace(/\\B([A-Z])/g, '-$1').toLowerCase();\n\n// eslint-disable-next-line no-restricted-globals\nexport const isNumber = val => typeof val === 'number' && isFinite(val);\n","import { isString, isPObject, hyphenate } from '../utils';\nimport bemNames from './bem-names';\n\nexport default function bemCn(block, options) {\n  return function entities(elem, mods, mix) {\n    const resultObj = {\n      block,\n      el: '',\n      mods: {},\n      mixin: '',\n    };\n\n    if (!elem && !mods && !mix) {\n      return block;\n    }\n\n    if (isPObject(mods)) {\n      resultObj.mods = mods;\n    } else if (isString(mods)) {\n      resultObj.mixin += mods;\n    }\n\n    if (isString(elem)) {\n      resultObj.el = elem;\n    } else if (isPObject(elem)) {\n      resultObj.mods = elem;\n    }\n\n    if (isString(mix)) {\n      resultObj.mixin += resultObj.mixin ? ` ${mix}` : mix;\n    }\n\n    const bemClasses = bemNames(resultObj, options.delimiters);\n\n    return options.hyphenate\n      ? hyphenate(bemClasses)\n      : bemClasses;\n  };\n}\n","import { isString, isNumber } from '../utils';\n\n/**\n * Create String from BEM entitys\n * @param {Object} entities BEM entitys\n * @param {String} entities.block Block\n * @param {String} [entities.el] Element\n * @param {Object<string>} [entities.mods] Modifiers\n * @param {String} [entities.mixin] Mixin\n * @param {Object<string>} delimiters Delimiters for BEM entitys\n * @returns {String}\n */\nexport default function bemNames(entities, delimiters) {\n  let resultString = entities.block;\n\n  if (entities.el) resultString += delimiters.el + entities.el;\n\n  if (entities.mods) {\n    resultString += Object.keys(entities.mods).reduce((prev, name) => {\n      const val = entities.mods[name];\n      /* eslint-disable no-param-reassign */\n      if (val === true) {\n        prev += ' ' + resultString + delimiters.mod + name;\n      } else if (isString(val) || isNumber(val)) {\n        prev += ' ' + resultString + delimiters.mod + name + delimiters.modVal + val;\n      }\n      /* eslint-enable no-param-reassign */\n\n      return prev;\n    }, '');\n  }\n\n  return resultString + (entities.mixin ? ` ${entities.mixin}` : '');\n}\n","export const DEFAULT_DELIMITERS = {\n  ns: '',\n  el: '__',\n  mod: '--',\n  modVal: '-',\n};\n\nexport const DEFAULT_CONFIG = {\n  hyphenate: false,\n  methodName: 'b',\n};\n","import bemCn from './bem-cn/index';\nimport { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';\nimport {hyphenate, isString} from './utils';\n\nexport default {\n  install(Vue, config = { delimiters: {} }) {\n    const cfg = {\n      ...DEFAULT_CONFIG,\n      ...config,\n      delimiters: {\n        ...DEFAULT_DELIMITERS,\n        ...config.delimiters,\n      },\n    };\n\n    Vue.mixin({\n      created() {\n        const block = this.$options.block || this.$options.name;\n        const nsBlock = cfg.delimiters.ns + block;\n        let generator = null;\n\n        if (!isString(block)) return;\n\n        generator = bemCn(cfg.hyphenate ? hyphenate(nsBlock) : nsBlock, cfg);\n\n        this[cfg.methodName] = (...args) => generator(...args);\n      },\n    });\n  },\n};\n"],"names":["isString","val","isPObject","constructor","Object","keys","length","hyphenate","str","replace","toLowerCase","isNumber","isFinite","bemCn","block","options","elem","mods","mix","resultObj","mixin","el","entities","delimiters","resultString","bemClasses","reduce","prev","name","mod","modVal","DEFAULT_DELIMITERS","DEFAULT_CONFIG","Vue","config","cfg","this","$options","nsBlock","ns","generator","methodName"],"mappings":"wiBAAaA,EAAW,mBAAOC,GAAsB,iBAARA,GAChCC,EAAY,qBACpBD,GAAsB,qBAARA,gBAAAA,KAAoBA,EAAIE,cAAgBC,SAAUA,OAAOC,KAAKJ,GAAKK,SAEzEC,EAAY,mBAAOC,EAAIC,QAAQ,aAAc,OAAOC,eAGpDC,EAAW,kBAAsB,iBAARV,GAAoBW,SAASX,aCJ3CY,EAAMC,EAAOC,UAC5B,SAAkBC,EAAMC,EAAMC,OAC7BC,EAAY,YAEZ,QACE,SACC,QAGJH,IAASC,IAASC,SACdJ,EAGLZ,EAAUe,KACFA,KAAOA,EACRjB,EAASiB,OACRG,OAASH,GAGjBjB,EAASgB,KACDK,GAAKL,EACNd,EAAUc,OACTC,KAAOD,GAGfhB,EAASkB,OACDE,OAASD,EAAUC,UAAYF,EAAQA,OCjBtBI,EAAUC,EACrCC,EDmBIC,GCpBuBH,EDoBDH,ECpBWI,EDoBAR,EAAQQ,WCnB7CC,EAAeF,EAASR,MAExBQ,EAASD,KAAIG,GAAgBD,EAAWF,GAAKC,EAASD,IAEtDC,EAASL,UACKb,OAAOC,KAAKiB,EAASL,MAAMS,OAAO,SAACC,EAAMC,OACjD3B,EAAMqB,EAASL,KAAKW,UAEd,IAAR3B,KACM,IAAMuB,EAAeD,EAAWM,IAAMD,GACrC5B,EAASC,IAAQU,EAASV,SAC3B,IAAMuB,EAAeD,EAAWM,IAAMD,EAAOL,EAAWO,OAAS7B,GAIpE0B,GACN,KAGEH,GAAgBF,EAASF,UAAYE,EAASF,MAAU,YDEtDL,EAAQR,UACXA,EAAUkB,GACVA,OEpCKM,EAAqB,IAC5B,MACA,SACC,YACG,KAGGC,EAAiB,YACjB,aACC,WCLC,kBACLC,OAAKC,yDAAS,CAAEX,WAAY,IAC5BY,OACDH,EACAE,mBAEEH,EACAG,EAAOX,gBAIVH,MAAM,wBAEAN,EAAQsB,KAAKC,SAASvB,OAASsB,KAAKC,SAAST,KAC7CU,EAAUH,EAAIZ,WAAWgB,GAAKzB,EAChC0B,EAAY,KAEXxC,EAASc,OAEFD,EAAMsB,EAAI5B,UAAYA,EAAU+B,GAAWA,EAASH,QAE3DA,EAAIM,YAAc,kBAAaD"}
\ No newline at end of file
diff --git a/src/vue-plugin.js b/src/vue-plugin.js
index 4b6466c..474611f 100644
--- a/src/vue-plugin.js
+++ b/src/vue-plugin.js
@@ -1,6 +1,6 @@
 import bemCn from './bem-cn/index';
 import { DEFAULT_DELIMITERS, DEFAULT_CONFIG } from './globals';
-import { isString } from './utils';
+import { hyphenate, isString } from './utils';
 
 export default {
   install(Vue, config = { delimiters: {} }) {
@@ -16,11 +16,12 @@ export default {
     Vue.mixin({
       created() {
         const block = this.$options.block || this.$options.name;
+        const nsBlock = cfg.delimiters.ns + block;
         let generator = null;
 
         if (!isString(block)) return;
 
-        generator = bemCn(cfg.delimiters.ns + block, cfg);
+        generator = bemCn(cfg.hyphenate ? hyphenate(nsBlock) : nsBlock, cfg);
 
         this[cfg.methodName] = (...args) => generator(...args);
       },
diff --git a/tests/bem-cn.test.js b/tests/bem-cn.test.js
index 181561d..bdd093f 100644
--- a/tests/bem-cn.test.js
+++ b/tests/bem-cn.test.js
@@ -17,9 +17,9 @@ describe('Block', () => {
     });
   });
 
-  test('block block--mod, when elem = false', () => {
+  test('BlockName BlockName--mod, when elem = false', () => {
     const val = { el: false, mods: { mod: 'val' } };
-    expect(b(val.el, val.mods)).toBe('block block--mod-val');
+    expect(b(val.el, val.mods)).toBe('BlockName BlockName--mod-val');
   });
 });
 
@@ -38,17 +38,18 @@ describe('Delimiters', () => {
 
   Object.keys(delimitersTest).forEach((item) => {
     test(item, () => {
-      expect(b(delimitersTest[item].el, delimitersTest[item].mods, delimitersTest[item].mixin)).toBe(item);
+      expect(b(delimitersTest[item].el, delimitersTest[item].mods, delimitersTest[item].mixin))
+        .toBe(item);
     });
   });
 });
 
 describe('Hyphenate', () => {
-  const b = bemCn(block, { ...config, hyphenate: true });
+  const b = bemCn('block-name', { ...config, hyphenate: true });
 
   Object.keys(hyphenate).forEach((item) => {
     test(item, () => {
-      expect(b(hyphenate[item].mods)).toBe(item);
+      expect(b(hyphenate[item].mods || hyphenate[item].el)).toBe(item);
     });
   });
 });
diff --git a/tests/testingEntitys.js b/tests/testingEntitys.js
index 777043d..512c363 100644
--- a/tests/testingEntitys.js
+++ b/tests/testingEntitys.js
@@ -1,6 +1,6 @@
 /* eslint-disable quote-props */
-export const block = 'block';
-export const el = 'elem';
+export const block = 'BlockName';
+export const el = 'elementName';
 export const delimiters = {
   ns: 'ns**',
   el: '++',
@@ -9,30 +9,30 @@ export const delimiters = {
 };
 
 export const blocks = {
-  'block': { block },
-  'block block--mod': { block, mods: { mod: true } },
-  'block block--mod-val': { block, mods: { mod: 'val' } },
-  'block block--mod-123': { block, mods: { mod: 123 } },
-  'block block--mod-val block--modbool': {
+  [block]: { block },
+  [`${block} ${block}--mod`]: { block, mods: { mod: true } },
+  [`${block} ${block}--mod-val`]: { block, mods: { mod: 'val' } },
+  [`${block} ${block}--mod-123`]: { block, mods: { mod: 123 } },
+  [`${block} ${block}--mod-val ${block}--modbool`]: {
     block,
     mods: { mod: 'val', modbool: true, 'some-mod': false },
   },
-  'block mix': { block, mixin: 'mix' },
-  'block block--mod mix': { block, mods: { mod: true }, mixin: 'mix' },
+  [`${block} mix`]: { block, mixin: 'mix' },
+  [`${block} ${block}--mod mix`]: { block, mods: { mod: true }, mixin: 'mix' },
 };
 
 export const elements = {
-  'block__elem': { block, el },
-  'block__elem block__elem--mod': { block, el, mods: { mod: true } },
-  'block__elem block__elem--mod-val': { block, el, mods: { mod: 'val' } },
-  'block__elem block__elem--mod-123': { block, el, mods: { mod: 123 } },
-  'block__elem block__elem--mod-val block__elem--modbool': {
+  [`${block}__${el}`]: { block, el },
+  [`${block}__${el} ${block}__${el}--mod`]: { block, el, mods: { mod: true } },
+  [`${block}__${el} ${block}__${el}--mod-val`]: { block, el, mods: { mod: 'val' } },
+  [`${block}__${el} ${block}__${el}--mod-123`]: { block, el, mods: { mod: 123 } },
+  [`${block}__${el} ${block}__${el}--mod-val ${block}__${el}--modbool`]: {
     block,
     el,
     mods: { mod: 'val', modbool: true, 'some-mod': false },
   },
-  'block__elem mix': { block, el, mixin: 'mix' },
-  'block__elem block__elem--mod-val mix': {
+  [`${block}__${el} mix`]: { block, el, mixin: 'mix' },
+  [`${block}__${el} ${block}__${el}--mod-val mix`]: {
     block,
     el,
     mods: { mod: 'val' },
@@ -41,7 +41,7 @@ export const elements = {
 };
 
 export const delimitersTest = {
-  'ns**block++elem ns**block++elem==mod~val ns**block++elem==modbool': {
+  [`ns**${block}++${el} ns**${block}++${el}==mod~val ns**${block}++${el}==modbool`]: {
     block: delimiters.ns + block,
     el,
     mods: {
@@ -53,5 +53,7 @@ export const delimitersTest = {
 };
 
 export const hyphenate = {
-  'block block--has-mod': { block, mods: { hasMod: true } },
+  'block-name': { block },
+  'block-name block-name--has-mod': { block, mods: { hasMod: true } },
+  'block-name__element-name': { block, el },
 };
diff --git a/tests/vue-plugin.test.js b/tests/vue-plugin.test.js
index 178be7c..efec8ac 100644
--- a/tests/vue-plugin.test.js
+++ b/tests/vue-plugin.test.js
@@ -48,8 +48,8 @@ describe('Check vm.b() method', () => {
 });
 
 describe('Check custom settings', () => {
-  const block = 'block';
-  const elem = 'elem';
+  const block = 'BlockName';
+  const elem = 'elementName';
   const mods = {
     hasMod: true,
     mod: 'val',
@@ -74,7 +74,7 @@ describe('Check custom settings', () => {
 
   test('Expect corrent string for custom delimiters', () => {
     const localVue = createLocalVue();
-    const expectedString = 'ns-block+elem ns-block+elem==hasMod ns-block+elem==mod__val';
+    const expectedString = `ns-${block}+${elem} ns-${block}+${elem}==hasMod ns-${block}+${elem}==mod__val`;
     const config = {
       delimiters: {
         ns: 'ns-',
@@ -90,9 +90,35 @@ describe('Check custom settings', () => {
     expect(vm.b(elem, mods)).toBe(expectedString);
   });
 
-  test('Expect corrent string for hyphenate option', () => {
+  test('Expect correct block string for hyphenate option and early exit (no arguments)', () => {
     const localVue = createLocalVue();
-    const expectedString = 'block__elem block__elem--has-mod block__elem--mod-val';
+    const expectedString = 'block-name';
+    const config = {
+      hyphenate: true,
+    };
+
+    localVue.use(vueBemCn, config);
+    const { vm } = mount(comp, { localVue });
+
+    expect(vm.b()).toBe(expectedString);
+  });
+
+  test('Expect correct block string for hyphenate option with mods', () => {
+    const localVue = createLocalVue();
+    const expectedString = 'block-name block-name--has-mod block-name--mod-val';
+    const config = {
+      hyphenate: true,
+    };
+
+    localVue.use(vueBemCn, config);
+    const { vm } = mount(comp, { localVue });
+
+    expect(vm.b(mods)).toBe(expectedString);
+  });
+
+  test('Expect correct element string for hyphenate option', () => {
+    const localVue = createLocalVue();
+    const expectedString = 'block-name__element-name block-name__element-name--has-mod block-name__element-name--mod-val';
     const config = {
       hyphenate: true,
     };