@open-norantec/herbal 1.0.2-alpha.1 → 1.0.2-alpha.10

package/dist/cli/herbal.js

@@ -1,18 +1,63 @@
 #!/usr/bin/env node
 "use strict";
+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 });
 var commander_1 = require("commander");
 var forge_1 = require("@open-norantec/forge");
+var utilities_1 = require("../utilities");
+var _ = require("lodash");
+var fs = require("fs-extra");
+var path = require("node:path");
+var attempt_util_class_1 = require("@open-norantec/utilities/dist/attempt-util.class");
 var command = new commander_1.Command('herbal');
 var getEntryFileContent = function (_a) {
     var entryFilePath = _a.entryFilePath;
     return [
         "import 'reflect-metadata';",
-        "import { ModelUtil, NestFactory } from '@open-norantec/herbal';",
+        "import { ModelUtil, NestFactory, isApplication } from '@open-norantec/herbal';",
         "import { LoggerService } from '@open-norantec/herbal/dist/modules/logger/logger.service';",
         "import { Worker, isMainThread, workerData } from 'node:worker_threads';",
         "import ENTRY from '".concat(entryFilePath, "';"),
         '\nasync function bootstrap() {',
+        '  if (!isApplication(ENTRY)) {',
+        '    console.log(`The entry file must export an application or a function that returns an application.`);',
+        '    process.exit(1);',
+        '  }',
         '  const entryOptions = ENTRY?.options;',
         '  await entryOptions?.onBeforeBootstrap?.();',
         "\n  if (!!workerData?.['__herbal_worker']) {",
@@ -67,42 +112,6 @@ var getEntryFileContent = function (_a) {
         '\nbootstrap();',
     ].join('\n');
 };
-var getGenerateClientEntryFileContent = function (_a) {
-    var entryFilePath = _a.entryFilePath, outputPath = _a.outputPath, options = _a.options;
-    return [
-        "import 'reflect-metadata';",
-        "import ENTRY from '".concat(entryFilePath, "';"),
-        "import * as fs from 'node:fs';",
-        "import * as path from 'node:path';",
-        '\nasync function bootstrap() {',
-        "  const outputDirPath = '".concat(outputPath, "';"),
-        "  const outputFilePath = path.resolve(outputDirPath, '".concat(options.outputName, ".ts');"),
-        '  await ENTRY?.options?.onBeforeBootstrap?.();',
-        '  try {',
-        '    fs.rmSync(outputFilePath, {',
-        '      recursive: true,',
-        '      force: true,',
-        '    });',
-        '  } catch {}',
-        '  try {',
-        '    if (!fs.statSync(path.dirname(outputDirPath)).isDirectory()) {',
-        '      fs.rmSync(path.dirname(outputDirPath), {',
-        '        recursive: true,',
-        '        force: true,',
-        '      });',
-        '    }',
-        '  } catch {}',
-        '  try {',
-        '    fs.mkdirSync(outputDirPath, { recursive: true });',
-        '  } catch {}',
-        '  fs.writeFileSync(',
-        '    outputFilePath,',
-        '    ENTRY?.generateClientSourceFile?.(),',
-        '  );',
-        '}',
-        '\nbootstrap();',
-    ].join('\n');
-};
 var handleLog = function (level, message) {
     console.log("[".concat(new Date().toISOString(), "] [").concat(level, "] ").concat(message));
     switch (level) {
@@ -127,14 +136,45 @@ command
     mode: 'development',
     afterEmitAction: 'watch',
 }).name('watch'))
-    .addCommand((0, forge_1.createForgeCommand)({
-    onLog: handleLog,
-    getEntryFileContent: getGenerateClientEntryFileContent,
-    hideOptions: ['--after-emit-action', '--ts-compiler', '--mode'],
-    mode: 'production',
-    afterEmitAction: 'run-once',
-    tsCompiler: require.resolve('ts-patch/compiler', {
-        paths: [__dirname, process.cwd()],
-    }),
-}).name('generate-client'));
+    .addCommand((function () {
+    var subCommand = new commander_1.Command('generate-client');
+    subCommand
+        .requiredOption('--entry <entry>', 'The entry file path of the application. It must export an instance generated with `createClient` to default.')
+        .requiredOption('--output-file <path>', 'The output file path of the generated client source file.')
+        .option('--group <group>', 'The group name of the generated client. It is used to distinguish different clients when there are multiple clients in the same application.')
+        .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
+        var clientUtil;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    clientUtil = _.attempt(function () {
+                        return new utilities_1.ClientUtil(options, function (absoluteOutputFile, content) {
+                            var absoluteOutputDir = path.dirname(absoluteOutputFile);
+                            if (!fs.existsSync(absoluteOutputDir) || !fs.statSync(absoluteOutputDir).isDirectory()) {
+                                _.attempt(function () { return fs.removeSync(absoluteOutputDir); });
+                                _.attempt(function () { return fs.mkdirpSync(absoluteOutputDir); });
+                            }
+                            var writeResult = attempt_util_class_1.AttemptUtil.exec(function () {
+                                return fs.writeFileSync(absoluteOutputFile, content, { encoding: 'utf-8' });
+                            });
+                            if (writeResult instanceof Error) {
+                                handleLog === null || handleLog === void 0 ? void 0 : handleLog('error', "Failed to write client code: ".concat(writeResult.message));
+                                return;
+                            }
+                            handleLog === null || handleLog === void 0 ? void 0 : handleLog('info', "Client code generated successfully at ".concat(absoluteOutputFile));
+                        }, handleLog);
+                    });
+                    if (clientUtil instanceof Error) {
+                        handleLog('error', "Failed to initialize the client utility: ".concat(clientUtil.message));
+                        return [2];
+                    }
+                    return [4, clientUtil.generateClientCode()];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    return subCommand;
+})());
 command.parse(process.argv);

package/dist/create.d.ts

@@ -1,11 +1,10 @@
 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 +15,30 @@ 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;
-};
+export interface CreateClientOptions {
+    Module: Constructor<any>;
+    allowedClientGroupsFactory?: (currentGroup: string | undefined, defaultGroupName: string) => string[] | null | undefined;
+}
+declare class Application {
+    readonly options: CreateApplicationOptions;
+    constructor(options: CreateApplicationOptions);
+}
+export declare function isApplication(input: any): boolean;
+export declare function createApplication(options: CreateApplicationOptions): Application;
+export declare abstract class Client {
+    readonly options: CreateClientOptions;
+    constructor(options: CreateClientOptions);
+    abstract generateClientSourceFile(currentGroup?: string): string;
+}
+declare class TypeScriptClient extends Client implements Client {
+    readonly options: CreateClientOptions;
+    constructor(options: CreateClientOptions);
+    generateClientSourceFile(currentGroup?: string): string;
+}
+export declare function isClient(input: any): boolean;
+export declare function createTypeScriptClient(options: CreateClientOptions): TypeScriptClient;
+export {};

