[Refactor] use es-iterator-helpers

 - also, maximally avoid iterator spreads

Author: ljharb

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

@@ -69,7 +69,7 @@ const invalidAriaValidityTests = domElements
  }));
 
 ruleTester.run('aria-unsupported-elements', rule, {
- valid: parsers.all([].concat(roleValidityTests.concat(ariaValidityTests))).map(parserOptionsMapper),
- invalid: parsers.all([].concat(invalidRoleValidityTests.concat(invalidAriaValidityTests)))
+ valid: parsers.all([].concat(roleValidityTests, ariaValidityTests)).map(parserOptionsMapper),
+ invalid: parsers.all([].concat(invalidRoleValidityTests, invalidAriaValidityTests))
  .map(parserOptionsMapper),
 });

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

@@ -10,6 +10,10 @@
 
 import { roles } from 'aria-query';
 import { RuleTester } from 'eslint';
+import iterFrom from 'es-iterator-helpers/Iterator.from';
+import map from 'es-iterator-helpers/Iterator.prototype.map';
+import toArray from 'es-iterator-helpers/Iterator.prototype.toArray';
+
 import parserOptionsMapper from '../../__util__/parserOptionsMapper';
 import parsers from '../../__util__/helpers/parsers';
 import rule from '../../../src/rules/role-has-required-aria-props';
@@ -38,7 +42,7 @@ const componentsSettings = {
 };
 
 // Create basic test cases using all valid role types.
