bx-rest 0.0.2 → 0.0.4

package/src/tsconfig.types.json

@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.esm.json",
+  "compilerOptions": {
+    "composite": true,
+    "module": "es2015",
+    "target": "esnext",
+    "removeComments": false,
+    "declaration": true,
+    "declarationMap": true,
+    "declarationDir": "../dist/types",
+    // "emitDeclarationOnly": true
+  },
+  "exclude": ["./internal/umd.ts"]
+}

package/src/tsconfig.types.spec.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.types.json",
+  "compilerOptions": {
+    "declarationDir": "../dist/types_spec",
+    "stripInternal": false
+  }
+}

package/src/typification/rest/api-lib.ts

@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core'
-import { iRestLib } from '@/typification/rest/lib'
+import { iRestLib } from 'bx-rest/src/typification/rest/lib'
 
 @Injectable({
     providedIn: 'root'
 })
-export class ApiLibServices {
+export class RestServices {
     BX24: iRestLib | false = false
 
     constructor() {

package/src/typification/rest/batch/batchRequestParam.ts

@@ -1,4 +1,4 @@
-import iHttpAnswerBX from '@/lib/typification/bitrix/api/rest/base/httpAnswerBX'
+import iHttpAnswerBX from 'bx-rest/src/typification/rest/base/httpAnswerBX'
 
 export type keyBatch = string | number
 

package/src/typification/rest/user/CustomUserFieldInfo.ts

@@ -1,5 +1,5 @@
-import { iBXRestUserKey } from '@/lib/typification/bitrix/api/rest/user/user'
-import { iBXRestYesNo } from '@/lib/typification/bitrix/api/rest/base/YesNo'
+import { iBXRestUserKey } from 'bx-rest/src/typification/rest/user/user'
+import { iBXRestYesNo } from 'bx-rest/src/typification/rest/base/YesNo'
 
 export interface iCustomUserFieldInfo {
   ID: string,

package/src/typification/rest/user/user.ts

@@ -1,4 +1,4 @@
-import { iBXRestYesNo } from '@/lib/typification/bitrix/api/rest/base/YesNo'
+import { iBXRestYesNo } from 'bx-rest/src/typification/rest/base/YesNo'
 
 export interface iBXRestUser extends iBXRestUserBase {
     ID: number,

package/src/typification/rest/user/userFilter.ts

@@ -0,0 +1,17 @@
+import { iBXRestYesNo } from '../base/YesNo'
+import { iBXRestBaseParam } from '../support/param'
+
+export interface UserFilter extends iBXRestBaseParam{
+    ID?: number[] | number, // по ID
+    PERSONAL_BIRTHDAY?: string | string[]
+    order?: 'ASC' | 'DESC', // сортировка
+    UF_DEPARTMENT?: number[],  // принадлежность к структуре компании
+    UF_PHONE_INNER?: string, // внутренний телефонный номер
+    IS_ONLINE?: iBXRestYesNo,  // позволяет показать только авторизованных или нет пользователей
+    NAME_SEARCH?: string, // быстрый поиск по персональным данным
+    USER_TYPE?: 'employee' | 'extranet' | 'email', // Тип пользователя. Может принимать следующие значения:
+    // employee - сотрудник,
+    // extranet - пользователь экстранета,
+    // email - почтовый пользователь
+    ACTIVE?: 2 | 1 | 0 // при значении 1 исключает из запроса уволенных пользователей. 2 - если нужны и те и те
+}

package/tools/add-license-to-file.js

@@ -0,0 +1,30 @@
+var fs = require('fs');
+
+function addLicenseTextToFile(licenseText, destination) {
+    if (!destination) {
+        throw new Error('destination file path is required as 2nd argument');
+    }
+
+    fs.writeFileSync(
+        destination,
+        `/**
+  @license
+  ${licenseText}
+ **/
+${fs.readFileSync(`${destination}`).toString()}
+`
+    );
+}
+
+function addLicenseToFile(license, destination) {
+    if (!license) {
+        throw new Error('license path is required as 1st argument');
+    }
+
+    addLicenseTextToFile(fs.readFileSync(license).toString(), destination);
+}
+
+module.exports = {
+    addLicenseToFile: addLicenseToFile,
+    addLicenseTextToFile: addLicenseTextToFile,
+};

package/tools/generate-alias.js

@@ -0,0 +1,30 @@
+/**
+ * Alias subpath import (`dist/cjs/*`) to top-level path mapping (`rxjs/*`)
+ * Previously this was done by placing cjs to top-level package when it's published -
+ * Now build uses `dist` as explicit output subpath so we generate top-level alias here instead.
+ */
+const fs = require('fs-extra');
+const path = require('path');
+
+const aliasRoot = ['ajax', 'fetch', 'operators', 'testing', 'webSocket'];
+
+aliasRoot
+    .map((alias) => path.resolve(__dirname, `../${alias}`))
+    .forEach((alias) => {
+        if (fs.existsSync(alias)) {
+            fs.removeSync(alias);
+        }
+        fs.ensureDirSync(alias);
+    });
+
+aliasRoot.forEach((alias) => {
+    const pkgManifest = {
+        name: `bx-rest/${alias}`,
+        types: `../dist/types/${alias}/index.d.ts`,
+        main: `../dist/cjs/${alias}/index.js`,
+        module: `../dist/esm/${alias}/index.js`,
+        sideEffects: false,
+    };
+
+    fs.writeJSON(path.resolve(__dirname, `../${alias}/package.json`), pkgManifest, { spaces: 2 });
+});

package/tools/subject-benchmark.js

@@ -0,0 +1,281 @@
+// @ts-check
+const { Bench } = require('tinybench');
+const { Subject: SubjectMaster } = require('../dist-master/cjs');
+const { Subject: SubjectPr } = require('../dist/cjs');
+
+async function run() {
+    const numIterations = 10_000;
+    const bench = new Bench({ warmupIterations: Math.ceil(numIterations / 20), iterations: numIterations });
+
+    //   bench.add('[master] Creating Subject', () => {
+    //     new SubjectMaster();
+    //   });
+    //   bench.add('[pr] Creating Subject', () => {
+    //     new SubjectPr();
+    //   });
+
+    //   bench.add('[master] 0 subscribed, 1 next', () => {
+    //     const source = new SubjectMaster();
+    //     source.next(1);
+    //   });
+    //   bench.add('[pr] 0 subscribed, 1 next', () => {
+    //     const source = new SubjectPr();
+    //     source.next(1);
+    //   });
+
+    //   bench.add('[master] 0 subscribed, 100 next', () => {
+    //     const source = new SubjectMaster();
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //   });
+    //   bench.add('[pr] 0 subscribed, 100 next', () => {
+    //     const source = new SubjectPr();
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //   });
+
+    //   bench.add('[master] 1 subscribed, 1 next', () => {
+    //     const source = new SubjectMaster();
+    //     const subscription = source.asObservable().subscribe();
+    //     source.next(1);
+    //     subscription.unsubscribe();
+    //   });
+    //   bench.add('[pr] 1 subscribed, 1 next', () => {
+    //     const source = new SubjectPr();
+    //     const subscription = source.asObservable().subscribe();
+    //     source.next(1);
+    //     subscription.unsubscribe();
+    //   });
+
+    //   bench.add('[master] 1 subscribed, 100 next', () => {
+    //     const source = new SubjectMaster();
+    //     const subscription = source.asObservable().subscribe();
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //     subscription.unsubscribe();
+    //   });
+    //   bench.add('[pr] 1 subscribed, 100 next', () => {
+    //     const source = new SubjectPr();
+    //     const subscription = source.asObservable().subscribe();
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //     subscription.unsubscribe();
+    //   });
+
+    //   bench.add('[master] 3 subscribed, 1 next', () => {
+    //     const source = new SubjectMaster();
+    //     const s1 = source.asObservable().subscribe();
+    //     const s2 = source.asObservable().subscribe();
+    //     const s3 = source.asObservable().subscribe();
+    //     source.next(1);
+    //     s1.unsubscribe();
+    //     s2.unsubscribe();
+    //     s3.unsubscribe();
+    //   });
+    //   bench.add('[pr] 3 subscribed, 1 next', () => {
+    //     const source = new SubjectPr();
+    //     const s1 = source.asObservable().subscribe();
+    //     const s2 = source.asObservable().subscribe();
+    //     const s3 = source.asObservable().subscribe();
+    //     source.next(1);
+    //     s1.unsubscribe();
+    //     s2.unsubscribe();
+    //     s3.unsubscribe();
+    //   });
+
+    //   bench.add('[master] 3 subscribed, 100 next', () => {
+    //     const source = new SubjectMaster();
+    //     const s1 = source.asObservable().subscribe();
+    //     const s2 = source.asObservable().subscribe();
+    //     const s3 = source.asObservable().subscribe();
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //     s1.unsubscribe();
+    //     s2.unsubscribe();
+    //     s3.unsubscribe();
+    //   });
+    //   bench.add('[pr] 3 subscribed, 100 next', () => {
+    //     const source = new SubjectPr();
+    //     const s1 = source.asObservable().subscribe();
+    //     const s2 = source.asObservable().subscribe();
+    //     const s3 = source.asObservable().subscribe();
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //     s1.unsubscribe();
+    //     s2.unsubscribe();
+    //     s3.unsubscribe();
+    //   });
+
+    //   bench.add('[master] 10 subscribed, 1 next', () => {
+    //     const source = new SubjectMaster();
+    //     const s = [];
+    //     for (let i = 0; i !== 10; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     source.next(1);
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+    //   bench.add('[pr] 10 subscribed, 1 next', () => {
+    //     const source = new SubjectPr();
+    //     const s = [];
+    //     for (let i = 0; i !== 10; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     source.next(1);
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+
+    //   bench.add('[master] 10 subscribed, 100 next', () => {
+    //     const source = new SubjectMaster();
+    //     const s = [];
+    //     for (let i = 0; i !== 10; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+    //   bench.add('[pr] 10 subscribed, 100 next', () => {
+    //     const source = new SubjectPr();
+    //     const s = [];
+    //     for (let i = 0; i !== 10; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+
+    //   bench.add('[master] 100 subscribed, 1 next', () => {
+    //     const source = new SubjectMaster();
+    //     const s = [];
+    //     for (let i = 0; i !== 100; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     source.next(1);
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+    //   bench.add('[pr] 100 subscribed, 1 next', () => {
+    //     const source = new SubjectPr();
+    //     const s = [];
+    //     for (let i = 0; i !== 100; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     source.next(1);
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+
+    //   bench.add('[master] 100 subscribed, 100 next', () => {
+    //     const source = new SubjectMaster();
+    //     const s = [];
+    //     for (let i = 0; i !== 100; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+    //   bench.add('[pr] 100 subscribed, 100 next', () => {
+    //     const source = new SubjectPr();
+    //     const s = [];
+    //     for (let i = 0; i !== 100; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     for (let i = 0; i !== 100; ++i) {
+    //       source.next(i);
+    //     }
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+
+    //   bench.add('[master] 1000 subscribed, 1 next', () => {
+    //     const source = new SubjectMaster();
+    //     const s = [];
+    //     for (let i = 0; i !== 1000; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     source.next(1);
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+    //   bench.add('[pr] 1000 subscribed, 1 next', () => {
+    //     const source = new SubjectPr();
+    //     const s = [];
+    //     for (let i = 0; i !== 1000; ++i) {
+    //       s.push(source.asObservable().subscribe());
+    //     }
+    //     source.next(1);
+    //     for (const e of s) {
+    //       e.unsubscribe();
+    //     }
+    //   });
+
+    bench.add('[master] 1 subscribed, 10,000 next', () => {
+        const source = new SubjectMaster();
+        const s = [];
+        for (let i = 0; i !== 1; ++i) {
+            s.push(source.asObservable().subscribe());
+        }
+        for (let i = 0; i !== 10000; ++i) {
+            source.next(i);
+        }
+        for (const e of s) {
+            e.unsubscribe();
+        }
+    });
+
+    bench.add('[pr]  1 subscribed, 10,000 next', () => {
+        const source = new SubjectPr();
+        const s = [];
+        for (let i = 0; i !== 1; ++i) {
+            s.push(source.asObservable().subscribe());
+        }
+        for (let i = 0; i !== 10000; ++i) {
+            source.next(i);
+        }
+        for (const e of s) {
+            e.unsubscribe();
+        }
+    });
+
+    await bench.warmup();
+    await bench.run();
+
+    console.table(
+        bench.tasks.map(({ name, result }) => {
+            return {
+                Name: name,
+                Mean: result?.mean,
+                P75: result?.p75,
+                P99: result?.p99,
+                RME: result?.rme,
+            };
+        })
+    );
+}
+run();

package/tsconfig.json

@@ -1,11 +1,24 @@
 {
     "compilerOptions": {
-        "target": "es5",
-        "lib": ["esnext", "dom"],
+        "experimentalDecorators": true,
+        "incremental": true,
+        "removeComments": true,
+        "preserveConstEnums": true,
+        "sourceMap": true,
+        "strict": true,
+        "noImplicitReturns": true,
+        "moduleResolution": "node",
+        "stripInternal": true,
+        "noEmit": true,
+        "lib": [
+            "esnext",
+            "dom"
+        ],
+        "target": "esnext",
+        "baseUrl": ".",
         "paths": {
-            "@/*": [
-                "src/*"
-            ]
-        },
+            "bx-rest": ["./"],
+            "bx-rest/*": ["./*"]
+        }
     },
 }

package/src/services/snack-bar/toast-message/toast-message.component.spec.ts

@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { ToastMessageComponent } from './toast-message.component'
-
-describe('ToastMessageComponent', () => {
-  let component: ToastMessageComponent;
-  let fixture: ComponentFixture<ToastMessageComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ ToastMessageComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ToastMessageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});