@sxzz/eslint-config 3.4.0 → 3.5.0

package/index.cjs

@@ -5,6 +5,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all2) => {
   for (var name in all2)
     __defProp(target, name, { get: all2[name], enumerable: true });
@@ -27,6 +30,337 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// node_modules/.pnpm/eslint-plugin-unused-imports@3.0.0_@typescript-eslint+eslint-plugin@6.4.1_eslint@8.48.0/node_modules/eslint-plugin-unused-imports/lib/rules/predicates.js
+var require_predicates = __commonJS({
+  "node_modules/.pnpm/eslint-plugin-unused-imports@3.0.0_@typescript-eslint+eslint-plugin@6.4.1_eslint@8.48.0/node_modules/eslint-plugin-unused-imports/lib/rules/predicates.js"(exports) {
+    "use strict";
+    exports.unusedVarsPredicate = (problem, context) => {
+      const { node } = problem;
+      const { parent } = node;
+      if (parent == null) {
+        return problem;
+      }
+      switch (parent.type) {
+        case "ImportSpecifier":
+        case "ImportDefaultSpecifier":
+        case "ImportNamespaceSpecifier":
+          return false;
+        default:
+          return problem;
+      }
+    };
+    var commaFilter = { filter: (token) => token.value === "," };
+    var includeCommentsFilter = { includeComments: true };
+    exports.unusedImportsPredicate = (problem, context) => {
+      const { sourceCode } = context;
+      const { node } = problem;
+      const { parent } = node;
+      if (parent == null) {
+        return problem;
+      }
+      switch (parent.type) {
+        case "ImportSpecifier":
+        case "ImportDefaultSpecifier":
+        case "ImportNamespaceSpecifier":
+          break;
+        default:
+          return false;
+      }
+      problem.fix = (fixer) => {
+        if (!parent) {
+          return null;
+        }
+        const grandParent = parent.parent;
+        if (!grandParent) {
+          return null;
+        }
+        if (grandParent.specifiers.length === 1) {
+          const nextToken = sourceCode.getTokenAfter(grandParent, includeCommentsFilter);
+          const newLinesBetween = nextToken ? nextToken.loc.start.line - grandParent.loc.start.line : 0;
+          const endOfReplaceRange = nextToken ? nextToken.range[0] : grandParent.range[1];
+          const count = Math.max(0, newLinesBetween - 1);
+          return [
+            fixer.remove(grandParent),
+            fixer.replaceTextRange([grandParent.range[1], endOfReplaceRange], "\n".repeat(count))
+          ];
+        }
+        if (parent !== grandParent.specifiers[grandParent.specifiers.length - 1]) {
+          const comma = sourceCode.getTokenAfter(parent, commaFilter);
+          const prevNode = sourceCode.getTokenBefore(parent);
+          return [
+            fixer.removeRange([prevNode.range[1], parent.range[0]]),
+            fixer.remove(parent),
+            fixer.remove(comma)
+          ];
+        }
+        if (grandParent.specifiers.filter((specifier) => specifier.type === "ImportSpecifier").length === 1) {
+          const start = sourceCode.getTokenBefore(parent, commaFilter);
+          const end = sourceCode.getTokenAfter(parent, { filter: (token) => token.value === "}" });
+          return fixer.removeRange([start.range[0], end.range[1]]);
+        }
+        return fixer.removeRange([
+          sourceCode.getTokenBefore(parent, commaFilter).range[0],
+          parent.range[1]
+        ]);
+      };
+      return problem;
+    };
+  }
+});
+
+// node_modules/.pnpm/eslint-rule-composer@0.3.0/node_modules/eslint-rule-composer/lib/rule-composer.js
+var require_rule_composer = __commonJS({
+  "node_modules/.pnpm/eslint-rule-composer@0.3.0/node_modules/eslint-rule-composer/lib/rule-composer.js"(exports, module2) {
+    "use strict";
+    function normalizeMultiArgReportCall() {
+      if (arguments.length === 1) {
+        return arguments[0];
+      }
+      if (typeof arguments[1] === "string") {
+        return {
+          node: arguments[0],
+          message: arguments[1],
+          data: arguments[2],
+          fix: arguments[3]
+        };
+      }
+      return {
+        node: arguments[0],
+        loc: arguments[1],
+        message: arguments[2],
+        data: arguments[3],
+        fix: arguments[4]
+      };
+    }
+    function normalizeReportLoc(descriptor) {
+      if (descriptor.loc) {
+        if (descriptor.loc.start) {
+          return descriptor.loc;
+        }
+        return { start: descriptor.loc, end: null };
+      }
+      return descriptor.node.loc;
+    }
+    function normalizeMessagePlaceholders(descriptor, messageIds) {
+      const message = typeof descriptor.messageId === "string" ? messageIds[descriptor.messageId] : descriptor.message;
+      if (!descriptor.data) {
+        return {
+          message,
+          data: typeof descriptor.messageId === "string" ? {} : null
+        };
+      }
+      const normalizedData = /* @__PURE__ */ Object.create(null);
+      const interpolatedMessage = message.replace(/\{\{\s*([^{}]+?)\s*\}\}/g, (fullMatch, term) => {
+        if (term in descriptor.data) {
+          normalizedData[term] = descriptor.data[term];
+          return descriptor.data[term];
+        }
+        return fullMatch;
+      });
+      return {
+        message: interpolatedMessage,
+        data: Object.freeze(normalizedData)
+      };
+    }
+    function getRuleMeta(rule) {
+      return typeof rule === "object" && rule.meta && typeof rule.meta === "object" ? rule.meta : {};
+    }
+    function getMessageIds(rule) {
+      const meta = getRuleMeta(rule);
+      return meta.messages && typeof rule.meta.messages === "object" ? meta.messages : {};
+    }
+    function getReportNormalizer(rule) {
+      const messageIds = getMessageIds(rule);
+      return function normalizeReport() {
+        const descriptor = normalizeMultiArgReportCall.apply(null, arguments);
+        const interpolatedMessageAndData = normalizeMessagePlaceholders(descriptor, messageIds);
+        return {
+          node: descriptor.node,
+          message: interpolatedMessageAndData.message,
+          messageId: typeof descriptor.messageId === "string" ? descriptor.messageId : null,
+          data: typeof descriptor.messageId === "string" ? interpolatedMessageAndData.data : null,
+          loc: normalizeReportLoc(descriptor),
+          fix: descriptor.fix
+        };
+      };
+    }
+    function getRuleCreateFunc(rule) {
+      return typeof rule === "function" ? rule : rule.create;
+    }
+    function removeMessageIfMessageIdPresent(reportDescriptor) {
+      const newDescriptor = Object.assign({}, reportDescriptor);
+      if (typeof reportDescriptor.messageId === "string" && typeof reportDescriptor.message === "string") {
+        delete newDescriptor.message;
+      }
+      return newDescriptor;
+    }
+    module2.exports = Object.freeze({
+      filterReports(rule, predicate) {
+        return Object.freeze({
+          create(context) {
+            const filename = context.getFilename();
+            const sourceCode = context.getSourceCode();
+            const settings = context.settings;
+            const options = context.options;
+            return getRuleCreateFunc(rule)(
+              Object.freeze(
+                Object.create(
+                  context,
+                  {
+                    report: {
+                      enumerable: true,
+                      value() {
+                        const reportDescriptor = getReportNormalizer(rule).apply(null, arguments);
+                        if (predicate(reportDescriptor, {
+                          sourceCode,
+                          settings,
+                          options,
+                          filename
+                        })) {
+                          context.report(removeMessageIfMessageIdPresent(reportDescriptor));
+                        }
+                      }
+                    }
+                  }
+                )
+              )
+            );
+          },
+          schema: rule.schema,
+          meta: getRuleMeta(rule)
+        });
+      },
+      mapReports(rule, iteratee) {
+        return Object.freeze({
+          create(context) {
+            const filename = context.getFilename();
+            const sourceCode = context.getSourceCode();
+            const settings = context.settings;
+            const options = context.options;
+            return getRuleCreateFunc(rule)(
+              Object.freeze(
+                Object.create(
+                  context,
+                  {
+                    report: {
+                      enumerable: true,
+                      value() {
+                        context.report(
+                          removeMessageIfMessageIdPresent(
+                            iteratee(
+                              getReportNormalizer(rule).apply(null, arguments),
+                              {
+                                sourceCode,
+                                settings,
+                                options,
+                                filename
+                              }
+                            )
+                          )
+                        );
+                      }
+                    }
+                  }
+                )
+              )
+            );
+          },
+          schema: rule.schema,
+          meta: getRuleMeta(rule)
+        });
+      },
+      joinReports(rules) {
+        return Object.freeze({
+          create(context) {
+            return rules.map((rule) => getRuleCreateFunc(rule)(context)).reduce(
+              (allListeners, ruleListeners) => Object.keys(ruleListeners).reduce(
+                (combinedListeners, key) => {
+                  const currentListener = combinedListeners[key];
+                  const ruleListener = ruleListeners[key];
+                  if (currentListener) {
+                    return Object.assign({}, combinedListeners, {
+                      [key]() {
+                        currentListener.apply(null, arguments);
+                        ruleListener.apply(null, arguments);
+                      }
+                    });
+                  }
+                  return Object.assign({}, combinedListeners, { [key]: ruleListener });
+                },
+                allListeners
+              ),
+              /* @__PURE__ */ Object.create(null)
+            );
+          },
+          meta: Object.freeze({
+            messages: Object.assign.apply(
+              null,
+              [/* @__PURE__ */ Object.create(null)].concat(rules.map(getMessageIds))
+            ),
+            fixable: "code"
+          })
+        });
+      }
+    });
+  }
+});
+
+// node_modules/.pnpm/eslint-plugin-unused-imports@3.0.0_@typescript-eslint+eslint-plugin@6.4.1_eslint@8.48.0/node_modules/eslint-plugin-unused-imports/lib/rules/no-unused-vars.js
+var require_no_unused_vars = __commonJS({
+  "node_modules/.pnpm/eslint-plugin-unused-imports@3.0.0_@typescript-eslint+eslint-plugin@6.4.1_eslint@8.48.0/node_modules/eslint-plugin-unused-imports/lib/rules/no-unused-vars.js"(exports, module2) {
+    "use strict";
+    var { unusedVarsPredicate } = require_predicates();
+    var ruleComposer = require_rule_composer();
+    var rule;
+    try {
+      const tslint = require("@typescript-eslint/eslint-plugin");
+      rule = tslint.rules["no-unused-vars"];
+    } catch (_) {
+      const eslint = require("eslint");
+      rule = new eslint.Linter().getRules().get("no-unused-vars");
+    }
+    rule.meta.fixable = "code";
+    rule.meta.docs.url = "https://github.com/sweepline/eslint-plugin-unused-imports/blob/master/docs/rules/no-unused-vars.md";
+    module2.exports = ruleComposer.filterReports(rule, unusedVarsPredicate);
+  }
+});
+
+// node_modules/.pnpm/eslint-plugin-unused-imports@3.0.0_@typescript-eslint+eslint-plugin@6.4.1_eslint@8.48.0/node_modules/eslint-plugin-unused-imports/lib/rules/no-unused-imports.js
+var require_no_unused_imports = __commonJS({
+  "node_modules/.pnpm/eslint-plugin-unused-imports@3.0.0_@typescript-eslint+eslint-plugin@6.4.1_eslint@8.48.0/node_modules/eslint-plugin-unused-imports/lib/rules/no-unused-imports.js"(exports, module2) {
+    "use strict";
+    var { unusedImportsPredicate } = require_predicates();
+    var ruleComposer = require_rule_composer();
+    var rule;
+    try {
+      const tslint = require("@typescript-eslint/eslint-plugin");
+      rule = tslint.rules["no-unused-vars"];
+    } catch (_) {
+      const eslint = require("eslint");
+      rule = new eslint.Linter().getRules().get("no-unused-vars");
+    }
+    rule.meta.fixable = "code";
+    rule.meta.docs.url = "https://github.com/sweepline/eslint-plugin-unused-imports/blob/master/docs/rules/no-unused-imports.md";
+    rule.meta.docs.extendsBaseRule = false;
+    module2.exports = ruleComposer.filterReports(rule, unusedImportsPredicate);
+  }
+});
+
+// node_modules/.pnpm/eslint-plugin-unused-imports@3.0.0_@typescript-eslint+eslint-plugin@6.4.1_eslint@8.48.0/node_modules/eslint-plugin-unused-imports/lib/index.js
+var require_lib = __commonJS({
+  "node_modules/.pnpm/eslint-plugin-unused-imports@3.0.0_@typescript-eslint+eslint-plugin@6.4.1_eslint@8.48.0/node_modules/eslint-plugin-unused-imports/lib/index.js"(exports, module2) {
+    "use strict";
+    var noUnusedVars = require_no_unused_vars();
+    var noUnusedImports = require_no_unused_imports();
+    module2.exports.rules = {
+      "no-unused-vars": noUnusedVars,
+      "no-unused-imports": noUnusedImports,
+      "no-unused-vars-ts": noUnusedVars,
+      "no-unused-imports-ts": noUnusedImports
+    };
+  }
+});
+
 // index.js
 var eslint_config_exports = {};
 __export(eslint_config_exports, {
@@ -81,6 +415,7 @@ var import_js = __toESM(require("@eslint/js"), 1);
 var import_eslint_plugin_import = __toESM(require("eslint-plugin-import"), 1);
 var import_eslint_plugin_unicorn = __toESM(require("eslint-plugin-unicorn"), 1);
 var import_eslint_plugin_antfu = __toESM(require("eslint-plugin-antfu"), 1);
+var import_eslint_plugin_unused_imports = __toESM(require_lib(), 1);
 
 // src/shared.js
 var GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
@@ -136,6 +471,7 @@ var GLOB_EXCLUDE = (
 );
 
 // src/js.js
+var isInEditor = (process.env.VSCODE_PID || process.env.JETBRAINS_IDE) && !process.env.CI;
 var js = [
   import_js.default.configs.recommended,
   {
@@ -147,8 +483,11 @@ var js = [
       },
       sourceType: "module"
     },
+    plugins: {
+      "unused-imports": import_eslint_plugin_unused_imports.default
+    },
     rules: {
-      "no-unused-vars": ["error", { args: "none", ignoreRestSiblings: true }],
+      "no-unused-vars": "off",
       "no-constant-condition": "warn",
       "no-debugger": "warn",
       "no-console": ["warn", { allow: ["warn", "error"] }],
@@ -208,7 +547,12 @@ var js = [
         }
       ],
       "no-lonely-if": "error",
-      "prefer-exponentiation-operator": "error"
+      "prefer-exponentiation-operator": "error",
+      "unused-imports/no-unused-imports": isInEditor ? "off" : "error",
+      [isInEditor ? "no-unused-vars" : "unused-imports/no-unused-vars"]: [
+        "error",
+        { args: "after-used", ignoreRestSiblings: true }
+      ]
     }
   },
   {
@@ -487,7 +831,8 @@ var markdown = [
       "no-restricted-imports": "off",
       "no-undef": "off",
       "no-unused-expressions": "off",
-      "no-unused-vars": "off"
+      "no-unused-vars": "off",
+      "unused-imports/no-unused-vars": "off"
     }
   }
 ];
@@ -603,7 +948,7 @@ var reactivityTransform = [
       vue: import_eslint_plugin_vue.default
     },
     rules: {
-      "vue/no-setup-props-destructure": "off"
+      "vue/no-setup-props-reactivity-loss": "off"
     }
   }
 ];
