Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
ehmicky committed Oct 3, 2021
1 parent 0f5cbd8 commit ab60e16
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions src/combination/ids.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import { getCombDimensions } from './dimensions.js'

// Check if two combinations have same identifiers for all dimensions
export const hasSameCombinationIds = function (combinationA, combinationB) {
const combinationIdsA = getCombinationIds(combinationA)
const combinationIdsB = getCombinationIds(combinationB)
return combinationIdsA.every(
({ id }, index) => combinationIdsB[index].id === id,
const dimensionsIdsA = getDimensionsIds(combinationA)
const dimensionsIdsB = getDimensionsIds(combinationB)
return dimensionsIdsA.every(
({ id }, index) => dimensionsIdsB[index].id === id,
)
}

// Retrieve all unique combinations identifiers.
// For all combinations of a given result.
export const getCombinationsIds = function (combinations) {
return combinations.flatMap(getCombinationIds).filter(isNotDuplicateId)
return combinations.flatMap(getDimensionsIds).filter(isNotDuplicateId)
}

// Remove duplicate ids with the same dimension, since this happens due to the
Expand All @@ -30,7 +30,7 @@ const isNotDuplicateId = function ({ dimension, id }, index, combinationIds) {

// Retrieve each dimension's id of a given combination
// Follows `DIMENSIONS` array order.
export const getCombinationIds = function (combination) {
export const getDimensionsIds = function (combination) {
const dimensions = getCombDimensions(combination)
return dimensions.map((dimension) => getCombinationId(combination, dimension))
}
Expand Down
6 changes: 3 additions & 3 deletions src/combination/name.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { titleColor, noteColor } from '../report/utils/colors.js'

import { omitCombNoDimensions } from './filter.js'
import { getCombinationIds } from './ids.js'
import { getDimensionsIds } from './ids.js'

// Retrieve error message prefix showing a combination's dimension ids
export const getCombinationPrefix = function (combination, noDimensions) {
Expand All @@ -21,14 +21,14 @@ export const getCombinationPrefix = function (combination, noDimensions) {
// and steps dimensions
export const getCombinationNameColor = function (combination, noDimensions) {
const combinationA = omitCombNoDimensions(combination, noDimensions)
return getCombinationIds(combinationA)
return getDimensionsIds(combinationA)
.map(getNameColorPart)
.join(NAME_SEPARATOR_COLOR)
}

export const getCombinationName = function (combination, noDimensions) {
const combinationA = omitCombNoDimensions(combination, noDimensions)
return getCombinationIds(combinationA).map(getNamePart).join(NAME_SEPARATOR)
return getDimensionsIds(combinationA).map(getNamePart).join(NAME_SEPARATOR)
}

const getNameColorPart = function ({ dimension: { messageName }, id }) {
Expand Down
4 changes: 2 additions & 2 deletions src/select/match.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getCombinationIds } from '../combination/ids.js'
import { getDimensionsIds } from '../combination/ids.js'
import { findIndexReverse } from '../utils/find.js'

// Select combinations according to the `select|limit` configuration properties.
Expand Down Expand Up @@ -31,7 +31,7 @@ export const matchSelectors = function (combination, selectors) {
return true
}

const combinationIds = getCombinationIds(combination).map(getCombinationId)
const combinationIds = getDimensionsIds(combination).map(getCombinationId)
const index = findIndexReverse(selectors, (selector) =>
matchIds(combinationIds, selector),
)
Expand Down

0 comments on commit ab60e16

Please sign in to comment.