taon 19.0.48 → 19.0.49

package/browser/fesm2022/taon.mjs

@@ -6,12 +6,12 @@ import { walk } from 'lodash-walk-object/browser';
 import { OrignalClassKey, Table } from 'taon-typeorm/browser';
 import { SYMBOL, CLASS } from 'typescript-class-helpers/browser';
 import { Models as Models$1, RestHeaders, Resource, Mapping } from 'ng2-rest/browser';
-import * as JSON5 from 'json5';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject as inject$1, Injectable } from '@angular/core';
 import axios from 'axios';
 import { JSON10 } from 'json10/browser';
 import { Observable, from, Subject } from 'rxjs';
+import * as JSON5 from 'json5';
 import { io } from 'socket.io-client';
 
 var Symbols;
@@ -321,146 +321,6 @@ var Models;
     //#endregion
 })(Models || (Models = {}));
 
-var TaonHelpers;
-(function (TaonHelpers) {
-    //#region fillUpTo string
-    TaonHelpers.fillUpTo = (s, nCharacters) => {
-        return _.times(nCharacters, n => {
-            if (s.charAt(n)) {
-                return s.charAt(n);
-            }
-            return ' ';
-        }).join('');
-    };
-    //#endregion
-    //#region is good path
-    TaonHelpers.isGoodPath = (p) => {
-        return p && typeof p === 'string' && p.trim() !== '';
-    };
-    //#endregion
-    //#region try transform params
-    TaonHelpers.tryTransformParam = param => {
-        if (typeof param === 'string') {
-            let n = Number(param);
-            if (!isNaN(n))
-                return n;
-            const bool = param.trim().toLowerCase();
-            if (bool === 'true') {
-                return true;
-            }
-            if (bool === 'false') {
-                return false;
-            }
-            try {
-                const t = JSON5.parse(param);
-                return t;
-            }
-            catch (e) {
-                return param;
-            }
-        }
-        return param;
-    };
-    //#endregion
-    //#region get expores path
-    TaonHelpers.getExpressPath = (c, pathOrClassConfig) => {
-        if (typeof pathOrClassConfig === 'string')
-            return `${c.calculatedPath}${pathOrClassConfig}`.replace(/\/$/, '');
-        return `${c.calculatedPath}${pathOrClassConfig.path}`.replace(/\/$/, '');
-    };
-    //#endregion
-    //#region get default value tyep
-    TaonHelpers.defaultType = value => {
-        if (typeof value === 'string')
-            return '';
-        if (typeof value === 'boolean')
-            return false;
-        if (Array.isArray(value))
-            return {};
-        if (typeof value === 'object')
-            return {};
-    };
-    //#endregion
-    //#region parse json with string jsons
-    TaonHelpers.parseJSONwithStringJSONs = (object, waring = false) => {
-        // console.log('checking object', object)
-        if (!_.isObject(object)) {
-            if (waring) {
-                console.error(`
-        parseJSONwithStringJSONs(...)
-        Parameter should be a object, but is ${typeof object}
-        `, object);
-            }
-            return object;
-        }
-        let res = _.cloneDeep(object);
-        Object.keys(res).forEach(key => {
-            let isJson = false;
-            try {
-                const possibleJSON = JSON.parse(res[key]);
-                res[key] = possibleJSON;
-                isJson = true;
-            }
-            catch (e) {
-                isJson = false;
-            }
-            // console.log(`key ${key} is json `, isJson)
-            if (isJson) {
-                res[key] = TaonHelpers.parseJSONwithStringJSONs(res[key], false);
-            }
-        });
-        return res;
-    };
-    //#endregion
-    //#region is plain file or folder
-    TaonHelpers.isPlainFileOrFolder = filePath => {
-        return /^([a-zA-Z]|\-|\_|\@|\#|\$|\!|\^|\&|\*|\(|\))+$/.test(filePath);
-    };
-    //#endregion
-    //#region ips key name repsonse
-    TaonHelpers.ipcKeyNameResponse = (target, methodConfig, expressPath) => {
-        return [
-            'response',
-            ClassHelpers.getName(target),
-            methodConfig.methodName,
-            methodConfig.type,
-            expressPath,
-        ].join('--');
-    };
-    //#endregion
-    //#region ipc key name request
-    TaonHelpers.ipcKeyNameRequest = (target, methodConfig, expressPath) => {
-        return [
-            'request',
-            ClassHelpers.getName(target),
-            methodConfig.methodName,
-            methodConfig.type,
-            expressPath,
-        ].join('--');
-    };
-    //#endregion
-    //#region websql mocks
-    TaonHelpers.websqlMocks = headers => {
-        const response = {
-            status(status) {
-                // console.log({status})
-                return {
-                    send(send) {
-                        // console.log({status})
-                    },
-                };
-            },
-            setHeader(key, value) {
-                // console.log('Dummy set header', arguments)
-                headers[key] = value;
-            },
-        };
-        const request = {};
-        return { request, response };
-    };
-    //#endregion
-})(TaonHelpers || (TaonHelpers = {}));
-
 /* */
 /* */
 var ClassHelpers;
@@ -651,19 +511,19 @@ var ClassHelpers;
     };
     //#endregion
     //#region get path for
