testaro 69.7.0 → 70.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testaro",
-  "version": "69.7.0",
+  "version": "70.0.0",
   "description": "Run 1000 web accessibility tests from 11 tools and get a standardized report",
   "main": "index.js",
   "scripts": {

package/procs/catalog.js

@@ -86,7 +86,7 @@ exports.getCatalog = async report => {
           ? ['x', 'y', 'width', 'height'].map(key => Math.round(domRect[key])).join(':')
           : '';
           // Get its path ID.
-          const pathID = window.getXPath(element);
+          const pathID = window.getXPath(element) ?? '/html';
           // If it is a heading that nullifies an existing current heading index:
           if (
             headingIndex
@@ -112,12 +112,9 @@ exports.getCatalog = async report => {
             // Assign its index to the current heading index.
             headingIndex = index;
           }
-          // If the element has a path ID:
-          if (pathID) {
-            // Add it to the temporary path ID directory in the catalog.
-            cat.pathID ??= {};
-            cat.pathID[pathID] = index;
-          }
+          // Add the path ID to the temporary path ID property of the catalog.
+          cat.pathID ??= {};
+          cat.pathID[pathID] = index;
         }
         // For each text in the catalog:
         Object.keys(texts).forEach(text => {
@@ -160,16 +157,17 @@ exports.getCatalog = async report => {
 };
 // Prunes a catalog.
 exports.pruneCatalog = report => {
+  console.log('Pruning catalog');
   const {acts, catalog} = report;
   const citedElementIndexes = new Set();
   // For each act in the report:
   acts.forEach(act => {
     // If it is a test with a standard result:
     if (act.type === 'test' && act.result?.standardResult) {
-      const {instances} = act.result.standardResult;
+      const {instances} = act.result?.standardResult ?? [];
       // For each instance of the standard result:
       instances.forEach(instance => {
-        const {catalogIndex} = instance;
+        const catalogIndex = instance?.catalogIndex;
         // If the instance has a catalog index:
         if (catalogIndex) {
           // Ensure the index is classified as cited.
@@ -184,7 +182,7 @@ exports.pruneCatalog = report => {
       });
     }
   });
-  // Delete the temporary path ID directory.
+  // Delete the temporary path ID property.
   delete catalog.pathID;
   // For each element in the catalog:
   Object.keys(catalog).forEach(elementIndex => {
@@ -195,25 +193,3 @@ exports.pruneCatalog = report => {
     }
   });
 };
-// Adds a catalog index or, if necessary, an XPath to a proto-instance.
-exports.addCatalogIndex = async (protoInstance, locator, catalog) => {
-  // Get the XPath of the element referenced by the locator.
-  const xPath = await locator.evaluate(element => window.getXPath(element));
-  // If the acquisition succeeded:
-  if (xPath) {
-    // Get the catalog index of the element.
-    const catalogIndex = getXPathCatalogIndex(catalog, xPath);
-    // If the acquisition succeeded:
-    if (catalogIndex) {
-      // Add it to the proto-instance.
-      protoInstance.catalogIndex = catalogIndex;
-    }
-    // Otherwise, i.e. if the acquisition failed:
-    else {
-      // Add the XPath to the proto-instance.
-      protoInstance.pathID = xPath;
-    }
-  }
-  // Return the proto-instance with any modification.
-  return protoInstance;
-};

package/procs/doActs.js

@@ -1203,8 +1203,8 @@ exports.doActs = async (report, opts = {}) => {
           for (const instance of instances) {
             // Increment the instance count.
             actCatalogData.instanceCount++;
-            const {catalogIndex} = instance;
-            // If the instance has a catalogIndex value:
+            const catalogIndex = instance?.catalogIndex;
+            // If the instance has a catalog index:
             if (catalogIndex) {
               // Increment the catalog count.
               actCatalogData.catalogCount++;

package/procs/testaro.js

@@ -14,8 +14,6 @@
 
 // ########## IMPORTS
 
-// Function to add a catalog index to a standard instance.
-const {addCatalogIndex} = require('./catalog');
 // Function to get a catalog index from an XPath.
 const {getXPathCatalogIndex} = require('./xPath');
 
@@ -84,12 +82,13 @@ exports.doTest = async (
         totals[ordinalSeverity]++;
         // If itemization is required:
         if (withItems) {
-          // Add a proto-instance to the proto-instances.
-          protoInstances.push({
+          const protoInstance = {
             what: ruleWhat,
             ordinalSeverity,
-            pathID: window.getXPath(candidate)
-          });
+            xPath: window.getXPath(candidate) ?? '/html'
+          };
+          // Add a proto-instance to the proto-instances.
+          protoInstances.push(protoInstance);
         }
       }
     }
@@ -112,7 +111,7 @@ exports.doTest = async (
   if (withItems) {
     // For each proto-instance:
     protoInstances.forEach(protoInstance => {
-      const {what, ordinalSeverity, pathID} = protoInstance;
+      const {what, ordinalSeverity, xPath} = protoInstance;
       // Initialize a standard instance.
       const standardInstance = {
         ruleID,
@@ -121,19 +120,9 @@ exports.doTest = async (
         count: 1
       };
       // If the proto-instance includes an XPath:
-      if (pathID) {
-        // Use it to get the catalog index of the element.
-        const catalogIndex = getXPathCatalogIndex(catalog, pathID);
-        // 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 to the standard instance as its path ID.
-          standardInstance.pathID = pathID;
-        }
+      if (xPath) {
+        // Add the catalog index to the standard instance.
+        standardInstance.catalogIndex = getXPathCatalogIndex(catalog, xPath);
       }
       // Add the standard instance to the standard instances.
       standardInstances.push(standardInstance);
@@ -162,6 +151,15 @@ exports.doTest = async (
     standardInstances
   };
 };
+// Adds a catalog index or, if necessary, an XPath to a proto-instance.
+const addCatalogIndex = async (protoInstance, locator, catalog) => {
+  // Get the XPath of the element referenced by the locator.
+  const xPath = await locator.evaluate(element => window.getXPath(element) ?? '/html');
+  // Add a catalog index to the proto-instance.
+  protoInstance.catalogIndex = getXPathCatalogIndex(catalog, xPath);
+  // Return the proto-instance with any modification.
+  return protoInstance;
+};
 // Tests for a doTest-ineligible Testaro rule.
 exports.getBasicResult = async (
   catalog, withItems, ruleID, ordinalSeverity, whats, data, violations
@@ -191,7 +189,7 @@ exports.getBasicResult = async (
         ordinalSeverity,
         count: 1
       };
-      // Add a catalog index or path ID to it.
+      // Add a catalog index to it.
       addCatalogIndex(protoInstance, loc, catalog);
       // Add the standard instance to the standard instances.
       standardInstances.push(protoInstance);

package/procs/xPath.js

@@ -47,16 +47,32 @@ exports.getNormalizedXPath = xPath => {
     return normalizedSegments.join('/');
   }
   else {
-    return '';
+    return '/html';
   }
 };
 // Gets an XPath from a data-xpath attribute in an HTML excerpt.
 exports.getAttributeXPath = html => {
   const match = html.match(/ data-xpath="([^" ]+)"/);
-  return match ? match[1] : '';
+  return match ? match[1] : '/html';
+};
+// Gets a tag name from an XPath.
+const getXPathTagName = xPath => {
+  return xPath.split('/').pop().replace(/\[.+/, '').toUpperCase();
 };
 // Gets a catalog index as a string from an XPath.
 exports.getXPathCatalogIndex = (catalog, xPath) => {
-  const index = catalog.pathID[xPath] ?? '';
+  // Get the index of the catalog item with the XPath.
+  const index = catalog.pathID[xPath];
+  // If no such item exists:
+  if (! index) {
+    // Add an item to the catalog.
+    const newIndex = Object.keys(catalog).length;
+    catalog[newIndex] = {
+      pathID: xPath,
+      tagName: getXPathTagName(xPath)
+    };
+    catalog.pathID[xPath] = `${newIndex}`;
+    return newIndex;
+  }
   return index;
 };

package/testaro/allHidden.js

@@ -12,10 +12,14 @@
   This test reports a page that is entirely or mainly hidden.
 */
 
+// IMPORTS
+
+const {getXPathCatalogIndex} = require('../procs/xPath');
+
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async page => {
+exports.reporter = async (page, catalog) => {
   // Get a count of elements deemed visible by Playwright.
   const visibleElementCount = await page.locator('body :visible').count();
   // If no element is visible:
@@ -28,7 +32,8 @@ exports.reporter = async page => {
         ruleID: 'allHidden',
         what: 'The entire page body is hidden or empty',
         ordinalSeverity: 3,
-        count: 1
+        count: 1,
+        catalogIndex: getXPathCatalogIndex(catalog, '/html/body')
       }]
     };
   }

package/testaro/bulk.js

@@ -13,8 +13,14 @@
   This test reports the count of visible elements. The test assumes that simplicity and compactness, with one page having one purpose, is an accessibility virtue. Users with visual, motor, and cognitive disabilities often have trouble finding what they want or understanding the purpose of a page if the page is cluttered with content.
 */
 
+// IMPORTS
+
+const {getXPathCatalogIndex} = require('../procs/xPath');
+
+// FUNCTIONS
+
 // Runs the test and returns the result.
-exports.reporter = async page => {
+exports.reporter = async (page, catalog) => {
   // Get a count of elements deemed visible by Playwright.
   const visibleElementCount = await page.locator('body :visible').count();
   // Convert the count to a severity level, treating up to 400 as non-reportable.
@@ -31,7 +37,8 @@ exports.reporter = async page => {
         ruleID: 'bulk',
         what: `Page contains ${visibleElementCount} visible elements`,
         ordinalSeverity: severity,
-        count: 1
+        count: 1,
+        catalogIndex: getXPathCatalogIndex(catalog, '/html')
       }]
     };
   }

package/testaro/buttonMenu.js

@@ -13,6 +13,10 @@
   This test reports nonstandard navigation among menu items of button-controlled menus. Standards are based on https://www.w3.org/TR/wai-aria-practices-1.1/#menu. The trialKeys argument is an array of strings, each of which may be 'Home', 'End', '+', or '-'. The '+' string represents the ArrowDown or ArrowRight key, and the '-' string represents the ArrowUp or ArrowLeft key, depending on the orientation of the current menu. When the trialKeys argument is missing or is an empty array, 12 keys are selected at random.
 */
 
+// IMPORTS
+
+const {addCatalogIndex} = require('../procs/catalog');
+
 // ########## FUNCTIONS
 
 // Returns data about the element referenced by a locator.
@@ -292,17 +296,16 @@ exports.reporter = async (page, catalog, withItems, trialKeySpecs = []) => {
                 totals[2]++;
                 // If itemization is required:
                 if (withItems) {
-                  // Create a proto-instance.
-                  const protoInstance = {
+                  // Get the XPath of the menu button.
+                  const mbXPath = await mbLoc.evaluate(element => window.getXPath(element));
+                  // Add an instance to the standard instances.
+                  standardInstances.push({
                     ruleID: 'buttonMenu',
                     what: `Menu responds nonstandardly to the ${key} key`,
                     ordinalSeverity: 2,
-                    count: 1
-                  };
-                  // Add a catalog index or XPath to it if possible.
-                  addCatalogIndex(protoInstance, mbLoc, catalog);
-                  // Add the proto-instance to the standard instances.
-                  standardInstances.push(protoInstance);
+                    count: 1,
+                    catalogIndex: getXPathCatalogIndex(catalog, mbXPath)
+                  });
                 }
                 // Stop testing the menu button.
                 break;
@@ -328,17 +331,16 @@ exports.reporter = async (page, catalog, withItems, trialKeySpecs = []) => {
       totals[2]++;
       // If itemization is required:
       if (withItems) {
-        // Create a proto-instance.
-        const protoInstance = {
+        // Get the XPath of the menu button.
+        const mbXPath = await mbLoc.evaluate(element => window.getXPath(element));
+        // Add an instance to the standard instances.
+        standardInstances.push({
           ruleID: 'buttonMenu',
           what: 'Menu button does not control exactly 1 menu',
           ordinalSeverity: 2,
-          count: 1
-        };
-        // Add a catalog index or XPath to it if possible.
-        addCatalogIndex(protoInstance, mbLoc, catalog);
-        // Add the proto-instance to the standard instances.
-        standardInstances.push(protoInstance);
+          count: 1,
+          catalogIndex: getXPathCatalogIndex(catalog, mbXPath)
+        });
       }
     }
   }
@@ -349,7 +351,7 @@ exports.reporter = async (page, catalog, withItems, trialKeySpecs = []) => {
       ruleID: 'buttonMenu',
       what: 'Menu buttons and menus behave nonstandardly',
       count: totals[2],
-      ordinalSeverity: 2,
+      ordinalSeverity: 2
     });
   }
   return {

package/testaro/docType.js

@@ -15,7 +15,7 @@
 */
 
 // Runs the test and returns the result.
-exports.reporter = async page => {
+exports.reporter = async (page, catalog) => {
   // Returns whether the page declares a document type.
   const docHasType = await page.evaluate(() => {
     const docType = document.doctype;
@@ -30,7 +30,8 @@ exports.reporter = async page => {
       ruleID: 'docType',
       what: 'Document has no standard HTML doctype preamble',
       ordinalSeverity: 3,
-      count: 1
+      count: 1,
+      catalogIndex: getXPathCatalogIndex('/html')
     }]
   };
 };

package/testaro/dupAtt.js

@@ -14,13 +14,13 @@
 
 // ########## IMPORTS
 
-// Module to get the document source.
 const {getSource} = require('../procs/getSource');
+const {getXPathCatalogIndex} = require('../procs/xPath');
 
 // ########## FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, _, withItems) => {
+exports.reporter = async (page, catalog, withItems) => {
   // Initialize the data and standard result.
   const data = {total: 0};
   if (withItems) {
@@ -95,7 +95,8 @@ exports.reporter = async (page, _, withItems) => {
           ruleID: 'dupAtt',
           what: `${item.tagName} element has 2 attributes named ${item.duplicatedAttribute}`,
           ordinalSeverity: 2,
-          count: 1
+          count: 1,
+          catalogIndex: getXPathCatalogIndex(catalog, '/html/body')
         });
       });
     }

package/testaro/elements.js

@@ -16,6 +16,8 @@
   3. Data on each specified element also include data on its sibling nodes.
 */
 
+// FUNCTIONS
+
 exports.reporter = async (
   page, _, _, detailLevel = 0, tagName = null, onlyVisible = false, attribute
 ) => {

package/testaro/focAll.js

@@ -12,8 +12,14 @@
   This test reports discrepancies between focusable and Tab-focused element counts. The test first counts all the visible focusable (i.e. with tabIndex 0) elements (except counting each group of radio buttons as only one focusable element). Then it repeatedly presses the Tab (or Option-Tab in webkit) key until it has reached all the elements it can and counts those elements. If the two counts differ, navigation can be made more difficult. The cause may be surprising changes in content during navigation with the Tab key, or inability to reach every focusable element (or widget, such as one radio button or tab in each group) merely by pressing the Tab key.
 */
 
+// IMPORTS
+
+const {getXPathCatalogIndex} = require('../procs/xPath');
+
+// FUNCTIONS
+
 // Runs the test and returns the result.
-exports.reporter = async page => {
+exports.reporter = async (page, catalog) => {
   // Get locators of visible elements.
   const locAll = await page.locator('body *:visible');
   // Get the count of focusable elements.
@@ -67,7 +73,8 @@ exports.reporter = async page => {
       ruleID: 'focAll',
       what: 'Some focusable elements are not Tab-focusable or vice versa',
       ordinalSeverity: 2,
-      count
+      count,
+      catalogIndex: getXPathCatalogIndex(catalog, '/html/body')
     }] : []
   };
 };

package/testaro/headEl.js

@@ -13,10 +13,14 @@
   This test reports invalid descendants of the head of the document.
 */
 
+// IMPORTS
+
+const {getXPathCatalogIndex} = require('../procs/xPath');
+
 // ########## FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async page => {
+exports.reporter = async (page, catalog) => {
   // Initialize the data and standard result.
   const data = {
     total: 0,
@@ -60,7 +64,8 @@ exports.reporter = async page => {
       ruleID: 'headEl',
       what: `Invalid elements within the head: ${data.badTagNames.join(', ')}`,
       ordinalSeverity: 2,
-      count: data.total
+      count: data.total,
+      catalogIndex: getXPathCatalogIndex(catalog, '/html/head')
     });
   }
   totals = [0, 0, data.total, 0];

package/testaro/hovInd.js

@@ -19,7 +19,7 @@ const {doTest} = require('../procs/testaro');
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, _, withItems) => {
+exports.reporter = async (page, catalog, withItems) => {
   const getBadWhat = element => {
     const violationTypes = [];
     const isVisible = element.checkVisibility({
@@ -140,5 +140,5 @@ exports.reporter = async (page, _, withItems) => {
   };
   const selector = 'a, button, input, [onmouseenter], [onmouseover]';
   const whats = 'elements have confusing hover indicators';
-  return await doTest(page, withItems, 'hovInd', selector, whats, 1, getBadWhat.toString());
+  return await doTest(page, catalog, withItems, 'hovInd', selector, whats, 1, getBadWhat.toString());
 };

package/testaro/linkAmb.js

@@ -14,11 +14,17 @@
   This test reports text contents that are shared by links with distinct destinations. Text contents are compared case-insensitively.
 */
 
+// IMPORTS
+
+const {getXPathCatalogIndex} = require('../procs/xPath');
+
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, _, withItems) => {
-  return await page.evaluate(withItems => {
+exports.reporter = async (page, catalog, withItems) => {
+  const catalogIndex = getXPathCatalogIndex(catalog, '/html/body');
+  return await page.evaluate(args => {
+    const [withItems, catalogIndex] = args;
     // Get all links.
     const allLinks = Array.from(document.body.getElementsByTagName('a'));
     // Get the visible ones.
@@ -65,7 +71,8 @@ exports.reporter = async (page, _, withItems) => {
             ruleID: 'linkAmb',
             what,
             ordinalSeverity: 2,
-            count: linkCount
+            count: linkCount,
+            catalogIndex
           });
         }
       }
@@ -78,7 +85,8 @@ exports.reporter = async (page, _, withItems) => {
         ruleID: 'linkAmb',
         what,
         ordinalSeverity: 2,
-        count: violationCount
+        count: violationCount,
+        catalogIndex
       });
     }
     return {
@@ -86,5 +94,5 @@ exports.reporter = async (page, _, withItems) => {
       totals: [0, 0, violationCount, 0],
       standardInstances
     };
-  }, withItems);
+  }, [withItems, catalogIndex]);
 };

package/testaro/motion.js

@@ -14,6 +14,7 @@
 
 // IMPORTS
 
+const {getXPathCatalogIndex} = require('../procs/xPath');
 const fs = require('fs/promises');
 const os = require('os');
 const blazediff = require('@blazediff/core').diff;
@@ -26,7 +27,7 @@ const tmpDir = os.tmpdir();
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async page => {
+exports.reporter = async (_, catalog) => {
   // Initialize the totals and standard instances.
   const data = {};
   const totals = [0, 0, 0, 0];
@@ -78,7 +79,8 @@ exports.reporter = async page => {
           ruleID: 'motion',
           what: violationWhat,
           ordinalSeverity,
-          count: 1
+          count: 1,
+          catalogIndex: getXPathCatalogIndex(catalog, '/html/body')
         });
       }
     }

package/testaro/styleDiff.js

@@ -12,6 +12,10 @@
   This test reports style differences among links, buttons, and headings. It assumes that an accessible page employs few or only one style for adjacent links, and likewise for list links, buttons, and headings at each level. The test considers only particular style properties, listed in the 'mainStyles' and 'headingStyles' arrays.
 */
 
+// IMPORTS
+
+const {getXPathCatalogIndex} = require('../procs/xPath');
+
 // FUNCTIONS
 
 // Returns an object classifying the links in a page by layout.
@@ -77,12 +81,12 @@ const linksByType = async page => await page.evaluateHandle(() => {
   };
 });
 // Runs the test and returns the result.
-exports.reporter = async (page, _, withItems) => {
+exports.reporter = async (page, catalog, withItems) => {
   // Get an object with arrays of list links and adjacent links as properties.
   const linkTypes = await linksByType(page);
+  const catalogIndex = getXPathCatalogIndex(catalog, '/html/body');
   return await page.evaluate(args => {
-    const linkTypes = args[0];
-    const withItems = args[1];
+    const [linkTypes, withItems, catalogIndex] = args;
     const {body} = document;
     // Identify the settable style properties to be compared for all tag names.
     const mainStyles = [
@@ -256,7 +260,8 @@ exports.reporter = async (page, _, withItems) => {
           ruleID: 'styleDiff',
           what: `${currentData[1]} have ${elementSubtotals.length} different styles`,
           ordinalSeverity: severity,
-          count: extraCount
+          count: extraCount,
+          catalogIndex
         });
       }
     });
@@ -266,5 +271,5 @@ exports.reporter = async (page, _, withItems) => {
       totals,
       standardInstances
     };
-  }, [linkTypes, withItems]);
+  }, [linkTypes, withItems, catalogIndex]);
 };

package/testaro/tabNav.js

@@ -164,7 +164,7 @@ const testTabs = async (tabs, index, listOrientation, listIsCorrect, withItems,
     const itemData = {};
     // If itemization is required:
     if (withItems) {
-      // Initialize a report on the element.
+      // Initialize data on the element.
       itemData.xPath = await page.evaluate(element => window.getXPath(element), currentTab);
       itemData.navigationErrors = [];
     }
@@ -368,32 +368,19 @@ exports.reporter = async (page, catalog, withItems) => {
   if (withItems) {
     // For each bad tab:
     data.tabElements.incorrect.forEach(item => {
-      // Create a proto-instance.
-      const protoInstance = {
+      // Add an instance to the standard instances.
+      standardInstances.push({
         ruleID: 'tabNav',
         what: `Tab responds nonstandardly to ${item.navigationErrors.join(', ')}`,
         ordinalSeverity: 1,
-        count: 1
-      };
-      // Try to get a catalog index from the xPath of the tab.
-      const catalogIndex = getXPathCatalogIndex(catalog, item.xPath);
-      // If the acquisition succeeded:
-      if (catalogIndex) {
-        // Add the catalog index to the proto-instance.
-        protoInstance.catalogIndex = catalogIndex;
-      }
-      // Otherwise, i.e. if the acquisition failed:
-      else {
-        // Add the XPath to the proto-instance as a path ID.
-        protoInstance.pathID = item.xPath;
-      }
-      // Add the proto-instance to the standard instances.
-      standardInstances.push(protoInstance);
+        count: 1,
+        catalogIndex: getXPathCatalogIndex(catalog, item.xPath)
+      });
     });
   }
   // Otherwise, if navigation is not required and any navigations were bad:
   else if (data.totals.navigations.all.incorrect) {
-    // Create a standard instance.
+    // Add a summary instance to the standard instances.
     standardInstances.push({
       ruleID: 'tabNav',
       what: 'Tab lists have nonstandard navigation',

package/testaro/targetSmall.js

@@ -13,10 +13,14 @@
   This test reports visible pointer targets, i.e. labels, buttons, inputs, and links, that are small enough or near enough to other targets to make pointer interaction difficult. This test relates to WCAG 2.2 Success Criteria 2.5.5 and 2.5.8, but does not attempt to implement either of them precisely. For example, the test reports a small pointer target that is far from all other targets, although it conforms to the Success Criteria.
 */
 
+// IMPORTS
+
+const {getXPathCatalogIndex} = require('../procs/xPath');
+
 // FUNCTIONS
 
 // Runs the test and returns the result.
-exports.reporter = async (page, _, withItems) => {
+exports.reporter = async (page, catalog, withItems) => {
   // Return totals and standard instances for the rule.
   const protoResult = await page.evaluate(withItems => {
     // Get all pointer targets.
@@ -76,7 +80,7 @@ exports.reporter = async (page, _, withItems) => {
               what,
               ordinalSeverity,
               count: 1,
-              xPath: window.getXPath(element)
+              xPath: window.getXPath(element) ?? '/html'
             });
           }
         }
@@ -111,6 +115,12 @@ exports.reporter = async (page, _, withItems) => {
       standardInstances: protoInstances
     };
   }, withItems);
+  // Convert the XPaths of the proto-instances to catalog indexes.
+  protoResult.standardInstances = protoResult.standardInstances.map(instance => {
+    instance.catalogIndex = getXPathCatalogIndex(catalog, instance.xPath);
+    delete instance.xPath;
+    return instance;
+  });
   // Return the result.
   return protoResult;
 };

package/tests/alfa.js

@@ -125,29 +125,15 @@ exports.reporter = async (page, report, actIndex) => {
             }
             // Increment the standard total.
             standardResult.totals[ordinalSeverity]++;
-            // Initialize a proto-instance.
-            const protoInstance = {
+            const xPath = getNormalizedXPath(item.path?.replace(/\/text\(\).*$/, '') || '/html');
+            // Add an instance to the standard instances.
+            standardResult.instances.push({
               ruleID,
               what,
               ordinalSeverity,
-              count: 1
-            };
-            // Get the pathID of the element or, if none, the document pathID.
-            const pathID = getNormalizedXPath(item.path.replace(/\/text\(\).*$/, '')) || '/html';
-            // Use it to get the index of the element in the catalog.
-            const catalogIndex = getXPathCatalogIndex(catalog, pathID);
-            // If the acquisition succeeded:
-            if (catalogIndex) {
-              // Add the catalog index to the proto-instance.
-              protoInstance.catalogIndex = catalogIndex;
-            }
-            // Otherwise, i.e. if the acquisition failed:
-            else {
-              // Add the pathID to the proto-instance.
-              protoInstance.pathID = pathID;
-            }
-            // Add the proto-instance to the instances of the standard result.
-            standardResult.instances.push(protoInstance);
+              count: 1,
+              catalogIndex: getXPathCatalogIndex(catalog, xPath)
+            });
           }
         }
       }

package/tests/axe.js

@@ -155,14 +155,12 @@ exports.reporter = async (page, report, actIndex) => {
                 standardResult.totals[ordinalSeverity]++;
                 // Get the XPath of the suspected element from its data-xpath attribute.
                 const xPath = getAttributeXPath(node.html);
-                // Get the catalog index of the suspected element from its XPath.
-                const catalogIndex = getXPathCatalogIndex(report.catalog, xPath) ?? '';
                 const instance = {
                   ruleID: rule.id,
                   what: Array.from(whatSet.values()).join('; '),
                   ordinalSeverity,
                   count: 1,
-                  catalogIndex
+                  catalogIndex: getXPathCatalogIndex(report.catalog, xPath)
                 };
                 standardResult.instances.push(instance);
               });

