opinionated-machine 6.20.3 → 8.0.0

package/CHANGELOG.md

@@ -0,0 +1,28 @@
+# opinionated-machine
+
+## 8.0.0
+
+### Major Changes
+
+- de12db0: Replace the local ApiContract route builder with `buildFastifyApiRoute` from `@lokalise/fastify-api-contracts` (>=6.0.0, now the source of the route-building, handler inference, response validation, and SSE streaming logic). `buildApiRoute` remains as a thin wrapper that only adds the contract-narrowed `gatewayMetadata` option.
+  
+  Breaking changes:
+  
+  - Handlers now use the package's unified `(request, reply, context) => { status, body }` shape for every response mode. SSE streaming is driven via `context.sse.start(...)` (or by returning an `AsyncIterable` body for an SSE status); dual-mode `{ nonSse, sse }` handler objects and `sse.respond()` / `sse.sendHeaders()` are gone — branch on `context.expectedContentType` and return `{ status, body }` for early HTTP responses.
+  - `ApiNonSseHandler`, `ApiSseHandler`, `InferApiRequest`, and `InferApiStatusResponse` are removed; `InferApiHandler`, `InferApiHandlerRequest`, `InferApiHandlerResult`, `ApiHandlerContext`, and `ApiHandlerReply` are re-exported from `@lokalise/fastify-api-contracts` instead.
+  - `buildApiRoute` options: `defaultMode` is removed (use `context.expectedContentType`). `heartbeatInterval` is removed — per-route heartbeat intervals are no longer possible: the package's `heartbeat` option is a boolean that only enables/disables the heartbeat for a route, and the interval itself is configured once for all routes at `@fastify/sse` plugin registration (`heartbeatInterval`, default 30000 ms).
+  - Response body validation is delegated to the `fastify-type-provider-zod` serializer compiler — apps must register `validatorCompiler` / `serializerCompiler`. This applies to every ApiContract route, not just JSON ones: the package emits a Zod response schema for every declared status (including `sseBody()` and `noBodyResponse()`, which previously produced no response schema), so an app missing `setSerializerCompiler` now fails at boot during route registration — even for SSE-only contracts — with `FST_ERR_SCH_SERIALIZATION_BUILD: Failed building the serialization schema … schema is invalid: data/required must be array`. If you hit that error, register the zod compilers. Peer ranges bumped: `@lokalise/fastify-api-contracts` >=6.0.0, `fastify-type-provider-zod` >=7.0.0.
+  - Error handling is delegated to the app's global `fastify.setErrorHandler` (per the `@lokalise/fastify-api-contracts` README), including for SSE routes: the route builder no longer maps the node-core `httpStatusCode` error convention (`PublicNonRecoverableError`, `InternalError`, …) onto responses — such errors now reach the error handler unmapped and default to 500 — and no longer emits a terminal SSE `error` event when a handler throws after `sse.start()`. Note the resulting cross-system split: legacy `buildFastifyRoute` / SSE / dual-mode routes still honor `httpStatusCode` internally, so an app mixing both route families maps the same error to different statuses. Install a global error handler that maps `httpStatusCode` (and, if your clients rely on it, emits the terminal SSE `error` event) before upgrading.
+  - The `SSESession` / `SSEContext` / `SSESessionMode` / `FastifySSERouteOptions` types exported from the package root still resolve to the legacy `lib/routes` types and no longer match what `buildApiRoute` handlers and lifecycle hooks (`onConnect` / `onClose`) actually receive — the package's session has no `rooms` / `eventSchemas`, an optional `context`, adds `close()`, and its context has no `respond()` / `sendHeaders()`. When typing `buildApiRoute` sessions, contexts, or hooks explicitly, import these types from `@lokalise/fastify-api-contracts` directly; the root exports keep typing the legacy `AbstractSSEController` / `AbstractDualModeController` routes.
+
+## 7.0.0
+
+### Major Changes
+
+- e3a05b6: Require `@lokalise/api-contracts` >= 7.0.0. The route builder no longer handles the legacy response entries removed in api-contracts 7 (`anyOfResponses`, `sseResponse`/`blobResponse`/`textResponse` tagged objects, `ContractNoBody` as a response) — declare responses with bare Zod schemas, `noBodyResponse()`, or content maps (`{ content: { 'text/event-stream': sseBody(...) } }`). Handler body types are now also inferred from content-map entries (JSON media types resolve to their Zod output type, blob to `Blob`, `allowNoBody` to `undefined`).
+
+## 6.20.3
+
+### Patch Changes
+
+- 22a290b: Migrate release automation to Changesets.

package/dist/lib/api-contracts/AbstractApiController.d.ts

@@ -20,9 +20,12 @@ import type { GatewayMetadataValue } from '../gateway/gatewayMetadata.ts';
  *       status: 200,
  *       body: { id: req.params.id },
  *     })),
- *     streamUpdates: buildApiRoute(UserController.contracts.streamUpdates, async (_req, sse) => {
- *       sse.start('keepAlive')
- *     }),
+ *     streamUpdates: buildApiRoute(
+ *       UserController.contracts.streamUpdates,
+ *       async (_req, _reply, { sse }) => {
+ *         sse.start('keepAlive')
+ *       },
+ *     ),
  *   }
  * }
  * ```

package/dist/lib/api-contracts/AbstractApiController.js

@@ -17,9 +17,12 @@
  *       status: 200,
  *       body: { id: req.params.id },
  *     })),
- *     streamUpdates: buildApiRoute(UserController.contracts.streamUpdates, async (_req, sse) => {
- *       sse.start('keepAlive')
- *     }),
+ *     streamUpdates: buildApiRoute(
+ *       UserController.contracts.streamUpdates,
+ *       async (_req, _reply, { sse }) => {
+ *         sse.start('keepAlive')
+ *       },
+ *     ),
  *   }
  * }
  * ```

