@open-norantec/herbal 1.0.2-alpha.3 → 1.0.2-alpha.31

package/dist/core.js

@@ -66,89 +66,76 @@ exports.HerbalController = void 0;
 require("reflect-metadata");
 var common_1 = require("@nestjs/common");
 var header_util_class_1 = require("@open-norantec/utilities/dist/header-util.class");
-var zod_1 = require("zod");
-var _ = require("lodash");
 var string_util_class_1 = require("@open-norantec/utilities/dist/string-util.class");
+var utilities_1 = require("@open-norantec/utilities");
+var controller_util_class_1 = require("./utilities/controller-util.class");
 __exportStar(require("@nestjs/core"), exports);
 var HerbalController = exports.HerbalController = (function () {
     function HerbalController() {
-        var _this = this;
-        this.registerMethod = function (inputSchema, outputSchema, callback) {
-            return function (request, rawInput, headers) { return __awaiter(_this, void 0, void 0, function () {
-                var input, responseData;
-                var _a, _b, _c;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0:
-                            input = inputSchema instanceof zod_1.ZodAny ? rawInput : _.attempt(function () { return inputSchema.parse(rawInput); });
-                            if (input instanceof Error) {
-                                if (input instanceof zod_1.ZodError) {
-                                    throw new common_1.BadRequestException({
-                                        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 : [],
-                                    });
-                                }
-                                throw input;
-                            }
-                            return [4, callback({ input: input, headers: headers, request: request })];
-                        case 1:
-                            responseData = _d.sent();
-                            return [2, {
-                                    request: input,
-                                    response: outputSchema instanceof zod_1.ZodAny ? responseData : outputSchema.parse(responseData),
-                                }];
-                    }
-                });
-            }); };
-        };
     }
-    HerbalController.prototype.handler = function (request) {
-        var _a, _b, _c, _d, _e, _f;
+    HerbalController.prototype.$handleRequest = function (request) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var methodHandler, parsedBody, result, _g, _h, error_1;
-            var _j;
-            return __generator(this, function (_k) {
-                switch (_k.label) {
+            var result, error_1;
+            var _e;
+            var _this = this;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
-                        methodHandler = this[request === null || request === void 0 ? void 0 : request.methodName];
-                        parsedBody = _.attempt(function () { return JSON.parse((request === null || request === void 0 ? void 0 : request.rawBody) || ''); });
-                        _k.label = 1;
+                        _f.trys.push([0, 3, , 5]);
+                        _e = {};
+                        return [4, this.$call(request.methodName, {
+                                authenticateResult: request.authenticateResult,
+                                headers: header_util_class_1.HeaderUtil.parse((_a = request.headers) !== null && _a !== void 0 ? _a : {}),
+                                methodName: request.methodName,
+                                rawBody: request.rawBody,
+                                traceId: request.traceId,
+                                transaction: request.transaction,
+                                url: request.originalUrl,
+                            })];
                     case 1:
-                        _k.trys.push([1, 12, , 13]);
-                        if (!(typeof methodHandler === 'function')) return [3, 7];
-                        _j = {};
-                        return [4, methodHandler(request, parsedBody instanceof Error ? undefined : parsedBody, header_util_class_1.HeaderUtil.parse((_a = request.headers) !== null && _a !== void 0 ? _a : {})).then(function (response) { return response === null || response === void 0 ? void 0 : response.response; })];
-                    case 2:
-                        result = (_j.data = _k.sent(),
-                            _j.token = string_util_class_1.StringUtil.isFalsyString((_b = request === null || request === void 0 ? void 0 : request.authenticateResult) === null || _b === void 0 ? void 0 : _b.nextToken)
+                        result = (_e.data = _f.sent(),
+                            _e.token = string_util_class_1.StringUtil.isFalsyString((_b = request === null || request === void 0 ? void 0 : request.authenticateResult) === null || _b === void 0 ? void 0 : _b.nextToken)
                                 ? null
                                 : request.authenticateResult.nextToken,
-                            _j);
-                        _k.label = 3;
-                    case 3:
-                        _k.trys.push([3, 5, , 6]);
+                            _e);
                         return [4, ((_d = (_c = request === null || request === void 0 ? void 0 : request.transaction) === null || _c === void 0 ? void 0 : _c.commit) === null || _d === void 0 ? void 0 : _d.call(_c))];
+                    case 2:
+                        _f.sent();
+                        return [2, result];
+                    case 3:
+                        error_1 = _f.sent();
+                        return [4, utilities_1.AttemptUtil.execPromise((function () { return __awaiter(_this, void 0, void 0, function () {
+                                var _a, _b;
+                                return __generator(this, function (_c) {
+                                    switch (_c.label) {
+                                        case 0: return [4, ((_b = (_a = request === null || request === void 0 ? void 0 : request.transaction) === null || _a === void 0 ? void 0 : _a.rollback) === null || _b === void 0 ? void 0 : _b.call(_a))];
+                                        case 1:
+                                            _c.sent();
+                                            return [2];
+                                    }
+                                });
+                            }); })())];
                     case 4:
-                        _k.sent();
-                        return [3, 6];
-                    case 5:
-                        _g = _k.sent();
-                        return [3, 6];
-                    case 6: return [2, result];
-                    case 7:
-                        _k.trys.push([7, 9, , 10]);
-                        return [4, ((_f = (_e = request === null || request === void 0 ? void 0 : request.transaction) === null || _e === void 0 ? void 0 : _e.rollback) === null || _f === void 0 ? void 0 : _f.call(_e))];
-                    case 8:
-                        _k.sent();
-                        return [3, 10];
-                    case 9:
-                        _h = _k.sent();
-                        return [3, 10];
-                    case 10: throw new common_1.NotFoundException();
-                    case 11: return [3, 13];
-                    case 12:
-                        error_1 = _k.sent();
+                        _f.sent();
                         throw error_1;
-                    case 13: return [2];
+                    case 5: return [2];
+                }
+            });
+        });
+    };
+    HerbalController.prototype.$call = function (name, context) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var callFn;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        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(this, context)];
+                    case 1: return [2, _c.sent()];
                 }
             });
         });
