ng2-rest 19.0.36 → 19.0.38

package/browser/fesm2022/ng2-rest.mjs

@@ -618,252 +618,6 @@ function prepareUrlOldWay(params) {
     return this.endpoint + '/' + params;
 }
 
-class RestHeaders {
-    static from(headers) {
-        if (!headers) {
-            return void 0;
-        }
-        return new RestHeaders(headers);
-    }
-    constructor(headers) {
-        /** @internal header names are lower case */
-        this._headers = new Map();
-        /** @internal map lower case names to actual names */
-        this._normalizedNames = new Map();
-        if (headers instanceof RestHeaders) {
-            headers.forEach((values, name) => {
-                values.forEach(value => this.set(name, value));
-            });
-        }
-        else {
-            Object.keys(headers).forEach((name) => {
-                const values = (Array.isArray(headers[name]) ? headers[name] : [headers[name]]);
-                this.delete(name);
-                values.forEach(value => this.set(name, value));
-            });
-        }
-    }
-    /**
-     * Returns a new RestHeaders instance from the given DOMString of Response RestHeaders
-     */
-    static fromResponseHeaderString(headersString) {
-        const headers = new RestHeaders();
-        // console.log({
-        //   headersString
-        // })
-        headersString.split('\n').forEach(line => {
-            const index = line.indexOf(':');
-            if (index > 0) {
-                const name = line.slice(0, index);
-                const value = line.slice(index + 1).trim();
-                headers.set(name, value);
-            }
-        });
-        return headers;
-    }
-    /**
-     * Appends a header to existing list of header values for a given header name.
-     */
-    append(name, value) {
-        const values = this.getAll(name);
-        if (values === null) {
-            this.set(name, value);
-        }
-        else {
-            values.push(value);
-        }
-    }
-    /**
-     * Deletes all header values for the given name.
-     */
-    delete(name) {
-        const lcName = name.toLowerCase();
-        this._normalizedNames.delete(lcName);
-        this._headers.delete(lcName);
-    }
-    forEach(fn) {
-        this._headers.forEach((values, lcName) => fn(values, this._normalizedNames.get(lcName), this._headers));
-    }
-    /**
-     * Returns first header that matches given name.
-     */
-    get(name) {
-        const values = this.getAll(name);
-        if (values === null) {
-            return null;
-        }
-        return values.length > 0 ? values[0] : null;
-    }
-    /**
-     * Checks for existence of header by given name.
-     */
-    has(name) { return this._headers.has(name.toLowerCase()); }
-    /**
-     * Returns the names of the headers
-     */
-    keys() { return Array.from(this._normalizedNames.values()); }
-    /**
-     * Sets or overrides header value for given name.
-     */
-    set(name, value) {
-        if (Array.isArray(value)) {
-            if (value.length) {
-                this._headers.set(name.toLowerCase(), [value.join(',')]);
-            }
-        }
-        else {
-            this._headers.set(name.toLowerCase(), [value]);
-        }
-        this.mayBeSetNormalizedName(name);
-    }
-    /**
-     * Returns values of all headers.
-     */
-    values() { return Array.from(this._headers.values()); }
-    /**
-     * 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;
-    }
-    /**
-     * Returns list of header values for a given name.
-     */
-    getAll(name) {
-        return this.has(name) ? this._headers.get(name.toLowerCase()) : null;
-    }
-    mayBeSetNormalizedName(name) {
-        const lcName = name.toLowerCase();
-        if (!this._normalizedNames.has(lcName)) {
-            this._normalizedNames.set(lcName, name);
-        }
-    }
-}
-
-// const log = Log.create('request-cache', Level.__NOTHING);
-/**
- * @deprecated
- * there is Cache API for that
- */
-class RequestCache {
-    static { this.LOCAL_STORAGE_KEY = 'ng2restrequestcache'; }
-    static { this.cached = []; }
-    static { this.isRestoredFromLocalStorage = false; }
-    static restoreFromLocalStorage() {
-        if (UtilsOs.isSSRMode) {
-            return;
-        }
-        if (Helpers$1.isNode) {
-            return;
-        }
-        if (!RequestCache.isRestoredFromLocalStorage) {
-            RequestCache.isRestoredFromLocalStorage = true;
-            const data = localStorage.getItem(RequestCache.LOCAL_STORAGE_KEY);
-            let requests = [];
-            if (data) {
-                try {
-                    requests = JSON.parse(data);
-                }
-                catch (error) { }
-                const restored = requests.map(r => {
-                    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.i('RESTORED FROM LOCAL STORAGE', restored);
-                RequestCache.cached = restored;
-            }
-        }
-    }
-    static findBy(sourceRequest) {
-        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;
-            const b = sourceRequest;
-            return (a.isArray === b.isArray &&
-                a.url === b.url &&
-                a.method === b.method &&
-                a.body === b.body);
-        });
-    }
-    constructor(response) {
-        this.response = response;
-    }
-    get containsCache() {
-        RequestCache.restoreFromLocalStorage();
-        return RequestCache.cached.includes(this);
-    }
-    persistsInLocalStorage() {
-        if (UtilsOs.isSSRMode) {
-            return;
-        }
-        localStorage.setItem(RequestCache.LOCAL_STORAGE_KEY, JSON.stringify(RequestCache.cached.map(r => {
-            return {
-                response: {
-                    sourceRequest: r.response.sourceRequest,
-                    responseText: r.response.responseText,
-                    headers: r.response.headers,
-                    statusCode: r.response.statusCode,
-                    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);
-            this.persistsInLocalStorage();
-        }
-        else {
-            console.log('already stored');
-        }
-        return this;
-    }
-    remove() {
-        if (UtilsOs.isSSRMode) {
-            return;
-        }
-        RequestCache.restoreFromLocalStorage();
-        const index = RequestCache.cached.indexOf(this);
-        if (index !== -1) {
-            RequestCache.cached.splice(index, 1);
-            this.persistsInLocalStorage();
-        }
-        else {
-            console.log('already removed');
-        }
-    }
-}
-
 /* */
 /* */
 // const log = Log.create('rest namespace', Level.__NOTHING)
@@ -976,6 +730,10 @@ var Models;
     }
     Models.BaseResponse = BaseResponse;
     class HttpResponse extends BaseResponse {
+        // public readonly TOTAL_COUNT_HEADER = 'X-Total-Count'.toLowerCase();
+        // public get totalElements(): number {
+        //     return Number(this.headers.get(this.TOTAL_COUNT_HEADER));
+        // }
         constructor(sourceRequest, responseText, headers, statusCode, entity, circular, jobid, isArray = false) {
             // console.log({
             //   sourceRequest, responseText, headers, statusCode, entity, circular, jobid, isArray
@@ -1008,12 +766,6 @@ var Models;
             }
             this.body = new HttpBody(this.responseText, this.isArray, this.entity, this.circular);
         }
-        get cache() {
-            if (_.isUndefined(this.rq)) {
-                this.rq = new RequestCache(this);
-            }
-            return new RequestCache(this);
-        }
     }
     Models.HttpResponse = HttpResponse;
     class HttpResponseError extends BaseResponse {
@@ -1035,6 +787,143 @@ var Models;
     /* */
 })(Models || (Models = {}));
 
+class RestHeaders {
+    static from(headers) {
+        if (!headers) {
+            return void 0;
+        }
+        return new RestHeaders(headers);
+    }
+    constructor(headers) {
+        /** @internal header names are lower case */
+        this._headers = new Map();
+        /** @internal map lower case names to actual names */
+        this._normalizedNames = new Map();
+        if (headers instanceof RestHeaders) {
+            headers.forEach((values, name) => {
+                values.forEach(value => this.set(name, value));
+            });
+        }
+        else {
+            Object.keys(headers).forEach((name) => {
+                const values = (Array.isArray(headers[name]) ? headers[name] : [headers[name]]);
+                this.delete(name);
+                values.forEach(value => this.set(name, value));
+            });
+        }
+    }
+    /**
+     * Returns a new RestHeaders instance from the given DOMString of Response RestHeaders
+     */
+    static fromResponseHeaderString(headersString) {
+        const headers = new RestHeaders();
+        // console.log({
+        //   headersString
+        // })
+        headersString.split('\n').forEach(line => {
+            const index = line.indexOf(':');
+            if (index > 0) {
+                const name = line.slice(0, index);
+                const value = line.slice(index + 1).trim();
+                headers.set(name, value);
+            }
+        });
+        return headers;
+    }
+    /**
+     * Appends a header to existing list of header values for a given header name.
+     */
+    append(name, value) {
+        const values = this.getAll(name);
+        if (values === null) {
+            this.set(name, value);
+        }
+        else {
+            values.push(value);
+        }
+    }
+    /**
+     * Deletes all header values for the given name.
+     */
+    delete(name) {
+        const lcName = name.toLowerCase();
+        this._normalizedNames.delete(lcName);
+        this._headers.delete(lcName);
+    }
+    forEach(fn) {
+        this._headers.forEach((values, lcName) => fn(values, this._normalizedNames.get(lcName), this._headers));
+    }
+    /**
+     * Returns first header that matches given name.
+     */
+    get(name) {
+        const values = this.getAll(name);
+        if (values === null) {
+            return null;
+        }
+        return values.length > 0 ? values[0] : null;
+    }
+    /**
+     * Checks for existence of header by given name.
+     */
+    has(name) { return this._headers.has(name.toLowerCase()); }
+    /**
+     * Returns the names of the headers
+     */
+    keys() { return Array.from(this._normalizedNames.values()); }
+    /**
+     * Sets or overrides header value for given name.
+     */
+    set(name, value) {
+        if (Array.isArray(value)) {
+            if (value.length) {
+                this._headers.set(name.toLowerCase(), [value.join(',')]);
+            }
+        }
+        else {
+            this._headers.set(name.toLowerCase(), [value]);
+        }
+        this.mayBeSetNormalizedName(name);
+    }
+    /**
+     * Returns values of all headers.
+     */
+    values() { return Array.from(this._headers.values()); }
+    /**
+     * 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;
+    }
+    /**
+     * Returns list of header values for a given name.
+     */
+    getAll(name) {
+        return this.has(name) ? this._headers.get(name.toLowerCase()) : null;
+    }
+    mayBeSetNormalizedName(name) {
+        const lcName = name.toLowerCase();
+        if (!this._normalizedNames.has(lcName)) {
+            this._normalizedNames.set(lcName, name);
+        }
+    }
+}
+
 //#region imports
 //#endregion
 // const log = Log.create('[ng2-rest] rest-request', Level.__NOTHING);
@@ -1051,6 +940,7 @@ class RestRequest {
     constructor() {
         this.subjectInuUse = {};
         this.meta = {};
+        this.interceptors = new Map();
         //#endregion
         this.replaySubjects = {};
     }
@@ -1081,28 +971,7 @@ class RestRequest {
         this.meta[jobid] = void 0;
         this.subjectInuUse[jobid].complete();
     }
-    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) {
-        if (this.checkCache({
-            url,
-            body,
-            isArray,
-            method,
-        }, jobid)) {
-            return;
-        }
         const CancelToken = axios.CancelToken;
         const source = CancelToken.source();
         this.subjectInuUse[jobid][cancelFn] = source.cancel;
@@ -1140,7 +1009,7 @@ class RestRequest {
                 /* */
                 // console.log('headers axios:', headers.toJSON())
                 // console.log({ responseType, headersJson, body, method, url })
-                response = await axios({
+                let axiosConfig = {
                     url,
                     method,
                     data: body,
@@ -1148,7 +1017,17 @@ class RestRequest {
                     headers: headersJson,
                     cancelToken: source.token,
                     // withCredentials: true, // this can be done manually
-                });
+                };
+                // console.log('AXIOS CONFIG', axiosConfig);
+                const entries = this.interceptors.entries();
+                // console.log('AXIOS INTERCEPTORS', entries);
+                for (const interceptorObj of entries) {
+                    const [interceptorName, interceptor] = interceptorObj;
+                    if (typeof interceptor === 'function') {
+                        axiosConfig = await interceptor(axiosConfig, interceptorName);
+                    }
+                }
+                response = await axios(axiosConfig);
                 // log.d(`after response of jobid: ${jobid}`);
             }
             // console.log('AXIOS RESPONES', response)
@@ -1311,12 +1190,6 @@ class RestRequest {
         })(this, url, method, headers, body, replay.id, isArray, mockHttp);
         const resp = firstValueFrom(replay.subject[customObs]);
         resp.observable = replay.subject[customObs];
-        resp.cache = RequestCache.findBy({
-            body,
-            isArray,
-            method,
-            url,
-        });
         return resp;
     }
     get(url, body, headers, meta, isArray, mockHttp) {
@@ -1342,12 +1215,6 @@ class RestRequest {
         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;
         }
@@ -1360,14 +1227,6 @@ class RestRequest {
             let callbackMethodName = 'cb_' + num;
             let win = globalThis; // TODO not a good idea! @LAST
             win[callbackMethodName] = data => {
-                if (this.checkCache({
-                    url,
-                    body,
-                    isArray,
-                    method,
-                }, jobid)) {
-                    return;
-                }
                 this.handlerResult({
                     res: {
                         data,
@@ -1390,34 +1249,8 @@ class RestRequest {
         });
         const resp = firstValueFrom(replay.subject[customObs]);
         resp.observable = replay.subject[customObs];
-        // console.log('assiging custom observable');
-        resp.cache = RequestCache.findBy({
-            body,
-            isArray,
-            method,
-            url,
-        });
         return resp;
     }
-    replay(method, meta) {
-        const replay = this.getReplay(method, meta, true);
-        if (!replay || !replay.data) {
-            console.warn(`Canno replay first ${method} request from ${meta.endpoint}/${meta.path}`);
-            return;
-        }
-        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;
-        }
-        const url = replay.data.url;
-        const headers = replay.data.headers;
-        const body = replay.data.body;
-        const isArray = replay.data.isArray;
-        setTimeout(() => this.req(url, method, headers, body, replay.id, isArray));
-    }
 }
 
 const CONTENT_TYPE = {
@@ -1476,6 +1309,7 @@ class Rest {
         //#region  constructor
         this._headers = RestHeaders.from(CONTENT_TYPE.APPLICATION_JSON);
         //#endregion
+        //#region http methods
         this.array = {
             get: (params = void 0, doNotSerializeParams) => {
                 return this.req('get', void 0, params, doNotSerializeParams, true);
@@ -1527,12 +1361,6 @@ class Rest {
         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);
     }
@@ -1622,9 +1450,6 @@ Instead use nested approach:            /book/:bookid/author/:authorid
         // if (model.charAt(model.length - 1) !== '/') model = `${model}/`;
         return {
             model: (params) => Resource.instance.api(e, interpolateParamsToUrl(params, model)),
-            replay: (method) => {
-                Resource.getModel(e, model).replay(method);
-            },
             get headers() {
                 return Resource.getModel(e, model).headers;
             },
@@ -1880,5 +1705,5 @@ class SimpleResource {
  * Generated bundle index. Do not edit.
  */
 
-export { CONTENT_TYPE, Helpers, Mapping, Models, RequestCache, Resource, Rest, RestHeaders, SimpleResource, interpolateParamsToUrl };
+export { CONTENT_TYPE, Helpers, Mapping, Models, Resource, Rest, RestHeaders, SimpleResource, interpolateParamsToUrl };
 //# sourceMappingURL=ng2-rest.mjs.map