@slavmak2486/bx24ts 1.2.17 → 1.2.18

package/BX24.ts

@@ -5,9 +5,9 @@ export class BX24 extends baseBX24{
     constructor(cb?:(params:any)=>void){
         super();
         const q = window.name.split('|');
-        this.DOMAIN = q[0].replace(/:(80|443)$/, '');
-        this.PROTOCOL = parseInt(q[1])||0;
-        this.APP_SID = q[2];
+        this.DOMAIN = q[0]?.replace(/:(80|443)$/, '')||'';
+        this.PROTOCOL = parseInt(String(q[1]))||0;
+        this.APP_SID = q[2]||'';
         if (window&&window instanceof Window){
             window.addEventListener("message", (event:MessageEvent)=>{
                 this.runCallback(event);

package/BX24Dev.ts

@@ -53,8 +53,7 @@ export class BX24Dev extends BX24Server{
         }
     }
 
-
-    appOption={
+    override appOption={
 		get: (name:string)=>{
 			return this.APP_OPTIONS[name];
 		},
@@ -77,7 +76,7 @@ export class BX24Dev extends BX24Server{
 		}
 	}
 
-    userOption={
+  override userOption={
         get:(name:string)=>{
             return this.USER_OPTIONS[name];
         },
@@ -106,15 +105,15 @@ export class BX24Dev extends BX24Server{
             done=el.done===true?true:false;
             if (el.value){
                 let tempArrPath=Array.from(el.value[0].matchAll(regexp)) as string[];
-                tempArrPath=tempArrPath.map(ell=>{return ell[1]});
+                tempArrPath=tempArrPath.map(ell=>{return ell[1]}).filter(el=>!!el) as string[];
                 const base=el.value[0].split('[')[0];
                 __set(result, [base, ...tempArrPath], el.value[1]);
             }
         }
 
-        if (result.placement){
-            this.PLACEMENT=result.placement;
-            delete(result.placement);
+        if (result["placement"]){
+            this.PLACEMENT=result["placement"];
+            delete(result["placement"]);
         }
         else{
             this.PLACEMENT='DEFAULT';

package/BX24Hook.ts

@@ -5,7 +5,7 @@ import { type getAuth } from "./types/getAuth";
 export class Bx24Hook extends baseBX24{
     declare url:string;
 
-    logger:Logger|null=null;
+    override logger:Logger|null=null;
 
     constructor(url:string){
         super();

package/BX24Server.ts

@@ -7,7 +7,7 @@ import { type BitrixEvent } from "./types/bitrixEvent";
 
 export class BX24Server extends baseBX24{
 
-    logger:Logger|null=null;
+    override logger:Logger|null=null;
 
     constructor(param: AuthBaseServe){
         super();
@@ -62,13 +62,13 @@ export class BX24Server extends baseBX24{
                 else{
                   const props:Record<string, string|number>={};
                   if (processId){
-                    props.process_id=processId;
+                    props["process_id"]=processId;
                   }
                   if (clear){
-                    props.clear=1;
+                    props["clear"]=1;
                   }
                   else{
-                    props.clear=0;
+                    props["clear"]=0;
                   }
                   this.callMethod('event.offline.get', props, ress=>{
                       if (ress.error()){

package/BatchHelper.ts

@@ -66,6 +66,7 @@ export class BatchHelper{
 
             for(const dep of deps){
                 alradyInBatch.push(dep);
+                if (!obj[dep]) continue;
                 currentChunk[dep] = obj[dep];
                 currentSize++;
             }

package/base/BX24.ts

@@ -98,7 +98,8 @@ export abstract class baseBX24{
         const arrHandler=this.arrEvents.filter(el=>{return el.event==event});
         for (const idx in arrHandler){
             setTimeout(()=>{
-                arrHandler[idx].handler.call(this, params);
+              if (!arrHandler[idx]?.handler) return;
+              arrHandler[idx].handler.call(this, params);
             }, 10);
         }
     }
@@ -322,8 +323,8 @@ export abstract class baseBX24{
                 
                 for(const idx in cmd){
                     const row=cmd[idx];
-                    const method=Array.isArray(row)?row[0]:row.method;
-                    const params=Array.isArray(row)?row[1]:row.params;
+                    const method=Array.isArray(row)?row[0]:row?.method;
+                    const params=Array.isArray(row)?row[1]:row?.params;
 
                     if(method)
                     {
@@ -422,6 +423,8 @@ export abstract class baseBX24{
         const result:Partial<{[key in keyof R]:CallResult}>={};
         for(const idx in calls){
             const cmd=calls[idx];
+            const method=Array.isArray(cmd)?cmd[0]:cmd?.method;
+            if (!method) continue;
             if (data?.result?.[idx]!==undefined|| data?.result_error?.[idx]!==undefined){
                 result[idx]=new CallResult({
                     result: data.result?.[idx]||{},
@@ -430,7 +433,7 @@ export abstract class baseBX24{
                     time:data.result_time[idx],
                     next: data.result_next[idx]
                 }, {
-                    method:Array.isArray(cmd)?cmd[0]:cmd?.method,
+                    method,
                     data: Array.isArray(cmd)?cmd[1]:cmd?.params,
                     callback:callback
                 }, this, res.status)
@@ -442,7 +445,7 @@ export abstract class baseBX24{
                     error_description:()=>JSON.stringify(res),
                     answer:data?.result?.[idx],
                     query: {
-                        method:Array.isArray(cmd)?cmd[0]:cmd?.method,
+                        method,
                         data: Array.isArray(cmd)?cmd[1]:cmd?.params,
                         callback:callback
                     },

package/dist/BX24.js

@@ -4,11 +4,12 @@ exports.BX24 = void 0;
 const BX24_1 = require("./base/BX24");
 class BX24 extends BX24_1.baseBX24 {
     constructor(cb) {
+        var _a;
         super();
         const q = window.name.split('|');
-        this.DOMAIN = q[0].replace(/:(80|443)$/, '');
-        this.PROTOCOL = parseInt(q[1]) || 0;
-        this.APP_SID = q[2];
+        this.DOMAIN = ((_a = q[0]) === null || _a === void 0 ? void 0 : _a.replace(/:(80|443)$/, '')) || '';
+        this.PROTOCOL = parseInt(String(q[1])) || 0;
+        this.APP_SID = q[2] || '';
         if (window && window instanceof Window) {
             window.addEventListener("message", (event) => {
                 this.runCallback(event);

package/dist/BX24Dev.js

@@ -99,14 +99,14 @@ class BX24Dev extends BX24Server_1.BX24Server {
             done = el.done === true ? true : false;
             if (el.value) {
                 let tempArrPath = Array.from(el.value[0].matchAll(regexp));
-                tempArrPath = tempArrPath.map(ell => { return ell[1]; });
+                tempArrPath = tempArrPath.map(ell => { return ell[1]; }).filter(el => !!el);
                 const base = el.value[0].split('[')[0];
                 (0, lodash_1.set)(result, [base, ...tempArrPath], el.value[1]);
             }
         }
-        if (result.placement) {
-            this.PLACEMENT = result.placement;
-            delete (result.placement);
+        if (result["placement"]) {
+            this.PLACEMENT = result["placement"];
+            delete (result["placement"]);
         }
         else {
             this.PLACEMENT = 'DEFAULT';

package/dist/BX24Server.js

@@ -49,13 +49,13 @@ class BX24Server extends BX24_1.baseBX24 {
                 else {
                     const props = {};
                     if (processId) {
-                        props.process_id = processId;
+                        props["process_id"] = processId;
                     }
                     if (clear) {
-                        props.clear = 1;
+                        props["clear"] = 1;
                     }
                     else {
-                        props.clear = 0;
+                        props["clear"] = 0;
                     }
                     this.callMethod('event.offline.get', props, ress => {
                         var _a, _b;

package/dist/BatchHelper.js

@@ -60,6 +60,8 @@ class BatchHelper {
             const deps = dependencies[key] || [];
             for (const dep of deps) {
                 alradyInBatch.push(dep);
+                if (!obj[dep])
+                    continue;
                 currentChunk[dep] = obj[dep];
                 currentSize++;
             }

package/dist/base/BX24.js

@@ -8,6 +8,65 @@ const axios_1 = __importDefault(require("axios"));
 const callResult_1 = require("../callResult");
 const lodash_1 = require("lodash");
 class baseBX24 {
+    getHttpString(value, prefix = '') {
+        if (value instanceof Date) {
+            return prefix + '=' + encodeURIComponent(value.toISOString());
+        }
+        else if (typeof value == 'object') {
+            const resultObj = [];
+            for (const field in value) {
+                resultObj.push(this.getHttpString(value[field], prefix + `${prefix != '' ? '[' : ""}${field}${prefix != '' ? ']' : ''}`));
+            }
+            return resultObj.join('&');
+        }
+        else if (prefix != '') {
+            return encodeURIComponent(prefix) + '=' + encodeURIComponent(value);
+        }
+        return encodeURIComponent(value);
+    }
+    setTimeoutCall(ms) {
+        this.timeoutCall = ms;
+    }
+    clearTimeoutCall() {
+        this.timeoutCall = 0;
+    }
+    isFunction(item) {
+        return item === null ? false : (typeof (item) == "function" || item instanceof Function);
+    }
+    addEvent(event, handler) {
+        this.arrEvents.push({
+            event: event,
+            handler: handler
+        });
+    }
+    emitEvent(event, params) {
+        const arrHandler = this.arrEvents.filter(el => { return el.event == event; });
+        for (const idx in arrHandler) {
+            setTimeout(() => {
+                var _a;
+                if (!((_a = arrHandler[idx]) === null || _a === void 0 ? void 0 : _a.handler))
+                    return;
+                arrHandler[idx].handler.call(this, params);
+            }, 10);
+        }
+    }
+    uniqid() {
+        const charsList = '0123456789abcdefghijklmnopqrstuvwxyz';
+        let s = '';
+        for (let i = 0; i < 32; i++)
+            s += charsList[Math.round(Math.random() * (charsList.length - 1))];
+        return s;
+    }
+    setCallback(cb) {
+        const cbId = this.uniqid();
+        if (cb) {
+            this.cbArray.push({ uid: cbId, cb: cb });
+        }
+        return cbId;
+    }
+    doInit() {
+        this.emitEvent('init', this);
+    }
     constructor() {
         this.cbArray = [];
         this.AUTH_CONNECTOR = "";
@@ -97,62 +156,6 @@ class baseBX24 {
         this.DOMAIN = "";
         this.PROTOCOL = 1;
     }
-    getHttpString(value, prefix = '') {
-        if (value instanceof Date) {
-            return prefix + '=' + encodeURIComponent(value.toISOString());
-        }
-        else if (typeof value == 'object') {
-            const resultObj = [];
-            for (const field in value) {
-                resultObj.push(this.getHttpString(value[field], prefix + `${prefix != '' ? '[' : ""}${field}${prefix != '' ? ']' : ''}`));
-            }
-            return resultObj.join('&');
-        }
-        else if (prefix != '') {
-            return encodeURIComponent(prefix) + '=' + encodeURIComponent(value);
-        }
-        return encodeURIComponent(value);
-    }
-    setTimeoutCall(ms) {
-        this.timeoutCall = ms;
-    }
-    clearTimeoutCall() {
-        this.timeoutCall = 0;
-    }
-    isFunction(item) {
-        return item === null ? false : (typeof (item) == "function" || item instanceof Function);
-    }
-    addEvent(event, handler) {
-        this.arrEvents.push({
-            event: event,
-            handler: handler
-        });
-    }
-    emitEvent(event, params) {
-        const arrHandler = this.arrEvents.filter(el => { return el.event == event; });
-        for (const idx in arrHandler) {
-            setTimeout(() => {
-                arrHandler[idx].handler.call(this, params);
-            }, 10);
-        }
-    }
-    uniqid() {
-        const charsList = '0123456789abcdefghijklmnopqrstuvwxyz';
-        let s = '';
-        for (let i = 0; i < 32; i++)
-            s += charsList[Math.round(Math.random() * (charsList.length - 1))];
-        return s;
-    }
-    setCallback(cb) {
-        const cbId = this.uniqid();
-        if (cb) {
-            this.cbArray.push({ uid: cbId, cb: cb });
-        }
-        return cbId;
-    }
-    doInit() {
-        this.emitEvent('init', this);
-    }
     utilReady() {
         if (document.readyState === "complete") {
             return this.runReady();
@@ -265,8 +268,8 @@ class baseBX24 {
         let cnt = 0;
         for (const idx in cmd) {
             const row = cmd[idx];
-            const method = Array.isArray(row) ? row[0] : row.method;
-            const params = Array.isArray(row) ? row[1] : row.params;
+            const method = Array.isArray(row) ? row[0] : row === null || row === void 0 ? void 0 : row.method;
+            const params = Array.isArray(row) ? row[1] : row === null || row === void 0 ? void 0 : row.params;
             if (method) {
                 cnt++;
                 comands[idx] = `${method}?${this.getHttpString(params)}`;
@@ -349,6 +352,9 @@ class baseBX24 {
         const result = {};
         for (const idx in calls) {
             const cmd = calls[idx];
+            const method = Array.isArray(cmd) ? cmd[0] : cmd === null || cmd === void 0 ? void 0 : cmd.method;
+            if (!method)
+                continue;
             if (((_a = data === null || data === void 0 ? void 0 : data.result) === null || _a === void 0 ? void 0 : _a[idx]) !== undefined || ((_b = data === null || data === void 0 ? void 0 : data.result_error) === null || _b === void 0 ? void 0 : _b[idx]) !== undefined) {
                 result[idx] = new callResult_1.CallResult({
                     result: ((_c = data.result) === null || _c === void 0 ? void 0 : _c[idx]) || {},
@@ -357,7 +363,7 @@ class baseBX24 {
                     time: data.result_time[idx],
                     next: data.result_next[idx]
                 }, {
-                    method: Array.isArray(cmd) ? cmd[0] : cmd === null || cmd === void 0 ? void 0 : cmd.method,
+                    method,
                     data: Array.isArray(cmd) ? cmd[1] : cmd === null || cmd === void 0 ? void 0 : cmd.params,
                     callback: callback
                 }, this, res.status);
@@ -369,7 +375,7 @@ class baseBX24 {
                     error_description: () => JSON.stringify(res),
                     answer: (_d = data === null || data === void 0 ? void 0 : data.result) === null || _d === void 0 ? void 0 : _d[idx],
                     query: {
-                        method: Array.isArray(cmd) ? cmd[0] : cmd === null || cmd === void 0 ? void 0 : cmd.method,
+                        method,
                         data: Array.isArray(cmd) ? cmd[1] : cmd === null || cmd === void 0 ? void 0 : cmd.params,
                         callback: callback
                     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@slavmak2486/bx24ts",
-    "version": "1.2.17",
+    "version": "1.2.18",
     "description": "Library for bitrix24",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -17,20 +17,20 @@
     "author": "dc",
     "license": "ISC",
     "devDependencies": {
-        "@types/jest": "^27.4.1",
-        "@typescript-eslint/eslint-plugin": "^5.13.0",
-        "@types/lodash": "^4.14.179",
-        "@typescript-eslint/parser": "^5.13.0",
-        "axios-mock-adapter": "^1.20.0",
-        "eslint": "^8.10.0",
-        "jest": "^27.5.1",
-        "nodemon": "^2.0.15",
-        "ts-jest": "^27.1.3",
-        "ts-node": "^10.6.0",
-        "typescript": "^4.6.2"
+        "@types/jest": "^30.0.0",
+        "@typescript-eslint/eslint-plugin": "^8.48.0",
+        "@types/lodash": "^4.17.21",
+        "@typescript-eslint/parser": "^8.48.0",
+        "axios-mock-adapter": "^2.1.0",
+        "eslint": "^9.39.1",
+        "jest": "^30.2.0",
+        "nodemon": "^3.1.11",
+        "ts-jest": "^29.4.5",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.9.3"
     },
     "dependencies": {
         "lodash": "^4.17.21",
-        "axios": "^1.7.9"
+        "axios": "^1.13.2"
     }
 }

package/tsconfig.json

@@ -86,16 +86,16 @@
     // "noImplicitThis": true,                           /* Enable error reporting when `this` is given the type `any`. */
     // "useUnknownInCatchVariables": true,               /* Type catch clause variables as 'unknown' instead of 'any'. */
     // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when a local variables aren't read. */
-    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read */
+    "noUnusedLocals": true,                           /* Enable error reporting when a local variables aren't read. */
+    "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read */
     // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
-    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-    // "noUncheckedIndexedAccess": true,                 /* Include 'undefined' in index signature results */
-    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type */
-    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+    "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+    "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+    "noUncheckedIndexedAccess": true,                 /* Include 'undefined' in index signature results */
+    "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+    "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type */
+    "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+    "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
 
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */