testaro 67.0.0 → 68.0.0

package/tests/htmlcs.js

@@ -1,6 +1,6 @@
 /*
   © 2022–2024 CVS Health and/or one of its affiliates. All rights reserved.
-  © 2025 Jonathan Robert Pool.
+  © 2025–2026 Jonathan Robert Pool.
 
   Licensed under the MIT License. See LICENSE file at the project root or
   https://opensource.org/license/mit/ for details.
@@ -15,11 +15,7 @@
 
 // IMPORTS
 
-// Module to add and use unique element IDs.
-const {addTestaroIDs} = require('../procs/testaro');
-// Module to get location data from an element.
-const {getElementData} = require('../procs/getLocatorData');
-// Module to handle files.
+const {getAttributeXPath, getXPathCatalogIndex} = require('../procs/xPath');
 const fs = require('fs/promises');
 
 // FUNCTIONS
@@ -28,27 +24,47 @@ const fs = require('fs/promises');
 exports.reporter = async (page, report, actIndex) => {
   const act = report.acts[actIndex];
   const {rules} = act;
+  // Initialize the act report.
   const data = {};
-  const result = {};
+  const result = {
+    nativeResult: {
+      totals: {
+        failed: 0,
+        cantTell: 0
+      },
+      error: [],
+      warning: []
+    },
+    standardResult: {}
+  };
+  const standard = report.standard !== 'no';
+  // If standard results are to be reported:
+  if (standard) {
+    // Initialize the standard result.
+    result.standardResult = {
+      prevented: false,
+      totals: [0, 0, 0, 0],
+      instances: []
+    };
+  }
+  const {nativeResult, standardResult} = result;
   // Get the HTMLCS script.
   const scriptText = await fs.readFile(`${__dirname}/../htmlcs/HTMLCS.js`, 'utf8');
   const scriptNonce = report.jobData && report.jobData.lastScriptNonce;
-  // Annotate all elements on the page with unique identifiers.
-  await addTestaroIDs(page);
   let messageStrings = [];
-  // Define the rules to be employed as those of WCAG 2 level AAA.
+  // For each class of standards to  be tested for:
   for (const actStandard of ['WCAG2AAA']) {
     const nextViolations = await page.evaluate(args => {
-      // Add the HTMLCS script to the page.
+      const actStandard = args[0];
+      const rules = args[1];
       const scriptText = args[2];
       const scriptNonce = args[3];
       const script = document.createElement('script');
       script.nonce = scriptNonce;
       script.textContent = scriptText;
+      // Add the HTMLCS script to the page.
       document.head.insertAdjacentElement('beforeend', script);
       // If only some rules are to be employed:
-      const actStandard = args[0];
-      const rules = args[1];
       if (rules && Array.isArray(rules) && rules.length) {
         // Redefine WCAG 2 AAA as including only them.
         if (! window.HTMLCS_WCAG2AAA) {
@@ -64,56 +80,71 @@ exports.reporter = async (page, report, actIndex) => {
       catch(error) {
         console.log(`ERROR executing HTMLCS_RUNNER on ${document.URL} (${error.message})`);
       }
+      // Return the reported violations of that standard.
       return violations;
     }, [actStandard, rules, scriptText, scriptNonce]);
-    if (nextViolations && nextViolations.every(violation => typeof violation === 'string')) {
+    // If all reported violations of the standard are validly described:
+    if (nextViolations?.every(violation => typeof violation === 'string')) {
+      // Add their descriptions to the violation descriptions.
       messageStrings.push(... nextViolations);
     }
+    // Otherwise, i.e. if any reported violations are invalidly described:
     else {
+      // Report this.
       data.prevented = true;
       data.error = 'ERROR executing HTMLCS_RUNNER in the page';
       break;
     }
   }
+  // If no error was thrown:
   if (! data.prevented) {
     // Sort the violations by class and standard.
     messageStrings.sort();
     // Remove any duplicate violations.
     messageStrings = [... new Set(messageStrings)];
-    // Initialize the result.
-    result.Error = {};
-    result.Warning = {};
     // For each violation:
     for (const string of messageStrings) {
       // Split its message into severity class, rule ID, tagname, ID, rule description, and excerpt.
       const parts = string.split(/\|/, 6);
       const partCount = parts.length;
+      // If the message partitions are too few:
       if (partCount < 6) {
+        // Report this.
         console.log(`ERROR: Violation string ${string} has too few parts`);
       }
-      // If it is an error or a warning (not a notice):
-      else if (['Error', 'Warning'].includes(parts[0])) {
-        /*
-          Add the violation to a violationClass.violationCode.description array in the result.
-          This saves space, because, although some descriptions are violation-specific, such as
-          descriptions that state the contrast ratio of an element, most descriptions are
-          generic, so typically many violations share a description.
-        */
-        const ruleID = parts[1].replace(/^WCAG2|\.Principle\d\.Guideline[\d_]+/g, '');
-        result[parts[0]][ruleID] ??= {};
-        result[parts[0]][ruleID][parts[4]] ??= [];
-        const elementLocation = await getElementData(page, parts[5]);
-        const {boxID, notInDOM, pathID} = elementLocation;
-        result[parts[0]][ruleID][parts[4]].push({
-          tagName: parts[2],
-          id: parts[3],
-          notInDOM,
-          excerpt: parts[5],
-          boxID,
-          pathID
-        });
+      // Otherwise, if the message reports an error:
+      else if (parts[0] === 'Error') {
+        // Add the rest of its message to the native-result errors.
+        nativeResult.error.push(parts.slice(1));
+        // Increment the error total.
+        nativeResult.totals.failed++;
+      }
+      // Otherwise, if the message reports a warning:
+      else if (parts[0] === 'Warning') {
+        // Add the rest of its message to the native-result warnings.
+        nativeResult.warning.push(parts.slice(1));
+        // Increment the warning total.
+        nativeResult.totals.cantTell++;
+      }
+      // If standard results are to be reported:
+      if (standard) {
+        const instance = {
+          ruleID: parts[1],
+          what: parts[4],
+          ordinalSeverity: parts[0] === 'Warning' ? 0 : 2,
+          count: 1
+        };
+        const xPath = getAttributeXPath(parts[5]) || '/html';
+        const catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
+        instance.catalogIndex = catalogIndex ?? '';
+        if (! catalogIndex) {
+          instance.pathID = xPath;
+        }
+        standardResult.instances.push(instance);
       }
     }
