eslint-plugin-oxfmt 0.11.0 → 0.12.1

package/README.md

@@ -22,6 +22,7 @@
 
 - **ESLint**: `>= 9.0.0` (Only supports ESLint flat config)
 - **Node.js**: `^20.19.0 || >=22.12.0`
+- **oxfmt**: `>= 0.57.0`
 
 ## Installation
 

package/dist/index.mjs

@@ -79,7 +79,7 @@ const configs = {
 //#region src/meta.ts
 const meta = {
 	name: "eslint-plugin-oxfmt",
-	version: "0.11.0"
+	version: "0.12.1"
 };
 //#endregion
 //#region src/dir.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-oxfmt",
   "type": "module",
-  "version": "0.11.0",
+  "version": "0.12.1",
   "description": "An ESLint plugin for formatting code with oxfmt.",
   "keywords": [
     "eslint",
@@ -47,7 +47,7 @@
   "sideEffects": false,
   "peerDependencies": {
     "eslint": "^9.5.0 || ^10.0.0",
-    "oxfmt": ">=0.56.0",
+    "oxfmt": ">=0.57.0",
     "svelte": "*"
   },
   "peerDependenciesMeta": {
@@ -57,17 +57,18 @@
   },
   "dependencies": {
     "generate-differences": "^0.1.1",
-    "load-oxfmt-config": "^0.12.1",
+    "ignore": "^7.0.5",
+    "load-oxfmt-config": "^0.13.0",
     "picomatch": "^4.0.4",
     "synckit": "^0.11.13"
   },
   "devDependencies": {
     "@ntnyq/eslint-config": "^6.1.5",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^26.0.0",
-    "@typescript/native-preview": "^7.0.0-dev.20260622.1",
+    "@types/node": "^26.1.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260701.1",
     "bumpp": "^11.1.0",
-    "eslint": "^10.5.0",
+    "eslint": "^10.6.0",
     "eslint-parser-plain": "^0.1.1",
     "eslint-typegen": "^2.3.1",
     "eslint-vitest-rule-tester": "^3.1.0",
@@ -75,15 +76,15 @@
     "jsonc-eslint-parser": "^3.1.0",
     "nano-staged": "^1.0.2",
     "npm-run-all2": "^9.0.2",
-    "oxfmt": "^0.56.0",
+    "oxfmt": "^0.57.0",
     "show-invisibles": "^0.0.2",
-    "svelte": "^5.56.3",
+    "svelte": "^5.56.4",
     "tinyglobby": "^0.2.17",
     "tsdown": "^0.22.3",
     "tsx": "^4.22.4",
     "typescript": "^6.0.3",
     "vitest": "^4.1.9",
-    "eslint-plugin-oxfmt": "0.11.0"
+    "eslint-plugin-oxfmt": "0.12.1"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"

package/workers/oxfmt.mjs

@@ -1,6 +1,7 @@
 // @ts-check
 
-import { dirname, relative } from 'node:path'
+import { dirname, extname, relative } from 'node:path'
+import ignore from 'ignore'
 import { isOxfmtIgnored, loadOxfmtConfig } from 'load-oxfmt-config'
 import { format } from 'oxfmt'
 import picomatch from 'picomatch'
@@ -65,7 +66,9 @@ const PLUGIN_ONLY_OPTIONS = new Set([
   'withNodeModules',
 ])
 /** @type {Map<string, import('picomatch').Matcher>} */
-const matcherCache = new Map()
+const overrideMatcherCache = new Map()
+/** @type {Map<string, import('ignore').Ignore>} */
+const ignoreMatcherCache = new Map()
 
 /**
  * Apply override entries to a base options object.
@@ -85,11 +88,11 @@ function applyOverrides(relativePath, baseOptions, overrides) {
       continue
     }
 
-    const fileMatcher = getCachedMatcher(override.files)
+    const fileMatcher = getCachedOverrideMatcher(override.files)
     const matches = !!fileMatcher && fileMatcher(relativePath)
 
     const excludeMatcher = override.excludeFiles?.length
-      ? getCachedMatcher(override.excludeFiles)
+      ? getCachedOverrideMatcher(override.excludeFiles)
       : undefined
     const excluded = excludeMatcher ? excludeMatcher(relativePath) : false
 
@@ -118,6 +121,7 @@ async function formatViaOxfmt(filename, sourceText, options = {}) {
 
   const cwd = pluginOptions.cwd
   const useConfig = pluginOptions.useConfig !== false
+  const useCache = getUseCacheOption(pluginOptions)
 
   const ruleIgnorePatterns = isStringArray(inlineFormatOptions.ignorePatterns)
     ? inlineFormatOptions.ignorePatterns
@@ -143,7 +147,7 @@ async function formatViaOxfmt(filename, sourceText, options = {}) {
       ignorePath: pluginOptions.ignorePath,
       includeConfigIgnorePatterns: useConfig,
       loadConfigForIgnorePatterns: useConfig,
-      useCache: pluginOptions.useCache,
+      useCache,
       withNodeModules: pluginOptions.withNodeModules,
     }
     const ignored = await isOxfmtIgnored(ignoredOptions)
@@ -178,7 +182,7 @@ async function formatViaOxfmt(filename, sourceText, options = {}) {
       disableNestedConfig: pluginOptions.disableNestedConfig,
       editorconfig: pluginOptions.editorconfig,
       filepath: filename,
-      useCache: pluginOptions.useCache,
+      useCache,
     })
     const { overrides: configOverrides, ...loadedConfig } = loaded.config
     const { overrides: ruleOverrides, ...inlineOptionsWithoutOverrides } =
@@ -215,19 +219,39 @@ async function formatViaOxfmt(filename, sourceText, options = {}) {
 }
 
 /**
- * Get or create a cached picomatch matcher.
+ * Get or create a cached ignore matcher for oxfmt ignorePatterns.
+ * @param {string[]} patterns - Gitignore-style patterns.
+ * @returns {import('ignore').Ignore} Compiled ignore matcher.
+ */
+function getCachedIgnoreMatcher(patterns) {
+  const key = patterns.join('\0')
+  const cached = ignoreMatcherCache.get(key)
+  if (cached) {
+    return cached
+  }
+
+  const matcher = ignore().add(patterns)
+  setCacheEntry(ignoreMatcherCache, key, matcher)
+  return matcher
+}
+
+/**
+ * Get or create a cached picomatch matcher for oxfmt override globs.
  * @param {string[]} patterns - Glob patterns.
  * @returns {import('picomatch').Matcher} Compiled matcher.
  */
-function getCachedMatcher(patterns) {
+function getCachedOverrideMatcher(patterns) {
   const key = patterns.join('\0')
-  const cached = matcherCache.get(key)
+  const cached = overrideMatcherCache.get(key)
   if (cached) {
     return cached
   }
 
-  const matcher = picomatch(patterns)
-  setCacheEntry(matcherCache, key, matcher)
+  const matcher = picomatch(patterns, {
+    dot: true,
+    noextglob: true,
+  })
+  setCacheEntry(overrideMatcherCache, key, matcher)
   return matcher
 }
 
@@ -241,6 +265,24 @@ function getRelativePath(baseDir, filename) {
   return relative(baseDir, filename).replace(/\\/g, '/')
 }
 
+/**
+ * Resolve the cache setting passed to load-oxfmt-config.
+ * Explicit CommonJS config files need the loader's non-cached CJS path so
+ * `module.exports = {}` configs are read as config objects.
+ * @param {PluginOnlyOptions} pluginOptions - Plugin orchestration options.
+ * @returns {boolean | undefined} Cache setting for config/ignore loading.
+ */
+function getUseCacheOption(pluginOptions) {
+  if (
+    pluginOptions.configPath &&
+    extname(pluginOptions.configPath) === '.cjs'
+  ) {
+    return false
+  }
+
+  return pluginOptions.useCache
+}
+
 /**
  * Check whether a value is an array of strings.
  * @param {unknown} value - Value to validate.
@@ -278,8 +320,8 @@ function shouldIgnoreFile(relativePath, ignorePatterns) {
     return false
   }
 
-  const matcher = getCachedMatcher(ignorePatterns)
-  return !!matcher && matcher(relativePath)
+  const matcher = getCachedIgnoreMatcher(ignorePatterns)
+  return matcher.ignores(relativePath)
 }
 
 /**