@orpc/openapi 0.0.0-next.2546825 → 0.0.0-next.25532a8

package/README.md

@@ -32,7 +32,7 @@
 - **Contract-First Development 📜**: (Optional) Define your API contract upfront and implement it with confidence.
 - **Exceptional Developer Experience ✨**: Enjoy a streamlined workflow with robust typing and clear, in-code documentation.
 - **Multi-Runtime Support 🌍**: Run your code seamlessly on Cloudflare, Deno, Bun, Node.js, and more.
-- **Framework Integrations 🧩**: Supports Tanstack Query (React, Vue), Pinia Colada, and more.
+- **Framework Integrations 🧩**: Supports Tanstack Query (React, Vue, Solid, Svelte), Pinia Colada, and more.
 - **Server Actions ⚡️**: Fully compatible with React Server Actions on Next.js, TanStack Start, and more.
 - **Standard Schema Support 🗂️**: Effortlessly work with Zod, Valibot, ArkType, and others right out of the box.
 - **Fast & Lightweight 💨**: Built on native APIs across all runtimes – optimized for speed and efficiency.
@@ -53,11 +53,16 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
 - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
+- [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
 - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).
+- [@orpc/solid-query](https://www.npmjs.com/package/@orpc/solid-query): Integration with [Solid Query](https://tanstack.com/query/latest/docs/framework/solid/overview).
+- [@orpc/svelte-query](https://www.npmjs.com/package/@orpc/svelte-query): Integration with [Svelte Query](https://tanstack.com/query/latest/docs/framework/svelte/overview).
 - [@orpc/vue-colada](https://www.npmjs.com/package/@orpc/vue-colada): Integration with [Pinia Colada](https://pinia-colada.esm.dev/).
 - [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
 - [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): More schemas that [Zod](https://zod.dev/) doesn't support yet.
+- [@orpc/valibot](https://www.npmjs.com/package/@orpc/valibot): OpenAPI spec generation from [Valibot](https://valibot.dev/).
+- [@orpc/arktype](https://www.npmjs.com/package/@orpc/arktype): OpenAPI spec generation from [ArkType](https://arktype.io/).
 
 ## `@orpc/openapi`
 
@@ -86,6 +91,14 @@ const server = createServer(async (req, res) => {
 server.listen(3000, '127.0.0.1', () => console.log('Listening on 127.0.0.1:3000'))
 ```
 
+## Sponsors
+
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg'/>
+  </a>
+</p>
+
 ## License
 
 Distributed under the MIT License. See [LICENSE](https://github.com/unnoq/orpc/blob/main/LICENSE) for more information.

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

@@ -1,13 +1,11 @@
 import { Context, Router } from '@orpc/server';
-import { FetchHandler, FetchHandleResult } from '@orpc/server/fetch';
-import { StandardHandlerOptions, StandardHandleOptions } from '@orpc/server/standard';
-import { MaybeOptionalOptions } from '@orpc/shared';
-import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
+import { FetchHandler, FetchHandlerOptions } from '@orpc/server/fetch';
+import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.mjs';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
 
-declare class OpenAPIHandler<T extends Context> implements FetchHandler<T> {
-    private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<StandardHandlerOptions<T>>);
-    handle(request: Request, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & ToFetchResponseOptions>): Promise<FetchHandleResult>;
+declare class OpenAPIHandler<T extends Context> extends FetchHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardOpenAPIHandlerOptions<T> & FetchHandlerOptions<T>>);
 }
 
 export { OpenAPIHandler };

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

@@ -1,13 +1,11 @@
 import { Context, Router } from '@orpc/server';
-import { FetchHandler, FetchHandleResult } from '@orpc/server/fetch';
-import { StandardHandlerOptions, StandardHandleOptions } from '@orpc/server/standard';
-import { MaybeOptionalOptions } from '@orpc/shared';
-import { ToFetchResponseOptions } from '@orpc/standard-server-fetch';
+import { FetchHandler, FetchHandlerOptions } from '@orpc/server/fetch';
+import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.js';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
 
-declare class OpenAPIHandler<T extends Context> implements FetchHandler<T> {
-    private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<StandardHandlerOptions<T>>);
-    handle(request: Request, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & ToFetchResponseOptions>): Promise<FetchHandleResult>;
+declare class OpenAPIHandler<T extends Context> extends FetchHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardOpenAPIHandlerOptions<T> & FetchHandlerOptions<T>>);
 }
 
 export { OpenAPIHandler };

package/dist/adapters/fetch/index.mjs

@@ -1,11 +1,10 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.C015V43J.mjs';
+export { O as OpenAPIHandler } from '../../shared/openapi.CGZ7t-VN.mjs';
 import '@orpc/openapi-client/standard';
+import '@orpc/server/fetch';
 import '@orpc/server/standard';
-import '@orpc/standard-server-fetch';
-import '../../shared/openapi.DFXD6scT.mjs';
+import '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
-import 'json-schema-typed/draft-2020-12';

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

@@ -1,6 +1,6 @@
 export { OpenAPIHandler } from '../fetch/index.mjs';
 import '@orpc/server';
 import '@orpc/server/fetch';
+import '../../shared/openapi.IfmmOyba.mjs';
+import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
-import '@orpc/shared';
-import '@orpc/standard-server-fetch';

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

@@ -1,6 +1,6 @@
 export { OpenAPIHandler } from '../fetch/index.js';
 import '@orpc/server';
 import '@orpc/server/fetch';
+import '../../shared/openapi.IfmmOyba.js';
+import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
-import '@orpc/shared';
-import '@orpc/standard-server-fetch';

package/dist/adapters/hono/index.mjs

@@ -1,11 +1,10 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.C015V43J.mjs';
+export { O as OpenAPIHandler } from '../../shared/openapi.CGZ7t-VN.mjs';
 import '@orpc/openapi-client/standard';
+import '@orpc/server/fetch';
 import '@orpc/server/standard';
-import '@orpc/standard-server-fetch';
-import '../../shared/openapi.DFXD6scT.mjs';
+import '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
-import 'json-schema-typed/draft-2020-12';

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

@@ -1,6 +1,6 @@
 export { OpenAPIHandler } from '../fetch/index.mjs';
 import '@orpc/server';
 import '@orpc/server/fetch';
+import '../../shared/openapi.IfmmOyba.mjs';
+import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
-import '@orpc/shared';
-import '@orpc/standard-server-fetch';

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

@@ -1,6 +1,6 @@
 export { OpenAPIHandler } from '../fetch/index.js';
 import '@orpc/server';
 import '@orpc/server/fetch';
+import '../../shared/openapi.IfmmOyba.js';
+import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
-import '@orpc/shared';
-import '@orpc/standard-server-fetch';

package/dist/adapters/next/index.mjs

@@ -1,11 +1,10 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.C015V43J.mjs';
+export { O as OpenAPIHandler } from '../../shared/openapi.CGZ7t-VN.mjs';
 import '@orpc/openapi-client/standard';
+import '@orpc/server/fetch';
 import '@orpc/server/standard';
-import '@orpc/standard-server-fetch';
-import '../../shared/openapi.DFXD6scT.mjs';
+import '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
-import 'json-schema-typed/draft-2020-12';

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

@@ -1,13 +1,11 @@
 import { Context, Router } from '@orpc/server';
-import { NodeHttpHandler, NodeHttpRequest, NodeHttpResponse, NodeHttpHandleResult } from '@orpc/server/node';
-import { StandardHandlerOptions, StandardHandleOptions } from '@orpc/server/standard';
-import { MaybeOptionalOptions } from '@orpc/shared';
-import { SendStandardResponseOptions } from '@orpc/standard-server-node';
+import { NodeHttpHandler, NodeHttpHandlerOptions } from '@orpc/server/node';
+import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.mjs';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
 
-declare class OpenAPIHandler<T extends Context> implements NodeHttpHandler<T> {
-    private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<StandardHandlerOptions<T>>);
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & SendStandardResponseOptions>): Promise<NodeHttpHandleResult>;
+declare class OpenAPIHandler<T extends Context> extends NodeHttpHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardOpenAPIHandlerOptions<T> & NodeHttpHandlerOptions<T>>);
 }
 
 export { OpenAPIHandler };

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

@@ -1,13 +1,11 @@
 import { Context, Router } from '@orpc/server';
-import { NodeHttpHandler, NodeHttpRequest, NodeHttpResponse, NodeHttpHandleResult } from '@orpc/server/node';
-import { StandardHandlerOptions, StandardHandleOptions } from '@orpc/server/standard';
-import { MaybeOptionalOptions } from '@orpc/shared';
-import { SendStandardResponseOptions } from '@orpc/standard-server-node';
+import { NodeHttpHandler, NodeHttpHandlerOptions } from '@orpc/server/node';
+import { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.js';
+import '@orpc/openapi-client/standard';
+import '@orpc/server/standard';
 
-declare class OpenAPIHandler<T extends Context> implements NodeHttpHandler<T> {
-    private readonly standardHandler;
-    constructor(router: Router<T, any>, options?: NoInfer<StandardHandlerOptions<T>>);
-    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...[options,]: MaybeOptionalOptions<StandardHandleOptions<T> & SendStandardResponseOptions>): Promise<NodeHttpHandleResult>;
+declare class OpenAPIHandler<T extends Context> extends NodeHttpHandler<T> {
+    constructor(router: Router<any, T>, options?: NoInfer<StandardOpenAPIHandlerOptions<T> & NodeHttpHandlerOptions<T>>);
 }
 
 export { OpenAPIHandler };

package/dist/adapters/node/index.mjs

@@ -1,32 +1,21 @@
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
+import { StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer, StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
+import { NodeHttpHandler } from '@orpc/server/node';
 import { StandardHandler } from '@orpc/server/standard';
-import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-node';
-import { a as OpenAPIMatcher, O as OpenAPICodec } from '../../shared/openapi.DFXD6scT.mjs';
-import '@orpc/shared';
-import 'json-schema-typed/draft-2020-12';
+import { a as StandardOpenAPIMatcher, S as StandardOpenAPICodec } from '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
+import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
 
-class OpenAPIHandler {
-  standardHandler;
+class OpenAPIHandler extends NodeHttpHandler {
   constructor(router, options = {}) {
-    const serializer = new OpenAPISerializer();
-    const matcher = new OpenAPIMatcher();
-    const codec = new OpenAPICodec(serializer);
-    this.standardHandler = new StandardHandler(router, matcher, codec, options);
-  }
-  async handle(req, res, ...[
-    options = {}
-  ]) {
-    const standardRequest = toStandardLazyRequest(req, res);
-    const result = await this.standardHandler.handle(standardRequest, options);
-    if (!result.matched) {
-      return { matched: false };
-    }
-    await sendStandardResponse(res, result.response, options);
-    return { matched: true };
+    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
+    const bracketNotationSerializer = new StandardBracketNotationSerializer();
+    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
+    const matcher = new StandardOpenAPIMatcher();
+    const codec = new StandardOpenAPICodec(serializer);
+    super(new StandardHandler(router, matcher, codec, options), options);
   }
 }
 

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

@@ -1,22 +1,22 @@
-import { ORPCError } from '@orpc/client';
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
+import { ORPCError, HTTPPath } from '@orpc/client';
+import { StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
 import { AnyProcedure, AnyRouter } from '@orpc/server';
 import { StandardCodec, StandardParams, StandardMatcher, StandardMatchResult } from '@orpc/server/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-import { HTTPPath } from '@orpc/contract';
+export { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.mjs';
 
-declare class OpenAPICodec implements StandardCodec {
+declare class StandardOpenAPICodec implements StandardCodec {
     private readonly serializer;
-    constructor(serializer: OpenAPISerializer);
+    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;
 }
 
-declare class OpenAPIMatcher implements StandardMatcher {
+declare class StandardOpenAPIMatcher implements StandardMatcher {
     private readonly tree;
     private pendingRouters;
-    init(router: AnyRouter, path?: string[]): void;
+    init(router: AnyRouter, path?: readonly string[]): void;
     match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
 }
 
@@ -31,4 +31,4 @@ declare function toRou3Pattern(path: HTTPPath): string;
  */
 declare function decodeParams(params: Record<string, string>): Record<string, string>;
 
-export { OpenAPICodec, OpenAPIMatcher, decodeParams, toRou3Pattern };
+export { StandardOpenAPICodec, StandardOpenAPIMatcher, decodeParams, toRou3Pattern };

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

@@ -1,22 +1,22 @@
-import { ORPCError } from '@orpc/client';
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
+import { ORPCError, HTTPPath } from '@orpc/client';
+import { StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
 import { AnyProcedure, AnyRouter } from '@orpc/server';
 import { StandardCodec, StandardParams, StandardMatcher, StandardMatchResult } from '@orpc/server/standard';
 import { StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-import { HTTPPath } from '@orpc/contract';
+export { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.js';
 
-declare class OpenAPICodec implements StandardCodec {
+declare class StandardOpenAPICodec implements StandardCodec {
     private readonly serializer;
-    constructor(serializer: OpenAPISerializer);
+    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;
 }
 
-declare class OpenAPIMatcher implements StandardMatcher {
+declare class StandardOpenAPIMatcher implements StandardMatcher {
     private readonly tree;
     private pendingRouters;
-    init(router: AnyRouter, path?: string[]): void;
+    init(router: AnyRouter, path?: readonly string[]): void;
     match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
 }
 
@@ -31,4 +31,4 @@ declare function toRou3Pattern(path: HTTPPath): string;
  */
 declare function decodeParams(params: Record<string, string>): Record<string, string>;
 
-export { OpenAPICodec, OpenAPIMatcher, decodeParams, toRou3Pattern };
+export { StandardOpenAPICodec, StandardOpenAPIMatcher, decodeParams, toRou3Pattern };

package/dist/adapters/standard/index.mjs

@@ -1,7 +1,7 @@
-export { O as OpenAPICodec, a as OpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.DFXD6scT.mjs';
+export { S as StandardOpenAPICodec, a as StandardOpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.sdeu0I7N.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
+import '@orpc/client/standard';
 import '@orpc/server';
 import 'rou3';
-import '../../shared/openapi.DZzpQAb-.mjs';
-import 'json-schema-typed/draft-2020-12';
+import '@orpc/openapi-client/standard';

package/dist/index.d.mts

@@ -1,9 +1,11 @@
-import { AnyContractProcedure, Schema, AnyContractRouter, HTTPPath, HTTPMethod } from '@orpc/contract';
+import { AnyContractProcedure, AnySchema, AnyContractRouter } from '@orpc/contract';
 import { OpenAPIV3_1 } from 'openapi-types';
 export { OpenAPIV3_1 as OpenAPI } from 'openapi-types';
+import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
 import { AnyRouter } from '@orpc/server';
 import { JSONSchema } from 'json-schema-typed/draft-2020-12';
 export { JSONSchema, Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
+import { HTTPPath, HTTPMethod } from '@orpc/client';
 
 type OverrideOperationValue = Partial<OpenAPIV3_1.OperationObject> | ((current: OpenAPIV3_1.OperationObject, procedure: AnyContractProcedure) => OpenAPIV3_1.OperationObject);
 declare function customOpenAPIOperation<T extends object>(o: T, extend: OverrideOperationValue): T;
@@ -32,18 +34,18 @@ interface SchemaConvertOptions {
     strategy: 'input' | 'output';
 }
 interface SchemaConverter {
-    convert(schema: Schema, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 interface ConditionalSchemaConverter extends SchemaConverter {
-    condition(schema: Schema, options: SchemaConvertOptions): boolean;
+    condition(schema: AnySchema | undefined, options: SchemaConvertOptions): boolean;
 }
 declare class CompositeSchemaConverter implements SchemaConverter {
     private readonly converters;
     constructor(converters: ConditionalSchemaConverter[]);
-    convert(schema: Schema, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 
-interface OpenAPIGeneratorOptions {
+interface OpenAPIGeneratorOptions extends StandardOpenAPIJsonSerializerOptions {
     schemaConverters?: ConditionalSchemaConverter[];
 }
 declare class OpenAPIGenerator {
@@ -54,10 +56,6 @@ declare class OpenAPIGenerator {
     generate(router: AnyContractRouter | AnyRouter, base: Omit<OpenAPIV3_1.Document, 'openapi'>): Promise<OpenAPIV3_1.Document>;
 }
 
-/**
- * @internal
- */
-declare function standardizeHTTPPath(path: HTTPPath): HTTPPath;
 /**
  * @internal
  */
@@ -66,10 +64,6 @@ declare function toOpenAPIPath(path: HTTPPath): string;
  * @internal
  */
 declare function toOpenAPIMethod(method: HTTPMethod): Lowercase<HTTPMethod>;
-/**
- * @internal
- */
-declare function getDynamicParams(path: HTTPPath | undefined): string[] | undefined;
 /**
  * @internal
  */
@@ -111,9 +105,10 @@ declare function separateObjectSchema(schema: ObjectSchema, separatedProperties:
  * @internal
  */
 declare function filterSchemaBranches(schema: JSONSchema, check: (schema: JSONSchema) => boolean, matches?: JSONSchema[]): [matches: JSONSchema[], rest: JSONSchema | undefined];
+declare function applySchemaOptionality(required: boolean, schema: JSONSchema): JSONSchema;
 
 declare const oo: {
     spec: typeof customOpenAPIOperation;
 };
 
-export { CompositeSchemaConverter, type ConditionalSchemaConverter, type FileSchema, LOGIC_KEYWORDS, type ObjectSchema, OpenAPIGenerator, type OpenAPIGeneratorOptions, type OverrideOperationValue, type SchemaConvertOptions, type SchemaConverter, applyCustomOpenAPIOperation, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, getDynamicParams, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, standardizeHTTPPath, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export { CompositeSchemaConverter, type ConditionalSchemaConverter, type FileSchema, LOGIC_KEYWORDS, type ObjectSchema, OpenAPIGenerator, type OpenAPIGeneratorOptions, type OverrideOperationValue, type SchemaConvertOptions, type SchemaConverter, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };

package/dist/index.d.ts

@@ -1,9 +1,11 @@
-import { AnyContractProcedure, Schema, AnyContractRouter, HTTPPath, HTTPMethod } from '@orpc/contract';
+import { AnyContractProcedure, AnySchema, AnyContractRouter } from '@orpc/contract';
 import { OpenAPIV3_1 } from 'openapi-types';
 export { OpenAPIV3_1 as OpenAPI } from 'openapi-types';
+import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
 import { AnyRouter } from '@orpc/server';
 import { JSONSchema } from 'json-schema-typed/draft-2020-12';
 export { JSONSchema, Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
+import { HTTPPath, HTTPMethod } from '@orpc/client';
 
 type OverrideOperationValue = Partial<OpenAPIV3_1.OperationObject> | ((current: OpenAPIV3_1.OperationObject, procedure: AnyContractProcedure) => OpenAPIV3_1.OperationObject);
 declare function customOpenAPIOperation<T extends object>(o: T, extend: OverrideOperationValue): T;
@@ -32,18 +34,18 @@ interface SchemaConvertOptions {
     strategy: 'input' | 'output';
 }
 interface SchemaConverter {
-    convert(schema: Schema, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 interface ConditionalSchemaConverter extends SchemaConverter {
-    condition(schema: Schema, options: SchemaConvertOptions): boolean;
+    condition(schema: AnySchema | undefined, options: SchemaConvertOptions): boolean;
 }
 declare class CompositeSchemaConverter implements SchemaConverter {
     private readonly converters;
     constructor(converters: ConditionalSchemaConverter[]);
-    convert(schema: Schema, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
+    convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 
-interface OpenAPIGeneratorOptions {
+interface OpenAPIGeneratorOptions extends StandardOpenAPIJsonSerializerOptions {
     schemaConverters?: ConditionalSchemaConverter[];
 }
 declare class OpenAPIGenerator {
@@ -54,10 +56,6 @@ declare class OpenAPIGenerator {
     generate(router: AnyContractRouter | AnyRouter, base: Omit<OpenAPIV3_1.Document, 'openapi'>): Promise<OpenAPIV3_1.Document>;
 }
 
-/**
- * @internal
- */
-declare function standardizeHTTPPath(path: HTTPPath): HTTPPath;
 /**
  * @internal
  */
@@ -66,10 +64,6 @@ declare function toOpenAPIPath(path: HTTPPath): string;
  * @internal
  */
 declare function toOpenAPIMethod(method: HTTPMethod): Lowercase<HTTPMethod>;
-/**
- * @internal
- */
-declare function getDynamicParams(path: HTTPPath | undefined): string[] | undefined;
 /**
  * @internal
  */
@@ -111,9 +105,10 @@ declare function separateObjectSchema(schema: ObjectSchema, separatedProperties:
  * @internal
  */
 declare function filterSchemaBranches(schema: JSONSchema, check: (schema: JSONSchema) => boolean, matches?: JSONSchema[]): [matches: JSONSchema[], rest: JSONSchema | undefined];
+declare function applySchemaOptionality(required: boolean, schema: JSONSchema): JSONSchema;
 
 declare const oo: {
     spec: typeof customOpenAPIOperation;
 };
 
-export { CompositeSchemaConverter, type ConditionalSchemaConverter, type FileSchema, LOGIC_KEYWORDS, type ObjectSchema, OpenAPIGenerator, type OpenAPIGeneratorOptions, type OverrideOperationValue, type SchemaConvertOptions, type SchemaConverter, applyCustomOpenAPIOperation, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, getDynamicParams, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, standardizeHTTPPath, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export { CompositeSchemaConverter, type ConditionalSchemaConverter, type FileSchema, LOGIC_KEYWORDS, type ObjectSchema, OpenAPIGenerator, type OpenAPIGeneratorOptions, type OverrideOperationValue, type SchemaConvertOptions, type SchemaConverter, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };

package/dist/index.mjs

@@ -1,10 +1,9 @@
-import { isProcedure, eachAllContractProcedure, convertPathToHttpPath } from '@orpc/server';
+import { isProcedure, resolveContractProcedures } from '@orpc/server';
 import { fallbackORPCErrorStatus, fallbackORPCErrorMessage } from '@orpc/client';
+import { toHttpPath } from '@orpc/client/standard';
 import { fallbackContractConfig, getEventIteratorSchemaDetails } from '@orpc/contract';
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
-import { clone } from '@orpc/shared';
-import { t as toOpenAPIMethod, a as toOpenAPIPath, b as toOpenAPIEventIteratorContent, g as getDynamicParams, i as isAnySchema, c as isObjectSchema, d as separateObjectSchema, e as checkParamsSchema, f as toOpenAPIParameters, h as toOpenAPIContent, j as toOpenAPISchema } from './shared/openapi.DZzpQAb-.mjs';
-export { L as LOGIC_KEYWORDS, l as filterSchemaBranches, k as isFileSchema, s as standardizeHTTPPath } from './shared/openapi.DZzpQAb-.mjs';
+import { standardizeHTTPPath, StandardOpenAPIJsonSerializer, getDynamicParams } from '@orpc/openapi-client/standard';
+import { isObject, findDeepMatches, toArray, clone } from '@orpc/shared';
 export { Format as JSONSchemaFormat } from 'json-schema-typed/draft-2020-12';
 
 const OPERATION_EXTENDER_SYMBOL = Symbol("ORPC_OPERATION_EXTENDER");
@@ -51,6 +50,238 @@ function applyCustomOpenAPIOperation(operation, contract) {
   return currentOperation;
 }
 
+const LOGIC_KEYWORDS = [
+  "$dynamicRef",
+  "$ref",
+  "additionalItems",
+  "additionalProperties",
+  "allOf",
+  "anyOf",
+  "const",
+  "contains",
+  "contentEncoding",
+  "contentMediaType",
+  "contentSchema",
+  "dependencies",
+  "dependentRequired",
+  "dependentSchemas",
+  "else",
+  "enum",
+  "exclusiveMaximum",
+  "exclusiveMinimum",
+  "format",
+  "if",
+  "items",
+  "maxContains",
+  "maximum",
+  "maxItems",
+  "maxLength",
+  "maxProperties",
+  "minContains",
+  "minimum",
+  "minItems",
+  "minLength",
+  "minProperties",
+  "multipleOf",
+  "not",
+  "oneOf",
+  "pattern",
+  "patternProperties",
+  "prefixItems",
+  "properties",
+  "propertyNames",
+  "required",
+  "then",
+  "type",
+  "unevaluatedItems",
+  "unevaluatedProperties",
+  "uniqueItems"
+];
+
+function isFileSchema(schema) {
+  return isObject(schema) && schema.type === "string" && typeof schema.contentMediaType === "string";
+}
+function isObjectSchema(schema) {
+  return isObject(schema) && schema.type === "object";
+}
+function isAnySchema(schema) {
+  if (schema === true) {
+    return true;
+  }
+  if (Object.keys(schema).every((k) => !LOGIC_KEYWORDS.includes(k))) {
+    return true;
+  }
+  return false;
+}
+function separateObjectSchema(schema, separatedProperties) {
+  if (Object.keys(schema).some((k) => k !== "type" && k !== "properties" && k !== "required" && LOGIC_KEYWORDS.includes(k))) {
+    return [{ type: "object" }, schema];
+  }
+  const matched = { ...schema };
+  const rest = { ...schema };
+  matched.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => separatedProperties.includes(key)).reduce((acc, [key, value]) => {
+    acc[key] = value;
+    return acc;
+  }, {});
+  matched.required = schema.required?.filter((key) => separatedProperties.includes(key));
+  matched.examples = schema.examples?.map((example) => {
+    if (!isObject(example)) {
+      return example;
+    }
+    return Object.entries(example).reduce((acc, [key, value]) => {
+      if (separatedProperties.includes(key)) {
+        acc[key] = value;
+      }
+      return acc;
+    }, {});
+  });
+  rest.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => !separatedProperties.includes(key)).reduce((acc, [key, value]) => {
+    acc[key] = value;
+    return acc;
+  }, {});
+  rest.required = schema.required?.filter((key) => !separatedProperties.includes(key));
+  rest.examples = schema.examples?.map((example) => {
+    if (!isObject(example)) {
+      return example;
+    }
+    return Object.entries(example).reduce((acc, [key, value]) => {
+      if (!separatedProperties.includes(key)) {
+        acc[key] = value;
+      }
+      return acc;
+    }, {});
+  });
+  return [matched, rest];
+}
+function filterSchemaBranches(schema, check, matches = []) {
+  if (check(schema)) {
+    matches.push(schema);
+    return [matches, void 0];
+  }
+  if (isObject(schema)) {
+    for (const keyword of ["anyOf", "oneOf"]) {
+      if (schema[keyword] && Object.keys(schema).every(
+        (k) => k === keyword || !LOGIC_KEYWORDS.includes(k)
+      )) {
+        const rest = schema[keyword].map((s) => filterSchemaBranches(s, check, matches)[1]).filter((v) => !!v);
+        if (rest.length === 1 && typeof rest[0] === "object") {
+          return [matches, { ...schema, [keyword]: void 0, ...rest[0] }];
+        }
+        return [matches, { ...schema, [keyword]: rest }];
+      }
+    }
+  }
+  return [matches, schema];
+}
+function applySchemaOptionality(required, schema) {
+  if (required) {
+    return schema;
+  }
+  return {
+    anyOf: [
+      schema,
+      { not: {} }
+    ]
+  };
+}
+
+function toOpenAPIPath(path) {
+  return standardizeHTTPPath(path).replace(/\/\{\+([^}]+)\}/g, "/{$1}");
+}
+function toOpenAPIMethod(method) {
+  return method.toLocaleLowerCase();
+}
+function toOpenAPIContent(schema) {
+  const content = {};
+  const [matches, restSchema] = filterSchemaBranches(schema, isFileSchema);
+  for (const file of matches) {
+    content[file.contentMediaType] = {
+      schema: toOpenAPISchema(file)
+    };
+  }
+  if (restSchema !== void 0) {
+    content["application/json"] = {
+      schema: toOpenAPISchema(restSchema)
+    };
+    const isStillHasFileSchema = findDeepMatches((v) => isObject(v) && isFileSchema(v), restSchema).values.length > 0;
+    if (isStillHasFileSchema) {
+      content["multipart/form-data"] = {
+        schema: toOpenAPISchema(restSchema)
+      };
+    }
+  }
+  return content;
+}
+function toOpenAPIEventIteratorContent([yieldsRequired, yieldsSchema], [returnsRequired, returnsSchema]) {
+  return {
+    "text/event-stream": {
+      schema: toOpenAPISchema({
+        oneOf: [
+          {
+            type: "object",
+            properties: {
+              event: { const: "message" },
+              data: yieldsSchema,
+              id: { type: "string" },
+              retry: { type: "number" }
+            },
+            required: yieldsRequired ? ["event", "data"] : ["event"]
+          },
+          {
+            type: "object",
+            properties: {
+              event: { const: "done" },
+              data: returnsSchema,
+              id: { type: "string" },
+              retry: { type: "number" }
+            },
+            required: returnsRequired ? ["event", "data"] : ["event"]
+          },
+          {
+            type: "object",
+            properties: {
+              event: { const: "error" },
+              data: {},
+              id: { type: "string" },
+              retry: { type: "number" }
+            },
+            required: ["event"]
+          }
+        ]
+      })
+    }
+  };
+}
+function toOpenAPIParameters(schema, parameterIn) {
+  const parameters = [];
+  for (const key in schema.properties) {
+    const keySchema = schema.properties[key];
+    parameters.push({
+      name: key,
+      in: parameterIn,
+      required: schema.required?.includes(key),
+      style: parameterIn === "query" ? "deepObject" : void 0,
+      explode: parameterIn === "query" ? true : void 0,
+      schema: toOpenAPISchema(keySchema)
+    });
+  }
+  return parameters;
+}
+function checkParamsSchema(schema, params) {
+  const properties = Object.keys(schema.properties ?? {});
+  const required = schema.required ?? [];
+  if (properties.length !== params.length || properties.some((v) => !params.includes(v))) {
+    return false;
+  }
+  if (required.length !== params.length || required.some((v) => !params.includes(v))) {
+    return false;
+  }
+  return true;
+}
+function toOpenAPISchema(schema) {
+  return schema === true ? {} : schema === false ? { not: {} } : schema;
+}
+
 class CompositeSchemaConverter {
   converters;
   constructor(converters) {
@@ -72,19 +303,19 @@ class OpenAPIGenerator {
   serializer;
   converter;
   constructor(options = {}) {
-    this.serializer = new OpenAPISerializer();
-    this.converter = new CompositeSchemaConverter(options.schemaConverters ?? []);
+    this.serializer = new StandardOpenAPIJsonSerializer(options);
+    this.converter = new CompositeSchemaConverter(toArray(options.schemaConverters));
   }
   async generate(router, base) {
     const doc = clone(base);
     doc.openapi = "3.1.1";
     const errors = [];
-    await eachAllContractProcedure({ path: [], router }, ({ contract, path }) => {
+    await resolveContractProcedures({ path: [], router }, ({ contract, path }) => {
       const operationId = path.join(".");
       try {
         const def = contract["~orpc"];
         const method = toOpenAPIMethod(fallbackContractConfig("defaultMethod", def.route.method));
-        const httpPath = toOpenAPIPath(def.route.path ?? convertPathToHttpPath(path));
+        const httpPath = toOpenAPIPath(def.route.path ?? toHttpPath(path));
         const operationObjectRef = {
           operationId,
           summary: def.route.summary,
@@ -115,7 +346,7 @@ ${e.message}`
 ${errors.join("\n\n")}`
       );
     }
-    return this.serializer.serialize(doc);
+    return this.serializer.serialize(doc)[0];
   }
   #request(ref, def) {
     const method = fallbackContractConfig("defaultMethod", def.route.method);
@@ -130,7 +361,7 @@ ${errors.join("\n\n")}`
       };
       return;
     }
-    const dynamicParams = getDynamicParams(def.route.path);
+    const dynamicParams = getDynamicParams(def.route.path)?.map((v) => v.name);
     const inputStructure = fallbackContractConfig("defaultInputStructure", def.route.inputStructure);
     let [required, schema] = this.converter.convert(def.inputSchema, { strategy: "input" });
     if (isAnySchema(schema) && !dynamicParams?.length) {
@@ -215,13 +446,13 @@ ${errors.join("\n\n")}`
       };
       return;
     }
-    const [_, json] = this.converter.convert(outputSchema, { strategy: "output" });
+    const [required, json] = this.converter.convert(outputSchema, { strategy: "output" });
     ref.responses ??= {};
     ref.responses[status] = {
       description
     };
     if (outputStructure === "compact") {
-      ref.responses[status].content = toOpenAPIContent(json);
+      ref.responses[status].content = toOpenAPIContent(applySchemaOptionality(required, json));
       return;
     }
     const error = new OpenAPIGeneratorError(
@@ -243,7 +474,9 @@ ${errors.join("\n\n")}`
       }
     }
     if (json.properties?.body !== void 0) {
-      ref.responses[status].content = toOpenAPIContent(json.properties.body);
+      ref.responses[status].content = toOpenAPIContent(
+        applySchemaOptionality(json.required?.includes("body") ?? false, json.properties.body)
+      );
     }
   }
   #errorResponse(ref, def) {
@@ -300,4 +533,4 @@ const oo = {
   spec: customOpenAPIOperation
 };
 
-export { CompositeSchemaConverter, OpenAPIGenerator, applyCustomOpenAPIOperation, checkParamsSchema, customOpenAPIOperation, getCustomOpenAPIOperation, getDynamicParams, isAnySchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };
+export { CompositeSchemaConverter, LOGIC_KEYWORDS, OpenAPIGenerator, applyCustomOpenAPIOperation, applySchemaOptionality, checkParamsSchema, customOpenAPIOperation, filterSchemaBranches, getCustomOpenAPIOperation, isAnySchema, isFileSchema, isObjectSchema, oo, separateObjectSchema, toOpenAPIContent, toOpenAPIEventIteratorContent, toOpenAPIMethod, toOpenAPIParameters, toOpenAPIPath, toOpenAPISchema };

package/dist/shared/openapi.CGZ7t-VN.mjs

@@ -0,0 +1,17 @@
+import { StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer, StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
+import { FetchHandler } from '@orpc/server/fetch';
+import { StandardHandler } from '@orpc/server/standard';
+import { a as StandardOpenAPIMatcher, S as StandardOpenAPICodec } from './openapi.sdeu0I7N.mjs';
+
+class OpenAPIHandler extends FetchHandler {
+  constructor(router, options = {}) {
+    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
+    const bracketNotationSerializer = new StandardBracketNotationSerializer();
+    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
+    const matcher = new StandardOpenAPIMatcher();
+    const codec = new StandardOpenAPICodec(serializer);
+    super(new StandardHandler(router, matcher, codec, options), options);
+  }
+}
+
+export { OpenAPIHandler as O };

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

@@ -0,0 +1,8 @@
+import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
+import { Context } from '@orpc/server';
+import { StandardHandlerOptions } from '@orpc/server/standard';
+
+interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions {
+}
+
+export type { StandardOpenAPIHandlerOptions as S };

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

@@ -0,0 +1,8 @@
+import { StandardOpenAPIJsonSerializerOptions } from '@orpc/openapi-client/standard';
+import { Context } from '@orpc/server';
+import { StandardHandlerOptions } from '@orpc/server/standard';
+
+interface StandardOpenAPIHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardOpenAPIJsonSerializerOptions {
+}
+
+export type { StandardOpenAPIHandlerOptions as S };

package/dist/shared/{openapi.DFXD6scT.mjs → openapi.sdeu0I7N.mjs}

@@ -1,10 +1,11 @@
 import { fallbackContractConfig } from '@orpc/contract';
 import { isObject } from '@orpc/shared';
-import { eachContractProcedure, convertPathToHttpPath, isProcedure, getLazyRouterPrefix, unlazy, getRouterChild, createContractedProcedure } from '@orpc/server';
+import { toHttpPath } from '@orpc/client/standard';
+import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@orpc/server';
 import { createRouter, addRoute, findRoute } from 'rou3';
-import { s as standardizeHTTPPath } from './openapi.DZzpQAb-.mjs';
+import { standardizeHTTPPath } from '@orpc/openapi-client/standard';
 
-class OpenAPICodec {
+class StandardOpenAPICodec {
   constructor(serializer) {
     this.serializer = serializer;
   }
@@ -65,7 +66,7 @@ class OpenAPICodec {
     return {
       status: error.status,
       headers: {},
-      body: this.serializer.serialize(error.toJSON())
+      body: this.serializer.serialize(error.toJSON(), { outputFormat: "plain" })
     };
   }
 }
@@ -77,16 +78,13 @@ function decodeParams(params) {
   return Object.fromEntries(Object.entries(params).map(([key, value]) => [key, decodeURIComponent(value)]));
 }
 
-class OpenAPIMatcher {
+class StandardOpenAPIMatcher {
   tree = createRouter();
   pendingRouters = [];
   init(router, path = []) {
-    const laziedOptions = eachContractProcedure({
-      router,
-      path
-    }, ({ path: path2, contract }) => {
+    const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
       const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route.method);
-      const httpPath = contract["~orpc"].route.path ? toRou3Pattern(contract["~orpc"].route.path) : convertPathToHttpPath(path2);
+      const httpPath = toRou3Pattern(contract["~orpc"].route.path ?? toHttpPath(path2));
       if (isProcedure(contract)) {
         addRoute(this.tree, method, httpPath, {
           path: path2,
@@ -106,8 +104,8 @@ class OpenAPIMatcher {
     });
     this.pendingRouters.push(...laziedOptions.map((option) => ({
       ...option,
-      httpPathPrefix: convertPathToHttpPath(option.path),
-      laziedPrefix: getLazyRouterPrefix(option.lazied)
+      httpPathPrefix: toHttpPath(option.path),
+      laziedPrefix: getLazyMeta(option.router).prefix
     })));
   }
   async match(method, pathname) {
@@ -115,7 +113,7 @@ class OpenAPIMatcher {
       const newPendingRouters = [];
       for (const pendingRouter of this.pendingRouters) {
         if (!pendingRouter.laziedPrefix || pathname.startsWith(pendingRouter.laziedPrefix) || pathname.startsWith(pendingRouter.httpPathPrefix)) {
-          const { default: router } = await unlazy(pendingRouter.lazied);
+          const { default: router } = await unlazy(pendingRouter.router);
           this.init(router, pendingRouter.path);
         } else {
           newPendingRouters.push(pendingRouter);
@@ -128,14 +126,14 @@ class OpenAPIMatcher {
       return void 0;
     }
     if (!match.data.procedure) {
-      const { default: maybeProcedure } = await unlazy(getRouterChild(match.data.router, ...match.data.path));
+      const { default: maybeProcedure } = await unlazy(getRouter(match.data.router, match.data.path));
       if (!isProcedure(maybeProcedure)) {
         throw new Error(`
-          [Contract-First] Missing or invalid implementation for procedure at path: ${convertPathToHttpPath(match.data.path)}.
+          [Contract-First] Missing or invalid implementation for procedure at path: ${toHttpPath(match.data.path)}.
           Ensure that the procedure is correctly defined and matches the expected contract.
         `);
       }
-      match.data.procedure = createContractedProcedure(match.data.contract, maybeProcedure);
+      match.data.procedure = createContractedProcedure(maybeProcedure, match.data.contract);
     }
     return {
       path: match.data.path,
@@ -145,4 +143,4 @@ class OpenAPIMatcher {
   }
 }
 
-export { OpenAPICodec as O, OpenAPIMatcher as a, decodeParams as d, toRou3Pattern as t };
+export { StandardOpenAPICodec as S, StandardOpenAPIMatcher as a, decodeParams as d, toRou3Pattern as t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "0.0.0-next.2546825",
+  "version": "0.0.0-next.25532a8",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -52,14 +52,12 @@
     "json-schema-typed": "^8.0.1",
     "openapi-types": "^12.1.3",
     "rou3": "^0.5.1",
-    "@orpc/client": "0.0.0-next.2546825",
-    "@orpc/contract": "0.0.0-next.2546825",
-    "@orpc/openapi-client": "0.0.0-next.2546825",
-    "@orpc/server": "0.0.0-next.2546825",
-    "@orpc/shared": "0.0.0-next.2546825",
-    "@orpc/standard-server-fetch": "0.0.0-next.2546825",
-    "@orpc/standard-server": "0.0.0-next.2546825",
-    "@orpc/standard-server-node": "0.0.0-next.2546825"
+    "@orpc/client": "0.0.0-next.25532a8",
+    "@orpc/server": "0.0.0-next.25532a8",
+    "@orpc/contract": "0.0.0-next.25532a8",
+    "@orpc/openapi-client": "0.0.0-next.25532a8",
+    "@orpc/shared": "0.0.0-next.25532a8",
+    "@orpc/standard-server": "0.0.0-next.25532a8"
   },
   "devDependencies": {
     "zod": "^3.24.2"

package/dist/shared/openapi.C015V43J.mjs

@@ -1,31 +0,0 @@
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
-import { StandardHandler } from '@orpc/server/standard';
-import { toStandardLazyRequest, toFetchResponse } from '@orpc/standard-server-fetch';
-import { a as OpenAPIMatcher, O as OpenAPICodec } from './openapi.DFXD6scT.mjs';
-import '@orpc/shared';
-import 'json-schema-typed/draft-2020-12';
-
-class OpenAPIHandler {
-  standardHandler;
-  constructor(router, options = {}) {
-    const serializer = new OpenAPISerializer();
-    const matcher = new OpenAPIMatcher();
-    const codec = new OpenAPICodec(serializer);
-    this.standardHandler = new StandardHandler(router, matcher, codec, options);
-  }
-  async handle(request, ...[
-    options = {}
-  ]) {
-    const standardRequest = toStandardLazyRequest(request);
-    const result = await this.standardHandler.handle(standardRequest, options);
-    if (!result.matched) {
-      return result;
-    }
-    return {
-      matched: true,
-      response: toFetchResponse(result.response, options)
-    };
-  }
-}
-
-export { OpenAPIHandler as O };

package/dist/shared/openapi.DZzpQAb-.mjs

@@ -1,231 +0,0 @@
-import { isObject, findDeepMatches } from '@orpc/shared';
-import 'json-schema-typed/draft-2020-12';
-
-const LOGIC_KEYWORDS = [
-  "$dynamicRef",
-  "$ref",
-  "additionalItems",
-  "additionalProperties",
-  "allOf",
-  "anyOf",
-  "const",
-  "contains",
-  "contentEncoding",
-  "contentMediaType",
-  "contentSchema",
-  "dependencies",
-  "dependentRequired",
-  "dependentSchemas",
-  "else",
-  "enum",
-  "exclusiveMaximum",
-  "exclusiveMinimum",
-  "format",
-  "if",
-  "items",
-  "maxContains",
-  "maximum",
-  "maxItems",
-  "maxLength",
-  "maxProperties",
-  "minContains",
-  "minimum",
-  "minItems",
-  "minLength",
-  "minProperties",
-  "multipleOf",
-  "not",
-  "oneOf",
-  "pattern",
-  "patternProperties",
-  "prefixItems",
-  "properties",
-  "propertyNames",
-  "required",
-  "then",
-  "type",
-  "unevaluatedItems",
-  "unevaluatedProperties",
-  "uniqueItems"
-];
-
-function isFileSchema(schema) {
-  return isObject(schema) && schema.type === "string" && typeof schema.contentMediaType === "string";
-}
-function isObjectSchema(schema) {
-  return isObject(schema) && schema.type === "object";
-}
-function isAnySchema(schema) {
-  if (schema === true) {
-    return true;
-  }
-  if (Object.keys(schema).every((k) => !LOGIC_KEYWORDS.includes(k))) {
-    return true;
-  }
-  return false;
-}
-function separateObjectSchema(schema, separatedProperties) {
-  if (Object.keys(schema).some((k) => k !== "type" && k !== "properties" && k !== "required" && LOGIC_KEYWORDS.includes(k))) {
-    return [{ type: "object" }, schema];
-  }
-  const matched = { ...schema };
-  const rest = { ...schema };
-  matched.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => separatedProperties.includes(key)).reduce((acc, [key, value]) => {
-    acc[key] = value;
-    return acc;
-  }, {});
-  matched.required = schema.required?.filter((key) => separatedProperties.includes(key));
-  matched.examples = schema.examples?.map((example) => {
-    if (!isObject(example)) {
-      return example;
-    }
-    return Object.entries(example).reduce((acc, [key, value]) => {
-      if (separatedProperties.includes(key)) {
-        acc[key] = value;
-      }
-      return acc;
-    }, {});
-  });
-  rest.properties = schema.properties && Object.entries(schema.properties).filter(([key]) => !separatedProperties.includes(key)).reduce((acc, [key, value]) => {
-    acc[key] = value;
-    return acc;
-  }, {});
-  rest.required = schema.required?.filter((key) => !separatedProperties.includes(key));
-  rest.examples = schema.examples?.map((example) => {
-    if (!isObject(example)) {
-      return example;
-    }
-    return Object.entries(example).reduce((acc, [key, value]) => {
-      if (!separatedProperties.includes(key)) {
-        acc[key] = value;
-      }
-      return acc;
-    }, {});
-  });
-  return [matched, rest];
-}
-function filterSchemaBranches(schema, check, matches = []) {
-  if (check(schema)) {
-    matches.push(schema);
-    return [matches, void 0];
-  }
-  if (isObject(schema)) {
-    for (const keyword of ["anyOf", "oneOf"]) {
-      if (schema[keyword] && Object.keys(schema).every(
-        (k) => k === keyword || !LOGIC_KEYWORDS.includes(k)
-      )) {
-        const rest = schema[keyword].map((s) => filterSchemaBranches(s, check, matches)[1]).filter((v) => !!v);
-        if (rest.length === 1 && typeof rest[0] === "object") {
-          return [matches, { ...schema, [keyword]: void 0, ...rest[0] }];
-        }
-        return [matches, { ...schema, [keyword]: rest }];
-      }
-    }
-  }
-  return [matches, schema];
-}
-
-function standardizeHTTPPath(path) {
-  return `/${path.replace(/\/{2,}/g, "/").replace(/^\/|\/$/g, "")}`;
-}
-function toOpenAPIPath(path) {
-  return standardizeHTTPPath(path).replace(/\/\{\+([^}]+)\}/g, "/{$1}");
-}
-function toOpenAPIMethod(method) {
-  return method.toLocaleLowerCase();
-}
-function getDynamicParams(path) {
-  return path ? standardizeHTTPPath(path).match(/\/\{([^}]+)\}/g)?.map((v) => v.match(/\{\+?([^}]+)\}/)[1]) : void 0;
-}
-function toOpenAPIContent(schema) {
-  const content = {};
-  const [matches, restSchema] = filterSchemaBranches(schema, isFileSchema);
-  for (const file of matches) {
-    content[file.contentMediaType] = {
-      schema: toOpenAPISchema(file)
-    };
-  }
-  if (restSchema !== void 0) {
-    content["application/json"] = {
-      schema: toOpenAPISchema(restSchema)
-    };
-    const isStillHasFileSchema = findDeepMatches((v) => isObject(v) && isFileSchema(v), restSchema).values.length > 0;
-    if (isStillHasFileSchema) {
-      content["multipart/form-data"] = {
-        schema: toOpenAPISchema(restSchema)
-      };
-    }
-  }
-  return content;
-}
-function toOpenAPIEventIteratorContent([yieldsRequired, yieldsSchema], [returnsRequired, returnsSchema]) {
-  return {
-    "text/event-stream": {
-      schema: toOpenAPISchema({
-        oneOf: [
-          {
-            type: "object",
-            properties: {
-              event: { const: "message" },
-              data: yieldsSchema,
-              id: { type: "string" },
-              retry: { type: "number" }
-            },
-            required: yieldsRequired ? ["event", "data"] : ["event"]
-          },
-          {
-            type: "object",
-            properties: {
-              event: { const: "done" },
-              data: returnsSchema,
-              id: { type: "string" },
-              retry: { type: "number" }
-            },
-            required: returnsRequired ? ["event", "data"] : ["event"]
-          },
-          {
-            type: "object",
-            properties: {
-              event: { const: "error" },
-              data: {},
-              id: { type: "string" },
-              retry: { type: "number" }
-            },
-            required: ["event"]
-          }
-        ]
-      })
-    }
-  };
-}
-function toOpenAPIParameters(schema, parameterIn) {
-  const parameters = [];
-  for (const key in schema.properties) {
-    const keySchema = schema.properties[key];
-    parameters.push({
-      name: key,
-      in: parameterIn,
-      required: schema.required?.includes(key),
-      style: parameterIn === "query" ? "deepObject" : void 0,
-      explode: parameterIn === "query" ? true : void 0,
-      schema: toOpenAPISchema(keySchema)
-    });
-  }
-  return parameters;
-}
-function checkParamsSchema(schema, params) {
-  const properties = Object.keys(schema.properties ?? {});
-  const required = schema.required ?? [];
-  if (properties.length !== params.length || properties.some((v) => !params.includes(v))) {
-    return false;
-  }
-  if (required.length !== params.length || required.some((v) => !params.includes(v))) {
-    return false;
-  }
-  return true;
-}
-function toOpenAPISchema(schema) {
-  return schema === true ? {} : schema === false ? { not: {} } : schema;
-}
-
-export { LOGIC_KEYWORDS as L, toOpenAPIPath as a, toOpenAPIEventIteratorContent as b, isObjectSchema as c, separateObjectSchema as d, checkParamsSchema as e, toOpenAPIParameters as f, getDynamicParams as g, toOpenAPIContent as h, isAnySchema as i, toOpenAPISchema as j, isFileSchema as k, filterSchemaBranches as l, standardizeHTTPPath as s, toOpenAPIMethod as t };