dbgate-tools 6.7.2-alpha.1 → 6.7.3

package/lib/DatabaseAnalyser.js

@@ -151,6 +151,11 @@ class DatabaseAnalyser {
         }
         const res = {};
         for (const field of STRUCTURE_FIELDS) {
+            const isAll = this.modifications.some(x => x.action == 'all' && x.objectTypeField == field);
+            if (isAll) {
+                res[field] = newlyAnalysed[field] || [];
+                continue;
+            }
             const removedIds = this.modifications
                 .filter(x => x.action == 'remove' && x.objectTypeField == field)
                 .map(x => x.objectId);

package/lib/stringTools.d.ts

@@ -7,7 +7,7 @@ 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;
+    thousandsSeparator?: string;
 }, jsonParsedValue?: any): {
     value: string;
     gridStyle?: 'textCellStyle' | 'valueCellStyle' | 'nullCellStyle';

package/lib/stringTools.js

@@ -37,9 +37,11 @@ function base64ToHex(base64String) {
     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('');
+    const binaryString = hexString
+        .match(/.{1,2}/g)
+        .map(byte => String.fromCharCode(parseInt(byte, 16)))
+        .join('');
     return btoa(binaryString);
 }
 exports.hexToBase64 = hexToBase64;
@@ -55,8 +57,8 @@ function parseCellValue(value, editorTypes) {
         if (mHex) {
             return {
                 $binary: {
-                    base64: hexToBase64(value.substring(2))
-                }
+                    base64: hexToBase64(value.substring(2)),
+                },
             };
         }
     }
@@ -182,6 +184,30 @@ function stringifyJsonToGrid(value) {
     }
     return { value: '(JSON)', gridStyle: 'nullCellStyle' };
 }
+function formatNumberCustomSeparator(value, thousandsSeparator) {
+    const [intPart, decPart] = value.split('.');
+    const intPartWithSeparator = intPart.replace(/\B(?=(\d{3})+(?!\d))/g, thousandsSeparator);
+    return decPart ? `${intPartWithSeparator}.${decPart}` : intPartWithSeparator;
+}
+function formatCellNumber(value, gridFormattingOptions) {
+    const separator = gridFormattingOptions === null || gridFormattingOptions === void 0 ? void 0 : gridFormattingOptions.thousandsSeparator;
+    if ((0, isNumber_1.default)(value)) {
+        if (separator === 'none' || (value < 1000 && value > -1000))
+            return value.toString();
+        if (separator === 'system')
+            return value.toLocaleString();
+    }
+    // fallback for system locale
+    if (separator === 'space' || separator === 'system')
+        return formatNumberCustomSeparator(value.toString(), ' ');
+    if (separator === 'narrowspace')
+        return formatNumberCustomSeparator(value.toString(), '\u202F');
+    if (separator === 'comma')
+        return formatNumberCustomSeparator(value.toString(), ',');
+    if (separator === 'dot')
+        return formatNumberCustomSeparator(value.toString(), '.');
+    return value.toString();
+}
 function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, jsonParsedValue) {
     var _a, _b;
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseSqlNull) {
@@ -235,13 +261,13 @@ function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, j
     }
     if (value === null || value === void 0 ? void 0 : value.$bigint) {
         return {
-            value: value.$bigint,
+            value: formatCellNumber(value.$bigint, gridFormattingOptions),
             gridStyle: 'valueCellStyle',
         };
     }
     if (typeof value === 'bigint') {
         return {
-            value: value.toString(),
+            value: formatCellNumber(value.toString(), gridFormattingOptions),
             gridStyle: 'valueCellStyle',
         };
     }
@@ -310,12 +336,8 @@ function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, j
     if ((0, isNumber_1.default)(value)) {
         switch (intent) {
             case 'gridCellIntent':
-                return {
-                    value: (gridFormattingOptions === null || gridFormattingOptions === void 0 ? void 0 : gridFormattingOptions.useThousandsSeparator) && (value >= 10000 || value <= -10000)
-                        ? value.toLocaleString()
-                        : value.toString(),
-                    gridStyle: 'valueCellStyle',
-                };
+                const separator = gridFormattingOptions === null || gridFormattingOptions === void 0 ? void 0 : gridFormattingOptions.thousandsSeparator;
+                return { value: formatCellNumber(value, gridFormattingOptions), gridStyle: 'valueCellStyle' };
             default:
                 return { value: value.toString() };
         }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.7.2-alpha.1",
+  "version": "6.7.3",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.7.2-alpha.1",
+    "dbgate-types": "^6.7.3",
     "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.11.9",
-    "dbgate-sqltree": "^6.7.2-alpha.1",
+    "dbgate-sqltree": "^6.7.3",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",