@open-norantec/herbal 1.0.2-alpha.34 → 1.0.2-alpha.35

package/dist/core.d.ts

@@ -8,12 +8,13 @@ import { Constructor } from 'type-fest';
 import { AuthAdapter } from './abstracts/auth-adapter.abstract.class';
 import { PathsObject } from 'zod-openapi/dist/openapi3-ts/dist/model/openapi31';
 export * from '@nestjs/core';
+declare const HANDLE_REQUEST_SYMBOL: unique symbol;
 export type MethodHandler<IS extends z.Schema<any>, OS extends z.Schema<any>> = (request: Request, input: unknown, headers: ReturnType<typeof HeaderUtil.parse>) => Promise<{
     request: z.infer<IS>;
     response: z.infer<OS>;
 }>;
 export declare class HerbalController {
-    private $handleRequest;
+    private [HANDLE_REQUEST_SYMBOL];
 }
 type ClientGroups = Array<string> | null | undefined;
 type ClienttGroupsFactory = (defaultGroupName: string) => ClientGroups;

package/dist/core.js

@@ -33,9 +33,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -111,10 +108,12 @@ var sequelize_typescript_1 = require("sequelize-typescript");
 var decorators_1 = require("./decorators");
 var zod_openapi_1 = require("zod-openapi");
 __exportStar(require("@nestjs/core"), exports);
-var HerbalController = exports.HerbalController = (function () {
+var HANDLE_REQUEST_SYMBOL = Symbol();
+var HANDLE_REQUEST_INSTANCE_SYMBOL = '$handleRequestInstance';
+var HerbalController = (function () {
     function HerbalController() {
     }
-    HerbalController.prototype.$handleRequest = function (request) {
+    HerbalController.prototype[HANDLE_REQUEST_SYMBOL] = function (request) {
         var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function () {
             var callFn, result, error_1;
@@ -170,14 +169,9 @@ var HerbalController = exports.HerbalController = (function () {
             });
         });
     };
-    __decorate([
-        __param(0, (0, common_1.Req)()),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Object]),
-        __metadata("design:returntype", Promise)
-    ], HerbalController.prototype, "$handleRequest", null);
     return HerbalController;
 }());
+exports.HerbalController = HerbalController;
 var METHOD_POOL = Symbol();
 var MethodConfig = (function () {
     function MethodConfig(name, options, callback) {
@@ -440,7 +434,7 @@ function HerbalGuard(options) {
                             _.attempt(function () { return _this.getLogger().log("[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":request:body] ").concat(request.rawBody)); });
                             rawHandlerName = (_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;
                             handlerPropertype = (_g = (_f = context === null || context === void 0 ? void 0 : context.getClass) === null || _f === void 0 ? void 0 : _f.call(context)) === null || _g === void 0 ? void 0 : _g.prototype;
-                            handlerName = string_util_class_1.StringUtil.isFalsyString(rawHandlerName) ? request.methodName : rawHandlerName;
+                            handlerName = string_util_class_1.StringUtil.isFalsyString(request.methodName) ? rawHandlerName : request.methodName;
                             authAdapters = (_j = (_h = getMethodPool(handlerPropertype)) === null || _h === void 0 ? void 0 : _h.getAuthAdapters) === null || _j === void 0 ? void 0 : _j.call(_h, handlerName);
                             if (authAdapters === null)
                                 authAdapters = auth_adapter_decorator_1.AuthAdapters.getAdapters(handlerPropertype, handlerName);
@@ -539,6 +533,7 @@ var ControllerUtil = (function () {
     function ControllerUtil() {
     }
     ControllerUtil.create = function (createOptions) {
+        var logger = new common_1.Logger('Herbal');
         function Controller(options) {
             return function (target) {
                 var _a;
@@ -549,6 +544,7 @@ var ControllerUtil = (function () {
                         : createOptions.prefix
                     : options.prefix;
                 var controllerName = _.camelCase(target.name.replace(/Controller$/g, ''));
+                var paths = [];
                 if (!(options === null || options === void 0 ? void 0 : options.ignoreControllerNamePostfix)) {
                     finalPrefix += "".concat(((_a = finalPrefix === null || finalPrefix === void 0 ? void 0 : finalPrefix.endsWith) === null || _a === void 0 ? void 0 : _a.call(finalPrefix, '/')) ? '' : '/').concat(controllerName);
                 }
@@ -556,7 +552,7 @@ var ControllerUtil = (function () {
                     if (string_util_class_1.StringUtil.isFalsyString(name) || typeof callback !== 'function')
                         return;
                     methodPool.registerMethod(name, options, callback);
-                    (0, common_2.Post)(name.startsWith('/') ? name : "/".concat(name))(target.prototype, '$handleRequest', Object.getOwnPropertyDescriptor(HerbalController.prototype, '$handleRequest'));
+                    paths.push(name.startsWith('/') ? name : "/".concat(name));
                 };
                 if (!finalPrefix.startsWith('/'))
                     finalPrefix = "/".concat(finalPrefix);
@@ -565,6 +561,20 @@ var ControllerUtil = (function () {
                 Reflect.defineMetadata(METHOD_POOL, methodPool, target.prototype);
                 if (typeof (options === null || options === void 0 ? void 0 : options.methods) === 'function')
                     options.methods(register);
+                Object.defineProperty(target.prototype, HANDLE_REQUEST_INSTANCE_SYMBOL, {
+                    enumerable: false,
+                    writable: false,
+                    value: function (request) {
+                        return this[HANDLE_REQUEST_SYMBOL].call(this, request);
+                    },
+                });
+                (0, common_1.Req)()(target.prototype, HANDLE_REQUEST_INSTANCE_SYMBOL, 0);
+                if (paths.length > 0) {
+                    (0, common_2.Post)(paths)(target.prototype, HANDLE_REQUEST_INSTANCE_SYMBOL, Object.getOwnPropertyDescriptor(target.prototype, HANDLE_REQUEST_INSTANCE_SYMBOL));
+                    paths.forEach(function (path) {
+                        logger.log("Mapped method: /".concat(controllerName).concat(path));
+                    });
+                }
                 (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);

package/package.json

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