dbgate-tools 6.6.12 → 6.7.1

package/lib/SqlDumper.js

@@ -51,6 +51,7 @@ class SqlDumper {
         this.put('^null');
     }
     putValue(value, dataType = null) {
+        var _a;
         if (value === null)
             this.put('^null');
         else if (value === true)
@@ -65,6 +66,14 @@ 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 ((_a = value === null || value === void 0 ? void 0 : value.$binary) === null || _a === void 0 ? void 0 : _a.base64) {
+            const binary = atob(value.$binary.base64);
+            const bytes = new Array(binary.length);
+            for (let i = 0; i < binary.length; i++) {
+                bytes[i] = binary.charCodeAt(i);
+            }
+            this.putByteArrayValue(bytes);
+        }
         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))

package/lib/filterBehaviours.js

@@ -41,6 +41,7 @@ exports.mongoFilterBehaviour = {
     allowStringToken: true,
     allowNumberDualTesting: true,
     allowObjectIdTesting: true,
+    allowHexString: true,
 };
 exports.evalFilterBehaviour = {
     supportEquals: true,

package/lib/stringTools.d.ts

@@ -3,6 +3,8 @@ export declare const MAX_GRID_TEXT_LENGTH = 1000;
 export type EditorDataType = 'null' | 'objectid' | 'string' | 'number' | 'object' | 'date' | 'array' | 'boolean' | 'unknown';
 export declare function arrayToHexString(byteArray: any): any;
 export declare function hexStringToArray(inputString: any): any[];
+export declare function base64ToHex(base64String: any): string;
+export declare function hexToBase64(hexString: any): string;
 export declare function parseCellValue(value: any, editorTypes?: DataEditorTypesBehaviour): any;
 export declare function stringifyCellValue(value: any, intent: 'gridCellIntent' | 'inlineEditorIntent' | 'multilineEditorIntent' | 'stringConversionIntent' | 'exportIntent' | 'clipboardIntent', editorTypes?: DataEditorTypesBehaviour, gridFormattingOptions?: {
     useThousandsSeparator?: boolean;

package/lib/stringTools.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shortenIdentifier = exports.setSqlFrontMatter = exports.removeSqlFrontMatter = exports.getSqlFrontMatter = 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 = exports.MAX_GRID_TEXT_LENGTH = void 0;
+exports.shortenIdentifier = exports.setSqlFrontMatter = exports.removeSqlFrontMatter = exports.getSqlFrontMatter = 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.hexToBase64 = exports.base64ToHex = exports.hexStringToArray = exports.arrayToHexString = exports.MAX_GRID_TEXT_LENGTH = void 0;
 const isString_1 = __importDefault(require("lodash/isString"));
 const isArray_1 = __importDefault(require("lodash/isArray"));
 const isDate_1 = __importDefault(require("lodash/isDate"));
@@ -31,6 +31,18 @@ function hexStringToArray(inputString) {
     return res;
 }
 exports.hexStringToArray = hexStringToArray;
+function base64ToHex(base64String) {
+    const binaryString = atob(base64String);
+    const hexString = Array.from(binaryString, c => c.charCodeAt(0).toString(16).padStart(2, '0')).join('');
+    return '0x' + hexString.toUpperCase();
+}
+exports.base64ToHex = base64ToHex;
+;
+function hexToBase64(hexString) {
+    const binaryString = hexString.match(/.{1,2}/g).map(byte => String.fromCharCode(parseInt(byte, 16))).join('');
+    return btoa(binaryString);
+}
+exports.hexToBase64 = hexToBase64;
 function parseCellValue(value, editorTypes) {
     if (!(0, isString_1.default)(value))
         return value;
@@ -42,8 +54,9 @@ function parseCellValue(value, editorTypes) {
         const mHex = value.match(/^0x([0-9a-fA-F][0-9a-fA-F])+$/);
         if (mHex) {
             return {
-                type: 'Buffer',
-                data: hexStringToArray(value.substring(2)),
+                $binary: {
+                    base64: hexToBase64(value.substring(2))
+                }
             };
         }
     }
@@ -170,7 +183,7 @@ function stringifyJsonToGrid(value) {
     return { value: '(JSON)', gridStyle: 'nullCellStyle' };
 }
 function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, jsonParsedValue) {
-    var _a;
+    var _a, _b;
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseSqlNull) {
         if (value === null) {
             switch (intent) {
@@ -198,10 +211,16 @@ function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, j
         return { value: 'true', gridStyle: 'valueCellStyle' };
     if (value === false)
         return { value: 'false', gridStyle: 'valueCellStyle' };
+    if ((_a = value === null || value === void 0 ? void 0 : value.$binary) === null || _a === void 0 ? void 0 : _a.base64) {
+        return {
+            value: base64ToHex(value.$binary.base64),
+            gridStyle: 'valueCellStyle',
+        };
+    }
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseHexAsBuffer) {
-        if ((value === null || value === void 0 ? void 0 : value.type) == 'Buffer' && (0, isArray_1.default)(value.data)) {
-            return { value: '0x' + arrayToHexString(value.data), gridStyle: 'valueCellStyle' };
-        }
+        // if (value?.type == 'Buffer' && _isArray(value.data)) {
+        //   return { value: '0x' + arrayToHexString(value.data), gridStyle: 'valueCellStyle' };
+        // }
     }
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseObjectIdAsDollar) {
         if (value === null || value === void 0 ? void 0 : value.$oid) {
@@ -263,7 +282,7 @@ function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, j
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseFsDocumentRefAsDollar) {
         if (value === null || value === void 0 ? void 0 : value.$fsDocumentRef) {
             return {
-                value: `$ref: ${(_a = value.$fsDocumentRef.documentPath) !== null && _a !== void 0 ? _a : ''}`,
+                value: `$ref: ${(_b = value.$fsDocumentRef.documentPath) !== null && _b !== void 0 ? _b : ''}`,
                 gridStyle: 'valueCellStyle',
             };
         }
@@ -437,9 +456,13 @@ function arrayBufferToBase64(buffer) {
 }
 exports.arrayBufferToBase64 = arrayBufferToBase64;
 function getAsImageSrc(obj) {
+    var _a;
     if ((obj === null || obj === void 0 ? void 0 : obj.type) == 'Buffer' && (0, isArray_1.default)(obj === null || obj === void 0 ? void 0 : obj.data)) {
         return `data:image/png;base64, ${arrayBufferToBase64(obj === null || obj === void 0 ? void 0 : obj.data)}`;
     }
+    if ((_a = obj === null || obj === void 0 ? void 0 : obj.$binary) === null || _a === void 0 ? void 0 : _a.base64) {
+        return `data:image/png;base64, ${obj.$binary.base64}`;
+    }
     if ((0, isString_1.default)(obj) && (obj.startsWith('http://') || obj.startsWith('https://'))) {
         return obj;
     }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.6.12",
+  "version": "6.7.1",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,15 +26,15 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.6.12",
+    "dbgate-types": "^6.7.1",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "blueimp-md5": "^2.19.0",
-    "dbgate-query-splitter": "^4.11.7",
-    "dbgate-sqltree": "^6.6.12",
+    "dbgate-query-splitter": "^4.11.9",
+    "dbgate-sqltree": "^6.7.1",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",