@orpc/openapi 2.0.0-beta.42 → 2.0.0-beta.43

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

@@ -6,7 +6,7 @@ import '@orpc/client';
 import '@orpc/shared';
 import '@standard-server/core';
 import '@orpc/contract';
-import '../../shared/openapi.C2LayTNZ.mjs';
+import '../../shared/openapi.DjGhiceP.mjs';
 
 interface OpenAPIHandlerOptions<T extends Context> extends AwsLambdaHandlerOptions<T>, StandardHandlerOptions<T>, OpenAPIHandlerCodecOptions<T> {
 }

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

@@ -6,7 +6,7 @@ import '@orpc/client';
 import '@orpc/shared';
 import '@standard-server/core';
 import '@orpc/contract';
-import '../../shared/openapi.C2LayTNZ.js';
+import '../../shared/openapi.DjGhiceP.js';
 
 interface OpenAPIHandlerOptions<T extends Context> extends AwsLambdaHandlerOptions<T>, StandardHandlerOptions<T>, OpenAPIHandlerCodecOptions<T> {
 }

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

@@ -1,12 +1,12 @@
 import { AwsLambdaHandler } from '@orpc/server/aws-lambda';
 import { StandardHandler } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodec } from '../../shared/openapi.BJRea9Uu.mjs';
+import { O as OpenAPIHandlerCodec } from '../../shared/openapi.DcQKf6ur.mjs';
 import '@orpc/client';
 import '@orpc/server';
 import '@orpc/shared';
 import '@standard-server/core';
-import '../../shared/openapi.Bu_PfTtX.mjs';
-import '../../shared/openapi.B2G-HeFn.mjs';
+import '../../shared/openapi.PXVenYpE.mjs';
+import '../../shared/openapi.DtEVcxuW.mjs';
 import '../../shared/openapi.B9PQzqBn.mjs';
 import 'rou3';
 

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

@@ -6,7 +6,7 @@ import '@orpc/client';
 import '@orpc/shared';
 import '@standard-server/core';
 import '@orpc/contract';
-import '../../shared/openapi.C2LayTNZ.mjs';
+import '../../shared/openapi.DjGhiceP.mjs';
 
 interface OpenAPIHandlerOptions<T extends Context> extends FastifyHandlerOptions<T>, StandardHandlerOptions<T>, OpenAPIHandlerCodecOptions<T> {
 }

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

@@ -6,7 +6,7 @@ import '@orpc/client';
 import '@orpc/shared';
 import '@standard-server/core';
 import '@orpc/contract';
-import '../../shared/openapi.C2LayTNZ.js';
+import '../../shared/openapi.DjGhiceP.js';
 
 interface OpenAPIHandlerOptions<T extends Context> extends FastifyHandlerOptions<T>, StandardHandlerOptions<T>, OpenAPIHandlerCodecOptions<T> {
 }

package/dist/adapters/fastify/index.mjs

@@ -1,12 +1,12 @@
 import { FastifyHandler } from '@orpc/server/fastify';
 import { StandardHandler } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodec } from '../../shared/openapi.BJRea9Uu.mjs';
+import { O as OpenAPIHandlerCodec } from '../../shared/openapi.DcQKf6ur.mjs';
 import '@orpc/client';
 import '@orpc/server';
 import '@orpc/shared';
 import '@standard-server/core';
-import '../../shared/openapi.Bu_PfTtX.mjs';
-import '../../shared/openapi.B2G-HeFn.mjs';
+import '../../shared/openapi.PXVenYpE.mjs';
+import '../../shared/openapi.DtEVcxuW.mjs';
 import '../../shared/openapi.B9PQzqBn.mjs';
 import 'rou3';
 

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

@@ -9,7 +9,7 @@ import { RouterContract } from '@orpc/contract';
 import { OpenAPILinkCodecOptions } from '../standard/index.mjs';
 import '@orpc/shared';
 import '@standard-server/core';
-import '../../shared/openapi.C2LayTNZ.mjs';
+import '../../shared/openapi.DjGhiceP.mjs';
 
 interface OpenAPIHandlerOptions<T extends Context> extends FetchHandlerOptions<T>, StandardHandlerOptions<T>, OpenAPIHandlerCodecOptions<T> {
 }

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

@@ -9,7 +9,7 @@ import { RouterContract } from '@orpc/contract';
 import { OpenAPILinkCodecOptions } from '../standard/index.js';
 import '@orpc/shared';
 import '@standard-server/core';
-import '../../shared/openapi.C2LayTNZ.js';
+import '../../shared/openapi.DjGhiceP.js';
 
 interface OpenAPIHandlerOptions<T extends Context> extends FetchHandlerOptions<T>, StandardHandlerOptions<T>, OpenAPIHandlerCodecOptions<T> {
 }

package/dist/adapters/fetch/index.mjs

@@ -1,15 +1,15 @@
 import { FetchHandler } from '@orpc/server/fetch';
 import { StandardHandler } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodec } from '../../shared/openapi.BJRea9Uu.mjs';
+import { O as OpenAPIHandlerCodec } from '../../shared/openapi.DcQKf6ur.mjs';
 import { FetchLinkTransport } from '@orpc/client/fetch';
 import { StandardLink } from '@orpc/client/standard';
-import { O as OpenAPILinkCodec } from '../../shared/openapi.D326pNzT.mjs';
+import { O as OpenAPILinkCodec } from '../../shared/openapi.C6KG7fwg.mjs';
 import '@orpc/client';
 import '@orpc/server';
 import '@orpc/shared';
 import '@standard-server/core';
-import '../../shared/openapi.Bu_PfTtX.mjs';
-import '../../shared/openapi.B2G-HeFn.mjs';
+import '../../shared/openapi.PXVenYpE.mjs';
+import '../../shared/openapi.DtEVcxuW.mjs';
 import '../../shared/openapi.B9PQzqBn.mjs';
 import 'rou3';
 import '@orpc/contract';

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