package/tests/ed11y.js

@@ -110,9 +110,6 @@ exports.reporter = async (page, report, actIndex) => {
       instance.ordinalSeverity = dismissalKey ? 0 : 2;
       instance.count = 1;
       instance.catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
-      if (! instance.catalogIndex) {
-        instance.pathID = xPath;
-      }
       standardResult.instances.push(instance);
     });
   }

package/tests/htmlcs.js

@@ -128,18 +128,14 @@ exports.reporter = async (page, report, actIndex) => {
       }
       // If standard results are to be reported and the message reports an error or warning:
       if (standard && ['Error', 'Warning'].includes(parts[0])) {
+        const xPath = getAttributeXPath(parts[5]);
         const instance = {
           ruleID: `${parts[0][0]}-${parts[1]}`,
           what: parts[4],
           ordinalSeverity: parts[0] === 'Warning' ? 0 : 2,
-          count: 1
+          count: 1,
+          catalogIndex: getXPathCatalogIndex(report.catalog, xPath)
         };
-        const xPath = getAttributeXPath(parts[5]) || '/html';
-        const catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
-        instance.catalogIndex = catalogIndex ?? '';
-        if (! catalogIndex) {
-          instance.pathID = xPath;
-        }
         standardResult.instances.push(instance);
       }
     }

