eslint-plugin-oxfmt 0.0.12 → 0.0.14

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import * as eslint0 from "eslint";
+import * as eslint from "eslint";
 import { Linter, Rule } from "eslint";
 
 //#region src/types.d.ts
@@ -23,7 +23,7 @@ declare const meta: {
 //#endregion
 //#region src/rules/index.d.ts
 declare const rules: {
-  oxfmt: eslint0.Rule.RuleModule;
+  oxfmt: eslint.Rule.RuleModule;
 };
 //#endregion
 //#region src/parser.d.ts

package/dist/index.mjs

@@ -3,9 +3,9 @@ import { createSyncFn } from "synckit";
 import { URL, fileURLToPath } from "node:url";
 import { DIFFERENCE, generateDifferences } from "generate-differences";
 
-//#region rolldown:runtime
+//#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
-var __exportAll = (all, symbols) => {
+var __exportAll = (all, no_symbols) => {
 	let target = {};
 	for (var name in all) {
 		__defProp(target, name, {
@@ -13,7 +13,7 @@ var __exportAll = (all, symbols) => {
 			enumerable: true
 		});
 	}
-	if (symbols) {
+	if (!no_symbols) {
 		__defProp(target, Symbol.toStringTag, { value: "Module" });
 	}
 	return target;
@@ -58,7 +58,7 @@ const recommended = {
 	name: "oxfmt/recommended",
 	languageOptions: { parser: parserPlain },
 	plugins: { get oxfmt() {
-		return src_default;
+		return plugin;
 	} },
 	rules: { "oxfmt/oxfmt": "error" }
 };
@@ -67,7 +67,7 @@ const configs = { recommended };
 //#endregion
 //#region package.json
 var name = "eslint-plugin-oxfmt";
-var version = "0.0.12";
+var version = "0.0.14";
 
 //#endregion
 //#region src/meta.ts
@@ -170,7 +170,7 @@ const oxfmtOptionsSchema = {
 			type: "boolean"
 		},
 		embeddedLanguageFormatting: {
-			description: `Control whether to format embedded parts in the file.\ne.g. JS-in-Vue, CSS-in-JS, etc. (Default: "auto")`,
+			description: `Control whether to format embedded parts (For example, CSS-in-JS, or JS-in-Vue, etc.) in the file.\n\nNOTE: XXX-in-JS support is incomplete.\n\n- (Default: "auto")`,
 			enum: ["auto", "off"],
 			type: "string"
 		},
@@ -196,7 +196,7 @@ const oxfmtOptionsSchema = {
 						type: "object",
 						properties: {
 							elementNamePattern: {
-								description: `List of import name prefixes to match for this group.`,
+								description: `List of glob patterns to match import sources for this group.`,
 								type: "array",
 								items: { type: "string" }
 							},
@@ -264,7 +264,7 @@ const oxfmtOptionsSchema = {
 			type: "object",
 			properties: {
 				attributes: {
-					description: `List of attributes that contain Tailwind CSS classes.\n\n- (Example: ["myClassProp", ":class"])\n\n- (Default: ["class", "className"])`,
+					description: `List of additional attributes to sort beyond "class" and "className" (exact match).\n\nNOTE: Regex patterns are not yet supported.\n\n- (Default: [])\n- Example: ["myClassProp", ":class"]`,
 					type: "array",
 					items: { type: "string" }
 				},
@@ -273,7 +273,7 @@ const oxfmtOptionsSchema = {
 					type: "string"
 				},
 				functions: {
-					description: `List of custom function names that contain Tailwind CSS classes.\n\nExample: ["clsx", "cn", "cva", "tw"]\n\n- (Default: [])`,
+					description: `List of custom function names whose arguments should be sorted (exact match).\n\nNOTE: Regex patterns are not yet supported.\n\n- (Default: [])\n- Example: ["clsx", "cn", "cva", "tw"]`,
 					type: "array",
 					items: { type: "string" }
 				},
@@ -447,8 +447,8 @@ const oxfmt = {
 	},
 	create(context) {
 		if (!formatViaOxfmt) formatViaOxfmt = createSyncFn(join(dirWorkers, "oxfmt.mjs"));
+		const sourceText = context.sourceCode.text;
 		return { Program() {
-			const sourceText = context.sourceCode.text;
 			try {
 				const formatResult = formatViaOxfmt(context.filename, sourceText, {
 					...context.options?.[0],
@@ -511,7 +511,6 @@ const plugin = {
 	meta,
 	rules
 };
-var src_default = plugin;
 
 //#endregion
-export { configs, src_default as default, meta, parserPlain, plugin, recommended, rules };
+export { configs, plugin as default, plugin, meta, parserPlain, recommended, rules };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-oxfmt",
   "type": "module",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "An ESLint plugin for formatting code with oxfmt.",
   "keywords": [
     "eslint",
@@ -44,41 +44,41 @@
   "sideEffects": false,
   "peerDependencies": {
     "eslint": "^9.5.0",
-    "oxfmt": "^0.28.0"
+    "oxfmt": "^0.31.0"
   },
   "dependencies": {
     "generate-differences": "^0.1.1",
-    "load-oxfmt-config": "^0.1.0",
+    "load-oxfmt-config": "^0.1.1",
     "picomatch": "^4.0.3",
     "synckit": "^0.11.12"
   },
   "devDependencies": {
-    "@ntnyq/eslint-config": "^6.0.0-beta.6",
+    "@ntnyq/eslint-config": "^6.0.0-beta.8",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^25.2.0",
-    "@typescript/native-preview": "^7.0.0-dev.20260202.1",
-    "bumpp": "^10.4.0",
+    "@types/node": "^25.2.3",
+    "@typescript/native-preview": "^7.0.0-dev.20260210.1",
+    "bumpp": "^10.4.1",
     "eslint": "^9.39.2",
     "eslint-parser-plain": "^0.1.1",
     "eslint-typegen": "^2.3.0",
-    "eslint-vitest-rule-tester": "^3.0.1",
+    "eslint-vitest-rule-tester": "^3.1.0",
     "husky": "^9.1.7",
     "nano-staged": "^0.9.0",
     "npm-run-all2": "^8.0.4",
-    "oxfmt": "^0.28.0",
+    "oxfmt": "^0.31.0",
     "show-invisibles": "^0.0.2",
     "tinyglobby": "^0.2.15",
-    "tsdown": "^0.20.1",
+    "tsdown": "^0.20.3",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18",
-    "eslint-plugin-oxfmt": "0.0.12"
+    "eslint-plugin-oxfmt": "0.0.14"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
   "nano-staged": {
-    "*.{js,ts,mjs,cjs,md,vue,yml,yaml,toml,json}": "eslint --fix",
+    "*.{js,ts,mjs,tsx,md,vue,yml,yaml,toml,json}": "eslint --fix",
     "*": "oxfmt --no-error-on-unmatched-pattern"
   },
   "scripts": {

package/workers/oxfmt.mjs

@@ -12,16 +12,11 @@ import { runAsWorker } from 'synckit'
  * @property {string} cwd - Current working directory for resolving configuration
  * @property {string} [configPath] - Custom path to oxfmt configuration file
  */
-
 /**
- * @typedef {object} Override
- * @property {string[]} files - Glob patterns to match files
- * @property {string[]} [excludeFiles] - Glob patterns to exclude files
- * @property {import('oxfmt').FormatOptions} [options] - Format options to apply
+ * @typedef {import('load-oxfmt-config').FormatOptionOverride} Override
  */
-
 /**
- * @typedef {import('oxfmt').FormatOptions & PluginOptions & {overrides?: Override[]}} Options
+ * @typedef {import('load-oxfmt-config').OxfmtOptions & PluginOptions} Options
  */
 
 /**
@@ -49,29 +44,29 @@ function applyOverrides(
   // Get relative path from cwd and normalize to forward slashes for cross-platform compatibility
   const relativePath = relative(cwd, filename).replace(/\\/g, '/')
 
-  let mergedOptions = { ...baseOptions }
+  let mergedOptions = baseOptions
+  let hasOverrides = false
 
   // Apply overrides in order (later overrides take precedence)
   for (const override of overrides) {
     const { excludeFiles, files, options: overrideOptions } = override
 
     // Check if file matches the files patterns
-    const isMatchFiles = picomatch(files)
-    const matches = isMatchFiles(relativePath)
+    const matches = picomatch.isMatch(relativePath, files)
 
     // Check if file is excluded
-    let excluded = false
-    if (excludeFiles && excludeFiles.length > 0) {
-      const isMatchExclude = picomatch(excludeFiles)
-      excluded = isMatchExclude(relativePath)
-    }
+    const excluded =
+      excludeFiles && excludeFiles.length > 0
+        ? picomatch.isMatch(relativePath, excludeFiles)
+        : false
 
     if (matches && !excluded && overrideOptions) {
       mergedOptions = { ...mergedOptions, ...overrideOptions }
+      hasOverrides = true
     }
   }
 
-  return mergedOptions
+  return hasOverrides ? mergedOptions : baseOptions
 }
 
 runAsWorker(
@@ -84,7 +79,7 @@ runAsWorker(
      * @type {string} source text
      */
     sourceText,
-    /**'
+    /**
      * @type {Options} format options
      */
     options,
@@ -109,7 +104,12 @@ runAsWorker(
     }
 
     // Apply overrides based on filename
-    const mergedOptions = applyOverrides(filename, cwd, baseOptions, overrides)
+    const mergedOptions = applyOverrides(
+      filename,
+      cwd,
+      baseOptions,
+      useConfig ? baseOptions.overrides : overrides,
+    )
 
     const formatResult = await format(filename, sourceText, mergedOptions)
     return formatResult