@croct/eslint-plugin 0.8.0 → 0.8.1

package/configs/typescript.js

@@ -1,99 +1,112 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typescript = void 0;
-exports.typescript = {
-    extends: ['plugin:@croct/javascript'],
-    plugins: [
-        '@typescript-eslint',
-        '@croct',
+exports.createTypescriptConfig = createTypescriptConfig;
+const typescript_eslint_1 = __importDefault(require("typescript-eslint"));
+const parser_1 = __importDefault(require("@typescript-eslint/parser"));
+const eslint_plugin_jest_1 = __importDefault(require("eslint-plugin-jest"));
+// @ts-expect-error - no types available
+const eslint_plugin_1 = __importDefault(require("@stylistic/eslint-plugin"));
+const baseRules = {
+    'import-x/export': 'off',
+    '@typescript-eslint/array-type': ['error', {
+            default: 'array-simple',
+        }],
+    '@typescript-eslint/prefer-as-const': 'error',
+    '@typescript-eslint/adjacent-overload-signatures': 'error',
+    '@stylistic/type-annotation-spacing': 'error',
+    '@stylistic/semi': ['error', 'always'],
+    '@typescript-eslint/strict-boolean-expressions': ['error', {
+            allowString: false,
+            allowNumber: false,
+            allowNullableObject: false,
+        }],
+    '@typescript-eslint/prefer-optional-chain': 'error',
+    'no-shadow': 'off',
+    '@typescript-eslint/no-shadow': ['error', {
+            ignoreTypeValueShadow: true,
+            ignoreFunctionTypeParameterNameValueShadow: true,
+        }],
+    '@typescript-eslint/no-empty-interface': 'off',
+    '@typescript-eslint/explicit-member-accessibility': [
+        'error',
     ],
-    overrides: [
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/explicit-function-return-type': ['error'],
+    '@typescript-eslint/no-explicit-any': 'off',
+    'no-use-before-define': 'off',
+    '@typescript-eslint/no-use-before-define': 'off',
+    'no-unused-expressions': 'off',
+    '@typescript-eslint/no-unused-expressions': 'error',
+    '@stylistic/indent': ['error', 4, {
+            SwitchCase: 1,
+        }],
+    '@typescript-eslint/no-unused-vars': [
+        'error',
         {
-            files: ['**/*.ts', '**/*.tsx'],
-            extends: ['plugin:@typescript-eslint/recommended'],
-            parser: '@typescript-eslint/parser',
-            rules: {
-                'import/export': 'off',
-                '@typescript-eslint/array-type': ['error', {
-                        default: 'array-simple',
-                    }],
-                '@typescript-eslint/prefer-as-const': 'error',
-                '@typescript-eslint/adjacent-overload-signatures': 'error',
-                '@typescript-eslint/type-annotation-spacing': 'error',
-                '@typescript-eslint/semi': ['error', 'always'],
-                '@typescript-eslint/strict-boolean-expressions': ['error', {
-                        allowString: false,
-                        allowNumber: false,
-                        allowNullableObject: false,
-                    }],
-                '@typescript-eslint/prefer-optional-chain': 'error',
-                'no-shadow': 'off',
-                '@typescript-eslint/no-shadow': ['error', {
-                        ignoreTypeValueShadow: true,
-                        ignoreFunctionTypeParameterNameValueShadow: true,
-                    }],
-                '@typescript-eslint/no-empty-interface': 'off',
-                '@typescript-eslint/explicit-member-accessibility': [
-                    'error',
-                ],
-                '@typescript-eslint/explicit-module-boundary-types': 'off',
-                '@typescript-eslint/explicit-function-return-type': ['error'],
-                '@typescript-eslint/no-explicit-any': 'off',
-                'no-use-before-define': 'off',
-                '@typescript-eslint/no-use-before-define': 'off',
-                'no-unused-expressions': 'off',
-                '@typescript-eslint/no-unused-expressions': 'error',
-                indent: ['error', 4, {
-                        SwitchCase: 1,
-                    }],
-                '@typescript-eslint/no-unused-vars': [
-                    'error',
-                    {
-                        args: 'after-used',
-                        ignoreRestSiblings: true,
+            args: 'after-used',
+            ignoreRestSiblings: true,
+        },
+    ],
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
+    '@stylistic/object-curly-spacing': 'error',
+    '@stylistic/member-delimiter-style': ['error', {
+            multiline: {
+                delimiter: 'comma',
+                requireLast: true,
+            },
+            singleline: {
+                delimiter: 'comma',
+                requireLast: false,
+            },
+            overrides: {
+                interface: {
+                    singleline: {
+                        delimiter: 'semi',
+                    },
+                    multiline: {
+                        delimiter: 'semi',
                     },
-                ],
-                'no-unused-vars': 'off',
-                '@typescript-eslint/no-non-null-assertion': 'off',
-                'object-curly-spacing': 'off',
-                '@typescript-eslint/object-curly-spacing': 'error',
-                '@typescript-eslint/member-delimiter-style': ['error', {
-                        multiline: {
-                            delimiter: 'comma',
-                            requireLast: true,
-                        },
-                        singleline: {
-                            delimiter: 'comma',
-                            requireLast: false,
-                        },
-                        overrides: {
-                            interface: {
-                                singleline: {
-                                    delimiter: 'semi',
-                                },
-                                multiline: {
-                                    delimiter: 'semi',
-                                },
-                            },
-                        },
-                    }],
-                'no-undef': 'off',
-                '@typescript-eslint/no-namespace': 'off',
+                },
             },
+        }],
+    'no-undef': 'off',
+    '@typescript-eslint/no-namespace': 'off',
+};
+// Factory function to create TypeScript config with the plugin reference
+function createTypescriptConfig(plugin, javascriptConfig) {
+    return [
+        ...javascriptConfig,
+        ...typescript_eslint_1.default.configs.recommendedTypeChecked,
+        eslint_plugin_jest_1.default.configs['flat/recommended'],
+        {
+            name: '@croct/typescript',
+            files: ['**/*.ts', '**/*.tsx'],
+            plugins: {
+                '@stylistic': eslint_plugin_1.default,
+                '@croct': plugin,
+            },
+            languageOptions: {
+                parser: parser_1.default,
+                parserOptions: {
+                    // Enable type-aware linting
+                    projectService: true,
+                },
+            },
+            rules: baseRules,
         },
         {
+            name: '@croct/typescript/tests',
             files: [
                 'src/**/*.test.ts',
                 'test/**/*.ts',
             ],
-            extends: ['plugin:jest/recommended'],
-            plugins: ['jest'],
             rules: {
                 'no-new-object': 'off',
             },
-            env: {
-                jest: true,
-            },
         },
-    ],
-};
+    ];
+}

package/index.js

@@ -1,8 +1,30 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rules = exports.configs = void 0;
 const rules_1 = require("./rules");
-const configs_1 = require("./configs");
-const configuration = {
+Object.defineProperty(exports, "rules", { enumerable: true, get: function () { return rules_1.rules; } });
+const javascript_1 = require("./configs/javascript");
+const typescript_1 = require("./configs/typescript");
+const react_1 = require("./configs/react");
+const cypress_1 = require("./configs/cypress");
+// Create the plugin with just the rules first
+const plugin = {
+    // Cast from TypeScript Rule Module to ESLint RuleDefinition.
+    // Due to variance, TS can't verify the type directly.
     rules: rules_1.rules,
-    configs: configs_1.configs,
+    configs: {},
 };
-module.exports = configuration;
+// Create configs with the plugin reference
+const javascriptConfig = (0, javascript_1.createJavaScriptConfig)(plugin);
+const typescriptConfig = (0, typescript_1.createTypescriptConfig)(plugin, javascriptConfig);
+const reactConfig = (0, react_1.createReactConfig)(plugin, javascriptConfig);
+const cypressConfig = (0, cypress_1.createCypressConfig)(plugin, javascriptConfig);
+exports.configs = {
+    javascript: javascriptConfig,
+    typescript: typescriptConfig,
+    react: reactConfig,
+    cypress: cypressConfig,
+};
+Object.assign(plugin.configs, exports.configs);
+// Export the plugin as default
+exports.default = plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@croct/eslint-plugin",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "ESLint rules and presets applied to all Croct JavaScript projects.",
   "license": "MIT",
   "author": {
@@ -36,20 +36,21 @@
     "cypress"
   ],
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.53.0",
+    "@eslint-community/eslint-plugin-eslint-comments": "^4.5.0",
+    "@stylistic/eslint-plugin": "^5.7.0",
     "@typescript-eslint/utils": "^8.53.0",
     "eslint-plugin-cypress": "^5.2.1",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-import-newlines": "^1.4.0",
+    "eslint-plugin-import-x": "^4.16.1",
     "eslint-plugin-jest": "^29.12.1",
     "eslint-plugin-jest-dom": "^5.5.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-newline-destructuring": "^1.2.2",
-    "eslint-plugin-no-smart-quotes": "^1.4.2",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-testing-library": "^7.15.4"
+    "eslint-plugin-testing-library": "^7.15.4",
+    "globals": "^17.0.0",
+    "typescript-eslint": "^8.53.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
@@ -63,7 +64,7 @@
     "eslint-plugin-self": "^1.2.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.3.4",
-    "typescript": "~5.8.3"
+    "typescript": "~5.9.0"
   },
   "peerDependencies": {
     "@typescript-eslint/parser": ">= 8",

package/rules/argument-spacing/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.argumentSpacing = void 0;
+const utils_1 = require("@typescript-eslint/utils");
 const createRule_1 = require("../createRule");
 exports.argumentSpacing = (0, createRule_1.createRule)({
     name: 'argument-spacing',
@@ -34,8 +35,8 @@ exports.argumentSpacing = (0, createRule_1.createRule)({
                 return;
             }
             const lastArgumentFirstToken = sourceCode.getFirstToken(lastArgument);
-            if ((lastArgument.type !== 'ArrowFunctionExpression'
-                || lastArgument.body.type === 'BlockStatement')
+            if ((lastArgument.type !== utils_1.TSESTree.AST_NODE_TYPES.ArrowFunctionExpression
+                || lastArgument.body.type === utils_1.TSESTree.AST_NODE_TYPES.BlockStatement)
                 && firstToken.loc.start.line === lastArgumentFirstToken.loc.start.line) {
                 return;
             }

package/rules/complex-expression-spacing/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.complexExpressionSpacing = void 0;
+const utils_1 = require("@typescript-eslint/utils");
 const createRule_1 = require("../createRule");
 exports.complexExpressionSpacing = (0, createRule_1.createRule)({
     name: 'complex-expression-spacing',
@@ -20,10 +21,10 @@ exports.complexExpressionSpacing = (0, createRule_1.createRule)({
         const sourceCode = context.getSourceCode();
         function check(node) {
             const parentPreviousToken = sourceCode.getTokenBefore(node, {
-                filter: token => token.type === 'Punctuator',
+                filter: token => token.type === utils_1.TSESTree.AST_TOKEN_TYPES.Punctuator,
             });
             const parentNextToken = sourceCode.getTokenAfter(node, {
-                filter: token => token.type === 'Punctuator',
+                filter: token => token.type === utils_1.TSESTree.AST_TOKEN_TYPES.Punctuator,
             });
             if (parentPreviousToken.loc.end.line === parentNextToken.loc.start.line) {
                 return;
@@ -53,7 +54,7 @@ exports.complexExpressionSpacing = (0, createRule_1.createRule)({
         return {
             ArrowFunctionExpression: (node) => {
                 const { body } = node;
-                if (body.type === 'ConditionalExpression') {
+                if (body.type === utils_1.TSESTree.AST_NODE_TYPES.ConditionalExpression) {
                     check(body);
                 }
             },

package/rules/jsx-attribute-spacing/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsxAttributeSpacing = void 0;
+const utils_1 = require("@typescript-eslint/utils");
 const createRule_1 = require("../createRule");
 exports.jsxAttributeSpacing = (0, createRule_1.createRule)({
     name: 'jsx-attribute-spacing',
@@ -20,12 +21,13 @@ exports.jsxAttributeSpacing = (0, createRule_1.createRule)({
         const sourceCode = context.getSourceCode();
         function check(node) {
             const { value } = node;
-            if (value?.type !== 'JSXExpressionContainer') {
+            if (value?.type !== utils_1.TSESTree.AST_NODE_TYPES.JSXExpressionContainer) {
                 return;
             }
             const firstToken = sourceCode.getFirstToken(value.expression);
             const lastToken = sourceCode.getLastToken(value.expression);
-            if ((firstToken.type === 'Punctuator' && lastToken.type === 'Punctuator')
+            if ((firstToken.type === utils_1.TSESTree.AST_TOKEN_TYPES.Punctuator
+                && lastToken.type === utils_1.TSESTree.AST_TOKEN_TYPES.Punctuator)
                 || (firstToken.loc.start.line === lastToken.loc.end.line)) {
                 return;
             }

package/rules/newline-per-chained-call/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.newlinePerChainedCall = void 0;
+const utils_1 = require("@typescript-eslint/utils");
 const createRule_1 = require("../createRule");
 const LINEBREAK_MATCHER = /\r\n|[\r\n\u2028\u2029]/u;
 exports.newlinePerChainedCall = (0, createRule_1.createRule)({
@@ -47,30 +48,30 @@ exports.newlinePerChainedCall = (0, createRule_1.createRule)({
             return node.object.loc.end.line === node.property.loc.start.line;
         }
         function isNotClosingParenToken(token) {
-            return token.value !== ')' || token.type !== 'Punctuator';
+            return token.value !== ')' || token.type !== utils_1.TSESTree.AST_TOKEN_TYPES.Punctuator;
         }
         function validateCallExpressionIgnoreDepth(node) {
             let hasCallExpression = false;
-            if (node.type === 'CallExpression') {
+            if (node.type === utils_1.TSESTree.AST_NODE_TYPES.CallExpression) {
                 hasCallExpression = true;
             }
-            if ((node.parent !== undefined)
-                && node.parent.type !== 'CallExpression'
-                && node.parent.type !== 'MemberExpression') {
+            if (node.parent != null
+                && node.parent.type !== utils_1.TSESTree.AST_NODE_TYPES.CallExpression
+                && node.parent.type !== utils_1.TSESTree.AST_NODE_TYPES.MemberExpression) {
                 const memberExpressions = [];
-                let currentNode = (node.type === 'CallExpression'
+                let currentNode = ('callee' in node
                     ? node.callee
                     : node);
-                while (currentNode.type === 'CallExpression'
-                    || currentNode.type === 'MemberExpression') {
-                    if (currentNode.type === 'MemberExpression') {
-                        if (currentNode.property.type === 'Identifier'
+                while (currentNode.type === utils_1.TSESTree.AST_NODE_TYPES.CallExpression
+                    || currentNode.type === utils_1.TSESTree.AST_NODE_TYPES.MemberExpression) {
+                    if (currentNode.type === utils_1.TSESTree.AST_NODE_TYPES.MemberExpression) {
+                        if (currentNode.property.type === utils_1.TSESTree.AST_NODE_TYPES.Identifier
                             && !currentNode.computed) {
                             memberExpressions.push(currentNode);
                         }
                         currentNode = currentNode.object;
                     }
-                    else if (currentNode.type === 'CallExpression') {
+                    else if (currentNode.type === utils_1.TSESTree.AST_NODE_TYPES.CallExpression) {
                         currentNode = currentNode.callee;
                     }
                 }
@@ -80,11 +81,11 @@ exports.newlinePerChainedCall = (0, createRule_1.createRule)({
                     const expressionsOnSameLine = memberExpressions
                         .filter(hasObjectAndPropertyOnSameLine);
                     const rootNode = expressionsOnSameLine[expressionsOnSameLine.length - 1];
-                    if (rootNode.type === 'MemberExpression'
-                        && (rootNode.parent?.type === 'CallExpression'
-                            || rootNode.parent?.type === 'MemberExpression')
-                        && (rootNode.object.type === 'ThisExpression'
-                            || rootNode.object.type === 'Identifier')) {
+                    if (rootNode.type === utils_1.TSESTree.AST_NODE_TYPES.MemberExpression
+                        && (rootNode.parent != null && (rootNode.parent.type === utils_1.TSESTree.AST_NODE_TYPES.CallExpression
+                            || rootNode.parent.type === utils_1.TSESTree.AST_NODE_TYPES.MemberExpression))
+                        && (rootNode.object.type === utils_1.TSESTree.AST_NODE_TYPES.ThisExpression
+                            || rootNode.object.type === utils_1.TSESTree.AST_NODE_TYPES.Identifier)) {
                         expressionsOnSameLine.pop();
                     }
                     expressionsOnSameLine.forEach(memberExpression => {
@@ -106,7 +107,7 @@ exports.newlinePerChainedCall = (0, createRule_1.createRule)({
         }
         return {
             CallExpression: (node) => {
-                if (node.callee?.type === 'MemberExpression') {
+                if (node.callee?.type === utils_1.TSESTree.AST_NODE_TYPES.MemberExpression) {
                     validateCallExpressionIgnoreDepth(node);
                 }
             },