package/tests/ibm.js

@@ -173,16 +173,10 @@ exports.reporter = async (page, report, actIndex) => {
           };
           // 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;
+          // If the XPath was obtained:
+          if (xPath) {
+            // Add the catalog index to the standard instance.
+            standardItem.catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
           }
           // Add the standard instance to the standard result.
           standardResult.instances.push(standardItem);

package/tests/nuVal.js

@@ -104,18 +104,8 @@ exports.reporter = async (page, report, actIndex) => {
         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 catalog index to the standard instance.
+          standardInstance.catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
         }
         // Add the standard instance to the standard result.
         standardResult.instances.push(standardInstance);

package/tests/nuVnu.js

@@ -102,23 +102,8 @@ exports.reporter = async (page, report, actIndex) => {
           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 catalog index to the standard instance.
+            standardInstance.catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
           }
           // Add the standard instance to the standard result.
           standardResult.instances.push(standardInstance);

package/tests/qualWeb.js

@@ -234,27 +234,14 @@ exports.reporter = async (page, report, actIndex, timeLimit) => {
                             standardResult.totals[ordinalSeverity]++;
                             // Initialize a standard instance.
                             const what = `[${verdict}] ${raResult.description}`;
+                            const xPath = getAttributeXPath(element.htmlCode);
                             const instance = {
                               ruleID,
                               what,
                               ordinalSeverity: ordinalSeverities[section][verdict],
-                              count: 1
+                              count: 1,
+                              catalogIndex: getXPathCatalogIndex(report.catalog, xPath)
                             };
-                            // Get the pathID of the element or, if none, the document pathID.
-                            const pathID = getAttributeXPath(element.htmlCode) || '/html';
-                            const {catalog} = report;
-                            // Use it to get the catalog index.
-                            const catalogIndex = getXPathCatalogIndex(catalog, pathID);
-                            // If the acquisition succeeded:
-                            if (catalogIndex) {
-                              // Add the catalog index to the instance.
-                              instance.catalogIndex = catalogIndex;
-                            }
-                            // Otherwise, i.e. if the acquisition failed:
-                            else {
-                              // Add the XPath to the instance.
-                              instance.pathID = pathID;
-                            }
                             // Add the instance to the standard result.
                             standardResult.instances.push(instance);
                           }

