bx-rest 0.0.3 → 0.0.5

package/package.json

@@ -1,57 +1,141 @@
 {
-  "name": "bx-rest",
-  "version": "0.0.3",
-  "description": "bitrix rest api",
-  "typings": "./index.d.ts",
-  "type": "module",
-  "dependencies": {
-    "@angular/common": "^16.1.8",
-    "@angular/core": "^16.1.8",
-    "@angular/material": "^16.1.7",
-    "@angular/router": "^16.1.8",
-    "@ngrx/store": "^16.2.0",
-    "entities": "^4.5.0",
-    "just-clone": "^6.2.0",
-    "just-compare": "^2.3.0",
-    "luxon": "^3.3.0",
-    "parse5": "^7.1.2",
-    "rxjs": "^7.8.1",
-    "safevalues": "^0.3.4",
-    "tslib": "^2.6.1",
-    "zone.js": "^0.13.1"
-  },
-  "devDependencies": {
-    "just-flatten-it": "^5.2.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Aricatofuka/bx-rest.git"
-  },
-  "scripts": {
-    "compile": "tsc -b ./src/tsconfig.cjs.json ./src/tsconfig.cjs.spec.json ./src/tsconfig.esm.json ./src/tsconfig.esm5.json ./src/tsconfig.esm5.rollup.json ./src/tsconfig.types.json ./src/tsconfig.types.spec.json ./spec/tsconfig.json",
-    "build:clean": "shx rm -rf ./dist"
-  },
-  "keywords": [
-    "bitrxi",
-    "rest",
-    "api"
-  ],
-  "author": "Aricatofuka",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Aricatofuka/bx-rest/issues"
-  },
-  "homepage": "https://github.com/Aricatofuka/bx-rest#readme",
-  "exports": {
-    "./package.json": {
-      "default": "./package.json"
+    "name": "bx-rest",
+    "version": "0.0.5",
+    "description": "bitrix rest api",
+    "typings": "./index.d.ts",
+    "type": "module",
+    "dependencies": {
+        "@angular-devkit/build-optimizer": "0.4.6",
+        "@angular-devkit/schematics": "^11.0.7",
+        "@angular/common": "^16.1.8",
+        "@angular/core": "^16.1.8",
+        "@angular/material": "^16.1.7",
+        "@angular/router": "^16.1.8",
+        "@ngrx/store": "^16.2.0",
+        "@swc/core": "^1.2.128",
+        "@swc/helpers": "^0.3.2",
+        "@types/chai": "^4.2.11",
+        "@types/estree": "^1.0.1",
+        "@types/lodash": "4.14.102",
+        "@types/mocha": "^7.0.2",
+        "@types/node": "^14.14.6",
+        "@types/shelljs": "^0.8.8",
+        "@types/sinon": "4.1.3",
+        "@types/sinon-chai": "2.7.29",
+        "@types/source-map": "^0.5.2",
+        "@typescript-eslint/eslint-plugin": "^4.29.1",
+        "@typescript-eslint/parser": "^4.29.1",
+        "babel-polyfill": "6.26.0",
+        "chai": "^4.2.0",
+        "check-side-effects": "0.0.23",
+        "color": "3.0.0",
+        "colors": "1.1.2",
+        "cross-env": "5.1.3",
+        "cz-conventional-changelog": "1.2.0",
+        "dependency-cruiser": "^9.12.0",
+        "entities": "^4.5.0",
+        "escape-string-regexp": "1.0.5",
+        "eslint": "^7.8.1",
+        "eslint-plugin-jasmine": "^2.10.1",
+        "form-data": "^3.0.0",
+        "fs-extra": "^11.1.1",
+        "glob": "7.1.2",
+        "google-closure-compiler-js": "20170218.0.0",
+        "husky": "^4.2.5",
+        "just-clone": "^6.2.0",
+        "just-compare": "^2.3.0",
+        "klaw-sync": "3.0.2",
+        "lint-staged": "^10.2.11",
+        "lodash": "^4.17.15",
+        "luxon": "^3.3.0",
+        "minimist": "^1.2.5",
+        "nodemon": "^1.9.2",
+        "npm-run-all": "4.1.2",
+        "opn-cli": "3.1.0",
+        "parse5": "^7.1.2",
+        "platform": "1.3.5",
+        "prettier": "^2.5.1",
+        "promise": "8.0.1",
+        "require": "^2.4.20",
+        "requirejs": "^2.3.6",
+        "rollup": "0.66.6",
+        "rollup-plugin-alias": "1.4.0",
+        "rollup-plugin-inject": "2.0.0",
+        "rollup-plugin-node-resolve": "2.0.0",
+        "rxjs": "^7.8.1",
+        "safevalues": "^0.3.4",
+        "shelljs": "^0.8.4",
+        "shx": "^0.3.2",
+        "sinon": "4.3.0",
+        "sinon-chai": "2.14.0",
+        "source-map-support": "0.5.3",
+        "systemjs": "^0.21.0",
+        "ts-node": "^9.1.1",
+        "tslib": "^2.6.1",
+        "tslint": "^5.20.1",
+        "tslint-config-prettier": "^1.18.0",
+        "tslint-etc": "1.13.10",
+        "tslint-no-toplevel-property-access": "0.0.2",
+        "tslint-no-unused-expression-chai": "0.0.3",
+        "validate-commit-msg": "2.14.0",
+        "web-streams-polyfill": "^3.0.2",
+        "webpack": "^5.88.2",
+        "zone.js": "^0.13.1"
     },
-    ".": {
-      "types": "./dist/types/index.d.ts",
-      "node": "./dist/cjs/index.js",
-      "require": "./dist/cjs/index.js",
-      "es2015": "./dist/esm/index.js",
-      "default": "./dist/esm5/index.js"
+    "devDependencies": {
+        "@types/luxon": "^3.3.1",
+        "just-flatten-it": "^5.2.0",
+        "typescript": "^4.9.5"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/Aricatofuka/bx-rest.git"
+    },
+    "scripts": {
+        "lint_spec": "tslint -c spec/tslint.json -p spec/tsconfig.json \"spec/**/*.ts\"",
+        "lint_src": "tslint -c tslint.json -p src/tsconfig.base.json \"src/**/*.ts\"",
+        "lint": "npm-run-all --parallel lint_*",
+        "dtslint": "tsc -b ./src/tsconfig.types.json && tslint -c spec-dtslint/tslint.json -p spec-dtslint/tsconfig.json \"spec-dtslint/**/*.ts\"",
+        "compile": "tsc -b ./src/tsconfig.cjs.json ./src/tsconfig.cjs.spec.json ./src/tsconfig.esm.json ./src/tsconfig.esm5.json ./src/tsconfig.esm5.rollup.json ./src/tsconfig.types.json ./src/tsconfig.types.spec.json ./spec/tsconfig.json",
+        "build:clean": "shx rm -rf ./dist",
+        "build:global": "node ./tools/make-umd-bundle.js && node ./tools/make-closure-core.js",
+        "build:package": "npm-run-all build:clean compile",
+        "watch:dtslint": "nodemon -w \"src/\" -w \"spec-dtslint/\" -e ts -x npm run dtslint"
+    },
+    "//": [
+        "build:package",
+        "npm-run-all build:clean compile && node ./tools/generate-alias.js",
+        "prepublishOnly",
+        "npm run build:package && npm run lint && npm run test && npm run test:circular && npm run dtslint"
+    ],
+    "keywords": [
+        "bitrxi",
+        "rest",
+        "api"
+    ],
+    "author": "Aricatofuka",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/Aricatofuka/bx-rest/issues"
+    },
+    "homepage": "https://github.com/Aricatofuka/bx-rest#readme",
+    "files": [
+        "src",
+        "LICENSE.txt",
+        "package.json",
+        "README.md",
+        "tsconfig.json"
+    ],
+    "exports": {
+        "./package.json": {
+            "default": "./package.json"
+        },
+        ".": {
+            "types": "./index.d.ts",
+            "node": "./dist/cjs/index.js",
+            "require": "./dist/cjs/index.js",
+            "es2015": "./dist/esm/index.js",
+            "default": "./dist/esm5/index.js"
+        }
     }
-  }
 }

