eslint-config-matsuri 1.6.1 → 1.7.0

package/index.js

@@ -1,6 +1,3 @@
-const rulesDirPlugin = require("eslint-plugin-rulesdir");
-rulesDirPlugin.RULES_DIR = __dirname + "/rules";
-
 /** @type {import('eslint').Linter.BaseConfig} */
 const config = {
   reportUnusedDisableDirectives: true,
@@ -13,10 +10,8 @@ const config = {
     ecmaVersion: 12,
   },
   extends: ["eslint:recommended"],
-  plugins: ["sort-imports-es6-autofix", "rulesdir"],
+  plugins: ["sort-imports-es6-autofix"],
   rules: {
-    "rulesdir/naming-convention": ["error", { fixable: false }],
-
     "no-console": ["error", { allow: ["error"] }],
     eqeqeq: ["error", "always"],
 
@@ -76,6 +71,21 @@ const config = {
             allowAny: true,
           },
         ],
+        "@typescript-eslint/ban-types": [
+          "error",
+          {
+            types: {
+              "React.VFC": {
+                message: "Use React.FC instead.",
+                fixWith: "React.FC",
+              },
+              VFC: {
+                message: "Use React.FC instead.",
+                fixWith: "React.FC",
+              },
+            },
+          },
+        ],
 
         "react/self-closing-comp": [
           "error",
@@ -103,7 +113,7 @@ const config = {
         "@typescript-eslint/no-unused-vars": "off",
         "unused-imports/no-unused-imports": "error",
         "unused-imports/no-unused-vars": [
-          "warn",
+          "error",
           {
             vars: "all",
             varsIgnorePattern: "^_",

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "eslint-config-matsuri",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "",
   "main": "index.js",
   "files": [
-    "index.js",
-    "rules"
+    "index.js"
   ],
   "scripts": {
     "test": "eslint . --max-warnings 0"
@@ -16,7 +15,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "peerDependencies": {
-    "eslint": ">= 8"
+    "eslint": "8.38.0"
   },
   "devDependencies": {
     "@emotion/react": "11.10.5",
@@ -33,8 +32,7 @@
     "eslint-plugin-jsx-a11y": "6.7.1",
     "eslint-plugin-react": "7.32.2",
     "eslint-plugin-react-hooks": "4.6.0",
-    "eslint-plugin-rulesdir": "^0.2.2",
-    "eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
+    "eslint-plugin-sort-imports-es6-autofix": "0.6.0",
     "eslint-plugin-unused-imports": "2.0.0"
   }
 }

package/rules/naming-convention.js

@@ -1,146 +0,0 @@
-const REGEX_CAMEL_CASE = /^[a-z][a-zA-Z0-9]*$/;
-const REGEX_PASCAL_CASE = /^[A-Z][a-zA-Z0-9]*$/;
-const REGEX_UPPER_CASE = /^[A-Z][A-Z0-9_]*$/;
-const REGEX_SNAKE_CASE = /^[a-z][a-z0-9_]*$/;
-
-const isCamelCase = (name) => REGEX_CAMEL_CASE.test(name);
-const isPascalCase = (name) => REGEX_PASCAL_CASE.test(name);
-const isUpperCase = (name) => REGEX_UPPER_CASE.test(name);
-const isSnakeCase = (name) => REGEX_SNAKE_CASE.test(name);
-
-const toCamelCase = (name) => {
-  if (isCamelCase(name)) {
-    return name;
-  }
-  if (isPascalCase(name)) {
-    return name[0].toLowerCase() + name.slice(1);
-  }
-  if (isUpperCase(name) || isSnakeCase(name)) {
-    const tmp = name
-      .split("_")
-      .map((word) => word[0].toUpperCase() + word.slice(1))
-      .join("");
-    return tmp[0].toLowerCase() + tmp.slice(1);
-  }
-  return name;
-};
-
-const checkValidity = (name, format) => {
-  switch (format) {
-    case "camelCase": {
-      return isCamelCase(name);
-    }
-    case "PascalCase": {
-      return isPascalCase(name);
-    }
-    case "UPPER_CASE": {
-      return isUpperCase(name);
-    }
-  }
-};
-
-const trimUnderscore = (name, leadingUnderscore, trailingUnderscore) => {
-  if (leadingUnderscore === "allow" && name?.startsWith("_")) {
-    return name.slice(1);
-  }
-  if (trailingUnderscore === "allow" && name?.endsWith("_")) {
-    return name.slice(0, -1);
-  }
-  return name;
-};
-
-/**
- * @typedef Option
- * @property {string[]} format
- * @property {string} fix
- * @property {string} leadingUnderscore
- * @property {string} trailingUnderscore
- */
-
-/**
- * @param {Option} option
- * @param {boolean} fixable
- */
-const reportValidity = (context, node, option, fixable) => {
-  const { format, fix, leadingUnderscore, trailingUnderscore } = option;
-  if (node.id === null) {
-    return;
-  }
-  const valid = format.some((format) => {
-    const name = trimUnderscore(
-      node.id.name,
-      leadingUnderscore,
-      trailingUnderscore
-    );
-    return checkValidity(name, format);
-  });
-
-  if (valid === false) {
-    context.report({
-      node,
-      message: `${node.id.name} must be ${format.join(" or ")}`,
-      fix: fixable
-        ? (fixer) => {
-            switch (fix) {
-              case "camelCase": {
-                return fixer.replaceText(node.id, toCamelCase(node.id.name));
-              }
-              default: {
-                return fixer.replaceText(node.id, node.id.name);
-              }
-            }
-          }
-        : null,
-    });
-  }
-};
-
-/**
- * @type {Object.<string, Option>}
- */
-const options = {
-  validable: {
-    format: ["camelCase", "UPPER_CASE"],
-    fix: "camelCase",
-    leadingUnderscore: "allow",
-    trailingUnderscore: "allow",
-  },
-  function: {
-    format: ["camelCase", "PascalCase"],
-    fix: "camelCase",
-    leadingUnderscore: "allow",
-    trailingUnderscore: "allow",
-  },
-};
-
-/**
- * @type {import("eslint").Rule.RuleModule}
- */
-const rule = {
-  meta: {
-    type: "problem",
-    fixable: "code",
-    hasSuggestions: true
-  },
-  create: (context) => {
-    const fixable = context.options[0]?.fixable ?? false;
-
-    return {
-      VariableDeclarator: (node) => {
-        if (node.init?.type === "ArrowFunctionExpression") {
-          reportValidity(context, node, options.function, fixable);
-        } else {
-          reportValidity(context, node, options.validable, fixable);
-        }
-      },
-      FunctionDeclaration: (node) => {
-        reportValidity(context, node, options.function, fixable);
-      },
-      FunctionExpression: (node) => {
-        reportValidity(context, node, options.function, fixable);
-      },
-    };
-  },
-};
-
-module.exports = rule;