package/dist/create.js

@@ -1,6 +1,21 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
+exports.createTypeScriptClient = exports.isClient = exports.Client = exports.createApplication = exports.isApplication = void 0;
 require("reflect-metadata");
 var _ = require("lodash");
 var nest_util_class_1 = require("./utilities/nest-util.class");
@@ -8,147 +23,183 @@ var string_util_class_1 = require("@open-norantec/utilities/dist/string-util.cla
 var reflect_declaration_1 = require("./transformers/reflect-declaration");
 var client_groups_decorator_1 = require("./decorators/client-groups.decorator");
 var controller_util_class_1 = require("./utilities/controller-util.class");
-function create(options) {
-    return {
-        options: options,
-        generateClientSourceFile: function () {
-            if (!(options === null || options === void 0 ? void 0 : options.Module))
-                throw new Error("Parameter 'Module' must be specified");
-            var METHOD_TYPE_MAP_NAME = 'MethodTypeMap';
-            var METHOD_TYPE_MAP_KEYS_NAME = 'MethodTypeMapKeys';
-            var RESPONSE_CALLBACK_DATA_NAME = 'ResponseCallbackData';
-            var REQUEST_OPTIONS_NAME = 'RequestOptions';
-            var RESULT_TYPE_NAME = 'Result';
-            var HTTP_RESPONSE_BODY_TYPE_NAME = 'HttpResponseBody';
-            var REQUEST_METHOD_MAP_NAME = 'REQUEST_METHOD_MAP';
-            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(HTTP_RESPONSE_BODY_TYPE_NAME, "<").concat(METHOD_TYPE_MAP_NAME, "[T]['response']>>");
-            var methodTypeMapCodeLines = nest_util_class_1.NestUtil.getControllerClasses(options.Module)
-                .reduce(function (result, Class) {
-                if (string_util_class_1.StringUtil.isFalsyString(Class === null || Class === void 0 ? void 0 : Class.name))
-                    return result;
-                var controllerName = _.camelCase(Class.name.replace(/Controller$/g, ''));
-                if (string_util_class_1.StringUtil.isFalsyString(controllerName) || !(0, controller_util_class_1.isHerbalController)(Class)) {
+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;
+var Client = (function () {
+    function Client(options) {
+        this.options = options;
+    }
+    return Client;
+}());
+exports.Client = Client;
+var TypeScriptClient = (function (_super) {
+    __extends(TypeScriptClient, _super);
+    function TypeScriptClient(options) {
+        var _this = _super.call(this, options) || this;
+        _this.options = options;
+        return _this;
+    }
+    TypeScriptClient.prototype.generateClientSourceFile = function (currentGroup) {
+        var options = this.options;
+        if (!(options === null || options === void 0 ? void 0 : options.Module))
+            throw new Error("Parameter 'Module' must be specified");
+        var METHOD_TYPE_MAP_NAME = 'MethodTypeMap';
+        var METHOD_TYPE_MAP_KEYS_NAME = 'MethodTypeMapKeys';
+        var RESPONSE_CALLBACK_DATA_NAME = 'ResponseCallbackData';
+        var REQUEST_OPTIONS_NAME = 'RequestOptions';
+        var RESULT_TYPE_NAME = 'Result';
+        var HTTP_RESPONSE_BODY_TYPE_NAME = 'HttpResponseBody';
+        var REQUEST_METHOD_MAP_NAME = 'REQUEST_METHOD_MAP';
+        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(HTTP_RESPONSE_BODY_TYPE_NAME, "<").concat(METHOD_TYPE_MAP_NAME, "[T]['response']>>");
+        var methodTypeMapCodeLines = nest_util_class_1.NestUtil.getControllerClasses(options.Module)
+            .reduce(function (result, Class) {
+            if (string_util_class_1.StringUtil.isFalsyString(Class === null || Class === void 0 ? void 0 : Class.name))
+                return result;
+            var controllerName = _.camelCase(Class.name.replace(/Controller$/g, ''));
+            if (string_util_class_1.StringUtil.isFalsyString(controllerName) || !(0, controller_util_class_1.isHerbalController)(Class)) {
+                return result;
+            }
+            var metadataNames = Reflect.getMetadataKeys(Class.prototype).filter(function (metadataName) { return !string_util_class_1.StringUtil.isFalsyString(metadataName); });
+            return result.concat(metadataNames.reduce(function (result, metadataName) {
+                var methodName = metadataName.slice(reflect_declaration_1.DECORATOR_NAME_PREFIX.length);
+                if (string_util_class_1.StringUtil.isFalsyString(metadataName) ||
+                    !metadataName.startsWith(reflect_declaration_1.DECORATOR_NAME_PREFIX) ||
+                    !client_groups_decorator_1.ClientGroups.shouldShowInClient(Class, methodName, function (defaultGroupName) {
+                        var _a;
+                        return (_a = options.allowedClientGroupsFactory) === null || _a === void 0 ? void 0 : _a.call(options, currentGroup, defaultGroupName);
+                    })) {
                     return result;
                 }
-                var metadataNames = Reflect.getMetadataKeys(Class.prototype).filter(function (metadataName) { return !string_util_class_1.StringUtil.isFalsyString(metadataName); });
-                return result.concat(metadataNames.reduce(function (result, metadataName) {
-                    var methodName = metadataName.slice(reflect_declaration_1.DECORATOR_NAME_PREFIX.length);
-                    if (string_util_class_1.StringUtil.isFalsyString(metadataName) ||
-                        !metadataName.startsWith(reflect_declaration_1.DECORATOR_NAME_PREFIX) ||
-                        !client_groups_decorator_1.ClientGroups.shouldShowInClient(Class, methodName, options === null || options === void 0 ? void 0 : options.allowedClientGroupsFactory)) {
-                        return result;
-                    }
-                    var scopeIdentifier = "/".concat(controllerName, "/").concat(methodName);
-                    return result.concat(["'".concat(scopeIdentifier, "'"), "".concat(Reflect.getMetadata(metadataName, Class.prototype), ";")].join(': '));
-                }, []));
-            }, [])
-                .map(function (line) { return "    ".concat(line); });
-            methodTypeMapCodeLines.unshift("export interface ".concat(METHOD_TYPE_MAP_NAME, " {"));
-            methodTypeMapCodeLines.push('}');
-            return [
-                "import * as hash from 'object-hash';",
-                "import * as _ from 'lodash';",
-                "\n".concat(methodTypeMapCodeLines.join('\n')),
-                "\ntype ".concat(METHOD_TYPE_MAP_KEYS_NAME, " = keyof ").concat(METHOD_TYPE_MAP_NAME, ";"),
-                "\ntype ".concat(RESPONSE_CALLBACK_DATA_NAME, "<K extends ").concat(METHOD_TYPE_MAP_KEYS_NAME, "> = {"),
-                '  url: K;',
-                "  result: ".concat(RESULT_TYPE_NAME, "<").concat(HTTP_RESPONSE_BODY_TYPE_NAME, "<").concat(METHOD_TYPE_MAP_NAME, "[K]['response']>>;"),
-                '};',
-                "\nexport type ".concat(HTTP_RESPONSE_BODY_TYPE_NAME, "<T> = {"),
-                '  data: T;',
-                '  token: string | null;',
-                '};',
-                "\nexport interface ".concat(REQUEST_OPTIONS_NAME, " extends RequestInit {"),
-                '  headers?: Record<string, any>;',
-                '  ignoreCache?: boolean;',
-                '  prefix?: string;',
-                '  timeout?: number;',
-                '  getAuthorizationCredential?: () => string;',
-                "  onRequest?: (context: { cached: boolean; id: string; options: Omit<".concat(REQUEST_OPTIONS_NAME, ", 'getAuthorizationCredential' | 'onRequest' | 'onResponse'>; prefix: string | undefined; requestBody: string; url: string; }) => void | Promise<void>;"),
-                "  onResponse?: <K extends ".concat(METHOD_TYPE_MAP_KEYS_NAME, ">(response: ").concat(RESPONSE_CALLBACK_DATA_NAME, "<K>, id: string) => void | Promise<void>;"),
-                '}',
-                "\nexport interface ".concat(RESULT_TYPE_NAME, "<T> {"),
-                '  error: Error | null;',
-                "  response: T | null;",
-                '  status: number;',
-                '  statusText: string;',
-                '  headers?: Record<string, any>;',
-                '}',
-                '\nexport class Client {',
-                "  public constructor(private readonly options: ".concat(REQUEST_OPTIONS_NAME, " = {}) {}"),
-                "\n  protected readonly ".concat(REQUEST_METHOD_MAP_NAME, " = new Map<keyof ").concat(METHOD_TYPE_MAP_NAME, ", (...params: any[]) => Promise<unknown>>();"),
-                "\n  protected readonly ".concat(RESPONSE_CACHE_MAP_NAME, " = new Map<string, ").concat(RESULT_TYPE_NAME, "<unknown>>();"),
-                "\n  public createRequest<T extends keyof ".concat(METHOD_TYPE_MAP_NAME, ">(url: T): (requestBody?: ").concat(REQUEST_BODY_TYPE_ANNOTATION, ", options?: ").concat(REQUEST_OPTIONS_NAME, ") => Promise<").concat(RESULT_TYPE_ANNOTATION, "> {"),
-                "    if (typeof this.".concat(REQUEST_METHOD_MAP_NAME, ".get(url) !== 'function') {"),
-                "      this.".concat(REQUEST_METHOD_MAP_NAME, ".set(url, (requestBody?: ").concat(REQUEST_BODY_TYPE_ANNOTATION, ", options?: ").concat(REQUEST_OPTIONS_NAME, ") => this.request.call(this, url, requestBody, options));"),
-                '    }',
-                "    return this.".concat(REQUEST_METHOD_MAP_NAME, ".get(url) as (requestBody?: ").concat(REQUEST_BODY_TYPE_ANNOTATION, ", options?: ").concat(REQUEST_OPTIONS_NAME, ") => Promise<").concat(RESULT_TYPE_ANNOTATION, ">;"),
-                '  }',
-                "\n  public async request<T extends keyof ".concat(METHOD_TYPE_MAP_NAME, ">(url: T, requestBody?: ").concat(REQUEST_BODY_TYPE_ANNOTATION, ", options?: Omit<").concat(REQUEST_OPTIONS_NAME, ", 'getAuthorizationCredential' | 'onRequest' | 'onResponse'>): Promise<").concat(RESULT_TYPE_ANNOTATION, "> {"),
-                '    const id = `${Math.random().toString(32).slice(2)}${Date.now().toString(16)}`;',
-                '    const requestHash = hash(requestBody ?? null);',
-                '    const requestBodyString = JSON.stringify(requestBody);',
-                "    const finalOptions = _.merge({}, this?.options, _.omit(options, ['getAuthorizationCredential', 'onRequest', 'onResponse']));",
-                "    const onRequestOptions = _.omit(finalOptions, ['getAuthorizationCredential', 'onRequest', 'onResponse']);",
-                '    const { getAuthorizationCredential, onResponse, onRequest, ignoreCache, timeout, prefix, ...requestOptions } = finalOptions;',
-                "    if (this.".concat(RESPONSE_CACHE_MAP_NAME, ".has(requestHash) && !ignoreCache) {"),
-                '      onRequest?.({',
-                '        prefix,',
-                '        url,',
-                '        requestBody: requestBodyString,',
-                '        cached: true,',
-                '        options: onRequestOptions,',
-                '        id,',
-                '      });',
-                "      return this.".concat(RESPONSE_CACHE_MAP_NAME, ".get(requestHash) as ").concat(RESULT_TYPE_ANNOTATION, ";"),
-                '    }',
-                '    onRequest?.({',
-                '      prefix,',
-                '      url,',
-                '      id,',
-                '      requestBody: requestBodyString,',
-                '      cached: false,',
-                '      options: onRequestOptions,',
-                '    });',
-                '    const credential = getAuthorizationCredential?.();',
-                '    const abortController = new AbortController();',
-                '    if (timeout! > 0) {',
-                '      setTimeout(() => {',
-                '        abortController.abort();',
-                '      }, timeout);',
-                '    }',
-                "    const result: ".concat(RESULT_TYPE_ANNOTATION, " = await fetch((prefix ?? '') + url, {"),
-                '      ...requestOptions,',
-                '      body: JSON.stringify(requestBody),',
-                "      method: 'POST',",
-                '      signal: abortController.signal,',
-                '      headers: {',
-                '        ...requestOptions?.headers,',
-                "        'Content-Type': 'application/json',",
-                "        Authorization: (typeof credential === 'string' && credential.length > 0) ? credential : finalOptions?.headers?.Authorization,",
-                '      },',
-                '    }).then((response) => {',
-                '      const status = response?.status;',
-                '      const statusText = response?.statusText;',
-                '      const headers = Array.from(response?.headers?.entries?.() ?? []).reduce((result, [key, value]) => {',
-                "        if (typeof key !== 'string' || key.length === 0) return result;",
-                '        result[key] = value;',
-                '        return result;',
-                '      }, {});',
-                '      if (!response?.ok) {',
-                '        return response.text().then((errorText) => ({ error: new Error(errorText), response: null, headers, status, statusText }));',
-                '      }',
-                "      return response.json().then((response) => ({ error: null, response, headers, status, statusText } as ".concat(RESULT_TYPE_ANNOTATION, "));"),
-                "    }).catch((error) => Promise.resolve({ error, response: null, headers: {}, status: 0, statusText: '' }));",
-                "    onResponse?.({ url, result }, id);",
-                "    this.".concat(RESPONSE_CACHE_MAP_NAME, ".set(requestHash, result);"),
-                '    return result;',
-                '  }',
-                '}\n',
-            ].join('\n');
-        },
+                var scopeIdentifier = "/".concat(controllerName, "/").concat(methodName);
+                return result.concat(["'".concat(scopeIdentifier, "'"), "".concat(Reflect.getMetadata(metadataName, Class.prototype), ";")].join(': '));
+            }, []));
+        }, [])
+            .map(function (line) { return "    ".concat(line); });
+        methodTypeMapCodeLines.unshift("export interface ".concat(METHOD_TYPE_MAP_NAME, " {"));
+        methodTypeMapCodeLines.push('}');
+        return [
+            "import * as hash from 'object-hash';",
+            "import * as _ from 'lodash';",
+            "\n".concat(methodTypeMapCodeLines.join('\n')),
+            "\ntype ".concat(METHOD_TYPE_MAP_KEYS_NAME, " = keyof ").concat(METHOD_TYPE_MAP_NAME, ";"),
+            "\ntype ".concat(RESPONSE_CALLBACK_DATA_NAME, "<K extends ").concat(METHOD_TYPE_MAP_KEYS_NAME, "> = {"),
+            '  url: K;',
+            "  result: ".concat(RESULT_TYPE_NAME, "<").concat(HTTP_RESPONSE_BODY_TYPE_NAME, "<").concat(METHOD_TYPE_MAP_NAME, "[K]['response']>>;"),
+            '};',
+            "\nexport type ".concat(HTTP_RESPONSE_BODY_TYPE_NAME, "<T> = {"),
+            '  data: T;',
+            '  token: string | null;',
+            '};',
+            "\nexport interface ".concat(REQUEST_OPTIONS_NAME, " extends RequestInit {"),
+            '  headers?: Record<string, any>;',
+            '  ignoreCache?: boolean;',
+            '  prefix?: string;',
+            '  timeout?: number;',
+            '  getAuthorizationCredential?: () => string;',
+            "  onRequest?: (context: { cached: boolean; id: string; options: Omit<".concat(REQUEST_OPTIONS_NAME, ", 'getAuthorizationCredential' | 'onRequest' | 'onResponse'>; prefix: string | undefined; requestBody: string; url: string; }) => void | Promise<void>;"),
+            "  onResponse?: <K extends ".concat(METHOD_TYPE_MAP_KEYS_NAME, ">(response: ").concat(RESPONSE_CALLBACK_DATA_NAME, "<K>, id: string) => void | Promise<void>;"),
+            '}',
+            "\nexport interface ".concat(RESULT_TYPE_NAME, "<T> {"),
+            '  error: Error | null;',
+            "  response: T | null;",
+            '  status: number;',
+            '  statusText: string;',
+            '  headers?: Record<string, any>;',
+            '}',
+            '\nexport class Client {',
+            "  public constructor(private readonly options: ".concat(REQUEST_OPTIONS_NAME, " = {}) {}"),
+            "\n  protected readonly ".concat(REQUEST_METHOD_MAP_NAME, " = new Map<keyof ").concat(METHOD_TYPE_MAP_NAME, ", (...params: any[]) => Promise<unknown>>();"),
+            "\n  protected readonly ".concat(RESPONSE_CACHE_MAP_NAME, " = new Map<string, ").concat(RESULT_TYPE_NAME, "<unknown>>();"),
+            "\n  public createRequest<T extends keyof ".concat(METHOD_TYPE_MAP_NAME, ">(url: T): (requestBody?: ").concat(REQUEST_BODY_TYPE_ANNOTATION, ", options?: ").concat(REQUEST_OPTIONS_NAME, ") => Promise<").concat(RESULT_TYPE_ANNOTATION, "> {"),
+            "    if (typeof this.".concat(REQUEST_METHOD_MAP_NAME, ".get(url) !== 'function') {"),
+            "      this.".concat(REQUEST_METHOD_MAP_NAME, ".set(url, (requestBody?: ").concat(REQUEST_BODY_TYPE_ANNOTATION, ", options?: ").concat(REQUEST_OPTIONS_NAME, ") => this.request.call(this, url, requestBody, options));"),
+            '    }',
+            "    return this.".concat(REQUEST_METHOD_MAP_NAME, ".get(url) as (requestBody?: ").concat(REQUEST_BODY_TYPE_ANNOTATION, ", options?: ").concat(REQUEST_OPTIONS_NAME, ") => Promise<").concat(RESULT_TYPE_ANNOTATION, ">;"),
+            '  }',
+            "\n  public async request<T extends keyof ".concat(METHOD_TYPE_MAP_NAME, ">(url: T, requestBody?: ").concat(REQUEST_BODY_TYPE_ANNOTATION, ", options?: Omit<").concat(REQUEST_OPTIONS_NAME, ", 'getAuthorizationCredential' | 'onRequest' | 'onResponse'>): Promise<").concat(RESULT_TYPE_ANNOTATION, "> {"),
+            '    const id = `${Math.random().toString(32).slice(2)}${Date.now().toString(16)}`;',
+            '    const requestHash = hash(requestBody ?? null);',
+            '    const requestBodyString = JSON.stringify(requestBody);',
+            "    const finalOptions = _.merge({}, this?.options, _.omit(options, ['getAuthorizationCredential', 'onRequest', 'onResponse']));",
+            "    const onRequestOptions = _.omit(finalOptions, ['getAuthorizationCredential', 'onRequest', 'onResponse']);",
+            '    const { getAuthorizationCredential, onResponse, onRequest, ignoreCache, timeout, prefix, ...requestOptions } = finalOptions;',
+            "    if (this.".concat(RESPONSE_CACHE_MAP_NAME, ".has(requestHash) && !ignoreCache) {"),
+            '      onRequest?.({',
+            '        prefix,',
+            '        url,',
+            '        requestBody: requestBodyString,',
+            '        cached: true,',
+            '        options: onRequestOptions,',
+            '        id,',
+            '      });',
+            "      return this.".concat(RESPONSE_CACHE_MAP_NAME, ".get(requestHash) as ").concat(RESULT_TYPE_ANNOTATION, ";"),
+            '    }',
+            '    onRequest?.({',
+            '      prefix,',
+            '      url,',
+            '      id,',
+            '      requestBody: requestBodyString,',
+            '      cached: false,',
+            '      options: onRequestOptions,',
+            '    });',
+            '    const credential = getAuthorizationCredential?.();',
+            '    const abortController = new AbortController();',
+            '    if (timeout! > 0) {',
+            '      setTimeout(() => {',
+            '        abortController.abort();',
+            '      }, timeout);',
+            '    }',
+            "    const result: ".concat(RESULT_TYPE_ANNOTATION, " = await fetch((prefix ?? '') + url, {"),
+            '      ...requestOptions,',
+            '      body: JSON.stringify(requestBody),',
+            "      method: 'POST',",
+            '      signal: abortController.signal,',
+            '      headers: {',
+            '        ...requestOptions?.headers,',
+            "        'Content-Type': 'application/json',",
+            "        Authorization: (typeof credential === 'string' && credential.length > 0) ? credential : finalOptions?.headers?.Authorization,",
+            '      },',
+            '    }).then((response) => {',
+            '      const status = response?.status;',
+            '      const statusText = response?.statusText;',
+            '      const headers = Array.from(response?.headers?.entries?.() ?? []).reduce((result, [key, value]) => {',
+            "        if (typeof key !== 'string' || key.length === 0) return result;",
+            '        result[key] = value;',
+            '        return result;',
+            '      }, {});',
+            '      if (!response?.ok) {',
+            '        return response.text().then((errorText) => ({ error: new Error(errorText), response: null, headers, status, statusText }));',
+            '      }',
+            "      return response.json().then((response) => ({ error: null, response, headers, status, statusText } as ".concat(RESULT_TYPE_ANNOTATION, "));"),
+            "    }).catch((error) => Promise.resolve({ error, response: null, headers: {}, status: 0, statusText: '' }));",
+            "    onResponse?.({ url, result }, id);",
+            "    this.".concat(RESPONSE_CACHE_MAP_NAME, ".set(requestHash, result);"),
+            '    return result;',
+            '  }',
+            '}\n',
+        ].join('\n');
     };
+    return TypeScriptClient;
+}(Client));
+function isClient(input) {
+    return input instanceof Client;
+}
+exports.isClient = isClient;
+function createTypeScriptClient(options) {
+    return new TypeScriptClient(options);
 }
-exports.create = create;
+exports.createTypeScriptClient = createTypeScriptClient;

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.d.ts

@@ -1,7 +1,10 @@
-import { BelongsToOptions, ModelAttributeColumnOptions } from 'sequelize';
-import { Model, TableOptions, ModelClassGetter } from 'sequelize-typescript';
+import { BelongsToOptions, IndexesOptions, ModelAttributeColumnOptions } from 'sequelize';
+import { Model, TableOptions as SequelizeTableOptions, ModelClassGetter } from 'sequelize-typescript';
 import { Constructor } from 'type-fest';
 export * from 'sequelize-typescript';
-export declare function Table<M extends Model = Model>(options: TableOptions<M>): (target: Constructor<M>) => void;
+export interface TableOptions<M extends Model = Model> extends Omit<SequelizeTableOptions<M>, 'indexes'> {
+    indexes?: Array<IndexesOptions | string>;
+}
+export declare function Table<M extends Model = Model>({ indexes, ...options }: TableOptions<M>): (target: Constructor<M>) => void;
 export declare function BelongsTo(associatedClassGetter: ModelClassGetter<{}, {}>, options?: BelongsToOptions): Function;
 export declare function DateColumn(options: Partial<ModelAttributeColumnOptions>): Function;

package/dist/sequelize-di.js

@@ -24,16 +24,35 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 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);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateColumn = exports.BelongsTo = exports.Table = void 0;
 var sequelize_typescript_1 = require("sequelize-typescript");
 __exportStar(require("sequelize-typescript"), exports);
-function Table(options) {
+function Table(_a) {
+    var indexes = _a.indexes, options = __rest(_a, ["indexes"]);
     return function (target) {
         var newOptions = !options ? {} : options;
-        if (!Array.isArray(newOptions === null || newOptions === void 0 ? void 0 : newOptions.indexes))
-            newOptions.indexes = [];
-        newOptions.indexes = Array.from(newOptions.indexes).concat({
+        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 item;
+        }).concat({
             name: 'pagination',
             fields: ['id', 'created_at'],
         });

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

@@ -0,0 +1,28 @@
+import { Schema } from '@open-norantec/utilities/dist/schema-util.class';
+import { z } from 'zod';
+declare const OPTIONS_SCHEMA: z.ZodObject<{
+    entry: z.ZodString;
+    outputFile: z.ZodString;
+    group: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    entry: string;
+    outputFile: string;
+    group?: string | undefined;
+}, {
+    entry: string;
+    outputFile: string;
+    group?: string | undefined;
+}>;
+export declare class ClientUtil {
+    private readonly inputOptions;
+    private readonly onFile;
+    private readonly onLog;
+    constructor(inputOptions: z.infer<typeof OPTIONS_SCHEMA>, onFile: (filePath: string, content: string) => void, onLog: (level: Schema.LogLevel, message?: string) => void);
+    protected readonly options: {
+        entry: string;
+        outputFile: string;
+        group?: string | undefined;
+    };
+    generateClientCode(): Promise<void>;
+}
+export {};

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

@@ -0,0 +1,190 @@
+"use strict";
+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.ClientUtil = void 0;
+var ts = require("typescript");
+var path = require("node:path");
+var _ = require("lodash");
+var reflect_declaration_1 = require("../transformers/reflect-declaration");
+var esbuild = require("esbuild");
+var requireFromString = require("require-from-string");
+var utilities_1 = require("@open-norantec/utilities");
+var create_1 = require("../create");
+var zod_1 = require("zod");
+var OPTIONS_SCHEMA = zod_1.z.object({
+    entry: zod_1.z.string(),
+    outputFile: zod_1.z.string(),
+    group: zod_1.z.string().optional(),
+});
+var ClientUtil = (function () {
+    function ClientUtil(inputOptions, onFile, onLog) {
+        this.inputOptions = inputOptions;
+        this.onFile = onFile;
+        this.onLog = onLog;
+        this.options = OPTIONS_SCHEMA.parse(this.inputOptions);
+    }
+    ClientUtil.prototype.generateClientCode = function () {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function () {
+            var configPath, configFile, parsed, program, outputMap, outputFile, esbuildResult, text, client, requireResult, clientCode, absoluteOutputFile;
+            var _this = this;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
+                    case 0:
+                        configPath = ts.findConfigFile('.', ts.sys.fileExists, 'tsconfig.json');
+                        configFile = ts.readConfigFile(configPath, ts.sys.readFile);
+                        parsed = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath));
+                        parsed.options.configFilePath = configPath;
+                        program = ts.createProgram({ rootNames: parsed.fileNames, options: parsed.options });
+                        outputMap = new Map();
+                        outputFile = _.attempt(function () {
+                            return ts
+                                .getOutputFileNames(parsed, path.relative(process.cwd(), path.resolve(_this.options.entry)), false)
+                                .find(function (filePath) { return filePath.endsWith('.js'); });
+                        });
+                        if (outputFile instanceof Error) {
+                            (_a = this.onLog) === null || _a === void 0 ? void 0 : _a.call(this, 'error', "Failed to determine output file: ".concat(outputFile.message));
+                            return [2];
+                        }
+                        if (typeof outputFile === 'undefined') {
+                            (_b = this.onLog) === null || _b === void 0 ? void 0 : _b.call(this, 'error', 'Failed to determine output file: No .js output file found');
+                            return [2];
+                        }
+                        program.emit(undefined, function (fileName, data) {
+                            var _a;
+                            var absolutePath = path.resolve(fileName);
+                            outputMap.set(absolutePath, data);
+                            (_a = _this.onLog) === null || _a === void 0 ? void 0 : _a.call(_this, 'info', "Compiled ".concat(absolutePath));
+                        }, undefined, false, {
+                            before: [(0, reflect_declaration_1.default)(program)],
+                        });
+                        return [4, utilities_1.AttemptUtil.execPromise(esbuild.build({
+                                entryPoints: [path.resolve(outputFile)],
+                                bundle: true,
+                                platform: 'node',
+                                format: 'cjs',
+                                write: false,
+                                plugins: [
+                                    {
+                                        name: 'tsconfig-paths',
+                                        setup: function (build) {
+                                            build.onResolve({ filter: /.*/ }, function (args) {
+                                                var _a, _b;
+                                                var hasMatchingPath = Object.keys(((_a = parsed.options) === null || _a === void 0 ? void 0 : _a.paths) || {}).some(function (path) {
+                                                    return new RegExp(path.replace('*', '\\w*')).test(args.path);
+                                                });
+                                                if (!hasMatchingPath) {
+                                                    return null;
+                                                }
+                                                var resolvedModule = ts.nodeModuleNameResolver(args.path, args.importer, parsed.options || {}, ts.sys).resolvedModule;
+                                                if (!resolvedModule) {
+                                                    return null;
+                                                }
+                                                var resolvedFileName = resolvedModule.resolvedFileName;
+                                                if (!resolvedFileName || resolvedFileName.endsWith('.d.ts')) {
+                                                    return null;
+                                                }
+                                                var resolved = ts.sys.resolvePath(resolvedFileName);
+                                                (_b = _this.onLog) === null || _b === void 0 ? void 0 : _b.call(_this, 'info', "Resolved file using TypeScript paths: ".concat(args.path, " -> ").concat(resolved, ")"));
+                                                return {
+                                                    path: resolved,
+                                                };
+                                            });
+                                        },
+                                    },
+                                    {
+                                        name: 'vfs',
+                                        setup: function (build) {
+                                            build.onResolve({ filter: /.*/ }, function (args) {
+                                                var fullPath = path.resolve(path.dirname(args.importer), args.path);
+                                                if (!fullPath.endsWith('.js'))
+                                                    fullPath += '.js';
+                                                if (outputMap.has(fullPath)) {
+                                                    return { path: fullPath, namespace: 'vfs' };
+                                                }
+                                                return { path: args.path, external: true };
+                                            });
+                                            build.onLoad({ filter: /.*/, namespace: 'vfs' }, function (args) {
+                                                var contents = outputMap.get(args.path);
+                                                return {
+                                                    contents: contents,
+                                                    loader: 'js',
+                                                };
+                                            });
+                                        },
+                                    },
+                                ],
+                            }))];
+                    case 1:
+                        esbuildResult = _f.sent();
+                        if (esbuildResult instanceof Error) {
+                            (_c = this.onLog) === null || _c === void 0 ? void 0 : _c.call(this, 'error', "Failed to build client code: ".concat(esbuildResult.message));
+                            return [2];
+                        }
+                        if (esbuildResult.errors.length > 0) {
+                            this.onLog('error', "Builder built with error: ".concat(esbuildResult.errors[0].text));
+                            return [2];
+                        }
+                        text = esbuildResult.outputFiles[0].text;
+                        client = undefined;
+                        try {
+                            requireResult = requireFromString(text, { appendPaths: [path.resolve(process.cwd())] });
+                            client = requireResult;
+                            if (!(client instanceof create_1.Client))
+                                client = client === null || client === void 0 ? void 0 : client.default;
+                        }
+                        catch (_g) { }
+                        if (!(client instanceof create_1.Client)) {
+                            (_d = this.onLog) === null || _d === void 0 ? void 0 : _d.call(this, 'error', 'Failed to load client code');
+                            return [2];
+                        }
+                        clientCode = _.attempt(function () { return client.generateClientSourceFile(_this.options.group); });
+                        if (clientCode instanceof Error) {
+                            (_e = this.onLog) === null || _e === void 0 ? void 0 : _e.call(this, 'error', "Failed to generate client code: ".concat(clientCode.message));
+                            return [2];
+                        }
+                        absoluteOutputFile = path.resolve(this.options.outputFile);
+                        this.onFile(absoluteOutputFile, clientCode);
+                        return [2];
+                }
+            });
+        });
+    };
+    return ClientUtil;
+}());
+exports.ClientUtil = ClientUtil;

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

