@orpc/zod 0.0.0-next.93fa264 → 0.0.0-next.94096b2

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.
@@ -72,7 +72,7 @@ More schemas that [Zod](https://zod.dev/) doesn't support yet, and provides `Zod
 
 ```ts
 import { oz } from '@orpc/zod'
-import { z } from 'zod'
+import { z } from 'zod/v3'
 
 const Example = z.object({
   url: oz.url(),
@@ -86,7 +86,7 @@ const Example = z.object({
 
 ```ts
 import { OpenAPIGenerator } from '@orpc/openapi'
-import { ZodToJsonSchemaConverter } from '@orpc/zod'
+import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'
 
 const openAPIGenerator = new OpenAPIGenerator({
   schemaConverters: [new ZodToJsonSchemaConverter()],
@@ -111,7 +111,7 @@ const specFromRouter = await openAPIGenerator.generate(router, {
 
 ```ts
 import { oz } from '@orpc/zod'
-import { z } from 'zod'
+import * as z from 'zod'
 
 const InputSchema = oz.openapi(
   z.object({

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { JSONSchema, ConditionalSchemaConverter, SchemaConvertOptions } from '@orpc/openapi';
-import { ZodTypeAny, input, output, ZodTypeDef, CustomErrorParams, ZodType, ZodEffects } from 'zod';
+import { ZodTypeAny, input, output, ZodTypeDef, CustomErrorParams, ZodType, ZodEffects } from 'zod/v3';
 import { Context } from '@orpc/server';
 import { StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { AnySchema } from '@orpc/contract';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { JSONSchema, ConditionalSchemaConverter, SchemaConvertOptions } from '@orpc/openapi';
-import { ZodTypeAny, input, output, ZodTypeDef, CustomErrorParams, ZodType, ZodEffects } from 'zod';
+import { ZodTypeAny, input, output, ZodTypeDef, CustomErrorParams, ZodType, ZodEffects } from 'zod/v3';
 import { Context } from '@orpc/server';
 import { StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { AnySchema } from '@orpc/contract';

package/dist/index.mjs

@@ -1,6 +1,7 @@
-import { custom, ZodFirstPartyTypeKind } from 'zod';
+import { custom, ZodFirstPartyTypeKind } from 'zod/v3';
 import wcmatch from 'wildcard-match';
 import { isObject, guard, toArray } from '@orpc/shared';
+import { JsonSchemaXNativeType } from '@orpc/json-schema';
 import { JSONSchemaFormat } from '@orpc/openapi';
 import escapeStringRegexp from 'escape-string-regexp';
 
@@ -128,7 +129,7 @@ class ZodSmartCoercionPlugin {
     options.clientInterceptors ??= [];
     options.clientInterceptors.unshift((options2) => {
       const inputSchema = options2.procedure["~orpc"].inputSchema;
-      if (!inputSchema || inputSchema["~standard"].vendor !== "zod") {
+      if (!inputSchema || inputSchema["~standard"].vendor !== "zod" || "_zod" in inputSchema) {
         return options2.next();
       }
       const coercedInput = zodCoerceInternal(inputSchema, options2.input);
@@ -400,7 +401,7 @@ class ZodToJsonSchemaConverter {
     this.anyJsonSchema = options.anyJsonSchema ?? {};
   }
   condition(schema) {
-    return schema !== void 0 && schema["~standard"].vendor === "zod";
+    return schema !== void 0 && schema["~standard"].vendor === "zod" && !("_zod" in schema);
   }
   convert(schema, options, lazyDepth = 0, isHandledCustomJSONSchema = false, isHandledZodDescription = false, structureDepth = 0) {
     const def = schema._def;
@@ -563,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: {
@@ -573,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: {
@@ -681,7 +690,11 @@ class ZodToJsonSchemaConverter {
       }
       case ZodFirstPartyTypeKind.ZodSet: {
         const schema_ = schema;
-        const json = { type: "array", uniqueItems: true };
+        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];
@@ -690,9 +703,9 @@ class ZodToJsonSchemaConverter {
         const schema_ = schema;
         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);
-        return [true, {
-          type: "array",
-          items: {
+        const json = {
+          "type": "array",
+          "items": {
             type: "array",
             prefixItems: [
               this.#toArrayItemJsonSchema(keyRequired, keyJson, options.strategy),
@@ -700,8 +713,10 @@ class ZodToJsonSchemaConverter {
             ],
             maxItems: 2,
             minItems: 2
-          }
-        }];
+          },
+          "x-native-type": JsonSchemaXNativeType.Map
+        };
+        return [true, json];
       }
       case ZodFirstPartyTypeKind.ZodUnion:
       case ZodFirstPartyTypeKind.ZodDiscriminatedUnion: {
@@ -789,7 +804,7 @@ class ZodToJsonSchemaConverter {
       case ZodFirstPartyTypeKind.ZodNullable: {
         const schema_ = schema;
         const [required, json] = this.convert(schema_._def.innerType, options, lazyDepth, false, false, structureDepth);
-        return [required, { anyOf: [{ type: "null" }, json] }];
+        return [required, { anyOf: [json, { type: "null" }] }];
       }
     }
     return [true, this.unsupportedJsonSchema];
@@ -808,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,12 +6,15 @@ 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;
 }
 
-interface experimental_ZodToJsonSchemaOptions {
+interface ZodToJsonSchemaConverterOptions {
     /**
      * Max depth of lazy type.
      *
@@ -56,7 +59,7 @@ interface experimental_ZodToJsonSchemaOptions {
         jsonSchema: Exclude<JSONSchema, boolean>
     ]>[];
 }
-declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
+declare class ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
     #private;
     private readonly maxLazyDepth;
     private readonly maxStructureDepth;
@@ -64,7 +67,7 @@ declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchema
     private readonly unsupportedJsonSchema;
     private readonly undefinedJsonSchema;
     private readonly interceptors;
-    constructor(options?: experimental_ZodToJsonSchemaOptions);
+    constructor(options?: ZodToJsonSchemaConverterOptions);
     condition(schema: AnySchema | undefined): boolean;
     convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: Exclude<JSONSchema, boolean>];
 }
@@ -86,7 +89,7 @@ declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchema
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_REGISTRY: zod_v4_core.$ZodRegistry<{
+declare const JSON_SCHEMA_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -165,7 +168,7 @@ declare const experimental_JSON_SCHEMA_REGISTRY: zod_v4_core.$ZodRegistry<{
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
+declare const JSON_SCHEMA_INPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -244,7 +247,7 @@ declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: zod_v4_core.$ZodRegistry<
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
+declare const JSON_SCHEMA_OUTPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -307,5 +310,5 @@ declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: zod_v4_core.$ZodRegistry
     writeOnly?: boolean;
 }, zod_v4_core.$ZodType<unknown, unknown, zod_v4_core.$ZodTypeInternals<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 };
+export { JSON_SCHEMA_INPUT_REGISTRY, JSON_SCHEMA_OUTPUT_REGISTRY, JSON_SCHEMA_REGISTRY, ZodToJsonSchemaConverter, experimental_ZodSmartCoercionPlugin };
+export type { ZodToJsonSchemaConverterOptions };

package/dist/zod4/index.d.ts

@@ -6,12 +6,15 @@ 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;
 }
 
-interface experimental_ZodToJsonSchemaOptions {
+interface ZodToJsonSchemaConverterOptions {
     /**
      * Max depth of lazy type.
      *
@@ -56,7 +59,7 @@ interface experimental_ZodToJsonSchemaOptions {
         jsonSchema: Exclude<JSONSchema, boolean>
     ]>[];
 }
-declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
+declare class ZodToJsonSchemaConverter implements ConditionalSchemaConverter {
     #private;
     private readonly maxLazyDepth;
     private readonly maxStructureDepth;
@@ -64,7 +67,7 @@ declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchema
     private readonly unsupportedJsonSchema;
     private readonly undefinedJsonSchema;
     private readonly interceptors;
-    constructor(options?: experimental_ZodToJsonSchemaOptions);
+    constructor(options?: ZodToJsonSchemaConverterOptions);
     condition(schema: AnySchema | undefined): boolean;
     convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: Exclude<JSONSchema, boolean>];
 }
@@ -86,7 +89,7 @@ declare class experimental_ZodToJsonSchemaConverter implements ConditionalSchema
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_REGISTRY: zod_v4_core.$ZodRegistry<{
+declare const JSON_SCHEMA_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -165,7 +168,7 @@ declare const experimental_JSON_SCHEMA_REGISTRY: zod_v4_core.$ZodRegistry<{
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
+declare const JSON_SCHEMA_INPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -244,7 +247,7 @@ declare const experimental_JSON_SCHEMA_INPUT_REGISTRY: zod_v4_core.$ZodRegistry<
  * })
  * ```
  */
-declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
+declare const JSON_SCHEMA_OUTPUT_REGISTRY: zod_v4_core.$ZodRegistry<{
     $anchor?: string;
     $comment?: string;
     $defs?: Record<string, JSONSchema>;
@@ -307,5 +310,5 @@ declare const experimental_JSON_SCHEMA_OUTPUT_REGISTRY: zod_v4_core.$ZodRegistry
     writeOnly?: boolean;
 }, zod_v4_core.$ZodType<unknown, unknown, zod_v4_core.$ZodTypeInternals<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 };
+export { JSON_SCHEMA_INPUT_REGISTRY, JSON_SCHEMA_OUTPUT_REGISTRY, JSON_SCHEMA_REGISTRY, ZodToJsonSchemaConverter, experimental_ZodSmartCoercionPlugin };
+export type { ZodToJsonSchemaConverterOptions };

package/dist/zod4/index.mjs

@@ -1,4 +1,5 @@
 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';
 
@@ -7,7 +8,7 @@ class experimental_ZodSmartCoercionPlugin {
     options.clientInterceptors ??= [];
     options.clientInterceptors.unshift((options2) => {
       const inputSchema = options2.procedure["~orpc"].inputSchema;
-      if (!inputSchema || inputSchema["~standard"].vendor !== "zod") {
+      if (!inputSchema || inputSchema["~standard"].vendor !== "zod" || !("_zod" in inputSchema)) {
         return options2.next();
       }
       const coercedInput = this.#coerce(inputSchema, options2.input);
@@ -268,11 +269,11 @@ class experimental_ZodSmartCoercionPlugin {
   }
 }
 
-const experimental_JSON_SCHEMA_REGISTRY = registry();
-const experimental_JSON_SCHEMA_INPUT_REGISTRY = registry();
-const experimental_JSON_SCHEMA_OUTPUT_REGISTRY = registry();
+const JSON_SCHEMA_REGISTRY = registry();
+const JSON_SCHEMA_INPUT_REGISTRY = registry();
+const JSON_SCHEMA_OUTPUT_REGISTRY = registry();
 
-class experimental_ZodToJsonSchemaConverter {
+class ZodToJsonSchemaConverter {
   maxLazyDepth;
   maxStructureDepth;
   anyJsonSchema;
@@ -288,7 +289,7 @@ class experimental_ZodToJsonSchemaConverter {
     this.interceptors = options.interceptors ?? [];
   }
   condition(schema) {
-    return schema !== void 0 && schema["~standard"].vendor === "zod";
+    return schema !== void 0 && schema["~standard"].vendor === "zod" && "_zod" in schema;
   }
   convert(schema, options) {
     return this.#convert(schema, options, 0, 0);
@@ -376,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" }];
@@ -494,8 +503,8 @@ class experimental_ZodToJsonSchemaConverter {
           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, structureDepth + 1), options2),
@@ -503,15 +512,17 @@ class experimental_ZodToJsonSchemaConverter {
                 ],
                 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, structureDepth + 1), 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": {
@@ -616,18 +627,19 @@ class experimental_ZodToJsonSchemaConverter {
     );
   }
   #getCustomJsonSchema(schema, options) {
-    if (options.strategy === "input" && experimental_JSON_SCHEMA_INPUT_REGISTRY.has(schema)) {
-      return experimental_JSON_SCHEMA_INPUT_REGISTRY.get(schema);
+    if (options.strategy === "input" && JSON_SCHEMA_INPUT_REGISTRY.has(schema)) {
+      return JSON_SCHEMA_INPUT_REGISTRY.get(schema);
     }
-    if (options.strategy === "output" && experimental_JSON_SCHEMA_OUTPUT_REGISTRY.has(schema)) {
-      return experimental_JSON_SCHEMA_OUTPUT_REGISTRY.get(schema);
+    if (options.strategy === "output" && JSON_SCHEMA_OUTPUT_REGISTRY.has(schema)) {
+      return JSON_SCHEMA_OUTPUT_REGISTRY.get(schema);
     }
-    if (experimental_JSON_SCHEMA_REGISTRY.has(schema)) {
-      return experimental_JSON_SCHEMA_REGISTRY.get(schema);
+    if (JSON_SCHEMA_REGISTRY.has(schema)) {
+      return JSON_SCHEMA_REGISTRY.get(schema);
     }
     const global = globalRegistry.get(schema);
     if (global) {
       return {
+        title: global.title,
         description: global.description,
         examples: Array.isArray(global.examples) ? global.examples : void 0
       };
@@ -665,4 +677,4 @@ class experimental_ZodToJsonSchemaConverter {
   }
 }
 
-export { experimental_JSON_SCHEMA_INPUT_REGISTRY, experimental_JSON_SCHEMA_OUTPUT_REGISTRY, experimental_JSON_SCHEMA_REGISTRY, experimental_ZodSmartCoercionPlugin, experimental_ZodToJsonSchemaConverter };
+export { JSON_SCHEMA_INPUT_REGISTRY, JSON_SCHEMA_OUTPUT_REGISTRY, JSON_SCHEMA_REGISTRY, ZodToJsonSchemaConverter, experimental_ZodSmartCoercionPlugin };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/zod",
   "type": "module",
-  "version": "0.0.0-next.93fa264",
+  "version": "0.0.0-next.94096b2",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -29,19 +29,19 @@
     "dist"
   ],
   "peerDependencies": {
-    "zod": ">=3.24.2",
-    "@orpc/contract": "0.0.0-next.93fa264",
-    "@orpc/server": "0.0.0-next.93fa264"
+    "zod": ">=3.25.0",
+    "@orpc/contract": "0.0.0-next.94096b2",
+    "@orpc/server": "0.0.0-next.94096b2"
   },
   "dependencies": {
     "escape-string-regexp": "^5.0.0",
     "wildcard-match": "^5.1.3",
-    "@orpc/openapi": "0.0.0-next.93fa264",
-    "@orpc/shared": "0.0.0-next.93fa264"
+    "@orpc/json-schema": "0.0.0-next.94096b2",
+    "@orpc/openapi": "0.0.0-next.94096b2",
+    "@orpc/shared": "0.0.0-next.94096b2"
   },
   "devDependencies": {
-    "zod": "^3.25.64",
-    "zod-to-json-schema": "^3.24.5"
+    "zod": "^4.0.5"
   },
   "scripts": {
     "build": "unbuild",