testaro 72.1.1 → 72.1.3

package/package.json

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

package/testaro/allCaps.js

@@ -90,13 +90,13 @@ const classifyWithAI = entries => new Promise((resolve, reject) => {
           return;
         }
         const text = parsed.content[0].text;
-        resolve(
-          [...text.matchAll(/\{"index":\s*\d+,\s*"confidence":\s*[01]\.\d{1,2}\}/g)]
-          .map(m => {
-            const {index, confidence} = JSON.parse(m[0]);
-            return {index, confidence: Math.round(confidence * 10) / 10};
-          })
-        );
+        const classifications = [...text.matchAll(/\{"index":\s*\d+,\s*"confidence":\s*[01]\.\d{1,2}\}/g)]
+        .map(m => {
+          const {index, confidence} = JSON.parse(m[0]);
+          return {index, confidence: Math.round(confidence * 10) / 10};
+        });
+        const {input_tokens, output_tokens} = parsed.usage;
+        resolve({classifications, aiModelUsage: {inputTokens: input_tokens, outputTokens: output_tokens}});
       }
       catch(error) {
         reject(new Error(`Haiku response error: ${error.message}`));
@@ -141,7 +141,8 @@ exports.reporter = async (_, catalog, withItems) => {
   let violations;
   try {
     // Get AI estimates of the probabilities of their violating the rule.
-    const classifications = await classifyWithAI(sample);
+    const {classifications, aiModelUsage} = await classifyWithAI(sample);
+    data.aiModelUsage = aiModelUsage;
     // Treat the entries with above-minimum violation confidence levels as violations.
     violations = classifications
     .filter(({confidence}) => confidence >= MIN_CONFIDENCE)

package/tests/wave.js

@@ -89,96 +89,105 @@ exports.reporter = async (page, report, actIndex) => {
         }
         // If the response was parsed:
         if (! data.prevented) {
-          const {categories} = result.nativeResult;
-          // Delete its unnecessary properties.
-          delete categories.feature;
-          delete categories.structure;
-          delete categories.aria;
-          // For each WAVE rule category:
-          for (const categoryName of ['error', 'contrast', 'alert']) {
-            const category = categories[categoryName];
-            const ordinalSeverity = categoryName === 'alert' ? 0 : 3;
-            // If any violated rules (named items by WAVE) were reported:
-            if (
-              category?.items
-              && Object.keys(category.items).length
-            ) {
-              const {items} = category;
-              // If rules to be tested for were specified:
-              if (rules && rules.length) {
-                // For each rule violated:
-                Object.keys(items).forEach(ruleID => {
-                  // If it was not a specified rule:
-                  if (! rules.includes(ruleID)) {
-                    // Decrease the category violation count by the count of its violations.
-                    category.count -= items[ruleID].count;
-                    // Remove its violations from the native result.
-                    delete items[ruleID];
-                  }
-                });
-              }
-              // If standard results are to be reported:
-              if (standard) {
-                const {standardResult} = result;
-                const {totals, instances} = standardResult;
-                // Add the category violation count to the standard-result totals.
-                totals[ordinalSeverity] += category.count;
-                const annotatedItems = await page.evaluate(items => {
-                  const ruleIDs = Object.keys(items);
-                  // For each rule of the category with any violations:
-                  ruleIDs.forEach(ruleID => {
-                    const {selectors} = items[ruleID];
-                    // For each of those violations:
-                    for (const index in selectors) {
-                      const selector = selectors[index];
-                      // Get the violator.
-                      let violator;
-                      try {
-                        violator = document.querySelector(selector);
-                        // Concatenate its selector with its XPath in the native result.
-                        selectors[index] = [selector, window.getXPath(violator) ?? ''];
-                      } catch (error) {
-                        console.error(`ERROR: Invalid selector: ${selector} (${error.message})`);
-                      }
+          const {categories, status} = result.nativeResult;
+          // If the request succeeded and produced categories:
+          if(status.success && categories) {
+            // Delete the unnecessary properties of the categories.
+            delete categories.feature;
+            delete categories.structure;
+            delete categories.aria;
+            // For each WAVE rule category:
+            for (const categoryName of ['error', 'contrast', 'alert']) {
+              const category = categories[categoryName];
+              const ordinalSeverity = categoryName === 'alert' ? 0 : 3;
+              // If any violated rules (named items by WAVE) were reported:
+              if (
+                category?.items
+                && Object.keys(category.items).length
+              ) {
+                const {items} = category;
+                // If rules to be tested for were specified:
+                if (rules && rules.length) {
+                  // For each rule violated:
+                  Object.keys(items).forEach(ruleID => {
+                    // If it was not a specified rule:
+                    if (! rules.includes(ruleID)) {
+                      // Decrease the category violation count by the count of its violations.
+                      category.count -= items[ruleID].count;
+                      // Remove its violations from the native result.
+                      delete items[ruleID];
                     }
                   });
-                  return items;
-                }, items);
-                const ruleIDs = Object.keys(annotatedItems);
-                // For each rule of the category with any violations:
-                for (const ruleID of ruleIDs) {
-                  const {description, selectors} = annotatedItems[ruleID];
-                  // For each violation of the rule:
-                  for (const violation of selectors) {
-                    // Initialize a standard instance.
-                    const instance = {
-                      ruleID,
-                      what: description,
-                      ordinalSeverity,
-                      count: 1
-                    };
-                    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);
+                }
+                // If standard results are to be reported:
+                if (standard) {
+                  const {standardResult} = result;
+                  const {totals, instances} = standardResult;
+                  // Add the category violation count to the standard-result totals.
+                  totals[ordinalSeverity] += category.count;
+                  const annotatedItems = await page.evaluate(items => {
+                    const ruleIDs = Object.keys(items);
+                    // For each rule of the category with any violations:
+                    ruleIDs.forEach(ruleID => {
+                      const {selectors} = items[ruleID];
+                      // For each of those violations:
+                      for (const index in selectors) {
+                        const selector = selectors[index];
+                        // Get the violator.
+                        let violator;
+                        try {
+                          violator = document.querySelector(selector);
+                          // Concatenate its selector with its XPath in the native result.
+                          selectors[index] = [selector, window.getXPath(violator) ?? ''];
+                        } catch (error) {
+                          console.error(`ERROR: Invalid selector: ${selector} (${error.message})`);
+                        }
+                      }
+                    });
+                    return items;
+                  }, items);
+                  const ruleIDs = Object.keys(annotatedItems);
+                  // For each rule of the category with any violations:
+                  for (const ruleID of ruleIDs) {
+                    const {description, selectors} = annotatedItems[ruleID];
+                    // For each violation of the rule:
+                    for (const violation of selectors) {
+                      // Initialize a standard instance.
+                      const instance = {
+                        ruleID,
+                        what: description,
+                        ordinalSeverity,
+                        count: 1
+                      };
+                      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);
+                    }
                   }
                 }
               }
             }
           }
-        }
-        const {statistics} = result.nativeResult;
-        if (statistics) {
-          // Copy important data from the native result to the result.
-          data.pageTitle = statistics.pagetitle || '';
-          data.pageURL = statistics.pageurl || '';
-          data.elapsedSeconds = statistics.time || null;
-          data.creditsRemaining = statistics.creditsremaining || null;
-          console.log(`WAVE credits remaining: ${data.creditsRemaining}`);
-          data.allItemCount = statistics.allitemcount || null;
-          data.totalElements = statistics.totalelements || null;
-          data.waveURL = statistics.waveurl || '';
+          // Otherwise, if the request failed:
+          else if (! status.success) {
+            // Report this.
+            data.prevented = true;
+            data.error = status.error || 'Unknown error';
+          }
+          const {statistics} = result.nativeResult;
+          if (statistics) {
+            // Copy important data from the native result to the result.
+            data.pageTitle = statistics.pagetitle || '';
+            data.pageURL = statistics.pageurl || '';
+            data.elapsedSeconds = statistics.time || null;
+            data.creditsRemaining = statistics.creditsremaining || null;
+            console.log(`WAVE credits remaining: ${data.creditsRemaining}`);
+            data.allItemCount = statistics.allitemcount || null;
+            data.totalElements = statistics.totalelements || null;
+            data.waveURL = statistics.waveurl || '';
+          }
         }
         // Return the result.
         resolve({