dbgate-tools 6.4.0 → 6.4.2

package/lib/SqlDumper.js

@@ -65,6 +65,8 @@ class SqlDumper {
             this.putStringValue(new Date(value).toISOString());
         else if ((value === null || value === void 0 ? void 0 : value.type) == 'Buffer' && (0, isArray_1.default)(value === null || value === void 0 ? void 0 : value.data))
             this.putByteArrayValue(value === null || value === void 0 ? void 0 : value.data);
+        else if (value === null || value === void 0 ? void 0 : value.$bigint)
+            this.putRaw(value === null || value === void 0 ? void 0 : value.$bigint);
         else if ((0, isPlainObject_1.default)(value) || (0, isArray_1.default)(value))
             this.putStringValue(JSON.stringify(value));
         else

package/lib/dbKeysLoader.d.ts

@@ -1,35 +1,60 @@
+export declare const DB_KEYS_SHOW_INCREMENT = 100;
 export interface DbKeysNodeModelBase {
     text?: string;
+    sortKey: string;
+    key: string;
     count?: number;
     level: number;
+    keyPath: string[];
+    parentKey: string;
 }
 export interface DbKeysLeafNodeModel extends DbKeysNodeModelBase {
-    key: string;
     type: 'string' | 'hash' | 'set' | 'list' | 'zset' | 'stream' | 'binary' | 'ReJSON-RL';
 }
 export interface DbKeysFolderNodeModel extends DbKeysNodeModelBase {
-    root: string;
     type: 'dir';
-    maxShowCount?: number;
+}
+export interface DbKeysFolderStateMode {
+    key: string;
+    visibleCount?: number;
     isExpanded?: boolean;
-    shouldLoadNext?: boolean;
-    hasNext?: boolean;
 }
 export interface DbKeysTreeModel {
+    treeKeySeparator: string;
     root: DbKeysFolderNodeModel;
     dirsByKey: {
         [key: string]: DbKeysFolderNodeModel;
     };
+    dirStateByKey: {
+        [key: string]: DbKeysFolderStateMode;
+    };
     childrenByKey: {
         [key: string]: DbKeysNodeModel[];
     };
-    refreshAll?: boolean;
+    keyObjectsByKey: {
+        [key: string]: DbKeysNodeModel;
+    };
+    scannedKeys: number;
+    loadCount: number;
+    dbsize: number;
+    cursor: string;
+    loadedAll: boolean;
 }
 export type DbKeysNodeModel = DbKeysLeafNodeModel | DbKeysFolderNodeModel;
-export type DbKeysLoadFunction = (root: string, limit: number) => Promise<DbKeysNodeModel[]>;
-export type DbKeysChangeModelFunction = (func: (model: DbKeysTreeModel) => DbKeysTreeModel) => void;
-export declare function dbKeys_loadMissing(tree: DbKeysTreeModel, loader: DbKeysLoadFunction): Promise<DbKeysTreeModel>;
+export interface DbKeyLoadedModel {
+    key: string;
+    type: 'string' | 'hash' | 'set' | 'list' | 'zset' | 'stream' | 'binary' | 'ReJSON-RL';
+    count?: number;
+}
+export interface DbKeysLoadResult {
+    nextCursor: string;
+    keys: DbKeyLoadedModel[];
+    dbsize: number;
+}
+export type DbKeysChangeModelFunction = (func: (model: DbKeysTreeModel) => DbKeysTreeModel, loadNextPage: boolean) => void;
+export declare function dbKeys_mergeNextPage(tree: DbKeysTreeModel, nextPage: DbKeysLoadResult): DbKeysTreeModel;
 export declare function dbKeys_markNodeExpanded(tree: DbKeysTreeModel, root: string, isExpanded: boolean): DbKeysTreeModel;
-export declare function dbKeys_refreshAll(tree?: DbKeysTreeModel): DbKeysTreeModel;
-export declare function dbKeys_reloadFolder(tree: DbKeysTreeModel, root: string): DbKeysTreeModel;
+export declare function dbKeys_showNextItems(tree: DbKeysTreeModel, root: string): DbKeysTreeModel;
+export declare function dbKeys_createNewModel(treeKeySeparator: string): DbKeysTreeModel;
+export declare function dbKeys_clearLoadedData(tree: DbKeysTreeModel): DbKeysTreeModel;
 export declare function dbKeys_getFlatList(tree: DbKeysTreeModel): DbKeysNodeModel[];

package/lib/dbKeysLoader.js

@@ -1,20 +1,11 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dbKeys_getFlatList = exports.dbKeys_reloadFolder = exports.dbKeys_refreshAll = exports.dbKeys_markNodeExpanded = exports.dbKeys_loadMissing = void 0;
-const omit_1 = __importDefault(require("lodash/omit"));
-const SHOW_INCREMENT = 100;
+exports.dbKeys_getFlatList = exports.dbKeys_clearLoadedData = exports.dbKeys_createNewModel = exports.dbKeys_showNextItems = exports.dbKeys_markNodeExpanded = exports.dbKeys_mergeNextPage = exports.DB_KEYS_SHOW_INCREMENT = void 0;
+const sortBy_1 = __importDefault(require("lodash/sortBy"));
+exports.DB_KEYS_SHOW_INCREMENT = 100;
 // function dbKeys_findFolderNode(node: DbKeysNodeModel, root: string) {
 //   if (node.type != 'dir') {
 //     return null;
@@ -49,78 +40,181 @@ const SHOW_INCREMENT = 100;
 //     },
 //   };
 // }
-function dbKeys_loadMissing(tree, loader) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const childrenByKey = Object.assign({}, tree.childrenByKey);
-        const dirsByKey = Object.assign({}, tree.dirsByKey);
-        for (const root in tree.dirsByKey) {
-            const dir = tree.dirsByKey[root];
-            if (dir.isExpanded && dir.shouldLoadNext) {
-                if (!tree.childrenByKey[root] || dir.hasNext) {
-                    const loadCount = dir.maxShowCount && dir.shouldLoadNext ? dir.maxShowCount + SHOW_INCREMENT : SHOW_INCREMENT;
-                    const items = yield loader(root, loadCount + 1);
-                    childrenByKey[root] = items.slice(0, loadCount);
-                    dirsByKey[root] = Object.assign(Object.assign({}, dir), { shouldLoadNext: false, maxShowCount: loadCount, hasNext: items.length > loadCount });
-                    for (const child of items.slice(0, loadCount)) {
-                        if (child.type == 'dir' && !dirsByKey[child.root]) {
-                            dirsByKey[child.root] = {
-                                shouldLoadNext: false,
-                                maxShowCount: null,
-                                hasNext: false,
-                                isExpanded: false,
-                                type: 'dir',
-                                level: dir.level + 1,
-                                root: child.root,
-                                text: child.text,
-                            };
-                        }
-                    }
-                }
-                else {
-                    dirsByKey[root] = Object.assign(Object.assign({}, dir), { shouldLoadNext: false });
-                }
+// export async function dbKeys_loadMissing(tree: DbKeysTreeModel, loader: DbKeysLoadFunction): Promise<DbKeysTreeModel> {
+//   const childrenByKey = { ...tree.childrenByKey };
+//   const dirsByKey = { ...tree.dirsByKey };
+//   for (const root in tree.dirsByKey) {
+//     const dir = tree.dirsByKey[root];
+//     if (dir.isExpanded && dir.shouldLoadNext) {
+//       if (!tree.childrenByKey[root] || dir.hasNext) {
+//         const loadCount = dir.maxShowCount && dir.shouldLoadNext ? dir.maxShowCount + SHOW_INCREMENT : SHOW_INCREMENT;
+//         const items = await loader(root, loadCount + 1);
+//         childrenByKey[root] = items.slice(0, loadCount);
+//         dirsByKey[root] = {
+//           ...dir,
+//           shouldLoadNext: false,
+//           maxShowCount: loadCount,
+//           hasNext: items.length > loadCount,
+//         };
+//         for (const child of items.slice(0, loadCount)) {
+//           if (child.type == 'dir' && !dirsByKey[child.root]) {
+//             dirsByKey[child.root] = {
+//               shouldLoadNext: false,
+//               maxShowCount: null,
+//               hasNext: false,
+//               isExpanded: false,
+//               type: 'dir',
+//               level: dir.level + 1,
+//               root: child.root,
+//               text: child.text,
+//             };
+//           }
+//         }
+//       } else {
+//         dirsByKey[root] = {
+//           ...dir,
+//           shouldLoadNext: false,
+//         };
+//       }
+//     }
+//   }
+//   return {
+//     ...tree,
+//     dirsByKey,
+//     childrenByKey,
+//     refreshAll: false,
+//   };
+// }
+function dbKeys_mergeNextPage(tree, nextPage) {
+    const keyObjectsByKey = Object.assign({}, tree.keyObjectsByKey);
+    for (const keyObj of nextPage.keys) {
+        const keyPath = keyObj.key.split(tree.treeKeySeparator);
+        keyObjectsByKey[keyObj.key] = Object.assign(Object.assign({}, keyObj), { level: keyPath.length, text: keyPath[keyPath.length - 1], sortKey: keyPath[keyPath.length - 1], keyPath, parentKey: keyPath.slice(0, -1).join(tree.treeKeySeparator) });
+    }
+    const dirsByKey = {};
+    const childrenByKey = {};
+    dirsByKey[''] = tree.root;
+    for (const keyObj of Object.values(keyObjectsByKey)) {
+        const dirPath = keyObj.keyPath.slice(0, -1);
+        const dirKey = dirPath.join(tree.treeKeySeparator);
+        let dirDepth = keyObj.keyPath.length - 1;
+        while (dirDepth > 0) {
+            const newDirPath = keyObj.keyPath.slice(0, dirDepth);
+            const newDirKey = newDirPath.join(tree.treeKeySeparator);
+            if (!dirsByKey[newDirKey]) {
+                dirsByKey[newDirKey] = {
+                    level: keyObj.level - 1,
+                    keyPath: newDirPath,
+                    parentKey: newDirPath.slice(0, -1).join(tree.treeKeySeparator),
+                    type: 'dir',
+                    key: newDirKey,
+                    text: `${newDirPath[newDirPath.length - 1]}${tree.treeKeySeparator}*`,
+                    sortKey: newDirPath[newDirPath.length - 1],
+                };
             }
+            dirDepth -= 1;
+        }
+        if (!childrenByKey[dirKey]) {
+            childrenByKey[dirKey] = [];
+        }
+        childrenByKey[dirKey].push(keyObj);
+    }
+    for (const dirObj of Object.values(dirsByKey)) {
+        if (dirObj.key == '') {
+            continue;
+        }
+        if (!childrenByKey[dirObj.parentKey]) {
+            childrenByKey[dirObj.parentKey] = [];
         }
-        return Object.assign(Object.assign({}, tree), { dirsByKey,
-            childrenByKey, refreshAll: false });
-    });
+        childrenByKey[dirObj.parentKey].push(dirObj);
+        // set key count
+        dirsByKey[dirObj.key].count = childrenByKey[dirObj.key].length;
+    }
+    for (const key in childrenByKey) {
+        childrenByKey[key] = (0, sortBy_1.default)(childrenByKey[key], 'sortKey');
+    }
+    return Object.assign(Object.assign({}, tree), { cursor: nextPage.nextCursor, dirsByKey,
+        childrenByKey,
+        keyObjectsByKey, scannedKeys: tree.scannedKeys + tree.loadCount, loadedAll: nextPage.nextCursor == '0', dbsize: nextPage.dbsize });
 }
-exports.dbKeys_loadMissing = dbKeys_loadMissing;
+exports.dbKeys_mergeNextPage = dbKeys_mergeNextPage;
 function dbKeys_markNodeExpanded(tree, root, isExpanded) {
-    const node = tree.dirsByKey[root];
-    if (!node) {
-        return tree;
-    }
-    return Object.assign(Object.assign({}, tree), { dirsByKey: Object.assign(Object.assign({}, tree.dirsByKey), { [root]: Object.assign(Object.assign({}, node), { isExpanded, shouldLoadNext: isExpanded }) }) });
+    const node = tree.dirStateByKey[root];
+    return Object.assign(Object.assign({}, tree), { dirStateByKey: Object.assign(Object.assign({}, tree.dirStateByKey), { [root]: Object.assign(Object.assign({}, node), { isExpanded }) }) });
 }
 exports.dbKeys_markNodeExpanded = dbKeys_markNodeExpanded;
-function dbKeys_refreshAll(tree) {
+function dbKeys_showNextItems(tree, root) {
+    var _a;
+    const node = tree.dirStateByKey[root];
+    return Object.assign(Object.assign({}, tree), { dirStateByKey: Object.assign(Object.assign({}, tree.dirStateByKey), { [root]: Object.assign(Object.assign({}, node), { visibleCount: ((_a = node === null || node === void 0 ? void 0 : node.visibleCount) !== null && _a !== void 0 ? _a : exports.DB_KEYS_SHOW_INCREMENT) + exports.DB_KEYS_SHOW_INCREMENT }) }) });
+}
+exports.dbKeys_showNextItems = dbKeys_showNextItems;
+function dbKeys_createNewModel(treeKeySeparator) {
     const root = {
-        isExpanded: true,
         level: 0,
-        root: '',
         type: 'dir',
-        shouldLoadNext: true,
+        keyPath: [],
+        parentKey: '',
+        key: '',
+        sortKey: '',
     };
-    return Object.assign(Object.assign({}, tree), { childrenByKey: {}, dirsByKey: {
+    return {
+        treeKeySeparator,
+        childrenByKey: {},
+        keyObjectsByKey: {},
+        dirsByKey: {
             '': root,
-        }, refreshAll: true, root });
+        },
+        dirStateByKey: {
+            '': {
+                key: '',
+                visibleCount: exports.DB_KEYS_SHOW_INCREMENT,
+                isExpanded: true,
+            },
+        },
+        scannedKeys: 0,
+        dbsize: 0,
+        loadCount: 2000,
+        cursor: '0',
+        root,
+        loadedAll: false,
+    };
 }
-exports.dbKeys_refreshAll = dbKeys_refreshAll;
-function dbKeys_reloadFolder(tree, root) {
-    return Object.assign(Object.assign({}, tree), { childrenByKey: (0, omit_1.default)(tree.childrenByKey, root), dirsByKey: Object.assign(Object.assign({}, tree.dirsByKey), { [root]: Object.assign(Object.assign({}, tree.dirsByKey[root]), { shouldLoadNext: true, hasNext: undefined }) }) });
+exports.dbKeys_createNewModel = dbKeys_createNewModel;
+function dbKeys_clearLoadedData(tree) {
+    return Object.assign(Object.assign({}, tree), { childrenByKey: {}, keyObjectsByKey: {}, dirsByKey: {
+            '': tree.root,
+        }, scannedKeys: 0, dbsize: 0, cursor: '0', loadedAll: false });
 }
-exports.dbKeys_reloadFolder = dbKeys_reloadFolder;
-function addFlatItems(tree, root, res) {
-    const item = tree.dirsByKey[root];
-    if (!item.isExpanded) {
+exports.dbKeys_clearLoadedData = dbKeys_clearLoadedData;
+// export function dbKeys_reloadFolder(tree: DbKeysTreeModel, root: string): DbKeysTreeModel {
+//   return {
+//     ...tree,
+//     childrenByKey: _omit(tree.childrenByKey, root),
+//     dirsByKey: {
+//       ...tree.dirsByKey,
+//       [root]: {
+//         ...tree.dirsByKey[root],
+//         shouldLoadNext: true,
+//         hasNext: undefined,
+//       },
+//     },
+//   };
+// }
+function addFlatItems(tree, root, res, visitedRoots = []) {
+    const item = tree.dirStateByKey[root];
+    if (!(item === null || item === void 0 ? void 0 : item.isExpanded)) {
         return false;
     }
     const children = tree.childrenByKey[root] || [];
     for (const child of children) {
         res.push(child);
         if (child.type == 'dir') {
-            addFlatItems(tree, child.root, res);
+            if (visitedRoots.includes(child.key)) {
+                console.warn('Redis: preventing infinite loop for root', child.key);
+                return false;
+            }
+            addFlatItems(tree, child.key, res, [...visitedRoots, root]);
         }
     }
 }

package/lib/stringTools.d.ts

@@ -37,3 +37,8 @@ export declare function getLimitedQuery(sql: string): string;
 export declare function pinoLogRecordToMessageRecord(logRecord: any, defaultSeverity?: string): any;
 export declare function jsonLinesStringify(jsonArray: any[]): string;
 export declare function jsonLinesParse(jsonLines: string): any[];
+export declare function serializeJsTypesForJsonStringify(obj: any, replacer?: any): any;
+export declare function deserializeJsTypesFromJsonParse(obj: any): any;
+export declare function serializeJsTypesReplacer(key: any, value: any): any;
+export declare function deserializeJsTypesReviver(key: any, value: any): any;
+export declare function parseNumberSafe(value: any): number | bigint;

package/lib/stringTools.js

@@ -14,13 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonLinesParse = exports.jsonLinesStringify = exports.pinoLogRecordToMessageRecord = exports.getLimitedQuery = exports.safeFormatDate = exports.extractErrorLogData = exports.extractErrorStackTrace = exports.extractErrorMessage = exports.getConvertValueMenu = exports.detectTypeIcon = exports.detectCellDataType = exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.shouldOpenMultilineDialog = exports.safeCompileRegExp = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
+exports.parseNumberSafe = exports.deserializeJsTypesReviver = exports.serializeJsTypesReplacer = exports.deserializeJsTypesFromJsonParse = exports.serializeJsTypesForJsonStringify = exports.jsonLinesParse = exports.jsonLinesStringify = exports.pinoLogRecordToMessageRecord = exports.getLimitedQuery = exports.safeFormatDate = exports.extractErrorLogData = exports.extractErrorStackTrace = exports.extractErrorMessage = exports.getConvertValueMenu = exports.detectTypeIcon = exports.detectCellDataType = exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.shouldOpenMultilineDialog = exports.safeCompileRegExp = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
 const isString_1 = __importDefault(require("lodash/isString"));
 const isArray_1 = __importDefault(require("lodash/isArray"));
 const isDate_1 = __importDefault(require("lodash/isDate"));
 const isNumber_1 = __importDefault(require("lodash/isNumber"));
 const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
 const pad_1 = __importDefault(require("lodash/pad"));
+const cloneDeepWith_1 = __importDefault(require("lodash/cloneDeepWith"));
 const dateTimeStorageRegex = /^([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|()|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
 const dateTimeParseRegex = /^(\d{4})-(\d{2})-(\d{2})[Tt ](\d{2}):(\d{2}):(\d{2})(\.[0-9]+)?(([Zz])|()|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
 function arrayToHexString(byteArray) {
@@ -78,7 +79,7 @@ function parseCellValue(value, editorTypes) {
     }
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseNumber) {
         if (/^-?[0-9]+(?:\.[0-9]+)?$/.test(value)) {
-            return parseFloat(value);
+            return parseNumberSafe(value);
         }
     }
     if ((editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonArray) || (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonObject)) {
@@ -189,6 +190,18 @@ function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, j
             }
         }
     }
+    if (value === null || value === void 0 ? void 0 : value.$bigint) {
+        return {
+            value: value.$bigint,
+            gridStyle: 'valueCellStyle',
+        };
+    }
+    if (typeof value === 'bigint') {
+        return {
+            value: value.toString(),
+            gridStyle: 'valueCellStyle',
+        };
+    }
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseDateAsDollar) {
         if (value === null || value === void 0 ? void 0 : value.$date) {
             const dateString = (0, isDate_1.default)(value.$date) ? value.$date.toISOString() : value.$date.toString();
@@ -320,6 +333,9 @@ function shouldOpenMultilineDialog(value) {
     if (value === null || value === void 0 ? void 0 : value.$date) {
         return false;
     }
+    if (value === null || value === void 0 ? void 0 : value.$bigint) {
+        return false;
+    }
     if ((0, isPlainObject_1.default)(value) || (0, isArray_1.default)(value)) {
         return true;
     }
@@ -553,3 +569,47 @@ function jsonLinesParse(jsonLines) {
         .filter(x => x);
 }
 exports.jsonLinesParse = jsonLinesParse;
+function serializeJsTypesForJsonStringify(obj, replacer = null) {
+    return (0, cloneDeepWith_1.default)(obj, value => {
+        if (typeof value === 'bigint') {
+            return { $bigint: value.toString() };
+        }
+        if (replacer) {
+            return replacer(value);
+        }
+    });
+}
+exports.serializeJsTypesForJsonStringify = serializeJsTypesForJsonStringify;
+function deserializeJsTypesFromJsonParse(obj) {
+    return (0, cloneDeepWith_1.default)(obj, value => {
+        if (value === null || value === void 0 ? void 0 : value.$bigint) {
+            return BigInt(value.$bigint);
+        }
+    });
+}
+exports.deserializeJsTypesFromJsonParse = deserializeJsTypesFromJsonParse;
+function serializeJsTypesReplacer(key, value) {
+    if (typeof value === 'bigint') {
+        return { $bigint: value.toString() };
+    }
+    return value;
+}
+exports.serializeJsTypesReplacer = serializeJsTypesReplacer;
+function deserializeJsTypesReviver(key, value) {
+    if (value === null || value === void 0 ? void 0 : value.$bigint) {
+        return BigInt(value.$bigint);
+    }
+    return value;
+}
+exports.deserializeJsTypesReviver = deserializeJsTypesReviver;
+function parseNumberSafe(value) {
+    if (/^-?[0-9]+$/.test(value)) {
+        const parsed = parseInt(value);
+        if (Number.isSafeInteger(parsed)) {
+            return parsed;
+        }
+        return BigInt(value);
+    }
+    return parseFloat(value);
+}
+exports.parseNumberSafe = parseNumberSafe;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.4.0",
+  "version": "6.4.2",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,14 +26,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.4.0",
+    "dbgate-types": "^6.4.2",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "dbgate-query-splitter": "^4.11.4",
-    "dbgate-sqltree": "^6.4.0",
+    "dbgate-query-splitter": "^4.11.5",
+    "dbgate-sqltree": "^6.4.2",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",