@w5s/eslint-config 3.3.0 → 3.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/eslint-config",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "description": "ESLint configuration presets",
   "keywords": [
     "eslint",
@@ -62,8 +62,8 @@
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "@vitest/eslint-plugin": "^1.0.0",
-    "@w5s/dev": "^3.1.2",
-    "@w5s/prettier-config": "^3.0.4",
+    "@w5s/dev": "^3.1.4",
+    "@w5s/prettier-config": "^3.0.5",
     "eslint-plugin-import": "^2.25.0",
     "eslint-plugin-jsdoc": "^62.0.0",
     "eslint-plugin-jsonc": "^2.4.0",
@@ -80,10 +80,10 @@
     "@types/eslint": "9.6.1",
     "@types/parse-gitignore": "1.0.2",
     "@types/react": "19.2.14",
-    "@typescript-eslint/parser": "8.55.0",
+    "@typescript-eslint/parser": "8.56.0",
     "eslint": "9.39.2",
     "eslint-find-rules": "5.0.0",
-    "eslint-typegen": "2.3.0",
+    "eslint-typegen": "2.3.1",
     "react": "19.2.4",
     "vite": "7.3.1",
     "vitest": "4.0.18"
@@ -108,5 +108,5 @@
     "access": "public"
   },
   "sideEffect": false,
-  "gitHead": "1339ba15448ca7c3aea9f0afa0ece486f4693961"
+  "gitHead": "6d0fd278d32187d231f63936bc50b87baebcf34c"
 }

package/src/config/es.ts

@@ -3,14 +3,11 @@ import eslintConfig from '@eslint/js';
 import { Project } from '@w5s/dev';
 import { type PluginOptionsBase, type Config } from '../type.js';
 import type { RuleOptions } from '../typegen/jsonc.js';
-import { createRules } from './createRules.js';
 import { esRules } from '../rules/esRules.js';
 
 const defaultFiles = [`**/${Project.extensionsToGlob(Project.queryExtensions(['javascript', 'javascriptreact']))}`];
 
