@orpc/server 2.0.0-beta.33 → 2.0.0-beta.35

package/dist/shared/{server.DtfwuV6U.d.ts → server.BpmUhems.d.mts}

@@ -1,10 +1,10 @@
 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.CwrYlF72.js';
+import { C as Context, a as Procedure, L as Lazyable, M as MergedContext } from './server.BsujoJoF.mjs';
 
-type Router<TInitialContext extends Context> = Procedure<TInitialContext, any, any, any, any, any> | {
+type Router<TInitialContext extends Context> = Procedure<TInitialContext, any, any, any, any> | {
     [k: string]: Lazyable<Router<TInitialContext>>;
 };
-type ContractedRouter<T extends RouterContract, TInitialContext extends Context> = T extends ProcedureContract<infer $InputSchema, infer $OutputSchema, infer $ErrorMap> ? Procedure<TInitialContext, any, $InputSchema, $OutputSchema, $ErrorMap, never> : {
+type ContractedRouter<T extends RouterContract, TInitialContext extends Context> = T extends ProcedureContract<infer $InputSchema, infer $OutputSchema, infer $ErrorMap> ? Procedure<TInitialContext, any, $InputSchema, $OutputSchema, $ErrorMap> : {
     [K in keyof T]: T[K] extends RouterContract ? Lazyable<ContractedRouter<T[K], TInitialContext>> : never;
 };
 type AnyRouter = Router<any>;
@@ -17,7 +17,7 @@ type InferRouterInitialContext<T extends AnyRouter> = T extends Router<infer $>
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-initial-contexts | Router - Infer Router Initial Contexts}
  */
-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;
 };
 /**
@@ -28,7 +28,7 @@ type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-final-contexts | Router - Infer Router Final Contexts}
  */
-type InferRouterFinalContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, infer UInjectedContext, any, any, any, any> ? MergedContext<UInitialContext, UInjectedContext> : {
+type InferRouterFinalContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, infer UInjectedContext, any, any, any> ? MergedContext<UInitialContext, UInjectedContext> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterFinalContexts<U> : never;
 };
 /**
@@ -39,7 +39,7 @@ type InferRouterFinalContexts<T extends AnyRouter> = T extends Procedure<infer U
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-inputs | Router - Infer Router Inputs}
  */
-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 UInputSchema, any, any> ? InferSchemaInput<UInputSchema> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInputs<U> : never;
 };
 /**
@@ -50,7 +50,7 @@ type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infe
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-outputs | Router - Infer Router Outputs}
  */
-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, any, infer UOutputSchema, any> ? InferSchemaOutput<UOutputSchema> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
 };
 /**
@@ -58,7 +58,7 @@ type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-error | Router - Infer Router Error}
  */
-type InferRouterError<T extends AnyRouter> = T extends Procedure<any, any, any, any, infer UErrorMap, infer UReturnedError> ? ORPCErrorFromErrorMap<UErrorMap> | UReturnedError | ThrowableError : {
+type InferRouterError<T extends AnyRouter> = T extends Procedure<any, any, any, any, infer UErrorMap> ? ORPCErrorFromErrorMap<UErrorMap> | ThrowableError : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterError<U> : never;
 }[keyof T];
 /**
@@ -66,7 +66,7 @@ type InferRouterError<T extends AnyRouter> = T extends Procedure<any, any, any,
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-errors | Router - Infer Router Errors}
  */
-type InferRouterErrors<T extends AnyRouter> = T extends Procedure<any, any, any, any, infer UErrorMap, infer UReturnedError> ? ORPCErrorFromErrorMap<UErrorMap> | UReturnedError | ThrowableError : {
+type InferRouterErrors<T extends AnyRouter> = T extends Procedure<any, any, any, any, infer UErrorMap> ? ORPCErrorFromErrorMap<UErrorMap> | ThrowableError : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterErrors<U> : never;
 };
 

package/dist/shared/{server.CwrYlF72.d.ts → server.BsujoJoF.d.mts}

@@ -1,4 +1,4 @@
-import { AnyORPCError, ClientContext, Client } from '@orpc/client';
+import { ClientContext, Client } from '@orpc/client';
 import { ErrorMap, AnyMetaPlugin, ORPCErrorConstructorMap, AnySchema, ProcedureContractDefinition, Meta, InferSchemaOutput, ORPCErrorFromErrorMap, InferSchemaInput } from '@orpc/contract';
 import { MaybeOptionalOptions, Promisable, Interceptor, PromiseWithError, ThrowableError, Value } from '@orpc/shared';
 
