fix: type errors

eslint-functional · Mar 24, 2024 · b73bcd2 · b73bcd2
1 parent d9f8916
commit b73bcd2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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;