refactor: don't spread arrays

Author: MichaelDeBoey

__mocks__/genInteractives.js

@@ -10,9 +10,6 @@ import JSXElementMock from './JSXElementMock';
 import type { JSXAttributeMockType } from './JSXAttributeMock';
 import type { JSXElementMockType } from './JSXElementMock';
 
-const domElements = dom.keys();
-const roleNames = roles.keys();
-
 const interactiveElementsMap = {
  a: [{ prop: 'href', value: '#' }],
  area: [{ prop: 'href', value: '#' }],
@@ -120,19 +117,19 @@ const nonInteractiveElementsMap: {[string]: Array<{[string]: string}>} = {
  ul: [],
 };
 
-const indeterminantInteractiveElementsMap: { [key: string]: Array<any> } = Object.fromEntries(domElements.map((name) => [name, []]));
+const indeterminantInteractiveElementsMap: { [key: string]: Array<any> } = Object.fromEntries(dom.keys().map((name) => [name, []]));
 
 Object.keys(interactiveElementsMap)
  .concat(Object.keys(nonInteractiveElementsMap))
  .forEach((name) => delete indeterminantInteractiveElementsMap[name]);
 
-const abstractRoles = roleNames.filter((role) => roles.get(role).abstract);
+const abstractRoles = roles.keys().filter((role) => roles.get(role).abstract);
 
-const nonAbstractRoles = roleNames.filter((role) => !roles.get(role).abstract);
+const nonAbstractRoles = roles.keys().filter((role) => !roles.get(role).abstract);
 
 const interactiveRoles = []
  .concat(
- roleNames,
+ roles.keys(),
  // 'toolbar' does not descend from widget, but it does support
  // aria-activedescendant, thus in practice we treat it as a widget.
  'toolbar',
@@ -142,7 +139,7 @@ const interactiveRoles = []
  && roles.get(role).superClass.some((klasses) => klasses.includes('widget'))
  ));
 
-const nonInteractiveRoles = roleNames
+const nonInteractiveRoles = roles.keys()
  .filter((role) => (
  !roles.get(role).abstract
  && !roles.get(role).superClass.some((klasses) => klasses.includes('widget'))

__tests__/src/rules/aria-props-test.js

@@ -19,10 +19,9 @@ import getSuggestion from '../../../src/util/getSuggestion';
 // -----------------------------------------------------------------------------
 
 const ruleTester = new RuleTester();
-const ariaAttributes = aria.keys();
 
 const errorMessage = (name) => {
- const suggestions = getSuggestion(name, ariaAttributes);
+ const suggestions = getSuggestion(name, aria.keys());
 
  if (suggestions.length > 0) {
  return {
@@ -43,7 +42,7 @@ const errorMessage = (name) => {
 };
 
 // Create basic test cases using all valid role types.
-const basicValidityTests = ariaAttributes.map((prop) => ({
+const basicValidityTests = aria.keys().map((prop) => ({
  code: `<div ${prop.toLowerCase()}="foobar" />`,
 }));
 

__tests__/src/rules/aria-role-test.js

@@ -24,10 +24,8 @@ const errorMessage = {
  type: 'JSXAttribute',
 };
 
-const roleKeys = roles.keys();
-
-const validRoles = roleKeys.filter((role) => roles.get(role).abstract === false);
-const invalidRoles = roleKeys.filter((role) => roles.get(role).abstract === true);
+const validRoles = roles.keys().filter((role) => roles.get(role).abstract === false);
+const invalidRoles = roles.keys().filter((role) => roles.get(role).abstract === true);
 
 const createTests = (roleNames) => roleNames.map((role) => ({
  code: `<div role="${role.toLowerCase()}" />`,

__tests__/src/rules/aria-unsupported-elements-test.js

@@ -26,9 +26,8 @@ const errorMessage = (invalidProp) => ({
  type: 'JSXOpeningElement',
 });
 
-const domElements = dom.keys();
 // Generate valid test cases
-const roleValidityTests = domElements.map((element) => {
+const roleValidityTests = dom.keys().map((element) => {
  const isReserved = dom.get(element).reserved || false;
  const role = isReserved ? '' : 'role';
 
@@ -37,7 +36,7 @@ const roleValidityTests = domElements.map((element) => {
  };
 });
 
-const ariaValidityTests = domElements.map((element) => {
+const ariaValidityTests = dom.keys().map((element) => {
  const isReserved = dom.get(element).reserved || false;
  const aria = isReserved ? '' : 'aria-hidden';
 
@@ -50,7 +49,7 @@ const ariaValidityTests = domElements.map((element) => {
 });
 
 // Generate invalid test cases.
-const invalidRoleValidityTests = domElements
+const invalidRoleValidityTests = dom.keys()
  .filter((element) => dom.get(element).reserved)
  .map((reservedElem) => ({
  code: `<${reservedElem} role {...props} />`,
@@ -61,7 +60,7 @@ const invalidRoleValidityTests = domElements
  settings: { 'jsx-a11y': { components: { Meta: 'meta' } } },
  });
 
-const invalidAriaValidityTests = domElements
+const invalidAriaValidityTests = dom.keys()
  .filter((element) => dom.get(element).reserved)
  .map((reservedElem) => ({
  code: `<${reservedElem} aria-hidden aria-role="none" {...props} />`,

src/rules/aria-props.js

@@ -12,8 +12,6 @@ import { propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 import getSuggestion from '../util/getSuggestion';
 
-const ariaAttributes = aria.keys();
-
 const schema = generateObjSchema();
 
 export default {
@@ -41,7 +39,7 @@ export default {
  const isValid = aria.has(name);
 
  if (isValid === false) {
- const suggestions = getSuggestion(name, ariaAttributes);
+ const suggestions = getSuggestion(name, aria.keys());
 
  context.report({
  data: {

src/rules/aria-unsupported-elements.js

@@ -45,7 +45,7 @@ export default {
  return;
  }
 
- const invalidAttributes = new Set([...aria.keys(), 'role']);
+ const invalidAttributes = new Set(aria.keys().concat('role'));
 
  node.attributes.forEach((prop) => {
  if (prop.type === 'JSXSpreadAttribute') {

src/rules/role-has-required-aria-props.js

@@ -20,8 +20,6 @@ import isSemanticRoleElement from '../util/isSemanticRoleElement';
 
 const schema = generateObjSchema();
 
-const roleKeys = roles.keys();
-
 export default {
  meta: {
  docs: {
@@ -61,7 +59,7 @@ export default {
 
  const normalizedValues = String(roleAttrValue).toLowerCase().split(' ');
  const validRoles = normalizedValues
- .filter((val) => roleKeys.indexOf(val) > -1);
+ .filter((val) => roles.keys().indexOf(val) > -1);
 
  // Check semantic DOM elements
  // For example, <input type="checkbox" role="switch" />