taon 19.0.54 → 19.0.56

package/browser/lib/config/controller-config.d.ts

@@ -0,0 +1,22 @@
+// @ts-nocheck
+import { TaonMiddlewareInheritanceObj } from '../decorators/http/http-methods-decorators';
+import { TaonControllerOptions } from './controller-options';
+import { MethodConfig } from './method-config';
+export declare class ControllerConfig extends TaonControllerOptions {
+    methods: {
+        [methodName: string]: Partial<MethodConfig>;
+    };
+    /**
+     * Calculated path from parents controllers
+     */
+    calculatedPath?: string;
+    /**
+     * a way to transform entity before sending to browser
+     */
+    browserTransformFn?: (entity: any) => any;
+    /**
+     * Calculated middlewares object from parents controllers
+     */
+    calculatedMiddlewaresControllerObj?: TaonMiddlewareInheritanceObj;
+}
+export declare const controllerConfigFrom: (partial: Partial<ControllerConfig>) => ControllerConfig;

package/{websql/lib/decorators/classes → browser/lib/config}/controller-options.d.ts

@@ -1,5 +1,6 @@
 // @ts-nocheck
-import { DecoratorAbstractOpt } from '../decorator-abstract-opt';
+import { DecoratorAbstractOpt } from '../decorators/decorator-abstract-opt';
+import type { TaonMiddlewareFunction } from '../decorators/http/http-methods-decorators';
 export declare class TaonControllerOptions<ControllerClass = any> extends DecoratorAbstractOpt {
     /**
      * typeorm realtime subscribtion // TODO disabled for now, does not make sense ?s
@@ -9,4 +10,8 @@ export declare class TaonControllerOptions<ControllerClass = any> extends Decora
      * override default path for controller api
      */
     path?: string;
+    /**
+     * Middlewares to be applied to all methods in the controller
+     */
+    middlewares?: TaonMiddlewareFunction;
 }

package/browser/lib/config/method-config.d.ts

@@ -0,0 +1,39 @@
+// @ts-nocheck
+import { CoreModels } from 'tnp-core/browser';
+import type { BaseMiddleware } from '../base-classes/base-middleware';
+import type { TaonHttpDecoratorOptions, TaonMiddlewareFunction, TaonMiddlewareInheritanceObj } from '../decorators/http/http-methods-decorators';
+import { ParamConfig } from './param-config';
+/**
+ * @link './decorators/http/http-methods-decorators.ts' TaonHttpDecoratorOptions
+ */
+export declare class MethodConfig implements Pick<TaonHttpDecoratorOptions, 'path' | 'middlewares'> {
+    methodName: string;
+    global?: boolean;
+    /**
+     * override default content type
+     */
+    contentType?: any;
+    /**
+     * override default axiso response type
+     */
+    responseType?: any;
+    path: string;
+    descriptor: PropertyDescriptor;
+    type: CoreModels.HttpMethod;
+    parameters: {
+        [paramName: string]: Partial<ParamConfig>;
+    };
+    /**
+     * Middlewares from controller method options
+     */
+    middlewares?: TaonMiddlewareFunction;
+    /**
+     * Calculated middlewares object from parents controllers
+     */
+    calculatedMiddlewaresMethodObj?: TaonMiddlewareInheritanceObj;
+    /**
+     * Middlewares array in proper order and ready to be used in
+     * express or in axios interceptors.
+     */
+    calculatedMiddlewares: (typeof BaseMiddleware)[];
+}

package/browser/lib/config/param-config.d.ts

@@ -0,0 +1,9 @@
+// @ts-nocheck
+import { CoreModels } from 'tnp-core/browser';
+export declare class ParamConfig {
+    paramName: string;
+    paramType: CoreModels.ParamType;
+    index: number;
+    defaultType: any;
+    expireInSeconds?: number;
+}

package/browser/lib/decorators/classes/controller-decorator.d.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import type { TaonControllerOptions } from './controller-options';
+import type { TaonControllerOptions } from '../../config/controller-options';
 /**
  * Controller decorator
  */

package/browser/lib/decorators/http/http-methods-decorators.d.ts

@@ -2,6 +2,19 @@
 import { Models as ModelsNg2Rest } from 'ng2-rest/browser';
 import { CoreModels } from 'tnp-core/browser';
 import { BaseMiddleware } from '../../base-classes/base-middleware';
