@unocss/eslint-plugin 0.57.7 → 0.58.1

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
-const utils = require('@typescript-eslint/utils');
 const MagicString = require('magic-string');
 const node_path = require('node:path');
 const synckit = require('synckit');
+const utils = require('@typescript-eslint/utils');
 const dirs = require('./dirs.cjs');
 require('node:url');
 
@@ -20,9 +20,12 @@ const configsRecommended = {
 };
 
 const syncAction = synckit.createSyncFn(node_path.join(dirs.distDir, "worker.cjs"));
+const createRule = utils.ESLintUtils.RuleCreator(
+  () => "https://unocss.dev/integrations/eslint#rules"
+);
 
 const IGNORE_ATTRIBUTES = ["style", "class", "classname", "value"];
-const orderAttributify = utils.ESLintUtils.RuleCreator((name) => name)({
+const orderAttributify = createRule({
   name: "order-attributify",
   meta: {
     type: "layout",
@@ -76,7 +79,7 @@ const orderAttributify = utils.ESLintUtils.RuleCreator((name) => name)({
 const CLASS_FIELDS = ["class", "classname"];
 const AST_NODES_WITH_QUOTES = ["Literal", "VLiteral"];
 
-const order = utils.ESLintUtils.RuleCreator((name) => name)({
+const order = createRule({
   name: "order",
   meta: {
     type: "layout",
@@ -140,7 +143,7 @@ const order = utils.ESLintUtils.RuleCreator((name) => name)({
   }
 });
 
-const blocklist = utils.ESLintUtils.RuleCreator((name) => name)({
+const blocklist = createRule({
   name: "blocklist",
   meta: {
     type: "problem",

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { ESLintUtils } from '@typescript-eslint/utils';
 import MagicString from 'magic-string';
 import { join } from 'node:path';
 import { createSyncFn } from 'synckit';
+import { ESLintUtils } from '@typescript-eslint/utils';
 import { distDir } from './dirs.mjs';
 import 'node:url';
 
@@ -14,9 +14,12 @@ const configsRecommended = {
 };
 
 const syncAction = createSyncFn(join(distDir, "worker.cjs"));
+const createRule = ESLintUtils.RuleCreator(
+  () => "https://unocss.dev/integrations/eslint#rules"
+);
 
 const IGNORE_ATTRIBUTES = ["style", "class", "classname", "value"];
-const orderAttributify = ESLintUtils.RuleCreator((name) => name)({
+const orderAttributify = createRule({
   name: "order-attributify",
   meta: {
     type: "layout",
@@ -70,7 +73,7 @@ const orderAttributify = ESLintUtils.RuleCreator((name) => name)({
 const CLASS_FIELDS = ["class", "classname"];
 const AST_NODES_WITH_QUOTES = ["Literal", "VLiteral"];
 
-const order = ESLintUtils.RuleCreator((name) => name)({
+const order = createRule({
   name: "order",
   meta: {
     type: "layout",
@@ -134,7 +137,7 @@ const order = ESLintUtils.RuleCreator((name) => name)({
   }
 });
 
-const blocklist = ESLintUtils.RuleCreator((name) => name)({
+const blocklist = createRule({
   name: "blocklist",
   meta: {
     type: "problem",

package/dist/worker.cjs

@@ -52,15 +52,35 @@ async function getGenerator() {
   promise = promise || _getGenerator();
   return await promise;
 }
+function setGenerator(generator) {
+  promise = Promise.resolve(generator);
+}
 async function actionSort(classes) {
   return await sortRules(classes, await getGenerator());
 }
 async function actionBlocklist(classes, id) {
   const uno = await getGenerator();
+  const blocked = /* @__PURE__ */ new Set();
   const extracted = await uno.applyExtractors(classes, id);
-  return [...extracted.values()].filter((i) => uno.isBlocked(i));
+  const values = [...extracted.values()];
+  const matchBlocked = async (raw) => {
+    if (blocked.has(raw))
+      return;
+    if (uno.isBlocked(raw)) {
+      blocked.add(raw);
+      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);
+  };
+  await Promise.all(values.map(matchBlocked));
+  return [...blocked];
 }
-function run(action, ...args) {
+async function runAsync(action, ...args) {
   switch (action) {
     case "sort":
       return actionSort(...args);
@@ -68,7 +88,12 @@ function run(action, ...args) {
       return actionBlocklist(...args);
   }
 }
+function run(action, ...args) {
+  return runAsync(action, ...args);
+}
 synckit.runAsWorker(run);
 
 exports.getGenerator = getGenerator;
 exports.run = run;
+exports.runAsync = runAsync;
+exports.setGenerator = setGenerator;

package/dist/worker.d.cts

@@ -1,7 +1,10 @@
 import { UnoGenerator } from '@unocss/core';
 
 declare function getGenerator(): Promise<UnoGenerator<any>>;
+declare function setGenerator(generator: Awaited<UnoGenerator<any>>): void;
+declare function runAsync(action: 'sort', classes: string): Promise<string>;
+declare function runAsync(action: 'blocklist', classes: string, id?: string): Promise<string[]>;
 declare function run(action: 'sort', classes: string): string;
 declare function run(action: 'blocklist', classes: string, id?: string): string[];
 
-export { getGenerator, run };
+export { getGenerator, run, runAsync, setGenerator };

package/dist/worker.d.mts

@@ -1,7 +1,10 @@
 import { UnoGenerator } from '@unocss/core';
 
 declare function getGenerator(): Promise<UnoGenerator<any>>;
+declare function setGenerator(generator: Awaited<UnoGenerator<any>>): void;
+declare function runAsync(action: 'sort', classes: string): Promise<string>;
+declare function runAsync(action: 'blocklist', classes: string, id?: string): Promise<string[]>;
 declare function run(action: 'sort', classes: string): string;
 declare function run(action: 'blocklist', classes: string, id?: string): string[];
 
-export { getGenerator, run };
+export { getGenerator, run, runAsync, setGenerator };

package/dist/worker.d.ts

@@ -1,7 +1,10 @@
 import { UnoGenerator } from '@unocss/core';
 
 declare function getGenerator(): Promise<UnoGenerator<any>>;
+declare function setGenerator(generator: Awaited<UnoGenerator<any>>): void;
+declare function runAsync(action: 'sort', classes: string): Promise<string>;
+declare function runAsync(action: 'blocklist', classes: string, id?: string): Promise<string[]>;
 declare function run(action: 'sort', classes: string): string;
 declare function run(action: 'blocklist', classes: string, id?: string): string[];
 
-export { getGenerator, run };
+export { getGenerator, run, runAsync, setGenerator };

package/dist/worker.mjs

@@ -46,15 +46,35 @@ async function getGenerator() {
   promise = promise || _getGenerator();
   return await promise;
 }
+function setGenerator(generator) {
+  promise = Promise.resolve(generator);
+}
 async function actionSort(classes) {
   return await sortRules(classes, await getGenerator());
 }
 async function actionBlocklist(classes, id) {
   const uno = await getGenerator();
+  const blocked = /* @__PURE__ */ new Set();
   const extracted = await uno.applyExtractors(classes, id);
-  return [...extracted.values()].filter((i) => uno.isBlocked(i));
+  const values = [...extracted.values()];
+  const matchBlocked = async (raw) => {
+    if (blocked.has(raw))
+      return;
+    if (uno.isBlocked(raw)) {
+      blocked.add(raw);
+      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);
+  };
+  await Promise.all(values.map(matchBlocked));
+  return [...blocked];
 }
-function run(action, ...args) {
+async function runAsync(action, ...args) {
   switch (action) {
     case "sort":
       return actionSort(...args);
@@ -62,6 +82,9 @@ function run(action, ...args) {
       return actionBlocklist(...args);
   }
 }
+function run(action, ...args) {
+  return runAsync(action, ...args);
+}
 runAsWorker(run);
 
-export { getGenerator, run };
+export { getGenerator, run, runAsync, setGenerator };

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@unocss/eslint-plugin",
-  "version": "0.57.7",
+  "version": "0.58.1",
   "description": "ESLint plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/antfu",
-  "homepage": "https://github.com/unocss/unocss/tree/main/packages/esling-plugin#readme",
+  "homepage": "https://github.com/unocss/unocss/tree/main/packages/eslint-plugin#readme",
   "repository": {
     "type": "git",
     "url": "https://github.com/unocss/unocss",
-    "directory": "packages/esling-plugin"
+    "directory": "packages/eslint-plugin"
   },
   "bugs": {
     "url": "https://github.com/unocss/unocss/issues"
@@ -34,14 +34,14 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^6.11.0",
+    "@typescript-eslint/utils": "^6.16.0",
     "magic-string": "^0.30.5",
-    "synckit": "^0.8.5",
-    "@unocss/config": "0.57.7",
-    "@unocss/core": "0.57.7"
+    "synckit": "^0.8.8",
+    "@unocss/config": "0.58.1",
+    "@unocss/core": "0.58.1"
   },
   "devDependencies": {
-    "@unocss/eslint-plugin": "0.57.7"
+    "@unocss/eslint-plugin": "0.58.1"
   },
   "scripts": {
     "build": "unbuild",