diff --git a/packages/utils/src/eslint-utils/context.ts b/packages/utils/src/eslint-utils/context.ts index 28ddb3cc154e..b01e7b8665f7 100644 --- a/packages/utils/src/eslint-utils/context.ts +++ b/packages/utils/src/eslint-utils/context.ts @@ -5,21 +5,17 @@ import type { Scope, SourceCode } from '../ts-eslint'; import type { RuleContext } from '../ts-eslint/Rule'; import type { TSESTree } from '../ts-estree'; -export function getAncestors( - context: Readonly>, -): TSESTree.Node[] { +export function getAncestors(context: Readonly): TSESTree.Node[] { // TODO: Use `SourceCode#getAncestors` (we'll be forced to soon) return context.getAncestors(); } -export function getCwd( - context: Readonly>, -): string { +export function getCwd(context: Readonly): string { return context.cwd ?? context.getCwd(); } export function getDeclaredVariables( - context: Readonly>, + context: Readonly, node: TSESTree.Node, ): readonly Scope.Variable[] { const sourceCode = getSourceCode(context); @@ -29,9 +25,7 @@ export function getDeclaredVariables( ); } -export function getFilename( - context: Readonly>, -): string { +export function getFilename(context: Readonly): string { return context.filename ?? context.getFilename(); } diff --git a/packages/utils/src/eslint-utils/getParserServices.ts b/packages/utils/src/eslint-utils/getParserServices.ts index 485860036c63..6ecc7add2fd9 100644 --- a/packages/utils/src/eslint-utils/getParserServices.ts +++ b/packages/utils/src/eslint-utils/getParserServices.ts @@ -53,7 +53,7 @@ function getParserServices< ): ParserServices; function getParserServices( - context: Readonly>, + context: Readonly, allowWithoutFullTypeInformation = false, ): ParserServices { // This check is unnecessary if the user is using the latest version of our parser. diff --git a/packages/utils/src/ts-eslint/Rule.ts b/packages/utils/src/ts-eslint/Rule.ts index 65f2928e3977..c0f849347bdb 100644 --- a/packages/utils/src/ts-eslint/Rule.ts +++ b/packages/utils/src/ts-eslint/Rule.ts @@ -173,8 +173,8 @@ type ReportDescriptor = type SharedConfigurationSettings = Record; interface RuleContext< - TMessageIds extends string, - TOptions extends readonly unknown[], + TMessageIds extends string = string, + TOptions extends readonly unknown[] = unknown[], > { /** * The rule ID.