@unocss/eslint-plugin 0.55.5 → 0.55.7

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-const node_path = require('node:path');
 const utils = require('@typescript-eslint/utils');
+const node_path = require('node:path');
 const synckit = require('synckit');
 const dirs = require('./dirs.cjs');
 const MagicString = require('magic-string');
@@ -14,7 +14,8 @@ const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
 const CLASS_FIELDS = ["class", "classname"];
 const AST_NODES_WITH_QUOTES = ["Literal", "VLiteral"];
 
-const sortClasses$1 = synckit.createSyncFn(node_path.join(dirs.distDir, "worker-sort.cjs"));
+const syncAction = synckit.createSyncFn(node_path.join(dirs.distDir, "worker.cjs"));
+
 const order = utils.ESLintUtils.RuleCreator((name) => name)({
   name: "order",
   meta: {
@@ -35,7 +36,7 @@ const order = utils.ESLintUtils.RuleCreator((name) => name)({
       if (typeof node.value !== "string" || !node.value.trim())
         return;
       const input = node.value;
-      const sorted = sortClasses$1(input).trim();
+      const sorted = syncAction("sort", input).trim();
       if (sorted !== input) {
         context.report({
           node,
@@ -79,7 +80,6 @@ const order = utils.ESLintUtils.RuleCreator((name) => name)({
   }
 });
 
-const sortClasses = synckit.createSyncFn(node_path.join(dirs.distDir, "worker-sort.cjs"));
 const IGNORE_ATTRIBUTES = ["style", "class", "classname", "value"];
 const orderAttributify = utils.ESLintUtils.RuleCreator((name) => name)({
   name: "order-attributify",
@@ -104,7 +104,7 @@ const orderAttributify = utils.ESLintUtils.RuleCreator((name) => name)({
         if (!valueless.length)
           return;
         const input = valueless.map((i) => i.key.name).join(" ").trim();
-        const sorted = sortClasses(input);
+        const sorted = syncAction("sort", input);
         if (sorted !== input) {
           context.report({
             node,
@@ -132,6 +132,67 @@ const orderAttributify = utils.ESLintUtils.RuleCreator((name) => name)({
   }
 });
 
+const blocklist = utils.ESLintUtils.RuleCreator((name) => name)({
+  name: "blocklist",
+  meta: {
+    type: "problem",
+    fixable: "code",
+    docs: {
+      description: "Utilities in UnoCSS blocklist",
+      recommended: "recommended"
+    },
+    messages: {
+      "in-blocklist": "Utility '{{ name }}' is in blocklist"
+    },
+    schema: []
+  },
+  defaultOptions: [],
+  create(context) {
+    const checkLiteral = (node) => {
+      if (typeof node.value !== "string" || !node.value.trim())
+        return;
+      const input = node.value;
+      const blocked = syncAction("blocklist", input, context.filename);
+      blocked.forEach((i) => {
+        context.report({
+          node,
+          messageId: "in-blocklist",
+          data: {
+            name: i
+          }
+        });
+      });
+    };
+    const scriptVisitor = {
+      JSXAttribute(node) {
+        if (typeof node.name.name === "string" && CLASS_FIELDS.includes(node.name.name.toLowerCase()) && node.value) {
+          if (node.value.type === "Literal")
+            checkLiteral(node.value);
+        }
+      },
+      SvelteAttribute(node) {
+        if (node.key.name === "class") {
+          if (node.value?.[0].type === "SvelteLiteral")
+            checkLiteral(node.value[0]);
+        }
+      }
+    };
+    const templateBodyVisitor = {
+      VAttribute(node) {
+        if (node.key.name === "class") {
+          if (node.value.type === "VLiteral")
+            checkLiteral(node.value);
+        }
+      }
+    };
+    if (context.parserServices == null || context.parserServices.defineTemplateBodyVisitor == null) {
+      return scriptVisitor;
+    } else {
+      return context.parserServices?.defineTemplateBodyVisitor(templateBodyVisitor, scriptVisitor);
+    }
+  }
+});
+
 const configsRecommended = {
   plugins: ["@unocss"],
   rules: {
@@ -143,7 +204,8 @@ const configsRecommended = {
 const index = {
   rules: {
     order,
-    "order-attributify": orderAttributify
+    "order-attributify": orderAttributify,
+    blocklist
   },
   configs: {
     recommended: configsRecommended

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { join } from 'node:path';
 import { ESLintUtils } from '@typescript-eslint/utils';
+import { join } from 'node:path';
 import { createSyncFn } from 'synckit';
 import { distDir } from './dirs.mjs';
 import MagicString from 'magic-string';
@@ -8,7 +8,8 @@ import 'node:url';
 const CLASS_FIELDS = ["class", "classname"];
 const AST_NODES_WITH_QUOTES = ["Literal", "VLiteral"];
 
-const sortClasses$1 = createSyncFn(join(distDir, "worker-sort.cjs"));
+const syncAction = createSyncFn(join(distDir, "worker.cjs"));
+
 const order = ESLintUtils.RuleCreator((name) => name)({
   name: "order",
   meta: {
@@ -29,7 +30,7 @@ const order = ESLintUtils.RuleCreator((name) => name)({
       if (typeof node.value !== "string" || !node.value.trim())
         return;
       const input = node.value;
-      const sorted = sortClasses$1(input).trim();
+      const sorted = syncAction("sort", input).trim();
       if (sorted !== input) {
         context.report({
           node,
@@ -73,7 +74,6 @@ const order = ESLintUtils.RuleCreator((name) => name)({
   }
 });
 
-const sortClasses = createSyncFn(join(distDir, "worker-sort.cjs"));
 const IGNORE_ATTRIBUTES = ["style", "class", "classname", "value"];
 const orderAttributify = ESLintUtils.RuleCreator((name) => name)({
   name: "order-attributify",
@@ -98,7 +98,7 @@ const orderAttributify = ESLintUtils.RuleCreator((name) => name)({
         if (!valueless.length)
           return;
         const input = valueless.map((i) => i.key.name).join(" ").trim();
-        const sorted = sortClasses(input);
+        const sorted = syncAction("sort", input);
         if (sorted !== input) {
           context.report({
             node,
@@ -126,6 +126,67 @@ const orderAttributify = ESLintUtils.RuleCreator((name) => name)({
   }
 });
 
+const blocklist = ESLintUtils.RuleCreator((name) => name)({
+  name: "blocklist",
+  meta: {
+    type: "problem",
+    fixable: "code",
+    docs: {
+      description: "Utilities in UnoCSS blocklist",
+      recommended: "recommended"
+    },
+    messages: {
+      "in-blocklist": "Utility '{{ name }}' is in blocklist"
+    },
+    schema: []
+  },
+  defaultOptions: [],
+  create(context) {
+    const checkLiteral = (node) => {
+      if (typeof node.value !== "string" || !node.value.trim())
+        return;
+      const input = node.value;
+      const blocked = syncAction("blocklist", input, context.filename);
+      blocked.forEach((i) => {
+        context.report({
+          node,
+          messageId: "in-blocklist",
+          data: {
+            name: i
+          }
+        });
+      });
+    };
+    const scriptVisitor = {
+      JSXAttribute(node) {
+        if (typeof node.name.name === "string" && CLASS_FIELDS.includes(node.name.name.toLowerCase()) && node.value) {
+          if (node.value.type === "Literal")
+            checkLiteral(node.value);
+        }
+      },
+      SvelteAttribute(node) {
+        if (node.key.name === "class") {
+          if (node.value?.[0].type === "SvelteLiteral")
+            checkLiteral(node.value[0]);
+        }
+      }
+    };
+    const templateBodyVisitor = {
+      VAttribute(node) {
+        if (node.key.name === "class") {
+          if (node.value.type === "VLiteral")
+            checkLiteral(node.value);
+        }
+      }
+    };
+    if (context.parserServices == null || context.parserServices.defineTemplateBodyVisitor == null) {
+      return scriptVisitor;
+    } else {
+      return context.parserServices?.defineTemplateBodyVisitor(templateBodyVisitor, scriptVisitor);
+    }
+  }
+});
+
 const configsRecommended = {
   plugins: ["@unocss"],
   rules: {
@@ -137,7 +198,8 @@ const configsRecommended = {
 const index = {
   rules: {
     order,
-    "order-attributify": orderAttributify
+    "order-attributify": orderAttributify,
+    blocklist
   },
   configs: {
     recommended: configsRecommended

package/dist/{worker-sort.cjs → worker.cjs}

@@ -31,15 +31,34 @@ async function sortRules(rules, uno) {
   return [...unknown, sorted].join(" ").trim();
 }
 
-async function getGenerator() {
+let promise;
+async function _getGenerator() {
   const { config: config$1, sources } = await config.loadConfig();
   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 core.createGenerator(config$1);
 }
-let promise;
-synckit.runAsWorker(async (classes) => {
-  promise = promise || getGenerator();
-  const uno = await promise;
-  return await sortRules(classes, uno);
-});
+async function getGenerator() {
+  promise = promise || _getGenerator();
+  return await promise;
+}
+async function actionSort(classes) {
+  return await sortRules(classes, await getGenerator());
+}
+async function actionBlocklist(classes, id) {
+  const uno = await getGenerator();
+  const extracted = await uno.applyExtractors(classes, id);
+  return [...extracted.values()].filter((i) => uno.isBlocked(i));
+}
+function run(action, ...args) {
+  switch (action) {
+    case "sort":
+      return actionSort(...args);
+    case "blocklist":
+      return actionBlocklist(...args);
+  }
+}
+synckit.runAsWorker(run);
+
+exports.getGenerator = getGenerator;
+exports.run = run;

package/dist/{worker-sort.mjs → worker.mjs}

@@ -29,15 +29,33 @@ async function sortRules(rules, uno) {
   return [...unknown, sorted].join(" ").trim();
 }
 
-async function getGenerator() {
+let promise;
+async function _getGenerator() {
   const { config, sources } = await loadConfig();
   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(config);
 }
-let promise;
-runAsWorker(async (classes) => {
-  promise = promise || getGenerator();
-  const uno = await promise;
-  return await sortRules(classes, uno);
-});
+async function getGenerator() {
+  promise = promise || _getGenerator();
+  return await promise;
+}
+async function actionSort(classes) {
+  return await sortRules(classes, await getGenerator());
+}
+async function actionBlocklist(classes, id) {
+  const uno = await getGenerator();
+  const extracted = await uno.applyExtractors(classes, id);
+  return [...extracted.values()].filter((i) => uno.isBlocked(i));
+}
+function run(action, ...args) {
+  switch (action) {
+    case "sort":
+      return actionSort(...args);
+    case "blocklist":
+      return actionBlocklist(...args);
+  }
+}
+runAsWorker(run);
+
+export { getGenerator, run };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/eslint-plugin",
-  "version": "0.55.5",
+  "version": "0.55.7",
   "description": "ESLint plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,11 +37,11 @@
     "@typescript-eslint/utils": "^6.4.1",
     "magic-string": "^0.30.3",
     "synckit": "^0.8.5",
-    "@unocss/config": "0.55.5",
-    "@unocss/core": "0.55.5"
+    "@unocss/config": "0.55.7",
+    "@unocss/core": "0.55.7"
   },
   "devDependencies": {
-    "@unocss/eslint-plugin": "0.55.5"
+    "@unocss/eslint-plugin": "0.55.7"
   },
   "scripts": {
     "build": "unbuild",