-    ClassHelpers.getCalculatedPathFor = (target) => {
-        const configs = ClassHelpers.getControllerConfigs(target);
-        const parentscalculatedPath = _.slice(configs, 1)
-            .reverse()
-            .map(bc => {
-            if (TaonHelpers.isGoodPath(bc.path)) {
-                return bc.path;
-            }
-            return bc.className;
-        })
-            .join('/');
-        return `/${parentscalculatedPath}/${ClassHelpers.getName(target)}`;
-    };
+    // export const getCalculatedPathFor = (target: Function) => {
+    //   const configs = getControllerConfigs(target);
+    //   const parentscalculatedPath = _.slice(configs, 1)
+    //     .reverse()
+    //     .map(bc => {
+    //       if (TaonHelpers.isGoodPath(bc.path)) {
+    //         return bc.path;
+    //       }
+    //       return bc.className;
+    //     })
+    //     .join('/');
+    //   return `/${parentscalculatedPath}/${ClassHelpers.getName(target)}`;
+    // };
     //#endregion
 })(ClassHelpers || (ClassHelpers = {}));
 
@@ -759,6 +619,7 @@ TAON_CONTEXT = new InjectionToken('TAON_CONTEXT');
 let CURRENT_HOST_BACKEND_PORT;
 //#region @browser
 CURRENT_HOST_BACKEND_PORT = new InjectionToken('CURRENT_HOST_BACKEND_PORT');
