fix: Disallow null in CreateFilterParams["context"]

neet · neet · commit 6139683f859a · 2025-11-30T10:15:27.000+09:00
diff --git a/eslint.config.js b/eslint.config.js
@@ -8,7 +8,6 @@ import tseslint from "typescript-eslint";
 
 import allowNullInOptionalParameter from "./eslint/allow-null-in-optional-parameter.js";
 import namingConvention from "./eslint/naming-convention.js";
-import noOptional from "./eslint/no-optional.js";
 
 export default tseslint.config(
   eslint.configs.recommended,
@@ -33,7 +32,6 @@ export default tseslint.config(
       masto: {
         rules: {
           "allow-null-in-optional-parameter": allowNullInOptionalParameter,
-          "no-optional": noOptional,
           "naming-convention": namingConvention,
         },
       },
@@ -78,19 +76,13 @@ export default tseslint.config(
       },
     },
   },
-  // {
-  //   files: ["src/mastodon/{rest,oauth,streaming}/**/*.ts"],
-  //   rules: {
-  //     "masto/naming-convention": ["warn"],
-  //     "masto/allow-null-in-optional-parameter": ["warn"],
-  //   },
-  // },
-  // {
-  //   files: ["src/mastodon/entities/**/*.ts"],
-  //   rules: {
-  //     "masto/no-optional": ["warn"],
-  //   },
-  // },
+  {
+    files: ["src/mastodon/{rest,oauth,streaming}/**/*.ts"],
+    rules: {
+      // "masto/naming-convention": ["warn"],
+      "masto/allow-null-in-optional-parameter": ["warn"],
+    },
+  },
   {
     files: [
       "vitest.config.ts",
diff --git a/eslint/allow-null-in-optional-parameter.js b/eslint/allow-null-in-optional-parameter.js
@@ -4,34 +4,48 @@ export default {
     fixable: "code",
     schema: [],
     messages: {
-      default: "Always use `T | null` for optional property",
+      optionalWithoutNull: "Always use `T | null` for optional property",
+      nullWithoutOptional: "Mark nullable parameter as optional",
     },
   },
 
   create(context) {
     return {
       TSPropertySignature(node) {
-        if (!node.optional) {
-          return;
-        }
-
-        if (node.typeAnnotation.type !== "TSTypeAnnotation") {
-          return;
-        }
+        if (node.optional) {
+          if (node.typeAnnotation.type !== "TSTypeAnnotation") {
+            return;
+          }
 
-        if (
-          node.typeAnnotation.typeAnnotation.type !== "TSUnionType" ||
-          node.typeAnnotation.typeAnnotation.types.every(
-            (type) => type.type !== "TSNullKeyword",
-          )
-        ) {
-          context.report({
-            node,
-            messageId: "default",
-            fix: function* (fixer) {
-              yield fixer.insertTextAfter(node.typeAnnotation, " | null");
-            },
-          });
+          if (
+            node.typeAnnotation.typeAnnotation.type !== "TSUnionType" ||
+            node.typeAnnotation.typeAnnotation.types.every(
+              (type) => type.type !== "TSNullKeyword",
+            )
+          ) {
+            context.report({
+              node,
+              messageId: "optionalWithoutNull",
+              fix: function* (fixer) {
+                yield fixer.insertTextAfter(node.typeAnnotation, " | null");
+              },
+            });
+          }
+        } else {
+          if (
+            node.typeAnnotation.typeAnnotation.type === "TSUnionType" &&
+            node.typeAnnotation.typeAnnotation.types.some(
+              (type) => type.type === "TSNullKeyword",
+            )
+          ) {
+            context.report({
+              node,
+              messageId: "nullWithoutOptional",
+              fix: function* (fixer) {
+                yield fixer.insertTextAfter(node.key, "?");
+              },
+            });
+          }
         }
       },
     };
diff --git a/eslint/allow-null-in-optional-parameter.spec.js b/eslint/allow-null-in-optional-parameter.spec.js
@@ -30,5 +30,22 @@ ruleTester.run("allow-null-in-optional-parameter", rule, {
       }
       `,
     },
+    {
+      code: `
+      interface CreateAccountParams {
+        email: string | null; 
+      }
+      `,
+      errors: [
+        {
+          message: "Mark nullable parameter as optional",
+        },
+      ],
+      output: `
+      interface CreateAccountParams {
+        email?: string | null; 
+      }
+      `,
+    },
   ],
 });
diff --git a/eslint/no-optional.js b/eslint/no-optional.js
diff --git a/eslint/no-optional.spec.js b/eslint/no-optional.spec.js
diff --git a/src/mastodon/rest/v1/filters.ts b/src/mastodon/rest/v1/filters.ts
@@ -10,7 +10,7 @@ export interface CreateFilterParams {
    * Array of enumerable strings `home`, `notifications`, `public`, `thread`.
    * At least one context must be specified.
    */
-  readonly context: readonly FilterContext[] | null;
+  readonly context: readonly FilterContext[];
   /** Should the server irreversibly drop matching entities from home and notifications? */
   readonly irreversible?: boolean | null;
   /** Consider word boundaries? */
diff --git a/src/mastodon/rest/v2/filters.ts b/src/mastodon/rest/v2/filters.ts
@@ -15,7 +15,7 @@ export interface CreateFilterParams {
   /** String. The name of the filter group. */
   readonly title: string;
   /** Array of String. Where the filter should be applied. Specify at least one of home, notifications, public, thread, account. */
-  readonly context: readonly FilterContext[] | null;
+  readonly context: readonly FilterContext[];
   /** String. The policy to be applied when the filter is matched. Specify warn or hide. */
   readonly filterAction?: FilterAction | null;
   /** Integer. How many seconds from now should the filter expire? */
