fix

Author: devmgn

oxlint.config.ts

@@ -135,14 +135,19 @@ export default defineConfig({
     "unicorn/switch-case-braces": ["error", "avoid"],
 
     // ── eslint-plugin-vitest (built-in) ──
+    "jest/prefer-importing-jest-globals": "off",
+    "jest/prefer-ending-with-an-expect": "off",
+
     "vitest/consistent-test-it": ["error", { fn: "it" }],
+    "vitest/no-hooks": "off",
     "vitest/no-importing-vitest-globals": "off",
     "vitest/no-standalone-expect": [
       "error",
       { additionalTestBlockFunctions: ["it.for"] },
     ],
     "vitest/prefer-called-once": "off",
     "vitest/prefer-importing-vitest-globals": "off",
+    "vitest/prefer-lowercase-title": "off",
     "vitest/prefer-to-be-falsy": "off",
     "vitest/prefer-to-be-truthy": "off",
     "vitest/require-hook": "off",

src/api/apiClient/apiClient.test.ts

@@ -1,6 +1,7 @@
 import { HttpResponse, http } from "msw";
 import { apiClient } from "./apiClient";
 import { server } from "../../mocks/server";
+import { ResponseError } from "../openapi";
 
 const BASE_URL = "https://jsonplaceholder.typicode.com";
 
@@ -70,7 +71,9 @@ describe("apiClient", () => {
         ),
       );
 
-      await expect(apiClient.postsPostIdGet({ postId: 999 })).rejects.toThrow();
+      await expect(apiClient.postsPostIdGet({ postId: 999 })).rejects.toThrow(
+        ResponseError,
+      );
     });
   });
 
@@ -119,7 +122,7 @@ describe("apiClient", () => {
 
       await expect(
         apiClient.postsPostIdDelete({ postId: 1 }),
-      ).rejects.toThrow();
+      ).rejects.toThrow(ResponseError);
     });
   });
 });

src/api/queries/post.queries.test.ts

@@ -2,6 +2,7 @@ import { QueryClient } from "@tanstack/react-query";
 import { HttpResponse, http } from "msw";
 import { getPostsQueryOptions } from "./post.queries";
 import { server } from "../../mocks/server";
+import { ResponseError } from "../openapi";
 
 const BASE_URL = "https://jsonplaceholder.typicode.com";
 
@@ -60,13 +61,13 @@ describe("getPostsQueryOptions", () => {
   it("queryKeyにリクエストパラメータが含まれること", () => {
     const options = getPostsQueryOptions({ userId: 1 });
 
-    expect(options.queryKey).toEqual(["getPosts", { userId: 1 }]);
+    expect(options.queryKey).toStrictEqual(["getPosts", { userId: 1 }]);
   });
 
   it("パラメータなしのqueryKeyが正しいこと", () => {
     const options = getPostsQueryOptions();
 
-    expect(options.queryKey).toEqual(["getPosts", {}]);
+    expect(options.queryKey).toStrictEqual(["getPosts", {}]);
   });
 
   it("APIエラー時に例外がスローされること", async () => {
@@ -81,14 +82,14 @@ describe("getPostsQueryOptions", () => {
 
     await expect(
       queryClient.fetchQuery(getPostsQueryOptions()),
-    ).rejects.toThrow();
+    ).rejects.toThrow(ResponseError);
   });
 
   it("空配列が返された場合に正しく処理されること", async () => {
     server.use(http.get(`${BASE_URL}/posts`, () => HttpResponse.json([])));
 
     const result = await queryClient.fetchQuery(getPostsQueryOptions());
 
-    expect(result).toEqual([]);
+    expect(result).toStrictEqual([]);
   });
 });

src/hooks/useIsComposing/useIsComposing.test.ts

@@ -37,17 +37,17 @@ describe(useIsComposing, () => {
         bubble: useIsComposing(false),
       }));
 
-      expect(result.current).toEqual({ capture: false, bubble: false });
+      expect(result.current).toStrictEqual({ capture: false, bubble: false });
 
       act(() => {
         dispatchComposition("compositionstart");
       });
