bx-rest 0.0.30 → 0.0.32

package/fesm2020/bx-rest.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { NgModule, inject, Component, ViewEncapsulation, Inject, Injectable } from '@angular/core';
-import { map, catchError, tap, mergeMap as mergeMap$1, first } from 'rxjs/operators';
 import { Subscription, filter, take, of, throwError, forkJoin, mergeMap } from 'rxjs';
+import { map, catchError, mergeMap as mergeMap$1, first } from 'rxjs/operators';
 import clone from 'just-clone';
 import * as i1$1 from '@angular/material/snack-bar';
 import { MatSnackBarRef, MAT_SNACK_BAR_DATA } from '@angular/material/snack-bar';
@@ -1087,12 +1087,6 @@ class HttpServices extends BaseHttpServices {
     mapBranchResultWithoutKey(res) {
         return flatten(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)));
     }
-    post(name, params = {}, textError = '', settings = this.defSettings) {
-        return this.httpPost(this.getNameMethod(name), params, textError, settings);
-    }
-    get(name, params = {}, textError = '', settings = this.defSettings) {
-        return this.httpGet(this.getNameMethod(name), params, textError, settings);
-    }
     httpPost(url, params = {}, textError = '', settings = this.defSettings) {
         return this.session.getAuthParams().pipe(mergeMap(auth => {
             if (auth) {
@@ -1161,6 +1155,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: SnackBarService }, { type: SessionKeyServices }]; } });
 
