eslint-plugin-oxfmt 0.0.11 → 0.0.13

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.11";
+var version = "0.0.13";
 
 //#endregion
 //#region src/meta.ts
@@ -152,7 +152,7 @@ function _reportDifference(context, difference, rangeOffset = 0) {
 
 //#endregion
 //#region src/schema.ts
-const sharedSchema = {
+const oxfmtOptionsSchema = {
 	additionalProperties: false,
 	type: "object",
 	properties: {
@@ -379,6 +379,55 @@ const sharedSchema = {
 		}
 	}
 };
+const oxfmtConfigSchema = {
+	additionalProperties: false,
+	type: "object",
+	properties: {
+		configPath: {
+			description: `Path to Oxfmt configuration file.\nIf you provide an absolute path, Oxfmt will use it directly.\n If not provided, Oxfmt will search for configuration files starting from the current working directory upwards.\n\n- (Default: undefined)`,
+			type: "string"
+		},
+		useConfig: {
+			description: `Whether to load Oxfmt configuration file.\n\n- (Default: true)`,
+			type: "boolean"
+		}
+	}
+};
+const oxfmtRuleSchema = {
+	additionalProperties: false,
+	type: "object",
+	properties: {
+		...oxfmtOptionsSchema.properties,
+		...oxfmtConfigSchema.properties,
+		overrides: {
+			description: `File-specific overrides.\nWhen a file matches multiple overrides, the later override takes precedence (array order matters).\n\n- (Default: [])`,
+			type: "array",
+			items: {
+				additionalProperties: false,
+				required: ["files"],
+				type: "object",
+				properties: {
+					excludeFiles: {
+						description: `Glob patterns to exclude from this override.`,
+						type: "array",
+						items: { type: "string" }
+					},
+					files: {
+						description: `Glob patterns to match files for this override.\nAll patterns are relative to the Oxfmt configuration file.`,
+						type: "array",
+						items: { type: "string" }
+					},
+					options: {
+						additionalProperties: false,
+						description: `Format options to apply for matched files.`,
+						type: "object",
+						properties: { ...oxfmtOptionsSchema.properties }
+					}
+				}
+			}
+		}
+	}
+};
 
 //#endregion
 //#region src/rules/oxfmt.ts
@@ -388,59 +437,18 @@ const oxfmt = {
 		defaultOptions: [],
 		fixable: "code",
 		messages,
+		schema: [oxfmtRuleSchema],
 		type: "layout",
 		docs: {
 			description: "Format code via oxfmt",
 			recommended: true,
 			url: "https://github.com/ntnyq/eslint-plugin-oxfmt"
-		},
-		schema: [{
-			additionalProperties: false,
-			type: "object",
-			properties: {
-				...sharedSchema.properties,
-				configPath: {
-					description: `Path to Oxfmt configuration file.\nIf you provide an absolute path, Oxfmt will use it directly.\n If not provided, Oxfmt will search for configuration files starting from the current working directory upwards.\n\n- (Default: undefined)`,
-					type: "string"
-				},
-				overrides: {
-					description: `File-specific overrides.\nWhen a file matches multiple overrides, the later override takes precedence (array order matters).\n\n- (Default: [])`,
-					type: "array",
-					items: {
-						additionalProperties: false,
-						required: ["files"],
-						type: "object",
-						properties: {
-							excludeFiles: {
-								description: `Glob patterns to exclude from this override.`,
-								type: "array",
-								items: { type: "string" }
-							},
-							files: {
-								description: `Glob patterns to match files for this override.\nAll patterns are relative to the Oxfmt configuration file.`,
-								type: "array",
-								items: { type: "string" }
-							},
-							options: {
-								additionalProperties: false,
-								description: `Format options to apply for matched files.`,
-								type: "object",
-								properties: { ...sharedSchema.properties }
-							}
-						}
-					}
-				},
-				useConfig: {
-					description: `Whether to load Oxfmt configuration file.\n\n- (Default: true)`,
-					type: "boolean"
-				}
-			}
-		}]
+		}
 	},
 	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],
@@ -503,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/dts/rule-options.d.ts

