diff --git a/src/rules/utils/__tests__/parseJestFnCall.test.ts b/src/rules/utils/__tests__/parseJestFnCall.test.ts index e8ef3646c..a44d2bff5 100644 --- a/src/rules/utils/__tests__/parseJestFnCall.test.ts +++ b/src/rules/utils/__tests__/parseJestFnCall.test.ts @@ -76,13 +76,17 @@ const rule = createRule({ }), }); -interface TestResolvedJestFnWithNode - extends Omit { +interface TestResolvedJestFnWithNode extends Omit< + ResolvedJestFnWithNode, + 'node' +> { node: string; } -interface TestParsedJestFnCall - extends Omit { +interface TestParsedJestFnCall extends Omit< + ParsedJestFnCall, + 'head' | 'members' +> { head: TestResolvedJestFnWithNode; members: string[]; } diff --git a/src/rules/utils/ast-utils.ts b/src/rules/utils/ast-utils.ts index 3a9e3e0f4..93ed68bfa 100644 --- a/src/rules/utils/ast-utils.ts +++ b/src/rules/utils/ast-utils.ts @@ -43,11 +43,11 @@ export const getActualLastToken = ( const nextToken = sourceCode.getTokenAfter(semiToken); const isSemicolonLessStyle = Boolean( prevToken && - nextToken && - prevToken.range[0] >= node.range[0] && - isTokenASemicolon(semiToken) && - semiToken.loc.start.line !== prevToken.loc.end.line && - semiToken.loc.end.line === nextToken.loc.start.line, + nextToken && + prevToken.range[0] >= node.range[0] && + isTokenASemicolon(semiToken) && + semiToken.loc.start.line !== prevToken.loc.end.line && + semiToken.loc.end.line === nextToken.loc.start.line, ); return isSemicolonLessStyle ? prevToken : semiToken; diff --git a/src/rules/utils/followTypeAssertionChain.ts b/src/rules/utils/followTypeAssertionChain.ts index 34c377ad1..2e6b02f07 100644 --- a/src/rules/utils/followTypeAssertionChain.ts +++ b/src/rules/utils/followTypeAssertionChain.ts @@ -10,13 +10,15 @@ type TSTypeCastExpression< interface AsExpressionChain< Expression extends TSESTree.Expression = TSESTree.Expression, -> extends TSESTree.TSAsExpression { +> + extends TSESTree.TSAsExpression { expression: AsExpressionChain | Expression; } interface TypeAssertionChain< Expression extends TSESTree.Expression = TSESTree.Expression, -> extends TSESTree.TSTypeAssertion { +> + extends TSESTree.TSTypeAssertion { expression: TypeAssertionChain | Expression; } diff --git a/src/rules/utils/misc.ts b/src/rules/utils/misc.ts index fb56c85c8..da91249d5 100644 --- a/src/rules/utils/misc.ts +++ b/src/rules/utils/misc.ts @@ -45,8 +45,9 @@ export interface KnownCallExpression * * This is `KnownCallExpression` from the perspective of the `MemberExpression` node. */ -interface CalledKnownMemberExpression - extends KnownMemberExpression { +interface CalledKnownMemberExpression< + Name extends string = string, +> extends KnownMemberExpression { parent: KnownCallExpression; } @@ -54,9 +55,10 @@ interface CalledKnownMemberExpression * Represents a `CallExpression` with a single argument. */ export interface CallExpressionWithSingleArgument< - Argument extends - TSESTree.CallExpression['arguments'][number] = TSESTree.CallExpression['arguments'][number], -> extends TSESTree.CallExpression { + Argument extends TSESTree.CallExpression['arguments'][number] = + TSESTree.CallExpression['arguments'][number], +> + extends TSESTree.CallExpression { arguments: [Argument]; } diff --git a/src/rules/utils/parseJestFnCall.ts b/src/rules/utils/parseJestFnCall.ts index c74ea1426..1aad25639 100644 --- a/src/rules/utils/parseJestFnCall.ts +++ b/src/rules/utils/parseJestFnCall.ts @@ -104,8 +104,7 @@ interface ParsedGeneralJestFnCall extends BaseParsedJestFnCall { } export interface ParsedExpectFnCall - extends BaseParsedJestFnCall, - ModifiersAndMatcher { + extends BaseParsedJestFnCall, ModifiersAndMatcher { type: 'expect'; } diff --git a/yarn.lock b/yarn.lock index b40a72b6a..ba0ff25c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9765,11 +9765,11 @@ __metadata: linkType: hard "prettier@npm:^3.0.0": - version: 3.6.2 - resolution: "prettier@npm:3.6.2" + version: 3.7.4 + resolution: "prettier@npm:3.7.4" bin: prettier: bin/prettier.cjs - checksum: 10c0/488cb2f2b99ec13da1e50074912870217c11edaddedeadc649b1244c749d15ba94e846423d062e2c4c9ae683e2d65f754de28889ba06e697ac4f988d44f45812 + checksum: 10c0/9675d2cd08eacb1faf1d1a2dbfe24bfab6a912b059fc9defdb380a408893d88213e794a40a2700bd29b140eb3172e0b07c852853f6e22f16f3374659a1a13389 languageName: node linkType: hard