ng2-rest 13.0.18 → 13.0.21

package/browser/fesm2020/ng2-rest.mjs

@@ -722,18 +722,26 @@ class RestHeaders {
     }
 }
 
-//#endregion
-const DEFAULT_HEADERS = {
-    'Content-Type': 'application/json',
-    'Accept': 'application/json'
+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 {
-    constructor(endpoint, request, meta) {
+    constructor(endpoint, request, meta, customContentType) {
         this.request = request;
         this.meta = meta;
+        this.customContentType = customContentType;
         //#endregion
         //#region  constructor
-        this._headers = RestHeaders.from(DEFAULT_HEADERS);
+        this._headers = RestHeaders.from(CONTENT_TYPE.APPLICATION_JSON);
         //#endregion
         this.array = {
             get: (params = void 0, doNotSerializeParams) => {
@@ -800,8 +808,21 @@ class Rest {
     req(method, item, params, doNotSerializeParams = false, isArray = false) {
         const modelUrl = this.creatUrl(params, doNotSerializeParams);
         const body = item ? JSON.stringify(item) : 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);
+        }
         const result = this.request[method.toLowerCase()](modelUrl, body, this.headers, this.meta, isArray, this.mockHttp);
-        this._headers = RestHeaders.from(DEFAULT_HEADERS);
         this.mockHttp = void 0;
         return result;
     }
@@ -1177,7 +1198,8 @@ class RestRequest {
         }
         try {
             if (!response) {
-                log$1.d(`[${method}] (jobid=${jobid}) request to:  ${url}`);
+                // console.log(`[${method}] (jobid=${jobid}) request to:  ${url}`);
+                // console.log(headers.toJSON())
                 response = await axios({
                     url,
                     method,
@@ -1185,6 +1207,7 @@ class RestRequest {
                     responseType: 'text',
                     headers: headers.toJSON(),
                     cancelToken: source.token,
+                    // withCredentials: true, // this can be done manually
                 });
                 // log.d(`after response of jobid: ${jobid}`);
             }
@@ -1297,9 +1320,6 @@ class RestRequest {
                             this.subjectInuUse[jobid][cancelFn]('[ng2-rest] on purpose canceled http request');
                         }
                     }
-                    else {
-                        // console.log(`somehow second time cancel ${jobid}`)
-                    }
                 });
                 const sub = subject.subscribe({
                     next: a => observer.next(a),
@@ -1515,7 +1535,7 @@ class Resource {
     }
     //#endregion
     //#region create
-    static create(e, model, entityMapping, circular) {
+    static create(e, model, entityMapping, circular, customContentType) {
         const badRestRegEX = new RegExp('((\/:)[a-z]+)+', 'g');
         const matchArr = model.match(badRestRegEX) || [];
         const badModelsNextToEachOther = matchArr.join();
@@ -1531,7 +1551,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
         }
         ;
         Resource.map(e, e);
-        Resource.instance.add(e, model ? model : '', entityMapping, circular);
+        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)),
@@ -1588,7 +1608,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
      * @param {string} model
      * @returns {boolean}
      */
-    add(endpoint, model, entity, circular) {
+    add(endpoint, model, entity, circular, customContentType) {
         log.i(`I am maping ${model} on ${endpoint}`);
         model = Resource.prepareModel(model);
         let e;
@@ -1609,8 +1629,8 @@ Instead use nested approach:            /book/:bookid/author/:authorid
                 endpoint: e,
                 path: model,
                 entity,
-                circular
-            });
+                circular,
+            }, customContentType); // TODO put custom content type in meta ?
         return;
     }
     //#endregion
@@ -1660,10 +1680,6 @@ Instead use nested approach:            /book/:bookid/author/:authorid
         return res;
     }
 }
-Resource.DEFAULT_HEADERS = RestHeaders.from({
-    'Content-Type': 'application/json',
-    'Accept': 'application/json'
-});
 Resource._listenErrors = new Subject();
 Resource._listenSuccess = new Subject();
 Resource.enableWarnings = true;
@@ -1800,5 +1816,5 @@ SimpleResource._isSetQueryParamsSerialization = false;
  * Generated bundle index. Do not edit.
  */
 
-export { DEFAULT_HEADERS, Helpers, Mapping, Models, RequestCache, Resource, Rest, RestHeaders, SimpleResource, interpolateParamsToUrl };
+export { CONTENT_TYPE, Helpers, Mapping, Models, RequestCache, Resource, Rest, RestHeaders, SimpleResource, interpolateParamsToUrl };
 //# sourceMappingURL=ng2-rest.mjs.map