clean up

Author: KKonstantinov

src/client/index.ts

@@ -45,6 +45,12 @@ import type { JsonSchemaType, JsonSchemaValidator, jsonSchemaValidator } from '.
 import { ZodLiteral, ZodObject, z } from 'zod';
 import type { RequestHandlerExtra } from '../shared/protocol.js';
 
+/**
+ * Elicitation default application helper. Applies defaults to the data based on the schema.
+ *
+ * @param schema - The schema to apply defaults to.
+ * @param data - The data to apply defaults to.
+ */
 function applyElicitationDefaults(schema: JsonSchemaType | undefined, data: unknown): void {
     if (!schema || data === null || typeof data !== 'object') return;
 
@@ -65,20 +71,6 @@ function applyElicitationDefaults(schema: JsonSchemaType | undefined, data: unkn
         }
     }
 
-    // Handle arrays
-    if (schema.type === 'array' && Array.isArray(data) && schema.items) {
-        const itemsSchema = schema.items as JsonSchemaType | JsonSchemaType[];
-        if (Array.isArray(itemsSchema)) {
-            for (let i = 0; i < data.length && i < itemsSchema.length; i++) {
-                applyElicitationDefaults(itemsSchema[i], data[i]);
-            }
-        } else {
-            for (const item of data) {
-                applyElicitationDefaults(itemsSchema, item);
-            }
-        }
-    }
-
     // Combine schemas
     if (Array.isArray(schema.allOf)) {
         for (const sub of schema.allOf) {

src/server/elicitation.test.ts

@@ -364,10 +364,7 @@ function testElicitationFlow(validatorProvider: typeof ajvProvider | typeof cfWo
             }
         );
 
-        const client = new Client(
-            { name: 'test-client', version: '1.0.0' },
-            { capabilities: { elicitation: {} }, jsonSchemaValidator: validatorProvider }
-        );
+        const client = new Client({ name: 'test-client', version: '1.0.0' }, { capabilities: { elicitation: {} } });
 
         client.setRequestHandler(ElicitRequestSchema, _request => ({
             action: 'accept',
@@ -401,10 +398,7 @@ function testElicitationFlow(validatorProvider: typeof ajvProvider | typeof cfWo
             }
         );
 
-        const client = new Client(
-            { name: 'test-client', version: '1.0.0' },
-            { capabilities: { elicitation: {} }, jsonSchemaValidator: validatorProvider }
-        );
+        const client = new Client({ name: 'test-client', version: '1.0.0' }, { capabilities: { elicitation: {} } });
 
         client.setRequestHandler(ElicitRequestSchema, _request => ({
             action: 'decline'
@@ -438,10 +432,7 @@ function testElicitationFlow(validatorProvider: typeof ajvProvider | typeof cfWo
             }
         );
 
-        const client = new Client(
-            { name: 'test-client', version: '1.0.0' },
-            { capabilities: { elicitation: {} }, jsonSchemaValidator: validatorProvider }
-        );
+        const client = new Client({ name: 'test-client', version: '1.0.0' }, { capabilities: { elicitation: {} } });
 
         client.setRequestHandler(ElicitRequestSchema, _request => ({
             action: 'cancel'