+export type TaonMiddlewareInheritanceObj = {
+    [parentMiddlewaresName: string]: typeof BaseMiddleware;
+};
+export type TaonMiddlewareFunction = (options: {
+    /**
+     * middlewares inherited from parent class
+     */
+    parentMiddlewares: TaonMiddlewareInheritanceObj;
+    /**
+     * Get real class name - needed when code is minified
+     */
+    className: (middlewareClass: Function) => string;
+}) => TaonMiddlewareInheritanceObj;
 export interface TaonHttpDecoratorOptions {
     /**
      * @deprecated don't use in production - keep stuff encapsulated
@@ -17,7 +30,7 @@ export interface TaonHttpDecoratorOptions {
     pathIsGlobal?: boolean;
     overrideContentType?: CoreModels.ContentType;
     overrideResponseType?: ModelsNg2Rest.ResponseTypeAxios;
-    middlewares?: (typeof BaseMiddleware)[];
+    middlewares?: TaonMiddlewareFunction;
 }
 export declare function GET(pathOrOptions?: string | TaonHttpDecoratorOptions, pathIsGlobal?: boolean): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
 export declare function HEAD(pathOrOptions?: string | TaonHttpDecoratorOptions, pathIsGlobal?: boolean): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;

package/browser/lib/endpoint-context.d.ts

@@ -107,7 +107,6 @@ export declare class EndpointContext {
     isActiveOn(classInstance: object): boolean;
     get frontendHostUri(): URL;
     get uri(): URL;
-    get uriPort(): string | undefined;
     get uriProtocol(): string | undefined;
     /**
      * Examples
@@ -128,6 +127,7 @@ export declare class EndpointContext {
      * https://localhost/path/to/  -> '/path/to/somewhere' # remove last slash
      */
     get uriPathnameOrNothingIfRoot(): string;
+    get uriPort(): string | undefined;
     /**
      * Port from uri as number
      * @returns {Number | undefined}
@@ -153,6 +153,8 @@ export declare class EndpointContext {
     initEntities(): Promise<void>;
     destroy(): Promise<void>;
     initDatabaseConnection(): Promise<void>;
+    private updateCalculatedPathsForControllers;
+    private mergeControllerMethodsConfigs;
     initControllers(): Promise<void>;
     writeActiveRoutes(): void;
     get middlewares(): Models.MiddlewareType[];

package/browser/lib/helpers/class-helpers.d.ts

@@ -1,5 +1,6 @@
 // @ts-nocheck
-import { ControllerConfig } from '../decorators/classes/controller-config';
+import { ControllerConfig } from '../config/controller-config';
+import { MethodConfig } from '../config/method-config';
 export declare namespace ClassHelpers {
     /**
      * TODO - repalce in every place when getting class fn from object
@@ -12,11 +13,13 @@ export declare namespace ClassHelpers {
     const isContextClassObject: (obj: any) => boolean;
     const setName: (target: Function, className: string) => void;
     const hasParentClassWithName: (target: Function, className: string, targets?: any[]) => boolean;
-    const getControllerConfig: (target: Function) => ControllerConfig | undefined;
     /**
      * Express async handler for middleware functions.
      */
     const asyncHandler: (fn: any) => (req: any, res: any, next: any) => void;
     const getMethodsNames: (classOrClassInstance: any, allMethodsNames?: any[]) => string[];
     const getControllerConfigs: (target: Function, configs?: ControllerConfig[], callerTarget?: Function) => ControllerConfig[];
+    const ensureClassConfig: (target: Function) => Partial<ControllerConfig>;
+    const ensureMethodConfig: (target: any, propertyKey: string | symbol) => Partial<MethodConfig>;
+    const getClassConfig: (constructor: Function) => Partial<ControllerConfig> | undefined;
 }

package/browser/lib/helpers/clone-obj.d.ts

@@ -0,0 +1,2 @@
+// @ts-nocheck
+export declare const cloneObj: <CloneT>(override: Partial<CloneT>, classFn: Function) => CloneT;

package/browser/lib/helpers/taon-helpers.d.ts

@@ -1,16 +1,16 @@
 // @ts-nocheck
