ng2-rest 21.0.59 → 21.0.61

package/README.md

@@ -1,131 +1,131 @@
-
-## ng2-rest ##
-
-Robust isomorphic REST framework
-- for browser (Angular, React etc.) 
-- for backend Taon apps/libs (NodeJS/TypeScript) 
-(part of [taon.dev](https://github.com/darekf77/taon)).
-
-Features:
-- Compatible with Angular (2+) (newest 13,14 also...) , React, Vue , NodeJS (works everywhere)
-- Compatible with RxJS operators (exhaustMap, switchMap, request cancelation etc.)
-- Based on [axios](https://axios-http.com/) => excellent alternative to  Angular's [HttpClient](https://angular.io/api/common/http/HttpClient)
-- JSONP api request handling
-- Transfer class instance from server to client and back
-- Elegant way of dealing with REST api ( *similar to ExpressJS routes definitions* )
-
-(more documentation soon... )
-
-To install this package run:
-
-    npm install ng2-rest --save
-
-Import Resource class:
-```ts
-import { Resource } from 'ng2-rest/browser';
-```
-
-Resource
-========
-
-Fit you existing API (not only REST) into new fluent objects with **Resource** 
- class observables. Use power of **async** in new angular templates;
-
-**template.html**  
-```html
-Users:
-<ul   *ngIf="model.allUsers() | async; else loader; let users" >
-
-  <li  *ngFor="let user of users"> 
-  		{{user.id}} {{user.fullName()}} 
-		  <br>
-		<input type="name" [(NgModel)]="user.name" >
-		<button (click)="model.update(user)" > Update </button>
-  </li>
-
-</ul>
-
-<ng-template #loader> loading users...  </ng-template>
-
-```
-**component.ts**
-```ts
-class User {
-	name: string;
-	surname: string;
-	id: number;
-
-	fullName() {
-		return `Surname: ${this.surname}, Name: ${this.name}`;
-	}
-}
-
-// Express.js style url endpoint model
-// you can ommit "<User>" part is you don't wanna see response interface
-// also you can ommit third argument ",User" is you don't wanna
-// map response object to User class objects
-const rest = Resource.create<User>("http://yourbackend.com/api","users/:id",{'':User} )
-
-class UserComponent {
-
-   // Prepare your beautiful interface
-    model = {
-	 allUsers: () => rest.model()
-		 .array
-		 .get()
-		 .observable // Observable resposnse (useful for Angular 2+ html templates)
-     .pipe( map({ body } => body.json) ) // get all users, body.json => User[] 
-
-	 userBy: (id) => rest.model({id})
-		 .get() // Promise response by default
-		 .then({ body } => console.log(body.json)) // get user by id,  body.json => User
-
-	 update: async (user:User) =>{
-		 try {
-			await rest.model({id:user.id}).put(user) // Promise response by default
-
-			alert('Update sucess')
-		 } catch(e) {
-			alert(e)
-		 }	
-	 	}
-    }
-
-	constructor() { }
-
-}
-```
-
-Specification
-============
-Example **UrlParams[]** :
- `[ { sort: true },{ filter: 'id,5' }, { filter: 'name,test' } ]` 
- 
- 
-| Name | Parameters  | Description |
-| :---: | --- | ---: |
-| **array** |  changes response type to array |
-| **get** | `model, UrlParams[] ` |   get data  |
-| **post** | `model, UrlParams[] ` |  create data  |
-| **patch** | `model, UrlParams[] ` | change data <br>(effect of changing data may be diffrent with each request)  |
-| **put** | `model, UrlParams[]` |   change data <br>(can be done multiple times with same effect) |
-| **head** | `model, UrlParams[]` |   check data  |
-| **delete** | `model, UrlParams[] ` |   remove data |
-| **jsonp** | `model, UrlParams[] ` |   get jsonp data |
-
-
-
-# Production mode
-===
-Nice things to do in production mode:
-
-**1. Disable warnings.**
-
-If you don't wanna see warning, disable it like this:
-```ts
-if (environment.production) {
-  Resource.enableWarnings = false;
-}
-```
-
-
+
+## ng2-rest ##
+
+Robust isomorphic REST framework
+- for browser (Angular, React etc.) 
+- for backend Taon apps/libs (NodeJS/TypeScript) 
+(part of [taon.dev](https://github.com/darekf77/taon)).
+
+Features:
+- Compatible with Angular (2+) (newest 13,14 also...) , React, Vue , NodeJS (works everywhere)
+- Compatible with RxJS operators (exhaustMap, switchMap, request cancelation etc.)
+- Based on [axios](https://axios-http.com/) => excellent alternative to  Angular's [HttpClient](https://angular.io/api/common/http/HttpClient)
+- JSONP api request handling
+- Transfer class instance from server to client and back
+- Elegant way of dealing with REST api ( *similar to ExpressJS routes definitions* )
+
+(more documentation soon... )
+
+To install this package run:
+
+    npm install ng2-rest --save
+
+Import Resource class:
+```ts
+import { Resource } from 'ng2-rest/browser';
+```
+
+Resource
+========
+
+Fit you existing API (not only REST) into new fluent objects with **Resource** 
+ class observables. Use power of **async** in new angular templates;
+
+**template.html**  
+```html
+Users:
+<ul   *ngIf="model.allUsers() | async; else loader; let users" >
+
+  <li  *ngFor="let user of users"> 
+  		{{user.id}} {{user.fullName()}} 
+		  <br>
+		<input type="name" [(NgModel)]="user.name" >
+		<button (click)="model.update(user)" > Update </button>
+  </li>
+
+</ul>
+
+<ng-template #loader> loading users...  </ng-template>
+
+```
+**component.ts**
+```ts
+class User {
+	name: string;
+	surname: string;
+	id: number;
+
+	fullName() {
+		return `Surname: ${this.surname}, Name: ${this.name}`;
+	}
+}
+
+// Express.js style url endpoint model
+// you can ommit "<User>" part is you don't wanna see response interface
+// also you can ommit third argument ",User" is you don't wanna
+// map response object to User class objects
+const rest = Resource.create<User>("http://yourbackend.com/api","users/:id",{'':User} )
+
+class UserComponent {
+
+   // Prepare your beautiful interface
+    model = {
+	 allUsers: () => rest.model()
+		 .array
+		 .get()
+		 .observable // Observable resposnse (useful for Angular 2+ html templates)
+     .pipe( map({ body } => body.json) ) // get all users, body.json => User[] 
+
+	 userBy: (id) => rest.model({id})
+		 .get() // Promise response by default
+		 .then({ body } => console.log(body.json)) // get user by id,  body.json => User
+
+	 update: async (user:User) =>{
+		 try {
+			await rest.model({id:user.id}).put(user) // Promise response by default
+
+			alert('Update sucess')
+		 } catch(e) {
+			alert(e)
+		 }	
+	 	}
+    }
+
+	constructor() { }
+
+}
+```
+
+Specification
+============
+Example **UrlParams[]** :
+ `[ { sort: true },{ filter: 'id,5' }, { filter: 'name,test' } ]` 
+ 
+ 
+| Name | Parameters  | Description |
+| :---: | --- | ---: |
+| **array** |  changes response type to array |
+| **get** | `model, UrlParams[] ` |   get data  |
+| **post** | `model, UrlParams[] ` |  create data  |
+| **patch** | `model, UrlParams[] ` | change data <br>(effect of changing data may be diffrent with each request)  |
+| **put** | `model, UrlParams[]` |   change data <br>(can be done multiple times with same effect) |
+| **head** | `model, UrlParams[]` |   check data  |
+| **delete** | `model, UrlParams[] ` |   remove data |
+| **jsonp** | `model, UrlParams[] ` |   get jsonp data |
+
+
+
+# Production mode
+===
+Nice things to do in production mode:
+
+**1. Disable warnings.**
+
+If you don't wanna see warning, disable it like this:
+```ts
+if (environment.production) {
+  Resource.enableWarnings = false;
+}
+```
+
+

package/VERIFIED-BUILD-DATA.jsonc

@@ -1,5 +1,5 @@
 {
-  "commitHash": "9d17ebc4f90a7206e700d0114d220107d6e6f7ea",
-  "commitName": "release: v21.0.58",
-  "commitDate": "06-08-2026 18:20:57"
+  "commitHash": "5d3f0ee896a720b8f325c00902600faef4561220",
+  "commitName": "feat: prevent overriding getters for mapping",
+  "commitDate": "26-09-2026 22:06:37"
 }

package/bin/start.js

@@ -1,38 +1,38 @@
 global.frameworkName = 'ng2-rest';
-Error.stackTraceLimit = 100;
-global.i0 = {
-  defineInjectable: function () { }
-}
-const process= require('process');
-global.currentTaonScriptStartDateTime =  process.hrtime.bigint();
-
-process.removeAllListeners('warning');
-var argv = process.argv;
-
-global.hideLog = true;
-global.verboseLevel = 0;
-var verboseLevel = argv.find(a => a.startsWith('-verbose='));
-if (typeof verboseLevel !== 'undefined') {
-  global.hideLog = false;
-  verboseLevel = Number(verboseLevel.replace('-verbose=', ''));
-  if (!isNaN(verboseLevel)) {
-    global.verboseLevel = verboseLevel;
-  }
-  argv = argv.filter(a => !a.startsWith('-verbose='));
-}
-
-if (argv.includes('-verbose')) {
-  global.hideLog = false;
-  argv = argv.filter(a => a !== '-verbose');
-}
-
-const fs = require('fs');
-const path = require('path');
-var pathToCliJS = {
-  distDev: path.join(__dirname, '../dist/cli.js'),
-  localOrNPm: path.join(__dirname, '../cli.js')
-}
-var p = fs.existsSync(pathToCliJS.distDev) ? pathToCliJS.distDev : pathToCliJS.localOrNPm;
-global.globalSystemToolMode = true;
-var run = require(p).startCli;
+Error.stackTraceLimit = 100;
+global.i0 = {
+  defineInjectable: function () { }
+}
+const process= require('process');
+global.currentTaonScriptStartDateTime =  process.hrtime.bigint();
+
+process.removeAllListeners('warning');
+var argv = process.argv;
+
+global.hideLog = true;
+global.verboseLevel = 0;
+var verboseLevel = argv.find(a => a.startsWith('-verbose='));
+if (typeof verboseLevel !== 'undefined') {
+  global.hideLog = false;
+  verboseLevel = Number(verboseLevel.replace('-verbose=', ''));
+  if (!isNaN(verboseLevel)) {
+    global.verboseLevel = verboseLevel;
+  }
+  argv = argv.filter(a => !a.startsWith('-verbose='));
+}
+
+if (argv.includes('-verbose')) {
+  global.hideLog = false;
+  argv = argv.filter(a => a !== '-verbose');
+}
+
+const fs = require('fs');
+const path = require('path');
+var pathToCliJS = {
+  distDev: path.join(__dirname, '../dist/cli.js'),
+  localOrNPm: path.join(__dirname, '../cli.js')
+}
+var p = fs.existsSync(pathToCliJS.distDev) ? pathToCliJS.distDev : pathToCliJS.localOrNPm;
+global.globalSystemToolMode = true;
+var run = require(p).startCli;
 run(argv,__filename);

package/browser/README.md

@@ -1,24 +1,24 @@
-# MyLib
-
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 13.2.0.
-
-## Code scaffolding
-
-Run `ng generate component component-name --project my-lib` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project my-lib`.
-> Note: Don't forget to add `--project my-lib` or else it will be added to the default project in your `angular.json` file. 
-
-## Build
-
-Run `ng build my-lib` to build the project. The build artifacts will be stored in the `dist/` directory.
-
-## Publishing
-
-After building your library with `ng build my-lib`, go to the dist folder `cd dist/my-lib` and run `npm publish`.
-
-## Running unit tests
-
-Run `ng test my-lib` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
+# MyLib
+
+This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 13.2.0.
+
+## Code scaffolding
+
+Run `ng generate component component-name --project my-lib` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project my-lib`.
+> Note: Don't forget to add `--project my-lib` or else it will be added to the default project in your `angular.json` file. 
+
+## Build
+
+Run `ng build my-lib` to build the project. The build artifacts will be stored in the `dist/` directory.
+
+## Publishing
+
+After building your library with `ng build my-lib`, go to the dist folder `cd dist/my-lib` and run `npm publish`.
+
+## Running unit tests
+
+Run `ng test my-lib` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

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

@@ -9,6 +9,27 @@ import { CLASS } from 'typescript-class-helpers/browser';
 //#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) {
@@ -322,72 +348,37 @@ var _a;
 //#endregion
 const log = Log.create('ng2-rest', Level.WARN, Level.ERROR);
 const listenErrorsSrc = new Subject();
-//#region cookie
-// TODO do it for nodejs
-// import { CookieJar } from 'tough-cookie';
-// const jar = new CookieJar();
-// const rest = Resource.create('http://my-website.pl', 'api/v3/user/:userId', {
-//   cookieJar: jar,
-// });
-// await rest.model({ userId: 1 }).get(); // cookies persist across requests
-// import type { CookieJar } from 'tough-cookie';
-// interface ResourceOptions {
-//   // ...
-//   cookieJar?: CookieJar;
-// }
-// export class CookieJarInterceptor implements TaonAxiosClientInterceptor<any> {
-//   constructor(private readonly jar: CookieJar) {}
-//   intercept({ req, next }: TaonClientMiddlewareInterceptOptions<any>) {
-//     return new Observable<AxiosResponse<any>>(subscriber => {
-//       const url = req.url || '';
-//       // 1) attach Cookie header from jar
-//       this.jar.getCookieString(url, (err, cookieString) => {
-//         if (err) {
-//           subscriber.error(err);
-//           return;
-//         }
-//         if (cookieString) {
-//           req.headers = req.headers || {};
-//           // axios headers can be plain object or AxiosHeaders
-//           if (req.headers instanceof AxiosHeaders) {
-//             req.headers.set('Cookie', cookieString);
-//           } else {
-//             (req.headers as any)['Cookie'] = cookieString;
-//           }
-//         }
-//         // 2) proceed
-//         const sub = next.handle(req).subscribe({
-//           next: res => {
-//             // 3) store Set-Cookie back into jar
-//             const setCookie = (res.headers as any)?.['set-cookie'];
-//             const cookies: string[] =
-//               typeof setCookie === 'string'
-//                 ? [setCookie]
-//                 : Array.isArray(setCookie)
-//                   ? setCookie
-//                   : [];
-//             if (!cookies.length) {
-//               subscriber.next(res);
-//               return;
-//             }
-//             let pending = cookies.length;
-//             for (const c of cookies) {
-//               this.jar.setCookie(c, url, () => {
-//                 pending--;
-//                 if (pending === 0) {
-//                   subscriber.next(res);
-//                 }
-//               });
-//             }
-//           },
-//           error: e => subscriber.error(e),
-//           complete: () => subscriber.complete(),
-//         });
-//         return () => sub.unsubscribe();
-//       });
-//     });
-//   }
-// }
+//#region cookie jar
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
+/* */
 class Cookie {
     static get Instance() {
         if (!Cookie.__instance) {
@@ -946,6 +937,7 @@ class HttpResponseError extends BaseResponse {
         this.body = new ErrorBody(url, responseText);
     }
 }
+//#endregion
 //#region default headers
 const HeaderKeyContentType = 'Content-Type';
 const HeaderKeyAccept = 'Accept';
@@ -1003,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")
      */
@@ -1015,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;
     }
@@ -1038,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;
     }
@@ -1067,6 +1071,11 @@ class ResourceResponse {
 //#region resource reponse http strategy
 class ResourceResponseHttp extends ResourceResponse {
     async makeRequest(abortSignal) {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
         const url = this.creatUrl(this.urlParams, !!this.axiosOptions?.doNotSerializeParams);
         const method = this.httpMethodName;
         log.d(`Requesting ${method} ${url}`);
@@ -1114,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);