snap-on-openapi 1.0.17 → 1.0.18

package/dist/OpenApi.d.ts

@@ -22,6 +22,7 @@ import { InitialBuilder } from './types/InitialBuilder.js';
 import { DefaultRouteContextMap } from './services/ConfigBuilder/types/DefaultRouteContextMap.js';
 import { DefaultRouteParamsMap } from './services/ConfigBuilder/types/DefaultRouteParamsMap.js';
 import z from 'zod';
+import { OnResponseEvent } from './types/events/OnResponseEvent.js';
 import { RouteResponse } from './types/RouteResponse.js';
 export declare class OpenApi<TRouteTypes extends string, TErrorCodes extends string, TConfig extends AnyConfig<TRouteTypes, TErrorCodes>> {
     static readonly builder: InitialBuilder;
@@ -48,7 +49,7 @@ export declare class OpenApi<TRouteTypes extends string, TErrorCodes extends str
     addServer(url: string, description: string): void;
     protected getRouteForPath(path: string, method: string): AnyRoute<TRouteTypes> | null;
     processRootRoute(originalReq: Request): Promise<RouteResponse>;
-    protected handleError(e: unknown, req: Request): Promise<{
+    protected handleError(e: unknown, req: Request, eventPieces?: Partial<OnResponseEvent<TRouteTypes, TConfig['routes'][TRouteTypes]['extraProps']>>): Promise<{
         status: number;
         body: z.TypeOf<import("./index.js").OpenApiErrorConfigMap<TErrorCodes>[TErrorCodes]["responseValidator"]>;
         headers: {};

package/dist/OpenApi.js

@@ -128,9 +128,14 @@ export class OpenApi {
         return null;
     }
     async processRootRoute(originalReq) {
+        let onRequest;
+        let onRoute;
+        let onResponse;
+        let onHandler;
         try {
             if (this.config.onRequest) {
-                await this.config.onRequest({ request: originalReq, logger: this.logger });
+                onRequest = { request: originalReq, logger: this.logger };
+                await this.config.onRequest(onRequest);
             }
             const url = new URL(originalReq.url);
             const basePath = this.getBasePath() === '/' ? '' : this.getBasePath();
@@ -179,7 +184,7 @@ export class OpenApi {
                 query: reqQuery,
                 body: body,
             };
-            const onRoute = {
+            onRoute = {
                 request: originalReq,
                 logger: this.logger,
                 path: urlPath,
@@ -221,7 +226,7 @@ export class OpenApi {
                     body: bodyData,
                 },
             });
-            const onHandler = {
+            onHandler = {
                 ...onRoute,
                 validated: {
                     query: query.data,
@@ -256,7 +261,7 @@ export class OpenApi {
                 headers: route.validators.responseHeaders?.strict() ?? z.object({}),
                 status: z.literal(200),
             });
-            const onResponse = {
+            onResponse = {
                 ...onHandler,
                 response,
             };
@@ -276,12 +281,18 @@ export class OpenApi {
             return response;
         }
         catch (e) {
-            return await this.handleError(e, originalReq);
+            return await this.handleError(e, originalReq, {
+                ...onHandler,
+                ...onRequest,
+                ...onRoute,
+                ...onResponse,
+            });
         }
     }
-    async handleError(e, req) {
+    async handleError(e, req, eventPieces) {
         try {
             const event = {
+                ...eventPieces,
                 request: req,
                 logger: this.logger,
                 error: e,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "snap-on-openapi",
   "author": "Alex Sarychev",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "Swiftly build type-checked OpenAPI applications with Zod and TypeScript",
   "type": "module",
   "license": "ISC",