[WIP] [DO NOT MERGE] v4.3.3 diff

.gitignore

@@ -28,3 +28,4 @@ typings/axe-core/axe-core-tests.js
 # doc
 doc/rule-descriptions.*.md
 
+.history

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "axe-core",
-  "version": "4.3.3",
+  "version": "4.3.3-canary.2",
   "contributors": [
     {
       "name": "David Sturley",

build/configure.js

@@ -10,10 +10,8 @@ var entities = new (require('html-entities').AllHtmlEntities)();
 var packageJSON = require('../package.json');
 var dotRegex = /\{\{.+?\}\}/g;
 
-var axeVersion = packageJSON.version.substring(
-  0,
-  packageJSON.version.lastIndexOf('.')
-);
+var _v = packageJSON.version.replace(/-\w+\.\w+$/, '');
+var axeVersion = _v.substring(0, _v.lastIndexOf('.'));
 
 var descriptionTableHeader =
   '| Rule ID | Description | Impact | Tags | Issue Type | ACT Rules |\n| :------- | :------- | :------- | :------- | :------- | :------- |\n';

build/tasks/update-help.js

@@ -9,7 +9,7 @@ module.exports = function(grunt) {
       var options = this.options({
         version: '1.0.0'
       });
-      var v = options.version.split('.');
+      var v = options.version.replace(/-\w+\.\w+$/, '').split('.');
       v.pop();
       var baseUrl =
         'https://dequeuniversity.com/rules/axe/' + v.join('.') + '/';

doc/examples/qunit/Gruntfile.js

@@ -5,7 +5,7 @@ module.exports = function(grunt) {
 
   grunt.initConfig({
     qunit: {
-      all: ['test/**/*.html']
+      all: ['test/**/*.html', 'test/**/*__.xhtml']
     }
   });
 };

doc/rule-descriptions.md

@@ -74,6 +74,7 @@
 | [autocomplete-valid](https://dequeuniversity.com/rules/axe/4.3/autocomplete-valid?application=RuleDescription)     | Ensure the autocomplete attribute is correct and suitable for the form field                  | Serious | cat.forms, wcag21aa, wcag135      | failure           | [73f2c2](https://act-rules.github.io/rules/73f2c2) |
 | [avoid-inline-spacing](https://dequeuniversity.com/rules/axe/4.3/avoid-inline-spacing?application=RuleDescription) | Ensure that text spacing set through style attributes can be adjusted with custom stylesheets | Serious | cat.structure, wcag21aa, wcag1412 | failure           |                                                    |
 | [empty-table-header](https://dequeuniversity.com/rules/axe/4.3/empty-table-header?application=RuleDescription)     | Ensures table headers have discernible text                                                   | Minor   | wcag131, cat.aria                 | needs review |                                                    |
+| [pagebreak-label](https://dequeuniversity.com/rules/axe/4.3/pagebreak-label?application=RuleDescription)           | Ensure page markers have an accessible label                                                  | Serious | cat.epub                          | failure           |                                                    |
 
 ## Best Practices Rules
 
@@ -87,6 +88,7 @@ Rules that do not necessarily conform to WCAG success criterion but are industry
 | [aria-text](https://dequeuniversity.com/rules/axe/4.3/aria-text?application=RuleDescription)                                                     | Ensures "role=text" is used on elements with no focusable descendants                            | Serious            | cat.aria, best-practice                         | failure, needs review |                                                                                                        |
 | [aria-treeitem-name](https://dequeuniversity.com/rules/axe/4.3/aria-treeitem-name?application=RuleDescription)                                   | Ensures every ARIA treeitem node has an accessible name                                                    | Serious            | cat.aria, best-practice                         | failure, needs review |                                                                                                        |
 | [empty-heading](https://dequeuniversity.com/rules/axe/4.3/empty-heading?application=RuleDescription)                                             | Ensures headings have discernible text                                                                     | Minor              | cat.name-role-value, best-practice              | failure, needs review |                                                                                                        |
+| [epub-type-has-matching-role](https://dequeuniversity.com/rules/axe/4.3/epub-type-has-matching-role?application=RuleDescription)                 | Ensure the element has an ARIA role matching its epub:type                                                 | Minor              | best-practice, cat.aria                         | failure                    |                                                                                                        |
 | [frame-tested](https://dequeuniversity.com/rules/axe/4.3/frame-tested?application=RuleDescription)                                               | Ensures <iframe> and <frame> elements contain the axe-core script                              | Critical           | cat.structure, review-item, best-practice       | failure, needs review |                                                                                                        |
 | [frame-title-unique](https://dequeuniversity.com/rules/axe/4.3/frame-title-unique?application=RuleDescription)                                   | Ensures <iframe> and <frame> elements contain a unique title attribute                         | Serious            | cat.text-alternatives, best-practice            | failure                    |                                                                                                        |
 | [heading-order](https://dequeuniversity.com/rules/axe/4.3/heading-order?application=RuleDescription)                                             | Ensures the order of headings is semantically correct                                                      | Moderate           | cat.semantics, best-practice                    | failure, needs review |                                                                                                        |
@@ -100,7 +102,7 @@ Rules that do not necessarily conform to WCAG success criterion but are industry
 | [landmark-no-duplicate-banner](https://dequeuniversity.com/rules/axe/4.3/landmark-no-duplicate-banner?application=RuleDescription)               | Ensures the document has at most one banner landmark                                                       | Moderate           | cat.semantics, best-practice                    | failure                    |                                                                                                        |
 | [landmark-no-duplicate-contentinfo](https://dequeuniversity.com/rules/axe/4.3/landmark-no-duplicate-contentinfo?application=RuleDescription)     | Ensures the document has at most one contentinfo landmark                                                  | Moderate           | cat.semantics, best-practice                    | failure                    |                                                                                                        |
 | [landmark-no-duplicate-main](https://dequeuniversity.com/rules/axe/4.3/landmark-no-duplicate-main?application=RuleDescription)                   | Ensures the document has at most one main landmark                                                         | Moderate           | cat.semantics, best-practice                    | failure                    |                                                                                                        |
-| [landmark-one-main](https://dequeuniversity.com/rules/axe/4.3/landmark-one-main?application=RuleDescription)                                     | Ensures the document has a main landmark                                                                   | Moderate           | cat.semantics, best-practice                    | failure                    |                                                                                                        |
+| [landmark-one-main](https://dequeuniversity.com/rules/axe/4.3/landmark-one-main?application=RuleDescription)                                     | Ensures the document has a unique main landmark                                                            | Moderate           | cat.semantics, best-practice                    | failure                    |                                                                                                        |
 | [landmark-unique](https://dequeuniversity.com/rules/axe/4.3/landmark-unique?application=RuleDescription)                                         | Landmarks should have a unique role or role/label/title (i.e. accessible name) combination                 | Moderate           | cat.semantics, best-practice                    | failure                    |                                                                                                        |
 | [meta-viewport-large](https://dequeuniversity.com/rules/axe/4.3/meta-viewport-large?application=RuleDescription)                                 | Ensures <meta name="viewport"> can scale a significant amount                              | Minor              | cat.sensory-and-visual-cues, best-practice      | failure                    |                                                                                                        |
 | [meta-viewport](https://dequeuniversity.com/rules/axe/4.3/meta-viewport?application=RuleDescription)                                             | Ensures <meta name="viewport"> does not disable text scaling and zooming                   | Critical           | cat.sensory-and-visual-cues, best-practice, ACT | failure                    | [b4f0c3](https://act-rules.github.io/rules/b4f0c3)                                                     |

lib/checks/aria/aria-prohibited-attr-evaluate.js

@@ -52,7 +52,7 @@ function ariaProhibitedAttrEvaluate(node, options = {}, virtualNode) {
 }
 
 function listProhibitedAttrs(virtualNode, elementsAllowedAriaLabel) {
-  const role = getRole(virtualNode, { chromium: true });
+  const role = getRole(virtualNode, { dpub: true, chromium: true });
   const roleSpec = standards.ariaRoles[role];
   if (roleSpec) {
     return roleSpec.prohibitedAttrs || [];

lib/checks/aria/aria-required-children-evaluate.js

@@ -10,11 +10,17 @@ import { hasContentVirtual, idrefs } from '../../commons/dom';
  * Get all owned roles of an element
  */
 function getOwnedRoles(virtualNode, required) {
+  // DAISY-AXE
+  const parentRole = getRole(virtualNode, { dpub: true });
+
   const ownedRoles = [];
   const ownedElements = getOwnedVirtual(virtualNode);
   for (let i = 0; i < ownedElements.length; i++) {
     const ownedElement = ownedElements[i];
-    const role = getRole(ownedElement, { noPresentational: true });
+
+    // DAISY-AXE
+    const role = getRole(ownedElement, { noPresentational: true, dpub: true });
+    // const role = getRole(ownedElement, { noPresentational: true });
 
     // if owned node has no role or is presentational, or if role
     // allows group or rowgroup, we keep parsing the descendant tree.
@@ -23,7 +29,10 @@ function getOwnedRoles(virtualNode, required) {
     if (
       !role ||
       (['group', 'rowgroup'].includes(role) &&
-        required.some(requiredRole => requiredRole === role))
+        required.some(requiredRole => requiredRole === role)) ||
+      // DAISY-AXE
+      (['list'].includes(role) &&
+        ['doc-bibliography', 'doc-endnotes'].includes(parentRole))
     ) {
       ownedElements.push(...ownedElement.children);
     } else if (role) {

lib/checks/aria/matching-aria-role-evaluate.js

@@ -0,0 +1,185 @@
+import { tokenList } from '../../core/utils';
+import { getRole } from '../../commons/aria';
+import matchesSelector from '../../core/utils/element-matches';
+
+function matchingAriaRoleEvaluate(node) {
+  // https://idpf.github.io/epub-guides/epub-aria-authoring/#sec-mappings
+  // https://www.w3.org/TR/dpub-aam-1.0/#mapping_role_table
+  // https://w3c.github.io/publ-cg/guides/aria-mapping.html#mapping-table
+  const mappings = new Map([
+    ['abstract', 'doc-abstract'],
+    ['acknowledgments', 'doc-acknowledgments'],
+    ['afterword', 'doc-afterword'],
+    // ['answer', '??'],
+    // ['answers', '??'],
+    ['appendix', 'doc-appendix'],
+    // ['assessment', '??'],
+    // ['assessments', '??'],
+    // ['backmatter', '??'],
+    // ['balloon', '??'],
+    // ['backlink', 'doc-backlink'], // ??
+    ['biblioentry', 'doc-biblioentry'],
+    ['bibliography', 'doc-bibliography'],
+    ['biblioref', 'doc-biblioref'],
+    // ['bodymatter', '??'],
+    // ['bridgehead', '??'],
+    // ['case-study', '??'],
+    ['chapter', 'doc-chapter'],
+    ['colophon', 'doc-colophon'],
+    // ['concluding-sentence', '??'],
+    ['conclusion', 'doc-conclusion'],
+    // ['contributors', '??'],
+    // ['copyright-page', '??'],
+    // ['cover', '??'],
+    // ['cover-image', 'doc-cover'], // ??
+    // ['covertitle', '??'],
+    ['credit', 'doc-credit'],
+    ['credits', 'doc-credits'],
+    ['dedication', 'doc-dedication'],
+    // ['division', '??'],
+    ['endnote', 'doc-endnote'],
+    ['endnotes', 'doc-endnotes'],
+    ['epigraph', 'doc-epigraph'],
+    ['epilogue', 'doc-epilogue'],
+    ['errata', 'doc-errata'],
+    // ['example', 'doc-example'],
+    // ['feedback', '??'],
+    ['figure', 'figure'], // ARIA
+    // ['fill-in-the-blank-problem', '??'],
+    ['footnote', 'doc-footnote'],
+    // ['footnotes', '??'],
+    ['foreword', 'doc-foreword'],
+    // ['frontmatter', '??'],
+    // ['fulltitle', '??'],
+    // ['general-problem', '??'],
+    ['glossary', 'doc-glossary'],
+    ['glossdef', 'definition'], // ARIA
+    ['glossref', 'doc-glossref'],
+    ['glossterm', 'term'], // ARIA
+    // ['halftitle', '??'],
+    // ['halftitlepage', '??'],
+    // ['imprimatur', '??'],
+    // ['imprint', '??'],
+    ['help', 'doc-tip'], // ??
+    ['index', 'doc-index'],
+    // ['index-editor-note', '??'],
+    // ['index-entry', '??'],
+    // ['index-entry-list', '??'],
+    // ['index-group', '??'],
+    // ['index-headnotes', '??'],
+    // ['index-legend', '??'],
+    // ['index-locator', '??'],
+    // ['index-locator-list', '??'],
+    // ['index-locator-range', '??'],
+    // ['index-term', '??'],
+    // ['index-term-categories', '??'],
+    // ['index-term-category', '??'],
+    // ['index-xref-preferred', '??'],
+    // ['index-xref-related', '??'],
+    ['introduction', 'doc-introduction'],
+    // ['keyword', '??'],
+    // ['keywords', '??'],
+    // ['label', '??'],
+    // ['landmarks', 'directory'], // ARIA (SKIPPED! NavDoc)
+    // ['learning-objective', '??'],
+    // ['learning-objectives', '??'],
+    // ['learning-outcome', '??'],
+    // ['learning-outcomes', '??'],
+    // ['learning-resource', '??'],
+    // ['learning-resources', '??'],
+    // ['learning-standard', '??'],
+    // ['learning-standards', '??'],
+    ['list', 'list'], // ARIA
+    ['list-item', 'listitem'], // ARIA
+    // ['loa', '??'],
+    // ['loi', '??'],
+    // ['lot', '??'],
+    // ['lov', '??'],
+    // ['match-problem', '??'],
+    // ['multiple-choice-problem', '??'],
+    ['noteref', 'doc-noteref'],
+    ['notice', 'doc-notice'],
+    // ['ordinal', '??'],
+    // ['other-credits', '??'],
+    ['page-list', 'doc-pagelist'],
+    ['pagebreak', 'doc-pagebreak'],
+    // ['panel', '??'],
+    // ['panel-group', '??'],
+    ['part', 'doc-part'],
+    // ['practice', '??'],
+    // ['practices', '??'],
+    // ['preamble', '??'],
+    ['preface', 'doc-preface'],
+    ['prologue', 'doc-prologue'],
+    ['pullquote', 'doc-pullquote'],
+    ['qna', 'doc-qna'],
+    // ['question', '??'],
+    ['referrer', 'doc-backlink'],
+    // ['revision-history', '??'],
+    // ['seriespage', '??'],
+    // ['sound-area', '??'],
+    // ['subchapter', '??'],
+    ['subtitle', 'doc-subtitle'],
+    ['table', 'table'],
+    ['table-cell', 'cell'],
+    ['table-row', 'row'],
+    // ['text-area', '??'],
+    ['tip', 'doc-tip'],
+    // ['title', '??'],
+    // ['titlepage', '??'],
+    ['toc', 'doc-toc']
+    // ['toc-brief', '??'],
+    // ['topic-sentence', '??'],
+    // ['true-false-problem', '??'],
+    // ['volume', '??'],
+  ]);
+
+  const hasXmlEpubType = node.hasAttributeNS(
+    'http://www.idpf.org/2007/ops',
+    'type'
+  );
+  if (
+    hasXmlEpubType ||
+    node.hasAttribute('epub:type') // for unit tests that are not XML-aware due to fixture.innerHTML
+  ) {
+    // abort if descendant of landmarks nav (nav with epub:type=landmarks)
+    if (
+      (hasXmlEpubType && matchesSelector(node, 'nav[*|type~="landmarks"] *')) ||
+      matchesSelector(node, 'nav[epub\\:type~="landmarks"] *')
+    ) {
+      // console.log('BREAKPOINT');
+      // throw new Error('BREAKPOINT');
+      return true;
+    }
+
+    // iterate for each epub:type value
+    var types = tokenList(
+      hasXmlEpubType
+        ? node.getAttributeNS('http://www.idpf.org/2007/ops', 'type')
+        : node.getAttribute('epub:type')
+    );
+    for (const type of types) {
+      // If there is a 1-1 mapping, check that the role is set (best practice)
+      if (mappings.has(type)) {
+        // Note: using axe’s `getRole` util returns the effective role of the element
+        // (either explicitly set with the role attribute or implicit)
+        // So this works for types mapping to core ARIA roles (eg. glossref/glossterm).
+        const mappedRole = mappings.get(type);
+        const role = getRole(node, { dpub: true });
+        // if (mappedRole !== role) {
+        // 	console.log('BREAKPOINT: ', type, mappedRole, role);
+        // 	// throw new Error('BREAKPOINT');
+        // }
+        return mappedRole === role;
+      } else {
+        // e.g. cover, landmarks
+        // console.log('BREAKPOINT: ', type);
+        // throw new Error('BREAKPOINT');
+      }
+    }
+  }
+
+  return true;
+}
+
+export default matchingAriaRoleEvaluate;

lib/checks/aria/matching-aria-role.json

@@ -0,0 +1,11 @@
+{
+  "id": "matching-aria-role",
+  "evaluate": "matching-aria-role-evaluate",
+  "metadata": {
+    "impact": "minor",
+    "messages": {
+      "pass": "Element has an ARIA role matching its epub:type",
+      "fail": "Element has no ARIA role matching its epub:type"
+    }
+  }
+}

lib/checks/landmarks/landmark-is-unique-after.js

@@ -1,11 +1,20 @@
 function landmarkIsUniqueAfter(results) {
   var uniqueLandmarks = [];
 
+  // console.log("landmarkIsUniqueAfter results: ", JSON.stringify(results, null, 4));
+
   // filter out landmark elements that share the same role and accessible text
   // so every non-unique landmark isn't reported as a failure (just the first)
-  return results.filter(currentResult => {
+  var filtered = results.filter(currentResult => {
+    if (!currentResult.data) {
+      // console.log('landmarkIsUniqueAfterlandmarkIsUniqueAfter NO DATA???!!!');
+      return false;
+    }
+
     var findMatch = someResult => {
       return (
+        // currentResult.data.isLandmark &&
+        // someResult.data.isLandmark &&
         currentResult.data.role === someResult.data.role &&
         currentResult.data.accessibleText === someResult.data.accessibleText
       );
@@ -22,6 +31,9 @@ function landmarkIsUniqueAfter(results) {
     currentResult.relatedNodes = [];
     return true;
   });
+
+  // console.log("landmarkIsUniqueAfter filtered: ", JSON.stringify(filtered, null, 4));
+  return filtered;
 }
 
 export default landmarkIsUniqueAfter;