@@ -625,10 +970,7 @@ var vueCustomRules = {
       math: "always"
     }
   ],
-  "vue/component-tags-order": [
-    "error",
-    { order: ["script", "template", "style"] }
-  ],
+  "vue/block-order": ["error", { order: ["script", "template", "style"] }],
   "vue/custom-event-name-casing": ["error", "camelCase"],
   "vue/no-useless-v-bind": "error",
   "vue/no-unused-refs": "error",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sxzz/eslint-config",
-  "version": "3.4.0",
-  "packageManager": "pnpm@8.6.12",
+  "version": "3.5.0",
+  "packageManager": "pnpm@8.7.0",
   "description": "ESLint config for @sxzz.",
   "type": "module",
   "license": "MIT",
@@ -31,35 +31,36 @@
     "eslint": "^8.0.0"
   },
   "dependencies": {
-    "@eslint/js": "^8.46.0",
-    "@typescript-eslint/eslint-plugin": "^6.2.1",
-    "@typescript-eslint/parser": "^6.2.1",
-    "@unocss/eslint-plugin": "^0.55.0",
+    "@eslint/js": "^8.48.0",
+    "@typescript-eslint/eslint-plugin": "^6.4.1",
+    "@typescript-eslint/parser": "^6.4.1",
+    "@unocss/eslint-plugin": "^0.55.3",
     "eslint-config-prettier": "^9.0.0",
     "eslint-define-config": "^1.23.0",
-    "eslint-plugin-antfu": "^0.40.2",
+    "eslint-plugin-antfu": "^0.41.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsonc": "^2.9.0",
     "eslint-plugin-markdown": "^3.0.1",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-unicorn": "^48.0.1",
-    "eslint-plugin-vue": "^9.16.1",
+    "eslint-plugin-vue": "^9.17.0",
     "eslint-plugin-yml": "^1.8.0",
-    "globals": "^13.20.0",
+    "globals": "^13.21.0",
     "jsonc-eslint-parser": "^2.3.0",
     "local-pkg": "^0.4.3",
-    "prettier": "^3.0.1",
+    "prettier": "^3.0.2",
     "vue-eslint-parser": "^9.3.1",
     "yaml-eslint-parser": "^1.2.2"
   },
   "devDependencies": {
     "@sxzz/prettier-config": "^1.0.4",
-    "@types/node": "^20.4.8",
-    "bumpp": "^9.1.1",
-    "eslint": "^8.46.0",
+    "@types/node": "^20.5.7",
+    "bumpp": "^9.2.0",
+    "eslint": "^8.48.0",
+    "eslint-plugin-unused-imports": "^3.0.0",
     "tsup": "^7.2.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "engines": {
     "node": ">=16.14.0"

package/src/js.js

@@ -3,8 +3,12 @@ import jsConfig from '@eslint/js'
 import importPlugin from 'eslint-plugin-import'
 import unicornPlugin from 'eslint-plugin-unicorn'
 import antfuPlugin from 'eslint-plugin-antfu'
+import unusedImportsPlugin from 'eslint-plugin-unused-imports'
 import { GLOB_MARKDOWN, GLOB_SRC, GLOB_SRC_EXT } from './shared.js'
 
+const isInEditor =
+  (process.env.VSCODE_PID || process.env.JETBRAINS_IDE) && !process.env.CI
+
 export { importPlugin, unicornPlugin, antfuPlugin }
 
 /** @type {import('eslint-define-config').FlatESLintConfigItem[]} */
@@ -19,8 +23,11 @@ export const js = [
       },
       sourceType: 'module',
     },