package/tests/testaro.js

@@ -610,7 +610,7 @@ exports.reporter = async (page, report, actIndex) => {
               standardResult.totals[index] += Math.round(total);
             });
           }
-          if (ruleResult.instances) {
+          if (ruleResult.instances?.length) {
             standardResult.instances.push(... ruleResult.instances);
           }
           justPrevented = false;

package/tests/wave.js

@@ -152,22 +152,9 @@ exports.reporter = async (page, report, actIndex) => {
                       ordinalSeverity,
                       count: 1
                     };
-                    const pathID = violation[1];
-                    // If the path ID of the violator was found:
-                    if (pathID) {
-                      // Get the catalog index of the violator.
-                      const catalogIndex = getXPathCatalogIndex(report.catalog, pathID);
-                      // If the acquisition succeeded:
-                      if (catalogIndex) {
-                        // Add the catalog index to the instance.
-                        instance.catalogIndex = catalogIndex;
-                      }
-                      // Otherwise, i.e. if the acquisition failed:
-                      else {
-                        // Add the path ID to the instance.
-                        instance.pathID = pathID;
-                      }
-                    }
+                    const xPath = violation[1];
+                    // Add the catalog index to the instance.
+                    instance.catalogIndex = getXPathCatalogIndex(report.catalog, xPath);
                     // Add the instance to the standard result.
                     instances.push(instance);
                   }

package/tests/wax.js

@@ -89,21 +89,11 @@ exports.reporter = async (page, report, actIndex) => {
             const pathID = getAttributeXPath(element);
             // If the acquisition succeeded:
             if (pathID) {
-              // Get the catalog index of the element.
-              const catalogIndex = getXPathCatalogIndex(report.catalog, pathID);
-              // If the acquisition succeeded:
-              if (catalogIndex) {
-                // Add the catalog index to the standard instance.
-                instance.catalogIndex = catalogIndex;
-              }
-              // Otherwise, i.e. if the acquisition failed:
-              else {
-                // Add the path ID to the standard instance.
-                instance.pathID = pathID;
-              }
-              // Add the standard instance to the standard result.
-              instances.push(instance);
+              // Add the catalog index to the standard instance.
+              instance.catalogIndex = getXPathCatalogIndex(report.catalog, pathID);
             }
+            // Add the standard instance to the standard result.
+            instances.push(instance);
           });
         }
       }