@temporary-name/server 1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3 → 1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f

package/dist/shared/{server.CjkiSCui.mjs → server.CHV9AQHl.mjs}

@@ -269,14 +269,16 @@ function createProcedureClient(lazyableProcedure, ...rest) {
           {
             context,
             input,
-            // input only optional when it undefinable so we can safely cast it
             errors,
             path,
             procedure,
             signal: callerOptions?.signal,
             lastEventId: callerOptions?.lastEventId
           },
-          (interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
+          (interceptorOptions) => {
+            const { input: input2, ...opts } = interceptorOptions;
+            return executeProcedureInternal(interceptorOptions.procedure, input2, opts);
+          }
         );
       });
       if (isAsyncIteratorObject(output)) {
@@ -304,30 +306,44 @@ function createProcedureClient(lazyableProcedure, ...rest) {
   };
 }
 async function validateInput(procedure, input) {
-  const schema = procedure["~orpc"].inputSchema;
-  if (!schema) {
-    return input;
-  }
+  const schemas = procedure["~orpc"].schemas;
   return runWithSpan({ name: "validate_input" }, async () => {
-    const result = await safeParseAsync(schema, input);
-    if (!result.success) {
+    const resultBody = await safeParseAsync(schemas.bodySchema, input.body);
+    const resultPath = await safeParseAsync(schemas.pathSchema, input.path);
+    const resultQuery = await safeParseAsync(schemas.querySchema, input.query);
+    const issues = [];
+    if (!resultBody.success) {
+      issues.push(...resultBody.error.issues.map((i) => ({ ...i, path: ["body", ...i.path] })));
+    }
+    if (!resultPath.success) {
+      issues.push(...resultPath.error.issues.map((i) => ({ ...i, path: ["path", ...i.path] })));
+    }
+    if (!resultQuery.success) {
+      issues.push(...resultQuery.error.issues.map((i) => ({ ...i, path: ["query", ...i.path] })));
+    }
+    if (issues.length > 0) {
       throw new ORPCError("BAD_REQUEST", {
         message: "Input validation failed",
         data: {
-          issues: result.error.issues
+          issues
         },
         cause: new ValidationError({
           message: "Input validation failed",
-          issues: result.error.issues,
+          issues,
           data: input
         })
       });
     }
-    return result.data;
+    const results = {
+      body: resultBody.data,
+      path: resultPath.data,
+      query: resultQuery.data
+    };
+    return results;
   });
 }
 async function validateOutput(procedure, output) {
-  const schema = procedure["~orpc"].outputSchema;
+  const schema = procedure["~orpc"].schemas.outputSchema;
   if (!schema) {
     return output;
   }
@@ -346,7 +362,7 @@ async function validateOutput(procedure, output) {
     return result.data;
   });
 }