@@ -60,7 +60,7 @@ interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput, TErro
     context: TCurrentContext;
     input: TInput;
     path: string[];
-    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, any>;
+    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap>;
     signal?: AbortSignal | undefined;
     lastEventId?: string | undefined;
     errors: TErrorConstructorMap;
@@ -109,32 +109,21 @@ interface ProcedureConfig {
      */
     disableOutputValidation?: boolean | undefined;
 }
-interface ProcedureDefinition<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError> extends ProcedureContractDefinition<TInputSchema, TOutputSchema, TErrorMap>, ProcedureConfig {
+interface ProcedureDefinition<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> extends ProcedureContractDefinition<TInputSchema, TOutputSchema, TErrorMap>, ProcedureConfig {
     __TInitialContext?: (type: TInitialContext) => unknown;
     __TInjectedContext?: (type: TInjectedContext) => unknown;
-    __TReturnedError?: () => TReturnedError;
-    /**
-     * When enabled, errors returned (not thrown) by the handler are passed through as-is,
-     * rather than being transformed into inferrable errors.
-     *
-     * This is intended for the contract-first approach, where the procedure adheres to an
-     * external contract and returned errors should not affect the inferred contract types.
-     *
-     * @default false
-     */
-    opaqueReturnedErrors?: boolean | undefined;
     orderedMiddlewares: OrderedMiddleware[];
     handler: ProcedureHandler<any, any, any, any>;
 }
-declare class Procedure<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError> {
-    '~orpc': ProcedureDefinition<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap, TReturnedError>;
-    constructor(def: ProcedureDefinition<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap, TReturnedError>);
+declare class Procedure<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
+    '~orpc': ProcedureDefinition<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap>;
+    constructor(def: ProcedureDefinition<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap>);
     /**
      * Checks if the given instance satisfies the {@link Procedure} class/interface.
      */
     static [Symbol.hasInstance](instance: unknown): boolean;
 }
-type AnyProcedure = Procedure<any, any, any, any, any, any>;
+type AnyProcedure = Procedure<any, any, any, any, any>;
 
 interface LazyDefinition<T> {
     meta: Meta;
@@ -156,19 +145,19 @@ declare function unlazy<T extends Lazyable<any>>(maybeLazy: T): Promise<{
     default: T extends Lazy<infer U> ? U : T;
 }>;
 
-type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedORPCError extends AnyORPCError> = Client<TClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | TReturnedORPCError | ThrowableError>;
+type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> = Client<TClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | ThrowableError>;
 interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TErrorMap extends ErrorMap> extends ProcedureHandlerOptions<TInitialContext, unknown, ORPCErrorConstructorMap<TErrorMap>> {
 }
-type ProcedureClientInterceptor<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError> = Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap>, PromiseWithError<InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | TReturnedError | ThrowableError>>;
-type ProcedureClientOptions<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError, TClientContext extends ClientContext> = {
+type ProcedureClientInterceptor<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> = Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap>, PromiseWithError<InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | ThrowableError>>;
+type ProcedureClientOptions<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TClientContext extends ClientContext> = {
     path?: string[];
-    interceptors?: ProcedureClientInterceptor<TInitialContext, TOutputSchema, TErrorMap, TReturnedError>[];
+    interceptors?: ProcedureClientInterceptor<TInitialContext, TOutputSchema, TErrorMap>[];
 } & (object extends TInitialContext ? {
     context?: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
 } : {
     context: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
 });
-declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError, TClientContext extends ClientContext = object>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap, TReturnedError>>, ...rest: MaybeOptionalOptions<ProcedureClientOptions<TInitialContext, TOutputSchema, TErrorMap, TReturnedError, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap, TReturnedError>;
+declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TClientContext extends ClientContext = object>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap>>, ...rest: MaybeOptionalOptions<ProcedureClientOptions<TInitialContext, TOutputSchema, TErrorMap, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap>;
 
 export { Procedure as a, Lazy as h, createProcedureClient as u, unlazy as v };
 export type { AnyProcedure as A, Context as C, Lazyable as L, MergedContext as M, OrderedMiddleware as O, ProcedureClientOptions as P, ProcedureClient as b, ProcedureClientInterceptor as c, Middleware as d, MergedInitialContext as e, ProcedureConfig as f, AnyMiddleware as g, ProcedureHandler as i, LazyDefinition as j, MiddlewareDefinition as k, MiddlewareDone as l, MiddlewareDoneOptions as m, MiddlewareNext as n, MiddlewareNextOptions as o, MiddlewareOptions as p, MiddlewareResult as q, ProcedureClientInterceptorOptions as r, ProcedureDefinition as s, ProcedureHandlerOptions as t };

package/dist/shared/{server.CwrYlF72.d.mts → server.BsujoJoF.d.ts}

@@ -1,4 +1,4 @@
-import { AnyORPCError, ClientContext, Client } from '@orpc/client';
+import { ClientContext, Client } from '@orpc/client';
 import { ErrorMap, AnyMetaPlugin, ORPCErrorConstructorMap, AnySchema, ProcedureContractDefinition, Meta, InferSchemaOutput, ORPCErrorFromErrorMap, InferSchemaInput } from '@orpc/contract';
 import { MaybeOptionalOptions, Promisable, Interceptor, PromiseWithError, ThrowableError, Value } from '@orpc/shared';
 
@@ -60,7 +60,7 @@ interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput, TErro
     context: TCurrentContext;
     input: TInput;
     path: string[];
-    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, any>;
+    procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap>;
     signal?: AbortSignal | undefined;
     lastEventId?: string | undefined;
     errors: TErrorConstructorMap;
@@ -109,32 +109,21 @@ interface ProcedureConfig {
      */
     disableOutputValidation?: boolean | undefined;
 }
-interface ProcedureDefinition<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError> extends ProcedureContractDefinition<TInputSchema, TOutputSchema, TErrorMap>, ProcedureConfig {
+interface ProcedureDefinition<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> extends ProcedureContractDefinition<TInputSchema, TOutputSchema, TErrorMap>, ProcedureConfig {
     __TInitialContext?: (type: TInitialContext) => unknown;
     __TInjectedContext?: (type: TInjectedContext) => unknown;
-    __TReturnedError?: () => TReturnedError;
-    /**
-     * When enabled, errors returned (not thrown) by the handler are passed through as-is,
-     * rather than being transformed into inferrable errors.
-     *
-     * This is intended for the contract-first approach, where the procedure adheres to an
-     * external contract and returned errors should not affect the inferred contract types.
-     *
-     * @default false
-     */
-    opaqueReturnedErrors?: boolean | undefined;
     orderedMiddlewares: OrderedMiddleware[];
     handler: ProcedureHandler<any, any, any, any>;
 }
-declare class Procedure<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError> {
-    '~orpc': ProcedureDefinition<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap, TReturnedError>;
-    constructor(def: ProcedureDefinition<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap, TReturnedError>);
+declare class Procedure<TInitialContext extends Context, TInjectedContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> {
+    '~orpc': ProcedureDefinition<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap>;
+    constructor(def: ProcedureDefinition<TInitialContext, TInjectedContext, TInputSchema, TOutputSchema, TErrorMap>);
     /**
      * Checks if the given instance satisfies the {@link Procedure} class/interface.
      */
     static [Symbol.hasInstance](instance: unknown): boolean;
 }
-type AnyProcedure = Procedure<any, any, any, any, any, any>;
+type AnyProcedure = Procedure<any, any, any, any, any>;
 
 interface LazyDefinition<T> {
     meta: Meta;
@@ -156,19 +145,19 @@ declare function unlazy<T extends Lazyable<any>>(maybeLazy: T): Promise<{
     default: T extends Lazy<infer U> ? U : T;
 }>;
 
-type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedORPCError extends AnyORPCError> = Client<TClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | TReturnedORPCError | ThrowableError>;
+type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> = Client<TClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | ThrowableError>;
 interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TErrorMap extends ErrorMap> extends ProcedureHandlerOptions<TInitialContext, unknown, ORPCErrorConstructorMap<TErrorMap>> {
 }
-type ProcedureClientInterceptor<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError> = Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap>, PromiseWithError<InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | TReturnedError | ThrowableError>>;
-type ProcedureClientOptions<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError, TClientContext extends ClientContext> = {
+type ProcedureClientInterceptor<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> = Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap>, PromiseWithError<InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | ThrowableError>>;
+type ProcedureClientOptions<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TClientContext extends ClientContext> = {
     path?: string[];
-    interceptors?: ProcedureClientInterceptor<TInitialContext, TOutputSchema, TErrorMap, TReturnedError>[];
+    interceptors?: ProcedureClientInterceptor<TInitialContext, TOutputSchema, TErrorMap>[];
 } & (object extends TInitialContext ? {
     context?: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
 } : {
     context: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
 });
-declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TReturnedError extends AnyORPCError, TClientContext extends ClientContext = object>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap, TReturnedError>>, ...rest: MaybeOptionalOptions<ProcedureClientOptions<TInitialContext, TOutputSchema, TErrorMap, TReturnedError, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap, TReturnedError>;
+declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TClientContext extends ClientContext = object>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap>>, ...rest: MaybeOptionalOptions<ProcedureClientOptions<TInitialContext, TOutputSchema, TErrorMap, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap>;
 
 export { Procedure as a, Lazy as h, createProcedureClient as u, unlazy as v };
 export type { AnyProcedure as A, Context as C, Lazyable as L, MergedContext as M, OrderedMiddleware as O, ProcedureClientOptions as P, ProcedureClient as b, ProcedureClientInterceptor as c, Middleware as d, MergedInitialContext as e, ProcedureConfig as f, AnyMiddleware as g, ProcedureHandler as i, LazyDefinition as j, MiddlewareDefinition as k, MiddlewareDone as l, MiddlewareDoneOptions as m, MiddlewareNext as n, MiddlewareNextOptions as o, MiddlewareOptions as p, MiddlewareResult as q, ProcedureClientInterceptorOptions as r, ProcedureDefinition as s, ProcedureHandlerOptions as t };

package/dist/shared/{server.D0Ipbmdv.d.mts → server.CAiLRqPf.d.mts}

@@ -1,5 +1,5 @@
-import { C as Context } from './server.CwrYlF72.mjs';
-import { S as StandardHandlerPlugin, a as StandardHandlerOptions } from './server.JbCIPL4P.mjs';
+import { C as Context } from './server.BsujoJoF.mjs';
+import { S as StandardHandlerPlugin, a as StandardHandlerOptions } from './server.R0uHWfBo.mjs';
 
 interface RequestLimitHandlerPluginOptions {
     /**

package/dist/shared/{server.Dm0os-OP.d.mts → server.CRwPbhLO.d.ts}

@@ -1,10 +1,10 @@
 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.CwrYlF72.mjs';
+import { C as Context, a as Procedure, L as Lazyable, M as MergedContext } from './server.BsujoJoF.js';
 
-type Router<TInitialContext extends Context> = Procedure<TInitialContext, any, any, any, any, any> | {
+type Router<TInitialContext extends Context> = Procedure<TInitialContext, any, any, any, any> | {
     [k: string]: Lazyable<Router<TInitialContext>>;
 };
-type ContractedRouter<T extends RouterContract, TInitialContext extends Context> = T extends ProcedureContract<infer $InputSchema, infer $OutputSchema, infer $ErrorMap> ? Procedure<TInitialContext, any, $InputSchema, $OutputSchema, $ErrorMap, never> : {
+type ContractedRouter<T extends RouterContract, TInitialContext extends Context> = T extends ProcedureContract<infer $InputSchema, infer $OutputSchema, infer $ErrorMap> ? Procedure<TInitialContext, any, $InputSchema, $OutputSchema, $ErrorMap> : {
     [K in keyof T]: T[K] extends RouterContract ? Lazyable<ContractedRouter<T[K], TInitialContext>> : never;
 };
 type AnyRouter = Router<any>;
@@ -17,7 +17,7 @@ type InferRouterInitialContext<T extends AnyRouter> = T extends Router<infer $>
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-initial-contexts | Router - Infer Router Initial Contexts}
  */
-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;
 };
 /**
@@ -28,7 +28,7 @@ type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-final-contexts | Router - Infer Router Final Contexts}
  */
-type InferRouterFinalContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, infer UInjectedContext, any, any, any, any> ? MergedContext<UInitialContext, UInjectedContext> : {
+type InferRouterFinalContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, infer UInjectedContext, any, any, any> ? MergedContext<UInitialContext, UInjectedContext> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterFinalContexts<U> : never;
 };
 /**
@@ -39,7 +39,7 @@ type InferRouterFinalContexts<T extends AnyRouter> = T extends Procedure<infer U
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-inputs | Router - Infer Router Inputs}
  */
-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 UInputSchema, any, any> ? InferSchemaInput<UInputSchema> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInputs<U> : never;
 };
 /**
@@ -50,7 +50,7 @@ type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infe
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-outputs | Router - Infer Router Outputs}
  */
-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, any, infer UOutputSchema, any> ? InferSchemaOutput<UOutputSchema> : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
 };
 /**
@@ -58,7 +58,7 @@ type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-error | Router - Infer Router Error}
  */
-type InferRouterError<T extends AnyRouter> = T extends Procedure<any, any, any, any, infer UErrorMap, infer UReturnedError> ? ORPCErrorFromErrorMap<UErrorMap> | UReturnedError | ThrowableError : {
+type InferRouterError<T extends AnyRouter> = T extends Procedure<any, any, any, any, infer UErrorMap> ? ORPCErrorFromErrorMap<UErrorMap> | ThrowableError : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterError<U> : never;
 }[keyof T];
 /**
@@ -66,7 +66,7 @@ type InferRouterError<T extends AnyRouter> = T extends Procedure<any, any, any,
  *
  * @see {@link https://orpc.dev/docs/router#infer-router-errors | Router - Infer Router Errors}
  */
-type InferRouterErrors<T extends AnyRouter> = T extends Procedure<any, any, any, any, infer UErrorMap, infer UReturnedError> ? ORPCErrorFromErrorMap<UErrorMap> | UReturnedError | ThrowableError : {
+type InferRouterErrors<T extends AnyRouter> = T extends Procedure<any, any, any, any, infer UErrorMap> ? ORPCErrorFromErrorMap<UErrorMap> | ThrowableError : {
     [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterErrors<U> : never;
 };
 

package/dist/shared/{server.DrN1Pj1-.d.ts → server.DEeCcNd6.d.ts}

@@ -1,7 +1,7 @@
 import { AnyORPCError } from '@orpc/client';
 import { OrderablePlugin, Interceptor, Promisable } from '@orpc/shared';
-import { StandardLazyRequest, StandardResponse } from '@standardserver/core';
-import { C as Context, c as ProcedureClientInterceptor, A as AnyProcedure } from './server.CwrYlF72.js';
+import { StandardLazyRequest, StandardResponse } from '@standard-server/core';
+import { C as Context, c as ProcedureClientInterceptor, A as AnyProcedure } from './server.BsujoJoF.js';
 import { Schema, ErrorMap } from '@orpc/contract';
 
 interface StandardHandlerPlugin<T extends Context> extends OrderablePlugin {
@@ -73,7 +73,7 @@ interface StandardHandlerOptions<TContext extends Context> {
      * ClientInterceptor equivalent with createRouterClient.interceptors / createProcedure.interceptors
      * useful for error handling, logging, metrics, etc. (not counting encoding/decoding)
      */
-    clientInterceptors?: ProcedureClientInterceptor<TContext, Schema<unknown>, ErrorMap, any>[];
+    clientInterceptors?: ProcedureClientInterceptor<TContext, Schema<unknown>, ErrorMap>[];
     plugins?: StandardHandlerPlugin<TContext>[];
 }
 declare class StandardHandler<T extends Context> {
@@ -84,7 +84,7 @@ declare class StandardHandler<T extends Context> {
     constructor(codec: StandardHandlerCodec<T>, options: StandardHandlerOptions<T>);
     handle(request: StandardLazyRequest, { context, prefix }: StandardHandlerHandleOptions<T>): Promise<StandardHandlerHandleResult>;
 }
-declare class OtelHandlerPlugin implements StandardHandlerPlugin<any> {
+declare class TracingHandlerPlugin implements StandardHandlerPlugin<any> {
     name: string;
     init(options: StandardHandlerOptions<any>): StandardHandlerOptions<any>;
 }
@@ -100,5 +100,5 @@ interface StandardHandlerCodec<T extends Context> {
     encodeError(error: AnyORPCError, procedure: AnyProcedure, path: string[], options: StandardHandlerHandleOptions<T>): Promisable<StandardResponse>;
 }
 
-export { CompositeStandardHandlerPlugin as C, OtelHandlerPlugin as O, StandardHandler as b };
+export { CompositeStandardHandlerPlugin as C, TracingHandlerPlugin as T, StandardHandler as b };
 export type { StandardHandlerPlugin as S, StandardHandlerOptions as a, StandardHandlerHandleOptions as c, StandardHandlerCodec as d, StandardHandlerCodecResolvedProcedure as e, StandardHandlerRoutingInterceptorOptions as f, StandardHandlerInterceptorOptions as g, StandardHandlerHandleResult as h, StandardHandlerInterceptor as i, StandardHandlerRoutingInterceptor as j };

package/dist/shared/{server.CkNnZ5F-.d.mts → server.DcHlvZFK.d.mts}

@@ -1,10 +1,10 @@
 import { RPCSerializer, AnyORPCError } from '@orpc/client';
-import { Value, Promisable } from '@orpc/shared';
-import { StandardMethod, StandardLazyRequest, StandardResponse } from '@standardserver/core';
-import { A as AnyProcedure, C as Context } from './server.CwrYlF72.mjs';
-import { A as AnyRouter } from './server.Dm0os-OP.mjs';
+import { Value, Public, Promisable } from '@orpc/shared';
+import { StandardMethod, StandardLazyRequest, StandardResponse } from '@standard-server/core';
+import { A as AnyProcedure, C as Context } from './server.BsujoJoF.mjs';
+import { A as AnyRouter } from './server.BpmUhems.mjs';
 import { AnyProcedureContract } from '@orpc/contract';
-import { c as StandardHandlerHandleOptions, d as StandardHandlerCodec, e as StandardHandlerCodecResolvedProcedure } from './server.JbCIPL4P.mjs';
+import { c as StandardHandlerHandleOptions, d as StandardHandlerCodec, e as StandardHandlerCodecResolvedProcedure } from './server.R0uHWfBo.mjs';
 
 /**
  * Methods that can invoke procedures by default. Browsers cannot trigger them
@@ -58,7 +58,7 @@ interface RPCHandlerCodecOptions<T extends Context> extends RPCMatcherOptions {
     /**
      * Override the default RPC serializer.
      */
-    serializer?: Pick<RPCSerializer, keyof RPCSerializer>;
+    serializer?: Public<RPCSerializer>;
     /**
      * Resolve HTTP status for encoded successful outputs.
      *

package/dist/shared/{server.3Ex_8ISY.mjs → server.Djb_ebJT.mjs}

@@ -1,6 +1,6 @@
-import { wrapAsyncIteratorPreservingEventMeta, ORPCError, cloneORPCError } from '@orpc/client';
+import { wrapAsyncIteratorPreservingEventMeta, ORPCError } from '@orpc/client';
 import { createORPCErrorConstructorMap, reconcileORPCError, ValidationError, ProcedureContract } from '@orpc/contract';
-import { getConstructor, isTypescriptObject, resolveMaybeOptionalOptions, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, override, traceAsyncIterator, traceReadableStream, isPlainObject, mergeTwoLevels } from '@orpc/shared';
+import { getConstructor, isTypescriptObject, resolveMaybeOptionalOptions, toArray, value, runWithSpan, intercept, isAsyncIteratorObject, override, getTracer, traceAsyncIterator, traceReadableStream, isPlainObject, mergeTwoLevels } from '@orpc/shared';
 
 class Lazy {
   "~orpc";
@@ -59,11 +59,10 @@ function createProcedureClient(lazyableProcedure, ...rest) {
       });
       if (isAsyncIteratorObject(output)) {
         return override(output, wrapAsyncIteratorPreservingEventMeta(
-          traceAsyncIterator("consume_async_iterator_object_output", output),
+          getTracer() ? traceAsyncIterator("consume_async_iterator_object_output", output) : output,
           { mapError: reconcileError }
         ));
-      }
-      if (output instanceof ReadableStream) {
+      } else if (getTracer() && output instanceof ReadableStream) {
         return override(output, traceReadableStream("consume_octet_stream_output", output));
       }
       return output;
@@ -169,18 +168,6 @@ async function executeProcedureInternal(procedure, options) {
         "handler",
         () => procedure["~orpc"].handler({ ...options, context, input: currentInput }, currentInput)
       );
-      if (currentOutput instanceof ORPCError) {
-        if (procedure["~orpc"].opaqueReturnedErrors) {
-          throw currentOutput;
-        }
-        if (currentOutput.inferable && !currentOutput.defined) {
-          throw currentOutput;
-        }
-        const error = cloneORPCError(currentOutput);
-        error.defined = false;
-        error.inferable = true;
-        throw error;
-      }
     }
     const startOutputIndex = midIndex === 0 ? 0 : orderedMiddlewares[midIndex - 1].outputSchemasLengthAtUse ?? 0;
     const endOutputIndex = midIndex === orderedMiddlewares.length ? outputSchemas.length : orderedMiddlewares[midIndex].outputSchemasLengthAtUse ?? 0;

package/dist/shared/{server.JbCIPL4P.d.mts → server.R0uHWfBo.d.mts}

@@ -1,7 +1,7 @@
 import { AnyORPCError } from '@orpc/client';
 import { OrderablePlugin, Interceptor, Promisable } from '@orpc/shared';
-import { StandardLazyRequest, StandardResponse } from '@standardserver/core';
-import { C as Context, c as ProcedureClientInterceptor, A as AnyProcedure } from './server.CwrYlF72.mjs';
+import { StandardLazyRequest, StandardResponse } from '@standard-server/core';
+import { C as Context, c as ProcedureClientInterceptor, A as AnyProcedure } from './server.BsujoJoF.mjs';
 import { Schema, ErrorMap } from '@orpc/contract';
 
 interface StandardHandlerPlugin<T extends Context> extends OrderablePlugin {
@@ -73,7 +73,7 @@ interface StandardHandlerOptions<TContext extends Context> {
      * ClientInterceptor equivalent with createRouterClient.interceptors / createProcedure.interceptors
      * useful for error handling, logging, metrics, etc. (not counting encoding/decoding)
      */
-    clientInterceptors?: ProcedureClientInterceptor<TContext, Schema<unknown>, ErrorMap, any>[];
+    clientInterceptors?: ProcedureClientInterceptor<TContext, Schema<unknown>, ErrorMap>[];
     plugins?: StandardHandlerPlugin<TContext>[];
 }
 declare class StandardHandler<T extends Context> {
@@ -84,7 +84,7 @@ declare class StandardHandler<T extends Context> {
     constructor(codec: StandardHandlerCodec<T>, options: StandardHandlerOptions<T>);
     handle(request: StandardLazyRequest, { context, prefix }: StandardHandlerHandleOptions<T>): Promise<StandardHandlerHandleResult>;
 }
-declare class OtelHandlerPlugin implements StandardHandlerPlugin<any> {
+declare class TracingHandlerPlugin implements StandardHandlerPlugin<any> {
     name: string;
     init(options: StandardHandlerOptions<any>): StandardHandlerOptions<any>;
 }
@@ -100,5 +100,5 @@ interface StandardHandlerCodec<T extends Context> {
     encodeError(error: AnyORPCError, procedure: AnyProcedure, path: string[], options: StandardHandlerHandleOptions<T>): Promisable<StandardResponse>;
 }
 
-export { CompositeStandardHandlerPlugin as C, OtelHandlerPlugin as O, StandardHandler as b };
+export { CompositeStandardHandlerPlugin as C, TracingHandlerPlugin as T, StandardHandler as b };
 export type { StandardHandlerPlugin as S, StandardHandlerOptions as a, StandardHandlerHandleOptions as c, StandardHandlerCodec as d, StandardHandlerCodecResolvedProcedure as e, StandardHandlerRoutingInterceptorOptions as f, StandardHandlerInterceptorOptions as g, StandardHandlerHandleResult as h, StandardHandlerInterceptor as i, StandardHandlerRoutingInterceptor as j };

package/dist/shared/{server.BhHrioCw.d.ts → server.b2-J4t6T.d.ts}

@@ -1,5 +1,5 @@
-import { C as Context } from './server.CwrYlF72.js';
-import { S as StandardHandlerPlugin, a as StandardHandlerOptions } from './server.DrN1Pj1-.js';
+import { C as Context } from './server.BsujoJoF.js';
+import { S as StandardHandlerPlugin, a as StandardHandlerOptions } from './server.DEeCcNd6.js';
 
 interface RequestLimitHandlerPluginOptions {
     /**

package/dist/shared/{server.7G43pSxo.mjs → server.sNWd6DAG.mjs}

@@ -1,8 +1,8 @@
 import { ORPCError, toORPCError, RPCSerializer, COMMON_ERROR_STATUS_MAP } from '@orpc/client';
-import { sortPlugins, getOpenTelemetryConfig, runWithSpan, toArray, matchesHttpPathPrefix, intercept, ORPC_NAME, isAsyncIteratorObject, override, traceAsyncIterator, recordSpanError, pathToHttpPath, normalizeHttpPath, value, parseEmptyableJSON, getOwn } from '@orpc/shared';
-import { flattenStandardHeader, parseStandardUrl } from '@standardserver/core';
-import { c as createProcedureClient, u as unlazy, P as Procedure } from './server.3Ex_8ISY.mjs';
-import { w as walkProcedureContractsSync, g as getRouter, c as createContractProcedure, D as DEFAULT_SUCCESS_STATUS, a as DEFAULT_ERROR_STATUS } from './server.S8BnCR3a.mjs';
+import { sortPlugins, toArray, matchesHttpPathPrefix, intercept, getTracer, runWithSpan, ORPC_NAME, isAsyncIteratorObject, override, traceAsyncIterator, traceReadableStream, recordSpanError, pathToHttpPath, normalizeHttpPath, value, parseEmptyableJSON, getOwn } from '@orpc/shared';
+import { flattenStandardHeader, parseStandardUrl } from '@standard-server/core';
+import { c as createProcedureClient, u as unlazy, P as Procedure } from './server.Djb_ebJT.mjs';
+import { w as walkProcedureContractsSync, g as getRouter, c as createContractProcedure, D as DEFAULT_SUCCESS_STATUS, a as DEFAULT_ERROR_STATUS } from './server.BYnwk7Xz.mjs';
 
 class CompositeStandardHandlerPlugin {
   name = "~composite";
@@ -24,7 +24,7 @@ class StandardHandler {
   constructor(codec, options) {
     this.codec = codec;
     options = new CompositeStandardHandlerPlugin([
-      new OtelHandlerPlugin(),
+      new TracingHandlerPlugin(),
       ...toArray(options.plugins)
     ]).init(options);
     this.routingInterceptors = options.routingInterceptors;
@@ -42,7 +42,7 @@ class StandardHandler {
       this.routingInterceptors,
       { context, prefix, request },
       async ({ context: context2, prefix: prefix2, request: request2 }) => {
-        const span = getOpenTelemetryConfig()?.trace.getActiveSpan();
+        const span = getTracer()?.getActiveSpan();
         let step;
         const matchedOrNot = await runWithSpan("find_procedure", () => this.codec.resolveProcedure(request2, { context: context2, prefix: prefix2 }));
         if (!matchedOrNot) {
@@ -63,8 +63,10 @@ class StandardHandler {
               step = "decode_input";
               let input = await runWithSpan("decode_input", decodeInput2);
               step = void 0;
-              if (isAsyncIteratorObject(input)) {
+              if (getTracer() && isAsyncIteratorObject(input)) {
                 input = override(input, traceAsyncIterator("consume_async_iterator_object_input", input));
+              } else if (getTracer() && input instanceof ReadableStream) {
+                input = override(input, traceReadableStream("consume_octet_stream_input", input));
               }
               const client = createProcedureClient(procedure2, {
                 context: context3,
@@ -97,21 +99,19 @@ class StandardHandler {
     );
   }
 }
-class OtelHandlerPlugin {
-  name = "~opentelemetry";
+class TracingHandlerPlugin {
+  name = "~tracing";
   init(options) {
     return {
       ...options,
       routingInterceptors: [
-        // Should be placed before user-provided interceptors to help them access the current active context.
+        // Should be placed before user-provided interceptors to help them access the current active span.
         async ({ next, request }) => {
-          const otelConfig = getOpenTelemetryConfig();
-          let propagationContext;
-          if (otelConfig?.propagation) {
-            propagationContext = otelConfig.propagation.extract(otelConfig.context.active(), request.headers);
-          }
+          const tracer = getTracer();
+          const parent = tracer?.extract?.(request.headers);
+          const [pathname] = parseStandardUrl(request.url);
           return runWithSpan(
-            { name: `${request.method} ${request.url}`, context: propagationContext },
+            { name: `${request.method} ${pathname}`, parent },
             () => next()
           );
         },
@@ -301,4 +301,4 @@ class RPCHandlerCodec {
   }
 }
 
-export { CompositeStandardHandlerPlugin as C, OtelHandlerPlugin as O, RPCHandlerCodec as R, StandardHandler as S, RPCMatcher as a, RPC_DEFAULT_ALLOW_METHODS as b };
+export { CompositeStandardHandlerPlugin as C, RPCHandlerCodec as R, StandardHandler as S, TracingHandlerPlugin as T, RPCMatcher as a, RPC_DEFAULT_ALLOW_METHODS as b };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "2.0.0-beta.33",
+  "version": "2.0.0-beta.35",
   "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,15 +117,15 @@
     }
   },
   "dependencies": {
-    "@orpc/client": "2.0.0-beta.33",
-    "@orpc/contract": "2.0.0-beta.33",
-    "@orpc/shared": "2.0.0-beta.33",
-    "@standardserver/aws-lambda": "^0.8.3",
-    "@standardserver/core": "^0.8.3",
-    "@standardserver/fastify": "^0.8.3",
-    "@standardserver/fetch": "^0.8.3",
-    "@standardserver/node": "^0.8.3",
-    "@standardserver/peer": "^0.8.3",
+    "@orpc/client": "2.0.0-beta.35",
+    "@orpc/contract": "2.0.0-beta.35",
+    "@orpc/shared": "2.0.0-beta.35",
+    "@standard-server/aws-lambda": "~0.9.0",
+    "@standard-server/core": "~0.9.0",
+    "@standard-server/fastify": "~0.9.0",
+    "@standard-server/fetch": "~0.9.0",
+    "@standard-server/node": "~0.9.0",
+    "@standard-server/peer": "~0.9.0",
     "cookie": "^2.0.1"
   },
   "devDependencies": {