@orpc/openapi 0.0.0-next.f677f1d → 0.0.0-next.f724c58

package/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <image align="center" src="https://orpc.unnoq.com/logo.webp" width=280 alt="oRPC logo" />
+  <image align="center" src="https://orpc.dev/logo.webp" width=280 alt="oRPC logo" />
 </div>
 
 <h1></h1>
@@ -45,7 +45,7 @@
 
 ## Documentation
 
-You can find the full documentation [here](https://orpc.unnoq.com).
+You can find the full documentation [here](https://orpc.dev).
 
 ## Packages
 
@@ -66,7 +66,7 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 
 ## `@orpc/openapi`
 
-Generate OpenAPI specs and handle OpenAPI requests. Read the [documentation](https://orpc.unnoq.com/docs/openapi/getting-started) for more information.
+Generate OpenAPI specs and handle OpenAPI requests. Read the [documentation](https://orpc.dev/docs/openapi/getting-started) for more information.
 
 ```ts
 import { createServer } from 'node:http'

package/dist/adapters/aws-lambda/index.d.mts

@@ -1,16 +1,17 @@
 import { Context, Router } from '@orpc/server';
 import { AwsLambdaHandler, AwsLambdaHandlerOptions } from '@orpc/server/aws-lambda';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.CQmjvnb0.mjs';
+import { b as StandardOpenAPIHandlerOptions } from '../../shared/openapi.DwaweYRb.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/client';
+import '@orpc/standard-server';
 import '@orpc/shared';
 
 /**
  * OpenAPI Handler for AWS Lambda.
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-handler OpenAPI Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-handler OpenAPI Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/http HTTP Adapter Docs}
  */
 declare class OpenAPIHandler<T extends Context> extends AwsLambdaHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardOpenAPIHandlerOptions<T> & AwsLambdaHandlerOptions>);

package/dist/adapters/aws-lambda/index.d.ts

@@ -1,16 +1,17 @@
 import { Context, Router } from '@orpc/server';
 import { AwsLambdaHandler, AwsLambdaHandlerOptions } from '@orpc/server/aws-lambda';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.CQmjvnb0.js';
+import { b as StandardOpenAPIHandlerOptions } from '../../shared/openapi.DwaweYRb.js';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/client';
+import '@orpc/standard-server';
 import '@orpc/shared';
 
 /**
  * OpenAPI Handler for AWS Lambda.
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-handler OpenAPI Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-handler OpenAPI Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/http HTTP Adapter Docs}
  */
 declare class OpenAPIHandler<T extends Context> extends AwsLambdaHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<StandardOpenAPIHandlerOptions<T> & AwsLambdaHandlerOptions>);

package/dist/adapters/aws-lambda/index.mjs

@@ -2,7 +2,7 @@ import { AwsLambdaHandler } from '@orpc/server/aws-lambda';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/shared';
-import { a as StandardOpenAPIHandler } from '../../shared/openapi.BVXcB0u4.mjs';
+import { a as StandardOpenAPIHandler } from '../../shared/openapi.DIt-Z9W1.mjs';
 import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';

package/dist/adapters/fastify/index.d.mts

@@ -0,0 +1,23 @@
+import { Context, Router } from '@orpc/server';
+import { FastifyHandlerOptions, FastifyHandler } from '@orpc/server/fastify';
+import { b as StandardOpenAPIHandlerOptions } from '../../shared/openapi.DwaweYRb.mjs';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
+import '@orpc/client';
+import '@orpc/standard-server';
+import '@orpc/shared';
+
+interface OpenAPIHandlerOptions<T extends Context> extends FastifyHandlerOptions<T>, StandardOpenAPIHandlerOptions<T> {
+}
+/**
+ * OpenAPI Handler for Fastify Server
+ *
+ * @see {@link https://orpc.dev/docs/openapi/openapi-handler OpenAPI Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/http HTTP Adapter Docs}
+ */
+declare class OpenAPIHandler<T extends Context> extends FastifyHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<OpenAPIHandlerOptions<T>>);
+}
+
+export { OpenAPIHandler };
+export type { OpenAPIHandlerOptions };

package/dist/adapters/fastify/index.d.ts

@@ -0,0 +1,23 @@
+import { Context, Router } from '@orpc/server';
+import { FastifyHandlerOptions, FastifyHandler } from '@orpc/server/fastify';
+import { b as StandardOpenAPIHandlerOptions } from '../../shared/openapi.DwaweYRb.js';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
+import '@orpc/client';
+import '@orpc/standard-server';
+import '@orpc/shared';
+
+interface OpenAPIHandlerOptions<T extends Context> extends FastifyHandlerOptions<T>, StandardOpenAPIHandlerOptions<T> {
+}
+/**
+ * OpenAPI Handler for Fastify Server
+ *
+ * @see {@link https://orpc.dev/docs/openapi/openapi-handler OpenAPI Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/http HTTP Adapter Docs}
+ */
+declare class OpenAPIHandler<T extends Context> extends FastifyHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<OpenAPIHandlerOptions<T>>);
+}
+
+export { OpenAPIHandler };
+export type { OpenAPIHandlerOptions };

package/dist/adapters/fastify/index.mjs

@@ -0,0 +1,18 @@
+import { FastifyHandler } from '@orpc/server/fastify';
+import '@orpc/client';
+import '@orpc/contract';
+import '@orpc/shared';
+import { a as StandardOpenAPIHandler } from '../../shared/openapi.DIt-Z9W1.mjs';
+import '@orpc/client/standard';
+import '@orpc/server';
+import 'rou3';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
+
+class OpenAPIHandler extends FastifyHandler {
+  constructor(router, options = {}) {
+    super(new StandardOpenAPIHandler(router, options), options);
+  }
+}
+
+export { OpenAPIHandler };

package/dist/adapters/fetch/index.d.mts

@@ -1,9 +1,10 @@
 import { Context, Router } from '@orpc/server';
 import { FetchHandlerOptions, FetchHandler } from '@orpc/server/fetch';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.CQmjvnb0.mjs';
+import { b as StandardOpenAPIHandlerOptions } from '../../shared/openapi.DwaweYRb.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/client';
+import '@orpc/standard-server';
 import '@orpc/shared';
 
 interface OpenAPIHandlerOptions<T extends Context> extends FetchHandlerOptions<T>, Omit<StandardOpenAPIHandlerOptions<T>, 'plugins'> {
@@ -11,8 +12,8 @@ interface OpenAPIHandlerOptions<T extends Context> extends FetchHandlerOptions<T
 /**
  * OpenAPI Handler for Fetch Server
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-handler OpenAPI Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-handler OpenAPI Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/http HTTP Adapter Docs}
  */
 declare class OpenAPIHandler<T extends Context> extends FetchHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<OpenAPIHandlerOptions<T>>);

package/dist/adapters/fetch/index.d.ts

@@ -1,9 +1,10 @@
 import { Context, Router } from '@orpc/server';
 import { FetchHandlerOptions, FetchHandler } from '@orpc/server/fetch';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.CQmjvnb0.js';
+import { b as StandardOpenAPIHandlerOptions } from '../../shared/openapi.DwaweYRb.js';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/client';
+import '@orpc/standard-server';
 import '@orpc/shared';
 
 interface OpenAPIHandlerOptions<T extends Context> extends FetchHandlerOptions<T>, Omit<StandardOpenAPIHandlerOptions<T>, 'plugins'> {
@@ -11,8 +12,8 @@ interface OpenAPIHandlerOptions<T extends Context> extends FetchHandlerOptions<T
 /**
  * OpenAPI Handler for Fetch Server
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-handler OpenAPI Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-handler OpenAPI Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/http HTTP Adapter Docs}
  */
 declare class OpenAPIHandler<T extends Context> extends FetchHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<OpenAPIHandlerOptions<T>>);

package/dist/adapters/fetch/index.mjs

@@ -2,7 +2,7 @@ import { FetchHandler } from '@orpc/server/fetch';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/shared';
-import { a as StandardOpenAPIHandler } from '../../shared/openapi.BVXcB0u4.mjs';
+import { a as StandardOpenAPIHandler } from '../../shared/openapi.DIt-Z9W1.mjs';
 import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';

package/dist/adapters/node/index.d.mts

@@ -1,9 +1,10 @@
 import { Context, Router } from '@orpc/server';
 import { NodeHttpHandlerOptions, NodeHttpHandler } from '@orpc/server/node';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.CQmjvnb0.mjs';
+import { b as StandardOpenAPIHandlerOptions } from '../../shared/openapi.DwaweYRb.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/client';
+import '@orpc/standard-server';
 import '@orpc/shared';
 
 interface OpenAPIHandlerOptions<T extends Context> extends NodeHttpHandlerOptions<T>, Omit<StandardOpenAPIHandlerOptions<T>, 'plugins'> {
@@ -11,8 +12,8 @@ interface OpenAPIHandlerOptions<T extends Context> extends NodeHttpHandlerOption
 /**
  * OpenAPI Handler for Node Server
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-handler OpenAPI Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-handler OpenAPI Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/http HTTP Adapter Docs}
  */
 declare class OpenAPIHandler<T extends Context> extends NodeHttpHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<OpenAPIHandlerOptions<T>>);

package/dist/adapters/node/index.d.ts

@@ -1,9 +1,10 @@
 import { Context, Router } from '@orpc/server';
 import { NodeHttpHandlerOptions, NodeHttpHandler } from '@orpc/server/node';
-import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.CQmjvnb0.js';
+import { b as StandardOpenAPIHandlerOptions } from '../../shared/openapi.DwaweYRb.js';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/client';
+import '@orpc/standard-server';
 import '@orpc/shared';
 
 interface OpenAPIHandlerOptions<T extends Context> extends NodeHttpHandlerOptions<T>, Omit<StandardOpenAPIHandlerOptions<T>, 'plugins'> {
@@ -11,8 +12,8 @@ interface OpenAPIHandlerOptions<T extends Context> extends NodeHttpHandlerOption
 /**
  * OpenAPI Handler for Node Server
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-handler OpenAPI Handler Docs}
- * @see {@link https://orpc.unnoq.com/docs/adapters/http HTTP Adapter Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-handler OpenAPI Handler Docs}
+ * @see {@link https://orpc.dev/docs/adapters/http HTTP Adapter Docs}
  */
 declare class OpenAPIHandler<T extends Context> extends NodeHttpHandler<T> {
     constructor(router: Router<any, T>, options?: NoInfer<OpenAPIHandlerOptions<T>>);

package/dist/adapters/node/index.mjs

@@ -2,7 +2,7 @@ import { NodeHttpHandler } from '@orpc/server/node';
 import '@orpc/client';
 import '@orpc/contract';
 import '@orpc/shared';
-import { a as StandardOpenAPIHandler } from '../../shared/openapi.BVXcB0u4.mjs';
+import { a as StandardOpenAPIHandler } from '../../shared/openapi.DIt-Z9W1.mjs';
 import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';

package/dist/adapters/standard/index.d.mts

@@ -1,20 +1,11 @@
-import { ORPCError, HTTPPath } from '@orpc/client';
-import { StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
-import { AnyProcedure } from '@orpc/server';
-import { StandardCodec, StandardParams } from '@orpc/server/standard';
-import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-export { a as StandardOpenAPIHandler, S as StandardOpenAPIHandlerOptions, c as StandardOpenAPIMatcher, b as StandardOpenAPIMatcherOptions } from '../../shared/openapi.CQmjvnb0.mjs';
+export { a as StandardOpenAPICodec, S as StandardOpenAPICodecOptions, c as StandardOpenAPIHandler, b as StandardOpenAPIHandlerOptions, e as StandardOpenAPIMatcher, d as StandardOpenAPIMatcherOptions } from '../../shared/openapi.DwaweYRb.mjs';
+import { HTTPPath } from '@orpc/client';
+import '@orpc/openapi-client/standard';
+import '@orpc/server';
+import '@orpc/server/standard';
+import '@orpc/standard-server';
 import '@orpc/shared';
 
-declare class StandardOpenAPICodec implements StandardCodec {
-    #private;
-    private readonly serializer;
-    constructor(serializer: StandardOpenAPISerializer);
-    decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
-    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
-    encodeError(error: ORPCError<any, any>): StandardResponse;
-}
-
 /**
  * {@link https://github.com/unjs/rou3}
  *
@@ -26,4 +17,4 @@ declare function toRou3Pattern(path: HTTPPath): string;
  */
 declare function decodeParams(params: Record<string, string>): Record<string, string>;
 
-export { StandardOpenAPICodec, decodeParams, toRou3Pattern };
+export { decodeParams, toRou3Pattern };

package/dist/adapters/standard/index.d.ts

@@ -1,20 +1,11 @@
-import { ORPCError, HTTPPath } from '@orpc/client';
-import { StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
-import { AnyProcedure } from '@orpc/server';
-import { StandardCodec, StandardParams } from '@orpc/server/standard';
-import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-export { a as StandardOpenAPIHandler, S as StandardOpenAPIHandlerOptions, c as StandardOpenAPIMatcher, b as StandardOpenAPIMatcherOptions } from '../../shared/openapi.CQmjvnb0.js';
+export { a as StandardOpenAPICodec, S as StandardOpenAPICodecOptions, c as StandardOpenAPIHandler, b as StandardOpenAPIHandlerOptions, e as StandardOpenAPIMatcher, d as StandardOpenAPIMatcherOptions } from '../../shared/openapi.DwaweYRb.js';
+import { HTTPPath } from '@orpc/client';
+import '@orpc/openapi-client/standard';
+import '@orpc/server';
+import '@orpc/server/standard';
+import '@orpc/standard-server';
 import '@orpc/shared';
 
-declare class StandardOpenAPICodec implements StandardCodec {
-    #private;
-    private readonly serializer;
-    constructor(serializer: StandardOpenAPISerializer);
-    decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
-    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
-    encodeError(error: ORPCError<any, any>): StandardResponse;
-}
-
 /**
  * {@link https://github.com/unjs/rou3}
  *
@@ -26,4 +17,4 @@ declare function toRou3Pattern(path: HTTPPath): string;
  */
 declare function decodeParams(params: Record<string, string>): Record<string, string>;
 
-export { StandardOpenAPICodec, decodeParams, toRou3Pattern };
+export { decodeParams, toRou3Pattern };

package/dist/adapters/standard/index.mjs

@@ -1,4 +1,4 @@
-export { S as StandardOpenAPICodec, a as StandardOpenAPIHandler, b as StandardOpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.BVXcB0u4.mjs';
+export { S as StandardOpenAPICodec, a as StandardOpenAPIHandler, b as StandardOpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.DIt-Z9W1.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/client';

package/dist/index.d.mts

@@ -1,9 +1,9 @@
 import { OpenAPI, AnyContractProcedure } from '@orpc/contract';
 export { OpenAPI } from '@orpc/contract';
-export { e as CompositeSchemaConverter, C as ConditionalSchemaConverter, b as OpenAPIGenerator, a as OpenAPIGeneratorGenerateOptions, O as OpenAPIGeneratorOptions, c as SchemaConvertOptions, d as SchemaConverter, S as SchemaConverterComponent } from './shared/openapi.CfjfVeBJ.mjs';
+export { e as CompositeSchemaConverter, C as ConditionalSchemaConverter, b as OpenAPIGenerator, a as OpenAPIGeneratorGenerateOptions, O as OpenAPIGeneratorOptions, c as SchemaConvertOptions, d as SchemaConverter, S as SchemaConverterComponent } from './shared/openapi.BGy4N6eR.mjs';
 import { HTTPPath, HTTPMethod } from '@orpc/client';
-import { JSONSchema } from '@orpc/interop/json-schema-typed/draft-2020-12';
-export { JSONSchema, ContentEncoding as JSONSchemaContentEncoding, Format as JSONSchemaFormat, TypeName as JSONSchemaTypeName } from '@orpc/interop/json-schema-typed/draft-2020-12';
+import { JSONSchema } from 'json-schema-typed/draft-2020-12';
+export { JSONSchema, ContentEncoding as JSONSchemaContentEncoding, Format as JSONSchemaFormat, TypeName as JSONSchemaTypeName } from 'json-schema-typed/draft-2020-12';
 import { JsonifiedClient } from '@orpc/openapi-client';
 import { AnyRouter, ClientContext, Lazyable, CreateProcedureClientOptions, InferRouterInitialContext, Schema, ErrorMap, Meta, RouterClient } from '@orpc/server';
 import { MaybeOptionalOptions } from '@orpc/shared';
@@ -13,7 +13,7 @@ type OverrideOperationValue = Partial<OpenAPI.OperationObject> | ((current: Open
 /**
  * Customize The Operation Object by proxy an error map item or a middleware.
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification#customizing-operation-objects Customizing Operation Objects Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-specification#customizing-operation-objects Customizing Operation Objects Docs}
  */
 declare function customOpenAPIOperation<T extends object>(o: T, extend: OverrideOperationValue): T;
 declare function getCustomOpenAPIOperation(o: object): OverrideOperationValue | undefined;
@@ -66,6 +66,12 @@ declare function checkParamsSchema(schema: ObjectSchema, params: string[]): bool
  */
 declare function toOpenAPISchema(schema: JSONSchema): OpenAPI.SchemaObject & object;
 declare function resolveOpenAPIJsonSchemaRef(doc: OpenAPI.Document, schema: JSONSchema): JSONSchema;
+/**
+ * Simplifies composed object JSON Schemas (using anyOf, oneOf, allOf) by flattening nested compositions
+ *
+ * @warning The result is looser than the original schema and may not fully validate the same data.
+ */
+declare function simplifyComposedObjectJsonSchemasAndRefs(schema: JSONSchema, doc?: OpenAPI.Document): JSONSchema;
 
 declare function createJsonifiedRouterClient<T extends AnyRouter, TClientContext extends ClientContext>(router: Lazyable<T | undefined>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<InferRouterInitialContext<T>, Schema<unknown, unknown>, ErrorMap, Meta, TClientContext>>): JsonifiedClient<RouterClient<T, TClientContext>>;
 
@@ -106,5 +112,5 @@ declare const oo: {
     spec: typeof customOpenAPIOperation;
 };
 
-export { LOGIC_KEYWORDS, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, createJsonifiedRouterClient, customOpenAPIOperation, expandArrayableSchema, expandUnionSchema, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, isPrimitiveSchema, oo, resolveOpenAPIJsonSchemaRef, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export { LOGIC_KEYWORDS, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, createJsonifiedRouterClient, customOpenAPIOperation, expandArrayableSchema, expandUnionSchema, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, isPrimitiveSchema, oo, resolveOpenAPIJsonSchemaRef, separateObjectSchema, simplifyComposedObjectJsonSchemasAndRefs, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
 export type { FileSchema, ObjectSchema, OverrideOperationValue };

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import { OpenAPI, AnyContractProcedure } from '@orpc/contract';
 export { OpenAPI } from '@orpc/contract';
-export { e as CompositeSchemaConverter, C as ConditionalSchemaConverter, b as OpenAPIGenerator, a as OpenAPIGeneratorGenerateOptions, O as OpenAPIGeneratorOptions, c as SchemaConvertOptions, d as SchemaConverter, S as SchemaConverterComponent } from './shared/openapi.CfjfVeBJ.js';
+export { e as CompositeSchemaConverter, C as ConditionalSchemaConverter, b as OpenAPIGenerator, a as OpenAPIGeneratorGenerateOptions, O as OpenAPIGeneratorOptions, c as SchemaConvertOptions, d as SchemaConverter, S as SchemaConverterComponent } from './shared/openapi.BGy4N6eR.js';
 import { HTTPPath, HTTPMethod } from '@orpc/client';
-import { JSONSchema } from '@orpc/interop/json-schema-typed/draft-2020-12';
-export { JSONSchema, ContentEncoding as JSONSchemaContentEncoding, Format as JSONSchemaFormat, TypeName as JSONSchemaTypeName } from '@orpc/interop/json-schema-typed/draft-2020-12';
+import { JSONSchema } from 'json-schema-typed/draft-2020-12';
+export { JSONSchema, ContentEncoding as JSONSchemaContentEncoding, Format as JSONSchemaFormat, TypeName as JSONSchemaTypeName } from 'json-schema-typed/draft-2020-12';
 import { JsonifiedClient } from '@orpc/openapi-client';
 import { AnyRouter, ClientContext, Lazyable, CreateProcedureClientOptions, InferRouterInitialContext, Schema, ErrorMap, Meta, RouterClient } from '@orpc/server';
 import { MaybeOptionalOptions } from '@orpc/shared';
@@ -13,7 +13,7 @@ type OverrideOperationValue = Partial<OpenAPI.OperationObject> | ((current: Open
 /**
  * Customize The Operation Object by proxy an error map item or a middleware.
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification#customizing-operation-objects Customizing Operation Objects Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-specification#customizing-operation-objects Customizing Operation Objects Docs}
  */
 declare function customOpenAPIOperation<T extends object>(o: T, extend: OverrideOperationValue): T;
 declare function getCustomOpenAPIOperation(o: object): OverrideOperationValue | undefined;
@@ -66,6 +66,12 @@ declare function checkParamsSchema(schema: ObjectSchema, params: string[]): bool
  */
 declare function toOpenAPISchema(schema: JSONSchema): OpenAPI.SchemaObject & object;
 declare function resolveOpenAPIJsonSchemaRef(doc: OpenAPI.Document, schema: JSONSchema): JSONSchema;
+/**
+ * Simplifies composed object JSON Schemas (using anyOf, oneOf, allOf) by flattening nested compositions
+ *
+ * @warning The result is looser than the original schema and may not fully validate the same data.
+ */
+declare function simplifyComposedObjectJsonSchemasAndRefs(schema: JSONSchema, doc?: OpenAPI.Document): JSONSchema;
 
 declare function createJsonifiedRouterClient<T extends AnyRouter, TClientContext extends ClientContext>(router: Lazyable<T | undefined>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<InferRouterInitialContext<T>, Schema<unknown, unknown>, ErrorMap, Meta, TClientContext>>): JsonifiedClient<RouterClient<T, TClientContext>>;
 
@@ -106,5 +112,5 @@ declare const oo: {
     spec: typeof customOpenAPIOperation;
 };
 
-export { LOGIC_KEYWORDS, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, createJsonifiedRouterClient, customOpenAPIOperation, expandArrayableSchema, expandUnionSchema, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, isPrimitiveSchema, oo, resolveOpenAPIJsonSchemaRef, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export { LOGIC_KEYWORDS, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, createJsonifiedRouterClient, customOpenAPIOperation, expandArrayableSchema, expandUnionSchema, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, isPrimitiveSchema, oo, resolveOpenAPIJsonSchemaRef, separateObjectSchema, simplifyComposedObjectJsonSchemasAndRefs, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
 export type { FileSchema, ObjectSchema, OverrideOperationValue };

package/dist/index.mjs

@@ -1,10 +1,10 @@
-import { c as customOpenAPIOperation } from './shared/openapi.BlSv9FKY.mjs';
-export { C as CompositeSchemaConverter, L as LOGIC_KEYWORDS, O as OpenAPIGenerator, a as applyCustomOpenAPIOperation, n as applySchemaOptionality, h as checkParamsSchema, p as expandArrayableSchema, o as expandUnionSchema, m as filterSchemaBranches, g as getCustomOpenAPIOperation, l as isAnySchema, j as isFileSchema, k as isObjectSchema, q as isPrimitiveSchema, r as resolveOpenAPIJsonSchemaRef, s as separateObjectSchema, d as toOpenAPIContent, e as toOpenAPIEventIteratorContent, b as toOpenAPIMethod, f as toOpenAPIParameters, t as toOpenAPIPath, i as toOpenAPISchema } from './shared/openapi.BlSv9FKY.mjs';
+import { c as customOpenAPIOperation } from './shared/openapi.CoREqFh3.mjs';
+export { C as CompositeSchemaConverter, L as LOGIC_KEYWORDS, O as OpenAPIGenerator, a as applyCustomOpenAPIOperation, o as applySchemaOptionality, h as checkParamsSchema, q as expandArrayableSchema, p as expandUnionSchema, n as filterSchemaBranches, g as getCustomOpenAPIOperation, l as isAnySchema, j as isFileSchema, k as isObjectSchema, u as isPrimitiveSchema, r as resolveOpenAPIJsonSchemaRef, m as separateObjectSchema, s as simplifyComposedObjectJsonSchemasAndRefs, d as toOpenAPIContent, e as toOpenAPIEventIteratorContent, b as toOpenAPIMethod, f as toOpenAPIParameters, t as toOpenAPIPath, i as toOpenAPISchema } from './shared/openapi.CoREqFh3.mjs';
 import { createORPCErrorFromJson } from '@orpc/client';
 import { StandardOpenAPISerializer, StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer } from '@orpc/openapi-client/standard';
 import { ORPCError, createRouterClient } from '@orpc/server';
 import { resolveMaybeOptionalOptions } from '@orpc/shared';
-export { ContentEncoding as JSONSchemaContentEncoding, Format as JSONSchemaFormat, TypeName as JSONSchemaTypeName } from '@orpc/interop/json-schema-typed/draft-2020-12';
+export { ContentEncoding as JSONSchemaContentEncoding, Format as JSONSchemaFormat, TypeName as JSONSchemaTypeName } from 'json-schema-typed/draft-2020-12';
 import '@orpc/client/standard';
 import '@orpc/contract';
 

package/dist/plugins/index.d.mts

@@ -2,9 +2,9 @@ import { OpenAPI } from '@orpc/contract';
 import { Context, HTTPPath, Router } from '@orpc/server';
 import { StandardHandlerInterceptorOptions, StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { Value, Promisable } from '@orpc/shared';
-import { O as OpenAPIGeneratorOptions, a as OpenAPIGeneratorGenerateOptions } from '../shared/openapi.CfjfVeBJ.mjs';
+import { O as OpenAPIGeneratorOptions, a as OpenAPIGeneratorGenerateOptions } from '../shared/openapi.BGy4N6eR.mjs';
 import '@orpc/openapi-client/standard';
-import '@orpc/interop/json-schema-typed/draft-2020-12';
+import 'json-schema-typed/draft-2020-12';
 
 interface OpenAPIReferencePluginOptions<T extends Context> extends OpenAPIGeneratorOptions {
     /**

package/dist/plugins/index.d.ts

@@ -2,9 +2,9 @@ import { OpenAPI } from '@orpc/contract';
 import { Context, HTTPPath, Router } from '@orpc/server';
 import { StandardHandlerInterceptorOptions, StandardHandlerPlugin, StandardHandlerOptions } from '@orpc/server/standard';
 import { Value, Promisable } from '@orpc/shared';
-import { O as OpenAPIGeneratorOptions, a as OpenAPIGeneratorGenerateOptions } from '../shared/openapi.CfjfVeBJ.js';
+import { O as OpenAPIGeneratorOptions, a as OpenAPIGeneratorGenerateOptions } from '../shared/openapi.BGy4N6eR.js';
 import '@orpc/openapi-client/standard';
-import '@orpc/interop/json-schema-typed/draft-2020-12';
+import 'json-schema-typed/draft-2020-12';
 
 interface OpenAPIReferencePluginOptions<T extends Context> extends OpenAPIGeneratorOptions {
     /**

package/dist/plugins/index.mjs

@@ -1,11 +1,11 @@
 import { stringifyJSON, once, value } from '@orpc/shared';
-import { O as OpenAPIGenerator } from '../shared/openapi.BlSv9FKY.mjs';
+import { O as OpenAPIGenerator } from '../shared/openapi.CoREqFh3.mjs';
 import '@orpc/client';
 import '@orpc/client/standard';
 import '@orpc/contract';
 import '@orpc/openapi-client/standard';
 import '@orpc/server';
-import '@orpc/interop/json-schema-typed/draft-2020-12';
+import 'json-schema-typed/draft-2020-12';
 
 class OpenAPIReferencePlugin {
   generator;

package/dist/shared/{openapi.CfjfVeBJ.d.mts → openapi.BGy4N6eR.d.mts}

@@ -2,7 +2,7 @@ import { AnySchema, OpenAPI, AnyContractProcedure, AnyContractRouter } from '@or
 import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
 import { AnyProcedure, TraverseContractProcedureCallbackOptions, AnyRouter } from '@orpc/server';
 import { Promisable, Value } from '@orpc/shared';
-import { JSONSchema } from '@orpc/interop/json-schema-typed/draft-2020-12';
+import { JSONSchema } from 'json-schema-typed/draft-2020-12';
 
 interface SchemaConverterComponent {
     allowedStrategies: readonly SchemaConvertOptions['strategy'][];
@@ -85,11 +85,23 @@ interface OpenAPIGeneratorGenerateOptions extends Partial<Omit<OpenAPI.Document,
         error: 'UndefinedError';
         schema?: never;
     }>;
+    /**
+     * Define a custom JSON schema for the error response body when using
+     * type-safe errors. Helps align ORPC error formatting with existing API
+     * response standards or conventions.
+     *
+     * @remarks
+     * - Return `null | undefined` to use the default error response body shaper.
+     */
+    customErrorResponseBodySchema?: Value<JSONSchema | undefined | null, [
+        definedErrors: [code: string, defaultMessage: string, dataRequired: boolean, dataSchema: JSONSchema][],
+        status: number
+    ]>;
 }
 /**
  * The generator that converts oRPC routers/contracts to OpenAPI specifications.
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification OpenAPI Specification Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-specification OpenAPI Specification Docs}
  */
 declare class OpenAPIGenerator {
     #private;
@@ -99,9 +111,9 @@ declare class OpenAPIGenerator {
     /**
      * Generates OpenAPI specifications from oRPC routers/contracts.
      *
-     * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification OpenAPI Specification Docs}
+     * @see {@link https://orpc.dev/docs/openapi/openapi-specification OpenAPI Specification Docs}
      */
-    generate(router: AnyContractRouter | AnyRouter, options?: OpenAPIGeneratorGenerateOptions): Promise<OpenAPI.Document>;
+    generate(router: AnyContractRouter | AnyRouter, { customErrorResponseBodySchema, commonSchemas, filter: baseFilter, exclude, ...baseDoc }?: OpenAPIGeneratorGenerateOptions): Promise<OpenAPI.Document>;
 }
 
 export { OpenAPIGenerator as b, CompositeSchemaConverter as e };

package/dist/shared/{openapi.CfjfVeBJ.d.ts → openapi.BGy4N6eR.d.ts}

@@ -2,7 +2,7 @@ import { AnySchema, OpenAPI, AnyContractProcedure, AnyContractRouter } from '@or
 import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
 import { AnyProcedure, TraverseContractProcedureCallbackOptions, AnyRouter } from '@orpc/server';
 import { Promisable, Value } from '@orpc/shared';
-import { JSONSchema } from '@orpc/interop/json-schema-typed/draft-2020-12';
+import { JSONSchema } from 'json-schema-typed/draft-2020-12';
 
 interface SchemaConverterComponent {
     allowedStrategies: readonly SchemaConvertOptions['strategy'][];
@@ -85,11 +85,23 @@ interface OpenAPIGeneratorGenerateOptions extends Partial<Omit<OpenAPI.Document,
         error: 'UndefinedError';
         schema?: never;
     }>;
+    /**
+     * Define a custom JSON schema for the error response body when using
+     * type-safe errors. Helps align ORPC error formatting with existing API
+     * response standards or conventions.
+     *
+     * @remarks
+     * - Return `null | undefined` to use the default error response body shaper.
+     */
+    customErrorResponseBodySchema?: Value<JSONSchema | undefined | null, [
+        definedErrors: [code: string, defaultMessage: string, dataRequired: boolean, dataSchema: JSONSchema][],
+        status: number
+    ]>;
 }
 /**
  * The generator that converts oRPC routers/contracts to OpenAPI specifications.
  *
- * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification OpenAPI Specification Docs}
+ * @see {@link https://orpc.dev/docs/openapi/openapi-specification OpenAPI Specification Docs}
  */
 declare class OpenAPIGenerator {
     #private;
@@ -99,9 +111,9 @@ declare class OpenAPIGenerator {
     /**
      * Generates OpenAPI specifications from oRPC routers/contracts.
      *
-     * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification OpenAPI Specification Docs}
+     * @see {@link https://orpc.dev/docs/openapi/openapi-specification OpenAPI Specification Docs}
      */
-    generate(router: AnyContractRouter | AnyRouter, options?: OpenAPIGeneratorGenerateOptions): Promise<OpenAPI.Document>;
+    generate(router: AnyContractRouter | AnyRouter, { customErrorResponseBodySchema, commonSchemas, filter: baseFilter, exclude, ...baseDoc }?: OpenAPIGeneratorGenerateOptions): Promise<OpenAPI.Document>;
 }
 
 export { OpenAPIGenerator as b, CompositeSchemaConverter as e };

package/dist/shared/{openapi.BlSv9FKY.mjs → openapi.CoREqFh3.mjs}

@@ -4,7 +4,7 @@ import { fallbackContractConfig, getEventIteratorSchemaDetails } from '@orpc/con
 import { standardizeHTTPPath, StandardOpenAPIJsonSerializer, getDynamicParams } from '@orpc/openapi-client/standard';
 import { isProcedure, resolveContractProcedures } from '@orpc/server';
 import { isObject, stringifyJSON, findDeepMatches, toArray, clone, value } from '@orpc/shared';
-import { TypeName } from '@orpc/interop/json-schema-typed/draft-2020-12';
+import { TypeName } from 'json-schema-typed/draft-2020-12';
 
 const OPERATION_EXTENDER_SYMBOL = Symbol("ORPC_OPERATION_EXTENDER");
 function customOpenAPIOperation(o, extend) {
@@ -359,6 +359,107 @@ function resolveOpenAPIJsonSchemaRef(doc, schema) {
   const resolved = doc.components?.schemas?.[name];
   return resolved ?? schema;
 }
+function simplifyComposedObjectJsonSchemasAndRefs(schema, doc) {
+  if (doc) {
+    schema = resolveOpenAPIJsonSchemaRef(doc, schema);
+  }
+  if (typeof schema !== "object" || !schema.anyOf && !schema.oneOf && !schema.allOf) {
+    return schema;
+  }
+  const unionSchemas = [
+    ...toArray(schema.anyOf?.map((s) => simplifyComposedObjectJsonSchemasAndRefs(s, doc))),
+    ...toArray(schema.oneOf?.map((s) => simplifyComposedObjectJsonSchemasAndRefs(s, doc)))
+  ];
+  const objectUnionSchemas = [];
+  for (const u of unionSchemas) {
+    if (!isObjectSchema(u)) {
+      return schema;
+    }
+    objectUnionSchemas.push(u);
+  }
+  const mergedUnionPropertyMap = /* @__PURE__ */ new Map();
+  for (const u of objectUnionSchemas) {
+    if (u.properties) {
+      for (const [key, value] of Object.entries(u.properties)) {
+        let entry = mergedUnionPropertyMap.get(key);
+        if (!entry) {
+          const required = objectUnionSchemas.every((s) => s.required?.includes(key));
+          entry = { required, schemas: [] };
+          mergedUnionPropertyMap.set(key, entry);
+        }
+        entry.schemas.push(value);
+      }
+    }
+  }
+  const intersectionSchemas = toArray(schema.allOf?.map((s) => simplifyComposedObjectJsonSchemasAndRefs(s, doc)));
+  const objectIntersectionSchemas = [];
+  for (const u of intersectionSchemas) {
+    if (!isObjectSchema(u)) {
+      return schema;
+    }
+    objectIntersectionSchemas.push(u);
+  }
+  if (isObjectSchema(schema)) {
+    objectIntersectionSchemas.push(schema);
+  }
+  const mergedInteractionPropertyMap = /* @__PURE__ */ new Map();
+  for (const u of objectIntersectionSchemas) {
+    if (u.properties) {
+      for (const [key, value] of Object.entries(u.properties)) {
+        let entry = mergedInteractionPropertyMap.get(key);
+        if (!entry) {
+          const required = objectIntersectionSchemas.some((s) => s.required?.includes(key));
+          entry = { required, schemas: [] };
+          mergedInteractionPropertyMap.set(key, entry);
+        }
+        entry.schemas.push(value);
+      }
+    }
+  }
+  const resultObjectSchema = { type: "object", properties: {}, required: [] };
+  const keys = /* @__PURE__ */ new Set([
+    ...mergedUnionPropertyMap.keys(),
+    ...mergedInteractionPropertyMap.keys()
+  ]);
+  if (keys.size === 0) {
+    return schema;
+  }
+  const deduplicateSchemas = (schemas) => {
+    const seen = /* @__PURE__ */ new Set();
+    const result = [];
+    for (const schema2 of schemas) {
+      const key = stringifyJSON(schema2);
+      if (!seen.has(key)) {
+        seen.add(key);
+        result.push(schema2);
+      }
+    }
+    return result;
+  };
+  for (const key of keys) {
+    const unionEntry = mergedUnionPropertyMap.get(key);
+    const intersectionEntry = mergedInteractionPropertyMap.get(key);
+    resultObjectSchema.properties[key] = (() => {
+      const dedupedUnionSchemas = unionEntry ? deduplicateSchemas(unionEntry.schemas) : [];
+      const dedupedIntersectionSchemas = intersectionEntry ? deduplicateSchemas(intersectionEntry.schemas) : [];
+      if (!dedupedUnionSchemas.length) {
+        return dedupedIntersectionSchemas.length === 1 ? dedupedIntersectionSchemas[0] : { allOf: dedupedIntersectionSchemas };
+      }
+      if (!dedupedIntersectionSchemas.length) {
+        return dedupedUnionSchemas.length === 1 ? dedupedUnionSchemas[0] : { anyOf: dedupedUnionSchemas };
+      }
+      const allOf = deduplicateSchemas([
+        ...dedupedIntersectionSchemas,
+        dedupedUnionSchemas.length === 1 ? dedupedUnionSchemas[0] : { anyOf: dedupedUnionSchemas }
+      ]);
+      return allOf.length === 1 ? allOf[0] : { allOf };
+    })();
+    if (unionEntry?.required || intersectionEntry?.required) {
+      resultObjectSchema.required.push(key);
+    }
+  }
+  return resultObjectSchema;
+}
 
 class CompositeSchemaConverter {
   converters;
@@ -387,21 +488,18 @@ class OpenAPIGenerator {
   /**
    * Generates OpenAPI specifications from oRPC routers/contracts.
    *
-   * @see {@link https://orpc.unnoq.com/docs/openapi/openapi-specification OpenAPI Specification Docs}
+   * @see {@link https://orpc.dev/docs/openapi/openapi-specification OpenAPI Specification Docs}
    */
-  async generate(router, options = {}) {
-    const filter = options.filter ?? (({ contract, path }) => {
-      return !(options.exclude?.(contract, path) ?? false);
+  async generate(router, { customErrorResponseBodySchema, commonSchemas, filter: baseFilter, exclude, ...baseDoc } = {}) {
+    const filter = baseFilter ?? (({ contract, path }) => {
+      return !(exclude?.(contract, path) ?? false);
     });
     const doc = {
-      ...clone(options),
-      info: options.info ?? { title: "API Reference", version: "0.0.0" },
-      openapi: "3.1.1",
-      exclude: void 0,
-      filter: void 0,
-      commonSchemas: void 0
+      ...clone(baseDoc),
+      info: baseDoc.info ?? { title: "API Reference", version: "0.0.0" },
+      openapi: "3.1.1"
     };
-    const { baseSchemaConvertOptions, undefinedErrorJsonSchema } = await this.#resolveCommonSchemas(doc, options.commonSchemas);
+    const { baseSchemaConvertOptions, undefinedErrorJsonSchema } = await this.#resolveCommonSchemas(doc, commonSchemas);
     const contracts = [];
     await resolveContractProcedures({ path: [], router }, (traverseOptions) => {
       if (!value(filter, traverseOptions)) {
@@ -429,7 +527,7 @@ class OpenAPIGenerator {
           };
           await this.#request(doc, operationObjectRef, def, baseSchemaConvertOptions);
           await this.#successResponse(doc, operationObjectRef, def, baseSchemaConvertOptions);
-          await this.#errorResponse(operationObjectRef, def, baseSchemaConvertOptions, undefinedErrorJsonSchema);
+          await this.#errorResponse(operationObjectRef, def, baseSchemaConvertOptions, undefinedErrorJsonSchema, customErrorResponseBodySchema);
         }
         if (typeof def.route.spec === "function") {
           operationObjectRef = def.route.spec(operationObjectRef);
@@ -542,13 +640,15 @@ ${errors.join("\n\n")}`
       def.inputSchema,
       {
         ...baseSchemaConvertOptions,
-        strategy: "input",
-        minStructureDepthForRef: dynamicParams?.length || inputStructure === "detailed" ? 1 : 0
+        strategy: "input"
       }
     );
     if (isAnySchema(schema) && !dynamicParams?.length) {
       return;
     }
+    if (inputStructure === "detailed" || inputStructure === "compact" && (dynamicParams?.length || method === "GET")) {
+      schema = simplifyComposedObjectJsonSchemasAndRefs(schema, doc);
+    }
     if (inputStructure === "compact") {
       if (dynamicParams?.length) {
         const error2 = new OpenAPIGeneratorError(
@@ -567,14 +667,13 @@ ${errors.join("\n\n")}`
         ref.parameters.push(...toOpenAPIParameters(paramsSchema, "path"));
       }
       if (method === "GET") {
-        const resolvedSchema = resolveOpenAPIJsonSchemaRef(doc, schema);
-        if (!isObjectSchema(resolvedSchema)) {
+        if (!isObjectSchema(schema)) {
           throw new OpenAPIGeneratorError(
             'When method is "GET", input schema must satisfy: object | any | unknown'
           );
         }
         ref.parameters ??= [];
-        ref.parameters.push(...toOpenAPIParameters(resolvedSchema, "query"));
+        ref.parameters.push(...toOpenAPIParameters(schema, "query"));
       } else {
         ref.requestBody = {
           required,
@@ -589,7 +688,7 @@ ${errors.join("\n\n")}`
     if (!isObjectSchema(schema)) {
       throw error;
     }
-    const resolvedParamSchema = schema.properties?.params !== void 0 ? resolveOpenAPIJsonSchemaRef(doc, schema.properties.params) : void 0;
+    const resolvedParamSchema = schema.properties?.params !== void 0 ? simplifyComposedObjectJsonSchemasAndRefs(schema.properties.params, doc) : void 0;
     if (dynamicParams?.length && (resolvedParamSchema === void 0 || !isObjectSchema(resolvedParamSchema) || !checkParamsSchema(resolvedParamSchema, dynamicParams))) {
       throw new OpenAPIGeneratorError(
         'When input structure is "detailed" and path has dynamic params, the "params" schema must be an object with all dynamic params as required.'
@@ -598,7 +697,7 @@ ${errors.join("\n\n")}`
     for (const from of ["params", "query", "headers"]) {
       const fromSchema = schema.properties?.[from];
       if (fromSchema !== void 0) {
-        const resolvedSchema = resolveOpenAPIJsonSchemaRef(doc, fromSchema);
+        const resolvedSchema = simplifyComposedObjectJsonSchemasAndRefs(fromSchema, doc);
         if (!isObjectSchema(resolvedSchema)) {
           throw error;
         }
@@ -659,13 +758,14 @@ ${errors.join("\n\n")}`
         
         But got: ${stringifyJSON(item)}
       `);
-      if (!isObjectSchema(item)) {
+      const simplifiedItem = simplifyComposedObjectJsonSchemasAndRefs(item, doc);
+      if (!isObjectSchema(simplifiedItem)) {
         throw error;
       }
       let schemaStatus;
       let schemaDescription;
-      if (item.properties?.status !== void 0) {
-        const statusSchema = resolveOpenAPIJsonSchemaRef(doc, item.properties.status);
+      if (simplifiedItem.properties?.status !== void 0) {
+        const statusSchema = resolveOpenAPIJsonSchemaRef(doc, simplifiedItem.properties.status);
         if (typeof statusSchema !== "object" || statusSchema.const === void 0 || typeof statusSchema.const !== "number" || !Number.isInteger(statusSchema.const) || isORPCErrorStatus(statusSchema.const)) {
           throw error;
         }
@@ -685,8 +785,8 @@ ${errors.join("\n\n")}`
       ref.responses[itemStatus] = {
         description: itemDescription
       };
-      if (item.properties?.headers !== void 0) {
-        const headersSchema = resolveOpenAPIJsonSchemaRef(doc, item.properties.headers);
+      if (simplifiedItem.properties?.headers !== void 0) {
+        const headersSchema = simplifyComposedObjectJsonSchemasAndRefs(simplifiedItem.properties.headers, doc);
         if (!isObjectSchema(headersSchema)) {
           throw error;
         }
@@ -696,50 +796,52 @@ ${errors.join("\n\n")}`
             ref.responses[itemStatus].headers ??= {};
             ref.responses[itemStatus].headers[key] = {
               schema: toOpenAPISchema(headerSchema),
-              required: item.required?.includes("headers") && headersSchema.required?.includes(key)
+              required: simplifiedItem.required?.includes("headers") && headersSchema.required?.includes(key)
             };
           }
         }
       }
-      if (item.properties?.body !== void 0) {
+      if (simplifiedItem.properties?.body !== void 0) {
         ref.responses[itemStatus].content = toOpenAPIContent(
-          applySchemaOptionality(item.required?.includes("body") ?? false, item.properties.body)
+          applySchemaOptionality(simplifiedItem.required?.includes("body") ?? false, simplifiedItem.properties.body)
         );
       }
     }
   }
-  async #errorResponse(ref, def, baseSchemaConvertOptions, undefinedErrorSchema) {
+  async #errorResponse(ref, def, baseSchemaConvertOptions, undefinedErrorSchema, customErrorResponseBodySchema) {
     const errorMap = def.errorMap;
-    const errors = {};
+    const errorResponsesByStatus = {};
     for (const code in errorMap) {
       const config = errorMap[code];
       if (!config) {
         continue;
       }
       const status = fallbackORPCErrorStatus(code, config.status);
-      const message = fallbackORPCErrorMessage(code, config.message);
+      const defaultMessage = fallbackORPCErrorMessage(code, config.message);
+      errorResponsesByStatus[status] ??= { status, definedErrorDefinitions: [], errorSchemaVariants: [] };
       const [dataRequired, dataSchema] = await this.converter.convert(config.data, { ...baseSchemaConvertOptions, strategy: "output" });
-      errors[status] ??= [];
-      errors[status].push({
+      errorResponsesByStatus[status].definedErrorDefinitions.push([code, defaultMessage, dataRequired, dataSchema]);
+      errorResponsesByStatus[status].errorSchemaVariants.push({
         type: "object",
         properties: {
           defined: { const: true },
           code: { const: code },
           status: { const: status },
-          message: { type: "string", default: message },
+          message: { type: "string", default: defaultMessage },
           data: dataSchema
         },
         required: dataRequired ? ["defined", "code", "status", "message", "data"] : ["defined", "code", "status", "message"]
       });
     }
     ref.responses ??= {};
-    for (const status in errors) {
-      const schemas = errors[status];
-      ref.responses[status] = {
-        description: status,
-        content: toOpenAPIContent({
+    for (const statusString in errorResponsesByStatus) {
+      const errorResponse = errorResponsesByStatus[statusString];
+      const customBodySchema = value(customErrorResponseBodySchema, errorResponse.definedErrorDefinitions, errorResponse.status);
+      ref.responses[statusString] = {
+        description: statusString,
+        content: toOpenAPIContent(customBodySchema ?? {
           oneOf: [
-            ...schemas,
+            ...errorResponse.errorSchemaVariants,
             undefinedErrorSchema
           ]
         })
@@ -748,4 +850,4 @@ ${errors.join("\n\n")}`
   }
 }
 
-export { CompositeSchemaConverter as C, LOGIC_KEYWORDS as L, OpenAPIGenerator as O, applyCustomOpenAPIOperation as a, toOpenAPIMethod as b, customOpenAPIOperation as c, toOpenAPIContent as d, toOpenAPIEventIteratorContent as e, toOpenAPIParameters as f, getCustomOpenAPIOperation as g, checkParamsSchema as h, toOpenAPISchema as i, isFileSchema as j, isObjectSchema as k, isAnySchema as l, filterSchemaBranches as m, applySchemaOptionality as n, expandUnionSchema as o, expandArrayableSchema as p, isPrimitiveSchema as q, resolveOpenAPIJsonSchemaRef as r, separateObjectSchema as s, toOpenAPIPath as t };
+export { CompositeSchemaConverter as C, LOGIC_KEYWORDS as L, OpenAPIGenerator as O, applyCustomOpenAPIOperation as a, toOpenAPIMethod as b, customOpenAPIOperation as c, toOpenAPIContent as d, toOpenAPIEventIteratorContent as e, toOpenAPIParameters as f, getCustomOpenAPIOperation as g, checkParamsSchema as h, toOpenAPISchema as i, isFileSchema as j, isObjectSchema as k, isAnySchema as l, separateObjectSchema as m, filterSchemaBranches as n, applySchemaOptionality as o, expandUnionSchema as p, expandArrayableSchema as q, resolveOpenAPIJsonSchemaRef as r, simplifyComposedObjectJsonSchemasAndRefs as s, toOpenAPIPath as t, isPrimitiveSchema as u };

package/dist/shared/{openapi.BVXcB0u4.mjs → openapi.DIt-Z9W1.mjs}

@@ -8,9 +8,11 @@ import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter
 import { createRouter, addRoute, findRoute } from 'rou3';
 
 class StandardOpenAPICodec {
-  constructor(serializer) {
+  constructor(serializer, options = {}) {
     this.serializer = serializer;
+    this.customErrorResponseBodyEncoder = options.customErrorResponseBodyEncoder;
   }
+  customErrorResponseBodyEncoder;
   async decode(request, params, procedure) {
     const inputStructure = fallbackContractConfig("defaultInputStructure", procedure["~orpc"].route.inputStructure);
     if (inputStructure === "compact") {
@@ -73,10 +75,11 @@ class StandardOpenAPICodec {
     };
   }
   encodeError(error) {
+    const body = this.customErrorResponseBodyEncoder?.(error) ?? error.toJSON();
     return {
       status: error.status,
       headers: {},
-      body: this.serializer.serialize(error.toJSON(), { outputFormat: "plain" })
+      body: this.serializer.serialize(body, { outputFormat: "plain" })
     };
   }
   #isDetailedOutput(output) {
@@ -179,7 +182,7 @@ class StandardOpenAPIHandler extends StandardHandler {
     const bracketNotationSerializer = new StandardBracketNotationSerializer(options);
     const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
     const matcher = new StandardOpenAPIMatcher(options);
-    const codec = new StandardOpenAPICodec(serializer);
+    const codec = new StandardOpenAPICodec(serializer, options);
     super(router, matcher, codec, options);
   }
 }

package/dist/shared/openapi.DwaweYRb.d.mts

@@ -0,0 +1,54 @@
+import { StandardOpenAPISerializer, StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions } from '@orpc/openapi-client/standard';
+import { AnyProcedure, TraverseContractProcedureCallbackOptions, AnyRouter, Context, Router } from '@orpc/server';
+import { StandardCodec, StandardParams, StandardMatcher, StandardMatchResult, StandardHandlerOptions, StandardHandler } from '@orpc/server/standard';
+import { ORPCError, HTTPPath } from '@orpc/client';
+import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
+import { Value } from '@orpc/shared';
+
+interface StandardOpenAPICodecOptions {
+    /**
+     * Customize how an ORPC error is encoded into a response body.
+     * Use this if your API needs a different error output structure.
+     *
+     * @remarks
+     * - Return `null | undefined` to fallback to default behavior
+     *
+     * @default ((e) => e.toJSON())
+     */
+    customErrorResponseBodyEncoder?: (error: ORPCError<any, any>) => unknown;
+}
+declare class StandardOpenAPICodec implements StandardCodec {
+    #private;
+    private readonly serializer;
+    private readonly customErrorResponseBodyEncoder;
+    constructor(serializer: StandardOpenAPISerializer, options?: StandardOpenAPICodecOptions);
+    decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
+    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
+    encodeError(error: ORPCError<any, any>): StandardResponse;
+}
+
+interface StandardOpenAPIMatcherOptions {
+    /**
+     * Filter procedures. Return `false` to exclude a procedure from matching.
+     *
+     * @default true
+     */
+    filter?: Value<boolean, [options: TraverseContractProcedureCallbackOptions]>;
+}
+declare class StandardOpenAPIMatcher implements StandardMatcher {
+    private readonly filter;
+    private readonly tree;
+    private pendingRouters;
+    constructor(options?: StandardOpenAPIMatcherOptions);
+    init(router: AnyRouter, path?: readonly string[]): void;
+    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
+}
+
+interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions, StandardOpenAPIMatcherOptions, StandardOpenAPICodecOptions {
+}
+declare class StandardOpenAPIHandler<T extends Context> extends StandardHandler<T> {
+    constructor(router: Router<any, T>, options: NoInfer<StandardOpenAPIHandlerOptions<T>>);
+}
+
+export { StandardOpenAPICodec as a, StandardOpenAPIHandler as c, StandardOpenAPIMatcher as e };
+export type { StandardOpenAPICodecOptions as S, StandardOpenAPIHandlerOptions as b, StandardOpenAPIMatcherOptions as d };

package/dist/shared/openapi.DwaweYRb.d.ts

@@ -0,0 +1,54 @@
+import { StandardOpenAPISerializer, StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions } from '@orpc/openapi-client/standard';
+import { AnyProcedure, TraverseContractProcedureCallbackOptions, AnyRouter, Context, Router } from '@orpc/server';
+import { StandardCodec, StandardParams, StandardMatcher, StandardMatchResult, StandardHandlerOptions, StandardHandler } from '@orpc/server/standard';
+import { ORPCError, HTTPPath } from '@orpc/client';
+import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
+import { Value } from '@orpc/shared';
+
+interface StandardOpenAPICodecOptions {
+    /**
+     * Customize how an ORPC error is encoded into a response body.
+     * Use this if your API needs a different error output structure.
+     *
+     * @remarks
+     * - Return `null | undefined` to fallback to default behavior
+     *
+     * @default ((e) => e.toJSON())
+     */
+    customErrorResponseBodyEncoder?: (error: ORPCError<any, any>) => unknown;
+}
+declare class StandardOpenAPICodec implements StandardCodec {
+    #private;
+    private readonly serializer;
+    private readonly customErrorResponseBodyEncoder;
+    constructor(serializer: StandardOpenAPISerializer, options?: StandardOpenAPICodecOptions);
+    decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
+    encode(output: unknown, procedure: AnyProcedure): StandardResponse;
+    encodeError(error: ORPCError<any, any>): StandardResponse;
+}
+
+interface StandardOpenAPIMatcherOptions {
+    /**
+     * Filter procedures. Return `false` to exclude a procedure from matching.
+     *
+     * @default true
+     */
+    filter?: Value<boolean, [options: TraverseContractProcedureCallbackOptions]>;
+}
+declare class StandardOpenAPIMatcher implements StandardMatcher {
+    private readonly filter;
+    private readonly tree;
+    private pendingRouters;
+    constructor(options?: StandardOpenAPIMatcherOptions);
+    init(router: AnyRouter, path?: readonly string[]): void;
+    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
+}
+
+interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions, StandardOpenAPIMatcherOptions, StandardOpenAPICodecOptions {
+}
+declare class StandardOpenAPIHandler<T extends Context> extends StandardHandler<T> {
+    constructor(router: Router<any, T>, options: NoInfer<StandardOpenAPIHandlerOptions<T>>);
+}
+
+export { StandardOpenAPICodec as a, StandardOpenAPIHandler as c, StandardOpenAPIMatcher as e };
+export type { StandardOpenAPICodecOptions as S, StandardOpenAPIHandlerOptions as b, StandardOpenAPIMatcherOptions as d };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.0.0-next.f677f1d",
+  "version": "0.0.0-next.f724c58",
   "license": "MIT",
-  "homepage": "https://orpc.unnoq.com",
+  "homepage": "https://orpc.dev",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/unnoq/orpc.git",
@@ -39,6 +39,11 @@
       "import": "./dist/adapters/node/index.mjs",
       "default": "./dist/adapters/node/index.mjs"
     },
+    "./fastify": {
+      "types": "./dist/adapters/fastify/index.d.mts",
+      "import": "./dist/adapters/fastify/index.mjs",
+      "default": "./dist/adapters/fastify/index.mjs"
+    },
     "./aws-lambda": {
       "types": "./dist/adapters/aws-lambda/index.d.mts",
       "import": "./dist/adapters/aws-lambda/index.mjs",
@@ -49,17 +54,19 @@
     "dist"
   ],
   "dependencies": {
-    "rou3": "^0.7.5",
-    "@orpc/client": "0.0.0-next.f677f1d",
-    "@orpc/interop": "0.0.0-next.f677f1d",
-    "@orpc/contract": "0.0.0-next.f677f1d",
-    "@orpc/openapi-client": "0.0.0-next.f677f1d",
-    "@orpc/server": "0.0.0-next.f677f1d",
-    "@orpc/standard-server": "0.0.0-next.f677f1d",
-    "@orpc/shared": "0.0.0-next.f677f1d"
+    "json-schema-typed": "^8.0.2",
+    "rou3": "^0.7.10",
+    "@orpc/client": "0.0.0-next.f724c58",
+    "@orpc/contract": "0.0.0-next.f724c58",
+    "@orpc/openapi-client": "0.0.0-next.f724c58",
+    "@orpc/interop": "0.0.0-next.f724c58",
+    "@orpc/server": "0.0.0-next.f724c58",
+    "@orpc/standard-server": "0.0.0-next.f724c58",
+    "@orpc/shared": "0.0.0-next.f724c58"
   },
   "devDependencies": {
-    "zod": "^4.1.11"
+    "fastify": "^5.6.2",
+    "zod": "^4.1.12"
   },
   "scripts": {
     "build": "unbuild",

package/dist/shared/openapi.CQmjvnb0.d.mts

@@ -1,31 +0,0 @@
-import { StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions } from '@orpc/openapi-client/standard';
-import { TraverseContractProcedureCallbackOptions, AnyRouter, Context, Router } from '@orpc/server';
-import { StandardMatcher, StandardMatchResult, StandardHandlerOptions, StandardHandler } from '@orpc/server/standard';
-import { HTTPPath } from '@orpc/client';
-import { Value } from '@orpc/shared';
-
-interface StandardOpenAPIMatcherOptions {
-    /**
-     * Filter procedures. Return `false` to exclude a procedure from matching.
-     *
-     * @default true
-     */
-    filter?: Value<boolean, [options: TraverseContractProcedureCallbackOptions]>;
-}
-declare class StandardOpenAPIMatcher implements StandardMatcher {
-    private readonly filter;
-    private readonly tree;
-    private pendingRouters;
-    constructor(options?: StandardOpenAPIMatcherOptions);
-    init(router: AnyRouter, path?: readonly string[]): void;
-    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
-}
-
-interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions, StandardOpenAPIMatcherOptions {
-}
-declare class StandardOpenAPIHandler<T extends Context> extends StandardHandler<T> {
-    constructor(router: Router<any, T>, options: NoInfer<StandardOpenAPIHandlerOptions<T>>);
-}
-
-export { StandardOpenAPIHandler as a, StandardOpenAPIMatcher as c };
-export type { StandardOpenAPIHandlerOptions as S, StandardOpenAPIMatcherOptions as b };

package/dist/shared/openapi.CQmjvnb0.d.ts

@@ -1,31 +0,0 @@
-import { StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions } from '@orpc/openapi-client/standard';
-import { TraverseContractProcedureCallbackOptions, AnyRouter, Context, Router } from '@orpc/server';
-import { StandardMatcher, StandardMatchResult, StandardHandlerOptions, StandardHandler } from '@orpc/server/standard';
-import { HTTPPath } from '@orpc/client';
-import { Value } from '@orpc/shared';
-
-interface StandardOpenAPIMatcherOptions {
-    /**
-     * Filter procedures. Return `false` to exclude a procedure from matching.
-     *
-     * @default true
-     */
-    filter?: Value<boolean, [options: TraverseContractProcedureCallbackOptions]>;
-}
-declare class StandardOpenAPIMatcher implements StandardMatcher {
-    private readonly filter;
-    private readonly tree;
-    private pendingRouters;
-    constructor(options?: StandardOpenAPIMatcherOptions);
-    init(router: AnyRouter, path?: readonly string[]): void;
-    match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
-}
-
-interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions, StandardBracketNotationSerializerOptions, StandardOpenAPIMatcherOptions {
-}
-declare class StandardOpenAPIHandler<T extends Context> extends StandardHandler<T> {
-    constructor(router: Router<any, T>, options: NoInfer<StandardOpenAPIHandlerOptions<T>>);
-}
-
-export { StandardOpenAPIHandler as a, StandardOpenAPIMatcher as c };
-export type { StandardOpenAPIHandlerOptions as S, StandardOpenAPIMatcherOptions as b };