ng2-rest 21.0.60 → 21.0.61

package/browser/types/ng2-rest-browser.d.ts

@@ -264,11 +264,6 @@ interface ResourceOptions {
         circular?: Circ[] | string;
     };
 }
-type BackendError = {
-    msg?: string;
-    stack?: string[];
-    data: any;
-};
 declare const HeaderKeyContentType = "Content-Type";
 declare const HeaderKeyAccept = "Accept";
 declare const DEFAULT_HEADERS: {
@@ -298,6 +293,7 @@ declare abstract class ResourceResponse<DATA = any, ERROR = any> implements Prom
     private _observable?;
     constructor(httpMethodName: CoreModels.HttpMethod, urlOrigin: string, urlPathname: string, options: ResourceOptions, body: DATA | DATA, urlParams: UrlParams[], axiosOptions: Ng2RestAxiosRequestConfig, isArray: boolean, headers: RestHeaders, globalInterceptors: Map<string, TaonAxiosClientInterceptor>, methodsInterceptors: Map<string, TaonAxiosClientInterceptor>);
     protected abstract makeRequest(abortSignal: AbortSignal): Promise<HttpResponse<DATA>>;
+    private makeRequestWithGlobalErrorHandling;
     /**
      * ✅ Explicit cancel (useful for "promise style")
      */
@@ -328,7 +324,7 @@ type Ng2RestAxiosRequestConfig = {
 declare namespace Resource {
     const globalInterceptors: Map<string, TaonAxiosClientInterceptor<any>>;
     const methodsInterceptors: Map<string, TaonAxiosClientInterceptor<any>>;
-    const listenErrors: Observable<BackendError>;
+    const listenErrors: Observable<any>;
     const Cookies: Cookie;
     function create<MODEL = any>(originUrl: string, pathnameModel: string, resourceOptions?: ResourceOptions): {
         model: <INTERPOLATE_ARGS = {}>(interpolateParams?: INTERPOLATE_ARGS, overrideOptions?: ResourceOptions | {

package/browser-prod/fesm2022/ng2-rest-browser-prod.mjs

@@ -9,6 +9,27 @@ import { CLASS__NS__getName, CLASS__NS__getClassNameFromObjInstanceOrClassFn, CL
 //#region constatns
 const mappingStore = new WeakMap();
 const defaultValueStore = new WeakMap();
+/**
+ * Checks whether assigning to a property would override
+ * a getter-only property somewhere in the prototype chain.
+ */
+const canAssignProperty = (target, key) => {
+    let current = target;
+    while (current) {
+        const descriptor = Object.getOwnPropertyDescriptor(current, key);
+        if (descriptor) {
+            // Accessor property
+            if ('get' in descriptor || 'set' in descriptor) {
+                return typeof descriptor.set === 'function';
+            }
+            // Normal property
+            return descriptor.writable !== false;
+        }
+        current = Object.getPrototypeOf(current);
+    }
+    // Property doesn't exist yet -> safe to create
+    return true;
+};
 //#endregion
 //#region decorators
 function DefaultMapping(mapping) {
@@ -292,6 +313,11 @@ const encodeMappingFn = (input, schema, circular, parentPath = '') => {
     }
     for (const key of Object.keys(input)) {
         const value = input[key];
+        // Don't try to overwrite getter-only / readonly properties.
+        if (!canAssignProperty(instance, key)) {
+            // console.log({keyNot:key})
+            continue;
+        }
         const fullPath = parentPath ? `${parentPath}.${key}` : key;
         const rule = schema[fullPath];
         if (!rule) {
@@ -911,6 +937,7 @@ class HttpResponseError extends BaseResponse {
         this.body = new ErrorBody(url, responseText);
     }
 }
+//#endregion
 //#region default headers
 const HeaderKeyContentType = 'Content-Type';
 const HeaderKeyAccept = 'Accept';
@@ -968,6 +995,17 @@ class ResourceResponse {
         this.methodsInterceptors = methodsInterceptors;
         this[_a] = 'Promise';
     }
+    async makeRequestWithGlobalErrorHandling(abortSignal) {
+        try {
+            return await this.makeRequest(abortSignal);
+        }
+        catch (error) {
+            // if (error instanceof HttpResponseError) {
+            listenErrorsSrc.next(error);
+            // }
+            throw error;
+        }
+    }
     /**
      * ✅ Explicit cancel (useful for "promise style")
      */
@@ -980,7 +1018,7 @@ class ResourceResponse {
     get promise() {
         if (!this._promise) {
             this._promiseAbort = new AbortController();
-            this._promise = this.makeRequest(this._promiseAbort.signal);
+            this._promise = this.makeRequestWithGlobalErrorHandling(this._promiseAbort.signal);
         }
         return this._promise;
     }
@@ -1003,18 +1041,19 @@ class ResourceResponse {
         if (!this._observable) {
             this._observable = new Observable(subscriber => {
                 const ac = new AbortController();
-                this.makeRequest(ac.signal)
+                this.makeRequestWithGlobalErrorHandling(ac.signal)
                     .then(res => {
-                    if (res instanceof HttpResponseError) {
-                        subscriber.error(res);
-                        return;
-                    }
                     subscriber.next(res);
                     subscriber.complete();
                 })
-                    .catch(err => subscriber.error(err));
+                    .catch(err => {
+                    subscriber.error(err);
+                });
                 return () => ac.abort('rxjs-unsubscribe');
-            }).pipe(shareReplay({ bufferSize: 1, refCount: true }));
+            }).pipe(shareReplay({
+                bufferSize: 1,
+                refCount: true,
+            }));
         }
         return this._observable;
     }
@@ -1084,23 +1123,6 @@ class ResourceResponseHttp extends ResourceResponse {
                 catchedError?.name === 'CanceledError') {
                 throw new HttpResponseError(url, method, JSON.stringify({ message: 'Request canceled' }), this.options, RestHeaders.from(), 0, this.isArray);
             }
-            //#region handle global error listener for notificaitons
-            if (typeof catchedError === 'object' &&
-                catchedError.response &&
-                catchedError.response.data) {
-                const err = catchedError.response.data;
-                const msg = catchedError.response.data.message || '';
-                // console.log({
-                //   'err.stack': err?.stack
-                // })
-                let stack = (err.stack || '').split('\n');
-                listenErrorsSrc.next({
-                    msg,
-                    stack,
-                    data: catchedError.response.data,
-                });
-            }
-            //#endregion
             const status = catchedError?.response?.status ?? 0; // ✅ FIX: you used "status" before defining it
             const data = catchedError?.response?.data ?? catchedError?.message ?? catchedError;
             const responseText = typeof data === 'string' ? data : JSON.stringify(data);