taon 21.0.63 → 21.0.71

package/websql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taon/websql",
-  "version": "21.0.63",
+  "version": "21.0.71",
   "peerDependencies": {
     "@angular/common": "^21.0.0",
     "@angular/core": "^21.0.0"

package/websql/types/taon-websql.d.ts

@@ -2,18 +2,18 @@
 import * as taon_websql from 'taon/websql';
 import * as expressType from 'express';
 import { Request, Response, RequestHandler, Application } from 'express';
-import { Models as Models$1, RestResponseWrapper, TaonServerMiddlewareInterceptOptions, TaonClientMiddlewareInterceptOptions, HttpResponseError, RestErrorResponseWrapper, Mapping } from 'ng2-rest/websql';
+import { HttpResponse, Ng2RestAxiosRequestConfig, RestResponseWrapper, TaonServerMiddlewareInterceptOptions, TaonClientMiddlewareInterceptOptions, ResponseTypeAxios, HttpResponseError, RestErrorResponseWrapper, ModelValue, EncodeSchema } from 'ng2-rest/websql';
 export { TaonClientMiddlewareInterceptOptions, TaonServerMiddlewareInterceptOptions } from 'ng2-rest/websql';
 import { Server } from 'http';
 import { DataSource, Repository, SaveOptions, DeepPartial, QueryDeepPartialEntity, InsertResult, UpsertOptions, FindOptionsWhere, UpdateResult, FindManyOptions, FindOneOptions, QueryRunner, SelectQueryBuilder, Table, RelationPath, MigrationInterface, EntitySubscriberInterface, InsertEvent, UpdateEvent, RemoveEvent, SoftRemoveEvent, RecoverEvent, TransactionStartEvent, TransactionCommitEvent, TransactionRollbackEvent } from 'taon-typeorm/websql';
 export { AfterInsert, AfterLoad, AfterRecover, AfterRemove, AfterSoftRemove, AfterUpdate, BeforeInsert, BeforeRecover, BeforeRemove, BeforeSoftRemove, BeforeUpdate, Column, Connection, CreateDateColumn, Column as CustomColumn, DeleteDateColumn, Generated, Generated as GeneratedColumn, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, OneToMany, OneToOne, PrimaryColumn, PrimaryGeneratedColumn, Repository, TreeChildren, TreeParent, UpdateDateColumn, VersionColumn, VirtualColumn } from 'taon-typeorm/websql';
 import { CoreModels } from 'tnp-core/websql';
 import { MySqlQuerySource } from 'taon-type-sql/websql';
+import * as rxjs from 'rxjs';
+import { Observable, Subscriber } from 'rxjs';
 import * as i0 from '@angular/core';
 import { InjectionToken, ViewContainerRef } from '@angular/core';
 import { AxiosResponse } from 'axios';
-import * as rxjs from 'rxjs';
-import { Observable, Subscriber } from 'rxjs';
 import * as _ngx_formly_core from '@ngx-formly/core';
 import { FieldWrapper, FieldArrayType, FormlyFormBuilder, FormlyFieldConfig } from '@ngx-formly/core';
 import * as Electron from 'electron';
@@ -606,12 +606,15 @@ declare namespace Models {
         };
         type SyncResponseFunc<T> = (options?: ResponseFuncOpt<T>) => SyncResponse<T>;
         type MixResponse<T> = SyncResponse<T> | ExpressContext<T>;
+        type PromiseObservableMix<T> = Promise<T> & {
+            observable: Observable<T>;
+        };
         interface ClientAction<T> {
             /**
              * @deprecated use request() mehods instead
              */
-            readonly received?: Models$1.PromiseObservableMix<Models$1.HttpResponse<T>>;
-            request?(axiosConfig?: Models$1.Ng2RestAxiosRequestConfig): Models$1.PromiseObservableMix<Models$1.HttpResponse<T>>;
+            readonly received?: PromiseObservableMix<HttpResponse<T>>;
+            request?(axiosConfig?: Ng2RestAxiosRequestConfig): PromiseObservableMix<HttpResponse<T>>;
         }
         interface AsyncResponse<T> {
             (req?: Request<any>, res?: Response<any>): Promise<SyncResponse<T> | SyncResponseFunc<T>>;
@@ -926,7 +929,6 @@ declare class EntityProcess {
      */
     private result;
     private response;
-    static init(result: any, response: Response): Promise<void>;
     /**
      * Data to send
      */
@@ -981,9 +983,7 @@ declare class Realtime {
 }
 declare namespace Symbols {
     const ctxInClassOrClassObj: unique symbol;
-    const classNameStaticProperty: string;
     const fullClassNameStaticProperty: string;
-    const orignalClass: string;
     const orignalClassClonesObj: string;
     const classMethodsNames: string;
     const REALTIME: Realtime;
@@ -1086,7 +1086,7 @@ interface TaonHttpDecoratorOptions {
      */
     pathIsGlobal?: boolean;
     overrideContentType?: CoreModels.ContentType;
-    overrideResponseType?: Models$1.ResponseTypeAxios;
+    overrideResponseType?: ResponseTypeAxios;
     /**
      * Express will send response as HTML string with proper headers
      */
@@ -1299,7 +1299,7 @@ declare class TaonBaseController<UPLOAD_FILE_QUERY_PARAMS = {}> extends TaonBase
      * through `uploadFormDataToServer` or `uploadLocalFileToServer`
      */
     protected afterFileUploadAction(file?: MulterFileUploadResponse, queryParams?: UPLOAD_FILE_QUERY_PARAMS): void | Promise<void>;
-    uploadLocalFileToServer(absFilePath: string, options?: Pick<Models$1.Ng2RestAxiosRequestConfig, 'onUploadProgress'>, queryParams?: UPLOAD_FILE_QUERY_PARAMS): Promise<MulterFileUploadResponse[]>;
+    uploadLocalFileToServer(absFilePath: string, options?: Pick<Ng2RestAxiosRequestConfig, 'onUploadProgress'>, queryParams?: UPLOAD_FILE_QUERY_PARAMS): Promise<MulterFileUploadResponse[]>;
     /**
      * Easy way to wait for status change with http (1s default) pooling.
      *
@@ -1591,7 +1591,7 @@ declare namespace ClassHelpers {
     const getName: (classFnOrObject: any) => string;
     const getOrginalClass: (classFnOrObject: any) => any;
     const getFullInternalName: (classFnOrObject: any) => string;
-    const getUniqueKey: (classFnOrObject: any) => string;
+    const getUniqueKey: (classFnOrObject: any) => string | undefined;
     const isContextClassObject: (obj: any) => boolean;
     const setName: (target: Function, className: string) => void;
     const hasParentClassWithName: (target: Function, className: string, targets?: any[]) => boolean;
@@ -1933,11 +1933,8 @@ declare class TaonEntityOptions<T = any> extends DecoratorAbstractOpt {
      */
     uniqueKeyProp?: string;
     createTable?: boolean;
-    defaultModelValues?: Mapping.ModelValue<T>;
-    defaultModelMapping?: Mapping.Mapping<T>;
-    defaultModelMappingDeep?: {
-        [lodashPathes: string]: string | [string];
-    };
+    defaultModelValues?: () => ModelValue<T>;
+    defaultModelMapping?: () => EncodeSchema<T>;
 }
 
 /**

package/websql-prod/fesm2022/taon-websql.mjs

@@ -1,15 +1,15 @@
 import 'reflect-metadata';
-import { ___NS__merge, ___NS__cloneDeep, ___NS__camelCase, ___NS__isUndefined, ___NS__isArray, ___NS__isFunction, ___NS__isNull, ___NS__isObject, ___NS__isRegExp, ___NS__isBuffer, ___NS__isArrayBuffer, ___NS__isDate, ___NS__isString, Utils__NS__uniqArray, ___NS__uniq, UtilsMigrations__NS__isValidTimestamp, Helpers__NS__throwError, UtilsMigrations__NS__getTimestampFromClassName, ___NS__times, ___NS__first, Helpers__NS__logInfo, UtilsOs__NS__isWebSQL, UtilsOs__NS__isElectron, Helpers__NS__error, UtilsOs__NS__isRunningInDocker, ___NS__isBoolean, ___NS__isNil, ___NS__set, Helpers__NS__info, ___NS__slice, ___NS__last, UtilsOs__NS__isNode, UtilsOs__NS__isBrowser, ___NS__startCase, crossPlatformPath, Helpers__NS__isBlob, Helpers__NS__runSyncOrAsync, config, CoreModels__NS__SPECIAL_APP_READY_MESSAGE, UtilsOs__NS__isRunningInCliMode, Helpers__NS__log, ___NS__isNumber, UtilsTerminal__NS__waitMilliseconds, CoreModels__NS__TaonHttpErrorCustomProp, Helpers__NS__warn, ___NS__lowerFirst } from 'tnp-core/websql-prod';
+import { ___NS__merge, ___NS__cloneDeep, ___NS__camelCase, ___NS__isUndefined, ___NS__isArray, ___NS__isFunction, ___NS__isNull, CoreModels__NS__ClassNameStaticProperty, CoreModels__NS__OrignalClassKey, ___NS__isObject, ___NS__isRegExp, ___NS__isBuffer, ___NS__isArrayBuffer, ___NS__isDate, ___NS__isString, Utils__NS__uniqArray, ___NS__uniq, UtilsMigrations__NS__isValidTimestamp, Helpers__NS__throwError, UtilsMigrations__NS__getTimestampFromClassName, ___NS__times, ___NS__first, Helpers__NS__logInfo, UtilsOs__NS__isWebSQL, UtilsOs__NS__isElectron, Helpers__NS__error, UtilsOs__NS__isRunningInDocker, ___NS__isBoolean, ___NS__isNil, ___NS__set, Helpers__NS__info, ___NS__slice, ___NS__last, UtilsOs__NS__isNode, UtilsOs__NS__isBrowser, ___NS__startCase, crossPlatformPath, Helpers__NS__isBlob, Helpers__NS__runSyncOrAsync, config, CoreModels__NS__SPECIAL_APP_READY_MESSAGE, UtilsOs__NS__isRunningInCliMode, Helpers__NS__log, ___NS__isNumber, UtilsTerminal__NS__waitMilliseconds, CoreModels__NS__TaonHttpErrorCustomProp, Helpers__NS__warn, ___NS__lowerFirst } from 'tnp-core/websql-prod';
 import axios from 'axios';
 import { JSON10 } from 'json10/websql-prod';
 import { walk } from 'lodash-walk-object/websql-prod';
-import { RestResponseWrapper, Resource, Models__NS__HttpResponse, RestHeaders, Mapping__NS__decode, Mapping__NS__DefaultModelWithMapping, HttpResponseError, Mapping__NS__getModelsMapping } from 'ng2-rest/websql-prod';
+import { RestResponseWrapper, Resource__NS__globalInterceptors, Resource__NS__methodsInterceptors, HttpResponse, RestHeaders, Resource__NS__create, decodeMappingForHeaderJson, Resource__NS__Cookies, DefaultMapping, DefaultModel, HttpResponseError } from 'ng2-rest/websql-prod';
 import { Observable, Subject, from } from 'rxjs';
-import { OrignalClassKey, Table, TableIndex, EventSubscriber, Entity, DataSource, Column, PrimaryGeneratedColumn, VersionColumn, CreateDateColumn } from 'taon-typeorm/websql-prod';
+import { Table, TableIndex, EventSubscriber, Entity, DataSource, Column, PrimaryGeneratedColumn, VersionColumn, CreateDateColumn } from 'taon-typeorm/websql-prod';
 export { AfterInsert, AfterLoad, AfterRecover, AfterRemove, AfterSoftRemove, AfterUpdate, BeforeInsert, BeforeRecover, BeforeRemove, BeforeSoftRemove, BeforeUpdate, Column, Connection, CreateDateColumn, Column as CustomColumn, DeleteDateColumn, Generated, Generated as GeneratedColumn, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, OneToMany, OneToOne, PrimaryColumn, PrimaryGeneratedColumn, Repository, TreeChildren, TreeParent, UpdateDateColumn, VersionColumn, VirtualColumn } from 'taon-typeorm/websql-prod';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject as inject$1, PLATFORM_ID, Injectable, ViewContainerRef, ViewChild, Component } from '@angular/core';
-import { SYMBOL, CLASS } from 'typescript-class-helpers/websql-prod';
+import { CLASS__NS__getName, CLASS__NS__setName, CLASS__NS__getBy } from 'typescript-class-helpers/websql-prod';
 import * as JSON5 from 'json5';
 import { io } from 'socket.io-client';
 import { __decorate, __metadata, __param } from 'tslib';
@@ -224,9 +224,7 @@ class Realtime {
 }
 //namespace Symbols
 const Symbols__NS__ctxInClassOrClassObj = Symbol();
-const Symbols__NS__classNameStaticProperty = SYMBOL.ClassNameStaticProperty;
 const Symbols__NS__fullClassNameStaticProperty = `$$fullclassName$$`;
-const Symbols__NS__orignalClass = OrignalClassKey;
 const Symbols__NS__orignalClassClonesObj = `$$originalClassClonesObj$$`;
 const Symbols__NS__classMethodsNames = `$$classMethodsNames$$`;
 const Symbols__NS__REALTIME = new Realtime();
@@ -377,14 +375,14 @@ const ClassHelpers__NS__getName = (classFnOrObject) => {
         console.error('OBJECT OR CLASS', classFnOrObject);
         throw new Error(`Cannot get name from this object or class.`);
     }
-    return ((classFnOrObject[Symbols__NS__classNameStaticProperty]
-        ? classFnOrObject[Symbols__NS__classNameStaticProperty]
-        : classFnOrObject?.constructor[Symbols__NS__classNameStaticProperty]) ||
-        (___NS__isFunction(classFnOrObject) ? CLASS.getName(classFnOrObject) : void 0));
+    return ((classFnOrObject[CoreModels__NS__ClassNameStaticProperty]
+        ? classFnOrObject[CoreModels__NS__ClassNameStaticProperty]
+        : classFnOrObject?.constructor[CoreModels__NS__ClassNameStaticProperty]) ||
+        (___NS__isFunction(classFnOrObject) ? CLASS__NS__getName(classFnOrObject) : void 0));
 };
 //#endregion
 const ClassHelpers__NS__getOrginalClass = (classFnOrObject) => {
-    const org = classFnOrObject[Symbols__NS__orignalClass];
+    const org = classFnOrObject[CoreModels__NS__OrignalClassKey];
     if (!org) {
         return classFnOrObject;
     }
@@ -406,8 +404,11 @@ const ClassHelpers__NS__getFullInternalName = (classFnOrObject) => {
 const ClassHelpers__NS__getUniqueKey = (classFnOrObject) => {
     const classFn = ___NS__isFunction(classFnOrObject)
         ? classFnOrObject
-        : classFnOrObject.constructor;
+        : classFnOrObject?.constructor;
     const config = Reflect.getMetadata(Symbols__NS__metadata.options.entity, classFn);
+    if (!config) {
+        return void 0;
+    }
     return config.uniqueKeyProp;
 };
 //#endregion
@@ -431,7 +432,7 @@ const ClassHelpers__NS__isContextClassObject = (obj) => {
 const ClassHelpers__NS__setName = (target, className) => {
     // console.log('setName', className, target.name)
     Validators__NS__classNameVlidation(className, target);
-    target[Symbols__NS__classNameStaticProperty] = className;
+    target[CoreModels__NS__ClassNameStaticProperty] = className;
 };
 //#endregion
 //#region has parent with class name
@@ -1291,7 +1292,7 @@ class RealtimeClient {
      * ...
      */
     listenChangesEntity(entityClassFnOrObj, options) {
-        options = options || {};
+        options = ___NS__cloneDeep(options || {});
         if (___NS__isObject(entityClassFnOrObj)) {
             const orgObj = entityClassFnOrObj;
             entityClassFnOrObj =
@@ -2527,23 +2528,18 @@ class EndpointContext {
                         // You can override prototype properties or methods here if needed
                         // static properties override allowed
                     }
-                    static { _a = Symbols__NS__orignalClass, _b = Symbols__NS__fullClassNameStaticProperty, _c = Symbols__NS__classNameStaticProperty, _d = Symbols__NS__ctxInClassOrClassObj, _e = Symbols__NS__ctxInClassOrClassObj; }
-                    // @ts-ignore
+                    static { _a = CoreModels__NS__OrignalClassKey, _b = Symbols__NS__fullClassNameStaticProperty, _c = CoreModels__NS__ClassNameStaticProperty, _d = Symbols__NS__ctxInClassOrClassObj, _e = Symbols__NS__ctxInClassOrClassObj; }
                     static { this[_a] = TaonBaseClass; }
-                    // @ts-ignore
                     static { this[_b] = `${ctx.contextName}.${className}`; }
-                    // @ts-ignore
                     static { this[_c] = className; }
                     static { this[_d] = ctx; }
                     // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
                     static __getFullPathForClass__(arr = []) {
                         const name = this[Symbols__NS__fullClassNameStaticProperty];
                         arr.push(name);
-                        // @ts-ignore
-                        if (this[Symbols__NS__orignalClass] && // @ts-ignore
-                            this[Symbols__NS__orignalClass].__getFullPathForClass__) {
-                            // @ts-ignore
-                            this[Symbols__NS__orignalClass].__getFullPathForClass__(arr);
+                        if (this[CoreModels__NS__OrignalClassKey] &&
+                            this[CoreModels__NS__OrignalClassKey].__getFullPathForClass__) {
+                            this[CoreModels__NS__OrignalClassKey].__getFullPathForClass__(arr);
                         }
                         return arr.join('/');
                     }
@@ -2593,7 +2589,7 @@ class EndpointContext {
                 //   console.warn(`Please provide className for ${TaonBaseClass.name} class`);
                 // }
                 className = className || key;
-                TaonBaseClass[Symbols__NS__classNameStaticProperty] = className;
+                TaonBaseClass[CoreModels__NS__ClassNameStaticProperty] = className;
                 const clonedClass = this.cloneClassWithNewMetadata({
                     TaonBaseClass,
                     className,
@@ -3870,7 +3866,8 @@ class EndpointContext {
         })).map(f => {
             const [method, expressPath] = f.split(' ');
             if (method.toUpperCase() === 'GET' && this.isRunningInsideDocker) {
-                this.logRoutes && console.log(`apk add curl && curl http://localhost:${this.uriPort}${expressPath}`);
+                this.logRoutes &&
+                    console.log(`apk add curl && curl http://localhost:${this.uriPort}${expressPath}`);
             }
             return (`\n### ${___NS__startCase(___NS__last(expressPath.split('/')))}\n` +
                 TaonHelpers__NS__fillUpTo(method.toUpperCase() + ' ', 10) +
@@ -3912,7 +3909,7 @@ class EndpointContext {
         middlewares.forEach(middlewareInstanceName => {
             const contextName = this.contextName;
             const interceptorName = `${contextName}-${ClassHelpers__NS__getName(middlewareInstanceName)}`;
-            Resource.request.interceptors.set(interceptorName, {
+            Resource__NS__globalInterceptors.set(interceptorName, {
                 intercept: ({ req, next }) => {
                     const url = new URL(req.url);
                     if (url.pathname.startsWith(`${this.uriPathnameOrNothingIfRoot}/${apiPrefix}/${contextName}/`)) {
@@ -4142,6 +4139,9 @@ class EndpointContext {
             /* */
             /* */
             /* */
+            /* */
+            /* */
+            /* */
         }
         if (!this.isRemoteHost) {
             //#region apply dummy websql express routers
@@ -4368,6 +4368,24 @@ class EndpointContext {
             /* */
             /* */
             /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
+            /* */
         }
         return {
             expressPath: expressPath,
@@ -4429,7 +4447,7 @@ class EndpointContext {
             const middlewareName = ClassHelpers__NS__getName(instance);
             // middlewareName - only needed for inheritace and uniqness of interceptors
             const interceptorKey = `${middlewareName}-${methodConfig.type?.toUpperCase()}-${expressPath}`;
-            Resource.request.methodsInterceptors.set(interceptorKey, {
+            Resource__NS__methodsInterceptors.set(interceptorKey, {
                 intercept: ({ req, next }) => {
                     return instance.interceptClientMethod({
                         req,
@@ -4465,15 +4483,15 @@ class EndpointContext {
                         console.log({ responseData });
                         try {
                             const body = res;
-                            res = new Models__NS__HttpResponse({
-                                body: void 0,
-                                isArray: void 0,
-                                method: methodConfig.type,
-                                url: `${ctx.uriOrigin}${'' // TODO express path
-                                }${methodConfig.path} `,
-                            }, Helpers__NS__isBlob(body) || ___NS__isString(body)
+                            const responseStrinOrBlob = Helpers__NS__isBlob(body) || ___NS__isString(body)
                                 ? body
-                                : JSON.stringify(body), RestHeaders.from(headers), void 0, () => body);
+                                : JSON.stringify(body);
+                            res = new HttpResponse(`${ctx.uriOrigin}${'' // TODO express path
+                            }${methodConfig.path} `, methodConfig.type, responseStrinOrBlob, RestHeaders.from(headers), 200, {
+                            // responseMapping: {
+                            //   // entity: ()=>  TODO for electron
+                            // },
+                            }, false);
                             resolve(res);
                         }
                         catch (error) {
@@ -4581,15 +4599,12 @@ class EndpointContext {
                         res = await res.received;
                     }
                     const body = res;
-                    res = new Models__NS__HttpResponse({
-                        body: void 0,
-                        isArray: void 0,
-                        method: methodConfig.type,
-                        url: `${ctx.uriOrigin}${'' // TODO express path
-                        }${methodConfig.path} `,
-                    }, Helpers__NS__isBlob(body) || ___NS__isString(body)
+                    const stringOrBlobData = Helpers__NS__isBlob(body) || ___NS__isString(body)
                         ? body
-                        : JSON.stringify(body), RestHeaders.from(headers), void 0, () => body);
+                        : JSON.stringify(body);
+                    // TODO SHOULD BE IMPLEMENTED IN NG2-REST
+                    res = new HttpResponse(`${ctx.uriOrigin}${'' // TODO express path
+                    }${methodConfig.path} `, methodConfig.type, stringOrBlobData, RestHeaders.from(headers), 200, {}, false);
                     // TODO blob should be blob not json
                     // console.log('NEXT', res);
                     // target.prototype[methodConfig.methodName][subjectHandler].next(res);
@@ -4634,28 +4649,51 @@ class EndpointContext {
                 storage[Symbols__NS__old.ENDPOINT_META_CONFIG][ctx.uriOrigin] = {};
             const endpoints = storage[Symbols__NS__old.ENDPOINT_META_CONFIG];
             let rest;
+            const requestHeaders = RestHeaders.from({});
             if (!endpoints[ctx.uriOrigin][expressPath]) {
-                let headers = {};
                 if (methodConfig.contentType && !methodConfig.responseType) {
-                    rest = Resource.create(ctx.uriOrigin, expressPath, Symbols__NS__old.MAPPING_CONFIG_HEADER, Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY, RestHeaders.from({
+                    rest = Resource__NS__create(ctx.uriOrigin, expressPath, {
+                        responseMapping: {
+                            entity: Symbols__NS__old.MAPPING_CONFIG_HEADER,
+                            circular: Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY,
+                        },
+                    });
+                    requestHeaders.apply({
                         'Content-Type': methodConfig.contentType,
                         Accept: methodConfig.contentType,
-                    }));
+                    });
                 }
                 else if (methodConfig.contentType && methodConfig.responseType) {
-                    rest = Resource.create(ctx.uriOrigin, expressPath, Symbols__NS__old.MAPPING_CONFIG_HEADER, Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY, RestHeaders.from({
+                    rest = Resource__NS__create(ctx.uriOrigin, expressPath, {
+                        responseMapping: {
+                            entity: Symbols__NS__old.MAPPING_CONFIG_HEADER,
+                            circular: Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY,
+                        },
+                    });
+                    requestHeaders.apply({
                         'Content-Type': methodConfig.contentType,
                         Accept: methodConfig.contentType,
                         responsetypeaxios: methodConfig.responseType,
-                    }));
+                    });
                 }
                 else if (!methodConfig.contentType && methodConfig.responseType) {
-                    rest = Resource.create(ctx.uriOrigin, expressPath, Symbols__NS__old.MAPPING_CONFIG_HEADER, Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY, RestHeaders.from({
+                    rest = Resource__NS__create(ctx.uriOrigin, expressPath, {
+                        responseMapping: {
+                            entity: Symbols__NS__old.MAPPING_CONFIG_HEADER,
+                            circular: Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY,
+                        },
+                    });
+                    requestHeaders.apply({
                         responsetypeaxios: methodConfig.responseType,
-                    }));
+                    });
                 }
                 else {
-                    rest = Resource.create(ctx.uriOrigin, expressPath, Symbols__NS__old.MAPPING_CONFIG_HEADER, Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY);
+                    rest = Resource__NS__create(ctx.uriOrigin, expressPath, {
+                        responseMapping: {
+                            entity: Symbols__NS__old.MAPPING_CONFIG_HEADER,
+                            circular: Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY,
+                        },
+                    });
                 }
                 endpoints[ctx.uriOrigin][expressPath] = rest;
             }
@@ -4683,47 +4721,60 @@ class EndpointContext {
                     /* */
                     throw new Error(errorMessage);
                 }
+                const optionsDecodeHeader = {
+                    useFirstArrayItemClassNameForAllElements: true,
+                };
                 if (currentParam.paramType === 'Path') {
+                    //#region handle path params
                     pathPrams[currentParam.paramName] = param;
+                    //#endregion
                 }
                 if (currentParam.paramType === 'Query') {
+                    //#region handle query params
                     if (currentParam.paramName) {
-                        const mapping = Mapping__NS__decode(param, !ctx.isProductionMode);
+                        const mapping = decodeMappingForHeaderJson(param, optionsDecodeHeader);
                         if (mapping) {
-                            rest.headers.set(`${Symbols__NS__old.MAPPING_CONFIG_HEADER_QUERY_PARAMS}${currentParam.paramName} `, JSON.stringify(mapping));
+                            requestHeaders.set(`${Symbols__NS__old.MAPPING_CONFIG_HEADER_QUERY_PARAMS}${currentParam.paramName} `, JSON.stringify(mapping));
                         }
                         queryParams[currentParam.paramName] = param;
                     }
                     else {
-                        const mapping = Mapping__NS__decode(param, !ctx.isProductionMode);
+                        const mapping = decodeMappingForHeaderJson(param, optionsDecodeHeader);
                         if (mapping) {
-                            rest.headers.set(Symbols__NS__old.MAPPING_CONFIG_HEADER_QUERY_PARAMS, JSON.stringify(mapping));
+                            requestHeaders.set(Symbols__NS__old.MAPPING_CONFIG_HEADER_QUERY_PARAMS, JSON.stringify(mapping));
                         }
                         queryParams = ___NS__cloneDeep(param);
                     }
+                    //#endregion
                 }
                 if (currentParam.paramType === 'Header') {
+                    //#region handler header params
                     if (currentParam.paramName) {
                         if (currentParam.paramName === Symbols__NS__old.MDC_KEY) {
                             // parese MDC
-                            rest.headers.set(currentParam.paramName, encodeURIComponent(JSON.stringify(param)));
+                            requestHeaders.set(currentParam.paramName, encodeURIComponent(JSON.stringify(param)));
                         }
                         else {
-                            rest.headers.set(currentParam.paramName, param);
+                            requestHeaders.set(currentParam.paramName, param);
                         }
                     }
                     else {
                         for (let header in param) {
-                            rest.headers.set(header, param[header]);
+                            requestHeaders.set(header, param[header]);
                         }
                     }
+                    //#endregion
                 }
                 if (currentParam.paramType === 'Cookie') {
-                    Resource.Cookies.write(currentParam.paramName, param, currentParam.expireInSeconds);
+                    //#region handle cookie params
+                    Resource__NS__Cookies.write(currentParam.paramName, param, currentParam.expireInSeconds);
+                    //#endregion
                 }
                 if (currentParam.paramType === 'Body') {
+                    //#region handle body params
                     if (currentParam.paramName) {
                         if (ClassHelpers__NS__getName(bodyObject) === 'FormData') {
+                            //#region prevent posting/putting not full body as FormData
                             throw new Error(`[taon - framework] Don use param names when posting / putting FormData.
               Use this:
 // ...
@@ -4735,45 +4786,52 @@ instead
   (@Taon.Http.Param.Body('${currentParam.paramName}') formData: FormData) ...
 // ...
 `);
+                            //#endregion
                         }
-                        const mapping = Mapping__NS__decode(param, !ctx.isProductionMode);
+                        const mapping = decodeMappingForHeaderJson(param, optionsDecodeHeader);
                         if (mapping) {
-                            rest.headers.set(`${Symbols__NS__old.MAPPING_CONFIG_HEADER_BODY_PARAMS}${currentParam.paramName} `, JSON.stringify(mapping));
+                            requestHeaders.set(`${Symbols__NS__old.MAPPING_CONFIG_HEADER_BODY_PARAMS}${currentParam.paramName} `, JSON.stringify(mapping));
                         }
                         bodyObject[currentParam.paramName] = param;
                     }
                     else {
-                        const mapping = Mapping__NS__decode(param, !ctx.isProductionMode);
+                        const mapping = decodeMappingForHeaderJson(param, optionsDecodeHeader);
                         if (mapping) {
-                            rest.headers.set(Symbols__NS__old.MAPPING_CONFIG_HEADER_BODY_PARAMS, JSON.stringify(mapping));
+                            requestHeaders.set(Symbols__NS__old.MAPPING_CONFIG_HEADER_BODY_PARAMS, JSON.stringify(mapping));
                         }
                         bodyObject = param;
                     }
+                    //#endregion
                 }
             });
             if (typeof bodyObject === 'object' &&
                 ClassHelpers__NS__getName(bodyObject) !== 'FormData') {
+                //#region handle circular objects in body params
                 let circuralFromItem = [];
                 bodyObject = JSON10.parse(JSON10.stringify(bodyObject, void 0, void 0, circs => {
                     circuralFromItem = circs;
                 }));
-                rest.headers.set(Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY, JSON10.stringify(circuralFromItem));
+                requestHeaders.set(Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY, JSON10.stringify(circuralFromItem));
+                //#endregion
             }
             if (typeof queryParams === 'object') {
+                //#region handle circular objects in query params
                 let circuralFromQueryParams = [];
                 queryParams = JSON10.parse(JSON10.stringify(queryParams, void 0, void 0, circs => {
                     circuralFromQueryParams = circs;
                 }));
-                rest.headers.set(Symbols__NS__old.CIRCURAL_OBJECTS_MAP_QUERY_PARAM, JSON10.stringify(circuralFromQueryParams));
+                requestHeaders.set(Symbols__NS__old.CIRCURAL_OBJECTS_MAP_QUERY_PARAM, JSON10.stringify(circuralFromQueryParams));
+                //#endregion
             }
             //#endregion
             const httpResultObj = {
                 get received() {
-                    return rest.model(pathPrams)[method](bodyObject, [queryParams]);
+                    return rest
+                        .model(pathPrams, { headers: requestHeaders })[method](bodyObject, [queryParams]);
                 },
                 request(axiosConfig) {
                     return rest
-                        .model(pathPrams)[method](bodyObject, [queryParams], axiosConfig);
+                        .model(pathPrams, { headers: requestHeaders })[method](bodyObject, [queryParams], axiosConfig);
                 },
             };
             return httpResultObj;
@@ -5168,10 +5226,6 @@ const singleTransform = (json) => {
 };
 //#endregion
 class EntityProcess {
-    //#region init
-    static async init(result, response) {
-        return await new EntityProcess(result, response).run();
-    }
     //#endregion
     //#region constructor
     constructor(
@@ -5245,11 +5299,15 @@ class EntityProcess {
             ].includes(className);
         // console.log('doNothing', doNothing)
         if (!doNothing) {
-            const cleaned = JSON10.cleaned(this.data, void 0, {
-                breadthWalk: true,
-                include,
+            // TODO not needed ?
+            // const cleaned = JSON10.cleaned(this.data, void 0, {
+            //   breadthWalk: true,
+            //   include,
+            // });
+            // decodeMappingForHeaderJson is handling nested objects ok
+            this.entityMapping = decodeMappingForHeaderJson(this.data, {
+                useFirstArrayItemClassNameForAllElements: !this.advancedManipulation,
             });
-            this.entityMapping = Mapping__NS__decode(cleaned, !this.advancedManipulation);
             this.response.set(Symbols__NS__old.MAPPING_CONFIG_HEADER, JSON.stringify(this.entityMapping));
             if (this.advancedManipulation) {
                 this.response.set(Symbols__NS__old.CIRCURAL_OBJECTS_MAP_BODY, JSON.stringify(this.circural));
@@ -5675,16 +5733,27 @@ function TaonEntity(options) {
     return function (constructor) {
         options = options || {};
         options.uniqueKeyProp = options.uniqueKeyProp || 'id';
+        if (!options.className) {
+            const nameForClass = constructor?.name || 'AnyClass';
+            throw `Please define 'classname' property inside decorator of class '${nameForClass}':
+
+      @TaonEntity({
+        className: '${nameForClass}'
+      })
+      class ${constructor?.name} {
+      //...
+
+      `;
+        }
         ClassHelpers__NS__setName(constructor, options?.className);
-        Mapping__NS__DefaultModelWithMapping(options?.defaultModelValues || {}, ___NS__merge(options?.defaultModelMapping || {}, (options?.defaultModelMappingDeep || {})))(constructor);
-        // TODO when entit metadata generator read use this
-        Mapping__NS__DefaultModelWithMapping(void 0, {})(constructor);
+        DefaultMapping(options?.defaultModelMapping)(constructor);
+        DefaultModel(options.defaultModelMapping)(constructor);
         Reflect.defineMetadata(Symbols__NS__metadata.options.entity, options, constructor);
         Reflect.defineMetadata(Symbols__NS__metadata.className, options?.className || constructor.name, constructor);
         //#region @websql
         Entity(options?.className)(constructor);
         //#endregion
-        CLASS.setName(constructor, options?.className); // TODO QUICK_FIX for ng2-rest
+        CLASS__NS__setName(constructor, options?.className); // TODO QUICK_FIX for ng2-rest
     };
 }
 class TaonEntityOptions extends DecoratorAbstractOpt {
@@ -7793,9 +7862,9 @@ function getFromlyConfigFor(target, options = {}) {
     if (level === maxLevel) {
         return [];
     }
-    const mapping = Mapping__NS__getModelsMapping(target);
+    const mapping = decodeMappingForHeaderJson(target);
     // console.log('mapping', mapping)
-    const fieldNames = CLASS.describeProperites(target);
+    const fieldNames = Object.keys(mapping);
     const checkExclude = ___NS__isArray(keysPathesToExclude) && keysPathesToExclude.length > 0;
     const checkInclude = ___NS__isArray(keysPathesToInclude) && keysPathesToInclude.length > 0;
     if (checkExclude && checkInclude) {
@@ -7960,7 +8029,7 @@ function getFromlyConfigFor(target, options = {}) {
                     fields.push(inputToPush(key, 'datepicker', parentModel));
                 }
                 else {
-                    const targetChild = CLASS.getBy(className);
+                    const targetChild = CLASS__NS__getBy(className);
                     if (targetChild) {
                         const ftype = findTypeForEntity(targetChild, isArray);
                         if (ftype) {
@@ -8195,5 +8264,5 @@ const TAON_FLATTEN_MAPPING = {
  * Generated bundle index. Do not edit.
  */
 
-export { BaseTaonClassesNames, Body, BooleanColumn, CURRENT_HOST_BACKEND_PORT, CURRENT_HOST_URL, ClassHelpers__NS__asyncHandler, ClassHelpers__NS__ensureClassConfig, ClassHelpers__NS__ensureMethodConfig, ClassHelpers__NS__getClassConfig, ClassHelpers__NS__getClassFnFromObject, ClassHelpers__NS__getControllerConfigs, ClassHelpers__NS__getFullInternalName, ClassHelpers__NS__getMethodsNames, ClassHelpers__NS__getName, ClassHelpers__NS__getOrginalClass, ClassHelpers__NS__getUniqueKey, ClassHelpers__NS__hasParentClassWithName, ClassHelpers__NS__isContextClassObject, ClassHelpers__NS__setName, ContextDbMigrations, ContextsEndpointStorage, ControllerConfig, Cookie, DELETE, DITaonContainer, DateTimeColumn, DecimalNumberColumn, DecoratorAbstractOpt, EndpointContext, EntityProcess, FormlyHorizontalWrapper, GET, HEAD, HTML, Header, MethodConfig, MockNamespaceIpc, MockServerIpc, MockSocketIpc, Models__NS__ClassType, Models__NS__ClassTypeKey, Models__NS__DatabaseConfig, Models__NS__DatabaseConfigTypeOrm, Models__NS__DatabasesFolder, NumberColumn, PATCH, POST, PUT, ParamConfig, Path, Query, RealtimeClient, RealtimeCore, RealtimeServer, RealtimeStrategy, RealtimeStrategyIpc, RealtimeStrategyMock, RealtimeStrategySocketIO, RealtimeSubsManager, RegisterComponentType, RegisterComponentTypeForEntity, RepeatTypeComponent, SimpleJsonColumn, String100Column, String200Column, String20Column, String45Column, String500Column, StringColumn, Symbols__NS__REALTIME, Symbols__NS__classMethodsNames, Symbols__NS__classNameStaticProperty, Symbols__NS__ctxInClassOrClassObj, Symbols__NS__fullClassNameStaticProperty, Symbols__NS__metadata, Symbols__NS__old, Symbols__NS__orignalClass, Symbols__NS__orignalClassClonesObj, TAON_CONTEXT, TAON_FLATTEN_MAPPING, TaonAdminService, TaonBaseAbstractEntity, TaonBaseAngularService, TaonBaseClass, TaonBaseContext, TaonBaseController, TaonBaseCrudController, TaonBaseCustomRepository, TaonBaseEntity, TaonBaseFileUploadMiddleware, TaonBaseInjector, TaonBaseMiddleware, TaonBaseMigration, TaonBaseProvider, TaonBaseRepository, TaonBaseSubscriberForEntity, TaonController, TaonControllerOptions, TaonEntity, TaonEntityKeysToOmitArr, TaonEntityOptions, TaonHelpers__NS__defaultType, TaonHelpers__NS__fillUpTo, TaonHelpers__NS__firstStringOrElemFromArray, TaonHelpers__NS__getExpressPath, TaonHelpers__NS__ipcKeyNameRequest, TaonHelpers__NS__ipcKeyNameResponse, TaonHelpers__NS__isGoodPath, TaonHelpers__NS__isPlainFileOrFolder, TaonHelpers__NS__parseJSONwithStringJSONs, TaonHelpers__NS__tryTransformParam, TaonHelpers__NS__websqlMocks, TaonMiddleware, TaonMiddlewareOptions, TaonMigration, TaonMigrationOptions, TaonProvider, TaonProviderOptions, TaonRepository, TaonRepositoryOptions, TaonRestResponseWrapper, TaonSubscriber, TaonSubscriberOptions, TaonTempDatabasesFolder, TaonTempRoutesFolder, Taon__NS__createContext, Taon__NS__createContextTemplate, Taon__NS__error, Taon__NS__getResponseValue, Taon__NS__init, Taon__NS__inject, Taon__NS__isBrowser, Taon__NS__isElectron, Taon__NS__isNode, Taon__NS__isWebSQL, Taon__NS__removeLoader, Validators__NS__checkIfMethodsWithReponseTYpeAlowed, Validators__NS__classNameVlidation, Validators__NS__preventUndefinedModel, Validators__NS__validateClassFunctions, apiPrefix, cloneObj, controllerConfigFrom, createContext, createContextTemplate, findTypeForEntity, getFromlyConfigFor, getRegisteredComponents, getResponseValue, getTransformFunction, inject, singleTransform, typeFromEntity, typeFromName };
+export { BaseTaonClassesNames, Body, BooleanColumn, CURRENT_HOST_BACKEND_PORT, CURRENT_HOST_URL, ClassHelpers__NS__asyncHandler, ClassHelpers__NS__ensureClassConfig, ClassHelpers__NS__ensureMethodConfig, ClassHelpers__NS__getClassConfig, ClassHelpers__NS__getClassFnFromObject, ClassHelpers__NS__getControllerConfigs, ClassHelpers__NS__getFullInternalName, ClassHelpers__NS__getMethodsNames, ClassHelpers__NS__getName, ClassHelpers__NS__getOrginalClass, ClassHelpers__NS__getUniqueKey, ClassHelpers__NS__hasParentClassWithName, ClassHelpers__NS__isContextClassObject, ClassHelpers__NS__setName, ContextDbMigrations, ContextsEndpointStorage, ControllerConfig, Cookie, DELETE, DITaonContainer, DateTimeColumn, DecimalNumberColumn, DecoratorAbstractOpt, EndpointContext, EntityProcess, FormlyHorizontalWrapper, GET, HEAD, HTML, Header, MethodConfig, MockNamespaceIpc, MockServerIpc, MockSocketIpc, Models__NS__ClassType, Models__NS__ClassTypeKey, Models__NS__DatabaseConfig, Models__NS__DatabaseConfigTypeOrm, Models__NS__DatabasesFolder, NumberColumn, PATCH, POST, PUT, ParamConfig, Path, Query, RealtimeClient, RealtimeCore, RealtimeServer, RealtimeStrategy, RealtimeStrategyIpc, RealtimeStrategyMock, RealtimeStrategySocketIO, RealtimeSubsManager, RegisterComponentType, RegisterComponentTypeForEntity, RepeatTypeComponent, SimpleJsonColumn, String100Column, String200Column, String20Column, String45Column, String500Column, StringColumn, Symbols__NS__REALTIME, Symbols__NS__classMethodsNames, Symbols__NS__ctxInClassOrClassObj, Symbols__NS__fullClassNameStaticProperty, Symbols__NS__metadata, Symbols__NS__old, Symbols__NS__orignalClassClonesObj, TAON_CONTEXT, TAON_FLATTEN_MAPPING, TaonAdminService, TaonBaseAbstractEntity, TaonBaseAngularService, TaonBaseClass, TaonBaseContext, TaonBaseController, TaonBaseCrudController, TaonBaseCustomRepository, TaonBaseEntity, TaonBaseFileUploadMiddleware, TaonBaseInjector, TaonBaseMiddleware, TaonBaseMigration, TaonBaseProvider, TaonBaseRepository, TaonBaseSubscriberForEntity, TaonController, TaonControllerOptions, TaonEntity, TaonEntityKeysToOmitArr, TaonEntityOptions, TaonHelpers__NS__defaultType, TaonHelpers__NS__fillUpTo, TaonHelpers__NS__firstStringOrElemFromArray, TaonHelpers__NS__getExpressPath, TaonHelpers__NS__ipcKeyNameRequest, TaonHelpers__NS__ipcKeyNameResponse, TaonHelpers__NS__isGoodPath, TaonHelpers__NS__isPlainFileOrFolder, TaonHelpers__NS__parseJSONwithStringJSONs, TaonHelpers__NS__tryTransformParam, TaonHelpers__NS__websqlMocks, TaonMiddleware, TaonMiddlewareOptions, TaonMigration, TaonMigrationOptions, TaonProvider, TaonProviderOptions, TaonRepository, TaonRepositoryOptions, TaonRestResponseWrapper, TaonSubscriber, TaonSubscriberOptions, TaonTempDatabasesFolder, TaonTempRoutesFolder, Taon__NS__createContext, Taon__NS__createContextTemplate, Taon__NS__error, Taon__NS__getResponseValue, Taon__NS__init, Taon__NS__inject, Taon__NS__isBrowser, Taon__NS__isElectron, Taon__NS__isNode, Taon__NS__isWebSQL, Taon__NS__removeLoader, Validators__NS__checkIfMethodsWithReponseTYpeAlowed, Validators__NS__classNameVlidation, Validators__NS__preventUndefinedModel, Validators__NS__validateClassFunctions, apiPrefix, cloneObj, controllerConfigFrom, createContext, createContextTemplate, findTypeForEntity, getFromlyConfigFor, getRegisteredComponents, getResponseValue, getTransformFunction, inject, singleTransform, typeFromEntity, typeFromName };
 //# sourceMappingURL=taon-websql.mjs.map