fix: mcp test

Author: mattzcarey

src/server/mcp.test.ts

@@ -1,35 +1,25 @@
-import { Ajv } from 'ajv';
 import { z } from 'zod';
 import { Client } from '../client/index.js';
 import { InMemoryTransport } from '../inMemory.js';
-import { UriTemplate } from '../shared/uriTemplate.js';
 import { getDisplayName } from '../shared/metadataUtils.js';
+import { UriTemplate } from '../shared/uriTemplate.js';
 import {
     CallToolResultSchema,
     CompleteResultSchema,
     ElicitRequestSchema,
     GetPromptResultSchema,
     ListPromptsResultSchema,
-    ListResourceTemplatesResultSchema,
     ListResourcesResultSchema,
+    ListResourceTemplatesResultSchema,
     ListToolsResultSchema,
     LoggingMessageNotificationSchema,
-    Notification,
+    type Notification,
     ReadResourceResultSchema,
-    TextContent
+    type TextContent
 } from '../types.js';
-import { AjvJsonSchemaValidator } from '../validation/ajv-provider.js';
 import { completable } from './completable.js';
 import { McpServer, ResourceTemplate } from './mcp.js';
 
-// Set up AJV validator for tests
-const ajv = new Ajv({
-    strict: false,
-    validateFormats: false,
-    validateSchema: false
-});
-const ajvValidator = new AjvJsonSchemaValidator(ajv);
-
 describe('McpServer', () => {
     /***
      * Test: Basic Server Instance
@@ -121,11 +111,22 @@ describe('McpServer', () => {
                     }
                 }
 
-                return { content: [{ type: 'text' as const, text: `Operation completed with ${steps} steps` }] };
+                return {
+                    content: [
+                        {
+                            type: 'text' as const,
+                            text: `Operation completed with ${steps} steps`
+                        }
+                    ]
+                };
             }
         );
 
-        const progressUpdates: Array<{ progress: number; total?: number; message?: string }> = [];
+        const progressUpdates: Array<{
+            progress: number;
+            total?: number;
+            message?: string;
+        }> = [];
 
         const client = new Client({
             name: 'test client',
@@ -686,9 +687,15 @@ describe('tool()', () => {
 
         expect(result.tools).toHaveLength(2);
         expect(result.tools[0].name).toBe('test');
-        expect(result.tools[0].annotations).toEqual({ title: 'Test Tool', readOnlyHint: true });
+        expect(result.tools[0].annotations).toEqual({
+            title: 'Test Tool',
+            readOnlyHint: true
+        });
         expect(result.tools[1].name).toBe('test (new api)');
-        expect(result.tools[1].annotations).toEqual({ title: 'Test Tool', readOnlyHint: true });
+        expect(result.tools[1].annotations).toEqual({
+            title: 'Test Tool',
+            readOnlyHint: true
+        });
     });
 
     /***
@@ -731,7 +738,10 @@ describe('tool()', () => {
             type: 'object',
             properties: { name: { type: 'string' } }
         });
-        expect(result.tools[0].annotations).toEqual({ title: 'Test Tool', readOnlyHint: true });
+        expect(result.tools[0].annotations).toEqual({
+            title: 'Test Tool',
+            readOnlyHint: true
+        });
         expect(result.tools[1].name).toBe('test (new api)');
         expect(result.tools[1].inputSchema).toEqual(result.tools[0].inputSchema);
         expect(result.tools[1].annotations).toEqual(result.tools[0].annotations);
@@ -765,7 +775,11 @@ describe('tool()', () => {
             {
                 description: 'A tool with everything',
                 inputSchema: { name: z.string() },
-                annotations: { title: 'Complete Test Tool', readOnlyHint: true, openWorldHint: false }
+                annotations: {
+                    title: 'Complete Test Tool',
+                    readOnlyHint: true,
+                    openWorldHint: false
+                }
             },
             async ({ name }) => ({
                 content: [{ type: 'text', text: `Hello, ${name}!` }]
@@ -813,7 +827,11 @@ describe('tool()', () => {
             'test',
             'A tool with everything but empty params',
             {},
-            { title: 'Complete Test Tool with empty params', readOnlyHint: true, openWorldHint: false },
+            {
+                title: 'Complete Test Tool with empty params',
+                readOnlyHint: true,
+                openWorldHint: false
+            },
             async () => ({
                 content: [{ type: 'text', text: 'Test response' }]
             })
@@ -824,7 +842,11 @@ describe('tool()', () => {
             {
                 description: 'A tool with everything but empty params',
                 inputSchema: {},
-                annotations: { title: 'Complete Test Tool with empty params', readOnlyHint: true, openWorldHint: false }
+                annotations: {
+                    title: 'Complete Test Tool with empty params',
+                    readOnlyHint: true,
+                    openWorldHint: false
+                }
             },
             async () => ({
                 content: [{ type: 'text' as const, text: 'Test response' }]
@@ -1351,7 +1373,7 @@ describe('tool()', () => {
 
         expect(receivedRequestId).toBeDefined();
         expect(typeof receivedRequestId === 'string' || typeof receivedRequestId === 'number').toBe(true);
-        expect(result.content && result.content[0].text).toContain('Received request ID:');
+        expect(result.content?.[0].text).toContain('Received request ID:');
     });
 
     /***
@@ -1379,7 +1401,10 @@ describe('tool()', () => {
         });
 
         mcpServer.tool('test-tool', async ({ sendNotification }) => {
-            await sendNotification({ method: 'notifications/message', params: { level: 'debug', data: loggingMessage } });
+            await sendNotification({
+                method: 'notifications/message',
+                params: { level: 'debug', data: loggingMessage }
+            });
             return {
                 content: [
                     {
@@ -3892,15 +3917,10 @@ describe('elicitInput()', () => {
         jest.clearAllMocks();
 
         // Create server with restaurant booking tool
-        mcpServer = new McpServer(
-            {
-                name: 'restaurant-booking-server',
-                version: '1.0.0'
-            },
-            {
-                jsonSchemaValidator: ajvValidator
-            }
-        );
+        mcpServer = new McpServer({
+            name: 'restaurant-booking-server',
+            version: '1.0.0'
+        });
 
         // Register the restaurant booking tool from README example
         mcpServer.tool(
@@ -3981,8 +4001,7 @@ describe('elicitInput()', () => {
             {
                 capabilities: {
                     elicitation: {}
-                },
-                jsonSchemaValidator: ajvValidator
+                }
             }
         );
     });