testaro 61.2.0 → 62.0.0

package/actSpecs.js

@@ -182,6 +182,18 @@ exports.actSpecs = {
         withNewContent: [true, 'boolean', '', 'whether to use a URL instead of page content']
       }
     ],
+    nuVal: [
+      'Perform NuVal tests',
+      {
+        withSource: [false, 'boolean', '', 'whether to use the page source and not the browser page']
+      }
+    ],
+    nuVnu: [
+      'Perform NuVnu tests',
+      {
+        withSource: [false, 'boolean', '', 'whether to use the page source and not the browser page']
+      }
+    ],
     testaro: [
       'Perform Testaro tests',
       {

package/package.json

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

package/procs/nu.js

@@ -0,0 +1,87 @@
+/*
+  © 2025 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
+*/
+
+/*
+  nu
+  Utilities for Testaro tests nuVal and nuVnu.
+*/
+
+// ########## IMPORTS
+
+// Module to get the document source.
+const {getSource} = require('./getSource');
+
+// ########## FUNCTIONS
+
+// Gets the content for a nuVal or nuVnu test.
+exports.getContent = async (page, withSource) => {
+  const data = {
+    withSource,
+    testTarget: null
+  };
+  // If the specified content type was the page source:
+  if (withSource) {
+    // Get it.
+    const sourceData = await getSource(page);
+    // If the source was not obtained:
+    if (sourceData.prevented) {
+      // Report this.
+      data.prevented = true;
+      data.error = sourceData.error;
+    }
+    // Otherwise, i.e. if it was obtained:
+    else {
+      // Add it to the data.
+      data.testTarget = sourceData.source;
+    }
+  }
+  // Otherwise, i.e. if the specified content type was the Playwright page content:
+  else {
+    // Add it to the data.
+    data.testTarget = await page.content();
+  }
+  // Return the data.
+  return data;
+};
+// Postprocesses a result from nuVal or nuVnu tests.
+exports.curate = (data, nuData, rules) => {
+  // Delete most of the test target from the data.
+  data.testTarget = `${data.testTarget.slice(0, 200)}…`;
+  let result;
+  // If a result was obtained:
+  if (nuData) {
+    // Delete left and right quotation marks and their erratic invalid replacements.
+    const nuDataValid = JSON.stringify(nuData).replace(/[\u{fffd}“”]/ug, '');
+    const nuDataClean = JSON.parse(nuDataValid);
+    result = nuDataClean;
+  }
+  // If there is a result and rules were specified:
+  if (result && rules && Array.isArray(rules) && rules.length) {
+    // Remove all messages except those specified.
+    result.messages = result.messages.filter(message => rules.some(rule => {
+      if (rule[0] === '=') {
+        return message.message === rule.slice(1);
+      }
+      else if (rule[0] === '~') {
+        return new RegExp(rule.slice(1)).test(message.message);
+      }
+      else {
+        console.log(`ERROR: Invalid nuVal rule ${rule}`);
+        return false;
+      }
+    }));
+  }
+  // Remove messages reporting duplicate blank IDs.
+  const badMessages = new Set(['Duplicate ID .', 'The first occurrence of ID  was here.']);
+  result.messages = result.messages.filter(
+    message => ! badMessages.has(message.message)
+  );
+  // Return the result.
+  return result;
+};

package/procs/standardize.js

@@ -209,9 +209,9 @@ const doHTMLCS = (result, standardResult, severity) => {
     });
   }
 };
