Refactoring

ehmicky · Sep 12, 2021 · 9f552ea · 9f552ea
1 parent d9942b2
commit 9f552ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/combination/ids.js b/src/combination/ids.js
@@ -17,7 +17,7 @@ export const getCombinationsIds = function (combinations) {
 
 // Same but for a single combination
 export const getCombinationIds = function (combination) {
-  return getIdInfos(combination).map(getId)
+  return getIdInfos(combination)
 }
 
 export const getCombinationName = function (combination) {
@@ -40,10 +40,6 @@ const getIdInfos = function (combination) {
   }))
 }
 
-const getId = function ({ id }) {
-  return id
-}
-
 // Remove duplicate ids with the same dimension, since this happens due to the
 // cartesian product.
 // Duplicate ids with a different dimension are validated later.

diff --git a/src/select/match.js b/src/select/match.js
@@ -31,9 +31,7 @@ export const matchSelectors = function (combination, selectors) {
     return true
   }
 
-  const combinationIds = getCombinationIds(combination).map(
-    removeCombinationIdCase,
-  )
+  const combinationIds = getCombinationIds(combination).map(getCombinationId)
   const index = findIndexReverse(selectors, (selector) =>
     matchIds(combinationIds, selector),
   )
@@ -46,8 +44,8 @@ export const matchSelectors = function (combination, selectors) {
 }
 
 // Matching is case-insensitive
-const removeCombinationIdCase = function (combinationId) {
-  return combinationId.toLowerCase()
+const getCombinationId = function ({ id }) {
+  return id.toLowerCase()
 }
 
 // An empty array selects any combinations: