@bfra.me/eslint-config 0.49.0 → 0.50.0

package/lib/index.d.ts

@@ -8273,13 +8273,17 @@ type StylisticPaddedBlocks = []|[(("always" | "never" | "start" | "end") | {
 }]
 // ----- @stylistic/padding-line-between-statements -----
 type _StylisticPaddingLineBetweenStatementsPaddingType = ("any" | "never" | "always")
-type _StylisticPaddingLineBetweenStatementsStatementOption = (_StylisticPaddingLineBetweenStatementsStatementType | [_StylisticPaddingLineBetweenStatementsStatementType, ...(_StylisticPaddingLineBetweenStatementsStatementType)[]])
+type _StylisticPaddingLineBetweenStatementsStatementOption = (_StylisticPaddingLineBetweenStatementsStatementMatcher | [_StylisticPaddingLineBetweenStatementsStatementMatcher, ...(_StylisticPaddingLineBetweenStatementsStatementMatcher)[]])
+type _StylisticPaddingLineBetweenStatementsStatementMatcher = (_StylisticPaddingLineBetweenStatementsStatementType | _StylisticPaddingLineBetweenStatements_SelectorOption)
 type _StylisticPaddingLineBetweenStatementsStatementType = ("*" | "exports" | "require" | "directive" | "iife" | "block" | "empty" | "function" | "ts-method" | "break" | "case" | "class" | "continue" | "debugger" | "default" | "do" | "for" | "if" | "import" | "switch" | "throw" | "try" | "while" | "with" | "cjs-export" | "cjs-import" | "enum" | "interface" | "function-overload" | "block-like" | "singleline-block-like" | "multiline-block-like" | "expression" | "singleline-expression" | "multiline-expression" | "return" | "singleline-return" | "multiline-return" | "export" | "singleline-export" | "multiline-export" | "var" | "singleline-var" | "multiline-var" | "let" | "singleline-let" | "multiline-let" | "const" | "singleline-const" | "multiline-const" | "using" | "singleline-using" | "multiline-using" | "type" | "singleline-type" | "multiline-type")
 type StylisticPaddingLineBetweenStatements = {
   blankLine: _StylisticPaddingLineBetweenStatementsPaddingType
   prev: _StylisticPaddingLineBetweenStatementsStatementOption
   next: _StylisticPaddingLineBetweenStatementsStatementOption
 }[]
+interface _StylisticPaddingLineBetweenStatements_SelectorOption {
+  selector: string
+}
 // ----- @stylistic/quote-props -----
 type StylisticQuoteProps = ([]|[("always" | "as-needed" | "consistent" | "consistent-as-needed")] | []|[("always" | "as-needed" | "consistent" | "consistent-as-needed")]|[("always" | "as-needed" | "consistent" | "consistent-as-needed"), {
   keywords?: boolean
@@ -18422,8 +18426,6 @@ type ConfigNames =
   | '@bfra.me/javascript/options'
   | '@bfra.me/javascript/rules'
   | '@bfra.me/jsdoc'
-  | '@bfra.me/jsonc/plugins'
-  | '@bfra.me/jsonc/unnamed1'
   | '@bfra.me/jsonc/json-schema/plugins'
   | '@bfra.me/jsonc/json-schema/unnamed1'
   | '@bfra.me/jsonc/json-schema'

package/lib/index.js

@@ -147,7 +147,7 @@ var GLOB_EXCLUDE = [
 import { fileURLToPath } from "url";
 
 // package.json
-var version = "0.49.0";
+var version = "0.50.0";
 
 // src/parsers/any-parser.ts
 var lineBreakPattern = /\r\n|[\n\r\u2028\u2029]/u;
@@ -712,15 +712,14 @@ async function jsonc(options = {}) {
   const indent = typeof stylisticConfig.indent === "number" ? stylisticConfig.indent : 2;
   const includeStylistic = typeof stylistic2 === "boolean" ? stylistic2 : true;
   const pluginJsonc = await interopDefault(import("eslint-plugin-jsonc"));
+  const baseConfigs = pluginJsonc.configs.base ?? pluginJsonc.configs["flat/base"] ?? [];
   return [
-    ...pluginJsonc.configs["flat/base"].map((config2, index) => ({
-      ...config2,
-      name: config2.plugins ? `@bfra.me/jsonc/plugins` : `@bfra.me/${(config2.name ?? "") || `jsonc/unnamed${index}`}`
-    })),
+    ...baseConfigs,
     ...await jsonSchema("jsonc", files),
     {
       name: "@bfra.me/jsonc",
       files,
+      language: "jsonc/x",
       rules: {
         "jsonc/no-bigint-literals": "error",
         "jsonc/no-binary-expression": "error",
@@ -1022,8 +1021,6 @@ async function markdown(options = {}) {
     });
   }
   if (json) {
-    const pluginJsonc = await interopDefault(import("eslint-plugin-jsonc"));
-    const baseConfigs = pluginJsonc.configs["flat/base"];
     configs.push({
       name: "@bfra.me/markdown/code-blocks/json",
       files: GLOB_MARKDOWN_FILES.flatMap((p) => [
@@ -1031,7 +1028,7 @@ async function markdown(options = {}) {
         `${p}/${GLOB_JSON5}`,
         `${p}/${GLOB_JSONC}`
       ]),
-      languageOptions: baseConfigs[1]?.languageOptions ?? {},
+      language: "jsonc/x",
       rules: {
         // Examples may show JSON with trailing commas or explanatory comments
         "jsonc/comma-dangle": "off",
@@ -1251,33 +1248,16 @@ async function pnpm() {
   return requireOf(
     ["eslint-plugin-pnpm"],
     async () => {
-      const [pluginJsonc, pluginPnpm, pluginYaml] = await Promise.all([
-        interopDefault(import("eslint-plugin-jsonc")),
+      const [pluginPnpm, pluginYaml] = await Promise.all([
         interopDefault(import("eslint-plugin-pnpm")),
         interopDefault(import("eslint-plugin-yml"))
       ]);
-      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({
+      return [
+        {
           name: "@bfra.me/pnpm/package-json",
           files: ["package.json", "**/package.json"],
-          ...jsoncLanguageSetup ? { language: jsoncLanguageSetup.language } : {},
-          ...jsoncParserSetup ? { languageOptions: jsoncParserSetup.languageOptions } : {},
+          language: "jsonc/x",
           plugins: {
-            ...jsoncPluginSetup?.plugins ?? {},
             pnpm: pluginPnpm
           },
           rules: {
@@ -1285,34 +1265,21 @@ 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"],
-          ...yamlLanguageSetup ? { language: yamlLanguageSetup.language } : {},
-          ...yamlParserSetup ? { languageOptions: yamlParserSetup.languageOptions } : {},
+          language: "yaml",
           plugins: {
-            ...yamlPluginSetup?.plugins ?? {},
-            pnpm: pluginPnpm
+            pnpm: pluginPnpm,
+            yml: pluginYaml
           },
           rules: {
             "pnpm/yaml-no-duplicate-catalog-item": "error",
             "pnpm/yaml-no-unused-catalog-item": "error"
           }
-        });
-      }
-      return configs;
+        }
+      ];
     },
     fallback
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bfra.me/eslint-config",
-  "version": "0.49.0",
+  "version": "0.50.0",
   "description": "Shared ESLint configuration for bfra.me",
   "keywords": [
     "bfra.me",
@@ -39,22 +39,22 @@
   "dependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "4.6.0",
     "@eslint/markdown": "7.5.1",
-    "@stylistic/eslint-plugin": "5.8.0",
-    "eslint-config-flat-gitignore": "2.1.0",
+    "@stylistic/eslint-plugin": "5.9.0",
+    "eslint-config-flat-gitignore": "2.2.1",
     "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": "62.6.0",
+    "eslint-plugin-jsdoc": "62.6.1",
     "eslint-plugin-json-schema-validator": "6.0.3",
-    "eslint-plugin-jsonc": "2.21.1",
+    "eslint-plugin-jsonc": "3.0.0",
     "eslint-plugin-n": "17.24.0",
     "eslint-plugin-perfectionist": "5.6.0",
     "eslint-plugin-regexp": "3.0.0",
-    "eslint-plugin-toml": "1.1.0",
+    "eslint-plugin-toml": "1.1.1",
     "eslint-plugin-unicorn": "63.0.0",
     "eslint-plugin-unused-imports": "4.4.1",
-    "eslint-plugin-yml": "3.2.0",
+    "eslint-plugin-yml": "3.2.1",
     "globals": "17.3.0",
     "is-in-ci": "2.0.0",
     "local-pkg": "1.1.2",
@@ -83,10 +83,10 @@
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-react-hooks": "7.0.1",
     "eslint-plugin-react-refresh": "0.5.0",
-    "eslint-typegen": "2.3.0",
-    "@bfra.me/prettier-config": "0.16.7",
+    "eslint-typegen": "2.3.1",
     "@bfra.me/tsconfig": "0.12.2",
-    "@bfra.me/works": "0.0.0-development"
+    "@bfra.me/works": "0.0.0-development",
+    "@bfra.me/prettier-config": "0.16.7"
   },
   "peerDependencies": {
     "@eslint-react/eslint-plugin": "^2.2.3",

package/src/config.d.ts

@@ -36,8 +36,6 @@ export type ConfigNames =
   | '@bfra.me/javascript/options'
   | '@bfra.me/javascript/rules'
   | '@bfra.me/jsdoc'
-  | '@bfra.me/jsonc/plugins'
-  | '@bfra.me/jsonc/unnamed1'
   | '@bfra.me/jsonc/json-schema/plugins'
   | '@bfra.me/jsonc/json-schema/unnamed1'
   | '@bfra.me/jsonc/json-schema'

package/src/configs/jsonc.ts

@@ -21,17 +21,15 @@ export async function jsonc(options: JsoncOptions = {}): Promise<Config[]> {
   const includeStylistic = typeof stylistic === 'boolean' ? stylistic : true
   const pluginJsonc = await interopDefault(import('eslint-plugin-jsonc'))
 
+  const baseConfigs = pluginJsonc.configs.base ?? pluginJsonc.configs['flat/base'] ?? []
+
   return [
-    ...(pluginJsonc.configs['flat/base'] as unknown as Config[]).map((config: Config, index) => ({
-      ...config,
-      name: config.plugins
-        ? `@bfra.me/jsonc/plugins`
-        : `@bfra.me/${(config.name ?? '') || `jsonc/unnamed${index}`}`,
-    })),
+    ...baseConfigs,
     ...(await jsonSchema('jsonc', files as string[])),
     {
       name: '@bfra.me/jsonc',
       files,
+      language: 'jsonc/x',
       rules: {
         'jsonc/no-bigint-literals': 'error',
         'jsonc/no-binary-expression': 'error',

package/src/configs/markdown.ts

@@ -376,11 +376,6 @@ export async function markdown(options: MarkdownOptions = {}): Promise<Config[]>
   }
 
   if (json) {
-    const pluginJsonc = await interopDefault(import('eslint-plugin-jsonc'))
-
-    // Use plugin's base config to inherit parser configuration
-    const baseConfigs = pluginJsonc.configs['flat/base']
-
     configs.push({
       name: '@bfra.me/markdown/code-blocks/json',
       files: GLOB_MARKDOWN_FILES.flatMap(p => [
@@ -388,7 +383,7 @@ export async function markdown(options: MarkdownOptions = {}): Promise<Config[]>
         `${p}/${GLOB_JSON5}`,
         `${p}/${GLOB_JSONC}`,
       ]),
-      languageOptions: baseConfigs[1]?.languageOptions ?? {},
+      language: 'jsonc/x',
       rules: {
         // Examples may show JSON with trailing commas or explanatory comments
         'jsonc/comma-dangle': 'off',

package/src/configs/pnpm.ts

@@ -11,57 +11,17 @@ export async function pnpm(): Promise<Config[]> {
   return requireOf(
     ['eslint-plugin-pnpm'],
     async () => {
-      const [pluginJsonc, pluginPnpm, pluginYaml] = await Promise.all([
-        interopDefault(import('eslint-plugin-jsonc')),
+      const [pluginPnpm, pluginYaml] = await Promise.all([
         interopDefault(import('eslint-plugin-pnpm')),
         interopDefault(import('eslint-plugin-yml')),
       ])
 
-      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({
+      return [
+        {
           name: '@bfra.me/pnpm/package-json',
           files: ['package.json', '**/package.json'],
-          ...(jsoncLanguageSetup ? {language: jsoncLanguageSetup.language} : {}),
-          ...(jsoncParserSetup ? {languageOptions: jsoncParserSetup.languageOptions} : {}),
+          language: 'jsonc/x',
           plugins: {
-            ...(jsoncPluginSetup?.plugins ?? {}),
             pnpm: pluginPnpm,
           },
           rules: {
@@ -69,46 +29,21 @@ 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'],
-          ...(yamlLanguageSetup ? {language: yamlLanguageSetup.language} : {}),
-          ...(yamlParserSetup ? {languageOptions: yamlParserSetup.languageOptions} : {}),
+          language: 'yaml',
           plugins: {
-            ...(yamlPluginSetup?.plugins ?? {}),
             pnpm: pluginPnpm,
+            yml: pluginYaml,
           },
           rules: {
             'pnpm/yaml-no-duplicate-catalog-item': 'error',
             'pnpm/yaml-no-unused-catalog-item': 'error',
           },
-        })
-      }
-
-      return configs
+        },
+      ] as Config[]
     },
     fallback,
   )

package/src/rules.d.ts

@@ -8264,13 +8264,17 @@ type StylisticPaddedBlocks = []|[(("always" | "never" | "start" | "end") | {
 }]
 // ----- @stylistic/padding-line-between-statements -----
 type _StylisticPaddingLineBetweenStatementsPaddingType = ("any" | "never" | "always")
-type _StylisticPaddingLineBetweenStatementsStatementOption = (_StylisticPaddingLineBetweenStatementsStatementType | [_StylisticPaddingLineBetweenStatementsStatementType, ...(_StylisticPaddingLineBetweenStatementsStatementType)[]])
+type _StylisticPaddingLineBetweenStatementsStatementOption = (_StylisticPaddingLineBetweenStatementsStatementMatcher | [_StylisticPaddingLineBetweenStatementsStatementMatcher, ...(_StylisticPaddingLineBetweenStatementsStatementMatcher)[]])
+type _StylisticPaddingLineBetweenStatementsStatementMatcher = (_StylisticPaddingLineBetweenStatementsStatementType | _StylisticPaddingLineBetweenStatements_SelectorOption)
 type _StylisticPaddingLineBetweenStatementsStatementType = ("*" | "exports" | "require" | "directive" | "iife" | "block" | "empty" | "function" | "ts-method" | "break" | "case" | "class" | "continue" | "debugger" | "default" | "do" | "for" | "if" | "import" | "switch" | "throw" | "try" | "while" | "with" | "cjs-export" | "cjs-import" | "enum" | "interface" | "function-overload" | "block-like" | "singleline-block-like" | "multiline-block-like" | "expression" | "singleline-expression" | "multiline-expression" | "return" | "singleline-return" | "multiline-return" | "export" | "singleline-export" | "multiline-export" | "var" | "singleline-var" | "multiline-var" | "let" | "singleline-let" | "multiline-let" | "const" | "singleline-const" | "multiline-const" | "using" | "singleline-using" | "multiline-using" | "type" | "singleline-type" | "multiline-type")
 type StylisticPaddingLineBetweenStatements = {
   blankLine: _StylisticPaddingLineBetweenStatementsPaddingType
   prev: _StylisticPaddingLineBetweenStatementsStatementOption
   next: _StylisticPaddingLineBetweenStatementsStatementOption
 }[]
+interface _StylisticPaddingLineBetweenStatements_SelectorOption {
+  selector: string
+}
 // ----- @stylistic/quote-props -----
 type StylisticQuoteProps = ([]|[("always" | "as-needed" | "consistent" | "consistent-as-needed")] | []|[("always" | "as-needed" | "consistent" | "consistent-as-needed")]|[("always" | "as-needed" | "consistent" | "consistent-as-needed"), {
   keywords?: boolean