@mcp-b/global 2.0.3-canary.1 → 2.0.3-canary.2

package/dist/index.js

@@ -1,7 +1,7 @@
 import { IframeChildTransport, TabServerTransport } from "@mcp-b/transports";
 import { CallToolRequestSchema, GetPromptRequestSchema, ListPromptsRequestSchema, ListResourcesRequestSchema, ListToolsRequestSchema, ReadResourceRequestSchema, Server } from "@mcp-b/webmcp-ts-sdk";
 import { z } from "zod";
-import { fromJSONSchema, toJSONSchema } from "zod/v4";
+import { zodToJsonSchema as zodToJsonSchema$1 } from "zod-to-json-schema";
 
 //#region src/logger.ts
 /**
@@ -92,14 +92,50 @@ function createLogger(namespace) {
 //#region src/validation.ts
 const logger$2 = createLogger("WebModelContext");
 /**
+* Check if a schema is a Zod 4 schema.
+* Zod 4 schemas have a `_zod` property, Zod 3 schemas have `_def`.
+*/
+function isZod4Schema(schema) {
+	if (typeof schema !== "object" || schema === null) return false;
+	return "_zod" in schema;
+}
+/**
+* Check if a schema is a Zod 3 schema.
+*/
+function isZod3Schema(schema) {
+	if (typeof schema !== "object" || schema === null) return false;
+	return "_def" in schema && !("_zod" in schema);
+}
+let zodV4Module = null;
+let zodV4LoadAttempted = false;
+/**
+* Attempt to load zod/v4 module. Returns null if not available (Zod 3.x).
+*/
+async function getZodV4Module() {
+	if (zodV4LoadAttempted) return zodV4Module;
+	zodV4LoadAttempted = true;
+	try {
+		const mod = await import("zod/v4");
+		zodV4Module = {
+			toJSONSchema: mod.toJSONSchema,
+			fromJSONSchema: "fromJSONSchema" in mod ? mod.fromJSONSchema : void 0
+		};
+	} catch {
+		zodV4Module = null;
+	}
+	return zodV4Module;
+}
+function getZodV4ModuleSync() {
+	return zodV4Module;
+}
+getZodV4Module().catch(() => {});
+/**
 * Detect if a schema is a Zod schema object (Record<string, ZodType>)
 * or a JSON Schema object.
 *
 * Uses duck-typing to detect Zod schemas:
 * - Zod 4 schemas have `_zod` property
 * - Zod 3 schemas have `_def` property
-*
-* Both are supported as of Zod 3.25+ (which includes Zod 4 under the hood).
 */
 function isZodSchema(schema) {
 	if (typeof schema !== "object" || schema === null) return false;
@@ -108,44 +144,66 @@ function isZodSchema(schema) {
 	if (values.length === 0) return false;
 	for (const val of values) {
 		if (val == null || typeof val !== "object") continue;
-		const obj = val;
-		if ("_zod" in obj || "_def" in obj) return true;
+		if (isZod4Schema(val) || isZod3Schema(val)) return true;
 	}
 	return false;
 }
 /**
-* Convert JSON Schema to Zod validator.
-* Uses fromJSONSchema from 'zod/v4' which is available in Zod 3.25+ and Zod 4.
+* Convert Zod schema object to JSON Schema.
+* Uses the appropriate method based on detected Zod version:
+* - Zod 4: Built-in toJSONSchema from zod/v4
+* - Zod 3: zod-to-json-schema external library
+*
+* @param schema - Record of Zod type definitions (e.g., { name: z.string(), age: z.number() })
+* @returns JSON Schema object compatible with MCP InputSchema
 */
-function jsonSchemaToZod(jsonSchema) {
+function zodToJsonSchema(schema) {
+	const zodObject = z.object(schema);
+	const zodV4 = getZodV4ModuleSync();
+	if (isZod4Schema(zodObject) && zodV4?.toJSONSchema) try {
+		const { $schema: _,...rest } = zodV4.toJSONSchema(zodObject, { target: "draft-7" });
+		return rest;
+	} catch (error) {
+		logger$2.warn("Zod 4 toJSONSchema failed, falling back to zod-to-json-schema:", error);
+	}
 	try {
-		return fromJSONSchema(jsonSchema);
+		const { $schema: _,...rest } = zodToJsonSchema$1(zodObject, {
+			strictUnions: true,
+			$refStrategy: "none"
+		});
+		return rest;
 	} catch (error) {
-		logger$2.warn("Failed to convert JSON Schema to Zod:", error);
-		return z.object({}).passthrough();
+		logger$2.warn("zod-to-json-schema failed:", error);
+		return {
+			type: "object",
+			properties: {}
+		};
 	}
 }
 /**
-* Convert Zod schema object to JSON Schema.
-* Uses toJSONSchema from 'zod/v4' which is available in Zod 3.25+ and Zod 4.
-*
-* Works with schemas created from both `import { z } from 'zod'` (Zod 3.25+ compat)
-* and `import { z } from 'zod/v4'` (native Zod 4).
+* Convert JSON Schema to Zod validator.
+* Only available in Zod 4.x via fromJSONSchema.
+* Falls back to a passthrough validator in Zod 3.x.
 *
-* @param schema - Record of Zod type definitions (e.g., { name: z.string(), age: z.number() })
-* @returns JSON Schema object compatible with MCP InputSchema
+* Note: When using Zod 3.x with JSON Schema input, server-side validation
+* is skipped. The MCP client still validates against the JSON Schema.
 */
-function zodToJsonSchema(schema) {
-	const { $schema: _,...rest } = toJSONSchema(z.object(schema));
-	return rest;
+function jsonSchemaToZod(jsonSchema) {
+	const zodV4 = getZodV4ModuleSync();
+	if (zodV4?.fromJSONSchema) try {
+		return zodV4.fromJSONSchema(jsonSchema);
+	} catch (error) {
+		logger$2.warn("fromJSONSchema failed:", error);
+	}
+	else logger$2.debug("fromJSONSchema not available (Zod 3.x). Server-side validation will be skipped for JSON Schema input. Upgrade to Zod 4.x for full JSON Schema validation support.");
+	return z.object({}).passthrough();
 }
 /**
 * Normalize a schema to both JSON Schema and Zod formats.
 * Detects which format is provided and converts to the other.
 *
 * Supports:
-* - Zod schemas from `import { z } from 'zod'` (Zod 3.25+ compat layer)
-* - Zod schemas from `import { z } from 'zod/v4'` (native Zod 4)
+* - Zod schemas from Zod 3.x or Zod 4.x
 * - Plain JSON Schema objects
 */
 function normalizeSchema(schema) {