@orpc/server 0.0.0-next.fea68c1 → 0.0.0-next.ff68fdb

package/dist/{index.js → index.mjs}

@@ -1,35 +1,15 @@
-import {
-  LAZY_LOADER_SYMBOL,
-  Procedure,
-  adaptRouter,
-  addMiddleware,
-  convertPathToHttpPath,
-  createAccessibleLazyRouter,
-  createContractedProcedure,
-  createLazyProcedureFormAnyLazy,
-  createProcedureClient,
-  deepSetLazyRouterPrefix,
-  eachAllContractProcedure,
-  eachContractProcedure,
-  flatLazy,
-  getLazyRouterPrefix,
-  getRouterChild,
-  getRouterContract,
-  isLazy,
-  isProcedure,
-  lazy,
-  middlewareOutputFn,
-  setRouterContract,
-  unlazy
-} from "./chunk-MHVECKBC.js";
+import { mergeErrorMap, mergeMeta, mergeRoute, mergePrefix, mergeTags, isContractProcedure, getContractRouter } from '@orpc/contract';
+export { ValidationError, eventIterator, type } from '@orpc/contract';
+import { P as Procedure, d as addMiddleware, c as createProcedureClient, e as enhanceRouter, l as lazy, s as setHiddenRouterContract, i as isProcedure, f as isLazy, h as createAssertedLazyProcedure, g as getRouter } from './shared/server.B_5ZADvP.mjs';
+export { L as LAZY_SYMBOL, p as call, r as createAccessibleLazyRouter, b as createContractedProcedure, j as createORPCErrorConstructorMap, q as getHiddenRouterContract, k as getLazyMeta, n as isStartWithMiddlewares, o as mergeMiddlewares, m as middlewareOutputFn, w as resolveContractProcedures, a as toHttpPath, t as traverseContractProcedures, u as unlazy, x as unlazyRouter, v as validateORPCError } from './shared/server.B_5ZADvP.mjs';
+export { ORPCError, isDefinedError, safe } from '@orpc/client';
+export { onError, onFinish, onStart, onSuccess } from '@orpc/shared';
+export { getEventMeta, withEventMeta } from '@orpc/standard-server';
 
