orpc-fn 0.1.0 → 0.3.0

package/dist/otel.js

@@ -1,9 +1,16 @@
 import { isAsyncIteratorObject, onStreamEnd } from './stream.js';
 export function createTracing(otel) {
-    const tracer = otel?.trace.getTracer('orpc-fn');
+    let tracer;
+    try {
+        tracer = otel?.trace.getTracer('orpc-fn');
+    }
+    catch {
+        /* Missing telemetry cannot prevent execution. */
+    }
     const end = (span, ...error) => {
         if (!span || !otel)
             return;
+        span = protectSpan(span);
         if (error.length === 0) {
             span.setStatus({ code: otel.SpanStatusCode.OK });
         }
@@ -23,11 +30,15 @@ export function createTracing(otel) {
                 try {
                     onSettled?.(span, ...error);
                 }
+                catch {
+                    /* Telemetry callbacks cannot replace the original result. */
+                }
                 finally {
                     end(span, ...error);
                 }
             };
             const run = async (span, scope) => {
+                span = span ? protectSpan(span) : undefined;
                 let result;
                 try {
                     result = await fn(span);
@@ -44,15 +55,56 @@ export function createTracing(otel) {
             };
             if (!tracer || !otel)
                 return run(undefined);
-            return tracer.startActiveSpan(name, { kind: otel.SpanKind[kind] }, (span) => {
-                const active = otel.context.active();
-                return run(span, (step) => otel.context.with(active, step));
-            });
+            let started;
+            try {
+                return tracer.startActiveSpan(name, { kind: otel.SpanKind[kind] }, (span) => {
+                    let active;
+                    try {
+                        active = otel.context.active();
+                    }
+                    catch {
+                        /* Fall back to the span without scope restoration. */
+                    }
+                    started = run(span, (step) => {
+                        let completed;
+                        let failed;
+                        try {
+                            return otel.context.with(active, () => {
+                                try {
+                                    const value = step();
+                                    completed = { value };
+                                    return value;
+                                }
+                                catch (error) {
+                                    failed = { error };
+                                    throw error;
+                                }
+                            });
+                        }
+                        catch {
+                            if (completed)
+                                return completed.value;
+                            if (failed)
+                                throw failed.error;
+                            return step();
+                        }
+                    });
+                    return started;
+                });
+            }
+            catch {
+                return started ?? run(undefined);
+            }
         },
         startSpan(name, kind, attributes) {
             if (!tracer || !otel)
                 return undefined;
-            return tracer.startSpan(name, { kind: otel.SpanKind[kind], attributes });
+            try {
+                return protectSpan(tracer.startSpan(name, { kind: otel.SpanKind[kind], attributes }));
+            }
+            catch {
+                return undefined;
+            }
         },
         end
     };
@@ -60,4 +112,23 @@ export function createTracing(otel) {
 export function errorMessageOf(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function protectSpan(span) {
+    return new Proxy(span, {
+        get(target, key) {
+            const value = Reflect.get(target, key, target);
+            if (typeof value !== 'function')
+                return value;
+            if (['setAttribute', 'setStatus', 'recordException', 'end'].includes(String(key)))
+                return (...args) => {
+                    try {
+                        return value.apply(target, args);
+                    }
+                    catch {
+                        /* Ignore exporter failures. */
+                    }
+                };
+            return value.bind(target);
+        }
+    });
+}
 //# sourceMappingURL=otel.js.map

package/dist/otel.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel.js","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,qBAAqB,EACrB,WAAW,EAEX,MAAM,aAAa,CAAA;AAiFpB,MAAM,UAAU,aAAa,CAAC,IAA6B;IAC1D,MAAM,MAAM,GAAG,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IAC/C,MAAM,GAAG,GAAmB,CAAC,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE;QAC9C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;YAAE,OAAM;QAC1B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAA;QACjD,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,SAAS,CAAC;gBACd,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK;gBAC/B,OAAO,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACjC,CAAC,CAAA;YACF,IAAI,KAAK,CAAC,CAAC,CAAC,YAAY,KAAK;gBAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC9D,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,CAAA;IACX,CAAC,CAAA;IACD,OAAO;QACN,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS;YAC/B,MAAM,MAAM,GAAG,CAAC,IAA0B,EAAE,GAAG,KAAqB,EAAE,EAAE;gBACvE,IAAI,CAAC;oBACJ,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAA;gBAC5B,CAAC;wBAAS,CAAC;oBACV,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAA;gBACpB,CAAC;YACF,CAAC,CAAA;YACD,MAAM,GAAG,GAAG,KAAK,EAChB,IAA0B,EAC1B,KAAmB,EACuB,EAAE;gBAC5C,IAAI,MAAsC,CAAA;gBAC1C,IAAI,CAAC;oBACJ,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,CAAA;gBACxB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;oBACnB,MAAM,KAAK,CAAA;gBACZ,CAAC;gBACD,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC;oBACnC,OAAO,WAAW,CACjB,MAAM,EACN,CAAC,GAAG,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,EACpC,KAAK,CACY,CAAA;gBACnB,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,CAAA;gBACZ,OAAO,MAAM,CAAA;YACd,CAAC,CAAA;YACD,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI;gBAAE,OAAO,GAAG,CAAC,SAAS,CAAC,CAAA;YAC3C,OAAO,MAAM,CAAC,eAAe,CAC5B,IAAI,EACJ,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAC7B,CAAC,IAAI,EAAE,EAAE;gBACR,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAA;gBACpC,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAe,EAAE,IAAI,CAAC,CAAC,CAAA;YACrE,CAAC,CACD,CAAA;QACF,CAAC;QACD,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU;YAC/B,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI;gBAAE,OAAO,SAAS,CAAA;YACtC,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;QACzE,CAAC;QACD,GAAG;KACH,CAAA;AACF,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAc;IAC5C,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC9D,CAAC","sourcesContent":["import {\n\tisAsyncIteratorObject,\n\tonStreamEnd,\n\ttype StreamScope\n} from './stream.js'\n\n/** Attribute values accepted by OpenTelemetry spans. */\nexport type AttributeValue = string | number | boolean\n\n/** The part of an OpenTelemetry `Span` this package uses. */\nexport interface SpanLike {\n\tsetAttribute(key: string, value: AttributeValue): unknown\n\tsetStatus(status: { code: number; message?: string }): unknown\n\trecordException(exception: Error): unknown\n\tend(): unknown\n}\n\ntype SpanOptionsLike = {\n\tkind?: number\n\tattributes?: Record<string, AttributeValue>\n}\n\ninterface TracerLike<TSpan> {\n\tstartActiveSpan<F extends (span: TSpan) => unknown>(\n\t\tname: string,\n\t\toptions: SpanOptionsLike,\n\t\tfn: F\n\t): ReturnType<F>\n\tstartSpan(name: string, options?: SpanOptionsLike): TSpan\n}\n\n/**\n * The part of `@opentelemetry/api` this package uses. Pass the module itself:\n * `import * as otel from '@opentelemetry/api'` then `createFn({ otel })`.\n * Without it no spans are created and handlers receive `span: undefined`.\n */\nexport interface OtelApiLike<TSpan extends SpanLike = SpanLike> {\n\ttrace: { getTracer(name: string): TracerLike<TSpan> }\n\tSpanStatusCode: { OK: number; ERROR: number }\n\tSpanKind: {\n\t\tINTERNAL: number\n\t\tSERVER: number\n\t\tPRODUCER: number\n\t}\n\t/** Restores a span's context for each step of a stream it returned. */\n\tcontext: {\n\t\tactive(): unknown\n\t\twith<T>(context: never, fn: () => T): T\n\t}\n}\n\n/** The span type of an OpenTelemetry API, or `SpanLike` when absent. */\nexport type SpanOf<TOtel> =\n\tTOtel extends OtelApiLike<infer TSpan> ? TSpan : SpanLike\n\n/** Called once when a span's work is done, before the span ends. */\nexport type OnSettled = (\n\tspan: SpanLike | undefined,\n\t...error: [] | [unknown]\n) => void\n\nexport type Tracing = {\n\t/**\n\t * Run `fn` inside an active span: OK when it resolves, ERROR when it throws,\n\t * ended either way. When `fn` resolves to a stream, the span stays open -\n\t * and active for each step of the stream - until the stream ends.\n\t * `onSettled` runs once at that point, before the span ends. Without\n\t * OpenTelemetry `span` is undefined and `onSettled` still runs.\n\t */\n\tinSpan<T>(\n\t\tname: string,\n\t\tkind: 'INTERNAL' | 'SERVER' | 'PRODUCER',\n\t\tfn: (span: SpanLike | undefined) => Promise<T>,\n\t\tonSettled?: OnSettled\n\t): Promise<T>\n\t/** Start a span that the caller ends with `end` (long-lived streams). */\n\tstartSpan(\n\t\tname: string,\n\t\tkind: 'SERVER',\n\t\tattributes: Record<string, AttributeValue>\n\t): SpanLike | undefined\n\t/** Set OK, or ERROR with `error`, and end the span. */\n\tend(span: SpanLike | undefined, error?: unknown): void\n}\n\nexport function createTracing(otel: OtelApiLike | undefined): Tracing {\n\tconst tracer = otel?.trace.getTracer('orpc-fn')\n\tconst end: Tracing['end'] = (span, ...error) => {\n\t\tif (!span || !otel) return\n\t\tif (error.length === 0) {\n\t\t\tspan.setStatus({ code: otel.SpanStatusCode.OK })\n\t\t} else {\n\t\t\tspan.setStatus({\n\t\t\t\tcode: otel.SpanStatusCode.ERROR,\n\t\t\t\tmessage: errorMessageOf(error[0])\n\t\t\t})\n\t\t\tif (error[0] instanceof Error) span.recordException(error[0])\n\t\t}\n\t\tspan.end()\n\t}\n\treturn {\n\t\tinSpan(name, kind, fn, onSettled) {\n\t\t\tconst settle = (span: SpanLike | undefined, ...error: [] | [unknown]) => {\n\t\t\t\ttry {\n\t\t\t\t\tonSettled?.(span, ...error)\n\t\t\t\t} finally {\n\t\t\t\t\tend(span, ...error)\n\t\t\t\t}\n\t\t\t}\n\t\t\tconst run = async (\n\t\t\t\tspan: SpanLike | undefined,\n\t\t\t\tscope?: StreamScope\n\t\t\t): Promise<Awaited<ReturnType<typeof fn>>> => {\n\t\t\t\tlet result: Awaited<ReturnType<typeof fn>>\n\t\t\t\ttry {\n\t\t\t\t\tresult = await fn(span)\n\t\t\t\t} catch (error) {\n\t\t\t\t\tsettle(span, error)\n\t\t\t\t\tthrow error\n\t\t\t\t}\n\t\t\t\tif (isAsyncIteratorObject(result)) {\n\t\t\t\t\treturn onStreamEnd(\n\t\t\t\t\t\tresult,\n\t\t\t\t\t\t(...error) => settle(span, ...error),\n\t\t\t\t\t\tscope\n\t\t\t\t\t) as typeof result\n\t\t\t\t}\n\t\t\t\tsettle(span)\n\t\t\t\treturn result\n\t\t\t}\n\t\t\tif (!tracer || !otel) return run(undefined)\n\t\t\treturn tracer.startActiveSpan(\n\t\t\t\tname,\n\t\t\t\t{ kind: otel.SpanKind[kind] },\n\t\t\t\t(span) => {\n\t\t\t\t\tconst active = otel.context.active()\n\t\t\t\t\treturn run(span, (step) => otel.context.with(active as never, step))\n\t\t\t\t}\n\t\t\t)\n\t\t},\n\t\tstartSpan(name, kind, attributes) {\n\t\t\tif (!tracer || !otel) return undefined\n\t\t\treturn tracer.startSpan(name, { kind: otel.SpanKind[kind], attributes })\n\t\t},\n\t\tend\n\t}\n}\n\nexport function errorMessageOf(error: unknown): string {\n\treturn error instanceof Error ? error.message : String(error)\n}\n"]}
+{"version":3,"file":"otel.js","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\tisAsyncIteratorObject,\n\tonStreamEnd,\n\ttype StreamScope\n} from './stream.js'\n\n/** Attribute values accepted by OpenTelemetry spans. */\nexport type AttributeValue = string | number | boolean\n\n/** The part of an OpenTelemetry `Span` this package uses. */\nexport interface SpanLike {\n\tsetAttribute(key: string, value: AttributeValue): unknown\n\tsetStatus(status: { code: number; message?: string }): unknown\n\trecordException(exception: Error): unknown\n\tend(): unknown\n}\n\ntype SpanOptionsLike = {\n\tkind?: number\n\tattributes?: Record<string, AttributeValue>\n}\n\ninterface TracerLike<TSpan> {\n\tstartActiveSpan<F extends (span: TSpan) => unknown>(\n\t\tname: string,\n\t\toptions: SpanOptionsLike,\n\t\tfn: F\n\t): ReturnType<F>\n\tstartSpan(name: string, options?: SpanOptionsLike): TSpan\n}\n\n/**\n * The part of `@opentelemetry/api` this package uses. Pass the module itself:\n * `import * as otel from '@opentelemetry/api'` then `createFn({ otel })`.\n * Without it no spans are created and handlers receive `span: undefined`.\n */\nexport interface OtelApiLike<TSpan extends SpanLike = SpanLike> {\n\ttrace: { getTracer(name: string): TracerLike<TSpan> }\n\tSpanStatusCode: { OK: number; ERROR: number }\n\tSpanKind: {\n\t\tINTERNAL: number\n\t\tSERVER: number\n\t\tPRODUCER: number\n\t}\n\t/** Restores a span's context for each step of a stream it returned. */\n\tcontext: {\n\t\tactive(): unknown\n\t\twith<T>(context: never, fn: () => T): T\n\t}\n}\n\n/** The span type of an OpenTelemetry API, or `SpanLike` when absent. */\nexport type SpanOf<TOtel> =\n\tTOtel extends OtelApiLike<infer TSpan> ? TSpan : SpanLike\n\n/** Called once when a span's work is done, before the span ends. */\nexport type OnSettled = (\n\tspan: SpanLike | undefined,\n\t...error: [] | [unknown]\n) => void\n\nexport type Tracing = {\n\t/**\n\t * Run `fn` inside an active span: OK when it resolves, ERROR when it throws,\n\t * ended either way. When `fn` resolves to a stream, the span stays open -\n\t * and active for each step of the stream - until the stream ends.\n\t * `onSettled` runs once at that point, before the span ends. Without\n\t * OpenTelemetry `span` is undefined and `onSettled` still runs.\n\t */\n\tinSpan<T>(\n\t\tname: string,\n\t\tkind: 'INTERNAL' | 'SERVER' | 'PRODUCER',\n\t\tfn: (span: SpanLike | undefined) => Promise<T>,\n\t\tonSettled?: OnSettled\n\t): Promise<T>\n\t/** Start a span that the caller ends with `end` (long-lived streams). */\n\tstartSpan(\n\t\tname: string,\n\t\tkind: 'SERVER',\n\t\tattributes: Record<string, AttributeValue>\n\t): SpanLike | undefined\n\t/** Set OK, or ERROR with `error`, and end the span. */\n\tend(span: SpanLike | undefined, error?: unknown): void\n}\n\nexport function createTracing(otel: OtelApiLike | undefined): Tracing {\n\tlet tracer: TracerLike<SpanLike> | undefined\n\ttry {\n\t\ttracer = otel?.trace.getTracer('orpc-fn')\n\t} catch {\n\t\t/* Missing telemetry cannot prevent execution. */\n\t}\n\tconst end: Tracing['end'] = (span, ...error) => {\n\t\tif (!span || !otel) return\n\t\tspan = protectSpan(span)\n\t\tif (error.length === 0) {\n\t\t\tspan.setStatus({ code: otel.SpanStatusCode.OK })\n\t\t} else {\n\t\t\tspan.setStatus({\n\t\t\t\tcode: otel.SpanStatusCode.ERROR,\n\t\t\t\tmessage: errorMessageOf(error[0])\n\t\t\t})\n\t\t\tif (error[0] instanceof Error) span.recordException(error[0])\n\t\t}\n\t\tspan.end()\n\t}\n\treturn {\n\t\tinSpan(name, kind, fn, onSettled) {\n\t\t\tconst settle = (span: SpanLike | undefined, ...error: [] | [unknown]) => {\n\t\t\t\ttry {\n\t\t\t\t\tonSettled?.(span, ...error)\n\t\t\t\t} catch {\n\t\t\t\t\t/* Telemetry callbacks cannot replace the original result. */\n\t\t\t\t} finally {\n\t\t\t\t\tend(span, ...error)\n\t\t\t\t}\n\t\t\t}\n\t\t\tconst run = async (\n\t\t\t\tspan: SpanLike | undefined,\n\t\t\t\tscope?: StreamScope\n\t\t\t): Promise<Awaited<ReturnType<typeof fn>>> => {\n\t\t\t\tspan = span ? protectSpan(span) : undefined\n\t\t\t\tlet result: Awaited<ReturnType<typeof fn>>\n\t\t\t\ttry {\n\t\t\t\t\tresult = await fn(span)\n\t\t\t\t} catch (error) {\n\t\t\t\t\tsettle(span, error)\n\t\t\t\t\tthrow error\n\t\t\t\t}\n\t\t\t\tif (isAsyncIteratorObject(result)) {\n\t\t\t\t\treturn onStreamEnd(\n\t\t\t\t\t\tresult,\n\t\t\t\t\t\t(...error) => settle(span, ...error),\n\t\t\t\t\t\tscope\n\t\t\t\t\t) as typeof result\n\t\t\t\t}\n\t\t\t\tsettle(span)\n\t\t\t\treturn result\n\t\t\t}\n\t\t\tif (!tracer || !otel) return run(undefined)\n\t\t\tlet started: Promise<Awaited<ReturnType<typeof fn>>> | undefined\n\t\t\ttry {\n\t\t\t\treturn tracer.startActiveSpan(\n\t\t\t\t\tname,\n\t\t\t\t\t{ kind: otel.SpanKind[kind] },\n\t\t\t\t\t(span) => {\n\t\t\t\t\t\tlet active: unknown\n\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\tactive = otel.context.active()\n\t\t\t\t\t\t} catch {\n\t\t\t\t\t\t\t/* Fall back to the span without scope restoration. */\n\t\t\t\t\t\t}\n\t\t\t\t\t\tstarted = run(span, (step) => {\n\t\t\t\t\t\t\tlet completed: { value: ReturnType<typeof step> } | undefined\n\t\t\t\t\t\t\tlet failed: { error: unknown } | undefined\n\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\treturn otel.context.with(active as never, () => {\n\t\t\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\t\t\tconst value = step()\n\t\t\t\t\t\t\t\t\t\tcompleted = { value }\n\t\t\t\t\t\t\t\t\t\treturn value\n\t\t\t\t\t\t\t\t\t} catch (error) {\n\t\t\t\t\t\t\t\t\t\tfailed = { error }\n\t\t\t\t\t\t\t\t\t\tthrow error\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\t} catch {\n\t\t\t\t\t\t\t\tif (completed) return completed.value\n\t\t\t\t\t\t\t\tif (failed) throw failed.error\n\t\t\t\t\t\t\t\treturn step()\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t})\n\t\t\t\t\t\treturn started\n\t\t\t\t\t}\n\t\t\t\t)\n\t\t\t} catch {\n\t\t\t\treturn started ?? run(undefined)\n\t\t\t}\n\t\t},\n\t\tstartSpan(name, kind, attributes) {\n\t\t\tif (!tracer || !otel) return undefined\n\t\t\ttry {\n\t\t\t\treturn protectSpan(\n\t\t\t\t\ttracer.startSpan(name, { kind: otel.SpanKind[kind], attributes })\n\t\t\t\t)\n\t\t\t} catch {\n\t\t\t\treturn undefined\n\t\t\t}\n\t\t},\n\t\tend\n\t}\n}\n\nexport function errorMessageOf(error: unknown): string {\n\treturn error instanceof Error ? error.message : String(error)\n}\n\nfunction protectSpan<T extends SpanLike>(span: T): T {\n\treturn new Proxy(span, {\n\t\tget(target, key) {\n\t\t\tconst value = Reflect.get(target, key, target)\n\t\t\tif (typeof value !== 'function') return value\n\t\t\tif (\n\t\t\t\t['setAttribute', 'setStatus', 'recordException', 'end'].includes(\n\t\t\t\t\tString(key)\n\t\t\t\t)\n\t\t\t)\n\t\t\t\treturn (...args: unknown[]) => {\n\t\t\t\t\ttry {\n\t\t\t\t\t\treturn value.apply(target, args)\n\t\t\t\t\t} catch {\n\t\t\t\t\t\t/* Ignore exporter failures. */\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\treturn value.bind(target)\n\t\t}\n\t})\n}\n"]}

package/dist/route-options.d.ts

@@ -0,0 +1,22 @@
+import { type AnySchema, type ErrorMap } from '@orpc/contract';
+type Resolver = (params: {
+    input: unknown;
+    context: unknown;
+    signal: AbortSignal | undefined;
+}) => unknown;
+/** Runtime validation for JavaScript callers and spread route options. */
+export declare function normalizeRoute(options: Record<string, unknown>, isGuard: (key: string) => boolean): {
+    handler: (params: Record<PropertyKey, unknown>) => unknown;
+    input: AnySchema | undefined;
+    output: AnySchema | undefined;
+    name: string;
+    procedure: string | undefined;
+    meta: Record<string, unknown>;
+    stream: boolean;
+    errors: ErrorMap | undefined;
+    guardResolvers: Record<string, Resolver>;
+    route: Record<string, unknown>;
+    guardChecks: [string, unknown][];
+};
+export {};
+//# sourceMappingURL=route-options.d.ts.map

package/dist/route-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-options.d.ts","sourceRoot":"","sources":["../src/route-options.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,SAAS,EACd,KAAK,QAAQ,EAEb,MAAM,gBAAgB,CAAA;AAGvB,KAAK,QAAQ,GAAG,CAAC,MAAM,EAAE;IACxB,KAAK,EAAE,OAAO,CAAA;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,WAAW,GAAG,SAAS,CAAA;CAC/B,KAAK,OAAO,CAAA;AAab,0EAA0E;AAC1E,wBAAgB,cAAc,CAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO;aA4DZ,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,OAAO;;;;;UAKpD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;YAEtB,QAAQ,GAAG,SAAS;oBACJ,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;;;EAI3D"}

package/dist/route-options.js

@@ -0,0 +1,67 @@
+import { getEventIteratorSchemaDetails } from '@orpc/contract';
+import { ROUTE_OPTION_KEYS } from './types.js';
+function schemaOption(schema, name) {
+    if (schema === undefined)
+        return undefined;
+    if (typeof schema !== 'object' ||
+        schema === null ||
+        !('~standard' in schema) ||
+        typeof schema['~standard']?.validate !== 'function')
+        throw new TypeError(`orpc-fn: ${name} must be a Standard Schema`);
+    return schema;
+}
+/** Runtime validation for JavaScript callers and spread route options. */
+export function normalizeRoute(options, isGuard) {
+    const { handler, input: rawInput, output: rawOutput, name, procedure, meta: appMeta = {}, stream, errors, guardResolvers = {}, ...rest } = options;
+    if (typeof name !== 'string' || !name || typeof handler !== 'function')
+        throw new TypeError('orpc-fn: routes require a name and handler');
+    if (procedure !== undefined && typeof procedure !== 'string')
+        throw new TypeError('orpc-fn: procedure must be a configured key');
+    if (typeof appMeta !== 'object' || appMeta === null || Array.isArray(appMeta))
+        throw new TypeError('orpc-fn: meta must be an object');
+    if (stream !== undefined && typeof stream !== 'boolean')
+        throw new TypeError('orpc-fn: stream must be boolean');
+    if (typeof guardResolvers !== 'object' ||
+        guardResolvers === null ||
+        Array.isArray(guardResolvers))
+        throw new TypeError('orpc-fn: guardResolvers must be an object');
+    const input = schemaOption(rawInput, 'input');
+    const output = schemaOption(rawOutput, 'output');
+    const route = {};
+    const guardChecks = [];
+    for (const [option, value] of Object.entries(rest)) {
+        if (ROUTE_OPTION_KEYS.includes(option))
+            route[option] = value;
+        else if (isGuard(option)) {
+            if (value !== undefined)
+                guardChecks.push([option, value]);
+        }
+        else
+            throw new TypeError(`orpc-fn: unknown route option "${option}"; put application metadata in meta`);
+    }
+    const iterator = getEventIteratorSchemaDetails(output) !== undefined;
+    if (stream === false && iterator)
+        throw new TypeError('orpc-fn: an event iterator schema cannot declare stream: false');
+    for (const [guard, resolver] of Object.entries(guardResolvers)) {
+        if (!isGuard(guard))
+            throw new TypeError(`orpc-fn: unknown guard resolver "${guard}"`);
+        if (typeof resolver !== 'function')
+            throw new TypeError(`orpc-fn: guard resolver "${guard}" must be a function`);
+        if (guardChecks.some(([key]) => key === guard))
+            throw new TypeError(`orpc-fn: guard "${guard}" has both a value and resolver`);
+    }
+    return {
+        handler: handler,
+        input,
+        output,
+        name,
+        procedure,
+        meta: appMeta,
+        stream: stream === true || iterator,
+        errors: errors,
+        guardResolvers: guardResolvers,
+        route,
+        guardChecks
+    };
+}
+//# sourceMappingURL=route-options.js.map

package/dist/route-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-options.js","sourceRoot":"","sources":["../src/route-options.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\ttype AnySchema,\n\ttype ErrorMap,\n\tgetEventIteratorSchemaDetails\n} from '@orpc/contract'\nimport { ROUTE_OPTION_KEYS } from './types.js'\n\ntype Resolver = (params: {\n\tinput: unknown\n\tcontext: unknown\n\tsignal: AbortSignal | undefined\n}) => unknown\nfunction schemaOption(schema: unknown, name: string): AnySchema | undefined {\n\tif (schema === undefined) return undefined\n\tif (\n\t\ttypeof schema !== 'object' ||\n\t\tschema === null ||\n\t\t!('~standard' in schema) ||\n\t\ttypeof (schema as AnySchema)['~standard']?.validate !== 'function'\n\t)\n\t\tthrow new TypeError(`orpc-fn: ${name} must be a Standard Schema`)\n\treturn schema as AnySchema\n}\n\n/** Runtime validation for JavaScript callers and spread route options. */\nexport function normalizeRoute(\n\toptions: Record<string, unknown>,\n\tisGuard: (key: string) => boolean\n) {\n\tconst {\n\t\thandler,\n\t\tinput: rawInput,\n\t\toutput: rawOutput,\n\t\tname,\n\t\tprocedure,\n\t\tmeta: appMeta = {},\n\t\tstream,\n\t\terrors,\n\t\tguardResolvers = {},\n\t\t...rest\n\t} = options\n\tif (typeof name !== 'string' || !name || typeof handler !== 'function')\n\t\tthrow new TypeError('orpc-fn: routes require a name and handler')\n\tif (procedure !== undefined && typeof procedure !== 'string')\n\t\tthrow new TypeError('orpc-fn: procedure must be a configured key')\n\tif (typeof appMeta !== 'object' || appMeta === null || Array.isArray(appMeta))\n\t\tthrow new TypeError('orpc-fn: meta must be an object')\n\tif (stream !== undefined && typeof stream !== 'boolean')\n\t\tthrow new TypeError('orpc-fn: stream must be boolean')\n\tif (\n\t\ttypeof guardResolvers !== 'object' ||\n\t\tguardResolvers === null ||\n\t\tArray.isArray(guardResolvers)\n\t)\n\t\tthrow new TypeError('orpc-fn: guardResolvers must be an object')\n\tconst input = schemaOption(rawInput, 'input')\n\tconst output = schemaOption(rawOutput, 'output')\n\tconst route: Record<string, unknown> = {}\n\tconst guardChecks: Array<[string, unknown]> = []\n\tfor (const [option, value] of Object.entries(rest)) {\n\t\tif ((ROUTE_OPTION_KEYS as readonly string[]).includes(option))\n\t\t\troute[option] = value\n\t\telse if (isGuard(option)) {\n\t\t\tif (value !== undefined) guardChecks.push([option, value])\n\t\t} else\n\t\t\tthrow new TypeError(\n\t\t\t\t`orpc-fn: unknown route option \"${option}\"; put application metadata in meta`\n\t\t\t)\n\t}\n\tconst iterator = getEventIteratorSchemaDetails(output) !== undefined\n\tif (stream === false && iterator)\n\t\tthrow new TypeError(\n\t\t\t'orpc-fn: an event iterator schema cannot declare stream: false'\n\t\t)\n\tfor (const [guard, resolver] of Object.entries(guardResolvers)) {\n\t\tif (!isGuard(guard))\n\t\t\tthrow new TypeError(`orpc-fn: unknown guard resolver \"${guard}\"`)\n\t\tif (typeof resolver !== 'function')\n\t\t\tthrow new TypeError(\n\t\t\t\t`orpc-fn: guard resolver \"${guard}\" must be a function`\n\t\t\t)\n\t\tif (guardChecks.some(([key]) => key === guard))\n\t\t\tthrow new TypeError(\n\t\t\t\t`orpc-fn: guard \"${guard}\" has both a value and resolver`\n\t\t\t)\n\t}\n\treturn {\n\t\thandler: handler as (params: Record<PropertyKey, unknown>) => unknown,\n\t\tinput,\n\t\toutput,\n\t\tname,\n\t\tprocedure,\n\t\tmeta: appMeta as Record<string, unknown>,\n\t\tstream: stream === true || iterator,\n\t\terrors: errors as ErrorMap | undefined,\n\t\tguardResolvers: guardResolvers as Record<string, Resolver>,\n\t\troute,\n\t\tguardChecks\n\t}\n}\n"]}

package/dist/router.d.ts

@@ -1,4 +1,4 @@
-import type { AnyRouter } from '@orpc/server';
+import { type AnyRouter } from '@orpc/server';
 /**
  * Creates a router object from routes or nested routers.
  * Simply returns the routes as a const object for type inference.
@@ -10,4 +10,16 @@ import type { AnyRouter } from '@orpc/server';
  * ```
  */
 export declare function createRouter<T extends AnyRouter>(routes: T): Readonly<T>;
+/** Serialize these paths to a frontend module; this helper belongs on the server. */
+export declare function createStreamManifest(router: AnyRouter): readonly (readonly string[])[];
+/** Resolve lazy routers before generating the same serializable path manifest. */
+export declare function createStreamManifestAsync(router: AnyRouter): Promise<readonly (readonly string[])[]>;
+/**
+ * Deterministic module source for a stream manifest: paths sorted, `json`
+ * as an array, `ts` as `export const <name>`. Used by `orpc-fn stream-manifest`.
+ */
+export declare function renderStreamManifest(paths: readonly (readonly string[])[], options: {
+    format: 'json' | 'ts';
+    name?: string | undefined;
+}): string;
 //# sourceMappingURL=router.d.ts.map

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAExE"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,SAAS,EAId,MAAM,cAAc,CAAA;AAGrB;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAExE;AAED,qFAAqF;AACrF,wBAAgB,oBAAoB,CACnC,MAAM,EAAE,SAAS,GACf,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAahC;AAED,kFAAkF;AAClF,wBAAsB,yBAAyB,CAC9C,MAAM,EAAE,SAAS,GACf,OAAO,CAAC,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,CASzC;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CACnC,KAAK,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,EACrC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC3D,MAAM,CAUR"}

package/dist/router.js

@@ -1,3 +1,5 @@
+import { resolveContractProcedures, traverseContractProcedures } from '@orpc/server';
+import { readFnMeta } from './meta.js';
 /**
  * Creates a router object from routes or nested routers.
  * Simply returns the routes as a const object for type inference.
@@ -11,4 +13,37 @@
 export function createRouter(routes) {
     return routes;
 }
+/** Serialize these paths to a frontend module; this helper belongs on the server. */
+export function createStreamManifest(router) {
+    const paths = [];
+    const unresolved = traverseContractProcedures({ router, path: [] }, ({ contract, path }) => {
+        if (readFnMeta(contract).stream)
+            paths.push([...path]);
+    });
+    if (unresolved.length)
+        throw new TypeError('orpc-fn: lazy routers require createStreamManifestAsync');
+    return paths;
+}
+/** Resolve lazy routers before generating the same serializable path manifest. */
+export async function createStreamManifestAsync(router) {
+    const paths = [];
+    await resolveContractProcedures({ router, path: [] }, ({ contract, path }) => {
+        if (readFnMeta(contract).stream)
+            paths.push([...path]);
+    });
+    return paths;
+}
+/**
+ * Deterministic module source for a stream manifest: paths sorted, `json`
+ * as an array, `ts` as `export const <name>`. Used by `orpc-fn stream-manifest`.
+ */
+export function renderStreamManifest(paths, options) {
+    const lines = paths
+        .map((path) => `\t[${path.map((segment) => JSON.stringify(segment)).join(', ')}]`)
+        .sort();
+    const array = lines.length ? `[\n${lines.join(',\n')}\n]` : '[]';
+    if (options.format === 'json')
+        return `${array}\n`;
+    return `// Generated by \`orpc-fn stream-manifest\`. Do not edit.\nexport const ${options.name ?? 'streamPaths'}: readonly (readonly string[])[] = ${array}\n`;
+}
 //# sourceMappingURL=router.js.map

package/dist/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAsB,MAAS;IAC1D,OAAO,MAAM,CAAA;AACd,CAAC","sourcesContent":["import type { AnyRouter } from '@orpc/server'\n\n/**\n * Creates a router object from routes or nested routers.\n * Simply returns the routes as a const object for type inference.\n *\n * @example\n * ```ts\n * const items = createRouter({ getItem, updateItem })\n * export const api = createRouter({ metabase, items })\n * ```\n */\nexport function createRouter<T extends AnyRouter>(routes: T): Readonly<T> {\n\treturn routes\n}\n"]}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,yBAAyB,EACzB,0BAA0B,EAC1B,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAsB,MAAS;IAC1D,OAAO,MAAM,CAAA;AACd,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,oBAAoB,CACnC,MAAiB;IAEjB,MAAM,KAAK,GAAe,EAAE,CAAA;IAC5B,MAAM,UAAU,GAAG,0BAA0B,CAC5C,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,EACpB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE;QACtB,IAAI,UAAU,CAAC,QAAwB,CAAC,CAAC,MAAM;YAAE,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IACvE,CAAC,CACD,CAAA;IACD,IAAI,UAAU,CAAC,MAAM;QACpB,MAAM,IAAI,SAAS,CAClB,yDAAyD,CACzD,CAAA;IACF,OAAO,KAAK,CAAA;AACb,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC9C,MAAiB;IAEjB,MAAM,KAAK,GAAe,EAAE,CAAA;IAC5B,MAAM,yBAAyB,CAC9B,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,EACpB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE;QACtB,IAAI,UAAU,CAAC,QAAwB,CAAC,CAAC,MAAM;YAAE,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;IACvE,CAAC,CACD,CAAA;IACD,OAAO,KAAK,CAAA;AACb,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CACnC,KAAqC,EACrC,OAA6D;IAE7D,MAAM,KAAK,GAAG,KAAK;SACjB,GAAG,CACH,CAAC,IAAI,EAAE,EAAE,CACR,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACnE;SACA,IAAI,EAAE,CAAA;IACR,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;IAChE,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM;QAAE,OAAO,GAAG,KAAK,IAAI,CAAA;IAClD,OAAO,2EAA2E,OAAO,CAAC,IAAI,IAAI,aAAa,sCAAsC,KAAK,IAAI,CAAA;AAC/J,CAAC","sourcesContent":["import {\n\ttype AnyRouter,\n\ttype AnyProcedure,\n\tresolveContractProcedures,\n\ttraverseContractProcedures\n} from '@orpc/server'\nimport { readFnMeta } from './meta.js'\n\n/**\n * Creates a router object from routes or nested routers.\n * Simply returns the routes as a const object for type inference.\n *\n * @example\n * ```ts\n * const items = createRouter({ getItem, updateItem })\n * export const api = createRouter({ metabase, items })\n * ```\n */\nexport function createRouter<T extends AnyRouter>(routes: T): Readonly<T> {\n\treturn routes\n}\n\n/** Serialize these paths to a frontend module; this helper belongs on the server. */\nexport function createStreamManifest(\n\trouter: AnyRouter\n): readonly (readonly string[])[] {\n\tconst paths: string[][] = []\n\tconst unresolved = traverseContractProcedures(\n\t\t{ router, path: [] },\n\t\t({ contract, path }) => {\n\t\t\tif (readFnMeta(contract as AnyProcedure).stream) paths.push([...path])\n\t\t}\n\t)\n\tif (unresolved.length)\n\t\tthrow new TypeError(\n\t\t\t'orpc-fn: lazy routers require createStreamManifestAsync'\n\t\t)\n\treturn paths\n}\n\n/** Resolve lazy routers before generating the same serializable path manifest. */\nexport async function createStreamManifestAsync(\n\trouter: AnyRouter\n): Promise<readonly (readonly string[])[]> {\n\tconst paths: string[][] = []\n\tawait resolveContractProcedures(\n\t\t{ router, path: [] },\n\t\t({ contract, path }) => {\n\t\t\tif (readFnMeta(contract as AnyProcedure).stream) paths.push([...path])\n\t\t}\n\t)\n\treturn paths\n}\n\n/**\n * Deterministic module source for a stream manifest: paths sorted, `json`\n * as an array, `ts` as `export const <name>`. Used by `orpc-fn stream-manifest`.\n */\nexport function renderStreamManifest(\n\tpaths: readonly (readonly string[])[],\n\toptions: { format: 'json' | 'ts'; name?: string | undefined }\n): string {\n\tconst lines = paths\n\t\t.map(\n\t\t\t(path) =>\n\t\t\t\t`\\t[${path.map((segment) => JSON.stringify(segment)).join(', ')}]`\n\t\t)\n\t\t.sort()\n\tconst array = lines.length ? `[\\n${lines.join(',\\n')}\\n]` : '[]'\n\tif (options.format === 'json') return `${array}\\n`\n\treturn `// Generated by \\`orpc-fn stream-manifest\\`. Do not edit.\\nexport const ${options.name ?? 'streamPaths'}: readonly (readonly string[])[] = ${array}\\n`\n}\n"]}

