@xaliksss/eslint-config 5.0.0 → 5.0.1

package/dist/index.js

@@ -1,19 +1,25 @@
 import stylisticPlugin from "@stylistic/eslint-plugin";
 import { defineConfig } from "eslint/config";
-import importPlugin from "eslint-plugin-import-x";
+import importPlugin, { createNodeResolver } from "eslint-plugin-import-x";
 import nPlugin from "eslint-plugin-n";
 import globals from "globals";
 import tseslint from "typescript-eslint";
 import { DEFAULT_CONFIG } from "./config.js";
 import { eslintRules } from "./rules/eslint.js";
 import { importRules } from "./rules/import-x.js";
+import { nRules } from "./rules/n.js";
 import { stylisticRules } from "./rules/stylistic.js";
 import { typescriptRules, typescriptTypeAwareRules } from "./rules/typescript.js";
+const extensions = {
+    js: [".js", ".mjs", ".cjs", ".jsx"],
+    ts: [".ts", ".mts", ".cts", ".tsx"],
+};
 export default function createConfig(_options = {}) {
     const options = {
         ...DEFAULT_CONFIG,
         ..._options,
     };
+    const cjsFiles = options.jsFiles.filter((pattern) => pattern.endsWith(".cjs"));
     return defineConfig({
         ignores: options.ignores,
     }, 
@@ -33,24 +39,49 @@ export default function createConfig(_options = {}) {
             "import-x": importPlugin,
             n: nPlugin,
         },
+        settings: {
+            // Без этого import-x не парсит .ts файлы: no-cycle, named и т.д. молча не работают
+            "import-x/extensions": [...extensions.js, ...extensions.ts],
+            "import-x/parsers": {
+                "@typescript-eslint/parser": extensions.ts,
+            },
+            // import "./a.js" -> a.ts
+            "import-x/resolver-next": [
+                createNodeResolver({
+                    extensions: [...extensions.ts, ...extensions.js, ".json", ".node"],
+                    extensionAlias: {
+                        ".js": [".ts", ".tsx", ".js", ".jsx"],
+                        ".mjs": [".mts", ".mjs"],
+                        ".cjs": [".cts", ".cjs"],
+                    },
+                }),
+            ],
+        },
         rules: {
             ...eslintRules,
             ...stylisticRules(options),
             ...importRules,
+            ...nRules,
         },
     }, 
+    // CommonJS
+    ...cjsFiles.length ? [{
+            files: cjsFiles,
+            languageOptions: {
+                sourceType: "commonjs",
+            },
+            rules: {
+                "import-x/no-commonjs": "off",
+                "import-x/unambiguous": "off",
+            },
+        }] : [], 
     // overrides для TS
     {
         files: options.tsFiles,
         languageOptions: {
             parser: tseslint.parser,
             parserOptions: {
-                projectService: {
-                    allowDefaultProject: [
-                        "eslint.config.ts",
-                        "sandbox.ts",
-                    ],
-                },
+                projectService: true,
             },
         },
         plugins: {

package/dist/rules/eslint.js

@@ -19,7 +19,7 @@ export const eslintRules = {
     "no-dupe-else-if": "error",
     "no-dupe-keys": "error", // [TS]
     "no-duplicate-case": "error",
-    "no-duplicate-imports": ["error", { allowSeparateTypeImports: true }],
+    "no-duplicate-imports": "off", // есть import-x/no-duplicates
     "no-empty-character-class": "error",
     "no-empty-pattern": "error",
     "no-ex-assign": "error",
@@ -35,6 +35,7 @@ export const eslintRules = {
     "no-obj-calls": "error", // [TS]
     "no-promise-executor-return": "error",
     "no-prototype-builtins": "error",
+    "no-restricted-syntax": "off",
     "no-self-assign": "error",
     "no-self-compare": "error",
     "no-setter-return": "error", // [TS]
@@ -51,7 +52,11 @@ export const eslintRules = {
     "no-unsafe-negation": "error", // [TS]
     "no-unsafe-optional-chaining": "error",
     "no-unused-private-class-members": "error",
-    "no-unused-vars": "error",
+    "no-unused-vars": ["error", {
+            ignoreRestSiblings: true,
+            ignoreClassWithStaticInitBlock: true,
+            argsIgnorePattern: "^_",
+        }],
     "no-use-before-define": ["error", {
             functions: false,
             classes: false,
@@ -108,15 +113,15 @@ export const eslintRules = {
     "require-yield": "error",
     "sort-imports": "off", // установлен другой плагин import
     "sort-keys": "off",
-    "sort-vars": "error",
+    "sort-vars": "off", // не нужен при one-var: never
     strict: "off",
     "symbol-description": "error",
-    "vars-on-top": "error",
+    "vars-on-top": "off", // не нужен при no-var
     yoda: "error",
     "unicode-bom": "error",
     "accessor-pairs": "error", // Спорно, возможно удалится
     "arrow-body-style": "off",
-    "block-scoped-var": "error",
+    "block-scoped-var": "off", // не нужен при no-var
     camelcase: "off", // есть naming-convention с более детальной настройкой
     "capitalized-comments": "off",
     "class-methods-use-this": "off",

package/dist/rules/import-x.js

@@ -1,6 +1,6 @@
 export const importRules = {
     "import-x/consistent-type-specifier-style": ["error", "prefer-top-level"],
-    "import-x/default": "error",
+    "import-x/default": "error", // [TS]
     "import-x/dynamic-import-chunkname": "off",
     "import-x/export": "error",
     "import-x/exports-last": "off",
@@ -8,8 +8,8 @@ export const importRules = {
     "import-x/first": "error",
     "import-x/group-exports": "off",
     "import-x/max-dependencies": "off",
-    "import-x/named": "error",
-    "import-x/namespace": "error",
+    "import-x/named": "error", // [TS]
+    "import-x/namespace": "error", // [TS]
     "import-x/newline-after-import": ["error", { count: 1 }],
     "import-x/no-absolute-path": "error",
     "import-x/no-amd": "error",
@@ -22,7 +22,7 @@ export const importRules = {
         }],
     "import-x/no-default-export": "off",
     "import-x/no-deprecated": "off", // С этим лучше справляется @typescript-eslint/no-deprecated
-    "import-x/no-duplicates": "off", // уже используем extensions
+    "import-x/no-duplicates": "error", // type и value импорты считаются отдельно (prefer-inline: false)
     "import-x/no-dynamic-require": "error",
     "import-x/no-empty-named-blocks": "error",
     "import-x/no-extraneous-dependencies": "error",

package/dist/rules/stylistic.js

@@ -15,7 +15,7 @@ export const stylisticRules = (options) => {
         "@stylistic/generator-star-spacing": "error",
         "@stylistic/implicit-arrow-linebreak": "error",
         "@stylistic/indent": ["error", "tab"],
-        "@stylistic/indent-binary-ops": ["error", 1],
+        "@stylistic/indent-binary-ops": ["error", "tab"],
         // JSX пока игнорирую. потом сделаю
         "@stylistic/jsx-child-element-spacing": "off",
         "@stylistic/jsx-closing-bracket-location": "off",
@@ -31,7 +31,7 @@ export const stylisticRules = (options) => {
         "@stylistic/jsx-newline": "off",
         "@stylistic/jsx-one-expression-per-line": "off",
         "@stylistic/jsx-pascal-case": "off",
-        "@stylistic/jsx-props-style": "off",
+        "@stylistic/exp-jsx-props-style": "off", // experimental
         "@stylistic/jsx-quotes": "off",
         "@stylistic/jsx-self-closing-comp": "off",
         "@stylistic/jsx-shorthand-boolean": "off",
@@ -77,9 +77,9 @@ export const stylisticRules = (options) => {
                     ImportAttributes: { singleLine: { spacing: "always" } }, //       import ... with { a, b, c }
                     ObjectExpression: { singleLine: { spacing: "always" } }, //       a = { a, b, c }
                     ObjectPattern: { singleLine: { spacing: "always" } }, //          { a, b, c } = d
-                    // [TODO]: beta 7. multiline -> multiLine
+                    // [TODO]: ждем beta 7. multiline -> multiLine
                     TSInterfaceBody: { singleLine: { spacing: "always", maxItems: 1 } }, // interface A { a } | interface A { a,\n b }
-                    // [TODO]: beta 7. multiline -> multiLine
+                    // [TODO]: ждем beta 7. multiline -> multiLine
                     TSEnumBody: { singleLine: { maxItems: 0 } }, //                   enum {\n a,\n b }
                     TSTypeLiteral: { singleLine: { spacing: "always" } }, //          a: { b: B, c: D }
                     JSONObjectExpression: { singleLine: { spacing: "always" } }, //   "a": { "b": "c" }
@@ -142,6 +142,7 @@ export const stylisticRules = (options) => {
                     "?": "before",
                     ":": "before",
                     "|": "before",
+                    "&": "before",
                 },
             }],
         "@stylistic/padded-blocks": ["error", "never"],

package/dist/rules/typescript.js

@@ -18,6 +18,9 @@ export const typescriptRules = {
     "no-unsafe-negation": "off",
     "no-invalid-this": "off",
     "no-redeclare": "off",
+    "import-x/default": "off",
+    "import-x/named": "off",
+    "import-x/namespace": "off",
     "@typescript-eslint/adjacent-overload-signatures": "error",
     "@typescript-eslint/array-type": ["error", { default: "array-simple" }],
     "@typescript-eslint/ban-ts-comment": ["error", { "ts-expect-error": "allow-with-description" }],
@@ -137,11 +140,14 @@ export const typescriptTypeAwareRules = {
     "@typescript-eslint/no-array-delete": "error",
     "@typescript-eslint/no-base-to-string": "error",
     "@typescript-eslint/no-confusing-void-expression": "off",
+    "@typescript-eslint/no-duplicate-type-constituents": "error",
     "@typescript-eslint/no-floating-promises": ["error", {
             ignoreIIFE: true,
         }],
     "@typescript-eslint/no-for-in-array": "error",
-    "@typescript-eslint/no-implied-eval": "off", // есть no-implied-eval
+    "no-implied-eval": "off", // core ловит только строковые литералы
+    "no-new-func": "off",
+    "@typescript-eslint/no-implied-eval": "error", // + любые string по типу и new Function
     "@typescript-eslint/no-meaningless-void-operator": "error",
     "@typescript-eslint/no-misused-promises": ["error", {
             checksVoidReturn: {
@@ -152,7 +158,9 @@ export const typescriptTypeAwareRules = {
     "@typescript-eslint/no-mixed-enums": "error",
     "@typescript-eslint/no-redundant-type-constituents": "error",
     "@typescript-eslint/no-unnecessary-boolean-literal-compare": "error",
-    "@typescript-eslint/no-unnecessary-condition": "error",
+    "@typescript-eslint/no-unnecessary-condition": ["error", {
+            allowConstantLoopConditions: "only-allowed-literals", // while (true)
+        }],
     "@typescript-eslint/no-unnecessary-qualifier": "error",
     "@typescript-eslint/no-unnecessary-template-expression": "error",
     "@typescript-eslint/no-unnecessary-type-arguments": "error",
@@ -177,7 +185,9 @@ export const typescriptTypeAwareRules = {
     "@typescript-eslint/prefer-destructuring": ["error", { array: true, object: false }],
     "@typescript-eslint/prefer-find": "error",
     "@typescript-eslint/prefer-includes": "error",
-    "@typescript-eslint/prefer-nullish-coalescing": "error",
+    "@typescript-eslint/prefer-nullish-coalescing": ["error", {
+            ignoreIfStatements: true, // if (!a) a = b; -> a ||= b делает logical-assignment-operators, дальше это правило предложит ??=
+        }],
     "@typescript-eslint/prefer-optional-chain": "error",
     "prefer-promise-reject-errors": "off",
     "@typescript-eslint/prefer-promise-reject-errors": ["error", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaliksss/eslint-config",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "main": "dist/index.js",
   "type": "module",
   "author": {
@@ -28,9 +28,10 @@
     "eslint-plugin-import-x": "^4.17.1",
     "eslint-plugin-n": "^18.3.0",
     "globals": "17.12.0",
-    "typescript-eslint": "8.70.0"
+    "typescript-eslint": "8.70.1"
   },
   "devDependencies": {
+    "@types/node": "24",
     "jiti": "^2.7.0",
     "typescript": "^6.0.3"
   }