taon 19.0.55 → 19.0.56

package/websql/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/{browser/lib/decorators/classes → websql/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/websql/lib/config/method-config.d.ts

@@ -0,0 +1,39 @@
+// @ts-nocheck
+import { CoreModels } from 'tnp-core/websql';
+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/websql/lib/config/param-config.d.ts

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

package/websql/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/websql/lib/decorators/http/http-methods-decorators.d.ts

@@ -2,6 +2,19 @@
 import { Models as ModelsNg2Rest } from 'ng2-rest/websql';
 import { CoreModels } from 'tnp-core/websql';
 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/websql/lib/endpoint-context.d.ts

@@ -109,7 +109,6 @@ export declare class EndpointContext {
     isActiveOn(classInstance: object): boolean;
     get frontendHostUri(): URL;
     get uri(): URL;
-    get uriPort(): string | undefined;
     get uriProtocol(): string | undefined;
     /**
      * Examples
@@ -130,6 +129,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}
@@ -155,6 +155,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/websql/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/websql/lib/helpers/clone-obj.d.ts

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

package/websql/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/websql/lib/models.d.ts

@@ -3,8 +3,6 @@ import type { RequestHandler } from 'express';
 import { Response as ExpressResponse, Request as ExpressRequest } from 'express';
 import { Models as ModelsNg2Rest } from 'ng2-rest/websql';
 import { CoreModels } from 'tnp-core/websql';
-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 {
@@ -213,35 +211,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 = {

package/websql/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/websql/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/websql/package.json

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

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

@@ -1,10 +0,0 @@
-// @ts-nocheck
-import { Models } from '../../models';
-import { TaonControllerOptions } from './controller-options';
-export declare class ControllerConfig extends TaonControllerOptions {
-    methods: {
-        [methodName: string]: Models.MethodConfig;
-    };
-    calculatedPath?: string;
-    browserTransformFn?: (entity: any) => any;
-}

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

@@ -1,9 +0,0 @@
-import { Models } from '../../models';
-import { TaonControllerOptions } from './controller-options';
-export declare class ControllerConfig extends TaonControllerOptions {
-    methods: {
-        [methodName: string]: Models.MethodConfig;
-    };
-    calculatedPath?: string;
-    browserTransformFn?: (entity: any) => any;
-}

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

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerConfig = void 0;
-const controller_options_1 = require("./controller-options");
-class ControllerConfig extends controller_options_1.TaonControllerOptions {
-    methods = {};
-    calculatedPath;
-    browserTransformFn;
-}
-exports.ControllerConfig = ControllerConfig;
-//# sourceMappingURL=controller-config.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"controller-config.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAEA,6DAA6D;AAC7D,MAAa,gBAAiB,SAAQ,0CAAqB;IACzD,OAAO,GAAkD,EAAE,CAAC;IAC5D,cAAc,CAAU;IACxB,kBAAkB,CAAwB;CAC3C;AAJD,4CAIC"}

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

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TaonControllerOptions = void 0;
-const decorator_abstract_opt_1 = require("../decorator-abstract-opt");
-class TaonControllerOptions extends decorator_abstract_opt_1.DecoratorAbstractOpt {
-    /**
-     * typeorm realtime subscribtion // TODO disabled for now, does not make sense ?s
-     */
-    realtime;
-    /**
-     * override default path for controller api
-     */
-    path;
-}
-exports.TaonControllerOptions = TaonControllerOptions;
-//# sourceMappingURL=controller-options.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"controller-options.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,sEAAiE;AAEjE,MAAa,qBAEX,SAAQ,6CAAoB;IAC5B;;OAEG;IACH,QAAQ,CAAW;IACnB;;OAEG;IACH,IAAI,CAAU;CACf;AAXD,sDAWC"}

package/lib/env.d.ts

@@ -1,2 +0,0 @@
-declare const ENV: any;
-export { ENV };

package/lib/env.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENV = void 0;
-const lib_1 = require("tnp-core/lib");
-const ENV = lib_1.Helpers.isBrowser ? window['ENV'] : global['ENV'];
-exports.ENV = ENV;
-//# sourceMappingURL=env.js.map

package/lib/env.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,sCAAuC;AAEvC,MAAM,GAAG,GAAG,aAAO,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAErD,kBAAG"}

package/lib/storage.d.ts

@@ -1 +0,0 @@
-export declare const globalPublicStorage: typeof globalThis;

package/lib/storage.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.globalPublicStorage = void 0;
-const lib_1 = require("tnp-core/lib");
-exports.globalPublicStorage = lib_1.Helpers.isBrowser ? window : global;
-//# sourceMappingURL=storage.js.map

package/lib/storage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,sCAAuC;AAE1B,QAAA,mBAAmB,GAAG,aAAO,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC"}

package/websql/lib/decorators/classes/controller-config.d.ts

@@ -1,10 +0,0 @@
-// @ts-nocheck
-import { Models } from '../../models';
-import { TaonControllerOptions } from './controller-options';
-export declare class ControllerConfig extends TaonControllerOptions {
-    methods: {
-        [methodName: string]: Models.MethodConfig;
-    };
-    calculatedPath?: string;
-    browserTransformFn?: (entity: any) => any;
-}