fix: enable type-checking in types/test.ts

.eslintrc.cjs

@@ -8,7 +8,7 @@ module.exports = {
   parser: '@typescript-eslint/parser',
   parserOptions: {
     tsconfigRootDir: __dirname,
-    project: './tsconfig.eslint.json',
+    project: './tsconfig.json',
     // Because we are setting "type": "module" in our package.json, all `.js` files are treated as modules
     // Sometimes we will want a commonjs file, like this eslint config, in which case we use the .cjs extension
     extraFileExtensions: ['.cjs'],

src/index.ts

@@ -5,7 +5,7 @@ import type { Mock } from '@vitest/spy';
 export type FetchMock = Mock<typeof global.fetch> & FetchMockObject;
 
 class FetchMockObject {
-  private readonly isMocking = vitest.fn(always(true));
+  public readonly isMocking = vitest.fn(always(true));
 
   constructor(
     private mockedFetch: Mock<typeof global.fetch>,
@@ -139,12 +139,16 @@ class FetchMockObject {
 
   // reject (error)
   mockReject(error?: ErrorOrFunction): FetchMock {
-    this.mockedFetch.mockImplementation(() => normalizeError(error));
+    this.mockedFetch.mockImplementation((input: RequestInput, requestInit?: RequestInit) =>
+      normalizeError(normalizeRequest(input, requestInit), error)
+    );
     return this.chainingResultProvider();
   }
 
   mockRejectOnce(error?: ErrorOrFunction): FetchMock {
-    this.mockedFetch.mockImplementationOnce(() => normalizeError(error));
+    this.mockedFetch.mockImplementationOnce((input: RequestInput, requestInit?: RequestInit) =>
+      normalizeError(normalizeRequest(input, requestInit), error)
+    );
     return this.chainingResultProvider();
   }
 
@@ -301,7 +305,7 @@ type RequestInput = string | URL | Request;
 type ResponseProvider = (request: Request) => ResponseLike | Promise<ResponseLike>;
 type ResponseLike = MockResponse | ResponseBody | Response;
 type ResponseBody = string;
-type ErrorOrFunction = Error | string | ((...args: any[]) => Promise<Response>);
+type ErrorOrFunction = Error | ResponseBody | ResponseProvider;
 
 export interface MockParams {
   status?: number;
@@ -411,8 +415,12 @@ function always(toggle: boolean): (input: RequestInput, requestInit?: RequestIni
   return () => toggle;
 }
 
-const normalizeError = (errorOrFunction?: ErrorOrFunction): Promise<Response> =>
-  typeof errorOrFunction === 'function' ? errorOrFunction() : Promise.reject(errorOrFunction);
+const normalizeError = async (request: Request, errorOrFunction?: ErrorOrFunction): Promise<Response> =>
+    errorOrFunction instanceof Error
+        ? Promise.reject(errorOrFunction)
+        : typeof errorOrFunction === 'function'
+            ? buildResponse(request, errorOrFunction)
+            : Promise.reject(errorOrFunction);
 
 function abortError(): Error {
   return new DOMException('The operation was aborted.');

tests/api.test.ts

@@ -277,7 +277,7 @@ describe('request', () => {
 
     try {
       const response = await request();
-      expect(response.type).toBe(contentType);
+      expect(response).toMatchObject({ message: contentType });
     } catch (e) {
       console.log(e);
     }

tsconfig.json

@@ -8,7 +8,7 @@
     "baseUrl": "./",
     "paths": {
       "vitest-fetch-mock": [
-        "./src"
+        "./src/index.ts"
       ]
     },
     "strict": true,
@@ -27,6 +27,8 @@
     "noEmit": true
   },
   "include": [
-    "./src/**/*.ts"
+    "./src/**/*.ts",
+    "./tests/**/*.ts",
+    "./types/**/*.ts"
   ]
 }

types/test.ts

@@ -1,6 +1,7 @@
-import setupFm, { MockResponseInit } from 'vitest-fetch-mock';
+import setupFm, { type MockResponse } from 'vitest-fetch-mock';
+import { vi } from 'vitest';
 
-const fetchMock = setupFm();
+const fetchMock = setupFm(vi);
 
 fetchMock.mockResponse(JSON.stringify({foo: "bar"}));
 fetchMock.mockResponse(JSON.stringify({foo: "bar"}), {
@@ -85,14 +86,14 @@ fetchMock.doMockOnce();
 fetchMock.dontMockOnce();
 fetchMock.mockOnce();
 
-async function someAsyncHandler(): Promise<MockResponseInit> {
+async function someAsyncHandler(): Promise<MockResponse> {
     return {
         status: 200,
         body: await someAsyncStringHandler()
     };
 }
 
-function someSyncHandler(): MockResponseInit {
+function someSyncHandler(): MockResponse {
     return {
         status: 200,
         body: someSyncStringHandler()