@dr.pogodin/eslint-configs 0.2.5 → 0.2.6

package/config/javascript.js

@@ -11,7 +11,10 @@ import babelPlugin from '@babel/eslint-plugin';
 import js from '@eslint/js';
 import stylisticPlugin from '@stylistic/eslint-plugin';
 
-export function newJsConfig({ noPerf } = {}) {
+export function newJsConfig({
+  noPerf,
+  perfectionistTsConfig,
+} = {}) {
   const extentions = [
     'js/recommended',
     '@stylistic/recommended',
@@ -296,7 +299,7 @@ export function newJsConfig({ noPerf } = {}) {
       partitionByNewLine: true,
     };
 
-    rules['perfectionist/sort-imports'] = ['error', {
+    const sortImporsOptions = {
       alphabet,
       groups: [
         'builtin',
@@ -312,7 +315,13 @@ export function newJsConfig({ noPerf } = {}) {
       newlinesInside: 'ignore',
       partitionByNewLine: false,
       type: 'custom',
-    }];
+    };
+
+    if (perfectionistTsConfig) {
+      sortImporsOptions.tsconfig = perfectionistTsConfig;
+    }
+
+    rules['perfectionist/sort-imports'] = ['error', sortImporsOptions];
   }
 
   return defineConfig([{

package/config/typescript.js

@@ -1,19 +1,17 @@
 import { defineConfig } from 'eslint/config';
 import tsEsLint from 'typescript-eslint';
 
-import { javascriptNoPerf, newJsConfig } from './javascript.js';
+import { newJsConfig } from './javascript.js';
 
 function newConfig({ noPerf } = {}) {
-  const jsConfig = newJsConfig();
-
-  // TODO: It is not the best way to modify this rule's settings,
-  // it will be better to expose this as an option of newJsConfig()
-  // function.
-  jsConfig[0].rules['perfectionist/sort-imports'][1].tsconfig = {
-    rootDir: '.',
-  };
+  const jsConfig = newJsConfig({
+    noPerf,
+    perfectionistTsConfig: {
+      rootDir: '.',
+    },
+  });
 
-  let extentions = [
+  const extentions = [
     jsConfig,
     tsEsLint.configs.recommendedTypeChecked,
     tsEsLint.configs.stylisticTypeChecked,
@@ -100,11 +98,7 @@ function newConfig({ noPerf } = {}) {
     '@typescript-eslint/use-unknown-in-catch-callback-variable': 'error',
   };
 
-  if (noPerf) {
-    extentions = [javascriptNoPerf, ...extentions];
-  } else {
-    extentions = [jsConfig, ...extentions];
-
+  if (!noPerf) {
     rules['adjacent-overload-signatures'] = 'off';
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dr.pogodin/eslint-configs",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "ESLint configurations for TypeScript and/or React projects",
   "type": "module",
   "main": "./config/index.js",