@dexto/core 1.6.26 → 1.7.0

package/dist/utils/zod-schema-converter.cjs

@@ -23,84 +23,84 @@ __export(zod_schema_converter_exports, {
 });
 module.exports = __toCommonJS(zod_schema_converter_exports);
 var import_zod = require("zod");
+function isJsonSchemaObject(schema) {
+  return !!schema && typeof schema === "object" && !Array.isArray(schema);
+}
+function getJsonSchemaTypes(schema) {
+  const { type } = schema;
+  if (Array.isArray(type)) {
+    return type;
+  }
+  return type ? [type] : [];
+}
+function getJsonSchemaType(schema) {
+  const types = getJsonSchemaTypes(schema);
+  return types.find((type) => type !== "null") ?? types[0];
+}
+function hasNullableJsonSchemaType(schema) {
+  return getJsonSchemaTypes(schema).includes("null");
+}
+function getZodTypeForJsonSchemaType(propSchema, type) {
+  switch (type) {
+    case "string":
+      return import_zod.z.string();
+    case "number":
+      return import_zod.z.number();
+    case "integer":
+      return import_zod.z.number().int();
+    case "boolean":
+      return import_zod.z.boolean();
+    case "object":
+      return import_zod.z.object(jsonSchemaToZodShape(propSchema));
+    case "array": {
+      const itemSchema = getPropertySchema(propSchema.items);
+      return import_zod.z.array(itemSchema ? getZodTypeFromProperty(itemSchema) : import_zod.z.unknown());
+    }
+    case "null":
+      return import_zod.z.null();
+    default:
+      return import_zod.z.unknown();
+  }
+}
+function getPropertySchema(schema) {
+  return isJsonSchemaObject(schema) ? schema : null;
+}
 function jsonSchemaToZodShape(jsonSchema) {
-  if (!jsonSchema || typeof jsonSchema !== "object" || jsonSchema.type !== "object") {
+  if (!isJsonSchemaObject(jsonSchema) || getJsonSchemaType(jsonSchema) !== "object") {
     return {};
   }
   const shape = {};
-  if (jsonSchema.properties) {
-    for (const [key, property] of Object.entries(jsonSchema.properties)) {
-      const propSchema = property;
-      let zodType;
-      switch (propSchema.type) {
-        case "string":
-          zodType = import_zod.z.string();
-          break;
-        case "number":
-          zodType = import_zod.z.number();
-          break;
-        case "integer":
-          zodType = import_zod.z.number().int();
-          break;
-        case "boolean":
-          zodType = import_zod.z.boolean();
-          break;
-        case "array":
-          if (propSchema.items) {
-            const itemType = getZodTypeFromProperty(propSchema.items);
-            zodType = import_zod.z.array(itemType);
-          } else {
-            zodType = import_zod.z.array(import_zod.z.any());
-          }
-          break;
-        case "object":
-          zodType = import_zod.z.object(jsonSchemaToZodShape(propSchema));
-          break;
-        default:
-          zodType = import_zod.z.any();
-      }
-      if (propSchema.description) {
-        zodType._def.description = propSchema.description;
-        zodType = zodType.describe(propSchema.description);
-      }
-      if (!jsonSchema.required || !jsonSchema.required.includes(key)) {
-        zodType = zodType.optional();
-      }
-      shape[key] = zodType;
+  const properties = jsonSchema.properties ?? {};
+  for (const [key, property] of Object.entries(properties)) {
+    const propSchema = getPropertySchema(property);
+    let zodType = propSchema ? getZodTypeFromProperty(propSchema) : import_zod.z.unknown();
+    if (!Array.isArray(jsonSchema.required) || !jsonSchema.required.includes(key)) {
+      zodType = zodType.optional();
     }
+    shape[key] = zodType;
   }
   return shape;
 }
 function getZodTypeFromProperty(propSchema) {
+  const nonNullTypes = getJsonSchemaTypes(propSchema).filter(
+    (type) => type !== "null"
+  );
   let zodType;
-  switch (propSchema.type) {
-    case "string":
-      zodType = import_zod.z.string();
-      break;
-    case "number":
-      zodType = import_zod.z.number();
-      break;
-    case "integer":
-      zodType = import_zod.z.number().int();
-      break;
-    case "boolean":
-      zodType = import_zod.z.boolean();
-      break;
-    case "object":
-      zodType = import_zod.z.object(jsonSchemaToZodShape(propSchema));
-      break;
-    case "array":
-      if (propSchema.items) {
-        zodType = import_zod.z.array(getZodTypeFromProperty(propSchema.items));
-      } else {
-        zodType = import_zod.z.array(import_zod.z.any());
-      }
-      break;
-    default:
-      zodType = import_zod.z.any();
+  if (nonNullTypes.length === 0) {
+    zodType = hasNullableJsonSchemaType(propSchema) ? import_zod.z.null() : import_zod.z.unknown();
+  } else {
+    const zodTypes = nonNullTypes.map((type) => getZodTypeForJsonSchemaType(propSchema, type));
+    const [firstType, secondType, ...restTypes] = zodTypes;
+    if (!firstType) {
+      zodType = import_zod.z.unknown();
+    } else {
+      zodType = secondType ? import_zod.z.union([firstType, secondType, ...restTypes]) : firstType;
+    }
+  }
+  if (hasNullableJsonSchemaType(propSchema) && nonNullTypes.length > 0) {
+    zodType = zodType.nullable();
   }
   if (propSchema.description) {
-    zodType._def.description = propSchema.description;
     zodType = zodType.describe(propSchema.description);
   }
   return zodType;

package/dist/utils/zod-schema-converter.d.ts

@@ -1,11 +1,12 @@
 import { z } from 'zod';
+import type { JSONSchema7 } from 'json-schema';
 /**
  * Converts a JSON Schema object to a Zod raw shape.
  * This is a simplified converter that handles common MCP tool schemas.
  */
-export declare function jsonSchemaToZodShape(jsonSchema: any): z.ZodRawShape;
+export declare function jsonSchemaToZodShape(jsonSchema: unknown): z.ZodRawShape;
 /**
  * Helper function to get a Zod type from a property schema
  */
-export declare function getZodTypeFromProperty(propSchema: any): z.ZodTypeAny;
+export declare function getZodTypeFromProperty(propSchema: JSONSchema7): z.ZodType;
 //# sourceMappingURL=zod-schema-converter.d.ts.map

package/dist/utils/zod-schema-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zod-schema-converter.d.ts","sourceRoot":"","sources":["../../src/utils/zod-schema-converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,GAAG,GAAG,CAAC,CAAC,WAAW,CAwDnE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,GAAG,GAAG,CAAC,CAAC,UAAU,CAsCpE"}
+{"version":3,"file":"zod-schema-converter.d.ts","sourceRoot":"","sources":["../../src/utils/zod-schema-converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,WAAW,EAA8C,MAAM,aAAa,CAAC;AAuD3F;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,GAAG,CAAC,CAAC,WAAW,CAoBvE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,WAAW,GAAG,CAAC,CAAC,OAAO,CA2BzE"}

package/dist/utils/zod-schema-converter.js

@@ -1,83 +1,83 @@
 import "../chunk-PTJYTZNU.js";
 import { z } from "zod";
+function isJsonSchemaObject(schema) {
+  return !!schema && typeof schema === "object" && !Array.isArray(schema);
+}
+function getJsonSchemaTypes(schema) {
+  const { type } = schema;
+  if (Array.isArray(type)) {
+    return type;
+  }
+  return type ? [type] : [];
+}
+function getJsonSchemaType(schema) {
+  const types = getJsonSchemaTypes(schema);
+  return types.find((type) => type !== "null") ?? types[0];
+}
+function hasNullableJsonSchemaType(schema) {
+  return getJsonSchemaTypes(schema).includes("null");
+}
+function getZodTypeForJsonSchemaType(propSchema, type) {
+  switch (type) {
+    case "string":
+      return z.string();
+    case "number":
+      return z.number();
+    case "integer":
+      return z.number().int();
+    case "boolean":
+      return z.boolean();
+    case "object":
+      return z.object(jsonSchemaToZodShape(propSchema));
+    case "array": {
+      const itemSchema = getPropertySchema(propSchema.items);
+      return z.array(itemSchema ? getZodTypeFromProperty(itemSchema) : z.unknown());
+    }
+    case "null":
+      return z.null();
+    default:
+      return z.unknown();
+  }
+}
+function getPropertySchema(schema) {
+  return isJsonSchemaObject(schema) ? schema : null;
+}
 function jsonSchemaToZodShape(jsonSchema) {
-  if (!jsonSchema || typeof jsonSchema !== "object" || jsonSchema.type !== "object") {
+  if (!isJsonSchemaObject(jsonSchema) || getJsonSchemaType(jsonSchema) !== "object") {
     return {};
   }
   const shape = {};
-  if (jsonSchema.properties) {
-    for (const [key, property] of Object.entries(jsonSchema.properties)) {
-      const propSchema = property;
-      let zodType;
-      switch (propSchema.type) {
-        case "string":
-          zodType = z.string();
-          break;
-        case "number":
-          zodType = z.number();
-          break;
-        case "integer":
-          zodType = z.number().int();
-          break;
-        case "boolean":
-          zodType = z.boolean();
-          break;
-        case "array":
-          if (propSchema.items) {
-            const itemType = getZodTypeFromProperty(propSchema.items);
-            zodType = z.array(itemType);
-          } else {
-            zodType = z.array(z.any());
-          }
-          break;
-        case "object":
-          zodType = z.object(jsonSchemaToZodShape(propSchema));
-          break;
-        default:
-          zodType = z.any();
-      }
-      if (propSchema.description) {
-        zodType._def.description = propSchema.description;
-        zodType = zodType.describe(propSchema.description);
-      }
-      if (!jsonSchema.required || !jsonSchema.required.includes(key)) {
-        zodType = zodType.optional();
-      }
-      shape[key] = zodType;
+  const properties = jsonSchema.properties ?? {};
+  for (const [key, property] of Object.entries(properties)) {
+    const propSchema = getPropertySchema(property);
+    let zodType = propSchema ? getZodTypeFromProperty(propSchema) : z.unknown();
+    if (!Array.isArray(jsonSchema.required) || !jsonSchema.required.includes(key)) {
+      zodType = zodType.optional();
     }
+    shape[key] = zodType;
   }
   return shape;
 }
 function getZodTypeFromProperty(propSchema) {
+  const nonNullTypes = getJsonSchemaTypes(propSchema).filter(
+    (type) => type !== "null"
+  );
   let zodType;
-  switch (propSchema.type) {
-    case "string":
-      zodType = z.string();
-      break;
-    case "number":
-      zodType = z.number();
-      break;
-    case "integer":
-      zodType = z.number().int();
-      break;
-    case "boolean":
-      zodType = z.boolean();
-      break;
-    case "object":
-      zodType = z.object(jsonSchemaToZodShape(propSchema));
-      break;
-    case "array":
-      if (propSchema.items) {
-        zodType = z.array(getZodTypeFromProperty(propSchema.items));
-      } else {
-        zodType = z.array(z.any());
-      }
-      break;
-    default:
-      zodType = z.any();
+  if (nonNullTypes.length === 0) {
+    zodType = hasNullableJsonSchemaType(propSchema) ? z.null() : z.unknown();
+  } else {
+    const zodTypes = nonNullTypes.map((type) => getZodTypeForJsonSchemaType(propSchema, type));
+    const [firstType, secondType, ...restTypes] = zodTypes;
+    if (!firstType) {
+      zodType = z.unknown();
+    } else {
+      zodType = secondType ? z.union([firstType, secondType, ...restTypes]) : firstType;
+    }
+  }
+  if (hasNullableJsonSchemaType(propSchema) && nonNullTypes.length > 0) {
+    zodType = zodType.nullable();
   }
   if (propSchema.description) {
-    zodType._def.description = propSchema.description;
     zodType = zodType.describe(propSchema.description);
   }
   return zodType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexto/core",
-  "version": "1.6.26",
+  "version": "1.7.0",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -46,8 +46,7 @@
     "glob": "^12.0.0",
     "nanoid": "^5.1.6",
     "winston": "^3.17.0",
-    "yaml": "^2.8.3",
-    "zod-to-json-schema": "^3.24.6"
+    "yaml": "^2.8.3"
   },
   "devDependencies": {
     "@opentelemetry/instrumentation-http": "^0.210.0",
@@ -58,7 +57,7 @@
     "@opentelemetry/semantic-conventions": "^1.28.0",
     "@types/diff": "^8.0.0",
     "@types/json-schema": "^7.0.15",
-    "zod": "^3.25.0"
+    "zod": "^4.3.6"
   },
   "peerDependencies": {
     "@opentelemetry/core": "^1.28.0",
@@ -74,7 +73,7 @@
     "ioredis": "^5.7.0",
     "pg": "^8.15.4",
     "tsx": "^4.19.2",
-    "zod": "^3.25.0"
+    "zod": "^4.3.6"
   },
   "peerDependenciesMeta": {
     "@opentelemetry/core": {