eslint-plugin-oxfmt 0.0.10 → 0.0.12

package/README.md

@@ -135,7 +135,7 @@ All options are optional and default to sensible values.
 | Option       | Type      | Default | Description                                                                                            |
 | ------------ | --------- | ------- | ------------------------------------------------------------------------------------------------------ |
 | `useConfig`  | `boolean` | `true`  | Load `.oxfmtrc` / config files via `load-oxfmt-config`. Set to `false` to rely only on inline options. |
-| `configPath` | `string`  | —       | Custom path to an oxfmt config file. Resolved from ESLint `cwd` when set. |
+| `configPath` | `string`  | —       | Custom path to an oxfmt config file. Resolved from ESLint `cwd` when set.                              |
 
 > Note: `cwd` is taken from ESLint automatically; you usually do not need to set it manually.
 

package/dist/index.mjs

@@ -7,9 +7,9 @@ import { DIFFERENCE, generateDifferences } from "generate-differences";
 var __defProp = Object.defineProperty;
 var __exportAll = (all, symbols) => {
 	let target = {};
-	for (var name$2 in all) {
-		__defProp(target, name$2, {
-			get: all[name$2],
+	for (var name in all) {
+		__defProp(target, name, {
+			get: all[name],
 			enumerable: true
 		});
 	}
@@ -67,7 +67,7 @@ const configs = { recommended };
 //#endregion
 //#region package.json
 var name = "eslint-plugin-oxfmt";
-var version = "0.0.10";
+var version = "0.0.12";
 
 //#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,54 +437,13 @@ 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"));

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.10",
+  "version": "0.0.12",
   "description": "An ESLint plugin for formatting code with oxfmt.",
   "keywords": [
     "eslint",
@@ -44,18 +44,19 @@
   "sideEffects": false,
   "peerDependencies": {
     "eslint": "^9.5.0",
-    "oxfmt": "^0.26.0"
+    "oxfmt": "^0.28.0"
   },
   "dependencies": {
     "generate-differences": "^0.1.1",
-    "load-oxfmt-config": "^0.0.7",
+    "load-oxfmt-config": "^0.1.0",
+    "picomatch": "^4.0.3",
     "synckit": "^0.11.12"
   },
   "devDependencies": {
-    "@ntnyq/eslint-config": "^6.0.0-beta.2",
+    "@ntnyq/eslint-config": "^6.0.0-beta.6",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^25.0.10",
-    "@typescript/native-preview": "^7.0.0-dev.20260120.1",
+    "@types/node": "^25.2.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260202.1",
     "bumpp": "^10.4.0",
     "eslint": "^9.39.2",
     "eslint-parser-plain": "^0.1.1",
@@ -64,20 +65,21 @@
     "husky": "^9.1.7",
     "nano-staged": "^0.9.0",
     "npm-run-all2": "^8.0.4",
-    "oxfmt": "^0.26.0",
+    "oxfmt": "^0.28.0",
     "show-invisibles": "^0.0.2",
     "tinyglobby": "^0.2.15",
-    "tsdown": "^0.20.0-beta.4",
+    "tsdown": "^0.20.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.17",
-    "eslint-plugin-oxfmt": "0.0.10"
+    "vitest": "^4.0.18",
+    "eslint-plugin-oxfmt": "0.0.12"
   },
   "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,cjs,md,vue,yml,yaml,toml,json}": "eslint --fix",
+    "*": "oxfmt --no-error-on-unmatched-pattern"
   },
   "scripts": {
     "build": "pnpm run update:rule-options && tsdown",
@@ -86,7 +88,7 @@
     "format:check": "oxfmt --check",
     "lint": "eslint",
     "release": "run-s release:check release:version",
-    "release:check": "run-s lint typecheck test build",
+    "release:check": "run-s format:check lint typecheck test build",
     "release:version": "bumpp",
     "test": "vitest",
     "typecheck": "tsgo --noEmit",

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'
 
 /**
@@ -12,9 +14,66 @@ import { runAsWorker } from 'synckit'
  */
 
 /**
- * @typedef {import('oxfmt').FormatOptions & PluginOptions} Options
+ * @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('oxfmt').FormatOptions & PluginOptions & {overrides?: Override[]}} 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 +89,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 +108,9 @@ runAsWorker(
       ...formatOptions,
     }
 
+    // Apply overrides based on filename
+    const mergedOptions = applyOverrides(filename, cwd, baseOptions, overrides)
+
     const formatResult = await format(filename, sourceText, mergedOptions)
     return formatResult
   },