modelcontextprotocol/typescript-sdk
Watch
1
0
Fork
You've already forked typescript-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix Zod object detection logic

Browse source 
Previously, this check was `value instanceof ZodType`, which breaks if
the user is using a different version of Zod than the library. Instead,
do the check using the structure of the input object rather than its
prototype chain.

Additionally, this adds a vendored version of Zod to use for tests, which
ensures that regressions like this would be caught next time.
This commit is contained in:
Glen Maddern 2025-05-09 15:23:50 +10:00
commit b6617dc44c
1 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/server/mcp.ts
View file

@ -659,16 +659,6 @@ export class McpServer {
if (this._registeredTools[name]) {
throw new Error(`Tool ${name} is already registered`);
}
// Helper to check if an object is a Zod schema (ZodRawShape)
const isZodRawShape = (obj: unknown): obj is ZodRawShape => {
if (typeof obj !== "object" || obj === null) return false;
const isEmptyObject = z.object({}).strict().safeParse(obj).success;
// Check if object is empty or at least one property is a ZodType instance
return isEmptyObject || Object.values(obj as object).some(v => v instanceof ZodType);
};
let description: string | undefined;
if (typeof rest[0] === "string") {
@ -931,6 +921,25 @@ const EMPTY_OBJECT_JSON_SCHEMA = {
type: "object" as const,
};
// Helper to check if an object is a Zod schema (ZodRawShape)
function isZodRawShape(obj: unknown): obj is ZodRawShape {
if (typeof obj !== "object" || obj === null) return false;
const isEmptyObject = z.object({}).strict().safeParse(obj).success;
// Check if object is empty or at least one property is a ZodType instance
return isEmptyObject || Object.values(obj as object).some(isZodType);
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
function isZodType(value: any): value is ZodType {
return value !== null &&
typeof value === 'object' &&
typeof value.parse === 'function' &&
typeof value.safeParse === 'function' &&
typeof value._def === 'object';
}
/**
* Additional, optional information for annotating a resource.
*/