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

package/dist/index.js

@@ -1,6 +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/v4";
+import { z } from "zod";
+import { fromJSONSchema, toJSONSchema } from "zod/v4";
 
 //#region src/logger.ts
 /**
@@ -94,42 +95,58 @@ const logger$2 = createLogger("WebModelContext");
 * Detect if a schema is a Zod schema object (Record<string, ZodType>)
 * or a JSON Schema object.
 *
-* Uses duck-typing to detect Zod 4 schemas by checking for the `_zod` property.
+* 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;
 	if ("type" in schema && typeof schema.type === "string") return false;
 	const values = Object.values(schema);
 	if (values.length === 0) return false;
-	return values.some((val) => val != null && typeof val === "object" && "_zod" in val);
+	for (const val of values) {
+		if (val == null || typeof val !== "object") continue;
+		const obj = val;
+		if ("_zod" in obj || "_def" in obj) return true;
+	}
+	return false;
 }
 /**
-* Convert JSON Schema to Zod validator
-* Uses Zod 4's native z.fromJSONSchema() for conversion
+* Convert JSON Schema to Zod validator.
+* Uses fromJSONSchema from 'zod/v4' which is available in Zod 3.25+ and Zod 4.
 */
 function jsonSchemaToZod(jsonSchema) {
 	try {
-		return z.fromJSONSchema(jsonSchema);
+		return fromJSONSchema(jsonSchema);
 	} catch (error) {
 		logger$2.warn("Failed to convert JSON Schema to Zod:", error);
 		return z.object({}).passthrough();
 	}
 }
 /**
-* Convert Zod schema object to JSON Schema
-* Uses Zod 4's native z.toJSONSchema() for conversion
+* 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).
 *
 * @param schema - Record of Zod type definitions (e.g., { name: z.string(), age: z.number() })
 * @returns JSON Schema object compatible with MCP InputSchema
 */
 function zodToJsonSchema(schema) {
-	const zodObject = z.object(schema);
-	const { $schema: _,...rest } = z.toJSONSchema(zodObject);
+	const { $schema: _,...rest } = toJSONSchema(z.object(schema));
 	return rest;
 }
 /**
-* Normalize a schema to both JSON Schema and Zod formats
-* Detects which format is provided and converts to the other
+* 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)
+* - Plain JSON Schema objects
 */
 function normalizeSchema(schema) {
 	if (isZodSchema(schema)) return {
@@ -181,6 +198,7 @@ const POLYFILL_MARKER_PROPERTY = "__isWebMCPPolyfill";
 * @returns Detection result with flags for native context and testing API availability
 */
 function detectNativeAPI() {
+	/* c8 ignore next 2 */
 	if (typeof window === "undefined" || typeof navigator === "undefined") return {
 		hasNativeContext: false,
 		hasNativeTesting: false
@@ -188,8 +206,8 @@ function detectNativeAPI() {
 	const modelContext = navigator.modelContext;
 	const modelContextTesting = navigator.modelContextTesting;
 	if (!modelContext || !modelContextTesting) return {
-		hasNativeContext: false,
-		hasNativeTesting: false
+		hasNativeContext: Boolean(modelContext),
+		hasNativeTesting: Boolean(modelContextTesting)
 	};
 	if (POLYFILL_MARKER_PROPERTY in modelContextTesting && modelContextTesting[POLYFILL_MARKER_PROPERTY] === true) return {
 		hasNativeContext: false,
@@ -898,11 +916,11 @@ var WebModelContext = class {
 	* @private
 	*/
 	validateResource(resource) {
-		const templateParamRegex = /\{([^}]+)\}/g;
+		const templateParamRegex = /\{([^}]{1,100})\}/g;
 		const templateParams = [];
 		for (const match of resource.uri.matchAll(templateParamRegex)) {
 			const paramName = match[1];
-			if (paramName) templateParams.push(paramName);
+			templateParams.push(paramName);
 		}
 		return {
 			uri: resource.uri,
@@ -1318,7 +1336,13 @@ var WebModelContext = class {
 	async readResource(uri) {
 		const staticResource = this.bridge.resources.get(uri);
 		if (staticResource && !staticResource.isTemplate) try {
-			const parsedUri = new URL(uri);
+			let parsedUri;
+			try {
+				parsedUri = new URL(uri);
+			} catch {
+				parsedUri = new URL(`custom-scheme:///${encodeURIComponent(uri)}`);
+				parsedUri.originalUri = uri;
+			}
 			return await staticResource.read(parsedUri);
 		} catch (error) {
 			logger$1.error(`Error reading resource ${uri}:`, error);
@@ -1328,7 +1352,13 @@ var WebModelContext = class {
 			if (!resource.isTemplate) continue;
 			const params = this.matchUriTemplate(resource.uri, uri);
 			if (params) try {
-				const parsedUri = new URL(uri);
+				let parsedUri;
+				try {
+					parsedUri = new URL(uri);
+				} catch {
+					parsedUri = new URL(`custom-scheme:///${encodeURIComponent(uri)}`);
+					parsedUri.originalUri = uri;
+				}
 				return await resource.read(parsedUri, params);
 			} catch (error) {
 				logger$1.error(`Error reading resource ${uri}:`, error);
@@ -1361,8 +1391,7 @@ var WebModelContext = class {
 		const params = {};
 		for (let i = 0; i < paramNames.length; i++) {
 			const paramName = paramNames[i];
-			const paramValue = match[i + 1];
-			if (paramName !== void 0 && paramValue !== void 0) params[paramName] = paramValue;
+			params[paramName] = match[i + 1];
 		}
 		return params;
 	}
@@ -1640,6 +1669,7 @@ function initializeMCPBridge(options) {
 * ```
 */
 function initializeWebModelContext(options) {
+	/* c8 ignore next 4 */
 	if (typeof window === "undefined") {
 		logger$1.warn("Not in browser environment, skipping initialization");
 		return;
@@ -1733,6 +1763,7 @@ function initializeWebModelContext(options) {
 * ```
 */
 function cleanupWebModelContext() {
+	/* c8 ignore next */
 	if (typeof window === "undefined") return;
 	if (window.__mcpBridge) try {
 		window.__mcpBridge.tabServer.close();