@orpc/zod 0.0.0-next.f356b86 → 0.0.0-next.f397ca2

package/README.md

@@ -17,6 +17,9 @@
   <a href="https://discord.gg/TXEbwRBvQn">
     <img alt="Discord" src="https://img.shields.io/discord/1308966753044398161?color=7389D8&label&logo=discord&logoColor=ffffff" />
   </a>
+  <a href="https://deepwiki.com/unnoq/orpc">
+    <img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki">
+  </a>
 </div>
 
 <h3 align="center">Typesafe APIs Made Simple 🪄</h3>
@@ -30,7 +33,8 @@
 - **🔗 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, Angular), Pinia Colada, and more.
+- **🔍 First-Class OpenTelemetry**: Seamlessly integrate with OpenTelemetry for observability.
+- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte, Angular), SWR, 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.
@@ -38,7 +42,6 @@
 - **📡 SSE & Streaming**: Enjoy full type-safe support for SSE and streaming.
 - **🌍 Multi-Runtime Support**: Fast and lightweight on Cloudflare, Deno, Bun, Node.js, and beyond.
 - **🔌 Extendability**: Easily extend functionality with plugins, middleware, and interceptors.
-- **🛡️ Reliability**: Well-tested, TypeScript-based, production-ready, and MIT licensed.
 
 ## Documentation
 
@@ -50,9 +53,11 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@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/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
+- [@orpc/otel](https://www.npmjs.com/package/@orpc/otel): [OpenTelemetry](https://opentelemetry.io/) integration for observability.
 - [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with [NestJS](https://nestjs.com/).
 - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): [TanStack Query](https://tanstack.com/query/latest) integration.
+- [@orpc/experimental-react-swr](https://www.npmjs.com/package/@orpc/experimental-react-swr): [SWR](https://swr.vercel.app/) integration.
 - [@orpc/vue-colada](https://www.npmjs.com/package/@orpc/vue-colada): Integration with [Pinia Colada](https://pinia-colada.esm.dev/).
 - [@orpc/hey-api](https://www.npmjs.com/package/@orpc/hey-api): [Hey API](https://heyapi.dev/) integration.
 - [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): More schemas that [Zod](https://zod.dev/) doesn't support yet.
@@ -72,7 +77,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 +91,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 +116,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,4 +1,4 @@
-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';
@@ -129,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);
@@ -401,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;
@@ -724,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, structureDepth);
+          const [itemRequired, itemJson] = this.convert(item, options, lazyDepth, false, false, structureDepth + 1);
           if (!itemRequired) {
             required = false;
             if (itemJson !== this.unsupportedJsonSchema) {
@@ -734,9 +734,6 @@ class ZodToJsonSchemaConverter {
             anyOf.push(itemJson);
           }
         }
-        if (anyOf.length === 1) {
-          return [required, anyOf[0]];
-        }
         return [required, { anyOf }];
       }
       case ZodFirstPartyTypeKind.ZodIntersection: {
@@ -744,7 +741,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, structureDepth);
+          const [itemRequired, itemJson] = this.convert(item, options, lazyDepth, false, false, structureDepth + 1);
           allOf.push(itemJson);
           if (itemRequired) {
             required = true;

package/dist/zod4/index.d.mts

@@ -14,7 +14,7 @@ declare class experimental_ZodSmartCoercionPlugin<TContext extends Context> impl
     init(options: StandardHandlerOptions<TContext>): void;
 }
 
-interface experimental_ZodToJsonSchemaOptions {
+interface ZodToJsonSchemaConverterOptions {
     /**
      * Max depth of lazy type.
      *
@@ -59,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;
@@ -67,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>];
 }
@@ -89,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>;
@@ -168,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>;
@@ -247,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>;
@@ -310,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

@@ -14,7 +14,7 @@ declare class experimental_ZodSmartCoercionPlugin<TContext extends Context> impl
     init(options: StandardHandlerOptions<TContext>): void;
 }
 
-interface experimental_ZodToJsonSchemaOptions {
+interface ZodToJsonSchemaConverterOptions {
     /**
      * Max depth of lazy type.
      *
@@ -59,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;
@@ -67,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>];
 }
@@ -89,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>;
@@ -168,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>;
@@ -247,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>;
@@ -310,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

@@ -8,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);
@@ -269,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;
@@ -289,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);
@@ -446,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, structureDepth);
+              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2, structureDepth + 1);
               if (!itemRequired) {
                 required = false;
               }
@@ -460,14 +460,14 @@ class experimental_ZodToJsonSchemaConverter {
                 }
               }
             }
-            return [required, anyOf.length === 1 ? anyOf[0] : { anyOf }];
+            return [required, { anyOf }];
           }
           case "intersection": {
             const intersection = schema2;
             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, structureDepth);
+              const [itemRequired, itemJson] = this.#convert(item, options2, lazyDepth2, structureDepth + 1);
               json.allOf.push(itemJson);
               if (itemRequired) {
                 required = true;
@@ -627,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
       };
@@ -676,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.f356b86",
+  "version": "0.0.0-next.f397ca2",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -29,20 +29,19 @@
     "dist"
   ],
   "peerDependencies": {
-    "zod": ">=3.24.2",
-    "@orpc/contract": "0.0.0-next.f356b86",
-    "@orpc/server": "0.0.0-next.f356b86"
+    "zod": ">=3.25.0",
+    "@orpc/contract": "0.0.0-next.f397ca2",
+    "@orpc/server": "0.0.0-next.f397ca2"
   },
   "dependencies": {
     "escape-string-regexp": "^5.0.0",
     "wildcard-match": "^5.1.3",
-    "@orpc/json-schema": "0.0.0-next.f356b86",
-    "@orpc/openapi": "0.0.0-next.f356b86",
-    "@orpc/shared": "0.0.0-next.f356b86"
+    "@orpc/json-schema": "0.0.0-next.f397ca2",
+    "@orpc/shared": "0.0.0-next.f397ca2",
+    "@orpc/openapi": "0.0.0-next.f397ca2"
   },
   "devDependencies": {
-    "zod": "^3.25.76",
-    "zod-to-json-schema": "^3.24.6"
+    "zod": "^4.1.12"
   },
   "scripts": {
     "build": "unbuild",