ng2-rest 19.0.37 → 19.0.39

package/browser/lib/axios-interceptors.d.ts

@@ -0,0 +1,23 @@
+// @ts-nocheck
+import { AxiosRequestConfig, AxiosResponse } from 'axios';
+import type express from 'express';
+import { Observable } from 'rxjs';
+export interface AxiosTaonHttpHandler<T = any> {
+    handle(req: AxiosRequestConfig): Observable<AxiosResponse<T>>;
+}
+export interface TaonClientMiddlewareInterceptOptions<T = any> {
+    req: AxiosRequestConfig;
+    next: AxiosTaonHttpHandler<T>;
+}
+export interface TaonServerMiddlewareInterceptOptions<T = any> {
+    req: express.Request;
+    res: express.Response;
+    next: express.NextFunction;
+}
+export interface TaonAxiosClientInterceptor<T = any> {
+    intercept(client: TaonClientMiddlewareInterceptOptions<T>): Observable<AxiosResponse<T>>;
+}
+export declare class AxiosBackendHandler<T = any> implements AxiosTaonHttpHandler<T> {
+    handle(req: AxiosRequestConfig): Observable<AxiosResponse<T>>;
+}
+export declare const buildInterceptorChain: <T = any>(interceptors: Array<TaonAxiosClientInterceptor<T>>, backend: AxiosTaonHttpHandler<T>) => AxiosTaonHttpHandler<T>;

package/browser/lib/index.d.ts

@@ -6,5 +6,6 @@ export * from './rest.class';
 export * from './rest-headers';
 export * from './helpers';
 export * from './content-type';
+export * from './axios-interceptors';
 export { SimpleResource } from './other/simple-resource';
 export { interpolateParamsToUrl } from './params';

package/browser/lib/models.d.ts

@@ -1,13 +1,14 @@
 // @ts-nocheck
+import { AxiosRequestConfig } from 'axios';
+import { Circ } from 'json10/browser';
 import { Observable } from 'rxjs';
 import { Subject } from 'rxjs';
-import { RestHeaders } from './rest-headers';
-import { Rest } from './rest.class';
+import { CoreModels } from 'tnp-core/browser';
+import { Models as HelpersModels } from 'typescript-class-helpers/browser';
 import { Cookie } from './cookie';
 import { Mapping } from './mapping';
