ng2-rest 19.0.46 → 19.0.47

package/websql/fesm2022/ng2-rest.mjs

@@ -1,5 +1,5 @@
 import { from, firstValueFrom, Subject, Observable } from 'rxjs';
-import { _, UtilsOs, CoreHelpers, Helpers as Helpers$1 } from 'tnp-core/websql';
+import { _, UtilsOs, CoreHelpers, CoreModels, Helpers as Helpers$1 } from 'tnp-core/websql';
 import { diffChars } from 'diff';
 import { Log, Level } from 'ng2-logger/websql';
 import { walk } from 'lodash-walk-object/websql';
@@ -643,6 +643,12 @@ const buildInterceptorChain = (interceptors, backend) => {
 };
 
 /* */
+class RestCommonHttpResponseWrapper {
+}
+class RestResponseWrapper extends RestCommonHttpResponseWrapper {
+}
+class RestErrorResponseWrapper extends RestCommonHttpResponseWrapper {
+}
 // const log = Log.create('rest namespace', Level.__NOTHING)
 var Models;
 (function (Models) {
@@ -651,11 +657,19 @@ var Models;
     Models.ParamConfig = Models$1.ParamConfig;
     [];
     class BaseBody {
-        toJSON(data, isJSONArray = false) {
-            let r = isJSONArray ? [] : {};
+        toJSON(data, opt) {
+            opt = opt || { isJSONArray: false };
+            let r = opt.isJSONArray ? [] : {};
             if (typeof data === 'string') {
                 try {
-                    r = JSON.parse(data);
+                    let parsed = JSON.parse(data);
+                    if (typeof parsed === 'string' && parsed.trim().startsWith('{')) {
+                        parsed = JSON.parse(parsed);
+                    }
+                    if (opt.parsingError && parsed[CoreModels.TaonHttpErrorCustomProp]) {
+                        return _.merge(new RestErrorResponseWrapper(), parsed);
+                    }
+                    return parsed;
                 }
                 catch (e) { }
             }
@@ -689,7 +703,7 @@ var Models;
         }
         get rawJson() {
             if (!Helpers$1.isBlob(this.responseText)) {
-                let res = this.toJSON(this.responseText, this.isArray);
+                let res = this.toJSON(this.responseText, { isJSONArray: this.isArray });
                 if (this.circular && Array.isArray(this.circular)) {
                     res = JSON10.parse(JSON.stringify(res), this.circular);
                 }
@@ -705,10 +719,12 @@ var Models;
                 return this.entity(); // @LAST
             }
             if (this.entity && typeof this.entity === 'object') {
-                const json = this.toJSON(this.responseText, this.isArray);
+                const json = this.toJSON(this.responseText, {
+                    isJSONArray: this.isArray,
+                });
                 return Mapping.encode(json, this.entity, this.circular);
             }
-            let res = this.toJSON(this.responseText, this.isArray);
+            let res = this.toJSON(this.responseText, { isJSONArray: this.isArray });
             if (this.circular && Array.isArray(this.circular)) {
                 res = JSON10.parse(JSON.stringify(res), this.circular);
             }
@@ -732,7 +748,7 @@ var Models;
             this.data = data;
         }
         get json() {
-            return this.toJSON(this.data);
+            return this.toJSON(this.data, { parsingError: true });
         }
         get text() {
             return this.data;
@@ -791,17 +807,6 @@ var Models;
         }
     }
     Models.HttpResponse = HttpResponse;
-    class HttpResponseError extends BaseResponse {
-        // public tryRecconect() {
-        // }
-        constructor(message, responseText, headers, statusCode, jobid) {
-            super(responseText, headers, statusCode);
-            this.message = message;
-            this.jobid = jobid;
-            this.body = new ErrorBody(responseText);
-        }
-    }
-    Models.HttpResponseError = HttpResponseError;
     /* */
     /* */
     /* */
@@ -809,6 +814,17 @@ var Models;
     /* */
     /* */
 })(Models || (Models = {}));
+class HttpResponseError extends Models.BaseResponse {
+    // public tryRecconect() {
+    // }
+    constructor(message, responseText, headers, statusCode, jobid, sourceRequest) {
+        super(responseText, headers, statusCode);
+        this.message = message;
+        this.jobid = jobid;
+        this.sourceRequest = sourceRequest;
+        this.body = new Models.ErrorBody(responseText);
+    }
+}
 
 class RestHeaders {
     static from(headers) {
@@ -991,7 +1007,7 @@ class RestRequest {
         }
         // error no internet
         if (res.error) {
-            this.subjectInuUse[jobid].error(new Models.HttpResponseError(res.error, res.data, res.headers, res.code, jobid));
+            this.subjectInuUse[jobid].error(new HttpResponseError(res.error, res.data, res.headers, res.code, jobid, sourceRequest));
             return;
         }
         const entity = this.meta[jobid].entity;
@@ -1086,6 +1102,7 @@ class RestRequest {
             if (this.subjectInuUse[jobid][isCanceled]) {
                 return;
             }
+            // handle normal request
             this.handlerResult({
                 res: {
                     code: response.status,
@@ -1129,6 +1146,7 @@ class RestRequest {
             const error = catchedError && catchedError.response
                 ? `[${catchedError.response.statusText}]: `
                 : '';
+            // handle error request
             this.handlerResult({
                 res: {
                     code: catchedError && catchedError.response
@@ -1279,6 +1297,7 @@ class RestRequest {
             let callbackMethodName = 'cb_' + num;
             let win = globalThis; // TODO not a good idea! @LAST
             win[callbackMethodName] = data => {
+                // handle jsonp result data
                 this.handlerResult({
                     res: {
                         data,
@@ -1779,5 +1798,5 @@ class SimpleResource {
  * Generated bundle index. Do not edit.
  */
 
-export { AxiosBackendHandler, CONTENT_TYPE, Helpers, Mapping, Models, Resource, Rest, RestHeaders, SimpleResource, buildInterceptorChain, interpolateParamsToUrl };
+export { AxiosBackendHandler, CONTENT_TYPE, Helpers, HttpResponseError, Mapping, Models, Resource, Rest, RestErrorResponseWrapper, RestHeaders, RestResponseWrapper, SimpleResource, buildInterceptorChain, interpolateParamsToUrl };
 //# sourceMappingURL=ng2-rest.mjs.map