+    standardResult.totals[0] = nativeResult.totals.cantTell;
+    standardResult.totals[2] = nativeResult.totals.failed;
   }
   return {
     data,

package/tests/ibm.js

@@ -1,6 +1,6 @@
 /*
   © 2021–2024 CVS Health and/or one of its affiliates. All rights reserved.
-  © 2025 Jonathan Robert Pool.
+  © 2025–2026 Jonathan Robert Pool.
 
   Licensed under the MIT License. See LICENSE file at the project root or
   https://opensource.org/license/mit/ for details.
@@ -20,7 +20,7 @@
 
 // IMPORTS
 
-// Scanner. Importing and executing 'close' crashed the Node process.
+const {getAttributeXPath, getXPathCatalogIndex} = require('../procs/xPath');
 const accessibilityChecker = require('accessibility-checker');
 const {getCompliance} = accessibilityChecker;
 
@@ -121,17 +121,33 @@ exports.reporter = async (page, report, actIndex) => {
   const act = report.acts[actIndex];
   const {withItems, withNewContent, rules} = act;
   const contentType = withNewContent ? 'new' : 'existing';
+  // Initialize the act report.
+  const result = {
+    nativeResult: {},
+    standardResult: {}
+  };
+  const standard = report.standard !== 'no';
+  // If standard results are to be reported:
+  if (standard) {
+    // Initialize the standard result.
+    result.standardResult = {
+      prevented: false,
+      totals: [0, 0, 0, 0],
+      instances: []
+    };
+  }
   try {
     const typeContent = contentType === 'existing' ? page : page.url();
     // Conduct the tests.
     const runReport = await run(typeContent);
-    const {report} = runReport;
+    const actReport = runReport.report;
     // If there were results:
-    if (report) {
+    if (actReport) {
       // Trim them.
-      const trimmedReport = trimActReport(report, withItems, rules);
-      const {error} = trimmedReport;
-      // If the report was not trimmable:
+      result.nativeResult = trimActReport(actReport, withItems, rules);
+      const {nativeResult, standardResult} = result;
+      const {error, totals} = nativeResult;
+      // If they were not trimmable:
       if (error) {
         // Return an act report with this error.
         return {
@@ -142,10 +158,39 @@ exports.reporter = async (page, report, actIndex) => {
           result: {}
         }
       }
-      // Otherwise, i.e. if the report was trimmable, return it.
+      // Otherwise, i.e. if they were trimmable, and if standard results are to be reported:
+      if (standard) {
+        // Populate the totals of the standard result.
+        standardResult.totals = [totals.recommendation, 0, totals.violation, 0];
+        // For each item of the native result:
+        nativeResult.items.forEach(item => {
+          // Populate a standard instance.
+          const standardItem = {
+            ruleID: item.ruleId,
+            what: item.message,
+            ordinalSeverity: item.level === 'recommendation' ? 0 : 2,
+            count: 1
+          };
+          // Get the XPath from the added attribute, because path.dom is wrong.
+          const xPath = getAttributeXPath(item.snippet);
+          const catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
+          // If a catalog index was found:
+          if (catalogIndex) {
+            // Add it to the standard instance.
+            standardItem.catalogIndex = catalogIndex;
+          }
+          // Otherwise, if no catalog index was found but the item has an XPath:
+          else if (xPath) {
+            // Add the XPath to the standard instance.
+            standardItem.pathID = xPath;
+          }
+          // Add the standard instance to the standard result.
+          standardResult.instances.push(standardItem);
+        });
+      }
       return {
         data: {},
-        result: trimmedReport
+        result
       };
     }
     // Otherwise, i.e. if there was only an error, return it in an act report.

package/tests/nuVal.js

@@ -1,5 +1,6 @@
 /*
   © 2022–2024 CVS Health and/or one of its affiliates. All rights reserved.
+  © 2026 Jonathan Robert Pool.
 
   Licensed under the MIT License. See LICENSE file at the project root or
   https://opensource.org/license/mit/ for details.
@@ -15,8 +16,8 @@
 
 // IMPORTS
 
-// Module to get the content.
 const {curate, getContent} = require('../procs/nu');
+const {getAttributeXPath, getXPathCatalogIndex} = require('../procs/xPath');
 
 // FUNCTIONS
 
@@ -24,27 +25,44 @@ const {curate, getContent} = require('../procs/nu');
 exports.reporter = async (page, report, actIndex) => {
   const act = report.acts[actIndex];
   const {rules, withSource} = act;
-  // Get the content and add it to the data.
-  const data = await getContent(page, withSource);
-  let result;
-  // If it was obtained:
-  if (data.testTarget) {
-    let nuData;
+  // Initialize the act report.
+  const data = {};
+  const result = {
+    nativeResult: {},
+    standardResult: {}
+  };
+  const standard = report.standard !== 'no';
+  // If standard results are to be reported:
+  if (standard) {
+    // Initialize the standard result.
+    result.standardResult = {
+      prevented: false,
+      totals: [0, 0, 0, 0],
+      instances: []
+    };
+  }
+  const {standardResult} = result;
+  // Get the content.
+  const content = await getContent(page, withSource);
+  const {testTarget} = content;
+  // If it was obtained and contains a test target:
+  if (testTarget) {
     const fetchOptions = {
       method: 'post',
       headers: {
         'User-Agent': 'Mozilla/5.0',
         'Content-Type': 'text/html; charset=utf-8'
-      }
+      },
+      body: testTarget
     };
     const nuURL = 'https://validator.w3.org/nu/?parser=html&out=json';
+    let nuData;
     try {
-      fetchOptions.body = data.testTarget;
       // Get a Nu Html Checker report from the W3C validator service.
       nuResponse = await fetch(nuURL, fetchOptions);
       // If the acquisition succeeded:
       if (nuResponse.ok) {
-        // Get the response body as JSON.
+        // Get the response body as an object.
         nuData = await nuResponse.json();
       }
       // Otherwise, i.e. if the request failed:
@@ -64,8 +82,43 @@ exports.reporter = async (page, report, actIndex) => {
       data.prevented = true;
       data.error = message;
     };
-    // Postprocess the response data.
-    result = await curate(page, data, nuData, rules);
+    // Postprocess the response data and add the postprocessed data to the native result.
+    result.nativeResult = await curate(data, nuData, rules);
+    // If standard results are to be reported:
+    if (standard) {
+      // For each message in the native result:
+      result.nativeResult.messages.forEach(message => {
+        const ordinalSeverity = message.type === 'info' ? 0 : 3;
+        // Increment the applicable standard-result total.
+        standardResult.totals[ordinalSeverity]++;
+        // Initialize a standard instance.
+        const standardInstance = {
+          ruleID: message.message,
+          what: message.message,
+          ordinalSeverity,
+          count: 1,
+        };
+        // Get the XPath of the element from its extract.
+        const xPath = getAttributeXPath(message.extract);
+        // If the acquisition succeeded:
+        if (xPath) {
+          // Get the catalog index of the element from the XPath.
+          const catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
+          // If the acquisition succeeded:
+          if (catalogIndex) {
+            // Add the catalog index to the standard instance.
+            standardInstance.catalogIndex = catalogIndex;
+          }
+          // Otherwise, i.e. if the acquisition failed:
+          else {
+            // Add the XPath of the standard instance as its pathID.
+            standardInstance.pathID = xPath;
+          }
+        }
+        // Add the standard instance to the standard result.
+        standardResult.instances.push(standardInstance);
+      })
+    }
   }
   // Otherwise, i.e. if the page content was not obtained:
   else {

package/tests/nuVnu.js

@@ -1,6 +1,6 @@
 /*
   © 2022–2024 CVS Health and/or one of its affiliates. All rights reserved.
-  © 2025 Jonathan Robert Pool.
+  © 2025–2026 Jonathan Robert Pool.
 
   Licensed under the MIT License. See LICENSE file at the project root or
   https://opensource.org/license/mit/ for details.
@@ -16,14 +16,11 @@
 
 // IMPORTS
 
-// Module to perform file operations.
 const fs = require('fs/promises');
-// Module to define the operating-system temporary-file directory.
 const os = require('os');
-// Module to run tests.
 const {vnu} = require('vnu-jar');
-// Module to get the content.
 const {curate, getContent} = require('../procs/nu');
+const {getAttributeXPath, getXPathCatalogIndex} = require('../procs/xPath');
 
 // CONSTANTS
 
@@ -33,6 +30,23 @@ const tmpDir = os.tmpdir();
 
 // Conducts and reports the Nu Html Checker tests.
 exports.reporter = async (page, report, actIndex) => {
+  // Initialize the act report.
+  const data = {};
+  const result = {
+    nativeResult: {},
+    standardResult: {}
+  };
+  const standard = report.standard !== 'no';
+  // If standard results are to be reported:
+  if (standard) {
+    // Initialize the standard result.
+    result.standardResult = {
+      prevented: false,
+      totals: [0, 0, 0, 0],
+      instances: []
+    };
+  }
+  const {standardResult} = result;
   // Get the nuVal act, if it exists.
   const nuValAct = report.acts.find(act => act.type === 'test' && act.which === 'nuVal');
   // If it does not exist or it exists but was prevented:
@@ -40,13 +54,13 @@ exports.reporter = async (page, report, actIndex) => {
     const act = report.acts[actIndex];
     const {rules, withSource} = act;
     // Get the content.
-    const data = await getContent(page, withSource);
-    let result;
-    // If it was obtained:
-    if (data.testTarget) {
+    const content = await getContent(page, withSource);
+    const {testTarget} = content;
+    // If it was obtained and contains a test target:
+    if (testTarget) {
       const pagePath = `${tmpDir}/nuVnu-page-${report.id}.html`;
-      // Save it in a temporary file.
-      await fs.writeFile(pagePath, data.testTarget);
+      // Save the test target in a temporary file.
+      await fs.writeFile(pagePath, testTarget);
       let nuData;
       try {
         // Get Nu Html Checker output on it.
@@ -56,7 +70,7 @@ exports.reporter = async (page, report, actIndex) => {
       catch (error) {
         const errorMessage = error.message;
         try {
-        // Parse it as JSON, i.e. a benign nuVnu result with at least 1 violation.
+          // Parse it as JSON, i.e. a benign nuVnu result with at least 1 violation.
           nuData = JSON.parse(error.message);
         }
         // If parsing it as JSON fails:
@@ -68,14 +82,50 @@ exports.reporter = async (page, report, actIndex) => {
       }
       // Delete the temporary file.
       await fs.unlink(pagePath);
-      // Postprocess the result.
-      result = await curate(page, data, nuData, rules);
-      return {
-        data,
-        result
-      };
+      // Postprocess the output and add the postprocessed output to the native result.
+      result.nativeResult = await curate(data, nuData, rules);
+      // If standard results are to be reported:
+      if (standard) {
+        // For each message in the native result:
+        result.nativeResult.messages.forEach(message => {
+          const ordinalSeverity = message.type === 'info' ? 0 : 3;
+          // Increment the applicable standard-result total.
+          standardResult.totals[ordinalSeverity]++;
+          // Initialize a standard instance.
+          const standardInstance = {
+            ruleID: message.message,
+            what: message.message,
+            ordinalSeverity,
+            count: 1,
+          };
+          // Get the XPath of the element from its extract.
+          const xPath = getAttributeXPath(message.extract);
+          // If the acquisition succeeded:
+          if (xPath) {
+            // Get the catalog index of the element from the XPath.
+            const catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
+            // If the acquisition succeeded:
+            if (catalogIndex) {
+              // Add the catalog index to the standard instance.
+              standardInstance.catalogIndex = catalogIndex;
+            }
+            // Otherwise, i.e. if the acquisition failed:
+            else {
+              // Add the XPath of the standard instance as its pathID.
+              standardInstance.pathID = xPath;
+            }
+          }
+          // Otherwise, i.e. if the acquisition failed:
+          else {
+            // Add the extract of the native instance to the standard instance.
+            standardInstance.excerpt = message.extract ?? '';
+          }
+          // Add the standard instance to the standard result.
+          standardResult.instances.push(standardInstance);
+        });
+      }
     }
-    // Otherwise, i.e. if the content was not obtained:
+    // Otherwise, i.e. if the content was not obtained or contains no test target:
     else {
       // Report this.
       data.prevented = true;
@@ -85,12 +135,12 @@ exports.reporter = async (page, report, actIndex) => {
   // Otherwise, i.e. if the nuVal act exists and succeeded:
   else {
     // Abort this act and report this.
-    return {
-      data: {
-        skipped: true,
-        reason: 'nuVal succeeded'
-      },
-      result: {}
-    };
+    data.skipped = true;
+    data.reason = 'nuVal succeeded';
   }
+  // Return the data and result.
+  return {
+    data,
+    result
+  };
 };