Merge pull request #61 from bem-sdk/issue-59

fix(valid): should throw if modifier is not valid

Author: blond

index.js

@@ -32,19 +32,20 @@ module.exports = class BemEntityName {
         }
 
         const data = this._data = { block: obj.block };
-        const modName = (typeof obj.mod === 'string' ? obj.mod : obj.mod && obj.mod.name) || obj.modName;
 
         obj.elem && (data.elem = obj.elem);
 
-        if (modName) {
-            const modVal = obj.hasOwnProperty('modVal') || obj.mod && obj.mod.hasOwnProperty('val')
-                ? obj.mod && obj.mod.val || obj.modVal
-                : true;
+        const modObj = obj.mod;
+        const modName = (typeof modObj === 'string' ? modObj : modObj && modObj.name) || obj.modName;
+        const hasModVal = modObj && modObj.hasOwnProperty('val') || obj.hasOwnProperty('modVal');
 
+        if (modName) {
             data.mod = {
                 name: modName,
-                val: modVal
+                val: hasModVal ? modObj && modObj.val || obj.modVal : true
             };
+        } else if (modObj || hasModVal) {
+            throw new Error('This is not valid BEM entity: the field `mod.name` is undefined.');
         }
     }
 

test/throws.test.js

@@ -0,0 +1,31 @@
+const test = require('ava');
+
+const BemEntityName = require('../index');
+
+test('should throw error for if entity object is not valid', t => {
+    t.throws(
+        () => new BemEntityName({ elem: 'elem' }),
+        'This is not valid BEM entity: the field `block` is undefined.'
+    );
+});
+
+test('should throw error for if mod object is empty', t => {
+    t.throws(
+        () => new BemEntityName({ block: 'block', mod: {} }),
+        'This is not valid BEM entity: the field `mod.name` is undefined.'
+    );
+});
+
+test('should throw error for if mod name is undefined', t => {
+    t.throws(
+        () => new BemEntityName({ block: 'block', mod: { val: 'val' } }),
+        'This is not valid BEM entity: the field `mod.name` is undefined.'
+    );
+});
+
+test('should throw error for if modName is undefined', t => {
+    t.throws(
+        () => new BemEntityName({ block: 'block', modVal: 'val' }),
+        'This is not valid BEM entity: the field `mod.name` is undefined.'
+    );
+});