@orpc/openapi 2.0.0-beta.2 → 2.0.0-beta.4

package/README.md

@@ -37,18 +37,19 @@ You can read the documentation [here](https://orpc.dev).
 - [@orpc/valibot](https://www.npmjs.com/package/@orpc/valibot): Integrate with [Valibot](https://valibot.dev/).
 - [@orpc/arktype](https://www.npmjs.com/package/@orpc/arktype): Integrate with [ArkType](https://arktype.io/).
 
-**Framework & ecosystem integrations**
-
-- [@orpc/next](https://www.npmjs.com/package/@orpc/react): Use oRPC with [Next.js Server Functions](https://nextjs.org/docs/app/getting-started/mutating-data).
-- [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): Integrate with [TanStack Query](https://tanstack.com/query/latest).
-- [@orpc/experimental-effect](https://www.npmjs.com/package/@orpc/experimental-effect): Integrate with [Effect](https://effect.website/).
-
 **Built-in features**
 
 - [@orpc/publisher](https://www.npmjs.com/package/@orpc/publisher): Pub/Sub.
 - [@orpc/ratelimit](https://www.npmjs.com/package/@orpc/ratelimit): Rate limiting.
 - [@orpc/json-schema](https://www.npmjs.com/package/@orpc/json-schema): Smart coercion for OpenAPI requests.
 
+**Framework & ecosystem integrations**
+
+- [@orpc/next](https://www.npmjs.com/package/@orpc/react): Use oRPC with [Next.js Server Functions](https://nextjs.org/docs/app/getting-started/mutating-data).
+- [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): Integrate with [TanStack Query](https://tanstack.com/query/latest).
+- [@orpc/experimental-effect](https://www.npmjs.com/package/@orpc/experimental-effect): Integrate with [Effect](https://effect.website/).
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Implement your contract with [NestJS](https://nestjs.com/).
+
 **Observability**
 
 - [@orpc/opentelemetry](https://www.npmjs.com/package/@orpc/opentelemetry): Instrument your API with [OpenTelemetry](https://opentelemetry.io/).
@@ -150,7 +151,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   <a href="https://github.com/theoludwig?ref=orpc" target="_blank" rel="noopener" title="Théo LUDWIG"><img src="https://avatars.githubusercontent.com/u/25207499?u=a6a9653725a2f574c07893748806668e0598cdbe&amp;v=4" width="32" height="32" alt="Théo LUDWIG" /></a>
   <a href="https://github.com/abhay-ramesh?ref=orpc" target="_blank" rel="noopener" title="Abhay Ramesh"><img src="https://avatars.githubusercontent.com/u/66196314?u=c5c2b0327b26606c2efcfaf17046ab18c3d25c57&amp;v=4" width="32" height="32" alt="Abhay Ramesh" /></a>
   <a href="https://github.com/shr-ink?ref=orpc" target="_blank" rel="noopener" title="shr.ink oü"><img src="https://avatars.githubusercontent.com/u/139700438?v=4" width="32" height="32" alt="shr.ink oü" /></a>
-  <a href="https://github.com/johngerome?ref=orpc" target="_blank" rel="noopener" title="0x4e32"><img src="https://avatars.githubusercontent.com/u/2002000?u=24e8dd943cfc862aa284d858a023532c75071ade&amp;v=4" width="32" height="32" alt="0x4e32" /></a>
+  <a href="https://github.com/johngerome?ref=orpc" target="_blank" rel="noopener" title="0x4e32"><img src="https://avatars.githubusercontent.com/u/2002000?u=505e54608466ab53754f702973687b04c6424c1f&amp;v=4" width="32" height="32" alt="0x4e32" /></a>
   <a href="https://github.com/yzuyr?ref=orpc" target="_blank" rel="noopener" title="Ryuz"><img src="https://avatars.githubusercontent.com/u/196539378?u=d38374588d219b6748b16406982f6559411466d4&amp;v=4" width="32" height="32" alt="Ryuz" /></a>
   <a href="https://github.com/happyboy2022?ref=orpc" target="_blank" rel="noopener" title="happyboy"><img src="https://avatars.githubusercontent.com/u/103669586?u=65b49c4b893ed3703909fbb3a7a22313f3f9c121&amp;v=4" width="32" height="32" alt="happyboy" /></a>
   <a href="https://github.com/YiCChi?ref=orpc" target="_blank" rel="noopener" title="yicchi"><img src="https://avatars.githubusercontent.com/u/86967274?u=6c2756f09fe15dd94d572f560e979cd157982852&amp;v=4" width="32" height="32" alt="yicchi" /></a>

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

@@ -1,7 +1,7 @@
 import { Context, Router } from '@orpc/server';
 import { FetchHandler, FetchHandlerOptions } from '@orpc/server/fetch';
 import { StandardHandlerOptions } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodecOptions } from '../../shared/openapi.XeW6_5tm.mjs';
+import { O as OpenAPIHandlerCodecOptions } from '../../shared/openapi.CX6Ri5dP.mjs';
 import { ClientContext } from '@orpc/client';
 import { FetchLinkTransportOptions } from '@orpc/client/fetch';
 import { StandardLink, StandardLinkOptions } from '@orpc/client/standard';

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

@@ -1,7 +1,7 @@
 import { Context, Router } from '@orpc/server';
 import { FetchHandler, FetchHandlerOptions } from '@orpc/server/fetch';
 import { StandardHandlerOptions } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodecOptions } from '../../shared/openapi.BYcWgK1j.js';
+import { O as OpenAPIHandlerCodecOptions } from '../../shared/openapi.7vgmPxca.js';
 import { ClientContext } from '@orpc/client';
 import { FetchLinkTransportOptions } from '@orpc/client/fetch';
 import { StandardLink, StandardLinkOptions } from '@orpc/client/standard';

package/dist/adapters/fetch/index.mjs

@@ -1,6 +1,6 @@
 import { FetchHandler } from '@orpc/server/fetch';
 import { StandardHandler } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodec } from '../../shared/openapi.DR-y5p-D.mjs';
+import { O as OpenAPIHandlerCodec } from '../../shared/openapi.CTlpLuKN.mjs';
 import { FetchLinkTransport } from '@orpc/client/fetch';
 import { StandardLink } from '@orpc/client/standard';
 import { O as OpenAPILinkCodec } from '../../shared/openapi.B2SK0ZAr.mjs';

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

@@ -1,7 +1,7 @@
 import { Context, Router } from '@orpc/server';
 import { NodeHttpHandler, NodeHttpHandlerOptions } from '@orpc/server/node';
 import { StandardHandlerOptions } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodecOptions } from '../../shared/openapi.XeW6_5tm.mjs';
+import { O as OpenAPIHandlerCodecOptions } from '../../shared/openapi.CX6Ri5dP.mjs';
 import '@orpc/client';
 import '@orpc/shared';
 import '@standardserver/core';

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

@@ -1,7 +1,7 @@
 import { Context, Router } from '@orpc/server';
 import { NodeHttpHandler, NodeHttpHandlerOptions } from '@orpc/server/node';
 import { StandardHandlerOptions } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodecOptions } from '../../shared/openapi.BYcWgK1j.js';
+import { O as OpenAPIHandlerCodecOptions } from '../../shared/openapi.7vgmPxca.js';
 import '@orpc/client';
 import '@orpc/shared';
 import '@standardserver/core';

package/dist/adapters/node/index.mjs

@@ -1,6 +1,6 @@
 import { NodeHttpHandler } from '@orpc/server/node';
 import { StandardHandler } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodec } from '../../shared/openapi.DR-y5p-D.mjs';
+import { O as OpenAPIHandlerCodec } from '../../shared/openapi.CTlpLuKN.mjs';
 import '@orpc/client';
 import '@orpc/server';
 import '@orpc/shared';

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

@@ -1,4 +1,4 @@
-export { a as OpenAPIHandlerCodec, b as OpenAPIHandlerCodecError, O as OpenAPIHandlerCodecOptions, c as OpenAPIMatcher, d as OpenAPIMatcherOptions } from '../../shared/openapi.XeW6_5tm.mjs';
+export { a as OpenAPIHandlerCodec, b as OpenAPIHandlerCodecCore, c as OpenAPIHandlerCodecCoreOptions, O as OpenAPIHandlerCodecOptions, d as OpenAPIMatcher, e as OpenAPIMatcherOptions } from '../../shared/openapi.CX6Ri5dP.mjs';
 import { ClientContext, ClientOptions, AnyORPCError } from '@orpc/client';
 import { StandardLinkCodec, StandardLinkCodecDecodedResponse } from '@orpc/client/standard';
 import { RouterContract } from '@orpc/contract';

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

@@ -1,4 +1,4 @@
-export { a as OpenAPIHandlerCodec, b as OpenAPIHandlerCodecError, O as OpenAPIHandlerCodecOptions, c as OpenAPIMatcher, d as OpenAPIMatcherOptions } from '../../shared/openapi.BYcWgK1j.js';
+export { a as OpenAPIHandlerCodec, b as OpenAPIHandlerCodecCore, c as OpenAPIHandlerCodecCoreOptions, O as OpenAPIHandlerCodecOptions, d as OpenAPIMatcher, e as OpenAPIMatcherOptions } from '../../shared/openapi.7vgmPxca.js';
 import { ClientContext, ClientOptions, AnyORPCError } from '@orpc/client';
 import { StandardLinkCodec, StandardLinkCodecDecodedResponse } from '@orpc/client/standard';
 import { RouterContract } from '@orpc/contract';

package/dist/adapters/standard/index.mjs

@@ -1,4 +1,4 @@
-export { O as OpenAPIHandlerCodec, a as OpenAPIHandlerCodecError, b as OpenAPIMatcher } from '../../shared/openapi.DR-y5p-D.mjs';
+export { O as OpenAPIHandlerCodec, a as OpenAPIHandlerCodecCore, b as OpenAPIMatcher } from '../../shared/openapi.CTlpLuKN.mjs';
 export { O as OpenAPILinkCodec, a as OpenAPILinkCodecError } from '../../shared/openapi.B2SK0ZAr.mjs';
 import '@orpc/client';
 import '@orpc/server';

package/dist/index.d.mts

@@ -9,7 +9,7 @@ export { d as JsonifiedArray, O as OpenAPIOperationObject } from './shared/opena
 export { a as OpenAPIFunction, O as OpenAPIMeta, b as OpenAPIMetaPlugin, c as OpenAPIMethodMetaPlugin, d as OpenAPIPathMetaPlugin, e as OpenAPIPrefixMetaPlugin, f as OpenAPISpecMetaPlugin, g as getOpenAPIMeta, o as openapi } from './shared/openapi.BcEtAxQj.mjs';
 import { JsonSchemaConverter, JsonSchema } from '@orpc/json-schema';
 import { AnyRouter, AnyProcedure } from '@orpc/server';
-import '@standardserver/core';
+export { StandardBodyHint } from '@standardserver/core';
 import '@hey-api/spec-types';
 
 interface ContractJsonifiedCaller<TClientContext extends ClientContext> {
@@ -89,6 +89,23 @@ declare class OpenAPIGenerator {
     private errorResponse;
 }
 
+type PopulatedContractRouterOpenAPIPaths<T extends RouterContract> = T extends ProcedureContract<infer UInputSchema, infer UOutputSchema, infer UErrors> ? ProcedureContract<UInputSchema, UOutputSchema, UErrors> : {
+    [K in keyof T]: T[K] extends RouterContract ? PopulatedContractRouterOpenAPIPaths<T[K]> : never;
+};
+interface PopulateRouterContractOpenAPIPathsOptions {
+    /**
+     * Base path segments.
+     */
+    path?: undefined | string[];
+}
+/**
+ * Automatically populates missing openapi.path using router structure.
+ *
+ * Builds paths by joining router keys with `/`.
+ * Useful when you want to ensure all contracts define openapi.path, such as for NestJS integration requirements.
+ */
+declare function populateRouterContractOpenAPIPaths<T extends RouterContract>(router: T, options?: PopulateRouterContractOpenAPIPathsOptions): PopulatedContractRouterOpenAPIPaths<T>;
+
 /**
  * Dynamic parameters are always returned in path order.
  */
@@ -99,5 +116,5 @@ declare function getDynamicPathParams(path: `/${string}`): {
     allowsSlash: boolean;
 }[] | undefined;
 
-export { DEFAULT_OPENAPI_INPUT_STRUCTURE, DEFAULT_OPENAPI_METHOD, DEFAULT_OPENAPI_OUTPUT_STRUCTURE, DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, JsonifiedClient, JsonifiedClientError, JsonifiedValue, OpenAPIDocument, OpenAPIGenerator, OpenAPIGeneratorError, OpenAPISerializer, createContractJsonifiedCaller, getDynamicPathParams };
-export type { ContractJsonifiedCaller, ContractJsonifiedCallerOptions, OpenAPIGeneratorGenerateOptions, OpenAPIGeneratorOptions };
+export { DEFAULT_OPENAPI_INPUT_STRUCTURE, DEFAULT_OPENAPI_METHOD, DEFAULT_OPENAPI_OUTPUT_STRUCTURE, DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, JsonifiedClient, JsonifiedClientError, JsonifiedValue, OpenAPIDocument, OpenAPIGenerator, OpenAPIGeneratorError, OpenAPISerializer, createContractJsonifiedCaller, getDynamicPathParams, populateRouterContractOpenAPIPaths };
+export type { ContractJsonifiedCaller, ContractJsonifiedCallerOptions, OpenAPIGeneratorGenerateOptions, OpenAPIGeneratorOptions, PopulateRouterContractOpenAPIPathsOptions, PopulatedContractRouterOpenAPIPaths };

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export { d as JsonifiedArray, O as OpenAPIOperationObject } from './shared/opena
 export { a as OpenAPIFunction, O as OpenAPIMeta, b as OpenAPIMetaPlugin, c as OpenAPIMethodMetaPlugin, d as OpenAPIPathMetaPlugin, e as OpenAPIPrefixMetaPlugin, f as OpenAPISpecMetaPlugin, g as getOpenAPIMeta, o as openapi } from './shared/openapi.BQzzr4-4.js';
 import { JsonSchemaConverter, JsonSchema } from '@orpc/json-schema';
 import { AnyRouter, AnyProcedure } from '@orpc/server';
-import '@standardserver/core';
+export { StandardBodyHint } from '@standardserver/core';
 import '@hey-api/spec-types';
 
 interface ContractJsonifiedCaller<TClientContext extends ClientContext> {
@@ -89,6 +89,23 @@ declare class OpenAPIGenerator {
     private errorResponse;
 }
 
+type PopulatedContractRouterOpenAPIPaths<T extends RouterContract> = T extends ProcedureContract<infer UInputSchema, infer UOutputSchema, infer UErrors> ? ProcedureContract<UInputSchema, UOutputSchema, UErrors> : {
+    [K in keyof T]: T[K] extends RouterContract ? PopulatedContractRouterOpenAPIPaths<T[K]> : never;
+};
+interface PopulateRouterContractOpenAPIPathsOptions {
+    /**
+     * Base path segments.
+     */
+    path?: undefined | string[];
+}
+/**
+ * Automatically populates missing openapi.path using router structure.
+ *
+ * Builds paths by joining router keys with `/`.
+ * Useful when you want to ensure all contracts define openapi.path, such as for NestJS integration requirements.
+ */
+declare function populateRouterContractOpenAPIPaths<T extends RouterContract>(router: T, options?: PopulateRouterContractOpenAPIPathsOptions): PopulatedContractRouterOpenAPIPaths<T>;
+
 /**
  * Dynamic parameters are always returned in path order.
  */
@@ -99,5 +116,5 @@ declare function getDynamicPathParams(path: `/${string}`): {
     allowsSlash: boolean;
 }[] | undefined;
 
-export { DEFAULT_OPENAPI_INPUT_STRUCTURE, DEFAULT_OPENAPI_METHOD, DEFAULT_OPENAPI_OUTPUT_STRUCTURE, DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, JsonifiedClient, JsonifiedClientError, JsonifiedValue, OpenAPIDocument, OpenAPIGenerator, OpenAPIGeneratorError, OpenAPISerializer, createContractJsonifiedCaller, getDynamicPathParams };
-export type { ContractJsonifiedCaller, ContractJsonifiedCallerOptions, OpenAPIGeneratorGenerateOptions, OpenAPIGeneratorOptions };
+export { DEFAULT_OPENAPI_INPUT_STRUCTURE, DEFAULT_OPENAPI_METHOD, DEFAULT_OPENAPI_OUTPUT_STRUCTURE, DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, JsonifiedClient, JsonifiedClientError, JsonifiedValue, OpenAPIDocument, OpenAPIGenerator, OpenAPIGeneratorError, OpenAPISerializer, createContractJsonifiedCaller, getDynamicPathParams, populateRouterContractOpenAPIPaths };
+export type { ContractJsonifiedCaller, ContractJsonifiedCallerOptions, OpenAPIGeneratorGenerateOptions, OpenAPIGeneratorOptions, PopulateRouterContractOpenAPIPathsOptions, PopulatedContractRouterOpenAPIPaths };

package/dist/index.mjs

@@ -1,14 +1,13 @@
 export { B as BracketNotationSerializer } from './shared/openapi.Bt87OzTt.mjs';
-import { createContractCaller, getEventIteratorSchemaDetails } from '@orpc/contract';
+import { createContractCaller, getEventIteratorSchemaDetails, ProcedureContract, resolveMetaPlugins } from '@orpc/contract';
 import { O as OpenAPISerializer, D as DEFAULT_OPENAPI_METHOD, g as getDynamicPathParams, a as DEFAULT_OPENAPI_INPUT_STRUCTURE, c as DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, b as DEFAULT_OPENAPI_OUTPUT_STRUCTURE } from './shared/openapi.DmAa7YPO.mjs';
 export { d as OpenAPIJsonSerializer } from './shared/openapi.DmAa7YPO.mjs';
-import { g as getOpenAPIMeta } from './shared/openapi.B9PQzqBn.mjs';
-export { o as openapi } from './shared/openapi.B9PQzqBn.mjs';
+import { g as getOpenAPIMeta, o as openapi } from './shared/openapi.B9PQzqBn.mjs';
 import { COMMON_ERROR_STATUS_MAP } from '@orpc/client';
 export { COMMON_ERROR_STATUS_MAP } from '@orpc/client';
-import { DelegatingJsonSchemaConverter, StandardJsonSchemaConverter, combineJsonSchemasWithComposition, isUnconstrainedSchema, extractJsonObjectSchemaEntries, combineJsonObjectSchemaEntries, isJsonPrimitiveSchema, matchArrayableJsonSchema, flattenJsonUnionSchema, ensureJsonSchemaObject, isJsonFileSchema, mapJsonSchemaRefs, encodeJsonPointerSegment, decodeJsonPointerSegment } from '@orpc/json-schema';
+import { DelegatingJsonSchemaConverter, StandardJsonSchemaConverter, combineJsonSchemasWithComposition, isUnconstrainedSchema, extractJsonObjectSchemaEntries, combineJsonObjectSchemaEntries, flattenJsonUnionSchema, isJsonPrimitiveSchema, matchArrayableJsonSchema, ensureJsonSchemaObject, isJsonFileSchema, mapJsonSchemaRefs, encodeJsonPointerSegment, decodeJsonPointerSegment } from '@orpc/json-schema';
 import { walkProcedureContractsAsync, DEFAULT_SUCCESS_STATUS, DEFAULT_ERROR_STATUS } from '@orpc/server';
-import { toArray, clone, value, pathToHttpPath, mergeHttpPath, stringifyJSON, findDeepMatches, isPlainObject, isDeepEqual } from '@orpc/shared';
+import { toArray, clone, value, pathToHttpPath, mergeHttpPath, stringifyJSON, findDeepMatches, isPlainObject, isDeepEqual, isTypescriptObject } from '@orpc/shared';
 import '@standardserver/core';
 
 function createContractJsonifiedCaller(link, options = {}) {
@@ -202,9 +201,9 @@ ${errors.join("\n\n")}`
           };
           delete parameter.schema;
         } else if (style === void 0) {
-          if (!isJsonPrimitiveSchema(schema2)) {
+          if (flattenJsonUnionSchema(schema2).some((s) => !isJsonPrimitiveSchema(s))) {
             const arrayable = matchArrayableJsonSchema(schema2);
-            if (!arrayable || !isJsonPrimitiveSchema(arrayable[0])) {
+            if (!arrayable || flattenJsonUnionSchema(arrayable[0]).some((s) => !isJsonPrimitiveSchema(s))) {
               parameter.style = "deepObject";
               parameter.explode = true;
             }
@@ -898,4 +897,34 @@ function rewriteComponentSchemaRefs(schema, renameMap) {
   });
 }
 
-export { DEFAULT_OPENAPI_INPUT_STRUCTURE, DEFAULT_OPENAPI_METHOD, DEFAULT_OPENAPI_OUTPUT_STRUCTURE, DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, OpenAPIGenerator, OpenAPIGeneratorError, OpenAPISerializer, createContractJsonifiedCaller, getDynamicPathParams, getOpenAPIMeta };
+function populateRouterContractOpenAPIPaths(router, options = {}) {
+  const path = toArray(options.path);
+  if (router instanceof ProcedureContract) {
+    if (getOpenAPIMeta(router)?.path !== void 0) {
+      return router;
+    }
+    const [meta, metaPlugins] = resolveMetaPlugins(
+      router["~orpc"].meta,
+      router["~orpc"].metaPlugins,
+      [openapi({ path: pathToHttpPath(path) })]
+    );
+    return new ProcedureContract({
+      ...router["~orpc"],
+      meta,
+      metaPlugins
+    });
+  }
+  if (!isTypescriptObject(router)) {
+    return router;
+  }
+  const populated = {};
+  for (const key in router) {
+    populated[key] = populateRouterContractOpenAPIPaths(
+      router[key],
+      { ...options, path: [...path, key] }
+    );
+  }
+  return populated;
+}
+
+export { DEFAULT_OPENAPI_INPUT_STRUCTURE, DEFAULT_OPENAPI_METHOD, DEFAULT_OPENAPI_OUTPUT_STRUCTURE, DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, OpenAPIGenerator, OpenAPIGeneratorError, OpenAPISerializer, createContractJsonifiedCaller, getDynamicPathParams, getOpenAPIMeta, openapi, populateRouterContractOpenAPIPaths };

package/dist/shared/{openapi.BYcWgK1j.d.ts → openapi.7vgmPxca.d.ts}

@@ -31,9 +31,7 @@ declare class OpenAPIMatcher {
     private resolveProcedure;
 }
 
-declare class OpenAPIHandlerCodecError extends TypeError {
-}
-interface OpenAPIHandlerCodecOptions<_T extends Context> extends OpenAPIMatcherOptions {
+interface OpenAPIHandlerCodecCoreOptions<_T extends Context> {
     /**
      * Override the default OpenAPI serializer.
      */
@@ -55,25 +53,30 @@ interface OpenAPIHandlerCodecOptions<_T extends Context> extends OpenAPIMatcherO
      */
     customErrorResponseBodyEncoder?: (error: AnyORPCError) => unknown;
 }
-declare class OpenAPIHandlerCodec<T extends Context> implements StandardHandlerCodec<T> {
-    private readonly matcher;
+declare class OpenAPIHandlerCodecCore<T extends Context> {
     private readonly serializer;
     private readonly errorStatusMap;
     private readonly customErrorResponseBodySerializer;
-    constructor(router: AnyRouter, options?: OpenAPIHandlerCodecOptions<T>);
+    constructor(options?: OpenAPIHandlerCodecCoreOptions<T>);
     decodeInput(matched: {
         procedure: AnyProcedure;
         params?: undefined | Record<string, string>;
     }, request: StandardLazyRequest): Promise<unknown>;
-    resolveProcedure(request: StandardLazyRequest, options: StandardHandlerHandleOptions<T>): Promise<StandardHandlerCodecResolvedProcedure | undefined>;
     /**
-     * @throws {Error} If `outputStructure` is "detailed" and the output doesn't match the expected structure.
+     * @throws {TypeError} If `outputStructure` is "detailed" and the output doesn't match the expected structure.
      */
-    encodeOutput(output: unknown, procedure: AnyProcedure, path: string[], _options: StandardHandlerHandleOptions<T>): Promisable<StandardResponse>;
-    encodeError(error: AnyORPCError, _procedure: AnyProcedure, _path: string[], _options: StandardHandlerHandleOptions<T>): Promisable<StandardResponse>;
+    encodeOutput(output: unknown, procedure: AnyProcedure, path: string[]): Promisable<StandardResponse>;
+    encodeError(error: AnyORPCError): Promisable<StandardResponse>;
     private deserializeQuery;
     private deserializeParams;
 }
+interface OpenAPIHandlerCodecOptions<T extends Context> extends OpenAPIHandlerCodecCoreOptions<T>, OpenAPIMatcherOptions {
+}
+declare class OpenAPIHandlerCodec<T extends Context> extends OpenAPIHandlerCodecCore<T> implements StandardHandlerCodec<T> {
+    private readonly matcher;
+    constructor(router: AnyRouter, options?: OpenAPIHandlerCodecOptions<T>);
+    resolveProcedure(request: StandardLazyRequest, options: StandardHandlerHandleOptions<T>): Promise<StandardHandlerCodecResolvedProcedure | undefined>;
+}
 
-export { OpenAPIHandlerCodec as a, OpenAPIHandlerCodecError as b, OpenAPIMatcher as c };
-export type { OpenAPIHandlerCodecOptions as O, OpenAPIMatcherOptions as d };
+export { OpenAPIHandlerCodec as a, OpenAPIHandlerCodecCore as b, OpenAPIMatcher as d };
+export type { OpenAPIHandlerCodecOptions as O, OpenAPIHandlerCodecCoreOptions as c, OpenAPIMatcherOptions as e };

package/dist/shared/{openapi.DR-y5p-D.mjs → openapi.CTlpLuKN.mjs}

@@ -124,15 +124,11 @@ function decodeParams(params) {
   return Object.fromEntries(Object.entries(params).map(([key, val]) => [key, tryDecodeURIComponent(val)]));
 }
 
-class OpenAPIHandlerCodecError extends TypeError {
-}
-class OpenAPIHandlerCodec {
-  matcher;
+class OpenAPIHandlerCodecCore {
   serializer;
   errorStatusMap;
   customErrorResponseBodySerializer;
-  constructor(router, options = {}) {
-    this.matcher = new OpenAPIMatcher(router, options);
+  constructor(options = {}) {
     this.serializer = options.serializer ?? new OpenAPISerializer();
     this.errorStatusMap = options.errorStatusMap ?? COMMON_ERROR_STATUS_MAP;
     this.customErrorResponseBodySerializer = options.customErrorResponseBodyEncoder;
@@ -166,22 +162,10 @@ class OpenAPIHandlerCodec {
       body: this.serializer.deserialize(await request.resolveBody(meta?.requestBodyHint))
     };
   }
-  async resolveProcedure(request, options) {
-    const [pathname] = parseStandardUrl(request.url);
-    const matched = await this.matcher.match(request.method, pathname, options.prefix);
-    if (!matched) {
-      return void 0;
-    }
-    return {
-      procedure: matched.procedure,
-      path: matched.path,
-      decodeInput: () => this.decodeInput(matched, request)
-    };
-  }
   /**
-   * @throws {Error} If `outputStructure` is "detailed" and the output doesn't match the expected structure.
+   * @throws {TypeError} If `outputStructure` is "detailed" and the output doesn't match the expected structure.
    */
-  encodeOutput(output, procedure, path, _options) {
+  encodeOutput(output, procedure, path) {
     const meta = getOpenAPIMeta(procedure);
     const successStatus = meta?.successStatus ?? DEFAULT_SUCCESS_STATUS;
     const outputStructure = meta?.outputStructure ?? DEFAULT_OPENAPI_OUTPUT_STRUCTURE;
@@ -193,7 +177,7 @@ class OpenAPIHandlerCodec {
       };
     }
     if (!isValidDetailedOutput(output)) {
-      throw new OpenAPIHandlerCodecError(`
+      throw new TypeError(`
         Invalid "detailed" output structure returned by procedure (${path.join(".")}):
         \u2022 Expected an object with optional properties:
           - status (number 200-399)
@@ -211,7 +195,7 @@ class OpenAPIHandlerCodec {
       body: this.serializer.serialize(output.body)
     };
   }
-  encodeError(error, _procedure, _path, _options) {
+  encodeError(error) {
     const status = this.errorStatusMap[error.code] ?? DEFAULT_ERROR_STATUS;
     return {
       status,
@@ -278,6 +262,25 @@ class OpenAPIHandlerCodec {
     return parsed;
   }
 }
+class OpenAPIHandlerCodec extends OpenAPIHandlerCodecCore {
+  matcher;
+  constructor(router, options = {}) {
+    super(options);
+    this.matcher = new OpenAPIMatcher(router, options);
+  }
+  async resolveProcedure(request, options) {
+    const [pathname] = parseStandardUrl(request.url);
+    const matched = await this.matcher.match(request.method, pathname, options.prefix);
+    if (!matched) {
+      return void 0;
+    }
+    return {
+      procedure: matched.procedure,
+      path: matched.path,
+      decodeInput: () => this.decodeInput(matched, request)
+    };
+  }
+}
 function isValidDetailedOutput(output) {
   if (!isTypescriptObject(output)) {
     return false;
@@ -312,4 +315,4 @@ function decodeDelimitedObject(value, delimiter) {
   return obj;
 }
 
-export { OpenAPIHandlerCodec as O, OpenAPIHandlerCodecError as a, OpenAPIMatcher as b };
+export { OpenAPIHandlerCodec as O, OpenAPIHandlerCodecCore as a, OpenAPIMatcher as b };

package/dist/shared/{openapi.XeW6_5tm.d.mts → openapi.CX6Ri5dP.d.mts}

@@ -31,9 +31,7 @@ declare class OpenAPIMatcher {
     private resolveProcedure;
 }
 
-declare class OpenAPIHandlerCodecError extends TypeError {
-}
-interface OpenAPIHandlerCodecOptions<_T extends Context> extends OpenAPIMatcherOptions {
+interface OpenAPIHandlerCodecCoreOptions<_T extends Context> {
     /**
      * Override the default OpenAPI serializer.
      */
@@ -55,25 +53,30 @@ interface OpenAPIHandlerCodecOptions<_T extends Context> extends OpenAPIMatcherO
      */
     customErrorResponseBodyEncoder?: (error: AnyORPCError) => unknown;
 }
-declare class OpenAPIHandlerCodec<T extends Context> implements StandardHandlerCodec<T> {
-    private readonly matcher;
+declare class OpenAPIHandlerCodecCore<T extends Context> {
     private readonly serializer;
     private readonly errorStatusMap;
     private readonly customErrorResponseBodySerializer;
-    constructor(router: AnyRouter, options?: OpenAPIHandlerCodecOptions<T>);
+    constructor(options?: OpenAPIHandlerCodecCoreOptions<T>);
     decodeInput(matched: {
         procedure: AnyProcedure;
         params?: undefined | Record<string, string>;
     }, request: StandardLazyRequest): Promise<unknown>;
-    resolveProcedure(request: StandardLazyRequest, options: StandardHandlerHandleOptions<T>): Promise<StandardHandlerCodecResolvedProcedure | undefined>;
     /**
-     * @throws {Error} If `outputStructure` is "detailed" and the output doesn't match the expected structure.
+     * @throws {TypeError} If `outputStructure` is "detailed" and the output doesn't match the expected structure.
      */
-    encodeOutput(output: unknown, procedure: AnyProcedure, path: string[], _options: StandardHandlerHandleOptions<T>): Promisable<StandardResponse>;
-    encodeError(error: AnyORPCError, _procedure: AnyProcedure, _path: string[], _options: StandardHandlerHandleOptions<T>): Promisable<StandardResponse>;
+    encodeOutput(output: unknown, procedure: AnyProcedure, path: string[]): Promisable<StandardResponse>;
+    encodeError(error: AnyORPCError): Promisable<StandardResponse>;
     private deserializeQuery;
     private deserializeParams;
 }
+interface OpenAPIHandlerCodecOptions<T extends Context> extends OpenAPIHandlerCodecCoreOptions<T>, OpenAPIMatcherOptions {
+}
+declare class OpenAPIHandlerCodec<T extends Context> extends OpenAPIHandlerCodecCore<T> implements StandardHandlerCodec<T> {
+    private readonly matcher;
+    constructor(router: AnyRouter, options?: OpenAPIHandlerCodecOptions<T>);
+    resolveProcedure(request: StandardLazyRequest, options: StandardHandlerHandleOptions<T>): Promise<StandardHandlerCodecResolvedProcedure | undefined>;
+}
 
-export { OpenAPIHandlerCodec as a, OpenAPIHandlerCodecError as b, OpenAPIMatcher as c };
-export type { OpenAPIHandlerCodecOptions as O, OpenAPIMatcherOptions as d };
+export { OpenAPIHandlerCodec as a, OpenAPIHandlerCodecCore as b, OpenAPIMatcher as d };
+export type { OpenAPIHandlerCodecOptions as O, OpenAPIHandlerCodecCoreOptions as c, OpenAPIMatcherOptions as e };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "license": "MIT",
   "homepage": "https://orpc.dev",
   "repository": {
@@ -65,11 +65,11 @@
     "@types/swagger-ui": "^5.32.0",
     "rou3": "^0.8.1",
     "swagger-ui": "^5.32.6",
-    "@orpc/client": "2.0.0-beta.2",
-    "@orpc/json-schema": "2.0.0-beta.2",
-    "@orpc/server": "2.0.0-beta.2",
-    "@orpc/shared": "2.0.0-beta.2",
-    "@orpc/contract": "2.0.0-beta.2"
+    "@orpc/client": "2.0.0-beta.4",
+    "@orpc/contract": "2.0.0-beta.4",
+    "@orpc/server": "2.0.0-beta.4",
+    "@orpc/json-schema": "2.0.0-beta.4",
+    "@orpc/shared": "2.0.0-beta.4"
   },
   "devDependencies": {
     "fastify": "^5.6.2",