dbgate-tools 7.1.6 → 7.1.8

package/lib/stringTools.d.ts

@@ -1,5 +1,6 @@
 import { DataEditorTypesBehaviour } from 'dbgate-types';
 export declare const MAX_GRID_TEXT_LENGTH = 1000;
+export declare const MAX_GRID_BINARY_SIZE = 10000;
 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[];

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.uuidToBase64 = exports.hexToBase64 = exports.base64ToUuid = exports.base64ToHex = 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.uuidToBase64 = exports.hexToBase64 = exports.base64ToUuid = exports.base64ToHex = exports.hexStringToArray = exports.arrayToHexString = exports.MAX_GRID_BINARY_SIZE = 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"));
@@ -16,6 +16,14 @@ const omitBy_1 = __importDefault(require("lodash/omitBy"));
 const isPlainObject_2 = __importDefault(require("lodash/isPlainObject"));
 const blueimp_md5_1 = __importDefault(require("blueimp-md5"));
 exports.MAX_GRID_TEXT_LENGTH = 1000; // maximum length of text in grid cell, longer text is truncated
+exports.MAX_GRID_BINARY_SIZE = 10000; // maximum binary size (base64 chars or byte count) before showing 'too large' in grid cell
+function formatByteSize(bytes) {
+    if (bytes >= 1024 * 1024)
+        return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+    if (bytes >= 1024)
+        return `${(bytes / 1024).toFixed(1)} KB`;
+    return `${bytes} B`;
+}
 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) {
@@ -304,6 +312,9 @@ function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, j
                 return { value: `${tag}("${uuidStr}")`, gridStyle: 'valueCellStyle' };
             }
         }
+        if (intent === 'gridCellIntent' && value.$binary.base64.length > exports.MAX_GRID_BINARY_SIZE) {
+            return { value: `(Field too large, ${formatByteSize(Math.round(value.$binary.base64.length * 3 / 4))})`, gridStyle: 'nullCellStyle' };
+        }
         return {
             value: base64ToHex(value.$binary.base64),
             gridStyle: 'valueCellStyle',
@@ -385,6 +396,13 @@ function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, j
             };
         }
     }
+    if ((value === null || value === void 0 ? void 0 : value.type) === 'Buffer' && (0, isArray_1.default)(value.data)) {
+        if (intent === 'gridCellIntent') {
+            return value.data.length > exports.MAX_GRID_BINARY_SIZE
+                ? { value: `(Field too large, ${formatByteSize(value.data.length)})`, gridStyle: 'nullCellStyle' }
+                : { value: '0x' + arrayToHexString(value.data), gridStyle: 'valueCellStyle' };
+        }
+    }
     if ((0, isArray_1.default)(value)) {
         switch (intent) {
             case 'gridCellIntent':
@@ -510,7 +528,7 @@ function shouldOpenMultilineDialog(value) {
 }
 exports.shouldOpenMultilineDialog = shouldOpenMultilineDialog;
 function isJsonLikeLongString(value) {
-    return (0, isString_1.default)(value) && value.length > 100 && value.match(/^\s*\{.*\}\s*$|^\s*\[.*\]\s*$/m);
+    return (0, isString_1.default)(value) && value.length > 100 && value.length <= exports.MAX_GRID_BINARY_SIZE && value.match(/^\s*\{.*\}\s*$|^\s*\[.*\]\s*$/m);
 }
 exports.isJsonLikeLongString = isJsonLikeLongString;
 function getIconForRedisType(type) {

package/package.json

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