next-a11y 0.1.4 → 0.1.6

package/README.md

@@ -1,3 +1,6 @@
+> [!IMPORTANT]
+> THIS PACKAGE IS IN ACTIVE DEVELOPMENT
+
 # next-a11y
 
 **Finds accessibility violations in your Next.js source code. Writes the fix.**

package/dist/cli/index.js

@@ -23,10 +23,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/cli/index.ts
-var import_dotenv = require("dotenv");
+var fs9 = __toESM(require("fs"));
+var path9 = __toESM(require("path"));
+var import_dotenv2 = require("dotenv");
 var import_commander = require("commander");
 
 // src/cli/scan-command.ts
+var fs7 = __toESM(require("fs"));
+var path7 = __toESM(require("path"));
+var import_dotenv = require("dotenv");
 var import_picocolors4 = __toESM(require("picocolors"));
 
 // src/config/resolve.ts
@@ -100,7 +105,7 @@ async function loadConfigFile(cwd) {
 }
 function resolveConfig(fileConfig, cliFlags = {}) {
   const merged = deepMerge(DEFAULT_CONFIG, fileConfig);
-  const provider = cliFlags.provider ?? merged.provider;
+  const provider = cliFlags.provider ?? merged.provider ?? detectProviderFromEnv();
   const model = cliFlags.model ?? merged.model ?? (provider ? PROVIDER_DEFAULTS[provider] : "gpt-4.1-nano");
   return {
     provider,
@@ -118,6 +123,12 @@ function resolveConfig(fileConfig, cliFlags = {}) {
     minScore: cliFlags.minScore
   };
 }
+function detectProviderFromEnv() {
+  for (const [name, envVar] of Object.entries(PROVIDER_ENV)) {
+    if (envVar && process.env[envVar]) return name;
+  }
+  return void 0;
+}
 function deepMerge(target, source) {
   const result = { ...target };
   for (const key of Object.keys(source)) {
@@ -146,13 +157,13 @@ async function discoverFiles(basePath, include, exclude) {
   if (typeof fs2.glob === "function") {
     for (const pattern of include) {
       try {
-        const matches = await new Promise((resolve4, reject) => {
+        const matches = await new Promise((resolve6, reject) => {
           fs2.glob(
             pattern,
             { cwd: absBase },
             (err, files) => {
               if (err) reject(err);
-              else resolve4(files);
+              else resolve6(files);
             }
           );
         });
@@ -358,6 +369,8 @@ var buttonLabelRule = {
         if (parent) {
           const hasTextContent = parent.getDescendantsOfKind(import_ts_morph2.SyntaxKind.JsxText).some((t) => t.getText().trim().length > 0);
           if (hasTextContent) continue;
+          const hasExpressionContent = parent.getDescendantsOfKind(import_ts_morph2.SyntaxKind.JsxExpression).some((expr) => expr.getExpression() != null);
+          if (hasExpressionContent) continue;
           const nestedElements = parent.getDescendantsOfKind(
             import_ts_morph2.SyntaxKind.JsxOpeningElement
           );
@@ -512,6 +525,8 @@ var linkLabelRule = {
         if (parent) {
           const hasTextContent = parent.getDescendantsOfKind(import_ts_morph3.SyntaxKind.JsxText).some((t) => t.getText().trim().length > 0);
           if (hasTextContent) continue;
+          const hasExpressionContent = parent.getDescendantsOfKind(import_ts_morph3.SyntaxKind.JsxExpression).some((expr) => expr.getExpression() != null);
+          if (hasExpressionContent) continue;
           const images = [
             ...parent.getDescendantsOfKind(import_ts_morph3.SyntaxKind.JsxSelfClosingElement),
             ...parent.getDescendantsOfKind(import_ts_morph3.SyntaxKind.JsxOpeningElement)
@@ -1692,13 +1707,13 @@ var PROVIDER_INSTALL = {
   ollama: "npm install ollama-ai-provider"
 };
 function createProvider(provider, model) {
-  const pkg = PROVIDER_PACKAGES[provider];
+  const pkg2 = PROVIDER_PACKAGES[provider];
   let mod;
   try {
-    mod = require(pkg);
+    mod = require(pkg2);
   } catch {
     throw new Error(
-      `AI provider "${provider}" requires the "${pkg}" package.
+      `AI provider "${provider}" requires the "${pkg2}" package.
 Install it with: ${PROVIDER_INSTALL[provider]}
 
 Or run: npx next-a11y init`
@@ -1924,7 +1939,18 @@ var fs5 = __toESM(require("fs"));
 var path5 = __toESM(require("path"));
 var https = __toESM(require("https"));
 var http = __toESM(require("http"));
+var IMAGE_EXTENSIONS = [".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg", ".avif"];
+function isImagePath(p) {
+  return IMAGE_EXTENSIONS.some((ext) => p.endsWith(ext));
+}
 async function resolveImageSource(src, file, projectRoot) {
+  if (path5.isAbsolute(src) && isImagePath(src)) {
+    try {
+      const buffer = fs5.readFileSync(src);
+      return { type: "file", buffer, path: src };
+    } catch {
+    }
+  }
   if (src.startsWith("/")) {
     const publicPath = path5.join(projectRoot, "public", src);
     try {
@@ -1957,26 +1983,135 @@ async function resolveImageSource(src, file, projectRoot) {
   }
   return { type: "unresolvable", reason: "Dynamic image source" };
 }
-function resolveStaticImportPath(importName, file) {
+function resolveStaticImportPath(importName, file, projectRoot) {
+  let name = importName;
+  if (name.endsWith(".src")) {
+    name = name.slice(0, -4);
+  }
+  if (name.includes("[") || name.includes("(")) {
+    return void 0;
+  }
   const imports = file.getImportDeclarations();
+  const filePath = file.getFilePath();
+  const root = projectRoot ?? findProjectRootFromFile(filePath);
+  const project = file.getProject();
   for (const imp of imports) {
+    const moduleSpecifier = imp.getModuleSpecifierValue();
     const defaultImport = imp.getDefaultImport();
-    if (defaultImport?.getText() === importName) {
-      const moduleSpecifier = imp.getModuleSpecifierValue();
-      if (moduleSpecifier.endsWith(".png") || moduleSpecifier.endsWith(".jpg") || moduleSpecifier.endsWith(".jpeg") || moduleSpecifier.endsWith(".webp") || moduleSpecifier.endsWith(".gif") || moduleSpecifier.endsWith(".svg") || moduleSpecifier.endsWith(".avif")) {
-        const filePath = file.getFilePath();
-        return path5.resolve(path5.dirname(filePath), moduleSpecifier);
+    if (defaultImport?.getText() === name) {
+      return resolveModuleToImage(moduleSpecifier, filePath, root, void 0, project);
+    }
+    const namedImports = imp.getNamedImports();
+    for (const named of namedImports) {
+      if (named.getName() === name || named.getAliasNode()?.getText() === name) {
+        const originalName = named.getName();
+        return resolveModuleToImage(moduleSpecifier, filePath, root, originalName, project);
       }
     }
   }
   return void 0;
 }
+function resolveModuleToImage(moduleSpecifier, fromFile, projectRoot, namedExport, project) {
+  if (isImagePath(moduleSpecifier)) {
+    return resolveModulePath(moduleSpecifier, fromFile, projectRoot, project);
+  }
+  if (namedExport) {
+    const barrelPath = resolveModulePath(moduleSpecifier, fromFile, projectRoot, project);
+    if (barrelPath) {
+      return followReExport(barrelPath, namedExport);
+    }
+  }
+  return void 0;
+}
+function resolveModulePath(moduleSpecifier, fromFile, projectRoot, project) {
+  let resolved;
+  if (moduleSpecifier.startsWith(".")) {
+    resolved = path5.resolve(path5.dirname(fromFile), moduleSpecifier);
+  } else {
+    const aliasResolved = resolvePathAlias(moduleSpecifier, projectRoot, project);
+    if (aliasResolved) {
+      resolved = aliasResolved;
+    } else {
+      return void 0;
+    }
+  }
+  if (fs5.existsSync(resolved) && fs5.statSync(resolved).isFile()) {
+    return resolved;
+  }
+  const extensions = [".ts", ".tsx", ".js", ".jsx", ...IMAGE_EXTENSIONS];
+  for (const ext of extensions) {
+    const withExt = resolved + ext;
+    if (fs5.existsSync(withExt)) return withExt;
+  }
+  const indexFiles = ["index.ts", "index.tsx", "index.js", "index.jsx"];
+  for (const idx of indexFiles) {
+    const indexPath = path5.join(resolved, idx);
+    if (fs5.existsSync(indexPath)) return indexPath;
+  }
+  return void 0;
+}
+function followReExport(barrelPath, exportName) {
+  try {
+    const content = fs5.readFileSync(barrelPath, "utf-8");
+    const reExportPattern = new RegExp(
+      `export\\s*\\{[^}]*\\b(?:default\\s+as\\s+)?${escapeRegex(exportName)}\\b[^}]*\\}\\s*from\\s*["']([^"']+)["']`
+    );
+    const match = content.match(reExportPattern);
+    if (match) {
+      const reExportPath = match[1];
+      if (isImagePath(reExportPath)) {
+        return path5.resolve(path5.dirname(barrelPath), reExportPath);
+      }
+    }
+  } catch {
+  }
+  return void 0;
+}
+function resolvePathAlias(moduleSpecifier, projectRoot, project) {
+  if (!project) return void 0;
+  const opts = project.getCompilerOptions();
+  const paths = opts.paths;
+  if (!paths) return void 0;
+  const baseDir = opts.baseUrl ?? projectRoot;
+  for (const [pattern, mappings] of Object.entries(paths)) {
+    if (pattern.endsWith("/*")) {
+      const prefix = pattern.slice(0, -1);
+      if (moduleSpecifier.startsWith(prefix)) {
+        const rest = moduleSpecifier.slice(prefix.length);
+        for (const mapping of mappings) {
+          const mappingBase = mapping.endsWith("/*") ? mapping.slice(0, -1) : mapping;
+          const resolved = path5.resolve(baseDir, mappingBase + rest);
+          return resolved;
+        }
+      }
+    } else if (pattern === moduleSpecifier) {
+      if (mappings.length > 0) {
+        return path5.resolve(baseDir, mappings[0]);
+      }
+    }
+  }
+  return void 0;
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findProjectRootFromFile(filePath) {
+  let dir = path5.dirname(filePath);
+  while (dir !== path5.dirname(dir)) {
+    if (fs5.existsSync(path5.join(dir, "package.json"))) return dir;
+    if (fs5.existsSync(path5.join(dir, "next.config.js"))) return dir;
+    if (fs5.existsSync(path5.join(dir, "next.config.mjs"))) return dir;
+    if (fs5.existsSync(path5.join(dir, "next.config.ts"))) return dir;
+    dir = path5.dirname(dir);
+  }
+  return path5.dirname(filePath);
+}
 function fetchImage(url) {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve6, reject) => {
     const client = url.startsWith("https") ? https : http;
     const req = client.get(url, { timeout: 1e4 }, (res) => {
       if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-        fetchImage(res.headers.location).then(resolve4).catch(reject);
+        fetchImage(res.headers.location).then(resolve6).catch(reject);
         return;
       }
       const chunks = [];
@@ -1991,7 +2126,7 @@ function fetchImage(url) {
         }
         chunks.push(chunk);
       });
-      res.on("end", () => resolve4(Buffer.concat(chunks)));
+      res.on("end", () => resolve6(Buffer.concat(chunks)));
       res.on("error", reject);
     });
     req.on("error", reject);
@@ -2064,6 +2199,8 @@ async function resolveAiFixes(opts) {
 async function resolveImgAlt(file, violation, model, config2, cache) {
   const el = findElement(file, violation.line);
   if (!el) return "";
+  const filePath = file.getFilePath();
+  const projectRoot = findProjectRoot(filePath);
   const srcAttr = el.getAttribute("src");
   let srcValue = "";
   if (srcAttr?.getKind() === import_ts_morph18.SyntaxKind.JsxAttribute) {
@@ -2074,13 +2211,11 @@ async function resolveImgAlt(file, violation, model, config2, cache) {
       const expr = init.asKind(import_ts_morph18.SyntaxKind.JsxExpression)?.getExpression();
       if (expr) {
         const importName = expr.getText();
-        const importPath = resolveStaticImportPath(importName, file);
+        const importPath = resolveStaticImportPath(importName, file, projectRoot);
         srcValue = importPath ?? importName;
       }
     }
   }
-  const filePath = file.getFilePath();
-  const projectRoot = findProjectRoot(filePath);
   const imageSource = await resolveImageSource(srcValue, file, projectRoot);
   const context = extractContext(file);
   const prompt = buildImgAltPrompt({
@@ -2167,17 +2302,17 @@ function findElement(file, line) {
   return elements.find((el) => el.getStartLineNumber() === line);
 }
 function findProjectRoot(filePath) {
-  const path8 = require("path");
-  const fs8 = require("fs");
-  let dir = path8.dirname(filePath);
-  while (dir !== path8.dirname(dir)) {
-    if (fs8.existsSync(path8.join(dir, "package.json"))) return dir;
-    if (fs8.existsSync(path8.join(dir, "next.config.js"))) return dir;
-    if (fs8.existsSync(path8.join(dir, "next.config.mjs"))) return dir;
-    if (fs8.existsSync(path8.join(dir, "next.config.ts"))) return dir;
-    dir = path8.dirname(dir);
-  }
-  return path8.dirname(filePath);
+  const path10 = require("path");
+  const fs10 = require("fs");
+  let dir = path10.dirname(filePath);
+  while (dir !== path10.dirname(dir)) {
+    if (fs10.existsSync(path10.join(dir, "package.json"))) return dir;
+    if (fs10.existsSync(path10.join(dir, "next.config.js"))) return dir;
+    if (fs10.existsSync(path10.join(dir, "next.config.mjs"))) return dir;
+    if (fs10.existsSync(path10.join(dir, "next.config.ts"))) return dir;
+    dir = path10.dirname(dir);
+  }
+  return path10.dirname(filePath);
 }
 
 // src/scan/scan.ts
@@ -2199,7 +2334,9 @@ async function detect(targetPath, config2) {
     config2.scanner.include,
     config2.scanner.exclude
   );
+  const tsconfigPath = path6.join(absPath, "tsconfig.json");
   const project = new import_ts_morph19.Project({
+    tsConfigFilePath: fs6.existsSync(tsconfigPath) ? tsconfigPath : void 0,
     skipAddingFilesFromTsConfig: true,
     compilerOptions: {
       jsx: 4,
@@ -2312,10 +2449,10 @@ var RULE_ICONS = {
   "heading-order": "hdg",
   "no-div-interactive": "div"
 };
-function formatReport(result, fix) {
+function formatReport(result, fix, version) {
   const lines = [];
   lines.push("");
-  lines.push(import_picocolors2.default.bold(`  next-a11y v0.1.4`));
+  lines.push(import_picocolors2.default.bold(`  next-a11y${version ? ` v${version}` : ""}`));
   lines.push(
     `  Scanned ${result.filesScanned} files`
   );
@@ -2505,7 +2642,7 @@ async function interactiveReview(violations, onAccept) {
   return { applied, skipped };
 }
 function promptAction() {
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout
@@ -2516,10 +2653,10 @@ function promptAction() {
       (answer) => {
         rl.close();
         const normalized = answer.trim().toLowerCase();
-        if (normalized === "n" || normalized === "no") resolve4("no");
-        else if (normalized === "s" || normalized === "skip") resolve4("skip");
-        else if (normalized === "q" || normalized === "quit") resolve4("quit");
-        else resolve4("yes");
+        if (normalized === "n" || normalized === "no") resolve6("no");
+        else if (normalized === "s" || normalized === "skip") resolve6("skip");
+        else if (normalized === "q" || normalized === "quit") resolve6("quit");
+        else resolve6("yes");
       }
     );
   });
@@ -2527,7 +2664,23 @@ function promptAction() {
 
 // src/cli/scan-command.ts
 function registerScanCommand(program2) {
+  const version = program2.version();
   program2.command("scan").description("Scan files for accessibility issues").argument("<path>", "Path to scan").option("--fix", "Auto-fix issues").option("-i, --interactive", "Review each fix interactively").option("--no-ai", "Skip AI-powered fixes").option("--provider <provider>", "Override AI provider").option("--model <model>", "Override AI model").option("--min-score <score>", "Minimum score threshold (exit code 1 if below)", parseInt).action(async (targetPath, options) => {
+    let envDir = path7.resolve(targetPath);
+    if (fs7.existsSync(envDir) && fs7.statSync(envDir).isFile()) {
+      envDir = path7.dirname(envDir);
+    }
+    let searchDir = envDir;
+    while (searchDir !== path7.dirname(searchDir)) {
+      for (const envFile of [".env", ".env.local"]) {
+        const envPath = path7.join(searchDir, envFile);
+        if (fs7.existsSync(envPath)) {
+          (0, import_dotenv.config)({ path: envPath, override: false, quiet: true });
+        }
+      }
+      if (fs7.existsSync(path7.join(searchDir, "package.json"))) break;
+      searchDir = path7.dirname(searchDir);
+    }
     const fileConfig = await loadConfigFile(process.cwd());
     const config2 = resolveConfig(fileConfig, {
       fix: options.fix,
@@ -2552,7 +2705,7 @@ function registerScanCommand(program2) {
           }
         );
         result = await finalize(ctx, applied);
-        console.log(formatReport(result, true));
+        console.log(formatReport(result, true, version));
       } else if (config2.fix) {
         const ctx = await detect(targetPath, config2);
         await resolveAi(ctx, (resolved, total, _violation, aiResult) => {
@@ -2579,10 +2732,10 @@ function registerScanCommand(program2) {
             console.log(formatFixApplied(f.filePath, f.line, f.rule, f.message));
           }
         }
-        console.log(formatReport(result, true));
+        console.log(formatReport(result, true, version));
       } else {
         result = await scan(targetPath, config2);
-        console.log(formatReport(result, false));
+        console.log(formatReport(result, false, version));
       }
       if (config2.minScore !== void 0 && result.score < config2.minScore) {
         console.error(
@@ -2600,26 +2753,29 @@ function registerScanCommand(program2) {
 }
 
 // src/cli/init-command.ts
-var fs7 = __toESM(require("fs"));
-var path7 = __toESM(require("path"));
+var fs8 = __toESM(require("fs"));
+var path8 = __toESM(require("path"));
 var readline2 = __toESM(require("readline"));
 var import_node_child_process = require("child_process");
 var import_picocolors5 = __toESM(require("picocolors"));
 var import_package_manager_detector = require("package-manager-detector");
 function registerInitCommand(program2) {
   program2.command("init").description("Initialize next-a11y configuration").action(async () => {
-    console.log(import_picocolors5.default.bold("\n  next-a11y v0.1.4 \u2014 Setup\n"));
+    const version = program2.version();
+    console.log(import_picocolors5.default.bold(`
+  next-a11y v${version} \u2014 Setup
+`));
     const options = await promptInitOptions();
     const cwd = process.cwd();
-    const hasAppDir = fs7.existsSync(path7.join(cwd, "app"));
-    const hasSrcDir = fs7.existsSync(path7.join(cwd, "src"));
+    const hasAppDir = fs8.existsSync(path8.join(cwd, "app"));
+    const hasSrcDir = fs8.existsSync(path8.join(cwd, "src"));
     const include = [];
     if (hasSrcDir) include.push("src/**/*.{tsx,jsx}");
     if (hasAppDir) include.push("app/**/*.{tsx,jsx}");
     if (include.length === 0) include.push("**/*.{tsx,jsx}");
     const configContent = generateConfig(options.provider, include);
-    const configPath = path7.join(cwd, "a11y.config.ts");
-    fs7.writeFileSync(configPath, configContent);
+    const configPath = path8.join(cwd, "a11y.config.ts");
+    fs8.writeFileSync(configPath, configContent);
     console.log(import_picocolors5.default.green("  Created a11y.config.ts"));
     if (options.provider !== "none" && options.installDep) {
       const pkgMap = {
@@ -2628,29 +2784,29 @@ function registerInitCommand(program2) {
         google: "@ai-sdk/google",
         ollama: "ollama-ai-provider"
       };
-      const pkg = pkgMap[options.provider];
-      if (pkg) {
+      const pkg2 = pkgMap[options.provider];
+      if (pkg2) {
         const pm = await (0, import_package_manager_detector.detect)({ cwd });
-        const resolved = (0, import_package_manager_detector.resolveCommand)(pm?.agent ?? "npm", "add", [pkg]);
-        const installCmd = resolved ? `${resolved.command} ${resolved.args.join(" ")}` : `npm install ${pkg}`;
+        const resolved = (0, import_package_manager_detector.resolveCommand)(pm?.agent ?? "npm", "add", [pkg2]);
+        const installCmd = resolved ? `${resolved.command} ${resolved.args.join(" ")}` : `npm install ${pkg2}`;
         try {
           console.log(import_picocolors5.default.dim(`  Running: ${installCmd}`));
           (0, import_node_child_process.execSync)(installCmd, { cwd, stdio: "pipe" });
-          console.log(import_picocolors5.default.green(`  Installed ${pkg}`));
+          console.log(import_picocolors5.default.green(`  Installed ${pkg2}`));
         } catch {
-          console.log(import_picocolors5.default.yellow(`  Failed to install ${pkg}. Run manually: ${installCmd}`));
+          console.log(import_picocolors5.default.yellow(`  Failed to install ${pkg2}. Run manually: ${installCmd}`));
         }
       }
     }
     if (options.addGitignore) {
-      const gitignorePath = path7.join(cwd, ".gitignore");
+      const gitignorePath = path8.join(cwd, ".gitignore");
       let content = "";
-      if (fs7.existsSync(gitignorePath)) {
-        content = fs7.readFileSync(gitignorePath, "utf-8");
+      if (fs8.existsSync(gitignorePath)) {
+        content = fs8.readFileSync(gitignorePath, "utf-8");
       }
       if (!content.includes(".a11y-cache")) {
         const newline = content.endsWith("\n") ? "" : "\n";
-        fs7.appendFileSync(gitignorePath, `${newline}.a11y-cache
+        fs8.appendFileSync(gitignorePath, `${newline}.a11y-cache
 `);
         console.log(import_picocolors5.default.green("  Updated .gitignore"));
       }
@@ -2691,7 +2847,7 @@ async function promptInitOptions() {
   return { provider, installDep, addGitignore };
 }
 function promptSelect(question, options) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     const rl = readline2.createInterface({
       input: process.stdin,
       output: process.stdout
@@ -2704,15 +2860,15 @@ function promptSelect(question, options) {
       rl.close();
       const idx = parseInt(answer.trim()) - 1;
       if (idx >= 0 && idx < options.length) {
-        resolve4(options[idx].value);
+        resolve6(options[idx].value);
       } else {
-        resolve4(options[0].value);
+        resolve6(options[0].value);
       }
     });
   });
 }
 function promptYesNo(question) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     const rl = readline2.createInterface({
       input: process.stdin,
       output: process.stdout
@@ -2720,7 +2876,7 @@ function promptYesNo(question) {
     rl.question(`  ${question} ${import_picocolors5.default.dim("[Y/n]")} `, (answer) => {
       rl.close();
       const normalized = answer.trim().toLowerCase();
-      resolve4(normalized !== "n" && normalized !== "no");
+      resolve6(normalized !== "n" && normalized !== "no");
     });
   });
 }
@@ -2798,12 +2954,14 @@ function formatBytes(bytes) {
 }
 
 // src/cli/index.ts
-(0, import_dotenv.config)({ path: ".env", override: false, quiet: true });
-(0, import_dotenv.config)({ path: ".env.local", override: true, quiet: true });
-(0, import_dotenv.config)({ path: ".env.development", override: true, quiet: true });
-(0, import_dotenv.config)({ path: ".env.development.local", override: true, quiet: true });
+var pkgPath = path9.resolve(__dirname, "../../package.json");
+var pkg = JSON.parse(fs9.readFileSync(pkgPath, "utf-8"));
+(0, import_dotenv2.config)({ path: ".env", override: false, quiet: true });
+(0, import_dotenv2.config)({ path: ".env.local", override: true, quiet: true });
+(0, import_dotenv2.config)({ path: ".env.development", override: true, quiet: true });
+(0, import_dotenv2.config)({ path: ".env.development.local", override: true, quiet: true });
 var program = new import_commander.Command();
-program.name("next-a11y").description("AI-powered accessibility codemod for Next.js").version("0.1.4");
+program.name("next-a11y").description("AI-powered accessibility codemod for Next.js").version(pkg.version);
 registerScanCommand(program);
 registerInitCommand(program);
 registerCacheCommand(program);

package/dist/cli/index.mjs

@@ -7,10 +7,15 @@ import {
 } from "../chunk-A4KDGFRG.mjs";
 
 // src/cli/index.ts
+import * as fs9 from "fs";
+import * as path9 from "path";
 import { config } from "dotenv";
 import { Command } from "commander";
 
 // src/cli/scan-command.ts
+import * as fs7 from "fs";
+import * as path7 from "path";
+import { config as dotenvConfig } from "dotenv";
 import pc4 from "picocolors";
 
 // src/config/resolve.ts
@@ -42,7 +47,7 @@ async function loadConfigFile(cwd) {
 }
 function resolveConfig(fileConfig, cliFlags = {}) {
   const merged = deepMerge(DEFAULT_CONFIG, fileConfig);
-  const provider = cliFlags.provider ?? merged.provider;
+  const provider = cliFlags.provider ?? merged.provider ?? detectProviderFromEnv();
   const model = cliFlags.model ?? merged.model ?? (provider ? PROVIDER_DEFAULTS[provider] : "gpt-4.1-nano");
   return {
     provider,
@@ -60,6 +65,12 @@ function resolveConfig(fileConfig, cliFlags = {}) {
     minScore: cliFlags.minScore
   };
 }
+function detectProviderFromEnv() {
+  for (const [name, envVar] of Object.entries(PROVIDER_ENV)) {
+    if (envVar && process.env[envVar]) return name;
+  }
+  return void 0;
+}
 function deepMerge(target, source) {
   const result = { ...target };
   for (const key of Object.keys(source)) {
@@ -88,13 +99,13 @@ async function discoverFiles(basePath, include, exclude) {
   if (typeof fs2.glob === "function") {
     for (const pattern of include) {
       try {
-        const matches = await new Promise((resolve4, reject) => {
+        const matches = await new Promise((resolve6, reject) => {
           fs2.glob(
             pattern,
             { cwd: absBase },
             (err, files) => {
               if (err) reject(err);
-              else resolve4(files);
+              else resolve6(files);
             }
           );
         });
@@ -300,6 +311,8 @@ var buttonLabelRule = {
         if (parent) {
           const hasTextContent = parent.getDescendantsOfKind(SyntaxKind2.JsxText).some((t) => t.getText().trim().length > 0);
           if (hasTextContent) continue;
+          const hasExpressionContent = parent.getDescendantsOfKind(SyntaxKind2.JsxExpression).some((expr) => expr.getExpression() != null);
+          if (hasExpressionContent) continue;
           const nestedElements = parent.getDescendantsOfKind(
             SyntaxKind2.JsxOpeningElement
           );
@@ -454,6 +467,8 @@ var linkLabelRule = {
         if (parent) {
           const hasTextContent = parent.getDescendantsOfKind(SyntaxKind3.JsxText).some((t) => t.getText().trim().length > 0);
           if (hasTextContent) continue;
+          const hasExpressionContent = parent.getDescendantsOfKind(SyntaxKind3.JsxExpression).some((expr) => expr.getExpression() != null);
+          if (hasExpressionContent) continue;
           const images = [
             ...parent.getDescendantsOfKind(SyntaxKind3.JsxSelfClosingElement),
             ...parent.getDescendantsOfKind(SyntaxKind3.JsxOpeningElement)
@@ -1634,13 +1649,13 @@ var PROVIDER_INSTALL = {
   ollama: "npm install ollama-ai-provider"
 };
 function createProvider(provider, model) {
-  const pkg = PROVIDER_PACKAGES[provider];
+  const pkg2 = PROVIDER_PACKAGES[provider];
   let mod;
   try {
-    mod = __require(pkg);
+    mod = __require(pkg2);
   } catch {
     throw new Error(
-      `AI provider "${provider}" requires the "${pkg}" package.
+      `AI provider "${provider}" requires the "${pkg2}" package.
 Install it with: ${PROVIDER_INSTALL[provider]}
 
 Or run: npx next-a11y init`
@@ -1866,7 +1881,18 @@ import * as fs5 from "fs";
 import * as path5 from "path";
 import * as https from "https";
 import * as http from "http";
+var IMAGE_EXTENSIONS = [".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg", ".avif"];
+function isImagePath(p) {
+  return IMAGE_EXTENSIONS.some((ext) => p.endsWith(ext));
+}
 async function resolveImageSource(src, file, projectRoot) {
+  if (path5.isAbsolute(src) && isImagePath(src)) {
+    try {
+      const buffer = fs5.readFileSync(src);
+      return { type: "file", buffer, path: src };
+    } catch {
+    }
+  }
   if (src.startsWith("/")) {
     const publicPath = path5.join(projectRoot, "public", src);
     try {
@@ -1899,26 +1925,135 @@ async function resolveImageSource(src, file, projectRoot) {
   }
   return { type: "unresolvable", reason: "Dynamic image source" };
 }
-function resolveStaticImportPath(importName, file) {
+function resolveStaticImportPath(importName, file, projectRoot) {
+  let name = importName;
+  if (name.endsWith(".src")) {
+    name = name.slice(0, -4);
+  }
+  if (name.includes("[") || name.includes("(")) {
+    return void 0;
+  }
   const imports = file.getImportDeclarations();
+  const filePath = file.getFilePath();
+  const root = projectRoot ?? findProjectRootFromFile(filePath);
+  const project = file.getProject();
   for (const imp of imports) {
+    const moduleSpecifier = imp.getModuleSpecifierValue();
     const defaultImport = imp.getDefaultImport();
-    if (defaultImport?.getText() === importName) {
-      const moduleSpecifier = imp.getModuleSpecifierValue();
-      if (moduleSpecifier.endsWith(".png") || moduleSpecifier.endsWith(".jpg") || moduleSpecifier.endsWith(".jpeg") || moduleSpecifier.endsWith(".webp") || moduleSpecifier.endsWith(".gif") || moduleSpecifier.endsWith(".svg") || moduleSpecifier.endsWith(".avif")) {
-        const filePath = file.getFilePath();
-        return path5.resolve(path5.dirname(filePath), moduleSpecifier);
+    if (defaultImport?.getText() === name) {
+      return resolveModuleToImage(moduleSpecifier, filePath, root, void 0, project);
+    }
+    const namedImports = imp.getNamedImports();
+    for (const named of namedImports) {
+      if (named.getName() === name || named.getAliasNode()?.getText() === name) {
+        const originalName = named.getName();
+        return resolveModuleToImage(moduleSpecifier, filePath, root, originalName, project);
       }
     }
   }
   return void 0;
 }
+function resolveModuleToImage(moduleSpecifier, fromFile, projectRoot, namedExport, project) {
+  if (isImagePath(moduleSpecifier)) {
+    return resolveModulePath(moduleSpecifier, fromFile, projectRoot, project);
+  }
+  if (namedExport) {
+    const barrelPath = resolveModulePath(moduleSpecifier, fromFile, projectRoot, project);
+    if (barrelPath) {
+      return followReExport(barrelPath, namedExport);
+    }
+  }
+  return void 0;
+}
+function resolveModulePath(moduleSpecifier, fromFile, projectRoot, project) {
+  let resolved;
+  if (moduleSpecifier.startsWith(".")) {
+    resolved = path5.resolve(path5.dirname(fromFile), moduleSpecifier);
+  } else {
+    const aliasResolved = resolvePathAlias(moduleSpecifier, projectRoot, project);
+    if (aliasResolved) {
+      resolved = aliasResolved;
+    } else {
+      return void 0;
+    }
+  }
+  if (fs5.existsSync(resolved) && fs5.statSync(resolved).isFile()) {
+    return resolved;
+  }
+  const extensions = [".ts", ".tsx", ".js", ".jsx", ...IMAGE_EXTENSIONS];
+  for (const ext of extensions) {
+    const withExt = resolved + ext;
+    if (fs5.existsSync(withExt)) return withExt;
+  }
+  const indexFiles = ["index.ts", "index.tsx", "index.js", "index.jsx"];
+  for (const idx of indexFiles) {
+    const indexPath = path5.join(resolved, idx);
+    if (fs5.existsSync(indexPath)) return indexPath;
+  }
+  return void 0;
+}
+function followReExport(barrelPath, exportName) {
+  try {
+    const content = fs5.readFileSync(barrelPath, "utf-8");
+    const reExportPattern = new RegExp(
+      `export\\s*\\{[^}]*\\b(?:default\\s+as\\s+)?${escapeRegex(exportName)}\\b[^}]*\\}\\s*from\\s*["']([^"']+)["']`
+    );
+    const match = content.match(reExportPattern);
+    if (match) {
+      const reExportPath = match[1];
+      if (isImagePath(reExportPath)) {
+        return path5.resolve(path5.dirname(barrelPath), reExportPath);
+      }
+    }
+  } catch {
+  }
+  return void 0;
+}
+function resolvePathAlias(moduleSpecifier, projectRoot, project) {
+  if (!project) return void 0;
+  const opts = project.getCompilerOptions();
+  const paths = opts.paths;
+  if (!paths) return void 0;
+  const baseDir = opts.baseUrl ?? projectRoot;
+  for (const [pattern, mappings] of Object.entries(paths)) {
+    if (pattern.endsWith("/*")) {
+      const prefix = pattern.slice(0, -1);
+      if (moduleSpecifier.startsWith(prefix)) {
+        const rest = moduleSpecifier.slice(prefix.length);
+        for (const mapping of mappings) {
+          const mappingBase = mapping.endsWith("/*") ? mapping.slice(0, -1) : mapping;
+          const resolved = path5.resolve(baseDir, mappingBase + rest);
+          return resolved;
+        }
+      }
+    } else if (pattern === moduleSpecifier) {
+      if (mappings.length > 0) {
+        return path5.resolve(baseDir, mappings[0]);
+      }
+    }
+  }
+  return void 0;
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findProjectRootFromFile(filePath) {
+  let dir = path5.dirname(filePath);
+  while (dir !== path5.dirname(dir)) {
+    if (fs5.existsSync(path5.join(dir, "package.json"))) return dir;
+    if (fs5.existsSync(path5.join(dir, "next.config.js"))) return dir;
+    if (fs5.existsSync(path5.join(dir, "next.config.mjs"))) return dir;
+    if (fs5.existsSync(path5.join(dir, "next.config.ts"))) return dir;
+    dir = path5.dirname(dir);
+  }
+  return path5.dirname(filePath);
+}
 function fetchImage(url) {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve6, reject) => {
     const client = url.startsWith("https") ? https : http;
     const req = client.get(url, { timeout: 1e4 }, (res) => {
       if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-        fetchImage(res.headers.location).then(resolve4).catch(reject);
+        fetchImage(res.headers.location).then(resolve6).catch(reject);
         return;
       }
       const chunks = [];
@@ -1933,7 +2068,7 @@ function fetchImage(url) {
         }
         chunks.push(chunk);
       });
-      res.on("end", () => resolve4(Buffer.concat(chunks)));
+      res.on("end", () => resolve6(Buffer.concat(chunks)));
       res.on("error", reject);
     });
     req.on("error", reject);
@@ -2006,6 +2141,8 @@ async function resolveAiFixes(opts) {
 async function resolveImgAlt(file, violation, model, config2, cache) {
   const el = findElement(file, violation.line);
   if (!el) return "";
+  const filePath = file.getFilePath();
+  const projectRoot = findProjectRoot(filePath);
   const srcAttr = el.getAttribute("src");
   let srcValue = "";
   if (srcAttr?.getKind() === SyntaxKind18.JsxAttribute) {
@@ -2016,13 +2153,11 @@ async function resolveImgAlt(file, violation, model, config2, cache) {
       const expr = init.asKind(SyntaxKind18.JsxExpression)?.getExpression();
       if (expr) {
         const importName = expr.getText();
-        const importPath = resolveStaticImportPath(importName, file);
+        const importPath = resolveStaticImportPath(importName, file, projectRoot);
         srcValue = importPath ?? importName;
       }
     }
   }
-  const filePath = file.getFilePath();
-  const projectRoot = findProjectRoot(filePath);
   const imageSource = await resolveImageSource(srcValue, file, projectRoot);
   const context = extractContext(file);
   const prompt = buildImgAltPrompt({
@@ -2109,17 +2244,17 @@ function findElement(file, line) {
   return elements.find((el) => el.getStartLineNumber() === line);
 }
 function findProjectRoot(filePath) {
-  const path8 = __require("path");
-  const fs8 = __require("fs");
-  let dir = path8.dirname(filePath);
-  while (dir !== path8.dirname(dir)) {
-    if (fs8.existsSync(path8.join(dir, "package.json"))) return dir;
-    if (fs8.existsSync(path8.join(dir, "next.config.js"))) return dir;
-    if (fs8.existsSync(path8.join(dir, "next.config.mjs"))) return dir;
-    if (fs8.existsSync(path8.join(dir, "next.config.ts"))) return dir;
-    dir = path8.dirname(dir);
-  }
-  return path8.dirname(filePath);
+  const path10 = __require("path");
+  const fs10 = __require("fs");
+  let dir = path10.dirname(filePath);
+  while (dir !== path10.dirname(dir)) {
+    if (fs10.existsSync(path10.join(dir, "package.json"))) return dir;
+    if (fs10.existsSync(path10.join(dir, "next.config.js"))) return dir;
+    if (fs10.existsSync(path10.join(dir, "next.config.mjs"))) return dir;
+    if (fs10.existsSync(path10.join(dir, "next.config.ts"))) return dir;
+    dir = path10.dirname(dir);
+  }
+  return path10.dirname(filePath);
 }
 
 // src/scan/scan.ts
@@ -2141,7 +2276,9 @@ async function detect(targetPath, config2) {
     config2.scanner.include,
     config2.scanner.exclude
   );
+  const tsconfigPath = path6.join(absPath, "tsconfig.json");
   const project = new Project2({
+    tsConfigFilePath: fs6.existsSync(tsconfigPath) ? tsconfigPath : void 0,
     skipAddingFilesFromTsConfig: true,
     compilerOptions: {
       jsx: 4,
@@ -2254,10 +2391,10 @@ var RULE_ICONS = {
   "heading-order": "hdg",
   "no-div-interactive": "div"
 };
-function formatReport(result, fix) {
+function formatReport(result, fix, version) {
   const lines = [];
   lines.push("");
-  lines.push(pc2.bold(`  next-a11y v0.1.4`));
+  lines.push(pc2.bold(`  next-a11y${version ? ` v${version}` : ""}`));
   lines.push(
     `  Scanned ${result.filesScanned} files`
   );
@@ -2447,7 +2584,7 @@ async function interactiveReview(violations, onAccept) {
   return { applied, skipped };
 }
 function promptAction() {
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout
@@ -2458,10 +2595,10 @@ function promptAction() {
       (answer) => {
         rl.close();
         const normalized = answer.trim().toLowerCase();
-        if (normalized === "n" || normalized === "no") resolve4("no");
-        else if (normalized === "s" || normalized === "skip") resolve4("skip");
-        else if (normalized === "q" || normalized === "quit") resolve4("quit");
-        else resolve4("yes");
+        if (normalized === "n" || normalized === "no") resolve6("no");
+        else if (normalized === "s" || normalized === "skip") resolve6("skip");
+        else if (normalized === "q" || normalized === "quit") resolve6("quit");
+        else resolve6("yes");
       }
     );
   });
@@ -2469,7 +2606,23 @@ function promptAction() {
 
 // src/cli/scan-command.ts
 function registerScanCommand(program2) {
+  const version = program2.version();
   program2.command("scan").description("Scan files for accessibility issues").argument("<path>", "Path to scan").option("--fix", "Auto-fix issues").option("-i, --interactive", "Review each fix interactively").option("--no-ai", "Skip AI-powered fixes").option("--provider <provider>", "Override AI provider").option("--model <model>", "Override AI model").option("--min-score <score>", "Minimum score threshold (exit code 1 if below)", parseInt).action(async (targetPath, options) => {
+    let envDir = path7.resolve(targetPath);
+    if (fs7.existsSync(envDir) && fs7.statSync(envDir).isFile()) {
+      envDir = path7.dirname(envDir);
+    }
+    let searchDir = envDir;
+    while (searchDir !== path7.dirname(searchDir)) {
+      for (const envFile of [".env", ".env.local"]) {
+        const envPath = path7.join(searchDir, envFile);
+        if (fs7.existsSync(envPath)) {
+          dotenvConfig({ path: envPath, override: false, quiet: true });
+        }
+      }
+      if (fs7.existsSync(path7.join(searchDir, "package.json"))) break;
+      searchDir = path7.dirname(searchDir);
+    }
     const fileConfig = await loadConfigFile(process.cwd());
     const config2 = resolveConfig(fileConfig, {
       fix: options.fix,
@@ -2494,7 +2647,7 @@ function registerScanCommand(program2) {
           }
         );
         result = await finalize(ctx, applied);
-        console.log(formatReport(result, true));
+        console.log(formatReport(result, true, version));
       } else if (config2.fix) {
         const ctx = await detect(targetPath, config2);
         await resolveAi(ctx, (resolved, total, _violation, aiResult) => {
@@ -2521,10 +2674,10 @@ function registerScanCommand(program2) {
             console.log(formatFixApplied(f.filePath, f.line, f.rule, f.message));
           }
         }
-        console.log(formatReport(result, true));
+        console.log(formatReport(result, true, version));
       } else {
         result = await scan(targetPath, config2);
-        console.log(formatReport(result, false));
+        console.log(formatReport(result, false, version));
       }
       if (config2.minScore !== void 0 && result.score < config2.minScore) {
         console.error(
@@ -2542,26 +2695,29 @@ function registerScanCommand(program2) {
 }
 
 // src/cli/init-command.ts
-import * as fs7 from "fs";
-import * as path7 from "path";
+import * as fs8 from "fs";
+import * as path8 from "path";
 import * as readline2 from "readline";
 import { execSync } from "child_process";
 import pc5 from "picocolors";
 import { detect as detectPM, resolveCommand } from "package-manager-detector";
 function registerInitCommand(program2) {
   program2.command("init").description("Initialize next-a11y configuration").action(async () => {
-    console.log(pc5.bold("\n  next-a11y v0.1.4 \u2014 Setup\n"));
+    const version = program2.version();
+    console.log(pc5.bold(`
+  next-a11y v${version} \u2014 Setup
+`));
     const options = await promptInitOptions();
     const cwd = process.cwd();
-    const hasAppDir = fs7.existsSync(path7.join(cwd, "app"));
-    const hasSrcDir = fs7.existsSync(path7.join(cwd, "src"));
+    const hasAppDir = fs8.existsSync(path8.join(cwd, "app"));
+    const hasSrcDir = fs8.existsSync(path8.join(cwd, "src"));
     const include = [];
     if (hasSrcDir) include.push("src/**/*.{tsx,jsx}");
     if (hasAppDir) include.push("app/**/*.{tsx,jsx}");
     if (include.length === 0) include.push("**/*.{tsx,jsx}");
     const configContent = generateConfig(options.provider, include);
-    const configPath = path7.join(cwd, "a11y.config.ts");
-    fs7.writeFileSync(configPath, configContent);
+    const configPath = path8.join(cwd, "a11y.config.ts");
+    fs8.writeFileSync(configPath, configContent);
     console.log(pc5.green("  Created a11y.config.ts"));
     if (options.provider !== "none" && options.installDep) {
       const pkgMap = {
@@ -2570,29 +2726,29 @@ function registerInitCommand(program2) {
         google: "@ai-sdk/google",
         ollama: "ollama-ai-provider"
       };
-      const pkg = pkgMap[options.provider];
-      if (pkg) {
+      const pkg2 = pkgMap[options.provider];
+      if (pkg2) {
         const pm = await detectPM({ cwd });
-        const resolved = resolveCommand(pm?.agent ?? "npm", "add", [pkg]);
-        const installCmd = resolved ? `${resolved.command} ${resolved.args.join(" ")}` : `npm install ${pkg}`;
+        const resolved = resolveCommand(pm?.agent ?? "npm", "add", [pkg2]);
+        const installCmd = resolved ? `${resolved.command} ${resolved.args.join(" ")}` : `npm install ${pkg2}`;
         try {
           console.log(pc5.dim(`  Running: ${installCmd}`));
           execSync(installCmd, { cwd, stdio: "pipe" });
-          console.log(pc5.green(`  Installed ${pkg}`));
+          console.log(pc5.green(`  Installed ${pkg2}`));
         } catch {
-          console.log(pc5.yellow(`  Failed to install ${pkg}. Run manually: ${installCmd}`));
+          console.log(pc5.yellow(`  Failed to install ${pkg2}. Run manually: ${installCmd}`));
         }
       }
     }
     if (options.addGitignore) {
-      const gitignorePath = path7.join(cwd, ".gitignore");
+      const gitignorePath = path8.join(cwd, ".gitignore");
       let content = "";
-      if (fs7.existsSync(gitignorePath)) {
-        content = fs7.readFileSync(gitignorePath, "utf-8");
+      if (fs8.existsSync(gitignorePath)) {
+        content = fs8.readFileSync(gitignorePath, "utf-8");
       }
       if (!content.includes(".a11y-cache")) {
         const newline = content.endsWith("\n") ? "" : "\n";
-        fs7.appendFileSync(gitignorePath, `${newline}.a11y-cache
+        fs8.appendFileSync(gitignorePath, `${newline}.a11y-cache
 `);
         console.log(pc5.green("  Updated .gitignore"));
       }
@@ -2633,7 +2789,7 @@ async function promptInitOptions() {
   return { provider, installDep, addGitignore };
 }
 function promptSelect(question, options) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     const rl = readline2.createInterface({
       input: process.stdin,
       output: process.stdout
@@ -2646,15 +2802,15 @@ function promptSelect(question, options) {
       rl.close();
       const idx = parseInt(answer.trim()) - 1;
       if (idx >= 0 && idx < options.length) {
-        resolve4(options[idx].value);
+        resolve6(options[idx].value);
       } else {
-        resolve4(options[0].value);
+        resolve6(options[0].value);
       }
     });
   });
 }
 function promptYesNo(question) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve6) => {
     const rl = readline2.createInterface({
       input: process.stdin,
       output: process.stdout
@@ -2662,7 +2818,7 @@ function promptYesNo(question) {
     rl.question(`  ${question} ${pc5.dim("[Y/n]")} `, (answer) => {
       rl.close();
       const normalized = answer.trim().toLowerCase();
-      resolve4(normalized !== "n" && normalized !== "no");
+      resolve6(normalized !== "n" && normalized !== "no");
     });
   });
 }
@@ -2740,12 +2896,14 @@ function formatBytes(bytes) {
 }
 
 // src/cli/index.ts
+var pkgPath = path9.resolve(__dirname, "../../package.json");
+var pkg = JSON.parse(fs9.readFileSync(pkgPath, "utf-8"));
 config({ path: ".env", override: false, quiet: true });
 config({ path: ".env.local", override: true, quiet: true });
 config({ path: ".env.development", override: true, quiet: true });
 config({ path: ".env.development.local", override: true, quiet: true });
 var program = new Command();
-program.name("next-a11y").description("AI-powered accessibility codemod for Next.js").version("0.1.4");
+program.name("next-a11y").description("AI-powered accessibility codemod for Next.js").version(pkg.version);
 registerScanCommand(program);
 registerInitCommand(program);
 registerCacheCommand(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-a11y",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "AI-powered accessibility codemod for Next.js",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",