@@ -77,8 +77,8 @@ require("reflect-metadata");
 var common_1 = require("@nestjs/common");
 var _ = require("lodash");
 var string_util_class_1 = require("@open-norantec/utilities/dist/string-util.class");
+var uuid_util_class_1 = require("@open-norantec/utilities/dist/uuid-util.class");
 var common_2 = require("@nestjs/common");
-var uuid_1 = require("uuid");
 var headers_constant_1 = require("../constants/headers.constant");
 var core_1 = require("@nestjs/core");
 var auth_adapter_decorator_1 = require("../decorators/auth-adapter.decorator");
@@ -86,6 +86,7 @@ var rxjs_1 = require("rxjs");
 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 IS_CONTROLLER = Symbol();
 function isHerbalController(target) {
     return _.attempt(function () { return Reflect.getMetadata(IS_CONTROLLER, target.prototype); }) === true;
@@ -102,9 +103,6 @@ var ControllerInterceptor = (function () {
             _.attempt(function () {
                 _this.getLogger().log("[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":response:url] ").concat(request === null || request === void 0 ? void 0 : request.originalUrl));
             });
-            _.attempt(function () {
-                return _this.getLogger().log("[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":request:body] ").concat(JSON.stringify(request === null || request === void 0 ? void 0 : request.body)));
-            });
             _.attempt(function () {
                 return _this.getLogger().log("[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":request:headers] ").concat(JSON.stringify(request === null || request === void 0 ? void 0 : request.headers)));
             });
@@ -139,6 +137,7 @@ var ControllerInterceptor = (function () {
             _.attempt(function () {
                 _this.getLogger().error("[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":response:error:stack] ").concat(error === null || error === void 0 ? void 0 : error.stack));
             });
+            _this.getLogger().error("Got error when handling route in interceptor: ".concat(error === null || error === void 0 ? void 0 : error.message, " ").concat(error === null || error === void 0 ? void 0 : error.stack));
             _.attempt(function () { var _a, _b, _c, _d; return (_d = (_c = (_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)) === null || _c === void 0 ? void 0 : _c.catch) === null || _d === void 0 ? void 0 : _d.call(_c, function () { }); });
             return (0, rxjs_1.throwError)(function () { return error; });
         }));
@@ -156,72 +155,67 @@ function HerbalGuard(options) {
         }
         HerbalGuardMixin.prototype.canActivate = function (context) {
             var _a, e_1, _b, _c;
-            var _d, _e, _f, _g, _h;
+            var _d, _e, _f, _g, _h, _j, _k;
             return __awaiter(this, void 0, void 0, function () {
-                var sequelizeInstance, transaction, request, response, traceId, chunks, _j, request_1, request_1_1, chunk, e_1_1, _k, parsedBody, authAdapters, _i, authAdapters_1, AuthAdapterClass, adapter, authenticateResult, error_1, _l;
+                var sequelizeInstance, transaction, request, response, traceId, chunks, _l, request_1, request_1_1, chunk, e_1_1, _m, parsedBody, rawHandlerName, handlerPropertype, handlerName, authAdapters, error_1, _i, authAdapters_1, AuthAdapterClass, adapter, authenticateResult, error_2, _o;
                 var _this = this;
-                return __generator(this, function (_m) {
-                    switch (_m.label) {
+                return __generator(this, function (_p) {
+                    switch (_p.label) {
                         case 0:
                             sequelizeInstance = _.attempt(function () { return _this.ref.get(sequelize_typescript_1.Sequelize, { strict: false }); });
                             transaction = undefined;
-                            if (!!(sequelizeInstance instanceof Error)) return [3, 2];
-                            return [4, ((_e = (_d = sequelizeInstance === null || sequelizeInstance === void 0 ? void 0 : sequelizeInstance.transaction) === null || _d === void 0 ? void 0 : _d.call(sequelizeInstance)) === null || _e === void 0 ? void 0 : _e.catch(function () { return Promise.resolve(undefined); }))];
-                        case 1:
-                            transaction = _m.sent();
-                            _m.label = 2;
-                        case 2:
                             request = context.switchToHttp().getRequest();
                             response = context.switchToHttp().getResponse();
-                            traceId = typeof (options === null || options === void 0 ? void 0 : options.getTraceId) === 'function' ? _.attempt(function () { return options.getTraceId(request); }) : (0, uuid_1.v4)();
-                            if (traceId instanceof Error)
-                                traceId = (0, uuid_1.v4)();
+                            traceId = typeof (options === null || options === void 0 ? void 0 : options.getTraceId) === 'function'
+                                ? _.attempt(function () { return options.getTraceId(request); })
+                                : uuid_util_class_1.UUIDUtil.generateV4();
+                            if (traceId instanceof Error || string_util_class_1.StringUtil.isFalsyString(traceId))
+                                traceId = uuid_util_class_1.UUIDUtil.generateV4();
                             request.traceId = traceId;
                             request.methodName = request.url.split('/').pop();
-                            request.transaction = transaction;
                             response.setHeader(headers_constant_1.HEADERS.TRACE_ID, traceId);
                             chunks = [];
-                            _m.label = 3;
-                        case 3:
-                            _m.trys.push([3, 16, , 17]);
-                            _m.label = 4;
+                            _p.label = 1;
+                        case 1:
+                            _p.trys.push([1, 14, , 15]);
+                            _p.label = 2;
+                        case 2:
+                            _p.trys.push([2, 7, 8, 13]);
+                            _l = true, request_1 = __asyncValues(request);
+                            _p.label = 3;
+                        case 3: return [4, request_1.next()];
                         case 4:
-                            _m.trys.push([4, 9, 10, 15]);
-                            _j = true, request_1 = __asyncValues(request);
-                            _m.label = 5;
-                        case 5: return [4, request_1.next()];
-                        case 6:
-                            if (!(request_1_1 = _m.sent(), _a = request_1_1.done, !_a)) return [3, 8];
+                            if (!(request_1_1 = _p.sent(), _a = request_1_1.done, !_a)) return [3, 6];
                             _c = request_1_1.value;
-                            _j = false;
+                            _l = false;
                             chunk = _c;
                             chunks.push(chunk);
-                            _m.label = 7;
+                            _p.label = 5;
+                        case 5:
+                            _l = true;
+                            return [3, 3];
+                        case 6: return [3, 13];
                         case 7:
-                            _j = true;
-                            return [3, 5];
-                        case 8: return [3, 15];
-                        case 9:
-                            e_1_1 = _m.sent();
+                            e_1_1 = _p.sent();
                             e_1 = { error: e_1_1 };
-                            return [3, 15];
-                        case 10:
-                            _m.trys.push([10, , 13, 14]);
-                            if (!(!_j && !_a && (_b = request_1.return))) return [3, 12];
+                            return [3, 13];
+                        case 8:
+                            _p.trys.push([8, , 11, 12]);
+                            if (!(!_l && !_a && (_b = request_1.return))) return [3, 10];
                             return [4, _b.call(request_1)];
+                        case 9:
+                            _p.sent();
+                            _p.label = 10;
+                        case 10: return [3, 12];
                         case 11:
-                            _m.sent();
-                            _m.label = 12;
-                        case 12: return [3, 14];
-                        case 13:
                             if (e_1) throw e_1.error;
                             return [7];
-                        case 14: return [7];
-                        case 15: return [3, 17];
-                        case 16:
-                            _k = _m.sent();
-                            return [3, 17];
-                        case 17:
+                        case 12: return [7];
+                        case 13: return [3, 15];
+                        case 14:
+                            _m = _p.sent();
+                            return [3, 15];
+                        case 15:
                             parsedBody = _.attempt(function () { return Buffer.concat(chunks).toString('utf8'); });
                             if (!(parsedBody instanceof Error)) {
                                 request.rawBody = parsedBody;
@@ -229,49 +223,87 @@ function HerbalGuard(options) {
                             else {
                                 request.rawBody = null;
                             }
-                            authAdapters = auth_adapter_decorator_1.AuthAdapters.getAdapters((_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, request.methodName);
-                            _m.label = 18;
+                            _.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;
+                            authAdapters = auth_adapter_decorator_1.AuthAdapters.getAdapters(handlerPropertype, handlerName);
+                            if (!(!(sequelizeInstance instanceof Error) && !decorators_1.NoTransaction.isDisabled(handlerPropertype, handlerName))) return [3, 20];
+                            _p.label = 16;
+                        case 16:
+                            _p.trys.push([16, 18, , 19]);
+                            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 17:
+                            transaction = _p.sent();
+                            request.transaction = transaction;
+                            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:
-                            _m.trys.push([18, 24, , 29]);
-                            if (!(Array.isArray(authAdapters) && authAdapters.length > 0)) return [3, 23];
+                            error_1 = _p.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));
+                            }
+                            return [3, 19];
+                        case 19: return [3, 21];
+                        case 20:
+                            if (decorators_1.NoTransaction.isDisabled(handlerPropertype, handlerName)) {
+                                this.getLogger().log("[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":transaction] Transaction is disabled for this route: ").concat(handlerName));
+                            }
+                            _p.label = 21;
+                        case 21:
+                            _p.trys.push([21, 27, , 32]);
+                            if (!(Array.isArray(authAdapters) && authAdapters.length > 0)) return [3, 26];
                             _i = 0, authAdapters_1 = authAdapters;
-                            _m.label = 19;
-                        case 19:
-                            if (!(_i < authAdapters_1.length)) return [3, 22];
+                            _p.label = 22;
+                        case 22:
+                            if (!(_i < authAdapters_1.length)) return [3, 25];
                             AuthAdapterClass = authAdapters_1[_i];
                             adapter = new AuthAdapterClass(request, this.ref);
                             if (!adapter.match())
-                                return [3, 21];
+                                return [3, 24];
                             return [4, adapter.authenticate(transaction)];
-                        case 20:
-                            authenticateResult = _m.sent();
+                        case 23:
+                            authenticateResult = _p.sent();
                             if (!authenticateResult)
-                                return [3, 22];
+                                return [3, 25];
                             request.authenticateResult = __assign({ AuthenticatorClass: AuthAdapterClass }, authenticateResult);
                             return [2, true];
-                        case 21:
-                            _i++;
-                            return [3, 19];
-                        case 22: throw new common_2.UnauthorizedException();
-                        case 23: return [3, 29];
                         case 24:
-                            error_1 = _m.sent();
-                            _m.label = 25;
-                        case 25:
-                            _m.trys.push([25, 27, , 28]);
-                            return [4, ((_h = transaction === null || transaction === void 0 ? void 0 : transaction.rollback) === null || _h === void 0 ? void 0 : _h.call(transaction))];
-                        case 26:
-                            _m.sent();
-                            return [3, 28];
+                            _i++;
+                            return [3, 22];
+                        case 25: throw new common_2.UnauthorizedException();
+                        case 26: return [3, 32];
                         case 27:
-                            _l = _m.sent();
-                            return [3, 28];
-                        case 28: throw error_1;
-                        case 29: return [2, true];
+                            error_2 = _p.sent();
+                            _p.label = 28;
+                        case 28:
+                            _p.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));
+                            }
+                            return [4, ((_k = transaction === null || transaction === void 0 ? void 0 : transaction.rollback) === null || _k === void 0 ? void 0 : _k.call(transaction))];
+                        case 29:
+                            _p.sent();
+                            return [3, 31];
+                        case 30:
+                            _o = _p.sent();
+                            return [3, 31];
+                        case 31: throw error_2;
+                        case 32: return [2, true];
                     }
                 });
             });
         };
+        HerbalGuardMixin.prototype.getLogger = function () {
+            var loggerService = this.ref.get(logger_service_1.LoggerService, { strict: false });
+            if (!(loggerService instanceof logger_service_1.LoggerService)) {
+                return {
+                    log: function () { },
+                    error: function () { },
+                };
+            }
+            return loggerService;
+        };
         HerbalGuardMixin = __decorate([
             (0, common_2.Injectable)(),
             __metadata("design:paramtypes", [core_1.ModuleRef])
@@ -286,12 +318,13 @@ var ControllerUtil = (function () {
     ControllerUtil.create = function (createOptions) {
         function Controller(options) {
             return function (target) {
+                var _a;
                 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)
                         ? ''
                         : createOptions.prefix
                     : options.prefix;
-                finalPrefix += "/".concat(_.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(_.camelCase(target.name.replace(/Controller$/g, '')));
                 if (!finalPrefix.startsWith('/'))
                     finalPrefix = "/".concat(finalPrefix);
                 Reflect.defineMetadata(IS_CONTROLLER, true, target.prototype);

package/dist/utilities/index.d.ts

@@ -1,3 +1,4 @@
 export * from './controller-util.class';
 export * from './model-util.class';
 export * from './nest-util.class';
+export * from './client-util.class';

package/dist/utilities/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./controller-util.class"), exports);
 __exportStar(require("./model-util.class"), exports);
 __exportStar(require("./nest-util.class"), exports);
+__exportStar(require("./client-util.class"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@open-norantec/herbal",
-    "version": "1.0.2-alpha.1",
+    "version": "1.0.2-alpha.10",
     "description": "Herbal is a builder and toolchain for Nest.js applications",
     "main": "dist/index.js",
     "scripts": {
@@ -41,24 +41,30 @@
         "@open-norantec/forge": "latest",
         "@open-norantec/utilities": "latest",
         "commander": "^12.1.0",
+        "esbuild": "^0.28.0",
+        "fs-extra": "^11.3.4",
         "lodash": "^4.17.21",
         "nest-winston": "^1.10.2",
         "nj-request-scope": "^1.0.10",
         "patch-package": "^8.0.1",
         "reflect-metadata": "^0.2.2",
+        "require-from-string": "^2.0.2",
         "rxjs": "^7.8.2",
         "sequelize": "6.37.7",
         "sequelize-typescript": "^2.1.5",
         "ts-patch": "^3.3.0",
         "type-fest": "^4.41.0",
+        "typescript": ">=5.1.0 <5.2.0",
         "uuid": "^11.1.0",
         "zod": "^3.25.67"
     },
     "devDependencies": {
         "@stylistic/eslint-plugin": "^2.12.1",
         "@types/express": "^5.0.3",
+        "@types/fs-extra": "^11.0.4",
         "@types/lodash": "^4.17.16",
         "@types/node": "18.11.18",
+        "@types/require-from-string": "^1.2.3",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
         "@typescript-eslint/parser": "^8.0.0",
         "cross-env": "^7.0.3",
@@ -68,7 +74,6 @@
         "express": "^4.21.2",
         "prettier": "^3.0.0",
         "rimraf": "^6.0.1",
-        "ts-node": "^10.0.0",
-        "typescript": "~5.1.3"
+        "ts-node": "^10.0.0"
     }
 }