From 951feeae4eb5285539080e9dcdd558571e9ef19f Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:18:50 -0400
Subject: [PATCH 01/19] bump aria-query to 5.3.0

---
 package-lock.json | 31 ++++++++++++++++++++++---------
 package.json      |  2 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c6157798..93a2cbd7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@github/browserslist-config": "^1.0.0",
         "@typescript-eslint/eslint-plugin": "^5.1.0",
         "@typescript-eslint/parser": "^5.1.0",
-        "aria-query": "^5.1.3",
+        "aria-query": "^5.3.0",
         "eslint-config-prettier": ">=8.0.0",
         "eslint-plugin-escompat": "^3.3.3",
         "eslint-plugin-eslint-comments": "^3.2.0",
@@ -682,11 +682,11 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
       "dependencies": {
-        "deep-equal": "^2.0.5"
+        "dequal": "^2.0.3"
       }
     },
     "node_modules/array-includes": {
@@ -1182,6 +1182,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/diff": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
@@ -4944,11 +4952,11 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
       "requires": {
-        "deep-equal": "^2.0.5"
+        "dequal": "^2.0.3"
       }
     },
     "array-includes": {
@@ -5298,6 +5306,11 @@
         "object-keys": "^1.1.1"
       }
     },
+    "dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="
+    },
     "diff": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
diff --git a/package.json b/package.json
index c8f8e0d1..50151ced 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "@github/browserslist-config": "^1.0.0",
     "@typescript-eslint/eslint-plugin": "^5.1.0",
     "@typescript-eslint/parser": "^5.1.0",
-    "aria-query": "^5.1.3",
+    "aria-query": "^5.3.0",
     "eslint-config-prettier": ">=8.0.0",
     "eslint-plugin-escompat": "^3.3.3",
     "eslint-plugin-eslint-comments": "^3.2.0",

From 95c60cf78628d7ae56b813b41593af591ce04794 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:20:48 -0400
Subject: [PATCH 02/19] Don't delete all of attributes

---
 lib/rules/role-supports-aria-props.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/rules/role-supports-aria-props.js b/lib/rules/role-supports-aria-props.js
