@orpc/openapi 2.0.0-beta.20 → 2.0.0-beta.22

package/dist/shared/{openapi.CVgUshDP.mjs → openapi.BaqI61Xi.mjs}

@@ -1,8 +1,8 @@
 import { COMMON_ERROR_STATUS_MAP } from '@orpc/client';
 import { walkProcedureContractsSync, Procedure, unlazy, getRouter, createContractProcedure, DEFAULT_SUCCESS_STATUS, DEFAULT_ERROR_STATUS } from '@orpc/server';
-import { value, pathToHttpPath, mergeHttpPath, normalizeHttpPath, tryDecodeURIComponent, isPlainObject, stringifyJSON, parseEmptyableJSON, isTypescriptObject, NullProtoObj } from '@orpc/shared';
-import { parseStandardUrl, isStandardHeaders } from '@standardserver/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.zZH_UksW.mjs';
+import { value, pathToHttpPath, mergeHttpPath, normalizeHttpPath, tryDecodeURIComponent, NullProtoObj, isTypescriptObject, isPlainObject, stringifyJSON, parseEmptyableJSON } from '@orpc/shared';
+import { parseStandardUrl } from '@standardserver/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.0yE-t1W-.mjs';
 import { g as getOpenAPIMeta } from './openapi.B9PQzqBn.mjs';
 import { createRouter, addRoute, findRoute, routeToRegExp } from 'rou3';
 
@@ -10,7 +10,7 @@ class OpenAPIMatcher {
   filter;
   rootRouter;
   tree = createRouter();
-  pendingLazyRouters = [];
+  pendingLazyRouters = /* @__PURE__ */ new Set();
   constructor(router, options = {}) {
     this.filter = options.filter ?? true;
     this.rootRouter = router;
@@ -32,13 +32,13 @@ class OpenAPIMatcher {
         procedure: contract instanceof Procedure ? contract : void 0
       });
     }, path);