package/dist/timing.d.ts

@@ -0,0 +1,8 @@
+/** Internal bridge shared by the execution middleware and HTTP adapters. */
+export declare const REQUEST_TIMING: unique symbol;
+export type InvocationTiming = {
+    procedureMs: number;
+    calls: number;
+};
+export declare const RAW_INPUT: unique symbol;
+//# sourceMappingURL=timing.d.ts.map

package/dist/timing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"timing.d.ts","sourceRoot":"","sources":["../src/timing.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,eAAO,MAAM,cAAc,eAAkC,CAAA;AAC7D,MAAM,MAAM,gBAAgB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAErE,eAAO,MAAM,SAAS,eAA6B,CAAA"}

package/dist/timing.js

@@ -0,0 +1,4 @@
+/** Internal bridge shared by the execution middleware and HTTP adapters. */
+export const REQUEST_TIMING = Symbol('orpc-fn.requestTiming');
+export const RAW_INPUT = Symbol('orpc-fn.rawInput');
+//# sourceMappingURL=timing.js.map

package/dist/timing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"timing.js","sourceRoot":"","sources":["../src/timing.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAA;AAG7D,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAA","sourcesContent":["/** Internal bridge shared by the execution middleware and HTTP adapters. */\nexport const REQUEST_TIMING = Symbol('orpc-fn.requestTiming')\nexport type InvocationTiming = { procedureMs: number; calls: number }\n\nexport const RAW_INPUT = Symbol('orpc-fn.rawInput')\n"]}