@@ -102,6 +102,8 @@ export type OxfmtOxfmt = []|[{
   
   configPath?: string
   
+  useConfig?: boolean
+  
   overrides?: {
     
     excludeFiles?: string[]
@@ -197,6 +199,4 @@ export type OxfmtOxfmt = []|[{
       vueIndentScriptAndStyle?: boolean
     }
   }[]
-  
-  useConfig?: boolean
 }]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-oxfmt",
   "type": "module",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "An ESLint plugin for formatting code with oxfmt.",
   "keywords": [
     "eslint",
@@ -44,34 +44,35 @@
   "sideEffects": false,
   "peerDependencies": {
     "eslint": "^9.5.0",
-    "oxfmt": "^0.27.0"
+    "oxfmt": "^0.28.0"
   },
   "dependencies": {
     "generate-differences": "^0.1.1",
-    "load-oxfmt-config": "^0.0.8",
+    "load-oxfmt-config": "^0.1.1",
+    "picomatch": "^4.0.3",
     "synckit": "^0.11.12"
   },
   "devDependencies": {
-    "@ntnyq/eslint-config": "^6.0.0-beta.4",
+    "@ntnyq/eslint-config": "^6.0.0-beta.7",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^25.0.10",
-    "@typescript/native-preview": "^7.0.0-dev.20260126.1",
-    "bumpp": "^10.4.0",
+    "@types/node": "^25.2.2",
+    "@typescript/native-preview": "^7.0.0-dev.20260208.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.27.0",
+    "oxfmt": "^0.28.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.11"
+    "eslint-plugin-oxfmt": "0.0.13"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"

package/workers/oxfmt.mjs

@@ -1,7 +1,9 @@
 // @ts-check
 
+import { relative } from 'node:path'
 import { loadOxfmtConfig } from 'load-oxfmt-config'
 import { format } from 'oxfmt'
+import picomatch from 'picomatch'
 import { runAsWorker } from 'synckit'
 
 /**
@@ -10,10 +12,62 @@ import { runAsWorker } from 'synckit'
  * @property {string} cwd - Current working directory for resolving configuration
  * @property {string} [configPath] - Custom path to oxfmt configuration file
  */
+/**
+ * @typedef {import('load-oxfmt-config').FormatOptionOverride} Override
+ */
+/**
+ * @typedef {import('load-oxfmt-config').OxfmtOptions & PluginOptions} Options
+ */
 
 /**
- * @typedef {import('oxfmt').FormatOptions & PluginOptions} Options
+ * Apply overrides to the base options based on the filename
+ * @param filename - The file path
+ * @param cwd - Current working directory
+ * @param baseOptions - Base format options
+ * @param [overrides] - Override configurations
+ * @returns - Merged options
  */
+function applyOverrides(
+  /** @type {string} */
+  filename,
+  /** @type {string} */
+  cwd,
+  /** @type {import('oxfmt').FormatOptions} */
+  baseOptions,
+  /** @type {Override[] | undefined} */
+  overrides,
+) {
+  if (!overrides || overrides.length === 0) {
+    return baseOptions
+  }
+
+  // Get relative path from cwd and normalize to forward slashes for cross-platform compatibility
+  const relativePath = relative(cwd, filename).replace(/\\/g, '/')
+
+  let mergedOptions = { ...baseOptions }
+
+  // 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)
+
+    // Check if file is excluded
+    let excluded = false
+    if (excludeFiles && excludeFiles.length > 0) {
+      const isMatchExclude = picomatch(excludeFiles)
+      excluded = isMatchExclude(relativePath)
+    }
+
+    if (matches && !excluded && overrideOptions) {
+      mergedOptions = { ...mergedOptions, ...overrideOptions }
+    }
+  }
+
+  return mergedOptions
+}
 
 runAsWorker(
   async (
@@ -30,8 +84,16 @@ runAsWorker(
      */
     options,
   ) => {
-    const { configPath, cwd, useConfig = true, ...formatOptions } = options
-    const mergedOptions = {
+    const {
+      configPath,
+      cwd,
+      overrides,
+      useConfig = true,
+      ...formatOptions
+    } = options
+
+    // Load base options from config or use provided options
+    const baseOptions = {
       ...(useConfig
         ? await loadOxfmtConfig({
             configPath,
@@ -41,6 +103,14 @@ runAsWorker(
       ...formatOptions,
     }
 
+    // Apply overrides based on filename
+    const mergedOptions = applyOverrides(
+      filename,
+      cwd,
+      baseOptions,
+      useConfig ? baseOptions.overrides : overrides,
+    )
+
     const formatResult = await format(filename, sourceText, mergedOptions)
     return formatResult
   },