-export async function es(
-  options: es.Options,
-) {
+export async function es(options: es.Options) {
   const { rules = {} } = options;
 
   return [
@@ -47,7 +44,6 @@ export async function es(
       files: defaultFiles,
       rules: {
         ...eslintConfig.configs.recommended.rules,
-        ...createRules(''),
         ...esRules(),
         ...rules,
       },

package/src/config/imports.ts

@@ -1,22 +1,28 @@
+import { interopDefault } from '@w5s/dev';
 import { PluginOptionsBase, StylisticConfig, type Config } from '../type.js';
-import type { RuleOptions } from '../typegen/import.js';
-// @ts-ignore
-import importPlugin from 'eslint-plugin-import';
-
-const importConfig = importPlugin.flatConfigs['recommended'];
+import { type RuleOptions } from '../typegen/import.js';
 
 export async function imports(options: imports.Options = {}) {
   const { rules = {}, stylistic = true } = options;
   const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
+  const [importPlugin] = await Promise.all([interopDefault(import('eslint-plugin-import'))] as const);
   return [
     {
       name: 'w5s/import/rules',
-      plugins: importConfig.plugins ?? {},
+      plugins: {
+        import: importPlugin,
+      },
       rules: {
-        ...(importConfig?.rules),
+        // 'import/consistent-type-specifier-style': ['error', 'prefer-inline'],
+        'import/first': 'error',
+        'import/no-duplicates': 'error',
+        'import/no-mutable-exports': 'error',
+        'import/no-named-default': 'error',
+
         ...(stylisticEnabled
           ? {
               // Stylistic rules
+              'import/newline-after-import': ['error', { count: 1 }],
             }
           : {}),
         ...rules,

package/src/config/jsdoc.ts

@@ -3,9 +3,7 @@ import { StylisticConfig, type PluginOptionsBase, type Config } from '../type.js
 import type { RuleOptions } from '../typegen/jsdoc.js';
 
 export async function jsdoc(options: jsdoc.Options = {}): Promise<readonly Config[]> {
-  const [jsdocPlugin] = await Promise.all([
-    interopDefault(import('eslint-plugin-jsdoc')),
-  ] as const);
+  const [jsdocPlugin] = await Promise.all([interopDefault(import('eslint-plugin-jsdoc'))] as const);
   const { rules = {}, stylistic = true } = options;
   const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
 
@@ -19,20 +17,21 @@ export async function jsdoc(options: jsdoc.Options = {}): Promise<readonly Confi
     {
       name: 'w5s/jsdoc/rules',
       rules: {
-        ...(jsdocPlugin.configs['flat/recommended'].rules),
+        ...jsdocPlugin.configs['flat/recommended-typescript-flavor'].rules,
         'jsdoc/no-undefined-types': 'off', // https://github.com/gajus/eslint-plugin-jsdoc/issues/839
         'jsdoc/require-hyphen-before-param-description': ['warn', 'always'],
         'jsdoc/require-jsdoc': 'off',
         'jsdoc/require-param-description': 'off',
+        'jsdoc/require-param-type': 'off',
         'jsdoc/require-returns': 'off',
-        'jsdoc/tag-lines': ['warn', 'any', { startLines: 1 }],
         'jsdoc/valid-types': 'off', // FIXME: reports lots of false positive
         // 'strict': ['error', 'safe'],
         ...(stylisticEnabled
           ? {
-              // ...(jsdocPlugin.configs['flat/stylistic'].rules),
+              ...jsdocPlugin.configs['flat/stylistic-typescript'].rules,
               'jsdoc/check-alignment': 'warn',
               'jsdoc/multiline-blocks': 'warn',
+              'jsdoc/tag-lines': ['warn', 'any', { startLines: 1 }],
             }
           : {}),
         ...rules,

package/src/config/ts.ts

@@ -2,7 +2,7 @@
 import { ESLintConfig, interopDefault, Project } from '@w5s/dev';
 import { StylisticConfig, type PluginOptionsBase, type Config } from '../type.js';
 import type { RuleOptions } from '../typegen/ts.js';
-import { createRules } from './createRules.js';
+import { tsRules } from '../rules/tsRules.js';
 
 const defaultFiles = [`**/${Project.extensionsToGlob(Project.queryExtensions(['typescript', 'typescriptreact']))}`];
 
@@ -45,48 +45,26 @@ export async function ts(options: ts.Options = {}) {
       },
       name: 'w5s/ts/rules',
       rules: {
-        ...ESLintConfig.renameRules(
-          tsRecommendedRules,
-          { '@typescript-eslint': 'ts' },
-        ),
-        ...ESLintConfig.renameRules(
-          tsStrictRules,
-          { '@typescript-eslint': 'ts' },
-        ),
-        'ts/ban-ts-comment': [
-          'warn',
-          {
-            'minimumDescriptionLength': 3,
-            'ts-check': false,
-            'ts-expect-error': 'allow-with-description',
-            'ts-ignore': 'allow-with-description',
-            'ts-nocheck': true,
-          },
-        ],
-        'ts/no-empty-object-type': 'off',
-        'ts/no-explicit-any': 'off', // if any is explicit then it's wanted
-        'ts/no-namespace': 'off', // We don't agree with community, namespaces are great and not deprecated
-        ...createRules('ts/'),
-        ...(stylisticEnabled
-          ? {}
-          : {}),
+        ...ESLintConfig.renameRules(tsRecommendedRules, { '@typescript-eslint': 'ts' }),
+        ...ESLintConfig.renameRules(tsStrictRules, { '@typescript-eslint': 'ts' }),
+        ...tsRules(),
+        ...(stylisticEnabled ? {} : {}),
         ...rules,
       },
     },
     ...(typeChecked
-      ? [{
-          files: defaultFiles,
-          // ignores: ignoresTypeAware,
-          name: 'w5s/ts/rules-type-checked',
-          rules: {
-            ...ESLintConfig.renameRules(
-              tsTypeCheckedRules,
-              { '@typescript-eslint': 'ts' },
-            ),
+      ? ([
+          {
+            files: defaultFiles,
+            // ignores: ignoresTypeAware,
+            name: 'w5s/ts/rules-type-checked',
+            rules: {
+              ...ESLintConfig.renameRules(tsTypeCheckedRules, { '@typescript-eslint': 'ts' }),
+            },
           },
-        }] as const
+        ] as const)
       : []),
-  ] as ([Config, Config] | [Config, Config, Config]) satisfies Array<Config>;
+  ] as [Config, Config] | [Config, Config, Config] satisfies Array<Config>;
 }
 export namespace ts {
   export type Rules = RuleOptions;

package/src/defineConfig.ts

@@ -14,9 +14,15 @@ export interface DefineConfigOptions extends ignores.Options {
 }
 
 export async function defineConfig(options: DefineConfigOptions = {}) {
-  const stylisticOptions = typeof options.stylistic === 'boolean' ? { enabled: options.stylistic } : { enabled: true, ...options.stylistic };
-  const withDefaultStylistic = <T>(options: T) => ({ stylistic: stylisticOptions, ...options });
-  const toOption = <T extends {}>(optionsOrBoolean: T | boolean | undefined) => withDefaultStylistic((typeof optionsOrBoolean === 'boolean' ? { enabled: optionsOrBoolean } : ({ enabled: true, ...optionsOrBoolean })) as T & { enabled: boolean });
+  const stylisticOptions =
+    typeof options.stylistic === 'boolean' ? { enabled: options.stylistic } : { enabled: true, ...options.stylistic };
+  const withDefaultStylistic = <T>(_options: T) => ({ stylistic: stylisticOptions, ..._options });
+  const toOption = <T extends {}>(optionsOrBoolean: T | boolean | undefined) =>
+    withDefaultStylistic(
+      (typeof optionsOrBoolean === 'boolean'
+        ? { enabled: optionsOrBoolean }
+        : { enabled: true, ...optionsOrBoolean }) as T & { enabled: boolean },
+    );
   const esOptions = toOption(options.es);
   const importOptions = toOption(options.import);
   const jsdocOptions = toOption(options.jsdoc);

package/src/rules/tsRules.ts

@@ -0,0 +1,132 @@
+import { ESLintConfig } from '@w5s/dev';
+import { esRules } from './esRules.js';
+
+export const tsRules = () => {
+  const baseRules = esRules();
+
+  return ESLintConfig.renameRules(
+    {
+      // '@typescript-eslint/comma-dangle': [
+      //   baseRules['comma-dangle'][0],
+      //   {
+      //     ...baseRules['comma-dangle'][1],
+      //     enums: baseRules['comma-dangle'][1].arrays,
+      //     generics: baseRules['comma-dangle'][1].arrays,
+      //     tuples: baseRules['comma-dangle'][1].arrays,
+      //   },
+      // ],
+      '@typescript-eslint/adjacent-overload-signatures': 'error',
+      '@typescript-eslint/ban-ts-comment': [
+        'warn',
+        {
+          'minimumDescriptionLength': 3,
+          'ts-check': false,
+          'ts-expect-error': 'allow-with-description',
+          'ts-ignore': 'allow-with-description',
+          'ts-nocheck': true,
+        },
+      ],
+      // '@typescript-eslint/brace-style': baseRules['brace-style'],
+      // '@typescript-eslint/comma-dangle': [
+      //   baseRules['comma-dangle'][0],
+      //   {
+      //     ...baseRules['comma-dangle'][1],
+      //     enums: baseRules['comma-dangle'][1].arrays,
+      //     generics: baseRules['comma-dangle'][1].arrays,
+      //     tuples: baseRules['comma-dangle'][1].arrays,
+      //   },
+      // ],
+      // '@typescript-eslint/comma-spacing': baseRules['comma-spacing'],
+      '@typescript-eslint/consistent-type-assertions': [
+        'error',
+        { assertionStyle: 'as', objectLiteralTypeAssertions: 'never' },
+      ],
+      '@typescript-eslint/default-param-last': baseRules['default-param-last'],
+      // '@typescript-eslint/dot-notation': baseRules['dot-notation'], // TODO: Stylistic typechecked
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+      // '@typescript-eslint/func-call-spacing': baseRules['func-call-spacing'],
+      // '@typescript-eslint/indent': baseRules.indent,
+      // '@typescript-eslint/keyword-spacing': baseRules['keyword-spacing'],
+      // '@typescript-eslint/lines-between-class-members': baseRules['lines-between-class-members'],
+      // '@typescript-eslint/member-delimiter-style': 'error', // TODO: @stylistic/member-delimiter-style
+      '@typescript-eslint/naming-convention': [
+        'error',
+        // {
+        //   format: ['PascalCase', 'camelCase'],
+        //   leadingUnderscore: 'allow',
+        //   selector: 'default',
+        //   trailingUnderscore: 'allow',
+        // },
+        {
+          format: ['PascalCase', 'camelCase', 'UPPER_CASE'],
+          leadingUnderscore: 'allow',
+          selector: 'variable',
+          trailingUnderscore: 'allow',
+        },
+        // {
+        //   format: ['PascalCase', 'camelCase', 'UPPER_CASE'],
+        //   leadingUnderscore: 'allowSingleOrDouble',
+        //   selector: 'memberLike',
+        //   trailingUnderscore: 'allowDouble',
+        // },
+        {
+          format: ['PascalCase'],
+          selector: 'typeLike',
+        },
+      ],
+      // '@typescript-eslint/no-array-constructor': baseRules['no-array-constructor'],
+      // '@typescript-eslint/no-base-to-string': 'error', // TODO: require type check
+      '@typescript-eslint/no-dupe-class-members': baseRules['no-dupe-class-members'],
+      '@typescript-eslint/no-empty-function': baseRules['no-empty-function'],
+      '@typescript-eslint/no-empty-interface': ['error', { allowSingleExtends: true }],
+      '@typescript-eslint/no-empty-object-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'off', // if any is explicit then it's wanted
+      '@typescript-eslint/no-extra-parens': baseRules['no-extra-parens'],
+      // '@typescript-eslint/no-extra-semi': baseRules['no-extra-semi'], // TODO: @stylistic/no-extra-semi
+      '@typescript-eslint/no-inferrable-types': 'error',
+      '@typescript-eslint/no-loop-func': baseRules['no-loop-func'],
+      '@typescript-eslint/no-loss-of-precision': baseRules['no-loss-of-precision'],
+      '@typescript-eslint/no-magic-numbers': baseRules['no-magic-numbers'],
+      '@typescript-eslint/no-misused-new': 'error',
+      '@typescript-eslint/no-namespace': 'off', // We don't agree with community, namespaces are great and not deprecated
+      '@typescript-eslint/no-non-null-assertion': 'error',
+      '@typescript-eslint/no-redeclare': ESLintConfig.fixme(baseRules['no-redeclare']),
+      '@typescript-eslint/no-require-imports': 'error',
+      '@typescript-eslint/no-shadow': baseRules['no-shadow'],
+      '@typescript-eslint/no-this-alias': 'error',
+      // '@typescript-eslint/no-unnecessary-condition': 'error',// TODO: require type check
+      // '@typescript-eslint/no-unsafe-argument': 'error', // TODO: recommended type check
+      '@typescript-eslint/no-unused-expressions': baseRules['no-unused-expressions'],
+      '@typescript-eslint/no-unused-vars': baseRules['no-unused-vars'],
+      '@typescript-eslint/no-use-before-define': baseRules['no-use-before-define'],
+      '@typescript-eslint/no-useless-constructor': baseRules['no-useless-constructor'],
+      '@typescript-eslint/no-var-requires': 'error',
+      '@typescript-eslint/no-wrapper-object-types': 'error',
+      // '@typescript-eslint/object-curly-spacing': baseRules['object-curly-spacing'],
+      // '@typescript-eslint/only-throw-error': baseRules['no-throw-literal'], //TODO: Recommended type check
+      '@typescript-eslint/prefer-namespace-keyword': 'error',
+      // '@typescript-eslint/prefer-reduce-type-parameter': 'error', // TODO: strict type check
+      // '@typescript-eslint/quotes': baseRules.quotes,
+      '@typescript-eslint/require-await': baseRules['require-await'],
+      // '@typescript-eslint/return-await': baseRules['no-return-await'], // TODO: strict type check
+      // '@typescript-eslint/semi': baseRules.semi,
+      // '@typescript-eslint/space-before-function-paren': baseRules['space-before-function-paren'],
+      // '@typescript-eslint/space-infix-ops': baseRules['space-infix-ops'],
+      // '@typescript-eslint/strict-boolean-expressions': [
+      //   'error',
+      //   {
+      //     allowNullableObject: false,
+      //     allowNumber: false,
+      //     allowString: false,
+      //   },
+      // ], //TODO: require typing
+      // '@typescript-eslint/switch-exhaustiveness-check': 'error',//TODO: require type check
+      '@typescript-eslint/triple-slash-reference': 'error',
+      // '@typescript-eslint/type-annotation-spacing': 'error',// TODO: @stylistic/type-annotation-spacing
+    },
+    {
+      '@typescript-eslint': 'ts',
+    },
+  );
+};

package/src/type/PluginOptionsBase.ts

@@ -3,10 +3,12 @@ import type { StylisticParameters } from './StylisticConfig.js';
 
 export interface PluginOptionsBase<Rules> {
   files?: Linter.Config['files'];
+
   /**
    * Plugin rules
    */
   rules?: Rules;
+
   /**
    * Stylistic options
    */

package/src/config/createRules.ts

@@ -1,9 +0,0 @@
-import { ESLintConfig } from '@w5s/dev';
-
-export function createRules(prefix: string) {
-  return ESLintConfig.renameRules({
-    'no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
-  }, {
-    '': prefix,
-  });
-}