@orpc/zod 0.0.0-next.a9447ff → 0.0.0-next.a9d0401

package/dist/zod4/index.d.mts

@@ -2,7 +2,7 @@ import { Context } from '@orpc/server';
 import { StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { AnySchema } from '@orpc/contract';
 import { JSONSchema, SchemaConvertOptions, ConditionalSchemaConverter } from '@orpc/openapi';
-import { Interceptor, ThrowableError, Promisable } from '@orpc/shared';
+import { Interceptor } from '@orpc/shared';
 import * as zod_v4_core from 'zod/v4/core';
 import { $ZodType, $input, $output } from 'zod/v4/core';
 
@@ -46,7 +46,7 @@ interface experimental_ZodToJsonSchemaOptions {
     }, [
         required: boolean,
         jsonSchema: Exclude<JSONSchema, boolean>
-    ], ThrowableError>[];
+    ]>[];
 }
 declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
     #private;
@@ -57,7 +57,7 @@ declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchema
     private readonly interceptors;
     constructor(options?: experimental_ZodToJsonSchemaOptions);
     condition(schema: AnySchema | undefined): boolean;
-    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): Promisable<[required: boolean, jsonSchema: Exclude<JSONSchema, boolean>]>;
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: Exclude<JSONSchema, boolean>];
 }
 
 /**

package/dist/zod4/index.d.ts

@@ -2,7 +2,7 @@ import { Context } from '@orpc/server';
 import { StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { AnySchema } from '@orpc/contract';
 import { JSONSchema, SchemaConvertOptions, ConditionalSchemaConverter } from '@orpc/openapi';
-import { Interceptor, ThrowableError, Promisable } from '@orpc/shared';
+import { Interceptor } from '@orpc/shared';
 import * as zod_v4_core from 'zod/v4/core';
 import { $ZodType, $input, $output } from 'zod/v4/core';
 
@@ -46,7 +46,7 @@ interface experimental_ZodToJsonSchemaOptions {
     }, [
         required: boolean,
         jsonSchema: Exclude<JSONSchema, boolean>
-    ], ThrowableError>[];
+    ]>[];
 }
 declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
     #private;
@@ -57,7 +57,7 @@ declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchema
     private readonly interceptors;
     constructor(options?: experimental_ZodToJsonSchemaOptions);
     condition(schema: AnySchema | undefined): boolean;
-    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): Promisable<[required: boolean, jsonSchema: Exclude<JSONSchema, boolean>]>;
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: Exclude<JSONSchema, boolean>];
 }
 
 /**

package/dist/zod4/index.mjs

@@ -100,8 +100,7 @@ class experimental_ZodSmartCoercionPlugin {
         }
         return value;
       }
-      case "object":
-      case "interface": {
+      case "object": {
         const object = schema;
         if (value === void 0) {
           return {};
@@ -165,9 +164,21 @@ class experimental_ZodSmartCoercionPlugin {
           return this.#coerce(union._zod.def.options[0], value);
         }
         if (isObject(value)) {
+          const discriminator = "discriminator" in union._zod.def && typeof union._zod.def.discriminator === "string" ? union._zod.def.discriminator : void 0;
           for (const option of union._zod.def.options) {
-            if (option._zod.disc && this.#matchDiscriminators(value, option._zod.disc)) {
-              return this.#coerce(option, value);
+            if (!option._zod.propValues) {
+              continue;
+            }
+            if (discriminator !== void 0) {
+              if (option._zod.propValues[discriminator]?.has(value[discriminator])) {
+                return this.#coerce(option, value);
+              }
+            } else {
+              for (const key in option._zod.propValues) {
+                if (option._zod.propValues[key]?.has(value[key])) {
+                  return this.#coerce(option, value);
+                }
+              }
             }
           }
         }
@@ -255,30 +266,6 @@ class experimental_ZodSmartCoercionPlugin {
     }
     return value;
   }
-  /**
-   * This function is inspired from Zod, because it's not exported
-   * https://github.com/colinhacks/zod/blob/v4/packages/core/src/schemas.ts#L1903C1-L1921C2
-   */
-  #matchDiscriminators(input, discs) {
-    for (const [key, value] of discs) {
-      const data = input[key];
-      if (value.values.size && !value.values.has(data)) {
-        return false;
-      }
-      if (value.maps.length === 0) {
-        continue;
-      }
-      if (!isObject(data)) {
-        return false;
-      }
-      for (const m of value.maps) {
-        if (!this.#matchDiscriminators(data, m)) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
 }
 
 const experimental_JSON_SCHEMA_REGISTRY = registry();
@@ -308,11 +295,11 @@ class experimental_ZodToJsonSchemaConverter {
     return intercept(
       this.interceptors,
       { schema, options, lazyDepth, isHandledCustomJSONSchema },
-      async ({ schema: schema2, options: options2, lazyDepth: lazyDepth2, isHandledCustomJSONSchema: isHandledCustomJSONSchema2 }) => {
+      ({ schema: schema2, options: options2, lazyDepth: lazyDepth2, isHandledCustomJSONSchema: isHandledCustomJSONSchema2 }) => {
         if (!isHandledCustomJSONSchema2) {
           const customJSONSchema = this.#getCustomJsonSchema(schema2, options2);
           if (customJSONSchema) {
-            const [required, json] = await this.#convert(schema2, options2, lazyDepth2, true);
+            const [required, json] = this.#convert(schema2, options2, lazyDepth2, true);
             return [required, { ...json, ...customJSONSchema }];
           }
         }
@@ -320,7 +307,7 @@ class experimental_ZodToJsonSchemaConverter {
           case "string": {
             const string = schema2;
             const json = { type: "string" };
-            const { minimum, maximum, format, pattern, contentEncoding } = string._zod.bag;
+            const { minimum, maximum, format, patterns, contentEncoding } = string._zod.bag;
             if (typeof minimum === "number") {
               json.minLength = minimum;
             }
@@ -333,8 +320,15 @@ class experimental_ZodToJsonSchemaConverter {
             if (typeof format === "string" && format !== "regex" && json.contentEncoding === void 0) {
               json.format = this.#handleStringFormat(format);
             }
-            if (pattern instanceof RegExp && json.contentEncoding === void 0 && json.format === void 0) {
-              json.pattern = pattern.source;
+            if (patterns instanceof Set && json.contentEncoding === void 0 && json.format === void 0) {
+              for (const pattern of patterns) {
+                if (json.pattern === void 0) {
+                  json.pattern = pattern.source;
+                } else {
+                  json.allOf ??= [];
+                  json.allOf.push({ pattern: pattern.source });
+                }
+              }
             }
             if (format === "jwt" && json.contentEncoding === void 0 && json.format === void 0 && json.pattern === void 0) {
               json.pattern = /^[\w-]+\.[\w-]+\.[\w-]+$/.source;
@@ -400,14 +394,14 @@ class experimental_ZodToJsonSchemaConverter {
             if (typeof maximum === "number") {
               json.maxItems = maximum;
             }
-            json.items = this.#handleArrayItemJsonSchema(await this.#convert(array._zod.def.element, options2, lazyDepth2), options2);
+            json.items = this.#handleArrayItemJsonSchema(this.#convert(array._zod.def.element, options2, lazyDepth2), options2);
             return [true, json];
           }
           case "object": {
             const object = schema2;
             const json = { type: "object" };
             for (const [key, value] of Object.entries(object._zod.def.shape)) {
-              const [itemRequired, itemJson] = await this.#convert(value, options2, lazyDepth2);
+              const [itemRequired, itemJson] = this.#convert(value, options2, lazyDepth2);
               json.properties ??= {};
               json.properties[key] = itemJson;
               if (itemRequired) {
@@ -419,7 +413,7 @@ class experimental_ZodToJsonSchemaConverter {
               if (object._zod.def.catchall._zod.def.type === "never") {
                 json.additionalProperties = false;
               } else {
-                const [_, addJson] = await this.#convert(object._zod.def.catchall, options2, lazyDepth2);
+                const [_, addJson] = this.#convert(object._zod.def.catchall, options2, lazyDepth2);
                 json.additionalProperties = addJson;
               }
             }
@@ -430,7 +424,7 @@ class experimental_ZodToJsonSchemaConverter {
             const anyOf = [];
             let required = true;
             for (const item of union._zod.def.options) {
-              const [itemRequired, itemJson] = await this.#convert(item, options2, lazyDepth2);
+              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2);
               if (!itemRequired) {
                 required = false;
               }
@@ -451,7 +445,7 @@ class experimental_ZodToJsonSchemaConverter {
             const json = { allOf: [] };
             let required = false;
             for (const item of [intersection._zod.def.left, intersection._zod.def.right]) {
-              const [itemRequired, itemJson] = await this.#convert(item, options2, lazyDepth2);
+              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2);
               json.allOf.push(itemJson);
               if (itemRequired) {
                 required = true;
@@ -463,10 +457,10 @@ class experimental_ZodToJsonSchemaConverter {
             const tuple = schema2;
             const json = { type: "array", prefixItems: [] };
             for (const item of tuple._zod.def.items) {
-              json.prefixItems.push(this.#handleArrayItemJsonSchema(await this.#convert(item, options2, lazyDepth2), options2));
+              json.prefixItems.push(this.#handleArrayItemJsonSchema(this.#convert(item, options2, lazyDepth2), options2));
             }
             if (tuple._zod.def.rest) {
-              json.items = this.#handleArrayItemJsonSchema(await this.#convert(tuple._zod.def.rest, options2, lazyDepth2), options2);
+              json.items = this.#handleArrayItemJsonSchema(this.#convert(tuple._zod.def.rest, options2, lazyDepth2), options2);
             }
             const { minimum, maximum } = tuple._zod.bag;
             if (typeof minimum === "number") {
@@ -480,8 +474,8 @@ class experimental_ZodToJsonSchemaConverter {
           case "record": {
             const record = schema2;
             const json = { type: "object" };
-            json.propertyNames = (await this.#convert(record._zod.def.keyType, options2, lazyDepth2))[1];
-            json.additionalProperties = (await this.#convert(record._zod.def.valueType, options2, lazyDepth2))[1];
+            json.propertyNames = this.#convert(record._zod.def.keyType, options2, lazyDepth2)[1];
+            json.additionalProperties = this.#convert(record._zod.def.valueType, options2, lazyDepth2)[1];
             return [true, json];
           }
           case "map": {
@@ -491,8 +485,8 @@ class experimental_ZodToJsonSchemaConverter {
               items: {
                 type: "array",
                 prefixItems: [
-                  this.#handleArrayItemJsonSchema(await this.#convert(map._zod.def.keyType, options2, lazyDepth2), options2),
-                  this.#handleArrayItemJsonSchema(await this.#convert(map._zod.def.valueType, options2, lazyDepth2), options2)
+                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.keyType, options2, lazyDepth2), options2),
+                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.valueType, options2, lazyDepth2), options2)
                 ],
                 maxItems: 2,
                 minItems: 2
@@ -504,7 +498,7 @@ class experimental_ZodToJsonSchemaConverter {
             return [true, {
               type: "array",
               uniqueItems: true,
-              items: this.#handleArrayItemJsonSchema(await this.#convert(set._zod.def.valueType, options2, lazyDepth2), options2)
+              items: this.#handleArrayItemJsonSchema(this.#convert(set._zod.def.valueType, options2, lazyDepth2), options2)
             }];
           }
           case "enum": {
@@ -544,12 +538,12 @@ class experimental_ZodToJsonSchemaConverter {
           }
           case "nullable": {
             const nullable = schema2;
-            const [required, json] = await this.#convert(nullable._zod.def.innerType, options2, lazyDepth2);
+            const [required, json] = this.#convert(nullable._zod.def.innerType, options2, lazyDepth2);
             return [required, { anyOf: [json, { type: "null" }] }];
           }
           case "nonoptional": {
             const nonoptional = schema2;
-            const [, json] = await this.#convert(nonoptional._zod.def.innerType, options2, lazyDepth2);
+            const [, json] = this.#convert(nonoptional._zod.def.innerType, options2, lazyDepth2);
             return [true, json];
           }
           case "success": {
@@ -558,7 +552,7 @@ class experimental_ZodToJsonSchemaConverter {
           case "default":
           case "prefault": {
             const default_ = schema2;
-            const [, json] = await this.#convert(default_._zod.def.innerType, options2, lazyDepth2);
+            const [, json] = this.#convert(default_._zod.def.innerType, options2, lazyDepth2);
             return [false, {
               ...json,
               default: default_._zod.def.defaultValue
@@ -566,18 +560,18 @@ class experimental_ZodToJsonSchemaConverter {
           }
           case "catch": {
             const catch_ = schema2;
-            return await this.#convert(catch_._zod.def.innerType, options2, lazyDepth2);
+            return this.#convert(catch_._zod.def.innerType, options2, lazyDepth2);
           }
           case "nan": {
             return [true, options2.strategy === "input" ? this.unsupportedJsonSchema : { type: "null" }];
           }
           case "pipe": {
             const pipe = schema2;
-            return await this.#convert(options2.strategy === "input" ? pipe._zod.def.in : pipe._zod.def.out, options2, lazyDepth2);
+            return this.#convert(options2.strategy === "input" ? pipe._zod.def.in : pipe._zod.def.out, options2, lazyDepth2);
           }
           case "readonly": {
             const readonly_ = schema2;
-            const [required, json] = await this.#convert(readonly_._zod.def.innerType, options2, lazyDepth2);
+            const [required, json] = this.#convert(readonly_._zod.def.innerType, options2, lazyDepth2);
             return [required, { ...json, readOnly: true }];
           }
           case "template_literal": {
@@ -589,7 +583,7 @@ class experimental_ZodToJsonSchemaConverter {
           }
           case "optional": {
             const optional = schema2;
-            const [, json] = await this.#convert(optional._zod.def.innerType, options2, lazyDepth2);
+            const [, json] = this.#convert(optional._zod.def.innerType, options2, lazyDepth2);
             return [false, json];
           }
           case "lazy": {
@@ -597,7 +591,7 @@ class experimental_ZodToJsonSchemaConverter {
             if (lazyDepth2 >= this.maxLazyDepth) {
               return [false, this.anyJsonSchema];
             }
-            return await this.#convert(lazy._zod.def.getter(), options2, lazyDepth2 + 1);
+            return this.#convert(lazy._zod.def.getter(), options2, lazyDepth2 + 1);
           }
           default: {
             schema2._zod.def.type;
@@ -621,7 +615,7 @@ class experimental_ZodToJsonSchemaConverter {
     if (global) {
       return {
         description: global.description,
-        examples: global.examples
+        examples: Array.isArray(global.examples) ? global.examples : void 0
       };
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/zod",
   "type": "module",
-  "version": "0.0.0-next.a9447ff",
+  "version": "0.0.0-next.a9d0401",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -30,17 +30,17 @@
   ],
   "peerDependencies": {
     "zod": ">=3.24.2",
-    "@orpc/server": "0.0.0-next.a9447ff",
-    "@orpc/contract": "0.0.0-next.a9447ff"
+    "@orpc/contract": "0.0.0-next.a9d0401",
+    "@orpc/server": "0.0.0-next.a9d0401"
   },
   "dependencies": {
     "escape-string-regexp": "^5.0.0",
     "wildcard-match": "^5.1.3",
-    "@orpc/openapi": "0.0.0-next.a9447ff",
-    "@orpc/shared": "0.0.0-next.a9447ff"
+    "@orpc/openapi": "0.0.0-next.a9d0401",
+    "@orpc/shared": "0.0.0-next.a9d0401"
   },
   "devDependencies": {
-    "zod": "^3.25.7",
+    "zod": "^3.25.49",
     "zod-to-json-schema": "^3.24.5"
   },
   "scripts": {