Non-nullable validators

typescript-eslint · Jan 31, 2023 · 3a7aed3 · 3a7aed3
1 parent 2073b68
commit 3a7aed3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/packages/eslint-plugin/src/rules/naming-convention-utils/types.ts b/packages/eslint-plugin/src/rules/naming-convention-utils/types.ts
@@ -64,7 +64,7 @@ type ValidatorFunction = (
   node: TSESTree.Identifier | TSESTree.PrivateIdentifier | TSESTree.Literal,
   modifiers?: Set<Modifiers>,
 ) => void;
-type ParsedOptions = Record<SelectorsString, null | ValidatorFunction>;
+type ParsedOptions = Record<SelectorsString, ValidatorFunction>;
 type Context = Readonly<TSESLint.RuleContext<MessageIds, Options>>;
 
 export type {

diff --git a/packages/eslint-plugin/src/rules/naming-convention.ts b/packages/eslint-plugin/src/rules/naming-convention.ts
@@ -217,7 +217,7 @@ export default util.createRule<Options, MessageIds>({
 
     const selectors: {
       readonly [k in keyof TSESLint.RuleListener]: Readonly<{
-        validator: ValidatorFunction | null;
+        validator: ValidatorFunction;
         handler: (
           node: Parameters<NonNullable<TSESLint.RuleListener[k]>>[0],
           validator: ValidatorFunction,
@@ -643,9 +643,6 @@ export default util.createRule<Options, MessageIds>({
     return Object.fromEntries(
       Object.entries(selectors)
         .map(([selector, { validator, handler }]) => {
-          if (validator == null) {
-            return null;
-          }
           return [
             selector,
             (node: Parameters<typeof handler>[0]): void => {