@opra/nestjs 1.0.0-alpha.9 → 1.0.0-beta.1

package/cjs/augmentation/nestjs.augmentation.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const external_exception_filter_1 = require("@nestjs/core/exceptions/external-exception-filter");
-const oldCatchMethod = external_exception_filter_1.ExternalExceptionFilter.prototype.catch;
-external_exception_filter_1.ExternalExceptionFilter.prototype.catch = function (exception, host) {
+const external_exception_filter_js_1 = require("@nestjs/core/exceptions/external-exception-filter.js");
+const oldCatchMethod = external_exception_filter_js_1.ExternalExceptionFilter.prototype.catch;
+external_exception_filter_js_1.ExternalExceptionFilter.prototype.catch = function (exception, host) {
     const opraContext = host.getArgByIndex(3);
     // Prevents error logging for all Opra controllers
     if (opraContext && opraContext.request && opraContext.response)

package/cjs/constants.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IS_PUBLIC_KEY = void 0;
-exports.IS_PUBLIC_KEY = 'isPublic';
+exports.OPRA_HTTP_MODULE_OPTIONS = exports.IS_PUBLIC_KEY = void 0;
+exports.IS_PUBLIC_KEY = 'opra:isPublic';
+exports.OPRA_HTTP_MODULE_OPTIONS = 'OPRA_HTTP_MODULE_OPTIONS';

package/cjs/opra-http-core.module.js

@@ -4,9 +4,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraHttpCoreModule = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
+const core_1 = require("@nestjs/core");
 const common_2 = require("@opra/common");
 const ts_gems_1 = require("ts-gems");
+const constants_js_1 = require("./constants.js");
 const opra_nestjs_adapter_js_1 = require("./opra-nestjs-adapter.js");
+const opra_exception_filter_js_1 = require("./services/opra-exception-filter.js");
 const opra_middleware_js_1 = require("./services/opra-middleware.js");
 let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
     constructor(opraAdapter) {
@@ -23,16 +26,35 @@ let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
         const token = init?.id || opra_nestjs_adapter_js_1.OpraNestAdapter;
         const providers = [
             ...(init?.providers || []),
+            {
+                provide: constants_js_1.OPRA_HTTP_MODULE_OPTIONS,
+                useValue: { ...options },
+            },
             {
                 provide: opra_nestjs_adapter_js_1.OpraNestAdapter,
-                useFactory: async () => {
+                inject: [core_1.ModuleRef],
+                useFactory: async (moduleRef) => {
                     (0, ts_gems_1.asMutable)(opraAdapter).document = await common_2.ApiDocumentFactory.createDocument({
                         ...init,
                         api: { protocol: 'http', name: init.name, controllers: init.controllers },
                     });
+                    opraAdapter.interceptors.map(x => {
+                        if ((0, common_2.isConstructor)(x)) {
+                            return (ctx, next) => {
+                                const interceptor = moduleRef.get(x);
+                                if (typeof interceptor.intercept === 'function')
+                                    return interceptor.intercept(ctx, next());
+                            };
+                        }
+                        return x;
+                    });
                     return opraAdapter;
                 },
             },
+            {
+                provide: core_1.APP_FILTER,
+                useClass: opra_exception_filter_js_1.OpraExceptionFilter,
+            },
         ];
         if (token !== opra_nestjs_adapter_js_1.OpraNestAdapter) {
             providers.push({

package/cjs/opra-nestjs-adapter.js

@@ -1,22 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpraNestAdapter = exports.kHandler = void 0;
+exports.OpraNestAdapter = void 0;
 const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const common_1 = require("@nestjs/common");
+const constants_js_1 = require("@nestjs/common/constants.js");
 const common_2 = require("@opra/common");
 const core_1 = require("@opra/core");
-const path_1 = tslib_1.__importDefault(require("path"));
 const ts_gems_1 = require("ts-gems");
-const public_decorator_1 = require("./decorators/public.decorator");
-const opra_exception_filter_js_1 = require("./services/opra-exception-filter.js");
-exports.kHandler = Symbol.for('kHandler');
+const public_decorator_js_1 = require("./decorators/public.decorator.js");
 class OpraNestAdapter extends core_1.HttpAdapter {
     constructor(init, options) {
         super((function () {
             const document = new common_2.ApiDocument();
             document.api = new common_2.HttpApi(document);
             return document;
-        })(), options);
+        })(), {
+            ...options,
+            interceptors: options?.interceptors,
+        });
         this.nestControllers = [];
         this.options = options;
         let basePath = options?.basePath || '/';
@@ -24,7 +26,7 @@ class OpraNestAdapter extends core_1.HttpAdapter {
             basePath = '/' + basePath;
         this._addRootController(basePath);
         if (init.controllers)
-            init.controllers.forEach(c => this._addToNestControllers(c, basePath));
+            init.controllers.forEach(c => this._addToNestControllers(c, basePath, []));
     }
     async close() {
         //
@@ -33,7 +35,7 @@ class OpraNestAdapter extends core_1.HttpAdapter {
         const _this = this;
         let RootController = class RootController {
             schema(_req, next) {
-                _this[exports.kHandler].sendDocumentSchema(_req.opraContext).catch(next);
+                _this.handler.sendDocumentSchema(_req.opraContext).catch(() => next());
             }
         };
         tslib_1.__decorate([
@@ -50,11 +52,11 @@ class OpraNestAdapter extends core_1.HttpAdapter {
             })
         ], RootController);
         if (this.options?.schemaRouteIsPublic) {
-            (0, public_decorator_1.Public)()(RootController.prototype, 'schema', Object.getOwnPropertyDescriptor(RootController.prototype, 'schema'));
+            (0, public_decorator_js_1.Public)()(RootController.prototype, 'schema', Object.getOwnPropertyDescriptor(RootController.prototype, 'schema'));
         }
         this.nestControllers.push(RootController);
     }
-    _addToNestControllers(sourceClass, currentPath) {
+    _addToNestControllers(sourceClass, currentPath, parentTree) {
         const metadata = Reflect.getMetadata(common_2.HTTP_CONTROLLER_METADATA, sourceClass);
         if (!metadata)
             return;
@@ -62,10 +64,16 @@ class OpraNestAdapter extends core_1.HttpAdapter {
             [sourceClass.name]: class extends sourceClass {
             },
         }[sourceClass.name];
-        const newPath = metadata.path ? path_1.default.join(currentPath, metadata.path) : currentPath;
+        /** Copy metadata keys from source class to new one */
+        let metadataKeys;
+        OpraNestAdapter.copyDecoratorMetadataToChild(newClass, parentTree);
+        const newPath = metadata.path ? node_path_1.default.join(currentPath, metadata.path) : currentPath;
         const adapter = this;
-        /** Inject exception filter */
-        (0, common_1.UseFilters)(new opra_exception_filter_js_1.OpraExceptionFilter(adapter))(newClass);
+        // adapter.logger =
+        /** Disable default error handler. Errors will be handled by OpraExceptionFilter */
+        adapter.handler.onError = (context, error) => {
+            throw error;
+        };
         (0, common_1.Controller)()(newClass);
         this.nestControllers.push(newClass);
         if (metadata.operations) {
@@ -74,7 +82,8 @@ class OpraNestAdapter extends core_1.HttpAdapter {
                 Object.defineProperty(newClass.prototype, k, {
                     writable: true,
                     /** NestJS handler method */
-                    async value(_req) {
+                    async value(_req, _res) {
+                        _res.statusCode = 200;
                         const api = adapter.document.api;
                         const controller = api.findController(sourceClass);
                         const operation = controller?.operations.get(k);
@@ -89,18 +98,16 @@ class OpraNestAdapter extends core_1.HttpAdapter {
                             });
                         }
                         /** Configure the HttpContext */
-                        context.adapter = adapter;
-                        context.document = adapter.document;
                         context.operation = operation;
                         context.controller = operation.owner;
                         context.controllerInstance = this;
                         context.operationHandler = operationHandler;
                         /** Handle request */
-                        await adapter[exports.kHandler].handleRequest(context);
+                        await adapter.handler.handleRequest(context);
                     },
                 });
                 /** Copy metadata keys from source function to new one */
-                const metadataKeys = Reflect.getOwnMetadataKeys(operationHandler);
+                metadataKeys = Reflect.getOwnMetadataKeys(operationHandler);
                 const newFn = newClass.prototype[k];
                 for (const key of metadataKeys) {
                     const m = Reflect.getMetadata(key, operationHandler);
@@ -109,7 +116,7 @@ class OpraNestAdapter extends core_1.HttpAdapter {
                 (0, common_1.Req)()(newClass.prototype, k, 0);
                 (0, common_1.Res)()(newClass.prototype, k, 1);
                 const descriptor = Object.getOwnPropertyDescriptor(newClass.prototype, k);
-                const operationPath = newPath + (v.path || '');
+                const operationPath = v.mergePath ? newPath + (v.path || '') : node_path_1.default.posix.join(newPath, v.path || '');
                 switch (v.method || 'GET') {
                     case 'DELETE':
                         /** Call @Delete decorator over new property */
@@ -152,7 +159,30 @@ class OpraNestAdapter extends core_1.HttpAdapter {
             for (const child of metadata.controllers) {
                 if (!(0, common_2.isConstructor)(child))
                     throw new TypeError('Controllers should be injectable a class');
-                this._addToNestControllers(child, newPath);
+                this._addToNestControllers(child, newPath, [...parentTree, sourceClass]);
+            }
+        }
+    }
+    static copyDecoratorMetadataToChild(target, parentTree) {
+        for (const parent of parentTree) {
+            const metadataKeys = Reflect.getOwnMetadataKeys(parent);
+            for (const key of metadataKeys) {
+                if (typeof key === 'string' && key.startsWith('opra:') && !Reflect.hasOwnMetadata(key, target)) {
+                    const metadata = Reflect.getMetadata(key, parent);
+                    Reflect.defineMetadata(key, metadata, target);
+                    continue;
+                }
+                if (key === constants_js_1.GUARDS_METADATA || key === constants_js_1.INTERCEPTORS_METADATA || key === constants_js_1.EXCEPTION_FILTERS_METADATA) {
+                    const m1 = Reflect.getMetadata(key, target) || [];
+                    const metadata = [...m1];
+                    const m2 = Reflect.getOwnMetadata(key, parent) || [];
+                    m2.forEach((t) => {
+                        if (!metadata.includes(t)) {
+                            metadata.push(t);
+                        }
+                    });
+                    Reflect.defineMetadata(key, metadata, target);
+                }
             }
         }
     }

package/cjs/services/opra-exception-filter.js

@@ -1,18 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpraExceptionFilter = exports.kHandler = void 0;
-const core_1 = require("@opra/core");
-exports.kHandler = Symbol.for('kHandler');
-class OpraExceptionFilter {
-    constructor(adapter) {
-        this.adapter = adapter;
+exports.OpraExceptionFilter = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
+const core_1 = require("@nestjs/core");
+const opra_nestjs_adapter_js_1 = require("../opra-nestjs-adapter.js");
+let OpraExceptionFilter = class OpraExceptionFilter extends core_1.BaseExceptionFilter {
+    constructor(moduleRef) {
+        super();
+        this.moduleRef = moduleRef;
     }
     catch(exception, host) {
-        const ctx = host.switchToHttp();
-        const _res = ctx.getResponse();
-        const error = (0, core_1.wrapException)(exception);
-        const response = core_1.HttpOutgoing.from(_res);
-        return this.adapter[exports.kHandler].sendErrorResponse(response, [error]);
+        const ctx = host.switchToHttp().getRequest().opraContext;
+        if (ctx) {
+            const adapter = this.moduleRef.get(opra_nestjs_adapter_js_1.OpraNestAdapter);
+            ctx.errors.push(exception);
+            return adapter.handler.sendResponse(ctx);
+        }
     }
-}
+};
 exports.OpraExceptionFilter = OpraExceptionFilter;
+exports.OpraExceptionFilter = OpraExceptionFilter = tslib_1.__decorate([
+    (0, common_1.Catch)(),
+    tslib_1.__metadata("design:paramtypes", [core_1.ModuleRef])
+], OpraExceptionFilter);

package/cjs/services/opra-middleware.js

@@ -4,21 +4,33 @@ exports.OpraMiddleware = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const core_1 = require("@opra/core");
+const constants_js_1 = require("../constants.js");
+const opra_nestjs_adapter_js_1 = require("../opra-nestjs-adapter.js");
 let OpraMiddleware = class OpraMiddleware {
+    constructor(opraAdapter, options) {
+        this.opraAdapter = opraAdapter;
+        this.options = options;
+    }
     use(req, res, next) {
         const request = core_1.HttpIncoming.from(req);
         const response = core_1.HttpOutgoing.from(res);
         /** Create the HttpContext */
-        req.opraContext = new core_1.HttpContext({
-            adapter: {},
+        const context = new core_1.HttpContext({
+            adapter: this.opraAdapter,
             platform: req.route ? 'express' : 'fastify',
             request,
             response,
         });
-        next();
+        req.opraContext = context;
+        this.opraAdapter
+            .emitAsync('createContext', context)
+            .then(() => next())
+            .catch(next);
     }
 };
 exports.OpraMiddleware = OpraMiddleware;
 exports.OpraMiddleware = OpraMiddleware = tslib_1.__decorate([
-    (0, common_1.Injectable)()
+    (0, common_1.Injectable)(),
+    tslib_1.__param(1, (0, common_1.Inject)(constants_js_1.OPRA_HTTP_MODULE_OPTIONS)),
+    tslib_1.__metadata("design:paramtypes", [opra_nestjs_adapter_js_1.OpraNestAdapter, Object])
 ], OpraMiddleware);

package/esm/augmentation/nestjs.augmentation.js

@@ -1,4 +1,4 @@
-import { ExternalExceptionFilter } from '@nestjs/core/exceptions/external-exception-filter';
+import { ExternalExceptionFilter } from '@nestjs/core/exceptions/external-exception-filter.js';
 const oldCatchMethod = ExternalExceptionFilter.prototype.catch;
 ExternalExceptionFilter.prototype.catch = function (exception, host) {
     const opraContext = host.getArgByIndex(3);

package/esm/constants.js

@@ -1 +1,2 @@
-export const IS_PUBLIC_KEY = 'isPublic';
+export const IS_PUBLIC_KEY = 'opra:isPublic';
+export const OPRA_HTTP_MODULE_OPTIONS = 'OPRA_HTTP_MODULE_OPTIONS';

package/esm/opra-http-core.module.js

@@ -1,9 +1,12 @@
 var OpraHttpCoreModule_1;
 import { __decorate, __metadata } from "tslib";
 import { Global, Module, RequestMethod, } from '@nestjs/common';
-import { ApiDocumentFactory } from '@opra/common';
+import { APP_FILTER, ModuleRef } from '@nestjs/core';
+import { ApiDocumentFactory, isConstructor } from '@opra/common';
 import { asMutable } from 'ts-gems';
+import { OPRA_HTTP_MODULE_OPTIONS } from './constants.js';
 import { OpraNestAdapter } from './opra-nestjs-adapter.js';
+import { OpraExceptionFilter } from './services/opra-exception-filter.js';
 import { OpraMiddleware } from './services/opra-middleware.js';
 let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
     constructor(opraAdapter) {
@@ -20,16 +23,35 @@ let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
         const token = init?.id || OpraNestAdapter;
         const providers = [
             ...(init?.providers || []),
+            {
+                provide: OPRA_HTTP_MODULE_OPTIONS,
+                useValue: { ...options },
+            },
             {
                 provide: OpraNestAdapter,
-                useFactory: async () => {
+                inject: [ModuleRef],
+                useFactory: async (moduleRef) => {
                     asMutable(opraAdapter).document = await ApiDocumentFactory.createDocument({
                         ...init,
                         api: { protocol: 'http', name: init.name, controllers: init.controllers },
                     });
+                    opraAdapter.interceptors.map(x => {
+                        if (isConstructor(x)) {
+                            return (ctx, next) => {
+                                const interceptor = moduleRef.get(x);
+                                if (typeof interceptor.intercept === 'function')
+                                    return interceptor.intercept(ctx, next());
+                            };
+                        }
+                        return x;
+                    });
                     return opraAdapter;
                 },
             },
+            {
+                provide: APP_FILTER,
+                useClass: OpraExceptionFilter,
+            },
         ];
         if (token !== OpraNestAdapter) {
             providers.push({

package/esm/opra-nestjs-adapter.js

@@ -1,19 +1,21 @@
 import { __decorate, __metadata, __param } from "tslib";
-import { Controller, Delete, Get, Head, Next, Options, Patch, Post, Put, Req, Res, Search, UseFilters, } from '@nestjs/common';
+import nodePath from 'node:path';
+import { Controller, Delete, Get, Head, Next, Options, Patch, Post, Put, Req, Res, Search, } from '@nestjs/common';
+import { EXCEPTION_FILTERS_METADATA, GUARDS_METADATA, INTERCEPTORS_METADATA } from '@nestjs/common/constants.js';
 import { ApiDocument, HTTP_CONTROLLER_METADATA, HttpApi, isConstructor, NotFoundError, } from '@opra/common';
 import { HttpAdapter } from '@opra/core';
-import nodePath from 'path';
 import { asMutable } from 'ts-gems';
-import { Public } from './decorators/public.decorator';
-import { OpraExceptionFilter } from './services/opra-exception-filter.js';
-export const kHandler = Symbol.for('kHandler');
+import { Public } from './decorators/public.decorator.js';
 export class OpraNestAdapter extends HttpAdapter {
     constructor(init, options) {
         super((function () {
             const document = new ApiDocument();
             document.api = new HttpApi(document);
             return document;
-        })(), options);
+        })(), {
+            ...options,
+            interceptors: options?.interceptors,
+        });
         this.nestControllers = [];
         this.options = options;
         let basePath = options?.basePath || '/';
@@ -21,7 +23,7 @@ export class OpraNestAdapter extends HttpAdapter {
             basePath = '/' + basePath;
         this._addRootController(basePath);
         if (init.controllers)
-            init.controllers.forEach(c => this._addToNestControllers(c, basePath));
+            init.controllers.forEach(c => this._addToNestControllers(c, basePath, []));
     }
     async close() {
         //
@@ -30,7 +32,7 @@ export class OpraNestAdapter extends HttpAdapter {
         const _this = this;
         let RootController = class RootController {
             schema(_req, next) {
-                _this[kHandler].sendDocumentSchema(_req.opraContext).catch(next);
+                _this.handler.sendDocumentSchema(_req.opraContext).catch(() => next());
             }
         };
         __decorate([
@@ -51,7 +53,7 @@ export class OpraNestAdapter extends HttpAdapter {
         }
         this.nestControllers.push(RootController);
     }
-    _addToNestControllers(sourceClass, currentPath) {
+    _addToNestControllers(sourceClass, currentPath, parentTree) {
         const metadata = Reflect.getMetadata(HTTP_CONTROLLER_METADATA, sourceClass);
         if (!metadata)
             return;
@@ -59,10 +61,16 @@ export class OpraNestAdapter extends HttpAdapter {
             [sourceClass.name]: class extends sourceClass {
             },
         }[sourceClass.name];
+        /** Copy metadata keys from source class to new one */
+        let metadataKeys;
+        OpraNestAdapter.copyDecoratorMetadataToChild(newClass, parentTree);
         const newPath = metadata.path ? nodePath.join(currentPath, metadata.path) : currentPath;
         const adapter = this;
-        /** Inject exception filter */
-        UseFilters(new OpraExceptionFilter(adapter))(newClass);
+        // adapter.logger =
+        /** Disable default error handler. Errors will be handled by OpraExceptionFilter */
+        adapter.handler.onError = (context, error) => {
+            throw error;
+        };
         Controller()(newClass);
         this.nestControllers.push(newClass);
         if (metadata.operations) {
@@ -71,7 +79,8 @@ export class OpraNestAdapter extends HttpAdapter {
                 Object.defineProperty(newClass.prototype, k, {
                     writable: true,
                     /** NestJS handler method */
-                    async value(_req) {
+                    async value(_req, _res) {
+                        _res.statusCode = 200;
                         const api = adapter.document.api;
                         const controller = api.findController(sourceClass);
                         const operation = controller?.operations.get(k);
@@ -86,18 +95,16 @@ export class OpraNestAdapter extends HttpAdapter {
                             });
                         }
                         /** Configure the HttpContext */
-                        context.adapter = adapter;
-                        context.document = adapter.document;
                         context.operation = operation;
                         context.controller = operation.owner;
                         context.controllerInstance = this;
                         context.operationHandler = operationHandler;
                         /** Handle request */
-                        await adapter[kHandler].handleRequest(context);
+                        await adapter.handler.handleRequest(context);
                     },
                 });
                 /** Copy metadata keys from source function to new one */
-                const metadataKeys = Reflect.getOwnMetadataKeys(operationHandler);
+                metadataKeys = Reflect.getOwnMetadataKeys(operationHandler);
                 const newFn = newClass.prototype[k];
                 for (const key of metadataKeys) {
                     const m = Reflect.getMetadata(key, operationHandler);
@@ -106,7 +113,7 @@ export class OpraNestAdapter extends HttpAdapter {
                 Req()(newClass.prototype, k, 0);
                 Res()(newClass.prototype, k, 1);
                 const descriptor = Object.getOwnPropertyDescriptor(newClass.prototype, k);
-                const operationPath = newPath + (v.path || '');
+                const operationPath = v.mergePath ? newPath + (v.path || '') : nodePath.posix.join(newPath, v.path || '');
                 switch (v.method || 'GET') {
                     case 'DELETE':
                         /** Call @Delete decorator over new property */
@@ -149,7 +156,30 @@ export class OpraNestAdapter extends HttpAdapter {
             for (const child of metadata.controllers) {
                 if (!isConstructor(child))
                     throw new TypeError('Controllers should be injectable a class');
-                this._addToNestControllers(child, newPath);
+                this._addToNestControllers(child, newPath, [...parentTree, sourceClass]);
+            }
+        }
+    }
+    static copyDecoratorMetadataToChild(target, parentTree) {
+        for (const parent of parentTree) {
+            const metadataKeys = Reflect.getOwnMetadataKeys(parent);
+            for (const key of metadataKeys) {
+                if (typeof key === 'string' && key.startsWith('opra:') && !Reflect.hasOwnMetadata(key, target)) {
+                    const metadata = Reflect.getMetadata(key, parent);
+                    Reflect.defineMetadata(key, metadata, target);
+                    continue;
+                }
+                if (key === GUARDS_METADATA || key === INTERCEPTORS_METADATA || key === EXCEPTION_FILTERS_METADATA) {
+                    const m1 = Reflect.getMetadata(key, target) || [];
+                    const metadata = [...m1];
+                    const m2 = Reflect.getOwnMetadata(key, parent) || [];
+                    m2.forEach((t) => {
+                        if (!metadata.includes(t)) {
+                            metadata.push(t);
+                        }
+                    });
+                    Reflect.defineMetadata(key, metadata, target);
+                }
             }
         }
     }

package/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/esm/services/opra-exception-filter.js

@@ -1,14 +1,23 @@
-import { HttpOutgoing, wrapException } from '@opra/core';
-export const kHandler = Symbol.for('kHandler');
-export class OpraExceptionFilter {
-    constructor(adapter) {
-        this.adapter = adapter;
+import { __decorate, __metadata } from "tslib";
+import { Catch } from '@nestjs/common';
+import { BaseExceptionFilter, ModuleRef } from '@nestjs/core';
+import { OpraNestAdapter } from '../opra-nestjs-adapter.js';
+let OpraExceptionFilter = class OpraExceptionFilter extends BaseExceptionFilter {
+    constructor(moduleRef) {
+        super();
+        this.moduleRef = moduleRef;
     }
     catch(exception, host) {
-        const ctx = host.switchToHttp();
-        const _res = ctx.getResponse();
-        const error = wrapException(exception);
-        const response = HttpOutgoing.from(_res);
-        return this.adapter[kHandler].sendErrorResponse(response, [error]);
+        const ctx = host.switchToHttp().getRequest().opraContext;
+        if (ctx) {
+            const adapter = this.moduleRef.get(OpraNestAdapter);
+            ctx.errors.push(exception);
+            return adapter.handler.sendResponse(ctx);
+        }
     }
-}
+};
+OpraExceptionFilter = __decorate([
+    Catch(),
+    __metadata("design:paramtypes", [ModuleRef])
+], OpraExceptionFilter);
+export { OpraExceptionFilter };

package/esm/services/opra-middleware.js

@@ -1,21 +1,33 @@
-import { __decorate } from "tslib";
-import { Injectable } from '@nestjs/common';
+import { __decorate, __metadata, __param } from "tslib";
+import { Inject, Injectable } from '@nestjs/common';
 import { HttpContext, HttpIncoming, HttpOutgoing } from '@opra/core';
+import { OPRA_HTTP_MODULE_OPTIONS } from '../constants.js';
+import { OpraNestAdapter } from '../opra-nestjs-adapter.js';
 let OpraMiddleware = class OpraMiddleware {
+    constructor(opraAdapter, options) {
+        this.opraAdapter = opraAdapter;
+        this.options = options;
+    }
     use(req, res, next) {
         const request = HttpIncoming.from(req);
         const response = HttpOutgoing.from(res);
         /** Create the HttpContext */
-        req.opraContext = new HttpContext({
-            adapter: {},
+        const context = new HttpContext({
+            adapter: this.opraAdapter,
             platform: req.route ? 'express' : 'fastify',
             request,
             response,
         });
-        next();
+        req.opraContext = context;
+        this.opraAdapter
+            .emitAsync('createContext', context)
+            .then(() => next())
+            .catch(next);
     }
 };
 OpraMiddleware = __decorate([
-    Injectable()
+    Injectable(),
+    __param(1, Inject(OPRA_HTTP_MODULE_OPTIONS)),
+    __metadata("design:paramtypes", [OpraNestAdapter, Object])
 ], OpraMiddleware);
 export { OpraMiddleware };

package/package.json

@@ -1,55 +1,45 @@
 {
   "name": "@opra/nestjs",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.0-beta.1",
   "description": "Opra NestJS module",
   "author": "Panates",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/panates/opra.git",
-    "directory": "packages/nestjs"
-  },
-  "scripts": {
-    "compile": "tsc",
-    "prebuild": "npm run lint && npm run clean",
-    "build": "npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc -b tsconfig-build-cjs.json",
-    "build:esm": "tsc -b tsconfig-build-esm.json",
-    "postbuild": "cp README.md package.json ../../LICENSE ../../build/nestjs && cp ../../package.cjs.json ../../build/nestjs/cjs/package.json",
-    "lint": "eslint . --max-warnings=0",
-    "format": "prettier . --write --log-level=warn",
-    "test": "jest --passWithNoTests",
-    "cover": "jest --passWithNoTests --collect-coverage",
-    "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
-    "clean:src": "ts-cleanup -s src --all",
-    "clean:test": "ts-cleanup -s test --all",
-    "clean:dist": "rimraf ../../build/client",
-    "clean:cover": "rimraf ../../coverage/client"
-  },
   "dependencies": {
-    "@opra/common": "^1.0.0-alpha.9",
-    "@opra/core": "^1.0.0-alpha.9",
-    "fast-tokenizer": "^1.3.0",
+    "@opra/common": "^1.0.0-beta.1",
+    "@opra/core": "^1.0.0-beta.1",
+    "fast-tokenizer": "^1.7.0",
     "lodash.head": "^4.0.1",
-    "reflect-metadata": "^0.2.2"
+    "putil-promisify": "^1.10.1",
+    "reflect-metadata": "^0.2.2",
+    "tslib": "^2.7.0"
   },
   "peerDependencies": {
-    "@nestjs/common": "^10.3.10",
-    "@nestjs/core": "^10.3.10"
-  },
-  "devDependencies": {
-    "@nestjs/platform-express": "^10.3.10",
-    "@nestjs/testing": "^10.3.10",
-    "@types/lodash.head": "^4.0.9",
-    "filedirname": "^3.4.0",
-    "rxjs": "^7.8.1",
-    "supertest": "^7.0.0",
-    "ts-gems": "^3.4.0"
+    "@nestjs/common": "^10.4.1",
+    "@nestjs/core": "^10.4.1"
   },
   "type": "module",
-  "module": "./esm/index.js",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "require": {
+        "types": "./types/index.d.cts",
+        "default": "./cjs/index.js"
+      },
+      "default": "./esm/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "main": "./cjs/index.js",
+  "module": "./esm/index.js",
   "types": "./types/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/panates/opra.git",
+    "directory": "packages/nestjs"
+  },
   "engines": {
     "node": ">=16.0",
     "npm": ">=7.0.0"
@@ -66,4 +56,4 @@
     "opra",
     "nestjs"
   ]
-}
+}

package/types/constants.d.ts

@@ -1 +1,2 @@
-export declare const IS_PUBLIC_KEY = "isPublic";
+export declare const IS_PUBLIC_KEY = "opra:isPublic";
+export declare const OPRA_HTTP_MODULE_OPTIONS = "OPRA_HTTP_MODULE_OPTIONS";

package/types/index.d.cts

@@ -0,0 +1,6 @@
+import 'reflect-metadata';
+import './augmentation/nestjs.augmentation.js';
+export * from './constants.js';
+export * from './decorators/public.decorator.js';
+export * from './opra-http.module.js';
+export * from './opra-nestjs-adapter.js';

package/types/opra-http-core.module.d.ts

@@ -1,5 +1,5 @@
-import { DynamicModule, MiddlewareConsumer, NestModule, OnModuleDestroy } from '@nestjs/common';
-import type { OpraHttpModule } from './opra-http.module';
+import { type DynamicModule, type MiddlewareConsumer, type NestModule, type OnModuleDestroy } from '@nestjs/common';
+import type { OpraHttpModule } from './opra-http.module.js';
 import { OpraNestAdapter } from './opra-nestjs-adapter.js';
 export declare class OpraHttpCoreModule implements OnModuleDestroy, NestModule {
     protected opraAdapter: OpraNestAdapter;

package/types/opra-http.module.d.ts

@@ -1,5 +1,6 @@
-import { DynamicModule } from '@nestjs/common';
+import { type DynamicModule, type Type } from '@nestjs/common';
 import { ApiDocumentFactory } from '@opra/common';
+import { HttpAdapter } from '@opra/core';
 export declare namespace OpraHttpModule {
     interface Initiator extends Pick<DynamicModule, 'imports' | 'providers' | 'exports' | 'controllers'>, Pick<ApiDocumentFactory.InitArguments, 'types' | 'references' | 'info'> {
         id?: any;
@@ -8,6 +9,7 @@ export declare namespace OpraHttpModule {
     interface Options {
         basePath?: string;
         schemaRouteIsPublic?: boolean;
+        interceptors?: (HttpAdapter.InterceptorFunction | HttpAdapter.IHttpInterceptor | Type<HttpAdapter.IHttpInterceptor>)[];
     }
 }
 export declare class OpraHttpModule {

package/types/opra-nestjs-adapter.d.ts

@@ -1,12 +1,12 @@
-import { Type } from '@nestjs/common';
+import { type Type } from '@nestjs/common';
 import { HttpAdapter } from '@opra/core';
-import type { OpraHttpModule } from './opra-http.module';
-export declare const kHandler: unique symbol;
+import type { OpraHttpModule } from './opra-http.module.js';
 export declare class OpraNestAdapter extends HttpAdapter {
     readonly nestControllers: Type[];
     readonly options?: OpraHttpModule.Options;
     constructor(init: OpraHttpModule.Initiator, options?: OpraHttpModule.Options);
     close(): Promise<void>;
     protected _addRootController(basePath: string): void;
-    protected _addToNestControllers(sourceClass: Type, currentPath: string): void;
+    protected _addToNestControllers(sourceClass: Type, currentPath: string, parentTree: Type[]): void;
+    static copyDecoratorMetadataToChild(target: Type, parentTree: Type[]): void;
 }

package/types/services/opra-exception-filter.d.ts

@@ -1,8 +1,7 @@
-import { ArgumentsHost, ExceptionFilter } from '@nestjs/common';
-import { OpraNestAdapter } from '../opra-nestjs-adapter.js';
-export declare const kHandler: unique symbol;
-export declare class OpraExceptionFilter implements ExceptionFilter {
-    readonly adapter: OpraNestAdapter;
-    constructor(adapter: OpraNestAdapter);
-    catch(exception: any, host: ArgumentsHost): Promise<void>;
+import { type ArgumentsHost } from '@nestjs/common';
+import { BaseExceptionFilter, ModuleRef } from '@nestjs/core';
+export declare class OpraExceptionFilter extends BaseExceptionFilter {
+    private moduleRef;
+    constructor(moduleRef: ModuleRef);
+    catch(exception: any, host: ArgumentsHost): Promise<void> | undefined;
 }

package/types/services/opra-middleware.d.ts

@@ -1,5 +1,10 @@
-import { NestMiddleware } from '@nestjs/common';
+import { type NestMiddleware } from '@nestjs/common';
 import type { NextFunction, Request, Response } from 'express';
+import type { OpraHttpModule } from '../opra-http.module.js';
+import { OpraNestAdapter } from '../opra-nestjs-adapter.js';
 export declare class OpraMiddleware implements NestMiddleware {
+    protected opraAdapter: OpraNestAdapter;
+    protected options: OpraHttpModule.Options;
+    constructor(opraAdapter: OpraNestAdapter, options: OpraHttpModule.Options);
     use(req: Request, res: Response, next: NextFunction): void;
 }

package/cjs/interfaces/opra-module-options.interface.js

@@ -1,17 +0,0 @@
-"use strict";
-// import { ApiDocumentFactory } from '@opra/common';
-// import { ExpressAdapter, HttpAdapter } from '@opra/core';
-// export interface OpraModuleOptions extends HttpAdapter.Options {
-//   id?: any;
-//   document?: Partial<ApiDocumentFactory.InitArguments>;
-//
-//   /**
-//    * @default true
-//    */
-//   useGlobalPrefix?: boolean;
-// }
-// export interface ExpressModuleOptions extends OpraModuleOptions, HttpAdapter.Options {}
-// type OpraModuleOptionsWithoutId = Omit<OpraModuleOptions, 'id'>;
-// export interface OpraModuleOptionsFactory {
-//   createOptions(): Promise<OpraModuleOptionsWithoutId> | OpraModuleOptionsWithoutId;
-// }

package/esm/interfaces/opra-module-options.interface.js

@@ -1,17 +0,0 @@
-"use strict";
-// import { ApiDocumentFactory } from '@opra/common';
-// import { ExpressAdapter, HttpAdapter } from '@opra/core';
-// export interface OpraModuleOptions extends HttpAdapter.Options {
-//   id?: any;
-//   document?: Partial<ApiDocumentFactory.InitArguments>;
-//
-//   /**
-//    * @default true
-//    */
-//   useGlobalPrefix?: boolean;
-// }
-// export interface ExpressModuleOptions extends OpraModuleOptions, HttpAdapter.Options {}
-// type OpraModuleOptionsWithoutId = Omit<OpraModuleOptions, 'id'>;
-// export interface OpraModuleOptionsFactory {
-//   createOptions(): Promise<OpraModuleOptionsWithoutId> | OpraModuleOptionsWithoutId;
-// }