@orpc/server 2.0.0-beta.43 → 2.0.0-beta.45

package/dist/shared/{server.UG_xdTub.d.mts → server.DgcwQ-Wr.d.mts}

@@ -1,10 +1,10 @@
 import { Value, Promisable } from '@orpc/shared';
 import { StandardLazyRequest } from '@standard-server/core';
-import { C as Context } from './server.BEdOJs6S.mjs';
-import { a as StandardHandlerHandleOptions } from './server.CVO0hWyj.mjs';
+import { C as Context } from './server.BWhT-63L.mjs';
+import { a as StandardHandlerHandleOptions } from './server.TVSii8T9.mjs';
 
 type FriendlyStandardHandlerHandleOptions<T extends Context> = Omit<StandardHandlerHandleOptions<T>, 'context'> & (object extends T ? {
-    context?: Value<Promisable<T>, [request: StandardLazyRequest]>;
+    context?: Value<Promisable<T>, [request: StandardLazyRequest]> | undefined;
 } : {
     context: Value<Promisable<T>, [request: StandardLazyRequest]>;
 });

package/dist/shared/{server.B1ecixZJ.mjs → server.Kbq-C85k.mjs}

@@ -2,7 +2,7 @@ import { ORPCError, toORPCError, RPCSerializer, COMMON_ERROR_STATUS_MAP } from '
 import { sortPlugins, toArray, matchesHttpPathPrefix, value, intercept, getTracer, runWithSpan, ORPC_NAME, isAsyncIteratorObject, override, traceAsyncIterator, traceReadableStream, recordSpanError, wrapAsyncIterator, toTracingException, wrapReadableStream, pathToHttpPath, normalizeHttpPath, parseEmptyableJSON, getOwn } from '@orpc/shared';
 import { flattenStandardHeader, parseStandardUrl, ErrorEvent } from '@standard-server/core';
 import { c as createProcedureClient, u as unlazy, P as Procedure } from './server.FEqy7Hrj.mjs';
