@orpc/zod 1.2.0 → 1.4.0

package/README.md

@@ -49,6 +49,7 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
 - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with NestJS.
 - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
 - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).

package/dist/zod4/index.d.mts

@@ -2,9 +2,9 @@ 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 * as _zod_core from '@zod/core';
-import { $ZodType, $input, $output } from '@zod/core';
+import { Interceptor } from '@orpc/shared';
+import * as zod_v4_core from 'zod/v4/core';
+import { $ZodType, $input, $output } from 'zod/v4/core';
 
 declare class experimental_ZodSmartCoercionPlugin<TContext extends Context> implements StandardHandlerPlugin<TContext> {
     #private;
@@ -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>];
 }
 
 /**
@@ -77,7 +77,7 @@ declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchema
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_REGISTRY: _zod_core.$ZodRegistry<{
+declare const experimental_JSON_SCHEMA_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -138,7 +138,7 @@ declare const experimental_JSON_SCHEMA_REGISTRY: _zod_core.$ZodRegistry<{
     unevaluatedProperties?: JSONSchema;
     uniqueItems?: boolean;
     writeOnly?: boolean;
-}, _zod_core.$ZodType<unknown, unknown>>;
+}, zod_v4_core.$ZodType<unknown, unknown>>;
 /**
  * Zod registry for customizing generated JSON schema, only useful for .input
  *
@@ -156,7 +156,7 @@ declare const experimental_JSON_SCHEMA_REGISTRY: _zod_core.$ZodRegistry<{
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: _zod_core.$ZodRegistry<{
+declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -217,7 +217,7 @@ declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: _zod_core.$ZodRegistry<{
     unevaluatedProperties?: JSONSchema;
     uniqueItems?: boolean;
     writeOnly?: boolean;
-}, _zod_core.$ZodType<unknown, unknown>>;
+}, zod_v4_core.$ZodType<unknown, unknown>>;
 /**
  * Zod registry for customizing generated JSON schema, only useful for .input
  *
@@ -235,7 +235,7 @@ declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: _zod_core.$ZodRegistry<{
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: _zod_core.$ZodRegistry<{
+declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -296,7 +296,7 @@ declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: _zod_core.$ZodRegistry<{
     unevaluatedProperties?: JSONSchema;
     uniqueItems?: boolean;
     writeOnly?: boolean;
-}, _zod_core.$ZodType<unknown, unknown>>;
+}, zod_v4_core.$ZodType<unknown, unknown>>;
 
 export { experimental_JSON_SCHEMA_INPUT_REGISTRY, experimental_JSON_SCHEMA_OUTPUT_REGISTRY, experimental_JSON_SCHEMA_REGISTRY, experimental_ZodSmartCoercionPlugin, experimental_ZodToJsonSchemaConverter };
 export type { experimental_ZodToJsonSchemaOptions };

package/dist/zod4/index.d.ts

@@ -2,9 +2,9 @@ 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 * as _zod_core from '@zod/core';
-import { $ZodType, $input, $output } from '@zod/core';
+import { Interceptor } from '@orpc/shared';
+import * as zod_v4_core from 'zod/v4/core';
+import { $ZodType, $input, $output } from 'zod/v4/core';
 
 declare class experimental_ZodSmartCoercionPlugin<TContext extends Context> implements StandardHandlerPlugin<TContext> {
     #private;
@@ -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>];
 }
 
 /**
@@ -77,7 +77,7 @@ declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchema
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_REGISTRY: _zod_core.$ZodRegistry<{
+declare const experimental_JSON_SCHEMA_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -138,7 +138,7 @@ declare const experimental_JSON_SCHEMA_REGISTRY: _zod_core.$ZodRegistry<{
     unevaluatedProperties?: JSONSchema;
     uniqueItems?: boolean;
     writeOnly?: boolean;
-}, _zod_core.$ZodType<unknown, unknown>>;
+}, zod_v4_core.$ZodType<unknown, unknown>>;
 /**
  * Zod registry for customizing generated JSON schema, only useful for .input
  *
@@ -156,7 +156,7 @@ declare const experimental_JSON_SCHEMA_REGISTRY: _zod_core.$ZodRegistry<{
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: _zod_core.$ZodRegistry<{
+declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -217,7 +217,7 @@ declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: _zod_core.$ZodRegistry<{
     unevaluatedProperties?: JSONSchema;
     uniqueItems?: boolean;
     writeOnly?: boolean;
-}, _zod_core.$ZodType<unknown, unknown>>;
+}, zod_v4_core.$ZodType<unknown, unknown>>;
 /**
  * Zod registry for customizing generated JSON schema, only useful for .input
  *
@@ -235,7 +235,7 @@ declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: _zod_core.$ZodRegistry<{
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: _zod_core.$ZodRegistry<{
+declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -296,7 +296,7 @@ declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: _zod_core.$ZodRegistry<{
     unevaluatedProperties?: JSONSchema;
     uniqueItems?: boolean;
     writeOnly?: boolean;
-}, _zod_core.$ZodType<unknown, unknown>>;
+}, zod_v4_core.$ZodType<unknown, unknown>>;
 
 export { experimental_JSON_SCHEMA_INPUT_REGISTRY, experimental_JSON_SCHEMA_OUTPUT_REGISTRY, experimental_JSON_SCHEMA_REGISTRY, experimental_ZodSmartCoercionPlugin, experimental_ZodToJsonSchemaConverter };
 export type { experimental_ZodToJsonSchemaOptions };

package/dist/zod4/index.mjs

@@ -1,6 +1,6 @@
 import { isObject, guard, intercept } from '@orpc/shared';
 import { JSONSchemaFormat, JSONSchemaContentEncoding } from '@orpc/openapi';
-import { registry, globalRegistry } from '@zod/core';
+import { registry, globalRegistry } from 'zod/v4/core';
 
 class experimental_ZodSmartCoercionPlugin {
   init(options) {
@@ -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);
+                }
+              }
             }
           }
         }
@@ -207,10 +218,17 @@ class experimental_ZodSmartCoercionPlugin {
         return this.#coerce(pipe._zod.def.in, value);
       }
       case "default":
-      case "catch": {
+      case "prefault": {
         const default_ = schema;
+        if (value === void 0) {
+          return value;
+        }
         return this.#coerce(default_._zod.def.innerType, value);
       }
+      case "catch": {
+        const catch_ = schema;
+        return this.#coerce(catch_._zod.def.innerType, value);
+      }
       case "lazy": {
         const lazy = schema;
         if (value !== void 0) {
@@ -248,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();
@@ -301,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 }];
           }
         }
@@ -313,21 +307,28 @@ class experimental_ZodToJsonSchemaConverter {
           case "string": {
             const string = schema2;
             const json = { type: "string" };
-            const { minimum, maximum, format, pattern, contentEncoding } = string._zod.computed;
-            if (minimum !== void 0) {
+            const { minimum, maximum, format, patterns, contentEncoding } = string._zod.bag;
+            if (typeof minimum === "number") {
               json.minLength = minimum;
             }
-            if (maximum !== void 0) {
+            if (typeof maximum === "number") {
               json.maxLength = maximum;
             }
-            if (contentEncoding !== void 0) {
+            if (typeof contentEncoding === "string") {
               json.contentEncoding = this.#handleContentEncoding(contentEncoding);
             }
-            if (format !== void 0 && format !== "regex" && json.contentEncoding === void 0) {
+            if (typeof format === "string" && format !== "regex" && json.contentEncoding === void 0) {
               json.format = this.#handleStringFormat(format);
             }
-            if (pattern !== void 0 && 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;
@@ -337,25 +338,23 @@ class experimental_ZodToJsonSchemaConverter {
           case "number": {
             const number = schema2;
             const json = { type: "number" };
-            const { minimum, maximum, format, multipleOf, inclusive } = number._zod.computed;
-            if (format?.includes("int")) {
+            const { minimum, maximum, format, multipleOf, exclusiveMaximum, exclusiveMinimum } = number._zod.bag;
+            if (typeof format === "string" && format?.includes("int")) {
               json.type = "integer";
             }
-            if (minimum !== void 0) {
-              if (inclusive) {
-                json.minimum = minimum;
-              } else {
-                json.exclusiveMinimum = minimum;
-              }
+            if (typeof minimum === "number") {
+              json.minimum = minimum;
             }
-            if (maximum !== void 0) {
-              if (inclusive) {
-                json.maximum = maximum;
-              } else {
-                json.exclusiveMaximum = maximum;
-              }
+            if (typeof maximum === "number") {
+              json.maximum = maximum;
+            }
+            if (typeof exclusiveMinimum === "number") {
+              json.exclusiveMinimum = exclusiveMinimum;
             }
-            if (multipleOf !== void 0) {
+            if (typeof exclusiveMaximum === "number") {
+              json.exclusiveMaximum = exclusiveMaximum;
+            }
+            if (typeof multipleOf === "number") {
               json.multipleOf = multipleOf;
             }
             return [true, json];
@@ -388,21 +387,21 @@ class experimental_ZodToJsonSchemaConverter {
           case "array": {
             const array = schema2;
             const json = { type: "array" };
-            const { minimum, maximum } = array._zod.computed;
-            if (minimum !== void 0) {
+            const { minimum, maximum } = array._zod.bag;
+            if (typeof minimum === "number") {
               json.minItems = minimum;
             }
-            if (maximum !== void 0) {
+            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) {
@@ -414,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;
               }
             }
@@ -425,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;
               }
@@ -446,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;
@@ -458,16 +457,16 @@ 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.computed;
-            if (minimum !== void 0) {
+            const { minimum, maximum } = tuple._zod.bag;
+            if (typeof minimum === "number") {
               json.minItems = minimum;
             }
-            if (maximum !== void 0) {
+            if (typeof maximum === "number") {
               json.maxItems = maximum;
             }
             return [true, json];
@@ -475,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": {
@@ -486,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
@@ -499,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": {
@@ -523,12 +522,14 @@ class experimental_ZodToJsonSchemaConverter {
           case "file": {
             const file = schema2;
             const oneOf = [];
-            const { mime } = file._zod.computed;
-            for (const type of mime ?? ["*/*"]) {
-              oneOf.push({
-                type: "string",
-                contentMediaType: type
-              });
+            const { mime } = file._zod.bag;
+            if (mime === void 0 || Array.isArray(mime) && mime.every((m) => typeof m === "string")) {
+              for (const type of mime ?? ["*/*"]) {
+                oneOf.push({
+                  type: "string",
+                  contentMediaType: type
+                });
+              }
             }
             return [true, oneOf.length === 1 ? oneOf[0] : { anyOf: oneOf }];
           }
