@open-norantec/herbal 1.0.2-alpha.21 → 1.0.2-alpha.22

package/dist/abstracts/client.abstract.class.js

@@ -5,7 +5,6 @@ require("reflect-metadata");
 var nest_util_class_1 = require("../utilities/nest-util.class");
 var string_util_class_1 = require("@open-norantec/utilities/dist/string-util.class");
 var controller_util_class_1 = require("../utilities/controller-util.class");
-var method_decorator_1 = require("../decorators/method.decorator");
 var Client = (function () {
     function Client(options) {
         this.options = options;
@@ -26,7 +25,7 @@ var Client = (function () {
             if (string_util_class_1.StringUtil.isFalsyString(Class === null || Class === void 0 ? void 0 : Class.name) || !(0, controller_util_class_1.isHerbalController)(Class))
                 return;
             var controllerName = (0, controller_util_class_1.getControllerName)(Class);
-            var pool = method_decorator_1.Method.getPool(Class.prototype);
+            var pool = controller_util_class_1.ControllerUtil.getPool(Class.prototype);
             if (string_util_class_1.StringUtil.isFalsyString(controllerName) || pool === null)
                 return;
             Object.entries(pool.getOpenAPIPathsObject(group)).forEach(function (_a) {

package/dist/clients/typescript-client.class.js

@@ -38,10 +38,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeScriptClient = exports.convertOpenApiToTypescript = void 0;
 require("reflect-metadata");
 var client_abstract_class_1 = require("../abstracts/client.abstract.class");
-var nest_util_class_1 = require("../utilities/nest-util.class");
-var string_util_class_1 = require("@open-norantec/utilities/dist/string-util.class");
-var controller_util_class_1 = require("../utilities/controller-util.class");
-var method_decorator_1 = require("../decorators/method.decorator");
 var OpenApiToTypescriptConverter = (function () {
     function OpenApiToTypescriptConverter(options) {
         if (options === void 0) { options = {}; }
@@ -230,7 +226,7 @@ var TypeScriptClient = (function (_super) {
         return _super.call(this, options) || this;
     }
     TypeScriptClient.prototype.generateClientSourceFile = function () {
-        var _this = this;
+        var _a;
         var options = this.options;
         if (!(options === null || options === void 0 ? void 0 : options.Module))
             throw new Error("Parameter 'Module' must be specified");
@@ -243,32 +239,22 @@ var TypeScriptClient = (function (_super) {
         var RESPONSE_CACHE_MAP_NAME = 'RESPONSE_CACHE_MAP';
         var REQUEST_BODY_TYPE_ANNOTATION = "".concat(METHOD_TYPE_MAP_NAME, "[T]['request']");
         var RESULT_TYPE_ANNOTATION = "".concat(RESULT_TYPE_NAME, "<").concat(METHOD_TYPE_MAP_NAME, "[T]['response']>");
-        var methodTypeMapCodeLines = nest_util_class_1.NestUtil.getControllerClasses(options.Module)
-            .reduce(function (result, Class) {
-            var _a;
-            if (string_util_class_1.StringUtil.isFalsyString(Class === null || Class === void 0 ? void 0 : Class.name) || !(0, controller_util_class_1.isHerbalController)(Class))
-                return result;
-            var pool = method_decorator_1.Method.getPool(Class.prototype);
-            if (pool === null)
-                return result;
-            return result.concat(Object.entries((_a = _this.document.paths) !== null && _a !== void 0 ? _a : {})
-                .map(function (_a) {
-                var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-                var pathname = _a[0], schema = _a[1];
-                var requestSchema = (_e = (_d = (_c = (_b = schema === null || schema === void 0 ? void 0 : schema.post) === null || _b === void 0 ? void 0 : _b.requestBody) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d['application/json']) === null || _e === void 0 ? void 0 : _e.schema;
-                var responseSchema = (_k = (_j = (_h = (_g = (_f = schema === null || schema === void 0 ? void 0 : schema.post) === null || _f === void 0 ? void 0 : _f.responses) === null || _g === void 0 ? void 0 : _g['200']) === null || _h === void 0 ? void 0 : _h.content) === null || _j === void 0 ? void 0 : _j['application/json']) === null || _k === void 0 ? void 0 : _k.schema;
-                if (!requestSchema && !responseSchema)
-                    return null;
-                return [
-                    "'".concat(pathname, "': {"),
-                    " request: ".concat(((_l = convertOpenApiToTypescript(requestSchema)) === null || _l === void 0 ? void 0 : _l.code) || 'any', ";"),
-                    " response: ".concat(((_m = convertOpenApiToTypescript(responseSchema)) === null || _m === void 0 ? void 0 : _m.code) || 'any', ";"),
-                    ' };',
-                ].join('');
-            })
-                .filter(function (value) { return value !== null; }));
-        }, [])
-            .map(function (line) { return "  ".concat(line); });
+        var methodTypeMapCodeLines = Object.entries((_a = this.document.paths) !== null && _a !== void 0 ? _a : {})
+            .map(function (_a) {
+            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var pathname = _a[0], schema = _a[1];
+            var requestSchema = (_e = (_d = (_c = (_b = schema === null || schema === void 0 ? void 0 : schema.post) === null || _b === void 0 ? void 0 : _b.requestBody) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d['application/json']) === null || _e === void 0 ? void 0 : _e.schema;
+            var responseSchema = (_k = (_j = (_h = (_g = (_f = schema === null || schema === void 0 ? void 0 : schema.post) === null || _f === void 0 ? void 0 : _f.responses) === null || _g === void 0 ? void 0 : _g['200']) === null || _h === void 0 ? void 0 : _h.content) === null || _j === void 0 ? void 0 : _j['application/json']) === null || _k === void 0 ? void 0 : _k.schema;
+            if (!requestSchema && !responseSchema)
+                return null;
+            return [
+                "'".concat(pathname, "': {"),
+                " request: ".concat(((_l = convertOpenApiToTypescript(requestSchema)) === null || _l === void 0 ? void 0 : _l.code) || 'any', ";"),
+                " response: ".concat(((_m = convertOpenApiToTypescript(responseSchema)) === null || _m === void 0 ? void 0 : _m.code) || 'any', ";"),
+                ' };',
+            ].join('');
+        })
+            .filter(function (value) { return value !== null; }).map(function (line) { return "  ".concat(line); });
         methodTypeMapCodeLines.unshift("export interface ".concat(METHOD_TYPE_MAP_NAME, " {"));
         methodTypeMapCodeLines.push('}');
         return [

package/dist/core.d.ts

@@ -2,6 +2,7 @@ import 'reflect-metadata';
 import { HeaderUtil } from '@open-norantec/utilities/dist/header-util.class';
 import { z } from 'zod';
 import { Request } from './types/request.type';
+import { ModuleRef } from '@nestjs/core';
 export * from '@nestjs/core';
 interface LegacyMethodContext<IS extends z.Schema<any>> {
     headers: ReturnType<typeof HeaderUtil.parse>;
@@ -14,6 +15,7 @@ export type MethodHandler<IS extends z.Schema<any>, OS extends z.Schema<any>> =
 }>;
 export declare class HerbalController {
     protected registerMethod: <IS extends z.ZodType<any, z.ZodTypeDef, any>, OS extends z.ZodType<any, z.ZodTypeDef, any>>(inputSchema: IS, outputSchema: OS, callback: (context: LegacyMethodContext<IS>) => Promise<z.TypeOf<OS>>) => MethodHandler<IS, OS>;
+    protected moduleRef: ModuleRef;
     private $handleRequest;
     private $call;
 }

package/dist/core.js

@@ -69,8 +69,9 @@ var header_util_class_1 = require("@open-norantec/utilities/dist/header-util.cla
 var zod_1 = require("zod");
 var _ = require("lodash");
 var string_util_class_1 = require("@open-norantec/utilities/dist/string-util.class");
-var decorators_1 = require("./decorators");
 var utilities_1 = require("@open-norantec/utilities");
+var core_1 = require("@nestjs/core");
+var controller_util_class_1 = require("./utilities/controller-util.class");
 __exportStar(require("@nestjs/core"), exports);
 var HerbalController = exports.HerbalController = (function () {
     function HerbalController() {
@@ -122,7 +123,7 @@ var HerbalController = exports.HerbalController = (function () {
                                 traceId: request.traceId,
                                 transaction: request.transaction,
                                 url: request.originalUrl,
-                                getProvider: function (token) { return request.moduleRef.get(token, { strict: false }); },
+                                controller: this,
                             })];
                     case 1:
                         result = (_e.data = _f.sent(),
@@ -162,7 +163,7 @@ var HerbalController = exports.HerbalController = (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        callFn = (_b = (_a = decorators_1.Method.getPool(this)) === null || _a === void 0 ? void 0 : _a.getCallFn) === null || _b === void 0 ? void 0 : _b.call(_a, name);
+                        callFn = (_b = (_a = controller_util_class_1.ControllerUtil.getPool(this)) === null || _a === void 0 ? void 0 : _a.getCallFn) === null || _b === void 0 ? void 0 : _b.call(_a, name);
                         if (typeof callFn !== 'function')
                             throw new common_1.NotFoundException("Method ".concat(name, " not found"));
                         return [4, callFn(context)];
@@ -171,6 +172,10 @@ var HerbalController = exports.HerbalController = (function () {
             });
         });
     };
+    __decorate([
+        (0, common_1.Inject)(core_1.ModuleRef),
+        __metadata("design:type", core_1.ModuleRef)
+    ], HerbalController.prototype, "moduleRef", void 0);
     __decorate([
         (0, common_1.Post)('*'),
         __param(0, (0, common_1.Req)()),

package/dist/decorators/index.d.ts

@@ -1,4 +1,3 @@
 export * from './auth-adapter.decorator';
 export * from './client-groups.decorator';
 export * from './no-transaction.decorator';
-export * from './method.decorator';

package/dist/decorators/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auth-adapter.decorator"), exports);
 __exportStar(require("./client-groups.decorator"), exports);
 __exportStar(require("./no-transaction.decorator"), exports);
-__exportStar(require("./method.decorator"), exports);

package/dist/types/request.type.d.ts

@@ -1,10 +1,8 @@
 import { Request as ExpressRequest } from 'express';
 import { AuthenticateResult } from '../abstracts/auth-adapter.abstract.class';
 import { Transaction } from 'sequelize';
-import { ModuleRef } from '@nestjs/core';
 export interface RequestContext {
     methodName: string;
-    moduleRef: ModuleRef;
     rawBody: string | null;
     traceId: string;
     authenticateResult?: AuthenticateResult;

package/dist/utilities/controller-util.class.d.ts

@@ -1,12 +1,51 @@
 import 'reflect-metadata';
+import { RequestContext } from '../types/request.type';
 import { Request as ExpressRequest } from 'express';
 import { Constructor } from 'type-fest';
+import { z } from 'zod';
+import { AuthAdapter } from '../abstracts/auth-adapter.abstract.class';
+import { HeaderUtil } from '@open-norantec/utilities/dist/header-util.class';
+import { PathsObject } from 'zod-openapi/dist/openapi3-ts/dist/model/openapi31';
+type ClientGroups = Array<string> | null | undefined;
+type ClienttGroupsFactory = (defaultGroupName: string) => ClientGroups;
+export interface MethodRegisterOptions<IS extends z.Schema<any>, OS extends z.Schema<any>> {
+    inputSchema: IS;
+    outputSchema: OS;
+    authAdapters?: Constructor<AuthAdapter>[];
+    clientGroups?: ClientGroups | ClienttGroupsFactory;
+    disableTransaction?: boolean;
+}
+export type MethodRegisterFn<C> = <IS extends z.Schema<any>, OS extends z.Schema<any>>(name: string, options: MethodRegisterOptions<IS, OS>, callback: MethodCallback<IS, OS, C>) => void;
+export interface MethodContext<IS extends z.Schema<any>, C> extends RequestContext {
+    controller: C;
+    headers: ReturnType<typeof HeaderUtil.parse>;
+    input: z.infer<IS>;
+    url: string;
+}
+export type MethodCallContext<IS extends z.Schema<any>, C> = Omit<MethodContext<IS, C>, 'input'>;
+export type MethodCallback<IS extends z.Schema<any>, OS extends z.Schema<any>, C> = (context: MethodContext<IS, C>) => Promise<z.infer<OS>>;
+declare class MethodConfig<IS extends z.Schema<any>, OS extends z.Schema<any>, C> {
+    readonly name: string;
+    readonly options: MethodRegisterOptions<IS, OS>;
+    protected readonly callback: MethodCallback<IS, OS, C>;
+    constructor(name: string, options: MethodRegisterOptions<IS, OS>, callback: MethodCallback<IS, OS, C>);
+    call(callContext: MethodCallContext<IS, C>): Promise<z.TypeOf<OS>>;
+}
+declare class MethodPool {
+    protected readonly methods: Map<string, MethodConfig<any, any, any>>;
+    registerMethod<IS extends z.Schema<any>, OS extends z.Schema<any>, C>(name: string, options: MethodRegisterOptions<IS, OS>, callback: MethodCallback<IS, OS, C>): void;
+    getCallFn(name: string): ((callContext: MethodCallContext<any, any>) => Promise<any>) | null;
+    getAuthAdapters(name: string): Constructor<AuthAdapter>[] | null | undefined;
+    getOpenAPIPathsObject(group?: string): PathsObject;
+}
 export declare function isHerbalController(target: Function): boolean;
 export declare function getControllerName(target: Function): any;
-export interface HerbalControllerOptions {
+export interface HerbalControllerOptions<C> {
+    ControllerClass: Constructor<C>;
     prefix?: string;
     useHeadGuards?: Constructor<any>[];
     useTailGuards?: Constructor<any>[];
+    methods?: (register: MethodRegisterFn<C>) => void;
 }
 export interface ControllerUtilCreateOptions {
     prefix?: string;
@@ -14,9 +53,11 @@ export interface ControllerUtilCreateOptions {
     getTraceId?: (request: ExpressRequest) => string;
 }
 export declare class ControllerUtil {
+    static getPool(targetPrototype: object): MethodPool | null;
     static create(createOptions?: ControllerUtilCreateOptions): {
-        (options?: HerbalControllerOptions): ClassDecorator;
+        <C>(options: HerbalControllerOptions<C>): ClassDecorator;
         isHerbalController: typeof isHerbalController;
         getControllerName: typeof getControllerName;
     };
 }
+export {};

package/dist/utilities/controller-util.class.js

@@ -87,6 +87,124 @@ var operators_1 = require("rxjs/operators");
 var logger_service_1 = require("../modules/logger/logger.service");
 var sequelize_typescript_1 = require("sequelize-typescript");
 var decorators_1 = require("../decorators");
+var zod_1 = require("zod");
+var zod_openapi_1 = require("zod-openapi");
+var METHOD_POOL = Symbol();
+var MethodConfig = (function () {
+    function MethodConfig(name, options, callback) {
+        this.name = name;
+        this.options = options;
+        this.callback = callback;
+    }
+    MethodConfig.prototype.call = function (callContext) {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function () {
+            var inputSchema, outputSchema, parsedBody_1, input, rawResponse_1, response, error_1;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        inputSchema = this.options.inputSchema;
+                        outputSchema = this.options.outputSchema;
+                        _g.label = 1;
+                    case 1:
+                        _g.trys.push([1, 3, , 4]);
+                        parsedBody_1 = _.attempt(function () { return JSON.parse((callContext === null || callContext === void 0 ? void 0 : callContext.rawBody) || ''); });
+                        input = _.attempt(function () { return (parsedBody_1 instanceof Error ? undefined : inputSchema.parse(parsedBody_1)); });
+                        if (input instanceof zod_1.ZodError) {
+                            throw new common_1.BadRequestException({
+                                from: 'request',
+                                invalidParams: (_c = (_b = (_a = input === null || input === void 0 ? void 0 : input.issues) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, function (item) { var _a, _b; return (_b = (_a = item === null || item === void 0 ? void 0 : item.path) === null || _a === void 0 ? void 0 : _a.join) === null || _b === void 0 ? void 0 : _b.call(_a, '.'); })) !== null && _c !== void 0 ? _c : [],
+                            });
+                        }
+                        else if (input instanceof Error)
+                            throw input;
+                        return [4, this.callback(__assign(__assign({}, callContext), { input: input }))];
+                    case 2:
+                        rawResponse_1 = _g.sent();
+                        response = _.attempt(function () { return outputSchema.parse(rawResponse_1); });
+                        if (response instanceof zod_1.ZodError) {
+                            throw new common_1.BadRequestException({
+                                from: 'response',
+                                invalidParams: (_f = (_e = (_d = response === null || response === void 0 ? void 0 : response.issues) === null || _d === void 0 ? void 0 : _d.map) === null || _e === void 0 ? void 0 : _e.call(_d, function (item) { var _a, _b; return (_b = (_a = item === null || item === void 0 ? void 0 : item.path) === null || _a === void 0 ? void 0 : _a.join) === null || _b === void 0 ? void 0 : _b.call(_a, '.'); })) !== null && _f !== void 0 ? _f : [],
+                            });
+                        }
+                        else if (response instanceof Error)
+                            throw response;
+                        return [2, response];
+                    case 3:
+                        error_1 = _g.sent();
+                        throw error_1;
+                    case 4: return [2];
+                }
+            });
+        });
+    };
+    return MethodConfig;
+}());
+var MethodPool = (function () {
+    function MethodPool() {
+        this.methods = new Map();
+    }
+    MethodPool.prototype.registerMethod = function (name, options, callback) {
+        if (string_util_class_1.StringUtil.isFalsyString(name))
+            return;
+        if (name.includes('/'))
+            throw new Error("Method name cannot contain slashes: ".concat(name));
+        this.methods.set(name, new MethodConfig(name, options, callback));
+    };
+    MethodPool.prototype.getCallFn = function (name) {
+        var config = this.methods.get(name);
+        if (!(config instanceof MethodConfig))
+            return null;
+        return config.call.bind(config);
+    };
+    MethodPool.prototype.getAuthAdapters = function (name) {
+        var config = this.methods.get(name);
+        if (!(config instanceof MethodConfig))
+            return null;
+        return config.options.authAdapters;
+    };
+    MethodPool.prototype.getOpenAPIPathsObject = function (group) {
+        var result = {};
+        Array.from(this.methods.entries()).forEach(function (_a) {
+            var _b;
+            var name = _a[0], config = _a[1];
+            var defaultGroupName = "".concat(Date.now(), "_").concat(Math.random().toString(16).slice(2));
+            var currentGroupName = string_util_class_1.StringUtil.isFalsyString(group) ? defaultGroupName : group;
+            var clientGroups = typeof config.options.clientGroups === 'function'
+                ? config.options.clientGroups(defaultGroupName)
+                : (_b = config === null || config === void 0 ? void 0 : config.options) === null || _b === void 0 ? void 0 : _b.clientGroups;
+            if (Array.isArray(clientGroups) && !clientGroups.includes(currentGroupName))
+                return;
+            result["/".concat(name)] = {
+                post: {
+                    requestBody: {
+                        description: 'Request body for method ' + name,
+                        required: true,
+                        content: {
+                            'application/json': {
+                                schema: (0, zod_openapi_1.createSchema)(config.options.inputSchema).schema,
+                            },
+                        },
+                    },
+                    responses: {
+                        '200': {
+                            description: 'Response for method ' + name,
+                            content: {
+                                'application/json': (0, zod_openapi_1.createSchema)(zod_1.z.object({
+                                    data: config.options.outputSchema,
+                                    token: zod_1.z.string().nullable(),
+                                })),
+                            },
+                        },
+                    },
+                },
+            };
+        });
+        return result;
+    };
+    return MethodPool;
+}());
 var IS_HERBAL_CONTROLLER = Symbol();
 var CONTROLLER_NAME = Symbol();
 function isHerbalController(target) {
@@ -162,7 +280,7 @@ function HerbalGuard(options) {
             var _a, e_1, _b, _c;
             var _d, _e, _f, _g, _h, _j, _k, _l, _m;
             return __awaiter(this, void 0, void 0, function () {
-                var sequelizeInstance, transaction, request, response, traceId, chunks, _o, request_1, request_1_1, chunk, e_1_1, _p, parsedBody, rawHandlerName, handlerPropertype, handlerName, authAdapters, error_1, _i, authAdapters_1, AuthAdapterClass, adapter, authenticateResult, error_2, _q;
+                var sequelizeInstance, transaction, request, response, traceId, chunks, _o, request_1, request_1_1, chunk, e_1_1, _p, parsedBody, rawHandlerName, handlerPropertype, handlerName, authAdapters, error_2, _i, authAdapters_1, AuthAdapterClass, adapter, authenticateResult, error_3, _q;
                 var _this = this;
                 return __generator(this, function (_r) {
                     switch (_r.label) {
@@ -178,7 +296,6 @@ function HerbalGuard(options) {
                                 traceId = uuid_util_class_1.UUIDUtil.generateV4();
                             request.traceId = traceId;
                             request.methodName = request.url.split('/').pop();
-                            request.moduleRef = this.ref;
                             response.setHeader(headers_constant_1.HEADERS.TRACE_ID, traceId);
                             chunks = [];
                             _r.label = 1;
@@ -233,7 +350,7 @@ function HerbalGuard(options) {
                             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;
-                            authAdapters = (_j = (_h = decorators_1.Method.getPool(handlerPropertype)) === null || _h === void 0 ? void 0 : _h.getAuthAdapters) === null || _j === void 0 ? void 0 : _j.call(_h, handlerName);
+                            authAdapters = (_j = (_h = ControllerUtil.getPool(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);
                             if (!(!(sequelizeInstance instanceof Error) && !decorators_1.NoTransaction.isDisabled(handlerPropertype, handlerName))) return [3, 20];
@@ -247,9 +364,9 @@ function HerbalGuard(options) {
                             this.getLogger().log("[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":transaction] Started transaction for route: ").concat(handlerName));
                             return [3, 19];
                         case 18:
-                            error_1 = _r.sent();
-                            if (error_1 instanceof Error) {
-                                this.getLogger().error("[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":transaction] Failed to start transaction: ").concat(error_1 === null || error_1 === void 0 ? void 0 : error_1.message, "\n").concat(error_1 === null || error_1 === void 0 ? void 0 : error_1.stack));
+                            error_2 = _r.sent();
+                            if (error_2 instanceof Error) {
+                                this.getLogger().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, 19];
                         case 19: return [3, 21];
@@ -282,12 +399,12 @@ function HerbalGuard(options) {
                         case 25: throw new common_2.UnauthorizedException();
                         case 26: return [3, 32];
                         case 27:
-                            error_2 = _r.sent();
+                            error_3 = _r.sent();
                             _r.label = 28;
                         case 28:
                             _r.trys.push([28, 30, , 31]);
-                            if (error_2 instanceof Error) {
-                                this.getLogger().error("Got error when handling route: ".concat(error_2 === null || error_2 === void 0 ? void 0 : error_2.message, " ").concat(error_2 === null || error_2 === void 0 ? void 0 : error_2.stack));
+                            if (error_3 instanceof Error) {
+                                this.getLogger().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, ((_m = transaction === null || transaction === void 0 ? void 0 : transaction.rollback) === null || _m === void 0 ? void 0 : _m.call(transaction))];
                         case 29:
@@ -296,7 +413,7 @@ function HerbalGuard(options) {
                         case 30:
                             _q = _r.sent();
                             return [3, 31];
-                        case 31: throw error_2;
+                        case 31: throw error_3;
                         case 32: return [2, true];
                     }
                 });
@@ -323,10 +440,17 @@ function HerbalGuard(options) {
 var ControllerUtil = (function () {
     function ControllerUtil() {
     }
+    ControllerUtil.getPool = function (targetPrototype) {
+        var pool = Reflect.getMetadata(METHOD_POOL, targetPrototype);
+        if (!(pool instanceof MethodPool))
+            return null;
+        return pool;
+    };
     ControllerUtil.create = function (createOptions) {
         function Controller(options) {
             return function (target) {
                 var _a;
+                var methodPool = new MethodPool();
                 var finalPrefix = string_util_class_1.StringUtil.isFalsyString(options === null || options === void 0 ? void 0 : options.prefix)
                     ? string_util_class_1.StringUtil.isFalsyString(createOptions === null || createOptions === void 0 ? void 0 : createOptions.prefix)
                         ? ''
@@ -334,10 +458,18 @@ var ControllerUtil = (function () {
                     : options.prefix;
                 var controllerName = _.camelCase(target.name.replace(/Controller$/g, ''));
                 finalPrefix += "".concat(((_a = finalPrefix === null || finalPrefix === void 0 ? void 0 : finalPrefix.endsWith) === null || _a === void 0 ? void 0 : _a.call(finalPrefix, '/')) ? '' : '/').concat(controllerName);
+                var register = function (name, options, callback) {
+                    if (string_util_class_1.StringUtil.isFalsyString(name) || typeof callback !== 'function')
+                        return;
+                    methodPool.registerMethod(name, options, callback);
+                };
                 if (!finalPrefix.startsWith('/'))
                     finalPrefix = "/".concat(finalPrefix);
                 Reflect.defineMetadata(IS_HERBAL_CONTROLLER, true, target.prototype);
                 Reflect.defineMetadata(CONTROLLER_NAME, controllerName, target.prototype);
+                Reflect.defineMetadata(METHOD_POOL, methodPool, target.prototype);
+                if (typeof (options === null || options === void 0 ? void 0 : options.methods) === 'function')
+                    options.methods(register);
                 (0, common_1.Controller)(finalPrefix)(target);
                 (0, common_1.UseInterceptors)(ControllerInterceptor)(target);
                 common_1.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.21",
+    "version": "1.0.2-alpha.22",
     "description": "Herbal is a builder and toolchain for Nest.js applications",
     "main": "dist/index.js",
     "scripts": {

package/dist/decorators/method.decorator.d.ts

@@ -1,45 +0,0 @@
-import 'reflect-metadata';
-import { z } from 'zod';
-import { AuthAdapter } from '../abstracts';
-import { HeaderUtil } from '@open-norantec/utilities/dist/header-util.class';
-import { Constructor } from 'type-fest';
-import { Type } from '@nestjs/common';
-import { RequestContext } from '../types';
-import { PathsObject } from 'zod-openapi/dist/openapi3-ts/dist/model/openapi31';
-type ClientGroups = Array<string> | null | undefined;
-type ClienttGroupsFactory = (defaultGroupName: string) => ClientGroups;
-export interface MethodOptions<IS extends z.Schema<any>, OS extends z.Schema<any>> {
-    inputSchema: IS;
-    outputSchema: OS;
-    authAdapters?: Constructor<AuthAdapter>[];
-    clientGroups?: ClientGroups | ClienttGroupsFactory;
-    disableTransaction?: boolean;
-}
-export type DependencyGetter = <T>(dependency: Constructor<T>) => T;
-export interface MethodContext<IS extends z.Schema<any>> extends Omit<RequestContext, 'moduleRef'> {
-    headers: ReturnType<typeof HeaderUtil.parse>;
-    input: z.infer<IS>;
-    url: string;
-    getProvider: <TInput = any, TResult = TInput>(typeOrToken: Type<TInput> | Function | string | symbol) => TResult;
-}
-export type MethodCallContext<IS extends z.Schema<any>> = Omit<MethodContext<IS>, 'input'>;
-export type MethodCallback<IS extends z.Schema<any>, OS extends z.Schema<any>> = (context: MethodContext<IS>) => Promise<z.infer<OS>>;
-declare class MethodConfig<IS extends z.Schema<any>, OS extends z.Schema<any>> {
-    readonly name: string;
-    readonly options: MethodOptions<IS, OS>;
-    protected readonly callback: MethodCallback<IS, OS>;
-    constructor(name: string, options: MethodOptions<IS, OS>, callback: MethodCallback<IS, OS>);
-    call(callContext: MethodCallContext<IS>): Promise<z.TypeOf<OS>>;
-}
-declare class MethodPool {
-    protected readonly methods: Map<string, MethodConfig<any, any>>;
-    registerMethod<IS extends z.Schema<any>, OS extends z.Schema<any>>(name: string, options: MethodOptions<IS, OS>, callback: MethodCallback<IS, OS>): void;
-    getCallFn(name: string): ((callContext: MethodCallContext<any>) => Promise<any>) | null;
-    getAuthAdapters(name: string): Constructor<AuthAdapter>[] | null | undefined;
-    getOpenAPIPathsObject(group?: string): PathsObject;
-}
-export declare function Method<IS extends z.Schema<any>, OS extends z.Schema<any>>(...parameters: Parameters<typeof MethodPool.prototype.registerMethod<IS, OS>>): ClassDecorator;
-export declare namespace Method {
-    var getPool: (targetPrototype: object) => MethodPool | null;
-}
-export {};

package/dist/decorators/method.decorator.js

@@ -1,193 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Method = void 0;
-require("reflect-metadata");
-var zod_1 = require("zod");
-var utilities_1 = require("@open-norantec/utilities");
-var common_1 = require("@nestjs/common");
-var _ = require("lodash");
-var zod_openapi_1 = require("zod-openapi");
-var METHOD_POOL = Symbol();
-var MethodConfig = (function () {
-    function MethodConfig(name, options, callback) {
-        this.name = name;
-        this.options = options;
-        this.callback = callback;
-    }
-    MethodConfig.prototype.call = function (callContext) {
-        var _a, _b, _c, _d, _e, _f;
-        return __awaiter(this, void 0, void 0, function () {
-            var inputSchema, outputSchema, parsedBody_1, input, rawResponse_1, response, error_1;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
-                    case 0:
-                        inputSchema = this.options.inputSchema;
-                        outputSchema = this.options.outputSchema;
-                        _g.label = 1;
-                    case 1:
-                        _g.trys.push([1, 3, , 4]);
-                        parsedBody_1 = _.attempt(function () { return JSON.parse((callContext === null || callContext === void 0 ? void 0 : callContext.rawBody) || ''); });
-                        input = _.attempt(function () { return (parsedBody_1 instanceof Error ? undefined : inputSchema.parse(parsedBody_1)); });
-                        if (input instanceof zod_1.ZodError) {
-                            throw new common_1.BadRequestException({
-                                from: 'request',
-                                invalidParams: (_c = (_b = (_a = input === null || input === void 0 ? void 0 : input.issues) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, function (item) { var _a, _b; return (_b = (_a = item === null || item === void 0 ? void 0 : item.path) === null || _a === void 0 ? void 0 : _a.join) === null || _b === void 0 ? void 0 : _b.call(_a, '.'); })) !== null && _c !== void 0 ? _c : [],
-                            });
-                        }
-                        else if (input instanceof Error)
-                            throw input;
-                        return [4, this.callback(__assign(__assign({}, callContext), { input: input }))];
-                    case 2:
-                        rawResponse_1 = _g.sent();
-                        response = _.attempt(function () { return outputSchema.parse(rawResponse_1); });
-                        if (response instanceof zod_1.ZodError) {
-                            throw new common_1.BadRequestException({
-                                from: 'response',
-                                invalidParams: (_f = (_e = (_d = response === null || response === void 0 ? void 0 : response.issues) === null || _d === void 0 ? void 0 : _d.map) === null || _e === void 0 ? void 0 : _e.call(_d, function (item) { var _a, _b; return (_b = (_a = item === null || item === void 0 ? void 0 : item.path) === null || _a === void 0 ? void 0 : _a.join) === null || _b === void 0 ? void 0 : _b.call(_a, '.'); })) !== null && _f !== void 0 ? _f : [],
-                            });
-                        }
-                        else if (response instanceof Error)
-                            throw response;
-                        return [2, response];
-                    case 3:
-                        error_1 = _g.sent();
-                        throw error_1;
-                    case 4: return [2];
-                }
-            });
-        });
-    };
-    return MethodConfig;
-}());
-var MethodPool = (function () {
-    function MethodPool() {
-        this.methods = new Map();
-    }
-    MethodPool.prototype.registerMethod = function (name, options, callback) {
-        if (utilities_1.StringUtil.isFalsyString(name))
-            return;
-        if (name.includes('/'))
-            throw new Error("Method name cannot contain slashes: ".concat(name));
-        this.methods.set(name, new MethodConfig(name, options, callback));
-    };
-    MethodPool.prototype.getCallFn = function (name) {
-        var config = this.methods.get(name);
-        if (!(config instanceof MethodConfig))
-            return null;
-        return config.call.bind(config);
-    };
-    MethodPool.prototype.getAuthAdapters = function (name) {
-        var config = this.methods.get(name);
-        if (!(config instanceof MethodConfig))
-            return null;
-        return config.options.authAdapters;
-    };
-    MethodPool.prototype.getOpenAPIPathsObject = function (group) {
-        var result = {};
-        Array.from(this.methods.entries()).forEach(function (_a) {
-            var _b;
-            var name = _a[0], config = _a[1];
-            var defaultGroupName = "".concat(Date.now(), "_").concat(Math.random().toString(16).slice(2));
-            var currentGroupName = utilities_1.StringUtil.isFalsyString(group) ? defaultGroupName : group;
-            var clientGroups = typeof config.options.clientGroups === 'function'
-                ? config.options.clientGroups(defaultGroupName)
-                : (_b = config === null || config === void 0 ? void 0 : config.options) === null || _b === void 0 ? void 0 : _b.clientGroups;
-            if (Array.isArray(clientGroups) && !clientGroups.includes(currentGroupName))
-                return;
-            result["/".concat(name)] = {
-                post: {
-                    requestBody: {
-                        description: 'Request body for method ' + name,
-                        required: true,
-                        content: {
-                            'application/json': {
-                                schema: (0, zod_openapi_1.createSchema)(config.options.inputSchema).schema,
-                            },
-                        },
-                    },
-                    responses: {
-                        '200': {
-                            description: 'Response for method ' + name,
-                            content: {
-                                'application/json': (0, zod_openapi_1.createSchema)(zod_1.z.object({
-                                    data: config.options.outputSchema,
-                                    token: zod_1.z.string().nullable(),
-                                })),
-                            },
-                        },
-                    },
-                },
-            };
-        });
-        return result;
-    };
-    return MethodPool;
-}());
-function Method() {
-    var parameters = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        parameters[_i] = arguments[_i];
-    }
-    return function (target) {
-        var pool = Reflect.getMetadata(METHOD_POOL, target.prototype);
-        if (!(pool instanceof MethodPool)) {
-            pool = new MethodPool();
-            Reflect.defineMetadata(METHOD_POOL, pool, target.prototype);
-        }
-        pool.registerMethod.apply(pool, parameters);
-    };
-}
-exports.Method = Method;
-Method.getPool = function (targetPrototype) {
-    var pool = Reflect.getMetadata(METHOD_POOL, targetPrototype);
-    if (!(pool instanceof MethodPool))
-        return null;
-    return pool;
-};