testaro 69.0.3 → 69.2.0

package/package.json

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

package/procs/catalog.js

@@ -69,9 +69,14 @@ exports.getCatalog = async report => {
             '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 isTextable = element.closest('body')
+          && ! element.closest('svg')
+          && ! ['SCRIPT', 'STYLE', 'svg'].includes(element.tagName);
+          const innerText = isTextable
+          ? element.innerText.trim() || (element.parentElement?.innerText?.trim() ?? '')
+          : '';
+          const segments = innerText?.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('\n'));
@@ -110,8 +115,11 @@ exports.getCatalog = async report => {
           ) {
             // For each element that has it:
             textElementIndexes.forEach(index => {
-              // If it is not in the head:
-              if (! cat.element[index].pathID.includes('/head[1]')) {
+              // If it is not in the head, a script, a style, or a noscript element:
+              if (
+                ! ['/head[1]', '/script[', '/style[', '/noscript[']
+                .some(excluder => cat.element[index].pathID.includes(excluder))
+              ) {
                 // Mark it as linkable in the element data in the catalog.
                 cat.element[index].textLinkable = true;
               }