@unocss/eslint-plugin 0.60.0 → 0.60.1

package/dist/index.cjs

@@ -48,7 +48,11 @@ const orderAttributify = createRule({
         if (!valueless.length)
           return;
         const input = valueless.map((i) => i.key.name).join(" ").trim();
-        const sorted = syncAction("sort", input);
+        const sorted = syncAction(
+          context.settings.unocss?.configPath,
+          "sort",
+          input
+        );
         if (sorted !== input) {
           context.report({
             node,
@@ -100,7 +104,11 @@ const order = createRule({
       if (typeof node.value !== "string" || !node.value.trim())
         return;
       const input = node.value;
-      const sorted = syncAction("sort", input).trim();
+      const sorted = syncAction(
+        context.settings.unocss?.configPath,
+        "sort",
+        input
+      ).trim();
       if (sorted !== input) {
         context.report({
           node,
@@ -155,7 +163,7 @@ const blocklist = createRule({
       recommended: "recommended"
     },
     messages: {
-      "in-blocklist": "Utility '{{ name }}' is in blocklist"
+      "in-blocklist": '"{{name}}" is in blocklist{{reason}}'
     },
     schema: []
   },
@@ -165,13 +173,19 @@ const blocklist = createRule({
       if (typeof node.value !== "string" || !node.value.trim())
         return;
       const input = node.value;
-      const blocked = syncAction("blocklist", input, context.filename);
-      blocked.forEach((i) => {
+      const blocked = syncAction(
+        context.settings.unocss?.configPath,
+        "blocklist",
+        input,
+        context.filename
+      );
+      blocked.forEach(([name, meta]) => {
         context.report({
           node,
           messageId: "in-blocklist",
           data: {
-            name: i
+            name,
+            reason: meta?.message ? `: ${meta.message}` : ""
           }
         });
       });
@@ -205,13 +219,19 @@ const blocklist = createRule({
         for (const node2 of valueless) {
           if (!node2?.key?.name)
             continue;
-          const blocked = syncAction("blocklist", node2.key.name, context.filename);
-          blocked.forEach((i) => {
+          const blocked = syncAction(
+            context.settings.unocss?.configPath,
+            "blocklist",
+            node2.key.name,
+            context.filename
+          );
+          blocked.forEach(([name, meta]) => {
             context.report({
               node: node2,
               messageId: "in-blocklist",
               data: {
-                name: i
+                name,
+                reason: meta?.message ? `: ${meta.message}` : ""
               }
             });
           });

package/dist/index.d.cts

@@ -1,5 +1,13 @@
 import * as _typescript_eslint_utils_eslint_utils from '@typescript-eslint/utils/eslint-utils';
 
+declare module '@typescript-eslint/utils/ts-eslint' {
+    interface SharedConfigurationSettings {
+        unocss?: {
+            configPath?: string;
+        };
+    }
+}
+
 declare const _default: {
     configs: {
         recommended: {

package/dist/index.d.mts

@@ -1,5 +1,13 @@
 import * as _typescript_eslint_utils_eslint_utils from '@typescript-eslint/utils/eslint-utils';
 
+declare module '@typescript-eslint/utils/ts-eslint' {
+    interface SharedConfigurationSettings {
+        unocss?: {
+            configPath?: string;
+        };
+    }
+}
+
 declare const _default: {
     configs: {
         recommended: {

package/dist/index.d.ts

@@ -1,5 +1,13 @@
 import * as _typescript_eslint_utils_eslint_utils from '@typescript-eslint/utils/eslint-utils';
 
+declare module '@typescript-eslint/utils/ts-eslint' {
+    interface SharedConfigurationSettings {
+        unocss?: {
+            configPath?: string;
+        };
+    }
+}
+
 declare const _default: {
     configs: {
         recommended: {

package/dist/index.mjs

@@ -42,7 +42,11 @@ const orderAttributify = createRule({
         if (!valueless.length)
           return;
         const input = valueless.map((i) => i.key.name).join(" ").trim();
-        const sorted = syncAction("sort", input);
+        const sorted = syncAction(
+          context.settings.unocss?.configPath,
+          "sort",
+          input
+        );
         if (sorted !== input) {
           context.report({
             node,
@@ -94,7 +98,11 @@ const order = createRule({
       if (typeof node.value !== "string" || !node.value.trim())
         return;
       const input = node.value;
-      const sorted = syncAction("sort", input).trim();
+      const sorted = syncAction(
+        context.settings.unocss?.configPath,
+        "sort",
+        input
+      ).trim();
       if (sorted !== input) {
         context.report({
           node,
@@ -149,7 +157,7 @@ const blocklist = createRule({
       recommended: "recommended"
     },
     messages: {
-      "in-blocklist": "Utility '{{ name }}' is in blocklist"
+      "in-blocklist": '"{{name}}" is in blocklist{{reason}}'
     },
     schema: []
   },
@@ -159,13 +167,19 @@ const blocklist = createRule({
       if (typeof node.value !== "string" || !node.value.trim())
         return;
       const input = node.value;
-      const blocked = syncAction("blocklist", input, context.filename);
-      blocked.forEach((i) => {
+      const blocked = syncAction(
+        context.settings.unocss?.configPath,
+        "blocklist",
+        input,
+        context.filename
+      );
+      blocked.forEach(([name, meta]) => {
         context.report({
           node,
           messageId: "in-blocklist",
           data: {
-            name: i
+            name,
+            reason: meta?.message ? `: ${meta.message}` : ""
           }
         });
       });
@@ -199,13 +213,19 @@ const blocklist = createRule({
         for (const node2 of valueless) {
           if (!node2?.key?.name)
             continue;
-          const blocked = syncAction("blocklist", node2.key.name, context.filename);
-          blocked.forEach((i) => {
+          const blocked = syncAction(
+            context.settings.unocss?.configPath,
+            "blocklist",
+            node2.key.name,
+            context.filename
+          );
+          blocked.forEach(([name, meta]) => {
             context.report({
               node: node2,
               messageId: "in-blocklist",
               data: {
-                name: i
+                name,
+                reason: meta?.message ? `: ${meta.message}` : ""
               }
             });
           });

package/dist/worker.mjs

@@ -31,10 +31,13 @@ async function sortRules(rules, uno) {
 }
 
 var _a;
-let promise;
+const promises = /* @__PURE__ */ new Map();
 (_a = process.env).ESLINT || (_a.ESLINT = "true");
-async function _getGenerator() {
-  const { config, sources } = await loadConfig();
+async function _getGenerator(configPath) {
+  const { config, sources } = await loadConfig(
+    process.cwd(),
+    configPath
+  );
   if (!sources.length)
     throw new Error("[@unocss/eslint-plugin] No config file found, create a `uno.config.ts` file in your project root and try again.");
   return createGenerator({
@@ -42,48 +45,54 @@ async function _getGenerator() {
     warn: false
   });
 }
-async function getGenerator() {
-  promise = promise || _getGenerator();
+async function getGenerator(configPath) {
+  let promise = promises.get(configPath);
+  if (!promise) {
+    promise = _getGenerator(configPath);
+    promises.set(configPath, promise);
+  }
   return await promise;
 }
-function setGenerator(generator) {
-  promise = Promise.resolve(generator);
+function setGenerator(generator, configPath) {
+  promises.set(configPath, Promise.resolve(generator));
 }
-async function actionSort(classes) {
-  return await sortRules(classes, await getGenerator());
+async function actionSort(configPath, classes) {
+  return await sortRules(classes, await getGenerator(configPath));
 }
-async function actionBlocklist(classes, id) {
-  const uno = await getGenerator();
-  const blocked = /* @__PURE__ */ new Set();
+async function actionBlocklist(configPath, classes, id) {
+  const uno = await getGenerator(configPath);
+  const blocked = /* @__PURE__ */ new Map();
   const extracted = await uno.applyExtractors(classes, id);
   const values = [...extracted.values()];
   const matchBlocked = async (raw) => {
     if (blocked.has(raw))
       return;
-    if (uno.isBlocked(raw)) {
-      blocked.add(raw);
+    let rule = uno.getBlocked(raw);
+    if (rule) {
+      blocked.set(raw, rule[1]);
       return;
     }
     let current = raw;
     for (const p of uno.config.preprocess)
       current = p(raw);
     const applied = await uno.matchVariants(raw, current);
-    if (applied && uno.isBlocked(applied[1]))
-      blocked.add(raw);
+    rule = applied && uno.getBlocked(applied[1]);
+    if (rule)
+      blocked.set(raw, rule[1]);
   };
   await Promise.all(values.map(matchBlocked));
   return [...blocked];
 }
-async function runAsync(action, ...args) {
+async function runAsync(configPath, action, ...args) {
   switch (action) {
     case "sort":
-      return actionSort(...args);
+      return actionSort(configPath, ...args);
     case "blocklist":
-      return actionBlocklist(...args);
+      return actionBlocklist(configPath, ...args);
   }
 }
-function run(action, ...args) {
-  return runAsync(action, ...args);
+function run(configPath, action, ...args) {
+  return runAsync(configPath, action, ...args);
 }
 runAsWorker(run);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/eslint-plugin",
   "type": "module",
-  "version": "0.60.0",
+  "version": "0.60.1",
   "description": "ESLint plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -38,12 +38,12 @@
     "@typescript-eslint/utils": "^7.8.0",
     "magic-string": "^0.30.10",
     "synckit": "^0.9.0",
-    "@unocss/config": "0.60.0",
-    "@unocss/core": "0.60.0"
+    "@unocss/core": "0.60.1",
+    "@unocss/config": "0.60.1"
   },
   "devDependencies": {
     "vue-eslint-parser": "^9.4.2",
-    "@unocss/eslint-plugin": "0.60.0"
+    "@unocss/eslint-plugin": "0.60.1"
   },
   "scripts": {
     "build": "unbuild",