package/dist/lib/api-contracts/AbstractApiController.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractApiController.js","sourceRoot":"","sources":["../../../lib/api-contracts/AbstractApiController.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,OAAgB,qBAAqB;IAGzC;;;;;;;OAOG;IACa,eAAe,CAAuB;CACvD"}
+{"version":3,"file":"AbstractApiController.js","sourceRoot":"","sources":["../../../lib/api-contracts/AbstractApiController.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,OAAgB,qBAAqB;IAGzC;;;;;;;OAOG;IACa,eAAe,CAAuB;CACvD"}

package/dist/lib/api-contracts/apiRouteBuilder.d.ts

@@ -1,23 +1,65 @@
-import { type ApiContract } from '@lokalise/api-contracts';
+import type { ApiContract } from '@lokalise/api-contracts';
+import { type ApiRouteOptions as FastifyApiRouteOptions, type InferApiHandler } from '@lokalise/fastify-api-contracts';
 import type { RouteOptions } from 'fastify';
-import type { ApiRouteOptions, InferApiHandler } from './apiHandlerTypes.ts';
+import type { GatewayMetadata } from '../gateway/gatewayTypes.ts';
+/**
+ * Options for configuring an ApiContract route.
+ *
+ * All options from `@lokalise/fastify-api-contracts` (any Fastify route field
+ * minus the ones the contract provides, SSE lifecycle hooks, and
+ * `contractMetadataToRouteMapper`) pass through to `buildFastifyApiRoute`
+ * unchanged.
+ *
+ * Generic in `Contract` so `gatewayMetadata.match.headers` / `match.query`
+ * keys are narrowed to the contract's request schemas. The generic is always
+ * inferred from the contract argument at the `buildApiRoute` call site, so
+ * direct references should write `ApiRouteOptions<typeof myContract>` when
+ * gateway metadata typing is needed.
+ */
+export type ApiRouteOptions<Contract extends ApiContract> = FastifyApiRouteOptions & {
+    /**
+     * Per-route gateway metadata. `match.headers` / `match.query` keys are
+     * narrowed to the contract's request schemas; `customHeaders` /
+     * `customQuery` remain the escape hatch for headers and params not
+     * declared on the contract. Validated at runtime against the same Zod
+     * schema used by `withGatewayMetadata` and stamped on the route via the
+     * shared `GATEWAY_METADATA_SYMBOL`.
+     *
+     * Equivalent to wrapping the result with `withGatewayMetadata` — keep
+     * to one form per route. If both are used on the same route, the later
+     * call (typically `withGatewayMetadata`) overwrites the inline value;
+     * there is no merge.
+     *
+     * @example
+     * ```ts
+     * buildApiRoute(MyController.contracts.getItem, this.getItem, {
+     *   gatewayMetadata: {
+     *     cache: { ttl: '60s' },
+     *     match: {
+     *       // narrowed to keys of the contract's requestHeaderSchema:
+     *       headers: { 'x-trace-id': { regex: '^[a-f0-9]+$' } },
+     *       // escape hatch for headers not declared on the contract:
+     *       customHeaders: { 'x-tenant-id': { regex: '^t_' } },
+     *     },
+     *   },
+     * })
+     * ```
+     */
+    gatewayMetadata?: GatewayMetadata<Contract>;
+};
 /**
  * Build a Fastify `RouteOptions` object from an `ApiContract` + handler.
  *
- * The handler shape is inferred from the contract's response mode:
- * - `'non-sse'` — bare async function returning `{ status, body }`
- * - `'sse'`     — bare async function calling `sse.start(...)` / `sse.respond(...)`
- * - `'dual'`    — `{ nonSse, sse }` object branched by the `Accept` header
+ * Thin wrapper around `buildFastifyApiRoute` from
+ * `@lokalise/fastify-api-contracts` — the handler shape, response mode
+ * inference, SSE streaming, and validation semantics are all the package's.
+ * See its docs for the `(request, reply, context) => { status, body }`
+ * handler model and `context.sse` streaming.
  *
- * The optional `options` argument carries:
- * - any Fastify route field (`preHandler`, `onRequest`, `config`, `bodyLimit`, …)
- *   minus the ones the contract provides (`method`, `url`, `schema`, `handler`, `sse`),
- * - SSE lifecycle hooks (`onConnect`, `onClose`, `onReconnect`, `serializer`,
- *   `heartbeatInterval`) — applied for `'sse'` and `'dual'` contracts only,
- * - `defaultMode` for `'dual'` contracts when the `Accept` header is ambiguous,
- * - `gatewayMetadata` — per-route gateway policy with header / query keys
- *   narrowed to the contract; equivalent to wrapping the result with
- *   `withGatewayMetadata`. See `ApiRouteOptions` for full details.
+ * On top of the package builder this adds one option: `gatewayMetadata` —
+ * per-route gateway policy with header / query keys narrowed to the
+ * contract; equivalent to wrapping the result with `withGatewayMetadata`.
+ * See `ApiRouteOptions` for full details.
  *
  * @returns Fastify `RouteOptions` ready to pass to `app.route()`
  */

package/dist/lib/api-contracts/apiRouteBuilder.js

@@ -1,364 +1,25 @@
-import { randomUUID } from 'node:crypto';
-import { ContractNoBody, getSseSchemaByEventName, hasAnySuccessSseResponse, isAnyOfResponses, isBlobResponse, isContentResponseEntry, isSseBody, isSseResponse, isTextResponse, mapApiContractToPath, resolveContractResponse, SUCCESSFUL_HTTP_STATUS_CODES, } from '@lokalise/api-contracts';
-import { InternalError } from '@lokalise/node-core';
-import { isErrorLike } from "../errorUtils.js";
+import { buildFastifyApiRoute, } from '@lokalise/fastify-api-contracts';
 import { attachGatewayMetadata } from "../gateway/withGatewayMetadata.js";
-import { determineMode, hasHttpStatusCode } from "../routes/fastifyRouteUtils.js";
-function isSuccessResponseDual(value) {
-    if (isContentResponseEntry(value)) {
-        // A content-map entry offers a non-SSE representation when it allows an empty
-        // body or declares any non-SSE media type descriptor.
-        if (value.allowNoBody || !value.content)
-            return true;
-        return Object.values(value.content).some((descriptor) => !isSseBody(descriptor));
-    }
-    if (value === ContractNoBody || isTextResponse(value) || isBlobResponse(value))
-        return true;
-    if (!isSseResponse(value) && !isAnyOfResponses(value))
-        return true;
-    if (isAnyOfResponses(value)) {
-        return value.responses.some((response) => !isSseResponse(response));
-    }
-    return false;
-}
-function getContractResponseMode(contract) {
-    if (!hasAnySuccessSseResponse(contract))
-        return 'non-sse';
-    for (const code of SUCCESSFUL_HTTP_STATUS_CODES) {
-        const value = contract.responsesByStatusCode[code];
-        if (value && isSuccessResponseDual(value))
-            return 'dual';
-    }
-    return 'sse';
-}
-function buildSSERouteConfig(options) {
-    if (!options?.serializer && options?.heartbeatInterval === undefined)
-        return true;
-    const sseConfig = {};
-    if (options.serializer)
-        sseConfig.serializer = options.serializer;
-    if (options.heartbeatInterval !== undefined)
-        sseConfig.heartbeatInterval = options.heartbeatInterval;
-    return sseConfig;
-}
-// ============================================================================
-// Internal Helpers — Sync Route
-// ============================================================================
-function getSchemaForStatusCode(contract, status) {
-    const entry = contract.responsesByStatusCode[status];
-    if (!entry)
-        return null;
-    // Resolve the JSON representation for this status code, covering both legacy
-    // response entries (bare Zod schema, anyOfResponses, …) and the new content-map
-    // entries. Non-JSON responses (text, blob, SSE, no-body) are not validated here.
-    const resolved = resolveContractResponse(entry, 'application/json', false);
-    return resolved?.kind === 'json' ? resolved.schema : null;
-}
-function validateApiResponseHeaders(contract, reply) {
-    const schema = contract.responseHeaderSchema;
-    if (!schema) {
-        return;
-    }
-    const result = schema.safeParse(reply.getHeaders());
-    if (!result.success) {
-        throw new InternalError({
-            message: 'Internal Server Error',
-            errorCode: 'RESPONSE_HEADERS_VALIDATION_FAILED',
-            details: { validationError: result.error.message },
-        });
-    }
-}
-async function handleApiSyncRoute(contract, 
-// biome-ignore lint/suspicious/noExplicitAny: Handler types are validated by InferApiHandler at the call site
-handler, 
-// biome-ignore lint/suspicious/noExplicitAny: Request types are validated by Fastify schema
-request, reply) {
-    const { status, body } = await handler(request, reply);
-    if (reply.sent) {
-        request.log.warn({
-            msg: 'Sync handler sent response directly, bypassing response validation',
-            tag: 'response_sent_directly',
-            method: request.method,
-            url: request.url,
-        });
-        return;
-    }
-    try {
-        const schema = getSchemaForStatusCode(contract, status);
-        if (schema) {
-            const result = schema.safeParse(body);
-            if (!result.success) {
-                throw new InternalError({
-                    message: 'Internal Server Error',
-                    errorCode: 'RESPONSE_VALIDATION_FAILED',
-                    details: { validationError: result.error.message },
-                });
-            }
-        }
-    }
-    catch (err) {
-        reply.code(500);
-        throw err;
-    }
-    validateApiResponseHeaders(contract, reply);
-    if (!reply.hasHeader('content-type')) {
-        reply.type('application/json');
-    }
-    return reply.code(status).send(body);
-}
-// ============================================================================
-// Internal Helpers — SSE Route (no controller, uses reply.sse directly)
-// ============================================================================
-function buildApiSSEContext(
-// biome-ignore lint/suspicious/noExplicitAny: Request types are validated by Fastify schema
-request, reply, eventSchemas, options) {
-    let started = false;
-    let responseData;
-    const sseReply = reply;
-    const sseContext = {
-        start: (mode, startOptions) => {
-            started = true;
-            if (mode === 'keepAlive') {
-                sseReply.sse.keepAlive();
-            }
-            // sendHeaders() calls writeHead(200) but only queues headers in the buffer.
-            // flushHeaders() forces them onto the wire so the client's fetch() returns.
-            sseReply.sse.sendHeaders();
-            reply.raw.flushHeaders();
-            const connectionId = randomUUID();
-            const send = async (eventName, data, sendOptions) => {
-                const schema = eventSchemas[eventName];
-                if (schema) {
-                    const result = schema.safeParse(data);
-                    if (!result.success) {
-                        throw new InternalError({
-                            message: `SSE event validation failed for event "${eventName}": ${result.error.message}`,
-                            errorCode: 'RESPONSE_VALIDATION_FAILED',
-                        });
-                    }
-                }
-                try {
-                    await sseReply.sse.send({
-                        event: eventName,
-                        data,
-                        id: sendOptions?.id,
-                        retry: sendOptions?.retry,
-                    });
-                    return true;
-                }
-                catch {
-                    return false;
-                }
-            };
-            const session = {
-                id: connectionId,
-                request,
-                reply,
-                context: (startOptions?.context ?? {}),
-                connectedAt: new Date(),
-                // biome-ignore lint/suspicious/noExplicitAny: SSEEventSender generic is satisfied at handler call site
-                send: send,
-                isConnected: () => sseReply.sse.isConnected,
-                getStream: () => sseReply.sse.stream(),
-                sendStream: async (messages) => {
-                    for await (const message of messages) {
-                        await send(message.event, message.data, { id: message.id, retry: message.retry });
-                    }
-                },
-                rooms: { join: () => { }, leave: () => { } },
-                eventSchemas,
-            };
-            if (options?.onConnect) {
-                void Promise.resolve(options.onConnect(session)).catch(() => { });
-            }
-            if (options?.onClose) {
-                const onClose = options.onClose;
-                sseReply.sse.onClose(() => {
-                    void Promise.resolve(onClose(session, 'client')).catch(() => { });
-                });
-            }
-            if (options?.onReconnect && sseReply.sse.lastEventId) {
-                const onReconnect = options.onReconnect;
-                const lastEventId = sseReply.sse.lastEventId;
-                void sseReply.sse.replay(async () => {
-                    const replay = await onReconnect(session, lastEventId);
-                    if (replay) {
-                        for await (const msg of replay) {
-                            await sseReply.sse.send(msg);
-                        }
-                    }
-                });
-            }
-            return session;
-        },
-        respond: ((code, body) => {
-            if (started) {
-                throw new Error('Cannot call sse.respond() after sse.start() — the SSE stream is already open.');
-            }
-            responseData = { code, body };
-            return { _type: 'respond', code, body };
-            // biome-ignore lint/suspicious/noExplicitAny: respond typing is enforced by contract at call site
-        }),
-        sendHeaders: () => {
-            sseReply.sse.sendHeaders();
-        },
-        reply,
-    };
-    return {
-        sseContext,
-        isStarted: () => started,
-        hasResponse: () => responseData !== undefined,
-        getResponseData: () => responseData,
-    };
-}
-// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: Core SSE handler coordinates context, error handling, and lifecycle
-async function handleApiSseRoute(
-// biome-ignore lint/suspicious/noExplicitAny: SSE handler types are validated by InferApiHandler at call site
-sseHandler, eventSchemas, options, 
-// biome-ignore lint/suspicious/noExplicitAny: Request types are validated by Fastify schema
-request, reply) {
-    const { sseContext, isStarted, hasResponse, getResponseData } = buildApiSSEContext(request, reply, eventSchemas, options);
-    try {
-        await sseHandler(request, sseContext);
-        if (!isStarted() && !hasResponse()) {
-            throw new Error('SSE handler must either send a response (sse.respond()) ' +
-                'or start streaming (sse.start()). Handler returned without doing either.');
-        }
-        const responseData = getResponseData();
-        if (responseData) {
-            // Early HTTP response (sse.respond() was called before streaming)
-            reply.removeHeader('cache-control');
-            reply.removeHeader('x-accel-buffering');
-            reply.type('application/json').code(responseData.code).send(responseData.body);
-        }
-        // If started, @fastify/sse manages the rest of the connection lifecycle
-    }
-    catch (err) {
-        if (isStarted()) {
-            // Headers already sent — can't change status code; try to send error event
-            const sseReply = reply;
-            if (sseReply.sse.isConnected) {
-                try {
-                    await sseReply.sse.send({
-                        event: 'error',
-                        data: { message: isErrorLike(err) ? err.message : 'Internal Server Error' },
-                    });
-                }
-                catch {
-                    // Ignore send failures during error handling
-                }
-            }
-            throw err;
-        }
-        // Streaming not started — send HTTP error response
-        const message = isErrorLike(err) ? err.message : 'Internal Server Error';
-        const statusCode = hasHttpStatusCode(err) ? err.httpStatusCode : 500;
-        const statusText = statusCode >= 500 ? 'Internal Server Error' : 'Error';
-        reply.code(statusCode).type('application/json').send({ statusCode, error: statusText, message });
-    }
-}
-// ============================================================================
-// Internal Helpers — Schema
-// ============================================================================
-function buildResponseSchemas(contract) {
-    return Object.keys(contract.responsesByStatusCode).reduce((acc, statusCode) => {
-        const schema = getSchemaForStatusCode(contract, Number(statusCode));
-        if (schema) {
-            acc[Number(statusCode)] = schema;
-        }
-        return acc;
-    }, {});
-}
-function buildBaseSchema(contract) {
-    const schema = {};
-    if (contract.requestPathParamsSchema)
-        schema.params = contract.requestPathParamsSchema;
-    if (contract.requestQuerySchema)
-        schema.querystring = contract.requestQuerySchema;
-    if (contract.requestHeaderSchema)
-        schema.headers = contract.requestHeaderSchema;
-    if (contract.requestBodySchema !== undefined && contract.requestBodySchema !== ContractNoBody) {
-        schema.body = contract.requestBodySchema;
-    }
-    schema.response = buildResponseSchemas(contract);
-    return schema;
-}
-// ============================================================================
-// Public API
-// ============================================================================
 /**
  * Build a Fastify `RouteOptions` object from an `ApiContract` + handler.
  *
- * The handler shape is inferred from the contract's response mode:
- * - `'non-sse'` — bare async function returning `{ status, body }`
- * - `'sse'`     — bare async function calling `sse.start(...)` / `sse.respond(...)`
- * - `'dual'`    — `{ nonSse, sse }` object branched by the `Accept` header
+ * Thin wrapper around `buildFastifyApiRoute` from
+ * `@lokalise/fastify-api-contracts` — the handler shape, response mode
+ * inference, SSE streaming, and validation semantics are all the package's.
+ * See its docs for the `(request, reply, context) => { status, body }`
+ * handler model and `context.sse` streaming.
  *
- * The optional `options` argument carries:
- * - any Fastify route field (`preHandler`, `onRequest`, `config`, `bodyLimit`, …)
- *   minus the ones the contract provides (`method`, `url`, `schema`, `handler`, `sse`),
- * - SSE lifecycle hooks (`onConnect`, `onClose`, `onReconnect`, `serializer`,
- *   `heartbeatInterval`) — applied for `'sse'` and `'dual'` contracts only,
- * - `defaultMode` for `'dual'` contracts when the `Accept` header is ambiguous,
- * - `gatewayMetadata` — per-route gateway policy with header / query keys
- *   narrowed to the contract; equivalent to wrapping the result with
- *   `withGatewayMetadata`. See `ApiRouteOptions` for full details.
+ * On top of the package builder this adds one option: `gatewayMetadata` —
+ * per-route gateway policy with header / query keys narrowed to the
+ * contract; equivalent to wrapping the result with `withGatewayMetadata`.
+ * See `ApiRouteOptions` for full details.
  *
  * @returns Fastify `RouteOptions` ready to pass to `app.route()`
  */
 export function buildApiRoute(contract, handler, options) {
-    // Separate SSE-specific options (not in Fastify RouteOptions) and gateway
-    // metadata (stamped via Symbol, not spread) from passthrough options.
-    const { defaultMode, contractMetadataToRouteMapper, gatewayMetadata, serializer: _serializer, heartbeatInterval: _heartbeatInterval, onConnect: _onConnect, onClose: _onClose, onReconnect: _onReconnect, logger: _logger, ...fastifyOptions } = options ?? {};
-    const url = mapApiContractToPath(contract);
-    const mode = getContractResponseMode(contract);
-    const eventSchemas = getSseSchemaByEventName(contract) ?? {};
-    const baseSchema = buildBaseSchema(contract);
-    const contractMetadata = contractMetadataToRouteMapper?.(contract.metadata) ?? {};
-    const finalize = (route) => gatewayMetadata !== undefined ? attachGatewayMetadata(route, gatewayMetadata) : route;
-    if (mode === 'non-sse') {
-        // biome-ignore lint/suspicious/noExplicitAny: handler shape validated by InferApiHandler at call site
-        const syncHandler = handler;
-        return finalize({
-            ...fastifyOptions,
-            ...contractMetadata,
-            method: contract.method,
-            url,
-            schema: baseSchema,
-            handler: async (request, reply) => handleApiSyncRoute(contract, syncHandler, request, reply),
-        });
-    }
-    if (mode === 'dual') {
-        const resolvedDefaultMode = defaultMode ?? 'json';
-        // biome-ignore lint/suspicious/noExplicitAny: handler shape validated by InferApiHandler at call site
-        const dualHandlers = handler;
-        return finalize({
-            ...fastifyOptions,
-            ...contractMetadata,
-            method: contract.method,
-            url,
-            sse: buildSSERouteConfig(options),
-            schema: baseSchema,
-            handler: (request, reply) => {
-                const responseMode = determineMode(request.headers.accept, resolvedDefaultMode);
-                if (responseMode === 'json') {
-                    return handleApiSyncRoute(contract, dualHandlers.nonSse, request, reply);
-                }
-                return handleApiSseRoute(dualHandlers.sse, eventSchemas, options, request, reply);
-            },
-        });
-    }
-    // SSE-only
-    // biome-ignore lint/suspicious/noExplicitAny: handler shape validated by InferApiHandler at call site
-    const sseHandler = handler;
-    return finalize({
-        ...fastifyOptions,
-        ...contractMetadata,
-        method: contract.method,
-        url,
-        sse: buildSSERouteConfig(options),
-        schema: baseSchema,
-        handler: async (request, reply) => handleApiSseRoute(sseHandler, eventSchemas, options, request, reply),
-    });
+    // Gateway metadata is stamped via Symbol, not spread into Fastify options.
+    const { gatewayMetadata, ...fastifyOptions } = options ?? {};
+    const route = buildFastifyApiRoute(contract, handler, fastifyOptions);
+    return gatewayMetadata !== undefined ? attachGatewayMetadata(route, gatewayMetadata) : route;
 }
 //# sourceMappingURL=apiRouteBuilder.js.map

package/dist/lib/api-contracts/apiRouteBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiRouteBuilder.js","sourceRoot":"","sources":["../../../lib/api-contracts/apiRouteBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apiRouteBuilder.js","sourceRoot":"","sources":["../../../lib/api-contracts/apiRouteBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,GAGrB,MAAM,iCAAiC,CAAA;AAGxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AAgDzE;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,aAAa,CAC3B,QAAkB,EAClB,OAAkC,EAClC,OAAmC;IAEnC,2EAA2E;IAC3E,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAC5D,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC,CAAA;IACrE,OAAO,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;AAC9F,CAAC"}

package/dist/lib/api-contracts/index.d.ts

@@ -1,4 +1,4 @@
+export type { ApiHandlerContext, ApiHandlerReply, InferApiHandler, InferApiHandlerRequest, InferApiHandlerResult, InferContractResponseContentTypes, } from '@lokalise/fastify-api-contracts';
 export { AbstractApiController } from './AbstractApiController.ts';
-export type { ApiNonSseHandler, ApiRouteOptions, ApiSseHandler, InferApiHandler, InferApiRequest, InferApiStatusResponse, } from './apiHandlerTypes.ts';
-export { buildApiRoute } from './apiRouteBuilder.ts';
+export { type ApiRouteOptions, buildApiRoute } from './apiRouteBuilder.ts';
 export { asApiControllerClass } from './asApiControllerClass.ts';

package/dist/lib/api-contracts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/api-contracts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AASlE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/api-contracts/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAwB,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA"}

package/package.json

@@ -1,90 +1,86 @@
 {
-    "name": "opinionated-machine",
-    "version": "6.20.3",
-    "description": "Very opinionated DI framework for fastify, built on top of awilix ",
-    "type": "module",
-    "license": "MIT",
-    "workspaces": [
-        ".",
-        "packages/*"
-    ],
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "exports": {
-        ".": "./dist/index.js",
-        "./package.json": "./package.json"
-    },
-    "maintainers": [
-        {
-            "name": "Igor Savin",
-            "email": "kibertoad@gmail.com"
-        }
-    ],
-    "scripts": {
-        "build": "rimraf dist && tsc -p tsconfig.build.json",
-        "lint": "biome check . && tsc",
-        "lint:fix": "biome check --write .",
-        "test": "vitest --typecheck",
-        "test:ci": "npm run test -- --coverage",
-        "prepublishOnly": "npm run build",
-        "changeset": "changeset",
-        "ci:publish": "changeset publish"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/kibertoad/opinionated-machine.git"
-    },
-    "dependencies": {
-        "@fastify/sse": "^0.4.0",
-        "fast-querystring": "^1.1.2",
-        "fastify-plugin": "^6.0.0",
-        "ts-deepmerge": "^8.0.0"
-    },
-    "peerDependencies": {
-        "@lokalise/api-contracts": ">=6.12.0",
-        "@lokalise/fastify-api-contracts": ">=5.3.1",
-        "@lokalise/node-core": ">=14.7.4",
-        "awilix": ">=13.0.0",
-        "awilix-manager": ">=6.0.0",
-        "fastify": ">=5.0.0",
-        "fastify-type-provider-zod": ">=6.1.0",
-        "zod": ">=4.1.12"
-    },
-    "devDependencies": {
-        "@biomejs/biome": "2.4.4",
-        "@changesets/cli": "^2.31.0",
-        "@lokalise/api-contracts": "^6.12.0",
-        "@lokalise/biome-config": "^3.1.1",
-        "@lokalise/fastify-api-contracts": "^5.3.1",
-        "@lokalise/node-core": "^14.7.4",
-        "@lokalise/tsconfig": "^3.1.0",
-        "@types/node": "^22.19.7",
-        "@vitest/coverage-v8": "^4.0.18",
-        "awilix": "^13.0.0",
-        "awilix-manager": "^7.0.0",
-        "fastify": "^5.7.4",
-        "fastify-type-provider-zod": "^7.0.0",
-        "rimraf": "^6.1.2",
-        "typescript": "^5.9.3",
-        "vitest": "^4.0.18",
-        "zod": "^4.3.6"
-    },
-    "private": false,
-    "publishConfig": {
-        "access": "public"
-    },
-    "keywords": [
-        "dependency",
-        "injection",
-        "opinionated",
-        "awilix",
-        "di",
-        "fastify"
-    ],
-    "homepage": "https://github.com/kibertoad/opinionated-machine",
-    "files": [
-        "README.md",
-        "LICENSE",
-        "dist/*"
-    ]
-}
+  "name": "opinionated-machine",
+  "version": "8.0.0",
+  "description": "Very opinionated DI framework for fastify, built on top of awilix ",
+  "type": "module",
+  "license": "MIT",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": "./dist/index.js",
+    "./package.json": "./package.json"
+  },
+  "maintainers": [
+    {
+      "name": "Igor Savin",
+      "email": "kibertoad@gmail.com"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kibertoad/opinionated-machine.git"
+  },
+  "dependencies": {
+    "@fastify/sse": "^0.6.0",
+    "fast-querystring": "^1.1.2",
+    "fastify-plugin": "^6.0.0",
+    "ts-deepmerge": "^8.0.0"
+  },
+  "peerDependencies": {
+    "@lokalise/api-contracts": ">=7.0.0",
+    "@lokalise/fastify-api-contracts": ">=6.0.0",
+    "@lokalise/node-core": ">=14.7.4",
+    "awilix": ">=13.0.0",
+    "awilix-manager": ">=6.0.0",
+    "fastify": ">=5.0.0",
+    "fastify-type-provider-zod": ">=7.0.0",
+    "zod": ">=4.1.12"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "2.4.4",
+    "@changesets/cli": "^3.0.0",
+    "@lokalise/api-contracts": "^7.0.0",
+    "@lokalise/biome-config": "^3.1.1",
+    "@lokalise/fastify-api-contracts": "^6.0.0",
+    "@lokalise/node-core": "^14.7.4",
+    "@lokalise/tsconfig": "^3.1.0",
+    "@types/node": "^22.19.7",
+    "@vitest/coverage-v8": "^4.0.18",
+    "awilix": "^13.0.0",
+    "awilix-manager": "^7.0.0",
+    "fastify": "^5.7.4",
+    "fastify-type-provider-zod": "^7.0.0",
+    "rimraf": "^6.1.2",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18",
+    "zod": "^4.3.6"
+  },
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "dependency",
+    "injection",
+    "opinionated",
+    "awilix",
+    "di",
+    "fastify"
+  ],
+  "homepage": "https://github.com/kibertoad/opinionated-machine",
+  "files": [
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE",
+    "dist/*"
+  ],
+  "scripts": {
+    "build": "rimraf dist && tsc -p tsconfig.build.json",
+    "lint": "biome check . && tsc",
+    "lint:fix": "biome check --write .",
+    "test": "vitest --typecheck",
+    "test:ci": "pnpm run test --coverage",
+    "changeset": "changeset",
+    "ci:publish": "changeset publish"
+  }
+}

