taon 19.0.51 → 19.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taon",
-  "version": "19.0.51",
+  "version": "19.0.53",
   "scripts": {
     "mkdocs": "python3 -m mkdocs",
     "taon init": "taon init",

package/websql/README.md

@@ -1,24 +1,24 @@
-# MyLib
-
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 13.2.0.
-
-## Code scaffolding
-
-Run `ng generate component component-name --project my-lib` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project my-lib`.
-> Note: Don't forget to add `--project my-lib` or else it will be added to the default project in your `angular.json` file. 
-
-## Build
-
-Run `ng build my-lib` to build the project. The build artifacts will be stored in the `dist/` directory.
-
-## Publishing
-
-After building your library with `ng build my-lib`, go to the dist folder `cd dist/my-lib` and run `npm publish`.
-
-## Running unit tests
-
-Run `ng test my-lib` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
+# MyLib
+
+This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 13.2.0.
+
+## Code scaffolding
+
+Run `ng generate component component-name --project my-lib` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project my-lib`.
+> Note: Don't forget to add `--project my-lib` or else it will be added to the default project in your `angular.json` file. 
+
+## Build
+
+Run `ng build my-lib` to build the project. The build artifacts will be stored in the `dist/` directory.
+
+## Publishing
+
+After building your library with `ng build my-lib`, go to the dist folder `cd dist/my-lib` and run `npm publish`.
+
+## Running unit tests
+
+Run `ng test my-lib` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

package/websql/fesm2022/taon.mjs

@@ -6,7 +6,7 @@ import * as tsorm from 'taon-typeorm/websql';
 import { OrignalClassKey, Entity, Table, TableIndex, EventSubscriber, DataSource } from 'taon-typeorm/websql';
 import { walk } from 'lodash-walk-object/websql';
 import { SYMBOL, CLASS } from 'typescript-class-helpers/websql';
-import { Models as Models$1, RestHeaders, Resource, Mapping } from 'ng2-rest/websql';
+import { Models as Models$1, Resource, RestHeaders, Mapping } from 'ng2-rest/websql';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject as inject$1, Injectable } from '@angular/core';
 import axios from 'axios';
@@ -323,6 +323,7 @@ var Models;
         ClassType["PROVIDER"] = "PROVIDER";
         ClassType["SUBSCRIBER"] = "SUBSCRIBER";
         ClassType["MIGRATION"] = "MIGRATION";
+        ClassType["MIDDLEWARE"] = "MIDDLEWARE";
     })(ClassType = Models.ClassType || (Models.ClassType = {}));
     Models.ClassTypeKey = {
         [ClassType.ENTITY]: 'entities',
@@ -331,6 +332,7 @@ var Models;
         [ClassType.PROVIDER]: 'providers',
         [ClassType.SUBSCRIBER]: 'subscribers',
         [ClassType.MIGRATION]: 'migrations',
+        [ClassType.MIDDLEWARE]: 'middlewares',
     };
     //#endregion
     //#region models / database connection options
@@ -723,9 +725,8 @@ const TaonEntityKeysToOmitArr = [
     'injectCustomRepo',
     'injectController',
     'injectCtrl',
-    'injectGlobalProvider',
-    'injectLocalProvider',
-    'injectContextProvider',
+    'injectProvider',
+    'injectMiddleware',
 ];
 let TAON_CONTEXT;
 //#region @browser
