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

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.DuDd2iQz.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.DBYxUpK8.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.B3H7yHQa.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.DuDd2iQz.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.DBYxUpK8.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.B3H7yHQa.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.DuDd2iQz.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.DBYxUpK8.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.B3H7yHQa.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> {

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> {

package/dist/index.mjs

@@ -6,7 +6,7 @@ import { g as getOpenAPIMeta } from './shared/openapi.B9PQzqBn.mjs';
 export { 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 '@standardserver/core';
@@ -202,9 +202,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;
             }

package/dist/shared/{openapi.DR-y5p-D.mjs → openapi.B3H7yHQa.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,20 +162,8 @@ 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) {
     const meta = getOpenAPIMeta(procedure);
@@ -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)
@@ -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.BYcWgK1j.d.ts → openapi.DBYxUpK8.d.ts}

@@ -1,6 +1,6 @@
 import { AnyORPCError } from '@orpc/client';
 import { AnyProcedure, AnyRouter, Context } from '@orpc/server';
-import { StandardHandlerCodec, StandardHandlerHandleOptions, StandardHandlerCodecResolvedProcedure } from '@orpc/server/standard';
+import { StandardHandlerHandleOptions, StandardHandlerCodec, StandardHandlerCodecResolvedProcedure } from '@orpc/server/standard';
 import { Value, Promisable } from '@orpc/shared';
 import { StandardLazyRequest, StandardResponse } from '@standardserver/core';
 import { AnyProcedureContract } from '@orpc/contract';
@@ -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>;
     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.XeW6_5tm.d.mts → openapi.DuDd2iQz.d.mts}

@@ -1,6 +1,6 @@
 import { AnyORPCError } from '@orpc/client';
 import { AnyProcedure, AnyRouter, Context } from '@orpc/server';
-import { StandardHandlerCodec, StandardHandlerHandleOptions, StandardHandlerCodecResolvedProcedure } from '@orpc/server/standard';
+import { StandardHandlerHandleOptions, StandardHandlerCodec, StandardHandlerCodecResolvedProcedure } from '@orpc/server/standard';
 import { Value, Promisable } from '@orpc/shared';
 import { StandardLazyRequest, StandardResponse } from '@standardserver/core';
 import { AnyProcedureContract } from '@orpc/contract';
@@ -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>;
     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.3",
   "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/json-schema": "2.0.0-beta.3",
+    "@orpc/client": "2.0.0-beta.3",
+    "@orpc/contract": "2.0.0-beta.3",
+    "@orpc/shared": "2.0.0-beta.3",
+    "@orpc/server": "2.0.0-beta.3"
   },
   "devDependencies": {
     "fastify": "^5.6.2",