@bfra.me/eslint-config 0.48.0 → 0.49.0

package/lib/index.js

@@ -147,7 +147,7 @@ var GLOB_EXCLUDE = [
 import { fileURLToPath } from "url";
 
 // package.json
-var version = "0.48.0";
+var version = "0.49.0";
 
 // src/parsers/any-parser.ts
 var lineBreakPattern = /\r\n|[\n\r\u2028\u2029]/u;
@@ -1041,11 +1041,20 @@ async function markdown(options = {}) {
   }
   if (yaml2) {
     const pluginYaml = await interopDefault(import("eslint-plugin-yml"));
-    const standardConfigs = pluginYaml.configs["flat/standard"];
+    const standardConfigs = pluginYaml.configs.standard ?? pluginYaml.configs["flat/standard"];
+    const normalizedConfigs = Array.isArray(standardConfigs) ? standardConfigs : [standardConfigs];
+    const languageSetup = normalizedConfigs.find(
+      (c) => c != null && "language" in c && typeof c.language === "string"
+    );
+    const parserSetup = normalizedConfigs.find(
+      (c) => c != null && "languageOptions" in c && c.languageOptions != null
+    );
     configs.push({
       name: "@bfra.me/markdown/code-blocks/yaml",
       files: GLOB_MARKDOWN_FILES.map((p) => `${p}/${GLOB_YAML}`),
-      languageOptions: standardConfigs[1]?.languageOptions ?? {},
+      ...languageSetup ? { language: languageSetup.language } : {},
+      ...parserSetup ? { languageOptions: parserSetup.languageOptions } : {},
+      ...languageSetup && "plugins" in languageSetup ? { plugins: languageSetup.plugins } : {},
       rules: {
         // Examples may show incomplete YAML mappings to focus on specific concepts
         "yml/no-empty-mapping-value": "off"
@@ -1247,12 +1256,28 @@ async function pnpm() {
         interopDefault(import("eslint-plugin-pnpm")),
         interopDefault(import("eslint-plugin-yml"))
       ]);
-      return [
-        {
+      const jsoncBaseConfigs = pluginJsonc.configs["flat/base"] ?? pluginJsonc.configs.base;
+      const yamlBaseConfigs = pluginYaml.configs.standard ?? pluginYaml.configs["flat/standard"];
+      const jsoncConfigs = Array.isArray(jsoncBaseConfigs) ? jsoncBaseConfigs : jsoncBaseConfigs ? [jsoncBaseConfigs] : [];
+      const yamlConfigs = Array.isArray(yamlBaseConfigs) ? yamlBaseConfigs : yamlBaseConfigs ? [yamlBaseConfigs] : [];
+      const configs = [];
+      const jsoncLanguageSetup = jsoncConfigs.find(
+        (config2) => config2 != null && typeof config2 === "object" && "language" in config2
+      );
+      const jsoncParserSetup = jsoncConfigs.find(
+        (config2) => config2 != null && typeof config2 === "object" && "languageOptions" in config2 && config2.languageOptions != null
+      );
+      const jsoncPluginSetup = jsoncConfigs.find(
+        (config2) => config2 != null && typeof config2 === "object" && "plugins" in config2 && config2.plugins != null
+      );
+      if (jsoncLanguageSetup ?? jsoncParserSetup ?? jsoncPluginSetup) {
+        configs.push({
           name: "@bfra.me/pnpm/package-json",
           files: ["package.json", "**/package.json"],
-          languageOptions: { parser: pluginJsonc },
+          ...jsoncLanguageSetup ? { language: jsoncLanguageSetup.language } : {},
+          ...jsoncParserSetup ? { languageOptions: jsoncParserSetup.languageOptions } : {},
           plugins: {
+            ...jsoncPluginSetup?.plugins ?? {},
             pnpm: pluginPnpm
           },
           rules: {
@@ -1260,20 +1285,34 @@ async function pnpm() {
             "pnpm/json-prefer-workspace-settings": "error",
             "pnpm/json-valid-catalog": "error"
           }
-        },
-        {
+        });
+      }
+      const yamlLanguageSetup = yamlConfigs.find(
+        (config2) => config2 != null && typeof config2 === "object" && "language" in config2
+      );
+      const yamlParserSetup = yamlConfigs.find(
+        (config2) => config2 != null && typeof config2 === "object" && "languageOptions" in config2 && config2.languageOptions != null
+      );
+      const yamlPluginSetup = yamlConfigs.find(
+        (config2) => config2 != null && typeof config2 === "object" && "plugins" in config2 && config2.plugins != null
+      );
+      if (yamlLanguageSetup ?? yamlParserSetup ?? yamlPluginSetup) {
+        configs.push({
           name: "@bfra.me/pnpm/pnpm-workspace-yaml",
           files: ["pnpm-workspace.yaml"],
-          languageOptions: { parser: pluginYaml },
+          ...yamlLanguageSetup ? { language: yamlLanguageSetup.language } : {},
+          ...yamlParserSetup ? { languageOptions: yamlParserSetup.languageOptions } : {},
           plugins: {
+            ...yamlPluginSetup?.plugins ?? {},
             pnpm: pluginPnpm
           },
           rules: {
             "pnpm/yaml-no-duplicate-catalog-item": "error",
             "pnpm/yaml-no-unused-catalog-item": "error"
           }
-        }
-      ];
+        });
+      }
+      return configs;
     },
     fallback
   );
@@ -1282,6 +1321,18 @@ async function pnpm() {
 // src/configs/prettier.ts
 import process4 from "process";
 import { isPackageExists as isPackageExists2 } from "local-pkg";
+function getConfigRules(configs) {
+  if (Array.isArray(configs)) {
+    const configWithRules = [...configs].reverse().find(
+      (config2) => typeof config2 === "object" && config2 !== null && "rules" in config2
+    );
+    return configWithRules?.rules;
+  }
+  if (typeof configs === "object" && configs !== null && "rules" in configs) {
+    return configs.rules;
+  }
+  return void 0;
+}
 async function prettier(options = {}) {
   const { isInEditor, overrides } = options;
   return requireOf(
@@ -1294,6 +1345,8 @@ async function prettier(options = {}) {
         isPackageExists2("eslint-plugin-jsonc") ? interopDefault(import("eslint-plugin-jsonc")) : Promise.resolve(void 0),
         isPackageExists2("eslint-plugin-yml") ? interopDefault(import("eslint-plugin-yml")) : Promise.resolve(void 0)
       ]);
+      const jsoncPrettierRules = getConfigRules(pluginJsonc?.configs.prettier);
+      const yamlPrettierRules = getConfigRules(pluginYaml?.configs.prettier);
       return [
         {
           name: "@bfra.me/prettier",
@@ -1303,7 +1356,7 @@ async function prettier(options = {}) {
           rules: {
             "prettier/prettier": isInEditor ? "warn" : "error",
             ...configPrettier.rules,
-            ...pluginJsonc?.configs.prettier.rules,
+            ...jsoncPrettierRules ?? {},
             "toml/array-bracket-newline": "off",
             "toml/array-bracket-spacing": "off",
             "toml/array-element-newline": "off",
@@ -1311,7 +1364,7 @@ async function prettier(options = {}) {
             "toml/inline-table-curly-spacing": "off",
             "toml/key-spacing": "off",
             "toml/table-bracket-spacing": "off",
-            ...pluginYaml?.configs.prettier.rules,
+            ...yamlPrettierRules ?? {},
             ...overrides
           }
         },
@@ -1382,7 +1435,7 @@ async function react(options = {}) {
       const [pluginReact, pluginReactHooks, pluginReactRefresh] = await Promise.all([
         interopDefault(import("@eslint-react/eslint-plugin")),
         interopDefault(import("eslint-plugin-react-hooks")),
-        interopDefault(import("eslint-plugin-react-refresh"))
+        import("eslint-plugin-react-refresh").then((m) => m.reactRefresh)
       ]);
       const plugins = pluginReact.configs.all.plugins;
       const isAllowConstantExport = ReactRefreshAllowConstantExportPackages.some(
@@ -1400,7 +1453,7 @@ async function react(options = {}) {
             "react-hooks": pluginReactHooks,
             "react-hooks-extra": plugins["@eslint-react/hooks-extra"],
             "react-naming-convention": plugins["@eslint-react/naming-convention"],
-            "react-refresh": pluginReactRefresh,
+            "react-refresh": pluginReactRefresh.plugin,
             "react-web-api": plugins["@eslint-react/web-api"]
           }
         },
@@ -1826,7 +1879,7 @@ async function toml(options = {}) {
   const includeStylistic = typeof stylistic2 === "boolean" ? stylistic2 : true;
   const pluginToml = await interopDefault(import("eslint-plugin-toml"));
   return [
-    ...pluginToml.configs["flat/standard"].map((config2, index) => ({
+    ...pluginToml.configs.standard.map((config2, index) => ({
       ...config2,
       name: config2.plugins ? `@bfra.me/toml/plugins` : `@bfra.me/${(config2.name ?? "") || `toml/unnamed${index}`}`
     })),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bfra.me/eslint-config",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "Shared ESLint configuration for bfra.me",
   "keywords": [
     "bfra.me",
@@ -41,26 +41,26 @@
     "@eslint/markdown": "7.5.1",
     "@stylistic/eslint-plugin": "5.8.0",
     "eslint-config-flat-gitignore": "2.1.0",
-    "eslint-flat-config-utils": "2.1.4",
+    "eslint-flat-config-utils": "3.0.1",
     "eslint-merge-processors": "2.0.0",
     "eslint-plugin-command": "3.4.0",
     "eslint-plugin-import-x": "4.16.1",
-    "eslint-plugin-jsdoc": "61.7.1",
-    "eslint-plugin-json-schema-validator": "5.5.1",
+    "eslint-plugin-jsdoc": "62.6.0",
+    "eslint-plugin-json-schema-validator": "6.0.3",
     "eslint-plugin-jsonc": "2.21.1",
     "eslint-plugin-n": "17.24.0",
-    "eslint-plugin-perfectionist": "5.5.0",
-    "eslint-plugin-regexp": "2.10.0",
-    "eslint-plugin-toml": "0.12.0",
-    "eslint-plugin-unicorn": "62.0.0",
+    "eslint-plugin-perfectionist": "5.6.0",
+    "eslint-plugin-regexp": "3.0.0",
+    "eslint-plugin-toml": "1.1.0",
+    "eslint-plugin-unicorn": "63.0.0",
     "eslint-plugin-unused-imports": "4.4.1",
-    "eslint-plugin-yml": "1.19.1",
+    "eslint-plugin-yml": "3.2.0",
     "globals": "17.3.0",
     "is-in-ci": "2.0.0",
     "local-pkg": "1.1.2",
     "package-manager-detector": "1.6.0",
     "sort-package-json": "3.6.1",
-    "typescript-eslint": "8.55.0",
+    "typescript-eslint": "8.56.0",
     "@bfra.me/es": "0.1.0"
   },
   "devDependencies": {
@@ -70,7 +70,7 @@
     "@next/eslint-plugin-next": "16.1.6",
     "@types/eslint-config-prettier": "6.11.3",
     "@types/eslint-plugin-jsx-a11y": "6.10.1",
-    "@typescript-eslint/types": "8.55.0",
+    "@typescript-eslint/types": "8.56.0",
     "@vitest/eslint-plugin": "1.6.9",
     "astro-eslint-parser": "1.3.0",
     "eslint": "10.0.0",
@@ -82,7 +82,7 @@
     "eslint-plugin-pnpm": "1.5.0",
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-react-hooks": "7.0.1",
-    "eslint-plugin-react-refresh": "0.4.26",
+    "eslint-plugin-react-refresh": "0.5.0",
     "eslint-typegen": "2.3.0",
     "@bfra.me/prettier-config": "0.16.7",
     "@bfra.me/tsconfig": "0.12.2",
@@ -99,7 +99,7 @@
     "eslint-plugin-jsx-a11y": ">=6.10.2",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react-hooks": "^7.0.0",
-    "eslint-plugin-react-refresh": "^0.4.20"
+    "eslint-plugin-react-refresh": "^0.4.20 || ^0.5.0"
   },
   "peerDependenciesMeta": {
     "@eslint-react/eslint-plugin": {

package/src/configs/markdown.ts

@@ -401,12 +401,27 @@ export async function markdown(options: MarkdownOptions = {}): Promise<Config[]>
     const pluginYaml = await interopDefault(import('eslint-plugin-yml'))
 
     // Use plugin's standard config to inherit parser configuration
-    const standardConfigs = pluginYaml.configs['flat/standard'] as Config[]
+    const standardConfigs = (pluginYaml.configs.standard ?? pluginYaml.configs['flat/standard']) as
+      | Config[]
+      | Config
+    const normalizedConfigs = Array.isArray(standardConfigs) ? standardConfigs : [standardConfigs]
+
+    // Find language and parser setup from normalized configs with explicit type guards
+    const languageSetup = normalizedConfigs.find(
+      (c): c is Config & {language: string} =>
+        c != null && 'language' in c && typeof c.language === 'string',
+    )
+    const parserSetup = normalizedConfigs.find(
+      (c): c is Config & {languageOptions: Record<string, unknown>} =>
+        c != null && 'languageOptions' in c && c.languageOptions != null,
+    )
 
     configs.push({
       name: '@bfra.me/markdown/code-blocks/yaml',
       files: GLOB_MARKDOWN_FILES.map(p => `${p}/${GLOB_YAML}`),
-      languageOptions: standardConfigs[1]?.languageOptions ?? {},
+      ...(languageSetup ? {language: languageSetup.language} : {}),
+      ...(parserSetup ? {languageOptions: parserSetup.languageOptions} : {}),
+      ...(languageSetup && 'plugins' in languageSetup ? {plugins: languageSetup.plugins} : {}),
       rules: {
         // Examples may show incomplete YAML mappings to focus on specific concepts
         'yml/no-empty-mapping-value': 'off',

package/src/configs/pnpm.ts

@@ -1,4 +1,3 @@
-import type {Linter} from 'eslint'
 import type {Config} from '../config'
 import {requireOf} from '../require-of'
 import {interopDefault} from '../utils'
@@ -18,12 +17,51 @@ export async function pnpm(): Promise<Config[]> {
         interopDefault(import('eslint-plugin-yml')),
       ])
 
-      return [
-        {
+      const jsoncBaseConfigs = (pluginJsonc.configs['flat/base'] ??
+        pluginJsonc.configs.base) as unknown as Config[] | Config | undefined
+      const yamlBaseConfigs = (pluginYaml.configs.standard ??
+        pluginYaml.configs['flat/standard']) as unknown as Config[] | Config | undefined
+
+      const jsoncConfigs = Array.isArray(jsoncBaseConfigs)
+        ? jsoncBaseConfigs
+        : jsoncBaseConfigs
+          ? [jsoncBaseConfigs]
+          : []
+      const yamlConfigs = Array.isArray(yamlBaseConfigs)
+        ? yamlBaseConfigs
+        : yamlBaseConfigs
+          ? [yamlBaseConfigs]
+          : []
+
+      const configs: Config[] = []
+
+      const jsoncLanguageSetup = jsoncConfigs.find(
+        (config): config is Config & {language: string} =>
+          config != null && typeof config === 'object' && 'language' in config,
+      )
+      const jsoncParserSetup = jsoncConfigs.find(
+        (config): config is Config & {languageOptions: Record<string, unknown>} =>
+          config != null &&
+          typeof config === 'object' &&
+          'languageOptions' in config &&
+          config.languageOptions != null,
+      )
+      const jsoncPluginSetup = jsoncConfigs.find(
+        (config): config is Config & {plugins: Record<string, unknown>} =>
+          config != null &&
+          typeof config === 'object' &&
+          'plugins' in config &&
+          config.plugins != null,
+      )
+
+      if (jsoncLanguageSetup ?? jsoncParserSetup ?? jsoncPluginSetup) {
+        configs.push({
           name: '@bfra.me/pnpm/package-json',
           files: ['package.json', '**/package.json'],
-          languageOptions: {parser: pluginJsonc as unknown as Linter.Parser},
+          ...(jsoncLanguageSetup ? {language: jsoncLanguageSetup.language} : {}),
+          ...(jsoncParserSetup ? {languageOptions: jsoncParserSetup.languageOptions} : {}),
           plugins: {
+            ...(jsoncPluginSetup?.plugins ?? {}),
             pnpm: pluginPnpm,
           },
           rules: {
@@ -31,20 +69,46 @@ export async function pnpm(): Promise<Config[]> {
             'pnpm/json-prefer-workspace-settings': 'error',
             'pnpm/json-valid-catalog': 'error',
           },
-        },
-        {
+        })
+      }
+
+      const yamlLanguageSetup = yamlConfigs.find(
+        (config): config is Config & {language: string} =>
+          config != null && typeof config === 'object' && 'language' in config,
+      )
+      const yamlParserSetup = yamlConfigs.find(
+        (config): config is Config & {languageOptions: Record<string, unknown>} =>
+          config != null &&
+          typeof config === 'object' &&
+          'languageOptions' in config &&
+          config.languageOptions != null,
+      )
+      const yamlPluginSetup = yamlConfigs.find(
+        (config): config is Config & {plugins: Record<string, unknown>} =>
+          config != null &&
+          typeof config === 'object' &&
+          'plugins' in config &&
+          config.plugins != null,
+      )
+
+      if (yamlLanguageSetup ?? yamlParserSetup ?? yamlPluginSetup) {
+        configs.push({
           name: '@bfra.me/pnpm/pnpm-workspace-yaml',
           files: ['pnpm-workspace.yaml'],
-          languageOptions: {parser: pluginYaml as unknown as Linter.Parser},
+          ...(yamlLanguageSetup ? {language: yamlLanguageSetup.language} : {}),
+          ...(yamlParserSetup ? {languageOptions: yamlParserSetup.languageOptions} : {}),
           plugins: {
+            ...(yamlPluginSetup?.plugins ?? {}),
             pnpm: pluginPnpm,
           },
           rules: {
             'pnpm/yaml-no-duplicate-catalog-item': 'error',
             'pnpm/yaml-no-unused-catalog-item': 'error',
           },
-        },
-      ]
+        })
+      }
+
+      return configs
     },
     fallback,
   )

package/src/configs/prettier.ts

@@ -7,6 +7,25 @@ import {requireOf} from '../require-of'
 import {interopDefault} from '../utils'
 import {fallback} from './fallback'
 
+function getConfigRules(configs: unknown): OptionsOverrides['overrides'] | undefined {
+  if (Array.isArray(configs)) {
+    const configWithRules = [...(configs as unknown[])]
+      .reverse()
+      .find(
+        (config): config is Config =>
+          typeof config === 'object' && config !== null && 'rules' in config,
+      )
+
+    return configWithRules?.rules
+  }
+
+  if (typeof configs === 'object' && configs !== null && 'rules' in configs) {
+    return (configs as Config).rules
+  }
+
+  return undefined
+}
+
 /**
  * Represents the options for the ESLint Prettier configuration.
  */
@@ -34,6 +53,8 @@ export async function prettier(options: PrettierOptions = {}): Promise<Config[]>
           ? interopDefault(import('eslint-plugin-yml'))
           : Promise.resolve(undefined),
       ])
+      const jsoncPrettierRules = getConfigRules(pluginJsonc?.configs.prettier)
+      const yamlPrettierRules = getConfigRules(pluginYaml?.configs.prettier)
 
       return [
         {
@@ -46,7 +67,7 @@ export async function prettier(options: PrettierOptions = {}): Promise<Config[]>
 
             ...configPrettier.rules,
 
-            ...(pluginJsonc?.configs.prettier.rules as OptionsOverrides['overrides']),
+            ...(jsoncPrettierRules ?? {}),
 
             'toml/array-bracket-newline': 'off',
             'toml/array-bracket-spacing': 'off',
@@ -56,7 +77,7 @@ export async function prettier(options: PrettierOptions = {}): Promise<Config[]>
             'toml/key-spacing': 'off',
             'toml/table-bracket-spacing': 'off',
 
-            ...(pluginYaml?.configs.prettier.rules as OptionsOverrides['overrides']),
+            ...(yamlPrettierRules ?? {}),
 
             ...overrides,
           },

package/src/configs/react.ts

@@ -82,7 +82,7 @@ export async function react(options: ReactOptions = {}): Promise<Config[]> {
       const [pluginReact, pluginReactHooks, pluginReactRefresh] = await Promise.all([
         interopDefault(import('@eslint-react/eslint-plugin')),
         interopDefault(import('eslint-plugin-react-hooks')),
-        interopDefault(import('eslint-plugin-react-refresh')),
+        import('eslint-plugin-react-refresh').then(m => m.reactRefresh),
       ] as const)
 
       const plugins = (pluginReact.configs.all as {plugins: Record<string, Plugin>}).plugins
@@ -102,7 +102,7 @@ export async function react(options: ReactOptions = {}): Promise<Config[]> {
             'react-hooks': pluginReactHooks,
             'react-hooks-extra': plugins['@eslint-react/hooks-extra'],
             'react-naming-convention': plugins['@eslint-react/naming-convention'],
-            'react-refresh': pluginReactRefresh,
+            'react-refresh': pluginReactRefresh.plugin,
             'react-web-api': plugins['@eslint-react/web-api'],
           } as Config['plugins'],
         },

package/src/configs/toml.ts

@@ -22,7 +22,7 @@ export async function toml(options: TomlOptions = {}): Promise<Config[]> {
   const pluginToml = await interopDefault(import('eslint-plugin-toml'))
 
   return [
-    ...(pluginToml.configs['flat/standard'] as Config[]).map((config: Config, index) => ({
+    ...(pluginToml.configs.standard as Config[]).map((config: Config, index) => ({
       ...config,
       name: config.plugins
         ? `@bfra.me/toml/plugins`