orpc-fn 0.1.0 → 0.3.0

package/dist/create-fn.d.ts

@@ -1,23 +1,12 @@
-import type { AnyProcedure } from '@orpc/server';
 import { type BoundCall } from './bound-call.js';
 import { type FnLive } from './live/fn-live.js';
 import { type CreatePublisher, type CreatePubSub, type PubSubRuntimeOptions } from './live/pub-sub.js';
 import { type FnLogger, type LogAttributes } from './logger.js';
-import { type FnMeta } from './meta.js';
-import { type AttributeValue, type OtelApiLike, type SpanLike, type SpanOf } from './otel.js';
+import { readFnMeta } from './meta.js';
+import { type AttributeValue, type OtelApiLike, type SpanOf } from './otel.js';
 import { createRouter } from './router.js';
-import { type AnyFnContext, type BuilderLike, type FiniteExtras, type Fn, type FnCompletedEvent, type FnDefinition, type Guard, type GuardParams, type MaybePromise, type RejectKeys, type ReservedOptionKey } from './types.js';
-type UnionContext<TProcedures extends Record<string, BuilderLike>> = AnyFnContext<{
-    procedures: TProcedures;
-    default: string;
-    extras: object;
-    guards: object;
-    meta: object;
-    tag: string;
-    span: SpanLike;
-    logger: FnLogger;
-}>;
-export type CreateFnOptions<TProcedures extends Record<string, BuilderLike>, TDefault extends keyof TProcedures & string, TExtras extends object, TGuards, TMeta extends object, TTag extends string, TOtel extends OtelApiLike | undefined, TLogger extends FnLogger> = {
+import { type ProcedureHookParams, type CompletedHookEvent, type CurrentContextOf, type BuilderLike, type FiniteExtras, type ScopedExtrasGuard, type Fn, type FnDefinition, type Guard, type GuardParams, type MaybePromise, type RejectKeys, type ReservedOptionKey } from './types.js';
+export type CreateFnOptions<TProcedures extends Record<string, BuilderLike>, TDefault extends keyof TProcedures & string, TExtras extends object, TGuards, TMeta extends object, TTag extends string, TOtel extends OtelApiLike | undefined, TLogger extends FnLogger, TScoped extends Partial<Record<keyof TProcedures, object>> = Record<never, never>> = {
     /** Named oRPC builders, e.g. `{ public: os.$context<Ctx>(), protected: authed }`. */
     procedures: TProcedures;
     /**
@@ -26,46 +15,52 @@ export type CreateFnOptions<TProcedures extends Record<string, BuilderLike>, TDe
      */
     default?: TDefault;
     /** Per-call values merged into every handler's params; may be async. */
-    extras?: (params: {
-        context: UnionContext<TProcedures>;
+    extras?: (params: ProcedureHookParams<TProcedures, {
         span: SpanOf<TOtel> | undefined;
         signal: AbortSignal | undefined;
         name: string;
-        procedure: string;
-    }) => MaybePromise<TExtras>;
+    }>) => MaybePromise<TExtras>;
+    extrasByProcedure?: {
+        [K in keyof TScoped & keyof TProcedures]: (params: {
+            context: CurrentContextOf<TProcedures[K]>;
+            span: SpanOf<TOtel> | undefined;
+            signal: AbortSignal | undefined;
+            name: string;
+            procedure: K;
+        }) => MaybePromise<TScoped[K] & ScopedExtrasGuard<NoInfer<TScoped[K]>>>;
+    };
     /**
      * Checks run before the handler; each key becomes a typed `fn()` option.
-     * Keys must not reuse route options or meta keys.
+     * Keys must not reuse route options. False denies, true or void allows.
      */
-    guards?: TGuards & Record<string, Guard<never, GuardParams<UnionContext<TProcedures>, TMeta>>> & RejectKeys<NoInfer<TGuards>, ReservedOptionKey | keyof NoInfer<TMeta>, 'orpc-fn: this guard name is a route option or meta key'>;
+    guards?: TGuards & Record<string, Guard<never, ProcedureHookParams<TProcedures, Omit<GuardParams<unknown, TMeta>, 'context' | 'procedure'>>>> & RejectKeys<NoInfer<TGuards>, ReservedOptionKey, 'orpc-fn: this guard name is a route option'>;
     /**
-     * Typed route metadata: `meta: {} as { readOnly?: boolean }`. Keys become
-     * `fn()` options and must not reuse route options.
+     * Typed route metadata contract: `meta: defineMeta<AppMeta>()`.
+     * Route declarations place values inside their own `meta` object.
      */
-    meta?: TMeta & RejectKeys<NoInfer<TMeta>, ReservedOptionKey, 'orpc-fn: this meta key is a route option'>;
+    meta?: TMeta;
     /** Allowed route tags: `tags: ['internal', 'external']`. */
     tags?: readonly TTag[];
     /** `import * as otel from '@opentelemetry/api'`. Omit for no tracing. */
     otel?: TOtel;
     logger?: (scope: string, span: SpanOf<TOtel> | undefined) => TLogger;
     /** Extra span attributes per call; undefined values are skipped. */
-    spanAttributes?: (params: {
-        context: UnionContext<TProcedures>;
+    spanAttributes?: (params: ProcedureHookParams<TProcedures, {
         name: string;
-        procedure: string;
         meta: Partial<TMeta>;
-    }) => Record<string, AttributeValue | undefined>;
-    /** Called after every handler; returned attributes join the `fn.completed` log. */
-    onCompleted?: (event: FnCompletedEvent<UnionContext<TProcedures>, SpanOf<TOtel>>) => LogAttributes | undefined | void;
+    }>) => Record<string, AttributeValue | undefined>;
+    /** Called after the procedure (or stream) settles; returned attributes join the `fn.completed` log. */
+    onCompleted?: (event: CompletedHookEvent<TProcedures, SpanOf<TOtel>>) => LogAttributes | undefined | void;
     /** Errors that are the caller's fault, logged at `warn`. Default: 4xx `ORPCError` or `AbortError`. */
     isExpectedError?: (error: unknown) => boolean;
     /** Needed for `fnLive` and `createPubSub`. */
     pubsub?: PubSubRuntimeOptions;
 };
-type Definition<TProcedures extends Record<string, BuilderLike>, TDefault extends string, TExtras extends object, TGuards, TMeta extends object, TTag extends string, TOtel, TLogger extends FnLogger> = {
+type Definition<TProcedures extends Record<string, BuilderLike>, TDefault extends string, TExtras extends object, TGuards, TMeta extends object, TTag extends string, TOtel, TLogger extends FnLogger, TScoped extends Partial<Record<keyof TProcedures, object>> = Record<never, never>> = {
     procedures: TProcedures;
     default: TDefault;
     extras: TExtras;
+    extrasByProcedure: TScoped;
     guards: TGuards;
     meta: TMeta;
     tag: TTag;
@@ -78,13 +73,14 @@ export type FnFactory<TDef extends FnDefinition> = {
     createPubSub: CreatePubSub<TDef>;
     createPublisher: CreatePublisher;
     createRouter: typeof createRouter;
-    readMeta: (procedure: AnyProcedure) => FnMeta<TDef['meta']>;
+    readMeta: typeof readFnMeta;
     /**
      * A `call` outside any handler (seeders, scripts, tests), traced with this
      * instance's OpenTelemetry.
      */
     createCall: <TContext>(context: TContext, signal?: AbortSignal) => BoundCall<TContext>;
-    /** End every open subscription of this instance; returns how many closed. */
+    /** Terminal, idempotent shutdown: close streams and await owned resources. */
+    shutdown: () => Promise<void>;
     drainPubSubSubscribers: () => number;
     activePubSubSubscriberCount: () => number;
 };
@@ -92,6 +88,6 @@ export type FnFactory<TDef extends FnDefinition> = {
  * Builds the app's `fn` and friends once. Everything app-specific (auth,
  * context, database, queues, i18n, permissions) is injected here.
  */
-export declare function createFn<const TProcedures extends Record<string, BuilderLike>, TDefault extends keyof TProcedures & string = never, TExtras extends object = Record<never, never>, TGuards extends object = Record<never, never>, TMeta extends object = Record<never, never>, const TTag extends string = string, TOtel extends OtelApiLike | undefined = undefined, TLogger extends FnLogger = FnLogger>(options: CreateFnOptions<TProcedures, TDefault, TExtras, TGuards, TMeta, TTag, TOtel, TLogger> & FiniteExtras<NoInfer<TExtras>>): FnFactory<Definition<TProcedures, TDefault, TExtras, TGuards, TMeta, TTag, TOtel, TLogger>>;
+export declare function createFn<const TProcedures extends Record<string, BuilderLike>, TDefault extends keyof TProcedures & string = never, TExtras extends object = Record<never, never>, TGuards extends object = Record<never, never>, TMeta extends object = Record<never, never>, const TTag extends string = string, TOtel extends OtelApiLike | undefined = undefined, TLogger extends FnLogger = FnLogger, TScoped extends Partial<Record<keyof TProcedures, object>> = Record<never, never>>(options: CreateFnOptions<TProcedures, TDefault, TExtras, TGuards, TMeta, TTag, TOtel, TLogger, TScoped> & FiniteExtras<NoInfer<TExtras>>): FnFactory<Definition<TProcedures, TDefault, TExtras, TGuards, TMeta, TTag, TOtel, TLogger, TScoped>>;
 export {};
 //# sourceMappingURL=create-fn.d.ts.map

package/dist/create-fn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-fn.d.ts","sourceRoot":"","sources":["../src/create-fn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-fn.d.ts","sourceRoot":"","sources":["../src/create-fn.ts"],"names":[],"mappings":"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"}

package/dist/create-fn.js

@@ -1,12 +1,18 @@
+import { createProcedureAssembler } from './assemble-procedure.js';
+import { isAsyncIteratorObject } from './stream.js';
+import { normalizeRoute } from './route-options.js';
+import { ORPCError, os } from '@orpc/server';
+import { procedureDefinition } from './compatibility.js';
 import { createBoundCall } from './bound-call.js';
 import { isExpectedClientError } from './expected-client-error.js';
 import { createFnLive } from './live/fn-live.js';
 import { createLiveRuntime } from './live/pub-sub.js';
-import { createDefaultLogger } from './logger.js';
-import { FN_META_KEY, readFnMeta } from './meta.js';
+import { createDefaultLogger, protectLogger } from './logger.js';
+import { readFnMeta } from './meta.js';
 import { createTracing, errorMessageOf } from './otel.js';
+import { RAW_INPUT, REQUEST_TIMING } from './timing.js';
 import { createRouter } from './router.js';
-import { RESERVED_OPTION_KEYS, ROUTE_OPTION_KEYS } from './types.js';
+import { RESERVED_OPTION_KEYS } from './types.js';
 /**
  * Builds the app's `fn` and friends once. Everything app-specific (auth,
  * context, database, queues, i18n, permissions) is injected here.
@@ -14,19 +20,30 @@ import { RESERVED_OPTION_KEYS, ROUTE_OPTION_KEYS } from './types.js';
 export function createFn(options) {
     const runtime = options;
     const tracing = createTracing(runtime.otel);
-    const defaultLogger = createDefaultLogger('fn');
-    const createLogger = runtime.logger ??
-        ((scope) => scope === 'fn' ? defaultLogger : createDefaultLogger(scope));
+    const defaultLogger = protectLogger(createDefaultLogger('fn'));
+    const createLogger = (scope, span) => {
+        try {
+            return protectLogger(runtime.logger?.(scope, span) ??
+                (scope === 'fn' ? defaultLogger : createDefaultLogger(scope)));
+        }
+        catch {
+            return defaultLogger;
+        }
+    };
     const isExpectedError = runtime.isExpectedError ?? isExpectedClientError;
     const guards = runtime.guards ?? {};
     const isGuard = (option) => Object.hasOwn(guards, option);
     for (const guard of Object.keys(guards)) {
+        if (typeof guards[guard] !== 'function')
+            throw new TypeError(`orpc-fn: guard ${guard} must be a function`);
         if (RESERVED_OPTION_KEYS.includes(guard)) {
             throw new Error(`orpc-fn: guard "${guard}" reuses a route option name; rename it`);
         }
     }
+    if (runtime.default && !Object.hasOwn(runtime.procedures, runtime.default))
+        throw new TypeError(`orpc-fn: unknown default procedure ${runtime.default}`);
     for (const [key, builder] of Object.entries(runtime.procedures)) {
-        const def = builder['~orpc'];
+        const def = procedureDefinition(builder);
         if (def?.inputSchema !== undefined || def?.outputSchema !== undefined) {
             throw new Error(`orpc-fn: procedure "${key}" sets an input or output schema; set schemas on routes instead`);
         }
@@ -38,138 +55,170 @@ export function createFn(options) {
         }
         return key;
     };
-    const buildProcedure = (route) => {
-        const key = resolveKey(route.procedure, route.name);
-        let builder = runtime.procedures[key];
-        if (!builder)
-            throw new Error(`orpc-fn: unknown procedure "${key}"`);
-        const stored = {
-            name: route.name,
-            procedure: key,
-            meta: route.meta
-        };
-        builder = builder
-            .route({
-            operationId: route.name,
-            ...Object.fromEntries(Object.entries(route.route).filter(([, value]) => value !== undefined))
-        })
-            .meta({ [FN_META_KEY]: stored });
-        if (route.input)
-            builder = builder.input(route.input);
-        if (route.output)
-            builder = builder.output(route.output);
-        return builder.handler(route.handler);
-    };
-    // biome-ignore lint/suspicious/noExplicitAny: the overloads in `Fn` carry the types
+    const buildProcedure = createProcedureAssembler(runtime.procedures, resolveKey);
+    const invocation = Symbol('orpc-fn.invocation');
+    // The overload-to-runtime boundary is adapted once at the returned factory.
     const fn = (routeOptions) => {
-        const { handler, input, output, name, procedure, ...rest } = routeOptions;
+        const { handler, input, output, name, procedure, meta, stream, errors, guardResolvers, route, guardChecks } = normalizeRoute(routeOptions, isGuard);
         const key = resolveKey(procedure, name);
-        const route = {};
-        const guardChecks = [];
-        const meta = {};
-        for (const [option, value] of Object.entries(rest)) {
-            if (value === undefined)
-                continue;
-            if (ROUTE_OPTION_KEYS.includes(option))
-                route[option] = value;
-            else if (isGuard(option))
-                guardChecks.push([option, value]);
-            else
-                meta[option] = value;
-        }
-        return buildProcedure({
+        const built = buildProcedure({
             name,
             procedure: key,
             route,
             meta,
             input,
             output,
-            handler: (params) => {
+            stream,
+            ...(errors ? { errors } : {}),
+            handler: async (params) => {
                 const { context, signal } = params;
-                const startTime = performance.now();
-                const elapsedMs = () => Math.round((performance.now() - startTime) * 100) / 100;
-                let logger = defaultLogger;
-                return tracing.inSpan(name, 'SERVER', async (span) => {
-                    logger = createLogger('fn', span);
-                    span?.setAttribute('fn.operation', name);
-                    span?.setAttribute('fn.procedure', key);
+                const state = context[invocation];
+                const { [invocation]: _invocation, ...observedContext } = context;
+                state.context = observedContext;
+                state.input = params.input;
+                state.handlerStarted = true;
+                try {
                     const attributes = runtime.spanAttributes?.({
                         context,
                         name,
                         procedure: key,
                         meta
                     });
-                    for (const [attribute, value] of Object.entries(attributes ?? {})) {
+                    for (const [attribute, value] of Object.entries(attributes ?? {}))
                         if (value !== undefined)
-                            span?.setAttribute(attribute, value);
-                    }
-                    try {
-                        for (const [guard, value] of guardChecks) {
-                            await guards[guard]?.(value, {
-                                context,
-                                input: params.input,
-                                name,
-                                procedure: key,
-                                meta,
-                                signal
-                            });
-                        }
-                        const extras = await runtime.extras?.({
-                            context,
-                            span,
-                            signal,
-                            name,
-                            procedure: key
-                        });
-                        return await handler({
-                            ...extras,
-                            input: params.input,
-                            context,
-                            call: createBoundCall(context, signal, tracing),
-                            signal,
-                            span,
-                            logger
-                        });
-                    }
-                    finally {
-                        // Server-Timing reports the time until the result (or stream) exists.
-                        const timing = context.timing;
-                        if (typeof timing === 'object' && timing !== null) {
-                            ;
-                            timing.handler_ms = elapsedMs();
-                        }
-                    }
-                }, 
-                // After the result, or after a returned stream ends; before the span ends.
-                (span, ...error) => {
-                    const durationMs = elapsedMs();
-                    span?.setAttribute('fn.duration_ms', durationMs);
-                    logCompleted(logger, {
+                            state.span?.setAttribute(attribute, value);
+                }
+                catch (error) {
+                    state.logger.warn('spanAttributes hook failed', {
+                        error: errorMessageOf(error)
+                    });
+                }
+                const resolvedChecks = [...guardChecks];
+                for (const [guard, resolver] of Object.entries(guardResolvers)) {
+                    const value = await resolver({ input: params.input, context, signal });
+                    if (value !== undefined)
+                        resolvedChecks.push([guard, value]);
+                }
+                for (const [guard, value] of resolvedChecks) {
+                    const result = await guards[guard]?.(value, {
+                        context,
+                        input: params.input,
                         name,
                         procedure: key,
-                        durationMs,
-                        success: error.length === 0,
-                        error: error[0],
-                        input: params.input,
-                        context,
-                        span,
-                        meta
+                        meta,
+                        signal
                     });
+                    if (result === false)
+                        throw new ORPCError('FORBIDDEN', {
+                            message: `Guard "${guard}" denied this call`
+                        });
+                    if (result !== undefined && result !== true)
+                        throw new TypeError(`orpc-fn: guard "${guard}" must return void or boolean`);
+                }
+                const extraParams = {
+                    context,
+                    span: state.span,
+                    signal,
+                    name,
+                    procedure: key
+                };
+                const shared = await runtime.extras?.(extraParams);
+                const scoped = await runtime.extrasByProcedure?.[key]?.(extraParams);
+                const extras = {
+                    ...shared,
+                    ...scoped
+                };
+                if (extras && typeof extras === 'object') {
+                    for (const reserved of [
+                        'input',
+                        'context',
+                        'call',
+                        'signal',
+                        'span',
+                        'logger',
+                        'errors',
+                        'lastEventId'
+                    ]) {
+                        if (Object.hasOwn(extras, reserved))
+                            throw new TypeError(`orpc-fn: extra "${reserved}" shadows a handler parameter`);
+                    }
+                }
+                return handler({
+                    ...extras,
+                    input: params.input,
+                    context,
+                    call: createBoundCall(context, signal, tracing),
+                    signal,
+                    span: state.span,
+                    logger: state.logger,
+                    errors: params.errors,
+                    lastEventId: params.lastEventId,
+                    [RAW_INPUT]: state.rawInput
                 });
             }
         });
+        // Prepending middleware shifts oRPC's validation indexes, covering auth,
+        // input validation, output validation, and the final stream lifetime.
+        return os
+            .use(async ({ context, next }, rawInput) => {
+            const started = performance.now();
+            const state = {
+                span: undefined,
+                logger: defaultLogger,
+                input: undefined,
+                context,
+                handlerStarted: false,
+                rawInput
+            };
+            const result = await tracing.inSpan(name, 'SERVER', async (span) => {
+                state.span = span;
+                state.logger = createLogger('fn', span);
+                span?.setAttribute('fn.operation', name);
+                span?.setAttribute('fn.procedure', key);
+                try {
+                    const result = await next({ context: { [invocation]: state } });
+                    if (isAsyncIteratorObject(result.output) !== stream) {
+                        if (isAsyncIteratorObject(result.output)) {
+                            try {
+                                await result.output.return?.();
+                            }
+                            catch {
+                                /* Release the unexpected stream. */
+                            }
+                        }
+                        throw new TypeError(`orpc-fn: ${name} returned a result inconsistent with stream; declare stream: true for iterators`);
+                    }
+                    return result.output;
+                }
+                finally {
+                    const timing = context[REQUEST_TIMING];
+                    if (timing && !context[invocation]) {
+                        timing.procedureMs += performance.now() - started;
+                        timing.calls++;
+                    }
+                }
+            }, (span, ...error) => {
+                const durationMs = Math.round((performance.now() - started) * 100) / 100;
+                span?.setAttribute('fn.duration_ms', durationMs);
+                logCompleted(state.logger, {
+                    name,
+                    procedure: key,
+                    durationMs,
+                    success: error.length === 0,
+                    error: error[0],
+                    input: state.input,
+                    context: state.context,
+                    span,
+                    meta,
+                    handlerStarted: state.handlerStarted
+                });
+            });
+            return { output: result, context };
+        })
+            .router({ route: built }).route;
     };
     const logCompleted = (logger, event) => {
         const { error, success } = event;
-        const timing = event.context.timing;
-        const timingFields = {};
-        if (typeof timing === 'object' && timing !== null) {
-            for (const [field, value] of Object.entries(timing)) {
-                if (field !== 'handler_ms' && typeof value === 'number') {
-                    timingFields[field] = value;
-                }
-            }
-        }
         let extra;
         try {
             extra = runtime.onCompleted?.(event);
@@ -179,25 +228,31 @@ export function createFn(options) {
                 error: errorMessageOf(hookError)
             });
         }