package/src/consts/part-name-metods.ts

@@ -0,0 +1,11 @@
+export const $get = 'get'
+export const $add = 'add'
+export const $set = 'set'
+export const $event = 'event'
+export const $update = 'update'
+export const $user = 'user'
+export const $task = 'task'
+export const $calendar = 'calendar'
+export const $meeting = 'meeting'
+export const $list = 'list'
+export const $search = 'search'

package/src/functions/isDate.ts

@@ -0,0 +1,8 @@
+/**
+ * Checks if provided variable is Date
+ *
+ * @param value Value to check
+ * @returns true if provided variable is Date
+ * @hidden
+ */
+export const isDate = (value: any): value is Date => value instanceof Date;

package/src/functions/isEqual.ts

@@ -0,0 +1,17 @@
+import { isDate } from './isDate';
+
+/**
+ * Checks if the two passed arguments are equal
+ * Currently supports date objects
+ *
+ * @param obj1
+ * @param obj2
+ * @returns: `boolean`
+ * @hidden
+ */
+export const isEqual = (obj1: any, obj2: any): boolean => {
+    if (isDate(obj1) && isDate(obj2)) {
+        return obj1.getTime() === obj2.getTime();
+    }
+    return obj1 === obj2;
+};

package/src/functions/isValidDate.ts

