@daldalso/eslint-plugin 1.2.0 → 1.2.2

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2022 JJoriping
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 JJoriping
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -4,19 +4,13 @@ ESLint plugin for [Daldalso](https://daldal.so)-style programming.
 
 ## Getting Started
 1. `yarn add @daldalso/eslint-plugin`
-2. Add following values to your ESLint configuration file.
-   ```json
-   {
-     "plugins": [
-       "@daldalso/eslint-plugin"
-     ],
-     "extends": [
-       "plugin:@daldalso/eslint-plugin/all"
-     ],
-     "parserOptions": {
-       "project": "./tsconfig.json"
-     }
-   }
+2. Add the plugin to your ESLint 9 configuration file like below:
+   ```js
+   import daldalsoPlugin from "@daldalso/eslint-plugin";
+
+   export default [
+     daldalsoPlugin.configs.all
+   ];
    ```
 
 ## Caveats

package/dist/configs/all.js

@@ -1,20 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var stylisticPlugin = require("@stylistic/eslint-plugin-ts");
+var compat_1 = require("@eslint/compat");
+var importPlugin = require("eslint-plugin-import");
+var tsLintParser = require("@typescript-eslint/parser");
+var tsLintPlugin = require("@typescript-eslint/eslint-plugin");
+var reactPlugin = require("eslint-plugin-react");
+var reactHooksPlugin = require("eslint-plugin-react-hooks");
+var unicornPlugin = require("eslint-plugin-unicorn");
 exports.default = {
-    parser: "@typescript-eslint/parser",
-    parserOptions: {
-        sourceType: "module",
-        ecmaFeatures: {
-            "jsx": true
-        }
-    },
-    plugins: [
-        "@typescript-eslint",
-        "import",
-        "react",
-        "react-hooks",
-        "unicorn"
+    files: [
+        "**/*.{ts,tsx}"
     ],
+    languageOptions: {
+        parserOptions: {
+            project: "./tsconfig.json",
+            ecmaFeatures: {
+                "jsx": true
+            }
+        },
+        parser: tsLintParser,
+        sourceType: "module"
+    },
+    plugins: {
+        '@stylistic': stylisticPlugin,
+        '@typescript-eslint': tsLintPlugin,
+        'import': (0, compat_1.fixupPluginRules)(importPlugin),
+        'react': reactPlugin,
+        'react-hooks': reactHooksPlugin,
+        'unicorn': unicornPlugin
+    },
     settings: {
         react: {
             version: "detect"
@@ -106,16 +121,16 @@ exports.default = {
         'template-curly-spacing': "warn",
         'template-tag-spacing': "warn",
         'yield-star-spacing': ["warn", "before"],
-        // TSLint rules - extensions
-        '@typescript-eslint/brace-style': "warn",
-        '@typescript-eslint/comma-dangle': [
+        // Stylistic rules
+        '@stylistic/brace-style': "warn",
+        '@stylistic/comma-dangle': [
             "warn",
             // NOTE Problem with `<T,>() => ...`
             { generics: "ignore" }
         ],
-        '@typescript-eslint/comma-spacing': "warn",
-        '@typescript-eslint/func-call-spacing': ["warn", "never"],
-        '@typescript-eslint/indent': [
+        '@stylistic/comma-spacing': "warn",
+        '@stylistic/func-call-spacing': ["warn", "never"],
+        '@stylistic/indent': [
             "warn",
             2,
             {
@@ -130,7 +145,7 @@ exports.default = {
                 ]
             }
         ],
-        '@typescript-eslint/keyword-spacing': ["warn", {
+        '@stylistic/keyword-spacing': ["warn", {
                 overrides: {
                     catch: { before: false, after: false },
                     do: { before: true, after: false },
@@ -146,20 +161,33 @@ exports.default = {
                     with: { before: true, after: false }
                 }
             }],
-        '@typescript-eslint/no-extra-parens': [
+        '@stylistic/member-delimiter-style': ["warn", {
+                overrides: {
+                    interface: {
+                        singleline: { delimiter: "semi", requireLast: true },
+                        multiline: { delimiter: "semi", requireLast: true }
+                    },
+                    typeLiteral: {
+                        singleline: { delimiter: "comma", requireLast: false },
+                        multiline: { delimiter: "comma", requireLast: false }
+                    }
+                }
+            }],
+        '@stylistic/no-extra-parens': [
             "warn",
             "all",
             { ignoreJSX: "all", nestedBinaryExpressions: false }
         ],
-        '@typescript-eslint/no-extra-semi': "error",
+        '@stylistic/no-extra-semi': "error",
+        '@stylistic/semi': "warn",
+        '@stylistic/space-before-blocks': ["warn", "never"],
+        '@stylistic/space-before-function-paren': ["warn", { anonymous: "never", named: "never", asyncArrow: "always" }],
+        // TSLint rules - extensions
         '@typescript-eslint/no-shadow': ["warn", { allow: ["_"] }],
-        '@typescript-eslint/no-throw-literal': "error",
         '@typescript-eslint/no-unused-expressions': ["error", { allowShortCircuit: true, enforceForJSX: true }],
         '@typescript-eslint/no-useless-constructor': "warn",
+        '@typescript-eslint/only-throw-error': "error",
         '@typescript-eslint/return-await': "error",
-        '@typescript-eslint/semi': "warn",
-        '@typescript-eslint/space-before-blocks': ["warn", "never"],
-        '@typescript-eslint/space-before-function-paren': ["warn", { anonymous: "never", named: "never", asyncArrow: "always" }],
         // TSLint rules - errors
         '@typescript-eslint/adjacent-overload-signatures': "error",
         '@typescript-eslint/consistent-indexed-object-style': "error",
@@ -171,11 +199,11 @@ exports.default = {
         '@typescript-eslint/no-extra-non-null-assertion': "error",
         '@typescript-eslint/no-misused-new': "error",
         '@typescript-eslint/no-non-null-asserted-nullish-coalescing': "error",
-        '@typescript-eslint/no-parameter-properties': "error",
         '@typescript-eslint/no-this-alias': "error",
         '@typescript-eslint/no-unnecessary-type-constraint': "error",
         '@typescript-eslint/no-unsafe-call': "error",
         '@typescript-eslint/no-useless-empty-export': "error",
+        '@typescript-eslint/parameter-properties': "error",
         '@typescript-eslint/prefer-literal-enum-member': "error",
         '@typescript-eslint/restrict-plus-operands': "error",
         // TSLint rules - warnings
@@ -186,18 +214,6 @@ exports.default = {
                 assertionStyle: "as",
                 objectLiteralTypeAssertions: "allow"
             }],
-        '@typescript-eslint/member-delimiter-style': ["warn", {
-                overrides: {
-                    interface: {
-                        singleline: { delimiter: "semi", requireLast: true },
-                        multiline: { delimiter: "semi", requireLast: true }
-                    },
-                    typeLiteral: {
-                        singleline: { delimiter: "comma", requireLast: false },
-                        multiline: { delimiter: "comma", requireLast: false }
-                    }
-                }
-            }],
         '@typescript-eslint/no-base-to-string': "warn",
         '@typescript-eslint/no-empty-interface': "warn",
         '@typescript-eslint/no-misused-promises': ["warn", { checksVoidReturn: false }],
@@ -246,7 +262,7 @@ exports.default = {
         'react/require-optimization': "warn",
         'react/self-closing-comp': "warn",
         'react/void-dom-elements-no-children': "error",
-        // Import rules
+        // Import rules (incompatible with eslint 9)
         'import/first': "error",
         'import/order': [
             "warn",

package/dist/index.js

@@ -4,7 +4,7 @@ var path_1 = require("path");
 var all_1 = require("./configs/all");
 var rules = (0, fs_1.readdirSync)((0, path_1.resolve)(__dirname, "rules"));
 var fileNamePattern = /^(.+)\.js$/;
-module.exports = {
+var plugin = {
     rules: rules.reduce(function (pv, v) {
         var chunk = v.match(fileNamePattern);
         if (!chunk)
@@ -16,3 +16,5 @@ module.exports = {
         all: all_1.default
     }
 };
+Object.assign(all_1.default.plugins, { '@daldalso': plugin });
+module.exports = plugin;

package/dist/rules/iterator-name.js

@@ -159,7 +159,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
             };
         };
         var getCurrentDepth = function (me) {
-            var ancestors = context.getAncestors();
+            var ancestors = sourceCode.getAncestors(me);
             var R = 0;
             for (var i = 0; i < ancestors.length; i++) {
                 var v = ancestors[i];

package/dist/rules/parenthesis-spacing.js

@@ -38,7 +38,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var ast_spec_1 = require("@typescript-eslint/types/dist/generated/ast-spec");
 var utils_1 = require("@typescript-eslint/utils");
 var patterns_1 = require("../utils/patterns");
 var OBJECT_OR_ARRAY_TYPES = [
@@ -89,7 +88,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
             if (shouldBeSpaced === void 0) { shouldBeSpaced = false; }
             var opener;
             var payload;
-            if (from.type in ast_spec_1.AST_TOKEN_TYPES) {
+            if (from.type in utils_1.AST_TOKEN_TYPES) {
                 _a = [from, sourceCode.getTokenAfter(from)], opener = _a[0], payload = _a[1];
             }
             else {
@@ -125,7 +124,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
             if (shouldBeSpaced === void 0) { shouldBeSpaced = false; }
             var payload;
             var closer;
-            if (from.type in ast_spec_1.AST_TOKEN_TYPES) {
+            if (from.type in utils_1.AST_TOKEN_TYPES) {
                 _a = [sourceCode.getTokenBefore(from), from], payload = _a[0], closer = _a[1];
             }
             else if ('typeAnnotation' in from && from.typeAnnotation) {

package/dist/rules/prefer-const.js

@@ -57,8 +57,8 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
             return "".concat(scope.block.range[0], ",").concat(scope.block.range[1], "/").concat(name);
         };
         return {
-            Program: function () {
-                var variables = getReassignedVariables(context.getScope());
+            Program: function (node) {
+                var variables = getReassignedVariables(sourceCode.getScope(node));
                 for (var _i = 0, variables_1 = variables; _i < variables_1.length; _i++) {
                     var v = variables_1[_i];
                     reassignedIdentifierTable[getKey(v)] = true;
@@ -68,7 +68,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
                 if (node.kind !== "let") {
                     return;
                 }
-                var scope = context.getScope();
+                var scope = sourceCode.getScope(node);
                 var kindToken = sourceCode.getFirstToken(node);
                 for (var _i = 0, _a = node.declarations; _i < _a.length; _i++) {
                     var v = _a[_i];

package/dist/rules/semantic-quotes.js

@@ -27,7 +27,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var ast_spec_1 = require("@typescript-eslint/types/dist/generated/ast-spec");
 var utils_1 = require("@typescript-eslint/utils");
 var patterns_1 = require("../utils/patterns");
 var type_1 = require("../utils/type");
@@ -66,7 +65,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
         var valueishNamePattern = new RegExp(valueishNamePatternString);
         var sourceCode = context.getSourceCode();
         var assertStringLiteral = function (node, as, messageId) {
-            if (node.type !== ast_spec_1.AST_NODE_TYPES.Literal) {
+            if (node.type !== utils_1.AST_NODE_TYPES.Literal) {
                 return;
             }
             if (!quotes.includes(node.raw[0])) {
@@ -127,18 +126,18 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
             }, {});
             for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
                 var v = values_1[_i];
-                if (v.type !== ast_spec_1.AST_NODE_TYPES.Property)
+                if (v.type !== utils_1.AST_NODE_TYPES.Property)
                     continue;
-                if (v.key.type !== ast_spec_1.AST_NODE_TYPES.Literal)
+                if (v.key.type !== utils_1.AST_NODE_TYPES.Literal)
                     continue;
                 if (typeof v.key.value !== "string")
                     continue;
                 var keySymbol = typeMap[v.key.value];
                 assertStringLiteral(v.key, 'key', 'from-keyish-usage');
-                if (keySymbol && v.value.type === ast_spec_1.AST_NODE_TYPES.Literal) {
+                if (keySymbol && v.value.type === utils_1.AST_NODE_TYPES.Literal) {
                     checkLiteral(keySymbol, v.value, true);
                 }
-                else if (v.value.type === ast_spec_1.AST_NODE_TYPES.ObjectExpression) {
+                else if (v.value.type === utils_1.AST_NODE_TYPES.ObjectExpression) {
                     checkObjectExpression((0, type_1.getTSTypeByNode)(context, v.value).getNonNullableType().getProperties(), v.value.properties);
                 }
             }
@@ -158,7 +157,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
                     var argument = node.arguments[i];
                     var isRest = (0, type_1.isRestParameter)(context, parameter);
                     switch (argument.type) {
-                        case ast_spec_1.AST_NODE_TYPES.Literal:
+                        case utils_1.AST_NODE_TYPES.Literal:
                             if (!parameterIndex && isCallingEventMethod(node)) {
                                 assertStringLiteral(argument, 'key', 'from-event');
                             }
@@ -166,15 +165,15 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
                                 checkLiteral(parameter, argument, false, isRest);
                             }
                             break;
-                        case ast_spec_1.AST_NODE_TYPES.ConditionalExpression:
+                        case utils_1.AST_NODE_TYPES.ConditionalExpression:
                             for (var _i = 0, _a = [argument.consequent, argument.alternate]; _i < _a.length; _i++) {
                                 var w = _a[_i];
-                                if (w.type !== ast_spec_1.AST_NODE_TYPES.Literal)
+                                if (w.type !== utils_1.AST_NODE_TYPES.Literal)
                                     continue;
                                 checkLiteral(parameter, w);
                             }
                             break;
-                        case ast_spec_1.AST_NODE_TYPES.ObjectExpression:
+                        case utils_1.AST_NODE_TYPES.ObjectExpression:
                             checkObjectExpression((0, type_1.getTSTypeBySymbol)(context, parameter, node).getProperties(), argument.properties);
                             break;
                     }
@@ -189,17 +188,17 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
             ObjectExpression: function (node) {
                 var _a;
                 switch ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.type) {
-                    case ast_spec_1.AST_NODE_TYPES.VariableDeclarator:
+                    case utils_1.AST_NODE_TYPES.VariableDeclarator:
                         checkObjectExpression((0, type_1.getObjectProperties)(context, node.parent.id), node.properties);
                         break;
-                    case ast_spec_1.AST_NODE_TYPES.TSAsExpression:
+                    case utils_1.AST_NODE_TYPES.TSAsExpression:
                         checkObjectExpression((0, type_1.getObjectProperties)(context, node.parent.typeAnnotation), node.properties);
                         break;
                 }
             },
             TSLiteralType: function (node) {
                 var _a;
-                if (((_a = node.parent) === null || _a === void 0 ? void 0 : _a.type) === ast_spec_1.AST_NODE_TYPES.TSIndexedAccessType) {
+                if (((_a = node.parent) === null || _a === void 0 ? void 0 : _a.type) === utils_1.AST_NODE_TYPES.TSIndexedAccessType) {
                     assertStringLiteral(node.literal, 'key', 'from-keyish-name');
                     return;
                 }
@@ -207,11 +206,11 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
                 v: for (var _i = 0, _b = context.getAncestors().reverse(); _i < _b.length; _i++) {
                     var v = _b[_i];
                     switch (v.type) {
-                        case ast_spec_1.AST_NODE_TYPES.TSPropertySignature:
+                        case utils_1.AST_NODE_TYPES.TSPropertySignature:
                             fromGeneric = false;
                             break v;
-                        case ast_spec_1.AST_NODE_TYPES.TSTypeParameter:
-                        case ast_spec_1.AST_NODE_TYPES.TSTypeParameterInstantiation:
+                        case utils_1.AST_NODE_TYPES.TSTypeParameter:
+                        case utils_1.AST_NODE_TYPES.TSTypeParameterInstantiation:
                             fromGeneric = true;
                             break v;
                     }
@@ -230,11 +229,11 @@ exports.default = utils_1.ESLintUtils.RuleCreator.withoutDocs({
     }
 });
 function isCallingEventMethod(node) {
-    if (node.type !== ast_spec_1.AST_NODE_TYPES.CallExpression)
+    if (node.type !== utils_1.AST_NODE_TYPES.CallExpression)
         return false;
-    if (node.callee.type !== ast_spec_1.AST_NODE_TYPES.MemberExpression)
+    if (node.callee.type !== utils_1.AST_NODE_TYPES.MemberExpression)
         return false;
-    if (node.callee.property.type !== ast_spec_1.AST_NODE_TYPES.Identifier)
+    if (node.callee.property.type !== utils_1.AST_NODE_TYPES.Identifier)
         return false;
     return eventMethodNames.includes(node.callee.property.name);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daldalso/eslint-plugin",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "main": "./dist/index.js",
   "repository": {
     "url": "git+https://github.com/JJoriping/eslint-plugin.git"
@@ -10,7 +10,7 @@
   "scripts": {
     "build": "tsc -b",
     "watch": "tsc --watch",
-    "test": "eslint --parser-options={\"project\":\"./test.tsconfig.json\"}"
+    "test": "eslint --parser-options project:./test.tsconfig.json"
   },
   "files": [
     "/LICENSE",
@@ -19,22 +19,25 @@
   ],
   "devDependencies": {
     "@daldalso/eslint-plugin": "link:.",
+    "@types/eslint": "^9.6.0",
     "@types/node": "^18.0.0",
     "@types/react": "^18.0.0",
-    "eslint": "^8.0.0"
+    "eslint": "^9"
   },
   "dependencies": {
-    "@typescript-eslint/types": "^5.40.0",
-    "@typescript-eslint/eslint-plugin": "^5",
-    "@typescript-eslint/parser": "^5",
-    "@typescript-eslint/utils": "^5",
+    "@eslint/compat": "^1.1.1",
+    "@stylistic/eslint-plugin-ts": "^2.6.2",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
+    "@typescript-eslint/parser": "^8.1.0",
+    "@typescript-eslint/types": "^8.1.0",
+    "@typescript-eslint/utils": "^8.1.0",
     "eslint-plugin-import": "^2",
     "eslint-plugin-react": "^7",
-    "eslint-plugin-react-hooks": "^4",
+    "eslint-plugin-react-hooks": "5.1.0-beta-26f2496093-20240514",
     "eslint-plugin-unicorn": "*",
     "typescript": "^5"
   },
   "peerDependencies": {
-    "eslint": "^8"
+    "eslint": "^9"
   }
 }