-        const level = success ? 'info' : isExpectedError(error) ? 'warn' : 'error';
+        let expected = false;
+        try {
+            expected = isExpectedError(error);
+        }
+        catch {
+            expected = isExpectedClientError(error);
+        }
+        const level = success ? 'info' : expected ? 'warn' : 'error';
         logger[level]('fn.completed', {
+            ...extra,
             event: 'fn.completed',
             operation: event.name,
             procedure: event.procedure,
             duration_ms: event.durationMs,
             status: success ? 'success' : 'failed',
-            ...timingFields,
             ...(error === undefined
                 ? {}
                 : {
                     error_type: error instanceof Error ? error.name : typeof error,
                     error_message: errorMessageOf(error)
-                }),
-            ...extra
+                })
         });
     };
     const live = createLiveRuntime({
-        buildProcedure,
+        fn,
         tracing,
         createLogger,
         pubsub: runtime.pubsub
@@ -205,7 +260,7 @@ export function createFn(options) {
     // The runtimes are untyped; `Fn`, `FnLive`, `CreatePubSub` and
     // `CreatePublisher` are their typed surface.
     return {
-        fn: fn,
+        fn,
         fnLive: createFnLive({
             fn,
             createChannel: live.createChannel,
@@ -215,8 +270,9 @@ export function createFn(options) {
         createPubSub: live.createPubSub,
         createPublisher: live.createPublisher,
         createRouter,
-        readMeta: (procedure) => readFnMeta(procedure),
+        readMeta: readFnMeta,
         createCall: (context, signal) => createBoundCall(context, signal, tracing),
+        shutdown: live.shutdown,
         drainPubSubSubscribers: live.drainPubSubSubscribers,
         activePubSubSubscriberCount: live.activePubSubSubscriberCount
     };