@diegovelasquezweb/a11y-engine 0.11.32 → 0.11.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diegovelasquezweb/a11y-engine",
-  "version": "0.11.32",
+  "version": "0.11.34",
   "description": "WCAG 2.2 accessibility audit engine — scanner, analyzer, and report builders",
   "type": "module",
   "license": "MIT",
@@ -32,6 +32,9 @@
     "CHANGELOG.md",
     "LICENSE"
   ],
+  "scripts": {
+    "test": "vitest run"
+  },
   "dependencies": {
     "@axe-core/playwright": "^4.11.1",
     "axe-core": "^4.11.1",
@@ -41,7 +44,5 @@
   "devDependencies": {
     "vitest": "^4.0.18"
   },
-  "scripts": {
-    "test": "vitest run"
-  }
-}
+  "packageManager": "pnpm@10.22.0+sha512.bf049efe995b28f527fd2b41ae0474ce29186f7edcb3bf545087bd61fbbebb2bf75362d1307fda09c2d288e1e499787ac12d4fcb617a974718a6051f2eee741c"
+}

package/src/fixes/apply-finding-fix.mjs

@@ -167,15 +167,56 @@ function buildPatternAiInput({ finding, candidate }) {
   };
 }
 
+// Layout file name patterns for page-level fixes (e.g. bypass/skip-link).
+// Ordered by priority: more specific names first.
+const LAYOUT_FILE_PATTERNS = [
+  /^app[\/\\]layout\.[jt]sx?$/i,
+  /^src[\/\\]app[\/\\]layout\.[jt]sx?$/i,
+  /^pages[\/\\]_app\.[jt]sx?$/i,
+  /^pages[\/\\]_document\.[jt]sx?$/i,
+  /^src[\/\\]pages[\/\\]_app\.[jt]sx?$/i,
+  /^src[\/\\]pages[\/\\]_document\.[jt]sx?$/i,
+  /layouts[\/\\]default\.vue$/i,
+  /layouts[\/\\][^\/\\]+\.vue$/i,
+  /\+layout\.svelte$/i,
+  /app\.component\.html$/i,
+  /layouts[\/\\][^\/\\]+\.astro$/i,
+  /layout[\/\\]theme\.liquid$/i,
+];
+
+function getLayoutCandidates(projectDir, files) {
+  const byPattern = [];
+  for (const { abs, rel, content } of files) {
+    const normalRel = rel.replace(/\\/g, "/");
+    for (let i = 0; i < LAYOUT_FILE_PATTERNS.length; i++) {
+      if (LAYOUT_FILE_PATTERNS[i].test(normalRel)) {
+        byPattern.push({ abs, rel, content, score: LAYOUT_FILE_PATTERNS.length - i });
+        break;
+      }
+    }
+  }
+  return byPattern.sort((a, b) => b.score - a.score).slice(0, MAX_CANDIDATE_FILES);
+}
+
 function getCandidateFiles(projectDir, finding) {
-  const files = listFilesRecursive(projectDir);
+  const allFiles = listFilesRecursive(projectDir).map((abs) => {
+    const content = fs.readFileSync(abs, "utf8");
+    const rel = path.relative(projectDir, abs);
+    return { abs, rel, content };
+  });
+
   const tokens = selectorTokens(finding.selector);
-  const ranked = files
-    .map((abs) => {
-      const content = fs.readFileSync(abs, "utf8");
-      const rel = path.relative(projectDir, abs);
-      return { abs, rel, content, score: scoreFile(rel, content, tokens) };
-    })
+
+  if (tokens.length === 0) {
+    // Selector has no useful tokens (e.g. "html", "body") — target layout files directly.
+    const layoutCandidates = getLayoutCandidates(projectDir, allFiles);
+    if (layoutCandidates.length > 0) return layoutCandidates;
+    // Fallback: return all files with equal weight so Claude gets the full picture.
+    return allFiles.slice(0, MAX_CANDIDATE_FILES).map((f) => ({ ...f, score: 1 }));
+  }
+
+  const ranked = allFiles
+    .map((f) => ({ ...f, score: scoreFile(f.rel, f.content, tokens) }))
     .filter((item) => item.score > 0)
     .sort((a, b) => b.score - a.score)
     .slice(0, MAX_CANDIDATE_FILES);
@@ -216,11 +257,19 @@ function groupFindingsByFile(domFindings, projectDir) {
 
   for (const finding of domFindings) {
     const tokens = selectorTokens(finding.selector);
-    const ranked = allFiles
-      .map((f) => ({ ...f, score: scoreFile(f.rel, f.content, tokens) }))
-      .filter((f) => f.score > 0)
-      .sort((a, b) => b.score - a.score)
-      .slice(0, MAX_CANDIDATE_FILES);
+    let ranked;
+    if (tokens.length === 0) {
+      const layoutCandidates = getLayoutCandidates(projectDir, allFiles);
+      ranked = layoutCandidates.length > 0
+        ? layoutCandidates
+        : allFiles.slice(0, MAX_CANDIDATE_FILES).map((f) => ({ ...f, score: 1 }));
+    } else {
+      ranked = allFiles
+        .map((f) => ({ ...f, score: scoreFile(f.rel, f.content, tokens) }))
+        .filter((f) => f.score > 0)
+        .sort((a, b) => b.score - a.score)
+        .slice(0, MAX_CANDIDATE_FILES);
+    }
 
     const key = ranked.length > 0 ? ranked[0].rel : `__no_candidates_${finding.id}`;
     if (!initialGroups.has(key)) {
@@ -322,11 +371,14 @@ function parseJsonBlock(text) {
 async function callClaudeForPatch({ apiKey, model, aiInput }) {
   const system = [
     "You are an accessibility fix engine.",
-    "Return JSON only.",
-    "Generate deterministic text replacements for provided files.",
-    "Use finding.fixDescription and execution.constraints.must as guidance for what to fix and how.",
-    "For insertions (new element that does not yet exist in the file), use the nearest existing parent element as the search anchor. The replace value must include that anchor plus the new content.",
-    "Do not create files. Do not modify paths outside provided filePath values.",
+    "Return JSON only — no markdown fences, no extra text.",
+    "The input contains either a single 'finding' object or a 'findings' array. Fix EVERY finding present.",
+    "For each finding, read its fixDescription and constraints.must fields to understand the required fix.",
+    "Generate text-replacement changes in the provided source files.",
+    "CRITICAL — filePath rules: use the EXACT filePath string from the files array. Never derive filePath from area, url, selector, or any other field. Never add or remove leading slashes or file extensions.",
+    "CRITICAL — search accuracy: the 'search' value must be a verbatim copy of a substring from the file content. Do not paraphrase, reformat, or reconstruct it — copy it character-for-character.",
+    "For insertions (new element not yet in the file), anchor the search on the nearest existing surrounding element and include it in both search and replace.",
+    "Do not create new files. Only write changes for filePaths listed in the files array.",
     "Schema:",
     "{\"changes\":[{\"filePath\":\"...\",\"search\":\"...\",\"replace\":\"...\"}],\"verifyRule\":\"...\",\"verifyRoute\":\"...\",\"notes\":\"...\"}",
   ].join("\n");
@@ -364,6 +416,11 @@ async function callClaudeForPatch({ apiKey, model, aiInput }) {
   return { patch: parsed, usage };
 }
 
+function normalizeFilePath(filePath) {
+  // Strip leading slashes Claude may copy from finding.area (e.g. "/contact.html" → "contact.html")
+  return typeof filePath === "string" ? filePath.replace(/^\/+/, "") : filePath;
+}
+
 function validateAiPatchOutput(output, projectDir, fileSet) {
   if (!isObject(output)) return { ok: false, reason: "AI patch output is empty" };
   if (!Array.isArray(output.changes) || output.changes.length === 0) {
@@ -372,18 +429,22 @@ function validateAiPatchOutput(output, projectDir, fileSet) {
 
   for (const change of output.changes) {
     if (!isObject(change)) return { ok: false, reason: "Invalid change item" };
-    const filePath = typeof change.filePath === "string" ? change.filePath.trim() : "";
+    const rawPath = typeof change.filePath === "string" ? change.filePath.trim() : "";
+    const filePath = normalizeFilePath(rawPath);
     const search = typeof change.search === "string" ? change.search : "";
     const replace = typeof change.replace === "string" ? change.replace : "";
     if (!filePath || !search) return { ok: false, reason: "Change is missing filePath/search" };
-    if (!fileSet.has(filePath)) return { ok: false, reason: `Change file not in candidate set: ${filePath}` };
+    if (!fileSet.has(filePath)) return { ok: false, reason: `Change file not in candidate set: ${rawPath}` };
     if (search === replace) return { ok: false, reason: `AI generated a no-op patch for ${filePath} — search and replace are identical` };
 
     const abs = path.resolve(projectDir, filePath);
-    if (!isWithin(projectDir, abs) && abs !== path.resolve(projectDir, filePath)) {
+    if (!isWithin(projectDir, abs)) {
       return { ok: false, reason: `Change path escapes projectDir: ${filePath}` };
     }
     if (replace.length > 20000) return { ok: false, reason: `Replacement too large for ${filePath}` };
+
+    // Normalize in-place so downstream applyChanges uses the clean path
+    change.filePath = filePath;
   }
 
   return { ok: true };