Implement BYO zod v3 or v4

fredericbarthelet · fredericbarthelet · commit e99517d75cd1 · 2025-12-12T11:29:02.000+01:00
Following recommendations from https://zod.dev/library-authors
diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -102,7 +102,7 @@ import cors from "cors";
 import express from "express";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { z } from "zod";
+import * as z from "zod";
 
 const server = new McpServer({
   name: "My MCP App Server",
diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json
@@ -15,7 +15,7 @@
     "@modelcontextprotocol/sdk": "^1.22.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",
diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json
@@ -15,7 +15,7 @@
     "@modelcontextprotocol/sdk": "^1.22.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@modelcontextprotocol/ext-apps": "../..",
     "@modelcontextprotocol/sdk": "^1.22.0",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json
@@ -17,7 +17,7 @@
     "@modelcontextprotocol/ext-apps": "../..",
     "@modelcontextprotocol/sdk": "^1.22.0",
     "chart.js": "^4.4.0",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json
@@ -18,7 +18,7 @@
     "@modelcontextprotocol/sdk": "^1.22.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json
@@ -17,7 +17,7 @@
     "@modelcontextprotocol/ext-apps": "../..",
     "@modelcontextprotocol/sdk": "^1.22.0",
     "chart.js": "^4.4.0",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json
@@ -19,7 +19,7 @@
     "chart.js": "^4.4.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json
@@ -18,7 +18,7 @@
     "@modelcontextprotocol/sdk": "^1.22.0",
     "chart.js": "^4.4.0",
     "systeminformation": "^5.27.11",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json
@@ -19,7 +19,7 @@
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "three": "^0.181.0",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json
@@ -17,7 +17,7 @@
     "@modelcontextprotocol/ext-apps": "../..",
     "@modelcontextprotocol/sdk": "^1.22.0",
     "cheerio": "^1.0.0",
-    "zod": "^3.25.0"
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,13 +64,16 @@
     "ts-to-zod": "^5.1.0",
     "tsx": "^4.21.0",
     "typedoc": "^0.28.14",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "zod": "^4.1.13"
+  },
+  "peerDependencies": {
+    "zod": "^3.25.0 || ^4.0.0"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.24.3",
     "react": "^19.2.0",
-    "react-dom": "^19.2.0",
-    "zod": "^3.25"
+    "react-dom": "^19.2.0"
   },
   "optionalDependencies": {
     "@rollup/rollup-darwin-arm64": "^4.53.3",
diff --git a/scripts/generate-schemas.ts b/scripts/generate-schemas.ts
@@ -181,14 +181,14 @@ function postProcess(content: string): string {
   // 1. Update import to use zod/v4
   content = content.replace(
     'import { z } from "zod";',
-    'import { z } from "zod/v4";',
+    'import * as z from "zod/v4";',
   );
 
   // 2. Add MCP SDK schema imports
   const mcpImports = EXTERNAL_TYPE_SCHEMAS.join(",\n  ");
   content = content.replace(
-    'import { z } from "zod/v4";',
-    `import { z } from "zod/v4";
+    'import * as z from "zod/v4";',
+    `import * as z from "zod/v4";
 import {
   ${mcpImports},
 } from "@modelcontextprotocol/sdk/types.js";`,
@@ -262,7 +262,7 @@ function replaceRecordAndWithLooseObject(content: string): string {
 function postProcessTests(content: string): string {
   content = content.replace(
     'import { z } from "zod";',
-    'import { z } from "zod/v4";',
+    'import * as z from "zod/v4";',
   );
 
   content = content.replace(
diff --git a/src/app-bridge.ts b/src/app-bridge.ts
@@ -1,5 +1,5 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { ZodLiteral, ZodObject } from "zod/v4";
+import * as z from "zod/v4/core";
 
 import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import {
@@ -838,10 +838,10 @@ export class AppBridge extends Protocol<Request, Notification, Result> {
   }
 
   private forwardRequest<
-    Req extends ZodObject<{
-      method: ZodLiteral<string>;
+    Req extends z.$ZodObject<{
+      method: z.$ZodLiteral<string>;
     }>,
-    Res extends ZodObject<{}>,
+    Res extends z.$ZodObject<{}>,
   >(requestSchema: Req, resultSchema: Res) {
     this.setRequestHandler(requestSchema, async (request, extra) => {
       console.log(`Forwarding request ${request.method} from MCP UI client`);
@@ -851,7 +851,7 @@ export class AppBridge extends Protocol<Request, Notification, Result> {
     });
   }
   private forwardNotification<
-    N extends ZodObject<{ method: ZodLiteral<string> }>,
+    N extends z.$ZodObject<{ method: z.$ZodLiteral<string> }>,
   >(notificationSchema: N) {
     this.setNotificationHandler(notificationSchema, async (notification) => {
       console.log(
diff --git a/src/generated/schema.json b/src/generated/schema.json
diff --git a/src/generated/schema.test.ts b/src/generated/schema.test.ts
diff --git a/src/generated/schema.ts b/src/generated/schema.ts
