@orpc/zod 0.0.0-next.de766b3 → 0.0.0-next.de7ca70

package/README.md

@@ -30,7 +30,7 @@
 - **🔗 End-to-End Type Safety**: Ensure type-safe inputs, outputs, and errors from client to server.
 - **📘 First-Class OpenAPI**: Built-in support that fully adheres to the OpenAPI standard.
 - **📝 Contract-First Development**: Optionally define your API contract before implementation.
-- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte), Pinia Colada, and more.
+- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte, Angular), Pinia Colada, and more.
 - **🚀 Server Actions**: Fully compatible with React Server Actions on Next.js, TanStack Start, and other platforms.
 - **🔠 Standard Schema Support**: Works out of the box with Zod, Valibot, ArkType, and other schema validators.
 - **🗃️ Native Types**: Supports native types like Date, File, Blob, BigInt, URL, and more.

package/dist/index.d.mts

@@ -40,34 +40,43 @@ declare class ZodSmartCoercionPlugin<TContext extends Context> implements Standa
 
 interface ZodToJsonSchemaOptions {
     /**
-     * Max depth of lazy type, if it exceeds.
+     * Max depth of lazy type
      *
-     * Used `{}` when reach max depth
+     * Used `{}` when exceed max depth
      *
      * @default 3
      */
     maxLazyDepth?: number;
     /**
-     * The schema to be used when the Zod schema is unsupported.
+     * Max depth of nested types
      *
-     * @default { not: {} }
+     * Used anyJsonSchema (`{}`) when exceed max depth
+     *
+     * @default 10
      */
-    unsupportedJsonSchema?: Exclude<JSONSchema, boolean>;
+    maxStructureDepth?: number;
     /**
      * The schema to be used to represent the any | unknown type.
      *
      * @default { }
      */
     anyJsonSchema?: Exclude<JSONSchema, boolean>;
+    /**
+     * The schema to be used when the Zod schema is unsupported.
+     *
+     * @default { not: {} }
+     */
+    unsupportedJsonSchema?: Exclude<JSONSchema, boolean>;
 }
 declare class ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
     #private;
     private readonly maxLazyDepth;
+    private readonly maxStructureDepth;
     private readonly unsupportedJsonSchema;
     private readonly anyJsonSchema;
     constructor(options?: ZodToJsonSchemaOptions);
     condition(schema: AnySchema | undefined): boolean;
