@govtechsg/oobee 0.10.86 → 0.10.87

package/dist/crawlers/custom/utils.js

@@ -25,6 +25,7 @@ const parseBoolEnv = (val, defaultVal) => {
     return defaultVal;
 };
 const RESTRICT_OVERLAY_TO_ENTRY_DOMAIN = parseBoolEnv(process.env.RESTRICT_OVERLAY_TO_ENTRY_DOMAIN, false);
+const OVERLAY_OPERATION_TIMEOUT_MS = 5000;
 const isOverlayAllowed = (currentUrl, entryUrl) => {
     try {
         const cur = new URL(currentUrl);
@@ -206,7 +207,7 @@ export const addOverlayMenu = async (page, urlsCrawled, menuPos, opts = {
     inProgress: false,
     collapsed: false,
 }) => {
-    await page.waitForLoadState('domcontentloaded');
+    await page.waitForLoadState('domcontentloaded', { timeout: OVERLAY_OPERATION_TIMEOUT_MS });
     consoleLogger.info(`Overlay menu: adding to ${menuPos}...`);
     // Add the overlay menu with initial styling
     return page
@@ -987,6 +988,7 @@ export const addOverlayMenu = async (page, urlsCrawled, menuPos, opts = {
     })
         .catch(error => {
         consoleLogger.error('Overlay menu: failed to add', error);
+        throw error;
     });
 };
 export const removeOverlayMenu = async (page) => {
@@ -1007,6 +1009,8 @@ export const removeOverlayMenu = async (page) => {
 };
 export const initNewPage = async (page, pageClosePromises, processPageParams, pagesDict) => {
     let menuPos = MENU_POSITION.right;
+    let overlayRefreshSeq = 0;
+    let overlayRefreshChain = Promise.resolve();
     // eslint-disable-next-line no-underscore-dangle
     const pageId = page._guid;
     page.on('dialog', async (dialog) => {
@@ -1032,6 +1036,68 @@ export const initNewPage = async (page, pageClosePromises, processPageParams, pa
             collapsed: false,
         };
     }
+    const reconcileOverlayMenu = async (trigger) => {
+        // Mark this as the latest refresh so older ones can stop.
+        const refreshSeq = ++overlayRefreshSeq;
+        // Serialize overlay updates so multiple navigation events do not add/remove concurrently.
+        overlayRefreshChain = overlayRefreshChain
+            .catch(() => { })
+            .then(async () => {
+            if (refreshSeq !== overlayRefreshSeq || page.isClosed())
+                return;
+            try {
+                // `framenavigated` can fire before the new document is ready for DOM inspection/injection.
+                await page.waitForLoadState('domcontentloaded', { timeout: 5000 });
+            }
+            catch {
+                // Best effort only. The page may still be mid-navigation.
+            }
+            try {
+                // Give fast redirect chains a brief chance to advance before we inject/remove the overlay.
+                await page.waitForTimeout(300);
+            }
+            catch {
+                // Best effort only. The page may already be closing.
+            }
+            // Re-check staleness after waiting because a newer navigation may have happened meanwhile.
+            if (refreshSeq !== overlayRefreshSeq || page.isClosed())
+                return;
+            const allowed = isOverlayAllowed(page.url(), processPageParams.entryUrl);
+            if (!allowed) {
+                await Promise.race([
+                    removeOverlayMenu(page),
+                    new Promise((_, reject) => {
+                        setTimeout(() => {
+                            reject(new Error(`removeOverlayMenu timed out after ${OVERLAY_OPERATION_TIMEOUT_MS}ms`));
+                        }, OVERLAY_OPERATION_TIMEOUT_MS);
+                    }),
+                ]);
+                return;
+            }
+            const hasOverlay = await page.evaluate(() => Boolean(document.querySelector('#oobeeShadowHost')));
+            consoleLogger.info(`Overlay state (${trigger}): ${hasOverlay}`);
+            if (!hasOverlay) {
+                // Recreate the overlay after allowed redirects while preserving current UI state.
+                consoleLogger.info(`Adding overlay menu to page (${trigger}): ${page.url()}`);
+                await Promise.race([
+                    addOverlayMenu(page, processPageParams.urlsCrawled, menuPos, {
+                        inProgress: !!pagesDict[pageId]?.isScanning,
+                        collapsed: !!pagesDict[pageId]?.collapsed,
+                        hideStopInput: !!processPageParams.customFlowLabel,
+                    }),
+                    new Promise((_, reject) => {
+                        setTimeout(() => {
+                            reject(new Error(`addOverlayMenu timed out after ${OVERLAY_OPERATION_TIMEOUT_MS}ms`));
+                        }, OVERLAY_OPERATION_TIMEOUT_MS);
+                    }),
+                ]);
+            }
+        })
+            .catch(() => {
+            consoleLogger.info('Error in adding overlay menu to page');
+        });
+        await overlayRefreshChain;
+    };
     // Window functions exposed in browser
     const handleOnScanClick = async () => {
         consoleLogger.info('Scan: click detected');
@@ -1044,17 +1110,7 @@ export const initNewPage = async (page, pageClosePromises, processPageParams, pa
             pagesDict[pageId].isScanning = false;
             if (page.isClosed())
                 return;
-            const allowed = isOverlayAllowed(page.url(), processPageParams.entryUrl);
-            if (allowed) {
-                await addOverlayMenu(page, processPageParams.urlsCrawled, menuPos, {
-                    inProgress: false,
-                    collapsed: !!pagesDict[pageId]?.collapsed,
-                    hideStopInput: !!processPageParams.customFlowLabel,
-                });
-            }
-            else {
-                await removeOverlayMenu(page);
-            }
+            await reconcileOverlayMenu('scan-click');
         }
         catch (error) {
             log(`Scan failed ${error}`);
@@ -1118,37 +1174,21 @@ export const initNewPage = async (page, pageClosePromises, processPageParams, pa
     page.on('domcontentloaded', async () => {
         if (page.isClosed())
             return;
-        try {
-            const allowed = isOverlayAllowed(page.url(), processPageParams.entryUrl);
-            if (!allowed) {
-                await removeOverlayMenu(page);
-                return;
-            }
-            const existingOverlay = await page.evaluate(() => {
-                return document.querySelector('#oobeeShadowHost');
-            });
-            consoleLogger.info(`Overlay state: ${existingOverlay}`);
-            if (!existingOverlay) {
-                consoleLogger.info(`Adding overlay menu to page: ${page.url()}`);
-                await addOverlayMenu(page, processPageParams.urlsCrawled, menuPos, {
-                    inProgress: !!pagesDict[pageId]?.isScanning,
-                    collapsed: !!pagesDict[pageId]?.collapsed,
-                    hideStopInput: !!processPageParams.customFlowLabel,
-                });
+        await reconcileOverlayMenu('domcontentloaded');
+        if (isCypressTest) {
+            try {
+                await handleOnScanClick();
+                page.close();
             }
-            if (isCypressTest) {
-                try {
-                    await handleOnScanClick();
-                    page.close();
-                }
-                catch {
-                    consoleLogger.info(`Error in calling handleOnScanClick, isCypressTest: ${isCypressTest}`);
-                }
+            catch {
+                consoleLogger.info(`Error in calling handleOnScanClick, isCypressTest: ${isCypressTest}`);
             }
         }
-        catch {
-            consoleLogger.info('Error in adding overlay menu to page');
-        }
+    });
+    page.on('framenavigated', async (frame) => {
+        if (frame !== page.mainFrame() || page.isClosed())
+            return;
+        await reconcileOverlayMenu('framenavigated');
     });
     try {
         if (page.isClosed())
@@ -1167,5 +1207,6 @@ export const initNewPage = async (page, pageClosePromises, processPageParams, pa
     catch (e) {
         log(`Error exposing functions on page: ${e}`);
     }
+    await reconcileOverlayMenu('init');
     return page;
 };

package/dist/generateHtmlReport.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { compressJsonFileStreaming, writeHTML, flattenAndSortResults, populateScanPagesDetail, getWcagPassPercentage, getProgressPercentage, getIssuesPercentage, itemTypeDescription, oobeeAiHtmlETL, oobeeAiRules, formatAboutStartTime, convertItemsToReferences, } from './mergeAxeResults.js';
-import constants, { ScannerTypes, WCAGclauses, a11yRuleShortDescriptionMap, disabilityBadgesMap, a11yRuleLongDescriptionMap, } from './constants/constants.js';
+import constants, { ScannerTypes, WCAGclauses, a11yRuleShortDescriptionMap, disabilityBadgesMap, a11yRuleLongDescriptionMap, a11yRuleStepByStepGuide, } from './constants/constants.js';
 import { consoleLogger } from './logs.js';
 const ensureCategory = (categoryObj, categoryName) => {
     const rulesRaw = categoryObj?.rules ?? [];
@@ -23,7 +23,12 @@ const ensureCategory = (categoryObj, categoryName) => {
             rule.pagesAffected = [];
         }
         if (typeof rule.totalItems !== 'number') {
-            rule.totalItems = rule.pagesAffected.reduce((accumulate, page) => accumulate + (Array.isArray(page.items) ? page.items.length : 0), 0);
+            rule.totalItems = rule.pagesAffected.reduce((accumulate, page) => accumulate +
+                (Array.isArray(page.items)
+                    ? page.items.length
+                    : typeof page.itemsCount === 'number'
+                        ? page.itemsCount
+                        : 0), 0);
         }
     });
     const totals = {
@@ -38,7 +43,7 @@ const ensureCategory = (categoryObj, categoryName) => {
         rules,
     };
 };
-export const generateHtmlReport = async (resultDir) => {
+export const generateHtmlReport = async (resultDir, htmlFilename = 'report') => {
     try {
         const storagePath = path.resolve(resultDir);
         const scanDataJsonPath = path.join(storagePath, 'scanData.json');
@@ -61,17 +66,16 @@ export const generateHtmlReport = async (resultDir) => {
         }
         const scanData = JSON.parse(await fs.readFile(scanDataJsonPath, 'utf8'));
         const scanItemsAll = JSON.parse(await fs.readFile(scanItemsJsonPath, 'utf8'));
-        // Use convertItemsToReferences to normalize items structure to match scanItemsWithHtmlGroupRefs format
-        const scanItemsWithHtmlGroupRefs = convertItemsToReferences({
+        // Build the lighter scanItems payload used by the HTML report.
+        const lightScanItemsPayload = convertItemsToReferences({
             items: scanItemsAll,
-            ...scanData
         });
-        const { mustFix = {}, goodToFix = {}, needsReview = {}, passed = {}, } = scanItemsWithHtmlGroupRefs;
+        const { mustFix = {}, goodToFix = {}, needsReview = {}, } = lightScanItemsPayload;
         const items = {
             mustFix: ensureCategory(mustFix, 'mustFix'),
             goodToFix: ensureCategory(goodToFix, 'goodToFix'),
             needsReview: ensureCategory(needsReview, 'needsReview'),
-            passed: ensureCategory(passed, 'passed'),
+            passed: ensureCategory(scanItemsAll.passed || {}, 'passed'),
         };
         const pagesScanned = Array.isArray(scanData.pagesScanned) ? scanData.pagesScanned : [];
         const pagesNotScanned = Array.isArray(scanData.pagesNotScanned) ? scanData.pagesNotScanned : [];
@@ -116,6 +120,8 @@ export const generateHtmlReport = async (resultDir) => {
             a11yRuleShortDescriptionMap,
             disabilityBadgesMap,
             a11yRuleLongDescriptionMap,
+            a11yRuleStepByStepGuide,
+            wcagCriteriaLabels: constants.wcagCriteriaLabels,
             advancedScanOptionsSummaryItems: {
                 showIncludeScreenshots: !!scanData.advancedScanOptionsSummaryItems?.showIncludeScreenshots,
                 showAllowSubdomains: !!scanData.advancedScanOptionsSummaryItems?.showAllowSubdomains,
@@ -137,9 +143,10 @@ export const generateHtmlReport = async (resultDir) => {
         allIssues.wcagPassPercentage = getWcagPassPercentage(allIssues.wcagViolations, allIssues.advancedScanOptionsSummaryItems.showEnableWcagAaa);
         allIssues.progressPercentage = getProgressPercentage(allIssues.scanPagesDetail, allIssues.advancedScanOptionsSummaryItems.showEnableWcagAaa);
         allIssues.issuesPercentage = await getIssuesPercentage(allIssues.scanPagesDetail, allIssues.advancedScanOptionsSummaryItems.showEnableWcagAaa, allIssues.advancedScanOptionsSummaryItems?.disableOobee);
-        await writeHTML(allIssues, storagePath, 'report', scanDataB64Path, scanItemsB64Path);
-        consoleLogger.info(`Report generated at: ${path.join(storagePath, 'report.html')}`);
-        return path.join(storagePath, 'report.html');
+        await writeHTML(allIssues, storagePath, htmlFilename, scanDataB64Path, scanItemsB64Path);
+        const outputPath = path.join(storagePath, `${htmlFilename}.html`);
+        consoleLogger.info(`Report generated at: ${outputPath}`);
+        return outputPath;
     }
     catch (err) {
         consoleLogger.error(`generateHtmlReport failed: ${err?.message || err}`);

package/dist/mergeAxeResults/itemReferences.js

@@ -25,31 +25,66 @@ export const buildHtmlGroups = (rule, items, pageUrl) => {
         }
     });
 };
+/*
+// Commenting this out for now as we are not including htmlGroups in the embedded report payload to keep it lean.
+// We can revisit this if we want to include htmlGroups in the future and need a reference builder for it.
+const toHtmlGroupReference = (item: any) => {
+  if (typeof item === 'string') {
+    return item;
+  }
+
+  return `${item?.html || 'No HTML element'}\x00${item?.xpath || ''}`;
+};
+
+const cloneCategoryWithReferenceItems = (category: ScanCategory): ScanCategory =>
+  ({
+    ...category,
+    rules: category.rules.map(
+      rule =>
+        ({
+          ...rule,
+          pagesAffected: rule.pagesAffected.map(
+            page => {
+              const { items, ...pageWithoutItems } = page;
+
+              return {
+                ...pageWithoutItems,
+                itemsCount: page.itemsCount ?? (Array.isArray(items) ? items.length : 0),
+                items: Array.isArray(items) ? items.map(toHtmlGroupReference) : items,
+              } as any;
+            },
+          ),
+        }) as any,
+    ),
+  }) as ScanCategory;
+*/
+const cloneCategoryLight = (category, includeHtmlGroups) => ({
+    ...category,
+    rules: category.rules.map(rule => ({
+        rule: rule.rule,
+        description: rule.description,
+        helpUrl: rule.helpUrl,
+        conformance: rule.conformance,
+        totalItems: rule.totalItems,
+        axeImpact: rule.axeImpact,
+        ...(includeHtmlGroups && rule.htmlGroups ? { htmlGroups: rule.htmlGroups } : {}),
+        pagesAffected: rule.pagesAffected.map(page => ({
+            url: page.url,
+            pageTitle: page.pageTitle,
+            itemsCount: page.itemsCount ?? (Array.isArray(page.items) ? page.items.length : 0),
+        })),
+    })),
+});
 /**
- * Converts items in pagesAffected to references (html\x00xpath composite keys) for embedding in HTML report.
- * Additionally, it deep-clones allIssues, replaces page.items objects with composite reference keys.
- * Those refs are specifically for htmlGroups lookup (html + xpath).
+ * Builds the embedded HTML-report payload from the full scan items.
+ * Includes htmlGroups for non-passed categories (Group by HTML Element),
+ * excludes them from passed to keep payload within browser memory limits.
  */
-export const convertItemsToReferences = (allIssues) => {
-    const cloned = JSON.parse(JSON.stringify(allIssues));
-    ['mustFix', 'goodToFix', 'needsReview', 'passed'].forEach(category => {
-        if (!cloned.items[category]?.rules)
-            return;
-        cloned.items[category].rules.forEach((rule) => {
-            if (!rule.pagesAffected || !rule.htmlGroups)
-                return;
-            rule.pagesAffected.forEach((page) => {
-                if (!page.items)
-                    return;
-                page.items = page.items.map((item) => {
-                    if (typeof item === 'string')
-                        return item; // Already a reference
-                    // Use composite key matching buildHtmlGroups
-                    const htmlKey = `${item.html || 'No HTML element'}\x00${item.xpath || ''}`;
-                    return htmlKey;
-                });
-            });
-        });
-    });
-    return cloned;
+export const convertItemsToReferences = (source) => {
+    return {
+        mustFix: cloneCategoryLight(source.items.mustFix, true),
+        goodToFix: cloneCategoryLight(source.items.goodToFix, true),
+        needsReview: cloneCategoryLight(source.items.needsReview, true),
+        passed: cloneCategoryLight(source.items.passed, false),
+    };
 };

package/dist/mergeAxeResults/sentryTelemetry.js

@@ -110,7 +110,10 @@ const sendWcagBreakdownToSentry = async (appVersion, wcagBreakdown, ruleIdJson,
                 event_type: 'accessibility_scan',
                 scanType: scanInfo.scanType,
                 browser: scanInfo.browser,
-                entryUrl: scanInfo.entryUrl,
+                entryUrl: process.env.OOBEE_SCAN_METADATA ?? scanInfo.entryUrl,
+                ...(process.env.OOBEE_SCAN_PRODUCT && {
+                    scanProduct: process.env.OOBEE_SCAN_PRODUCT,
+                }),
             },
             user: {
                 ...(scanInfo.email && scanInfo.name

package/dist/mergeAxeResults.js

@@ -119,10 +119,10 @@ const writeHTML = async (allIssues, storagePath, htmlFilename = 'report', scanDe
     const { topFilePath, bottomFilePath } = await splitHtmlAndCreateFiles(htmlFilePath, storagePath);
     const prefixData = fs.readFileSync(path.join(storagePath, 'report-partial-top.htm.txt'), 'utf-8');
     const suffixData = fs.readFileSync(path.join(storagePath, 'report-partial-bottom.htm.txt'), 'utf-8');
-    // Create lighter version with item references for embedding in HTML
-    const scanItemsWithHtmlGroupRefs = convertItemsToReferences(allIssues);
+    // Create the lighter scanItems payload for embedding in the HTML report.
+    const lightScanItemsPayload = convertItemsToReferences(allIssues);
     // Write the lighter items to a file and get the base64 path
-    const { jsonFilePath: scanItemsWithHtmlGroupRefsJsonFilePath, base64FilePath: scanItemsWithHtmlGroupRefsBase64FilePath, } = await writeJsonFileAndCompressedJsonFile(scanItemsWithHtmlGroupRefs.items, storagePath, 'scanItems-light');
+    const { jsonFilePath: lightScanItemsPayloadJsonFilePath, base64FilePath: lightScanItemsPayloadBase64FilePath, } = await writeJsonFileAndCompressedJsonFile(lightScanItemsPayload, storagePath, 'scanItems-light');
     return new Promise((resolve, reject) => {
         const scanDetailsReadStream = fs.createReadStream(scanDetailsFilePath, {
             encoding: 'utf8',
@@ -135,8 +135,8 @@ const writeHTML = async (allIssues, storagePath, htmlFilename = 'report', scanDe
                 await Promise.all([
                     fs.promises.unlink(topFilePath),
                     fs.promises.unlink(bottomFilePath),
-                    fs.promises.unlink(scanItemsWithHtmlGroupRefsBase64FilePath),
-                    fs.promises.unlink(scanItemsWithHtmlGroupRefsJsonFilePath),
+                    fs.promises.unlink(lightScanItemsPayloadBase64FilePath),
+                    fs.promises.unlink(lightScanItemsPayloadJsonFilePath),
                 ]);
             }
             catch (err) {
@@ -172,22 +172,28 @@ const writeHTML = async (allIssues, storagePath, htmlFilename = 'report', scanDe
   } else {
     console.warn('Skipping fetch GenAI feature as it is local report');
   }
+
+  var scanData = null;
+  var scanItems = null;
   \n`);
         outputStream.write('</script>\n<script type="text/plain" id="scanDataRaw">');
         scanDetailsReadStream.pipe(outputStream, { end: false });
         scanDetailsReadStream.on('end', async () => {
             outputStream.write('</script>\n<script>\n');
-            outputStream.write("var scanDataPromise = (async () => { console.log('Loading scanData...'); scanData = await decodeUnzipParse(document.getElementById('scanDataRaw').textContent); })();\n");
+            outputStream.write("var scanDataPromise = (async () => { console.log('Loading scanData...'); scanData = await decodeUnzipParse(document.getElementById('scanDataRaw').textContent); console.log('[report] scanData loaded'); })();\n");
             outputStream.write('</script>\n');
             // Write scanItems in 2MB chunks using a stream to avoid loading entire file into memory
             try {
                 let chunkIndex = 1;
-                const scanItemsStream = fs.createReadStream(scanItemsWithHtmlGroupRefsBase64FilePath, {
+                const scanItemsStream = fs.createReadStream(lightScanItemsPayloadBase64FilePath, {
                     encoding: 'utf8',
                     highWaterMark: CHUNK_SIZE,
                 });
                 for await (const chunk of scanItemsStream) {
-                    outputStream.write(`<script type="text/plain" id="scanItemsRaw${chunkIndex}">${chunk}</script>\n`);
+                    const ok = outputStream.write(`<script type="text/plain" id="scanItemsRaw${chunkIndex}">${chunk}</script>\n`);
+                    if (!ok) {
+                        await new Promise(resolve => outputStream.once('drain', resolve));
+                    }
                     chunkIndex++;
                 }
                 outputStream.write('<script>\n');
@@ -203,6 +209,7 @@ var scanItemsPromise = (async () => {
     i++;
   }
   scanItems = await decodeUnzipParse(chunks);
+  console.log('[report] scanItems loaded');
 })();\n`);
                 outputStream.write(suffixData);
                 outputStream.end();
@@ -722,11 +729,13 @@ generateJsonFiles = false) => {
     const browserChannel = getBrowserToRun(randomToken, BrowserTypes.CHROME, false).browserToRun;
     // Should consider refactor constants.userDataDirectory to be a parameter in future
     await retryFunction(() => writeSummaryPdf(storagePath, pagesScanned.length, 'summary', browserChannel, constants.userDataDirectory), 1);
+    // Brief delay to allow lingering async crawlee storage operations to flush
+    await new Promise(resolve => setTimeout(resolve, 3000));
     try {
         await fs.promises.rm(path.join(storagePath, 'crawlee'), { recursive: true, force: true });
     }
     catch (error) {
-        consoleLogger.warn(`Unable to force remove crawlee folder: ${error.message}`);
+        // Silently ignore — folder may already be gone or still locked
     }
     try {
         await fs.promises.rm(path.join(storagePath, 'pdfs'), { recursive: true, force: true });

package/dist/static/ejs/partials/scripts/decodeUnzipParse.ejs

@@ -28,8 +28,11 @@ async function decodeUnzipParse(input) {
       offset += arr.length;
     }
 
-    // Step 2: Decompress with pako (GZIP)
-    const decompressed = pako.ungzip(merged, { to: 'string' });
+    // Step 2: Decompress with pako (GZIP) to bytes first to avoid large-string
+    // construction inside pako for very large payloads.
+    const decompressedBytes = pako.ungzip(merged);
+
+    const decompressed = new TextDecoder().decode(decompressedBytes);
 
     // Step 3: Parse JSON
     return JSON.parse(decompressed);
@@ -37,4 +40,4 @@ async function decodeUnzipParse(input) {
     throw new Error(`Failed to decode/unzip/parse: ${err.message}`);
   }
 }
-</script>
+</script>

package/dist/static/ejs/partials/scripts/ruleModal/itemCardRenderer.ejs

@@ -1,10 +1,44 @@
 <script>
   /**
-   * Resolves item references (composite "html\x00xpath" strings) to full item data using htmlGroups.
+   * Rebuilds the item list for a page from pre-computed htmlGroups when the light report omits page.items.
+   */
+  function buildItemsFromHtmlGroupsForPage(page, ruleInCategory) {
+    const htmlGroups = ruleInCategory.htmlGroups || {};
+    const resolvedItems = [];
+
+    Object.values(htmlGroups).forEach(groupData => {
+      if (!Array.isArray(groupData.pageUrls) || !groupData.pageUrls.includes(page.url)) {
+        return;
+      }
+
+      resolvedItems.push({
+        html: groupData.html,
+        xpath: groupData.xpath,
+        message: groupData.message,
+        screenshotPath: groupData.screenshotPath,
+        displayNeedsReview: groupData.displayNeedsReview,
+        pageUrl: page.url,
+        pageTitle: page.pageTitle || page.metadata
+      });
+    });
+
+    return resolvedItems;
+  }
+
+  /**
+   * The embedded report payload now omits page.items and rebuilds occurrences from
+   * htmlGroups + page metadata. Keep the older page.items resolution logic below
+   * commented for an easy rollback if we need to restore mixed payload support.
    */
   function resolveItemReferencesForPage(page, ruleInCategory) {
+    return buildItemsFromHtmlGroupsForPage(page, ruleInCategory);
+
+    /*
     const items = page.items || [];
-    if (items.length === 0) return [];
+
+    if (items.length === 0) {
+      return buildItemsFromHtmlGroupsForPage(page, ruleInCategory);
+    }
 
     const isReference = typeof items[0] === 'string';
 
@@ -27,6 +61,7 @@
           pageTitle: page.pageTitle || page.metadata
         };
       }
+
       // Fallback: parse composite key
       const nullByteIndex = compositeKey.indexOf('\x00');
       const html = nullByteIndex !== -1 ? compositeKey.slice(0, nullByteIndex) : compositeKey;
@@ -40,6 +75,7 @@
         pageTitle: page.pageTitle || page.metadata
       };
     });
+    */
   }
 
   function buildItemCardsWithPagination(accordionId, category, ruleInCategory, page, index) {

package/dist/static/ejs/partials/scripts/ruleModal/pageAccordionBuilder.ejs

@@ -86,7 +86,7 @@
             // Use pre-computed htmlGroups for count if available, otherwise use pages
             const count = isHtmlGrouping && selectedCategory.htmlGroups
               ? Object.keys(selectedCategory.htmlGroups).length
-              : selectedCategory.pagesAffected.length;
+              : (selectedCategory.pagesAffectedCount || selectedCategory.pagesAffected.length);
             if (isHtmlGrouping) {
               dropdownTitle.innerText = `HTML elements affected by this issue (${count})`;
             } else {

package/dist/static/ejs/partials/scripts/ruleModal/ruleOffcanvas.ejs

@@ -270,8 +270,8 @@ include('./pageAccordionBuilder') %> <%- include('./constants') %>
           if (!Array.isArray(rule.pagesAffected)) return;
 
           rule.pagesAffected.sort((a, b) => {
-            const lenA = Array.isArray(a.items) ? a.items.length : 0;
-            const lenB = Array.isArray(b.items) ? b.items.length : 0;
+            const lenA = Array.isArray(a.items) ? a.items.length : a.itemsCount || 0;
+            const lenB = Array.isArray(b.items) ? b.items.length : b.itemsCount || 0;
             return lenB - lenA; // DESC
           });
         });
@@ -295,10 +295,10 @@ include('./pageAccordionBuilder') %> <%- include('./constants') %>
             dropdownToggle.innerText = `${ruleInCategory.totalItems} Total occ.`;
             dropdownToggle.setAttribute('aria-label', occurrencesText);
           document.getElementById('expandedRuleDropdownTitle').innerText =
-            `Pages affected by this issue (${ruleInCategory.pagesAffected.length})`;
+            `Pages affected by this issue (${(ruleInCategory.pagesAffectedCount || ruleInCategory.pagesAffected.length)})`;
           buildExpandedRuleCategoryContent(category, ruleInCategory);
           document.getElementById('expandedRulePageContent').innerText =
-            `Total ${ruleInCategory.pagesAffected.length} affected pages`;
+            `Total ${(ruleInCategory.pagesAffectedCount || ruleInCategory.pagesAffected.length)} affected pages`;
         }
       }
     });

package/dist/static/ejs/summary.ejs

@@ -21,18 +21,24 @@
     %>
     <script>
       const scanItems = <%- JSON.stringify(
-        {
-          ...items,
-          ...['mustFix','goodToFix','needsReview','passed'].reduce((acc, cat) => {
-            if (items[cat]) {
-              acc[cat] = {
-                ...items[cat],
-                rules: (items[cat].rules || []).map(({ htmlGroups, ...rest }) => rest),
-              };
-            }
-            return acc;
-          }, {}),
-        }
+        ['mustFix','goodToFix','needsReview','passed'].reduce((acc, cat) => {
+          if (items[cat]) {
+            acc[cat] = {
+              description: items[cat].description,
+              totalItems: items[cat].totalItems,
+              totalRuleIssues: items[cat].totalRuleIssues,
+              rules: (items[cat].rules || []).map(rule => ({
+                rule: rule.rule,
+                description: rule.description,
+                helpUrl: rule.helpUrl,
+                conformance: rule.conformance,
+                totalItems: rule.totalItems,
+                pagesAffected: { length: (rule.pagesAffected || []).length },
+              })),
+            };
+          }
+          return acc;
+        }, {})
       ).replace(/<\//g, '<\\/') %>
     </script>
     <%- include('partials/scripts/summaryTable') %>

package/dist/utils.js

@@ -4,6 +4,7 @@ import fs from 'fs-extra';
 import axe from 'axe-core';
 import { v4 as uuidv4 } from 'uuid';
 import { getDomain } from 'tldts';
+import { normalizeUrl } from '@apify/utilities';
 import constants, { destinationPath, getIntermediateScreenshotsPath, } from './constants/constants.js';
 import { consoleLogger, errorsTxtPath } from './logs.js';
 import { getAxeConfiguration } from './crawlers/custom/getAxeConfiguration.js';
@@ -852,13 +853,13 @@ export const randomThreeDigitNumberString = () => {
     const threeDigitNumber = Math.floor(scaledDecimal) + 100;
     return String(threeDigitNumber);
 };
+export const normUrl = (u) => (u ? normalizeUrl(u) || u : '');
 export const isFollowStrategy = (link1, link2, rule) => {
+    if (rule === 'all')
+        return true;
     try {
         const parsedLink1 = new URL(link1);
         const parsedLink2 = new URL(link2);
-        if (rule === 'all') {
-            return true;
-        }
         if (rule === 'same-origin') {
             return parsedLink1.origin === parsedLink2.origin;
         }