@@ -537,40 +538,40 @@ 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": {
             return [true, { type: "boolean" }];
           }
-          case "default": {
+          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()
+              default: default_._zod.def.defaultValue
             }];
           }
           case "catch": {
             const catch_ = schema2;
-            const [, json] = await this.#convert(catch_._zod.def.innerType, options2, lazyDepth2);
-            return [false, json];
+            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": {
@@ -582,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": {
@@ -590,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;
@@ -614,12 +615,12 @@ class experimental_ZodToJsonSchemaConverter {
     if (global) {
       return {
         description: global.description,
-        examples: global.examples
+        examples: Array.isArray(global.examples) ? global.examples : void 0
       };
     }
   }
   #handleArrayItemJsonSchema([required, schema], options) {
-    if (required || options.strategy === "input") {
+    if (required || options.strategy === "input" || schema.default !== void 0) {
       return schema;
     }
     if (schema === this.undefinedJsonSchema) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/zod",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -29,31 +29,19 @@
     "dist"
   ],
   "peerDependencies": {
-    "@zod/core": ">=0.11.4",
     "zod": ">=3.24.2",
-    "@orpc/contract": "1.2.0",
-    "@orpc/server": "1.2.0"
-  },
-  "peerDependenciesMeta": {
-    "@zod/core": {
-      "optional": true
-    },
-    "zod": {
-      "optional": true
-    }
+    "@orpc/contract": "1.4.0",
+    "@orpc/server": "1.4.0"
   },
   "dependencies": {
     "escape-string-regexp": "^5.0.0",
     "wildcard-match": "^5.1.3",
-    "@orpc/openapi": "1.2.0",
-    "@orpc/shared": "1.2.0"
+    "@orpc/openapi": "1.4.0",
+    "@orpc/shared": "1.4.0"
   },
   "devDependencies": {
-    "@zod/core": "^0.11.4",
-    "@zod/mini": "^4.0.0-beta.20250505T012514",
-    "zod": "^3.24.2",
-    "zod-to-json-schema": "^3.24.5",
-    "zod4": "npm:zod@^4.0.0-beta.20250505T012514"
+    "zod": "^3.25.49",
+    "zod-to-json-schema": "^3.24.5"
   },
   "scripts": {
     "build": "unbuild",