ng2-rest 13.1.13 → 13.2.1

package/client/fesm2020/ng2-rest.mjs

@@ -756,9 +756,11 @@ class Rest {
     get headers() {
         return this._headers;
     }
-    req(method, item, params, doNotSerializeParams = false, isArray = false) {
+    req(method, requestBody, params, doNotSerializeParams = false, isArray = false) {
         const modelUrl = this.creatUrl(params, doNotSerializeParams);
-        const body = item ? JSON.stringify(item) : void 0;
+        const body = (CLASS.getNameFromObject(requestBody) === 'FormData')
+            ? requestBody
+            : (requestBody ? JSON.stringify(requestBody) : void 0);
         if (this.customContentType) {
             const customHeaderKeys = this.customContentType.keys();
             const currentHeaderKeys = this._headers.keys();
@@ -834,6 +836,10 @@ class Cookie {
 ({}); // @--end-of-file-for-module=ng2-rest lib/cookie.ts
 
 const log$2 = Log.create('request-cache', Level.__NOTHING);
+/**
+ * @deprecated
+ * there is Cache API for that
+ */
 class RequestCache {
     constructor(response) {
         this.response = response;
@@ -951,39 +957,50 @@ var Models;
     }
     Models.BaseBody = BaseBody;
     class HttpBody extends BaseBody {
-        constructor(body, isArray = false, entity, circular) {
+        constructor(responseText, isArray = false, entity, circular) {
             super();
-            this.body = body;
+            this.responseText = responseText;
             this.isArray = isArray;
             this.entity = entity;
             this.circular = circular;
         }
+        get blob() {
+            return this.responseText;
+        }
         get booleanValue() {
-            return ['ok', 'true'].includes(this.body.trim());
+            if (!isBlob(this.responseText)) {
+                return ['ok', 'true'].includes(this.responseText.trim());
+            }
         }
         get rawJson() {
-            let res = this.toJSON(this.body, this.isArray);
-            if (this.circular && Array.isArray(this.circular)) {
-                res = JSON10.parse(JSON.stringify(res), this.circular);
+            if (!isBlob(this.responseText)) {
+                let res = this.toJSON(this.responseText, this.isArray);
+                if (this.circular && Array.isArray(this.circular)) {
+                    res = JSON10.parse(JSON.stringify(res), this.circular);
+                }
+                return res;
             }
-            return res;
         }
         get json() {
-            if (this.entity && typeof this.entity === 'function') {
-                return this.entity(); // @LAST
-            }
-            if (this.entity && typeof this.entity === 'object') {
-                const json = this.toJSON(this.body, this.isArray);
-                return Mapping.encode(json, this.entity, this.circular);
-            }
-            let res = this.toJSON(this.body, this.isArray);
-            if (this.circular && Array.isArray(this.circular)) {
-                res = JSON10.parse(JSON.stringify(res), this.circular);
+            if (!isBlob(this.responseText)) {
+                if (this.entity && typeof this.entity === 'function') {
+                    return this.entity(); // @LAST
+                }
+                if (this.entity && typeof this.entity === 'object') {
+                    const json = this.toJSON(this.responseText, this.isArray);
+                    return Mapping.encode(json, this.entity, this.circular);
+                }
+                let res = this.toJSON(this.responseText, this.isArray);
+                if (this.circular && Array.isArray(this.circular)) {
+                    res = JSON10.parse(JSON.stringify(res), this.circular);
+                }
+                return res;
             }
-            return res;
         }
         get text() {
-            return this.body.replace(/^\"/, '').replace(/\"$/, '');
+            if (!isBlob(this.responseText)) {
+                return this.responseText.replace(/^\"/, '').replace(/\"$/, '');
+            }
         }
     }
     Models.HttpBody = HttpBody;
@@ -1058,7 +1075,19 @@ var Models;
         }
     }
     Models.HttpResponseError = HttpResponseError;
+    /* */
+    /* */
+    /* */
+    /* */
+    /* */
+    /* */
 })(Models || (Models = {}));
+function isBlob(maybeBlob) {
+    if (typeof Blob === 'undefined') { // OK because there is no Blob in node
+        return false;
+    }
+    return maybeBlob instanceof Blob; // || toString.call(maybeBlob) === '[object Blob]';
+}
 ;
 ({}); // @--end-of-file-for-module=ng2-rest lib/models.ts
 
@@ -1100,7 +1129,6 @@ class RestRequest {
     checkCache(sourceRequest, jobid) {
         const existedInCache = RequestCache.findBy(sourceRequest);
         if (existedInCache) {
-            log$1.i('cache exists', existedInCache);
             const success = Resource['_listenSuccess'];
             success.next(existedInCache.response);
             this.subjectInuUse[jobid].next(existedInCache);
@@ -1143,14 +1171,16 @@ class RestRequest {
                 };
             }
         }
+        const headersJson = headers.toJSON();
+        const responseType = headersJson.responsetypeaxios ? headersJson.responsetypeaxios : 'text';
         try {
             if (!response) {
                 response = await axios({
                     url,
                     method,
                     data: body,
-                    responseType: 'text',
-                    headers: headers.toJSON(),
+                    responseType,
+                    headers: headersJson,
                     cancelToken: source.token,
                 });
             }
@@ -1160,7 +1190,7 @@ class RestRequest {
             this.handlerResult({
                 res: {
                     code: response.status,
-                    data: JSON.stringify(response.data),
+                    data: response.data,
                     isArray,
                     jobid,
                     headers: RestHeaders.from(response.headers)