tailwind-lint 0.10.1 → 0.11.0

package/README.md

@@ -65,7 +65,7 @@ tailwind-lint --verbose
 ### Options
 
 - `-c, --config <path>` - Path to Tailwind config file (default: auto-discover)
-- `-a, --auto` - Auto-discover files from config content patterns (legacy, enabled by default)
+- `-a, --auto` - Auto-discover files from the resolved Tailwind config or CSS `@source` directives
 - `--fix` - Automatically fix problems that can be fixed
 - `--format <text|json>` - Output format (`text` default, `json` for machine-readable output)
 - `-v, --verbose` - Enable verbose logging for debugging
@@ -81,6 +81,9 @@ tailwind-lint "src/**/*.{js,jsx,ts,tsx}"
 # Specify a custom config location
 tailwind-lint --config ./config/tailwind.config.js
 
+# Scan files based on an explicit config
+tailwind-lint --config ./src/app.css
+
 # Lint and fix specific file types
 tailwind-lint "**/*.vue" --fix
 
@@ -109,6 +112,8 @@ The JSON payload includes:
 - `config` - resolved runtime values (`cwd`, `configPath`, `autoDiscover`, `fix`, `patterns`)
 - `files[]` - per-file diagnostics with 1-based `line`/`column` ranges
 
+On JSON errors, the CLI keeps the same top-level shape and adds `error` so agent integrations do not need a separate parser for failure cases.
+
 Typical agent flow:
 
 1. Run `tailwind-lint --auto --format json`.
