diff --git a/eslint-utils/build-groups.js b/eslint-utils/build-groups.js index 76ee348c..3394998a 100644 --- a/eslint-utils/build-groups.js +++ b/eslint-utils/build-groups.js @@ -10,14 +10,11 @@ const cartesianProduct = (arrays) => [[]], ) -const modifierCombos = ({ orderedModifiers }) => - cartesianProduct(orderedModifiers).map((combo) => combo.filter(Boolean)) +const modifierCombos = ({ modifiers }) => + cartesianProduct(modifiers).map((combo) => combo.filter(Boolean)) -const compatibleModifierCombos = ({ - modifierIncompatibilities, - orderedModifiers, -}) => - modifierCombos({ orderedModifiers }).filter((combo) => +const compatibleModifierCombos = ({ modifierIncompatibilities, modifiers }) => + modifierCombos({ modifiers }).filter((combo) => combo.every((modifier) => (modifierIncompatibilities[modifier] ?? []).every( (incompatibleModifier) => !combo.includes(incompatibleModifier), @@ -27,11 +24,11 @@ const compatibleModifierCombos = ({ const buildGroupsForSelector = ({ modifierIncompatibilities, - orderedModifiers, + modifiers, selector, selectorIncompatibilities, }) => - compatibleModifierCombos({ modifierIncompatibilities, orderedModifiers }) + compatibleModifierCombos({ modifierIncompatibilities, modifiers }) .filter((combo) => combo.every( (modifier) => @@ -42,7 +39,7 @@ const buildGroupsForSelector = ({ export const buildGroups = ({ modifierIncompatibilities, - orderedModifiers, + modifiers, selectorIncompatibilities, selectors, }) => @@ -51,7 +48,7 @@ export const buildGroups = ({ const groupPairs = selector.map((pairedSelector) => buildGroupsForSelector({ modifierIncompatibilities, - orderedModifiers, + modifiers, selector: pairedSelector, selectorIncompatibilities, }), @@ -63,7 +60,7 @@ export const buildGroups = ({ } return buildGroupsForSelector({ modifierIncompatibilities, - orderedModifiers, + modifiers, selector, selectorIncompatibilities, }) diff --git a/eslint-utils/class-groups.js b/eslint-utils/class-groups.js index df546383..1d1f96fd 100644 --- a/eslint-utils/class-groups.js +++ b/eslint-utils/class-groups.js @@ -1,6 +1,6 @@ import { buildGroups } from './build-groups.js' -const orderedModifiers = [ +const modifiers = [ ['declare', 'override', ''], ['static', '', 'abstract'], ['decorated', ''], @@ -26,7 +26,7 @@ const selectors = [ 'method', ] -const allModifiers = orderedModifiers.flat().filter(Boolean) +const allModifiers = modifiers.flat().filter(Boolean) const baseMethodIncompatibilities = ['declare', 'readonly'] const accessorIncompatibilities = [...baseMethodIncompatibilities, 'optional'] const selectorIncompatibilities = { @@ -67,7 +67,7 @@ export const classGroups = { ], groups: buildGroups({ modifierIncompatibilities, - orderedModifiers, + modifiers, selectorIncompatibilities, selectors, }),