package/dist/types.d.ts

@@ -1,6 +1,8 @@
-import type { AnySchema, ErrorMap, InferSchemaInput, InferSchemaOutput, Meta, Schema } from '@orpc/contract';
+import type { AnySchema, ErrorMap, InferSchemaInput, InferSchemaOutput, MergedErrorMap, Schema } from '@orpc/contract';
 import type { AnyProcedure, DecoratedProcedure, Procedure, Route } from '@orpc/server';
-import type { ZodType, z } from 'zod';
+import type { createORPCErrorConstructorMap } from '@orpc/server';
+import type { StoredFnMeta } from './meta.js';
+import type { NativeErrors, NativeMeta } from './compatibility.js';
 import type { BoundCall } from './bound-call.js';
 import type { FnLogger } from './logger.js';
 import type { SpanLike } from './otel.js';
@@ -28,13 +30,13 @@ export type DistributiveOmit<T, K extends PropertyKey> = T extends unknown ? Omi
 /** `fn()` options passed to oRPC's `.route()`; `RouteConfig` is derived from it. */
 export declare const ROUTE_OPTION_KEYS: readonly ["path", "method", "summary", "description", "deprecated", "successStatus", "successDescription", "inputStructure", "outputStructure", "tags"];
 /**
- * `fn()` option names owned by the route itself. Guard and meta keys must not
+ * `fn()` option names owned by the route itself. Guard keys must not
  * reuse them: such an option would be read as the route option and the guard
  * would never run.
  */