-    this.pendingLazyRouters.push(...lazyResults.map((result) => {
+    for (const result of lazyResults) {
       const prefix = getOpenAPIMeta(result.router)?.prefix;
-      return {
+      this.pendingLazyRouters.add({
         ...result,
         matcher: prefix ? toRou3PrefixMatcher(prefix) : void 0
-      };
-    }));
+      });
+    }
   }
   async match(method, pathname, prefix) {
     if (prefix) {
@@ -56,44 +56,58 @@ class OpenAPIMatcher {
         return void 0;
       }
     }
-    const result = await this.matchPathname(method, pathname);
-    if (!result && pathname.includes("%")) {
-      return this.matchPathname(method, normalizeHttpPath(pathname));
+    const loading = this.resolvePendingLazyRouters(pathname);
+    if (loading !== void 0) {
+      await loading;
     }
-    return result;
-  }
-  async matchPathname(method, pathname) {
-    await this.resolvePendingLazyRouters(pathname);
-    const match = findRoute(this.tree, method, pathname);
-    if (!match) {
+    let match = findRoute(this.tree, method, pathname);
+    if (match === void 0 && pathname.includes("%")) {
+      const normalizedPathname = normalizeHttpPath(pathname);
+      const normalizedLoading = this.resolvePendingLazyRouters(normalizedPathname);
+      if (normalizedLoading !== void 0) {
+        await normalizedLoading;
+      }
+      match = findRoute(this.tree, method, normalizedPathname);
+    }
+    if (match === void 0) {
       return void 0;
     }
-    const procedure = await this.resolveProcedure(match.data);
+    const entry = match.data;
     return {
-      path: match.data.path,
-      procedure,
+      path: entry.path,
+      procedure: entry.procedure ?? await this.resolveProcedure(entry),
       params: match.params ? decodeParams(match.params) : void 0
     };
   }
-  async resolvePendingLazyRouters(pathname) {
-    if (!this.pendingLazyRouters.length) {
-      return;
+  resolvePendingLazyRouters(pathname) {
+    for (const pending of this.pendingLazyRouters) {
+      if (pending.matcher === void 0 || pending.matcher.test(pathname)) {
+        return this.loadPendingLazyRouters(pathname);
+      }
     }
-    const stillPending = [];
+  }
+  async loadPendingLazyRouters(pathname) {
     for (const pending of this.pendingLazyRouters) {
-      if (!pending.matcher || pending.matcher.test(pathname)) {
-        const { default: router } = await unlazy(pending.router);
-        this.index(router, pending.path);
-      } else {
-        stillPending.push(pending);
+      if (pending.matcher === void 0 || pending.matcher.test(pathname)) {
+        await this.loadPendingLazyRouter(pending);
       }
     }
-    this.pendingLazyRouters = stillPending;
   }
-  async resolveProcedure(entry) {
-    if (entry.procedure) {
-      return entry.procedure;
+  loadPendingLazyRouter(pending) {
+    if (pending.loading === void 0) {
+      pending.loading = this.indexPendingLazyRouter(pending).catch((error) => {
+        pending.loading = void 0;
+        throw error;
+      });
     }
+    return pending.loading;
+  }
+  async indexPendingLazyRouter(pending) {
+    const { default: router } = await unlazy(pending.router);
+    this.index(router, pending.path);
+    this.pendingLazyRouters.delete(pending);
+  }
+  async resolveProcedure(entry) {
     const { default: maybeProcedure } = await unlazy(getRouter(this.rootRouter, entry.path));
     if (!(maybeProcedure instanceof Procedure)) {
       throw new TypeError(
@@ -124,6 +138,41 @@ function decodeParams(params) {
   return Object.fromEntries(Object.entries(params).map(([key, val]) => [key, tryDecodeURIComponent(val)]));
 }
 
+function serializeHeaders(headers, serializer) {
+  const result = new NullProtoObj();
+  for (const [key, value] of Object.entries(headers)) {
+    if (Array.isArray(value)) {
+      const lines = [];
+      for (const item of value) {
+        const line2 = serializeHeaderValue(item, serializer);
+        if (line2 !== void 0) {
+          lines.push(line2);
+        }
+      }
+      result[key] = lines;
+      continue;
+    }
+    const line = serializeHeaderValue(value, serializer);
+    if (line !== void 0) {
+      result[key] = line;
+    }
+  }
+  return result;
+}
+function serializeHeaderValue(value, serializer) {
+  const serialized = serializer.serialize(value);
+  if (Array.isArray(serialized)) {
+    return serialized.filter((item) => item !== void 0 && item !== null).map(String).join(",");
+  }
+  if (isTypescriptObject(serialized)) {
+    return Object.entries(serialized).filter(([, val]) => val !== void 0 && val !== null).map(([key, val]) => `${String(key)},${String(val)}`).join(",");
+  }
+  if (serialized !== void 0 && serialized !== null) {
+    return String(serialized);
+  }
+  return void 0;
+}
+
 class OpenAPIHandlerCodecCore {
   serializer;
   errorStatusMap;
@@ -180,8 +229,8 @@ class OpenAPIHandlerCodecCore {
       throw new TypeError(`
         Invalid "detailed" output structure returned by procedure (${path.join(".")}):
         \u2022 Expected an object with optional properties:
-          - status (number 200-399)
-          - headers (Record<string, string | string[] | undefined>)
+          - status (number <400)
+          - headers (object)
           - body (any)
         \u2022 No extra keys allowed.
 
@@ -191,7 +240,7 @@ class OpenAPIHandlerCodecCore {
     }
     return {
       status: output.status ?? successStatus,
-      headers: output.headers ?? {},
+      headers: output.headers !== void 0 ? serializeHeaders(output.headers, this.serializer) : {},
       body: this.serializer.serialize(output.body)
     };
   }
@@ -288,10 +337,10 @@ function isValidDetailedOutput(output) {
   if (Object.keys(output).some((key) => key !== "status" && key !== "headers" && key !== "body")) {
     return false;
   }
-  if (output.status !== void 0 && (typeof output.status !== "number" || !Number.isInteger(output.status) || output.status < 200 || output.status > 399)) {
+  if (output.status !== void 0 && (typeof output.status !== "number" || !Number.isInteger(output.status) || output.status > 399)) {
     return false;
   }
-  if (output.headers !== void 0 && !isStandardHeaders(output.headers)) {
+  if (output.headers !== void 0 && !isTypescriptObject(output.headers)) {
     return false;
   }
   return true;
@@ -315,4 +364,4 @@ function decodeDelimitedObject(value, delimiter) {
   return obj;
 }
 
-export { OpenAPIHandlerCodec as O, OpenAPIHandlerCodecCore as a, OpenAPIMatcher as b };
+export { OpenAPIHandlerCodec as O, OpenAPIHandlerCodecCore as a, OpenAPIMatcher as b, serializeHeaders as s };

package/dist/shared/{openapi.ByT4oUeY.d.mts → openapi.Bsz7d8xx.d.mts}

@@ -15,4 +15,4 @@ type JsonifiedClient<T extends AnyNestedClient> = T extends Client<infer UClient
     [K in keyof T]: T[K] extends AnyNestedClient ? JsonifiedClient<T[K]> : T[K];
 };
 
-export type { JsonifiedClient as J, OpenAPIOperationObject as O, OpenAPIDocument as a, JsonifiedArray as b, JsonifiedClientError as c, JsonifiedValue as d };
+export type { JsonifiedClient as J, OpenAPIDocument as O, JsonifiedArray as a, JsonifiedClientError as b, JsonifiedValue as c, OpenAPIOperationObject as d };

package/dist/shared/{openapi.ByT4oUeY.d.ts → openapi.Bsz7d8xx.d.ts}

@@ -15,4 +15,4 @@ type JsonifiedClient<T extends AnyNestedClient> = T extends Client<infer UClient
     [K in keyof T]: T[K] extends AnyNestedClient ? JsonifiedClient<T[K]> : T[K];
 };
 
-export type { JsonifiedClient as J, OpenAPIOperationObject as O, OpenAPIDocument as a, JsonifiedArray as b, JsonifiedClientError as c, JsonifiedValue as d };
+export type { JsonifiedClient as J, OpenAPIDocument as O, JsonifiedArray as a, JsonifiedClientError as b, JsonifiedValue as c, OpenAPIOperationObject as d };

package/dist/shared/{openapi.hg_rhZ4x.d.mts → openapi.COG_72WY.d.mts}

@@ -2,7 +2,7 @@ import { AnySchema, ErrorMap, MetaPlugin, AnyProcedureContract } from '@orpc/con
 import { Lazy } from '@orpc/server';
 import { Value } from '@orpc/shared';
 import { StandardBodyHint } from '@standardserver/core';
-import { O as OpenAPIOperationObject } from './openapi.ByT4oUeY.mjs';
+import { d as OpenAPIOperationObject } from './openapi.Bsz7d8xx.mjs';
 
 interface OpenAPIMeta {
     /**

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

@@ -0,0 +1,47 @@
+import { ClientContext, ClientOptions, AnyORPCError } from '@orpc/client';
+import { StandardLinkCodec, StandardLinkCodecDecodedResponse } from '@orpc/client/standard';
+import { RouterContract } from '@orpc/contract';
+import { Value, Promisable } from '@orpc/shared';
+import { StandardUrl, StandardHeaders, StandardLazyResponse, StandardRequest } from '@standardserver/core';
+import { O as OpenAPISerializer } from './openapi.DBFXInk5.mjs';
+
+declare class OpenAPILinkCodecError extends TypeError {
+}
+interface OpenAPILinkCodecOptions<T extends ClientContext> {
+    /**
+     * Base URL for all requests, without origin. Should match the OpenAPI handler mount path.
+     *
+     * @example '/api'
+     * @default '/'
+     */
+    url?: Value<Promisable<StandardUrl>, [options: ClientOptions<T>, path: string[], input: unknown]>;
+    /**
+     * Inject headers into the request.
+     */
+    headers?: Value<Promisable<StandardHeaders | Headers>, [options: ClientOptions<T>, path: string[], input: unknown]>;
+    /**
+     * Override the default OpenAPI serializer.
+     */
+    serializer?: Pick<OpenAPISerializer, keyof OpenAPISerializer>;
+    /**
+     * Customize how an error response body is converted into an ORPC error.
+     * Return `null` or `undefined` to fall back to the default decoding behavior.
+     */
+    customErrorResponseBodyDecoder?: (deserializedBody: unknown, response: StandardLazyResponse) => AnyORPCError | null | undefined;
+}
+declare class OpenAPILinkCodec<T extends ClientContext> implements StandardLinkCodec<T> {
+    private readonly router;
+    private readonly baseUrl;
+    private readonly headers;
+    private readonly serializer;
+    private readonly customErrorResponseBodyDecoder;
+    constructor(router: RouterContract, options?: OpenAPILinkCodecOptions<T>);
+    encodeInput(input: unknown, path: string[], options: ClientOptions<T>): Promise<StandardRequest>;
+    private encodePathParam;
+    private serializeQueryString;
+    decodeResponse(response: StandardLazyResponse, path: string[], _options: ClientOptions<T>): Promise<StandardLinkCodecDecodedResponse>;
+    private resolveProcedure;
+}
+
+export { OpenAPILinkCodec as a, OpenAPILinkCodecError as b };
+export type { OpenAPILinkCodecOptions as O };

package/dist/shared/{openapi.B6hEbRyF.d.ts → openapi.D7Fpk6aV.d.ts}

@@ -4,7 +4,7 @@ import { StandardHandlerCodec, StandardHandlerHandleOptions, StandardHandlerCode
 import { Value, Promisable } from '@orpc/shared';
 import { StandardLazyRequest, StandardResponse } from '@standardserver/core';
 import { AnyProcedureContract } from '@orpc/contract';
-import { O as OpenAPISerializer } from './openapi.BOOA-bde.js';
+import { O as OpenAPISerializer } from './openapi.DBFXInk5.js';
 
 interface OpenAPIMatcherOptions {
     /**
@@ -18,7 +18,7 @@ declare class OpenAPIMatcher {
     private readonly filter;
     private readonly rootRouter;
     private readonly tree;
-    private pendingLazyRouters;
+    private readonly pendingLazyRouters;
     constructor(router: AnyRouter, options?: OpenAPIMatcherOptions);
     private index;
     match(method: string, pathname: `/${string}`, prefix: `/${string}` | undefined): Promise<{
@@ -26,8 +26,10 @@ declare class OpenAPIMatcher {
         procedure: AnyProcedure;
         params?: Record<string, string> | undefined;
     } | undefined>;
-    private matchPathname;
     private resolvePendingLazyRouters;
+    private loadPendingLazyRouters;
+    private loadPendingLazyRouter;
+    private indexPendingLazyRouter;
     private resolveProcedure;
 }
 

package/dist/shared/{openapi.BOOA-bde.d.mts → openapi.DBFXInk5.d.mts}

@@ -95,10 +95,15 @@ interface OpenAPIJsonSerializerOptions {
     omitUndefinedProperties?: boolean | undefined;
 }
 declare class OpenAPIJsonSerializer {
-    private readonly handlers;
+    private readonly inlineBuiltInHandlers;
+    private readonly handlerEntries;
     private readonly omitUndefinedProperties;
     constructor(options?: OpenAPIJsonSerializerOptions);
     serialize(data: unknown): OpenAPIJsonSerialization;
+    /**
+     * `segments` is a shared mutable stack (push/pop while walking),
+     * so it must be copied before being stored in `maps`.
+     */
     private serializeValue;
     deserialize(serialized: OpenAPIJsonSerialization): unknown;
 }

package/dist/shared/{openapi.BOOA-bde.d.ts → openapi.DBFXInk5.d.ts}

@@ -95,10 +95,15 @@ interface OpenAPIJsonSerializerOptions {
     omitUndefinedProperties?: boolean | undefined;
 }
 declare class OpenAPIJsonSerializer {
-    private readonly handlers;
+    private readonly inlineBuiltInHandlers;
+    private readonly handlerEntries;
     private readonly omitUndefinedProperties;
     constructor(options?: OpenAPIJsonSerializerOptions);
     serialize(data: unknown): OpenAPIJsonSerialization;
+    /**
+     * `segments` is a shared mutable stack (push/pop while walking),
+     * so it must be copied before being stored in `maps`.
+     */
     private serializeValue;
     deserialize(serialized: OpenAPIJsonSerialization): unknown;
 }

package/dist/shared/{openapi.BafbB3uM.d.mts → openapi.Dam82YDK.d.mts}

@@ -4,7 +4,7 @@ import { StandardHandlerCodec, StandardHandlerHandleOptions, StandardHandlerCode
 import { Value, Promisable } from '@orpc/shared';
 import { StandardLazyRequest, StandardResponse } from '@standardserver/core';
 import { AnyProcedureContract } from '@orpc/contract';
-import { O as OpenAPISerializer } from './openapi.BOOA-bde.mjs';
+import { O as OpenAPISerializer } from './openapi.DBFXInk5.mjs';
 
 interface OpenAPIMatcherOptions {
     /**
@@ -18,7 +18,7 @@ declare class OpenAPIMatcher {
     private readonly filter;
     private readonly rootRouter;
     private readonly tree;
-    private pendingLazyRouters;
+    private readonly pendingLazyRouters;
     constructor(router: AnyRouter, options?: OpenAPIMatcherOptions);
     private index;
     match(method: string, pathname: `/${string}`, prefix: `/${string}` | undefined): Promise<{
@@ -26,8 +26,10 @@ declare class OpenAPIMatcher {
         procedure: AnyProcedure;
         params?: Record<string, string> | undefined;
     } | undefined>;
-    private matchPathname;
     private resolvePendingLazyRouters;
+    private loadPendingLazyRouters;
+    private loadPendingLazyRouter;
+    private indexPendingLazyRouter;
     private resolveProcedure;
 }
 

package/dist/shared/{openapi.DNNo0V-l.d.ts → openapi.Du7gMjyF.d.ts}

@@ -2,7 +2,7 @@ import { AnySchema, ErrorMap, MetaPlugin, AnyProcedureContract } from '@orpc/con
 import { Lazy } from '@orpc/server';
 import { Value } from '@orpc/shared';
 import { StandardBodyHint } from '@standardserver/core';
-import { O as OpenAPIOperationObject } from './openapi.ByT4oUeY.js';
+import { d as OpenAPIOperationObject } from './openapi.Bsz7d8xx.js';
 
 interface OpenAPIMeta {
     /**

package/dist/shared/{openapi.Bt87OzTt.mjs → openapi.s_p5sN-P.mjs}

@@ -6,21 +6,22 @@ class BracketNotationSerializer {
     this.maxExplicitDeserializingArrayIndex = options.maxExplicitDeserializingArrayIndex ?? 999;
   }
   serialize(data) {
-    return this.internalSerialize(data, [], []);
+    const result = [];
+    this.internalSerialize(data, "", true, result);
+    return result;
   }
-  internalSerialize(data, segments, result) {
+  internalSerialize(data, path, isRoot, result) {
     if (Array.isArray(data)) {
       data.forEach((item, i) => {
-        this.internalSerialize(item, [...segments, i], result);
+        this.internalSerialize(item, isRoot ? i.toString() : `${path}[${i}]`, false, result);
       });
     } else if (isPlainObject(data)) {
       for (const key in data) {
-        this.internalSerialize(data[key], [...segments, key], result);
+        this.internalSerialize(data[key], isRoot ? key : `${path}[${key}]`, false, result);
       }
     } else {
-      result.push([this.stringifyPath(segments), data]);
+      result.push([path, data]);
     }
-    return result;
   }
   deserialize(serialized) {
     if (serialized.length === 0) {
@@ -32,7 +33,8 @@ class BracketNotationSerializer {
       const segments = this.parsePath(path);
       let currentRef = ref;
       let nextSegment = "value";
-      segments.forEach((segment, i) => {
+      for (let i = 0; i < segments.length; i++) {
+        const segment = segments[i];
         if (!Array.isArray(currentRef[nextSegment]) && !isPlainObject(currentRef[nextSegment])) {
           currentRef[nextSegment] = [];
         }
@@ -63,7 +65,7 @@ class BracketNotationSerializer {
         }
         currentRef = currentRef[nextSegment];
         nextSegment = segment;
-      });
+      }
       if (Array.isArray(currentRef) && nextSegment === "") {
         arrayPushStyles.add(currentRef);
         currentRef.push(value);
@@ -80,12 +82,14 @@ class BracketNotationSerializer {
     return ref.value;
   }
   stringifyPath(segments) {
-    return segments.reduce((result, segment, i) => {
-      if (i === 0) {
-        return segment.toString();
-      }
-      return `${result}[${segment}]`;
-    }, "");
+    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 = [];
@@ -112,8 +116,9 @@ class BracketNotationSerializer {
     return inBrackets || segments.length === 0 ? [path] : segments;
   }
 }
+const INTEGER_PATTERN = /^0$|^[1-9]\d*$/;
 function internalIsValidArrayIndex(value, maxIndex) {
-  return /^0$|^[1-9]\d*$/.test(value) && Number(value) <= maxIndex;
+  return INTEGER_PATTERN.test(value) && Number(value) <= maxIndex;
 }
 function internalArrayToObject(array) {
   const obj = new NullProtoObj();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/openapi",
   "type": "module",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.22",
   "license": "MIT",
   "homepage": "https://orpc.dev",
   "repository": {
@@ -75,20 +75,20 @@
   },
   "dependencies": {
     "@hey-api/spec-types": "0.0.0-next-20260408030107",
-    "@standardserver/core": "^0.5.0",
-    "@standardserver/fetch": "^0.5.0",
+    "@standardserver/core": "^0.6.0",
+    "@standardserver/fetch": "^0.6.0",
     "rou3": "^0.9.1",
-    "@orpc/client": "2.0.0-beta.20",
-    "@orpc/contract": "2.0.0-beta.20",
-    "@orpc/server": "2.0.0-beta.20",
-    "@orpc/shared": "2.0.0-beta.20",
-    "@orpc/json-schema": "2.0.0-beta.20"
+    "@orpc/client": "2.0.0-beta.22",
+    "@orpc/contract": "2.0.0-beta.22",
+    "@orpc/shared": "2.0.0-beta.22",
+    "@orpc/server": "2.0.0-beta.22",
+    "@orpc/json-schema": "2.0.0-beta.22"
   },
   "devDependencies": {
-    "@scalar/api-reference": "^1.57.2",
+    "@scalar/api-reference": "^1.63.0",
     "@types/swagger-ui": "^5.32.0",
     "fastify": "^5.8.5",
-    "swagger-ui": "^5.32.6",
+    "swagger-ui": "^5.32.11",
     "zod": "^4.4.3"
   },
   "scripts": {