package/dist/lib/api-contracts/apiHandlerTypes.d.ts

@@ -1,159 +0,0 @@
-import type { ApiContract, ContractNoBody, ContractResponseMode, InferSseSuccessResponses, PayloadApiContract, SSEEventSchemas } from '@lokalise/api-contracts';
-import type { FastifyRequest, RouteOptions } from 'fastify';
-import type { z } from 'zod/v4';
-import type { DualModeType } from '../dualmode/dualModeTypes.ts';
-import type { GatewayMetadata } from '../gateway/gatewayTypes.ts';
-import type { FastifySSERouteOptions, SSEContext, SSEHandlerResult, SyncModeReply } from '../routes/fastifyRouteTypes.ts';
-type NonSseBodyEntry<T> = T extends undefined ? never : T extends {
-    _tag: 'SseResponse';
-} ? never : T extends {
-    _tag: 'BlobResponse';
-} ? Blob : T extends {
-    _tag: 'TextResponse';
-} ? string : T extends {
-    _tag: 'AnyOfResponses';
-    responses: Array<infer R>;
-} ? NonSseBodyEntry<R> : T extends z.ZodType ? z.output<T> : undefined;
-/**
- * Discriminated union of `{ status, body }` pairs for all non-SSE responses in a contract.
- *
- * Allows non-SSE handlers to return a specific status code and body together without
- * calling `reply.code()` separately.
- *
- * @example
- * ```typescript
- * async (request) => {
- *   if (!valid) return { status: 400, body: { error: 'Bad Request' } }
- *   return { id: request.params.id }
- * }
- * ```
- */
-export type InferApiStatusResponse<Contract extends ApiContract> = {
-    [K in keyof Contract['responsesByStatusCode']]: NonSseBodyEntry<Contract['responsesByStatusCode'][K]> extends never ? never : {
-        status: K;
-        body: NonSseBodyEntry<Contract['responsesByStatusCode'][K]>;
-    };
-}[keyof Contract['responsesByStatusCode']];
-type InferOptSchema<T, Fallback = unknown> = NonNullable<T> extends z.ZodType ? z.output<NonNullable<T>> : Fallback;
-type InferApiBodyType<Contract extends ApiContract> = Contract extends PayloadApiContract ? Contract['requestBodySchema'] extends typeof ContractNoBody ? undefined : NonNullable<Contract['requestBodySchema']> extends z.ZodType ? z.output<NonNullable<Contract['requestBodySchema']>> : undefined : undefined;
-/**
- * Infer the FastifyRequest type from an ApiContract.
- *
- * Provides properly typed params, querystring, headers, and body.
- *
- * @example
- * ```typescript
- * const handler = async (request: InferApiRequest<typeof myContract>) => {
- *   request.params.userId  // typed
- *   request.body.name      // typed
- * }
- * ```
- */
-export type InferApiRequest<Contract extends ApiContract> = FastifyRequest<{
-    Params: InferOptSchema<Contract['requestPathParamsSchema']>;
-    Querystring: InferOptSchema<Contract['requestQuerySchema']>;
-    Headers: InferOptSchema<Contract['requestHeaderSchema']>;
-    Body: InferApiBodyType<Contract>;
-}>;
-/**
- * Handler for non-SSE responses from an ApiContract.
- *
- * Always return `{ status, body }` — the framework validates the body against the
- * contract's schema for that status code and sends it.
- *
- * Use `reply.header()` to set response headers when needed.
- *
- * @example
- * ```typescript
- * async (request) => ({ status: 200, body: { id: request.params.userId } })
- * ```
- *
- * @example With multiple status codes
- * ```typescript
- * async (request) => {
- *   if (!valid) return { status: 400, body: { error: 'Bad Request' } }
- *   return { status: 200, body: { id: request.params.userId } }
- * }
- * ```
- */
-export type ApiNonSseHandler<Contract extends ApiContract> = (request: InferApiRequest<Contract>, reply: SyncModeReply) => InferApiStatusResponse<Contract> | Promise<InferApiStatusResponse<Contract>>;
-/**
- * Handler for SSE responses from an ApiContract.
- *
- * Call `sse.start(mode)` to begin streaming or `sse.respond(code, body)` for
- * early HTTP returns before streaming starts.
- */
-export type ApiSseHandler<Contract extends ApiContract> = (request: InferApiRequest<Contract>, sse: SSEContext<EnsureSseEventSchemas<InferSseSuccessResponses<Contract['responsesByStatusCode']>>>) => SSEHandlerResult | Promise<SSEHandlerResult>;
-/**
- * `InferSseSuccessResponses` resolves to the contract's SSE event schema map, but for a
- * generic `Contract` the content-map response path can widen it beyond `SSEEventSchemas`.
- * This narrows it back so it satisfies the `SSEContext` constraint, falling back to the
- * base `SSEEventSchemas` when the inferred type is not a valid schema map.
- */
-export type EnsureSseEventSchemas<TEvents> = [TEvents] extends [SSEEventSchemas] ? TEvents : SSEEventSchemas;
-/**
- * Infer the handler shape based on the contract's response mode:
- * - `'non-sse'` — bare `ApiNonSseHandler` function
- * - `'sse'`     — bare `ApiSseHandler` function
- * - `'dual'`    — `{ nonSse, sse }` object, branched by `Accept` header
- */
-export type InferApiHandler<Contract extends ApiContract> = [
-    ContractResponseMode<Contract['responsesByStatusCode']>
-] extends ['dual'] ? {
-    nonSse: ApiNonSseHandler<Contract>;
-    sse: ApiSseHandler<Contract>;
-} : [ContractResponseMode<Contract['responsesByStatusCode']>] extends ['sse'] ? ApiSseHandler<Contract> : ApiNonSseHandler<Contract>;
-/**
- * Options for configuring an ApiContract route.
- *
- * Extends Fastify's `RouteOptions` minus the fields the contract provides
- * (`method`, `url`, `schema`, `handler`, `sse`), so any Fastify hook or config
- * (`preHandler`, `onRequest`, `config`, `bodyLimit`, etc.) can be passed directly.
- *
- * SSE lifecycle options (`onConnect`, `onClose`, `onReconnect`) are only
- * relevant for SSE and dual-mode contracts and are ignored for non-SSE routes.
- *
- * Generic in `Contract` so `gatewayMetadata.match.headers` / `match.query`
- * keys are narrowed to the contract's request schemas. The generic is always
- * inferred from the contract argument at the `buildApiRoute` call site, so
- * direct references should write `ApiRouteOptions<typeof myContract>` when
- * gateway metadata typing is needed.
- */
-export type ApiRouteOptions<Contract extends ApiContract> = Omit<RouteOptions, 'method' | 'url' | 'schema' | 'handler' | 'sse'> & Omit<FastifySSERouteOptions, 'preHandler'> & {
-    /**
-     * Default response mode for dual-mode routes when the `Accept` header
-     * does not express a preference.
-     * @default 'json'
-     */
-    defaultMode?: DualModeType;
-    /**
-     * Per-route gateway metadata. `match.headers` / `match.query` keys are
-     * narrowed to the contract's request schemas; `customHeaders` /
-     * `customQuery` remain the escape hatch for headers and params not
-     * declared on the contract. Validated at runtime against the same Zod
-     * schema used by `withGatewayMetadata` and stamped on the route via the
-     * shared `GATEWAY_METADATA_SYMBOL`.
-     *
-     * Equivalent to wrapping the result with `withGatewayMetadata` — keep
-     * to one form per route. If both are used on the same route, the later
-     * call (typically `withGatewayMetadata`) overwrites the inline value;
-     * there is no merge.
-     *
-     * @example
-     * ```ts
-     * buildApiRoute(MyController.contracts.getItem, this.getItem, {
-     *   gatewayMetadata: {
-     *     cache: { ttl: '60s' },
-     *     match: {
-     *       // narrowed to keys of the contract's requestHeaderSchema:
-     *       headers: { 'x-trace-id': { regex: '^[a-f0-9]+$' } },
-     *       // escape hatch for headers not declared on the contract:
-     *       customHeaders: { 'x-tenant-id': { regex: '^t_' } },
-     *     },
-     *   },
-     * })
-     * ```
-     */
-    gatewayMetadata?: GatewayMetadata<Contract>;
-};
-export {};

package/dist/lib/api-contracts/apiHandlerTypes.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=apiHandlerTypes.js.map

package/dist/lib/api-contracts/apiHandlerTypes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"apiHandlerTypes.js","sourceRoot":"","sources":["../../../lib/api-contracts/apiHandlerTypes.ts"],"names":[],"mappings":""}