fix(eslint-plugin): enhance generator to support filename context for config loading (#4978)

Jungzl · web-flow · commit 942cd34c6232 · 2025-11-04T08:13:26.000Z
diff --git a/packages-integrations/eslint-plugin/src/rules/order-attributify.ts b/packages-integrations/eslint-plugin/src/rules/order-attributify.ts
@@ -34,6 +34,7 @@ export default createRule({
           context.settings.unocss?.configPath,
           'sort',
           input,
+          context.filename,
         )
         if (sorted !== input) {
           context.report({
diff --git a/packages-integrations/eslint-plugin/src/rules/order.ts b/packages-integrations/eslint-plugin/src/rules/order.ts
@@ -60,6 +60,7 @@ export default createRule({
         context.settings.unocss?.configPath,
         'sort',
         input,
+        context.filename,
       ).trim()
 
       if (addSpace === 'before')
@@ -109,6 +110,7 @@ export default createRule({
         context.settings.unocss?.configPath,
         'sort',
         input,
+        context.filename,
       ).trim()
       if (/^\s/.test(input))
         sorted = ` ${sorted}`
diff --git a/packages-integrations/eslint-plugin/src/worker.ts b/packages-integrations/eslint-plugin/src/worker.ts
@@ -1,18 +1,29 @@
 import type { BlocklistMeta, UnoGenerator } from '@unocss/core'
+import { dirname } from 'node:path'
 import process from 'node:process'
 import { sortRules } from '#integration/sort-rules'
 import { loadConfig } from '@unocss/config'
 import { createGenerator } from '@unocss/core'
 import { runAsWorker } from 'synckit'
 
-const promises = new Map<string | undefined, Promise<UnoGenerator<any>> | undefined>()
+const promises = new Map<string, Promise<UnoGenerator<any>> | undefined>()
 
 // bypass icon rules in ESLint
 process.env.ESLINT ||= 'true'
 
-async function _getGenerator(configPath?: string) {
+async function _getGenerator(configPath?: string, id?: string) {
+  // Determine the search directory:
+  // 1. If configPath is provided, use process.cwd() (existing behavior for explicit config)
+  // 2. If filename is provided and no configPath, search from the file's directory (monorepo support)
+  // 3. Otherwise, use process.cwd() as fallback
+  const searchFrom = configPath
+    ? process.cwd()
+    : id
+      ? dirname(id)
+      : process.cwd()
+
   const { config, sources } = await loadConfig(
-    process.cwd(),
+    searchFrom,
     configPath,
   )
   if (!sources.length)
@@ -23,25 +34,36 @@ async function _getGenerator(configPath?: string) {
   })
 }
 
-export async function getGenerator(configPath?: string) {
-  let promise = promises.get(configPath)
+function getCacheKey(configPath?: string, id?: string): string {
+  // Create a cache key based on configPath or the directory of the filename
+  if (configPath)
+    return `config:${configPath}`
+  if (id)
+    return `dir:${dirname(id)}`
+  return `cwd:${process.cwd()}`
+}
+
+export async function getGenerator(configPath?: string, id?: string) {
+  const cacheKey = getCacheKey(configPath, id)
+  let promise = promises.get(cacheKey)
   if (!promise) {
-    promise = _getGenerator(configPath)
-    promises.set(configPath, promise)
+    promise = _getGenerator(configPath, id)
+    promises.set(cacheKey, promise)
   }
   return await promise
 }
 
 export function setGenerator(generator: Awaited<UnoGenerator<any>>, configPath?: string | undefined) {
-  promises.set(configPath, Promise.resolve(generator))
+  const cacheKey = configPath ? `config:${configPath}` : `cwd:${process.cwd()}`
+  promises.set(cacheKey, Promise.resolve(generator))
 }
 
-async function actionSort(configPath: string | undefined, classes: string) {
-  return await sortRules(classes, await getGenerator(configPath))
+async function actionSort(configPath: string | undefined, classes: string, id?: string) {
+  return await sortRules(classes, await getGenerator(configPath, id))
 }
 
 async function actionBlocklist(configPath: string | undefined, classes: string, id?: string): Promise<[string, BlocklistMeta | undefined][]> {
-  const uno = await getGenerator(configPath)
+  const uno = await getGenerator(configPath, id)
   const blocked = new Map<string, BlocklistMeta | undefined>()
 
   const extracted = await uno.applyExtractors(classes, id)
@@ -81,7 +103,7 @@ async function actionBlocklist(configPath: string | undefined, classes: string,
   return [...blocked]
 }
 
-export function runAsync(configPath: string | undefined, action: 'sort', classes: string): Promise<string>
+export function runAsync(configPath: string | undefined, action: 'sort', classes: string, id?: string): Promise<string>
 export function runAsync(configPath: string | undefined, action: 'blocklist', classes: string, id?: string): Promise<[string, BlocklistMeta | undefined][]>
 export async function runAsync(configPath: string | undefined, action: string, ...args: any[]): Promise<any> {
   switch (action) {
@@ -94,7 +116,7 @@ export async function runAsync(configPath: string | undefined, action: string, .
   }
 }
 
-export function run(configPath: string | undefined, action: 'sort', classes: string): string
+export function run(configPath: string | undefined, action: 'sort', classes: string, id?: string): string
 export function run(configPath: string | undefined, action: 'blocklist', classes: string, id?: string): [string, BlocklistMeta | undefined][]
 export function run(configPath: string | undefined, action: string, ...args: any[]): any {
   // @ts-expect-error cast

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ export default createRule({`
`34`	`34`	`context.settings.unocss?.configPath,`
`35`	`35`	`'sort',`
`36`	`36`	`input,`
	`37`	`+ context.filename,`
`37`	`38`	`)`
`38`	`39`	`if (sorted !== input) {`
`39`	`40`	`context.report({`