fixup! fixup! fixup! Use bem decl for merge, subtract and intersect

enb · Sep 23, 2016 · e8f96c0 · e8f96c0
1 parent c69003b
commit e8f96c0
Showing 1 changed file with 30 additions and 31 deletions.
diff --git a/lib/deps/deps.js b/lib/deps/deps.js
@@ -239,48 +239,47 @@ module.exports = {
     /**
      * Coverts declaration mod and val to modName and modVal
      *
-     * @param  {Array} deps
+     * @param  {Array|Object} deps
      * @return {Array}
      */
     _convertFromMod: function (deps) {
-        Array.isArray(deps) || (deps = [deps]);
-
-        return deps.map(function (item) {
-            if (item.mod) {
-                var tmp = {};
-
-                tmp.block = item.block;
-                item.elem && (tmp.elem = item.elem);
-                tmp.modName = item.mod;
-                item.val && (tmp.modVal = item.val);
-
-                return tmp;
-            }
-            return item;
-        });
+        return _switchModsFormat('mod', {
+            mod: 'modName',
+            val: 'modVal'
+        }, deps);
     },
 
     /**
      * Coverts declaration modName and modVal to mod and val
      *
-     * @param  {Array} deps
+     * @param  {Array|Object} deps
      * @return {Array}
      */
     _convertToMod: function (deps) {
-        Array.isArray(deps) || (deps = [deps]);
+        return _switchModsFormat('modName', {
+            modName: 'mod',
+            modVal: 'val'
+        }, deps);
+    }
+};
 
-        return deps.map(function (item) {
-            if (item.modName) {
-                var tmp = {};
+/**
+ * Switch declaration mod format
+ *
+ * @param  {String} conditionKey mod or modName
+ * @param  {Object} modsMap      map of replacements (for example mod: 'modName')
+ * @param  {Array|Object} deps
+ * @return {Array}
+ */
+function _switchModsFormat (conditionKey, modsMap, deps) {
+    Array.isArray(deps) || (deps = [deps]);
 
-                tmp.block = item.block;
-                item.elem && (tmp.elem = item.elem);
-                tmp.mod = item.modName;
-                item.modVal && (tmp.val = item.modVal);
+    return deps.map(function (item) {
+        if (!item[conditionKey]) return item;
 
-                return tmp;
-            }
-            return item;
-        });
-    }
-};
+        return Object.keys(item).reduce(function (acc, key) {
+            acc[modsMap[key] || key] = item[key];
+            return acc;
+        }, {});
+    });
+}