testaro 67.0.0 → 68.0.0

package/netWatch.js

@@ -1,6 +1,6 @@
 /*
   © 2022–2025 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.
@@ -24,6 +24,8 @@ const httpClient = require('http');
 const httpsClient = require('https');
 // Module to perform jobs.
 const {doJob} = require('./run');
+// Module to process dates and times.
+const {nowString} = require('./procs/dateTime');
 
 // CONSTANTS
 
@@ -34,8 +36,6 @@ const auths = netWatchURLIDs.map(id => process.env[`NETWATCH_URL_${id}_AUTH`]);
 
 // FUNCTIONS
 
-// Returns a string representing the date and time.
-const nowString = () => (new Date()).toISOString().slice(2, 16);
 // Waits.
 const wait = ms => {
   return new Promise(resolve => {
@@ -144,13 +144,13 @@ exports.netWatch = async (isForever, intervalInSeconds, isCertTolerant = true) =
                   // Check it for validity.
                   const jobInvalidity = isValidJob(contentObj);
                   // If it is invalid:
-                  if (jobInvalidity) {
+                  if (! jobInvalidity.isValid) {
                     // Report this to the server.
                     serveObject({
                       message: `invalidJob`,
-                      jobInvalidity
+                      error: jobInvalidity.error
                     }, response);
-                    console.log(`${logStart}invalid job (${jobInvalidity})`);
+                    console.log(`${logStart}invalid job (${jobInvalidity.error})`);
                     resolve(true);
                   }
                   // Otherwise, i.e. if it is valid:

package/package.json

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

package/procs/aslint.js

@@ -1,8 +1,8 @@
 /*
   © 2023 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.
+  Licensed under the MIT License. See LICENSE file at the project root or https://opensource.org/license/mit/ for details.
 
   SPDX-License-Identifier: MIT
 */

package/procs/catalog.js

