[Refactor] remove array.prototype.flatmap

Author: talentlessguy

__tests__/__util__/helpers/parsers.js

@@ -2,7 +2,6 @@ import path from 'path';
 import semver from 'semver';
 import entries from 'object.entries';
 import { version } from 'eslint/package.json';
-import flatMap from 'array.prototype.flatmap';
 
 let tsParserVersion;
 try {
@@ -23,7 +22,7 @@ function minEcmaVersion(features, parserOptions) {
   const result = Math.max(
     ...[].concat(
       (parserOptions && parserOptions.ecmaVersion) || [],
-      flatMap(entries(minEcmaVersionForFeatures), (entry) => {
+      entries(minEcmaVersionForFeatures).flatMap((entry) => {
         const f = entry[0];
         const y = entry[1];
         return features.has(f) ? y : [];
@@ -69,7 +68,7 @@ const parsers = {
     };
   },
   all: function all(tests) {
-    const t = flatMap(tests, (test) => {
+    const t = tests.flatMap((test) => {
       /* eslint no-param-reassign: 0 */
       if (typeof test === 'string') {
         test = { code: test };

__tests__/__util__/ruleOptionsMapperFactory.js

@@ -2,8 +2,6 @@
  * @flow
  */
 
-import flatMap from 'array.prototype.flatmap';
-
 const { fromEntries, entries } = Object;
 
 type ESLintTestRunnerTestCase = {
@@ -25,7 +23,7 @@ export default function ruleOptionsMapperFactory(ruleOptions: Array<mixed> = [])
       code,
       errors,
       // Flatten the array of objects in an array of one object.
-      options: [fromEntries(flatMap((options || []).concat(ruleOptions), (item) => entries(item)))],
+      options: [fromEntries((options || []).concat(ruleOptions).flatMap((item) => entries(item)))],
       parserOptions,
       settings,
     };

package.json

@@ -76,7 +76,6 @@
   "license": "MIT",
   "dependencies": {
     "aria-query": "^5.3.2",
-    "array.prototype.flatmap": "^1.3.2",
     "ast-types-flow": "^0.0.8",
     "axe-core": "^4.10.0",
     "axobject-query": "^4.1.0",

src/rules/alt-text.js

@@ -12,7 +12,6 @@ import {
   getPropValue,
   getLiteralPropValue,
 } from 'jsx-ast-utils';
-import flatMap from 'array.prototype.flatmap';
 
 import { generateObjSchema, arraySchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
@@ -206,10 +205,8 @@ export default {
     // Elements to validate for alt text.
     const elementOptions = options.elements || DEFAULT_ELEMENTS;
     // Get custom components for just the elements that will be tested.
-    const customComponents = flatMap(
-      elementOptions,
-      (element) => options[element],
-    );
+    const customComponents = elementOptions.flatMap((element) => options[element]);
+
     const typesToValidate = new Set(
       [].concat(
         customComponents,

src/rules/media-has-caption.js

@@ -10,7 +10,6 @@
 
 import type { JSXElement, JSXOpeningElement, Node } from 'ast-types-flow';
 import { getProp, getLiteralPropValue } from 'jsx-ast-utils';
-import flatMap from 'array.prototype.flatmap';
 
 import type { ESLintConfig, ESLintContext, ESLintVisitorSelectorConfig } from '../../flow/eslint';
 import { generateObjSchema, arraySchema } from '../util/schemas';
@@ -29,7 +28,7 @@ const schema = generateObjSchema({
 const isMediaType = (context, type) => {
   const options = context.options[0] || {};
   return MEDIA_TYPES
-    .concat(flatMap(MEDIA_TYPES, (mediaType) => options[mediaType]))
+    .concat(MEDIA_TYPES.flatMap((mediaType) => options[mediaType]))
     .some((typeToCheck) => typeToCheck === type);
 };
 

src/util/isInteractiveElement.js

@@ -11,7 +11,6 @@ import {
   AXObjects,
   elementAXObjects,
 } from 'axobject-query';
-import flatMap from 'array.prototype.flatmap';
 import iterFrom from 'es-iterator-helpers/Iterator.from';
 // import iterFlatMap from 'es-iterator-helpers/Iterator.prototype.flatMap';
 import filter from 'es-iterator-helpers/Iterator.prototype.filter';
@@ -55,24 +54,15 @@ const interactiveRoles = new Set(roleKeys
   ));
 
 // TODO: convert to use iterFlatMap and iterFrom
-const interactiveElementRoleSchemas = flatMap(
-  elementRoleEntries,
-  ([elementSchema, rolesArr]) => (rolesArr.some((role): boolean => interactiveRoles.has(role)) ? [elementSchema] : []),
-);
+const interactiveElementRoleSchemas = elementRoleEntries.flatMap(([elementSchema, rolesArr]) => (rolesArr.some((role): boolean => interactiveRoles.has(role)) ? [elementSchema] : []));
 
 // TODO: convert to use iterFlatMap and iterFrom
-const nonInteractiveElementRoleSchemas = flatMap(
-  elementRoleEntries,
-  ([elementSchema, rolesArr]) => (rolesArr.every((role): boolean => nonInteractiveRoles.has(role)) ? [elementSchema] : []),
-);
+const nonInteractiveElementRoleSchemas = elementRoleEntries.flatMap(([elementSchema, rolesArr]) => (rolesArr.every((role): boolean => nonInteractiveRoles.has(role)) ? [elementSchema] : []));
 
 const interactiveAXObjects = new Set(filter(iterFrom(AXObjects.keys()), (name) => AXObjects.get(name).type === 'widget'));
 
 // TODO: convert to use iterFlatMap and iterFrom
-const interactiveElementAXObjectSchemas = flatMap(
-  [...elementAXObjects],
-  ([elementSchema, AXObjectsArr]) => (AXObjectsArr.every((role): boolean => interactiveAXObjects.has(role)) ? [elementSchema] : []),
-);
+const interactiveElementAXObjectSchemas = [...elementAXObjects].flatMap(([elementSchema, AXObjectsArr]) => (AXObjectsArr.every((role): boolean => interactiveAXObjects.has(role)) ? [elementSchema] : []));
 
 function checkIsInteractiveElement(tagName, attributes): boolean {
   function elementSchemaMatcher(elementSchema) {

src/util/isInteractiveRole.js

@@ -2,7 +2,6 @@
 import { roles as rolesMap } from 'aria-query';
 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) => (
@@ -39,10 +38,7 @@ const isInteractiveRole = (
 
   let isInteractive = false;
   const normalizedValues = String(value).toLowerCase().split(' ');
-  const validRoles = flatMap(
-    normalizedValues,
-    (name: string) => (roles.includes(name) ? [name] : []),
-  );
+  const validRoles = normalizedValues.flatMap((name) => (roles.includes(name) ? [name] : []));
   if (validRoles.length > 0) {
     // The first role value is a series takes precedence.
     isInteractive = interactiveRoles.includes(validRoles[0]);

src/util/isNonInteractiveElement.js

@@ -12,7 +12,6 @@ import {
   elementAXObjects,
 } from 'axobject-query';
 import type { Node } from 'ast-types-flow';
-import flatMap from 'array.prototype.flatmap';
 import iterFrom from 'es-iterator-helpers/Iterator.from';
 // import iterFlatMap from 'es-iterator-helpers/Iterator.prototype.flatMap';
 import filter from 'es-iterator-helpers/Iterator.prototype.filter';
@@ -62,24 +61,15 @@ const interactiveRoles = new Set(roleKeys
   ));
 
 // TODO: convert to use iterFlatMap and iterFrom
-const interactiveElementRoleSchemas = flatMap(
-  elementRoleEntries,
-  ([elementSchema, rolesArr]) => (rolesArr.some((role): boolean => interactiveRoles.has(role)) ? [elementSchema] : []),
-);
+const interactiveElementRoleSchemas = elementRoleEntries.flatMap(([elementSchema, rolesArr]) => (rolesArr.some((role): boolean => interactiveRoles.has(role)) ? [elementSchema] : []));
 
 // TODO: convert to use iterFlatMap and iterFrom
-const nonInteractiveElementRoleSchemas = flatMap(
-  elementRoleEntries,
-  ([elementSchema, rolesArr]) => (rolesArr.every((role): boolean => nonInteractiveRoles.has(role)) ? [elementSchema] : []),
-);
+const nonInteractiveElementRoleSchemas = elementRoleEntries.flatMap(([elementSchema, rolesArr]) => (rolesArr.every((role): boolean => nonInteractiveRoles.has(role)) ? [elementSchema] : []));
 
 const nonInteractiveAXObjects = new Set(filter(iterFrom(AXObjects.keys()), (name) => ['window', 'structure'].includes(AXObjects.get(name).type)));
 
 // TODO: convert to use iterFlatMap and iterFrom
-const nonInteractiveElementAXObjectSchemas = flatMap(
-  [...elementAXObjects],
-  ([elementSchema, AXObjectsArr]) => (AXObjectsArr.every((role): boolean => nonInteractiveAXObjects.has(role)) ? [elementSchema] : []),
-);
+const nonInteractiveElementAXObjectSchemas = [...elementAXObjects].flatMap(([elementSchema, AXObjectsArr]) => (AXObjectsArr.every((role): boolean => nonInteractiveAXObjects.has(role)) ? [elementSchema] : []));
 
 function checkIsNonInteractiveElement(tagName, attributes): boolean {
   function elementSchemaMatcher(elementSchema) {

src/util/isNonInteractiveRole.js

@@ -8,7 +8,6 @@ import {
 } from 'aria-query';
 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) => (
   !rolesMap.get(name).abstract
@@ -47,10 +46,7 @@ const isNonInteractiveRole = (
 
   let isNonInteractive = false;
   const normalizedValues = String(role).toLowerCase().split(' ');
-  const validRoles = flatMap(
-    normalizedValues,
-    (name: string) => (rolesMap.has(name) ? [name] : []),
-  );
+  const validRoles = normalizedValues.flatMap((name: string) => (rolesMap.has(name) ? [name] : []));
   if (validRoles.length > 0) {
     // The first role value is a series takes precedence.
     isNonInteractive = nonInteractiveRoles.includes(validRoles[0]);