es-guard 1.6.0 → 1.7.0

package/dist/cli.js

@@ -4,9 +4,8 @@ import * as fs from "fs";
 import packageJson from "../package.json" with { type: "json" };
 import { checkCompatibility, formatViolationMessage } from "./lib/checkCompatiblity.js";
 import { getBrowserTargetsFromString } from "./lib/getBrowserTargets.js";
-import { detectTarget, detectOutputDir } from "./lib/detectTarget.js";
+import { detectProjectConfig, getConfigFileNames } from "./lib/detectTarget.js";
 import { setVerboseMode } from "./lib/globalState.js";
-import path from "path";
 const version = packageJson.version;
 // Create the main program
 const program = new Command();
@@ -71,22 +70,27 @@ program.action(async (directory, options) => {
     try {
         // Set global verbose mode
         setVerboseMode(options.verbose || false);
-        // Auto-detect output directory if not specified
+        // Auto-detect configuration if not specified
         let scanDirectory;
         let outputDirSource;
+        let target;
+        let targetSource;
+        let browserTargets;
+        let browserslistSource;
+        if (options.verbose) {
+            console.log("🔍 Auto-detecting project configuration...");
+            console.log(`📂 Searching in: ${process.cwd()}`);
+            console.log("");
+        }
+        // Use unified detection to get all configuration at once
+        const detectedConfig = detectProjectConfig(process.cwd());
+        // Handle directory detection
         if (!directory) {
-            if (options.verbose) {
-                console.log("🔍 No directory specified, auto-detecting output directory from project configuration files...");
-                console.log(`📂 Searching in: ${process.cwd()}`);
-                console.log("");
-            }
-            // Try to detect output directory from current working directory
-            const detectedOutput = detectOutputDir(process.cwd());
-            if (detectedOutput) {
-                scanDirectory = detectedOutput.outputDir;
-                outputDirSource = `auto-detected from ${detectedOutput.source}`;
+            if (detectedConfig.outputDir) {
+                scanDirectory = detectedConfig.outputDir;
+                outputDirSource = `auto-detected from ${detectedConfig.outputSource}`;
                 if (options.verbose) {
-                    console.log(`✅ Found output directory: ${scanDirectory} in ${detectedOutput.source}`);
+                    console.log(`✅ Found output directory: ${scanDirectory} in ${detectedConfig.outputSource}`);
                 }
             }
             else {
@@ -113,80 +117,51 @@ program.action(async (directory, options) => {
             console.error(`Error: "${scanDirectory}" is not a directory`);
             process.exit(1);
         }
-        // Determine target - use provided target or auto-detect
-        let target = options.target;
-        let targetSource = "specified";
-        if (!target) {
+        // Handle target detection
+        if (options.target) {
+            target = options.target;
+            targetSource = "specified";
+        }
+        else if (detectedConfig.target) {
+            target = detectedConfig.target;
+            targetSource = `auto-detected from ${detectedConfig.targetSource}`;
+        }
+        else {
             if (options.verbose) {
-                console.log("🔍 Auto-detecting ES target from project configuration files...");
-                console.log(`📂 Searching in: ${process.cwd()}`);
+                console.log("❌ No valid configuration files found for target detection");
+                console.log("📋 Searched for:");
+                const configFileNames = getConfigFileNames();
+                configFileNames.forEach((filename, index) => {
+                    console.log(`   ${index + 1}. ${filename}`);
+                });
                 console.log("");
             }
-            // Try to detect target from current working directory
-            const detectedResult = detectTarget(process.cwd());
-            if (detectedResult) {
-                target = detectedResult.target;
-                targetSource = `auto-detected from ${detectedResult.source}`;
-            }
-            else {
-                if (options.verbose) {
-                    console.log("❌ No valid configuration files found for target detection");
-                    console.log("📋 Searched for:");
-                    console.log("   - package.json (browserslist field)");
-                    console.log("   - .browserslistrc/.browserslist");
-                    console.log("   - tsconfig.json (compilerOptions.target)");
-                    console.log("   - babel.config.js/.babelrc (@babel/preset-env targets)");
-                    console.log("   - vite.config.js/ts (esbuild target)");
-                    console.log("   - webpack.config.js/ts (target)");
-                    console.log("   - next.config.js/ts (output directory)");
-                    console.log("");
-                }
-                console.error("Error: No target specified and could not auto-detect from project configuration files.");
-                console.error("Please specify a target with --target or ensure your project has a valid configuration file.");
-                process.exit(1);
-            }
+            console.error("Error: No target specified and could not auto-detect from project configuration files.");
+            console.error("Please specify a target with --target or ensure your project has a valid configuration file.");
+            process.exit(1);
         }
-        // Determine browser targets
-        let browserTargets;
+        // Handle browser targets detection
         if (options.browsers) {
             browserTargets = options.browsers;
+            browserslistSource = "specified";
             if (options.verbose) {
                 console.log(`🌐 Using specified browser targets: ${browserTargets}`);
             }
         }
-        else {
-            // If auto-detected from package.json or browserslist file, check for ES version strings
-            if (targetSource.startsWith("auto-detected from ")) {
-                const configFile = targetSource.replace("auto-detected from ", "");
-                let browserslistEntries = [];
-                if (configFile === "package.json") {
-                    const pkgPath = path.join(process.cwd(), "package.json");
-                    if (fs.existsSync(pkgPath)) {
-                        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-                        if (pkg.browserslist) {
-                            browserslistEntries = Array.isArray(pkg.browserslist) ? pkg.browserslist : [pkg.browserslist];
-                        }
-                    }
-                }
-                else if (configFile === ".browserslistrc" || configFile === ".browserslist") {
-                    const blPath = path.join(process.cwd(), configFile);
-                    if (fs.existsSync(blPath)) {
-                        browserslistEntries = fs
-                            .readFileSync(blPath, "utf-8")
-                            .split(/\r?\n/)
-                            .map((l) => l.trim())
-                            .filter((l) => l && !l.startsWith("#"));
-                    }
-                }
-                const esVersionRegex = /^es\d{1,4}$/i;
-                const invalidEntries = browserslistEntries.filter((entry) => esVersionRegex.test(entry));
-                if (invalidEntries.length > 0) {
-                    console.warn(`Warning: Detected ES version string(s) in browserslist (${invalidEntries.join(", ")}). These are not valid Browserslist queries and will be ignored for browser compatibility checks.`);
-                }
+        else if (detectedConfig.browserslist) {
+            // Use the detected browserslist
+            browserTargets = detectedConfig.browserslist.join(", ");
+            browserslistSource = `auto-detected from ${detectedConfig.browserslistSource}`;
+            if (options.verbose) {
+                console.log(`🌐 Using detected browserslist: ${browserTargets} (from ${detectedConfig.browserslistSource})`);
             }
+        }
+        else {
+            // No browserslist detected, auto-determine from target
             browserTargets = getBrowserTargetsFromString(target);
+            browserslistSource = "auto-determined from target";
             if (options.verbose) {
-                console.log(`🌐 Auto-determined browser targets: ${browserTargets}`);
+                console.log(`🌐 No browserslist detected, auto-determining from target: ${browserTargets}`);
             }
         }
         if (options.verbose) {
@@ -195,6 +170,7 @@ program.action(async (directory, options) => {
             console.log(`   Target ES version: ${target}`);
             console.log(`   Target source: ${targetSource}`);
             console.log(`   Browser targets: ${browserTargets}`);
+            console.log(`   Browserslist source: ${browserslistSource}`);
             console.log(`   Scan directory: ${scanDirectory}`);
             console.log(`   Output directory source: ${outputDirSource}`);
             console.log("");
@@ -202,7 +178,7 @@ program.action(async (directory, options) => {
         console.log(`🔍 ES-Guard v${version}`);
         console.log(`📁 Scanning directory: ${scanDirectory}`);
         console.log(`🎯 Target ES version: ${target} (${targetSource})`);
-        console.log(`🌐 Browser targets: ${browserTargets}${options.browsers ? "" : " (auto-determined)"}`);
+        console.log(`🌐 Browser targets: ${browserTargets} (${browserslistSource})`);
         console.log("");
         const { errors, warnings } = await checkCompatibility({
             dir: scanDirectory,

package/dist/lib/detectTarget.js

@@ -24,23 +24,6 @@ const CONFIG_FILE_NAMES = [
     "next.config.cjs",
     "next.config.mjs",
 ];
-/**
- * Parse ES version from string (e.g., "es6", "es2020", "ES2015")
- * Returns the year as a string, or null if not found
- */
-const parseESVersion = (str) => {
-    const esMatch = str.match(/es(\d+)/i);
-    if (esMatch) {
-        const esVersion = parseInt(esMatch[1]);
-        // If it's a 4-digit year (like 2020), use it directly
-        if (esVersion >= 2000) {
-            return esVersion.toString();
-        }
-        // Otherwise convert ES version to year: ES6=2015, ES7=2016, ES8=2017, etc.
-        return (2009 + esVersion).toString();
-    }
-    return null;
-};
 /**
  * Common target mapping for TypeScript, Vite, and Webpack configs
  */
@@ -172,19 +155,18 @@ const getParser = (filename) => {
 /**
  * Get all possible config file names for detection
  */
-const getConfigFileNames = () => {
+export const getConfigFileNames = () => {
     return CONFIG_FILE_NAMES;
 };
 /**
- * Detects both ES target and output directory from common frontend project configuration files.
- * Searches in order of preference: package.json, .browserslistrc/.browserslist, tsconfig.json, babel.config.js, .babelrc, vite.config.js, webpack.config.js
- * Returns an object with detected target and output directory information
+ * Detection function that extracts all configuration in a single pass
+ * This is more efficient than separate detection functions
  */
-export const detectTargetAndOutput = (cwd = process.cwd()) => {
+export const detectProjectConfig = (cwd = process.cwd()) => {
     const configFileNames = getConfigFileNames();
     const result = {};
     if (verboseMode) {
-        console.log("🔍 Starting configuration file detection...");
+        console.log("🔍 Starting configuration detection...");
         console.log(`📂 Scanning directory: ${cwd}`);
         console.log("📋 Files to check:");
         configFileNames.forEach((filename, index) => {
@@ -241,10 +223,24 @@ export const detectTargetAndOutput = (cwd = process.cwd()) => {
                 else if (verboseMode) {
                     console.log(`      📁 Output directory: not found`);
                 }
-                // If we found both target and output directory, we can stop searching
-                if (result.target && result.outputDir) {
+                // Update browserslist if found and not already set
+                if (detection.browserslist && !result.browserslist) {
+                    result.browserslist = detection.browserslist;
+                    result.browserslistSource = filename;
                     if (verboseMode) {
-                        console.log(`   ✅ Both target and output directory found, stopping search`);
+                        console.log(`      🌐 Browserslist: ${detection.browserslist.join(", ")} (from ${result.browserslistSource})`);
+                    }
+                }
+                else if (verboseMode && detection.browserslist) {
+                    console.log(`      🌐 Browserslist: ${detection.browserslist.join(", ")} (already found in ${result.browserslistSource})`);
+                }
+                else if (verboseMode) {
+                    console.log(`      🌐 Browserslist: not found`);
+                }
+                // If we found all three (target, output directory, and browserslist), we can stop searching
+                if (result.target && result.outputDir && result.browserslist) {
+                    if (verboseMode) {
+                        console.log(`   ✅ All configuration found, stopping search`);
                     }
                     break;
                 }
@@ -278,6 +274,12 @@ export const detectTargetAndOutput = (cwd = process.cwd()) => {
         else {
             console.log(`   📁 Output directory: not found`);
         }
+        if (result.browserslist) {
+            console.log(`   🌐 Browserslist: ${result.browserslist.join(", ")} (from ${result.browserslistSource})`);
+        }
+        else {
+            console.log(`   🌐 Browserslist: not found`);
+        }
         console.log("");
     }
     return result;
@@ -286,16 +288,37 @@ export const detectTargetAndOutput = (cwd = process.cwd()) => {
  * Legacy function for backward compatibility - detects only ES target
  */
 export const detectTarget = (cwd = process.cwd()) => {
-    const result = detectTargetAndOutput(cwd);
+    const result = detectProjectConfig(cwd);
     return result.target ? { target: result.target, source: result.targetSource } : null;
 };
 /**
  * Legacy function for backward compatibility - detects only output directory
  */
 export const detectOutputDir = (cwd = process.cwd()) => {
-    const result = detectTargetAndOutput(cwd);
+    const result = detectProjectConfig(cwd);
     return result.outputDir ? { outputDir: result.outputDir, source: result.outputSource } : null;
 };
+/**
+ * Legacy function for backward compatibility - detects only browserslist
+ */
+export const detectBrowserslist = (cwd = process.cwd()) => {
+    const result = detectProjectConfig(cwd);
+    return result.browserslist ? { browserslist: result.browserslist, source: result.browserslistSource } : null;
+};
+/**
+ * Legacy function for backward compatibility - detects target and output directory
+ */
+export const detectTargetAndOutput = (cwd = process.cwd()) => {
+    const result = detectProjectConfig(cwd);
+    return {
+        target: result.target,
+        targetSource: result.targetSource,
+        outputDir: result.outputDir,
+        outputSource: result.outputSource,
+        browserslist: result.browserslist,
+        browserslistSource: result.browserslistSource,
+    };
+};
 /**
  * Parse package.json for both target and output directory
  */
@@ -306,19 +329,11 @@ const parsePackageJson = (filePath) => {
         return {};
     }
     const result = {};
-    // Check for browserslist field for target
+    // Check for browserslist field
     if (pkg.browserslist) {
         const browserslist = Array.isArray(pkg.browserslist) ? pkg.browserslist : [pkg.browserslist];
-        // Look for ES target in browserslist
-        for (const browser of browserslist) {
-            if (typeof browser === "string") {
-                const target = parseESVersion(browser);
-                if (target) {
-                    result.target = target;
-                    break;
-                }
-            }
-        }
+        // Store the full browserslist for CLI defaults
+        result.browserslist = browserslist.filter((browser) => typeof browser === "string");
     }
     // Check for output directory hints
     if (pkg.dist) {
@@ -363,6 +378,7 @@ const parseTsConfig = (filePath) => {
  */
 const parseBabelConfig = (filePath) => {
     const content = readTextFile(filePath);
+    const result = {};
     // Look for @babel/preset-env configuration
     const presetEnvMatch = content.match(/@babel\/preset-env.*?targets.*?(\{[^}]*\})/s);
     if (presetEnvMatch) {
@@ -371,13 +387,16 @@ const parseBabelConfig = (filePath) => {
         const browsersMatch = targetsStr.match(/browsers.*?\[(.*?)\]/);
         if (browsersMatch) {
             const browsers = browsersMatch[1];
-            const target = parseESVersion(browsers);
-            if (target) {
-                return { target };
-            }
+            // Parse browsers array from string
+            const browsersList = browsers
+                .split(",")
+                .map((b) => b.trim().replace(/['"]/g, ""))
+                .filter((b) => b);
+            // Store the full browserslist for CLI defaults
+            result.browserslist = browsersList;
         }
     }
-    return {};
+    return result;
 };
 /**
  * Parse .babelrc for target
@@ -388,23 +407,20 @@ const parseBabelRc = (filePath) => {
         console.warn(`Warning: ${filePath} does not look like a valid .babelrc (missing or invalid presets field).`);
         return {};
     }
+    const result = {};
     if (config.presets) {
         for (const preset of config.presets) {
             if (Array.isArray(preset) && preset[0] === "@babel/preset-env") {
                 const options = preset[1];
                 if (options?.targets?.browsers) {
                     const browsers = options.targets.browsers;
-                    for (const browser of browsers) {
-                        const target = parseESVersion(browser);
-                        if (target) {
-                            return { target };
-                        }
-                    }
+                    // Store the full browserslist for CLI defaults
+                    result.browserslist = browsers;
                 }
             }
         }
     }
-    return {};
+    return result;
 };
 /**
  * Parse vite.config.js/ts for both target and output directory
@@ -454,7 +470,7 @@ const parseWebpackConfig = (filePath) => {
     return result;
 };
 /**
- * Parse .browserslistrc or .browserslist file for ES target
+ * Parse .browserslistrc or .browserslist file for browserslist
  */
 const parseBrowserslistFile = (filePath) => {
     const content = readTextFile(filePath);
@@ -462,13 +478,10 @@ const parseBrowserslistFile = (filePath) => {
         .split(/\r?\n/)
         .map((line) => line.trim())
         .filter((line) => line && !line.startsWith("#"));
-    for (const browser of lines) {
-        const target = parseESVersion(browser);
-        if (target) {
-            return { target };
-        }
-    }
-    return {};
+    const result = {};
+    // Store the full browserslist for CLI defaults
+    result.browserslist = lines;
+    return result;
 };
 /**
  * Parse next.config.js/ts/cjs/mjs for output directory

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-guard",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "A tool to check JavaScript compatibility with target environments",
   "type": "module",
   "main": "dist/cli.js",