-export declare const RESERVED_OPTION_KEYS: readonly ["path", "method", "summary", "description", "deprecated", "successStatus", "successDescription", "inputStructure", "outputStructure", "tags", "name", "procedure", "input", "output", "handler", "live", "operationId"];
+export declare const RESERVED_OPTION_KEYS: readonly ["path", "method", "summary", "description", "deprecated", "successStatus", "successDescription", "inputStructure", "outputStructure", "tags", "name", "procedure", "input", "output", "handler", "live", "operationId", "meta", "stream", "errors", "guardResolvers"];
 export type ReservedOptionKey = (typeof RESERVED_OPTION_KEYS)[number];
-/** @internal Builds one route from a `procedures` builder; shared by `fn` and `createPubSub`. */
+/** @internal Builds one route from a selected native procedure builder. */
 export type BuildProcedure = (options: {
     name: string;
     procedure: string | undefined;
@@ -42,25 +44,33 @@ export type BuildProcedure = (options: {
     meta: Record<string, unknown>;
     input?: AnySchema | undefined;
     output?: AnySchema | undefined;
+    stream?: boolean;
+    errors?: ErrorMap;
     handler: (options: {
         input: unknown;
-        context: Record<string, unknown>;
+        context: Record<string | symbol, unknown>;
         signal?: AbortSignal;
+        lastEventId?: string;
+        errors: ReturnType<typeof createORPCErrorConstructorMap>;
     }) => unknown;
 }) => AnyProcedure;
 /** Turns every key of `T` found in `K` into a readable type error. */
 export type RejectKeys<T, K extends PropertyKey, TMessage extends string> = {
     [P in Extract<keyof T, K>]: TMessage;
 };
+/** Params every handler receives; extras may not reuse these names. */
+type HandlerParamKey = 'input' | 'context' | 'call' | 'signal' | 'span' | 'logger' | 'errors' | 'lastEventId';
 /**
  * Handler extras must have known keys: an index signature would claim every
  * handler param. Intersected into `createFn`'s options to reject it.
  */
-export type FiniteExtras<T> = string extends keyof T ? {
+export type FiniteExtras<T> = T extends unknown ? string extends keyof T ? {
     extras: 'orpc-fn: extras need known keys, not an index signature';
 } : number extends keyof T ? {
     extras: 'orpc-fn: extras need known keys, not an index signature';
-} : unknown;
+} : Extract<keyof T, HandlerParamKey> extends never ? unknown : {
+    extras: 'orpc-fn: extras cannot shadow handler parameters';
+} : never;
 type ProcedureOf<TBuilder> = TBuilder extends {
     handler(handler: never): infer TProcedure;
 } ? TProcedure : never;
@@ -68,16 +78,8 @@ type ProcedureOf<TBuilder> = TBuilder extends {
 export type InitialContextOf<TBuilder> = ProcedureContext<ProcedureOf<TBuilder>>;
 /** Context the handler sees, after the builder's middleware. */
 export type CurrentContextOf<TBuilder> = ProcedureOf<TBuilder> extends Procedure<infer _TInitial, infer TContext, infer _TIn, infer _TOut, infer _TErrors, infer _TMeta> ? TContext : never;
-type ErrorMapOf<TBuilder> = ProcedureOf<TBuilder> extends {
-    '~orpc': {
-        errorMap: infer T extends ErrorMap;
-    };
-} ? T : ErrorMap;
-type MetaOf<TBuilder> = ProcedureOf<TBuilder> extends {
-    '~orpc': {
-        meta: infer T extends Meta;
-    };
-} ? T : Meta;
+export type ErrorMapOf<TBuilder> = NativeErrors<ProcedureOf<TBuilder>>;
+type MetaOf<TBuilder> = NativeMeta<ProcedureOf<TBuilder>>;
 /**
  * Everything `createFn` inferred from its options. Route types read from it;
  * apps rarely spell it out.
@@ -86,6 +88,7 @@ export type FnDefinition = {
     procedures: Record<string, BuilderLike>;
     default: string;
     extras: object;
+    extrasByProcedure?: Partial<Record<string, object>>;
     guards: object;
     meta: object;
     tag: string;
@@ -114,11 +117,15 @@ export type GuardParams<TContext, TMeta> = {
  * `fn({...})`; the guard runs only on routes that set it. Throw (usually an
  * `ORPCError`) to refuse the call.
  */
-export type Guard<TValue, TParams> = (value: TValue, params: TParams) => unknown;
+export type Guard<TValue, TParams> = (value: TValue, params: TParams) => MaybePromise<void | boolean>;
 export type GuardOptions<TGuards> = {
     [K in keyof TGuards]?: TGuards[K] extends (value: infer TValue, params: never) => unknown ? TValue : never;
 };
-export type HandlerParams<TDef extends FnDefinition, TInput, TKey extends ProcedureKey<TDef>> = DistributiveOmit<TDef['extras'], 'input' | 'context' | 'call' | 'signal' | 'span' | 'logger'> & {
+/** Match object spread: scoped extras replace shared keys, preserving unions. */
+type MergeExtras<TShared, TScoped> = TShared extends unknown ? TScoped extends unknown ? Omit<TShared, keyof TScoped> & TScoped : never : never;
+export type HandlerParams<TDef extends FnDefinition, TInput, TKey extends ProcedureKey<TDef>, TErrors extends ErrorMap = Record<never, never>> = DistributiveOmit<MergeExtras<TDef['extras'], TDef extends {
+    extrasByProcedure: infer E;
+} ? TKey extends keyof E ? E[TKey] : object : object>, HandlerParamKey> & {
     input: TInput;
     context: FnContext<TDef, TKey>;
     /** Calls another procedure with this context and signal, in a child span. */
@@ -128,6 +135,8 @@ export type HandlerParams<TDef extends FnDefinition, TInput, TKey extends Proced
     /** Active OpenTelemetry span, undefined when `createFn({ otel })` is not set. */
     span: TDef['span'] | undefined;
     logger: TDef['logger'];
+    lastEventId: string | undefined;
+    errors: ReturnType<typeof createORPCErrorConstructorMap<MergedErrorMap<ErrorMapOf<TDef['procedures'][TKey]>, TErrors>>>;
 };
 /** Route options shared by every `fn()` overload. */
 export type RouteConfig<TTag extends string = string> = Pick<Route, Exclude<(typeof ROUTE_OPTION_KEYS)[number], 'tags'>> & {
@@ -135,7 +144,18 @@ export type RouteConfig<TTag extends string = string> = Pick<Route, Exclude<(typ
     name: string;
     tags?: TTag[];
 };
-export type FnRouteOptions<TDef extends FnDefinition, TKey extends ProcedureKey<TDef>> = RouteConfig<TDef['tag']> & GuardOptions<TDef['guards']> & TDef['meta'] & ProcedureOption<TDef, TKey>;
+export type FnRouteOptions<TDef extends FnDefinition, TKey extends ProcedureKey<TDef>, TInput = unknown, TErrors extends ErrorMap = Record<never, never>> = RouteConfig<TDef['tag']> & GuardOptions<TDef['guards']> & {
+    meta?: TDef['meta'];
+    stream?: boolean;
+    errors?: TErrors;
+    guardResolvers?: {
+        [K in keyof TDef['guards']]?: (params: {
+            input: TInput;
+            context: FnContext<TDef, TKey>;
+            signal: AbortSignal | undefined;
+        }) => MaybePromise<GuardOptions<TDef['guards']>[K]>;
+    };
+} & ProcedureOption<TDef, TKey>;
 /**
  * Which `createFn({ procedures })` builder a route uses. Optional when
  * `createFn` has a `default`; required on every route when it has none.
@@ -145,40 +165,42 @@ export type ProcedureOption<TDef extends FnDefinition, TKey extends ProcedureKey
 } : {
     procedure?: TKey;
 };
-export type FnProcedure<TDef extends FnDefinition, TKey extends ProcedureKey<TDef>, TInputSchema extends Schema<unknown, unknown>, TOutputSchema extends Schema<unknown, unknown>> = DecoratedProcedure<InitialContextOf<TDef['procedures'][TKey]>, FnContext<TDef, TKey>, TInputSchema, TOutputSchema, ErrorMapOf<TDef['procedures'][TKey]>, MetaOf<TDef['procedures'][TKey]>>;
-type InputOf<T> = [T] extends [ZodType] ? z.output<T> : unknown;
-type ReturnOf<TOut, TReturn> = [TOut] extends [ZodType] ? z.input<TOut> : TReturn;
+export type FnProcedure<TDef extends FnDefinition, TKey extends ProcedureKey<TDef>, TInputSchema extends Schema<unknown, unknown>, TOutputSchema extends Schema<unknown, unknown>, TErrors extends ErrorMap = Record<never, never>> = DecoratedProcedure<InitialContextOf<TDef['procedures'][TKey]>, FnContext<TDef, TKey>, TInputSchema, TOutputSchema, MergedErrorMap<ErrorMapOf<TDef['procedures'][TKey]>, TErrors>, MetaOf<TDef['procedures'][TKey]> & {
+    'orpc-fn': StoredFnMeta<TDef['meta'], TKey>;
+}>;
+type InputOf<T> = [T] extends [AnySchema] ? InferSchemaOutput<T> : unknown;
+type ReturnOf<TOut, TReturn> = [TOut] extends [AnySchema] ? InferSchemaInput<TOut> : TReturn;
 /** `fn()`: four overloads for input/output schema × inferred. */
 export interface Fn<TDef extends FnDefinition> {
-    <TInput extends ZodType, TOut extends ZodType, TKey extends ProcedureKey<TDef> = TDef['default']>(options: {
+    <TInput extends AnySchema, TOut extends AnySchema, TKey extends ProcedureKey<TDef> = TDef['default'], TErrors extends ErrorMap = Record<never, never>>(options: {
         input: TInput;
         output: TOut;
-        handler: (params: HandlerParams<TDef, z.output<TInput>, NoInfer<TKey>>) => MaybePromise<z.input<TOut>>;
-    } & FnRouteOptions<TDef, TKey>): FnProcedure<TDef, TKey, TInput, TOut>;
-    <TInput extends ZodType, TReturn, TKey extends ProcedureKey<TDef> = TDef['default']>(options: {
+        handler: (params: HandlerParams<TDef, InferSchemaOutput<TInput>, NoInfer<TKey>, TErrors>) => MaybePromise<InferSchemaInput<TOut>>;
+    } & FnRouteOptions<TDef, TKey, InferSchemaOutput<TInput>, TErrors>): FnProcedure<TDef, TKey, TInput, TOut, TErrors>;
+    <TInput extends AnySchema, TReturn, TKey extends ProcedureKey<TDef> = TDef['default'], TErrors extends ErrorMap = Record<never, never>>(options: {
         input: TInput;
         output?: undefined;
-        handler: (params: HandlerParams<TDef, z.output<TInput>, NoInfer<TKey>>) => MaybePromise<TReturn>;
-    } & FnRouteOptions<TDef, TKey>): FnProcedure<TDef, TKey, TInput, Schema<TReturn, TReturn>>;
-    <TOut extends ZodType, TKey extends ProcedureKey<TDef> = TDef['default']>(options: {
+        handler: (params: HandlerParams<TDef, InferSchemaOutput<TInput>, NoInfer<TKey>, TErrors>) => MaybePromise<TReturn>;
+    } & FnRouteOptions<TDef, TKey, InferSchemaOutput<TInput>, TErrors>): FnProcedure<TDef, TKey, TInput, Schema<TReturn, TReturn>, TErrors>;
+    <TOut extends AnySchema, TKey extends ProcedureKey<TDef> = TDef['default'], TErrors extends ErrorMap = Record<never, never>>(options: {
         input?: undefined;
         output: TOut;
-        handler: (params: HandlerParams<TDef, unknown, NoInfer<TKey>>) => MaybePromise<z.input<TOut>>;
-    } & FnRouteOptions<TDef, TKey>): FnProcedure<TDef, TKey, Schema<unknown, unknown>, TOut>;
-    <TReturn, TKey extends ProcedureKey<TDef> = TDef['default']>(options: {
+        handler: (params: HandlerParams<TDef, unknown, NoInfer<TKey>, TErrors>) => MaybePromise<InferSchemaInput<TOut>>;
+    } & FnRouteOptions<TDef, TKey, unknown, TErrors>): FnProcedure<TDef, TKey, Schema<unknown, unknown>, TOut, TErrors>;
+    <TReturn, TKey extends ProcedureKey<TDef> = TDef['default'], TErrors extends ErrorMap = Record<never, never>>(options: {
         input?: undefined;
         output?: undefined;
-        handler: (params: HandlerParams<TDef, unknown, NoInfer<TKey>>) => MaybePromise<TReturn>;
-    } & FnRouteOptions<TDef, TKey>): FnProcedure<TDef, TKey, Schema<unknown, unknown>, Schema<TReturn, TReturn>>;
-    <TReturn, TInput extends ZodType | undefined = undefined, TOut extends ZodType | undefined = undefined, TKey extends ProcedureKey<TDef> = TDef['default']>(options: {
+        handler: (params: HandlerParams<TDef, unknown, NoInfer<TKey>, TErrors>) => MaybePromise<TReturn>;
+    } & FnRouteOptions<TDef, TKey, unknown, TErrors>): FnProcedure<TDef, TKey, Schema<unknown, unknown>, Schema<TReturn, TReturn>, TErrors>;
+    <TReturn, TInput extends AnySchema | undefined = undefined, TOut extends AnySchema | undefined = undefined, TKey extends ProcedureKey<TDef> = TDef['default'], TErrors extends ErrorMap = Record<never, never>>(options: {
         input?: TInput;
         output?: TOut;
-        handler: (params: HandlerParams<TDef, InputOf<TInput>, NoInfer<TKey>>) => MaybePromise<ReturnOf<TOut, TReturn>>;
-    } & FnRouteOptions<TDef, TKey>): FnProcedure<TDef, TKey, [
+        handler: (params: HandlerParams<TDef, InputOf<TInput>, NoInfer<TKey>, TErrors>) => MaybePromise<ReturnOf<TOut, TReturn>>;
+    } & FnRouteOptions<TDef, TKey, InputOf<TInput>, TErrors>): FnProcedure<TDef, TKey, [
         TInput
-    ] extends [ZodType] ? TInput : Schema<unknown, unknown>, [
+    ] extends [AnySchema] ? TInput : Schema<unknown, unknown>, [
         TOut
-    ] extends [ZodType] ? TOut : Schema<TReturn, TReturn>>;
+    ] extends [AnySchema] ? TOut : Schema<TReturn, TReturn>, TErrors>;
 }
 /** What `fn.completed` reports, and what `onCompleted` receives. */
 export type FnCompletedEvent<TContext = unknown, TSpan = SpanLike> = {
@@ -186,11 +208,44 @@ export type FnCompletedEvent<TContext = unknown, TSpan = SpanLike> = {
     procedure: string;
     durationMs: number;
     success: boolean;
+    /** False when authentication or input validation prevented handler execution. */
+    handlerStarted: boolean;
     error: unknown;
     input: unknown;
     context: TContext;
     span: TSpan | undefined;
     meta: Record<string, unknown>;
 };
+/** Factory hooks retain the builder key/context relationship. */
+export type ProcedureHookParams<TProcedures extends Record<string, BuilderLike>, TExtra = object> = {
+    [K in keyof TProcedures & string]: TExtra & {
+        procedure: K;
+        context: CurrentContextOf<TProcedures[K]>;
+    };
+}[keyof TProcedures & string];
+export type CompletedHookEvent<TProcedures extends Record<string, BuilderLike>, TSpan> = {
+    [K in keyof TProcedures & string]: Omit<FnCompletedEvent<unknown, TSpan>, 'context' | 'procedure' | 'handlerStarted'> & {
+        procedure: K;
+    } & ({
+        handlerStarted: true;
+        context: CurrentContextOf<TProcedures[K]>;
+    } | {
+        handlerStarted: false;
+        context: InitialContextOf<TProcedures[K]>;
+    });
+}[keyof TProcedures & string];
+/**
+ * Intersected into each scoped extras function's return type: rejects index
+ * signatures and handler-parameter names at the offending property. A
+ * top-level conditional over the whole map broke inference when zero-argument
+ * and context-reading functions were mixed.
+ */
+export type ScopedExtrasGuard<T> = (string extends keyof T ? {
+    'orpc-fn: scoped extras need finite keys': never;
+} : number extends keyof T ? {
+    'orpc-fn: scoped extras need finite keys': never;
+} : unknown) & {
+    [K in HandlerParamKey]?: never;
+};
 export {};
 //# sourceMappingURL=types.d.ts.map