ng2-rest 19.0.46 → 19.0.47

package/README.md

@@ -1,136 +1,136 @@
-
-## ng2-rest ##
-
-Robust isomorphic REST framework for browser (Angular, React etc.) and backend (NodeJS) JavaScript/TypeScript apps.
-
-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 resposne (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;
-}
-```
-
-# Angular 2+ ngZone
-If you are using Angular 2+ you need to do this in your root **app.component**:
-```ts
-constructor(zone:NgZone) {
-    Resource.initAngularNgZone(zone)
-}
-```
-
-
+
+## ng2-rest ##
+
+Robust isomorphic REST framework for browser (Angular, React etc.) and backend (NodeJS) JavaScript/TypeScript apps.
+
+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 resposne (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;
+}
+```
+
+# Angular 2+ ngZone
+If you are using Angular 2+ you need to do this in your root **app.component**:
+```ts
+constructor(zone:NgZone) {
+    Resource.initAngularNgZone(zone)
+}
+```
+
+

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.mjs

@@ -1,5 +1,5 @@
 import { from, firstValueFrom, Subject, Observable } from 'rxjs';
-import { _, UtilsOs, CoreHelpers, Helpers as Helpers$1 } from 'tnp-core/browser';
+import { _, UtilsOs, CoreHelpers, CoreModels, Helpers as Helpers$1 } from 'tnp-core/browser';
 import { diffChars } from 'diff';
 import { Log, Level } from 'ng2-logger/browser';
 import { walk } from 'lodash-walk-object/browser';
@@ -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