Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support advanced rule execution for iframes #62

Merged
merged 8 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions lib/core/public/load.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*global a11yEngine*/
import Audit from '../base/audit';
import cleanup from './cleanup';
import runRules from './run-rules';
import respondable from '../utils/respondable';
import nodeSerializer from '../utils/node-serializer';
import mergeErrors from '../utils/merge-errors';

/**
* Sets up Rules, Messages and default options for Checks, must be invoked before attempting analysis
Expand Down Expand Up @@ -36,6 +38,21 @@ function runCommand(data, keepalive, callback) {
(results, cleanupFn) => {
// Serialize all DqElements
results = nodeSerializer.mapRawResults(results);

//a11y-engine iframe rules error merging logic
const errors = a11yEngine.getErrors();
if (Object.keys(errors).length !== 0) {
if (results[results.length - 1].a11yEngineErrors) {
const error = results.pop();
delete error.a11yEngineErrors;
const mergedErrors = mergeErrors(error, errors);
results.push({ ...mergedErrors, a11yEngineErrors: true });
} else {
results.push({ ...errors, a11yEngineErrors: true });
}
}
a11yEngine.clearErrors();

resolve(results);
// Cleanup AFTER resolve so that selectors can be generated
cleanupFn();
Expand Down
14 changes: 13 additions & 1 deletion lib/core/public/run-rules.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*global a11yEngine*/
import Context from '../base/context';
import teardown from './teardown';
import {
Expand Down Expand Up @@ -36,7 +37,11 @@ export default function runRules(context, options, resolve, reject) {
performanceTimer.auditStart();
}

if (context.frames.length && options.iframes !== false) {
if (options.a11yEngineConfig && options.a11yEngineConfig.advancedRun) {
a11yEngine.setup(options.a11yEngineConfig);
}

if (context.frames.length && options.iframes === true) {
q.defer((res, rej) => {
collectResultsFromFrames(context, options, 'rules', null, res, rej);
});
Expand All @@ -59,6 +64,13 @@ export default function runRules(context, options, resolve, reject) {

// after should only run once, so ensure we are in the top level window
if (context.initiator) {
// Return a11y-engine errors when at top level window
if (results[results.length - 1].a11yEngineErrors) {
const error = results.pop();
delete error.a11yEngineErrors;
a11yEngine.mergeErrors(error);
}

results = audit.after(results, options);

results.forEach(publishMetaData);
Expand Down
5 changes: 5 additions & 0 deletions lib/core/utils/collect-results-from-frames.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ export default function collectResultsFromFrames(
// elementRefs can't be passed across frame boundaries
options = { ...options, elementRef: false };

// check a11yengine advance run flag
if (options.a11yEngineConfig && !options.a11yEngineConfig.advancedRun) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iframeAdvancedRun

options.a11yEngineConfig.advancedRun = true;
}

var q = queue();
var frames = parentContent.frames;

Expand Down
52 changes: 52 additions & 0 deletions lib/core/utils/merge-errors.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Function to merge errors for a11y-engine.
// Handles errors differently for check_errors and other errors.
// It also adds the target selector to the errors for better identification.

function mergeErrors(mergedErrors, frameErrors, frameSpec) {
for (const [key, value] of Object.entries(frameErrors)) {
if (key === 'check_errors') {
if (!mergedErrors[key]) {
mergedErrors[key] = {};
}

for (const [checkNameKey, checkNameValue] of Object.entries(value)) {
// Add the target if not present. If present then append parents target.
checkNameValue.forEach(checkNameValueError => {
if (!checkNameValueError.target && frameSpec) {
checkNameValueError.target = frameSpec?.selector;
} else if (checkNameValueError.target && frameSpec) {
checkNameValueError.target = [
...frameSpec.selector,
...checkNameValueError.target
];
}
});
if (mergedErrors[key][checkNameKey]) {
mergedErrors[key][checkNameKey].push(...checkNameValue);
} else {
mergedErrors[key][checkNameKey] = Array.isArray(checkNameValue)
? [...checkNameValue]
: [checkNameValue];
}
}
} else {
// Add the target if not present. If present then append parents target.
value.forEach(errorValue => {
if (!errorValue.target && frameSpec) {
errorValue.target = frameSpec?.selector;
} else if (errorValue.target && frameSpec) {
errorValue.target = [...frameSpec.selector, ...errorValue.target];
}
});
if (mergedErrors[key]) {
mergedErrors[key] = [...mergedErrors[key], ...value];
} else {
mergedErrors[key] = value;
}
}
}

return mergedErrors;
}

export default mergeErrors;
14 changes: 13 additions & 1 deletion lib/core/utils/merge-results.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import nodeSerializer from './node-serializer';
import getAllChecks from './get-all-checks';
import findBy from './find-by';
import mergeErrors from './merge-errors';

/**
* Adds the owning frame's CSS selector onto each instance of DqElement
Expand Down Expand Up @@ -75,13 +76,20 @@ function normalizeResult(result) {
*/
function mergeResults(frameResults, options) {
const mergedResult = [];
let mergedErrors = {};
frameResults.forEach(frameResult => {
const results = normalizeResult(frameResult);
if (!results || !results.length) {
return;
}

const frameSpec = getFrameSpec(frameResult);
if (results[results.length - 1].a11yEngineErrors) {
const error = results.pop();
delete error.a11yEngineErrors;
mergedErrors = mergeErrors(mergedErrors, error, frameSpec);
}

results.forEach(ruleResult => {
if (ruleResult.nodes && frameSpec) {
pushFrame(ruleResult.nodes, options, frameSpec);
Expand All @@ -106,7 +114,11 @@ function mergeResults(frameResults, options) {
});
}
});
return mergedResult;

if (Object.keys(mergedErrors).length === 0) {
return mergedResult;
}
return [...mergedResult, { ...mergedErrors, a11yEngineErrors: true }];
}

function nodeIndexSort(nodeIndexesA = [], nodeIndexesB = []) {
Expand Down
Loading