ng2-rest 19.0.3 → 19.0.5

package/client/fesm2022/ng2-rest.mjs

@@ -10,6 +10,7 @@ import axios from 'axios';
 var Mapping;
 (function (Mapping) {
     function decode(json, autodetect = false) {
+        // console.log('DECODE isBrowser', HelpersLog.isBrowser)
         if (_.isUndefined(json)) {
             return void 0;
         }
@@ -48,6 +49,7 @@ var Mapping;
             return {};
         }
         const className = CLASS.getName(entity);
+        // console.log(`getMaping for: '${className}' `)
         let enityOWnMapping = _.isArray(entity[SYMBOL.MODELS_MAPPING]) ?
             entity[SYMBOL.MODELS_MAPPING] : [{ '': className }];
         let res = {};
@@ -56,6 +58,7 @@ var Mapping;
             .map(m => m['']);
         enityOWnMapping.reverse().forEach(m => {
             m = _.cloneDeep(m);
+            // console.log(`'${className}' m:`, m)
             Object.keys(m).forEach(key => {
                 const v = m[key];
                 const isArr = _.isArray(v);
@@ -67,6 +70,7 @@ var Mapping;
             res = _.merge(res, m);
         });
         res[''] = className;
+        // console.log(`mapping for ${className} : ${JSON.stringify(res)}`)
         return res;
     }
     Mapping.getModelsMapping = getModelsMapping;
@@ -107,6 +111,7 @@ var Mapping;
                 const v = c[p];
                 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('.');
                         getMappingNaive(elem, currentPaht, mapping, level);
                     });
@@ -135,6 +140,7 @@ var Mapping;
     }
     function setMappingCirc(json, mapping = {}, circular = []) {
         const mainClassFn = !_.isArray(json) && CLASS.getBy(mapping['']);
+        // console.log(mapping)
         walk.Object(json, (v, lodashPath, changeValue) => {
             if (!_.isUndefined(v) && !_.isNull(v)) {
                 const mappingPath = getMappingPathFrom(lodashPath);
@@ -144,6 +150,7 @@ var Mapping;
                         const className = isArray ? _.first(mapping[mappingPath]) : mapping[mappingPath];
                         const classFN = CLASS.getBy(className);
                         if (_.isFunction(classFN)) {
+                            // console.log(`mapping: '${mappingPath}', lp: '${lodashPath}' class: '${className}' , set `, v.location)
                             changeValue(_.merge(new classFN(), v));
                         }
                     }
@@ -160,6 +167,7 @@ var Mapping;
         return json;
     }
     function setMapping(json, mapping = {}) {
+        // console.log('mapping', mapping)
         if (Array.isArray(json)) {
             return json.map(j => {
                 return setMapping(j, mapping);
@@ -168,6 +176,9 @@ var Mapping;
         const mainClassFn = CLASS.getBy(mapping['']);
         for (const key in json) {
             if (json.hasOwnProperty(key)) {
+                // if (mainClassFn && mainClassFn.name === 'Project') {
+                //   // console.log(`OWn property: "${key}"`)
+                // }
                 if (_.isArray(json[key])) {
                     json[key] = json[key].map(arrObj => {
                         const objMapping = getModelsMapping(CLASS.getBy(mapping[key]));
@@ -179,11 +190,17 @@ var Mapping;
                     json[key] = setMapping(json[key], objMapping);
                 }
             }
+            // else {
+            //   if (mainClassFn && mainClassFn.name === 'Project') {
+            //     // console.log(`Not own property: "${key}"`)
+            //   }
+            // }
         }
         Object
             .keys(mapping)
             .filter(key => key !== '' && key.split('.').length >= 2)
             .forEach(lodasPath => {
+            // console.log(`Loadsh path: ${lodasPath}`)
             const objMapping = getModelsMapping(CLASS.getBy(mapping[lodasPath]));
             const input = _.get(json, lodasPath);
             if (!_.isUndefined(input)) {
@@ -222,6 +239,7 @@ var Mapping;
                 const describedTarget = CLASS
                     .describeProperites(target)
                     .filter(prop => /^([a-zA-Z0-9]|\_|\#)+$/.test(prop));
+                // console.log(`describedTarget: ${describedTarget} for ${target.name}`)
                 describedTarget.forEach(propDefInConstr => {
                     if (defaultModelValues[propDefInConstr]) {
                         console.warn(`
@@ -236,6 +254,7 @@ var Mapping;
                         toMerge[propDefInConstr] = null; // TODO from toString I can't know that
                     }
                 });
+                // console.log(`merge "${JSON.stringify(target.prototype)}" with "${JSON.stringify(defaultModelValues)}"`)
                 target[SYMBOL.DEFAULT_MODEL] = _.merge(toMerge, defaultModelValues);
                 const propsToOmmit = Object
                     .keys(target[SYMBOL.DEFAULT_MODEL])
@@ -245,13 +264,12 @@ var Mapping;
                     return !!descriptor;
                 });
                 _.merge(target.prototype, _.omit(target[SYMBOL.DEFAULT_MODEL], propsToOmmit));
+                // console.log(`DEFAULT VALUE MERGE for ${target.name}`)
             }
         };
     }
     Mapping.DefaultModelWithMapping = DefaultModelWithMapping;
 })(Mapping || (Mapping = {}));
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/mapping.ts
 
 // @ts-ignore
 class Helpers extends CoreHelpers {
@@ -271,8 +289,6 @@ class Helpers extends CoreHelpers {
         return regex.test(url);
     }
 }
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/helpers.ts
 
 const log$3 = Log.create('[ng2-rest] params', Level.__NOTHING);
 /** check if string is a valid pattern */
@@ -307,9 +323,12 @@ function getRestPramsNames(pattern) {
 function containsModels(url, models) {
     if (url.charAt(0) !== '/')
         url = '/' + url;
+    // url = url.replace(new RegExp('\/', 'g'), '');
     let res = models.filter(m => {
         let word = '/' + m;
+        // log.d('word', word)
         let iii = url.indexOf(word);
+        // log.d('iii', iii)
         if (iii + word.length < url.length && url.charAt(iii + word.length) !== '/') {
             return false;
         }
@@ -319,6 +338,7 @@ function containsModels(url, models) {
         }
         return false;
     }).length;
+    // log.d('containsModels', res);
     return res === models.length;
 }
 function stars(n) {
@@ -330,11 +350,13 @@ function stars(n) {
 function getRestParams(url, pattern) {
     let res = {};
     let models = getRestPramsNames(pattern);
+    // log.d('models', models);
     models.forEach(m => {
         pattern = pattern.replace(`:${m}`, stars(m.length));
     });
     let currentModel = void 0;
     diffChars(pattern, url).forEach(d => {
+        // log.d('d', d);
         if (d.added) {
             if (!isNaN(Number(d.value)))
                 res[currentModel] = Number(d.value);
@@ -347,6 +369,7 @@ function getRestParams(url, pattern) {
             currentModel = void 0;
         }
         let m = d.value.replace(':', "");
+        // log.d('model m', m)
         if (d.removed) {
             currentModel = models.shift();
         }
@@ -363,6 +386,7 @@ function cutUrlModel(params, models, output) {
     let m = models.pop();
     let param = m.match(/:[a-zA-Z0-9\.]+/)[0].replace(':', '');
     const paramIsPath = regexisPath.test(param);
+    // log.i('cut param', param)
     let model = m.match(/[a-zA-Z0-9]+\//)[0].replace('\/', '');
     if (params === void 0 ||
         (paramIsPath ? _.get(params, param) === void 0 : params[param] === void 0) ||
@@ -373,11 +397,13 @@ function cutUrlModel(params, models, output) {
     }
     else {
         if (paramIsPath) {
+            // log.i('param is path', param)
             let mrep = m.replace(new RegExp(`:${param}`, 'g'), `${_.get(params, param)}`);
             output.unshift(mrep);
             return cutUrlModel(params, models, output);
         }
         else {
+            // log.i('param is normal', param)
             let mrep = m.replace(new RegExp(`:${param}`, 'g'), `${params[param]}`);
             output.unshift(mrep);
             return cutUrlModel(params, models, output);
@@ -387,10 +413,13 @@ function cutUrlModel(params, models, output) {
 function interpolateParamsToUrl(params, url) {
     const regexInt = /\[\[([^\..]+\.[^\..]+)+\]\]/g;
     url = url.split('/').map(p => {
+        // log.d('url parts', p)
         let isParam = p.startsWith(':');
         if (isParam) {
             let part = p.slice(1);
+            // log.d('url param part', p)
             if (regexInt.test(part)) {
+                // let level = (url.split('.').length - 1)
                 part = part.replace('[[', '');
                 part = part.replace(']]', '');
             }
@@ -398,28 +427,35 @@ function interpolateParamsToUrl(params, url) {
         }
         return p;
     }).join('/');
+    // log.i('URL TO EXPOSE', url)
+    // log.i('params', params)
     let slash = {
         start: url.charAt(0) === '\/',
         end: url.charAt(url.length - 1) === '\/'
     };
     let morePramsOnEnd = url.match(/(\/:[a-zA-Z0-9\.]+){2,10}/g);
     if (morePramsOnEnd && (Array.isArray(morePramsOnEnd) && morePramsOnEnd.length === 1)) {
+        // log.i('morePramsOnEnd', morePramsOnEnd)
         let m = morePramsOnEnd[0];
         let match = m.match(/\/:[a-zA-Z0-9\.]+/g);
+        // log.i('match', match)
         match.forEach(e => {
             let c = e.replace('\/:', '');
+            // log.i('c', c)
             if (regexisPath.test(c)) {
                 url = url.replace(e, `/${_.get(params, c)}`);
             }
             else {
                 url = url.replace(e, `/${params[c]}`);
             }
+            // log.i('prog url', url)
         });
         return url;
     }
     let nestedParams = url.match(/[a-zA-Z0-9]+\/:[a-zA-Z0-9\.]+/g);
     if (!nestedParams || (Array.isArray(nestedParams) && nestedParams.length === 0))
         return url;
+    // check alone params
     if (!slash.end)
         url = `${url}/`;
     let addUndefinedForAlone = (!/:[a-zA-Z0-9\.]+\/$/g.test(url) && /[a-zA-Z0-9]+\/$/g.test(url));
@@ -456,12 +492,14 @@ function decodeUrl(url) {
             continue;
         }
         if (paramsObject.hasOwnProperty(p)) {
+            // chcek if property is number
             let n = Number(params[p]);
             if (!isNaN(n)) {
                 params[p] = n;
                 continue;
             }
             if (typeof params[p] === 'string') {
+                // check if property is object
                 let json;
                 try {
                     json = JSON.parse(params[p]);
@@ -471,6 +509,12 @@ function decodeUrl(url) {
                     params[p] = json;
                     continue;
                 }
+                // chcek if property value is like regular rexpression
+                // let regexExpression;
+                // try {
+                //     regexExpression = new RegExp(params[p]);
+                // } catch (e) { }
+                // if (regexExpression !== undefined) params[p] = regexExpression;
             }
         }
     }
@@ -546,8 +590,6 @@ function prepareUrlOldWay(params) {
     }
     return this.endpoint + '/' + params;
 }
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/params.ts
 
 class RestHeaders {
     static from(headers) {
@@ -579,6 +621,9 @@ class RestHeaders {
      */
     static fromResponseHeaderString(headersString) {
         const headers = new RestHeaders();
+        // console.log({
+        //   headersString
+        // })
         headersString.split('\n').forEach(line => {
             const index = line.indexOf(':');
             if (index > 0) {
@@ -651,13 +696,20 @@ class RestHeaders {
     /**
      * Returns string of all headers.
      */
+    // TODO(vicb): returns {[name: string]: string[]}
     toJSON() {
         const serialized = {};
         if (!this._headers) {
+            // debugger
         }
+        // console.log('serializing headers',this._headers)
         this._headers.forEach((values, name) => {
             const split = [];
             values.forEach(v => split.push(...v.split(',')));
+            // console.log({
+            //   values
+            // })
+            // values.forEach(v => split.push(...(v ? v : '').split(',')));
             serialized[this._normalizedNames.get(name)] = split;
         });
         return serialized;
@@ -675,8 +727,6 @@ class RestHeaders {
         }
     }
 }
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/rest-headers.ts
 
 const CONTENT_TYPE = {
     APPLICATION_JSON: RestHeaders.from({
@@ -688,8 +738,8 @@ const CONTENT_TYPE = {
         'Accept': 'application/vnd.api+json'
     }),
 };
-({}); // @--end-of-file-for-module=ng2-rest lib/content-type.ts
 
+//#endregion
 class Rest {
     mock(mock) {
         if ((typeof mock === 'function') || (typeof mock === 'object')) {
@@ -730,7 +780,10 @@ class Rest {
         this.request = request;
         this.meta = meta;
         this.customContentType = customContentType;
+        //#endregion
+        //#region  constructor
         this._headers = RestHeaders.from(CONTENT_TYPE.APPLICATION_JSON);
+        //#endregion
         this.array = {
             get: (params = void 0, doNotSerializeParams) => {
                 return this.req('get', void 0, params, doNotSerializeParams, true);
@@ -756,11 +809,14 @@ class Rest {
         };
         this.__meta_endpoint = endpoint;
     }
+    //#endregion
+    //#region  req
     req(method, requestBody, params, doNotSerializeParams = false, isArray = false) {
         const modelUrl = this.creatUrl(params, doNotSerializeParams);
         const body = (CLASS.getNameFromObject(requestBody) === 'FormData')
             ? requestBody
             : (requestBody ? JSON.stringify(requestBody) : void 0);
+        // console.log('this.customContentType', this.customContentType)
         if (this.customContentType) {
             const customHeaderKeys = this.customContentType.keys();
             const currentHeaderKeys = this._headers.keys();
@@ -774,10 +830,14 @@ class Rest {
         else {
             this._headers = RestHeaders.from(CONTENT_TYPE.APPLICATION_JSON);
         }
+        // console.log("_headers", this.headers)
         const result = this.request[method.toLowerCase()](modelUrl, body, this.headers, this.meta, isArray, this.mockHttp);
         this.mockHttp = void 0;
         return result;
     }
+    //#endregion
+    //#region http methods
+    //#region replay
     replay(method) {
         this.request.replay(method, this.meta);
     }
@@ -803,8 +863,6 @@ class Rest {
         return this.req('jsonp', void 0, params, doNotSerializeParams);
     }
 }
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/rest.class.ts
 
 class Cookie {
     static get Instance() {
@@ -832,8 +890,6 @@ class Cookie {
         this.write(name, "", -1);
     }
 }
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/cookie.ts
 
 const log$2 = Log.create('request-cache', Level.__NOTHING);
 /**
@@ -929,11 +985,10 @@ class RequestCache {
         }
     }
 }
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/request-cache.ts
 
 /* */
 /* */
+// const log = Log.create('rest namespace', Level.__NOTHING)
 var Models;
 (function (Models) {
     Models.MethodConfig = Models$1.MethodConfig;
@@ -1044,6 +1099,9 @@ var Models;
     Models.BaseResponse = BaseResponse;
     class HttpResponse extends BaseResponse {
         constructor(sourceRequest, responseText, headers, statusCode, entity, circular, jobid, isArray = false) {
+            // console.log({
+            //   sourceRequest, responseText, headers, statusCode, entity, circular, jobid, isArray
+            // })
             super(responseText, headers, statusCode, isArray);
             this.sourceRequest = sourceRequest;
             this.responseText = responseText;
@@ -1057,12 +1115,14 @@ var Models;
         }
         init() {
             if (typeof this.entity === 'string') {
+                // const headerWithMapping = headers.get(entity);
                 let entityJSON = this.headers?.getAll(this.entity);
                 if (!!entityJSON) {
                     this.entity = JSON.parse(entityJSON.join());
                 }
             }
             if (typeof this.circular === 'string') {
+                // const headerWithMapping = headers.get(circular);
                 let circuralJSON = this.headers?.getAll(this.circular);
                 if (!!circuralJSON) {
                     this.circular = JSON.parse(circuralJSON.join());
@@ -1079,6 +1139,8 @@ var Models;
     }
     Models.HttpResponse = HttpResponse;
     class HttpResponseError extends BaseResponse {
+        // public tryRecconect() {
+        // }
         constructor(message, responseText, headers, statusCode, jobid) {
             super(responseText, headers, statusCode);
             this.message = message;
@@ -1094,8 +1156,6 @@ var Models;
     /* */
     /* */
 })(Models || (Models = {}));
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/models.ts
 
 const log$1 = Log.create('[ng2-rest] rest-request', Level.__NOTHING);
 /**
@@ -1105,10 +1165,13 @@ const jobIDkey = 'jobID';
 const customObs = 'customObs';
 const cancelFn = 'cancelFn';
 const isCanceled = 'isCanceled';
+//#region mock request
+//#endregion
 class RestRequest {
     constructor() {
         this.subjectInuUse = {};
         this.meta = {};
+        //#endregion
         this.replaySubjects = {};
     }
     static { this.jobId = 0; }
@@ -1116,6 +1179,7 @@ class RestRequest {
         if (_.isUndefined(options)) {
             options = {};
         }
+        // log.d(`HANDLE RESULT (jobid:${options.jobid}) ${sourceRequest.url}`);
         const { res, jobid, isArray, method } = options;
         if (typeof res !== 'object') {
             throw new Error('No resposnse for request. ');
@@ -1123,6 +1187,7 @@ class RestRequest {
         if (Helpers$1.isBrowser) {
             res.headers = RestHeaders.from(res.headers);
         }
+        // error no internet
         if (res.error) {
             this.subjectInuUse[jobid].error(new Models.HttpResponseError(res.error, res.data, res.headers, res.code, jobid));
             return;
@@ -1139,12 +1204,14 @@ class RestRequest {
     checkCache(sourceRequest, jobid) {
         const existedInCache = RequestCache.findBy(sourceRequest);
         if (existedInCache) {
+            // log.i('cache exists', existedInCache)
             const success = Resource['_listenSuccess'];
             success.next(existedInCache.response);
             this.subjectInuUse[jobid].next(existedInCache);
             this.subjectInuUse[jobid].complete();
             return true;
         }
+        // log.i(`cache not exists for jobid ${jobid}`)
         return false;
     }
     async req(url, method, headers, body, jobid, isArray = false, mockHttp) {
@@ -1185,6 +1252,9 @@ class RestRequest {
         const responseType = headersJson.responsetypeaxios ? headersJson.responsetypeaxios : 'text';
         try {
             if (!response) {
+                // console.log(`[${method}] (jobid=${jobid}) request to:  ${url}`);
+                // console.log('headers axios:', headers.toJSON())
+                // console.log({ responseType, headersJson, body, method, url })
                 response = await axios({
                     url,
                     method,
@@ -1192,8 +1262,11 @@ class RestRequest {
                     responseType,
                     headers: headersJson,
                     cancelToken: source.token,
+                    // withCredentials: true, // this can be done manually
                 });
+                // log.d(`after response of jobid: ${jobid}`);
             }
+            // console.log('AXIOS RESPONES', response)
             if (this.subjectInuUse[jobid][isCanceled]) {
                 return;
             }
@@ -1219,9 +1292,14 @@ class RestRequest {
             if (this.subjectInuUse[jobid][isCanceled]) {
                 return;
             }
+            // console.log('ERROR RESPONESE catchedError typeof ', typeof catchedError)
+            // console.log('ERROR RESPONESE catchedError', catchedError)
             if (typeof catchedError === 'object' && catchedError.response && catchedError.response.data) {
                 const err = catchedError.response.data;
                 const msg = catchedError.response.data.message || '';
+                // console.log({
+                //   'err.stack': err?.stack
+                // })
                 let stack = (err.stack || '').split('\n');
                 const errObs = Resource['_listenErrors'];
                 errObs.next({
@@ -1253,21 +1331,27 @@ class RestRequest {
     }
     getReplay(method, meta, onlyGetLastReplayForMethod) {
         let replay;
+        //#region prevent empty tree
         if (_.isUndefined(this.replaySubjects[meta.endpoint])) {
+            // log.i(`(${meta.endpoint}) `);
             this.replaySubjects[meta.endpoint] = {};
         }
         if (_.isUndefined(this.replaySubjects[meta.endpoint][meta.path])) {
+            // log.i(`(${meta.endpoint})(${meta.path}) `);
             this.replaySubjects[meta.endpoint][meta.path] = {};
         }
         if (_.isUndefined(this.replaySubjects[meta.endpoint][meta.path][method])) {
+            // log.i(`(${meta.endpoint})(${meta.path}) `);
             this.replaySubjects[meta.endpoint][meta.path][method] = {};
         }
+        //#endregion
         const objectIDToCreateOrLast = (Object.keys(this.replaySubjects[meta.endpoint][meta.path][method]).length) +
             (onlyGetLastReplayForMethod ? 0 : 1);
         if (onlyGetLastReplayForMethod && (objectIDToCreateOrLast === 0)) {
             return replay;
         }
         if (_.isUndefined(this.replaySubjects[meta.endpoint][meta.path][method][objectIDToCreateOrLast])) {
+            // log.i(`(${meta.endpoint})(${meta.path})(${method}) `);
             this.replaySubjects[meta.endpoint][meta.path][method][objectIDToCreateOrLast] = {
                 subject: new Subject(),
                 data: void 0,
@@ -1285,7 +1369,10 @@ class RestRequest {
             this.meta[jobid] = meta;
             this.subjectInuUse[jobid] = subject;
             this.subjectInuUse[jobid][customObs] = new Observable((observer) => {
+                // observer.remove(() => {
+                // });
                 observer.add(() => {
+                    // console.log(`cancel observable job${jobid}`)
                     if (!this.subjectInuUse[jobid][isCanceled]) {
                         this.subjectInuUse[jobid][isCanceled] = true;
                         if (typeof this.subjectInuUse[jobid][cancelFn] === 'function') {
@@ -1293,6 +1380,7 @@ class RestRequest {
                         }
                     }
                     else {
+                        // console.log(`somehow second time cancel ${jobid}`)
                     }
                 });
                 const sub = subject.subscribe({
@@ -1304,13 +1392,26 @@ class RestRequest {
                     },
                 });
             });
+            //#region DISPOSE  @UNCOMMENT AFTER TESTS
+            // if (objectIDToCreateOrLast > 2) {
+            //   const oldReq: Models.ReplayData = this.replaySubjects[meta.endpoint][meta.path][method][(objectIDToCreateOrLast - 2)];
+            //   if (_.isUndefined(this.meta[oldReq.id])) {
+            //     // cant delete this - for counter purpose
+            //     this.replaySubjects[meta.endpoint][meta.path][method][(objectIDToCreateOrLast - 2)] = {};
+            //     delete this.subjectInuUse[oldReq.id];
+            //     delete this.meta[oldReq.id];
+            //   }
+            // }
+            //#endregion
         }
         return replay;
     }
+    //#region http methods
     generalReq(method, url, body, headers, meta, isArray, mockHttp) {
         const replay = this.getReplay(method, meta, false);
         replay.data = { url, body, headers, isArray };
         ((pthis, purl, pmethod, pheaders, pbody, pid, pisArray, pmockHttp) => {
+            // log.d(`for ${purl} jobid ${pid}`);
             setTimeout(() => pthis.req(purl, pmethod, pheaders, pbody, pid, pisArray, pmockHttp));
         })(this, url, method, headers, body, replay.id, isArray, mockHttp);
         const resp = firstValueFrom(replay.subject[customObs]);
@@ -1408,8 +1509,6 @@ class RestRequest {
         setTimeout(() => this.req(url, method, headers, body, replay.id, isArray));
     }
 }
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/rest-request.ts
 
 const log = Log.create('resouce-service', Level.__NOTHING);
 class Resource {
@@ -1422,6 +1521,7 @@ class Resource {
         return this._listenSuccess.asObservable();
     }
     static { this.enableWarnings = true; }
+    //#region private mthods and fields
     getZone() {
         const isNode = (typeof window === 'undefined');
         if (isNode) {
@@ -1461,6 +1561,7 @@ class Resource {
         RestRequest.zone = zone;
     }
     checkNestedModels(model, allModels) {
+        // if (model.indexOf('/') !== -1) { //TODO make this better, becouse now I unecesary checking shit
         for (let p in allModels) {
             if (allModels.hasOwnProperty(p)) {
                 let m = allModels[p];
@@ -1473,6 +1574,7 @@ class Resource {
                 }
             }
         }
+        // }
         return model;
     }
     static { this.instance = new Resource(); }
@@ -1487,6 +1589,8 @@ class Resource {
         return Resource.endpoints[endpoint].models[model];
     }
     static { this.request = new RestRequest(); }
+    //#endregion
+    //#region create
     static create(e, model, entityMapping, circular, customContentType) {
         const badRestRegEX = new RegExp('((\/:)[a-z]+)+', 'g');
         const matchArr = model.match(badRestRegEX) || [];
@@ -1504,6 +1608,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
         ;
         Resource.map(e, e);
         Resource.instance.add(e, model ? model : '', entityMapping, circular, customContentType);
+        // if (model.charAt(model.length - 1) !== '/') model = `${model}/`;
         return {
             model: (params) => Resource.instance.api(e, interpolateParamsToUrl(params, model)),
             replay: (method) => {
@@ -1514,9 +1619,13 @@ Instead use nested approach:            /book/:bookid/author/:authorid
             }
         };
     }
+    //#endregion
+    //#region reset
     static reset() {
         Resource.endpoints = {};
     }
+    //#endregion
+    //#region constructor
     constructor() {
         setTimeout(() => {
             const zone = this.getZone();
@@ -1526,7 +1635,9 @@ Instead use nested approach:            /book/:bookid/author/:authorid
             ;
         });
     }
+    //#endregion
     static { this.Cookies = Cookie.Instance; }
+    //#region map
     static map(endpoint, url) {
         log.i('url', url);
         let regex = /(http|https):\/\/(\w+:{0,1}\w*)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%!\-\/]))?/;
@@ -1550,6 +1661,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
         log.i('enpoints', Resource.endpoints);
         return true;
     }
+    //#endregion
     static prepareModel(model) {
         if (model.charAt(model.length - 1) === '/')
             model = model.slice(0, model.length - 1);
@@ -1557,6 +1669,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
             model = model.slice(1, model.length);
         return model;
     }
+    //#region add
     /**
      * And enipoint to application
      *
@@ -1589,6 +1702,8 @@ Instead use nested approach:            /book/:bookid/author/:authorid
             }, customContentType); // TODO put custom content type in meta ?
         return;
     }
+    //#endregion
+    //#region api
     /**
      * Access api throught endpoint
      *
@@ -1597,6 +1712,10 @@ Instead use nested approach:            /book/:bookid/author/:authorid
      * @returns {Rest<T, TA>}
      */
     api(endpoint, model) {
+        // log.i(`[api]
+        // creating for endpoint: "${endpoint}"
+        // model: "${model}"
+        // `)
         if (model.charAt(0) === '/')
             model = model.slice(1, model.length);
         let e = (endpoint).toString();
@@ -1607,22 +1726,37 @@ Instead use nested approach:            /book/:bookid/author/:authorid
         let orgModel = model;
         model = this.checkNestedModels(model, allModels);
         if (Resource.endpoints[e].models[model] === void 0) {
+            // log.d('Resource.endpoints', Resource.endpoints);
             throw `Model '${model}' is undefined in endpoint: ${Resource.endpoints[e].url} `;
         }
         let res = Resource.endpoints[(endpoint).toString()].models[model];
+        // log.d(`
+        // orgModel: ${orgModel}
+        // model: ${model}
+        // `)
         if (orgModel !== model) {
             let baseUrl = Resource.endpoints[(endpoint).toString()].url;
+            // log.d('base', Resource.endpoints[<string>(endpoint).toString()])
+            // log.d('baseUrl', baseUrl)
+            // log.d('orgModel', orgModel)
             res.__rest_endpoint = `${baseUrl}/${orgModel}`;
         }
         else {
             res.__rest_endpoint = void 0;
         }
         ;
+        // log.i(`Resource.endpoints`, Resource.endpoints)
         return res;
     }
 }
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/resource-service.ts
+// const res = Resource.create('')
+// res.model()
+//   .mock({
+//     code: 500,
+//     data: {},
+//     isArray: true
+//   })
+//   .array.
 
 /**
  *
@@ -1639,6 +1773,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
 class ExtendedResource {
     static { this.doNotSerializeQueryParams = false; }
     static { this.handlers = []; }
+    // add(endpoint: E, model: string, group?: string, name?: string, description?: string) { }
     constructor(endpoint, path_model) {
         this.endpoint = endpoint;
         this.path_model = path_model;
@@ -1737,11 +1872,6 @@ class SimpleResource {
         this.model = rest.model;
     }
 }
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/other/simple-resource.ts
-
-;
-({}); // @--end-of-file-for-module=ng2-rest lib/index.ts
 
 /**
  * Generated bundle index. Do not edit.