Update Bot

node_modules/@eslint/config-helpers/dist/cjs/index.cjs

@@ -9,17 +9,15 @@
 // Type Definitions
 //-----------------------------------------------------------------------------
 
-/** @import * as $eslintcore from "@eslint/core"; */
-/** @typedef {$eslintcore.ConfigObject} Config */
-/** @typedef {$eslintcore.LegacyConfigObject} LegacyConfig */
-/** @typedef {$eslintcore.Plugin} Plugin */
-/** @typedef {$eslintcore.RuleConfig} RuleConfig */
-/** @import * as $typests from "./types.ts"; */
-/** @typedef {$typests.ExtendsElement} ExtendsElement */
-/** @typedef {$typests.SimpleExtendsElement} SimpleExtendsElement */
-/** @typedef {$typests.ConfigWithExtends} ConfigWithExtends */
-/** @typedef {$typests.InfiniteArray<Config>} InfiniteConfigArray */
-/** @typedef {$typests.ConfigWithExtendsArray} ConfigWithExtendsArray */
+/** @typedef {import("eslint").Linter.Config} Config */
+/** @typedef {import("eslint").Linter.LegacyConfig} LegacyConfig */
+/** @typedef {import("eslint").ESLint.Plugin} Plugin */
+/** @typedef {import("eslint").Linter.RuleEntry} RuleEntry */
+/** @typedef {import("./types.ts").ExtendsElement} ExtendsElement */
+/** @typedef {import("./types.ts").SimpleExtendsElement} SimpleExtendsElement */
+/** @typedef {import("./types.ts").ConfigWithExtends} ConfigWithExtends */
+/** @typedef {import("./types.ts").InfiniteArray<Config>} InfiniteConfigArray */
+/** @typedef {import("./types.ts").ConfigWithExtendsArray} ConfigWithExtendsArray */
 
 //-----------------------------------------------------------------------------
 // Helpers
@@ -78,11 +76,6 @@ function getExtensionName(extension, indexPath) {
  * @return {config is LegacyConfig} `true` if the config object is a legacy config.
  */
 function isLegacyConfig(config) {
-	// eslintrc's plugins must be an array; while flat config's must be an object.
-	if (Array.isArray(config.plugins)) {
-		return true;
-	}
-
 	for (const key of eslintrcKeys) {
 		if (key in config) {
 			return true;
@@ -162,7 +155,7 @@ function normalizePluginConfig(userNamespace, plugin, config) {
 	if (result.rules) {
 		const ruleIds = Object.keys(result.rules);
 
-		/** @type {Record<string,RuleConfig|undefined>} */
+		/** @type {Record<string,RuleEntry|undefined>} */
 		const newRules = {};
 
 		for (let i = 0; i < ruleIds.length; i++) {
@@ -260,8 +253,6 @@ function findPluginConfig(config, pluginConfigName) {
 	}
 
 	const directConfig = plugin.configs?.[configName];
-
-	// Prefer direct config, but fall back to flat config if available
 	if (directConfig) {
 		// Arrays are always flat configs, and non-legacy configs can be used directly
 		if (Array.isArray(directConfig) || !isLegacyConfig(directConfig)) {
@@ -272,28 +263,30 @@ function findPluginConfig(config, pluginConfigName) {
 				pluginConfigName,
 			);
 		}
-	}
 
-	// If it's a legacy config, or the config does not exist => look for the flat version
-	const flatConfig = plugin.configs?.[`flat/${configName}`];
-	if (
-		flatConfig &&
-		(Array.isArray(flatConfig) || !isLegacyConfig(flatConfig))
-	) {
-		return deepNormalizePluginConfig(
-			userPluginNamespace,
-			plugin,
-			flatConfig,
-			pluginConfigName,
+		// If it's a legacy config, look for the flat version
+		const flatConfig = plugin.configs?.[`flat/${configName}`];
+
+		if (
+			flatConfig &&
+			(Array.isArray(flatConfig) || !isLegacyConfig(flatConfig))
+		) {
+			return deepNormalizePluginConfig(
+				userPluginNamespace,
+				plugin,
+				flatConfig,
+				pluginConfigName,
+			);
+		}
+
+		throw new TypeError(
+			`Plugin config "${configName}" in plugin "${userPluginNamespace}" is an eslintrc config and cannot be used in this context.`,
 		);
 	}
 
-	// If we get here, then the config was either not found or is a legacy config
-	const message =
-		directConfig || flatConfig
-			? `Plugin config "${configName}" in plugin "${userPluginNamespace}" is an eslintrc config and cannot be used in this context.`
-			: `Plugin config "${configName}" not found in plugin "${userPluginNamespace}".`;
-	throw new TypeError(message);
+	throw new TypeError(
+		`Plugin config "${configName}" not found in plugin "${userPluginNamespace}".`,
+	);
 }
 
 /**