ng2-rest 19.0.31 → 19.0.33

package/browser/fesm2022/ng2-rest.mjs

@@ -1,12 +1,39 @@
 import { Subject, Observable, firstValueFrom } from 'rxjs';
-import { Log, Level } from 'ng2-logger/browser';
+import { _, Helpers as Helpers$1, CoreHelpers, UtilsOs } from 'tnp-core/browser';
 import { diffChars } from 'diff';
-import { _, Helpers as Helpers$1, CoreHelpers } from 'tnp-core/browser';
+import { Log, Level } from 'ng2-logger/browser';
 import { walk } from 'lodash-walk-object/browser';
 import { CLASS, SYMBOL, Models as Models$1 } from 'typescript-class-helpers/browser';
 import { JSON10 } from 'json10/browser';
 import axios from 'axios';
 
+class Cookie {
+    static get Instance() {
+        if (!Cookie.__instance) {
+            Cookie.__instance = new Cookie();
+        }
+        return Cookie.__instance;
+    }
+    constructor() {
+    }
+    read(name) {
+        var result = new RegExp('(?:^|; )' + encodeURIComponent(name) + '=([^;]*)').exec(document.cookie);
+        return result ? result[1] : null;
+    }
+    write(name, value, days) {
+        if (!days) {
+            days = 365 * 20;
+        }
+        var date = new Date();
+        date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+        var expires = "; expires=" + date.toUTCString();
+        document.cookie = name + "=" + value + expires + "; path=/";
+    }
+    remove(name) {
+        this.write(name, "", -1);
+    }
+}
+
 var Mapping;
 (function (Mapping) {
     function decode(json, autodetect = false) {
@@ -290,14 +317,14 @@ class Helpers extends CoreHelpers {
     }
 }
 
-const log$3 = Log.create('[ng2-rest] params', Level.__NOTHING);
+const log = Log.create('[ng2-rest] params', Level.__NOTHING);
 /** check if string is a valid pattern */
 function isValid(pattern) {
     return (new RegExp('\/:[a-zA-Z]*', 'g')).test(pattern.replace('://', ''));
 }
 function check(url, pattern) {
     if (!Helpers.checkValidUrl(url)) {
-        log$3.error(`Incorrect url: ${url}`);
+        log.error(`Incorrect url: ${url}`);
         return false;
     }
     if (url.charAt(url.length - 1) === '/')
@@ -728,170 +755,7 @@ class RestHeaders {
     }
 }
 
-const CONTENT_TYPE = {
-    APPLICATION_JSON: RestHeaders.from({
-        'Content-Type': 'application/json',
-        'Accept': 'application/json'
-    }),
-    APPLICATINO_VND_API_JSON: RestHeaders.from({
-        'Content-Type': 'application/vnd.api+json',
-        'Accept': 'application/vnd.api+json'
-    }),
-};
-
-//#endregion
-class Rest {
-    mock(mock) {
-        if ((typeof mock === 'function') || (typeof mock === 'object')) {
-            this.mockHttp = mock;
-        }
-        else {
-            throw `[ng2-rest]
-      .model(...)
-      .mock( < BAD MOCK DATA > )
-      ...
-      `;
-        }
-        return this;
-    }
-    get endpoint() {
-        let e = this.__meta_endpoint;
-        if (this.restQueryParams !== void 0 && this._endpointRest !== void 0
-            && typeof this._endpointRest === 'string' && this._endpointRest.trim() !== '')
-            e = this._endpointRest;
-        return e;
-    }
-    set __rest_endpoint(endpoint) {
-        this._endpointRest = endpoint;
-        if (endpoint === void 0) {
-            this.restQueryParams = void 0;
-        }
-        else {
-            this.restQueryParams = getRestParams(endpoint, this.__meta_endpoint);
-        }
-    }
-    creatUrl(params, doNotSerializeParams = false) {
-        return `${this.endpoint}${getParamsUrl(params, doNotSerializeParams)}`;
-    }
-    get headers() {
-        return this._headers;
-    }
-    constructor(endpoint, request, meta, customContentType) {
-        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);
-            },
-            head: (params = void 0, doNotSerializeParams) => {
-                return this.req('head', void 0, params, doNotSerializeParams, true);
-            },
-            post: (item, params, doNotSerializeParams) => {
-                return this.req('post', item, params, doNotSerializeParams, true);
-            },
-            put: (item, params, doNotSerializeParams) => {
-                return this.req('put', item, params, doNotSerializeParams, true);
-            },
-            patch: (item, params, doNotSerializeParams) => {
-                return this.req('patch', item, params, doNotSerializeParams, true);
-            },
-            delete: (params, doNotSerializeParams) => {
-                return this.req('delete', void 0, params, doNotSerializeParams, true);
-            },
-            jsonp: (params, doNotSerializeParams) => {
-                return this.req('jsonp', void 0, params, doNotSerializeParams, true);
-            }
-        };
-        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();
-            currentHeaderKeys
-                .filter(key => !customHeaderKeys.includes(key))
-                .forEach(key => {
-                this.customContentType.set(key, this._headers.get(key));
-            });
-            this._headers = this.customContentType;
-        }
-        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);
-    }
-    get(params, doNotSerializeParams = false) {
-        return this.req('get', void 0, params, doNotSerializeParams);
-    }
-    head(params, doNotSerializeParams = false) {
-        return this.req('head', void 0, params, doNotSerializeParams);
-    }
-    post(item, params, doNotSerializeParams = false) {
-        return this.req('post', item, params, doNotSerializeParams);
-    }
-    put(item, params, doNotSerializeParams = false) {
-        return this.req('put', item, params, doNotSerializeParams);
-    }
-    patch(item, params, doNotSerializeParams = false) {
-        return this.req('patch', item, params, doNotSerializeParams);
-    }
-    delete(params, doNotSerializeParams = false) {
-        return this.req('delete', void 0, params, doNotSerializeParams);
-    }
-    jsonp(params, doNotSerializeParams = false) {
-        return this.req('jsonp', void 0, params, doNotSerializeParams);
-    }
-}
-
-class Cookie {
-    static get Instance() {
-        if (!Cookie.__instance) {
-            Cookie.__instance = new Cookie();
-        }
-        return Cookie.__instance;
-    }
-    constructor() {
-    }
-    read(name) {
-        var result = new RegExp('(?:^|; )' + encodeURIComponent(name) + '=([^;]*)').exec(document.cookie);
-        return result ? result[1] : null;
-    }
-    write(name, value, days) {
-        if (!days) {
-            days = 365 * 20;
-        }
-        var date = new Date();
-        date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
-        var expires = "; expires=" + date.toUTCString();
-        document.cookie = name + "=" + value + expires + "; path=/";
-    }
-    remove(name) {
-        this.write(name, "", -1);
-    }
-}
-
-const log$2 = Log.create('request-cache', Level.__NOTHING);
+// const log = Log.create('request-cache', Level.__NOTHING);
 /**
  * @deprecated
  * there is Cache API for that
@@ -901,6 +765,9 @@ class RequestCache {
     static { this.cached = []; }
     static { this.isRestoredFromLocalStorage = false; }
     static restoreFromLocalStorage() {
+        if (UtilsOs.isSSRMode) {
+            return;
+        }
         if (Helpers$1.isNode) {
             return;
         }
@@ -912,24 +779,26 @@ class RequestCache {
                 try {
                     requests = JSON.parse(data);
                 }
-                catch (error) {
-                }
+                catch (error) { }
                 const restored = requests.map(r => {
-                    let { sourceRequest, responseText, body, headers, circular, entity, isArray, cookies, statusCode } = r.response;
+                    let { sourceRequest, responseText, body, headers, circular, entity, isArray, cookies, statusCode, } = r.response;
                     r.response = new Models.HttpResponse(sourceRequest, responseText, RestHeaders.from(headers), statusCode, entity, circular, -1, // jobid from local storage TODO
                     isArray);
                     r = new RequestCache(r.response);
                     r.response.rq = r;
                     return r;
                 });
-                log$2.i('RESTORED FROM LOCAL STORAGE', restored);
+                // log.i('RESTORED FROM LOCAL STORAGE', restored);
                 RequestCache.cached = restored;
             }
         }
     }
     static findBy(sourceRequest) {
-        log$2.i('findby', sourceRequest);
-        log$2.i('RequestCache.cached', RequestCache.cached);
+        if (UtilsOs.isSSRMode) {
+            return;
+        }
+        // log.i('findby', sourceRequest);
+        // log.i('RequestCache.cached', RequestCache.cached);
         RequestCache.restoreFromLocalStorage();
         return RequestCache.cached.find(c => {
             const a = c.response.sourceRequest;
@@ -948,6 +817,9 @@ class RequestCache {
         return RequestCache.cached.includes(this);
     }
     persistsInLocalStorage() {
+        if (UtilsOs.isSSRMode) {
+            return;
+        }
         localStorage.setItem(RequestCache.LOCAL_STORAGE_KEY, JSON.stringify(RequestCache.cached.map(r => {
             return {
                 response: {
@@ -958,11 +830,14 @@ class RequestCache {
                     entity: r.response.entity,
                     circular: r.response.circular,
                     isArray: r.response.isArray,
-                }
+                },
             };
         })));
     }
     store() {
+        if (UtilsOs.isSSRMode) {
+            return;
+        }
         RequestCache.restoreFromLocalStorage();
         if (!this.containsCache) {
             RequestCache.cached.push(this);
@@ -974,6 +849,9 @@ class RequestCache {
         return this;
     }
     remove() {
+        if (UtilsOs.isSSRMode) {
+            return;
+        }
         RequestCache.restoreFromLocalStorage();
         const index = RequestCache.cached.indexOf(this);
         if (index !== -1) {
@@ -1157,7 +1035,9 @@ var Models;
     /* */
 })(Models || (Models = {}));
 
