@orpc/openapi 0.0.0-next.c0afbea → 0.0.0-next.c0dd7cd

package/README.md

@@ -60,6 +60,8 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@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`
 

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

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

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

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

package/dist/adapters/fetch/index.mjs

@@ -1,8 +1,8 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.CbzTVvGL.mjs';
+export { O as OpenAPIHandler } from '../../shared/openapi.Dv-KT_Bx.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/standard-server-fetch';
-import '../../shared/openapi.CJTe38Ya.mjs';
+import '../../shared/openapi.BNHmrMe2.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/server';

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

@@ -4,3 +4,5 @@ import '@orpc/server/fetch';
 import '@orpc/server/standard';
 import '@orpc/shared';
 import '@orpc/standard-server-fetch';
+import '../../shared/openapi.IfmmOyba.mjs';
+import '@orpc/openapi-client/standard';

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

@@ -4,3 +4,5 @@ import '@orpc/server/fetch';
 import '@orpc/server/standard';
 import '@orpc/shared';
 import '@orpc/standard-server-fetch';
+import '../../shared/openapi.IfmmOyba.js';
+import '@orpc/openapi-client/standard';

package/dist/adapters/hono/index.mjs

@@ -1,8 +1,8 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.CbzTVvGL.mjs';
+export { O as OpenAPIHandler } from '../../shared/openapi.Dv-KT_Bx.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/standard-server-fetch';
-import '../../shared/openapi.CJTe38Ya.mjs';
+import '../../shared/openapi.BNHmrMe2.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/server';

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

@@ -4,3 +4,5 @@ import '@orpc/server/fetch';
 import '@orpc/server/standard';
 import '@orpc/shared';
 import '@orpc/standard-server-fetch';
+import '../../shared/openapi.IfmmOyba.mjs';
+import '@orpc/openapi-client/standard';

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

@@ -4,3 +4,5 @@ import '@orpc/server/fetch';
 import '@orpc/server/standard';
 import '@orpc/shared';
 import '@orpc/standard-server-fetch';
+import '../../shared/openapi.IfmmOyba.js';
+import '@orpc/openapi-client/standard';

package/dist/adapters/next/index.mjs

@@ -1,8 +1,8 @@
-export { O as OpenAPIHandler } from '../../shared/openapi.CbzTVvGL.mjs';
+export { O as OpenAPIHandler } from '../../shared/openapi.Dv-KT_Bx.mjs';
 import '@orpc/openapi-client/standard';
 import '@orpc/server/standard';
 import '@orpc/standard-server-fetch';
-import '../../shared/openapi.CJTe38Ya.mjs';
+import '../../shared/openapi.BNHmrMe2.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/server';

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

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

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

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

package/dist/adapters/node/index.mjs

@@ -1,7 +1,7 @@
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
+import { StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer, StandardOpenAPISerializer } from '@orpc/openapi-client/standard';
 import { StandardHandler } from '@orpc/server/standard';
 import { toStandardLazyRequest, sendStandardResponse } from '@orpc/standard-server-node';
-import { a as OpenAPIMatcher, O as OpenAPICodec } from '../../shared/openapi.CJTe38Ya.mjs';
+import { a as StandardOpenAPIMatcher, S as StandardOpenAPICodec } from '../../shared/openapi.BNHmrMe2.mjs';
 import '@orpc/shared';
 import 'json-schema-typed/draft-2020-12';
 import '@orpc/contract';
@@ -12,9 +12,11 @@ import '../../shared/openapi.DZzpQAb-.mjs';
 class OpenAPIHandler {
   standardHandler;
   constructor(router, options = {}) {
-    const serializer = new OpenAPISerializer();
-    const matcher = new OpenAPIMatcher();
-    const codec = new OpenAPICodec(serializer);
+    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
+    const bracketNotationSerializer = new StandardBracketNotationSerializer();
+    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
+    const matcher = new StandardOpenAPIMatcher();
+    const codec = new StandardOpenAPICodec(serializer);
     this.standardHandler = new StandardHandler(router, matcher, codec, options);
   }
   async handle(req, res, ...[

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

@@ -1,19 +1,20 @@
 import { ORPCError } from '@orpc/client';
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
+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';
+export { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.mjs';
 import { HTTPPath } from '@orpc/contract';
 
-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?: readonly string[]): void;
@@ -31,4 +32,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,19 +1,20 @@
 import { ORPCError } from '@orpc/client';
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
+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';
+export { S as StandardOpenAPIHandlerOptions } from '../../shared/openapi.IfmmOyba.js';
 import { HTTPPath } from '@orpc/contract';
 
-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?: readonly string[]): void;
@@ -31,4 +32,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,4 +1,4 @@
-export { O as OpenAPICodec, a as OpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.CJTe38Ya.mjs';
+export { S as StandardOpenAPICodec, a as StandardOpenAPIMatcher, d as decodeParams, t as toRou3Pattern } from '../../shared/openapi.BNHmrMe2.mjs';
 import '@orpc/contract';
 import '@orpc/shared';
 import '@orpc/server';

package/dist/index.d.mts

@@ -1,6 +1,7 @@
 import { AnyContractProcedure, AnySchema, AnyContractRouter, HTTPPath, HTTPMethod } 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';
@@ -43,7 +44,7 @@ declare class CompositeSchemaConverter implements SchemaConverter {
     convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 
-interface OpenAPIGeneratorOptions {
+interface OpenAPIGeneratorOptions extends StandardOpenAPIJsonSerializerOptions {
     schemaConverters?: ConditionalSchemaConverter[];
 }
 declare class OpenAPIGenerator {

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { AnyContractProcedure, AnySchema, AnyContractRouter, HTTPPath, HTTPMethod } 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';
@@ -43,7 +44,7 @@ declare class CompositeSchemaConverter implements SchemaConverter {
     convert(schema: AnySchema | undefined, options: SchemaConvertOptions): [required: boolean, jsonSchema: JSONSchema];
 }
 
-interface OpenAPIGeneratorOptions {
+interface OpenAPIGeneratorOptions extends StandardOpenAPIJsonSerializerOptions {
     schemaConverters?: ConditionalSchemaConverter[];
 }
 declare class OpenAPIGenerator {

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { isProcedure, resolveContractProcedures, toHttpPath } from '@orpc/server';
 import { fallbackORPCErrorStatus, fallbackORPCErrorMessage } from '@orpc/client';
 import { fallbackContractConfig, getEventIteratorSchemaDetails } from '@orpc/contract';
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
+import { StandardOpenAPIJsonSerializer } 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';
@@ -72,7 +72,7 @@ class OpenAPIGenerator {
   serializer;
   converter;
   constructor(options = {}) {
-    this.serializer = new OpenAPISerializer();
+    this.serializer = new StandardOpenAPIJsonSerializer(options);
     this.converter = new CompositeSchemaConverter(options.schemaConverters ?? []);
   }
   async generate(router, base) {
@@ -115,7 +115,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);

package/dist/shared/{openapi.CJTe38Ya.mjs → openapi.BNHmrMe2.mjs}

@@ -4,7 +4,7 @@ import { traverseContractProcedures, toHttpPath, isProcedure, getLazyMeta, unlaz
 import { createRouter, addRoute, findRoute } from 'rou3';
 import { s as standardizeHTTPPath } from './openapi.DZzpQAb-.mjs';
 
-class OpenAPICodec {
+class StandardOpenAPICodec {
   constructor(serializer) {
     this.serializer = serializer;
   }
@@ -77,7 +77,7 @@ 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 = []) {
@@ -142,4 +142,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/dist/shared/{openapi.CbzTVvGL.mjs → openapi.Dv-KT_Bx.mjs}

@@ -1,16 +1,18 @@
-import { OpenAPISerializer } from '@orpc/openapi-client/standard';
+import { StandardOpenAPIJsonSerializer, StandardBracketNotationSerializer, StandardOpenAPISerializer } 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.CJTe38Ya.mjs';
+import { a as StandardOpenAPIMatcher, S as StandardOpenAPICodec } from './openapi.BNHmrMe2.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);
+    const jsonSerializer = new StandardOpenAPIJsonSerializer(options);
+    const bracketNotationSerializer = new StandardBracketNotationSerializer();
+    const serializer = new StandardOpenAPISerializer(jsonSerializer, bracketNotationSerializer);
+    const matcher = new StandardOpenAPIMatcher();
+    const codec = new StandardOpenAPICodec(serializer);
     this.standardHandler = new StandardHandler(router, matcher, codec, options);
   }
   async handle(request, ...[

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/package.json

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