refactor: don't spread arrays

MichaelDeBoey · MichaelDeBoey · commit 45f202cd24a7 · 2024-10-25T15:25:01.000+02:00
diff --git a/__mocks__/genInteractives.js b/__mocks__/genInteractives.js
@@ -12,9 +12,6 @@ import type { JSXElementMockType } from './JSXElementMock';
 
 const { fromEntries } = Object;
 
-const domElements = [...dom.keys()];
-const roleNames = [...roles.keys()];
-
 const interactiveElementsMap = {
   a: [{ prop: 'href', value: '#' }],
   area: [{ prop: 'href', value: '#' }],
@@ -122,36 +119,36 @@ const nonInteractiveElementsMap: {[string]: Array<{[string]: string}>} = {
   ul: [],
 };
 
-const indeterminantInteractiveElementsMap: { [key: string]: Array<any> } = fromEntries(domElements.map((name) => [name, []]));
+const indeterminantInteractiveElementsMap: { [key: string]: Array<any> } = 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',
   )
   .filter((role) => (
     !roles.get(role).abstract
-    && roles.get(role).superClass.some((klasses) => klasses.includes('widget'))
+    && roles.get(role).superClass.some((klasses) => includes(klasses, 'widget'))
   ));
 
-const nonInteractiveRoles = roleNames
+const nonInteractiveRoles = roles.keys()
   .filter((role) => (
     !roles.get(role).abstract
-    && !roles.get(role).superClass.some((klasses) => klasses.includes('widget'))
+    && !roles.get(role).superClass.some((klasses) => includes(klasses, 'widget'))
 
     // 'toolbar' does not descend from widget, but it does support
     // aria-activedescendant, thus in practice we treat it as a widget.
-    && role !== 'toolbar'
+    && !includes(['toolbar'], role)
   ));
 
 export function genElementSymbol(openingElement: Object): string {
diff --git a/__tests__/src/rules/aria-props-test.js b/__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());
   const message = `${name}: This attribute is an invalid ARIA attribute.`;
 
   if (suggestions.length > 0) {
@@ -39,7 +38,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" />`,
 }));
 
diff --git a/__tests__/src/rules/aria-role-test.js b/__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()}" />`,
diff --git a/__tests__/src/rules/aria-unsupported-elements-test.js b/__tests__/src/rules/aria-unsupported-elements-test.js
@@ -26,9 +26,8 @@ Try removing the prop '${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} />`,
diff --git a/src/rules/aria-props.js b/src/rules/aria-props.js
@@ -12,10 +12,8 @@ import { propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 import getSuggestion from '../util/getSuggestion';
 
-const ariaAttributes = [...aria.keys()];
-
 const errorMessage = (name) => {
-  const suggestions = getSuggestion(name, ariaAttributes);
+  const suggestions = getSuggestion(name, aria.keys());
   const message = `${name}: This attribute is an invalid ARIA attribute.`;
 
   if (suggestions.length > 0) {
diff --git a/src/rules/aria-unsupported-elements.js b/src/rules/aria-unsupported-elements.js
@@ -47,7 +47,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') {
diff --git a/src/rules/role-has-required-aria-props.js b/src/rules/role-has-required-aria-props.js
@@ -60,7 +60,7 @@ export default {
 
         const normalizedValues = String(roleAttrValue).toLowerCase().split(' ');
         const validRoles = normalizedValues
-          .filter((val) => [...roles.keys()].indexOf(val) > -1);
+          .filter((val) => roles.keys().indexOf(val) > -1);
 
         // Check semantic DOM elements
         // For example, <input type="checkbox" role="switch" />
diff --git a/src/util/isInteractiveElement.js b/src/util/isInteractiveElement.js
@@ -15,10 +15,9 @@ import flatMap from 'array.prototype.flatmap';
 
 import attributesComparator from './attributesComparator';
 
-const roleKeys = [...roles.keys()];
 const elementRoleEntries = [...elementRoles];
 
-const nonInteractiveRoles = new Set(roleKeys
+const nonInteractiveRoles = new Set(roles.keys()
   .filter((name) => {
     const role = roles.get(name);
     return (
@@ -34,7 +33,7 @@ const nonInteractiveRoles = new Set(roleKeys
     'progressbar',
   ));
 
-const interactiveRoles = new Set(roleKeys
+const interactiveRoles = new Set(roles.keys()
   .filter((name) => {
     const role = roles.get(name);
     return (
diff --git a/src/util/isInteractiveRole.js b/src/util/isInteractiveRole.js
@@ -4,8 +4,7 @@ import type { Node } from 'ast-types-flow';
 import { getProp, getLiteralPropValue } from 'jsx-ast-utils';
 import flatMap from 'array.prototype.flatmap';
 
-const roles = [...rolesMap.keys()];
-const interactiveRoles = roles.filter((name) => (
+const interactiveRoles = rolesMap.keys().filter((name) => (
   !rolesMap.get(name).abstract
   && rolesMap.get(name).superClass.some((klasses) => klasses.includes('widget'))
 ));
@@ -41,7 +40,7 @@ const isInteractiveRole = (
   const normalizedValues = String(value).toLowerCase().split(' ');
   const validRoles = flatMap(
     normalizedValues,
-    (name: string) => (roles.includes(name) ? [name] : []),
+    (name: string) => (rolesMap.keys().includes(name) ? [name] : []),
   );
   if (validRoles.length > 0) {
     // The first role value is a series takes precedence.
diff --git a/src/util/isNonInteractiveElement.js b/src/util/isNonInteractiveElement.js
@@ -16,10 +16,9 @@ import flatMap from 'array.prototype.flatmap';
 
 import attributesComparator from './attributesComparator';
 
-const roleKeys = [...roles.keys()];
 const elementRoleEntries = [...elementRoles];
 
-const nonInteractiveRoles = new Set(roleKeys
+const nonInteractiveRoles = new Set(roles.keys()
   .filter((name) => {
     const role = roles.get(name);
     return (
@@ -38,7 +37,7 @@ const nonInteractiveRoles = new Set(roleKeys
     'progressbar',
   ));
 
-const interactiveRoles = new Set(roleKeys
+const interactiveRoles = new Set(roles.keys()
   .filter((name) => {
     const role = roles.get(name);
     return (
diff --git a/src/util/isNonInteractiveRole.js b/src/util/isNonInteractiveRole.js
@@ -10,7 +10,7 @@ import type { Node } from 'ast-types-flow';
 import { getProp, getLiteralPropValue } from 'jsx-ast-utils';
 import flatMap from 'array.prototype.flatmap';
 
-const nonInteractiveRoles = [...rolesMap.keys()].filter((name) => (
+const nonInteractiveRoles = rolesMap.keys().filter((name) => (
   !rolesMap.get(name).abstract
   && !rolesMap.get(name).superClass.some((klasses) => klasses.includes('widget'))
 ));

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export default {`
`47`	`47`	`return;`
`48`	`48`	`}`
`49`	`49`
`50`		`- const invalidAttributes = new Set([...aria.keys(), 'role']);`
	`50`	`+ const invalidAttributes = new Set(aria.keys().concat('role'));`
`51`	`51`
`52`	`52`	`node.attributes.forEach((prop) => {`
`53`	`53`	`if (prop.type === 'JSXSpreadAttribute') {`