-import { w as walkProcedureContractsSync, g as getRouter, c as createContractProcedure, D as DEFAULT_SUCCESS_STATUS, a as DEFAULT_ERROR_STATUS } from './server.BgvqVW_v.mjs';
+import { w as walkProcedureContractsSync, r as resolveContractProcedure, D as DEFAULT_SUCCESS_STATUS, a as DEFAULT_ERROR_STATUS } from './server.BcxD3fmU.mjs';
 
 class CompositeStandardHandlerPlugin {
   name = "~composite";
@@ -191,6 +191,8 @@ class RPCMatcher {
   rootRouter;
   tree = /* @__PURE__ */ new Map();
   pendingLazyRouters = /* @__PURE__ */ new Map();
+  /** segment count of the deepest pending key, never lowered so it stays an upper bound */
+  maxPendingLazyRouterDepth = 0;
   constructor(router, options = {}) {
     this.filter = options.filter ?? true;
     const allowMethods = options.allowMethods ?? RPC_DEFAULT_ALLOW_METHODS;
@@ -216,6 +218,7 @@ class RPCMatcher {
     }, path);
     for (const result of lazyResults) {
       this.pendingLazyRouters.set(pathToHttpPath(result.path), result);
+      this.maxPendingLazyRouterDepth = Math.max(this.maxPendingLazyRouterDepth, result.path.length);
     }
   }
   async match(method, pathname, prefix) {
@@ -270,22 +273,12 @@ class RPCMatcher {
       return;
     }
     let slashIndex = 0;
-    while (slashIndex !== -1) {
-      const nextSlashIndex = pathname.indexOf("/", slashIndex + 1);
-      const httpPathPrefix = nextSlashIndex === -1 ? pathname : pathname.slice(0, nextSlashIndex);
-      if (this.pendingLazyRouters.has(httpPathPrefix)) {
-        return this.loadPendingLazyRouters(pathname, slashIndex);
-      }
-      slashIndex = nextSlashIndex;
-    }
-  }
-  async loadPendingLazyRouters(pathname, slashIndex) {
-    while (slashIndex !== -1) {
+    for (let depth = 1; slashIndex !== -1 && depth <= this.maxPendingLazyRouterDepth; depth++) {
       const nextSlashIndex = pathname.indexOf("/", slashIndex + 1);
       const httpPathPrefix = nextSlashIndex === -1 ? pathname : pathname.slice(0, nextSlashIndex);
       const pending = this.pendingLazyRouters.get(httpPathPrefix);
       if (pending !== void 0) {
-        await this.loadPendingLazyRouter(httpPathPrefix, pending);
+        return this.loadPendingLazyRouter(httpPathPrefix, pending).then(() => this.resolvePendingLazyRouters(pathname));
       }
       slashIndex = nextSlashIndex;
     }
@@ -305,13 +298,7 @@ class RPCMatcher {
     this.pendingLazyRouters.delete(httpPathPrefix);
   }
   async resolveProcedure(entry) {
-    const { default: maybeProcedure } = await unlazy(getRouter(this.rootRouter, entry.path));
-    if (!(maybeProcedure instanceof Procedure)) {
-      throw new TypeError(
-        `[Contract-First] Missing or invalid implementation for procedure at path: "${entry.path.join(".")}". Ensure the procedure is correctly implemented and matches its contract.`
-      );
-    }
-    entry.procedure = createContractProcedure(maybeProcedure, entry.contract);
+    entry.procedure = await resolveContractProcedure(this.rootRouter, entry.contract, entry.path);
     return entry.procedure;
   }
 }

package/dist/shared/{server.DJNkZPfD.d.ts → server.TVSii8T9.d.mts}

@@ -1,7 +1,7 @@
 import { AnyORPCError } from '@orpc/client';
 import { OrderablePlugin, Value, Promisable, Interceptor } from '@orpc/shared';
 import { StandardLazyRequest, StandardResponse } from '@standard-server/core';
-import { C as Context, c as ProcedureClientInterceptor, A as AnyProcedure } from './server.BEdOJs6S.js';
+import { C as Context, c as ProcedureClientInterceptor, A as AnyProcedure } from './server.BWhT-63L.mjs';
 import { Schema, ErrorMap } from '@orpc/contract';
 
 interface StandardHandlerPlugin<T extends Context> extends OrderablePlugin {
@@ -73,19 +73,19 @@ interface StandardHandlerOptions<TContext extends Context> {
      * - batch plugins - separate one request into multiple and call multiple next
      * - openapi spec plugin - to intercept a request and early response
      */
-    routingInterceptors?: StandardHandlerRoutingInterceptor<TContext>[];
+    routingInterceptors?: StandardHandlerRoutingInterceptor<TContext>[] | undefined;
     /**
      * interceptor run after routing and before error handler,
      * useful for error handling, logging, metrics, etc.
      */
-    interceptors?: StandardHandlerInterceptor<TContext>[];
+    interceptors?: StandardHandlerInterceptor<TContext>[] | undefined;
     /**
      *
      * ClientInterceptor equivalent with createRouterClient.interceptors / createProcedure.interceptors
      * useful for error handling, logging, metrics, etc. (not counting encoding/decoding)
      */
-    clientInterceptors?: ProcedureClientInterceptor<TContext, Schema<unknown>, ErrorMap>[];
-    plugins?: StandardHandlerPlugin<TContext>[];
+    clientInterceptors?: ProcedureClientInterceptor<TContext, Schema<unknown>, ErrorMap>[] | undefined;
+    plugins?: StandardHandlerPlugin<TContext>[] | undefined;
 }
 declare class StandardHandler<T extends Context> {
     private readonly codec;

package/dist/shared/{server.DD1roZl9.d.mts → server.TjEHK8V3.d.mts}

@@ -1,5 +1,5 @@
 import { RouterContract, ProcedureContract, ORPCErrorFromErrorMap, ThrowableError, InferSchemaInput, InferSchemaOutput } from '@orpc/contract';
-import { C as Context, a as Procedure, L as Lazyable, M as MergedContext } from './server.BEdOJs6S.mjs';
+import { C as Context, a as Procedure, L as Lazyable, M as MergedContext } from './server.BWhT-63L.mjs';
 
 type Router<TInitialContext extends Context> = Procedure<TInitialContext, any, any, any, any> | {
     [k: string]: Lazyable<Router<TInitialContext>>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "2.0.0-beta.43",
+  "version": "2.0.0-beta.45",
   "description": "Build typesafe APIs with oRPC: RPC and OpenAPI support, middleware, and adapters for Node.js, Bun, Deno, Fetch, Fastify, WebSocket, AWS Lambda, and more",
   "license": "MIT",
   "funding": [
@@ -117,23 +117,23 @@
     }
   },
   "dependencies": {
-    "@orpc/client": "2.0.0-beta.43",
-    "@orpc/contract": "2.0.0-beta.43",
-    "@orpc/shared": "2.0.0-beta.43",
-    "@standard-server/aws-lambda": "~0.10.2",
-    "@standard-server/core": "~0.10.2",
-    "@standard-server/fastify": "~0.10.2",
-    "@standard-server/fetch": "~0.10.2",
-    "@standard-server/node": "~0.10.2",
-    "@standard-server/peer": "~0.10.2",
+    "@orpc/client": "2.0.0-beta.45",
+    "@orpc/contract": "2.0.0-beta.45",
+    "@orpc/shared": "2.0.0-beta.45",
+    "@standard-server/aws-lambda": "~0.11.0",
+    "@standard-server/core": "~0.11.0",
+    "@standard-server/fastify": "~0.11.0",
+    "@standard-server/fetch": "~0.11.0",
+    "@standard-server/node": "~0.11.0",
+    "@standard-server/peer": "~0.11.0",
     "cookie": "^2.0.1"
   },
   "devDependencies": {
-    "crossws": "^0.4.6",
-    "fastify": "^5.12.1",
-    "supertest": "^7.2.2",
-    "ws": "^8.21.3",
-    "zod": "^4.5.4"
+    "crossws": "^0.4.15",
+    "fastify": "^5.12.7",
+    "supertest": "^7.3.1",
+    "ws": "^8.22.0",
+    "zod": "^4.6.7"
   },
   "scripts": {
     "type:check": "tsc -b"