@w5s/eslint-config 3.3.1 → 3.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/eslint-config",
-  "version": "3.3.1",
+  "version": "3.3.3",
   "description": "ESLint configuration presets",
   "keywords": [
     "eslint",
@@ -62,14 +62,14 @@
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "@vitest/eslint-plugin": "^1.0.0",
-    "@w5s/dev": "^3.1.3",
+    "@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",
-    "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-unicorn": "^62.0.0",
-    "eslint-plugin-yml": "^2.0.0",
+    "eslint-plugin-import": "~2.32.0",
+    "eslint-plugin-jsdoc": "~62.6.1",
+    "eslint-plugin-jsonc": "~2.21.1",
+    "eslint-plugin-n": "~17.24.0",
+    "eslint-plugin-unicorn": "~63.0.0",
+    "eslint-plugin-yml": "~2.0.2",
     "find-up": "^8.0.0",
     "globals": "^17.0.0",
     "jsonc-eslint-parser": "^2.0.0",
@@ -83,7 +83,7 @@
     "@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": "550810ad9a8d35378bb00361cd0080bd67058fc5"
+  "gitHead": "5ccfbd65c727dda6c5e119e5164d4af6916d83bb"
 }

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/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/typegen/jsdoc.d.ts

@@ -1082,6 +1082,8 @@ type JsdocTagLines = []|[("always" | "any" | "never")]|[("always" | "any" | "nev
   
   startLines?: (number | null)
   
+  startLinesWithNoTags?: number
+  
   tags?: {
     [k: string]: {
       count?: number