@open-norantec/herbal 2.0.0-alpha.4 → 2.0.0-alpha.6

package/dist/abstracts/auth-adapter.abstract.class.d.ts

@@ -1,7 +1,7 @@
-import { ModuleRef } from '@nestjs/core';
 import { Constructor } from 'type-fest';
 import { Request } from 'express';
 import { Transaction } from 'sequelize';
+import { GetModuleFn } from '../types';
 export interface AuthenticateReturn {
     challengeValue: string;
     identifier: string;
@@ -13,8 +13,8 @@ export interface AuthenticateResult extends AuthenticateReturn {
 }
 export declare abstract class AuthAdapter {
     protected readonly request: Request;
-    protected readonly ref: ModuleRef;
-    constructor(request: Request, ref: ModuleRef);
+    protected readonly getModule: GetModuleFn;
+    constructor(request: Request, getModule: GetModuleFn);
     abstract match(): boolean;
     abstract authenticate(transaction?: Transaction): Promise<AuthenticateReturn | null>;
 }

package/dist/abstracts/auth-adapter.abstract.class.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthAdapter = void 0;
 var AuthAdapter = (function () {
-    function AuthAdapter(request, ref) {
+    function AuthAdapter(request, getModule) {
         this.request = request;
-        this.ref = ref;
+        this.getModule = getModule;
     }
     return AuthAdapter;
 }());

package/dist/core.d.ts

@@ -4,11 +4,11 @@ import { Request, RequestContext } from './types/request.type';
 import { z } from '@open-norantec/utilities';
 import 'reflect-metadata';
 import { Request as ExpressRequest } from 'express';
-import { ModuleRef } from '@nestjs/core';
 import { Constructor } from 'type-fest';
 import { Sequelize } from 'sequelize-typescript';
 import { AuthAdapter } from './abstracts/auth-adapter.abstract.class';
 import { PathsObject } from 'openapi3-ts/oas31';
+import { GetModuleFn } from './types';
 export * from '@nestjs/core';
 export type MethodHandler<IS extends z.ZodType<any>, OS extends z.ZodType<any>> = (request: Request, input: unknown, headers: ReturnType<typeof HeaderUtil.parse>) => Promise<{
     request: z.infer<IS>;
@@ -51,22 +51,23 @@ export declare function getControllerName(target: Function): any;
 export interface HerbalControllerOptions<C> {
     ignoreControllerNamePostfix?: boolean;
     prefix?: string;
-    useHeadGuards?: Constructor<any>[];
-    useTailGuards?: Constructor<any>[];
     methods?: (register: MethodRegisterFn<C>) => void;
+    onAfterParsingRequest?: (request: Request, getModule: GetModuleFn) => void | Promise<void>;
+    onBeforeParsingRequest?: (request: Request, getModule: GetModuleFn) => void | Promise<void>;
 }
 export interface ControllerUtilCreateOptions {
     prefix?: string;
-    useGuards?: Constructor<any>[];
     getTraceId?: (request: ExpressRequest) => string;
+    onAfterParsingRequest?: HerbalControllerOptions<any>['onAfterParsingRequest'];
+    onBeforeParsingRequest?: HerbalControllerOptions<any>['onBeforeParsingRequest'];
 }
-export declare function parseRequest({ request, traceId: inputTraceId, sequelize: sequelizeInstance, moduleRef, handlerName, handlerPrototype, onLog, }: {
+export declare function parseRequest({ request, traceId: inputTraceId, sequelize: sequelizeInstance, handlerName, handlerPrototype, onLog, getModule, }: {
     handlerPrototype: object;
-    moduleRef: ModuleRef;
     request: Request;
     handlerName?: string;
     sequelize?: Sequelize;
     traceId?: string;
+    getModule: GetModuleFn;
     onLog?: (methodName: string, message: string) => void;
 }): Promise<void>;
 export declare function getMethodPool(targetPrototype: object): MethodPool | null;

package/dist/core.js

@@ -76,15 +76,6 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
     function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRequestHandler = exports.ControllerUtil = exports.getMethodPool = exports.parseRequest = exports.getControllerName = exports.isHerbalController = void 0;
 require("reflect-metadata");
@@ -241,6 +232,8 @@ var MethodPool = (function () {
 }());
 var IS_HERBAL_CONTROLLER = Symbol();
 var CONTROLLER_NAME = Symbol();
+var AFTER_PARSING_REQUEST_HANDLERS = Symbol();
+var BEFORE_PARSING_REQUEST_HANDLERS = Symbol();
 function isHerbalController(target) {
     return _.attempt(function () { return Reflect.getMetadata(IS_HERBAL_CONTROLLER, target.prototype); }) === true;
 }
@@ -309,14 +302,16 @@ function parseRequest(_a) {
     var _b, request_1, request_1_1;
     var _c, e_1, _d, _e;
     var _f, _g, _h, _j, _k;
-    var request = _a.request, inputTraceId = _a.traceId, sequelizeInstance = _a.sequelize, moduleRef = _a.moduleRef, handlerName = _a.handlerName, handlerPrototype = _a.handlerPrototype, onLog = _a.onLog;
+    var request = _a.request, inputTraceId = _a.traceId, sequelizeInstance = _a.sequelize, handlerName = _a.handlerName, handlerPrototype = _a.handlerPrototype, onLog = _a.onLog, getModule = _a.getModule;
     return __awaiter(this, void 0, void 0, function () {
-        var transaction, chunks_1, chunk, e_1_1, _l, parsedBody, methodPool, authAdapters, shouldHaveTransaction, error_2, authSucceeded, error_3, _m;
+        var transaction, beforeParsingRequestHandlers, afterParsingRequestHandlers, chunks_1, chunk, e_1_1, _l, parsedBody, methodPool, authAdapters, shouldHaveTransaction, error_2, authSucceeded, error_3, _m;
         var _this = this;
         return __generator(this, function (_o) {
             switch (_o.label) {
                 case 0:
                     transaction = undefined;
+                    beforeParsingRequestHandlers = Reflect.getMetadata(BEFORE_PARSING_REQUEST_HANDLERS, handlerPrototype);
+                    afterParsingRequestHandlers = Reflect.getMetadata(AFTER_PARSING_REQUEST_HANDLERS, handlerPrototype);
                     request.traceId = string_util_class_1.StringUtil.isFalsyString(inputTraceId) ? uuid_util_class_1.UUIDUtil.generateV4() : inputTraceId;
                     request.methodName = request.url.split('/').pop();
                     if (!(typeof request.rawBody === 'undefined')) return [3, 16];
@@ -372,39 +367,44 @@ function parseRequest(_a) {
                     _o.label = 16;
                 case 16:
                     _.attempt(function () { return onLog === null || onLog === void 0 ? void 0 : onLog('log', "[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":request:body] ").concat(request.rawBody)); });
+                    return [4, Promise.all((Array.isArray(beforeParsingRequestHandlers) ? beforeParsingRequestHandlers : []).map(function (handler) {
+                            return handler(request, getModule);
+                        }))];
+                case 17:
+                    _o.sent();
                     methodPool = getMethodPool(handlerPrototype);
                     authAdapters = (_f = methodPool === null || methodPool === void 0 ? void 0 : methodPool.getAuthAdapters) === null || _f === void 0 ? void 0 : _f.call(methodPool, request.methodName);
                     if (authAdapters === null)
                         authAdapters = auth_adapter_decorator_1.AuthAdapters.getAdapters(handlerPrototype, handlerName);
                     shouldHaveTransaction = !decorators_1.NoTransaction.isDisabled(handlerPrototype, handlerName) && !((_g = methodPool === null || methodPool === void 0 ? void 0 : methodPool.transactionDisabled) === null || _g === void 0 ? void 0 : _g.call(methodPool, request.methodName));
-                    if (!(sequelizeInstance instanceof sequelize_typescript_1.Sequelize && shouldHaveTransaction)) return [3, 21];
-                    _o.label = 17;
-                case 17:
-                    _o.trys.push([17, 19, , 20]);
-                    return [4, ((_j = (_h = sequelizeInstance === null || sequelizeInstance === void 0 ? void 0 : sequelizeInstance.transaction) === null || _h === void 0 ? void 0 : _h.call(sequelizeInstance)) === null || _j === void 0 ? void 0 : _j.catch(function () { return Promise.resolve(undefined); }))];
+                    if (!(sequelizeInstance instanceof sequelize_typescript_1.Sequelize && shouldHaveTransaction)) return [3, 22];
+                    _o.label = 18;
                 case 18:
+                    _o.trys.push([18, 20, , 21]);
+                    return [4, ((_j = (_h = sequelizeInstance === null || sequelizeInstance === void 0 ? void 0 : sequelizeInstance.transaction) === null || _h === void 0 ? void 0 : _h.call(sequelizeInstance)) === null || _j === void 0 ? void 0 : _j.catch(function () { return Promise.resolve(undefined); }))];
+                case 19:
                     transaction = _o.sent();
                     request.transaction = transaction;
                     onLog === null || onLog === void 0 ? void 0 : onLog('log', "[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":transaction] Started transaction for route: ").concat(request.url));
-                    return [3, 20];
-                case 19:
+                    return [3, 21];
+                case 20:
                     error_2 = _o.sent();
                     if (error_2 instanceof Error) {
                         onLog === null || onLog === void 0 ? void 0 : onLog('error', "[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":transaction] Failed to start transaction: ").concat(error_2 === null || error_2 === void 0 ? void 0 : error_2.message, "\n").concat(error_2 === null || error_2 === void 0 ? void 0 : error_2.stack));
                     }
-                    return [3, 20];
-                case 20: return [3, 22];
-                case 21:
+                    return [3, 21];
+                case 21: return [3, 23];
+                case 22:
                     if (!shouldHaveTransaction) {
                         onLog === null || onLog === void 0 ? void 0 : onLog('log', "[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":transaction] Transaction is disabled for this route: ").concat(request.url));
                     }
                     else {
                         throw new Error('Sequelize instance not found, cannot start transaction');
                     }
-                    _o.label = 22;
-                case 22:
-                    _o.trys.push([22, 25, , 30]);
-                    if (!(Array.isArray(authAdapters) && authAdapters.length > 0 && typeof request.authenticateResult === 'undefined')) return [3, 24];
+                    _o.label = 23;
+                case 23:
+                    _o.trys.push([23, 26, 31, 33]);
+                    if (!(Array.isArray(authAdapters) && authAdapters.length > 0 && typeof request.authenticateResult === 'undefined')) return [3, 25];
                     return [4, (function () { return __awaiter(_this, void 0, void 0, function () {
                             var _i, authAdapters_1, AuthAdapterClass, adapter, authenticateResult;
                             return __generator(this, function (_a) {
@@ -415,7 +415,7 @@ function parseRequest(_a) {
                                     case 1:
                                         if (!(_i < authAdapters_1.length)) return [3, 4];
                                         AuthAdapterClass = authAdapters_1[_i];
-                                        adapter = new AuthAdapterClass(request, moduleRef);
+                                        adapter = new AuthAdapterClass(request, getModule);
                                         if (!adapter.match())
                                             return [3, 3];
                                         return [4, adapter.authenticate(transaction)];
@@ -432,29 +432,35 @@ function parseRequest(_a) {
                                 }
                             });
                         }); })()];
-                case 23:
+                case 24:
                     authSucceeded = _o.sent();
                     if (!authSucceeded)
                         throw new common_3.UnauthorizedException();
-                    _o.label = 24;
-                case 24: return [3, 30];
-                case 25:
-                    error_3 = _o.sent();
-                    _o.label = 26;
+                    _o.label = 25;
+                case 25: return [3, 33];
                 case 26:
-                    _o.trys.push([26, 28, , 29]);
+                    error_3 = _o.sent();
+                    _o.label = 27;
+                case 27:
+                    _o.trys.push([27, 29, , 30]);
                     if (error_3 instanceof Error) {
                         onLog === null || onLog === void 0 ? void 0 : onLog('error', "[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":error] Got error when handling route: ").concat(error_3 === null || error_3 === void 0 ? void 0 : error_3.message, " ").concat(error_3 === null || error_3 === void 0 ? void 0 : error_3.stack));
                     }
                     return [4, ((_k = transaction === null || transaction === void 0 ? void 0 : transaction.rollback) === null || _k === void 0 ? void 0 : _k.call(transaction))];
-                case 27:
-                    _o.sent();
-                    return [3, 29];
                 case 28:
+                    _o.sent();
+                    return [3, 30];
+                case 29:
                     _m = _o.sent();
-                    return [3, 29];
-                case 29: throw error_3;
-                case 30: return [2];
+                    return [3, 30];
+                case 30: throw error_3;
+                case 31: return [4, Promise.all((Array.isArray(afterParsingRequestHandlers) ? afterParsingRequestHandlers : []).map(function (handler) {
+                        return handler(request, getModule);
+                    }))];
+                case 32:
+                    _o.sent();
+                    return [7];
+                case 33: return [2];
             }
         });
     });
@@ -484,11 +490,11 @@ function HerbalGuard(options) {
                                 traceId = uuid_util_class_1.UUIDUtil.generateV4();
                             return [4, parseRequest({
                                     request: request,
-                                    moduleRef: this.ref,
                                     sequelize: sequelizeInstance instanceof Error ? undefined : sequelizeInstance,
                                     handlerPrototype: (_c = (_b = (_a = context === null || context === void 0 ? void 0 : context.getClass) === null || _a === void 0 ? void 0 : _a.call(context)) === null || _b === void 0 ? void 0 : _b.prototype) !== null && _c !== void 0 ? _c : {},
                                     handlerName: (_e = (_d = context === null || context === void 0 ? void 0 : context.getHandler) === null || _d === void 0 ? void 0 : _d.call(context)) === null || _e === void 0 ? void 0 : _e.name,
                                     traceId: traceId,
+                                    getModule: this.ref.get.bind(this.ref),
                                     onLog: function (method, message) {
                                         var _a;
                                         try {
@@ -632,9 +638,21 @@ var ControllerUtil = (function () {
                         logger.log("Mapped method: /".concat(controllerName).concat(path));
                     });
                 }
+                var beforeParsingRequestHandlers = [];
+                var afterParsingRequestHandlers = [];
+                if (typeof (createOptions === null || createOptions === void 0 ? void 0 : createOptions.onBeforeParsingRequest) === 'function')
+                    beforeParsingRequestHandlers.push(createOptions.onBeforeParsingRequest);
+                if (typeof (options === null || options === void 0 ? void 0 : options.onBeforeParsingRequest) === 'function')
+                    beforeParsingRequestHandlers.push(options.onBeforeParsingRequest);
+                if (typeof (options === null || options === void 0 ? void 0 : options.onAfterParsingRequest) === 'function')
+                    afterParsingRequestHandlers.push(options.onAfterParsingRequest);
+                if (typeof (createOptions === null || createOptions === void 0 ? void 0 : createOptions.onAfterParsingRequest) === 'function')
+                    afterParsingRequestHandlers.push(createOptions.onAfterParsingRequest);
+                Reflect.defineMetadata(BEFORE_PARSING_REQUEST_HANDLERS, beforeParsingRequestHandlers, target.prototype);
+                Reflect.defineMetadata(AFTER_PARSING_REQUEST_HANDLERS, afterParsingRequestHandlers, target.prototype);
                 (0, common_2.Controller)(finalPrefix)(target);
                 (0, common_2.UseInterceptors)(ControllerInterceptor)(target);
-                common_2.UseGuards.apply(void 0, __spreadArray(__spreadArray(__spreadArray([HerbalGuard(_.pick(createOptions, ['getTraceId']))], (Array.isArray(options === null || options === void 0 ? void 0 : options.useHeadGuards) ? options.useHeadGuards : []), false), (Array.isArray(createOptions === null || createOptions === void 0 ? void 0 : createOptions.useGuards) ? createOptions.useGuards : []), false), (Array.isArray(options === null || options === void 0 ? void 0 : options.useTailGuards) ? options.useTailGuards : []), false))(target);
+                (0, common_2.UseGuards)(HerbalGuard(_.pick(createOptions, ['getTraceId'])))(target);
             };
         }
         Controller.isHerbalController = isHerbalController;

package/dist/types/index.d.ts

@@ -1,2 +1,7 @@
+import { Constructor } from 'type-fest';
 export * from './request.type';
 export * from './http-response-body.type';
+export type GetModuleFn = <TInput = any, TResult = TInput>(typeOrToken: Constructor<TInput> | Function | string | symbol, options: {
+    strict?: boolean;
+    each?: undefined | false;
+}) => TResult;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@open-norantec/herbal",
-    "version": "2.0.0-alpha.4",
+    "version": "2.0.0-alpha.6",
     "description": "Herbal is a builder and toolchain for Nest.js applications",
     "main": "dist/index.js",
     "scripts": {