@@ -0,0 +1,9 @@
+import { isDate } from './isDate';
+
+export const isValidDate = (value: any): value is Date => {
+    if (isDate(value)) {
+        return !isNaN(value.getTime());
+    }
+
+    return false;
+}

package/src/functions/serializeJavascript.ts

@@ -0,0 +1,229 @@
+// Generate an internal UID to make the regexp pattern harder to guess.
+const UID_LENGTH = 16;
+const UID = generateUID();
+const PLACE_HOLDER_REGEXP = new RegExp('(\\\\)?"@__(F|R|D|M|S|A|U|I|B|L)-' + UID + '-(\\d+)__@"', 'g');
+
+const IS_NATIVE_CODE_REGEXP = /\{\s*\[native code]\s*}/g;
+const IS_PURE_FUNCTION = /function.*?\(/;
+const IS_ARROW_FUNCTION = /.*?=>.*?/;
+const UNSAFE_CHARS_REGEXP = /[<>\/\u2028\u2029]/g;
+
+const RESERVED_SYMBOLS = ['*', 'async'];
+
+// Mapping of unsafe HTML and invalid JavaScript line terminator chars to their
+// Unicode char counterparts which are safe to use in JavaScript strings.
+const ESCAPED_CHARS: {[key: string]: string}  = {
+  '<': '\\u003C',
+  '>': '\\u003E',
+  '/': '\\u002F',
+  '\u2028': '\\u2028',
+  '\u2029': '\\u2029'
+};
+
+function escapeUnsafeChars(unsafeChar: string): string {
+  return (ESCAPED_CHARS.hasOwnProperty(unsafeChar)) ? ESCAPED_CHARS[unsafeChar] : '';
+}
+
+function generateUID() {
+  let bytes = window.crypto.getRandomValues(new Uint32Array(UID_LENGTH))
+  let result = '';
+  for (let i = 0; i < UID_LENGTH; ++i) {
+    result += bytes[i].toString(16);
+  }
+  return result;
+}
+
+function deleteFunctions(obj: any) {
+  let functionKeys = [];
+  for (let key in obj) {
+    if (typeof obj[key] === "function") {
+      functionKeys.push(key);
+    }
+  }
+  for (let i = 0; i < functionKeys.length; i++) {
+    delete obj[functionKeys[i]];
+  }
+}
+
+function serialize(obj: any, options: any = {}): any {
+  // Backwards-compatibility for `space` as the second argument.
+  if (typeof options === 'number' || typeof options === 'string') {
+    options = {space: options};
+  }
+
+  let functions: Function[] = [];
+  let regexps: any[] = [];
+  let dates: any[] = [];
+  let maps: any[] = [];
+  let sets: any[] = [];
+  let arrays: any[] = [];
+  let undefs: any[] = [];
+  let infinities: any[] = [];
+  let bigInts: any[] = [];
+  let urls: any[] = [];
+
+  // Returns placeholders for functions and regexps (identified by index)
+  // which are later replaced by their string representation.
+  function replacer(key: string, value: any) {
+
+    // For nested function
+    if (options.ignoreFunction) {
+      deleteFunctions(value);
+    }
+
+    if (!value && value !== undefined) {
+      return value;
+    }
+
+    // let origValue: any = this[key];
+    let origValue: any = value;
+    let type = typeof origValue;
+
+    switch (type){
+      case 'object':
+
+        if (origValue instanceof RegExp) {
+          return '@__R-' + UID + '-' + (regexps.push(origValue) - 1) + '__@';
+        } else if (origValue instanceof Date) {
+          return '@__D-' + UID + '-' + (dates.push(origValue) - 1) + '__@';
+        } else if (origValue instanceof Map) {
+          return '@__M-' + UID + '-' + (maps.push(origValue) - 1) + '__@';
+        } else if (origValue instanceof Set) {
+          return '@__S-' + UID + '-' + (sets.push(origValue) - 1) + '__@';
+        }
+
+        if (origValue instanceof Array) {
+          let isSparse = origValue.filter(function () {
+            return true
+          }).length !== origValue.length;
+          if (isSparse) {
+            return '@__A-' + UID + '-' + (arrays.push(origValue) - 1) + '__@';
+          }
+        }
+
+        if (origValue instanceof URL) {
+          return '@__L-' + UID + '-' + (urls.push(origValue) - 1) + '__@';
+        }
+        break;
+      case 'function':
+        return '@__F-' + UID + '-' + (functions.push(origValue) - 1) + '__@';
+      case 'undefined':
+        return '@__U-' + UID + '-' + (undefs.push(origValue) - 1) + '__@';
+      case 'number':
+        return '@__I-' + UID + '-' + (infinities.push(origValue) - 1) + '__@';
+      case 'bigint':
+        return '@__B-' + UID + '-' + (bigInts.push(origValue) - 1) + '__@';
+    }
+
+    return value;
+  }
+
+  function serializeFunc(fn: Function) {
+    let serializedFn = fn.toString();
+    if (IS_NATIVE_CODE_REGEXP.test(serializedFn)) {
+      throw new TypeError('Serializing native function: ' + fn.name);
+    }
+
+    // pure functions, example: {key: function() {}}
+    if (IS_PURE_FUNCTION.test(serializedFn)) {
+      return serializedFn;
+    }
+
+    // arrow functions, example: arg1 => arg1+5
+    if (IS_ARROW_FUNCTION.test(serializedFn)) {
+      return serializedFn;
+    }
+
+    let argsStartsAt = serializedFn.indexOf('(');
+    let def = serializedFn.slice(0, argsStartsAt)
+    .trim()
+    .split(' ')
+    .filter(function (val) {
+      return val.length > 0
+    });
+
+    let nonReservedSymbols = def.filter(function (val) {
+      return RESERVED_SYMBOLS.indexOf(val) === -1
+    });
+
+    // enhanced literal objects, example: {key() {}}
+    if (nonReservedSymbols.length > 0) {
+      return (def.indexOf('async') > -1 ? 'async ' : '') + 'function'
+        + (def.join('').indexOf('*') > -1 ? '*' : '')
+        + serializedFn.slice(argsStartsAt);
+    }
+
+    // arrow functions
+    return serializedFn;
+  }
+
+  // Check if the parameter is function
+  if (options.ignoreFunction && typeof obj === "function") {
+    obj = undefined;
+  }
+  // Protects against `JSON.stringify()` returning `undefined`, by serializing
+  // to the literal string: "undefined".
+  if (obj === undefined) {
+    return String(obj);
+  }
+
+  let str: string = '';
+
+  // Creates a JSON string representation of the value.
+  // NOTE: Node 0.12 goes into slow mode with extra JSON.stringify() args.
+  if (options.isJSON && !options.space) {
+    str = JSON.stringify(obj);
+  } else {
+    str = JSON.stringify(obj, options.isJSON ? undefined : replacer, options.space);
+  }
+
+  // Replace unsafe HTML and invalid JavaScript line terminator chars with
+  // their safe Unicode char counterpart. This _must_ happen before the
+  // regexps and functions are serialized and added back to the string.
+  if (options.unsafe !== true) {
+    str = str.replace(UNSAFE_CHARS_REGEXP, escapeUnsafeChars);
+  }
+
+  if (functions.length === 0 && regexps.length === 0 && dates.length === 0 && maps.length === 0 && sets.length === 0 && arrays.length === 0 && undefs.length === 0 && infinities.length === 0 && bigInts.length === 0 && urls.length === 0) {
+    return str;
+  }
+
+  // Replaces all occurrences of function, regexp, date, map and set placeholders in the
+  // JSON string with their string representations. If the original value can
+  // not be found, then `undefined` is used.
+  return str.replace(PLACE_HOLDER_REGEXP, function (match, backSlash, type, valueIndex) {
+    // The placeholder may not be preceded by a backslash. This is to prevent
+    // replacing things like `"a\"@__R-<UID>-0__@"` and thus outputting
+    // invalid JS.
+    if (backSlash) {
+      return match;
+    }
+
+    switch (type){
+      case 'D':
+        return "new Date(\"" + dates[valueIndex].toISOString() + "\")"
+      case 'R':
+        return "new RegExp(" + serialize(regexps[valueIndex].source) + ", \"" + regexps[valueIndex].flags + "\")"
+      case 'M':
+        return "new Map(" + serialize(Array.from(maps[valueIndex].entries()), options) + ")"
+      case 'S':
+        return "new Set(" + serialize(Array.from(sets[valueIndex].values()), options) + ")"
+      case 'A':
+        return "Array.prototype.slice.call(" + serialize(Object.assign({length: arrays[valueIndex].length}, arrays[valueIndex]), options) + ")"
+      case 'U':
+        return 'undefined'
+      case 'I':
+        return infinities[valueIndex]
+      case 'B':
+        return "BigInt(\"" + bigInts[valueIndex] + "\")"
+      case 'L':
+        return "new URL(\"" + urls[valueIndex].toString() + "\")"
+    }
+
+    let fn = functions[valueIndex];
+
+    return serializeFunc(fn);
+  });
+}
+
+export default serialize

package/src/rest/user/user.ts

@@ -2,20 +2,21 @@ import { Observable, of, take } from 'rxjs'
 import { first, map, mergeMap, tap } from 'rxjs/operators'
 import clone from 'just-clone'
 import compare from 'just-compare'
-import { iBXGetParam } from '@/typification/rest/user/get'
-import HttpBXServices from '@/lib/services/api/bitrix/http/HttpBX'
-import UserFilterSearch from '@/lib/typification/bitrix/api/rest/user/UserFilterSearch'
-import ImgServices from '@/lib/services/api/bitrix/custom/img'
+import { iBXGetParam } from 'bx-rest/src/typification/rest/user/get'
+import HttpBXServices from 'bx-rest/src/services/http/HttpBX'
+import UserFilterSearch from 'bx-rest/src/typification/rest/user/UserFilterSearch'
+// import ImgServices from 'bx-rest/src/services/api/bitrix/custom/img'
 import { Store } from '@ngrx/store'
-import { loadAll, saveArr, saveIDLoadedDepartment, saveSelf, storeUsers } from '@/lib/store/users'
-import { iCustomUserFieldInfo } from '@/lib/typification/bitrix/api/rest/user/CustomUserFieldInfo'
+import { loadAll, saveArr, saveIDLoadedDepartment, saveSelf, storeUsers } from 'bx-rest/src/store/users'
+import { iCustomUserFieldInfo } from 'bx-rest/src/typification/rest/user/CustomUserFieldInfo'
 import { DatePipe } from '@angular/common'
-import { BitrixApiUserMapServices } from '@/lib/services/map/bitrix/api/rest/user'
-import DateTrace from '@/lib/services/api/trace/metods/date'
-import { $get, $list, $search, $update, $user } from '@/lib/services/api/bitrix/rest/consts/part-name-metods'
-import SnackBarService from '@/lib/services/snack-bar/snack-bar.service'
-import iHttpAnswerBX from '@/lib/typification/bitrix/api/rest/base/httpAnswerBX'
-import { iBXRestUser, iBXRestUserHttp, iBXRestUserHttpField } from '@/lib/typification/bitrix/api/rest/user/user'
+import { BitrixApiUserMapServices } from 'bx-rest/src/services/map/rest/user'
+// import DateTrace from 'bx-rest/src/services/api/trace/metods/date'
+import SnackBarService from 'bx-rest/src/services/snack-bar/snack-bar.service'
+import iHttpAnswerBX from 'bx-rest/src/typification/rest/base/httpAnswerBX'
+import { iBXRestUser, iBXRestUserHttp, iBXRestUserHttpField } from 'bx-rest/src/typification/rest/user/user'
+import { $get, $list, $search, $update, $user } from '../../consts/part-name-metods'
+import { UserFilter } from '../../typification/rest/user/userFilter';
 
 export class BXRestUser {
     url = {
@@ -43,8 +44,8 @@ export class BXRestUser {
     constructor(
         private http: HttpBXServices,
         private snackBar: SnackBarService,
-        private img: ImgServices,
-        private dateTrace: DateTrace,
+       // private img: ImgServices,
+        //private dateTrace: DateTrace,
         private store: Store<{ users: storeUsers }>,
         private userMap: BitrixApiUserMapServices,
         private datePipe: DatePipe
@@ -307,9 +308,9 @@ export class BXRestUser {
         )
     }
 
-    getUrlCompressedImage(url: string, width: number, height: number) {
-        return this.img.getUrlCompressed(url, width, height)
-    }
+    // getUrlCompressedImage(url: string, width: number, height: number) {
+    //     return this.img.getUrlCompressed(url, width, height)
+    // }
 
     setDefParam(params: iBXGetParam) {
         if (!params.hasOwnProperty('ACTIVE')) {

package/src/services/base.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core'
-import { time } from '@/const/time'
-// import { environment } from '@/environments/environment'
+import { time } from 'bx-rest/src/consts/time'
+// import { environment } from 'bx-rest/src/environments/environment'
 import { DateTime } from 'luxon'
 import { DateTimeOptions } from 'luxon/src/datetime'