fix: dual run aria-query and html-aria for dpub spec support

Author: cmorten

src/getNodeAccessibilityData/getAccessibleAttributeLabels/getAttributesByRole.ts

@@ -10,6 +10,8 @@ export const getAttributesByRole = ({
   accessibleValue: string;
   role: string;
 }): [string, string | null][] => {
+  // TODO: swap out with the html-aria package if implicit role attributes
+  // become supported.
   const {
     props: implicitRoleAttributes = {},
     prohibitedProps: prohibitedAttributes = [],

src/getNodeAccessibilityData/getRole.ts

@@ -1,21 +1,27 @@
 import {
   type AncestorList,
   getRole as getImplicitRole,
+  roles,
   type TagName,
   type VirtualElement,
 } from "html-aria";
+import { roles as backupRoles } from "aria-query";
 import { getLocalName } from "../getLocalName";
 import { isElement } from "../isElement";
-import { roles } from "aria-query";
 
 export const presentationRoles = new Set(["presentation", "none"]);
 
-const allowedNonAbstractRoles = new Set(
-  roles
+const allowedNonAbstractRoles = new Set([
+  ...(Object.entries(roles)
+    .filter(([, { type }]) => !type.includes("abstract"))
+    .map(([key]) => key) as string[]),
+  // TODO: remove once the `html-aria` package supports `dpub-aam` /
+  // `dpub-aria` specifications.
+  ...(backupRoles
     .entries()
     .filter(([, { abstract }]) => !abstract)
-    .map(([key]) => key) as string[]
-);
+    .map(([key]) => key) as string[]),
+]);
 
 const rolesRequiringName = new Set(["form", "region"]);
 

src/getNodeAccessibilityData/index.ts

@@ -5,6 +5,7 @@ import { getAccessibleName } from "./getAccessibleName";
 import { getAccessibleValue } from "./getAccessibleValue";
 import { isElement } from "../isElement";
 
+// TODO: swap out with the html-aria package if this property becomes supported.
 const childrenPresentationalRoles = new Set(
   roles
     .entries()

test/wpt-jsdom/to-run.yaml

@@ -279,7 +279,6 @@ aria-valuetext_value_changes-manual.html:
   ]
 combobox-value-calculation-manual.html:
   [timeout, value taken from text content not implemented]
-comment-manual.html: [timeout, upstream issue with html-aria package]
 deletion-manual.html: [fail, syntax error in test - fix needed in WPT]
 exclude_element_hidden_with_*:
   [
@@ -302,7 +301,6 @@ heading-no-level-manual.html:
     skip,
     targets accessibility APIs whose mappings have not been implemented in this test suite yet,
   ]
-image-manual.html: [timeout, upstream issue with html-aria package]
 include_element_*:
   [
     skip,
@@ -336,6 +334,7 @@ tablist-level-not-supported-manual.html:
     skip,
     targets accessibility APIs whose mappings have not been implemented in this test suite yet,
   ]
+
 ---
 DIR: dpub-aam
 
@@ -455,14 +454,10 @@ role/menu-roles.tentative.html:
     [fail, upstream issue with html-aria package]
   "orphan button with menuitemradio role":
     [fail, upstream issue with html-aria package]
-role/roles.html:
-  "role: suggestion": [fail, upstream issue with html-aria package]
 role/roles.tentative.html:
   "role: sectionheader": [fail, upstream issue with html-aria package]
   "role: sectionfooter": [fail, upstream issue with html-aria package]
 role/synonym-roles.html:
-  "image role == computedrole image":
-    [fail, upstream issue with html-aria packages]
   "synonym img role == computedrole image":
     [fail, upstream issue with html-aria packages]
   "directory role == computedrole list":