Merge remote-tracking branch 'upstream/main'

Author: Lehoczky Zoltán

Diff for: src/rules/no-redundant-roles.ts

@@ -13,14 +13,22 @@ import {
 const exceptions: { [type: string]: string[] } = { nav: ["navigation"] };
 
 function getImplicitRoleSet(node: AST.VElement): any[] | null {
-  for (const [elementRole, roleSet] of elementRoles.entries()) {
-    if (matchesElementRole(node, elementRole)) {
-      // The types for this are wrong, it's actually a string[]
-      return roleSet as unknown as any[];
-    }
-  }
+  const matchingRoles = elementRoles.entries()
+    .filter(([consept]) => {
+      return matchesElementRole(node, consept);
+    })
+    .sort(([a], [b]) => {
+      // try ordering by the concept that is more difficult to match first.
+      // the number of attributes needed to "match" is used here as a proxy of
+      // that difficulty.
+      return (b.attributes?.length ?? 0) - (a.attributes?.length ?? 0);
+    });
+
+  const [preferedRole] = matchingRoles;
+  const [, roleSet = null] = preferedRole || [];
 
-  return null;
+  // The types for this are wrong, it's actually a string[]
+  return roleSet as unknown as string[];
 }
 
 const rule: Rule.RuleModule = {

Diff for: src/utils/getElementType.ts

@@ -3,6 +3,13 @@ import type { AST } from "vue-eslint-parser";
 import getElementAttributeValue from "./getElementAttributeValue";
 import makeKebabCase from "./makeKebabCase";
 
+/**
+ * Returns a kebab-normalized string representing the element node name
+ * or, if the `is` attribute is a string, its value if present.
+ * @example <div is="foo-bar"> => "foo-bar"
+ * @example <foo-bar> => "foo-bar"
+ * @example <div> => "div"
+ */
 function getElementType(node: AST.VElement) {
   let is = getElementAttributeValue(node, "is");