index 55644c1f..370bb696 100644
--- a/lib/rules/role-supports-aria-props.js
+++ b/lib/rules/role-supports-aria-props.js
@@ -9,7 +9,10 @@ const elementRolesMap = new ObjectMap()
 for (const [key, value] of elementRoles.entries()) {
   // - Remove unused `constraints` key
   delete key.constraints
-  key.attributes = key.attributes?.filter(attribute => !('constraints' in attribute))
+  // - Remove `constraints` key within `attributes`
+  for (const attribute of key.attributes || []) {
+    delete attribute.constraints
+  }
   // - Remove empty `attributes` key
   if (!key.attributes || key.attributes?.length === 0) {
     delete key.attributes

From 762f7e123f2074c542874c8d7e2a47e0e14dad76 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:36:44 -0400
Subject: [PATCH 03/19] `a` and `area` without `href` are now generic,

- generic does not list `aria-checked`.
---
 tests/role-supports-aria-props.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/role-supports-aria-props.js b/tests/role-supports-aria-props.js
index c0676d6a..1858b9cf 100644
--- a/tests/role-supports-aria-props.js
+++ b/tests/role-supports-aria-props.js
@@ -57,9 +57,6 @@ ruleTester.run('role-supports-aria-props', rule, {
     {code: '<a href="#" aria-owns />'},
     {code: '<a href="#" aria-relevant />'},
 
-    // this will have global
-    {code: '<a aria-checked />'},
-
     // AREA TESTS - implicit role is `link`
     {code: '<area href="#" aria-expanded />'},
     {code: '<area href="#" aria-atomic />'},
@@ -78,9 +75,6 @@ ruleTester.run('role-supports-aria-props', rule, {
     {code: '<area href="#" aria-owns />'},
     {code: '<area href="#" aria-relevant />'},
 
-    // this will have global
-    {code: '<area aria-checked />'},
-
     // LINK TESTS - implicit role is `link`
     {code: '<link href="#" aria-expanded />'},
     {code: '<link href="#" aria-atomic />'},
@@ -348,6 +342,14 @@ ruleTester.run('role-supports-aria-props', rule, {
 
   invalid: [
     // implicit basic checks
+    {
+      code: '<area aria-checked />',
+      errors: [getErrorMessage('aria-checked', 'generic')],
+    },
+    {
+      code: '<a aria-checked />',
+      errors: [getErrorMessage('aria-checked', 'generic')],
+    },
     {
       code: '<a href="#" aria-checked />',
       errors: [getErrorMessage('aria-checked', 'link')],

From 2747f2da177afd2255b0ed73f09546a0f238b535 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:39:59 -0400
Subject: [PATCH 04/19] link tag maps to nothing

- according to https://www.w3.org/TR/html-aam-1.0/, link tag doesn't map to anything even with an href.
- therefore, it no longer makes sense to try to determine role and evaluate, so it should be skipped.
- accordingly, tests are deleted since we don't want to evaluate it.
---
 tests/role-supports-aria-props.js | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/tests/role-supports-aria-props.js b/tests/role-supports-aria-props.js
index 1858b9cf..a7658712 100644
--- a/tests/role-supports-aria-props.js
+++ b/tests/role-supports-aria-props.js
@@ -75,27 +75,6 @@ ruleTester.run('role-supports-aria-props', rule, {
     {code: '<area href="#" aria-owns />'},
     {code: '<area href="#" aria-relevant />'},
 
-    // LINK TESTS - implicit role is `link`
-    {code: '<link href="#" aria-expanded />'},
-    {code: '<link href="#" aria-atomic />'},
-    {code: '<link href="#" aria-busy />'},
-    {code: '<link href="#" aria-controls />'},
-    {code: '<link href="#" aria-describedby />'},
-    {code: '<link href="#" aria-disabled />'},
-    {code: '<link href="#" aria-dropeffect />'},
-    {code: '<link href="#" aria-flowto />'},
-    {code: '<link href="#" aria-grabbed />'},
-    {code: '<link href="#" aria-hidden />'},
-    {code: '<link href="#" aria-haspopup />'},
-    {code: '<link href="#" aria-label />'},
-    {code: '<link href="#" aria-labelledby />'},
-    {code: '<link href="#" aria-live />'},
-    {code: '<link href="#" aria-owns />'},
-    {code: '<link href="#" aria-relevant />'},
-
-    // this will have global
-    {code: '<link aria-checked />'},
-
     // this will have role of `img`
     {code: '<img alt="foobar" aria-busy />'},
 
@@ -338,6 +317,7 @@ ruleTester.run('role-supports-aria-props', rule, {
     {code: '<datalist aria-expanded />'},
     {code: '<div role="heading" aria-level />'},
     {code: '<div role="heading" aria-level="1" />'},
+    {code: '<link href="#" aria-expanded />'}, // link maps to nothing
   ],
 
   invalid: [
@@ -358,10 +338,6 @@ ruleTester.run('role-supports-aria-props', rule, {
       code: '<area href="#" aria-checked />',
       errors: [getErrorMessage('aria-checked', 'link')],
     },
-    {
-      code: '<link href="#" aria-checked />',
-      errors: [getErrorMessage('aria-checked', 'link')],
-    },
     {
       code: '<img alt="foobar" aria-checked />',
       errors: [getErrorMessage('aria-checked', 'img')],
@@ -482,10 +458,6 @@ ruleTester.run('role-supports-aria-props', rule, {
       code: '<menu type="toolbar" aria-expanded />',
       errors: [getErrorMessage('aria-expanded', 'toolbar')],
     },
-    {
-      code: '<link href="#" aria-invalid />',
-      errors: [getErrorMessage('aria-invalid', 'link')],
-    },
     {
       code: '<area href="#" aria-invalid />',
       errors: [getErrorMessage('aria-invalid', 'link')],

From d21a25e6a81d9e8903e394d595c6d7d5fe9c651d Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:46:35 -0400
Subject: [PATCH 05/19] body now maps to generic role

- see https://www.w3.org/TR/html-aria/ and https://www.w3.org/TR/html-aam-1.0/
---
 tests/role-supports-aria-props.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/role-supports-aria-props.js b/tests/role-supports-aria-props.js
index a7658712..fd2bc2dc 100644
--- a/tests/role-supports-aria-props.js
+++ b/tests/role-supports-aria-props.js
@@ -372,7 +372,7 @@ ruleTester.run('role-supports-aria-props', rule, {
     },
     {
       code: '<body aria-expanded />',
-      errors: [getErrorMessage('aria-expanded', 'document')],
+      errors: [getErrorMessage('aria-expanded', 'generic')],
     },
     {
       code: '<li aria-expanded />',

From 281fa951c006b915fca4c84be4ac8543dd3f1adb Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:21:53 -0400
Subject: [PATCH 06/19] `summary` does not map to anything anymore

---
 lib/rules/role-supports-aria-props.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/rules/role-supports-aria-props.js b/lib/rules/role-supports-aria-props.js
index 370bb696..858c4bed 100644
--- a/lib/rules/role-supports-aria-props.js
+++ b/lib/rules/role-supports-aria-props.js
@@ -44,9 +44,7 @@ module.exports = {
         // - Get the element’s name
         const key = {name: getElementType(context, node)}
         // - Get the element’s disambiguating attributes
-        for (const prop of ['aria-expanded', 'type', 'size', 'role', 'href', 'multiple', 'scope']) {
-          // - Only provide `aria-expanded` when it’s required for disambiguation
-          if (prop === 'aria-expanded' && key.name !== 'summary') continue
+        for (const prop of ['type', 'size', 'role', 'href', 'multiple', 'scope']) {
           const value = getPropValue(getProp(node.attributes, prop))
           if (value) {
             if (!('attributes' in key)) {

From 33fe0b0db356303fbda489486e1946a767a8c7bf Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:54:43 -0400
Subject: [PATCH 07/19] Add aria-label and aria-labelledby and alt and name

Add additional dis-ambiguating attributes.

When `aria-label` or `aria-labelledby` is set at all, constraints should be set.
---
 lib/rules/role-supports-aria-props.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/lib/rules/role-supports-aria-props.js b/lib/rules/role-supports-aria-props.js
index 858c4bed..ab447e72 100644
--- a/lib/rules/role-supports-aria-props.js
+++ b/lib/rules/role-supports-aria-props.js
@@ -9,10 +9,6 @@ const elementRolesMap = new ObjectMap()
 for (const [key, value] of elementRoles.entries()) {
   // - Remove unused `constraints` key
   delete key.constraints
-  // - Remove `constraints` key within `attributes`
-  for (const attribute of key.attributes || []) {
-    delete attribute.constraints
-  }
   // - Remove empty `attributes` key
   if (!key.attributes || key.attributes?.length === 0) {
     delete key.attributes
@@ -44,14 +40,31 @@ module.exports = {
         // - Get the element’s name
         const key = {name: getElementType(context, node)}
         // - Get the element’s disambiguating attributes
-        for (const prop of ['type', 'size', 'role', 'href', 'multiple', 'scope']) {
+        for (const prop of [
+          'aria-label',
+          'aria-labelledby',
+          'alt',
+          'type',
+          'size',
+          'role',
+          'href',
+          'multiple',
+          'scope',
+          'name',
+        ]) {
+          if ((prop === 'aria-labelledby' || prop === 'aria-label') && !['section', 'aside', 'form'].includes(key.name))
+            continue
+          if (prop === 'name' && key.name !== 'form') continue
+
           const value = getPropValue(getProp(node.attributes, prop))
           if (value) {
             if (!('attributes' in key)) {
               key.attributes = []
             }
-            if (prop === 'href') {
-              key.attributes.push({name: prop})
+            if (prop === 'href' || prop === 'aria-labelledby' || prop === 'aria-label') {
+              key.attributes.push({name: prop, constraints: ['set']})
+            } else if (prop === 'alt' && value !== '') {
+              key.attributes.push({name: prop, constraints: ['set']})
             } else {
               key.attributes.push({name: prop, value})
             }

From 985fa01bdba1ef27138ddd1f0790dec7ebdff63b Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:59:57 -0400
Subject: [PATCH 08/19] update tests to reflect truth

---
 tests/role-supports-aria-props.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/role-supports-aria-props.js b/tests/role-supports-aria-props.js
index fd2bc2dc..d215eb02 100644
--- a/tests/role-supports-aria-props.js
+++ b/tests/role-supports-aria-props.js
@@ -348,7 +348,7 @@ ruleTester.run('role-supports-aria-props', rule, {
     },
     {
       code: '<aside aria-checked />',
-      errors: [getErrorMessage('aria-checked', 'complementary')],
+      errors: [getErrorMessage('aria-checked', 'generic')],
     },
     {
       code: '<ul aria-expanded />',
@@ -364,7 +364,7 @@ ruleTester.run('role-supports-aria-props', rule, {
     },
     {
       code: '<aside aria-expanded />',
-      errors: [getErrorMessage('aria-expanded', 'complementary')],
+      errors: [getErrorMessage('aria-expanded', 'generic')],
     },
     {
       code: '<article aria-expanded />',
@@ -392,6 +392,10 @@ ruleTester.run('role-supports-aria-props', rule, {
     },
     {
       code: '<section aria-expanded />',
+      errors: [getErrorMessage('aria-expanded', 'generic')],
+    },
+    {
+      code: '<section aria-label="something" aria-expanded />',
       errors: [getErrorMessage('aria-expanded', 'region')],
     },
     {

From 247eea291acba4a3f19eeae7bcbe70ed0fbb3f30 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Tue, 11 Jul 2023 11:36:59 -0400
Subject: [PATCH 09/19] Extract test helpers

---
 tests/utils/get-element-type.js | 27 ++-------------------------
 tests/utils/helpers.js          | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 tests/utils/helpers.js

diff --git a/tests/utils/get-element-type.js b/tests/utils/get-element-type.js
index e1baf698..87b8cecc 100644
--- a/tests/utils/get-element-type.js
+++ b/tests/utils/get-element-type.js
@@ -1,34 +1,11 @@
 const {getElementType} = require('../../lib/utils/get-element-type')
+const {mockJSXAttribute, mockJSXOpeningElement} = require('./helpers')
+
 const mocha = require('mocha')
 const describe = mocha.describe
 const it = mocha.it
 const expect = require('chai').expect
 
-function mockJSXAttribute(prop, propValue) {
-  return {
-    type: 'JSXAttribute',
-    name: {
-      type: 'JSXIdentifier',
-      name: prop,
-    },
-    value: {
-      type: 'Literal',
-      value: propValue,
-    },
-  }
-}
-
-function mockJSXOpeningElement(tagName, attributes = []) {
-  return {
-    type: 'JSXOpeningElement',
-    name: {
-      type: 'JSXIdentifier',
-      name: tagName,
-    },
-    attributes,
-  }
-}
-
 function mockSetting(componentSetting = {}) {
   return {
     settings: {
diff --git a/tests/utils/helpers.js b/tests/utils/helpers.js
new file mode 100644
index 00000000..4d0181b9
--- /dev/null
+++ b/tests/utils/helpers.js
@@ -0,0 +1,26 @@
+function mockJSXAttribute(prop, propValue) {
+  return {
+    type: 'JSXAttribute',
+    name: {
+      type: 'JSXIdentifier',
+      name: prop,
+    },
+    value: {
+      type: 'Literal',
+      value: propValue,
+    },
+  }
+}
+
+function mockJSXOpeningElement(tagName, attributes = []) {
+  return {
+    type: 'JSXOpeningElement',
+    name: {
+      type: 'JSXIdentifier',
+      name: tagName,
+    },
+    attributes,
+  }
+}
+
+module.exports = {mockJSXAttribute, mockJSXOpeningElement}

From 5c98a4411e3dc4d7c6bfbdfdfbc7cfab27f40c1a Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Tue, 11 Jul 2023 11:38:43 -0400
Subject: [PATCH 10/19] Extract getRole into its own helper

---
 lib/rules/role-supports-aria-props.js | 40 +-----------
 lib/utils/get-role.js                 | 93 +++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 37 deletions(-)
 create mode 100644 lib/utils/get-role.js

diff --git a/lib/rules/role-supports-aria-props.js b/lib/rules/role-supports-aria-props.js
index ab447e72..67c112e9 100644
--- a/lib/rules/role-supports-aria-props.js
+++ b/lib/rules/role-supports-aria-props.js
@@ -1,7 +1,7 @@
 // @ts-check
 const {aria, elementRoles, roles} = require('aria-query')
-const {getProp, getPropValue, propName} = require('jsx-ast-utils')
-const {getElementType} = require('../utils/get-element-type')
+const {getPropValue, propName} = require('jsx-ast-utils')
+const {getRole} = require('../utils/get-role')
 const ObjectMap = require('../utils/object-map')
 
 // Clean-up `elementRoles` from `aria-query`
@@ -36,42 +36,8 @@ module.exports = {
   create(context) {
     return {
       JSXOpeningElement(node) {
-        // Assemble a key for looking-up the element’s role in the `elementRolesMap`
-        // - Get the element’s name
-        const key = {name: getElementType(context, node)}
-        // - Get the element’s disambiguating attributes
-        for (const prop of [
-          'aria-label',
-          'aria-labelledby',
-          'alt',
-          'type',
-          'size',
-          'role',
-          'href',
-          'multiple',
-          'scope',
-          'name',
-        ]) {
-          if ((prop === 'aria-labelledby' || prop === 'aria-label') && !['section', 'aside', 'form'].includes(key.name))
-            continue
-          if (prop === 'name' && key.name !== 'form') continue
-
-          const value = getPropValue(getProp(node.attributes, prop))
-          if (value) {
-            if (!('attributes' in key)) {
-              key.attributes = []
-            }
-            if (prop === 'href' || prop === 'aria-labelledby' || prop === 'aria-label') {
-              key.attributes.push({name: prop, constraints: ['set']})
-            } else if (prop === 'alt' && value !== '') {
-              key.attributes.push({name: prop, constraints: ['set']})
-            } else {
-              key.attributes.push({name: prop, value})
-            }
-          }
-        }
         // Get the element’s explicit or implicit role
-        const role = getPropValue(getProp(node.attributes, 'role')) ?? elementRolesMap.get(key)?.[0]
+        const role = getRole(context, node)
 
         // Return early if role could not be determined
         if (!role) return
diff --git a/lib/utils/get-role.js b/lib/utils/get-role.js
new file mode 100644
index 00000000..99ef0edf
--- /dev/null
+++ b/lib/utils/get-role.js
@@ -0,0 +1,93 @@
+const {getProp, getPropValue} = require('jsx-ast-utils')
+const {elementRoles} = require('aria-query')
+const {getElementType} = require('./get-element-type')
+const ObjectMap = require('./object-map')
+
+// Clean-up `elementRoles` from `aria-query`
+const elementRolesMap = new ObjectMap()
+for (const [key, value] of elementRoles.entries()) {
+  // - Remove unused `constraints` key
+  delete key.constraints
+  // - Remove empty `attributes` key
+  if (!key.attributes || key.attributes?.length === 0) {
+    delete key.attributes
+  }
+  elementRolesMap.set(key, value)
+}
+// - Remove insufficiently-disambiguated `menuitem` entry
+elementRolesMap.delete({name: 'menuitem'})
+// - Disambiguate `menuitem` and `menu` roles by `type`
+elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'command'}]}, ['menuitem'])
+elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'radio'}]}, ['menuitemradio'])
+elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
+elementRolesMap.set({name: 'menu', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
+
+/*
+  Determine role of an element, based on its name and attributes.
+*/
+function getRole(context, node) {
+  // Early return if role is explicitly set
+  const explicitRole = getPropValue(getProp(node.attributes, 'role'))
+  if (explicitRole) {
+    return explicitRole
+  }
+
+  // Assemble a key for looking-up the element’s role in the `elementRolesMap`
+  // - Get the element’s name
+  const key = {name: getElementType(context, node)}
+
+  for (const prop of [
+    'aria-label',
+    'aria-labelledby',
+    'alt',
+    'type',
+    'size',
+    'role',
+    'href',
+    'multiple',
+    'scope',
+    'name',
+  ]) {
+    if ((prop === 'aria-labelledby' || prop === 'aria-label') && !['section', 'aside', 'form'].includes(key.name))
+      continue
+    if (prop === 'name' && key.name !== 'form') continue
+    if (prop === 'href' && key.name !== 'a' && key.name !== 'area') continue
+    if (prop === 'alt' && key.name !== 'img') continue
+
+    const propOnNode = getProp(node.attributes, prop)
+
+    if (!('attributes' in key)) {
+      key.attributes = []
+    }
+    // Disambiguate "undefined" props
+    if (propOnNode === undefined && prop === 'alt' && key.name === 'img') {
+      key.attributes.push({name: prop, constraints: ['undefined']})
+      continue
+    }
+
+    const value = getPropValue(propOnNode)
+    if (value || (value === '' && prop === 'alt')) {
+      if (
+        prop === 'href' ||
+        prop === 'aria-labelledby' ||
+        prop === 'aria-label' ||
+        prop === 'name' ||
+        (prop === 'alt' && value !== '')
+      ) {
+        key.attributes.push({name: prop, constraints: ['set']})
+      } else {
+        key.attributes.push({name: prop, value})
+      }
+    }
+  }
+
+  // - Remove empty `attributes` key
+  if (!key.attributes || key.attributes?.length === 0) {
+    delete key.attributes
+  }
+
+  // Get the element’s implicit role
+  return elementRolesMap.get(key)?.[0]
+}
+
+module.exports = {getRole}

From ba52acae2d55a5fb5fbb87701694f142f73c6bfc Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Tue, 11 Jul 2023 11:39:00 -0400
Subject: [PATCH 11/19] Add tests for getRole

---
 tests/utils/get-role.js | 120 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 tests/utils/get-role.js

diff --git a/tests/utils/get-role.js b/tests/utils/get-role.js
new file mode 100644
index 00000000..329e9c25
--- /dev/null
+++ b/tests/utils/get-role.js
@@ -0,0 +1,120 @@
+const {getRole} = require('../../lib/utils/get-role')
+const {mockJSXAttribute, mockJSXOpeningElement} = require('./helpers')
+const mocha = require('mocha')
+const describe = mocha.describe
+const it = mocha.it
+const expect = require('chai').expect
+
+describe('getRole', function () {
+  it('returns generic role for <span> regardless of attribute', function () {
+    const node = mockJSXOpeningElement('span', [mockJSXAttribute('aria-label', 'something')])
+    expect(getRole({}, node)).to.equal('generic')
+  })
+
+  it('returns generic role for <div> regardless of attribute', function () {
+    const node = mockJSXOpeningElement('div', [mockJSXAttribute('aria-describedby', 'something')])
+    expect(getRole({}, node)).to.equal('generic')
+  })
+
+  it('returns generic role for <a> without href', function () {
+    const node = mockJSXOpeningElement('a')
+    expect(getRole({}, node)).to.equal('generic')
+  })
+
+  it('returns link role for <a> with href', function () {
+    const node = mockJSXOpeningElement('a', [mockJSXAttribute('href', '#')])
+    expect(getRole({}, node)).to.equal('link')
+  })
+
+  it('returns region role for <section> with aria-label', function () {
+    const node = mockJSXOpeningElement('section', [mockJSXAttribute('aria-label', 'something')])
+    expect(getRole({}, node)).to.equal('region')
+  })
+
+  it('returns region role for <section> with aria-labelledby', function () {
+    const node = mockJSXOpeningElement('section', [mockJSXAttribute('aria-labelledby', 'something')])
+    expect(getRole({}, node)).to.equal('region')
+  })
+
+  it('returns complementary role for <aside> with aria-label', function () {
+    const node = mockJSXOpeningElement('aside', [mockJSXAttribute('aria-label', 'something')])
+    expect(getRole({}, node)).to.equal('complementary')
+  })
+
+  it('returns complementary role for <aside> with aria-labelledby', function () {
+    const node = mockJSXOpeningElement('aside', [mockJSXAttribute('aria-labelledby', 'something')])
+    expect(getRole({}, node)).to.equal('complementary')
+  })
+
+  it('returns img role for <img> with alt set explicitly', function () {
+    const node = mockJSXOpeningElement('img', [mockJSXAttribute('alt', 'Cute cat')])
+    expect(getRole({}, node)).to.equal('img')
+  })
+
+  it('returns img role for <img> with no alt', function () {
+    const node = mockJSXOpeningElement('img')
+    expect(getRole({}, node)).to.equal('img')
+  })
+
+  it('returns presentation role for <img> with alt set to empty', function () {
+    const node = mockJSXOpeningElement('img', [mockJSXAttribute('alt', '')])
+    expect(getRole({}, node)).to.equal('presentation')
+  })
+
+  it('returns form role for <form> with aria-label', function () {
+    const node = mockJSXOpeningElement('form', [mockJSXAttribute('aria-label', 'registration')])
+    expect(getRole({}, node)).to.equal('form')
+  })
+
+  it('returns form role for <form> with name attrribute', function () {
+    const node = mockJSXOpeningElement('form', [mockJSXAttribute('name', 'registration')])
+    expect(getRole({}, node)).to.equal('form')
+  })
+
+  it('returns undefined role for <form> with no attributes', function () {
+    const node = mockJSXOpeningElement('form')
+    expect(getRole({}, node)).to.equal(undefined)
+  })
+
+  it('returns explicitly set role', function () {
+    const spanButton = mockJSXOpeningElement('span', [mockJSXAttribute('role', 'button')])
+    expect(getRole({}, spanButton)).to.equal('button')
+
+    const divNav = mockJSXOpeningElement('div', [mockJSXAttribute('role', 'navigation')])
+    expect(getRole({}, divNav)).to.equal('navigation')
+
+    const listMenu = mockJSXOpeningElement('ul', [mockJSXAttribute('role', 'menu')])
+    expect(getRole({}, listMenu)).to.equal('menu')
+  })
+
+  it('returns heading role for heading tags', function () {
+    const h1 = mockJSXOpeningElement('h1')
+    expect(getRole({}, h1)).to.equal('heading')
+
+    const h2 = mockJSXOpeningElement('h2')
+    expect(getRole({}, h2)).to.equal('heading')
+
+    const h3 = mockJSXOpeningElement('h3')
+    expect(getRole({}, h3)).to.equal('heading')
+
+    const h4 = mockJSXOpeningElement('h4')
+    expect(getRole({}, h4)).to.equal('heading')
+
+    const h5 = mockJSXOpeningElement('h5')
+    expect(getRole({}, h5)).to.equal('heading')
+
+    const h6 = mockJSXOpeningElement('h6')
+    expect(getRole({}, h6)).to.equal('heading')
+  })
+
+  // <link> does not map to anything.
+  it('returns undefined role for <link>', function () {
+    const node = mockJSXOpeningElement('link')
+    expect(getRole({}, node)).to.equal(undefined)
+  })
+
+  it('returns undefined role for <link href="#">', function () {
+    const node = mockJSXOpeningElement('link', [mockJSXAttribute('href', '#')])
+    expect(getRole({}, node)).to.equal(undefined)
+  })
+})

From b12cda5770b47176b673e867d4c179c79481b268 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Tue, 11 Jul 2023 11:51:44 -0400
Subject: [PATCH 12/19] Add more tests for getRole

---
 tests/utils/get-role.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/utils/get-role.js b/tests/utils/get-role.js
index 329e9c25..6efe3bd4 100644
--- a/tests/utils/get-role.js
+++ b/tests/utils/get-role.js
@@ -107,6 +107,31 @@ describe('getRole', function () {
     expect(getRole({}, h6)).to.equal('heading')
   })
 
+  it('returns navigation role for <nav>', function () {
+    const node = mockJSXOpeningElement('nav')
+    expect(getRole({}, node)).to.equal('navigation')
+  })
+
+  it('returns option role for <opt>', function () {
+    const node = mockJSXOpeningElement('option')
+    expect(getRole({}, node)).to.equal('option')
+  })
+
+  it('returns textbox role for <textarea>', function () {
+    const node = mockJSXOpeningElement('textarea')
+    expect(getRole({}, node)).to.equal('textbox')
+  })
+
+  it('returns listbox role for <select>', function () {
+    const node = mockJSXOpeningElement('textarea')
+    expect(getRole({}, node)).to.equal('textbox')
+  })
+
+  it('returns group role for <details>', function () {
+    const node = mockJSXOpeningElement('details')
+    expect(getRole({}, node)).to.equal('group')
+  })
+
   // <link> does not map to anything.
   it('returns undefined role for <link>', function () {
     const node = mockJSXOpeningElement('link')

From 9136431f51dd1a72f04cba007954d2e2fc61a492 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:44:39 -0400
Subject: [PATCH 13/19] Add more test

---
 tests/utils/get-role.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/utils/get-role.js b/tests/utils/get-role.js
index 6efe3bd4..020567f3 100644
--- a/tests/utils/get-role.js
+++ b/tests/utils/get-role.js
@@ -132,6 +132,41 @@ describe('getRole', function () {
     expect(getRole({}, node)).to.equal('group')
   })
 
+  it('returns group role for <details>', function () {
+    const node = mockJSXOpeningElement('details')
+    expect(getRole({}, node)).to.equal('group')
+  })
+
+  // <input>
+  it('returns slider role for <input> with type range', function () {
+    const node = mockJSXOpeningElement('input', [mockJSXAttribute('type', 'range')])
+    expect(getRole({}, node)).to.equal('slider')
+  })
+
+  it('returns spinbutton for <input> with type number', function () {
+    const node = mockJSXOpeningElement('input', [mockJSXAttribute('type', 'number')])
+    expect(getRole({}, node)).to.equal('spinbutton')
+  })
+
+  it('returns checkbox for <input> with type checkbox', function () {
+    const node = mockJSXOpeningElement('input', [mockJSXAttribute('type', 'checkbox')])
+    expect(getRole({}, node)).to.equal('checkbox')
+  })
+
+  it('returns button for <input> with type button, image, reset, submit', function () {
+    const button = mockJSXOpeningElement('input', [mockJSXAttribute('type', 'button')])
+    expect(getRole({}, button)).to.equal('button')
+
+    const image = mockJSXOpeningElement('input', [mockJSXAttribute('type', 'image')])
+    expect(getRole({}, image)).to.equal('button')
+
+    const reset = mockJSXOpeningElement('input', [mockJSXAttribute('type', 'reset')])
+    expect(getRole({}, reset)).to.equal('button')
+
+    const submit = mockJSXOpeningElement('input', [mockJSXAttribute('type', 'submit')])
+    expect(getRole({}, submit)).to.equal('button')
+  })
+
   // <link> does not map to anything.
   it('returns undefined role for <link>', function () {
     const node = mockJSXOpeningElement('link')

From 2fa5ecab5b48d9e3975d135604da71a67e3d4039 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Wed, 12 Jul 2023 09:56:35 -0400
Subject: [PATCH 14/19] Remove more forgotten, unnecessary code

---
 lib/rules/role-supports-aria-props.js | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/lib/rules/role-supports-aria-props.js b/lib/rules/role-supports-aria-props.js
index 67c112e9..b6ba0710 100644
--- a/lib/rules/role-supports-aria-props.js
+++ b/lib/rules/role-supports-aria-props.js
@@ -1,27 +1,7 @@
 // @ts-check
-const {aria, elementRoles, roles} = require('aria-query')
+const {aria, roles} = require('aria-query')
 const {getPropValue, propName} = require('jsx-ast-utils')
 const {getRole} = require('../utils/get-role')
-const ObjectMap = require('../utils/object-map')
-
-// Clean-up `elementRoles` from `aria-query`
-const elementRolesMap = new ObjectMap()
-for (const [key, value] of elementRoles.entries()) {
-  // - Remove unused `constraints` key
-  delete key.constraints
-  // - Remove empty `attributes` key
-  if (!key.attributes || key.attributes?.length === 0) {
-    delete key.attributes
-  }
-  elementRolesMap.set(key, value)
-}
-// - Remove insufficiently-disambiguated `menuitem` entry
-elementRolesMap.delete({name: 'menuitem'})
-// - Disambiguate `menuitem` and `menu` roles by `type`
-elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'command'}]}, ['menuitem'])
-elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'radio'}]}, ['menuitemradio'])
-elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
-elementRolesMap.set({name: 'menu', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
 
 module.exports = {
   meta: {

From b2ed30efdafe8c6afade1f775cb4fa5ccc3373c9 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Wed, 12 Jul 2023 12:40:14 -0400
Subject: [PATCH 15/19] Rename helpers to mocks

---
 tests/utils/get-element-type.js      | 2 +-
 tests/utils/get-role.js              | 2 +-
 tests/utils/{helpers.js => mocks.js} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/utils/{helpers.js => mocks.js} (100%)

diff --git a/tests/utils/get-element-type.js b/tests/utils/get-element-type.js
index 87b8cecc..38079301 100644
--- a/tests/utils/get-element-type.js
+++ b/tests/utils/get-element-type.js
@@ -1,5 +1,5 @@
 const {getElementType} = require('../../lib/utils/get-element-type')
-const {mockJSXAttribute, mockJSXOpeningElement} = require('./helpers')
+const {mockJSXAttribute, mockJSXOpeningElement} = require('./mocks')
 
 const mocha = require('mocha')
 const describe = mocha.describe
diff --git a/tests/utils/get-role.js b/tests/utils/get-role.js
index 020567f3..378276dc 100644
--- a/tests/utils/get-role.js
+++ b/tests/utils/get-role.js
@@ -1,5 +1,5 @@
 const {getRole} = require('../../lib/utils/get-role')
-const {mockJSXAttribute, mockJSXOpeningElement} = require('./helpers')
+const {mockJSXAttribute, mockJSXOpeningElement} = require('./mocks')
 const mocha = require('mocha')
 const describe = mocha.describe
 const it = mocha.it
diff --git a/tests/utils/helpers.js b/tests/utils/mocks.js
similarity index 100%
rename from tests/utils/helpers.js
rename to tests/utils/mocks.js

From 8fb64196e8aa8df8819facda7284100f2577a30a Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Wed, 12 Jul 2023 16:53:18 -0400
Subject: [PATCH 16/19] Delete constraints, and hard-code roles we benefit from
 enforcing despite constraints

---
 lib/utils/get-role.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/utils/get-role.js b/lib/utils/get-role.js
index 99ef0edf..c9ca3e72 100644
--- a/lib/utils/get-role.js
+++ b/lib/utils/get-role.js
@@ -3,27 +3,32 @@ const {elementRoles} = require('aria-query')
 const {getElementType} = require('./get-element-type')
 const ObjectMap = require('./object-map')
 
-// Clean-up `elementRoles` from `aria-query`
+// Clean-up `elementRoles` from `aria-query`.
 const elementRolesMap = new ObjectMap()
 for (const [key, value] of elementRoles.entries()) {
-  // - Remove unused `constraints` key
-  delete key.constraints
   // - Remove empty `attributes` key
   if (!key.attributes || key.attributes?.length === 0) {
     delete key.attributes
   }
   elementRolesMap.set(key, value)
 }
-// - Remove insufficiently-disambiguated `menuitem` entry
+// Remove insufficiently-disambiguated `menuitem` entry
 elementRolesMap.delete({name: 'menuitem'})
-// - Disambiguate `menuitem` and `menu` roles by `type`
+// Disambiguate `menuitem` and `menu` roles by `type`
 elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'command'}]}, ['menuitem'])
 elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'radio'}]}, ['menuitemradio'])
 elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
 elementRolesMap.set({name: 'menu', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
 
+/* These have constraints defined in aria-query's `elementRoles` which depend on knowledge of ancestor roles which we cant accurately determine in a linter context.
+   However, we benefit more from assuming the role, than assuming it's generic or undefined so we opt to hard code the mapping */
+elementRolesMap.set({name: 'aside'}, ['complementary']) // `aside` still maps to `complementary` in https://www.w3.org/TR/html-aria/#docconformance.
+elementRolesMap.set({name: 'li'}, ['listitem']) // `li` can be generic if it's not within a list but we would never want to render `li` outside of a list.
+
 /*
   Determine role of an element, based on its name and attributes.
+  We construct a key and look up the element's role in `elementRolesMap`.
+  If there is no match, we return undefined.
 */
 function getRole(context, node) {
   // Early return if role is explicitly set
@@ -48,8 +53,7 @@ function getRole(context, node) {
     'scope',
     'name',
   ]) {
-    if ((prop === 'aria-labelledby' || prop === 'aria-label') && !['section', 'aside', 'form'].includes(key.name))
-      continue
+    if ((prop === 'aria-labelledby' || prop === 'aria-label') && !['section', 'form'].includes(key.name)) continue
     if (prop === 'name' && key.name !== 'form') continue
     if (prop === 'href' && key.name !== 'a' && key.name !== 'area') continue
     if (prop === 'alt' && key.name !== 'img') continue

From 5a660335fa181a63d257d0c09e47e5c787f9c60e Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Wed, 12 Jul 2023 16:54:09 -0400
Subject: [PATCH 17/19] update tests

---
 tests/role-supports-aria-props.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/role-supports-aria-props.js b/tests/role-supports-aria-props.js
index d215eb02..0192b96d 100644
--- a/tests/role-supports-aria-props.js
+++ b/tests/role-supports-aria-props.js
@@ -348,7 +348,7 @@ ruleTester.run('role-supports-aria-props', rule, {
     },
     {
       code: '<aside aria-checked />',
-      errors: [getErrorMessage('aria-checked', 'generic')],
+      errors: [getErrorMessage('aria-checked', 'complementary')],
     },
     {
       code: '<ul aria-expanded />',
@@ -364,7 +364,7 @@ ruleTester.run('role-supports-aria-props', rule, {
     },
     {
       code: '<aside aria-expanded />',
-      errors: [getErrorMessage('aria-expanded', 'generic')],
+      errors: [getErrorMessage('aria-expanded', 'complementary')],
     },
     {
       code: '<article aria-expanded />',

From aaca700b73ca9bc778bf254defc78eecd7e6e1e9 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Wed, 12 Jul 2023 16:54:26 -0400
Subject: [PATCH 18/19] add more test coverage of roles

---
 tests/utils/get-role.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/utils/get-role.js b/tests/utils/get-role.js
index 378276dc..6ee41ec4 100644
--- a/tests/utils/get-role.js
+++ b/tests/utils/get-role.js
@@ -167,6 +167,27 @@ describe('getRole', function () {
     expect(getRole({}, submit)).to.equal('button')
   })
 
+  it('returns rowheader role for <th scope="row">', function () {
+    const node = mockJSXOpeningElement('th', [mockJSXAttribute('scope', 'row')])
+    expect(getRole({}, node)).to.equal('rowheader')
+  })
+
+  it('returns rowheader role for <th scope="rowgroup">', function () {
+    const node = mockJSXOpeningElement('th', [mockJSXAttribute('scope', 'rowgroup')])
+    expect(getRole({}, node)).to.equal('rowheader')
+  })
+
+  // Hard-coded mapping
+  it('returns listitem role for <li>', function () {
+    const node = mockJSXOpeningElement('li')
+    expect(getRole({}, node)).to.equal('listitem')
+  })
+
+  it('returns complementary role for <aside>', function () {
+    const node = mockJSXOpeningElement('aside')
+    expect(getRole({}, node)).to.equal('complementary')
+  })
+
   // <link> does not map to anything.
   it('returns undefined role for <link>', function () {
     const node = mockJSXOpeningElement('link')

From 40c0b2b7a518b36b238adebae6911f0cee1156d4 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Wed, 12 Jul 2023 17:13:21 -0400
Subject: [PATCH 19/19] Move map constructing code into a function

---
 lib/utils/get-role.js | 49 ++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/lib/utils/get-role.js b/lib/utils/get-role.js
index c9ca3e72..b69431d7 100644
--- a/lib/utils/get-role.js
+++ b/lib/utils/get-role.js
@@ -3,27 +3,38 @@ const {elementRoles} = require('aria-query')
 const {getElementType} = require('./get-element-type')
 const ObjectMap = require('./object-map')
 
-// Clean-up `elementRoles` from `aria-query`.
-const elementRolesMap = new ObjectMap()
-for (const [key, value] of elementRoles.entries()) {
-  // - Remove empty `attributes` key
-  if (!key.attributes || key.attributes?.length === 0) {
-    delete key.attributes
+const elementRolesMap = cleanElementRolesMap()
+
+/*
+  Returns an element roles map which uses `aria-query`'s elementRoles as the foundation.
+  We additionally clean the data so we're able to fetch a role using a key we construct based on the node we're looking at.
+  In a few scenarios, we stray from the roles returned by `aria-query` and hard code the mapping.
+*/
+function cleanElementRolesMap() {
+  const rolesMap = new ObjectMap()
+
+  for (const [key, value] of elementRoles.entries()) {
+    // - Remove empty `attributes` key
+    if (!key.attributes || key.attributes?.length === 0) {
+      delete key.attributes
+    }
+    rolesMap.set(key, value)
   }
-  elementRolesMap.set(key, value)
-}
-// Remove insufficiently-disambiguated `menuitem` entry
-elementRolesMap.delete({name: 'menuitem'})
-// Disambiguate `menuitem` and `menu` roles by `type`
-elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'command'}]}, ['menuitem'])
-elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'radio'}]}, ['menuitemradio'])
-elementRolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
-elementRolesMap.set({name: 'menu', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
+  // Remove insufficiently-disambiguated `menuitem` entry
+  rolesMap.delete({name: 'menuitem'})
+  // Disambiguate `menuitem` and `menu` roles by `type`
+  rolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'command'}]}, ['menuitem'])
+  rolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'radio'}]}, ['menuitemradio'])
+  rolesMap.set({name: 'menuitem', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
+  rolesMap.set({name: 'menu', attributes: [{name: 'type', value: 'toolbar'}]}, ['toolbar'])
 
-/* These have constraints defined in aria-query's `elementRoles` which depend on knowledge of ancestor roles which we cant accurately determine in a linter context.
-   However, we benefit more from assuming the role, than assuming it's generic or undefined so we opt to hard code the mapping */
-elementRolesMap.set({name: 'aside'}, ['complementary']) // `aside` still maps to `complementary` in https://www.w3.org/TR/html-aria/#docconformance.
-elementRolesMap.set({name: 'li'}, ['listitem']) // `li` can be generic if it's not within a list but we would never want to render `li` outside of a list.
+  /* These have constraints defined in aria-query's `elementRoles` which depend on knowledge of ancestor roles which we cant accurately determine in a linter context.
+     However, we benefit more from assuming the role, than assuming it's generic or undefined so we opt to hard code the mapping */
+  rolesMap.set({name: 'aside'}, ['complementary']) // `aside` still maps to `complementary` in https://www.w3.org/TR/html-aria/#docconformance.
+  rolesMap.set({name: 'li'}, ['listitem']) // `li` can be generic if it's not within a list but we would never want to render `li` outside of a list.
+
+  return rolesMap
+}
 
 /*
   Determine role of an element, based on its name and attributes.