-const log$1 = Log.create('[ng2-rest] rest-request', Level.__NOTHING);
+//#region imports
+//#endregion
+// const log = Log.create('[ng2-rest] rest-request', Level.__NOTHING);
 /**
  * TODO refactor this (remove jobid)
  */
@@ -1219,7 +1099,7 @@ class RestRequest {
             url,
             body,
             isArray,
-            method
+            method,
         }, jobid)) {
             return;
         }
@@ -1234,7 +1114,7 @@ class RestRequest {
                     status: mockHttp.code,
                     headers: mockHttp.headers,
                     statusText: mockHttp.error,
-                    config: {}
+                    config: {},
                 };
             }
             else if (typeof mockHttp === 'function') {
@@ -1244,15 +1124,20 @@ class RestRequest {
                     status: r.code,
                     headers: r.headers,
                     statusText: r.error,
-                    config: {}
+                    config: {},
                 };
             }
         }
         const headersJson = headers.toJSON();
-        const responseType = headersJson.responsetypeaxios ? headersJson.responsetypeaxios : 'text';
+        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({
@@ -1276,11 +1161,11 @@ class RestRequest {
                     data: response.data,
                     isArray,
                     jobid,
-                    headers: RestHeaders.from(response.headers)
+                    headers: RestHeaders.from(response.headers),
                 },
                 method,
                 jobid,
-                isArray
+                isArray,
             }, {
                 url,
                 body,
@@ -1294,7 +1179,9 @@ class RestRequest {
             }
             // console.log('ERROR RESPONESE catchedError typeof ', typeof catchedError)
             // console.log('ERROR RESPONESE catchedError', catchedError)
-            if (typeof catchedError === 'object' && catchedError.response && catchedError.response.data) {
+            if (typeof catchedError === 'object' &&
+                catchedError.response &&
+                catchedError.response.data) {
                 const err = catchedError.response.data;
                 const msg = catchedError.response.data.message || '';
                 // console.log({
@@ -1305,27 +1192,35 @@ class RestRequest {
                 errObs.next({
                     msg,
                     stack,
-                    data: catchedError.response.data
+                    data: catchedError.response.data,
                 });
             }
-            const error = (catchedError && catchedError.response) ? `[${catchedError.response.statusText}]: ` : '';
+            const error = catchedError && catchedError.response
+                ? `[${catchedError.response.statusText}]: `
+                : '';
             this.handlerResult({
                 res: {
-                    code: (catchedError && catchedError.response) ? catchedError.response.status : void 0,
+                    code: catchedError && catchedError.response
+                        ? catchedError.response.status
+                        : void 0,
                     error: `${error}${catchedError.message}`,
-                    data: (catchedError && catchedError.response) ? JSON.stringify(catchedError.response.data) : void 0,
+                    data: catchedError && catchedError.response
+                        ? JSON.stringify(catchedError.response.data)
+                        : void 0,
                     isArray,
                     jobid,
-                    headers: RestHeaders.from(catchedError && catchedError.response && catchedError.response.headers)
+                    headers: RestHeaders.from(catchedError &&
+                        catchedError.response &&
+                        catchedError.response.headers),
                 },
                 method,
                 jobid,
-                isArray
+                isArray,
             }, {
                 url,
                 body,
                 isArray,
-                method
+                method,
             });
         }
     }
@@ -1345,9 +1240,8 @@ class RestRequest {
             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)) {
+        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])) {
@@ -1357,7 +1251,8 @@ class RestRequest {
                 data: void 0,
             };
         }
