chore: bring in new tests from recent merge

Author: dclark27

src/client/v3/index.v3.test.ts

@@ -3,7 +3,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Client, getSupportedElicitationModes } from '../index.js';
 import * as z from 'zod/v3';
-import { AnyObjectSchema } from '../../server/zod-compat.js';
 import {
     RequestSchema,
     NotificationSchema,
@@ -912,22 +911,25 @@ test('should apply defaults for form-mode elicitation when applyDefaults is enab
  * Test that custom request/notification/result schemas can be used with the Client class.
  */
 test('should typecheck', () => {
-    const GetWeatherRequestSchema = RequestSchema.extend({
+    const GetWeatherRequestSchema = z.object({
+        ...RequestSchema.shape,
         method: z.literal('weather/get'),
         params: z.object({
             city: z.string()
         })
     });
 
-    const GetForecastRequestSchema = RequestSchema.extend({
+    const GetForecastRequestSchema = z.object({
+        ...RequestSchema.shape,
         method: z.literal('weather/forecast'),
         params: z.object({
             city: z.string(),
             days: z.number()
         })
     });
 
-    const WeatherForecastNotificationSchema = NotificationSchema.extend({
+    const WeatherForecastNotificationSchema = z.object({
+        ...NotificationSchema.shape,
         method: z.literal('weather/alert'),
         params: z.object({
             severity: z.enum(['warning', 'watch']),
@@ -937,7 +939,9 @@ test('should typecheck', () => {
 
     const WeatherRequestSchema = GetWeatherRequestSchema.or(GetForecastRequestSchema);
     const WeatherNotificationSchema = WeatherForecastNotificationSchema;
-    const WeatherResultSchema = ResultSchema.extend({
+    const WeatherResultSchema = z.object({
+        ...ResultSchema.shape,
+        _meta: z.record(z.string(), z.unknown()).optional(),
         temperature: z.number(),
         conditions: z.string()
     });

src/server/index.ts

@@ -354,7 +354,7 @@ export class Server<
         params: LegacyElicitRequestFormParams | ElicitRequestFormParams | ElicitRequestURLParams,
         options?: RequestOptions
     ): Promise<ElicitResult> {
-        const mode = 'mode' in params ? params.mode : 'form';
+        const mode = ('mode' in params ? params.mode : 'form') as 'form' | 'url';
 
         switch (mode) {
             case 'url': {
@@ -370,7 +370,9 @@ export class Server<
                     throw new Error('Client does not support form elicitation.');
                 }
                 const formParams: ElicitRequestFormParams =
-                    'mode' in params ? (params as ElicitRequestFormParams) : { ...(params as LegacyElicitRequestFormParams), mode: 'form' };
+                    'mode' in params
+                        ? (params as ElicitRequestFormParams)
+                        : ({ ...(params as LegacyElicitRequestFormParams), mode: 'form' } as ElicitRequestFormParams);
 
                 const result = await this.request({ method: 'elicitation/create', params: formParams }, ElicitResultSchema, options);
 

src/server/zod-json-schema-compat.ts

@@ -9,7 +9,7 @@ import type * as z4c from 'zod/v4/core';
 
 import * as z4mini from 'zod/v4-mini';
 
-import { AnyObjectSchema, isZ4Schema } from './zod-compat.js';
+import { AnySchema, AnyObjectSchema, getObjectShape, safeParse, isZ4Schema, type ZodV3Internal, type ZodV4Internal } from './zod-compat.js';
 import { zodToJsonSchema } from 'zod-to-json-schema';
 
 type JsonSchema = Record<string, unknown>;
@@ -43,3 +43,52 @@ export function toJsonSchemaCompat(schema: AnyObjectSchema, opts?: CommonOpts):
         pipeStrategy: opts?.pipeStrategy ?? 'input'
     }) as JsonSchema;
 }
+
+export function getMethodLiteral(schema: AnyObjectSchema): string {
+    const shape = getObjectShape(schema);
+    const methodSchema = shape?.method as AnySchema | undefined;
+    if (!methodSchema) {
+        throw new Error('Schema is missing a method literal');
+    }
+
+    const value = getLiteralValue(methodSchema);
+    if (typeof value !== 'string') {
+        throw new Error('Schema method literal must be a string');
+    }
+
+    return value;
+}
+
+export function getLiteralValue(schema: AnySchema): unknown {
+    if (isZ4Schema(schema)) {
+        const v4Schema = schema as unknown as ZodV4Internal;
+        const v4Def = v4Schema._zod?.def;
+        const candidates = [v4Def?.value, Array.isArray(v4Def?.values) ? v4Def.values[0] : undefined, v4Schema.value];
+
+        for (const candidate of candidates) {
+            if (typeof candidate !== 'undefined') {
+                return candidate;
+            }
+        }
+    } else {
+        const v3Schema = schema as unknown as ZodV3Internal;
+        const legacyDef = v3Schema._def;
+        const candidates = [legacyDef?.value, Array.isArray(legacyDef?.values) ? legacyDef.values[0] : undefined, v3Schema.value];
+
+        for (const candidate of candidates) {
+            if (typeof candidate !== 'undefined') {
+                return candidate;
+            }
+        }
+    }
+
+    return undefined;
+}
+
+export function parseWithCompat(schema: AnySchema, data: unknown): unknown {
+    const result = safeParse(schema, data);
+    if (!result.success) {
+        throw result.error;
+    }
+    return result.data;
+}

src/shared/protocol.ts

@@ -1,13 +1,4 @@
-import {
-    AnySchema,
-    AnyObjectSchema,
-    SchemaOutput,
-    getObjectShape,
-    safeParse,
-    isZ4Schema,
-    type ZodV3Internal,
-    type ZodV4Internal
-} from '../server/zod-compat.js';
+import { AnySchema, AnyObjectSchema, SchemaOutput, safeParse } from '../server/zod-compat.js';
 import {
     CancelledNotificationSchema,
     ClientCapabilities,
@@ -36,6 +27,7 @@ import {
 } from '../types.js';
 import { Transport, TransportSendOptions } from './transport.js';
 import { AuthInfo } from '../server/auth/types.js';
+import { getMethodLiteral, parseWithCompat } from '../server/zod-json-schema-compat.js';
 
 /**
  * Callback for progress notifications.
@@ -730,55 +722,3 @@ export function mergeCapabilities<T extends ServerCapabilities | ClientCapabilit
     }
     return result;
 }
-
-// Helper functions for Zod v3/v4 compatibility
-
-function getMethodLiteral(schema: AnyObjectSchema): string {
-    const shape = getObjectShape(schema);
-    const methodSchema = shape?.method as AnySchema | undefined;
-    if (!methodSchema) {
-        throw new Error('Schema is missing a method literal');
-    }
-
-    const value = getLiteralValue(methodSchema);
-    if (typeof value !== 'string') {
-        throw new Error('Schema method literal must be a string');
-    }
-
-    return value;
-}
-
-function getLiteralValue(schema: AnySchema): unknown {
-    if (isZ4Schema(schema)) {
-        const v4Schema = schema as unknown as ZodV4Internal;
-        const v4Def = v4Schema._zod?.def;
-        const candidates = [v4Def?.value, Array.isArray(v4Def?.values) ? v4Def.values[0] : undefined, v4Schema.value];
-
-        for (const candidate of candidates) {
-            if (typeof candidate !== 'undefined') {
-                return candidate;
-            }
-        }
-    } else {
-        const v3Schema = schema as unknown as ZodV3Internal;
-        const legacyDef = v3Schema._def;
-        const candidates = [legacyDef?.value, Array.isArray(legacyDef?.values) ? legacyDef.values[0] : undefined, v3Schema.value];
-
-        for (const candidate of candidates) {
-            if (typeof candidate !== 'undefined') {
-                return candidate;
-            }
-        }
-    }
-
-    return undefined;
-}
-
-function parseWithCompat(schema: AnySchema, data: unknown): unknown {
-    const result = safeParse(schema, data);
-    if (!result.success) {
-        // Type guard: if success is false, error is guaranteed to exist
-        throw result.error;
-    }
-    return result.data;
-}