-async function executeProcedureInternal(procedure, options) {
+async function executeProcedureInternal(procedure, input, options) {
   const middlewares = procedure["~orpc"].middlewares;
   const inputValidationIndex = Math.min(
     Math.max(0, procedure["~orpc"].inputValidationIndex),
@@ -356,8 +372,8 @@ async function executeProcedureInternal(procedure, options) {
     Math.max(0, procedure["~orpc"].outputValidationIndex),
     middlewares.length
   );
-  const next = async (index, context, input) => {
-    let currentInput = input;
+  const next = async (index, context, input2) => {
+    let currentInput = input2;
     if (index === inputValidationIndex) {
       currentInput = await validateInput(procedure, currentInput);
     }
@@ -383,14 +399,14 @@ async function executeProcedureInternal(procedure, options) {
       return result.output;
     }) : await runWithSpan(
       { name: "handler", signal: options.signal },
-      () => procedure["~orpc"].handler({ ...options, context, input: currentInput })
+      () => procedure["~orpc"].handler(currentInput, { ...options, context })
     );
     if (index === outputValidationIndex) {
       return await validateOutput(procedure, output);
     }
     return output;
   };
-  return next(0, options.context, options.input);
+  return next(0, options.context, input);
 }
 
 export { LAZY_SYMBOL as L, Procedure as P, addMiddleware as a, isLazy as b, createProcedureClient as c, getRouter as d, enhanceRouter as e, createORPCErrorConstructorMap as f, getLazyMeta as g, lazy as h, isProcedure as i, middlewareOutputFn as j, isStartWithMiddlewares as k, lazyInternal as l, mergeCurrentContext as m, mergeMiddlewares as n, getHiddenRouterContract as o, createAccessibleLazyRouter as p, unlazyRouter as q, resolveContractProcedures as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u };

package/dist/shared/{server.C-tNYmY_.d.ts → server.CdeqmULw.d.ts}

@@ -1,7 +1,7 @@
 import { Meta } from '@temporary-name/contract';
 import { HTTPPath, Interceptor } from '@temporary-name/shared';
 import { StandardLazyRequest, StandardResponse } from '@temporary-name/standard-server';
-import { C as Context, R as Router, H as ProcedureClientInterceptorOptions } from './server.WsFQIubj.js';
+import { C as Context, R as Router, H as ProcedureClientInterceptorOptions } from './server.DecvGKtb.js';
 
 interface StandardHandlerPlugin<T extends Context> {
     order?: number;

package/dist/shared/{server.DdHBdcen.mjs → server.Cn7WsRHl.mjs}

@@ -1,26 +1,18 @@
-import { isObject, stringifyJSON, isORPCErrorStatus, tryDecodeURIComponent, toHttpPath, toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, ORPCError, toORPCError } from '@temporary-name/shared';
+import { stringifyJSON, isObject, isORPCErrorStatus, tryDecodeURIComponent, toHttpPath, toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, ORPCError, toORPCError } from '@temporary-name/shared';
 import { flattenHeader } from '@temporary-name/standard-server';
-import { c as createProcedureClient } from './server.CjkiSCui.mjs';
-import { fallbackContractConfig } from '@temporary-name/contract';
-import { d as deserialize, s as serialize, b as bracketNotationDeserialize, a as standardizeHTTPPath } from './server.Kxw442A9.mjs';
+import { c as createProcedureClient } from './server.CHV9AQHl.mjs';
+import { fallbackContractConfig, standardizeHTTPPath } from '@temporary-name/contract';
+import { d as deserialize, b as bracketNotationDeserialize, s as serialize } from './server.JtIZ8YG7.mjs';
 import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@temporary-name/server';
 import { createRouter, addRoute, findRoute } from 'rou3';
 
 async function decode(request, pathParams) {
-  const deserializeSearchParams = () => {
-    return bracketNotationDeserialize(Array.from(request.url.searchParams.entries()));
+  return {
+    path: pathParams ?? {},
+    query: bracketNotationDeserialize(Array.from(request.url.searchParams.entries())),
+    headers: request.headers,
+    body: deserialize(await request.body()) ?? {}
   };
-  const data = request.method === "GET" ? deserializeSearchParams() : deserialize(await request.body());
-  if (data === void 0) {
-    return pathParams;
-  }
-  if (isObject(data)) {
-    return {
-      ...pathParams,
-      ...data
-    };
-  }
-  return data;
 }
 function encode(output, procedure) {
   const successStatus = fallbackContractConfig(
@@ -214,12 +206,12 @@ class StandardHandler {
               span?.setAttribute("rpc.system", ORPC_NAME);
               span?.setAttribute("rpc.method", match.path.join("."));
               step = "decode_input";
-              let input = await runWithSpan({ name: "decode_input" }, () => decode(request2, match.params));
+              const input = await runWithSpan({ name: "decode_input" }, () => decode(request2, match.params));
               step = void 0;
-              if (isAsyncIteratorObject(input)) {
-                input = asyncIteratorWithSpan(
+              if (isAsyncIteratorObject(input.body)) {
+                input.body = asyncIteratorWithSpan(
                   { name: "consume_event_iterator_input", signal: request2.signal },
-                  input
+                  input.body
                 );
               }
               const client = createProcedureClient(match.procedure, {

package/dist/shared/{server.BYnDyuDL.d.mts → server.DHezmW6C.d.mts}

@@ -1,6 +1,6 @@
 import { HTTPPath } from '@temporary-name/shared';
-import { C as Context } from './server.WsFQIubj.mjs';
-import { c as StandardHandleOptions } from './server.BlJrjUA9.mjs';
+import { C as Context } from './server.DecvGKtb.mjs';
+import { c as StandardHandleOptions } from './server.BCcLYvdF.mjs';
 
 type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: T;

package/dist/shared/{server.JI4dqTgD.d.ts → server.Da-qLzdU.d.ts}

@@ -1,6 +1,6 @@
 import { HTTPPath } from '@temporary-name/shared';
-import { C as Context } from './server.WsFQIubj.js';
-import { c as StandardHandleOptions } from './server.C-tNYmY_.js';
+import { C as Context } from './server.DecvGKtb.js';
+import { c as StandardHandleOptions } from './server.CdeqmULw.js';
 
 type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: T;

package/dist/shared/{server.WsFQIubj.d.mts → server.DecvGKtb.d.mts}

@@ -1,4 +1,4 @@
-import { ErrorMap, ErrorMapItem, InferSchemaInput, AnySchema, Meta, ContractProcedureDef, AnyContractRouter, ContractProcedure, InferSchemaOutput, EnhanceRouteOptions, MergedErrorMap, AnyContractProcedure, ContractRouter, ErrorFromErrorMap } from '@temporary-name/contract';
+import { ErrorMap, ErrorMapItem, InferSchemaInput, Schemas, Meta, ContractProcedureDef, AnyContractRouter, ContractProcedure, InferProcedureClientInputs, InferSchemaOutput, EnhanceRouteOptions, MergedErrorMap, AnyContractProcedure, ContractRouter, AnySchema, ErrorFromErrorMap } from '@temporary-name/contract';
 import { ORPCErrorCode, MaybeOptionalOptions, ORPCErrorOptions, ORPCError, Promisable, HTTPPath, ClientContext, Interceptor, PromiseWithError, Value, Client } from '@temporary-name/shared';
 
 type Context = Record<PropertyKey, any>;
@@ -13,19 +13,22 @@ type ORPCErrorConstructorMap<T extends ErrorMap> = {
 };
 declare function createORPCErrorConstructorMap<T extends ErrorMap>(errors: T): ORPCErrorConstructorMap<T>;
 
-interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
+interface ProcedureHandlerOptions<TCurrentContext extends Context, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
     context: TCurrentContext;
-    input: TInput;
     path: readonly string[];
-    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
+    procedure: Procedure<Context, Context, Schemas, ErrorMap, TMeta>;
     signal?: AbortSignal;
     lastEventId: string | undefined;
     errors: TErrorConstructorMap;
 }
-interface ProcedureHandler<TCurrentContext extends Context, TInput, THandlerOutput, TErrorMap extends ErrorMap, TMeta extends Meta> {
-    (opt: ProcedureHandlerOptions<TCurrentContext, TInput, ORPCErrorConstructorMap<TErrorMap>, TMeta>): Promisable<THandlerOutput>;
+interface ProcedureHandler<TCurrentContext extends Context, TInput extends {
+    path: any;
+    query: any;
+    body: any;
+}, THandlerOutput, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    (input: TInput, opt: ProcedureHandlerOptions<TCurrentContext, ORPCErrorConstructorMap<TErrorMap>, TMeta>): Promisable<THandlerOutput>;
 }
-interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TInputSchema, TOutputSchema, TErrorMap, TMeta> {
+interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends Context, TSchemas extends Schemas, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TSchemas, TErrorMap, TMeta> {
     __initialContext?: (type: TInitialContext) => unknown;
     middlewares: readonly AnyMiddleware[];
     inputValidationIndex: number;
@@ -37,14 +40,14 @@ interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends
  *
  * @see {@link https://orpc.unnoq.com/docs/procedure Procedure Docs}
  */
-declare class Procedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> {
+declare class Procedure<TInitialContext extends Context, TCurrentContext extends Context, TSchemas extends Schemas, TErrorMap extends ErrorMap, TMeta extends Meta> {
     /**
      * This property holds the defined options.
      */
-    '~orpc': ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
-    constructor(def: ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>);
+    '~orpc': ProcedureDef<TInitialContext, TCurrentContext, TSchemas, TErrorMap, TMeta>;
+    constructor(def: ProcedureDef<TInitialContext, TCurrentContext, TSchemas, TErrorMap, TMeta>);
 }
-type AnyProcedure = Procedure<any, any, AnySchema, AnySchema, any, any>;
+type AnyProcedure = Procedure<any, any, Schemas, any, any>;
 declare function isProcedure(item: unknown): item is AnyProcedure;
 
 type MiddlewareResult<TOutContext extends Context, TOutput> = Promisable<{
@@ -65,7 +68,7 @@ interface MiddlewareOutputFn<TOutput> {
 interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
     context: TInContext;
     path: readonly string[];
-    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
+    procedure: Procedure<Context, Context, Schemas, ErrorMap, TMeta>;
     signal?: AbortSignal;
     lastEventId: string | undefined;
     next: MiddlewareNextFn<TOutput>;
@@ -91,7 +94,7 @@ declare function middlewareOutputFn<TOutput>(output: TOutput): MiddlewareResult<
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/contract-first/define-contract#contract-router Contract Router Docs}
  */
-type Router<T extends AnyContractRouter, TInitialContext extends Context> = T extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta> ? Procedure<TInitialContext, any, UInputSchema, UOutputSchema, UErrorMap, UMeta> : {
+type Router<T extends AnyContractRouter, TInitialContext extends Context> = T extends ContractProcedure<infer USchemas, infer UErrorMap, infer UMeta> ? Procedure<TInitialContext, any, USchemas, UErrorMap, UMeta> : {
     [K in keyof T]: T[K] extends AnyContractRouter ? Lazyable<Router<T[K], TInitialContext>> : never;
 };
 type AnyRouter = Router<any, any>;
@@ -102,7 +105,7 @@ type InferRouterInitialContext<T extends AnyRouter> = T extends Router<any, infe
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
  */
-type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, any, any, any, any, any> ? UInitialContext : {
+type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, any, any, any, any> ? UInitialContext : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInitialContexts<U> : never;
 };
 /**
@@ -111,7 +114,7 @@ type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
  */
-type InferRouterCurrentContexts<T extends AnyRouter> = T extends Procedure<any, infer UCurrentContext, any, any, any, any> ? UCurrentContext : {
+type InferRouterCurrentContexts<T extends AnyRouter> = T extends Procedure<any, infer UCurrentContext, any, any, any> ? UCurrentContext : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterCurrentContexts<U> : never;
 };
 /**
@@ -120,7 +123,7 @@ type InferRouterCurrentContexts<T extends AnyRouter> = T extends Procedure<any,
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
  */
-type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infer UInputSchema, any, any, any> ? InferSchemaInput<UInputSchema> : {
+type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infer USchemas, any, any> ? InferProcedureClientInputs<USchemas> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInputs<U> : never;
 };
 /**
@@ -129,7 +132,7 @@ type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infe
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
  */
-type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any, infer UOutputSchema, any, any> ? InferSchemaOutput<UOutputSchema> : {
+type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, infer USchemas, any, any> ? InferSchemaOutput<USchemas['outputSchema']> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
 };
 
@@ -138,7 +141,7 @@ type AccessibleLazyRouter<T extends Lazyable<AnyRouter | undefined>> = T extends
     [K in keyof T]: T[K] extends Lazyable<AnyRouter> ? AccessibleLazyRouter<T[K]> : never;
 };
 declare function createAccessibleLazyRouter<T extends Lazy<AnyRouter | undefined>>(lazied: T): AccessibleLazyRouter<T>;
-type EnhancedRouter<T extends Lazyable<AnyRouter>, TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> = T extends Lazy<infer U extends AnyRouter> ? AccessibleLazyRouter<EnhancedRouter<U, TInitialContext, TCurrentContext, TErrorMap>> : T extends (Procedure<infer UInitialContext, infer UCurrentContext, infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta>) ? Procedure<MergedInitialContext<TInitialContext, UInitialContext, TCurrentContext>, UCurrentContext, UInputSchema, UOutputSchema, MergedErrorMap<TErrorMap, UErrorMap>, UMeta> : {
+type EnhancedRouter<T extends Lazyable<AnyRouter>, TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> = T extends Lazy<infer U extends AnyRouter> ? AccessibleLazyRouter<EnhancedRouter<U, TInitialContext, TCurrentContext, TErrorMap>> : T extends (Procedure<infer UInitialContext, infer UCurrentContext, infer USchemas, infer UErrorMap, infer UMeta>) ? Procedure<MergedInitialContext<TInitialContext, UInitialContext, TCurrentContext>, UCurrentContext, USchemas, MergedErrorMap<TErrorMap, UErrorMap>, UMeta> : {
     [K in keyof T]: T[K] extends Lazyable<AnyRouter> ? EnhancedRouter<T[K], TInitialContext, TCurrentContext, TErrorMap> : never;
 };
 interface EnhanceRouterOptions<TErrorMap extends ErrorMap> extends EnhanceRouteOptions {
@@ -203,13 +206,17 @@ declare function unlazy<T extends Lazyable<any>>(lazied: T): Promise<{
     default: T extends Lazy<infer U> ? U : T;
 }>;
 
-type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> = Client<TClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>;
+type ProcedureClient<TClientContext extends ClientContext, TSchemas extends Schemas, TErrorMap extends ErrorMap> = Client<TClientContext, InferProcedureClientInputs<TSchemas>, InferSchemaOutput<TSchemas['outputSchema']>, ErrorFromErrorMap<TErrorMap>>;
 interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TErrorMap extends ErrorMap, TMeta extends Meta> {
     context: TInitialContext;
-    input: unknown;
+    input: {
+        path: unknown;
+        query: unknown;
+        body: unknown;
+    };
     errors: ORPCErrorConstructorMap<TErrorMap>;
     path: readonly string[];
-    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
+    procedure: Procedure<Context, Context, Schemas, ErrorMap, TMeta>;
     signal?: AbortSignal;
     lastEventId: string | undefined;
 }
@@ -229,7 +236,7 @@ type CreateProcedureClientOptions<TInitialContext extends Context, TOutputSchema
  *
  * @see {@link https://orpc.unnoq.com/docs/client/server-side Server-side Client Docs}
  */
-declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap, TMeta>>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TOutputSchema, TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap>;
+declare function createProcedureClient<TInitialContext extends Context, TSchemas extends Schemas, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TSchemas, TErrorMap, TMeta>>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TSchemas['outputSchema'], TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TSchemas, TErrorMap>;
 
 export { traverseContractProcedures as $, middlewareOutputFn as B, isProcedure as G, createProcedureClient as J, Procedure as P, getRouter as T, createAccessibleLazyRouter as V, enhanceRouter as W, resolveContractProcedures as a0, unlazyRouter as a2, mergeCurrentContext as m, createORPCErrorConstructorMap as n, LAZY_SYMBOL as o, lazyInternal as q, lazy as r, isLazy as s, getLazyMeta as t, unlazy as u };
 export type { AnyMiddleware as A, Context as C, ProcedureHandlerOptions as D, EnhanceRouterOptions as E, ProcedureDef as F, ProcedureClientInterceptorOptions as H, InferRouterInitialContext as I, InferRouterInitialContexts as K, Lazy as L, Middleware as M, InferRouterCurrentContexts as N, ORPCErrorConstructorMap as O, InferRouterInputs as Q, Router as R, InferRouterOutputs as S, AccessibleLazyRouter as U, TraverseContractProceduresOptions as X, TraverseContractProcedureCallbackOptions as Y, ContractProcedureCallbackOptions as Z, LazyTraverseContractProceduresOptions as _, CreateProcedureClientOptions as a, UnlaziedRouter as a1, ProcedureClient as b, MergedInitialContext as c, MergedCurrentContext as d, ProcedureHandler as e, EnhancedRouter as f, MapInputMiddleware as g, AnyProcedure as h, Lazyable as i, AnyRouter as j, ORPCErrorConstructorMapItemOptions as k, ORPCErrorConstructorMapItem as l, LazyMeta as p, MiddlewareResult as v, MiddlewareNextFnOptions as w, MiddlewareNextFn as x, MiddlewareOutputFn as y, MiddlewareOptions as z };

package/dist/shared/{server.WsFQIubj.d.ts → server.DecvGKtb.d.ts}

@@ -1,4 +1,4 @@
-import { ErrorMap, ErrorMapItem, InferSchemaInput, AnySchema, Meta, ContractProcedureDef, AnyContractRouter, ContractProcedure, InferSchemaOutput, EnhanceRouteOptions, MergedErrorMap, AnyContractProcedure, ContractRouter, ErrorFromErrorMap } from '@temporary-name/contract';
+import { ErrorMap, ErrorMapItem, InferSchemaInput, Schemas, Meta, ContractProcedureDef, AnyContractRouter, ContractProcedure, InferProcedureClientInputs, InferSchemaOutput, EnhanceRouteOptions, MergedErrorMap, AnyContractProcedure, ContractRouter, AnySchema, ErrorFromErrorMap } from '@temporary-name/contract';
 import { ORPCErrorCode, MaybeOptionalOptions, ORPCErrorOptions, ORPCError, Promisable, HTTPPath, ClientContext, Interceptor, PromiseWithError, Value, Client } from '@temporary-name/shared';
 
 type Context = Record<PropertyKey, any>;
@@ -13,19 +13,22 @@ type ORPCErrorConstructorMap<T extends ErrorMap> = {
 };
 declare function createORPCErrorConstructorMap<T extends ErrorMap>(errors: T): ORPCErrorConstructorMap<T>;
 
-interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
+interface ProcedureHandlerOptions<TCurrentContext extends Context, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
     context: TCurrentContext;
-    input: TInput;
     path: readonly string[];
-    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
+    procedure: Procedure<Context, Context, Schemas, ErrorMap, TMeta>;
     signal?: AbortSignal;
     lastEventId: string | undefined;
     errors: TErrorConstructorMap;
 }
-interface ProcedureHandler<TCurrentContext extends Context, TInput, THandlerOutput, TErrorMap extends ErrorMap, TMeta extends Meta> {
-    (opt: ProcedureHandlerOptions<TCurrentContext, TInput, ORPCErrorConstructorMap<TErrorMap>, TMeta>): Promisable<THandlerOutput>;
+interface ProcedureHandler<TCurrentContext extends Context, TInput extends {
+    path: any;
+    query: any;
+    body: any;
+}, THandlerOutput, TErrorMap extends ErrorMap, TMeta extends Meta> {
+    (input: TInput, opt: ProcedureHandlerOptions<TCurrentContext, ORPCErrorConstructorMap<TErrorMap>, TMeta>): Promisable<THandlerOutput>;
 }
-interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TInputSchema, TOutputSchema, TErrorMap, TMeta> {
+interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends Context, TSchemas extends Schemas, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TSchemas, TErrorMap, TMeta> {
     __initialContext?: (type: TInitialContext) => unknown;
     middlewares: readonly AnyMiddleware[];
     inputValidationIndex: number;
@@ -37,14 +40,14 @@ interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends
  *
  * @see {@link https://orpc.unnoq.com/docs/procedure Procedure Docs}
  */
-declare class Procedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> {
+declare class Procedure<TInitialContext extends Context, TCurrentContext extends Context, TSchemas extends Schemas, TErrorMap extends ErrorMap, TMeta extends Meta> {
     /**
      * This property holds the defined options.
      */
-    '~orpc': ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
-    constructor(def: ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>);
+    '~orpc': ProcedureDef<TInitialContext, TCurrentContext, TSchemas, TErrorMap, TMeta>;
+    constructor(def: ProcedureDef<TInitialContext, TCurrentContext, TSchemas, TErrorMap, TMeta>);
 }
-type AnyProcedure = Procedure<any, any, AnySchema, AnySchema, any, any>;
+type AnyProcedure = Procedure<any, any, Schemas, any, any>;
 declare function isProcedure(item: unknown): item is AnyProcedure;
 
 type MiddlewareResult<TOutContext extends Context, TOutput> = Promisable<{
@@ -65,7 +68,7 @@ interface MiddlewareOutputFn<TOutput> {
 interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
     context: TInContext;
     path: readonly string[];
-    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
+    procedure: Procedure<Context, Context, Schemas, ErrorMap, TMeta>;
     signal?: AbortSignal;
     lastEventId: string | undefined;
     next: MiddlewareNextFn<TOutput>;
@@ -91,7 +94,7 @@ declare function middlewareOutputFn<TOutput>(output: TOutput): MiddlewareResult<
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/contract-first/define-contract#contract-router Contract Router Docs}
  */
-type Router<T extends AnyContractRouter, TInitialContext extends Context> = T extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta> ? Procedure<TInitialContext, any, UInputSchema, UOutputSchema, UErrorMap, UMeta> : {
+type Router<T extends AnyContractRouter, TInitialContext extends Context> = T extends ContractProcedure<infer USchemas, infer UErrorMap, infer UMeta> ? Procedure<TInitialContext, any, USchemas, UErrorMap, UMeta> : {
     [K in keyof T]: T[K] extends AnyContractRouter ? Lazyable<Router<T[K], TInitialContext>> : never;
 };
 type AnyRouter = Router<any, any>;
@@ -102,7 +105,7 @@ type InferRouterInitialContext<T extends AnyRouter> = T extends Router<any, infe
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
  */
-type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, any, any, any, any, any> ? UInitialContext : {
+type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, any, any, any, any> ? UInitialContext : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInitialContexts<U> : never;
 };
 /**
@@ -111,7 +114,7 @@ type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
  */
-type InferRouterCurrentContexts<T extends AnyRouter> = T extends Procedure<any, infer UCurrentContext, any, any, any, any> ? UCurrentContext : {
+type InferRouterCurrentContexts<T extends AnyRouter> = T extends Procedure<any, infer UCurrentContext, any, any, any> ? UCurrentContext : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterCurrentContexts<U> : never;
 };
 /**
@@ -120,7 +123,7 @@ type InferRouterCurrentContexts<T extends AnyRouter> = T extends Procedure<any,
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
  */
-type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infer UInputSchema, any, any, any> ? InferSchemaInput<UInputSchema> : {
+type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infer USchemas, any, any> ? InferProcedureClientInputs<USchemas> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInputs<U> : never;
 };
 /**
@@ -129,7 +132,7 @@ type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infe
  * @info A procedure is a router too.
  * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
  */
-type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any, infer UOutputSchema, any, any> ? InferSchemaOutput<UOutputSchema> : {
+type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, infer USchemas, any, any> ? InferSchemaOutput<USchemas['outputSchema']> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
 };
 
@@ -138,7 +141,7 @@ type AccessibleLazyRouter<T extends Lazyable<AnyRouter | undefined>> = T extends
     [K in keyof T]: T[K] extends Lazyable<AnyRouter> ? AccessibleLazyRouter<T[K]> : never;
 };
 declare function createAccessibleLazyRouter<T extends Lazy<AnyRouter | undefined>>(lazied: T): AccessibleLazyRouter<T>;
-type EnhancedRouter<T extends Lazyable<AnyRouter>, TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> = T extends Lazy<infer U extends AnyRouter> ? AccessibleLazyRouter<EnhancedRouter<U, TInitialContext, TCurrentContext, TErrorMap>> : T extends (Procedure<infer UInitialContext, infer UCurrentContext, infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta>) ? Procedure<MergedInitialContext<TInitialContext, UInitialContext, TCurrentContext>, UCurrentContext, UInputSchema, UOutputSchema, MergedErrorMap<TErrorMap, UErrorMap>, UMeta> : {
+type EnhancedRouter<T extends Lazyable<AnyRouter>, TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> = T extends Lazy<infer U extends AnyRouter> ? AccessibleLazyRouter<EnhancedRouter<U, TInitialContext, TCurrentContext, TErrorMap>> : T extends (Procedure<infer UInitialContext, infer UCurrentContext, infer USchemas, infer UErrorMap, infer UMeta>) ? Procedure<MergedInitialContext<TInitialContext, UInitialContext, TCurrentContext>, UCurrentContext, USchemas, MergedErrorMap<TErrorMap, UErrorMap>, UMeta> : {
     [K in keyof T]: T[K] extends Lazyable<AnyRouter> ? EnhancedRouter<T[K], TInitialContext, TCurrentContext, TErrorMap> : never;
 };
 interface EnhanceRouterOptions<TErrorMap extends ErrorMap> extends EnhanceRouteOptions {
@@ -203,13 +206,17 @@ declare function unlazy<T extends Lazyable<any>>(lazied: T): Promise<{
     default: T extends Lazy<infer U> ? U : T;
 }>;
 
-type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> = Client<TClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>;
+type ProcedureClient<TClientContext extends ClientContext, TSchemas extends Schemas, TErrorMap extends ErrorMap> = Client<TClientContext, InferProcedureClientInputs<TSchemas>, InferSchemaOutput<TSchemas['outputSchema']>, ErrorFromErrorMap<TErrorMap>>;
 interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TErrorMap extends ErrorMap, TMeta extends Meta> {
     context: TInitialContext;
-    input: unknown;
+    input: {
+        path: unknown;
+        query: unknown;
+        body: unknown;
+    };
     errors: ORPCErrorConstructorMap<TErrorMap>;
     path: readonly string[];
-    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
+    procedure: Procedure<Context, Context, Schemas, ErrorMap, TMeta>;
     signal?: AbortSignal;
     lastEventId: string | undefined;
 }
@@ -229,7 +236,7 @@ type CreateProcedureClientOptions<TInitialContext extends Context, TOutputSchema
  *
  * @see {@link https://orpc.unnoq.com/docs/client/server-side Server-side Client Docs}
  */
-declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap, TMeta>>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TOutputSchema, TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap>;
+declare function createProcedureClient<TInitialContext extends Context, TSchemas extends Schemas, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TSchemas, TErrorMap, TMeta>>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TSchemas['outputSchema'], TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TSchemas, TErrorMap>;
 
 export { traverseContractProcedures as $, middlewareOutputFn as B, isProcedure as G, createProcedureClient as J, Procedure as P, getRouter as T, createAccessibleLazyRouter as V, enhanceRouter as W, resolveContractProcedures as a0, unlazyRouter as a2, mergeCurrentContext as m, createORPCErrorConstructorMap as n, LAZY_SYMBOL as o, lazyInternal as q, lazy as r, isLazy as s, getLazyMeta as t, unlazy as u };
 export type { AnyMiddleware as A, Context as C, ProcedureHandlerOptions as D, EnhanceRouterOptions as E, ProcedureDef as F, ProcedureClientInterceptorOptions as H, InferRouterInitialContext as I, InferRouterInitialContexts as K, Lazy as L, Middleware as M, InferRouterCurrentContexts as N, ORPCErrorConstructorMap as O, InferRouterInputs as Q, Router as R, InferRouterOutputs as S, AccessibleLazyRouter as U, TraverseContractProceduresOptions as X, TraverseContractProcedureCallbackOptions as Y, ContractProcedureCallbackOptions as Z, LazyTraverseContractProceduresOptions as _, CreateProcedureClientOptions as a, UnlaziedRouter as a1, ProcedureClient as b, MergedInitialContext as c, MergedCurrentContext as d, ProcedureHandler as e, EnhancedRouter as f, MapInputMiddleware as g, AnyProcedure as h, Lazyable as i, AnyRouter as j, ORPCErrorConstructorMapItemOptions as k, ORPCErrorConstructorMapItem as l, LazyMeta as p, MiddlewareResult as v, MiddlewareNextFnOptions as w, MiddlewareNextFn as x, MiddlewareOutputFn as y, MiddlewareOptions as z };

package/dist/shared/{server.Kxw442A9.mjs → server.JtIZ8YG7.mjs}

@@ -234,14 +234,4 @@ function deserialize(data) {
   return data;
 }
 
-function standardizeHTTPPath(path) {
-  return `/${path.replace(/\/{2,}/g, "/").replace(/^\/|\/$/g, "")}`;
-}
-function getDynamicParams(path) {
-  return path ? standardizeHTTPPath(path).match(/\/\{[^}]+\}/g)?.map((v) => ({
-    raw: v,
-    name: v.match(/\{\+?([^}]+)\}/)[1]
-  })) : void 0;
-}
-
-export { standardizeHTTPPath as a, bracketNotationDeserialize as b, deserialize as d, getDynamicParams as g, jsonSerialize as j, serialize as s };
+export { bracketNotationDeserialize as b, deserialize as d, jsonSerialize as j, serialize as s };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@temporary-name/server",
   "type": "module",
-  "version": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3",
+  "version": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f",
   "license": "MIT",
   "homepage": "https://www.stainless.com/",
   "repository": {
@@ -73,15 +73,15 @@
     "cookie": "^1.0.2",
     "rou3": "^0.7.7",
     "zod": "^4.1.12",
-    "@temporary-name/contract": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3",
-    "@temporary-name/shared": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3",
-    "@temporary-name/json-schema": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3",
-    "@temporary-name/standard-server": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3",
-    "@temporary-name/standard-server-aws-lambda": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3",
-    "@temporary-name/interop": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3",
-    "@temporary-name/standard-server-fetch": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3",
-    "@temporary-name/zod": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3",
-    "@temporary-name/standard-server-node": "1.9.3-alpha.26612c2cf6a7177d2b500d984d282309d8320ca3"
+    "@temporary-name/interop": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f",
+    "@temporary-name/json-schema": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f",
+    "@temporary-name/standard-server": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f",
+    "@temporary-name/shared": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f",
+    "@temporary-name/standard-server-fetch": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f",
+    "@temporary-name/zod": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f",
+    "@temporary-name/standard-server-node": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f",
+    "@temporary-name/contract": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f",
+    "@temporary-name/standard-server-aws-lambda": "1.9.3-alpha.2d4311b66d2b675b022398c62ddc6fde97c93a6f"
   },
   "devDependencies": {
     "@types/supertest": "^6.0.3",