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

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

@@ -10,16 +10,22 @@ import { hasContentVirtual, idrefs } from '../../commons/dom';
  * Get all owned roles of an element
  */
 function getOwnedRoles(virtualNode) {
+	const parentRole = getRole(virtualNode, { dpub: true });
+
 	const ownedRoles = [];
 	const ownedElements = getOwnedVirtual(virtualNode);
 	for (let i = 0; i < ownedElements.length; i++) {
 		let ownedElement = ownedElements[i];
-		let role = getRole(ownedElement);
+		let role = getRole(ownedElement, { dpub: true });
 
 		// if owned node has no role or is presentational we keep
 		// parsing the descendant tree. this means intermediate roles
 		// between a required parent and child will fail the check
-		if (['presentation', 'none', null].includes(role)) {
+		if (
+			['presentation', 'none', null].includes(role) ||
+			(['list'].includes(role) &&
+				['doc-bibliography', 'doc-endnotes'].includes(parentRole))
+		) {
 			ownedElements.push(...ownedElement.children);
 		} else if (role) {
 			ownedRoles.push(role);

lib/checks/lists/listitem-evaluate.js

@@ -1,5 +1,5 @@
 import { getComposedParent } from '../../commons/dom';
-import { isValidRole } from '../../commons/aria';
+import { getRoleType, isValidRole } from '../../commons/aria';
 
 function listitemEvaluate(node) {
 	const parent = getComposedParent(node);
@@ -16,6 +16,10 @@ function listitemEvaluate(node) {
 	}
 
 	if (parentRole && isValidRole(parentRole)) {
+		if (getRoleType(parentRole) === 'list') {
+			return true;
+		}
+
 		this.data({
 			messageKey: 'roleNotValid'
 		});

lib/checks/lists/only-listitems-evaluate.js

@@ -1,5 +1,5 @@
 import { isVisible } from '../../commons/dom';
-import { getRole } from '../../commons/aria';
+import { getRole, getRoleType } from '../../commons/aria';
 
 function onlyListitemsEvaluate(node, options, virtualNode) {
 	let hasNonEmptyTextNode = false;
@@ -24,7 +24,8 @@ function onlyListitemsEvaluate(node, options, virtualNode) {
 		isEmpty = false;
 		const isLi = actualNode.nodeName.toUpperCase() === 'LI';
 		const role = getRole(vNode);
-		const isListItemRole = role === 'listitem';
+		const isListItemRole =
+			role === 'listitem' || getRoleType(role) === 'listitem';
 
 		if (!isLi && !isListItemRole) {
 			badNodes.push(actualNode);

lib/commons/aria/get-element-unallowed-roles.js

@@ -37,13 +37,14 @@ function getRoleSegments(node) {
 		roles = roles.concat(nodeRoles);
 	}
 
-	if (node.hasAttributeNS('http://www.idpf.org/2007/ops', 'type')) {
-		const epubRoles = tokenList(
-			node.getAttributeNS('http://www.idpf.org/2007/ops', 'type').toLowerCase()
-		).map(role => `doc-${role}`);
-
-		roles = roles.concat(epubRoles);
-	}
+	// EPUB epub:type should be ignored
+	// if (node.hasAttributeNS('http://www.idpf.org/2007/ops', 'type')) {
+	// 	const epubRoles = tokenList(
+	// 		node.getAttributeNS('http://www.idpf.org/2007/ops', 'type').toLowerCase()
+	// 	).map(role => `doc-${role}`);
+
+	// 	roles = roles.concat(epubRoles);
+	// }
 
 	// filter invalid roles
 	roles = roles.filter(role => isValidRole(role));

package.json

@@ -1,7 +1,7 @@
 {
-	"name": "axe-core",
+	"name": "@daisy/axe-core-for-ace",
 	"description": "Accessibility engine for automated Web UI testing",
-	"version": "4.1.2",
+	"version": "4.1.2-daisy.0",
 	"license": "MPL-2.0",
 	"engines": {
 		"node": ">=4"
@@ -50,6 +50,15 @@
 	],
 	"main": "axe.js",
 	"typings": "axe.d.ts",
+	"files": [
+		"LICENSE",
+		"README.md",
+		"CHANGELOG.md",
+		"locales/**/*",
+		"axe.js",
+		"axe.min.js",
+		"axe.d.ts"
+	],
 	"standard-version": {
 		"scripts": {
 			"postbump": "npm ci && npm run sri-update"
@@ -64,6 +73,7 @@
 		"eslint": "eslint --color --format stylish '{lib,test,build,doc}/**/*.js' 'Gruntfile.js'",
 		"test:headless": "node ./build/test/headless",
 		"test": "tsc && grunt test",
+		"test-fast": "tsc && grunt test-fast",
 		"test:examples": "node ./doc/examples/test-examples",
 		"test:locales": "mocha test/test-locales.js",
 		"test:rule-help-version": "mocha test/test-rule-help-version.js",
@@ -149,5 +159,8 @@
 			"prettier --write",
 			"git add"
 		]
+	},
+	"publishConfig": {
+		"access": "public"
 	}
 }

test/commons/aria/get-role.js

@@ -315,11 +315,29 @@ describe('aria.getRole', function() {
 			assert.equal(aria.getRole(node, { dpub: true }), 'doc-chapter');
 		});
 
-		it('does not returns DPUB roles with `dpub: false`', function() {
+		it('returns DPUB roles with `dpub: true` whilst ignoring implicit roles', function() {
+			var node = document.createElement('li');
+			node.setAttribute('role', 'doc-chapter');
+			flatTreeSetup(node);
+			assert.equal(aria.getRole(node, { dpub: true }), 'doc-chapter');
+		});
+
+		it('returns non-DPUB implicit roles with `dpub: false/undefined`', function() {
+			var node = document.createElement('li');
+			node.setAttribute('role', 'doc-chapter');
+			var parentNode = document.createElement('div');
+			parentNode.appendChild(node);
+			flatTreeSetup(parentNode);
+			assert.equal(aria.getRole(node, { dpub: false }), 'listitem');
+			assert.equal(aria.getRole(node, { dpub: undefined }), 'listitem');
+		});
+
+		it('does not returns DPUB roles with `dpub: false/undefined`', function() {
 			var node = document.createElement('section');
 			node.setAttribute('role', 'doc-chapter');
 			flatTreeSetup(node);
 			assert.isNull(aria.getRole(node, { dpub: false }));
+			assert.isNull(aria.getRole(node, { dpub: undefined }));
 		});
 	});
 
@@ -379,6 +397,54 @@ describe('aria.getRole', function() {
 				'doc-chapter'
 			);
 		});
+
+		it('respect the `dpub: false/undefined` option, whilst skipping the implicit roles due to non-abstract explicit role', function() {
+			var node = document.createElement('li');
+			node.setAttribute('role', 'doc-chapter region');
+			var parentNode = document.createElement('div');
+			parentNode.appendChild(node);
+			flatTreeSetup(parentNode);
+			assert.equal(
+				aria.getRole(node, { fallback: true, dpub: false }),
+				'region'
+			);
+			assert.equal(
+				aria.getRole(node, { fallback: true, dpub: undefined }),
+				'region'
+			);
+		});
+
+		it('respect the `dpub: false/undefined` option, whilst ignoring the implicit roles and abstract explicit role', function() {
+			var node = document.createElement('li');
+			node.setAttribute('role', 'doc-chapter section');
+			var parentNode = document.createElement('div');
+			parentNode.appendChild(node);
+			flatTreeSetup(parentNode);
+			assert.isNull(
+				aria.getRole(node, { noImplicit: true, fallback: true, dpub: false })
+			);
+			assert.isNull(
+				aria.getRole(node, {
+					noImplicit: true,
+					fallback: true,
+					dpub: undefined
+				})
+			);
+		});
+
+		it('respect the `dpub: false/undefined` option', function() {
+			var node = document.createElement('div');
+			node.setAttribute('role', 'doc-chapter region');
+			flatTreeSetup(node);
+			assert.equal(
+				aria.getRole(node, { fallback: true, dpub: false }),
+				'region'
+			);
+			assert.equal(
+				aria.getRole(node, { fallback: true, dpub: undefined }),
+				'region'
+			);
+		});
 	});
 
 	describe('noPresentational is honored', function() {

test/runner.tmpl

@@ -24,7 +24,8 @@
 		<script>
 			mocha.setup({
 				timeout: 20000,
-				ui: 'bdd'
+				ui: 'bdd',
+				bail: true,
 			});
 			var assert = chai.assert;
 		</script>