eslint-config-entva-typescript-base 2.7.0 → 2.9.0

package/index.js

@@ -5,12 +5,23 @@ import typescriptEslint from '@typescript-eslint/eslint-plugin';
 import tsParser from '@typescript-eslint/parser';
 import stylisticTs from '@stylistic/eslint-plugin-ts';
 
+const baseRules = baseConfig.reduce((acc, config) => ({ ...acc, ...config.rules }), {});
+
+// Many TS rules mirror JS rules, we need to disable JS rule and apply config for the TS replacement
+const getOverrides = (rules, overridePrefix) => rules.reduce((acc, rule) => {
+  acc[rule] = ['off'];
+  acc[`${overridePrefix}/${rule}`] = baseRules[rule];
+  return acc;
+}, {});
+
 export default [
   ...baseConfig,
   {
     files: [
       '**/*.test.ts',
+      '**/*.test.tsx',
       '**/*.spec.ts',
+      '**/*.spec.tsx',
     ],
     languageOptions: {
       globals: {
@@ -19,7 +30,7 @@ export default [
     },
   },
   {
-    files: ['**/*.ts'],
+    files: ['**/*.{ts,tsx}'],
     plugins: {
       import: importPlugin,
       '@typescript-eslint': typescriptEslint,
@@ -43,38 +54,88 @@ export default [
         ecmaFeatures: {
           generators: false,
           objectLiteralDuplicateProperties: false,
+          jsx: true,
         },
       },
     },
 
     settings: {
       'import/parsers': {
-        '@typescript-eslint/parser': ['.ts', '.d.ts'],
+        '@typescript-eslint/parser': ['.ts', '.tsx', '.d.ts'],
       },
 
       'import/resolver': {
         node: {
-          extensions: ['.mjs', '.js', '.json', '.ts', '.d.ts'],
+          extensions: ['.js', '.mjs', '.cjs', '.jsx', '.ts', '.tsx', '.d.ts', '.json'],
         },
       },
 
-      'import/extensions': ['.mjs', '.js', '.json', '.ts', '.d.ts'],
+      'import/extensions': ['.js', '.mjs', '.cjs', '.jsx', '.ts', '.tsx', '.d.ts', '.json'],
       'import/external-module-folders': ['node_modules', 'node_modules/@types'],
       'import/core-modules': [],
       'import/ignore': ['node_modules', '\\.(coffee|scss|css|less|hbs|svg|json)$'],
     },
 
     rules: {
-      '@stylistic/ts/member-delimiter-style': ['error', {
-        multiline: {
-          delimiter: 'comma',
-        },
+      ...baseRules,
+      ...getOverrides(
+        [
+          'no-array-constructor',
+          'no-useless-constructor',
+          'no-empty-function',
+          'no-dupe-class-members',
+          'default-param-last',
+          'dot-notation',
+          'naming-convention',
+          'no-unused-vars',
+          'no-shadow',
+        ],
+        '@typescript-eslint',
+      ),
+      ...getOverrides(
+        [
+          'space-before-function-paren',
+          'lines-between-class-members',
+          'space-before-blocks',
+          'brace-style',
+          'indent',
+          'keyword-spacing',
+          'space-infix-ops',
+          'comma-spacing',
+          'comma-dangle',
+          'object-curly-spacing',
+          'quotes',
+        ],
+        '@stylistic/ts',
+      ),
 
-        singleline: {
-          delimiter: 'comma',
-        },
+      '@typescript-eslint/no-implied-eval': ['error'],
+      '@typescript-eslint/no-loss-of-precision': ['error'],
+      '@typescript-eslint/no-loop-func': ['error'],
+      '@typescript-eslint/no-magic-numbers': ['off', {
+        ignore: [],
+        ignoreArrayIndexes: true,
+        enforceConst: true,
+        detectObjects: false,
       }],
 
+      '@typescript-eslint/no-redeclare': ['error'],
+      '@typescript-eslint/no-unused-expressions': ['error', {
+        allowShortCircuit: false,
+        allowTernary: false,
+        allowTaggedTemplates: false,
+        enforceForJSX: false,
+      }],
+
+      '@typescript-eslint/no-use-before-define': ['error', {
+        functions: true,
+        classes: true,
+        variables: true,
+      }],
+
+      '@typescript-eslint/require-await': ['off'],
+      '@typescript-eslint/return-await': ['error', 'in-try-catch'],
+
       '@typescript-eslint/no-explicit-any': ['error', {
         ignoreRestArgs: true,
       }],
@@ -93,117 +154,6 @@ export default [
         leadingUnderscore: 'allowSingleOrDouble',
       }],
 
-      '@stylistic/ts/brace-style': ['error', '1tbs', {
-        allowSingleLine: true,
-      }],
-
-      '@stylistic/ts/comma-dangle': ['error', {
-        arrays: 'always-multiline',
-        objects: 'always-multiline',
-        imports: 'always-multiline',
-        exports: 'always-multiline',
-        functions: 'always-multiline',
-        enums: 'always-multiline',
-        generics: 'always-multiline',
-        tuples: 'always-multiline',
-      }],
-
-      '@stylistic/ts/comma-spacing': ['error', {
-        before: false,
-        after: true,
-      }],
-
-      'default-param-last': ['off'],
-      '@typescript-eslint/default-param-last': ['error'],
-
-      '@typescript-eslint/dot-notation': ['error', {
-        allowKeywords: true,
-        allowPattern: '',
-        allowPrivateClassPropertyAccess: false,
-        allowProtectedClassPropertyAccess: false,
-        allowIndexSignaturePropertyAccess: false,
-      }],
-
-      '@stylistic/ts/func-call-spacing': ['error', 'never'],
-
-      '@stylistic/ts/indent': ['error', 2, {
-        SwitchCase: 1,
-        VariableDeclarator: 1,
-        outerIIFEBody: 1,
-
-        FunctionDeclaration: {
-          parameters: 1,
-          body: 1,
-        },
-
-        FunctionExpression: {
-          parameters: 1,
-          body: 1,
-        },
-
-        CallExpression: {
-          arguments: 1,
-        },
-
-        ArrayExpression: 1,
-        ObjectExpression: 1,
-        ImportDeclaration: 1,
-        flatTernaryExpressions: false,
-
-        ignoredNodes: [
-          'JSXElement',
-          'JSXElement > *',
-          'JSXAttribute',
-          'JSXIdentifier',
-          'JSXNamespacedName',
-          'JSXMemberExpression',
-          'JSXSpreadAttribute',
-          'JSXExpressionContainer',
-          'JSXOpeningElement',
-          'JSXClosingElement',
-          'JSXFragment',
-          'JSXOpeningFragment',
-          'JSXClosingFragment',
-          'JSXText',
-          'JSXEmptyExpression',
-          'JSXSpreadChild',
-        ],
-
-        ignoreComments: false,
-        offsetTernaryExpressions: false,
-      }],
-
-      '@stylistic/ts/keyword-spacing': ['error', {
-        before: true,
-        after: true,
-
-        overrides: {
-          return: {
-            after: true,
-          },
-
-          throw: {
-            after: true,
-          },
-
-          case: {
-            after: true,
-          },
-        },
-      }],
-
-      '@stylistic/ts/lines-between-class-members': ['error', 'always', {
-        exceptAfterSingleLine: false,
-        exceptAfterOverload: true,
-      }],
-
-      '@typescript-eslint/no-array-constructor': ['error'],
-      '@typescript-eslint/no-dupe-class-members': ['error'],
-
-      '@typescript-eslint/no-empty-function': ['error', {
-        allow: ['arrowFunctions', 'functions', 'methods'],
-      }],
-
       '@typescript-eslint/no-extra-parens': ['off', 'all', {
         conditionalAssign: true,
         nestedBinaryExpressions: false,
@@ -212,61 +162,32 @@ export default [
         enforceForArrowConditionals: false,
       }],
 
-      '@stylistic/ts/no-extra-semi': ['error'],
-      '@typescript-eslint/no-implied-eval': ['error'],
-      '@typescript-eslint/no-loss-of-precision': ['error'],
-      '@typescript-eslint/no-loop-func': ['error'],
-
-      '@typescript-eslint/no-magic-numbers': ['off', {
-        ignore: [],
-        ignoreArrayIndexes: true,
-        enforceConst: true,
-        detectObjects: false,
-      }],
-
-      '@typescript-eslint/no-redeclare': ['error'],
-      '@stylistic/ts/space-before-blocks': ['error'],
-
-      'no-shadow': ['off'],
-      '@typescript-eslint/no-shadow': ['error'],
-
-      '@typescript-eslint/no-unused-expressions': ['error', {
-        allowShortCircuit: false,
-        allowTernary: false,
-        allowTaggedTemplates: false,
-        enforceForJSX: false,
-      }],
-
-      'no-unused-vars': ['off'],
-      '@typescript-eslint/no-unused-vars': ['error', {
-        vars: 'all',
-        args: 'after-used',
-        ignoreRestSiblings: true,
-        caughtErrors: 'none',
-      }],
-
-      '@typescript-eslint/no-use-before-define': ['error', {
-        functions: true,
-        classes: true,
-        variables: true,
+      '@stylistic/ts/type-annotation-spacing': ['error', {
+        before: false,
+        after: true,
       }],
 
-      '@typescript-eslint/no-useless-constructor': ['error'],
+      '@stylistic/ts/member-delimiter-style': ['error', {
+        multiline: {
+          delimiter: 'comma',
+        },
 
-      '@stylistic/ts/quotes': ['error', 'single', {
-        avoidEscape: true,
+        singleline: {
+          delimiter: 'comma',
+        },
       }],
-
-      '@stylistic/ts/space-before-function-paren': ['error', {
-        anonymous: 'always',
-        named: 'never',
-        asyncArrow: 'always',
+      '@stylistic/ts/func-call-spacing': ['error', 'never'],
+      '@stylistic/ts/no-extra-semi': ['error'],
+      '@stylistic/ts/comma-dangle': ['error', {
+        arrays: 'always-multiline',
+        objects: 'always-multiline',
+        imports: 'always-multiline',
+        exports: 'always-multiline',
+        functions: 'always-multiline',
+        enums: 'always-multiline',
+        generics: 'always-multiline',
+        tuples: 'always-multiline',
       }],
-
-      '@typescript-eslint/require-await': ['off'],
-      '@typescript-eslint/return-await': ['error', 'in-try-catch'],
-      '@stylistic/ts/space-infix-ops': ['error'],
-      '@stylistic/ts/object-curly-spacing': ['error', 'always'],
     },
   },
 ];

package/package.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/entva/styleguide"
   },
   "bugs": "https://github.com/entva/styleguide/issues",
-  "version": "2.7.0",
+  "version": "2.9.0",
   "keywords": [
     "linter",
     "config",
@@ -31,7 +31,7 @@
     "@stylistic/eslint-plugin-ts": "^2.12.1",
     "@typescript-eslint/eslint-plugin": "^8.18.0",
     "@typescript-eslint/parser": "^8.18.0",
-    "eslint-config-entva-base": "^2.7.0",
+    "eslint-config-entva-base": "^2.8.0",
     "eslint-plugin-import": "^2.31.0",
     "globals": "^15.13.0"
   },