-      expect(result.current).toEqual({ capture: true, bubble: true });
+      expect(result.current).toStrictEqual({ capture: true, bubble: true });
 
       act(() => {
         dispatchComposition("compositionend");
       });
-      expect(result.current).toEqual({ capture: false, bubble: false });
+      expect(result.current).toStrictEqual({ capture: false, bubble: false });
     });
   });
 

src/hooks/useLocalStorage/useLocalStorage.test.ts

@@ -56,18 +56,31 @@ describe(useLocalStorage, () => {
       expect(mockStorage.setItem).toHaveBeenCalledWith(key, "updated");
     });
 
-    it("関数型更新をサポートする（prev は string | null）", () => {
+    it("関数型更新 - 初回は prev として null が渡される", () => {
       const key = uniqueKey();
       const { result } = renderHook(() => useLocalStorage(key));
+      const updater = vi.fn<(prev: string | null) => string>(() => "a");
 
       act(() => {
-        result.current[1]((prev) => `${prev ?? ""}a`);
+        result.current[1](updater);
       });
+
+      expect(updater).toHaveBeenCalledWith(null);
       expect(result.current[0]).toBe("a");
+    });
+
+    it("関数型更新 - 2回目以降は prev として前回値が渡される", () => {
+      const key = uniqueKey();
+      const { result } = renderHook(() => useLocalStorage(key));
 
       act(() => {
-        result.current[1]((prev) => `${prev ?? ""}b`);
+        result.current[1]("a");
       });
+
+      act(() => {
+        result.current[1]((prev) => `${prev}b`);
+      });
+
       expect(result.current[0]).toBe("ab");
     });
 

src/hooks/useWebStorage/useWebStorage.test.ts

@@ -110,13 +110,14 @@ describe(useWebStorage, () => {
   it("関数型更新はストアの最新値に基づいて解決される", () => {
     const store = createMockStore();
     const key = uniqueKey();
+    store.write(key, "");
     const { result } = renderHook(() => useWebStorage(store, key));
 
     act(() => {
-      result.current[1]((prev) => `${prev ?? ""}a`);
+      result.current[1]((prev) => `${prev}a`);
     });
     act(() => {
-      result.current[1]((prev) => `${prev ?? ""}b`);
+      result.current[1]((prev) => `${prev}b`);
     });
 
     expect(result.current[0]).toBe("ab");
@@ -130,7 +131,7 @@ describe(useWebStorage, () => {
 
     act(() => {
       store.write(key, "base");
-      result.current[1]((prev) => `${prev ?? ""}+1`);
+      result.current[1]((prev) => `${prev}+1`);
     });
 
     expect(result.current[0]).toBe("base+1");
@@ -145,7 +146,7 @@ describe(useWebStorage, () => {
     rerender();
     rerender();
 
-    expect(vi.mocked(store.subscribe).mock.calls.length).toBe(initialCalls);
+    expect(store.subscribe).toHaveBeenCalledTimes(initialCalls);
   });
 
   it("アンマウント時に購読が解除される", () => {

src/utils/debounce/debounce.test.ts

@@ -176,16 +176,16 @@ describe(debounce, () => {
 
     it("leading コールバック内から再帰呼び出ししても leading が二重発火しないこと", () => {
       const calls: string[] = [];
-      const debounced = debounce(
-        (x: string) => {
-          calls.push(x);
-          if (x === "a") {
-            debounced("re-entry");
-          }
-        },
-        100,
-        { edges: ["leading"] },
-      );
+      const callback = vi.fn<(x: string) => void>((x) => {
+        calls.push(x);
+      });
+      const debounced = debounce(callback, 100, { edges: ["leading"] });
+
+      // 1 回目の invoke だけ再帰呼び出しする
+      callback.mockImplementationOnce((x) => {
+        calls.push(x);
+        debounced("re-entry");
+      });
 
       debounced("a");
       // 再帰呼び出しは isLeadingInvoked ガードにより leading 発火せず
@@ -428,12 +428,15 @@ describe(debounce, () => {
   describe("再帰呼び出し", () => {
     it("trailing コールバック内から再帰呼び出しした引数が失われないこと", () => {
       const calls: string[] = [];
-      const debounced = debounce((x: string) => {
+      const callback = vi.fn<(x: string) => void>((x) => {
         calls.push(x);
-        if (x === "a") {
-          debounced("re-entry");
-        }
-      }, 100);
+      });
+      const debounced = debounce(callback, 100);
+
+      callback.mockImplementationOnce((x) => {
+        calls.push(x);
+        debounced("re-entry");
+      });
 
       debounced("a");
       vi.advanceTimersByTime(100);
@@ -446,16 +449,17 @@ describe(debounce, () => {
 
     it("leading+trailing コールバック内から再帰呼び出しした引数が trailing で実行されること", () => {
       const calls: string[] = [];
-      const debounced = debounce(
-        (x: string) => {
-          calls.push(x);
-          if (x === "a") {
-            debounced("re-entry");
-          }
-        },
-        100,
-        { edges: ["leading", "trailing"] },
-      );
+      const callback = vi.fn<(x: string) => void>((x) => {
+        calls.push(x);
+      });
+      const debounced = debounce(callback, 100, {
+        edges: ["leading", "trailing"],
+      });
+
+      callback.mockImplementationOnce((x) => {
+        calls.push(x);
+        debounced("re-entry");
+      });
 
       debounced("a");
       expect(calls).toStrictEqual(["a"]);
@@ -1136,20 +1140,25 @@ describe(debounce, () => {
 
     it("再帰呼び出し時に保存した this が失われないこと", () => {
       const spy = vi.fn();
+      const callback = vi.fn<(this: { value: number }, step: number) => void>(
+        function defaultImpl(this: { value: number }, step) {
+          spy(this.value, step);
+        },
+      );
       const obj = {
         value: 1,
-        update: debounce(function update(
-          this: { value: number },
-          step: number,
-        ) {
-          spy(this.value, step);
-          if (step === 1) {
-            // trailing 実行中に再帰呼び出し
-            obj.update(2);
-          }
-        }, 100),
+        update: debounce(callback, 100),
       };
 
+      // 1 回目の trailing 実行中だけ再帰呼び出しする
+      callback.mockImplementationOnce(function recursingImpl(
+        this: { value: number },
+        step,
+      ) {
+        spy(this.value, step);
+        obj.update(2);
+      });
+
       obj.update(1);
       vi.advanceTimersByTime(100);
       expect(spy).toHaveBeenNthCalledWith(1, 1, 1);

src/utils/isFunction/isFunction.test.ts

@@ -30,12 +30,15 @@ describe(isFunction, () => {
     });
   });
 
+  // 型述語の narrowing 挙動そのものがテスト対象のため、各ブランチで expect する
   it("ユニオン型を関数成分で narrow する", () => {
     const union: string | (() => string) = returnX;
+    // oxlint-disable jest/no-conditional-in-test,jest/no-conditional-expect
     if (isFunction(union)) {
       expect(union()).toBe("x");
     } else {
       expect.unreachable();
     }
+    // oxlint-enable jest/no-conditional-in-test,jest/no-conditional-expect
   });
 });

vitest.config.ts

@@ -24,6 +24,9 @@ export default defineConfig({
     },
     testTimeout: 10_000,
     hookTimeout: 10_000,
+    restoreMocks: true,
+    unstubEnvs: true,
+    unstubGlobals: true,
     projects: [
       {
         extends: true,
@@ -39,9 +42,6 @@ export default defineConfig({
           environment: "happy-dom",
           globalSetup: "./vitest.globalSetup.ts",
           setupFiles: "./vitest.setup.ts",
-          restoreMocks: true,
-          unstubEnvs: true,
-          unstubGlobals: true,
         },
       },
       {