-// Converts issue instances from a nuVal document type.
-const doNuVal = (result, standardResult, docType) => {
-  const items = result[docType] && result[docType].messages;
+// Converts issue instances from a nuVal or nuVnu result..
+const doNu = (withSource, result, standardResult) => {
+  const items = result && result.messages;
   if (items && items.length) {
     items.forEach(item => {
       const {extract, firstColumn, lastColumn, lastLine, message, subType, type} = item;
@@ -236,7 +236,7 @@ const doNuVal = (result, standardResult, docType) => {
         tagName: identifiers[0],
         id: identifiers[1],
         location: {
-          doc: docType === 'pageContent' ? 'dom' : 'source',
+          doc: withSource ? 'source' : 'dom',
           type: 'code',
           spec
         },
@@ -252,48 +252,13 @@ const doNuVal = (result, standardResult, docType) => {
     });
   }
 };
-// Converts issue instances from a nuVnu document type.
-const doNuVnu = (result, standardResult, docType) => {
-  const items = result[docType] && result[docType].messages;
-  if (items && items.length) {
-    items.forEach(item => {
-      const {extract, firstColumn, lastColumn, lastLine, message, subType, type} = item;
-      const identifiers = getIdentifiers(extract);
-      if (! identifiers[0] && message) {
-        const tagNameLCArray = message.match(
-          /^Element ([^ ]+)|^An (img) element| (meta|script) element| element (script)| tag (script)/
-        );
-        if (tagNameLCArray && tagNameLCArray[1]) {
-          identifiers[0] = tagNameLCArray[1].toUpperCase();
-        }
-      }
-      let spec = '';
-      const locationSegments = [lastLine, firstColumn, lastColumn];
-      if (locationSegments.every(segment => typeof segment === 'number')) {
-        spec = locationSegments.join(':');
-      }
-      const instance = {
-        ruleID: message,
-        what: message,
-        ordinalSeverity: -1,
-        tagName: identifiers[0],
-        id: identifiers[1],
-        location: {
-          doc: docType === 'pageContent' ? 'dom' : 'source',
-          type: 'code',
-          spec
-        },
-        excerpt: cap(extract)
-      };
-      if (type === 'info' && subType === 'warning') {
-        instance.ordinalSeverity = 0;
-      }
-      else if (type === 'error') {
-        instance.ordinalSeverity = subType === 'fatal' ? 3 : 2;
-      }
-      standardResult.instances.push(instance);
-    });
-  }
+// Converts issue instances from a nuVal result.
+const doNuVal = (withSource, result, standardResult) => {
+  doNu(withSource, result, standardResult);
+};
+// Converts issue instances from a nuVnu result.
+const doNuVnu = (withSource, result, standardResult) => {
+  doNu(withSource, result, standardResult);
 };
 // Converts instances of a qualWeb rule class.
 const doQualWeb = (result, standardResult, ruleClassName) => {
@@ -600,22 +565,12 @@ const convert = (toolName, data, result, standardResult) => {
     }
   }
   // nuVal
-  else if (toolName === 'nuVal' && (result.pageContent || result.rawPage)) {
-    if (result.pageContent) {
-      doNuVal(result, standardResult, 'pageContent');
-    }
-    if (result.rawPage) {
-      doNuVal(result, standardResult, 'rawPage');
-    }
+  else if (toolName === 'nuVal' && result) {
+    doNuVal(data.withSource, result, standardResult);
   }
   // nuVnu
-  else if (toolName === 'nuVnu' && (result.pageContent || result.rawPage)) {
-    if (result.pageContent) {
-      doNuVnu(result, standardResult, 'pageContent');
-    }
-    if (result.rawPage) {
-      doNuVnu(result, standardResult, 'rawPage');
-    }
+  else if (toolName === 'nuVnu' && result) {
+    doNuVnu(data.withSource, result, standardResult);
   }
   // qualWeb
   else if (

package/tests/nuVal.js

@@ -10,42 +10,26 @@
 /*
   nuVal
   This tool subjects a page and its source to the Nu Html Checker, thereby testing scripted content found only in the loaded page and erroneous content before the browser corrects it. The API erratically replaces left and right double quotation marks with invalid UTF-8, which appears as 2 or 3 successive instances of the replacement character (U+fffd). Therefore, this test removes all such quotation marks and the replacement character. That causes 'Bad value “” for' to become 'Bad value  for'. Since the corruption of quotation marks is erratic, no better solution is known.
-  This tool is the API version of the Nu Html Checker. It is an alternative to the vnu tool, which uses the same validator as an installed dependency. Each tool has advantages and disadvantages. The main advantage of nuVal is that it does not require the Testaro host to provide a Java virtual machine. The main disadvantage of nuVal is that it returns 502 status errors when the content being uploaded is larger than about 80,000 bytes. The main advantage of the vnu tool is that it can evaluate pages larger than about 80,000 bytes and pages reachable from the host that Testaro runs on even if not reachable from the public Internet.
+  This tool is the API version of the Nu Html Checker. It is an alternative to the nuVnu tool, which uses the same validator as an installed dependency. Each tool has advantages and disadvantages. The main advantage of nuVal is that it does not require the Testaro host to provide a Java virtual machine. The main disadvantage of nuVal is that it returns 502 status errors when the content being uploaded is larger than about 80,000 bytes. The main advantage of the nuVnu tool is that it can evaluate pages larger than about 80,000 bytes and pages reachable from the host that Testaro runs on even if not reachable from the public Internet.
 */
 
 // IMPORTS
 
-// Module to process files.
-const fs = require('fs/promises');
-// Module to get the document source.
-const {getSource} = require('../procs/getSource');
+// Module to get the content.
+const {curate, getContent} = require('../procs/nu');
 
 // FUNCTIONS
 
-// Conducts and reports the Nu Html Checker tests.
+// Conducts and reports the Nu Html Checker API tests.
 exports.reporter = async (page, report, actIndex) => {
   const act = report.acts[actIndex];
-  const {rules} = act;
-  // Get the browser-parsed page.
-  const pageContent = await page.content();
-  // Get the source.
-  const sourceData = await getSource(page);
-  const data = {
-    docTypes: {
-      pageContent: {},
-      rawPage: {}
-    }
-  };
-  const result = {};
-  // If the source was not obtained:
-  if (sourceData.prevented) {
-    // Report this.
-    data.prevented = true;
-    data.error = sourceData.error;
-  }
-  // Otherwise, i.e. if it was obtained:
-  else {
-    // Get results from validator.w3.org, a more reliable service than validator.nu.
+  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;
     const fetchOptions = {
       method: 'post',
       headers: {
@@ -54,70 +38,40 @@ exports.reporter = async (page, report, actIndex) => {
       }
     };
     const nuURL = 'https://validator.w3.org/nu/?parser=html&out=json';
-    const pageTypes = [['pageContent', pageContent], ['rawPage', sourceData.source]];
-    // For each page type:
-    for (const page of pageTypes) {
-      try {
-        fetchOptions.body = page[1];
-        // Get a Nu Html Checker report on it.
-        const nuResult = await fetch(nuURL, fetchOptions);
-        // If the request failed:
-        if (! nuResult.ok) {
-          // Get the response body as text.
-          const text = await nuResult.text();
-          // Add a failure report to the data.
-          result[page[0]] = {
-            prevented: true,
-            error: `HTTP ${nuResult.status}: ${nuResult.statusText}`,
-            rawBody: text
-          };
-          data.docTypes[page[0]] = result[page[0]];
-        }
-        // Otherwise, i.e. if it succeeded:
-        else {
-          // Get the response body as JSON.
-          const nuData = await nuResult.json();
-          // Delete left and right quotation marks and their erratic invalid replacements.
-          const nuDataClean = JSON.parse(JSON.stringify(nuData).replace(/[\u{fffd}“”]/ug, ''));
-          result[page[0]] = nuDataClean;
-        }
-        // If there is a report and rules were specified:
-        if (! result[page[0]].error && rules && Array.isArray(rules) && rules.length) {
-          // Remove all messages except those specified.
-          result[page[0]].messages = result[page[0]].messages.filter(message => rules.some(rule => {
-            if (rule[0] === '=') {
-              return message.message === rule.slice(1);
-            }
-            else if (rule[0] === '~') {
-              return new RegExp(rule.slice(1)).test(message.message);
-            }
-            else {
-              console.log(`ERROR: Invalid nuVal rule ${rule}`);
-              return false;
-            }
-          }));
-        }
-        // Remove messages reporting duplicate blank IDs.
-        const badMessages = new Set(['Duplicate ID .', 'The first occurrence of ID  was here.']);
-        result[page[0]].messages = result[page[0]].messages.filter(
-          message => ! badMessages.has(message.message)
-        );
+    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.
+        nuData = await nuResponse.json();
+      }
+      // Otherwise, i.e. if the request failed:
+      else {
+        // Get the response body as text.
+        const nuResponseText = await nuResponse.text();
+        // Add a failure report to the data.
+        data.prevented = true;
+        data.error = `HTTP ${nuResponse.status}: ${nuResponse.statusText} (${nuResponseText.slice(0, 200)})`;
       }
-      // If an error occurred:
-      catch (error) {
-        // Report it.
-        const message = `ERROR getting results for ${page[0]} (${error.message}; status ${nuResult.status}, body ${JSON.stringify(nuResult?.body, null, 2)}`;
-        console.log(message);
-        data.docTypes[page[0]].prevented = true;
-        data.docTypes[page[0]].error = message;
-      };
-    };
-    // If both page types prevented testing:
-    if (pageTypes.every(pageType => data.docTypes[pageType[0]].prevented)) {
-      // Report this.
-      data.prevented = true;
-      data.error = 'Both doc types prevented';
     }
+    // If an error occurred:
+    catch (error) {
+      // Report it.
+      const message = `ERROR getting results (${error.message}; status ${nuResult?.status || 'none'} (${JSON.stringify(nuData?.body || 'no body', null, 2)})`;
+      console.log(message);
+      data.prevented = true;
+      data.error = message;
+    };
+    // Postprocess the response data.
+    result = curate(data, nuData, rules);
+  }
+  // Otherwise, i.e. if the page content was not obtained:
+  else {
+    // Report this.
+    data.prevented = true;
+    data.error = 'Content not obtained';
   }
   return {
     data,

package/tests/nuVnu.js

@@ -21,8 +21,8 @@ const fs = require('fs/promises');
 const os = require('os');
 // Module to run tests.
 const {vnu} = require('vnu-jar');
-// Module to get the document source.
-const {getSource} = require('../procs/getSource');
+// Module to get the content.
+const {curate, getContent} = require('../procs/nu');
 
 // CONSTANTS
 
@@ -33,101 +33,54 @@ const tmpDir = os.tmpdir();
 // Conducts and reports the Nu Html Checker tests.
 exports.reporter = async (page, report, actIndex) => {
   const act = report.acts[actIndex];
-  const {rules} = act;
-  // Get the browser-parsed page.
-  const pageContent = await page.content();
-  const pagePath = `${tmpDir}/nuVnu-page-${report.id}.html`;
-  // Save it.
-  await fs.writeFile(pagePath, pageContent);
-  // Get the source.
-  const sourceData = await getSource(page);
-  const data = {
-    docTypes: {
-      pageContent: {},
-      rawPage: {}
+  const {rules, withSource} = act;
+  // Get the content.
+  const data = await getContent(page, withSource);
+  let result;
+  // If it was obtained:
+  if (data.testTarget) {
+    const pagePath = `${tmpDir}/nuVnu-page-${report.id}.html`;
+    // Save it in a temporary file.
+    await fs.writeFile(pagePath, data.testTarget);
+    let nuData;
+    try {
+      // Get Nu Html Checker output on it.
+      nuData = await vnu.check(['--format', 'json', '--stdout', pagePath]);
     }
-  };
-  const result = {};
-  // If the source was not obtained:
-  if (sourceData.prevented) {
-    // Report this.
-    data.prevented = true;
-    data.error = sourceData.error;
-  }
-  // Otherwise, i.e. if it was obtained:
-  else {
-    const sourcePath = `${tmpDir}/nuVnu-source-${report.id}.html`;
-    // Save the source.
-    await fs.writeFile(sourcePath, sourceData.source);
-    const pageTypes = [['pageContent', pagePath], ['rawPage', sourcePath]];
-    // For each page type:
-    for (const page of pageTypes) {
-      let nuResult;
-      try {
-        // Get Nu Html Checker output on it.
-        const nuOutput = await vnu.check(['--format', 'json', '--stdout', page[1]]);
-        // Consider the JSON output to be the result.
-        nuResult = nuOutput;
+    // If any error was thrown:
+    catch (error) {
+      let errorMessage = error.message;
+      // If it was due to an incompatible Java version:
+      if (errorMessage.includes('Unsupported major.minor version')) {
+        // Revise the error message and report this.
+        errorMessage = `Installed version of Java is incompatible. Details: ${errorMessage}`;
+        data.prevented = true;
+        data.error = errorMessage;
       }
-      // If any error was thrown:
-      catch (error) {
-        let errorMessage = error.message;
-        // If it was due to an incompatible Java version:
-        if (errorMessage.includes('Unsupported major.minor version')) {
-          // Revise the error messageand report this.
-          errorMessage = `Installed version of Java is incompatible. Details: ${errorMessage}`;
-          data.docTypes[page[0]].prevented = true;
-          data.docTypes[page[0]].error = errorMessage;
-        }
-        // Otherwise, i.e. if it was not due to an incompatible Java version:
-        else {
-          try {
-            // Treat the output as a JSON result reporting rule violations.
-            nuResult = JSON.parse(error.message);
-            // But, if parsing it as JSON fails:
-          } catch (error) {
-            // Report this.
-            data.docTypes[page[0]].prevented = true;
-            data.docTypes[page[0]].error = `Error getting result (${error.message.slice(0, 300)});`;
-          }
+      // Otherwise, i.e. if it was not due to an incompatible Java version:
+      else {
+        try {
+          // Treat the error message as a JSON result reporting rule violations.
+          nuData = JSON.parse(error.message);
         }
-      }
-      // Delete the temporary file.
-      await fs.unlink(page[1]);
-      // If a result with or without reported violations was obtained:
-      if (nuResult) {
-        // Delete left and right quotation marks and their erratic invalid replacements.
-        const nuResultClean = JSON.parse(JSON.stringify(nuResult).replace(/[\u{fffd}“”]/ug, ''));
-        result[page[0]] = nuResultClean;
-        // If there is a report and rules were specified:
-        if (! result[page[0]].error && rules && Array.isArray(rules) && rules.length) {
-          // Remove all messages except those specified.
-          result[page[0]].messages = result[page[0]].messages.filter(message => rules.some(rule => {
-            if (rule[0] === '=') {
-              return message.message === rule.slice(1);
-            }
-            else if (rule[0] === '~') {
-              return new RegExp(rule.slice(1)).test(message.message);
-            }
-            else {
-              console.log(`ERROR: Invalid nuVal rule ${rule}`);
-              return false;
-            }
-          }));
+        // But, if parsing it as JSON fails:
+        catch (error) {
+          // Report this.
+          data.prevented = true;
+          data.error = `Error getting result (${error.message.slice(0, 300)});`;
         }
-        // Remove messages reporting duplicate blank IDs.
-        const badMessages = new Set(['Duplicate ID .', 'The first occurrence of ID  was here.']);
-        result[page[0]].messages = result[page[0]].messages.filter(
-          message => ! badMessages.has(message.message)
-        );
       }
     }
-    // If both page types prevented testing:
-    if (pageTypes.every(pageType => data.docTypes[pageType[0]].prevented)) {
-      // Report this.
-      data.prevented = true;
-      data.error = 'Both doc types prevented';
-    }
+    // Delete the temporary file.
+    await fs.unlink(pagePath);
+    // Postprocess the result.
+    result = curate(data, nuData, rules);
+  }
+  // Otherwise, i.e. if the content was not obtained:
+  else {
+    // Report this.
+    data.prevented = true;
+    data.error = 'Content not obtained';
   }
   return {
     data,