@opra/nestjs 1.0.0-alpha.23 → 1.0.0-alpha.24

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

@@ -4,9 +4,11 @@ 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 opra_nestjs_adapter_js_1 = require("./opra-nestjs-adapter.js");
+const opra_exception_filter_1 = require("./services/opra-exception-filter");
 const opra_middleware_js_1 = require("./services/opra-middleware.js");
 let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
     constructor(opraAdapter) {
@@ -33,6 +35,10 @@ let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
                     return opraAdapter;
                 },
             },
+            {
+                provide: core_1.APP_FILTER,
+                useClass: opra_exception_filter_1.OpraExceptionFilter,
+            },
         ];
         if (token !== opra_nestjs_adapter_js_1.OpraNestAdapter) {
             providers.push({

package/cjs/opra-nestjs-adapter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpraNestAdapter = exports.kHandler = void 0;
+exports.OpraNestAdapter = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const constants_1 = require("@nestjs/common/constants");
@@ -9,8 +9,6 @@ const core_1 = require("@opra/core");
 const path_1 = tslib_1.__importDefault(require("path"));
 const ts_gems_1 = require("ts-gems");
 const public_decorator_js_1 = require("./decorators/public.decorator.js");
-const opra_exception_filter_js_1 = require("./services/opra-exception-filter.js");
-exports.kHandler = Symbol.for('kHandler');
 class OpraNestAdapter extends core_1.HttpAdapter {
     constructor(init, options) {
         super((function () {
@@ -23,6 +21,10 @@ class OpraNestAdapter extends core_1.HttpAdapter {
         let basePath = options?.basePath || '/';
         if (!basePath.startsWith('/'))
             basePath = '/' + basePath;
+        if (options?.onError)
+            this.on('error', options.onError);
+        if (options?.onRequest)
+            this.on('request', options.onRequest);
         this._addRootController(basePath);
         if (init.controllers)
             init.controllers.forEach(c => this._addToNestControllers(c, basePath, []));
@@ -34,7 +36,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([
@@ -68,8 +70,11 @@ class OpraNestAdapter extends core_1.HttpAdapter {
         OpraNestAdapter.copyDecoratorMetadataToChild(newClass, parentTree);
         const newPath = metadata.path ? 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) {
@@ -100,7 +105,7 @@ class OpraNestAdapter extends core_1.HttpAdapter {
                         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 */
@@ -113,7 +118,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 || '') : path_1.default.posix.join(newPath, v.path || '');
                 switch (v.method || 'GET') {
                     case 'DELETE':
                         /** Call @Delete decorator over new property */

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

@@ -1,18 +1,25 @@
 "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);
+            return adapter.handler.sendErrorResponse(ctx, [exception]);
+        }
     }
-}
+};
 exports.OpraExceptionFilter = OpraExceptionFilter;
+exports.OpraExceptionFilter = OpraExceptionFilter = tslib_1.__decorate([
+    (0, common_1.Catch)(),
+    tslib_1.__metadata("design:paramtypes", [core_1.ModuleRef])
+], OpraExceptionFilter);

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

@@ -1,9 +1,11 @@
 var OpraHttpCoreModule_1;
 import { __decorate, __metadata } from "tslib";
 import { Global, Module, RequestMethod, } from '@nestjs/common';
+import { APP_FILTER } from '@nestjs/core';
 import { ApiDocumentFactory } from '@opra/common';
 import { asMutable } from 'ts-gems';
 import { OpraNestAdapter } from './opra-nestjs-adapter.js';
+import { OpraExceptionFilter } from './services/opra-exception-filter';
 import { OpraMiddleware } from './services/opra-middleware.js';
 let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
     constructor(opraAdapter) {
@@ -30,6 +32,10 @@ let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
                     return opraAdapter;
                 },
             },
+            {
+                provide: APP_FILTER,
+                useClass: OpraExceptionFilter,
+            },
         ];
         if (token !== OpraNestAdapter) {
             providers.push({

package/esm/opra-nestjs-adapter.js

@@ -1,13 +1,11 @@
 import { __decorate, __metadata, __param } from "tslib";
-import { Controller, Delete, Get, Head, Next, Options, Patch, Post, Put, Req, Res, Search, UseFilters, } from '@nestjs/common';
+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';
 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.js';
-import { OpraExceptionFilter } from './services/opra-exception-filter.js';
-export const kHandler = Symbol.for('kHandler');
 export class OpraNestAdapter extends HttpAdapter {
     constructor(init, options) {
         super((function () {
@@ -20,6 +18,10 @@ export class OpraNestAdapter extends HttpAdapter {
         let basePath = options?.basePath || '/';
         if (!basePath.startsWith('/'))
             basePath = '/' + basePath;
+        if (options?.onError)
+            this.on('error', options.onError);
+        if (options?.onRequest)
+            this.on('request', options.onRequest);
         this._addRootController(basePath);
         if (init.controllers)
             init.controllers.forEach(c => this._addToNestControllers(c, basePath, []));
@@ -31,7 +33,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([
@@ -65,8 +67,11 @@ export class OpraNestAdapter extends HttpAdapter {
         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) {
@@ -97,7 +102,7 @@ export class OpraNestAdapter extends HttpAdapter {
                         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 */
@@ -110,7 +115,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 */

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

@@ -1,14 +1,22 @@
-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);
+            return adapter.handler.sendErrorResponse(ctx, [exception]);
+        }
     }
-}
+};
+OpraExceptionFilter = __decorate([
+    Catch(),
+    __metadata("design:paramtypes", [ModuleRef])
+], OpraExceptionFilter);
+export { OpraExceptionFilter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/nestjs",
-  "version": "1.0.0-alpha.23",
+  "version": "1.0.0-alpha.24",
   "description": "Opra NestJS module",
   "author": "Panates",
   "license": "MIT",
@@ -27,8 +27,8 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/common": "^1.0.0-alpha.23",
-    "@opra/core": "^1.0.0-alpha.23",
+    "@opra/common": "^1.0.0-alpha.24",
+    "@opra/core": "^1.0.0-alpha.24",
     "fast-tokenizer": "^1.3.0",
     "lodash.head": "^4.0.1",
     "reflect-metadata": "^0.2.2"
@@ -41,6 +41,7 @@
     "@nestjs/platform-express": "^10.3.10",
     "@nestjs/testing": "^10.3.10",
     "@types/lodash.head": "^4.0.9",
+    "express": "^4.19.2",
     "filedirname": "^3.4.0",
     "rxjs": "^7.8.1",
     "supertest": "^7.0.0",

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

@@ -1,5 +1,6 @@
 import { DynamicModule } 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,8 @@ export declare namespace OpraHttpModule {
     interface Options {
         basePath?: string;
         schemaRouteIsPublic?: boolean;
+        onRequest?: HttpAdapter.Events['request'];
+        onError?: HttpAdapter.Events['error'];
     }
 }
 export declare class OpraHttpModule {

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

@@ -1,7 +1,6 @@
 import { Type } from '@nestjs/common';
 import { HttpAdapter } from '@opra/core';
 import type { OpraHttpModule } from './opra-http.module.js';
-export declare const kHandler: unique symbol;
 export declare class OpraNestAdapter extends HttpAdapter {
     readonly nestControllers: Type[];
     readonly options?: OpraHttpModule.Options;

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 { 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;
 }