@@ -6,7 +6,7 @@ import '@orpc/client';
 import '@orpc/shared';
 import '@standard-server/core';
 import '@orpc/contract';
-import '../../shared/openapi.C2LayTNZ.mjs';
+import '../../shared/openapi.DjGhiceP.mjs';
 
 interface OpenAPIHandlerOptions<T extends Context> extends NodeHttpHandlerOptions<T>, StandardHandlerOptions<T>, OpenAPIHandlerCodecOptions<T> {
 }

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

@@ -6,7 +6,7 @@ import '@orpc/client';
 import '@orpc/shared';
 import '@standard-server/core';
 import '@orpc/contract';
-import '../../shared/openapi.C2LayTNZ.js';
+import '../../shared/openapi.DjGhiceP.js';
 
 interface OpenAPIHandlerOptions<T extends Context> extends NodeHttpHandlerOptions<T>, StandardHandlerOptions<T>, OpenAPIHandlerCodecOptions<T> {
 }

package/dist/adapters/node/index.mjs

@@ -1,12 +1,12 @@
 import { NodeHttpHandler } from '@orpc/server/node';
 import { StandardHandler } from '@orpc/server/standard';
-import { O as OpenAPIHandlerCodec } from '../../shared/openapi.BJRea9Uu.mjs';
+import { O as OpenAPIHandlerCodec } from '../../shared/openapi.DcQKf6ur.mjs';
 import '@orpc/client';
 import '@orpc/server';
 import '@orpc/shared';
 import '@standard-server/core';
-import '../../shared/openapi.Bu_PfTtX.mjs';
-import '../../shared/openapi.B2G-HeFn.mjs';
+import '../../shared/openapi.PXVenYpE.mjs';
+import '../../shared/openapi.DtEVcxuW.mjs';
 import '../../shared/openapi.B9PQzqBn.mjs';
 import 'rou3';
 

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

@@ -1,5 +1,5 @@
-export { a as OpenAPIHandlerCodec, b as OpenAPIHandlerCodecCore, c as OpenAPIHandlerCodecCoreOptions, O as OpenAPIHandlerCodecOptions, d as OpenAPIMatcher, e as OpenAPIMatcherOptions } from '../../shared/openapi.BDiBd3_k.mjs';
-export { a as OpenAPILinkCodec, O as OpenAPILinkCodecOptions } from '../../shared/openapi.Cg9h6jpm.mjs';
+export { a as OpenAPIHandlerCodec, b as OpenAPIHandlerCodecCore, c as OpenAPIHandlerCodecCoreOptions, O as OpenAPIHandlerCodecOptions, d as OpenAPIMatcher, e as OpenAPIMatcherOptions } from '../../shared/openapi.BSLqRCwO.mjs';
+export { a as OpenAPILinkCodec, O as OpenAPILinkCodecOptions } from '../../shared/openapi.BVt3NPfo.mjs';
 import { StandardHeaders } from '@standard-server/core';
 import { OpenAPISerializer } from '../../index.mjs';
 import '@orpc/client';

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

@@ -1,5 +1,5 @@
-export { a as OpenAPIHandlerCodec, b as OpenAPIHandlerCodecCore, c as OpenAPIHandlerCodecCoreOptions, O as OpenAPIHandlerCodecOptions, d as OpenAPIMatcher, e as OpenAPIMatcherOptions } from '../../shared/openapi.CkzUS83v.js';
-export { a as OpenAPILinkCodec, O as OpenAPILinkCodecOptions } from '../../shared/openapi.D0yWs-uW.js';
+export { a as OpenAPIHandlerCodec, b as OpenAPIHandlerCodecCore, c as OpenAPIHandlerCodecCoreOptions, O as OpenAPIHandlerCodecOptions, d as OpenAPIMatcher, e as OpenAPIMatcherOptions } from '../../shared/openapi.1UQkZGBs.js';
+export { a as OpenAPILinkCodec, O as OpenAPILinkCodecOptions } from '../../shared/openapi.aoP0G_Bv.js';
 import { StandardHeaders } from '@standard-server/core';
 import { OpenAPISerializer } from '../../index.js';
 import '@orpc/client';

package/dist/adapters/standard/index.mjs

@@ -1,11 +1,11 @@
-export { O as OpenAPIHandlerCodec, a as OpenAPIHandlerCodecCore, b as OpenAPIMatcher, s as serializeHeaders } from '../../shared/openapi.BJRea9Uu.mjs';
-export { O as OpenAPILinkCodec } from '../../shared/openapi.D326pNzT.mjs';
+export { O as OpenAPIHandlerCodec, a as OpenAPIHandlerCodecCore, b as OpenAPIMatcher, s as serializeHeaders } from '../../shared/openapi.DcQKf6ur.mjs';
+export { O as OpenAPILinkCodec } from '../../shared/openapi.C6KG7fwg.mjs';
 import '@orpc/client';
 import '@orpc/server';
 import '@orpc/shared';
 import '@standard-server/core';
-import '../../shared/openapi.Bu_PfTtX.mjs';
-import '../../shared/openapi.B2G-HeFn.mjs';
+import '../../shared/openapi.PXVenYpE.mjs';
+import '../../shared/openapi.DtEVcxuW.mjs';
 import '../../shared/openapi.B9PQzqBn.mjs';
 import 'rou3';
 import '@orpc/contract';

package/dist/helpers/index.mjs

@@ -1,6 +1,6 @@
 import { isSchemaIssue } from '@orpc/contract';
 import { isTypescriptObject } from '@orpc/shared';
