[Deps] remove hasown

talentlessguy · talentlessguy · commit 6a483487faa2 · 2024-10-21T04:02:31.000+03:00
diff --git a/.babelrc b/.babelrc
@@ -4,7 +4,7 @@
       "airbnb",
       {
         "targets": {
-          "node": 4
+          "node": 18
         },
         "transformRuntime": false
       }
diff --git a/.eslintrc b/.eslintrc
@@ -15,7 +15,7 @@
   ],
   "rules": {
     "max-len": "off",
-    "no-template-curly-in-string": "off",
+    "no-template-curly-in-string": "off"
   },
   "overrides": [
     {
diff --git a/__mocks__/genInteractives.js b/__mocks__/genInteractives.js
@@ -162,9 +162,9 @@ export function genElementSymbol(openingElement: Object): string {
 }
 
 export function genInteractiveElements(): Array<JSXElementMockType> {
-  return Object.keys(interactiveElementsMap).map((elementSymbol: string): JSXElementMockType => {
+  return Object.keys(interactiveElementsMap).map((elementSymbol): JSXElementMockType => {
     const bracketIndex = elementSymbol.indexOf('[');
-    let name = elementSymbol;
+    let name: string = elementSymbol;
     if (bracketIndex > -1) {
       name = elementSymbol.slice(0, bracketIndex);
     }
diff --git a/flow/eslint.js b/flow/eslint.js
@@ -4,6 +4,7 @@
 export type ESLintReport = {
   node: any,
   message: string,
+  data?: Object
 };
 
 export type ESLintSettings = {
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "eslint-plugin-flowtype": "^5.8.0 || ^8.0.3",
     "eslint-plugin-import": "^2.29.1",
     "estraverse": "^5.3.0",
-    "flow-bin": "^0.147.0",
+    "flow-bin": "^0.250.0",
     "in-publish": "^2.0.1",
     "jackspeak": "=2.1.1",
     "jscodeshift": "^0.7.1",
@@ -83,7 +83,6 @@
     "damerau-levenshtein": "^1.0.8",
     "emoji-regex": "^9.2.2",
     "es-iterator-helpers": "^1.0.19",
-    "hasown": "^2.0.2",
     "jsx-ast-utils": "^3.3.5",
     "language-tags": "^1.0.9",
     "minimatch": "^3.1.2",
diff --git a/src/rules/anchor-ambiguous-text.js b/src/rules/anchor-ambiguous-text.js
@@ -44,7 +44,7 @@ export default ({
     const ambiguousWords = new Set(words);
 
     return {
-      JSXOpeningElement: (node) => {
+      JSXOpeningElement: (node: Object) => {
         const nodeType = elementType(node);
 
         // Only check anchor elements and custom types.
diff --git a/src/rules/anchor-is-valid.js b/src/rules/anchor-is-valid.js
@@ -60,7 +60,7 @@ export default ({
 
         // Create active aspect flag object. Failing checks will only report
         // if the related flag is set to true.
-        const activeAspects = {};
+        const activeAspects: Object = {};
         allAspects.forEach((aspect) => {
           activeAspects[aspect] = aspects.indexOf(aspect) !== -1;
         });
diff --git a/src/rules/label-has-associated-control.js b/src/rules/label-has-associated-control.js
@@ -36,7 +36,7 @@ const schema = generateObjSchema({
   },
 });
 
-function validateID(node, context) {
+function validateID(node: Object, context: Object) {
   const { settings } = context;
   const htmlForAttributes = settings['jsx-a11y']?.attributes?.for ?? ['htmlFor'];
 
diff --git a/src/rules/media-has-caption.js b/src/rules/media-has-caption.js
@@ -25,14 +25,14 @@ const schema = generateObjSchema({
   track: arraySchema,
 });
 
-const isMediaType = (context, type) => {
+const isMediaType = (context: Object, type: string) => {
   const options = context.options[0] || {};
   return MEDIA_TYPES
     .concat(MEDIA_TYPES.flatMap((mediaType) => options[mediaType]))
     .some((typeToCheck) => typeToCheck === type);
 };
 
-const isTrackType = (context, type) => {
+const isTrackType = (context: Object, type: string) => {
   const options = context.options[0] || {};
   return ['track'].concat(options.track || []).some((typeToCheck) => typeToCheck === type);
 };
diff --git a/src/rules/mouse-events-have-key-events.js b/src/rules/mouse-events-have-key-events.js
@@ -40,7 +40,7 @@ export default ({
   },
 
   create: (context: ESLintContext) => ({
-    JSXOpeningElement: (node) => {
+    JSXOpeningElement: (node: Object) => {
       const { name } = node.name;
 
       if (!dom.get(name)) {
diff --git a/src/rules/no-interactive-element-to-noninteractive-role.js b/src/rules/no-interactive-element-to-noninteractive-role.js
@@ -16,7 +16,6 @@ import {
   propName,
 } from 'jsx-ast-utils';
 import type { JSXIdentifier } from 'ast-types-flow';
-import hasOwn from 'hasown';
 import type { ESLintConfig, ESLintContext, ESLintVisitorSelectorConfig } from '../../flow/eslint';
 import type { ESLintJSXAttribute } from '../../flow/eslint-jsx';
 import getElementType from '../util/getElementType';
@@ -67,7 +66,7 @@ export default ({
         // Allow overrides from rule configuration for specific elements and
         // roles.
         const allowedRoles = (options[0] || {});
-        if (hasOwn(allowedRoles, type) && allowedRoles[type].includes(role)) {
+        if (Object.hasOwn(allowedRoles, type) && allowedRoles[type].includes(role)) {
           return;
         }
         if (
diff --git a/src/rules/no-noninteractive-element-interactions.js b/src/rules/no-noninteractive-element-interactions.js
@@ -16,7 +16,6 @@ import {
   propName,
 } from 'jsx-ast-utils';
 import type { JSXOpeningElement } from 'ast-types-flow';
-import hasOwn from 'hasown';
 import type { ESLintConfig, ESLintContext, ESLintVisitorSelectorConfig } from '../../flow/eslint';
 import { arraySchema, generateObjSchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
@@ -60,7 +59,7 @@ export default ({
         const config = (options[0] || {});
         const interactiveProps = config.handlers || defaultInteractiveProps;
         // Allow overrides from rule configuration for specific elements and roles.
-        if (hasOwn(config, type)) {
+        if (Object.hasOwn(config, type)) {
           attributes = attributes.filter((attr) => attr.type !== 'JSXSpreadAttribute' && !config[type].includes(propName(attr)));
         }
 
diff --git a/src/rules/no-noninteractive-element-to-interactive-role.js b/src/rules/no-noninteractive-element-to-interactive-role.js
@@ -14,7 +14,6 @@ import {
   propName,
 } from 'jsx-ast-utils';
 import type { JSXIdentifier } from 'ast-types-flow';
-import hasOwn from 'hasown';
 import type { ESLintConfig, ESLintContext, ESLintVisitorSelectorConfig } from '../../flow/eslint';
 import type { ESLintJSXAttribute } from '../../flow/eslint-jsx';
 import getElementType from '../util/getElementType';
@@ -65,7 +64,7 @@ export default ({
         // Allow overrides from rule configuration for specific elements and
         // roles.
         const allowedRoles = (options[0] || {});
-        if (hasOwn(allowedRoles, type) && allowedRoles[type].includes(role)) {
+        if (Object.hasOwn(allowedRoles, type) && allowedRoles[type].includes(role)) {
           return;
         }
         if (
diff --git a/src/rules/no-redundant-roles.js b/src/rules/no-redundant-roles.js
@@ -9,18 +9,17 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
-import hasOwn from 'hasown';
 import type { JSXOpeningElement } from 'ast-types-flow';
 import type { ESLintConfig, ESLintContext, ESLintVisitorSelectorConfig } from '../../flow/eslint';
 import getElementType from '../util/getElementType';
 import getExplicitRole from '../util/getExplicitRole';
 import getImplicitRole from '../util/getImplicitRole';
 
-const errorMessage = (element, implicitRole) => (
+const errorMessage = (element: string, implicitRole: string) => (
   `The element ${element} has an implicit role of ${implicitRole}. Defining this explicitly is redundant and should be avoided.`
 );
 
-const DEFAULT_ROLE_EXCEPTIONS = { nav: ['navigation'] };
+const DEFAULT_ROLE_EXCEPTIONS: Record<string, Array<string>> = { nav: ['navigation'] };
 
 export default ({
   meta: {
@@ -57,7 +56,7 @@ export default ({
           const allowedRedundantRoles = (options[0] || {});
           let redundantRolesForElement;
 
-          if (hasOwn(allowedRedundantRoles, type)) {
+          if (Object.hasOwn(allowedRedundantRoles, type)) {
             redundantRolesForElement = allowedRedundantRoles[type];
           } else {
             redundantRolesForElement = DEFAULT_ROLE_EXCEPTIONS[type] || [];
diff --git a/src/util/getElementType.js b/src/util/getElementType.js
@@ -3,7 +3,6 @@
  */
 
 import type { JSXOpeningElement } from 'ast-types-flow';
-import hasOwn from 'hasown';
 import { elementType, getProp, getLiteralPropValue } from 'jsx-ast-utils';
 
 import type { ESLintContext } from '../../flow/eslint';
@@ -30,7 +29,7 @@ const getElementType = (context: ESLintContext): ((node: JSXOpeningElement) => s
       return rawType;
     }
 
-    return hasOwn(componentMap, rawType) ? componentMap[rawType] : rawType;
+    return Object.hasOwn(componentMap, rawType) ? componentMap[rawType] : rawType;
   };
 };
 
diff --git a/src/util/getExplicitRole.js b/src/util/getExplicitRole.js
@@ -15,7 +15,7 @@ export default function getExplicitRole(
   tag: string,
   attributes: Array<Node>,
 ): ?string {
-  const explicitRole = (function toLowerCase(role) {
+  const explicitRole = (function toLowerCase(role: any) {
     if (typeof role === 'string') {
       return role.toLowerCase();
     }
diff --git a/src/util/isInteractiveElement.js b/src/util/isInteractiveElement.js
@@ -64,8 +64,8 @@ const interactiveAXObjects = new Set(filter(iterFrom(AXObjects.keys()), (name) =
 // TODO: convert to use iterFlatMap and iterFrom
 const interactiveElementAXObjectSchemas = [...elementAXObjects].flatMap(([elementSchema, AXObjectsArr]) => (AXObjectsArr.every((role): boolean => interactiveAXObjects.has(role)) ? [elementSchema] : []));
 
-function checkIsInteractiveElement(tagName, attributes): boolean {
-  function elementSchemaMatcher(elementSchema) {
+function checkIsInteractiveElement(tagName: string, attributes: Object): boolean {
+  function elementSchemaMatcher(elementSchema: Object) {
     return (
       tagName === elementSchema.name
       && attributesComparator(elementSchema.attributes, attributes)
diff --git a/src/util/isNonInteractiveElement.js b/src/util/isNonInteractiveElement.js
@@ -70,8 +70,8 @@ const nonInteractiveAXObjects = new Set([...AXObjects.keys()].filter((name) => [
 // TODO: convert to use iterFlatMap and iterFrom
 const nonInteractiveElementAXObjectSchemas = [...elementAXObjects].flatMap(([elementSchema, AXObjectsArr]) => (AXObjectsArr.every((role): boolean => nonInteractiveAXObjects.has(role)) ? [elementSchema] : []));
 
-function checkIsNonInteractiveElement(tagName, attributes): boolean {
-  function elementSchemaMatcher(elementSchema) {
+function checkIsNonInteractiveElement(tagName: string, attributes: Object): boolean {
+  function elementSchemaMatcher(elementSchema: Object) {
     return (
       tagName === elementSchema.name
       && tagName !== 'td' // TODO: investigate why this is needed

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"airbnb",`
`5`	`5`	`{`
`6`	`6`	`"targets": {`
`7`		`- "node": 4`
	`7`	`+ "node": 18`
`8`	`8`	`},`
`9`	`9`	`"transformRuntime": false`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`],`
`16`	`16`	`"rules": {`
`17`	`17`	`"max-len": "off",`
`18`		`- "no-template-curly-in-string": "off",`
	`18`	`+ "no-template-curly-in-string": "off"`
`19`	`19`	`},`
`20`	`20`	`"overrides": [`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -162,9 +162,9 @@ export function genElementSymbol(openingElement: Object): string {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`export function genInteractiveElements(): Array<JSXElementMockType> {`
`165`		`- return Object.keys(interactiveElementsMap).map((elementSymbol: string): JSXElementMockType => {`
	`165`	`+ return Object.keys(interactiveElementsMap).map((elementSymbol): JSXElementMockType => {`
`166`	`166`	`const bracketIndex = elementSymbol.indexOf('[');`
`167`		`- let name = elementSymbol;`
	`167`	`+ let name: string = elementSymbol;`
`168`	`168`	`if (bracketIndex > -1) {`
`169`	`169`	`name = elementSymbol.slice(0, bracketIndex);`
`170`	`170`	`}`