testilo 10.3.1 → 11.0.0

package/call.js

@@ -124,11 +124,16 @@ const callDigest = async (digesterID, selector = '') => {
   }
 };
 // Fulfills a comparison request.
+// Get the scored reports to be scored.
 const callCompare = async (compareProcID, comparisonNameBase) => {
-  await compare(compareProcID, comparisonNameBase);
-  console.log(
-    `Comparison completed. Comparison proc: ${compareProcID}. Directory: ${comparisonDir}.`
-  );
+  const reports = await getReports('scored');
+  const comparerDir = `${functionDir}/compare/${compareProcID}`;
+  const comparisonTemplate = await fs.readFile(`${comparerDir}/index.html`, 'utf8');
+  const comparer = require(`${comparerDir}/index`).getQuery;
+  const comparison = await compare(comparisonTemplate, comparer, reports);
+  const comparisonDir = `${reportDir}/comparative`;
+  await fs.writeFile(`${comparisonDir}/${comparisonNameBase}.html`, comparison);
+  console.log(`Comparison completed. Proc: ${compareProcID}. Directory: ${comparisonDir}.`);
 };
 
 // ########## OPERATION

package/compare.js

@@ -9,11 +9,11 @@
 const replaceHolders = (template, query) => template
 .replace(/__([a-zA-Z]+)__/g, (ph, qp) => query[qp]);
 // Compares the scored reports and returns a comparison.