@@ -147,6 +152,52 @@ export default defineConfig({
 
 If a real CSS config is also present, the CLI uses that file so custom `@theme` tokens and `@source` directives are available to diagnostics.
 
+### Workspace Settings
+
+The CLI also reads Tailwind workspace settings from common editor config files so extraction behavior can match your editor more closely.
+
+Supported locations:
+
+- `.zed/settings.json`
+- `.vscode/settings.json`
+
+Supported settings:
+
+- `classFunctions`
+- `experimental.classRegex`
+- `classAttributes`
+- `includeLanguages`
+- `files.exclude`
+- `lint`
+
+Zed format:
+
+```json
+{
+	"lsp": {
+		"tailwindcss-language-server": {
+			"settings": {
+				"classFunctions": ["cva", "cx"],
+				"experimental": {
+					"classRegex": ["tw=\"([^\"]*)\""]
+				}
+			}
+		}
+	}
+}
+```
+
+VS Code format:
+
+```json
+{
+	"tailwindCSS.classFunctions": ["cva", "cx"],
+	"tailwindCSS.experimental": {
+		"classRegex": ["tw=\"([^\"]*)\""]
+	}
+}
+```
+
 ### Tailwind CSS v3 (Legacy)
 
 Create a JavaScript config file (`tailwind.config.js`):

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_linter = require("./linter-CQy2hg_B.cjs");
+const require_linter = require("./linter-BygZ0yGf.cjs");
 let node_path = require("node:path");
 node_path = require_linter.__toESM(node_path, 1);
 let ansis = require("ansis");
@@ -74,6 +74,27 @@ function createJsonOutput({ files, totalFilesProcessed, cwd, configPath, autoDis
 		files: mappedFiles
 	};
 }
+function createJsonErrorOutput({ error, cwd, configPath, autoDiscover, fix, patterns }) {
+	return {
+		ok: false,
+		error,
+		summary: {
+			errors: 0,
+			warnings: 0,
+			fixed: 0,
+			filesWithIssues: 0,
+			totalFilesProcessed: 0
+		},
+		config: {
+			cwd,
+			configPath: configPath || null,
+			autoDiscover,
+			fix,
+			patterns
+		},
+		files: []
+	};
+}
 //#endregion
 //#region src/cli.ts
 const MAX_FILENAME_DISPLAY_LENGTH = 50;
@@ -84,13 +105,13 @@ function resolveOptions(files, options) {
 	let cwd = process.cwd();
 	let configPath = options.config;
 	let patterns = files;
+	let autoDiscover = hasAutoFlag;
+	if (hasConfigFlag && options.config) configPath = node_path.isAbsolute(options.config) ? options.config : node_path.resolve(process.cwd(), options.config);
 	if (hasConfigFlag && options.config && !hasFiles) {
-		const absoluteConfigPath = node_path.isAbsolute(options.config) ? options.config : node_path.resolve(process.cwd(), options.config);
-		cwd = node_path.dirname(absoluteConfigPath);
-		configPath = node_path.basename(absoluteConfigPath);
-		patterns = [require_linter.DEFAULT_FILE_PATTERN];
+		cwd = node_path.dirname(configPath);
+		patterns = [];
+		autoDiscover = true;
 	}
-	const autoDiscover = hasAutoFlag;
 	return {
 		cwd,
 		configPath,
@@ -186,19 +207,22 @@ program.configureHelp({ formatHelp: (cmd, helper) => {
 	}
 	return output;
 } });
-program.name("tailwind-lint").description("A CLI tool for linting Tailwind CSS class usage").version(getVersion()).argument("[files...]", "File patterns to lint (e.g., \"src/**/*.{js,jsx,ts,tsx}\")").option("-c, --config <path>", "Path to Tailwind config file (default: auto-discover)").option("-a, --auto", "Auto-discover files from Tailwind config content patterns").option("--fix", "Automatically fix problems that can be fixed").option("-v, --verbose", "Enable verbose logging for debugging").option("--format <format>", "Output format: text or json", "text").addHelpText("after", `
+program.name("tailwind-lint").description("A CLI tool for linting Tailwind CSS class usage").version(getVersion()).argument("[files...]", "File patterns to lint (e.g., \"src/**/*.{js,jsx,ts,tsx}\")").option("-c, --config <path>", "Path to Tailwind config file (default: auto-discover)").option("-a, --auto", "Auto-discover files from Tailwind config or CSS @source patterns").option("--fix", "Automatically fix problems that can be fixed").option("-v, --verbose", "Enable verbose logging for debugging").option("--format <format>", "Output format: text or json", "text").addHelpText("after", `
 ${ansis.default.bold.cyan("Examples:")}
   ${ansis.default.dim("$")} tailwind-lint
   ${ansis.default.dim("$")} tailwind-lint ${ansis.default.green("\"src/**/*.{js,jsx,ts,tsx}\"")}
   ${ansis.default.dim("$")} tailwind-lint ${ansis.default.yellow("--config")} ${ansis.default.green("./tailwind.config.js")}
+  ${ansis.default.dim("$")} tailwind-lint ${ansis.default.yellow("--config")} ${ansis.default.green("./src/app.css")}
   ${ansis.default.dim("$")} tailwind-lint ${ansis.default.green("\"src/**/*.tsx\"")} ${ansis.default.yellow("--fix")}
   ${ansis.default.dim("$")} tailwind-lint ${ansis.default.green("\"**/*.vue\"")}
 
 ${ansis.default.bold.cyan("Notes:")}
   ${ansis.default.dim("•")} Running without arguments auto-discovers config and files
+  ${ansis.default.dim("•")} Using ${ansis.default.yellow("--config")} without files scans based on that config
   ${ansis.default.dim("•")} For v3: uses content patterns from tailwind.config.js
-  ${ansis.default.dim("•")} For v4: uses @source patterns from CSS config, or default pattern
-  ${ansis.default.dim("•")} Default pattern: ${ansis.default.dim("./**/*.{js,jsx,ts,tsx,html}")}
+  ${ansis.default.dim("•")} For v4: uses @source patterns from CSS config, Vite detection, or default pattern
+  ${ansis.default.dim("•")} Default pattern: ${ansis.default.dim(require_linter.DEFAULT_FILE_PATTERN)}
+  ${ansis.default.dim("•")} Reads Tailwind workspace settings from ${ansis.default.dim(".zed/settings.json")} and ${ansis.default.dim(".vscode/settings.json")}
   ${ansis.default.dim("•")} Use ${ansis.default.yellow("--fix")} to automatically resolve fixable issues
 `).action(async (files, options) => {
 	const hasConfigFlag = !!options.config;
@@ -257,10 +281,10 @@ ${ansis.default.bold.cyan("Notes:")}
 		process.exit(hasErrors ? 1 : 0);
 	} catch (error) {
 		const errorMessage = error instanceof Error ? error.message : String(error);
-		if (isJsonOutput) console.log(JSON.stringify({
-			ok: false,
-			error: errorMessage
-		}));
+		if (isJsonOutput) console.log(JSON.stringify(createJsonErrorOutput({
+			error: errorMessage,
+			...resolved
+		})));
 		else console.error(ansis.default.red("✖ Error:"), errorMessage);
 		if (resolved.verbose && error instanceof Error && !isJsonOutput) {
 			console.error(ansis.default.dim("\nStack trace:"));

package/dist/{linter-CQy2hg_B.cjs → linter-BygZ0yGf.cjs}

@@ -80,8 +80,7 @@ const V4_CSS_FOLDERS = [
 	"./style/",
 	"./styles/",
 	"./assets/css/",
-	"./resources/css/",
-	"./.ladle/"
+	"./resources/css/"
 ];
 const VITE_CONFIG_PATHS = [
 	"vite.config.js",
@@ -207,6 +206,182 @@ async function applyCodeActions(state, filePath, content, diagnostics) {
 	}
 }
 //#endregion
+//#region src/utils/fs.ts
+function fileExists(filePath) {
+	try {
+		return node_fs.existsSync(filePath);
+	} catch {
+		return false;
+	}
+}
+function readFileSync(filePath) {
+	if (!filePath || typeof filePath !== "string") throw new TypeError("File path must be a non-empty string");
+	return node_fs.readFileSync(filePath, "utf-8");
+}
+function writeFileSync(filePath, content) {
+	if (!filePath || typeof filePath !== "string") throw new TypeError("File path must be a non-empty string");
+	if (typeof content !== "string") throw new TypeError("Content must be a string");
+	node_fs.writeFileSync(filePath, content, "utf-8");
+}
+function readGitignorePatterns(cwd) {
+	const gitignorePath = node_path.join(cwd, ".gitignore");
+	if (!fileExists(gitignorePath)) return [];
+	try {
+		return node_fs.readFileSync(gitignorePath, "utf-8").split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#") && !line.startsWith("!")).map((pattern) => {
+			const cleaned = pattern.replace(/\/+$/, "");
+			if (cleaned.includes("/") || cleaned.includes("*")) return cleaned.endsWith("/**") ? cleaned : `${cleaned}/**`;
+			return `**/${cleaned}/**`;
+		});
+	} catch {
+		return [];
+	}
+}
+//#endregion
+//#region src/utils/settings.ts
+function loadWorkspaceTailwindSettings(cwd) {
+	return mergeTailwindSettings(readVsCodeTailwindSettings(cwd), readZedTailwindSettings(cwd));
+}
+function readVsCodeTailwindSettings(cwd) {
+	const parsed = readJsoncFile(node_path.join(cwd, ".vscode", "settings.json"));
+	if (!parsed || typeof parsed !== "object") return {};
+	const raw = parsed;
+	const experimental = readNestedObject(raw, "tailwindCSS.experimental");
+	const files = readNestedObject(raw, "tailwindCSS.files");
+	const lint = readNestedObject(raw, "tailwindCSS.lint");
+	return {
+		includeLanguages: asRecord(raw["tailwindCSS.includeLanguages"]),
+		classAttributes: asStringArray(raw["tailwindCSS.classAttributes"]),
+		classFunctions: asStringArray(raw["tailwindCSS.classFunctions"]),
+		experimental: {
+			classRegex: asClassRegex(experimental?.classRegex),
+			configFile: asConfigFile(experimental?.configFile)
+		},
+		files: { exclude: asStringArray(files?.exclude) },
+		lint: asLintSettings(lint)
+	};
+}
+function readZedTailwindSettings(cwd) {
+	const parsed = readJsoncFile(node_path.join(cwd, ".zed", "settings.json"));
+	if (!parsed || typeof parsed !== "object") return {};
+	const serverSettings = asRecord(asRecord(asRecord(parsed.lsp)?.["tailwindcss-language-server"])?.settings);
+	const normalized = asRecord(serverSettings?.tailwindCSS) ?? serverSettings;
+	if (!normalized) return {};
+	return {
+		includeLanguages: asRecord(normalized.includeLanguages),
+		classAttributes: asStringArray(normalized.classAttributes),
+		classFunctions: asStringArray(normalized.classFunctions),
+		experimental: {
+			classRegex: asClassRegex(asRecord(normalized.experimental)?.classRegex),
+			configFile: asConfigFile(asRecord(normalized.experimental)?.configFile)
+		},
+		files: { exclude: asStringArray(asRecord(normalized.files)?.exclude) },
+		lint: asLintSettings(asRecord(normalized.lint))
+	};
+}
+function readJsoncFile(filePath) {
+	if (!fileExists(filePath)) return null;
+	try {
+		return JSON.parse(stripJsonComments(readFileSync(filePath)));
+	} catch {
+		return null;
+	}
+}
+function stripJsonComments(content) {
+	return content.replace(/\/\*[\s\S]*?\*\//g, "").replace(/^\s*\/\/.*$/gm, "").replace(/,\s*([}\]])/g, "$1");
+}
+function readNestedObject(input, key) {
+	return asRecord(input[key]);
+}
+function asRecord(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function asStringArray(value) {
+	return Array.isArray(value) && value.every((item) => typeof item === "string") ? value : void 0;
+}
+function asClassRegex(value) {
+	if (!Array.isArray(value)) return;
+	if (value.every((item) => typeof item === "string")) return value;
+	if (value.every((item) => Array.isArray(item) && item.length === 2 && item.every((part) => typeof part === "string"))) return value;
+}
+function asConfigFile(value) {
+	if (typeof value === "string" || value === null) return value;
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	const record = value;
+	const entries = Object.entries(record).filter(([, entry]) => typeof entry === "string" || Array.isArray(entry) && entry.every((item) => typeof item === "string"));
+	return entries.length === Object.keys(record).length ? Object.fromEntries(entries) : void 0;
+}
+function asLintSettings(value) {
+	if (!value) return;
+	const entries = Object.entries(value).filter(([, entry]) => [
+		"ignore",
+		"warning",
+		"error"
+	].includes(String(entry)));
+	return entries.length > 0 ? Object.fromEntries(entries) : void 0;
+}
+function mergeTailwindSettings(...patches) {
+	return patches.reduce((acc, patch) => {
+		if (patch.includeLanguages) acc.includeLanguages = {
+			...acc.includeLanguages,
+			...patch.includeLanguages
+		};
+		if (patch.classAttributes) acc.classAttributes = uniqueStrings(acc.classAttributes, patch.classAttributes);
+		if (patch.classFunctions) acc.classFunctions = uniqueStrings(acc.classFunctions, patch.classFunctions);
+		if (patch.experimental) acc.experimental = {
+			...acc.experimental,
+			...patch.experimental,
+			classRegex: mergeClassRegex(acc.experimental?.classRegex, patch.experimental.classRegex)
+		};
+		if (patch.files?.exclude) acc.files = { exclude: uniqueStrings(acc.files?.exclude, patch.files.exclude) };
+		if (patch.lint) acc.lint = {
+			...acc.lint,
+			...patch.lint
+		};
+		return acc;
+	}, {});
+}
+function uniqueStrings(...arrays) {
+	return [...new Set(arrays.flatMap((array) => array ?? []))];
+}
+function mergeClassRegex(current, next) {
+	if (!next) return current;
+	if (!current) return next;
+	const serialized = /* @__PURE__ */ new Set();
+	const merged = [];
+	for (const item of [...current, ...next]) {
+		const key = JSON.stringify(item);
+		if (serialized.has(key)) continue;
+		serialized.add(key);
+		merged.push(item);
+	}
+	return merged;
+}
+function mergeEditorSettings(defaultSettings, overrides) {
+	return {
+		...defaultSettings,
+		tailwindCSS: {
+			...defaultSettings.tailwindCSS,
+			...overrides,
+			includeLanguages: {
+				...defaultSettings.tailwindCSS.includeLanguages,
+				...overrides.includeLanguages
+			},
+			classAttributes: uniqueStrings(defaultSettings.tailwindCSS.classAttributes, overrides.classAttributes),
+			classFunctions: uniqueStrings(defaultSettings.tailwindCSS.classFunctions, overrides.classFunctions),
+			files: { exclude: uniqueStrings(defaultSettings.tailwindCSS.files.exclude, overrides.files?.exclude) },
+			experimental: {
+				...defaultSettings.tailwindCSS.experimental,
+				...overrides.experimental,
+				classRegex: mergeClassRegex(defaultSettings.tailwindCSS.experimental.classRegex, overrides.experimental?.classRegex) ?? defaultSettings.tailwindCSS.experimental.classRegex
+			},
+			lint: {
+				...defaultSettings.tailwindCSS.lint,
+				...overrides.lint
+			}
+		}
+	};
+}
+//#endregion
 //#region src/adapters/editor-state-adapter.ts
 function isDirectory(filePath) {
 	try {
@@ -216,7 +391,7 @@ function isDirectory(filePath) {
 	}
 }
 function createEditorState(cwd) {
-	const settings = {
+	const settings = mergeEditorSettings({
 		editor: { tabSize: 2 },
 		tailwindCSS: {
 			validate: true,
@@ -265,7 +440,7 @@ function createEditorState(cwd) {
 				suggestCanonicalClasses: "warning"
 			}
 		}
-	};
+	}, loadWorkspaceTailwindSettings(cwd));
 	return {
 		connection: null,
 		folder: cwd,
@@ -367,37 +542,6 @@ function extractConfigMetadata(state) {
 	if (config.corePlugins) state.corePlugins = Array.isArray(config.corePlugins) ? config.corePlugins : Object.keys(config.corePlugins);
 }
 //#endregion
-//#region src/utils/fs.ts
-function fileExists(filePath) {
-	try {
-		return node_fs.existsSync(filePath);
-	} catch {
-		return false;
-	}
-}
-function readFileSync(filePath) {
-	if (!filePath || typeof filePath !== "string") throw new TypeError("File path must be a non-empty string");
-	return node_fs.readFileSync(filePath, "utf-8");
-}
-function writeFileSync(filePath, content) {
-	if (!filePath || typeof filePath !== "string") throw new TypeError("File path must be a non-empty string");
-	if (typeof content !== "string") throw new TypeError("Content must be a string");
-	node_fs.writeFileSync(filePath, content, "utf-8");
-}
-function readGitignorePatterns(cwd) {
-	const gitignorePath = node_path.join(cwd, ".gitignore");
-	if (!fileExists(gitignorePath)) return [];
-	try {
-		return node_fs.readFileSync(gitignorePath, "utf-8").split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#") && !line.startsWith("!")).map((pattern) => {
-			const cleaned = pattern.replace(/\/+$/, "");
-			if (cleaned.includes("/") || cleaned.includes("*")) return cleaned.endsWith("/**") ? cleaned : `${cleaned}/**`;
-			return `**/${cleaned}/**`;
-		});
-	} catch {
-		return [];
-	}
-}
-//#endregion
 //#region src/adapters/v4-adapter.ts
 const require$3 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href || __filename);
 async function loadV4DesignSystem(state, cwd, configPath, verbose = false) {
@@ -700,6 +844,11 @@ async function discoverFilesFromConfig(cwd, configPath) {
 	}
 	const configDir = node_path.dirname(configFilePath);
 	const cssContent = fileExists(configFilePath) ? readFileSync(configFilePath) : SYNTHETIC_VITE_CSS_CONFIG_CONTENT;
+	const includeConfigFile = (files) => {
+		if (!fileExists(configFilePath)) return files;
+		const relativeConfigPath = node_path.relative(cwd, configFilePath);
+		return [...new Set([relativeConfigPath, ...files])].sort((a, b) => a.localeCompare(b));
+	};
 	const { include, exclude } = extractSourcePatterns(cssContent);
 	const importSource = extractImportSourceDirectives(cssContent);
 	const resolveFromConfig = (pattern) => {
@@ -709,10 +858,10 @@ async function discoverFilesFromConfig(cwd, configPath) {
 	const resolvedExclude = exclude.map(resolveFromConfig);
 	const gitignorePatterns = readGitignorePatterns(cwd);
 	const extraIgnore = [...resolvedExclude, ...gitignorePatterns];
-	if (include.length > 0) return expandPatterns(cwd, include.map(resolveFromConfig), extraIgnore);
-	if (importSource.roots.length > 0) return expandPatterns(cwd, importSource.roots.map((root) => resolveFromConfig(node_path.join(root, "**/*.{js,jsx,ts,tsx,html,vue,svelte,astro,mdx}"))), extraIgnore);
-	if (importSource.disableAutoSource) return [];
-	return expandPatterns(cwd, [DEFAULT_FILE_PATTERN], extraIgnore);
+	if (include.length > 0) return includeConfigFile(await expandPatterns(cwd, include.map(resolveFromConfig), extraIgnore));
+	if (importSource.roots.length > 0) return includeConfigFile(await expandPatterns(cwd, importSource.roots.map((root) => resolveFromConfig(node_path.join(root, "**/*.{js,jsx,ts,tsx,html,vue,svelte,astro,mdx}"))), extraIgnore));
+	if (importSource.disableAutoSource) return includeConfigFile([]);
+	return includeConfigFile(await expandPatterns(cwd, [DEFAULT_FILE_PATTERN], extraIgnore));
 }
 function extractContentPatterns(config) {
 	if (!config.content) return [];
@@ -796,7 +945,8 @@ async function initializeState(cwd, configPath, verbose = false) {
 }
 async function lint({ cwd, patterns, configPath, autoDiscover, fix = false, verbose = false, onProgress }) {
 	const state = await initializeState(cwd, configPath, verbose);
-	const files = await discoverFiles(cwd, patterns, configPath, autoDiscover);
+	const discoveredFiles = await discoverFiles(cwd, patterns, configPath, autoDiscover);
+	const files = state.configPath && isCssConfigFile(state.configPath) && fileExists(state.configPath) ? [...new Set([node_path.relative(cwd, state.configPath), ...discoveredFiles])].sort((a, b) => a.localeCompare(b)) : discoveredFiles;
 	if (verbose) {
 		console.log(ansis.default.cyan.bold(`→ Discovered ${files.length} file${files.length !== 1 ? "s" : ""} to lint`));
 		console.log();

package/dist/linter.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_linter = require("./linter-CQy2hg_B.cjs");
+const require_linter = require("./linter-BygZ0yGf.cjs");
 exports.extractImportSourceDirectives = require_linter.extractImportSourceDirectives;
 exports.extractSourcePatterns = require_linter.extractSourcePatterns;
 exports.lint = require_linter.lint;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "tailwind-lint",
-	"version": "0.10.1",
+	"version": "0.11.0",
 	"description": "A command-line tool that uses the Tailwind CSS IntelliSense plugin to show linting suggestions for your Tailwind CSS classes",
 	"keywords": [
 		"cli",