From b2d14c9e56caf81f6f6ce0d132f41ff46b2ee4da Mon Sep 17 00:00:00 2001 From: Nolan Gajdascz Date: Mon, 4 Aug 2025 13:17:31 -0400 Subject: [PATCH] fix(utils): correct `calculateConfigForFile` return type - Issue: https://github.com/typescript-eslint/typescript-eslint/issues/11444 Changes: - Extend `FlatESLintBase` generic with `FlatConfig.Config` - Update `calculateConfigForFile` to return `FlatConfig.Config` Note: The comment for `calculateConfigForFile` in `FlatESLintBase` mentions the return type as "A configuration object for the file or `undefined` if there is no configuration data". This differs from the base `SharedESLintBase`, which only states it returns the config object. Left as-is, but may warrant clarification or further typing updates. --- packages/utils/src/ts-eslint/eslint/FlatESLint.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/utils/src/ts-eslint/eslint/FlatESLint.ts b/packages/utils/src/ts-eslint/eslint/FlatESLint.ts index 085a9e0fdfa9..1861200f51b4 100644 --- a/packages/utils/src/ts-eslint/eslint/FlatESLint.ts +++ b/packages/utils/src/ts-eslint/eslint/FlatESLint.ts @@ -6,7 +6,7 @@ import type * as Shared from './ESLintShared'; // eslint-disable-next-line @typescript-eslint/no-unused-vars declare class FlatESLintBase extends Shared.ESLintBase< - FlatConfig.ConfigArray, + FlatConfig.Config | FlatConfig.ConfigArray, FlatESLint.ESLintOptions > { static readonly configType: 'flat'; @@ -18,7 +18,7 @@ declare class FlatESLintBase extends Shared.ESLintBase< * @param filePath The path of the file to retrieve a config object for. * @returns A configuration object for the file or `undefined` if there is no configuration data for the object. */ - calculateConfigForFile(filePath: string): Promise; + calculateConfigForFile(filePath: string): Promise; /** * Finds the config file being used by this instance based on the options