@@ -832,29 +833,26 @@ const inject = (entity) => {
 //#region @browser
 //#endregion
 class BaseAngularsService {
+    //#endregion
     constructor() {
         //#region @browser
         this.currentContext = inject$1(TAON_CONTEXT);
-        //#region @browser
-        this.CURRENT_HOST_BACKEND_PORT = inject$1(CURRENT_HOST_BACKEND_PORT, {
-            optional: true,
-        });
-        // #endregion
     }
+    injectController(ctor, 
     /**
-     * @deprecated
-     * Returns the host URL for the backend service
-     * that is running on localhost (normal NodeJS/ExpressJS mode).
+     * optional override context
      */
-    get host() {
-        return `http://localhost:${this.CURRENT_HOST_BACKEND_PORT}`;
-    }
-    injectController(ctor) {
-        let currentContext;
-        //#region @browser
-        currentContext = this.currentContext;
-        //#endregion
-        return inject(() => currentContext.getClass(ctor));
+    overrideCurrentContext) {
+        return inject(() => {
+            let currentContext;
+            //#region @browser
+            currentContext = overrideCurrentContext ? overrideCurrentContext : this.currentContext;
+            //#endregion
+            if (!currentContext) {
+                throw new Error('No context available. Make sure to initialize the context before injecting controllers.');
+            }
+            return currentContext ? currentContext.getClass(ctor) : void 0;
+        });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: BaseAngularsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: BaseAngularsService }); }
@@ -1520,7 +1518,8 @@ class RealtimeClient {
         };
         // console.log('[browser] nspPath', nspPath);
         if (this.core.ctx.config.frontendHost &&
-            this.core.ctx.config.frontendHost !== '') {
+            this.core.ctx.config.frontendHost !== '' &&
+            this.core.ctx.isRunningInsideDocker) {
             console.log(`[${this.core.ctx.contextName}] USING FRONTEND HOST ${this.core.ctx.config.frontendHost}`);
             nspPath.global = new URL(`${this.core.ctx.frontendHostUri.origin}${nspPath.global.pathname}`);
             nspPath.realtime = new URL(`${this.core.ctx.frontendHostUri.origin}${nspPath.realtime.pathname}`);
@@ -2707,6 +2706,7 @@ class EndpointContext {
         this.injectableTypesfromContexts = [
             Models.ClassType.CONTROLLER,
             Models.ClassType.PROVIDER,
+            Models.ClassType.MIDDLEWARE,
             Models.ClassType.REPOSITORY,
             Models.ClassType.SUBSCRIBER,
             Models.ClassType.MIGRATION,
@@ -2974,6 +2974,10 @@ class EndpointContext {
             ...(await this.getRecrusiveClassesfromContextsObj(Models.ClassType.PROVIDER)),
             ...this.config.providers,
         };
+        this.config.middlewares = {
+            ...(await this.getRecrusiveClassesfromContextsObj(Models.ClassType.MIDDLEWARE)),
+            ...this.config.middlewares,
+        };
         this.config.subscribers = {
             ...(await this.getRecrusiveClassesfromContextsObj(Models.ClassType.SUBSCRIBER)),
             ...this.config.subscribers,
@@ -3008,6 +3012,12 @@ class EndpointContext {
             ctx: this,
             classType: Models.ClassType.PROVIDER,
         });
+        this.config.middlewares = this.cloneClassesObjWithNewMetadata({
+            classesInput: this.config.middlewares,
+            config: this.config,
+            ctx: this,
+            classType: Models.ClassType.MIDDLEWARE,
+        });
         this.config.subscribers = this.cloneClassesObjWithNewMetadata({
             classesInput: this.config.subscribers,
             config: this.config,
@@ -3060,6 +3070,11 @@ class EndpointContext {
                 /* */
                 /* */
                 /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                await this.initFrontnedMiddlewares();
             }
             //#endregion
             //#region prepare realtime
@@ -3270,6 +3285,7 @@ class EndpointContext {
         /* */
         /* */
         /* */
+        /* */
         return (void 0);
     }
     //#endregion
@@ -3451,6 +3467,8 @@ class EndpointContext {
                 return this.config.entities;
             case Models.ClassType.PROVIDER:
                 return this.config.providers;
+            case Models.ClassType.MIDDLEWARE:
+                return this.config.middlewares;
             case Models.ClassType.REPOSITORY:
                 return this.config.repositories;
             case Models.ClassType.SUBSCRIBER:
@@ -3464,7 +3482,7 @@ class EndpointContext {
     }
     /**
      * Only for injectable types
-     * Only for classType: CONTROLLER, REPOSITORY, PROVIDER
+     * Only for classType: CONTROLLER, REPOSITORY, PROVIDER, MIDDLEWARES
      */
     getClassFunByClassName(className) {
         for (const classTypeName of this.allTypesfromContexts) {
@@ -3504,25 +3522,7 @@ class EndpointContext {
         }
     }
     //#endregion
-    //#region methods & getters / reinit controllers db example data
-    async reinitControllers() {
-        if (this.remoteHost || Object.keys(this.config.migrations).length > 0) {
-            return;
-        }
-        // Helpers.taskStarted(
-        //   `[taon] REINITING CONTROLLERS ${this.contextName} STARTED`,
-        // );
-        const controllers = this.getClassesInstancesArrBy(Models.ClassType.CONTROLLER);
-        // console.log('CONTROLLERS TO REINIT', controllers);
-        for (const ctrl of controllers) {
-            if (_.isFunction(ctrl.initExampleDbData)) {
-                await ctrl.initExampleDbData();
-            }
-        }
-        // Helpers.taskDone(
-        //   `[taon] REINITING CONTROLLERS ${this.contextName} DONE`,
-        // );
-    }
+    //#region methods & getters / init classes
     async initClasses() {
         if (this.remoteHost) {
             return;
@@ -3534,6 +3534,7 @@ class EndpointContext {
         }
         //#endregion
         for (const classTypeName of [
+            Models.ClassType.MIDDLEWARE,
             Models.ClassType.PROVIDER,
             Models.ClassType.REPOSITORY,
             Models.ClassType.CONTROLLER,
@@ -3549,6 +3550,7 @@ class EndpointContext {
             //#endregion
         }
         for (const classTypeName of [
+            Models.ClassType.MIDDLEWARE,
             Models.ClassType.PROVIDER,
             Models.ClassType.REPOSITORY,
             Models.ClassType.CONTROLLER,
@@ -3749,7 +3751,7 @@ class EndpointContext {
     //#region methods & getters / init connection
     async initDatabaseConnection() {
         //#region @websqlFunc
-        if (this.remoteHost) {
+        if (this.remoteHost || !this.databaseConfig) {
             return;
         }
         const entities = this.getClassFunByArr(Models.ClassType.ENTITY).map(entityFn => {
@@ -3823,7 +3825,9 @@ class EndpointContext {
         [taon][typeorm] db prepration done.. db initialize=${this.connection?.isInitialized}
 
 
-        `, dataSourceDbConfig, { 'this.connection': !!this.connection });
+        `, 
+                // dataSourceDbConfig,
+                { 'this.connection': !!this.connection });
                 console.log(`Database file location: ${this.connection.options.database}`);
             }
             //     const entityMetadata = getMetadataArgsStorage();
@@ -3985,7 +3989,80 @@ class EndpointContext {
     }
     //#endregion
     //#region methods & getters / init middlewares
-    initMiddlewares() {
+    async initFrontnedMiddlewares() {
+        const middlewares = this.getClassesInstancesArrBy(Models.ClassType.MIDDLEWARE);
+        for (const middleware of middlewares) {
+            const middlewareInstance = middleware;
+            if (_.isFunction(middlewareInstance.intercept)) {
+                ((instance, contextName, apiPart, uriPathnameOrNothingIfRoot) => {
+                    const interceptorName = `${contextName}-${ClassHelpers.getName(instance)}`;
+                    Resource.request.interceptors.set(interceptorName, async (req) => {
+                        console.log('request', req);
+                        const url = new URL(req.url);
+                        if (url.pathname.startsWith(`${uriPathnameOrNothingIfRoot}/${apiPart}/${contextName}/`)) {
+                            await instance.intercept({
+                                client: {
+                                    req,
+                                },
+                            });
+                        }
+                        else {
+                            // console.log('not fit frontend', url.href);
+                        }
+                        return req;
+                    });
+                })(middlewareInstance, this.contextName, apiPrefix, this.uriPathnameOrNothingIfRoot);
+            }
+        }
+    }
+    async initBackendMiddlewares() {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
         /* */
         /* */
         /* */
@@ -4765,6 +4842,9 @@ const createContext = (configFn) => {
             get migrations() {
                 return config.migrations; // TODO QUICK_FIX new typescript generated wrong types
             },
+            get middlewares() {
+                return config.middlewares; // TODO QUICK_FIX new typescript generated wrong types
+            },
         },
         //#endregion
         //#region contexts
@@ -4859,43 +4939,44 @@ const createContext = (configFn) => {
                     endpointContextRef.writeActiveRoutes();
                     //#endregion
                     await endpointContextRef.initClasses();
-                    let keepWebsqlDbDataAfterReload = false;
-                    //#region @browser
-                    keepWebsqlDbDataAfterReload =
-                        TaonAdminService.Instance?.keepWebsqlDbDataAfterReload;
-                    //#endregion
-                    if (!Helpers.isNode && keepWebsqlDbDataAfterReload) {
-                        !UtilsOs.isRunningInCliMode() &&
-                            Helpers.info(`[taon] Keeping websql data after reload ` +
-                                `(context=${endpointContextRef.contextName}).`);
-                    }
-                    else {
-                        !UtilsOs.isRunningInCliMode() &&
-                            Helpers.info(`[taon] Dropping all tables and data ` +
-                                `(context=${endpointContextRef.contextName}).`);
-                        await endpointContextRef.reinitControllers();
-                    }
-                    //#region TODO this may be usefull but for now
-                    // 2 separate contexts are fine
-                    // const shouldStartRemoteHost = endpointContextRef.mode !== 'remote-backend(tcp+udp)';
-                    // if(shouldStartRemoteHost) {
-                    //   const endpointContextRemoteHostRef = new EndpointContext(config, configFn);
-                    //   await endpointContextRemoteHostRef.init({
-                    //     overrideRemoteHost: endpointContextRef.host,
-                    //     overrideHost: null,
-                    //   });
-                    //   endpointContextRemoteHostRef.initMetadata();
-                    //   endpointContextRef.__contextForControllerInstanceAccess = endpointContextRemoteHostRef;
-                    // }
-                    //#endregion
-                    if (endpointContextRef.onlyMigrationRun) {
-                        await endpointContextRef.dbMigrations.runAllNotCompletedMigrations();
-                    }
-                    else if (endpointContextRef.onlyMigrationRevertToTimestamp) {
-                        await endpointContextRef.dbMigrations.revertMigrationToTimestamp(endpointContextRef.onlyMigrationRevertToTimestamp);
-                    }
-                    else {
-                        await endpointContextRef.dbMigrations.runAllNotCompletedMigrations();
+                    if (endpointContextRef.databaseConfig) {
+                        let keepWebsqlDbDataAfterReload = false;
+                        //#region @browser
+                        keepWebsqlDbDataAfterReload =
+                            TaonAdminService.Instance?.keepWebsqlDbDataAfterReload;
+                        //#endregion
+                        if (!Helpers.isNode && keepWebsqlDbDataAfterReload) {
+                            !UtilsOs.isRunningInCliMode() &&
+                                Helpers.info(`[taon] Keeping websql data after reload ` +
+                                    `(context=${endpointContextRef.contextName}).`);
+                        }
+                        else {
+                            !UtilsOs.isRunningInCliMode() &&
+                                Helpers.info(`[taon] Dropping all tables and data ` +
+                                    `(context=${endpointContextRef.contextName}).`);
+                        }
+                        //#region TODO this may be usefull but for now
+                        // 2 separate contexts are fine
+                        // const shouldStartRemoteHost = endpointContextRef.mode !== 'remote-backend(tcp+udp)';
+                        // if(shouldStartRemoteHost) {
+                        //   const endpointContextRemoteHostRef = new EndpointContext(config, configFn);
+                        //   await endpointContextRemoteHostRef.init({
+                        //     overrideRemoteHost: endpointContextRef.host,
+                        //     overrideHost: null,
+                        //   });
+                        //   endpointContextRemoteHostRef.initMetadata();
+                        //   endpointContextRef.__contextForControllerInstanceAccess = endpointContextRemoteHostRef;
+                        // }
+                        //#endregion
+                        if (endpointContextRef.onlyMigrationRun) {
+                            await endpointContextRef.dbMigrations.runAllNotCompletedMigrations();
+                        }
+                        else if (endpointContextRef.onlyMigrationRevertToTimestamp) {
+                            await endpointContextRef.dbMigrations.revertMigrationToTimestamp(endpointContextRef.onlyMigrationRevertToTimestamp);
+                        }
+                        else {
+                            await endpointContextRef.dbMigrations.runAllNotCompletedMigrations();
+                        }
                     }
                     resolve(endpointContextRef);
                 });
@@ -5027,18 +5108,17 @@ class BaseInjector {
     //#endregion
     //#region inject / global provider
     /**
-     * global provider available in every context
+     * inject middleware for context
      */
-    injectGlobalProvider(ctor) {
+    injectMiddleware(ctor) {
         return this.__inject(ctor, { localInstance: false });
     }
     //#endregion
     //#region inject / context provider
     /**
-     * context scoped provider
-     * TODO
+     * inject provider for context
      */
-    injectContextProvider(ctor) {
+    injectProvider(ctor) {
         return this.__inject(ctor, { localInstance: false });
     }
     //#endregion
@@ -5072,7 +5152,7 @@ class BaseInjector {
                         throw new Error(`Not able to inject "${ClassHelpers.getName(ctor) || ctor.name}" inside ` +
                             `property "${propName?.toString()}" on  class "${ClassHelpers.getName(this)}".
 
-              Please add "${ClassHelpers.getName(ctor) || ctor.name}" to (entites or contorllers or providers or repositories)
+              Please add "${ClassHelpers.getName(ctor) || ctor.name}" to (entites or contorllers or providers or repositories or middlewares)
 
               `);
                     }
@@ -5106,7 +5186,7 @@ class BaseInjector {
                         throw new Error(`Not able to inject "${classNameNotResolved}" inside ` +
                             `property "${propName?.toString()}" on  class "${ClassHelpers.getName(this)}".
 
-              Please add "${ClassHelpers.getName(ctor) || ctor.name}" to (entites or contorllers or providers or repositories)
+              Please add "${ClassHelpers.getName(ctor) || ctor.name}" to (entites or contorllers or providers or repositories or middlewares)
 
               `);
                     }
@@ -5737,14 +5817,6 @@ class TaonControllerOptions extends Models.DecoratorAbstractOpt {
 }
 
 let BaseController = class BaseController extends BaseInjector {
-    /**
-     * @deprecated use migration instead
-     * THIS ONLY WORKS IF NO MIGRATIONS PROVIDED IN CONFIG
-     * Purpose: init example data for db.
-     */
-    initExampleDbData() {
-        return void 0;
-    }
 };
 BaseController = __decorate([
     TaonController({ className: 'BaseController' })
@@ -6144,6 +6216,14 @@ BaseCrudController = __decorate([
     TaonController({ className: 'BaseCrudController' })
 ], BaseCrudController);
 
+/**
+ * TODO
+ * - global provider available in all contexts
+ * - provider available in own context
+ */
+class BaseMiddleware extends BaseInjector {
+}
+
 class BaseMigration extends BaseInjector {
     /**
      * by default is READY to run
@@ -6338,6 +6418,7 @@ var Base;
     Base.CustomRepository = BaseCustomRepository;
     Base.SubscriberForEntity = BaseSubscriberForEntity;
     Base.Migration = BaseMigration;
+    Base.Middleware = BaseMiddleware;
     Base.AngularService = BaseAngularsService;
     Base.Context = BaseContext;
 })(Base || (Base = {}));
@@ -6365,6 +6446,19 @@ function TaonEntity(options) {
 class TaonEntityOptions extends Models.DecoratorAbstractOpt {
 }
 
+/**
+ * Provider decorator
+ */
+function TaonMiddleware(options) {
+    return function (constructor) {
+        Reflect.defineMetadata(Symbols.metadata.options.provider, options, constructor);
+        Reflect.defineMetadata(Symbols.metadata.className, options?.className || constructor.name, constructor);
+        ClassHelpers.setName(constructor, options?.className || constructor.name);
+    };
+}
+class TaonMiddlewareOptions extends Models.DecoratorAbstractOpt {
+}
+
 /**
  * Migration decorator
  */
@@ -6424,6 +6518,7 @@ var Taon;
     Taon.Repository = TaonRepository;
     Taon.Subscriber = TaonSubscriber;
     Taon.Migration = TaonMigration;
+    Taon.Middleware = TaonMiddleware;
     //#endregion
     //#region aliases to helpers
     Taon.isBrowser = coreHelpers.Helpers.isBrowser;