@@ -0,0 +1,190 @@
+/*
+  © 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.
+
+  SPDX-License-Identifier: MIT
+*/
+
+/*
+  catalog
+  Creates and returns a catalog of a target.
+*/
+
+// IMPORTS
+
+// Module to close and launch browsers.
+const {browserClose, launch} = require('./launch');
+const {getXPathCatalogIndex} = require('./xPath');
+
+// FUNCTIONS
+
+// Creates and returns a catalog.
+exports.getCatalog = async report => {
+  const {browserID} = report;
+  const targetURL = report.target?.url;
+  // If the report specifies a global browser ID and a global target URL:
+  if (browserID && targetURL) {
+    // Launch a browser, navigate to the target, and get the resulting page.
+    const page = await launch({
+      report,
+      actIndex: null,
+      tempBrowserID: browserID,
+      tempURL: targetURL
+    });
+    // If the launch and navigation succeeded:
+    if (page) {
+      // Create a catalog of the elements in the page.
+      const catalog = await page.evaluate(() => {
+        // Adds an element property to a catalog and returns its value.
+        const addToCatalog = (elementIndex, catalog, propertyName, value) => {
+          if (value) {
+            catalog[propertyName] ??= {};
+            catalog[propertyName][value] ??= [];
+            catalog[propertyName][value].push(elementIndex);
+            return value;
+          }
+          return '';
+        };
+        const elements = Array.from(document.querySelectorAll('*'));
+        // Initialize a catalog.
+        const cat = {
+          element: {},
+          tagName: {},
+          id: {},
+          startTag: {},
+          text: {},
+          boxID: {},
+          pathID: {}
+        };
+        // For each element in the page:
+        for (const index in elements) {
+          const element = elements[index];
+          // Index it by its properties in the catalog.
+          const tagName = addToCatalog(index, cat, 'tagName', element.tagName || '');
+          const id = addToCatalog(index, cat, 'id', element.id || '');
+          const startTag = addToCatalog(
+            index,
+            cat,
+            'startTag',
+            element.outerHTML?.replace(/^.*?</s, '<').replace(/>.*$/s, '>') ?? ''
+          );
+          const innerText = element.closest('head') ? '' : element.innerText;
+          const segments = innerText?.trim().split('\n');
+          const tidySegments = segments?.map(segment => segment.trim().replace(/\s+/g, ' ')) ?? [];
+          const neededSegments = tidySegments.filter(segment => segment.length);
+          neededSegments.splice(1, neededSegments.length - 2);
+          const text = addToCatalog(index, cat, 'text', neededSegments.join('◢‖◤'));
+          const domRect = element.getBoundingClientRect();
+          const boxID = addToCatalog(
+            index,
+            cat,
+            'boxID',
+            domRect
+            ? ['x', 'y', 'width', 'height'].map(key => Math.round(domRect[key])).join(':')
+            : ''
+          );
+          const pathID = addToCatalog(index, cat, 'pathID', window.getXPath(element));
+          // Add an entry for it to the element data in the catalog.
+          cat.element[index] = {
+            tagName,
+            id,
+            startTag,
+            textLinkable: false,
+            text,
+            boxID,
+            pathID
+          };
+        }
+        // For each text in the catalog:
+        Object.keys(cat.text).forEach(text => {
+          const textElementIndexes = cat.text[text];
+          // If every element that has it is in the same subtree, so is page-unique:
+          if (
+            textElementIndexes.slice(0, -1).every(
+              (elementIndex, index) => cat
+              .element[textElementIndexes[index + 1]]
+              .pathID
+              .startsWith(cat.element[elementIndex].pathID)
+            )
+          ) {
+            // For each element that has it:
+            textElementIndexes.forEach(index => {
+              // If it is not in the head:
+              if (! cat.element[index].pathID.includes('/head[1]')) {
+                // Mark it as linkable in the element data in the catalog.
+                cat.element[index].textLinkable = true;
+              }
+            });
+          }
+        });
+        return cat;
+      });
+      // Close the browser and its context.
+      await browserClose(page);
+      // Return the catalog.
+      return catalog;
+    }
+    // Otherwise, i.e. if the launch or navigation failed, report and return this.
+    console.log('ERROR: Launch or navigation failure prevented catalog creation');
+    return {};
+  }
+  // Otherwise, i.e. if the report specification is incomplete, report and return this.
+  console.log('ERROR: Job omits browser ID or target URL, preventing catalog creation');
+  return {};
+};
+// Prunes an elements-only catalog.
+exports.pruneCatalog = report => {
+  const {acts} = 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;
+      // For each instance of the standard result:
+      instances.forEach(instance => {
+        const {catalogIndex} = instance;
+        // If the instance has a catalog index:
+        if (catalogIndex) {
+          // Ensure the index is classified as cited.
+          citedElementIndexes.add(catalogIndex);
+        }
+      });
+    }
+  });
+  const prunedCatalog = {};
+  // For each element in the catalog:
+  const {catalog} = report;
+  Object.keys(catalog).forEach(elementIndex => {
+    // If it is cited by at least 1 instance:
+    if (citedElementIndexes.has(elementIndex)) {
+      // Add it to the pruned catalog.
+      prunedCatalog[elementIndex] = catalog[elementIndex];
+    }
+  });
+  // Replace the catalog with the pruned catalog.
+  report.catalog = prunedCatalog;
+};
+// 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/{dateOf.js → dateTime.js}

@@ -1,15 +1,15 @@
 /*
   © 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.
+  Licensed under the MIT License. See LICENSE file at the project root or https://opensource.org/license/mit/ for details.
 
   SPDX-License-Identifier: MIT
 */
 
 /*
-  dateOf
-  Returns the date represented by a time stamp.
+  dateTime
+  Processes dates and times.
 */
 
 // Inserts a character periodically in a string.
@@ -32,3 +32,5 @@ exports.dateOf = timeStamp => {
     return null;
   }
 };
+// Returns a string representing the date and time.
+exports.nowString = () => (new Date()).toISOString().slice(2, 16);