-exports.compare = (comparisonTemplate, comparer, reports) => {
+exports.compare = async (comparisonTemplate, comparer, reports) => {
   // Create a query.
   const query = {};
   // Populate the query.
-  comparer(reports, query);
+  await comparer(reports, query);
   // Use it to create a comparison.
   const comparison = replaceHolders(comparisonTemplate, query);
   // Return the comparison.

package/merge.js

@@ -19,14 +19,8 @@ const stdRequester = process.env.REQUESTER;
 const contaminantNames = new Set([
   'axe',
   'continuum',
-  'focAll',
-  'focInd',
-  'focOp',
-  'hover',
   'htmlcs',
   'ibm',
-  'menuNav',
-  'textNodes',
   'wave'
 ]);
 // Tests that are immune to page alteration.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "10.3.1",
+  "version": "11.0.0",
   "description": "Client that scores and digests Testaro reports",
   "main": "aim.js",
   "scripts": {

package/procs/compare/cp20sqrt/index.js

@@ -14,26 +14,24 @@ const fs = require('fs/promises');
 
 // ########## CONSTANTS
 
-const reportDirScored = process.env.REPORTDIR_SCORED || 'reports/scored';
 const query = {};
 
 // ########## FUNCTIONS
 
 // Returns data on the targets.
 const getData = async scoredReports => {
-  const reportCount = scoredReports.length;
   const bodyData = [];
   for (const report of scoredReports) {
-    const {id, host, score} = report;
+    const {id, acts, sources, score} = report;
     bodyData.push({
       id,
-      org: host.what,
-      url: host.which,
+      org: sources.target.what,
+      url: acts[1].which,
       score: score.summary.total
     });
   };
   return {
-    pageCount,
+    pageCount: scoredReports.length,
     bodyData
   }
 };
@@ -57,13 +55,12 @@ const getTableBody = async bodyData => {
   });
   return rows.join('\n          ');
 };
-// Returns a query for a comparative table.
-exports.getQuery = async () => {
-  const data = await getData();
+// Populates a query for a comparative table.
+exports.getQuery = async (scoredReports, query) => {
+  const data = await getData(scoredReports);
   query.pageCount = data.pageCount;
   query.tableBody = await getTableBody(data.bodyData);
   const date = new Date();
   query.dateISO = date.toISOString().slice(0, 10);
   query.dateSlash = query.dateISO.replace(/-/g, '/');
-  return query;
 };

package/procs/compare/{cp15b → tcp24}/index.html

@@ -21,12 +21,12 @@
       <p>The table below compares __pageCount__ web pages on <a href="https://www.w3.org/WAI/fundamentals/accessibility-intro/">accessibility</a>. The page names are links to the pages on the web. The scores are links to digests that explain in detail how the scores were computed.</p>
       <p>The pages were:</p>
       <ol id="summary">
-        <li>Tested by <a href="https://www.npmjs.com/package/testaro">Testaro</a> with procedure <code>tp15</code></li>
-        <li>Scored by <a href="https://www.npmjs.com/package/testilo">Testilo</a> with procedure <code>sp15c</code></li>
-        <li>Digested by Testilo with procedure <code>dp15a</code></li>
-        <li>Compared by Testilo with procedure <code>cp15b</code></li>
+        <li>Tested by <a href="https://www.npmjs.com/package/testaro">Testaro</a> with script <code>ts20</code></li>
+        <li>Scored by <a href="https://www.npmjs.com/package/testilo">Testilo</a> with procedure <code>sp20b</code></li>
+        <li>Digested by Testilo with procedure <code>dp20d</code></li>
+        <li>Compared by Testilo with procedure <code>cp20a</code></li>
       </ol>
-      <p>The Testaro procedure performs 1230 tests on each page. Of these, 24 tests are custom tests defined by Testaro, and the others belong to packages of tests created by others.</p>
+      <p>The script made Testaro perform 1230 automated accessibility tests drawn from nine different packages: Alfa, Axe, Continuum, Equal Access, HTML CodeSniffer, Nu Html Checker, Tenon, Testaro, and WAVE. The scoring procedure made Testilo assign a score to each page, with 0 being perfect.</p>
       <h2>Comparison</h2>
       <table class="allBorder">
         <caption>Accessibility scores of web pages</caption>

package/procs/compare/{cp12a → tcp24}/index.js

@@ -1,6 +1,6 @@
 /*
-  cp12a.js
-  Returns a query for an HTML page including a bar-graph table.
+  cp24.js
+  Returns a query for replacing placeholders in the associated template.
 */
 
 // ########## IMPORTS
@@ -12,31 +12,24 @@ const fs = require('fs/promises');
 
 // ########## CONSTANTS
 
-const reportDirScored = process.env.REPORTDIR_SCORED || 'reports/scored';
 const query = {};
 
 // ########## FUNCTIONS
 
-// Returns data on the hosts in the report directory.
-const getData = async () => {
-  const reportDirAbs = `${__dirname}/../../../${reportDirScored}`;
-  const reportFileNamesAll = await fs.readdir(reportDirAbs);
-  const reportFileNamesSource = reportFileNamesAll.filter(fileName => fileName.endsWith('.json'));
-  const pageCount = reportFileNamesSource.length;
+// Returns data on the targets.
+const getData = async scoredReports => {
   const bodyData = [];
-  for (const fileName of reportFileNamesSource) {
-    const fileJSON = await fs.readFile(`${reportDirAbs}/${fileName}`, 'utf8');
-    const file = JSON.parse(fileJSON);
-    const {id, host, score} = file;
+  for (const report of scoredReports) {
+    const {id, acts, sources, score} = report;
     bodyData.push({
       id,
-      org: host.what,
-      url: host.which,
+      org: sources.target.what,
+      url: acts[1].which,
       score: score.summary.total
     });
   };
   return {
-    pageCount,
+    pageCount: scoredReports.length,
     bodyData
   }
 };
@@ -51,6 +44,7 @@ const getTableBody = async bodyData => {
     const {id, org, url, score} = item;
     const pageCell = `<th scope="row"><a href="${url}">${org}</a></th>`;
     const numCell = `<td><a href="digests/${id}.html">${score}</a></td>`;
+    // Make the bar width proportional.
     const barWidth = 100 * score / maxScore;
     const bar = `<rect height="100%" width="${barWidth}%" fill="red"></rect>`;
     const barCell = `<td aria-hidden="true"><svg width="100%" height="0.7em">${bar}</svg></td>`;
@@ -59,13 +53,12 @@ const getTableBody = async bodyData => {
   });
   return rows.join('\n          ');
 };
-// Returns a query for a comparative table.
-exports.getQuery = async () => {
-  const data = await getData();
+// Populates a query for a comparative table.
+exports.getQuery = async (scoredReports, query) => {
+  const data = await getData(scoredReports);
   query.pageCount = data.pageCount;
   query.tableBody = await getTableBody(data.bodyData);
   const date = new Date();
   query.dateISO = date.toISOString().slice(0, 10);
   query.dateSlash = query.dateISO.replace(/-/g, '/');
-  return query;
 };