-import { B as BracketNotationSerializer } from '../shared/openapi.B2G-HeFn.mjs';
+import { B as BracketNotationSerializer } from '../shared/openapi.DtEVcxuW.mjs';
 
 function parseFormData(form) {
   const serializer = new BracketNotationSerializer();
@@ -30,7 +30,7 @@ function getIssueMessage(error, path) {
     if (path.endsWith("[]") && issuePath.replace(/\[(?:0|[1-9]\d*)\]$/, "[]") === path) {
       return issue.message;
     }
-    if (path === "" && /(?:0|[1-9]\d*)$/.test(issuePath)) {
+    if (path === "" && /^(?:0|[1-9]\d*)$/.test(issuePath)) {
       return issue.message;
     }
   }

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { O as OpenAPISerializer } from './shared/openapi.C2LayTNZ.mjs';
-export { B as BracketNotationSerializeResult, a as BracketNotationSerializer, b as BracketNotationSerializerOptions, c as OpenAPIJsonSerialization, d as OpenAPIJsonSerializer, e as OpenAPIJsonSerializerHandler, f as OpenAPIJsonSerializerOptions, g as OpenAPISerializerOptions, h as OpenAPISerializerSerializeOptions } from './shared/openapi.C2LayTNZ.mjs';
+import { O as OpenAPISerializer } from './shared/openapi.DjGhiceP.mjs';
+export { B as BracketNotationSerializeResult, a as BracketNotationSerializer, b as BracketNotationSerializerOptions, c as OpenAPIJsonSerialization, d as OpenAPIJsonSerializer, e as OpenAPIJsonSerializerHandler, f as OpenAPIJsonSerializerOptions, g as OpenAPISerializerOptions, h as OpenAPISerializerSerializeOptions } from './shared/openapi.DjGhiceP.mjs';
 import { ClientContext, ORPCClientOptions, ClientLink } from '@orpc/client';
 export { COMMON_ERROR_STATUS_MAP } from '@orpc/client';
 import { RouterContract, RouterContractClient, AnyProcedureContract, ProcedureContract } from '@orpc/contract';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { O as OpenAPISerializer } from './shared/openapi.C2LayTNZ.js';
-export { B as BracketNotationSerializeResult, a as BracketNotationSerializer, b as BracketNotationSerializerOptions, c as OpenAPIJsonSerialization, d as OpenAPIJsonSerializer, e as OpenAPIJsonSerializerHandler, f as OpenAPIJsonSerializerOptions, g as OpenAPISerializerOptions, h as OpenAPISerializerSerializeOptions } from './shared/openapi.C2LayTNZ.js';
+import { O as OpenAPISerializer } from './shared/openapi.DjGhiceP.js';
+export { B as BracketNotationSerializeResult, a as BracketNotationSerializer, b as BracketNotationSerializerOptions, c as OpenAPIJsonSerialization, d as OpenAPIJsonSerializer, e as OpenAPIJsonSerializerHandler, f as OpenAPIJsonSerializerOptions, g as OpenAPISerializerOptions, h as OpenAPISerializerSerializeOptions } from './shared/openapi.DjGhiceP.js';
 import { ClientContext, ORPCClientOptions, ClientLink } from '@orpc/client';
 export { COMMON_ERROR_STATUS_MAP } from '@orpc/client';
 import { RouterContract, RouterContractClient, AnyProcedureContract, ProcedureContract } from '@orpc/contract';

package/dist/index.mjs

@@ -1,7 +1,7 @@
-export { B as BracketNotationSerializer } from './shared/openapi.B2G-HeFn.mjs';
+export { B as BracketNotationSerializer } from './shared/openapi.DtEVcxuW.mjs';
 import { createContractClientFactory, getAsyncIteratorObjectSchemaDetails, ProcedureContract, resolveMetaPlugins } from '@orpc/contract';
-import { D as DEFAULT_OPENAPI_METHOD, a as DEFAULT_OPENAPI_INPUT_STRUCTURE, c as DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, b as DEFAULT_OPENAPI_OUTPUT_STRUCTURE, i as isBodylessMethod, O as OpenAPISerializer, g as getDynamicPathParams } from './shared/openapi.Bu_PfTtX.mjs';
-export { d as OpenAPIJsonSerializer } from './shared/openapi.Bu_PfTtX.mjs';
+import { D as DEFAULT_OPENAPI_METHOD, a as DEFAULT_OPENAPI_INPUT_STRUCTURE, c as DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, b as DEFAULT_OPENAPI_OUTPUT_STRUCTURE, i as isBodylessMethod, O as OpenAPISerializer, g as getDynamicPathParams } from './shared/openapi.PXVenYpE.mjs';
+export { d as OpenAPIJsonSerializer } from './shared/openapi.PXVenYpE.mjs';
 import { g as getOpenAPIMeta, o as openapi } from './shared/openapi.B9PQzqBn.mjs';
 import { downgradeSpecV32ToV31, downgradeSpecV31ToV30 } from '@openapi-spec/downgrader';
 import { COMMON_ERROR_STATUS_MAP } from '@orpc/client';
@@ -457,33 +457,56 @@ function extractDetailedResponseParts(schema, defaultStatus) {
       );
     }
     const statusSchema = entries.find(([name]) => name === "status")?.[1];
-    if (statusSchema !== void 0 && (typeof statusSchema !== "object" || !Number.isInteger(statusSchema.const) || statusSchema.const >= 400)) {
+    const statuses = statusSchema === void 0 ? /* @__PURE__ */ new Map([[defaultStatus, void 0]]) : extractDetailedStatuses(statusSchema);
+    if (!statuses) {
       throw new OpenAPIGeneratorError(
         `invalid "status" field in the detailed output schema.
-  Expected: a literal (const) integer below 400
+  Expected: literal integers below 400 (const, enum, or a union of them)
   Received: ${stringifyJSON(statusSchema)}`
       );
     }
-    const status = (statusSchema?.const || void 0) ?? defaultStatus;
-    let parts = partsByStatus.get(status);
-    if (!parts) {
-      parts = { descriptions: [], bodies: [], headers: [] };
-      partsByStatus.set(status, parts);
-    }
-    if (statusSchema?.description !== void 0) {
-      parts.descriptions.push(statusSchema.description);
-    }
     const headersSchema = entries.find(([name]) => name === "headers")?.[1];
-    if (headersSchema !== void 0) {
-      parts.headers.push(headersSchema);
-    }
     const bodySchema = entries.find(([name]) => name === "body")?.[1];
-    if (bodySchema !== void 0) {
-      parts.bodies.push(bodySchema);
+    for (const [status, description] of statuses) {
+      let parts = partsByStatus.get(status);
+      if (!parts) {
+        parts = { descriptions: [], bodies: [], headers: [] };
+        partsByStatus.set(status, parts);
+      }
+      if (description !== void 0) {
+        parts.descriptions.push(description);
+      }
+      if (headersSchema !== void 0) {
+        parts.headers.push(headersSchema);
+      }
+      if (bodySchema !== void 0) {
+        parts.bodies.push(bodySchema);
+      }
     }
   }
   return partsByStatus;
 }
+function extractDetailedStatuses(schema) {
+  const statuses = /* @__PURE__ */ new Map();
+  for (const member of flattenJsonUnionSchema(schema)) {
+    if (typeof member !== "object") {
+      return void 0;
+    }
+    const values = member.const !== void 0 ? [member.const] : member.enum;
+    if (!values?.length) {
+      return void 0;
+    }
+    for (const value2 of values) {
+      if (!Number.isInteger(value2) || value2 >= 400) {
+        return void 0;
+      }
+      if (!statuses.has(value2)) {
+        statuses.set(value2, member.description);
+      }
+    }
+  }
+  return statuses.size ? statuses : void 0;
+}
 function buildErrorResponse(ctx, operation, def) {
   const definitionsByStatus = /* @__PURE__ */ new Map();
   for (const code of Object.keys(def.errorMap)) {

package/dist/shared/{openapi.CkzUS83v.d.ts → openapi.1UQkZGBs.d.ts}

@@ -4,7 +4,7 @@ import { StandardHandlerCodec, ResolvedStandardHandlerHandleOptions, StandardHan
 import { Value, Public, Promisable } from '@orpc/shared';
 import { StandardLazyRequest, StandardResponse } from '@standard-server/core';
 import { AnyProcedureContract } from '@orpc/contract';
-import { O as OpenAPISerializer } from './openapi.C2LayTNZ.js';
+import { O as OpenAPISerializer } from './openapi.DjGhiceP.js';
 
 interface OpenAPIMatcherOptions {
     /**

package/dist/shared/{openapi.BDiBd3_k.d.mts → openapi.BSLqRCwO.d.mts}

@@ -4,7 +4,7 @@ import { StandardHandlerCodec, ResolvedStandardHandlerHandleOptions, StandardHan
 import { Value, Public, Promisable } from '@orpc/shared';
 import { StandardLazyRequest, StandardResponse } from '@standard-server/core';
 import { AnyProcedureContract } from '@orpc/contract';
-import { O as OpenAPISerializer } from './openapi.C2LayTNZ.mjs';
+import { O as OpenAPISerializer } from './openapi.DjGhiceP.mjs';
 
 interface OpenAPIMatcherOptions {
     /**

package/dist/shared/{openapi.Cg9h6jpm.d.mts → openapi.BVt3NPfo.d.mts}

@@ -3,7 +3,7 @@ import { StandardLinkCodec, StandardLinkCodecDecodedResponse } from '@orpc/clien
 import { RouterContract } from '@orpc/contract';
 import { Value, Promisable, Public } from '@orpc/shared';
 import { StandardUrl, StandardHeaders, StandardLazyResponse, StandardRequest } from '@standard-server/core';
-import { O as OpenAPISerializer } from './openapi.C2LayTNZ.mjs';
+import { O as OpenAPISerializer } from './openapi.DjGhiceP.mjs';
 
 interface OpenAPILinkCodecOptions<T extends ClientContext> {
     /**

package/dist/shared/{openapi.D326pNzT.mjs → openapi.C6KG7fwg.mjs}

@@ -4,9 +4,9 @@ import { unlazy } from '@orpc/server';
 import { value, pathToHttpPath, mergeHttpPath, isTypescriptObject, stringifyJSON, safeEncodeURIComponent } from '@orpc/shared';
 import { mergeStandardHeaders, parseStandardUrl } from '@standard-server/core';
 import { toStandardHeaders } from '@standard-server/fetch';
-import { O as OpenAPISerializer, D as DEFAULT_OPENAPI_METHOD, a as DEFAULT_OPENAPI_INPUT_STRUCTURE, g as getDynamicPathParams, i as isBodylessMethod, b as DEFAULT_OPENAPI_OUTPUT_STRUCTURE } from './openapi.Bu_PfTtX.mjs';
+import { O as OpenAPISerializer, D as DEFAULT_OPENAPI_METHOD, a as DEFAULT_OPENAPI_INPUT_STRUCTURE, g as getDynamicPathParams, i as isBodylessMethod, b as DEFAULT_OPENAPI_OUTPUT_STRUCTURE } from './openapi.PXVenYpE.mjs';
 import { g as getOpenAPIMeta } from './openapi.B9PQzqBn.mjs';
-import { s as serializeHeaders } from './openapi.BJRea9Uu.mjs';
+import { s as serializeHeaders } from './openapi.DcQKf6ur.mjs';
 
 const END_SLASH_REGEX = /\/$/;
 const DOT_SEGMENT_REGEX = /(?:^|\/)\.{1,2}(?:\/|$)/;

package/dist/shared/{openapi.BJRea9Uu.mjs → openapi.DcQKf6ur.mjs}

@@ -1,11 +1,14 @@
 import { COMMON_ERROR_STATUS_MAP } from '@orpc/client';
 import { walkProcedureContractsSync, unlazy, getRouter, Procedure, createContractProcedure, DEFAULT_SUCCESS_STATUS, DEFAULT_ERROR_STATUS } from '@orpc/server';
-import { value, pathToHttpPath, mergeHttpPath, normalizeHttpPath, setOwn, safeDecodeURIComponent, NullProtoObj, isTypescriptObject, isPlainObject, stringifyJSON, getOwn, parseEmptyableJSON } from '@orpc/shared';
+import { value, pathToHttpPath, mergeHttpPath, safeDecodeURIComponent, safeEncodeURIComponent, setOwn, NullProtoObj, isTypescriptObject, isPlainObject, stringifyJSON, getOwn, parseEmptyableJSON } from '@orpc/shared';
 import { parseStandardUrl } from '@standard-server/core';
-import { D as DEFAULT_OPENAPI_METHOD, g as getDynamicPathParams, O as OpenAPISerializer, a as DEFAULT_OPENAPI_INPUT_STRUCTURE, i as isBodylessMethod, b as DEFAULT_OPENAPI_OUTPUT_STRUCTURE } from './openapi.Bu_PfTtX.mjs';
+import { D as DEFAULT_OPENAPI_METHOD, g as getDynamicPathParams, O as OpenAPISerializer, a as DEFAULT_OPENAPI_INPUT_STRUCTURE, i as isBodylessMethod, b as DEFAULT_OPENAPI_OUTPUT_STRUCTURE } from './openapi.PXVenYpE.mjs';
 import { g as getOpenAPIMeta } from './openapi.B9PQzqBn.mjs';
 import { createRouter, addRoute, findRoute, findAllRoutes, routeToRegExp } from 'rou3';
 
+const ROU3_RAW_CHARS = String.raw`\w!$&'()*+,\-.:;=@[\\\]|~`;
+const NORMALIZABLE_PATHNAME_REGEX = new RegExp(`[^${ROU3_RAW_CHARS}/]`);
+const ROU3_ENCODED_SEGMENT_TEXT_REGEX = new RegExp(`[^${ROU3_RAW_CHARS}]+`, "g");
 class OpenAPIMatcher {
   filter;
   rootRouter;
@@ -73,8 +76,8 @@ class OpenAPIMatcher {
       await loading;
     }
     let match = this.findMatch(method, pathname);
-    if (match === void 0 && pathname.includes("%")) {
-      const normalizedPathname = normalizeHttpPath(pathname);
+    if (match === void 0 && NORMALIZABLE_PATHNAME_REGEX.test(pathname)) {
+      const normalizedPathname = normalizeRou3Path(pathname);
       const normalizedLoading = this.resolvePendingLazyRouters(normalizedPathname);
       if (normalizedLoading !== void 0) {
         await normalizedLoading;
@@ -140,7 +143,7 @@ class OpenAPIMatcher {
 function toRou3Route(path) {
   const dynamicParams = getDynamicPathParams(path);
   if (!dynamicParams) {
-    return { pattern: escapeRou3Literal(path) };
+    return { pattern: toRou3Literal(path) };
   }
   let pattern = "";
   let literalStart = 0;
@@ -149,7 +152,7 @@ function toRou3Route(path) {
   for (const param of dynamicParams) {
     const key = `p${params.length}`;
     params.push([key, param.parameterName]);
-    pattern += escapeRou3Literal(path.slice(literalStart, param.startIndex));
+    pattern += toRou3Literal(path.slice(literalStart, param.startIndex));
     literalStart = param.startIndex + param.segment.length;
     if (param.allowsSlash) {
       if (catchAllKey !== void 0) {
@@ -161,12 +164,16 @@ function toRou3Route(path) {
       pattern += `:${key}`;
     }
   }
-  pattern += escapeRou3Literal(path.slice(literalStart));
+  pattern += toRou3Literal(path.slice(literalStart));
   return { pattern, params, catchAllKey };
 }
 const ROU3_SYNTAX_REGEX = /[\\:*?+(){}]|(?<![^/])\.(?=\.?(?:\/|$))/g;
-function escapeRou3Literal(text) {
-  return text.replace(ROU3_SYNTAX_REGEX, "\\$&");
+function toRou3Literal(text) {
+  const normalized = NORMALIZABLE_PATHNAME_REGEX.test(text) ? normalizeRou3Path(text) : text;
+  return normalized.replace(ROU3_SYNTAX_REGEX, "\\$&");
+}
+function normalizeRou3Path(path) {
+  return path.split("/").map((segment) => safeDecodeURIComponent(segment).replace(ROU3_ENCODED_SEGMENT_TEXT_REGEX, safeEncodeURIComponent)).join("/");
 }
 function toRou3PrefixMatcher(prefix) {
   const catchAll = getDynamicPathParams(prefix)?.find((param) => param.allowsSlash);

package/dist/shared/{openapi.C2LayTNZ.d.mts → openapi.DjGhiceP.d.mts}

@@ -4,22 +4,21 @@ import { Segment } from '@orpc/shared';
 type BracketNotationSerializeResult = [string, unknown][];
 interface BracketNotationSerializerOptions {
     /**
-     * Maximum explicit array index allowed during deserialization (e.g., `arr[0]`, `arr[999]`).
-     * If the index exceeds this limit, the array is deserialized as an object instead.
+     * Maximum number of empty slots that explicit array indexes may leave in total during deserialization
+     * (e.g., `a[0]=x&a[3]=y` leaves 2). An index that would exceed it turns its array into an object
+     * instead (e.g., `?arr[5000]=x` becomes `{ arr: { 5000: 'x' } }`).
      *
-     * This guards against memory exhaustion attacks where malicious input uses extremely large
-     * indices (e.g., `?arr[4294967296]=value`). Although orpc uses sparse arrays handle large indices
-     * efficiently, downstream code may inadvertently densify them - creating millions of
-     * undefined slots and exhausting memory.
+     * Empty slots take memory (a lone `?arr[999]=x` takes ~12KB in V8), and code iterating an array walks
+     * every one of them, so this keeps both in line with the input.
      *
-     * NOTE: Does not apply to append-style notation (e.g., `arr[]`).
+     * NOTE: Append-style notation (e.g., `arr[]`) never leaves empty slots.
      *
-     * @default 999 (array with 1,000 elements)
+     * @default 1_000
      */
-    maxExplicitDeserializingArrayIndex?: number;
+    maxDeserializingEmptySlots?: number;
 }
 declare class BracketNotationSerializer {
-    private readonly maxExplicitDeserializingArrayIndex;
+    private readonly maxDeserializingEmptySlots;
     constructor(options?: BracketNotationSerializerOptions);
     serialize(data: unknown): BracketNotationSerializeResult;
     private internalSerialize;
@@ -125,7 +124,7 @@ interface OpenAPISerializerSerializeOptions {
 }
 interface OpenAPISerializerOptions extends OpenAPIJsonSerializerOptions {
     /**
-     * Options for bracket notation serializer, like maxExplicitDeserializingArrayIndex
+     * Options for bracket notation serializer, like maxDeserializingEmptySlots
      */
     bracketNotation?: BracketNotationSerializerOptions | undefined;
     /**

package/dist/shared/{openapi.C2LayTNZ.d.ts → openapi.DjGhiceP.d.ts}

@@ -4,22 +4,21 @@ import { Segment } from '@orpc/shared';
 type BracketNotationSerializeResult = [string, unknown][];
 interface BracketNotationSerializerOptions {
     /**
-     * Maximum explicit array index allowed during deserialization (e.g., `arr[0]`, `arr[999]`).
-     * If the index exceeds this limit, the array is deserialized as an object instead.
+     * Maximum number of empty slots that explicit array indexes may leave in total during deserialization
+     * (e.g., `a[0]=x&a[3]=y` leaves 2). An index that would exceed it turns its array into an object
+     * instead (e.g., `?arr[5000]=x` becomes `{ arr: { 5000: 'x' } }`).
      *
-     * This guards against memory exhaustion attacks where malicious input uses extremely large
-     * indices (e.g., `?arr[4294967296]=value`). Although orpc uses sparse arrays handle large indices
-     * efficiently, downstream code may inadvertently densify them - creating millions of
-     * undefined slots and exhausting memory.
+     * Empty slots take memory (a lone `?arr[999]=x` takes ~12KB in V8), and code iterating an array walks
+     * every one of them, so this keeps both in line with the input.
      *
-     * NOTE: Does not apply to append-style notation (e.g., `arr[]`).
+     * NOTE: Append-style notation (e.g., `arr[]`) never leaves empty slots.
      *
-     * @default 999 (array with 1,000 elements)
+     * @default 1_000
      */
-    maxExplicitDeserializingArrayIndex?: number;
+    maxDeserializingEmptySlots?: number;
 }
 declare class BracketNotationSerializer {
-    private readonly maxExplicitDeserializingArrayIndex;
+    private readonly maxDeserializingEmptySlots;
     constructor(options?: BracketNotationSerializerOptions);
     serialize(data: unknown): BracketNotationSerializeResult;
     private internalSerialize;
@@ -125,7 +124,7 @@ interface OpenAPISerializerSerializeOptions {
 }
 interface OpenAPISerializerOptions extends OpenAPIJsonSerializerOptions {
     /**
-     * Options for bracket notation serializer, like maxExplicitDeserializingArrayIndex
+     * Options for bracket notation serializer, like maxDeserializingEmptySlots
      */
     bracketNotation?: BracketNotationSerializerOptions | undefined;
     /**

package/dist/shared/openapi.DtEVcxuW.mjs

@@ -0,0 +1,149 @@
+import { isPlainObject, NullProtoObj, getOwn, setOwn } from '@orpc/shared';
+
+class BracketNotationSerializer {
+  maxDeserializingEmptySlots;
+  constructor(options = {}) {
+    this.maxDeserializingEmptySlots = options.maxDeserializingEmptySlots ?? 1e3;
+  }
+  serialize(data) {
+    const result = [];
+    this.internalSerialize(data, "", true, result);
+    return result;
+  }
+  internalSerialize(data, path, isRoot, result) {
+    if (Array.isArray(data)) {
+      data.forEach((item, i) => {
+        this.internalSerialize(item, isRoot ? i.toString() : `${path}[${i}]`, false, result);
+      });
+    } else if (isPlainObject(data)) {
+      for (const key of Object.keys(data)) {
+        this.internalSerialize(data[key], isRoot ? key : `${path}[${key}]`, false, result);
+      }
+    } else {
+      result.push([path, data]);
+    }
+  }
+  deserialize(serialized) {
+    let arrayPushStyles;
+    const root = new NullProtoObj();
+    let emptySlotsLeft = this.maxDeserializingEmptySlots;
+    for (const [path, value] of serialized) {
+      const segments = this.parsePath(path);
+      let currentRef = root;
+      let nextSegment = segments[0];
+      for (let i = 1; i < segments.length; i++) {
+        const segment = segments[i];
+        const isLast = i === segments.length - 1;
+        const existing = getOwn(currentRef, nextSegment);
+        let child = existing;
+        let key = segment;
+        if (Array.isArray(child) || !isPlainObject(child)) {
+          const isArray = Array.isArray(child);
+          const isPushStyle = isArray && !!arrayPushStyles?.has(child);
+          const length = isArray ? child.length : 0;
+          const index = internalToArrayIndex(segment);
+          const emptySlots = index === void 0 ? 0 : Math.max(0, index - length);
+          const canBeArray = segment === "" ? isLast && (isPushStyle || length === 0) : index !== void 0 && !(isLast && isPushStyle) && emptySlots <= emptySlotsLeft;
+          if (canBeArray) {
+            emptySlotsLeft -= emptySlots;
+            child = isArray ? child : [];
+            key = index ?? segment;
+          } else if (isArray) {
+            arrayPushStyles?.delete(child);
+            child = isPushStyle ? internalPushStyleArrayToObject(child) : internalArrayToObject(child);
+          } else {
+            child = new NullProtoObj();
+          }
+        }
+        if (child !== existing) {
+          internalSetOwn(currentRef, nextSegment, child);
+        }
+        currentRef = child;
+        nextSegment = key;
+      }
+      if (Array.isArray(currentRef) && nextSegment === "") {
+        arrayPushStyles ??= /* @__PURE__ */ new WeakSet();
+        arrayPushStyles.add(currentRef);
+        currentRef.push(value);
+      } else if (Object.hasOwn(currentRef, nextSegment)) {
+        const current = currentRef[nextSegment];
+        if (Array.isArray(current)) {
+          current.push(value);
+        } else {
+          internalSetOwn(currentRef, nextSegment, [current, value]);
+        }
+      } else {
+        internalSetOwn(currentRef, nextSegment, value);
+      }
+    }
+    return root;
+  }
+  stringifyPath(segments) {
+    if (segments.length === 0) {
+      return "";
+    }
+    let result = segments[0].toString();
+    for (let i = 1; i < segments.length; i++) {
+      result += `[${segments[i]}]`;
+    }
+    return result;
+  }
+  parsePath(path) {
+    const start = path.indexOf("[");
+    if (start === -1 || path[path.length - 1] !== "]") {
+      return [path];
+    }
+    const segments = [path.slice(0, start)];
+    let from = start + 1;
+    let to = path.indexOf("][", from);
+    while (to !== -1) {
+      segments.push(path.slice(from, to));
+      from = to + 2;
+      to = path.indexOf("][", from);
+    }
+    segments.push(path.slice(from, -1));
+    return segments;
+  }
+}
+const MAX_ARRAY_INDEX = 2 ** 32 - 2;
+function internalToArrayIndex(key) {
+  if (key.length === 0 || key.length > 10) {
+    return void 0;
+  }
+  let index = key.charCodeAt(0) - 48;
+  if (index < 0 || index > 9 || index === 0 && key.length > 1) {
+    return void 0;
+  }
+  for (let i = 1; i < key.length; i++) {
+    const digit = key.charCodeAt(i) - 48;
+    if (digit < 0 || digit > 9) {
+      return void 0;
+    }
+    index = index * 10 + digit;
+  }
+  return index <= MAX_ARRAY_INDEX ? index : void 0;
+}
+function internalArrayToObject(array) {
+  const obj = new NullProtoObj();
+  array.forEach((item, i) => {
+    obj[i] = item;
+  });
+  return obj;
+}
+function internalPushStyleArrayToObject(array) {
+  const obj = new NullProtoObj();
+  obj[""] = array.length === 1 ? array[0] : array;
+  return obj;
+}
+function internalSetOwn(container, key, value) {
+  if (typeof key === "string" && container instanceof NullProtoObj) {
+    const index = internalToArrayIndex(key);
+    if (index !== void 0 && index !== 0 && !Object.hasOwn(container, index - 1) && !Object.hasOwn(container, MAX_ARRAY_INDEX)) {
+      container[MAX_ARRAY_INDEX] = void 0;
+      delete container[MAX_ARRAY_INDEX];
+    }
+  }
+  setOwn(container, key, value);
+}
+
+export { BracketNotationSerializer as B };

package/dist/shared/{openapi.Bu_PfTtX.mjs → openapi.PXVenYpE.mjs}

@@ -1,7 +1,7 @@
 import { wrapAsyncIteratorPreservingEventMeta, toORPCError, isORPCErrorJson, createORPCErrorFromJson } from '@orpc/client';
 import { isPlainObject, NullProtoObj, copyOnWrite, isAsyncIteratorObject } from '@orpc/shared';
 import { ErrorEvent } from '@standard-server/core';
-import { B as BracketNotationSerializer } from './openapi.B2G-HeFn.mjs';
+import { B as BracketNotationSerializer } from './openapi.DtEVcxuW.mjs';
 
 const DEFAULT_OPENAPI_METHOD = "POST";
 const DEFAULT_OPENAPI_SUCCESS_DESCRIPTION = "OK";

package/dist/shared/{openapi.D0yWs-uW.d.ts → openapi.aoP0G_Bv.d.ts}

@@ -3,7 +3,7 @@ import { StandardLinkCodec, StandardLinkCodecDecodedResponse } from '@orpc/clien
 import { RouterContract } from '@orpc/contract';
 import { Value, Promisable, Public } from '@orpc/shared';
 import { StandardUrl, StandardHeaders, StandardLazyResponse, StandardRequest } from '@standard-server/core';
-import { O as OpenAPISerializer } from './openapi.C2LayTNZ.js';
+import { O as OpenAPISerializer } from './openapi.DjGhiceP.js';
 
 interface OpenAPILinkCodecOptions<T extends ClientContext> {
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "2.0.0-beta.42",
+  "version": "2.0.0-beta.43",
   "description": "Generate OpenAPI specs from oRPC routers and serve OpenAPI-compliant APIs with end-to-end type safety",
   "license": "MIT",
   "funding": [
@@ -99,18 +99,18 @@
   "dependencies": {
     "@openapi-spec/downgrader": "~0.3.0",
     "@openapi-spec/types": "~0.3.0",
-    "@orpc/client": "2.0.0-beta.42",
-    "@orpc/contract": "2.0.0-beta.42",
-    "@orpc/json-schema": "2.0.0-beta.42",
-    "@orpc/server": "2.0.0-beta.42",
-    "@orpc/shared": "2.0.0-beta.42",
-    "@standard-server/core": "~0.10.1",
-    "@standard-server/fetch": "~0.10.1",
+    "@orpc/client": "2.0.0-beta.43",
+    "@orpc/contract": "2.0.0-beta.43",
+    "@orpc/json-schema": "2.0.0-beta.43",
+    "@orpc/server": "2.0.0-beta.43",
+    "@orpc/shared": "2.0.0-beta.43",
+    "@standard-server/core": "~0.10.2",
+    "@standard-server/fetch": "~0.10.2",
     "rou3": "^1.0.0"
   },
   "devDependencies": {
     "@scalar/api-reference": "^1.65.1",
-    "@standard-server/aws-lambda": "~0.10.1",
+    "@standard-server/aws-lambda": "~0.10.2",
     "@types/swagger-ui": "^5.32.0",
     "fastify": "^5.12.1",
     "swagger-ui": "^5.32.14",

package/dist/shared/openapi.B2G-HeFn.mjs

@@ -1,123 +0,0 @@
-import { isPlainObject, NullProtoObj, getOwn, setOwn } from '@orpc/shared';
-
-class BracketNotationSerializer {
-  maxExplicitDeserializingArrayIndex;
-  constructor(options = {}) {
-    this.maxExplicitDeserializingArrayIndex = options.maxExplicitDeserializingArrayIndex ?? 999;
-  }
-  serialize(data) {
-    const result = [];
-    this.internalSerialize(data, "", true, result);
-    return result;
-  }
-  internalSerialize(data, path, isRoot, result) {
-    if (Array.isArray(data)) {
-      data.forEach((item, i) => {
-        this.internalSerialize(item, isRoot ? i.toString() : `${path}[${i}]`, false, result);
-      });
-    } else if (isPlainObject(data)) {
-      for (const key of Object.keys(data)) {
-        this.internalSerialize(data[key], isRoot ? key : `${path}[${key}]`, false, result);
-      }
-    } else {
-      result.push([path, data]);
-    }
-  }
-  deserialize(serialized) {
-    const arrayPushStyles = /* @__PURE__ */ new WeakSet();
-    const root = new NullProtoObj();
-    for (const [path, value] of serialized) {
-      const segments = this.parsePath(path);
-      let currentRef = root;
-      let nextSegment = segments[0];
-      for (let i = 1; i < segments.length; i++) {
-        const segment = segments[i];
-        const isLast = i === segments.length - 1;
-        const existing = getOwn(currentRef, nextSegment);
-        let child = existing;
-        if (!Array.isArray(child) && !isPlainObject(child)) {
-          child = [];
-        }
-        if (Array.isArray(child)) {
-          const isPushStyle = arrayPushStyles.has(child);
-          const canStayArray = segment === "" ? isLast && (isPushStyle || child.length === 0) : internalIsValidArrayIndex(segment, this.maxExplicitDeserializingArrayIndex) && !(isLast && isPushStyle);
-          if (!canStayArray) {
-            arrayPushStyles.delete(child);
-            child = isPushStyle ? internalPushStyleArrayToObject(child) : internalArrayToObject(child);
-          }
-        }
-        if (child !== existing) {
-          setOwn(currentRef, nextSegment, child);
-        }
-        currentRef = child;
-        nextSegment = segment;
-      }
-      if (Array.isArray(currentRef) && nextSegment === "") {
-        arrayPushStyles.add(currentRef);
-        currentRef.push(value);
-      } else if (Object.hasOwn(currentRef, nextSegment)) {
-        const current = currentRef[nextSegment];
-        if (Array.isArray(current)) {
-          current.push(value);
-        } else {
-          setOwn(currentRef, nextSegment, [current, value]);
-        }
-      } else {
-        setOwn(currentRef, nextSegment, value);
-      }
-    }
-    return root;
-  }
-  stringifyPath(segments) {
-    if (segments.length === 0) {
-      return "";
-    }
-    let result = segments[0].toString();
-    for (let i = 1; i < segments.length; i++) {
-      result += `[${segments[i]}]`;
-    }
-    return result;
-  }
-  parsePath(path) {
-    const segments = [];
-    let inBrackets = false;
-    let currentSegment = "";
-    for (let i = 0; i < path.length; i++) {
-      const char = path[i];
-      const nextChar = path[i + 1];
-      if (inBrackets && char === "]" && (nextChar === void 0 || nextChar === "[")) {
-        if (nextChar === void 0) {
-          inBrackets = false;
-        }
-        segments.push(currentSegment);
-        currentSegment = "";
-        i++;
-      } else if (segments.length === 0 && char === "[") {
-        inBrackets = true;
-        segments.push(currentSegment);
-        currentSegment = "";
-      } else {
-        currentSegment += char;
-      }
-    }
-    return inBrackets || segments.length === 0 ? [path] : segments;
-  }
-}
-const INTEGER_PATTERN = /^0$|^[1-9]\d*$/;
-function internalIsValidArrayIndex(value, maxIndex) {
-  return INTEGER_PATTERN.test(value) && Number(value) <= maxIndex;
-}
-function internalArrayToObject(array) {
-  const obj = new NullProtoObj();
-  array.forEach((item, i) => {
-    obj[i] = item;
-  });
-  return obj;
-}
-function internalPushStyleArrayToObject(array) {
-  const obj = new NullProtoObj();
-  obj[""] = array.length === 1 ? array[0] : array;
-  return obj;
-}
-
-export { BracketNotationSerializer as B };