+const apiPrefix = 'api';
 
 const inject = (entity) => {
     return new Proxy({}, {
@@ -1391,6 +1252,146 @@ const getResponseValue = (response, options) => {
     return (void 0);
 };
 
+var TaonHelpers;
+(function (TaonHelpers) {
+    //#region fillUpTo string
+    TaonHelpers.fillUpTo = (s, nCharacters) => {
+        return _.times(nCharacters, n => {
+            if (s.charAt(n)) {
+                return s.charAt(n);
+            }
+            return ' ';
+        }).join('');
+    };
+    //#endregion
+    //#region is good path
+    TaonHelpers.isGoodPath = (p) => {
+        return p && typeof p === 'string' && p.trim() !== '';
+    };
+    //#endregion
+    //#region try transform params
+    TaonHelpers.tryTransformParam = param => {
+        if (typeof param === 'string') {
+            let n = Number(param);
+            if (!isNaN(n))
+                return n;
+            const bool = param.trim().toLowerCase();
+            if (bool === 'true') {
+                return true;
+            }
+            if (bool === 'false') {
+                return false;
+            }
+            try {
+                const t = JSON5.parse(param);
+                return t;
+            }
+            catch (e) {
+                return param;
+            }
+        }
+        return param;
+    };
+    //#endregion
+    //#region get expores path
+    TaonHelpers.getExpressPath = (c, pathOrClassConfig) => {
+        if (typeof pathOrClassConfig === 'string')
+            return `${c.calculatedPath}${pathOrClassConfig}`.replace(/\/$/, '');
+        return `${c.calculatedPath}${pathOrClassConfig.path}`.replace(/\/$/, '');
+    };
+    //#endregion
+    //#region get default value tyep
+    TaonHelpers.defaultType = value => {
+        if (typeof value === 'string')
+            return '';
+        if (typeof value === 'boolean')
+            return false;
+        if (Array.isArray(value))
+            return {};
+        if (typeof value === 'object')
+            return {};
+    };
+    //#endregion
+    //#region parse json with string jsons
+    TaonHelpers.parseJSONwithStringJSONs = (object, waring = false) => {
+        // console.log('checking object', object)
+        if (!_.isObject(object)) {
+            if (waring) {
+                console.error(`
+        parseJSONwithStringJSONs(...)
+        Parameter should be a object, but is ${typeof object}
+        `, object);
+            }
+            return object;
+        }
+        let res = _.cloneDeep(object);
+        Object.keys(res).forEach(key => {
+            let isJson = false;
+            try {
+                const possibleJSON = JSON.parse(res[key]);
+                res[key] = possibleJSON;
+                isJson = true;
+            }
+            catch (e) {
+                isJson = false;
+            }
+            // console.log(`key ${key} is json `, isJson)
+            if (isJson) {
+                res[key] = TaonHelpers.parseJSONwithStringJSONs(res[key], false);
+            }
+        });
+        return res;
+    };
+    //#endregion
+    //#region is plain file or folder
+    TaonHelpers.isPlainFileOrFolder = filePath => {
+        return /^([a-zA-Z]|\-|\_|\@|\#|\$|\!|\^|\&|\*|\(|\))+$/.test(filePath);
+    };
+    //#endregion
+    //#region ips key name repsonse
+    TaonHelpers.ipcKeyNameResponse = (target, methodConfig, expressPath) => {
+        return [
+            'response',
+            ClassHelpers.getName(target),
+            methodConfig.methodName,
+            methodConfig.type,
+            expressPath,
+        ].join('--');
+    };
+    //#endregion
+    //#region ipc key name request
+    TaonHelpers.ipcKeyNameRequest = (target, methodConfig, expressPath) => {
+        return [
+            'request',
+            ClassHelpers.getName(target),
+            methodConfig.methodName,
+            methodConfig.type,
+            expressPath,
+        ].join('--');
+    };
+    //#endregion
+    //#region websql mocks
+    TaonHelpers.websqlMocks = headers => {
+        const response = {
+            status(status) {
+                // console.log({status})
+                return {
+                    send(send) {
+                        // console.log({status})
+                    },
+                };
+            },
+            setHeader(key, value) {
+                // console.log('Dummy set header', arguments)
+                headers[key] = value;
+            },
+        };
+        const request = {};
+        return { request, response };
+    };
+    //#endregion
+})(TaonHelpers || (TaonHelpers = {}));
+
 //#region imports
 /* */
 /* */
@@ -1659,6 +1660,7 @@ to use socket realtime connection;
 }
 
 //#region imports
+/* */
 //#endregion
 class RealtimeServer {
     // private jobs = {};
@@ -1836,6 +1838,9 @@ class RealtimeServer {
         /* */
         /* */
         /* */
+        /* */
+        /* */
+        /* */
     }
     //#endregion
     //#region methods & getters / trigger changes
@@ -2534,12 +2539,12 @@ class RealtimeStrategyMock extends RealtimeStrategy {
     //#endregion
     //#region server & io
     ioServer(url, opt) {
-        const server = MockServer.from(url || this.ctx.uri.origin);
+        const server = MockServer.from(url || this.ctx.uriOrigin);
         return server.of(opt?.path || '/');
     }
     get ioClient() {
         const clientIo = (uri, opts) => {
-            return new MockSocket(uri || this.ctx.uri.origin, opts);
+            return new MockSocket(uri || this.ctx.uriOrigin, opts);
         };
         return clientIo;
     }
@@ -2609,6 +2614,7 @@ class RealtimeCore {
     //#endregion
     //#region methods & getters / resovle staraegy
     resolveStrategy() {
+        // console.log(`[taon] resolveStrategy for this.ctx.mode ${this.ctx.mode}`);
         if (this.ctx.mode === 'backend-frontend(websql)' ||
             this.ctx.mode === 'backend-frontend(websql-electron)') {
             // debugger
@@ -2628,15 +2634,14 @@ class RealtimeCore {
     //#endregion
     //#region path for
     pathFor(namespace) {
-        const uri = this.ctx.uri;
         let nsp = namespace ? namespace : '';
         nsp = nsp === '/' ? '' : nsp;
-        const pathname = uri.pathname !== '/' ? uri.pathname : '';
-        let prefix = `taonContext`;
+        let prefix = `${apiPrefix}/${this.ctx.contextName}/udp`;
         if (Helpers.isElectron) {
             prefix = ``;
         }
-        const href = `${uri.origin}${pathname}/${prefix}${prefix && nsp ? '-' + nsp : nsp}`;
+        const href = `${this.ctx.uriOrigin}${this.ctx.uriPathnameOrNothingIfRoot}` +
+            `/${prefix}${prefix && nsp ? '-' + nsp : nsp}`;
         // console.log(`HREF: ${href}, nsp: ${nsp}`)
         return new URL(href);
     }
@@ -2920,6 +2925,10 @@ class EndpointContext {
             }
             this.mode = 'remote-backend(tcp+udp)';
         }
+        // console.log(`
+        //   useIpcWhenElectron: ${this.config.useIpcWhenElectron}
+        //   Helpers.isElectron: ${Helpers.isElectron}
+        //   `)
         if (this.config.useIpcWhenElectron && Helpers.isElectron) {
             if (Helpers.isWebSQL) {
                 this.mode = 'backend-frontend(websql-electron)';
@@ -2928,6 +2937,11 @@ class EndpointContext {
                 this.mode = 'backend-frontend(ipc-electron)';
             }
         }
+        // mode === undefined for BaseContext => ok behavior
+        // console.log(`Mode for BE/FE communication: ${this.mode}`);
+        // if(!this.mode) {
+        //   console.log(this.config)
+        // }
         if (!this.mode && !this.config.abstract) {
             Helpers.error(`[taon] Context "${this.contextName}": You need to provide host or remoteHost or useIpcWhenElectron`, false, true);
             /* */
@@ -3291,6 +3305,10 @@ class EndpointContext {
         /* */
         /* */
         /* */
+        /* */
+        /* */
+        /* */
+        /* */
         return (void 0);
     }
     //#endregion
@@ -3610,16 +3628,53 @@ class EndpointContext {
         return url;
     }
     //#endregion
+    get uriPort() {
+        return this.uri?.port;
+    }
+    get uriProtocol() {
+        return this.uri?.protocol;
+    }
+    /**
+     * Examples
+     * http://localhost:3000
+     * https://localhost (from localhost:80)   *
+     */
+    get uriOrigin() {
+        return this.uri?.origin;
+    }
+    /**
+     * Exampels
+     * http://localhost:3000/path/to/somewhere
+     * https://localhost/path/to/somewhere (from localhost:80)
+     */
+    // get uriOriginWithPathname(): string | undefined {
+    //   return this.uri?.origin
+    //     ? this.uri?.origin + this.uriPathnameOrNothingIfRoot.replace(/\/$/, '')
+    //     : undefined;
+    // }
+    get uriPathname() {
+        return this.uri?.pathname;
+    }
+    /**
+     * Examples
+     * http://localhost:3000/path/to/somewhere -> '/path/to/somewhere'
+     * http://localhost:3000 -> '' #
+     * https://localhost/path/to/  -> '/path/to/somewhere' # remove last slash
+     */
+    get uriPathnameOrNothingIfRoot() {
+        const isNonRootProperPathName = this.uri?.pathname && this.uri.pathname !== '/';
+        return isNonRootProperPathName ? this.uri.pathname.replace(/\/$/, '') : '';
+    }
     /**
      * Port from uri as number
      * @returns {Number | undefined}
      */
     get port() {
-        return this.uri?.port ? Number(this.uri.port) : undefined;
+        return this.uri?.port ? Number(this.uriPort) : undefined;
     }
     //#region methods & getters / is https server
     get isHttpServer() {
-        return this.uri.protocol === 'https:';
+        return this.uriProtocol === 'https:';
     }
     //#endregion
     //#region methods & getters / public assets
@@ -3856,7 +3911,7 @@ class EndpointContext {
             return;
         }
         const allControllers = this.getClassFunByArr(Models.ClassType.CONTROLLER);
-        // console.log('allControllers', allControllers)11
+        // console.log('allControllers', allControllers);
         for (const controllerClassFn of allControllers) {
             controllerClassFn[Symbols.classMethodsNames] =
                 ClassHelpers.getMethodsNames(controllerClassFn);
@@ -3876,15 +3931,17 @@ class EndpointContext {
                 classConfig.calculatedPath = classConfig.path;
             }
             else {
-                classConfig.calculatedPath =
-                    `${parentscalculatedPath}/${ClassHelpers.getName(controllerClassFn)}`
-                        .replace(/\/\//g, '/')
-                        .split('/')
-                        .reduce((acc, bc) => {
-                        return _.last(acc) === bc ? acc : [...acc, bc];
-                    }, [])
-                        .join('/');
+                classConfig.calculatedPath = (`${this.uriPathnameOrNothingIfRoot}` +
+                    `/${apiPrefix}/${this.contextName}/tcp${parentscalculatedPath}/` +
+                    `${ClassHelpers.getName(controllerClassFn)}`)
+                    .replace(/\/\//g, '/')
+                    .split('/')
+                    .reduce((acc, bc) => {
+                    return _.last(acc) === bc ? acc : [...acc, bc];
+                }, [])
+                    .join('/');
             }
+            // console.log('calculatedPath', classConfig.calculatedPath);
             _.slice(configs, 1).forEach(bc => {
                 const alreadyIs = classConfig.methods;
                 const toMerge = _.cloneDeep(bc.methods);
@@ -3910,7 +3967,7 @@ class EndpointContext {
                 const expressPath = methodConfig.global
                     ? `/${methodConfig.path?.replace(/\//, '')}`
                     : TaonHelpers.getExpressPath(classConfig, methodConfig);
-                // console.log({ expressPath })
+                // console.log({ expressPath });
                 if (Helpers.isNode || Helpers.isWebSQL) {
                     /* */
                     /* */
@@ -3955,7 +4012,7 @@ class EndpointContext {
             this.skipWritingServerRoutes) {
             return;
         }
-        const contexts = [this];
+        // const contexts: EndpointContext[] = [this];
         /* */
         /* */
         /* */
@@ -4120,7 +4177,7 @@ class EndpointContext {
         /* */
         /* */
         /* */
-        const url = this.uri;
+        // const url = this.uri;
         //#region get result
         const getResult = async (resolvedParams, req, res) => {
             const response = methodConfig.descriptor.value.apply(
@@ -4136,12 +4193,7 @@ class EndpointContext {
             return result;
         };
         //#endregion
-        url.pathname = url.pathname.replace(/\/$/, '');
-        expressPath = url.pathname.startsWith('/')
-            ? `${url.pathname}${expressPath}`
-            : expressPath;
-        expressPath = expressPath.replace(/\/\//g, '/');
-        // console.log(`BACKEND: expressPath: ${ expressPath } `)
+        // console.log(`BACKEND: expressPath: "${expressPath}" `);
         //#endregion
         if (Helpers.isElectron) {
             /* */
@@ -4165,6 +4217,9 @@ class EndpointContext {
             /* */
             /* */
             /* */
+            /* */
+            /* */
+            /* */
         }
         if (!this.remoteHost) {
             //#region apply dummy websql express routers
@@ -4391,7 +4446,7 @@ class EndpointContext {
             /* */
         }
         return {
-            routePath: expressPath,
+            expressPath: expressPath,
             method: methodConfig.type,
         };
     }
@@ -4429,7 +4484,7 @@ class EndpointContext {
                                 body: void 0,
                                 isArray: void 0,
                                 method: methodConfig.type,
-                                url: `${ctx.uri.origin}${'' // TODO express path
+                                url: `${ctx.uriOrigin}${'' // TODO express path
                                 }${methodConfig.path} `,
                             }, Helpers.isBlob(body) || _.isString(body)
                                 ? body
@@ -4606,37 +4661,37 @@ class EndpointContext {
             //#region resolve frontend parameters
             if (!storage[Symbols.old.ENDPOINT_META_CONFIG])
                 storage[Symbols.old.ENDPOINT_META_CONFIG] = {};
-            if (!storage[Symbols.old.ENDPOINT_META_CONFIG][ctx.uri.href])
-                storage[Symbols.old.ENDPOINT_META_CONFIG][ctx.uri.href] = {};
+            if (!storage[Symbols.old.ENDPOINT_META_CONFIG][ctx.uriOrigin])
+                storage[Symbols.old.ENDPOINT_META_CONFIG][ctx.uriOrigin] = {};
             const endpoints = storage[Symbols.old.ENDPOINT_META_CONFIG];
             let rest;
-            if (!endpoints[ctx.uri.href][expressPath]) {
+            if (!endpoints[ctx.uriOrigin][expressPath]) {
                 let headers = {};
                 if (methodConfig.contentType && !methodConfig.responseType) {
-                    rest = Resource.create(ctx.uri.href, expressPath, Symbols.old.MAPPING_CONFIG_HEADER, Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, RestHeaders.from({
+                    rest = Resource.create(ctx.uriOrigin, expressPath, Symbols.old.MAPPING_CONFIG_HEADER, Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, RestHeaders.from({
                         'Content-Type': methodConfig.contentType,
                         Accept: methodConfig.contentType,
                     }));
                 }
                 else if (methodConfig.contentType && methodConfig.responseType) {
-                    rest = Resource.create(ctx.uri.href, expressPath, Symbols.old.MAPPING_CONFIG_HEADER, Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, RestHeaders.from({
+                    rest = Resource.create(ctx.uriOrigin, expressPath, Symbols.old.MAPPING_CONFIG_HEADER, Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, RestHeaders.from({
                         'Content-Type': methodConfig.contentType,
                         Accept: methodConfig.contentType,
                         responsetypeaxios: methodConfig.responseType,
                     }));
                 }
                 else if (!methodConfig.contentType && methodConfig.responseType) {
-                    rest = Resource.create(ctx.uri.href, expressPath, Symbols.old.MAPPING_CONFIG_HEADER, Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, RestHeaders.from({
+                    rest = Resource.create(ctx.uriOrigin, expressPath, Symbols.old.MAPPING_CONFIG_HEADER, Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, RestHeaders.from({
                         responsetypeaxios: methodConfig.responseType,
                     }));
                 }
                 else {
-                    rest = Resource.create(ctx.uri.href, expressPath, Symbols.old.MAPPING_CONFIG_HEADER, Symbols.old.CIRCURAL_OBJECTS_MAP_BODY);
+                    rest = Resource.create(ctx.uriOrigin, expressPath, Symbols.old.MAPPING_CONFIG_HEADER, Symbols.old.CIRCURAL_OBJECTS_MAP_BODY);
                 }
-                endpoints[ctx.uri.href][expressPath] = rest;
+                endpoints[ctx.uriOrigin][expressPath] = rest;
             }
             else {
-                rest = endpoints[ctx.uri.href][expressPath];
+                rest = endpoints[ctx.uriOrigin][expressPath];
             }
             const method = type.toLowerCase();
             const isWithBody = method === 'put' || method === 'post';
@@ -6570,5 +6625,5 @@ var Taon;
  * Generated bundle index. Do not edit.
  */
 
-export { BaseContext, BaseController, BaseCustomRepository, BaseEntity, BaseMigration, BaseProvider, BaseRepository, CURRENT_HOST_BACKEND_PORT, ClassHelpers, EndpointContext, Models, TAON_CONTEXT, Taon, TaonAdminService, TaonEntityKeysToOmitArr, createContext, inject };
+export { BaseContext, BaseController, BaseCustomRepository, BaseEntity, BaseMigration, BaseProvider, BaseRepository, CURRENT_HOST_BACKEND_PORT, ClassHelpers, EndpointContext, Models, TAON_CONTEXT, Taon, TaonAdminService, TaonEntityKeysToOmitArr, apiPrefix, createContext, inject };
 //# sourceMappingURL=taon.mjs.map