-    convert(schema: AnySchema | undefined, options: SchemaConvertOptions, lazyDepth?: number, isHandledCustomJSONSchema?: boolean, isHandledZodDescription?: boolean): [required: boolean, jsonSchema: Exclude<JSONSchema, boolean>];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions, lazyDepth?: number, isHandledCustomJSONSchema?: boolean, isHandledZodDescription?: boolean, structureDepth?: number): [required: boolean, jsonSchema: Exclude<JSONSchema, boolean>];
 }
 
 declare const oz: {

package/dist/index.d.ts

@@ -40,34 +40,43 @@ declare class ZodSmartCoercionPlugin<TContext extends Context> implements Standa
 
 interface ZodToJsonSchemaOptions {
     /**
-     * Max depth of lazy type, if it exceeds.
+     * Max depth of lazy type
      *
-     * Used `{}` when reach max depth
+     * Used `{}` when exceed max depth
      *
      * @default 3
      */
     maxLazyDepth?: number;
     /**
-     * The schema to be used when the Zod schema is unsupported.
+     * Max depth of nested types
      *
-     * @default { not: {} }
+     * Used anyJsonSchema (`{}`) when exceed max depth
+     *
+     * @default 10
      */
-    unsupportedJsonSchema?: Exclude<JSONSchema, boolean>;
+    maxStructureDepth?: number;
     /**
      * The schema to be used to represent the any | unknown type.
      *
      * @default { }
      */
     anyJsonSchema?: Exclude<JSONSchema, boolean>;
+    /**
+     * The schema to be used when the Zod schema is unsupported.
+     *
+     * @default { not: {} }
+     */
+    unsupportedJsonSchema?: Exclude<JSONSchema, boolean>;
 }
 declare class ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
     #private;
     private readonly maxLazyDepth;
+    private readonly maxStructureDepth;
     private readonly unsupportedJsonSchema;
     private readonly anyJsonSchema;
     constructor(options?: ZodToJsonSchemaOptions);
     condition(schema: AnySchema | undefined): boolean;
-    convert(schema: AnySchema | undefined, options: SchemaConvertOptions, lazyDepth?: number, isHandledCustomJSONSchema?: boolean, isHandledZodDescription?: boolean): [required: boolean, jsonSchema: Exclude<JSONSchema, boolean>];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions, lazyDepth?: number, isHandledCustomJSONSchema?: boolean, isHandledZodDescription?: boolean, structureDepth?: number): [required: boolean, jsonSchema: Exclude<JSONSchema, boolean>];
 }
 
 declare const oz: {

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import { custom, ZodFirstPartyTypeKind } from 'zod';
 import wcmatch from 'wildcard-match';
-import { isObject, guard } from '@orpc/shared';
+import { isObject, guard, toArray } from '@orpc/shared';
+import { JsonSchemaXNativeType } from '@orpc/json-schema';
 import { JSONSchemaFormat } from '@orpc/openapi';
 import escapeStringRegexp from 'escape-string-regexp';
 
@@ -390,25 +391,39 @@ function safeToDate(value) {
 
 class ZodToJsonSchemaConverter {
   maxLazyDepth;
+  maxStructureDepth;
   unsupportedJsonSchema;
   anyJsonSchema;
   constructor(options = {}) {
     this.maxLazyDepth = options.maxLazyDepth ?? 3;
+    this.maxStructureDepth = options.maxStructureDepth ?? 10;
     this.unsupportedJsonSchema = options.unsupportedJsonSchema ?? { not: {} };
     this.anyJsonSchema = options.anyJsonSchema ?? {};
   }
   condition(schema) {
     return schema !== void 0 && schema["~standard"].vendor === "zod";
   }
-  convert(schema, options, lazyDepth = 0, isHandledCustomJSONSchema = false, isHandledZodDescription = false) {
+  convert(schema, options, lazyDepth = 0, isHandledCustomJSONSchema = false, isHandledZodDescription = false, structureDepth = 0) {
     const def = schema._def;
+    if (structureDepth > this.maxStructureDepth) {
+      return [false, this.anyJsonSchema];
+    }
+    if (!options.minStructureDepthForRef || options.minStructureDepthForRef <= structureDepth) {
+      const components = toArray(options.components);
+      for (const component of components) {
+        if (component.schema === schema && component.allowedStrategies.includes(options.strategy)) {
+          return [component.required, { $ref: component.ref }];
+        }
+      }
+    }
     if (!isHandledZodDescription && "description" in def && typeof def.description === "string") {
       const [required, json] = this.convert(
         schema,
         options,
         lazyDepth,
         isHandledCustomJSONSchema,
-        true
+        true,
+        structureDepth
       );
       return [required, { ...json, description: def.description }];
     }
@@ -420,7 +435,8 @@ class ZodToJsonSchemaConverter {
           options,
           lazyDepth,
           true,
-          isHandledZodDescription
+          isHandledZodDescription,
+          structureDepth
         );
         return [required, { ...json, ...customJSONSchema }];
       }
@@ -548,7 +564,11 @@ class ZodToJsonSchemaConverter {
         return [true, json];
       }
       case ZodFirstPartyTypeKind.ZodBigInt: {
-        const json = { type: "string", pattern: "^-?[0-9]+$" };
+        const json = {
+          "type": "string",
+          "pattern": "^-?[0-9]+$",
+          "x-native-type": JsonSchemaXNativeType.BigInt
+        };
         return [true, json];
       }
       case ZodFirstPartyTypeKind.ZodNaN: {
@@ -558,7 +578,11 @@ class ZodToJsonSchemaConverter {
         return [true, { type: "boolean" }];
       }
       case ZodFirstPartyTypeKind.ZodDate: {
-        const schema2 = { type: "string", format: JSONSchemaFormat.DateTime };
+        const schema2 = {
+          "type": "string",
+          "format": JSONSchemaFormat.DateTime,
+          "x-native-type": JsonSchemaXNativeType.Date
+        };
         return [true, schema2];
       }
       case ZodFirstPartyTypeKind.ZodNull: {
@@ -591,7 +615,7 @@ class ZodToJsonSchemaConverter {
         const schema_ = schema;
         const def2 = schema_._def;
         const json = { type: "array" };
-        const [itemRequired, itemJson] = this.convert(def2.type, options, lazyDepth, false, false);
+        const [itemRequired, itemJson] = this.convert(def2.type, options, lazyDepth, false, false, structureDepth + 1);
         json.items = this.#toArrayItemJsonSchema(itemRequired, itemJson, options.strategy);
         if (def2.exactLength) {
           json.maxItems = def2.exactLength.value;
@@ -610,7 +634,7 @@ class ZodToJsonSchemaConverter {
         const prefixItems = [];
         const json = { type: "array" };
         for (const item of schema_._def.items) {
-          const [itemRequired, itemJson] = this.convert(item, options, lazyDepth, false, false);
+          const [itemRequired, itemJson] = this.convert(item, options, lazyDepth, false, false, structureDepth + 1);
           prefixItems.push(
             this.#toArrayItemJsonSchema(itemRequired, itemJson, options.strategy)
           );
@@ -619,7 +643,7 @@ class ZodToJsonSchemaConverter {
           json.prefixItems = prefixItems;
         }
         if (schema_._def.rest) {
-          const [itemRequired, itemJson] = this.convert(schema_._def.rest, options, lazyDepth, false, false);
+          const [itemRequired, itemJson] = this.convert(schema_._def.rest, options, lazyDepth, false, false, structureDepth + 1);
           json.items = this.#toArrayItemJsonSchema(itemRequired, itemJson, options.strategy);
         }
         return [true, json];
@@ -630,7 +654,7 @@ class ZodToJsonSchemaConverter {
         const properties = {};
         const required = [];
         for (const [key, value] of Object.entries(schema_.shape)) {
-          const [itemRequired, itemJson] = this.convert(value, options, lazyDepth, false, false);
+          const [itemRequired, itemJson] = this.convert(value, options, lazyDepth, false, false, structureDepth + 1);
           properties[key] = itemJson;
           if (itemRequired) {
             required.push(key);
@@ -648,7 +672,7 @@ class ZodToJsonSchemaConverter {
             json.additionalProperties = false;
           }
         } else {
-          const [_, addJson] = this.convert(schema_._def.catchall, options, lazyDepth, false, false);
+          const [_, addJson] = this.convert(schema_._def.catchall, options, lazyDepth, false, false, structureDepth + 1);
           json.additionalProperties = addJson;
         }
         return [true, json];
@@ -656,28 +680,32 @@ class ZodToJsonSchemaConverter {
       case ZodFirstPartyTypeKind.ZodRecord: {
         const schema_ = schema;
         const json = { type: "object" };
-        const [__, keyJson] = this.convert(schema_._def.keyType, options, lazyDepth, false, false);
+        const [__, keyJson] = this.convert(schema_._def.keyType, options, lazyDepth, false, false, structureDepth + 1);
         if (Object.entries(keyJson).some(([k, v]) => k !== "type" || v !== "string")) {
           json.propertyNames = keyJson;
         }
-        const [_, itemJson] = this.convert(schema_._def.valueType, options, lazyDepth, false, false);
+        const [_, itemJson] = this.convert(schema_._def.valueType, options, lazyDepth, false, false, structureDepth + 1);
         json.additionalProperties = itemJson;
         return [true, json];
       }
       case ZodFirstPartyTypeKind.ZodSet: {
         const schema_ = schema;
-        const json = { type: "array", uniqueItems: true };
-        const [itemRequired, itemJson] = this.convert(schema_._def.valueType, options, lazyDepth, false, false);
+        const json = {
+          "type": "array",
+          "uniqueItems": true,
+          "x-native-type": JsonSchemaXNativeType.Set
+        };
+        const [itemRequired, itemJson] = this.convert(schema_._def.valueType, options, lazyDepth, false, false, structureDepth + 1);
         json.items = this.#toArrayItemJsonSchema(itemRequired, itemJson, options.strategy);
         return [true, json];
       }
       case ZodFirstPartyTypeKind.ZodMap: {
         const schema_ = schema;
-        const [keyRequired, keyJson] = this.convert(schema_._def.keyType, options, lazyDepth, false, false);
-        const [valueRequired, valueJson] = this.convert(schema_._def.valueType, options, lazyDepth, false, false);
-        return [true, {
-          type: "array",
-          items: {
+        const [keyRequired, keyJson] = this.convert(schema_._def.keyType, options, lazyDepth, false, false, structureDepth + 1);
+        const [valueRequired, valueJson] = this.convert(schema_._def.valueType, options, lazyDepth, false, false, structureDepth + 1);
+        const json = {
+          "type": "array",
+          "items": {
             type: "array",
             prefixItems: [
               this.#toArrayItemJsonSchema(keyRequired, keyJson, options.strategy),
@@ -685,8 +713,10 @@ class ZodToJsonSchemaConverter {
             ],
             maxItems: 2,
             minItems: 2
-          }
-        }];
+          },
+          "x-native-type": JsonSchemaXNativeType.Map
+        };
+        return [true, json];
       }
       case ZodFirstPartyTypeKind.ZodUnion:
       case ZodFirstPartyTypeKind.ZodDiscriminatedUnion: {
@@ -694,7 +724,7 @@ class ZodToJsonSchemaConverter {
         const anyOf = [];
         let required = true;
         for (const item of schema_._def.options) {
-          const [itemRequired, itemJson] = this.convert(item, options, lazyDepth, false, false);
+          const [itemRequired, itemJson] = this.convert(item, options, lazyDepth, false, false, structureDepth);
           if (!itemRequired) {
             required = false;
             if (itemJson !== this.unsupportedJsonSchema) {
@@ -714,7 +744,7 @@ class ZodToJsonSchemaConverter {
         const allOf = [];
         let required = false;
         for (const item of [schema_._def.left, schema_._def.right]) {
-          const [itemRequired, itemJson] = this.convert(item, options, lazyDepth, false, false);
+          const [itemRequired, itemJson] = this.convert(item, options, lazyDepth, false, false, structureDepth);
           allOf.push(itemJson);
           if (itemRequired) {
             required = true;
@@ -723,25 +753,26 @@ class ZodToJsonSchemaConverter {
         return [required, { allOf }];
       }
       case ZodFirstPartyTypeKind.ZodLazy: {
-        if (lazyDepth >= this.maxLazyDepth) {
+        const currentLazyDepth = lazyDepth + 1;
+        if (currentLazyDepth > this.maxLazyDepth) {
           return [false, this.anyJsonSchema];
         }
         const schema_ = schema;
-        return this.convert(schema_._def.getter(), options, lazyDepth + 1, false, false);
+        return this.convert(schema_._def.getter(), options, currentLazyDepth, false, false, structureDepth);
       }
       case ZodFirstPartyTypeKind.ZodOptional: {
         const schema_ = schema;
-        const [_, inner] = this.convert(schema_._def.innerType, options, lazyDepth, false, false);
+        const [_, inner] = this.convert(schema_._def.innerType, options, lazyDepth, false, false, structureDepth);
         return [false, inner];
       }
       case ZodFirstPartyTypeKind.ZodReadonly: {
         const schema_ = schema;
-        const [required, json] = this.convert(schema_._def.innerType, options, lazyDepth, false, false);
+        const [required, json] = this.convert(schema_._def.innerType, options, lazyDepth, false, false, structureDepth);
         return [required, { ...json, readOnly: true }];
       }
       case ZodFirstPartyTypeKind.ZodDefault: {
         const schema_ = schema;
-        const [_, json] = this.convert(schema_._def.innerType, options, lazyDepth, false, false);
+        const [_, json] = this.convert(schema_._def.innerType, options, lazyDepth, false, false, structureDepth);
         return [false, { default: schema_._def.defaultValue(), ...json }];
       }
       case ZodFirstPartyTypeKind.ZodEffects: {
@@ -749,15 +780,15 @@ class ZodToJsonSchemaConverter {
         if (schema_._def.effect.type === "transform" && options.strategy === "output") {
           return [false, this.anyJsonSchema];
         }
-        return this.convert(schema_._def.schema, options, lazyDepth, false, false);
+        return this.convert(schema_._def.schema, options, lazyDepth, false, false, structureDepth);
       }
       case ZodFirstPartyTypeKind.ZodCatch: {
         const schema_ = schema;
-        return this.convert(schema_._def.innerType, options, lazyDepth, false, false);
+        return this.convert(schema_._def.innerType, options, lazyDepth, false, false, structureDepth);
       }
       case ZodFirstPartyTypeKind.ZodBranded: {
         const schema_ = schema;
-        return this.convert(schema_._def.type, options, lazyDepth, false, false);
+        return this.convert(schema_._def.type, options, lazyDepth, false, false, structureDepth);
       }
       case ZodFirstPartyTypeKind.ZodPipeline: {
         const schema_ = schema;
@@ -766,13 +797,14 @@ class ZodToJsonSchemaConverter {
           options,
           lazyDepth,
           false,
-          false
+          false,
+          structureDepth
         );
       }
       case ZodFirstPartyTypeKind.ZodNullable: {
         const schema_ = schema;
-        const [required, json] = this.convert(schema_._def.innerType, options, lazyDepth, false, false);
-        return [required, { anyOf: [{ type: "null" }, json] }];
+        const [required, json] = this.convert(schema_._def.innerType, options, lazyDepth, false, false, structureDepth);
+        return [required, { anyOf: [json, { type: "null" }] }];
       }
     }
     return [true, this.unsupportedJsonSchema];
@@ -791,12 +823,17 @@ class ZodToJsonSchemaConverter {
       }
       case "regexp": {
         return {
-          type: "string",
-          pattern: "^\\/(.*)\\/([a-z]*)$"
+          "type": "string",
+          "pattern": "^\\/(.*)\\/([a-z]*)$",
+          "x-native-type": JsonSchemaXNativeType.RegExp
         };
       }
       case "url": {
-        return { type: "string", format: JSONSchemaFormat.URI };
+        return {
+          "type": "string",
+          "format": JSONSchemaFormat.URI,
+          "x-native-type": JsonSchemaXNativeType.Url
+        };
       }
     }
   }

package/dist/zod4/index.d.mts

@@ -6,6 +6,9 @@ import { Interceptor } from '@orpc/shared';
 import * as zod_v4_core from 'zod/v4/core';
 import { $ZodType, $input, $output } from 'zod/v4/core';
 
+/**
+ * @deprecated Use [Smart Coercion Plugin](https://orpc.unnoq.com/docs/openapi/plugins/smart-coercion) instead.
+ */
 declare class experimental_ZodSmartCoercionPlugin<TContext extends Context> implements StandardHandlerPlugin<TContext> {
     #private;
     init(options: StandardHandlerOptions<TContext>): void;
@@ -13,13 +16,21 @@ declare class experimental_ZodSmartCoercionPlugin<TContext extends Context> impl
 
 interface experimental_ZodToJsonSchemaOptions {
     /**
-     * Max depth of lazy type, if it exceeds.
+     * Max depth of lazy type.
      *
-     * Used anyJsonSchema (`{}`) when reach max depth
+     * Used anyJsonSchema (`{}`) when exceed max depth
      *
      * @default 2
      */
     maxLazyDepth?: number;
+    /**
+     * Max depth of nested types.
+     *
+     * Used anyJsonSchema (`{}`) when exceed max depth
+     *
+     * @default 10
+     */
+    maxStructureDepth?: number;
     /**
      * The schema to be used to represent the any | unknown type.
      *
@@ -51,6 +62,7 @@ interface experimental_ZodToJsonSchemaOptions {
 declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
     #private;
     private readonly maxLazyDepth;
+    private readonly maxStructureDepth;
     private readonly anyJsonSchema;
     private readonly unsupportedJsonSchema;
     private readonly undefinedJsonSchema;

package/dist/zod4/index.d.ts

@@ -6,6 +6,9 @@ import { Interceptor } from '@orpc/shared';
 import * as zod_v4_core from 'zod/v4/core';
 import { $ZodType, $input, $output } from 'zod/v4/core';
 
+/**
+ * @deprecated Use [Smart Coercion Plugin](https://orpc.unnoq.com/docs/openapi/plugins/smart-coercion) instead.
+ */
 declare class experimental_ZodSmartCoercionPlugin<TContext extends Context> implements StandardHandlerPlugin<TContext> {
     #private;
     init(options: StandardHandlerOptions<TContext>): void;
@@ -13,13 +16,21 @@ declare class experimental_ZodSmartCoercionPlugin<TContext extends Context> impl
 
 interface experimental_ZodToJsonSchemaOptions {
     /**
-     * Max depth of lazy type, if it exceeds.
+     * Max depth of lazy type.
      *
-     * Used anyJsonSchema (`{}`) when reach max depth
+     * Used anyJsonSchema (`{}`) when exceed max depth
      *
      * @default 2
      */
     maxLazyDepth?: number;
+    /**
+     * Max depth of nested types.
+     *
+     * Used anyJsonSchema (`{}`) when exceed max depth
+     *
+     * @default 10
+     */
+    maxStructureDepth?: number;
     /**
      * The schema to be used to represent the any | unknown type.
      *
@@ -51,6 +62,7 @@ interface experimental_ZodToJsonSchemaOptions {
 declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
     #private;
     private readonly maxLazyDepth;
+    private readonly maxStructureDepth;
     private readonly anyJsonSchema;
     private readonly unsupportedJsonSchema;
     private readonly undefinedJsonSchema;

package/dist/zod4/index.mjs

@@ -1,4 +1,5 @@
-import { isObject, guard, intercept } from '@orpc/shared';
+import { isObject, guard, intercept, toArray } from '@orpc/shared';
+import { JsonSchemaXNativeType } from '@orpc/json-schema';
 import { JSONSchemaFormat, JSONSchemaContentEncoding } from '@orpc/openapi';
 import { registry, globalRegistry } from 'zod/v4/core';
 
@@ -274,12 +275,14 @@ const experimental_JSON_SCHEMA_OUTPUT_REGISTRY = registry();
 
 class experimental_ZodToJsonSchemaConverter {
   maxLazyDepth;
+  maxStructureDepth;
   anyJsonSchema;
   unsupportedJsonSchema;
   undefinedJsonSchema;
   interceptors;
   constructor(options = {}) {
     this.maxLazyDepth = options.maxLazyDepth ?? 2;
+    this.maxStructureDepth = options.maxStructureDepth ?? 10;
     this.anyJsonSchema = options.anyJsonSchema ?? {};
     this.unsupportedJsonSchema = options.unsupportedJsonSchema ?? { not: {} };
     this.undefinedJsonSchema = options.undefinedJsonSchema ?? { not: {} };
@@ -289,17 +292,28 @@ class experimental_ZodToJsonSchemaConverter {
     return schema !== void 0 && schema["~standard"].vendor === "zod";
   }
   convert(schema, options) {
-    return this.#convert(schema, options, 0);
+    return this.#convert(schema, options, 0, 0);
   }
-  #convert(schema, options, lazyDepth, isHandledCustomJSONSchema = false) {
+  #convert(schema, options, lazyDepth, structureDepth, isHandledCustomJSONSchema = false) {
     return intercept(
       this.interceptors,
       { schema, options, lazyDepth, isHandledCustomJSONSchema },
       ({ schema: schema2, options: options2, lazyDepth: lazyDepth2, isHandledCustomJSONSchema: isHandledCustomJSONSchema2 }) => {
+        if (structureDepth > this.maxStructureDepth) {
+          return [false, this.anyJsonSchema];
+        }
+        if (!options2.minStructureDepthForRef || options2.minStructureDepthForRef <= structureDepth) {
+          const components = toArray(options2.components);
+          for (const component of components) {
+            if (component.schema === schema2 && component.allowedStrategies.includes(options2.strategy)) {
+              return [component.required, { $ref: component.ref }];
+            }
+          }
+        }
         if (!isHandledCustomJSONSchema2) {
           const customJSONSchema = this.#getCustomJsonSchema(schema2, options2);
           if (customJSONSchema) {
-            const [required, json] = this.#convert(schema2, options2, lazyDepth2, true);
+            const [required, json] = this.#convert(schema2, options2, lazyDepth2, structureDepth, true);
             return [required, { ...json, ...customJSONSchema }];
           }
         }
@@ -363,10 +377,18 @@ class experimental_ZodToJsonSchemaConverter {
             return [true, { type: "boolean" }];
           }
           case "bigint": {
-            return [true, { type: "string", pattern: "^-?[0-9]+$" }];
+            return [true, {
+              "type": "string",
+              "pattern": "^-?[0-9]+$",
+              "x-native-type": JsonSchemaXNativeType.BigInt
+            }];
           }
           case "date": {
-            return [true, { type: "string", format: JSONSchemaFormat.DateTime }];
+            return [true, {
+              "type": "string",
+              "format": JSONSchemaFormat.DateTime,
+              "x-native-type": JsonSchemaXNativeType.Date
+            }];
           }
           case "null": {
             return [true, { type: "null" }];
@@ -394,14 +416,14 @@ class experimental_ZodToJsonSchemaConverter {
             if (typeof maximum === "number") {
               json.maxItems = maximum;
             }
-            json.items = this.#handleArrayItemJsonSchema(this.#convert(array._zod.def.element, options2, lazyDepth2), options2);
+            json.items = this.#handleArrayItemJsonSchema(this.#convert(array._zod.def.element, options2, lazyDepth2, structureDepth + 1), 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] = this.#convert(value, options2, lazyDepth2);
+              const [itemRequired, itemJson] = this.#convert(value, options2, lazyDepth2, structureDepth + 1);
               json.properties ??= {};
               json.properties[key] = itemJson;
               if (itemRequired) {
@@ -413,7 +435,7 @@ class experimental_ZodToJsonSchemaConverter {
               if (object._zod.def.catchall._zod.def.type === "never") {
                 json.additionalProperties = false;
               } else {
-                const [_, addJson] = this.#convert(object._zod.def.catchall, options2, lazyDepth2);
+                const [_, addJson] = this.#convert(object._zod.def.catchall, options2, lazyDepth2, structureDepth + 1);
                 json.additionalProperties = addJson;
               }
             }
@@ -424,7 +446,7 @@ class experimental_ZodToJsonSchemaConverter {
             const anyOf = [];
             let required = true;
             for (const item of union._zod.def.options) {
-              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2);
+              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2, structureDepth);
               if (!itemRequired) {
                 required = false;
               }
@@ -445,7 +467,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] = this.#convert(item, options2, lazyDepth2);
+              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2, structureDepth);
               json.allOf.push(itemJson);
               if (itemRequired) {
                 required = true;
@@ -457,10 +479,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(this.#convert(item, options2, lazyDepth2), options2));
+              json.prefixItems.push(this.#handleArrayItemJsonSchema(this.#convert(item, options2, lazyDepth2, structureDepth + 1), options2));
             }
             if (tuple._zod.def.rest) {
-              json.items = this.#handleArrayItemJsonSchema(this.#convert(tuple._zod.def.rest, options2, lazyDepth2), options2);
+              json.items = this.#handleArrayItemJsonSchema(this.#convert(tuple._zod.def.rest, options2, lazyDepth2, structureDepth + 1), options2);
             }
             const { minimum, maximum } = tuple._zod.bag;
             if (typeof minimum === "number") {
@@ -474,31 +496,33 @@ class experimental_ZodToJsonSchemaConverter {
           case "record": {
             const record = schema2;
             const json = { type: "object" };
-            json.propertyNames = this.#convert(record._zod.def.keyType, options2, lazyDepth2)[1];
-            json.additionalProperties = this.#convert(record._zod.def.valueType, options2, lazyDepth2)[1];
+            json.propertyNames = this.#convert(record._zod.def.keyType, options2, lazyDepth2, structureDepth + 1)[1];
+            json.additionalProperties = this.#convert(record._zod.def.valueType, options2, lazyDepth2, structureDepth + 1)[1];
             return [true, json];
           }
           case "map": {
             const map = schema2;
             return [true, {
-              type: "array",
-              items: {
+              "type": "array",
+              "items": {
                 type: "array",
                 prefixItems: [
-                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.keyType, options2, lazyDepth2), options2),
-                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.valueType, options2, lazyDepth2), options2)
+                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.keyType, options2, lazyDepth2, structureDepth + 1), options2),
+                  this.#handleArrayItemJsonSchema(this.#convert(map._zod.def.valueType, options2, lazyDepth2, structureDepth + 1), options2)
                 ],
                 maxItems: 2,
                 minItems: 2
-              }
+              },
+              "x-native-type": JsonSchemaXNativeType.Map
             }];
           }
           case "set": {
             const set = schema2;
             return [true, {
-              type: "array",
-              uniqueItems: true,
-              items: this.#handleArrayItemJsonSchema(this.#convert(set._zod.def.valueType, options2, lazyDepth2), options2)
+              "type": "array",
+              "uniqueItems": true,
+              "items": this.#handleArrayItemJsonSchema(this.#convert(set._zod.def.valueType, options2, lazyDepth2, structureDepth + 1), options2),
+              "x-native-type": JsonSchemaXNativeType.Set
             }];
           }
           case "enum": {
@@ -538,12 +562,12 @@ class experimental_ZodToJsonSchemaConverter {
           }
           case "nullable": {
             const nullable = schema2;
-            const [required, json] = this.#convert(nullable._zod.def.innerType, options2, lazyDepth2);
+            const [required, json] = this.#convert(nullable._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [required, { anyOf: [json, { type: "null" }] }];
           }
           case "nonoptional": {
             const nonoptional = schema2;
-            const [, json] = this.#convert(nonoptional._zod.def.innerType, options2, lazyDepth2);
+            const [, json] = this.#convert(nonoptional._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [true, json];
           }
           case "success": {
@@ -552,7 +576,7 @@ class experimental_ZodToJsonSchemaConverter {
           case "default":
           case "prefault": {
             const default_ = schema2;
-            const [, json] = this.#convert(default_._zod.def.innerType, options2, lazyDepth2);
+            const [, json] = this.#convert(default_._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [false, {
               ...json,
               default: default_._zod.def.defaultValue
@@ -560,18 +584,18 @@ class experimental_ZodToJsonSchemaConverter {
           }
           case "catch": {
             const catch_ = schema2;
-            return this.#convert(catch_._zod.def.innerType, options2, lazyDepth2);
+            return this.#convert(catch_._zod.def.innerType, options2, lazyDepth2, structureDepth);
           }
           case "nan": {
             return [true, options2.strategy === "input" ? this.unsupportedJsonSchema : { type: "null" }];
           }
           case "pipe": {
             const pipe = schema2;
-            return 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, structureDepth);
           }
           case "readonly": {
             const readonly_ = schema2;
-            const [required, json] = this.#convert(readonly_._zod.def.innerType, options2, lazyDepth2);
+            const [required, json] = this.#convert(readonly_._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [required, { ...json, readOnly: true }];
           }
           case "template_literal": {
@@ -583,15 +607,16 @@ class experimental_ZodToJsonSchemaConverter {
           }
           case "optional": {
             const optional = schema2;
-            const [, json] = this.#convert(optional._zod.def.innerType, options2, lazyDepth2);
+            const [, json] = this.#convert(optional._zod.def.innerType, options2, lazyDepth2, structureDepth);
             return [false, json];
           }
           case "lazy": {
             const lazy = schema2;
-            if (lazyDepth2 >= this.maxLazyDepth) {
+            const currentLazyDepth = lazyDepth2 + 1;
+            if (currentLazyDepth > this.maxLazyDepth) {
               return [false, this.anyJsonSchema];
             }
-            return this.#convert(lazy._zod.def.getter(), options2, lazyDepth2 + 1);
+            return this.#convert(lazy._zod.def.getter(), options2, currentLazyDepth, structureDepth);
           }
           default: {
             schema2._zod.def.type;

package/package.json

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