-        replay = this.replaySubjects[meta.endpoint][meta.path][method][objectIDToCreateOrLast];
+        replay =
+            this.replaySubjects[meta.endpoint][meta.path][method][objectIDToCreateOrLast];
         if (!_.isNumber(replay.id)) {
             if (RestRequest.jobId === Number.MAX_SAFE_INTEGER) {
                 RestRequest.jobId = 0;
@@ -1368,7 +1263,7 @@ class RestRequest {
             subject[jobIDkey] = jobid; // modify internal rxjs subject obj
             this.meta[jobid] = meta;
             this.subjectInuUse[jobid] = subject;
-            this.subjectInuUse[jobid][customObs] = new Observable((observer) => {
+            this.subjectInuUse[jobid][customObs] = new Observable(observer => {
                 // observer.remove(() => {
                 // });
                 observer.add(() => {
@@ -1420,7 +1315,7 @@ class RestRequest {
             body,
             isArray,
             method,
-            url
+            url,
         });
         return resp;
     }
@@ -1443,30 +1338,44 @@ class RestRequest {
         return this.generalReq('patch', url, body, headers, meta, isArray, mockHttp);
     }
     jsonp(url, body, headers, meta, isArray, mockHttp) {
+        const method = 'jsonp';
+        if (UtilsOs.isSSRMode) {
+            const emptyStuff = Promise.resolve();
+            emptyStuff.observable = new Observable();
+            emptyStuff.cache = RequestCache.findBy({
+                body,
+                isArray,
+                method,
+                url,
+            });
+            console.warn(`Cannot perform jsonp request in SSR mode`);
+            return emptyStuff;
+        }
         const replay = this.getReplay('jsonp', meta, false);
         const jobid = replay.id;
-        const method = 'jsonp';
         setTimeout(() => {
             if (url.endsWith('/'))
                 url = url.slice(0, url.length - 1);
             let num = Math.round(10000 * Math.random());
-            let callbackMethodName = "cb_" + num;
-            window[callbackMethodName] = (data) => {
+            let callbackMethodName = 'cb_' + num;
+            let win = globalThis; // TODO not a good idea! @LAST
+            win[callbackMethodName] = data => {
                 if (this.checkCache({
                     url,
                     body,
                     isArray,
-                    method
+                    method,
                 }, jobid)) {
                     return;
                 }
                 this.handlerResult({
                     res: {
-                        data, isArray
+                        data,
+                        isArray,
                     },
                     method,
                     jobid,
-                    isArray
+                    isArray,
                 }, {
                     url,
                     body,
@@ -1481,12 +1390,12 @@ class RestRequest {
         });
         const resp = firstValueFrom(replay.subject[customObs]);
         resp.observable = replay.subject[customObs];
-        console.log('assiging custom observable');
+        // console.log('assiging custom observable');
         resp.cache = RequestCache.findBy({
             body,
             isArray,
             method,
-            url
+            url,
         });
         return resp;
     }
@@ -1496,8 +1405,9 @@ class RestRequest {
             console.warn(`Canno replay first ${method} request from ${meta.endpoint}/${meta.path}`);
             return;
         }
-        ;
-        if (replay && replay.subject && Array.isArray(replay.subject.observers) &&
+        if (replay &&
+            replay.subject &&
+            Array.isArray(replay.subject.observers) &&
             replay.subject.observers.length === 0) {
             console.warn(`No observators for ${method} request from ${meta.endpoint}/${meta.path}`);
             return;
@@ -1510,7 +1420,144 @@ class RestRequest {
     }
 }
 
-const log = Log.create('resouce-service', Level.__NOTHING);
+const CONTENT_TYPE = {
+    APPLICATION_JSON: RestHeaders.from({
+        'Content-Type': 'application/json',
+        'Accept': 'application/json'
+    }),
+    APPLICATINO_VND_API_JSON: RestHeaders.from({
+        'Content-Type': 'application/vnd.api+json',
+        'Accept': 'application/vnd.api+json'
+    }),
+};
+
+//#endregion
+class Rest {
+    mock(mock) {
+        if ((typeof mock === 'function') || (typeof mock === 'object')) {
+            this.mockHttp = mock;
+        }
+        else {
+            throw `[ng2-rest]
+      .model(...)
+      .mock( < BAD MOCK DATA > )
+      ...
+      `;
+        }
+        return this;
+    }
+    get endpoint() {
+        let e = this.__meta_endpoint;
+        if (this.restQueryParams !== void 0 && this._endpointRest !== void 0
+            && typeof this._endpointRest === 'string' && this._endpointRest.trim() !== '')
+            e = this._endpointRest;
+        return e;
+    }
+    set __rest_endpoint(endpoint) {
+        this._endpointRest = endpoint;
+        if (endpoint === void 0) {
+            this.restQueryParams = void 0;
+        }
+        else {
+            this.restQueryParams = getRestParams(endpoint, this.__meta_endpoint);
+        }
+    }
+    creatUrl(params, doNotSerializeParams = false) {
+        return `${this.endpoint}${getParamsUrl(params, doNotSerializeParams)}`;
+    }
+    get headers() {
+        return this._headers;
+    }
+    constructor(endpoint, request, meta, customContentType) {
+        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);
+            },
+            head: (params = void 0, doNotSerializeParams) => {
+                return this.req('head', void 0, params, doNotSerializeParams, true);
+            },
+            post: (item, params, doNotSerializeParams) => {
+                return this.req('post', item, params, doNotSerializeParams, true);
+            },
+            put: (item, params, doNotSerializeParams) => {
+                return this.req('put', item, params, doNotSerializeParams, true);
+            },
+            patch: (item, params, doNotSerializeParams) => {
+                return this.req('patch', item, params, doNotSerializeParams, true);
+            },
+            delete: (params, doNotSerializeParams) => {
+                return this.req('delete', void 0, params, doNotSerializeParams, true);
+            },
+            jsonp: (params, doNotSerializeParams) => {
+                return this.req('jsonp', void 0, params, doNotSerializeParams, true);
+            }
+        };
+        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();
+            currentHeaderKeys
+                .filter(key => !customHeaderKeys.includes(key))
+                .forEach(key => {
+                this.customContentType.set(key, this._headers.get(key));
+            });
+            this._headers = this.customContentType;
+        }
+        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);
+    }
+    get(params, doNotSerializeParams = false) {
+        return this.req('get', void 0, params, doNotSerializeParams);
+    }
+    head(params, doNotSerializeParams = false) {
+        return this.req('head', void 0, params, doNotSerializeParams);
+    }
+    post(item, params, doNotSerializeParams = false) {
+        return this.req('post', item, params, doNotSerializeParams);
+    }
+    put(item, params, doNotSerializeParams = false) {
+        return this.req('put', item, params, doNotSerializeParams);
+    }
+    patch(item, params, doNotSerializeParams = false) {
+        return this.req('patch', item, params, doNotSerializeParams);
+    }
+    delete(params, doNotSerializeParams = false) {
+        return this.req('delete', void 0, params, doNotSerializeParams);
+    }
+    jsonp(params, doNotSerializeParams = false) {
+        return this.req('jsonp', void 0, params, doNotSerializeParams);
+    }
+}
+
+//#endregion
+// const log = Log.create('resouce-service', Level.__NOTHING);
 class Resource {
     static { this._listenErrors = new Subject(); }
     static { this._listenSuccess = new Subject(); }
@@ -1522,41 +1569,6 @@ class Resource {
     }
     static { this.enableWarnings = true; }
     //#region private mthods and fields
-    getZone() {
-        const isNode = (typeof window === 'undefined');
-        if (isNode) {
-            return;
-        }
-        ;
-        const ng = window['ng'];
-        const getAllAngularRootElements = window['getAllAngularRootElements'];
-        if (!ng || !getAllAngularRootElements) {
-            return;
-        }
-        const probe = ng.probe;
-        const coreTokens = ng.coreTokens;
-        if (!coreTokens || !coreTokens.NgZone) {
-            return;
-        }
-        const zoneClass = coreTokens.NgZone;
-        if (!probe || typeof probe !== 'function' || !getAllAngularRootElements) {
-            return;
-        }
-        const angularElements = getAllAngularRootElements();
-        if (!Array.isArray(angularElements) || angularElements.length === 0) {
-            return;
-        }
-        const rootElement = ng.probe(angularElements[0]);
-        if (!rootElement) {
-            return;
-        }
-        const injector = rootElement.injector;
-        if (!injector || !injector.get || typeof injector.get !== 'function') {
-            return;
-        }
-        const zone = injector.get(zoneClass);
-        return zone;
-    }
     static initAngularNgZone(zone) {
         RestRequest.zone = zone;
     }
@@ -1595,7 +1607,7 @@ class Resource {
         const badRestRegEX = new RegExp('((\/:)[a-z]+)+', 'g');
         const matchArr = model.match(badRestRegEX) || [];
         const badModelsNextToEachOther = matchArr.join();
-        const atleas2DoubleDots = ((badModelsNextToEachOther.match(new RegExp(':', 'g')) || []).length >= 2);
+        const atleas2DoubleDots = (badModelsNextToEachOther.match(new RegExp(':', 'g')) || []).length >= 2;
         if (atleas2DoubleDots && model.search(badModelsNextToEachOther) !== -1) {
             throw new Error(`
 
@@ -1605,7 +1617,6 @@ Do not create rest models like this:    /book/author/:bookid/:authorid
 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}/`;
@@ -1616,7 +1627,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
             },
             get headers() {
                 return Resource.getModel(e, model).headers;
-            }
+            },
         };
     }
     //#endregion
@@ -1626,20 +1637,12 @@ Instead use nested approach:            /book/:bookid/author/:authorid
     }
     //#endregion
     //#region constructor
-    constructor() {
-        setTimeout(() => {
-            const zone = this.getZone();
-            if (!RestRequest.zone) {
-                RestRequest.zone = zone;
-            }
-            ;
-        });
-    }
+    constructor() { }
     //#endregion
     static { this.Cookies = Cookie.Instance; }
     //#region map
     static map(endpoint, url) {
-        log.i('url', url);
+        // log.i('url', url);
         let regex = /(http|https):\/\/(\w+:{0,1}\w*)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%!\-\/]))?/;
         let e = endpoint;
         if (!regex.test(url)) {
@@ -1647,26 +1650,29 @@ Instead use nested approach:            /book/:bookid/author/:authorid
         }
         if (url.charAt(url.length - 1) === '/')
             url = url.slice(0, url.length - 1);
-        log.i('url after', url);
+        // log.i('url after', url);
         if (Resource.endpoints[e] !== void 0) {
-            Helpers$1.log('Cannot use map function at the same API endpoint again ('
-                + Resource.endpoints[e].url + ')');
+            Helpers$1.log('Cannot use map function at the same API endpoint again (' +
+                Resource.endpoints[e].url +
+                ')');
             return false;
         }
         Resource.endpoints[e] = {
             url: url,
             models: {},
-            entity: null
+            entity: null,
         };
-        log.i('enpoints', Resource.endpoints);
+        // log.i('enpoints', Resource.endpoints);
         return true;
     }
     //#endregion
     static prepareModel(model) {
-        if (model.charAt(model.length - 1) === '/')
+        if (model.charAt(model.length - 1) === '/') {
             model = model.slice(0, model.length - 1);
-        if (model.charAt(0) === '/')
+        }
+        if (model.charAt(0) === '/') {
             model = model.slice(1, model.length);
+        }
         return model;
     }
     //#region add
@@ -1678,28 +1684,26 @@ Instead use nested approach:            /book/:bookid/author/:authorid
      * @returns {boolean}
      */
     add(endpoint, model, entity, circular, customContentType) {
-        log.i(`I am maping ${model} on ${endpoint}`);
+        // log.i(`I am maping ${model} on ${<any>endpoint}`);
         model = Resource.prepareModel(model);
         let e;
-        e = (endpoint).toString();
+        e = endpoint.toString();
         if (Resource.endpoints[e] === void 0) {
             console.error('Endpoint is not mapped ! Cannot add model ' + model);
             return;
         }
         if (Resource.endpoints[e].models[model] !== void 0) {
             if (Resource.enableWarnings)
-                console.warn(`Model '${model}' is already defined in endpoint: `
-                    + Resource.endpoints[e].url);
+                console.warn(`Model '${model}' is already defined in endpoint: ` +
+                    Resource.endpoints[e].url);
             return;
         }
-        Resource.endpoints[e].models[model] =
-            new Rest(Resource.endpoints[e].url
-                + '/' + model, Resource.request, {
-                endpoint: e,
-                path: model,
-                entity,
-                circular,
-            }, customContentType); // TODO put custom content type in meta ?
+        Resource.endpoints[e].models[model] = new Rest(Resource.endpoints[e].url + '/' + model, Resource.request, {
+            endpoint: e,
+            path: model,
+            entity,
+            circular,
+        }, customContentType); // TODO put custom content type in meta ?
         return;
     }
     //#endregion
@@ -1718,7 +1722,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
         // `)
         if (model.charAt(0) === '/')
             model = model.slice(1, model.length);
-        let e = (endpoint).toString();
+        let e = endpoint.toString();
         if (Resource.endpoints[e] === void 0) {
             throw `Endpoint: ${endpoint} is not mapped ! Cannot add model: ${model}`;
         }
@@ -1729,13 +1733,13 @@ Instead use nested approach:            /book/:bookid/author/:authorid
             // 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];
+        let res = Resource.endpoints[endpoint.toString()].models[model];
         // log.d(`
         // orgModel: ${orgModel}
         // model: ${model}
         // `)
         if (orgModel !== model) {
-            let baseUrl = Resource.endpoints[(endpoint).toString()].url;
+            let baseUrl = Resource.endpoints[endpoint.toString()].url;
             // log.d('base', Resource.endpoints[<string>(endpoint).toString()])
             // log.d('baseUrl', baseUrl)
             // log.d('orgModel', orgModel)
@@ -1744,7 +1748,6 @@ Instead use nested approach:            /book/:bookid/author/:authorid
         else {
             res.__rest_endpoint = void 0;
         }
-        ;
         // log.i(`Resource.endpoints`, Resource.endpoints)
         return res;
     }