more type fixes

Author: mattzcarey

src/client/auth.test.ts

@@ -1122,6 +1122,7 @@ describe('OAuth Authorization', () => {
             expect(mockFetch).toHaveBeenCalledTimes(1);
             expect(mockFetch.mock.calls[0][0].toString()).toBe('https://auth.example.com/token');
             expect(mockFetch.mock.calls[0][1].method).toBe('POST');
+            expect(mockFetch.mock.calls[0][1].headers.get('Content-Type')).toBe('application/x-www-form-urlencoded');
 
             const body = mockFetch.mock.calls[0][1].body as URLSearchParams;
             expect(body.get('grant_type')).toBe('authorization_code');

src/client/cross-spawn.test.ts

@@ -2,19 +2,20 @@ import { StdioClientTransport, getDefaultEnvironment } from './stdio.js';
 import spawn from 'cross-spawn';
 import { JSONRPCMessage } from '../types.js';
 import { ChildProcess } from 'node:child_process';
+import { Mock, MockedFunction } from 'vitest';
 
 // mock cross-spawn
 vi.mock('cross-spawn');
-const mockSpawn = spawn as vi.MockedFunction<typeof spawn>;
+const mockSpawn = spawn as unknown as MockedFunction<typeof spawn>;
 
 describe('StdioClientTransport using cross-spawn', () => {
     beforeEach(() => {
         // mock cross-spawn's return value
         mockSpawn.mockImplementation(() => {
             const mockProcess: {
-                on: vi.Mock;
-                stdin?: { on: vi.Mock; write: vi.Mock };
-                stdout?: { on: vi.Mock };
+                on: Mock;
+                stdin?: { on: Mock; write: Mock };
+                stdout?: { on: Mock };
                 stderr?: null;
             } = {
                 on: vi.fn((event: string, callback: () => void) => {
@@ -105,14 +106,14 @@ describe('StdioClientTransport using cross-spawn', () => {
 
         // get the mock process object
         const mockProcess: {
-            on: vi.Mock;
+            on: Mock;
             stdin: {
-                on: vi.Mock;
-                write: vi.Mock;
-                once: vi.Mock;
+                on: Mock;
+                write: Mock;
+                once: Mock;
             };
             stdout: {
-                on: vi.Mock;
+                on: Mock;
             };
             stderr: null;
         } = {

src/client/middleware.test.ts

@@ -1,6 +1,7 @@
 import { withOAuth, withLogging, applyMiddlewares, createMiddleware } from './middleware.js';
 import { OAuthClientProvider } from './auth.js';
 import { FetchLike } from '../shared/transport.js';
+import { MockInstance, Mocked, MockedFunction } from 'vitest';
 
 vi.mock('../client/auth.js', async () => {
     const actual = await vi.importActual<typeof import('../client/auth.js')>('../client/auth.js');
@@ -13,12 +14,12 @@ vi.mock('../client/auth.js', async () => {
 
 import { auth, extractWWWAuthenticateParams } from './auth.js';
 
-const mockAuth = auth as vi.MockedFunction<typeof auth>;
-const mockExtractWWWAuthenticateParams = extractWWWAuthenticateParams as vi.MockedFunction<typeof extractWWWAuthenticateParams>;
+const mockAuth = auth as MockedFunction<typeof auth>;
+const mockExtractWWWAuthenticateParams = extractWWWAuthenticateParams as MockedFunction<typeof extractWWWAuthenticateParams>;
 
 describe('withOAuth', () => {
-    let mockProvider: vi.Mocked<OAuthClientProvider>;
-    let mockFetch: vi.MockedFunction<FetchLike>;
+    let mockProvider: Mocked<OAuthClientProvider>;
+    let mockFetch: MockedFunction<FetchLike>;
 
     beforeEach(() => {
         vi.clearAllMocks();
@@ -371,8 +372,8 @@ describe('withOAuth', () => {
 });
 
 describe('withLogging', () => {
-    let mockFetch: vi.MockedFunction<FetchLike>;
-    let mockLogger: vi.MockedFunction<
+    let mockFetch: MockedFunction<FetchLike>;
+    let mockLogger: MockedFunction<
         (input: {
             method: string;
             url: string | URL;
@@ -384,8 +385,8 @@ describe('withLogging', () => {
             error?: Error;
         }) => void
     >;
-    let consoleErrorSpy: vi.SpyInstance;
-    let consoleLogSpy: vi.SpyInstance;
+    let consoleErrorSpy: MockInstance;
+    let consoleLogSpy: MockInstance;
 
     beforeEach(() => {
         vi.clearAllMocks();
@@ -614,7 +615,7 @@ describe('withLogging', () => {
 });
 
 describe('applyMiddleware', () => {
-    let mockFetch: vi.MockedFunction<FetchLike>;
+    let mockFetch: MockedFunction<FetchLike>;
 
     beforeEach(() => {
         vi.clearAllMocks();
@@ -743,8 +744,8 @@ describe('applyMiddleware', () => {
 });
 
 describe('Integration Tests', () => {
-    let mockProvider: vi.Mocked<OAuthClientProvider>;
-    let mockFetch: vi.MockedFunction<FetchLike>;
+    let mockProvider: Mocked<OAuthClientProvider>;
+    let mockFetch: MockedFunction<FetchLike>;
 
     beforeEach(() => {
         vi.clearAllMocks();
@@ -914,7 +915,7 @@ describe('Integration Tests', () => {
 });
 
 describe('createMiddleware', () => {
-    let mockFetch: vi.MockedFunction<FetchLike>;
+    let mockFetch: MockedFunction<FetchLike>;
 
     beforeEach(() => {
         vi.clearAllMocks();

src/client/sse.test.ts

@@ -5,6 +5,7 @@ import { SSEClientTransport } from './sse.js';
 import { OAuthClientProvider, UnauthorizedError } from './auth.js';
 import { OAuthTokens } from '../shared/auth.js';
 import { InvalidClientError, InvalidGrantError, UnauthorizedClientError } from '../server/auth/errors.js';
+import { Mock, Mocked, MockedFunction, MockInstance } from 'vitest';
 
 describe('SSEClientTransport', () => {
     let resourceServer: Server;
@@ -333,7 +334,7 @@ describe('SSEClientTransport', () => {
                     })
                 );
 
-                const calledHeaders = (global.fetch as vi.Mock).mock.calls[0][1].headers;
+                const calledHeaders = (global.fetch as Mock).mock.calls[0][1].headers;
                 expect(calledHeaders.get('Authorization')).toBe(customHeaders.Authorization);
                 expect(calledHeaders.get('X-Custom-Header')).toBe(customHeaders['X-Custom-Header']);
                 expect(calledHeaders.get('content-type')).toBe('application/json');
@@ -347,7 +348,7 @@ describe('SSEClientTransport', () => {
     describe('auth handling', () => {
         const authServerMetadataUrls = ['/.well-known/oauth-authorization-server', '/.well-known/openid-configuration'];
 
-        let mockAuthProvider: vi.Mocked<OAuthClientProvider>;
+        let mockAuthProvider: Mocked<OAuthClientProvider>;
 
         beforeEach(() => {
             mockAuthProvider = {
@@ -1124,19 +1125,10 @@ describe('SSEClientTransport', () => {
     });
 
     describe('custom fetch in auth code paths', () => {
-        let customFetch: vi.MockedFunction<typeof fetch>;
-        let globalFetchSpy: vi.SpyInstance;
-        let mockAuthProvider: vi.Mocked<OAuthClientProvider>;
-        let resourceServerHandler: vi.Mock<
-            void,
-            [
-                IncomingMessage,
-                ServerResponse<IncomingMessage> & {
-                    req: IncomingMessage;
-                }
-            ],
-            void
-        >;
+        let customFetch: MockedFunction<typeof fetch>;
+        let globalFetchSpy: MockInstance;
+        let mockAuthProvider: Mocked<OAuthClientProvider>;
+        let resourceServerHandler: Mock;
 
         /**
          * Helper function to create a mock auth provider with configurable behavior
@@ -1149,7 +1141,7 @@ describe('SSEClientTransport', () => {
                 clientRegistered?: boolean;
                 authorizationCode?: string;
             } = {}
-        ): vi.Mocked<OAuthClientProvider> => {
+        ): Mocked<OAuthClientProvider> => {
             const tokens = config.hasTokens
                 ? {
                       access_token: config.tokensExpired ? 'expired-token' : 'valid-token',
@@ -1317,7 +1309,7 @@ describe('SSEClientTransport', () => {
 
         it('uses custom fetch during auth flow on SSE connection 401 - no global fetch fallback', async () => {
             // Set up resource server that returns 401 on SSE connection and provides OAuth metadata
-            resourceServerHandler.mockImplementation((req, res) => {
+            resourceServerHandler.mockImplementation((req: IncomingMessage, res: ServerResponse) => {
                 if (req.url === '/') {
                     // Return 401 to trigger auth flow
                     res.writeHead(401, {
@@ -1361,7 +1353,7 @@ describe('SSEClientTransport', () => {
 
         it('uses custom fetch during auth flow on POST request 401 - no global fetch fallback', async () => {
             // Set up resource server that accepts SSE connection but returns 401 on POST
-            resourceServerHandler.mockImplementation((req, res) => {
+            resourceServerHandler.mockImplementation((req: IncomingMessage, res: ServerResponse) => {
                 switch (req.method) {
                     case 'GET':
                         if (req.url === '/') {

src/server/auth/handlers/register.test.ts

@@ -3,6 +3,7 @@ import { OAuthRegisteredClientsStore } from '../clients.js';
 import { OAuthClientInformationFull, OAuthClientMetadata } from '../../../shared/auth.js';
 import express from 'express';
 import supertest from 'supertest';
+import { MockInstance } from 'vitest';
 
 describe('Client Registration Handler', () => {
     // Mock client store with registration support
@@ -45,7 +46,7 @@ describe('Client Registration Handler', () => {
 
     describe('Request handling', () => {
         let app: express.Express;
-        let spyRegisterClient: vi.SpyInstance;
+        let spyRegisterClient: MockInstance;
 
         beforeEach(() => {
             // Setup express app with registration handler

src/server/auth/handlers/revoke.test.ts

@@ -6,6 +6,7 @@ import express, { Response } from 'express';
 import supertest from 'supertest';
 import { AuthInfo } from '../types.js';
 import { InvalidTokenError } from '../errors.js';
+import { MockInstance } from 'vitest';
 
 describe('Revocation Handler', () => {
     // Mock client data
@@ -130,7 +131,7 @@ describe('Revocation Handler', () => {
 
     describe('Request handling', () => {
         let app: express.Express;
-        let spyRevokeToken: vi.SpyInstance;
+        let spyRevokeToken: MockInstance;
 
         beforeEach(() => {
             // Setup express app with revocation handler

src/server/auth/middleware/bearerAuth.test.ts

@@ -1,4 +1,5 @@
 import { Request, Response } from 'express';
+import { Mock } from 'vitest';
 import { requireBearerAuth } from './bearerAuth.js';
 import { AuthInfo } from '../types.js';
 import { InsufficientScopeError, InvalidTokenError, CustomOAuthError, ServerError } from '../errors.js';
@@ -13,7 +14,7 @@ const mockVerifier: OAuthTokenVerifier = {
 describe('requireBearerAuth middleware', () => {
     let mockRequest: Partial<Request>;
     let mockResponse: Partial<Response>;
-    let nextFunction: vi.Mock;
+    let nextFunction: Mock;
 
     beforeEach(() => {
         mockRequest = {

src/server/auth/providers/proxyProvider.test.ts

@@ -5,7 +5,7 @@ import { OAuthClientInformationFull, OAuthTokens } from '../../../shared/auth.js
 import { ServerError } from '../errors.js';
 import { InvalidTokenError } from '../errors.js';
 import { InsufficientScopeError } from '../errors.js';
-import { type Mock } from "vitest"
+import { type Mock } from 'vitest';
 
 describe('Proxy OAuth Server Provider', () => {
     // Mock client data

src/server/mcp.test.ts

@@ -1705,7 +1705,7 @@ describe('tool()', () => {
         });
 
         // Spy on console.warn to verify warnings are logged
-        const warnSpy = vi.spyOn(console, 'warn').mockImplementation();
+        const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
 
         // Test valid tool names
         testServer.registerTool(

src/server/sse.test.ts

@@ -1,4 +1,5 @@
 import http from 'http';
+import { type Mocked } from 'vitest';
 
 import { SSEServerTransport } from './sse.js';
 import { McpServer } from './mcp.js';
@@ -15,7 +16,7 @@ const createMockResponse = () => {
         end: vi.fn<http.ServerResponse['end']>().mockReturnThis()
     };
 
-    return res as unknown as vi.Mocked<http.ServerResponse>;
+    return res as unknown as Mocked<http.ServerResponse>;
 };
 
 const createMockRequest = ({ headers = {}, body }: { headers?: Record<string, string>; body?: string } = {}) => {