-import { Models as HelpersModels } from 'typescript-class-helpers/browser';
-import { Circ } from 'json10/browser';
-import { CoreModels } from 'tnp-core/browser';
+import { RestHeaders } from './rest-headers';
+import { Rest } from './rest.class';
 export declare namespace Models {
     export import HttpMethod = CoreModels.HttpMethod;
     export import ParamType = CoreModels.ParamType;
@@ -41,8 +42,10 @@ export declare namespace Models {
     type PromiseObservableMix<T> = Promise<T> & {
         observable: Observable<T>;
     };
-    type MethodWithoutBody<E, T, R = PromiseObservableMix<E>> = (params?: UrlParams[], doNotSerializeParams?: boolean) => R;
-    type MethodWithBody<E, T, R = PromiseObservableMix<E>> = (item?: T, params?: UrlParams[], doNotSerializeParams?: boolean) => R;
+    type Ng2RestAxiosRequestConfig = {
+        doNotSerializeParams?: boolean;
+    } & AxiosRequestConfig<any>;
+    type MethodWithBody<E, T, R = PromiseObservableMix<E>> = (item?: T, params?: UrlParams[], axiosOptions?: Ng2RestAxiosRequestConfig) => R;
     type ReplayData = {
         subject: Subject<any>;
         data: {
@@ -69,13 +72,13 @@ export declare namespace Models {
         headers: RestHeaders;
     }
     interface Ng2RestMethods<E, T> {
-        get: MethodWithoutBody<E, T>;
+        get: MethodWithBody<E, T>;
         post: MethodWithBody<E, T>;
         put: MethodWithBody<E, T>;
         patch: MethodWithBody<E, T>;
-        head: MethodWithoutBody<E, T>;
-        delete: MethodWithoutBody<E, T>;
-        jsonp: MethodWithoutBody<E, T>;
+        head: MethodWithBody<E, T>;
+        delete: MethodWithBody<E, T>;
+        jsonp: MethodWithBody<E, T>;
     }
     type MockController = (url: string, method: CoreModels.HttpMethod, headers?: RestHeaders, body?: any) => MockResponse;
     type MockHttp = MockResponse | MockController;

package/browser/lib/other/simple-resource.d.ts

@@ -2,13 +2,13 @@
 import { Observable } from 'rxjs';
 import { Models } from '../models';
 export interface RestPromises<A, TA, QP extends Models.UrlParams> {
-    get: (queryParams?: QP) => Observable<Models.HttpResponse<A>>;
-    head: (queryParams?: QP) => Observable<Models.HttpResponse<A>>;
-    query: (queryParams?: QP) => Observable<Models.HttpResponse<TA>>;
+    get: (tem?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
+    head: (tem?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
+    query: (tem?: A, queryParams?: QP) => Observable<Models.HttpResponse<TA>>;
     put: (item?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
     patch: (item?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
     post: (item?: A, queryParams?: QP) => Observable<Models.HttpResponse<A>>;
-    delete: (queryParams?: QP) => Observable<Models.HttpResponse<A> | any>;
+    delete: (item?: A, queryParams?: QP) => Observable<Models.HttpResponse<A> | any>;
 }
 export interface Model<A, TA, RP extends Object, QP extends Models.UrlParams> {
     (restParams?: RP): RestPromises<A, TA, QP>;

package/browser/lib/rest-request.d.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { AxiosRequestConfig } from 'axios';
+import { TaonAxiosClientInterceptor } from './axios-interceptors';
 import { Models } from './models';
 import { RestHeaders } from './rest-headers';
 export declare class RestRequest {
@@ -7,17 +7,25 @@ export declare class RestRequest {
     private static jobId;
     private subjectInuUse;
     private meta;
-    interceptors: Map<string, (config: AxiosRequestConfig<any>, interceptorName?: string) => Promise<AxiosRequestConfig<any>>>;
+    /**
+     * key is interceptorName (just to identify who is intercepting)
+     */
+    interceptors: Map<string, TaonAxiosClientInterceptor<any>>;
+    /**
+     * key is a joined string METHOD-expressPath.
+     * Example `GET-/api/users`
+     */
+    methodsInterceptors: Map<string, TaonAxiosClientInterceptor<any>>;
     private handlerResult;
     private req;
     private getReplay;
     private generalReq;
-    get(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    head(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    delete(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    post(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    put(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    patch(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
-    jsonp(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp): Models.PromiseObservableMix<any>;
+    get(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    head(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    delete(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    post(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    put(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    patch(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
+    jsonp(url: string, body: string, headers: RestHeaders, meta: Models.MetaRequest, isArray: boolean, mockHttp: Models.MockHttp, axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<any>;
     private replaySubjects;
 }

package/browser/lib/rest.class.d.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { Models } from './models';
-import { RestRequest } from './rest-request';
 import { RestHeaders } from './rest-headers';
+import { RestRequest } from './rest-request';
 export declare class Rest<T, TA = T[]> implements Models.FnMethodsHttpWithMock<T, TA> {
     private request;
     private meta;
@@ -19,19 +19,19 @@ export declare class Rest<T, TA = T[]> implements Models.FnMethodsHttpWithMock<T
     constructor(endpoint: string, request: RestRequest, meta: Models.MetaRequest, customContentType: RestHeaders);
     private req;
     array: {
-        get: (params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        head: (params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        post: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        put: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        patch: (item: TA, params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        delete: (params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
-        jsonp: (params?: Models.UrlParams[], doNotSerializeParams?: boolean) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        get: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        head: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        post: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        put: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        patch: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        delete: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
+        jsonp: (item: TA, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig) => Models.PromiseObservableMix<Models.HttpResponse<TA>>;
     };
-    get(params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    head(params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    post(item: T, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    put(item: T, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    patch(item: T, params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    delete(params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
-    jsonp(params?: Models.UrlParams[], doNotSerializeParams?: boolean): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    get(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    head(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    post(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    put(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    patch(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    delete(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
+    jsonp(item: T, params?: Models.UrlParams[], axiosOptions?: Models.Ng2RestAxiosRequestConfig): Models.PromiseObservableMix<Models.HttpResponse<T>>;
 }

package/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng2-rest/browser",
-  "version": "19.0.37",
+  "version": "19.0.39",
   "module": "fesm2022/ng2-rest.mjs",
   "typings": "index.d.ts",
   "exports": {

package/lib/axios-interceptors.d.ts

@@ -0,0 +1,22 @@
+import { AxiosRequestConfig, AxiosResponse } from 'axios';
+import type express from 'express';
+import { Observable } from 'rxjs';
+export interface AxiosTaonHttpHandler<T = any> {
+    handle(req: AxiosRequestConfig): Observable<AxiosResponse<T>>;
+}
+export interface TaonClientMiddlewareInterceptOptions<T = any> {
+    req: AxiosRequestConfig;
+    next: AxiosTaonHttpHandler<T>;
+}
+export interface TaonServerMiddlewareInterceptOptions<T = any> {
+    req: express.Request;
+    res: express.Response;
+    next: express.NextFunction;
+}
+export interface TaonAxiosClientInterceptor<T = any> {
+    intercept(client: TaonClientMiddlewareInterceptOptions<T>): Observable<AxiosResponse<T>>;
+}
+export declare class AxiosBackendHandler<T = any> implements AxiosTaonHttpHandler<T> {
+    handle(req: AxiosRequestConfig): Observable<AxiosResponse<T>>;
+}
+export declare const buildInterceptorChain: <T = any>(interceptors: Array<TaonAxiosClientInterceptor<T>>, backend: AxiosTaonHttpHandler<T>) => AxiosTaonHttpHandler<T>;

package/lib/axios-interceptors.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildInterceptorChain = exports.AxiosBackendHandler = void 0;
+const axios_1 = require("axios");
+const rxjs_1 = require("rxjs");
+// Optional helper for passing around context (browser/client)
+// === Backend handler (last in chain) ===
+class AxiosBackendHandler {
+    handle(req) {
+        // axios returns a Promise; wrap as Observable
+        return (0, rxjs_1.from)(axios_1.default.request(req));
+    }
+}
+exports.AxiosBackendHandler = AxiosBackendHandler;
+// === Chain builder (request: forward order, response: reverse order) ===
+const buildInterceptorChain = (interceptors, backend) => {
+    return interceptors.reduceRight((next, interceptor) => ({
+        handle: req => interceptor.intercept({ req, next }),
+    }), backend);
+};
+exports.buildInterceptorChain = buildInterceptorChain;
+//# sourceMappingURL=axios-interceptors.js.map

package/lib/axios-interceptors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"axios-interceptors.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,iCAAiE;AAEjE,+BAAwD;AAuBxD,8DAA8D;AAE9D,0CAA0C;AAC1C,MAAa,mBAAmB;IAC9B,MAAM,CAAC,GAAuB;QAC5B,8CAA8C;QAC9C,OAAO,IAAA,WAAI,EAAC,eAAK,CAAC,OAAO,CAAI,GAAG,CAAC,CAAC,CAAC;IACrC,CAAC;CACF;AALD,kDAKC;AAED,0EAA0E;AACnE,MAAM,qBAAqB,GAAG,CACnC,YAAkD,EAClD,OAAgC,EACP,EAAE;IAC3B,OAAO,YAAY,CAAC,WAAW,CAC7B,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;QACtB,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;KACpD,CAAC,EACF,OAAO,CACR,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,qBAAqB,yBAUhC"}

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

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

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

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

package/lib/index.d.ts

@@ -5,5 +5,6 @@ export * from './rest.class';
 export * from './rest-headers';
 export * from './helpers';
 export * from './content-type';
+export * from './axios-interceptors';
 export { SimpleResource } from './other/simple-resource';
 export { interpolateParamsToUrl } from './params';

package/lib/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./rest.class"), exports);
 __exportStar(require("./rest-headers"), exports);
 __exportStar(require("./helpers"), exports);
 __exportStar(require("./content-type"), exports);
+__exportStar(require("./axios-interceptors"), exports);
 var simple_resource_1 = require("./other/simple-resource");
 Object.defineProperty(exports, "SimpleResource", { enumerable: true, get: function () { return simple_resource_1.SimpleResource; } });
 var params_1 = require("./params");

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,2CAAyB;AACzB,4CAA0B;AAC1B,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,iDAA+B;AAC/B,2DAAyD;AAAhD,iHAAA,cAAc,OAAA;AACvB,mCAAkD;AAAzC,gHAAA,sBAAsB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,2CAAyB;AACzB,4CAA0B;AAC1B,+CAA6B;AAC7B,iDAA+B;AAC/B,4CAA0B;AAC1B,iDAA+B;AAC/B,uDAAqC;AACrC,2DAAyD;AAAhD,iHAAA,cAAc,OAAA;AACvB,mCAAkD;AAAzC,gHAAA,sBAAsB,OAAA"}

package/lib/mapping.js

@@ -1,34 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Mapping = void 0;
-const lib_1 = require("tnp-core/lib");
+const node_stream_1 = require("node:stream"); // @backend
+const lib_1 = require("lodash-walk-object/lib");
 const lib_2 = require("tnp-core/lib");
-const lib_3 = require("lodash-walk-object/lib");
-const lib_4 = require("typescript-class-helpers/lib");
+const lib_3 = require("typescript-class-helpers/lib");
 var Mapping;
 (function (Mapping) {
     function decode(json, autodetect = false) {
         // console.log('DECODE isBrowser', HelpersLog.isBrowser)
-        if (lib_1._.isUndefined(json)) {
+        if (lib_2._.isUndefined(json)) {
             return void 0;
         }
-        let mapping = decodeFromDecorator(lib_1._.isArray(json) ? lib_1._.first(json) : json, !autodetect);
+        let mapping = decodeFromDecorator(lib_2._.isArray(json) ? lib_2._.first(json) : json, !autodetect);
         if (autodetect) {
-            mapping = lib_1._.merge(getMappingNaive(json), mapping);
+            mapping = lib_2._.merge(getMappingNaive(json), mapping);
         }
         return mapping;
     }
     Mapping.decode = decode;
     function encode(json, mapping, circular = []) {
-        if (lib_1._.isString(json) || lib_1._.isBoolean(json) || lib_1._.isNumber(json)) {
+        if (lib_2._.isString(json) || lib_2._.isBoolean(json) || lib_2._.isNumber(json)) {
             return json;
         }
         if (mapping['']) {
-            const decoratorMapping = getModelsMapping(lib_4.CLASS.getBy(mapping['']));
-            mapping = lib_1._.merge(mapping, decoratorMapping);
+            const decoratorMapping = getModelsMapping(lib_3.CLASS.getBy(mapping['']));
+            mapping = lib_2._.merge(mapping, decoratorMapping);
         }
         let res;
-        if (lib_1._.isArray(circular) && circular.length > 0) {
+        if (lib_2._.isArray(circular) && circular.length > 0) {
             res = setMappingCirc(json, mapping, circular);
         }
         else {
@@ -38,34 +38,35 @@ var Mapping;
     }
     Mapping.encode = encode;
     function decodeFromDecorator(json, production = false) {
-        const entityClass = lib_4.CLASS.getFromObject(json);
+        const entityClass = lib_3.CLASS.getFromObject(json);
         const mappings = getModelsMapping(entityClass);
         return mappings;
     }
     function getModelsMapping(entity) {
-        if (!lib_1._.isFunction(entity) || entity === Object) {
+        if (!lib_2._.isFunction(entity) || entity === Object) {
             return {};
         }
-        const className = lib_4.CLASS.getName(entity);
+        const className = lib_3.CLASS.getName(entity);
         // console.log(`getMaping for: '${className}' `)
-        let enityOWnMapping = lib_1._.isArray(entity[lib_4.SYMBOL.MODELS_MAPPING]) ?
-            entity[lib_4.SYMBOL.MODELS_MAPPING] : [{ '': className }];
+        let enityOWnMapping = lib_2._.isArray(entity[lib_3.SYMBOL.MODELS_MAPPING])
+            ? entity[lib_3.SYMBOL.MODELS_MAPPING]
+            : [{ '': className }];
         let res = {};
         let parents = enityOWnMapping
-            .filter(m => !lib_1._.isUndefined(m['']) && m[''] !== className)
+            .filter(m => !lib_2._.isUndefined(m['']) && m[''] !== className)
             .map(m => m['']);
         enityOWnMapping.reverse().forEach(m => {
-            m = lib_1._.cloneDeep(m);
+            m = lib_2._.cloneDeep(m);
             // console.log(`'${className}' m:`, m)
             Object.keys(m).forEach(key => {
                 const v = m[key];
-                const isArr = lib_1._.isArray(v);
-                const model = isArr ? lib_1._.first(v) : v;
+                const isArr = lib_2._.isArray(v);
+                const model = isArr ? lib_2._.first(v) : v;
                 if (parents.includes(model)) {
                     m[key] = isArr ? [className] : className;
                 }
             });
-            res = lib_1._.merge(res, m);
+            res = lib_2._.merge(res, m);
         });
         res[''] = className;
         // console.log(`mapping for ${className} : ${JSON.stringify(res)}`)
@@ -75,19 +76,22 @@ var Mapping;
     function add(o, path, mapping = {}) {
         if (!o || Array.isArray(o) || typeof o !== 'object')
             return;
-        const objectClassName = lib_4.CLASS.getName(Object.getPrototypeOf(o).constructor);
-        const resolveClass = lib_4.CLASS.getBy(objectClassName);
+        const proptotypeObj = Object.getPrototypeOf(o);
+        if (!proptotypeObj) {
+            return;
+        }
+        const objectClassName = lib_3.CLASS.getName(proptotypeObj.constructor);
+        const resolveClass = lib_3.CLASS.getBy(objectClassName);
         if (!resolveClass) {
             if (objectClassName !== 'Object') {
-                if (lib_2.Helpers.isBrowser) {
+                if (lib_2.UtilsOs.isBrowser) {
                     console.error(`Cannot resolve class "${objectClassName}" while mapping.`);
                 }
             }
             return;
         }
         if (!mapping[path])
-            mapping[path] = lib_4.CLASS.getName(resolveClass);
-        ;
+            mapping[path] = lib_3.CLASS.getName(resolveClass);
     }
     /**
      * USE ONLY IN DEVELOPMENT
@@ -97,6 +101,15 @@ var Mapping;
      * @param level
      */
     function getMappingNaive(c, path = '', mapping = {}, level = 0) {
+        if (c === null || c === undefined) {
+            return;
+        }
+        //#region @backend
+        if (c instanceof node_stream_1.Stream) {
+            return;
+        }
+        //#endregion
+        // console.log({c})
         if (Array.isArray(c)) {
             c.forEach(c => getMappingNaive(c, path, mapping, level));
             return mapping;
@@ -105,9 +118,10 @@ var Mapping;
             return;
         add(c, path, mapping);
         for (var p in c) {
-            if (c.hasOwnProperty(p)) {
+            if (lib_2._.isFunction(c.hasOwnProperty) && c.hasOwnProperty(p)) {
                 const v = c[p];
-                if (Array.isArray(v) && v.length > 0) { // reducer as impovement
+                if (Array.isArray(v) && v.length > 0) {
+                    // reducer as impovement
                     v.forEach((elem, i) => {
                         // const currentPaht = [`path[${i}]`, p].filter(c => c.trim() != '').join('.');
                         const currentPaht = [path, p].filter(c => c.trim() != '').join('.');
@@ -124,43 +138,43 @@ var Mapping;
         return mapping;
     }
     function getMappingPathFrom(pathLodhas) {
-        if (!lib_1._.isString(pathLodhas)) {
+        if (!lib_2._.isString(pathLodhas)) {
             return void 0;
         }
         const regex = /\[([0-9a-zA-Z]|\'|\")*\]/g;
-        pathLodhas = pathLodhas
-            .replace(regex, '')
-            .replace('..', '.');
+        pathLodhas = pathLodhas.replace(regex, '').replace('..', '.');
         if (pathLodhas.startsWith('.')) {
             pathLodhas = pathLodhas.slice(1);
         }
         return pathLodhas;
     }
     function setMappingCirc(json, mapping = {}, circular = []) {
-        const mainClassFn = !lib_1._.isArray(json) && lib_4.CLASS.getBy(mapping['']);
+        const mainClassFn = !lib_2._.isArray(json) && lib_3.CLASS.getBy(mapping['']);
         // console.log(mapping)
-        lib_3.walk.Object(json, (v, lodashPath, changeValue) => {
-            if (!lib_1._.isUndefined(v) && !lib_1._.isNull(v)) {
+        lib_1.walk.Object(json, (v, lodashPath, changeValue) => {
+            if (!lib_2._.isUndefined(v) && !lib_2._.isNull(v)) {
                 const mappingPath = getMappingPathFrom(lodashPath);
-                if (!lib_1._.isUndefined(mapping[mappingPath])) {
-                    const isArray = lib_1._.isArray(mapping[mappingPath]);
+                if (!lib_2._.isUndefined(mapping[mappingPath])) {
+                    const isArray = lib_2._.isArray(mapping[mappingPath]);
                     if (!isArray) {
-                        const className = isArray ? lib_1._.first(mapping[mappingPath]) : mapping[mappingPath];
-                        const classFN = lib_4.CLASS.getBy(className);
-                        if (lib_1._.isFunction(classFN)) {
+                        const className = isArray
+                            ? lib_2._.first(mapping[mappingPath])
+                            : mapping[mappingPath];
+                        const classFN = lib_3.CLASS.getBy(className);
+                        if (lib_2._.isFunction(classFN)) {
                             // console.log(`mapping: '${mappingPath}', lp: '${lodashPath}' class: '${className}' , set `, v.location)
-                            changeValue(lib_1._.merge(new classFN(), v));
+                            changeValue(lib_2._.merge(new classFN(), v));
                         }
                     }
                 }
             }
         });
         circular.forEach(c => {
-            const ref = lib_1._.get(json, c.circuralTargetPath);
-            lib_1._.set(json, c.pathToObj, ref);
+            const ref = lib_2._.get(json, c.circuralTargetPath);
+            lib_2._.set(json, c.pathToObj, ref);
         });
-        if (lib_1._.isFunction(mainClassFn)) {
-            json = lib_1._.merge(new mainClassFn(), json);
+        if (lib_2._.isFunction(mainClassFn)) {
+            json = lib_2._.merge(new mainClassFn(), json);
         }
         return json;
     }
@@ -171,20 +185,20 @@ var Mapping;
                 return setMapping(j, mapping);
             });
         }
-        const mainClassFn = lib_4.CLASS.getBy(mapping['']);
+        const mainClassFn = lib_3.CLASS.getBy(mapping['']);
         for (const key in json) {
             if (json.hasOwnProperty(key)) {
                 // if (mainClassFn && mainClassFn.name === 'Project') {
                 //   // console.log(`OWn property: "${key}"`)
                 // }
-                if (lib_1._.isArray(json[key])) {
+                if (lib_2._.isArray(json[key])) {
                     json[key] = json[key].map(arrObj => {
-                        const objMapping = getModelsMapping(lib_4.CLASS.getBy(mapping[key]));
+                        const objMapping = getModelsMapping(lib_3.CLASS.getBy(mapping[key]));
                         return setMapping(arrObj, objMapping);
                     });
                 }
-                else if (lib_1._.isObject(json[key])) {
-                    const objMapping = getModelsMapping(lib_4.CLASS.getBy(mapping[key]));
+                else if (lib_2._.isObject(json[key])) {
+                    const objMapping = getModelsMapping(lib_3.CLASS.getBy(mapping[key]));
                     json[key] = setMapping(json[key], objMapping);
                 }
             }
@@ -194,35 +208,35 @@ var Mapping;
             //   }
             // }
         }
-        Object
-            .keys(mapping)
+        Object.keys(mapping)
             .filter(key => key !== '' && key.split('.').length >= 2)
             .forEach(lodasPath => {
             // console.log(`Loadsh path: ${lodasPath}`)
-            const objMapping = getModelsMapping(lib_4.CLASS.getBy(mapping[lodasPath]));
-            const input = lib_1._.get(json, lodasPath);
-            if (!lib_1._.isUndefined(input)) {
+            const objMapping = getModelsMapping(lib_3.CLASS.getBy(mapping[lodasPath]));
+            const input = lib_2._.get(json, lodasPath);
+            if (!lib_2._.isUndefined(input)) {
                 const res = setMapping(input, objMapping);
-                lib_1._.set(json, lodasPath, res);
+                lib_2._.set(json, lodasPath, res);
             }
         });
         if (!mainClassFn) {
             return json;
         }
-        return lib_1._.merge(new mainClassFn(), json);
+        return lib_2._.merge(new mainClassFn(), json);
     }
     function DefaultModelWithMapping(defaultModelValues, mapping) {
         return function (target) {
-            if (!lib_1._.isArray(target[lib_4.SYMBOL.MODELS_MAPPING])) {
-                target[lib_4.SYMBOL.MODELS_MAPPING] = [];
+            if (!lib_2._.isArray(target[lib_3.SYMBOL.MODELS_MAPPING])) {
+                target[lib_3.SYMBOL.MODELS_MAPPING] = [];
             }
-            target[lib_4.SYMBOL.MODELS_MAPPING].push({ '': lib_4.CLASS.getName(target) });
-            if (lib_1._.isObject(mapping)) {
-                target[lib_4.SYMBOL.MODELS_MAPPING] = target[lib_4.SYMBOL.MODELS_MAPPING].concat(mapping);
-                Object.keys(mapping)
-                    .forEach(key => {
+            target[lib_3.SYMBOL.MODELS_MAPPING].push({
+                '': lib_3.CLASS.getName(target),
+            });
+            if (lib_2._.isObject(mapping)) {
+                target[lib_3.SYMBOL.MODELS_MAPPING] = target[lib_3.SYMBOL.MODELS_MAPPING].concat(mapping);
+                Object.keys(mapping).forEach(key => {
                     const v = mapping;
-                    if (lib_1._.isUndefined(v) || lib_1._.isFunction(v)) {
+                    if (lib_2._.isUndefined(v) || lib_2._.isFunction(v)) {
                         throw `
 
 
@@ -232,11 +246,9 @@ var Mapping;
                     }
                 });
             }
-            if (lib_1._.isObject(defaultModelValues)) {
+            if (lib_2._.isObject(defaultModelValues)) {
                 const toMerge = {};
-                const describedTarget = lib_4.CLASS
-                    .describeProperites(target)
-                    .filter(prop => /^([a-zA-Z0-9]|\_|\#)+$/.test(prop));
+                const describedTarget = lib_3.CLASS.describeProperites(target).filter(prop => /^([a-zA-Z0-9]|\_|\#)+$/.test(prop));
                 // console.log(`describedTarget: ${describedTarget} for ${target.name}`)
                 describedTarget.forEach(propDefInConstr => {
                     if (defaultModelValues[propDefInConstr]) {
@@ -253,15 +265,12 @@ var Mapping;
                     }
                 });
                 // console.log(`merge "${JSON.stringify(target.prototype)}" with "${JSON.stringify(defaultModelValues)}"`)
-                target[lib_4.SYMBOL.DEFAULT_MODEL] = lib_1._.merge(toMerge, defaultModelValues);
-                const propsToOmmit = Object
-                    .keys(target[lib_4.SYMBOL.DEFAULT_MODEL])
-                    .filter(key => {
-                    const descriptor = Object
-                        .getOwnPropertyDescriptor(target.prototype, key);
+                target[lib_3.SYMBOL.DEFAULT_MODEL] = lib_2._.merge(toMerge, defaultModelValues);
+                const propsToOmmit = Object.keys(target[lib_3.SYMBOL.DEFAULT_MODEL]).filter(key => {
+                    const descriptor = Object.getOwnPropertyDescriptor(target.prototype, key);
                     return !!descriptor;
                 });
-                lib_1._.merge(target.prototype, lib_1._.omit(target[lib_4.SYMBOL.DEFAULT_MODEL], propsToOmmit));
+                lib_2._.merge(target.prototype, lib_2._.omit(target[lib_3.SYMBOL.DEFAULT_MODEL], propsToOmmit));
                 // console.log(`DEFAULT VALUE MERGE for ${target.name}`)
             }
         };