-const basicValidityTests = [...roles.keys()].map((role) => {
+const basicValidityTests = toArray(map(iterFrom(roles.keys()), (role) => {
  const {
  requiredProps: requiredPropKeyValues,
  } = roles.get(role);
@@ -48,7 +52,7 @@ const basicValidityTests = [...roles.keys()].map((role) => {
  return {
  code: `<div role="${role.toLowerCase()}" ${propChain} />`,
  };
-});
+}));
 
 ruleTester.run('role-has-required-aria-props', rule, {
  valid: parsers.all([].concat(

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

@@ -14,6 +14,11 @@ import {
 import { RuleTester } from 'eslint';
 import { version as eslintVersion } from 'eslint/package.json';
 import semver from 'semver';
+import iterFrom from 'es-iterator-helpers/Iterator.from';
+import filter from 'es-iterator-helpers/Iterator.prototype.filter';
+import map from 'es-iterator-helpers/Iterator.prototype.map';
+import toArray from 'es-iterator-helpers/Iterator.prototype.toArray';
+
 import parserOptionsMapper from '../../__util__/parserOptionsMapper';
 import parsers from '../../__util__/helpers/parsers';
 import rule from '../../../src/rules/role-supports-aria-props';
@@ -26,8 +31,7 @@ const ruleTester = new RuleTester();
 
 const generateErrorMessage = (attr, role, tag, isImplicit) => {
  if (isImplicit) {
- return `The attribute ${attr} is not supported by the role ${role}. \
-This role is implicit on the element ${tag}.`;
+ return `The attribute ${attr} is not supported by the role ${role}. This role is implicit on the element ${tag}.`;
  }
 
  return `The attribute ${attr} is not supported by the role ${role}.`;
@@ -46,30 +50,28 @@ const componentsSettings = {
  },
 };
 
-const nonAbstractRoles = [...roles.keys()].filter((role) => roles.get(role).abstract === false);
+const nonAbstractRoles = toArray(filter(iterFrom(roles.keys()), (role) => roles.get(role).abstract === false));
 
 const createTests = (rolesNames) => rolesNames.reduce((tests, role) => {
  const {
  props: propKeyValues,
  } = roles.get(role);
  const validPropsForRole = Object.keys(propKeyValues);
- const invalidPropsForRole = [...aria.keys()]
- .map((attribute) => attribute.toLowerCase())
- .filter((attribute) => validPropsForRole.indexOf(attribute) === -1);
+ const invalidPropsForRole = filter(
+ map(iterFrom(aria.keys()), (attribute) => attribute.toLowerCase()),
+ (attribute) => validPropsForRole.indexOf(attribute) === -1,
+ );
  const normalRole = role.toLowerCase();
 
- const allTests = [];
-
- allTests[0] = tests[0].concat(validPropsForRole.map((prop) => ({
- code: `<div role="${normalRole}" ${prop.toLowerCase()} />`,
- })));
-
- allTests[1] = tests[1].concat(invalidPropsForRole.map((prop) => ({
- code: `<div role="${normalRole}" ${prop.toLowerCase()} />`,
- errors: [errorMessage(prop.toLowerCase(), normalRole, 'div', false)],
- })));
-
- return allTests;
+ return [
+ tests[0].concat(validPropsForRole.map((prop) => ({
+ code: `<div role="${normalRole}" ${prop.toLowerCase()} />`,
+ }))),
+ tests[1].concat(toArray(map(invalidPropsForRole, (prop) => ({
+ code: `<div role="${normalRole}" ${prop.toLowerCase()} />`,
+ errors: [errorMessage(prop.toLowerCase(), normalRole, 'div', false)],
+ })))),
+ ];
 }, [[], []]);
 
 const [validTests, invalidTests] = createTests(nonAbstractRoles);

__tests__/src/util/isDOMElement-test.js

@@ -4,11 +4,9 @@ import { elementType } from 'jsx-ast-utils';
 import isDOMElement from '../../../src/util/isDOMElement';
 import JSXElementMock from '../../../__mocks__/JSXElementMock';
 
-const domElements = [...dom.keys()];
-
 describe('isDOMElement', () => {
  describe('DOM elements', () => {
- domElements.forEach((el) => {
+ dom.forEach((_, el) => {
  it(`should identify ${el} as a DOM element`, () => {
  const element = JSXElementMock(el);
  expect(isDOMElement(elementType(element.openingElement)))

__tests__/src/util/isFocusable-test.js

@@ -9,7 +9,7 @@ import {
 import JSXAttributeMock from '../../../__mocks__/JSXAttributeMock';
 
 function mergeTabIndex(index, attributes) {
- return [...attributes, JSXAttributeMock('tabIndex', index)];
+ return [].concat(attributes, JSXAttributeMock('tabIndex', index));
 }
 
 describe('isFocusable', () => {

package.json

@@ -83,6 +83,7 @@
  "axobject-query": "^3.2.1",
  "damerau-levenshtein": "^1.0.8",
  "emoji-regex": "^9.2.2",
+ "es-iterator-helpers": "^1.0.15",
  "hasown": "^2.0.0",
  "jsx-ast-utils": "^3.3.5",
  "language-tags": "^1.0.9",

src/rules/aria-activedescendant-has-tabindex.js

@@ -18,8 +18,6 @@ const errorMessage = 'An element that manages focus with `aria-activedescendant`
 
 const schema = generateObjSchema();
 
-const domElements = [...dom.keys()];
-
 export default {
  meta: {
  docs: {
@@ -42,7 +40,7 @@ export default {
  const type = elementType(node);
  // Do not test higher level JSX components, as we do not know what
  // low-level DOM element this maps to.
- if (domElements.indexOf(type) === -1) {
+ if (!dom.has(type)) {
  return;
  }
  const tabIndex = getTabIndex(getProp(attributes, 'tabIndex'));

src/rules/aria-props.js

@@ -45,7 +45,7 @@ export default {
  return;
  }
 
- const isValid = ariaAttributes.indexOf(name) > -1;
+ const isValid = aria.has(name);
 
  if (isValid === false) {
  context.report({

src/rules/aria-role.js

@@ -9,6 +9,9 @@
 
 import { dom, roles } from 'aria-query';
 import { getLiteralPropValue, propName } from 'jsx-ast-utils';
+import iterFrom from 'es-iterator-helpers/Iterator.from';
+import filter from 'es-iterator-helpers/Iterator.prototype.filter';
+
 import getElementType from '../util/getElementType';
 import { generateObjSchema } from '../util/schemas';
 
@@ -28,7 +31,7 @@ const schema = generateObjSchema({
  },
 });
 
-const validRoles = new Set([...roles.keys()].filter((role) => roles.get(role).abstract === false));
+const validRoles = new Set(filter(iterFrom(roles.keys()), (role) => roles.get(role).abstract === false));
 
 export default {
  meta: {

src/rules/aria-unsupported-elements.js

@@ -47,7 +47,7 @@ export default {
  return;
  }
 
- const invalidAttributes = [...aria.keys(), 'role'];
+ const invalidAttributes = new Set([...aria.keys(), 'role']);
 
  node.attributes.forEach((prop) => {
  if (prop.type === 'JSXSpreadAttribute') {
@@ -56,7 +56,7 @@ export default {
 
  const name = propName(prop).toLowerCase();
 
- if (invalidAttributes.indexOf(name) > -1) {
+ if (invalidAttributes.has(name)) {
  context.report({
  node,
  message: errorMessage(name),