+function mapResult(v) {
+    if (v && (v.result || typeof v.result === 'boolean')) {
+        return v.result;
+    }
+    return undefined;
+}
+
 class HttpBXServices extends HttpServices {
     timeNowOnServer() {
         return this.httpGet('server.time').pipe(map(v => {
@@ -1208,11 +1209,27 @@ class HttpBXServices extends HttpServices {
     mapBranchResultWithoutKey(res) {
         return flatten(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)));
     }
-    post(name, params = {}, textError = '', settings = this.defSettings) {
-        return this.httpPost(this.getNameMethod(name), params, textError, settings);
-    }
-    get(name, params = {}, textError = '', settings = this.defSettings) {
-        return this.httpGet(this.getNameMethod(name), params, textError, settings);
+    post(name, params = {}, textError = '', mapHttp = undefined, settings = this.defSettings) {
+        return this.httpPost(this.getNameMethod(name), params, textError, settings).pipe(map(v => {
+            if (v && v.result && REST_SETTINGS.support.map && mapHttp) {
+                return Array.isArray(v.result)
+                    ? Object.assign(v, { result: v.result.map(i => mapHttp(i)) })
+                    : Object.assign(v, { result: mapHttp(v.result) });
+            }
+            return v;
+        }), map(v => (v && REST_SETTINGS.support.result) ? mapResult : v));
+    }
+    get(name, params = {}, textError = '', mapHttp = (v) => {
+        return v;
+    }, settings = this.defSettings) {
+        return this.httpGet(this.getNameMethod(name), params, textError, settings).pipe(map(v => {
+            if (v && v.result && REST_SETTINGS.support.map) {
+                return Array.isArray(v.result)
+                    ? Object.assign(v, { result: v.result.map(i => mapHttp(i)) })
+                    : Object.assign(v, { result: mapHttp(v.result) });
+            }
+            return v;
+        }), map(v => (v && REST_SETTINGS.support.result) ? mapResult : v));
     }
     httpPost(url, params = {}, textError = '', settings = this.defSettings) {
         return this.session.getAuthParams().pipe(mergeMap(auth => {
@@ -1326,10 +1343,9 @@ class BXRestListsElement {
         };
     }
     get(pram) {
-        return this.http.post(this.url.get, pram)
-            .pipe(map(v => (v && v.result)
-            ? Object.assign(v, { result: v.result.map(i => this.mapResult.get(i)) })
-            : undefined));
+        return this.http.post(this.url.get, pram, 'Не Удалось получить элемент списка', (v) => v.map(i => this.mapResult.get(i)));
+    }
+    customPipe() {
     }
 }
 BXRestListsElement.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestListsElement, deps: [{ token: HttpBXServices }, { token: BXRestListsElementMap }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -1362,13 +1378,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestListsElement }]; } });
 
-function mapResult(v) {
-    if (v && (v.result || typeof v.result === 'boolean')) {
-        return v.result;
-    }
-    return undefined;
-}
-
 const save = createAction('[Users Component] Save', props());
 const saveArr = createAction('[Users Component] Save Arr', props());
 const update = createAction('[Users Component] Update', props());
@@ -1564,12 +1573,14 @@ class BXRestUser {
     get(params = {}) {
         let copyParams = clone(params);
         this.setDefParam(copyParams);
-        return this.http.post(this.url.get, copyParams, 'Не удалось получить пользователей')
-            .pipe(tap(v => {
-            if (v && v.result) {
-                this.saveArrUser(v.result);
-            }
-        }));
+        return this.http.post(this.url.get, copyParams, 'Не удалось получить пользователей', (v) => { return v.map(i => this.userMap.HttpToBX(i)); });
+        // .pipe(
+        //   tap(v => {
+        //     if (v && v.result) {
+        //       this.saveArrUser(v.result)
+        //     }
+        //   })
+        // )
     }
     current(update = false) {
         if (update) {
@@ -1587,17 +1598,14 @@ class BXRestUser {
         }
     }
     getSelfHttp() {
-        return this.http.get(this.url.current, {}, 'Не удалось получить пользователя')
-            .pipe(map(v => {
-            if (v && v.result) {
-                return this.userMap.HttpToBX(v.result);
-            }
-            return undefined;
-        }), tap(v => {
-            if (v) {
-                this.store.dispatch(saveSelf({ self: v }));
-            }
-        }));
+        return this.http.get(this.url.current, {}, 'Не удалось получить пользователя');
+        // .pipe(
+        //   tap(v => {
+        //     if (v) {
+        //       this.store.dispatch(saveSelf({self: v}))
+        //     }
+        //   }),
+        // )
     }
     access(access, textError = 'Не удалось получить права') {
         return this.http.get(this.url.access, { ACCESS: access }, textError);
@@ -1721,52 +1729,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: SnackBarService }, { type: i1$2.Store }, { type: BitrixApiUserMapServices }]; } });
 
-// import { Observable } from 'rxjs'
-// import BXRestListsElementMap from './map/lists/element'
-// import { map } from 'rxjs/operators'
-// import { mapResult } from './functions/mapResult'
-class BXRestBase {
+class BXRest {
     constructor(user, lists) {
         this.user = user;
         this.lists = lists;
     }
 }
-BXRestBase.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBase, deps: [{ token: BXRestUser }, { token: BXRestLists }], target: i0.ɵɵFactoryTarget.Injectable });
-BXRestBase.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBase, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRestBase, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestLists }]; } });
-class BXRest extends new Proxy(BXRestBase, {
-    get(target, prop, receiver) {
-        const res = Reflect.get(target, prop, receiver);
-        console.log('res', res);
-        if (typeof res === 'function') {
-            // let mapRes = new BXRestListsElementMap()
-            console.log('res', res);
-            return Reflect.get(target, prop, receiver).pipe(
-            // @ts-ignore
-            map(v => (v && v.result)
-                // @ts-ignore
-                ? Object.assign(v, { result: v.result.map(i => mapRes.get(i)) })
-                : undefined), 
-            // @ts-ignore
-            map(v => mapResult(v)));
-        }
-        return res;
-    }
-}) {
-}
-BXRest.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BXRest.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, deps: [{ token: BXRestUser }, { token: BXRestLists }], target: i0.ɵɵFactoryTarget.Injectable });
 BXRest.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BXRest, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestLists }]; } });
 
 /*
  * Public API Surface of bx-rest