-import type { ControllerConfig } from '../decorators/classes/controller-config';
-import { Models } from '../models';
+import type { ControllerConfig } from '../config/controller-config';
+import { MethodConfig } from '../config/method-config';
 export declare namespace TaonHelpers {
     const fillUpTo: (s: string, nCharacters: number) => string;
     const isGoodPath: (p: string) => boolean;
     const tryTransformParam: (param: any) => any;
-    const getExpressPath: (c: ControllerConfig, pathOrClassConfig: Models.MethodConfig) => string;
+    const getExpressPath: (c: ControllerConfig, pathOrClassConfig: Partial<MethodConfig>) => string;
     const defaultType: (value: any) => {};
     const parseJSONwithStringJSONs: (object: Object, waring?: boolean) => Object;
     const isPlainFileOrFolder: (filePath: any) => boolean;
-    const ipcKeyNameResponse: (target: Function, methodConfig: Models.MethodConfig, expressPath: string) => string;
-    const ipcKeyNameRequest: (target: Function, methodConfig: Models.MethodConfig, expressPath: string) => string;
+    const ipcKeyNameResponse: (target: Function, methodConfig: Partial<MethodConfig>, expressPath: string) => string;
+    const ipcKeyNameRequest: (target: Function, methodConfig: Partial<MethodConfig>, expressPath: string) => string;
     const websqlMocks: (headers: any) => {
         request: Express.Request;
         response: Express.Response;

package/browser/lib/models.d.ts

@@ -2,8 +2,6 @@
 import { Response as ExpressResponse, Request as ExpressRequest } from 'express';
 import { Models as ModelsNg2Rest } from 'ng2-rest/browser';
 import { CoreModels } from 'tnp-core/browser';
-import type { BaseMiddleware } from './base-classes/base-middleware';
-import type { TaonHttpDecoratorOptions } from './decorators/http/http-methods-decorators';
 export declare namespace Models {
     type FrameworkMode = 'backend-frontend(tcp+udp)' | 'remote-backend(tcp+udp)' | 'backend-frontend(ipc-electron)' | 'backend-frontend(websql-electron)' | 'backend-frontend(websql)';
     enum ClassType {
@@ -212,35 +210,6 @@ export declare namespace Models {
          */
         cwd?: string;
     }
-    class ParamConfig {
-        paramName: string;
-        paramType: CoreModels.ParamType;
-        index: number;
-        defaultType: any;
-        expireInSeconds?: number;
-    }
-    /**
-     * @link './decorators/http/http-methods-decorators.ts' TaonHttpDecoratorOptions
-     */
-    class MethodConfig implements Pick<TaonHttpDecoratorOptions, 'path' | 'middlewares'> {
-        methodName: string;
-        global?: boolean;
-        /**
-         * override default content type
-         */
-        contentType?: any;
-        /**
-         * override default axiso response type
-         */
-        responseType?: any;
-        path: string;
-        descriptor: PropertyDescriptor;
-        type: CoreModels.HttpMethod;
-        parameters: {
-            [paramName: string]: ParamConfig;
-        };
-        middlewares?: (typeof BaseMiddleware)[];
-    }
     namespace Http {
         export import Rest = ModelsNg2Rest;
         type ContextENDPOINT = {
@@ -259,7 +228,7 @@ export declare namespace Models {
             /**
              * @deprecated use request() mehods instead
              */
-            received?: Rest.PromiseObservableMix<Rest.HttpResponse<T>>;
+            readonly received?: Rest.PromiseObservableMix<Rest.HttpResponse<T>>;
             request?(axiosConfig?: ModelsNg2Rest.Ng2RestAxiosRequestConfig): Rest.PromiseObservableMix<Rest.HttpResponse<T>>;
         }
         interface AsyncResponse<T> {

package/browser/lib/symbols.d.ts

@@ -31,9 +31,7 @@ export declare namespace Symbols {
     export const metadata: {
         className: string;
         options: {
-            runtimeController: string;
             controller: string;
-            controllerMethod: string;
             entity: string;
             repository: string;
             provider: string;

package/browser/lib/validators.d.ts

@@ -1,8 +1,8 @@
 // @ts-nocheck
-import { Models } from './models';
+import { MethodConfig } from './config/method-config';
 export declare namespace Validators {
     const classNameVlidation: (className: any, target: Function) => any;
-    const checkIfMethodsWithReponseTYpeAlowed: (methods: Models.MethodConfig[], current: Models.MethodConfig) => void;
+    const checkIfMethodsWithReponseTYpeAlowed: (methods: MethodConfig[], current: MethodConfig) => void;
     const validateClassFunctions: (controllers: any[], entities: any[], proviers: any[], repositories: any[]) => void;
     const preventUndefinedModel: (model: any, id: any) => void;
 }

package/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taon/browser",
-  "version": "19.0.54",
+  "version": "19.0.56",
   "module": "fesm2022/taon.mjs",
   "typings": "index.d.ts",
   "exports": {

package/lib/base-classes/base-class.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseClass = void 0;
-//#region imports
-const lib_1 = require("lodash-walk-object/lib");
-const lib_2 = require("tnp-core/lib");
 const class_helpers_1 = require("../helpers/class-helpers");
+const clone_obj_1 = require("../helpers/clone-obj");
 //#endregion
 class BaseClass {
     //#region class initialization hook
@@ -17,19 +15,7 @@ class BaseClass {
     //#region clone
     clone(override) {
         const classFn = class_helpers_1.ClassHelpers.getClassFnFromObject(this);
-        const result = lib_2._.merge(new classFn(), lib_2._.cloneDeep(this));
-        lib_1.walk.Object(override || {}, (value, lodashPath) => {
-            if (lib_2._.isNil(value) || lib_2._.isFunction(value) || lib_2._.isObject(value)) {
-                // skipping
-            }
-            else {
-                lib_2._.set(result, lodashPath, value);
-            }
-        }, {
-            walkGetters: false,
-        });
-        // console.log({result})
-        return result;
+        return (0, clone_obj_1.cloneObj)(override, classFn);
     }
 }
 exports.BaseClass = BaseClass;

package/lib/base-classes/base-class.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-class.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,iBAAiB;AACjB,gDAA8C;AAC9C,sCAAiC;AAEjC,4DAAwD;AACxD,YAAY;AAEZ,MAAa,SAAS;IACpB,mCAAmC;IACnC;;;OAGG;IACH,KAAK,CAAC,CAAC,KAAmB,CAAC;IAC3B,YAAY;IAEZ,eAAe;IACR,KAAK,CAAC,QAA0B;QACrC,MAAM,OAAO,GAAG,4BAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,OAAC,CAAC,KAAK,CAAC,IAAI,OAAO,EAAE,EAAE,OAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,UAAI,CAAC,MAAM,CACT,QAAQ,IAAI,EAAE,EACd,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YACpB,IAAI,OAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,OAAC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,OAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/D,WAAW;YACb,CAAC;iBAAM,CAAC;gBACN,OAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YACnC,CAAC;QACH,CAAC,EACD;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC;QACF,wBAAwB;QACxB,OAAO,MAAM,CAAC;IAChB,CAAC;CAEF;AA9BD,8BA8BC"}
+{"version":3,"file":"base-class.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAIA,4DAAwD;AACxD,oDAAgD;AAEhD,YAAY;AAEZ,MAAa,SAAS;IACpB,mCAAmC;IACnC;;;OAGG;IACH,KAAK,CAAC,CAAC,KAAmB,CAAC;IAC3B,YAAY;IAEZ,eAAe;IACR,KAAK,CAAC,QAA0B;QACrC,MAAM,OAAO,GAAG,4BAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACxD,OAAO,IAAA,oBAAQ,EAAS,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;CAEF;AAfD,8BAeC"}

package/lib/base-classes/base-controller.js

@@ -61,7 +61,10 @@ exports.BaseController = BaseController;
 __decorate([
     (0, http_methods_decorators_1.POST)({
         overrideContentType: 'multipart/form-data',
-        middlewares: [base_file_upload_middleware_1.BaseFileUploadMiddleware],
+        middlewares: ({ parentMiddlewares }) => ({
+            ...parentMiddlewares,
+            BaseFileUploadMiddleware: base_file_upload_middleware_1.BaseFileUploadMiddleware,
+        }),
     }),
     __param(0, (0, http_params_decorators_1.Body)())
 ], BaseController.prototype, "uploadFormDataToServer", null);

package/lib/base-classes/base-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-controller.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAsC,CAAC,WAAW;AAClD,sCAA4D,CAAC,WAAW;AAExE,qFAA4E;AAC5E,wFAAkE;AAClE,sFAA8E;AAG9E,+EAAyE;AACzE,mDAA+C;AAcxC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,4BAAY;IAC9C,oCAAoC;IAKpC,sBAAsB,CACZ,QAAkB;QAE1B,sBAAsB;QACtB,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACxB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YACxB,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,qBAAqB,CAAC;YAC9B,CAAC;YACD,OAAQ,KAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBAC9B,MAAM,QAAQ,GAAG,IAAA,uBAAiB,EAAC,UAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,MAAM,QAAQ,GAAG,IAAA,uBAAiB,EAChC,UAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CACtC,CAAC;gBACF,OAAO;oBACL,EAAE,EAAE,IAAI;oBACR,YAAY,EAAE,CAAC,CAAC,YAAY;oBAC5B,OAAO,EAAE,UAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAChC,SAAS,EAAE,QAAQ;oBACnB,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,QAAQ,EAAE,CAAC,CAAC,QAAQ;iBACrB,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,YAAY;IACd,CAAC;IACD,YAAY;IAEZ,qCAAqC;IACrC,KAAK,CAAC,uBAAuB,CAC3B,WAAmB;QAEnB,sBAAsB;QACtB,MAAM,IAAI,GAAG,SAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,SAAG,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAEjD,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE;YAC1B,QAAQ,EAAE,UAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YACpC,WAAW,EAAE,IAAI,CAAC,IAAI;SACvB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC9D,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACtB,YAAY;IACd,CAAC;CAEF,CAAA;AArDY,wCAAc;AAMzB;IAJC,IAAA,8BAAI,EAAC;QACJ,mBAAmB,EAAE,qBAAqB;QAC1C,WAAW,EAAE,CAAC,sDAAwB,CAAC;KACxC,CAAC;IAEC,WAAA,IAAA,6BAAI,GAAE,CAAA;4DAwBR;yBA/BU,cAAc;IAH1B,IAAA,qCAAc,EAAiB;QAC9B,SAAS,EAAE,gBAAgB;KAC5B,CAAC;GACW,cAAc,CAqD1B"}
+{"version":3,"file":"base-controller.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAsC,CAAC,WAAW;AAClD,sCAA4D,CAAC,WAAW;AAExE,qFAA4E;AAC5E,wFAAkE;AAClE,sFAA8E;AAG9E,+EAAyE;AACzE,mDAA+C;AAcxC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,4BAAY;IAC9C,oCAAoC;IAQpC,sBAAsB,CACZ,QAAkB;QAE1B,sBAAsB;QACtB,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACxB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YACxB,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,qBAAqB,CAAC;YAC9B,CAAC;YACD,OAAQ,KAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBAC9B,MAAM,QAAQ,GAAG,IAAA,uBAAiB,EAAC,UAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,MAAM,QAAQ,GAAG,IAAA,uBAAiB,EAChC,UAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CACtC,CAAC;gBACF,OAAO;oBACL,EAAE,EAAE,IAAI;oBACR,YAAY,EAAE,CAAC,CAAC,YAAY;oBAC5B,OAAO,EAAE,UAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAChC,SAAS,EAAE,QAAQ;oBACnB,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,QAAQ,EAAE,CAAC,CAAC,QAAQ;iBACrB,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,YAAY;IACd,CAAC;IACD,YAAY;IAEZ,qCAAqC;IACrC,KAAK,CAAC,uBAAuB,CAC3B,WAAmB;QAEnB,sBAAsB;QACtB,MAAM,IAAI,GAAG,SAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,SAAG,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAEjD,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE;YAC1B,QAAQ,EAAE,UAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YACpC,WAAW,EAAE,IAAI,CAAC,IAAI;SACvB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC9D,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACtB,YAAY;IACd,CAAC;CAEF,CAAA;AAxDY,wCAAc;AASzB;IAPC,IAAA,8BAAI,EAAC;QACJ,mBAAmB,EAAE,qBAAqB;QAC1C,WAAW,EAAE,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC;YACvC,GAAG,iBAAiB;YACpB,wBAAwB,EAAxB,sDAAwB;SACzB,CAAC;KACH,CAAC;IAEC,WAAA,IAAA,6BAAI,GAAE,CAAA;4DAwBR;yBAlCU,cAAc;IAH1B,IAAA,qCAAc,EAAiB;QAC9B,SAAS,EAAE,gBAAgB;KAC5B,CAAC;GACW,cAAc,CAwD1B"}

package/lib/build-info._auto-generated_.d.ts

@@ -17,4 +17,4 @@ export declare const PROJECT_NPM_NAME = "taon";
 /**
  *  Autogenerated by current cli tool. Use *tnp release* to bump version.
  */
-export declare const CURRENT_PACKAGE_VERSION = "19.0.54";
+export declare const CURRENT_PACKAGE_VERSION = "19.0.56";

package/lib/build-info._auto-generated_.js

@@ -21,6 +21,6 @@ exports.PROJECT_NPM_NAME = 'taon';
 /**
  *  Autogenerated by current cli tool. Use *tnp release* to bump version.
  */
-exports.CURRENT_PACKAGE_VERSION = '19.0.54';
+exports.CURRENT_PACKAGE_VERSION = '19.0.56';
 // THIS FILE IS GENERATED - DO NOT MODIFY
 //# sourceMappingURL=build-info._auto-generated_.js.map

package/lib/config/controller-config.d.ts

@@ -0,0 +1,21 @@
+import { TaonMiddlewareInheritanceObj } from '../decorators/http/http-methods-decorators';
+import { TaonControllerOptions } from './controller-options';
+import { MethodConfig } from './method-config';
+export declare class ControllerConfig extends TaonControllerOptions {
+    methods: {
+        [methodName: string]: Partial<MethodConfig>;
+    };
+    /**
+     * Calculated path from parents controllers
+     */
+    calculatedPath?: string;
+    /**
+     * a way to transform entity before sending to browser
+     */
+    browserTransformFn?: (entity: any) => any;
+    /**
+     * Calculated middlewares object from parents controllers
+     */
+    calculatedMiddlewaresControllerObj?: TaonMiddlewareInheritanceObj;
+}
+export declare const controllerConfigFrom: (partial: Partial<ControllerConfig>) => ControllerConfig;

package/lib/config/controller-config.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.controllerConfigFrom = exports.ControllerConfig = void 0;
+// import { cloneObj } from '../helpers/clone-obj';
+const controller_options_1 = require("./controller-options");
+// import { ParamConfig } from './param-config';
+class ControllerConfig extends controller_options_1.TaonControllerOptions {
+}
+exports.ControllerConfig = ControllerConfig;
+const controllerConfigFrom = (partial) => {
+    const newObj = partial || {};
+    newObj.methods = newObj.methods || {};
+    for (const methodName in newObj.methods) {
+        if (newObj.methods.hasOwnProperty(methodName)) {
+            // newObj.methods[methodName] = new MethodConfig().clone(
+            //   newObj.methods[methodName],
+            // );
+            newObj.methods[methodName] = newObj.methods[methodName] || {};
+            const params = newObj.methods[methodName].parameters || {};
+            newObj.methods[methodName].parameters = params
+                ? params
+                : {};
+            for (const paramName in params) {
+                if (params.hasOwnProperty(paramName)) {
+                    params[paramName] = params[paramName] || {};
+                    // params[paramName] = new ParamConfig().clone(params[paramName]);
+                }
+            }
+        }
+    }
+    return newObj;
+};
+exports.controllerConfigFrom = controllerConfigFrom;
+//# sourceMappingURL=controller-config.js.map

package/lib/config/controller-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller-config.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAEA,mDAAmD;AAEnD,6DAA6D;AAE7D,gDAAgD;AAEhD,MAAa,gBAAiB,SAAQ,0CAAqB;CAmB1D;AAnBD,4CAmBC;AAEM,MAAM,oBAAoB,GAAG,CAClC,OAAkC,EAChB,EAAE;IACpB,MAAM,MAAM,GAAqB,OAAO,IAAK,EAAU,CAAC;IACxD,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACxC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9C,yDAAyD;YACzD,gCAAgC;YAChC,KAAK;YAEL,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YAE9D,MAAM,MAAM,GACT,MAAM,CAAC,OAAO,CAAC,UAAU,CAAkB,CAAC,UAAU,IAAI,EAAE,CAAC;YAC/D,MAAM,CAAC,OAAO,CAAC,UAAU,CAAkB,CAAC,UAAU,GAAG,MAAM;gBAC9D,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,EAAE,CAAC;YAEP,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;gBAC/B,IAAI,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;oBACrC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;oBAC5C,kEAAkE;gBACpE,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA5BW,QAAA,oBAAoB,wBA4B/B"}

package/lib/{decorators/classes → config}/controller-options.d.ts

@@ -1,4 +1,5 @@
-import { DecoratorAbstractOpt } from '../decorator-abstract-opt';
+import { DecoratorAbstractOpt } from '../decorators/decorator-abstract-opt';
+import type { TaonMiddlewareFunction } from '../decorators/http/http-methods-decorators';
 export declare class TaonControllerOptions<ControllerClass = any> extends DecoratorAbstractOpt {
     /**
      * typeorm realtime subscribtion // TODO disabled for now, does not make sense ?s
@@ -8,4 +9,8 @@ export declare class TaonControllerOptions<ControllerClass = any> extends Decora
      * override default path for controller api
      */
     path?: string;
+    /**
+     * Middlewares to be applied to all methods in the controller
+     */
+    middlewares?: TaonMiddlewareFunction;
 }

package/lib/config/controller-options.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaonControllerOptions = void 0;
+const decorator_abstract_opt_1 = require("../decorators/decorator-abstract-opt");
+class TaonControllerOptions extends decorator_abstract_opt_1.DecoratorAbstractOpt {
+}
+exports.TaonControllerOptions = TaonControllerOptions;
+//# sourceMappingURL=controller-options.js.map

package/lib/config/controller-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller-options.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,iFAA4E;AAG5E,MAAa,qBAEX,SAAQ,6CAAoB;CAa7B;AAfD,sDAeC"}

package/lib/config/method-config.d.ts

@@ -0,0 +1,38 @@
+import { CoreModels } from 'tnp-core';
+import type { BaseMiddleware } from '../base-classes/base-middleware';
+import type { TaonHttpDecoratorOptions, TaonMiddlewareFunction, TaonMiddlewareInheritanceObj } from '../decorators/http/http-methods-decorators';
+import { ParamConfig } from './param-config';
+/**
+ * @link './decorators/http/http-methods-decorators.ts' TaonHttpDecoratorOptions
+ */
+export declare class MethodConfig implements Pick<TaonHttpDecoratorOptions, 'path' | 'middlewares'> {
+    methodName: string;
+    global?: boolean;
+    /**
+     * override default content type
+     */
+    contentType?: any;
+    /**
+     * override default axiso response type
+     */
+    responseType?: any;
+    path: string;
+    descriptor: PropertyDescriptor;
+    type: CoreModels.HttpMethod;
+    parameters: {
+        [paramName: string]: Partial<ParamConfig>;
+    };
+    /**
+     * Middlewares from controller method options
+     */
+    middlewares?: TaonMiddlewareFunction;
+    /**
+     * Calculated middlewares object from parents controllers
+     */
+    calculatedMiddlewaresMethodObj?: TaonMiddlewareInheritanceObj;
+    /**
+     * Middlewares array in proper order and ready to be used in
+     * express or in axios interceptors.
+     */
+    calculatedMiddlewares: (typeof BaseMiddleware)[];
+}

package/lib/config/method-config.js

@@ -0,0 +1,12 @@
+"use strict";
+//#region models / method config
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MethodConfig = void 0;
+/**
+ * @link './decorators/http/http-methods-decorators.ts' TaonHttpDecoratorOptions
+ */
+class MethodConfig {
+}
+exports.MethodConfig = MethodConfig;
+//#endregion
+//# sourceMappingURL=method-config.js.map

package/lib/config/method-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"method-config.js","sourceRoot":"","sources":[""],"names":[],"mappings":";AAAA,gCAAgC;;;AAahC;;GAEG;AACH,MAAa,YAAY;CAoCxB;AApCD,oCAoCC;AACD,YAAY"}

package/lib/config/param-config.d.ts

@@ -0,0 +1,8 @@
+import { CoreModels } from 'tnp-core';
+export declare class ParamConfig {
+    paramName: string;
+    paramType: CoreModels.ParamType;
+    index: number;
+    defaultType: any;
+    expireInSeconds?: number;
+}

package/lib/config/param-config.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParamConfig = void 0;
+// import { cloneObj } from '../helpers/clone-obj';
+class ParamConfig {
+}
+exports.ParamConfig = ParamConfig;
+//# sourceMappingURL=param-config.js.map

package/lib/config/param-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"param-config.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAEA,mDAAmD;AAEnD,MAAa,WAAW;CAWvB;AAXD,kCAWC"}

package/lib/decorators/classes/controller-decorator.d.ts

@@ -1,4 +1,4 @@
-import type { TaonControllerOptions } from './controller-options';
+import type { TaonControllerOptions } from '../../config/controller-options';
 /**
  * Controller decorator
  */

package/lib/decorators/classes/controller-decorator.js

@@ -9,8 +9,13 @@ const symbols_1 = require("../../symbols");
 function TaonController(options) {
     return function (constructor) {
         class_helpers_1.ClassHelpers.setName(constructor, options?.className);
-        Reflect.defineMetadata(symbols_1.Symbols.metadata.options.controller, options, constructor);
         Reflect.defineMetadata(symbols_1.Symbols.metadata.className, options?.className || constructor.name, constructor);
+        const cfg = class_helpers_1.ClassHelpers.ensureClassConfig(constructor);
+        options = options || {};
+        cfg.className = options.className || constructor.name;
+        cfg.path = options.path || '';
+        cfg.realtime = options.realtime;
+        cfg.middlewares = options.middlewares;
     };
 }
 //# sourceMappingURL=controller-decorator.js.map

package/lib/decorators/classes/controller-decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller-decorator.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAQA,wCAgBC;AAxBD,+DAA2D;AAC3D,2CAAwC;AAIxC;;GAEG;AACH,SAAgB,cAAc,CAC5B,OAAgD;IAEhD,OAAO,UAAU,WAAqB;QACpC,4BAAY,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACtD,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,EACnC,OAAO,EACP,WAAW,CACZ,CAAC;QACF,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAC1B,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EACtC,WAAW,CACZ,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"controller-decorator.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAOA,wCAiBC;AAvBD,+DAA2D;AAC3D,2CAAwC;AAExC;;GAEG;AACH,SAAgB,cAAc,CAC5B,OAAgD;IAEhD,OAAO,UAAU,WAAqB;QACpC,4BAAY,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACtD,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAC1B,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EACtC,WAAW,CACZ,CAAC;QACF,MAAM,GAAG,GAAG,4BAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACxD,OAAO,GAAG,OAAO,IAAK,EAAU,CAAC;QACjC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC;QACtD,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IACxC,CAAC,CAAC;AACJ,CAAC"}

package/lib/decorators/classes/middleware-decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-decorator.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAOA,wCAcC;AArBD,+DAA2D;AAC3D,2CAAwC;AACxC,sEAAiE;AAEjE;;GAEG;AACH,SAAgB,cAAc,CAAU,OAAkC;IACxE,OAAO,UAAU,WAAqB;QACpC,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EACjC,OAAO,EACP,WAAW,CACZ,CAAC;QACF,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAC1B,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EACtC,WAAW,CACZ,CAAC;QACF,4BAAY,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC;AAED,MAAa,qBAA+B,SAAQ,6CAAoB;CAEvE;AAFD,sDAEC"}
+{"version":3,"file":"middleware-decorator.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAOA,wCAgBC;AAvBD,+DAA2D;AAC3D,2CAAwC;AACxC,sEAAiE;AAEjE;;GAEG;AACH,SAAgB,cAAc,CAC5B,OAAkC;IAElC,OAAO,UAAU,WAAqB;QACpC,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EACjC,OAAO,EACP,WAAW,CACZ,CAAC;QACF,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAC1B,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EACtC,WAAW,CACZ,CAAC;QACF,4BAAY,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC;AAED,MAAa,qBAA+B,SAAQ,6CAAoB;CAEvE;AAFD,sDAEC"}

package/lib/decorators/classes/provider-decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider-decorator.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAOA,oCAcC;AArBD,+DAA2D;AAC3D,2CAAwC;AACxC,sEAAiE;AAEjE;;GAEG;AACH,SAAgB,YAAY,CAAU,OAAgC;IACpE,OAAO,UAAU,WAAqB;QACpC,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EACjC,OAAO,EACP,WAAW,CACZ,CAAC;QACF,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAC1B,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EACtC,WAAW,CACZ,CAAC;QACF,4BAAY,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC;AAED,MAAa,mBAA6B,SAAQ,6CAAoB;CAErE;AAFD,kDAEC"}
+{"version":3,"file":"provider-decorator.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAOA,oCAgBC;AAvBD,+DAA2D;AAC3D,2CAAwC;AACxC,sEAAiE;AAEjE;;GAEG;AACH,SAAgB,YAAY,CAC1B,OAAgC;IAEhC,OAAO,UAAU,WAAqB;QACpC,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EACjC,OAAO,EACP,WAAW,CACZ,CAAC;QACF,OAAO,CAAC,cAAc,CACpB,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAC1B,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EACtC,WAAW,CACZ,CAAC;QACF,4BAAY,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC;AAED,MAAa,mBAA6B,SAAQ,6CAAoB;CAErE;AAFD,kDAEC"}

package/lib/decorators/decorator-abstract-opt.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DecoratorAbstractOpt = void 0;
 class DecoratorAbstractOpt {
-    className;
 }
 exports.DecoratorAbstractOpt = DecoratorAbstractOpt;
 //# sourceMappingURL=decorator-abstract-opt.js.map

package/lib/decorators/decorator-abstract-opt.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorator-abstract-opt.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,MAAa,oBAAoB;IAC/B,SAAS,CAAS;CACnB;AAFD,oDAEC"}
+{"version":3,"file":"decorator-abstract-opt.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AACA,MAAa,oBAAoB;CAEhC;AAFD,oDAEC"}

package/lib/decorators/http/http-methods-decorators.d.ts

@@ -1,6 +1,19 @@
 import { Models as ModelsNg2Rest } from 'ng2-rest';
 import { CoreModels } from 'tnp-core';
 import { BaseMiddleware } from '../../base-classes/base-middleware';
+export type TaonMiddlewareInheritanceObj = {
+    [parentMiddlewaresName: string]: typeof BaseMiddleware;
+};
+export type TaonMiddlewareFunction = (options: {
+    /**
+     * middlewares inherited from parent class
+     */
+    parentMiddlewares: TaonMiddlewareInheritanceObj;
+    /**
+     * Get real class name - needed when code is minified
+     */
+    className: (middlewareClass: Function) => string;
+}) => TaonMiddlewareInheritanceObj;
 export interface TaonHttpDecoratorOptions {
     /**
      * @deprecated don't use in production - keep stuff encapsulated
@@ -16,7 +29,7 @@ export interface TaonHttpDecoratorOptions {
     pathIsGlobal?: boolean;
     overrideContentType?: CoreModels.ContentType;
     overrideResponseType?: ModelsNg2Rest.ResponseTypeAxios;
-    middlewares?: (typeof BaseMiddleware)[];
+    middlewares?: TaonMiddlewareFunction;
 }
 export declare function GET(pathOrOptions?: string | TaonHttpDecoratorOptions, pathIsGlobal?: boolean): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
 export declare function HEAD(pathOrOptions?: string | TaonHttpDecoratorOptions, pathIsGlobal?: boolean): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;