dbgate-tools 5.3.4 → 5.4.1

package/lib/SqlDumper.d.ts

@@ -111,5 +111,5 @@ export declare class SqlDumper implements AlterProcessor {
     createSqlObject(obj: SqlObjectInfo): void;
     getSqlObjectSqlName(ojectTypeField: string): "PROCEDURE" | "VIEW" | "FUNCTION" | "TRIGGER" | "MATERIALIZED VIEW";
     dropSqlObject(obj: SqlObjectInfo): void;
-    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[]): void;
+    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[], autoIncrementColumn: string): void;
 }

package/lib/SqlDumper.js

@@ -125,11 +125,29 @@ class SqlDumper {
             i++;
             switch (c) {
                 case '^':
+                    if (format[i] == '^') {
+                        this.putRaw('^');
+                        i++;
+                        break;
+                    }
                     while (i < length && format[i].match(/[a-z0-9_]/i)) {
                         this.putRaw(SqlDumper.convertKeywordCase(format[i]));
                         i++;
                     }
                     break;
+                case '~':
+                    if (format[i] == '~') {
+                        this.putRaw('~');
+                        i++;
+                        break;
+                    }
+                    let ident = '';
+                    while (i < length && format[i].match(/[a-z0-9_]/i)) {
+                        ident += format[i];
+                        i++;
+                    }
+                    this.putRaw(this.dialect.quoteIdentifier(ident));
+                    break;
                 case '%':
                     c = format[i];
                     i++;
@@ -571,7 +589,7 @@ class SqlDumper {
     dropSqlObject(obj) {
         this.putCmd('^drop %s %f', this.getSqlObjectSqlName(obj.objectTypeField), obj);
     }
-    fillPreloadedRows(table, oldRows, newRows, key, insertOnly) {
+    fillPreloadedRows(table, oldRows, newRows, key, insertOnly, autoIncrementColumn) {
         let was = false;
         for (const row of newRows) {
             const old = oldRows === null || oldRows === void 0 ? void 0 : oldRows.find(r => key.every(col => r[col] == row[col]));
@@ -597,7 +615,12 @@ class SqlDumper {
                 if (was)
                     this.put(';\n');
                 was = true;
+                const autoinc = rowKeys.includes(autoIncrementColumn);
+                if (autoinc)
+                    this.allowIdentityInsert(table, true);
                 this.put('^insert ^into %f (%,i) ^values (%,v)', table, rowKeys, rowKeys.map(x => row[x]));
+                if (autoinc)
+                    this.allowIdentityInsert(table, false);
             }
         }
         if (was) {

package/lib/alterPlan.d.ts

@@ -69,6 +69,7 @@ interface AlterOperation_FillPreloadedRows {
     newRows: any[];
     key: string[];
     insertOnly: string[];
+    autoIncrementColumn: string;
 }
 type AlterOperation = AlterOperation_CreateColumn | AlterOperation_ChangeColumn | AlterOperation_DropColumn | AlterOperation_CreateConstraint | AlterOperation_ChangeConstraint | AlterOperation_DropConstraint | AlterOperation_CreateTable | AlterOperation_DropTable | AlterOperation_RenameTable | AlterOperation_RenameColumn | AlterOperation_RenameConstraint | AlterOperation_CreateSqlObject | AlterOperation_DropSqlObject | AlterOperation_RecreateTable | AlterOperation_FillPreloadedRows;
 export declare class AlterPlan {
@@ -97,7 +98,7 @@ export declare class AlterPlan {
     renameColumn(column: ColumnInfo, newName: string): void;
     renameConstraint(constraint: ConstraintInfo, newName: string): void;
     recreateTable(table: TableInfo, operations: AlterOperation[]): void;
-    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[]): void;
+    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[], autoIncrementColumn: string): void;
     run(processor: AlterProcessor): void;
     _getDependendColumnConstraints(column: ColumnInfo, dependencyDefinition: any): import("dbgate-types/dbinfo").PrimaryKeyInfo[];
     _addLogicalDependencies(): AlterOperation[];

package/lib/alterPlan.js

@@ -112,7 +112,7 @@ class AlterPlan {
         });
         this.recreates.tables += 1;
     }
-    fillPreloadedRows(table, oldRows, newRows, key, insertOnly) {
+    fillPreloadedRows(table, oldRows, newRows, key, insertOnly, autoIncrementColumn) {
         this.operations.push({
             operationType: 'fillPreloadedRows',
             table,
@@ -120,6 +120,7 @@ class AlterPlan {
             newRows,
             key,
             insertOnly,
+            autoIncrementColumn,
         });
     }
     run(processor) {
@@ -408,7 +409,7 @@ function runAlterOperation(op, processor) {
             processor.dropSqlObject(op.oldObject);
             break;
         case 'fillPreloadedRows':
-            processor.fillPreloadedRows(op.table, op.oldRows, op.newRows, op.key, op.insertOnly);
+            processor.fillPreloadedRows(op.table, op.oldRows, op.newRows, op.key, op.insertOnly, op.autoIncrementColumn);
             break;
         case 'recreateTable':
             {

package/lib/database-info-alter-processor.d.ts

@@ -16,5 +16,5 @@ export declare class DatabaseInfoAlterProcessor {
     renameColumn(column: ColumnInfo, newName: string): void;
     renameConstraint(constraint: ConstraintInfo, newName: string): void;
     recreateTable(oldTable: TableInfo, newTable: TableInfo): void;
-    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[]): void;
+    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[], autoIncrementColumn: string): void;
 }

package/lib/database-info-alter-processor.js

@@ -93,7 +93,7 @@ class DatabaseInfoAlterProcessor {
     recreateTable(oldTable, newTable) {
         throw new Error('recreateTable not implemented for DatabaseInfoAlterProcessor');
     }
-    fillPreloadedRows(table, oldRows, newRows, key, insertOnly) {
+    fillPreloadedRows(table, oldRows, newRows, key, insertOnly, autoIncrementColumn) {
         const tableInfo = this.db.tables.find(x => x.pureName == table.pureName && x.schemaName == table.schemaName);
         tableInfo.preloadedRows = newRows;
         tableInfo.preloadedRowsKey = key;

package/lib/detectSqlFilterBehaviour.d.ts

@@ -0,0 +1,2 @@
+import { FilterBehaviour } from 'dbgate-types';
+export declare function detectSqlFilterBehaviour(dataType: string): FilterBehaviour;

package/lib/detectSqlFilterBehaviour.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectSqlFilterBehaviour = void 0;
+const filterBehaviours_1 = require("./filterBehaviours");
+const commonTypeParser_1 = require("./commonTypeParser");
+function detectSqlFilterBehaviour(dataType) {
+    if (!dataType)
+        return filterBehaviours_1.stringFilterBehaviour;
+    if ((0, commonTypeParser_1.isTypeNumber)(dataType))
+        return filterBehaviours_1.numberFilterBehaviour;
+    if ((0, commonTypeParser_1.isTypeString)(dataType))
+        return filterBehaviours_1.stringFilterBehaviour;
+    if ((0, commonTypeParser_1.isTypeLogical)(dataType))
+        return filterBehaviours_1.logicalFilterBehaviour;
+    if ((0, commonTypeParser_1.isTypeDateTime)(dataType))
+        return filterBehaviours_1.datetimeFilterBehaviour;
+    return filterBehaviours_1.stringFilterBehaviour;
+}
+exports.detectSqlFilterBehaviour = detectSqlFilterBehaviour;

package/lib/diffTools.js

@@ -63,6 +63,13 @@ function testEqualFullNames(lft, rgt, opts) {
         return lft == rgt;
     return testEqualSchemas(lft.schemaName, rgt.schemaName, opts) && testEqualNames(lft.pureName, rgt.pureName, opts);
 }
+function testEqualDefaultValues(value1, value2) {
+    if (value1 == null)
+        return value2 == null || value2 == 'NULL';
+    if (value2 == null)
+        return value1 == null || value1 == 'NULL';
+    return value1 == value2;
+}
 function testEqualColumns(a, b, checkName, checkDefault, opts = {}) {
     if (checkName && !testEqualNames(a.columnName, b.columnName, opts)) {
         // opts.DiffLogger.Trace("Column, different name: {0}; {1}", a, b);
@@ -88,31 +95,16 @@ function testEqualColumns(a, b, checkName, checkDefault, opts = {}) {
         return true;
     }
     if (checkDefault) {
-        if (a.defaultValue == null) {
-            if (a.defaultValue != b.defaultValue) {
-                console.debug(`Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different default value: ${a.defaultValue}, ${b.defaultValue}`);
-                // opts.DiffLogger.Trace(
-                //   'Column {0}, {1}: different default values: {2}; {3}',
-                //   a,
-                //   b,
-                //   a.DefaultValue,
-                //   b.DefaultValue
-                // );
-                return false;
-            }
-        }
-        else {
-            if (a.defaultValue != b.defaultValue) {
-                console.debug(`Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different default value: ${a.defaultValue}, ${b.defaultValue}`);
-                // opts.DiffLogger.Trace(
-                //   'Column {0}, {1}: different default values: {2}; {3}',
-                //   a,
-                //   b,
-                //   a.DefaultValue,
-                //   b.DefaultValue
-                // );
-                return false;
-            }
+        if (!testEqualDefaultValues(a.defaultValue, b.defaultValue)) {
+            console.debug(`Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different default value: ${a.defaultValue}, ${b.defaultValue}`);
+            // opts.DiffLogger.Trace(
+            //   'Column {0}, {1}: different default values: {2}; {3}',
+            //   a,
+            //   b,
+            //   a.DefaultValue,
+            //   b.DefaultValue
+            // );
+            return false;
         }
         if (a.defaultConstraint != b.defaultConstraint) {
             console.debug(`Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different default constraint: ${a.defaultConstraint}, ${b.defaultConstraint}`);
@@ -254,10 +246,10 @@ function createPairs(oldList, newList, additionalCondition = null) {
     return res;
 }
 function planTablePreload(plan, oldTable, newTable) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const key = newTable.preloadedRowsKey || ((_b = (_a = newTable.primaryKey) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(x => x.columnName));
     if (((_c = newTable.preloadedRows) === null || _c === void 0 ? void 0 : _c.length) > 0 && (key === null || key === void 0 ? void 0 : key.length) > 0) {
-        plan.fillPreloadedRows(newTable, oldTable === null || oldTable === void 0 ? void 0 : oldTable.preloadedRows, newTable.preloadedRows, key, newTable.preloadedRowsInsertOnly);
+        plan.fillPreloadedRows(newTable, oldTable === null || oldTable === void 0 ? void 0 : oldTable.preloadedRows, newTable.preloadedRows, key, newTable.preloadedRowsInsertOnly, (_d = newTable.columns.find(x => x.autoIncrement)) === null || _d === void 0 ? void 0 : _d.columnName);
     }
 }
 function planAlterTable(plan, oldTable, newTable, opts) {

package/lib/driverBase.d.ts

@@ -26,6 +26,7 @@ export declare const driverBase: {
     analyseIncremental(pool: any, structure: any, version: any): Promise<any>;
     createDumper(options?: any): SqlDumper;
     script(pool: any, sql: any, options: RunScriptOptions): Promise<void>;
+    operation(pool: any, operation: any, options: RunScriptOptions): Promise<never>;
     getNewObjectTemplates(): {
         label: string;
         sql: string;
@@ -34,4 +35,14 @@ export declare const driverBase: {
     readJsonQuery(pool: any, select: any, structure: any): any;
     showConnectionField: (field: any, values: any) => boolean;
     showConnectionTab: (field: any) => boolean;
+    getAccessTokenFromAuth: (connection: any, req: any) => Promise<any>;
+    getFilterBehaviour(dataType: string, standardFilterBehaviours: any): import("dbgate-types").FilterBehaviour;
+    getCollectionExportQueryScript(collection: string, condition: any, sort: any): any;
+    getCollectionExportQueryJson(collection: string, condition: any, sort: any): any;
+    getScriptTemplates(objectTypeField: any): any[];
+    getScriptTemplateContent(scriptTemplate: any, props: any): any;
+    dataEditorTypesBehaviour: {
+        parseSqlNull: boolean;
+        parseHexAsBuffer: boolean;
+    };
 };

package/lib/driverBase.js

@@ -17,6 +17,7 @@ const compact_1 = __importDefault(require("lodash/compact"));
 const SqlDumper_1 = require("./SqlDumper");
 const dbgate_query_splitter_1 = require("dbgate-query-splitter");
 const dbgate_sqltree_1 = require("dbgate-sqltree");
+const detectSqlFilterBehaviour_1 = require("./detectSqlFilterBehaviour");
 const dialect = {
     limitSelect: true,
     rangeSelect: true,
@@ -101,6 +102,11 @@ exports.driverBase = {
             }
         });
     },
+    operation(pool, operation, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('Operation not defined in target driver');
+        });
+    },
     getNewObjectTemplates() {
         if (this.databaseEngineTypes.includes('sql')) {
             return [{ label: 'New view', sql: 'CREATE VIEW myview\nAS\nSELECT * FROM table1' }];
@@ -164,4 +170,24 @@ exports.driverBase = {
     },
     showConnectionField: (field, values) => false,
     showConnectionTab: field => true,
+    getAccessTokenFromAuth: (connection, req) => __awaiter(void 0, void 0, void 0, function* () { return null; }),
+    getFilterBehaviour(dataType, standardFilterBehaviours) {
+        return (0, detectSqlFilterBehaviour_1.detectSqlFilterBehaviour)(dataType);
+    },
+    getCollectionExportQueryScript(collection, condition, sort) {
+        return null;
+    },
+    getCollectionExportQueryJson(collection, condition, sort) {
+        return null;
+    },
+    getScriptTemplates(objectTypeField) {
+        return [];
+    },
+    getScriptTemplateContent(scriptTemplate, props) {
+        return null;
+    },
+    dataEditorTypesBehaviour: {
+        parseSqlNull: true,
+        parseHexAsBuffer: true,
+    },
 };

package/lib/filterBehaviours.d.ts

@@ -0,0 +1,10 @@
+import { FilterBehaviour } from 'dbgate-types';
+export declare const numberFilterBehaviour: FilterBehaviour;
+export declare const stringFilterBehaviour: FilterBehaviour;
+export declare const logicalFilterBehaviour: FilterBehaviour;
+export declare const datetimeFilterBehaviour: FilterBehaviour;
+export declare const mongoFilterBehaviour: FilterBehaviour;
+export declare const evalFilterBehaviour: FilterBehaviour;
+export declare const standardFilterBehaviours: {
+    [id: string]: FilterBehaviour;
+};

package/lib/filterBehaviours.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.standardFilterBehaviours = exports.evalFilterBehaviour = exports.mongoFilterBehaviour = exports.datetimeFilterBehaviour = exports.logicalFilterBehaviour = exports.stringFilterBehaviour = exports.numberFilterBehaviour = void 0;
+exports.numberFilterBehaviour = {
+    supportEquals: true,
+    supportNumberLikeComparison: true,
+    supportNullTesting: true,
+    supportSqlCondition: true,
+    allowNumberToken: true,
+};
+exports.stringFilterBehaviour = {
+    supportEquals: true,
+    supportStringInclusion: true,
+    supportEmpty: true,
+    supportNumberLikeComparison: true,
+    supportNullTesting: true,
+    supportSqlCondition: true,
+    allowStringToken: true,
+    allowHexString: true,
+};
+exports.logicalFilterBehaviour = {
+    supportBooleanValues: true,
+    supportNullTesting: true,
+    supportSqlCondition: true,
+};
+exports.datetimeFilterBehaviour = {
+    supportNullTesting: true,
+    supportSqlCondition: true,
+    supportDatetimeSymbols: true,
+    supportDatetimeComparison: true,
+};
+exports.mongoFilterBehaviour = {
+    supportEquals: true,
+    supportArrayTesting: true,
+    supportNumberLikeComparison: true,
+    supportStringInclusion: true,
+    supportBooleanValues: true,
+    supportExistsTesting: true,
+    allowStringToken: true,
+    allowNumberDualTesting: true,
+    allowObjectIdTesting: true,
+};
+exports.evalFilterBehaviour = {
+    supportEquals: true,
+    supportStringInclusion: true,
+    supportEmpty: true,
+    supportNumberLikeComparison: true,
+    supportNullTesting: true,
+    allowStringToken: true,
+};
+exports.standardFilterBehaviours = {
+    numberFilterBehaviour: exports.numberFilterBehaviour,
+    stringFilterBehaviour: exports.stringFilterBehaviour,
+    logicalFilterBehaviour: exports.logicalFilterBehaviour,
+    datetimeFilterBehaviour: exports.datetimeFilterBehaviour,
+    mongoFilterBehaviour: exports.mongoFilterBehaviour,
+    evalFilterBehaviour: exports.evalFilterBehaviour,
+};

package/lib/getConnectionLabel.d.ts

@@ -0,0 +1,5 @@
+export declare function getDatabaseFileLabel(databaseFile: any): any;
+export declare function getConnectionLabel(connection: any, { allowExplicitDatabase, showUnsaved }?: {
+    allowExplicitDatabase?: boolean;
+    showUnsaved?: boolean;
+}): any;

package/lib/getConnectionLabel.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConnectionLabel = exports.getDatabaseFileLabel = void 0;
+function getDatabaseFileLabel(databaseFile) {
+    if (!databaseFile)
+        return databaseFile;
+    const m = databaseFile.match(/[\/]([^\/]+)$/);
+    if (m)
+        return m[1];
+    return databaseFile;
+}
+exports.getDatabaseFileLabel = getDatabaseFileLabel;
+function getConnectionLabelCore(connection, { allowExplicitDatabase = true } = {}) {
+    if (!connection) {
+        return null;
+    }
+    if (connection.displayName) {
+        return connection.displayName;
+    }
+    if (connection.useDatabaseUrl) {
+        return `${connection.databaseUrl}`;
+    }
+    if (connection.singleDatabase && connection.server && allowExplicitDatabase && connection.defaultDatabase) {
+        return `${connection.defaultDatabase} on ${connection.server}`;
+    }
+    if (connection.databaseFile) {
+        return getDatabaseFileLabel(connection.databaseFile);
+    }
+    if (connection.server) {
+        return connection.server;
+    }
+    if (connection.singleDatabase && connection.defaultDatabase) {
+        return `${connection.defaultDatabase}`;
+    }
+    return '';
+}
+function getConnectionLabel(connection, { allowExplicitDatabase = true, showUnsaved = false } = {}) {
+    const res = getConnectionLabelCore(connection, { allowExplicitDatabase });
+    if (res && showUnsaved && (connection === null || connection === void 0 ? void 0 : connection.unsaved)) {
+        return `${res} - unsaved`;
+    }
+    return res;
+}
+exports.getConnectionLabel = getConnectionLabel;

package/lib/index.d.ts

@@ -20,3 +20,6 @@ export * from './computeDiffRows';
 export * from './preloadedRowsTools';
 export * from './ScriptWriter';
 export * from './getLogger';
+export * from './getConnectionLabel';
+export * from './detectSqlFilterBehaviour';
+export * from './filterBehaviours';

package/lib/index.js

@@ -36,3 +36,6 @@ __exportStar(require("./computeDiffRows"), exports);
 __exportStar(require("./preloadedRowsTools"), exports);
 __exportStar(require("./ScriptWriter"), exports);
 __exportStar(require("./getLogger"), exports);
+__exportStar(require("./getConnectionLabel"), exports);
+__exportStar(require("./detectSqlFilterBehaviour"), exports);
+__exportStar(require("./filterBehaviours"), exports);

package/lib/nameTools.d.ts

@@ -20,7 +20,7 @@ export declare function equalFullName(name1: NamedObjectInfo, name2: NamedObject
 export declare function findObjectLike({ pureName, schemaName }: {
     pureName: any;
     schemaName: any;
-}, dbinfo: DatabaseInfo, objectTypeField: keyof DatabaseInfoObjects): import("dbgate-types").CollectionInfo;
+}, dbinfo: DatabaseInfo, objectTypeField: keyof DatabaseInfoObjects): any;
 export declare function findForeignKeyForColumn(table: TableInfo, column: ColumnInfo | string): import("dbgate-types").ForeignKeyInfo;
 export declare function makeUniqueColumnNames(res: ColumnInfo[]): void;
 export declare function fillConstraintNames(table: TableInfo, dialect: SqlDialect): TableInfo;

package/lib/stringTools.d.ts

@@ -1,11 +1,26 @@
+import { DataEditorTypesBehaviour } from 'dbgate-types';
+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 parseCellValue(value: any): any;
-export declare function stringifyCellValue(value: any): any;
+export declare function parseCellValue(value: any, editorTypes?: DataEditorTypesBehaviour): any;
+export declare function stringifyCellValue(value: any, intent: 'gridCellIntent' | 'inlineEditorIntent' | 'multilineEditorIntent' | 'stringConversionIntent' | 'exportIntent', editorTypes?: DataEditorTypesBehaviour, gridFormattingOptions?: {
+    useThousandsSeparator?: boolean;
+}, jsonParsedValue?: any): {
+    value: string;
+    gridStyle?: 'textCellStyle' | 'valueCellStyle' | 'nullCellStyle';
+    gridTitle?: string;
+};
 export declare function safeJsonParse(json: any, defaultValue?: any, logError?: boolean): any;
+export declare function shouldOpenMultilineDialog(value: any): boolean;
 export declare function isJsonLikeLongString(value: any): RegExpMatchArray;
 export declare function getIconForRedisType(type: any): "img folder" | "img type-string" | "img type-hash" | "img type-set" | "img type-list" | "img type-zset" | "img type-stream" | "img type-binary" | "img type-rejson";
 export declare function isWktGeometry(s: any): boolean;
 export declare function arrayBufferToBase64(buffer: any): string;
 export declare function getAsImageSrc(obj: any): string;
 export declare function parseSqlDefaultValue(value: string): string | number;
+export declare function detectCellDataType(value: any): EditorDataType;
+export declare function detectTypeIcon(value: any): "icon type-null" | "icon type-objectid" | "icon type-date" | "icon type-string" | "icon type-number" | "icon type-object" | "icon type-array" | "icon type-boolean" | "icon type-unknown";
+export declare function getConvertValueMenu(value: any, onSetValue: any, editorTypes?: DataEditorTypesBehaviour): {
+    text: string;
+    onClick: () => any;
+}[];

package/lib/stringTools.js

@@ -3,10 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
+exports.getConvertValueMenu = exports.detectTypeIcon = exports.detectCellDataType = exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.shouldOpenMultilineDialog = 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 isNumber_1 = __importDefault(require("lodash/isNumber"));
 const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
+const pad_1 = __importDefault(require("lodash/pad"));
+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) {
     return byteArray.reduce((output, elem) => output + ('0' + elem.toString(16)).slice(-2), '').toUpperCase();
 }
@@ -20,38 +24,247 @@ function hexStringToArray(inputString) {
     return res;
 }
 exports.hexStringToArray = hexStringToArray;
-function parseCellValue(value) {
+function parseCellValue(value, editorTypes) {
     if (!(0, isString_1.default)(value))
         return value;
-    if (value == '(NULL)')
-        return null;
-    const mHex = value.match(/^0x([0-9a-fA-F][0-9a-fA-F])+$/);
-    if (mHex) {
-        return {
-            type: 'Buffer',
-            data: hexStringToArray(value.substring(2)),
-        };
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseSqlNull) {
+        if (value == '(NULL)')
+            return null;
+    }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseHexAsBuffer) {
+        const mHex = value.match(/^0x([0-9a-fA-F][0-9a-fA-F])+$/);
+        if (mHex) {
+            return {
+                type: 'Buffer',
+                data: hexStringToArray(value.substring(2)),
+            };
+        }
     }
-    const mOid = value.match(/^ObjectId\("([0-9a-f]{24})"\)$/);
-    if (mOid) {
-        return { $oid: mOid[1] };
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseObjectIdAsDollar) {
+        const mOid = value.match(/^ObjectId\("([0-9a-f]{24})"\)$/);
+        if (mOid) {
+            return { $oid: mOid[1] };
+        }
+    }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseDateAsDollar) {
+        const m = value.match(dateTimeParseRegex);
+        if (m) {
+            return {
+                $date: `${m[1]}-${m[2]}-${m[3]}T${m[4]}:${m[5]}:${m[6]}Z`,
+            };
+        }
+    }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonNull) {
+        if (value == 'null')
+            return null;
+    }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonBoolean) {
+        if (value == 'true')
+            return true;
+        if (value == 'false')
+            return false;
+    }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseNumber) {
+        if (/^-?[0-9]+(?:\.[0-9]+)?$/.test(value)) {
+            return parseFloat(value);
+        }
+    }
+    if ((editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonArray) || (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonObject)) {
+        const jsonValue = safeJsonParse(value);
+        if ((0, isPlainObject_1.default)(jsonValue) && (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonObject))
+            return jsonValue;
+        if ((0, isArray_1.default)(jsonValue) && (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonArray))
+            return jsonValue;
     }
     return value;
 }
 exports.parseCellValue = parseCellValue;
-function stringifyCellValue(value) {
-    if (value === null)
-        return '(NULL)';
-    if (value === undefined)
-        return '(NoField)';
-    if ((value === null || value === void 0 ? void 0 : value.type) == 'Buffer' && (0, isArray_1.default)(value.data))
-        return '0x' + arrayToHexString(value.data);
+function parseFunc_ObjectIdAsDollar(value) {
     if (value === null || value === void 0 ? void 0 : value.$oid)
-        return `ObjectId("${value === null || value === void 0 ? void 0 : value.$oid}")`;
-    if ((0, isPlainObject_1.default)(value) || (0, isArray_1.default)(value))
-        return JSON.stringify(value);
+        return value;
+    if ((0, isString_1.default)(value)) {
+        if (value.match(/^[0-9a-f]{24}$/))
+            return { $oid: value };
+        const mOid = value.match(/^ObjectId\("([0-9a-f]{24})"\)$/);
+        if (mOid) {
+            return { $oid: mOid[1] };
+        }
+    }
+    return value;
+}
+function parseFunc_DateAsDollar(value) {
+    if (value === null || value === void 0 ? void 0 : value.$date)
+        return value;
+    if ((0, isString_1.default)(value)) {
+        const m = value.match(dateTimeParseRegex);
+        if (m) {
+            return { $date: `${m[1]}-${m[2]}-${m[3]}T${m[4]}:${m[5]}:${m[6]}Z` };
+        }
+    }
+    return value;
+}
+function makeBulletString(value) {
+    return (0, pad_1.default)('', value.length, '•');
+}
+function highlightSpecialCharacters(value) {
+    value = value.replace(/\n/g, '↲');
+    value = value.replace(/\r/g, '');
+    value = value.replace(/^(\s+)/, makeBulletString);
+    value = value.replace(/(\s+)$/, makeBulletString);
+    value = value.replace(/(\s\s+)/g, makeBulletString);
     return value;
 }
+function stringifyJsonToGrid(value) {
+    if ((0, isPlainObject_1.default)(value)) {
+        const svalue = JSON.stringify(value, undefined, 2);
+        if (svalue.length < 100) {
+            return { value: svalue, gridStyle: 'nullCellStyle' };
+        }
+        else {
+            return { value: '(JSON)', gridStyle: 'nullCellStyle', gridTitle: svalue };
+        }
+    }
+    if ((0, isArray_1.default)(value)) {
+        return {
+            value: `[${value.length} items]`,
+            gridStyle: 'nullCellStyle',
+            gridTitle: value.map(x => JSON.stringify(x)).join('\n'),
+        };
+    }
+    return { value: '(JSON)', gridStyle: 'nullCellStyle' };
+}
+function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, jsonParsedValue) {
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseSqlNull) {
+        if (value === null) {
+            switch (intent) {
+                case 'exportIntent':
+                    return { value: '' };
+                default:
+                    return { value: '(NULL)', gridStyle: 'nullCellStyle' };
+            }
+        }
+    }
+    if (value === undefined) {
+        switch (intent) {
+            case 'gridCellIntent':
+                return { value: '(No Field)', gridStyle: 'nullCellStyle' };
+            default:
+                return { value: '' };
+        }
+    }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonNull) {
+        if (value === null) {
+            return { value: 'null', gridStyle: 'valueCellStyle' };
+        }
+    }
+    if (value === true)
+        return { value: 'true', gridStyle: 'valueCellStyle' };
+    if (value === false)
+        return { value: 'false', 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 (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseObjectIdAsDollar) {
+        if (value === null || value === void 0 ? void 0 : value.$oid) {
+            switch (intent) {
+                case 'exportIntent':
+                case 'stringConversionIntent':
+                    return { value: value.$oid };
+                default:
+                    return { value: `ObjectId("${value.$oid}")`, gridStyle: 'valueCellStyle' };
+            }
+        }
+    }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseDateAsDollar) {
+        if (value === null || value === void 0 ? void 0 : value.$date) {
+            switch (intent) {
+                case 'exportIntent':
+                case 'stringConversionIntent':
+                    return { value: value.$date };
+                default:
+                    const m = value.$date.match(dateTimeStorageRegex);
+                    if (m) {
+                        return { value: `${m[1]}-${m[2]}-${m[3]} ${m[4]}:${m[5]}:${m[6]}`, gridStyle: 'valueCellStyle' };
+                    }
+                    else {
+                        return { value: value.$date.replaCE('T', ' '), gridStyle: 'valueCellStyle' };
+                    }
+            }
+        }
+    }
+    if ((0, isArray_1.default)(value)) {
+        switch (intent) {
+            case 'gridCellIntent':
+                return stringifyJsonToGrid(value);
+            case 'multilineEditorIntent':
+                return { value: JSON.stringify(value, null, 2) };
+            default:
+                return { value: JSON.stringify(value), gridStyle: 'valueCellStyle' };
+        }
+    }
+    if ((0, isPlainObject_1.default)(value)) {
+        switch (intent) {
+            case 'gridCellIntent':
+                return stringifyJsonToGrid(value);
+            case 'multilineEditorIntent':
+                return { value: JSON.stringify(value, null, 2) };
+            default:
+                return { value: JSON.stringify(value), gridStyle: 'valueCellStyle' };
+        }
+    }
+    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',
+                };
+            default:
+                return { value: value.toString() };
+        }
+    }
+    if ((0, isString_1.default)(value)) {
+        switch (intent) {
+            case 'gridCellIntent':
+                if (jsonParsedValue && !(editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.explicitDataType)) {
+                    return stringifyJsonToGrid(jsonParsedValue);
+                }
+                else {
+                    if (!(editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.explicitDataType)) {
+                        // reformat datetime for implicit date types
+                        const m = value.match(dateTimeStorageRegex);
+                        if (m) {
+                            return {
+                                value: `${m[1]}-${m[2]}-${m[3]} ${m[4]}:${m[5]}:${m[6]}`,
+                                gridStyle: 'valueCellStyle',
+                            };
+                        }
+                    }
+                    return { value: highlightSpecialCharacters(value), gridStyle: 'textCellStyle' };
+                }
+            default:
+                return { value: value };
+        }
+    }
+    if (value === null || value === undefined) {
+        switch (intent) {
+            case 'gridCellIntent':
+                return { value: '(n/a)', gridStyle: 'nullCellStyle' };
+            default:
+                return { value: '' };
+        }
+    }
+    switch (intent) {
+        case 'gridCellIntent':
+            return { value: '(Unknown)', gridStyle: 'nullCellStyle' };
+        default:
+            return { value: '' };
+    }
+}
 exports.stringifyCellValue = stringifyCellValue;
 function safeJsonParse(json, defaultValue, logError = false) {
     if ((0, isArray_1.default)(json) || (0, isPlainObject_1.default)(json)) {
@@ -68,6 +281,28 @@ function safeJsonParse(json, defaultValue, logError = false) {
     }
 }
 exports.safeJsonParse = safeJsonParse;
+function shouldOpenMultilineDialog(value) {
+    if ((0, isString_1.default)(value)) {
+        if (value.includes('\n')) {
+            return true;
+        }
+        const parsed = safeJsonParse(value);
+        if (parsed && ((0, isPlainObject_1.default)(parsed) || (0, isArray_1.default)(parsed))) {
+            return true;
+        }
+    }
+    if (value === null || value === void 0 ? void 0 : value.$oid) {
+        return false;
+    }
+    if (value === null || value === void 0 ? void 0 : value.$date) {
+        return false;
+    }
+    if ((0, isPlainObject_1.default)(value) || (0, isArray_1.default)(value)) {
+        return true;
+    }
+    return false;
+}
+exports.shouldOpenMultilineDialog = shouldOpenMultilineDialog;
 function isJsonLikeLongString(value) {
     return (0, isString_1.default)(value) && value.length > 100 && value.match(/^\s*\{.*\}\s*$|^\s*\[.*\]\s*$/);
 }
@@ -135,3 +370,75 @@ function parseSqlDefaultValue(value) {
     return undefined;
 }
 exports.parseSqlDefaultValue = parseSqlDefaultValue;
+function detectCellDataType(value) {
+    if (value === null)
+        return 'null';
+    if (value === null || value === void 0 ? void 0 : value.$oid)
+        return 'objectid';
+    if (value === null || value === void 0 ? void 0 : value.$date)
+        return 'date';
+    if ((0, isString_1.default)(value))
+        return 'string';
+    if ((0, isNumber_1.default)(value))
+        return 'number';
+    if ((0, isPlainObject_1.default)(value))
+        return 'object';
+    if ((0, isArray_1.default)(value))
+        return 'array';
+    if (value === true || value === false)
+        return 'boolean';
+    return 'unknown';
+}
+exports.detectCellDataType = detectCellDataType;
+function detectTypeIcon(value) {
+    switch (detectCellDataType(value)) {
+        case 'null':
+            return 'icon type-null';
+        case 'objectid':
+            return 'icon type-objectid';
+        case 'date':
+            return 'icon type-date';
+        case 'string':
+            return 'icon type-string';
+        case 'number':
+            return 'icon type-number';
+        case 'object':
+            return 'icon type-object';
+        case 'array':
+            return 'icon type-array';
+        case 'boolean':
+            return 'icon type-boolean';
+        default:
+            return 'icon type-unknown';
+    }
+}
+exports.detectTypeIcon = detectTypeIcon;
+function getConvertValueMenu(value, onSetValue, editorTypes) {
+    return [
+        (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.supportStringType) && {
+            text: 'String',
+            onClick: () => onSetValue(stringifyCellValue(value, 'stringConversionIntent', editorTypes).value),
+        },
+        (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.supportNumberType) && { text: 'Number', onClick: () => onSetValue(parseFloat(value)) },
+        (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.supportNullType) && { text: 'Null', onClick: () => onSetValue(null) },
+        (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.supportBooleanType) && {
+            text: 'Boolean',
+            onClick: () => { var _a; return onSetValue(((_a = value === null || value === void 0 ? void 0 : value.toString()) === null || _a === void 0 ? void 0 : _a.toLowerCase()) == 'true' || value == '1'); },
+        },
+        (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.supportObjectIdType) && {
+            text: 'ObjectId',
+            onClick: () => onSetValue(parseFunc_ObjectIdAsDollar(value)),
+        },
+        (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.supportDateType) && { text: 'Date', onClick: () => onSetValue(parseFunc_DateAsDollar(value)) },
+        (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.supportJsonType) && {
+            text: 'JSON',
+            onClick: () => {
+                const jsonValue = safeJsonParse(value);
+                if (jsonValue != null) {
+                    onSetValue(jsonValue);
+                }
+            },
+        },
+    ];
+}
+exports.getConvertValueMenu = getConvertValueMenu;

package/lib/testPermission.d.ts

@@ -7,4 +7,7 @@ interface CompiledPermissions {
 }
 export declare function compilePermissions(permissions: string[] | string): CompiledPermissions;
 export declare function testPermission(tested: string, permissions: CompiledPermissions): boolean;
+export declare function testSubPermission(tested: string, permissions: string[], allowSamePermission?: boolean): true | false | null;
+export declare function getPredefinedPermissions(predefinedRoleName: string): string[];
+export declare function sortPermissionsFromTheSameLevel(permissions: string[]): string[];
 export {};

package/lib/testPermission.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.testPermission = exports.compilePermissions = void 0;
+exports.sortPermissionsFromTheSameLevel = exports.getPredefinedPermissions = exports.testSubPermission = exports.testPermission = exports.compilePermissions = void 0;
 const escapeRegExp_1 = __importDefault(require("lodash/escapeRegExp"));
 const isString_1 = __importDefault(require("lodash/isString"));
 const compact_1 = __importDefault(require("lodash/compact"));
@@ -64,3 +64,40 @@ function testPermission(tested, permissions) {
     return allow;
 }
 exports.testPermission = testPermission;
+function testSubPermission(tested, permissions, allowSamePermission = true) {
+    let result = null;
+    for (const permWithSign of permissions) {
+        const perm = permWithSign.startsWith('~') ? permWithSign.substring(1) : permWithSign;
+        const deny = permWithSign.startsWith('~');
+        if (perm.endsWith('*')) {
+            const prefix = perm.substring(0, perm.length - 1);
+            if (tested.startsWith(prefix)) {
+                result = !deny;
+            }
+        }
+        else {
+            if (allowSamePermission && tested == perm) {
+                result = !deny;
+            }
+        }
+    }
+    return result;
+}
+exports.testSubPermission = testSubPermission;
+function getPredefinedPermissions(predefinedRoleName) {
+    switch (predefinedRoleName) {
+        case 'superadmin':
+            return ['*', '~widgets/*', 'widgets/admin', 'widgets/database', '~all-connections'];
+        case 'logged-user':
+            return ['*', '~widgets/admin', '~admin/*', '~internal-storage', '~all-connections'];
+        case 'anonymous-user':
+            return ['*', '~widgets/admin', '~admin/*', '~internal-storage', '~all-connections'];
+        default:
+            return null;
+    }
+}
+exports.getPredefinedPermissions = getPredefinedPermissions;
+function sortPermissionsFromTheSameLevel(permissions) {
+    return [...permissions.filter(x => x.startsWith('~')), ...permissions.filter(x => !x.startsWith('~'))];
+}
+exports.sortPermissionsFromTheSameLevel = sortPermissionsFromTheSameLevel;

package/lib/yamlModelConv.d.ts

@@ -6,6 +6,8 @@ export interface ColumnInfoYaml {
     length?: number;
     autoIncrement?: boolean;
     references?: string;
+    refDeleteAction?: string;
+    refUpdateAction?: string;
     primaryKey?: boolean;
     default?: string;
 }
@@ -27,4 +29,4 @@ export interface ForeignKeyInfoYaml {
 }
 export declare function tableInfoToYaml(table: TableInfo): TableInfoYaml;
 export declare function tableInfoFromYaml(table: TableInfoYaml, allTables: TableInfoYaml[]): TableInfo;
-export declare function databaseInfoFromYamlModel(files: DatabaseModelFile[]): DatabaseInfo;
+export declare function databaseInfoFromYamlModel(filesOrDbInfo: DatabaseModelFile[] | DatabaseInfo): DatabaseInfo;

package/lib/yamlModelConv.js

@@ -66,6 +66,8 @@ function convertForeignKeyFromYaml(col, table, allTables) {
         constraintType: 'foreignKey',
         pureName: table.name,
         refTableName: col.references,
+        deleteAction: col.refDeleteAction,
+        updateAction: col.refUpdateAction,
         columns: [
             {
                 columnName: col.name,
@@ -93,10 +95,13 @@ function tableInfoFromYaml(table, allTables) {
     return res;
 }
 exports.tableInfoFromYaml = tableInfoFromYaml;
-function databaseInfoFromYamlModel(files) {
+function databaseInfoFromYamlModel(filesOrDbInfo) {
+    if (!Array.isArray(filesOrDbInfo)) {
+        return filesOrDbInfo;
+    }
     const model = DatabaseAnalyser_1.DatabaseAnalyser.createEmptyStructure();
     const tablesYaml = [];
-    for (const file of files) {
+    for (const file of filesOrDbInfo) {
         if (file.name.endsWith('.table.yaml') || file.name.endsWith('.sql')) {
             if (file.name.endsWith('.table.yaml')) {
                 tablesYaml.push(file.json);

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.3.4",
+  "version": "5.4.1",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,14 +25,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.3.4",
+    "dbgate-types": "^5.4.1",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "dbgate-query-splitter": "^4.10.1",
-    "dbgate-sqltree": "^5.3.4",
+    "dbgate-query-splitter": "^4.10.3",
+    "dbgate-sqltree": "^5.4.1",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",