+    plugins: {
+      'unused-imports': unusedImportsPlugin,
+    },
     rules: {
-      'no-unused-vars': ['error', { args: 'none', ignoreRestSiblings: true }],
+      'no-unused-vars': 'off',
       'no-constant-condition': 'warn',
       'no-debugger': 'warn',
       'no-console': ['warn', { allow: ['warn', 'error'] }],
@@ -84,6 +91,12 @@ export const js = [
       ],
       'no-lonely-if': 'error',
       'prefer-exponentiation-operator': 'error',
+
+      'unused-imports/no-unused-imports': isInEditor ? 'off' : 'error',
+      [isInEditor ? 'no-unused-vars' : 'unused-imports/no-unused-vars']: [
+        'error',
+        { args: 'after-used', ignoreRestSiblings: true },
+      ],
     },
   },
   {

package/src/markdown.js

@@ -37,6 +37,7 @@ export const markdown = [
       'no-undef': 'off',
       'no-unused-expressions': 'off',
       'no-unused-vars': 'off',
+      'unused-imports/no-unused-vars': 'off',
     },
   },
 ]

package/src/vue.js

@@ -38,7 +38,7 @@ export const reactivityTransform = [
       vue: vuePlugin,
     },
     rules: {
-      'vue/no-setup-props-destructure': 'off',
+      'vue/no-setup-props-reactivity-loss': 'off',
     },
   },
 ]
@@ -63,10 +63,7 @@ const vueCustomRules = {
       math: 'always',
     },
   ],
-  'vue/component-tags-order': [
-    'error',
-    { order: ['script', 'template', 'style'] },
-  ],
+  'vue/block-order': ['error', { order: ['script', 'template', 'style'] }],
   'vue/custom-event-name-casing': ['error', 'camelCase'],
   'vue/no-useless-v-bind': 'error',
   'vue/no-unused-refs': 'error',