Merge pull request #99 from bem-sdk/issue-37_fix

fix(belongsTo): should not detect belonging between modifiers

Author: blond

README.md

@@ -241,9 +241,7 @@ const BemEntityName = require('@bem/entity-name');
 
 const buttonName = new BemEntityName({ block: 'button' });
 const buttonTextName = new BemEntityName({ block: 'button', elem: 'text' });
-const buttonTextBoldName = new BemEntityName(
-   { block: 'button', elem: 'text', mod: { name: 'bold', val: true } }
-);
+const buttonTextBoldName = new BemEntityName({ block: 'button', elem: 'text', mod: 'bold' });
 
 buttonTextName.belongsTo(buttonName);         // true
 buttonName.belongsTo(buttonTextName);         // false

index.d.ts

@@ -12,6 +12,7 @@ declare class BemEntityName {
     readonly type: BemSDK.EntityName.TYPE;
 
     isSimpleMod(): boolean | null;
+    belongsTo(entityName: BemEntityName): boolean;
     toString(): string;
     valueOf(): BemSDK.EntityName.StrictRepresentation;
     inspect(depth: number, options: object): string;

index.js

@@ -318,9 +318,7 @@ class BemEntityName {
      *
      * const buttonName = new BemEntityName({ block: 'button' });
      * const buttonTextName = new BemEntityName({ block: 'button', elem: 'text' });
-     * const buttonTextBoldName = new BemEntityName(
-     *    { block: 'button', elem: 'text', mod: { name: 'bold', val: true } }
-     * );
+     * const buttonTextBoldName = new BemEntityName({ block: 'button', elem: 'text', mod: 'bold' });
      *
      * buttonTextName.belongsTo(buttonName); // true
      * buttonName.belongsTo(buttonTextName); // false
@@ -332,11 +330,10 @@ class BemEntityName {
      * @returns {boolean}
      */
     belongsTo(entityName) {
-        return entityName && entityName.id !== this.id && this.id.startsWith(entityName.id) &&
-            (entityName.type !== 'block' || this.type !== 'elemMod') &&
-            (!entityName.elem || this.elem === entityName.elem) &&
-            (!entityName.modName || this.modName === entityName.modName) &&
-            (!entityName.modVal || entityName.modVal === true || this.modVal === entityName.modVal);
+        if (entityName.block !== this.block) { return false; }
+
+        return entityName.type === TYPES.BLOCK && (this.type === TYPES.BLOCK_MOD || this.type === TYPES.ELEM)
+            || entityName.elem === this.elem && (entityName.type === TYPES.ELEM && this.type === TYPES.ELEM_MOD);
     }
 
     /**

test/belongs-to.test.js

@@ -82,27 +82,27 @@ test('should not detect belonging between block and its elem mod', t => {
     t.false(blockName.belongsTo(elemModName));
 });
 
-test('should not detect belonging between block and its elem with the same mod', t => {
+test('should not detect belonging between block mod and its elem with the same mod', t => {
     const blockModName = new BemEntityName({ block: 'block', mod: 'mod' });
     const elemModName = new BemEntityName({ block: 'block', elem: 'elem', mod: 'mod' });
 
     t.false(elemModName.belongsTo(blockModName));
     t.false(blockModName.belongsTo(elemModName));
 });
 
-test('should resolve belonging between boolean and key-value mod of block', t => {
+test('should not detect belonging between boolean and key-value mod of block', t => {
     const boolModName = new BemEntityName({ block: 'block', mod: { name: 'mod', val: true } });
     const modName = new BemEntityName({ block: 'block', mod: { name: 'mod', val: 'key' } });
 
-    t.true(modName.belongsTo(boolModName));
+    t.false(modName.belongsTo(boolModName));
     t.false(boolModName.belongsTo(modName));
 });
 
-test('should resolve belonging between boolean and key-value mod of element', t => {
+test('should not detect belonging between boolean and key-value mod of element', t => {
     const boolModName = new BemEntityName({ block: 'block', elem: 'elem', mod: { name: 'mod', val: true } });
     const modName = new BemEntityName({ block: 'block', elem: 'elem', mod: { name: 'mod', val: 'key' } });
 
-    t.true(modName.belongsTo(boolModName));
+    t.false(modName.belongsTo(boolModName));
     t.false(boolModName.belongsTo(modName));
 });