dbgate-datalib 4.4.0-alpha.2 → 4.4.3

package/lib/ChangeSet.d.ts

@@ -40,4 +40,5 @@ export declare function revertChangeSetRowChanges(changeSet: ChangeSet, definiti
 export declare function deleteChangeSetRows(changeSet: ChangeSet, definition: ChangeSetRowDefinition): ChangeSet;
 export declare function getChangeSetInsertedRows(changeSet: ChangeSet, name?: NamedObjectInfo): any[];
 export declare function changeSetInsertNewRow(changeSet: ChangeSet, name?: NamedObjectInfo): ChangeSet;
+export declare function changeSetInsertDocuments(changeSet: ChangeSet, documents: any[], name?: NamedObjectInfo): ChangeSet;
 export declare function changeSetContainsChanges(changeSet: ChangeSet): boolean;

package/lib/ChangeSet.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.changeSetContainsChanges = exports.changeSetInsertNewRow = exports.getChangeSetInsertedRows = exports.deleteChangeSetRows = exports.revertChangeSetRowChanges = exports.changeSetToSql = exports.extractChangeSetCondition = exports.batchUpdateChangeSet = exports.setChangeSetRowData = exports.setChangeSetValue = exports.findExistingChangeSetItem = exports.createChangeSet = void 0;
+exports.changeSetContainsChanges = exports.changeSetInsertDocuments = exports.changeSetInsertNewRow = exports.getChangeSetInsertedRows = exports.deleteChangeSetRows = exports.revertChangeSetRowChanges = exports.changeSetToSql = exports.extractChangeSetCondition = exports.batchUpdateChangeSet = exports.setChangeSetRowData = exports.setChangeSetValue = exports.findExistingChangeSetItem = exports.createChangeSet = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 function createChangeSet() {
     return {
@@ -150,7 +150,7 @@ function changeSetInsertToSql(item, dbinfo = null) {
         const table = dbinfo.tables.find(x => x.schemaName == item.schemaName && x.pureName == item.pureName);
         if (table) {
             const autoIncCol = table.columns.find(x => x.autoIncrement);
-            console.log('autoIncCol', autoIncCol);
+            // console.log('autoIncCol', autoIncCol);
             if (autoIncCol && fields.find(x => x.targetColumn == autoIncCol.columnName)) {
                 autoInc = true;
             }
@@ -292,7 +292,7 @@ function getChangeSetInsertedRows(changeSet, name) {
 }
 exports.getChangeSetInsertedRows = getChangeSetInsertedRows;
 function changeSetInsertNewRow(changeSet, name) {
-    console.log('INSERT', name);
+    // console.log('INSERT', name);
     const insertedRows = getChangeSetInsertedRows(changeSet, name);
     return Object.assign(Object.assign({}, changeSet), { inserts: [
             ...changeSet.inserts,
@@ -300,6 +300,14 @@ function changeSetInsertNewRow(changeSet, name) {
         ] });
 }
 exports.changeSetInsertNewRow = changeSetInsertNewRow;
+function changeSetInsertDocuments(changeSet, documents, name) {
+    const insertedRows = getChangeSetInsertedRows(changeSet, name);
+    return Object.assign(Object.assign({}, changeSet), { inserts: [
+            ...changeSet.inserts,
+            ...documents.map((doc, index) => (Object.assign(Object.assign({}, name), { insertedRowIndex: insertedRows.length + index, fields: doc }))),
+        ] });
+}
+exports.changeSetInsertDocuments = changeSetInsertDocuments;
 function changeSetContainsChanges(changeSet) {
     if (!changeSet)
         return false;

package/lib/CollectionGridDisplay.d.ts

@@ -4,5 +4,5 @@ import { GridConfig, GridCache } from './GridConfig';
 export declare function analyseCollectionDisplayColumns(rows: any, display: any): any[];
 export declare class CollectionGridDisplay extends GridDisplay {
     collection: CollectionInfo;
-    constructor(collection: CollectionInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, loadedRows: any);
+    constructor(collection: CollectionInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, loadedRows: any, changeSet: any);
 }

package/lib/CollectionGridDisplay.js

@@ -74,18 +74,27 @@ function getDisplayColumn(basePath, columnName, display) {
     };
 }
 function analyseCollectionDisplayColumns(rows, display) {
+    var _a;
     const res = [];
+    const addedColumns = (_a = display === null || display === void 0 ? void 0 : display.config) === null || _a === void 0 ? void 0 : _a.addedColumns;
     for (const row of rows || []) {
         getColumnsForObject([], row, res, display);
     }
+    for (const added of addedColumns || []) {
+        if (res.find(x => x.uniqueName == added))
+            continue;
+        res.push(getDisplayColumn([], added, display));
+    }
     return (res.map(col => (Object.assign(Object.assign({}, col), { isChecked: display.isColumnChecked(col) }))) || []);
 }
 exports.analyseCollectionDisplayColumns = analyseCollectionDisplayColumns;
 class CollectionGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(collection, driver, config, setConfig, cache, setCache, loadedRows) {
+    constructor(collection, driver, config, setConfig, cache, setCache, loadedRows, changeSet) {
         super(config, setConfig, cache, setCache, driver);
         this.collection = collection;
-        this.columns = analyseCollectionDisplayColumns(loadedRows, this);
+        const changedDocs = lodash_1.default.compact(changeSet.updates.map(chs => chs.document));
+        const insertedDocs = lodash_1.default.compact(changeSet.inserts.map(chs => chs.fields));
+        this.columns = analyseCollectionDisplayColumns([...(loadedRows || []), ...changedDocs, ...insertedDocs], this);
         this.filterable = true;
         this.sortable = true;
         this.editable = true;

package/lib/FreeTableGridDisplay.js

@@ -2,11 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeTableGridDisplay = void 0;
 const GridDisplay_1 = require("./GridDisplay");
+const _1 = require(".");
 class FreeTableGridDisplay extends GridDisplay_1.GridDisplay {
     constructor(model, config, setConfig, cache, setCache) {
+        var _a;
         super(config, setConfig, cache, setCache);
         this.model = model;
-        this.columns = this.getDisplayColumns(model);
+        this.columns = ((_a = model === null || model === void 0 ? void 0 : model.structure) === null || _a === void 0 ? void 0 : _a.__isDynamicStructure)
+            ? (0, _1.analyseCollectionDisplayColumns)(model === null || model === void 0 ? void 0 : model.rows, this)
+            : this.getDisplayColumns(model);
         this.filterable = false;
         this.sortable = false;
     }

package/lib/GridDisplay.d.ts

@@ -15,7 +15,7 @@ export interface DisplayColumn {
     foreignKey?: ForeignKeyInfo;
     isExpandable?: boolean;
     isChecked?: boolean;
-    hintColumnName?: string;
+    hintColumnNames?: string[];
     dataType?: string;
     filterType?: boolean;
     isStructured?: boolean;
@@ -51,6 +51,7 @@ export declare abstract class GridDisplay {
     supportsReload: boolean;
     isDynamicStructure: boolean;
     setColumnVisibility(uniquePath: string[], isVisible: boolean): void;
+    addDynamicColumn(name: string): void;
     focusColumn(uniqueName: string): void;
     get hasReferences(): boolean;
     get focusedColumn(): string;

package/lib/GridDisplay.js

@@ -43,6 +43,9 @@ class GridDisplay {
                 this.reload();
         }
     }
+    addDynamicColumn(name) {
+        this.includeInColumnSet('addedColumns', name, true);
+    }
     focusColumn(uniqueName) {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { focusedColumn: uniqueName })));
     }
@@ -81,7 +84,7 @@ class GridDisplay {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { hiddenColumns: this.columns.map(x => x.uniqueName) })));
     }
     get hiddenColumnIndexes() {
-        return (this.config.hiddenColumns || []).map(x => lodash_1.default.findIndex(this.columns, y => y.uniqueName == x));
+        return (this.config.hiddenColumns || []).map(x => lodash_1.default.findIndex(this.allColumns, y => y.uniqueName == x));
     }
     isColumnChecked(column) {
         // console.log('isColumnChecked', column, this.config.hiddenColumns);

package/lib/TableFormViewDisplay.d.ts

@@ -4,10 +4,11 @@ import { EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
 import { Select, Condition } from 'dbgate-sqltree';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
+import { DictionaryDescriptionFunc } from '.';
 export declare class TableFormViewDisplay extends FormViewDisplay {
     tableName: NamedObjectInfo;
     private gridDisplay;
-    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any);
+    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any, getDictionaryDescription?: DictionaryDescriptionFunc);
     addDisplayColumns(columns: DisplayColumn[]): void;
     getPrimaryKeyEqualCondition(row?: any): Condition;
     getPrimaryKeyOperatorCondition(operator: any): Condition;

package/lib/TableFormViewDisplay.js

@@ -9,10 +9,10 @@ const dbgate_sqltree_1 = require("dbgate-sqltree");
 const TableGridDisplay_1 = require("./TableGridDisplay");
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 class TableFormViewDisplay extends FormViewDisplay_1.FormViewDisplay {
-    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion) {
+    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription = null) {
         super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
         this.tableName = tableName;
-        this.gridDisplay = new TableGridDisplay_1.TableGridDisplay(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion);
+        this.gridDisplay = new TableGridDisplay_1.TableGridDisplay(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription);
         this.gridDisplay.addAllExpandedColumnsToSelected = true;
         this.isLoadedCorrectly = this.gridDisplay.isLoadedCorrectly && !!this.driver;
         this.columns = [];

package/lib/TableGridDisplay.d.ts

@@ -1,21 +1,29 @@
 import { GridDisplay, ChangeCacheFunc, DisplayColumn, DisplayedColumnInfo, ChangeConfigFunc } from './GridDisplay';
-import { TableInfo, EngineDriver, ColumnInfo, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
+import { TableInfo, EngineDriver, ColumnInfo, NamedObjectInfo, DatabaseInfo, ForeignKeyInfo } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
 import { Select } from 'dbgate-sqltree';
+export interface DictionaryDescription {
+    expression: string;
+    columns: string[];
+    delimiter: string;
+}
+export declare type DictionaryDescriptionFunc = (table: TableInfo) => DictionaryDescription;
 export declare class TableGridDisplay extends GridDisplay {
     tableName: NamedObjectInfo;
     displayOptions: any;
+    getDictionaryDescription: DictionaryDescriptionFunc;
     table: TableInfo;
     addAllExpandedColumnsToSelected: boolean;
     hintBaseColumns: DisplayColumn[];
-    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any);
+    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any, getDictionaryDescription?: DictionaryDescriptionFunc);
     findTable({ schemaName, pureName }: {
         schemaName?: any;
         pureName: any;
     }): TableInfo;
     getDisplayColumns(table: TableInfo, parentPath: string[]): {
         isChecked: boolean;
-        hintColumnName: string;
+        hintColumnNames: string[];
+        hintColumnDelimiter: string;
         isExpandable: boolean;
         pureName: string;
         schemaName: string;
@@ -23,7 +31,7 @@ export declare class TableGridDisplay extends GridDisplay {
         uniqueName: string;
         uniquePath: string[];
         isPrimaryKey: boolean;
-        foreignKey: import("dbgate-types").ForeignKeyInfo;
+        foreignKey: ForeignKeyInfo;
         pairingId?: string;
         columnName: string;
         notNull: boolean;
@@ -40,6 +48,7 @@ export declare class TableGridDisplay extends GridDisplay {
     }[];
     addJoinsFromExpandedColumns(select: Select, columns: DisplayColumn[], parentAlias: string, columnSources: any): void;
     addReferenceToSelect(select: Select, parentAlias: string, column: DisplayColumn): void;
+    getFkDictionaryDescription(foreignKey: ForeignKeyInfo): DictionaryDescription;
     addHintsToSelect(select: Select): boolean;
     enrichExpandedColumns(list: DisplayColumn[]): DisplayColumn[];
     getExpandedColumns(column: DisplayColumn): DisplayColumn[];
@@ -54,7 +63,7 @@ export declare class TableGridDisplay extends GridDisplay {
         uniqueName: string;
         uniquePath: string[];
         isPrimaryKey: boolean;
-        foreignKey: import("dbgate-types").ForeignKeyInfo;
+        foreignKey: ForeignKeyInfo;
         pairingId?: string;
         columnName: string;
         notNull: boolean;

package/lib/TableGridDisplay.js

@@ -4,10 +4,11 @@ exports.TableGridDisplay = void 0;
 const dbgate_tools_1 = require("dbgate-tools");
 const GridDisplay_1 = require("./GridDisplay");
 class TableGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion) {
+    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription = null) {
         super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
         this.tableName = tableName;
         this.displayOptions = displayOptions;
+        this.getDictionaryDescription = getDictionaryDescription;
         this.addAllExpandedColumnsToSelected = false;
         this.table = this.findTable(tableName);
         if (!this.table) {
@@ -38,7 +39,10 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
     }
     getDisplayColumns(table, parentPath) {
         var _a, _b;
-        return (((_b = (_a = table === null || table === void 0 ? void 0 : table.columns) === null || _a === void 0 ? void 0 : _a.map(col => this.getDisplayColumn(table, col, parentPath))) === null || _b === void 0 ? void 0 : _b.map(col => (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col), hintColumnName: col.foreignKey ? `hint_${col.uniqueName}` : null, isExpandable: !!col.foreignKey })))) || []);
+        return (((_b = (_a = table === null || table === void 0 ? void 0 : table.columns) === null || _a === void 0 ? void 0 : _a.map(col => this.getDisplayColumn(table, col, parentPath))) === null || _b === void 0 ? void 0 : _b.map(col => {
+            var _a, _b, _c;
+            return (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col), hintColumnNames: ((_b = (_a = this.getFkDictionaryDescription(col.foreignKey)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(columnName => `hint_${col.uniqueName}_${columnName}`)) || null, hintColumnDelimiter: (_c = this.getFkDictionaryDescription(col.foreignKey)) === null || _c === void 0 ? void 0 : _c.delimiter, isExpandable: !!col.foreignKey }));
+        })) || []);
     }
     addJoinsFromExpandedColumns(select, columns, parentAlias, columnSources) {
         for (const column of columns) {
@@ -86,6 +90,18 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
             ];
         }
     }
+    getFkDictionaryDescription(foreignKey) {
+        if (!foreignKey)
+            return null;
+        const pureName = foreignKey.refTableName;
+        const schemaName = foreignKey.refSchemaName;
+        const table = this.findTable({ schemaName, pureName });
+        if (table && table.columns && table.columns.length > 0 && table.primaryKey) {
+            const hintDescription = this.getDictionaryDescription(table);
+            return hintDescription;
+        }
+        return null;
+    }
     addHintsToSelect(select) {
         let res = false;
         const groupColumns = this.groupColumns;
@@ -96,17 +112,18 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
                 }
                 const table = this.getFkTarget(column);
                 if (table && table.columns && table.columns.length > 0 && table.primaryKey) {
-                    const hintColumn = table.columns.find(x => { var _a, _b; return (_b = (_a = x === null || x === void 0 ? void 0 : x.dataType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.includes('char'); });
-                    if (hintColumn) {
+                    // const hintColumn = table.columns.find(x => x?.dataType?.toLowerCase()?.includes('char'));
+                    const hintDescription = this.getDictionaryDescription(table);
+                    if (hintDescription) {
                         const parentUniqueName = column.uniquePath.slice(0, -1).join('.');
                         this.addReferenceToSelect(select, parentUniqueName ? `${parentUniqueName}_ref` : 'basetbl', column);
                         const childAlias = `${column.uniqueName}_ref`;
-                        select.columns.push({
+                        select.columns.push(...hintDescription.columns.map(columnName => ({
                             exprType: 'column',
-                            columnName: hintColumn.columnName,
-                            alias: `hint_${column.uniqueName}`,
+                            columnName,
+                            alias: `hint_${column.uniqueName}_${columnName}`,
                             source: { alias: childAlias },
-                        });
+                        })));
                         res = true;
                     }
                 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.4.0-alpha.2",
+  "version": "4.4.3",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -11,11 +11,11 @@
     "lib"
   ],
   "dependencies": {
-    "dbgate-sqltree": "^4.4.0-alpha.2",
-    "dbgate-filterparser": "^4.4.0-alpha.2"
+    "dbgate-sqltree": "^4.4.3",
+    "dbgate-filterparser": "^4.4.3"
   },
   "devDependencies": {
-    "dbgate-types": "^4.4.0-alpha.2",
+    "dbgate-types": "^4.4.3",
     "@types/node": "^13.7.0",
     "typescript": "^4.4.3"
   }