From b73bcd211cc56d631097a2c7e29f7daad3657400 Mon Sep 17 00:00:00 2001
From: Rebecca Stevens <rebecca.stevens@outlook.co.nz>
Date: Mon, 25 Mar 2024 08:20:48 +1300
Subject: [PATCH] fix: type errors

---
 src/rules/no-expression-statements.ts |  2 +-
 src/utils/rule.ts                     |  3 ++-
 tests/helpers/util.ts                 | 15 +++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/rules/no-expression-statements.ts b/src/rules/no-expression-statements.ts
index 44cbecda7..863f64e5d 100644
--- a/src/rules/no-expression-statements.ts
+++ b/src/rules/no-expression-statements.ts
@@ -168,7 +168,7 @@ function checkExpressionStatement(
             returnStatements.every(
               (statement) =>
                 statement.expression !== undefined &&
-                tsApiUtils.isThisKeyword(statement.expression),
+                tsApiUtils?.isThisKeyword(statement.expression),
             )
           ) {
             return {
diff --git a/src/utils/rule.ts b/src/utils/rule.ts
index b4ea3c9b7..f47e11179 100644
--- a/src/utils/rule.ts
+++ b/src/utils/rule.ts
@@ -55,9 +55,10 @@ export type RuleDefinition<
   MessageIds extends string,
   Options extends BaseOptions,
 > = {
+  readonly defaultOptions: Options;
   readonly meta: NamedCreateRuleCustomMeta<MessageIds, Options>;
   readonly create: (
-    context: RuleDefinition<MessageIds, Options>,
+    context: Readonly<RuleContext<MessageIds, Options>>,
   ) => RuleListener;
 };
 
diff --git a/tests/helpers/util.ts b/tests/helpers/util.ts
index 1c4a52e82..e9d01457a 100644
--- a/tests/helpers/util.ts
+++ b/tests/helpers/util.ts
@@ -142,13 +142,8 @@ export function addFilename<
   };
 }
 
-export type MessagesOf<
-  T extends RuleDefinition<string, ReadonlyArray<unknown>>,
-> =
-  T extends RuleDefinition<infer Messages, ReadonlyArray<unknown>>
-    ? Messages
-    : never;
-
-export type OptionsOf<
-  T extends RuleDefinition<string, ReadonlyArray<unknown>>,
-> = T extends RuleDefinition<string, infer Options> ? Options : never;
+export type MessagesOf<T extends RuleDefinition<string, any>> =
+  T extends RuleDefinition<infer Messages, any> ? Messages : never;
+
+export type OptionsOf<T extends RuleDefinition<string, any>> =
+  T extends RuleDefinition<string, infer Options> ? Options : never;