-// src/builder.ts
-import { mergeErrorMap as mergeErrorMap2, mergeMeta as mergeMeta2, mergePrefix, mergeRoute as mergeRoute2, mergeTags } from "@orpc/contract";
-
-// src/config.ts
-var DEFAULT_CONFIG = {
+const DEFAULT_CONFIG = {
   initialInputValidationIndex: 0,
-  initialOutputValidationIndex: 0
+  initialOutputValidationIndex: 0,
+  dedupeLeadingMiddlewares: true
 };
 function fallbackConfig(key, value) {
   if (value === void 0) {
@@ -38,9 +18,8 @@ function fallbackConfig(key, value) {
   return value;
 }
 
-// src/middleware-decorated.ts
 function decorateMiddleware(middleware) {
-  const decorated = middleware;
+  const decorated = (...args) => middleware(...args);
   decorated.mapInput = (mapInput) => {
     const mapped = decorateMiddleware(
       (options, input, ...rest) => middleware(options, mapInput(input), ...rest)
@@ -65,30 +44,28 @@ function decorateMiddleware(middleware) {
   return decorated;
 }
 
-// src/procedure-decorated.ts
-import { mergeErrorMap, mergeMeta, mergeRoute } from "@orpc/contract";
-var DecoratedProcedure = class _DecoratedProcedure extends Procedure {
+class DecoratedProcedure extends Procedure {
   errors(errors) {
-    return new _DecoratedProcedure({
+    return new DecoratedProcedure({
       ...this["~orpc"],
       errorMap: mergeErrorMap(this["~orpc"].errorMap, errors)
     });
   }
   meta(meta) {
-    return new _DecoratedProcedure({
+    return new DecoratedProcedure({
       ...this["~orpc"],
       meta: mergeMeta(this["~orpc"].meta, meta)
     });
   }
   route(route) {
-    return new _DecoratedProcedure({
+    return new DecoratedProcedure({
       ...this["~orpc"],
       route: mergeRoute(this["~orpc"].route, route)
     });
   }
   use(middleware, mapInput) {
     const mapped = mapInput ? decorateMiddleware(middleware).mapInput(mapInput) : middleware;
-    return new _DecoratedProcedure({
+    return new DecoratedProcedure({
       ...this["~orpc"],
       middlewares: addMiddleware(this["~orpc"].middlewares, mapped)
     });
@@ -97,9 +74,13 @@ var DecoratedProcedure = class _DecoratedProcedure extends Procedure {
    * Make this procedure callable (works like a function while still being a procedure).
    */
   callable(...rest) {
-    return Object.assign(createProcedureClient(this, ...rest), {
-      "~type": "Procedure",
-      "~orpc": this["~orpc"]
+    return new Proxy(createProcedureClient(this, ...rest), {
+      get: (target, key) => {
+        return Reflect.has(this, key) ? Reflect.get(this, key) : Reflect.get(target, key);
+      },
+      has: (target, key) => {
+        return Reflect.has(this, key) || Reflect.has(target, key);
+      }
     });
   }
   /**
@@ -108,10 +89,9 @@ var DecoratedProcedure = class _DecoratedProcedure extends Procedure {
   actionable(...rest) {
     return this.callable(...rest);
   }
-};
+}
 
-// src/builder.ts
-var Builder = class _Builder {
+class Builder {
   "~orpc";
   constructor(def) {
     this["~orpc"] = def;
@@ -122,9 +102,10 @@ var Builder = class _Builder {
   $config(config) {
     const inputValidationCount = this["~orpc"].inputValidationIndex - fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex);
     const outputValidationCount = this["~orpc"].outputValidationIndex - fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex);
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
       config,
+      dedupeLeadingMiddlewares: fallbackConfig("dedupeLeadingMiddlewares", config.dedupeLeadingMiddlewares),
       inputValidationIndex: fallbackConfig("initialInputValidationIndex", config.initialInputValidationIndex) + inputValidationCount,
       outputValidationIndex: fallbackConfig("initialOutputValidationIndex", config.initialOutputValidationIndex) + outputValidationCount
     });
@@ -133,7 +114,7 @@ var Builder = class _Builder {
    * Reset initial context
    */
   $context() {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
       middlewares: [],
       inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex),
@@ -144,7 +125,7 @@ var Builder = class _Builder {
    * Reset initial meta
    */
   $meta(initialMeta) {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
       meta: initialMeta
     });
@@ -153,48 +134,54 @@ var Builder = class _Builder {
    * Reset initial route
    */
   $route(initialRoute) {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
       route: initialRoute
     });
   }
+  $input(initialInputSchema) {
+    return new Builder({
+      ...this["~orpc"],
+      inputSchema: initialInputSchema
+    });
+  }
   middleware(middleware) {
     return decorateMiddleware(middleware);
   }
   errors(errors) {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
-      errorMap: mergeErrorMap2(this["~orpc"].errorMap, errors)
+      errorMap: mergeErrorMap(this["~orpc"].errorMap, errors)
     });
   }
   use(middleware, mapInput) {
     const mapped = mapInput ? decorateMiddleware(middleware).mapInput(mapInput) : middleware;
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
       middlewares: addMiddleware(this["~orpc"].middlewares, mapped)
     });
   }
   meta(meta) {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
-      meta: mergeMeta2(this["~orpc"].meta, meta)
+      meta: mergeMeta(this["~orpc"].meta, meta)
     });
   }
   route(route) {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
-      route: mergeRoute2(this["~orpc"].route, route)
+      route: mergeRoute(this["~orpc"].route, route)
     });
   }
   input(schema) {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
       inputSchema: schema,
       inputValidationIndex: fallbackConfig("initialInputValidationIndex", this["~orpc"].config.initialInputValidationIndex) + this["~orpc"].middlewares.length
     });
   }
   output(schema) {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
       outputSchema: schema,
       outputValidationIndex: fallbackConfig("initialOutputValidationIndex", this["~orpc"].config.initialOutputValidationIndex) + this["~orpc"].middlewares.length
@@ -207,43 +194,39 @@ var Builder = class _Builder {
     });
   }
   prefix(prefix) {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
       prefix: mergePrefix(this["~orpc"].prefix, prefix)
     });
   }
   tag(...tags) {
-    return new _Builder({
+    return new Builder({
       ...this["~orpc"],
       tags: mergeTags(this["~orpc"].tags, tags)
     });
   }
   router(router) {
-    return adaptRouter(router, this["~orpc"]);
+    return enhanceRouter(router, this["~orpc"]);
   }
   lazy(loader) {
-    return adaptRouter(flatLazy(lazy(loader)), this["~orpc"]);
+    return enhanceRouter(lazy(loader), this["~orpc"]);
   }
-};
-var os = new Builder({
+}
+const os = new Builder({
   config: {},
   route: {},
   meta: {},
   errorMap: {},
-  inputSchema: void 0,
-  outputSchema: void 0,
   inputValidationIndex: fallbackConfig("initialInputValidationIndex"),
   outputValidationIndex: fallbackConfig("initialOutputValidationIndex"),
-  middlewares: []
+  middlewares: [],
+  dedupeLeadingMiddlewares: true
 });
 
-// src/context.ts
-function mergeContext(context, other) {
+function mergeCurrentContext(context, other) {
   return { ...context, ...other };
 }
 
-// src/implementer.ts
-import { isContractProcedure } from "@orpc/contract";
 function implementerInternal(contract, config, middlewares) {
   if (isContractProcedure(contract)) {
     const impl2 = new Builder({
@@ -251,12 +234,16 @@ function implementerInternal(contract, config, middlewares) {
       config,
       middlewares,
       inputValidationIndex: fallbackConfig("initialInputValidationIndex", config?.initialInputValidationIndex) + middlewares.length,
-      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", config?.initialOutputValidationIndex) + middlewares.length
+      outputValidationIndex: fallbackConfig("initialOutputValidationIndex", config?.initialOutputValidationIndex) + middlewares.length,
+      dedupeLeadingMiddlewares: fallbackConfig("dedupeLeadingMiddlewares", config.dedupeLeadingMiddlewares)
     });
     return impl2;
   }
   const impl = new Proxy(contract, {
     get: (target, key) => {
+      if (typeof key !== "string") {
+        return Reflect.get(target, key);
+      }
       let method;
       if (key === "middleware") {
         method = (mid) => decorateMiddleware(mid);
@@ -270,23 +257,29 @@ function implementerInternal(contract, config, middlewares) {
         };
       } else if (key === "router") {
         method = (router) => {
-          const adapted = adaptRouter(router, {
+          const adapted = enhanceRouter(router, {
             middlewares,
-            errorMap: {}
+            errorMap: {},
+            prefix: void 0,
+            tags: void 0,
+            dedupeLeadingMiddlewares: fallbackConfig("dedupeLeadingMiddlewares", config.dedupeLeadingMiddlewares)
           });
-          return setRouterContract(adapted, contract);
+          return setHiddenRouterContract(adapted, contract);
         };
       } else if (key === "lazy") {
         method = (loader) => {
-          const adapted = adaptRouter(flatLazy(lazy(loader)), {
+          const adapted = enhanceRouter(lazy(loader), {
             middlewares,
-            errorMap: {}
+            errorMap: {},
+            prefix: void 0,
+            tags: void 0,
+            dedupeLeadingMiddlewares: fallbackConfig("dedupeLeadingMiddlewares", config.dedupeLeadingMiddlewares)
           });
-          return setRouterContract(adapted, contract);
+          return setHiddenRouterContract(adapted, contract);
         };
       }
-      const next = Reflect.get(target, key);
-      if (!next || typeof next !== "function" && typeof next !== "object") {
+      const next = getContractRouter(target, [key]);
+      if (!next) {
         return method ?? next;
       }
       const nextImpl = implementerInternal(next, config, middlewares);
@@ -313,44 +306,34 @@ function implement(contract, config = {}) {
         method = (config2) => implement(contract, config2);
       }
       const next = Reflect.get(target, key);
-      if (!next || typeof next !== "function" && typeof next !== "object") {
-        return method ?? next;
-      }
-      if (method) {
-        return new Proxy(method, {
-          get(_, key2) {
-            return Reflect.get(next, key2);
-          }
-        });
+      if (!method || !next || typeof next !== "function" && typeof next !== "object") {
+        return method || next;
       }
-      return next;
+      return new Proxy(method, {
+        get(_, key2) {
+          return Reflect.get(next, key2);
+        }
+      });
     }
   });
   return impl;
 }
 
-// src/procedure-utils.ts
-function call(procedure, input, ...rest) {
-  return createProcedureClient(procedure, ...rest)(input);
-}
-
-// src/router-client.ts
-function createRouterClient(router, ...rest) {
+function createRouterClient(router, ...[options]) {
   if (isProcedure(router)) {
-    const caller = createProcedureClient(router, ...rest);
+    const caller = createProcedureClient(router, options);
     return caller;
   }
-  const procedureCaller = isLazy(router) ? createProcedureClient(createLazyProcedureFormAnyLazy(router), ...rest) : {};
+  const procedureCaller = isLazy(router) ? createProcedureClient(createAssertedLazyProcedure(router), options) : {};
   const recursive = new Proxy(procedureCaller, {
     get(target, key) {
       if (typeof key !== "string") {
         return Reflect.get(target, key);
       }
-      const next = getRouterChild(router, key);
+      const next = getRouter(router, [key]);
       if (!next) {
         return Reflect.get(target, key);
       }
-      const [options] = rest;
       return createRouterClient(next, {
         ...options,
         path: [...options?.path ?? [], key]
@@ -360,54 +343,4 @@ function createRouterClient(router, ...rest) {
   return recursive;
 }
 
-// src/index.ts
-import { isDefinedError, ORPCError, safe } from "@orpc/client";
-import { eventIterator, type, ValidationError } from "@orpc/contract";
-import { onError, onFinish, onStart, onSuccess } from "@orpc/shared";
-import { getEventMeta, withEventMeta } from "@orpc/standard-server";
-export {
-  Builder,
-  DecoratedProcedure,
-  LAZY_LOADER_SYMBOL,
-  ORPCError,
-  Procedure,
-  ValidationError,
-  adaptRouter,
-  call,
-  convertPathToHttpPath,
-  createAccessibleLazyRouter,
-  createContractedProcedure,
-  createLazyProcedureFormAnyLazy,
-  createProcedureClient,
-  createRouterClient,
-  decorateMiddleware,
-  deepSetLazyRouterPrefix,
-  eachAllContractProcedure,
-  eachContractProcedure,
-  eventIterator,
-  fallbackConfig,
-  flatLazy,
-  getEventMeta,
-  getLazyRouterPrefix,
-  getRouterChild,
-  getRouterContract,
-  implement,
-  implementerInternal,
-  isDefinedError,
-  isLazy,
-  isProcedure,
-  lazy,
-  mergeContext,
-  middlewareOutputFn,
-  onError,
-  onFinish,
-  onStart,
-  onSuccess,
-  os,
-  safe,
-  setRouterContract,
-  type,
-  unlazy,
-  withEventMeta
-};
-//# sourceMappingURL=index.js.map
+export { Builder, DecoratedProcedure, Procedure, addMiddleware, createAssertedLazyProcedure, createProcedureClient, createRouterClient, decorateMiddleware, enhanceRouter, fallbackConfig, getRouter, implement, implementerInternal, isLazy, isProcedure, lazy, mergeCurrentContext, os, setHiddenRouterContract };

package/dist/plugins/index.d.mts

@@ -0,0 +1,31 @@
+import { a as StandardHandlerInterceptorOptions, H as HandlerPlugin, b as StandardHandlerOptions } from '../shared/server.CL84X8p4.mjs';
+export { C as CompositePlugin } from '../shared/server.CL84X8p4.mjs';
+import { Value } from '@orpc/shared';
+import { C as Context } from '../shared/server.DnmJuN02.mjs';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client';
+
+interface CORSOptions<TContext extends Context> {
+    origin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>;
+    timingOrigin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>;
+    allowMethods?: readonly string[];
+    allowHeaders?: readonly string[];
+    maxAge?: number;
+    credentials?: boolean;
+    exposeHeaders?: readonly string[];
+}
+declare class CORSPlugin<TContext extends Context> implements HandlerPlugin<TContext> {
+    private readonly options;
+    constructor(options?: CORSOptions<TContext>);
+    init(options: StandardHandlerOptions<TContext>): void;
+}
+
+interface ResponseHeadersPluginContext {
+    resHeaders?: Headers;
+}
+declare class ResponseHeadersPlugin<TContext extends ResponseHeadersPluginContext & Context> implements HandlerPlugin<TContext> {
+    init(options: StandardHandlerOptions<TContext>): void;
+}
+
+export { type CORSOptions, CORSPlugin, HandlerPlugin, ResponseHeadersPlugin, type ResponseHeadersPluginContext };

package/dist/plugins/index.d.ts

@@ -0,0 +1,31 @@
+import { a as StandardHandlerInterceptorOptions, H as HandlerPlugin, b as StandardHandlerOptions } from '../shared/server.hqPWnakL.js';
+export { C as CompositePlugin } from '../shared/server.hqPWnakL.js';
+import { Value } from '@orpc/shared';
+import { C as Context } from '../shared/server.DnmJuN02.js';
+import '@orpc/contract';
+import '@orpc/standard-server';
+import '@orpc/client';
+
+interface CORSOptions<TContext extends Context> {
+    origin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>;
+    timingOrigin?: Value<string | readonly string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>;
+    allowMethods?: readonly string[];
+    allowHeaders?: readonly string[];
+    maxAge?: number;
+    credentials?: boolean;
+    exposeHeaders?: readonly string[];
+}
+declare class CORSPlugin<TContext extends Context> implements HandlerPlugin<TContext> {
+    private readonly options;
+    constructor(options?: CORSOptions<TContext>);
+    init(options: StandardHandlerOptions<TContext>): void;
+}
+
+interface ResponseHeadersPluginContext {
+    resHeaders?: Headers;
+}
+declare class ResponseHeadersPlugin<TContext extends ResponseHeadersPluginContext & Context> implements HandlerPlugin<TContext> {
+    init(options: StandardHandlerOptions<TContext>): void;
+}
+
+export { type CORSOptions, CORSPlugin, HandlerPlugin, ResponseHeadersPlugin, type ResponseHeadersPluginContext };

package/dist/{chunk-TXHKQO7N.js → plugins/index.mjs}

@@ -1,20 +1,9 @@
-// src/plugins/base.ts
-var CompositePlugin = class {
-  constructor(plugins = []) {
-    this.plugins = plugins;
-  }
-  init(options) {
-    for (const plugin of this.plugins) {
-      plugin.init?.(options);
-    }
-  }
-};
+export { C as CompositePlugin } from '../shared/server.Q6ZmnTgO.mjs';
+import { value } from '@orpc/shared';
 
-// src/plugins/cors.ts
-import { value } from "@orpc/shared";
-var CORSPlugin = class {
+class CORSPlugin {
   options;
-  constructor(options) {
+  constructor(options = {}) {
     const defaults = {
       origin: (origin) => origin,
       allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH"]
@@ -84,10 +73,9 @@ var CORSPlugin = class {
       return result;
     });
   }
-};
+}
 
-// src/plugins/response-headers.ts
-var ResponseHeadersPlugin = class {
+class ResponseHeadersPlugin {
   init(options) {
     options.rootInterceptors ??= [];
     options.rootInterceptors.push(async (interceptorOptions) => {
@@ -98,23 +86,18 @@ var ResponseHeadersPlugin = class {
         return result;
       }
       const responseHeaders = result.response.headers;
-      for (const [key, value2] of headers) {
+      for (const [key, value] of headers) {
         if (Array.isArray(responseHeaders[key])) {
-          responseHeaders[key].push(value2);
+          responseHeaders[key].push(value);
         } else if (responseHeaders[key] !== void 0) {
-          responseHeaders[key] = [responseHeaders[key], value2];
+          responseHeaders[key] = [responseHeaders[key], value];
         } else {
-          responseHeaders[key] = value2;
+          responseHeaders[key] = value;
         }
       }
       return result;
     });
   }
-};
+}
 
-export {
-  CompositePlugin,
-  CORSPlugin,
-  ResponseHeadersPlugin
-};
-//# sourceMappingURL=chunk-TXHKQO7N.js.map
+export { CORSPlugin, ResponseHeadersPlugin };

package/dist/{chunk-NTHCS5CK.js → shared/server.3mOimouH.mjs}

@@ -1,21 +1,10 @@
-import {
-  convertPathToHttpPath,
-  createContractedProcedure,
-  createProcedureClient,
-  eachContractProcedure,
-  getRouterChild,
-  isProcedure,
-  unlazy
-} from "./chunk-MHVECKBC.js";
-import {
-  CompositePlugin
-} from "./chunk-TXHKQO7N.js";
+import { ORPCError, toORPCError } from '@orpc/client';
+import { intercept, trim, parseEmptyableJSON } from '@orpc/shared';
+import { C as CompositePlugin } from './server.Q6ZmnTgO.mjs';
+import { c as createProcedureClient, t as traverseContractProcedures, a as toHttpPath, i as isProcedure, u as unlazy, g as getRouter, b as createContractedProcedure } from './server.B_5ZADvP.mjs';
 
-// src/adapters/standard/handler.ts
-import { ORPCError, toORPCError } from "@orpc/client";
-import { intercept, trim } from "@orpc/shared";
-var StandardHandler = class {
-  constructor(router, matcher, codec, options = {}) {
+class StandardHandler {
+  constructor(router, matcher, codec, options) {
     this.matcher = matcher;
     this.codec = codec;
     this.options = options;
@@ -78,15 +67,11 @@ var StandardHandler = class {
       }
     );
   }
-};
+}
 
-// src/adapters/standard/rpc-codec.ts
-import { RPCSerializer } from "@orpc/client/rpc";
-import { parseEmptyableJSON } from "@orpc/shared";
-var RPCCodec = class {
-  serializer;
-  constructor(options = {}) {
-    this.serializer = options.serializer ?? new RPCSerializer();
+class RPCCodec {
+  constructor(serializer) {
+    this.serializer = serializer;
   }
   async decode(request, _params, _procedure) {
     const serialized = request.method === "GET" ? parseEmptyableJSON(request.url.searchParams.getAll("data").at(-1)) : await request.body();
@@ -106,18 +91,14 @@ var RPCCodec = class {
       body: this.serializer.serialize(error.toJSON())
     };
   }
-};
+}
 
-// src/adapters/standard/rpc-matcher.ts
-var RPCMatcher = class {
+class RPCMatcher {
   tree = {};
   pendingRouters = [];
   init(router, path = []) {
-    const laziedOptions = eachContractProcedure({
-      router,
-      path
-    }, ({ path: path2, contract }) => {
-      const httpPath = convertPathToHttpPath(path2);
+    const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
+      const httpPath = toHttpPath(path2);
       if (isProcedure(contract)) {
         this.tree[httpPath] = {
           path: path2,
@@ -137,7 +118,7 @@ var RPCMatcher = class {
     });
     this.pendingRouters.push(...laziedOptions.map((option) => ({
       ...option,
-      httpPathPrefix: convertPathToHttpPath(option.path)
+      httpPathPrefix: toHttpPath(option.path)
     })));
   }
   async match(_method, pathname) {
@@ -145,7 +126,7 @@ var RPCMatcher = class {
       const newPendingRouters = [];
       for (const pendingRouter of this.pendingRouters) {
         if (pathname.startsWith(pendingRouter.httpPathPrefix)) {
-          const { default: router } = await unlazy(pendingRouter.lazied);
+          const { default: router } = await unlazy(pendingRouter.router);
           this.init(router, pendingRouter.path);
         } else {
           newPendingRouters.push(pendingRouter);
@@ -158,25 +139,20 @@ var RPCMatcher = class {
       return void 0;
     }
     if (!match.procedure) {
-      const { default: maybeProcedure } = await unlazy(getRouterChild(match.router, ...match.path));
+      const { default: maybeProcedure } = await unlazy(getRouter(match.router, match.path));
       if (!isProcedure(maybeProcedure)) {
         throw new Error(`
-          [Contract-First] Missing or invalid implementation for procedure at path: ${convertPathToHttpPath(match.path)}.
+          [Contract-First] Missing or invalid implementation for procedure at path: ${toHttpPath(match.path)}.
           Ensure that the procedure is correctly defined and matches the expected contract.
         `);
       }
-      match.procedure = createContractedProcedure(match.contract, maybeProcedure);
+      match.procedure = createContractedProcedure(maybeProcedure, match.contract);
     }
     return {
       path: match.path,
       procedure: match.procedure
     };
   }
-};
+}
 
-export {
-  StandardHandler,
-  RPCCodec,
-  RPCMatcher
-};
-//# sourceMappingURL=chunk-NTHCS5CK.js.map
+export { RPCCodec as R, StandardHandler as S, RPCMatcher as a };