@d-zero/a11y-check-axe-scenario 0.3.0 → 0.4.0

package/dist/axe.js

@@ -1,3 +1,4 @@
+import AxePuppeteer from '@axe-core/puppeteer';
 import { createScenario } from '@d-zero/a11y-check-core';
 import { Cache } from '@d-zero/shared/cache';
 import { convertResultsFromViolations } from './convert-results-from-violations.js';
@@ -5,13 +6,15 @@ const scenarioId = 'a11y-check/axe';
 export default createScenario((options) => {
     const cache = new Cache(scenarioId, options?.cacheDir);
     return {
+        modulePath: import.meta.url,
+        moduleParams: JSON.stringify(options ?? {}),
         id: scenarioId,
         async exec(page, sizeName, log) {
             if (options?.cache === false) {
                 await cache.clear();
             }
             const axeLog = (message) => log(`🪓 ${message}`);
-            const key = (await page.url()) + '#' + sizeName;
+            const key = page.url() + '#' + sizeName;
             const cached = await cache.load(key, (key, value) => {
                 if (key === 'timestamp') {
                     return new Date(Date.parse(value));
@@ -23,10 +26,13 @@ export default createScenario((options) => {
                     violations: await convertResultsFromViolations(page, cached, sizeName, options?.screenshot ?? false, axeLog),
                 };
             }
-            const axeResults = await page.axe({
-                lang: options?.lang ?? 'ja',
-                log: axeLog,
-            });
+            const axeResults = await new AxePuppeteer(page)
+                .configure({
+                locale: {
+                    lang: options?.lang ?? 'ja',
+                },
+            })
+                .analyze();
             await cache.store(key, axeResults);
             return {
                 violations: await convertResultsFromViolations(page, axeResults, sizeName, options?.screenshot ?? false, axeLog),

package/dist/convert-results-from-node.d.ts

@@ -1,6 +1,6 @@
 import type { Style } from '@d-zero/a11y-check-core';
-import type { Page } from '@d-zero/puppeteer-page';
 import type { NodeResult } from 'axe-core';
+import type { Page } from 'puppeteer';
 /**
  *
  * @param page

package/dist/convert-results-from-node.js

@@ -16,9 +16,10 @@ export async function convertResultsFromNode(page, node, screenshot, log) {
     let screenshotName = null;
     if (screenshot && target) {
         log(`Screenshot: ${target}`);
-        const url = await page.url();
+        const url = page.url();
         const ssName = hash(url + target) + '.png';
-        const elementScreenshot = await page.elementScreenshot(target, {
+        const el = await page.waitForSelector(target);
+        const elementScreenshot = await el?.screenshot({
             path: path.resolve(process.cwd(), '.cache', ssName),
         });
         if (elementScreenshot) {

package/dist/convert-results-from-violations.d.ts

@@ -1,6 +1,6 @@
 import type { Violation } from '@d-zero/a11y-check-core';
-import type { Page } from '@d-zero/puppeteer-page';
 import type { AxeResults } from 'axe-core';
+import type { Page } from 'puppeteer';
 /**
  *
  * @param page

package/dist/convert-results-from-violations.js

@@ -1,7 +1,7 @@
 import { convertResultsFromNode } from './convert-results-from-node.js';
 import { detectLevel } from './detect-level.js';
 import { inferExplanation } from './infer-explanation.js';
-import { p } from './pargraph.js';
+import { p } from './paragraph.js';
 import { tagsToSCs } from './tags-to-scs.js';
 /**
  *
@@ -21,7 +21,7 @@ export async function convertResultsFromViolations(page, axeResults, sizeName, s
             const explanation = inferExplanation(violation.id, node, nodeResult?.style ?? null);
             results.push({
                 id: '',
-                url: await page.url(),
+                url: page.url(),
                 tool: `${axeResults.testEngine.name} (v${axeResults.testEngine.version})`,
                 timestamp: new Date(axeResults.timestamp),
                 component: nodeResult?.landmark ?? null,

package/dist/infer-explanation.js

@@ -1,5 +1,5 @@
 import { colorContrastCheck, ColorContrastError } from '@d-zero/a11y-check-core';
-import { br, p } from './pargraph.js';
+import { br, p } from './paragraph.js';
 /**
  *
  * @param id
@@ -132,7 +132,7 @@ export function inferExplanation(id, node, style) {
                     }
                     case ColorContrastError.DOES_NOT_DETERMINE_BACKGROUND: {
                         needCheck = 'WARNING';
-                        message = '背景色が判定できないかったので#FFFFFFとして判定しています。';
+                        message = '背景色が判定できなかったので#FFFFFFとして判定しています。';
                         contrastResult = style
                             ? colorContrastCheck({
                                 ...style,

package/dist/paragraph.d.ts

@@ -0,0 +1,10 @@
+/**
+ *
+ * @param {...any} texts
+ */
+export declare function p(...texts: (string | null | undefined)[]): string;
+/**
+ *
+ * @param {...any} texts
+ */
+export declare function br(...texts: (string | null | undefined)[]): string;

package/dist/paragraph.js

@@ -0,0 +1,14 @@
+/**
+ *
+ * @param {...any} texts
+ */
+export function p(...texts) {
+    return texts.filter(Boolean).join('\n\n');
+}
+/**
+ *
+ * @param {...any} texts
+ */
+export function br(...texts) {
+    return texts.filter(Boolean).join('\n');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/a11y-check-axe-scenario",
-	"version": "0.3.0",
+	"version": "0.4.0",
 	"description": "Accessibility Checker Axe Scenario",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -24,13 +24,18 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/a11y-check-core": "0.3.0",
+		"@axe-core/puppeteer": "4.10.2",
+		"@d-zero/a11y-check-core": "0.5.0",
 		"@d-zero/db-wcag": "1.0.0-alpha.1",
-		"@d-zero/shared": "0.7.0"
+		"@d-zero/shared": "0.9.0"
 	},
 	"devDependencies": {
-		"@d-zero/puppeteer-page": "0.3.0",
-		"axe-core": "4.10.2"
+		"axe-core": "4.10.3",
+		"puppeteer": "24.10.1"
 	},
-	"gitHead": "e4fd17857e31022d121527b00fd7f009dbdb2142"
+	"peerDependencies": {
+		"axe-core": "4.10.3",
+		"puppeteer": "24.10.1"
+	},
+	"gitHead": "04c6969564182c36ee38ef41e78130936dfa4863"
 }