@@ -159,6 +146,6 @@ var HerbalController = exports.HerbalController = (function () {
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", Promise)
-    ], HerbalController.prototype, "handler", null);
+    ], HerbalController.prototype, "$handleRequest", null);
     return HerbalController;
 }());

package/dist/{create.d.ts → create/create-application.d.ts}

@@ -1,11 +1,9 @@
 import 'reflect-metadata';
 import { CorsOptions, CorsOptionsDelegate } from '@nestjs/common/interfaces/external/cors-options.interface';
 import { Constructor } from 'type-fest';
-import { GroupsFactory } from './decorators/client-groups.decorator';
 import { CanActivate, ExceptionFilter, INestApplication, NestApplicationOptions, NestInterceptor, PipeTransform, WebSocketAdapter } from '@nestjs/common';
 export type Resolver = <T>(Class: Constructor<T>) => Promise<T>;
-export type TypeCustomizerFn = (dataTypeMapName: string, name: string, genericName: string) => string[];
-export interface CreateOptions {
+export interface CreateApplicationOptions {
     Module: Constructor<any>;
     cors?: CorsOptions | CorsOptionsDelegate<any> | false;
     factoryOptions?: NestApplicationOptions;
@@ -16,12 +14,14 @@ export interface CreateOptions {
     uses?: any[];
     websocketAdapter?: WebSocketAdapter;
     getListenPort: (resolver: Resolver) => number | Promise<number>;
-    allowedClientGroupsFactory?: GroupsFactory;
     callback?: (listenPort: number, app: INestApplication<any>) => void | Promise<void>;
     onBeforeBootstrap?: () => void | Promise<void>;
     worker?: (resolver: Resolver, listenPort: number) => any;
 }
-export declare function create(options: CreateOptions): {
-    options: CreateOptions;
-    generateClientSourceFile: () => string;
-};
+declare class Application {
+    readonly options: CreateApplicationOptions;
+    constructor(options: CreateApplicationOptions);
+}
+export declare function isApplication(input: any): boolean;
+export declare function createApplication(options: CreateApplicationOptions): Application;
+export {};

package/dist/create/create-application.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createApplication = exports.isApplication = void 0;
+require("reflect-metadata");
+var Application = (function () {
+    function Application(options) {
+        this.options = options;
+    }
+    return Application;
+}());
+function isApplication(input) {
+    return input instanceof Application;
+}
+exports.isApplication = isApplication;
+function createApplication(options) {
+    return new Application(options);
+}
+exports.createApplication = createApplication;

package/dist/create/create-client.d.ts

@@ -0,0 +1,9 @@
+import { Constructor } from 'type-fest';
+import { Client as ClientFactory, CreateClientOptions } from '../abstracts/client.abstract.class';
+declare class Client {
+    readonly instance: ClientFactory;
+    constructor(instance: ClientFactory);
+}
+export declare function isClient(input: any): boolean;
+export declare function createClient(Class: Constructor<ClientFactory>, options: CreateClientOptions): Client;
+export {};

package/dist/create/create-client.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createClient = exports.isClient = void 0;
+var Client = (function () {
+    function Client(instance) {
+        this.instance = instance;
+    }
+    return Client;
+}());
+function isClient(input) {
+    return input instanceof Client;
+}
+exports.isClient = isClient;
+function createClient(Class, options) {
+    return new Client(new Class(options));
+}
+exports.createClient = createClient;

package/dist/create/index.d.ts

@@ -0,0 +1,2 @@
+export * from './create-application';
+export * from './create-client';

package/dist/create/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./create-application"), exports);
+__exportStar(require("./create-client"), exports);

package/dist/decorators/index.d.ts

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

package/dist/decorators/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auth-adapter.decorator"), exports);
 __exportStar(require("./client-groups.decorator"), exports);
+__exportStar(require("./no-transaction.decorator"), exports);

package/dist/decorators/no-transaction.decorator.d.ts

@@ -0,0 +1,5 @@
+import 'reflect-metadata';
+export declare function NoTransaction(): PropertyDecorator;
+export declare namespace NoTransaction {
+    var isDisabled: (target: object, propertyKey: string) => boolean;
+}

package/dist/decorators/no-transaction.decorator.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoTransaction = void 0;
+require("reflect-metadata");
+var _ = require("lodash");
+var TRANSACTION_DISABLED = Symbol();
+function NoTransaction() {
+    return function (target, propertyKey) {
+        Reflect.defineMetadata(TRANSACTION_DISABLED, true, target, propertyKey);
+    };
+}
+exports.NoTransaction = NoTransaction;
+NoTransaction.isDisabled = function (target, propertyKey) {
+    var result = _.attempt(function () { return Reflect.getMetadata(TRANSACTION_DISABLED, target, propertyKey); });
+    return result === true;
+};

package/dist/sequelize-di.js

@@ -46,12 +46,10 @@ function Table(_a) {
         newOptions.indexes = [];
         newOptions.indexes = Array.from(Array.isArray(indexes) ? indexes : []).map(function (item, index) {
             if (typeof item === 'string') {
-                return [
-                    {
-                        name: "sidx__".concat(index),
-                        fields: [item],
-                    },
-                ];
+                return {
+                    name: "sidx__".concat(index),
+                    fields: [item],
+                };
             }
             return item;
         }).concat({

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

@@ -1,10 +1,11 @@
 import { Request as ExpressRequest } from 'express';
 import { AuthenticateResult } from '../abstracts/auth-adapter.abstract.class';
 import { Transaction } from 'sequelize';
-export type Request = ExpressRequest & {
+export interface RequestContext {
     methodName: string;
     rawBody: string | null;
     traceId: string;
     authenticateResult?: AuthenticateResult;
     transaction?: Transaction;
-};
+}
+export type Request = ExpressRequest & RequestContext;

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

@@ -1,11 +1,49 @@
 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>> extends RequestContext {
+    headers: ReturnType<typeof HeaderUtil.parse>;
+    input: z.infer<IS>;
+    url: string;
+}
+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>, C> = (this: C, context: MethodContext<IS>) => 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(controller: C, callContext: MethodCallContext<IS>): 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): ((controller: any, callContext: MethodCallContext<any>) => Promise<any>) | null;
+    getAuthAdapters(name: string): Constructor<AuthAdapter>[] | null | undefined;
+    getOpenAPIPathsObject(group?: string): PathsObject;
+}
 export declare function isHerbalController(target: Function): boolean;
-export interface HerbalControllerOptions {
+export declare function getControllerName(target: Function): any;
+export interface HerbalControllerOptions<C> {
     prefix?: string;
     useHeadGuards?: Constructor<any>[];
     useTailGuards?: Constructor<any>[];
+    methods?: (register: MethodRegisterFn<C>) => void;
 }
 export interface ControllerUtilCreateOptions {
     prefix?: string;
@@ -13,8 +51,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> | undefined): ClassDecorator;
         isHerbalController: typeof isHerbalController;
+        getControllerName: typeof getControllerName;
     };
 }
+export {};