dbgate-datalib 5.1.0 → 5.1.1

package/lib/PerspectiveConfig.d.ts

@@ -1,13 +1,9 @@
 import { DatabaseInfo, ForeignKeyInfo } from 'dbgate-types';
-export interface PerspectiveConfigColumns {
-    expandedColumns: string[];
-    checkedColumns: string[];
-    uncheckedColumns: string[];
-}
 export interface PerspectiveCustomJoinConfig {
-    joinid: string;
+    refNodeDesignerId: string;
+    referenceDesignerId: string;
     joinName: string;
-    baseUniqueName: string;
+    baseDesignerId: string;
     conid?: string;
     database?: string;
     refSchemaName?: string;
@@ -24,27 +20,52 @@ export interface PerspectiveFilterColumnInfo {
     schemaName: string;
     foreignKey: ForeignKeyInfo;
 }
-export interface PerspectiveParentFilterConfig {
-    uniqueName: string;
-}
-export interface PerspectiveConfig extends PerspectiveConfigColumns {
-    rootObject: {
-        schemaName?: string;
-        pureName: string;
-    };
+export interface PerspectiveNodeConfig {
+    designerId: string;
+    schemaName?: string;
+    pureName: string;
+    defaultColumnsProcessed?: boolean;
+    alias?: string;
+    conid?: string;
+    database?: string;
+    isParentFilter?: boolean;
+    expandedColumns: string[];
+    checkedColumns: string[];
+    sort: {
+        columnName: string;
+        order: 'ASC' | 'DESC';
+    }[];
     filters: {
         [uniqueName: string]: string;
     };
-    sort: {
-        [parentUniqueName: string]: {
-            uniqueName: string;
-            order: 'ASC' | 'DESC';
-        }[];
+    isAutoGenerated?: true | undefined;
+    isNodeChecked?: boolean;
+    position?: {
+        x: number;
+        y: number;
     };
-    customJoins: PerspectiveCustomJoinConfig[];
-    parentFilters: PerspectiveParentFilterConfig[];
 }
-export declare function createPerspectiveConfig(rootObject: {
+export interface PerspectiveReferenceConfig {
+    designerId: string;
+    sourceId: string;
+    targetId: string;
+    columns: {
+        source: string;
+        target: string;
+    }[];
+    isAutoGenerated?: true | undefined;
+}
+export interface PerspectiveConfig {
+    rootDesignerId: string;
+    isArranged: boolean;
+    nodes: PerspectiveNodeConfig[];
+    references: PerspectiveReferenceConfig[];
+}
+export declare function createPerspectiveNodeConfig(name: {
+    schemaName?: string;
+    pureName: string;
+}): PerspectiveNodeConfig;
+export declare function createPerspectiveConfig(rootObject?: {
     schemaName?: string;
     pureName: string;
 }): PerspectiveConfig;
@@ -61,3 +82,4 @@ export interface MultipleDatabaseInfo {
         [database: string]: DatabaseInfo;
     };
 }
+export declare function switchPerspectiveReferenceDirection(ref: PerspectiveReferenceConfig): PerspectiveReferenceConfig;

package/lib/PerspectiveConfig.js

@@ -1,16 +1,30 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractPerspectiveDatabases = exports.createPerspectiveConfig = void 0;
+exports.switchPerspectiveReferenceDirection = exports.extractPerspectiveDatabases = exports.createPerspectiveConfig = exports.createPerspectiveNodeConfig = void 0;
+const v1_1 = __importDefault(require("uuid/v1"));
+function createPerspectiveNodeConfig(name) {
+    const node = Object.assign(Object.assign({}, name), { designerId: (0, v1_1.default)(), expandedColumns: [], checkedColumns: [], sort: [], filters: {}, isNodeChecked: true });
+    return node;
+}
+exports.createPerspectiveNodeConfig = createPerspectiveNodeConfig;
 function createPerspectiveConfig(rootObject) {
+    if (!rootObject) {
+        return {
+            nodes: [],
+            references: [],
+            isArranged: true,
+            rootDesignerId: null,
+        };
+    }
+    const rootNode = createPerspectiveNodeConfig(rootObject);
     return {
-        expandedColumns: [],
-        checkedColumns: [],
-        uncheckedColumns: [],
-        customJoins: [],
-        filters: {},
-        sort: {},
-        rootObject,
-        parentFilters: [],
+        nodes: [rootNode],
+        references: [],
+        rootDesignerId: rootNode.designerId,
+        isArranged: true,
     };
 }
 exports.createPerspectiveConfig = createPerspectiveConfig;
@@ -22,9 +36,19 @@ function extractPerspectiveDatabases({ conid, database }, cfg) {
             return;
         res.push({ conid, database });
     }
-    for (const custom of cfg.customJoins) {
-        add(custom.conid || conid, custom.database || database);
+    for (const node of cfg.nodes) {
+        add(node.conid || conid, node.database || database);
     }
     return res;
 }
 exports.extractPerspectiveDatabases = extractPerspectiveDatabases;
+function switchPerspectiveReferenceDirection(ref) {
+    return {
+        designerId: ref.designerId,
+        sourceId: ref.targetId,
+        targetId: ref.sourceId,
+        isAutoGenerated: ref.isAutoGenerated,
+        columns: ref.columns.map(x => ({ source: x.target, target: x.source })),
+    };
+}
+exports.switchPerspectiveReferenceDirection = switchPerspectiveReferenceDirection;

package/lib/PerspectiveDataLoader.js

@@ -95,6 +95,9 @@ class PerspectiveDataLoader {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const { schemaName, pureName, bindingColumns, bindingValues, dataColumns, orderBy, condition } = props;
+            if ((dataColumns === null || dataColumns === void 0 ? void 0 : dataColumns.length) == 0) {
+                return [];
+            }
             const select = {
                 commandType: 'select',
                 from: {

package/lib/PerspectiveDataProvider.js

@@ -120,6 +120,8 @@ class PerspectiveDataProvider {
             for (; groupIndex < props.bindingValues.length; groupIndex++) {
                 const groupValues = props.bindingValues[groupIndex];
                 const group = tableCache.getBindingGroup(groupValues);
+                if (!group)
+                    continue;
                 if (group.loadedAll)
                     continue;
                 if (group.groupSize == 0) {

package/lib/PerspectiveDisplay.d.ts

@@ -15,7 +15,7 @@ export declare class PerspectiveDisplayColumn {
     get columnLevel(): number;
     getParentName(level: any): any;
     getParentNode(level: any): PerspectiveTreeNode;
-    getParentTableUniqueName(level: any): any;
+    getParentTableDesignerId(level: any): string;
 }
 interface PerspectiveSubRowCollection {
     rows: CollectedPerspectiveDisplayRow[];
@@ -40,7 +40,7 @@ export declare class PerspectiveDisplay {
     rows: PerspectiveDisplayRow[];
     readonly columnLevelCount: number;
     loadIndicatorsCounts: {
-        [uniqueName: string]: number;
+        [designerId: string]: number;
     };
     constructor(root: PerspectiveTreeNode, rows: any[]);
     private getRowAt;

package/lib/PerspectiveDisplay.js

@@ -44,9 +44,9 @@ class PerspectiveDisplayColumn {
     getParentNode(level) {
         return this.parentNodes[level];
     }
-    getParentTableUniqueName(level) {
+    getParentTableDesignerId(level) {
         var _a, _b;
-        return ((_a = this.parentNodes[level]) === null || _a === void 0 ? void 0 : _a.headerTableAttributes) ? (_b = this.parentNodes[level]) === null || _b === void 0 ? void 0 : _b.uniqueName : '';
+        return ((_a = this.parentNodes[level]) === null || _a === void 0 ? void 0 : _a.headerTableAttributes) ? (_b = this.parentNodes[level]) === null || _b === void 0 ? void 0 : _b.designerId : '';
     }
 }
 exports.PerspectiveDisplayColumn = PerspectiveDisplayColumn;
@@ -99,20 +99,13 @@ class PerspectiveDisplay {
     }
     fillColumns(children, parentNodes) {
         for (const child of children) {
-            if (child.isChecked) {
+            if (child.isCheckedColumn || child.isCheckedNode) {
                 this.processColumn(child, parentNodes);
             }
         }
     }
     processColumn(node, parentNodes) {
-        if (node.isExpandable) {
-            const countBefore = this.columns.length;
-            this.fillColumns(node.childNodes, [...parentNodes, node]);
-            if (this.columns.length > countBefore) {
-                this.columns[countBefore].colSpanAtLevel[parentNodes.length] = this.columns.length - countBefore;
-            }
-        }
-        else {
+        if (node.isCheckedColumn) {
             const column = new PerspectiveDisplayColumn(this);
             column.title = node.columnTitle;
             column.dataField = node.dataField;
@@ -122,13 +115,26 @@ class PerspectiveDisplay {
             column.dataNode = node;
             this.columns.push(column);
         }
+        if (node.isExpandable && node.isCheckedNode) {
+            const countBefore = this.columns.length;
+            this.fillColumns(node.childNodes, [...parentNodes, node]);
+            if (this.columns.length > countBefore) {
+                this.columns[countBefore].colSpanAtLevel[parentNodes.length] = this.columns.length - countBefore;
+            }
+        }
     }
     findColumnIndexFromNode(node) {
-        return (0, findIndex_1.default)(this.columns, x => x.dataNode.uniqueName == node.uniqueName);
+        return (0, findIndex_1.default)(this.columns, x => { var _a, _b, _c; return x.dataNode.columnName == node.columnName && ((_b = (_a = x.dataNode) === null || _a === void 0 ? void 0 : _a.parentNode) === null || _b === void 0 ? void 0 : _b.designerId) == ((_c = node === null || node === void 0 ? void 0 : node.parentNode) === null || _c === void 0 ? void 0 : _c.designerId); });
     }
+    // findColumnIndexFromNode(node: PerspectiveTreeNode) {
+    //   return _findIndex(this.columns, x => x.dataNode.designerId == node.designerId);
+    // }
     collectRows(sourceRows, nodes) {
-        const columnNodes = nodes.filter(x => x.isChecked && !x.isExpandable);
-        const treeNodes = nodes.filter(x => x.isChecked && x.isExpandable);
+        // console.log('********** COLLECT ROWS', sourceRows);
+        const columnNodes = nodes.filter(x => x.isCheckedColumn);
+        const treeNodes = nodes.filter(x => x.isCheckedNode);
+        // console.log('columnNodes', columnNodes);
+        // console.log('treeNodes', treeNodes);
         const columnIndexes = columnNodes.map(node => this.findColumnIndexFromNode(node));
         const res = [];
         for (const sourceRow of sourceRows) {

package/lib/PerspectiveTreeNode.d.ts

@@ -1,5 +1,5 @@
 import { ColumnInfo, DatabaseInfo, ForeignKeyInfo, NamedObjectInfo, TableInfo, ViewInfo } from 'dbgate-types';
-import { ChangePerspectiveConfigFunc, MultipleDatabaseInfo, PerspectiveConfig, PerspectiveConfigColumns, PerspectiveCustomJoinConfig, PerspectiveFilterColumnInfo } from './PerspectiveConfig';
+import { ChangePerspectiveConfigFunc, MultipleDatabaseInfo, PerspectiveConfig, PerspectiveCustomJoinConfig, PerspectiveFilterColumnInfo, PerspectiveNodeConfig, PerspectiveReferenceConfig } from './PerspectiveConfig';
 import { PerspectiveDatabaseConfig, PerspectiveDataLoadProps, PerspectiveDataProvider } from './PerspectiveDataProvider';
 import { FilterType } from 'dbgate-filterparser/lib/types';
 import { Condition } from 'dbgate-sqltree';
@@ -14,12 +14,16 @@ export declare abstract class PerspectiveTreeNode {
     parentNode: PerspectiveTreeNode;
     dataProvider: PerspectiveDataProvider;
     databaseConfig: PerspectiveDatabaseConfig;
-    constructor(dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, parentNode: PerspectiveTreeNode, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig);
-    defaultChecked: boolean;
+    designerId: string;
+    constructor(dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, parentNode: PerspectiveTreeNode, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, designerId: string);
+    readonly nodeConfig: PerspectiveNodeConfig;
+    readonly parentNodeConfig: PerspectiveNodeConfig;
     abstract get title(): any;
     abstract get codeName(): any;
     abstract get isExpandable(): any;
-    abstract get childNodes(): PerspectiveTreeNode[];
+    childNodesCache: PerspectiveTreeNode[];
+    get childNodes(): PerspectiveTreeNode[];
+    abstract generateChildNodes(): PerspectiveTreeNode[];
     abstract get icon(): string;
     get fieldName(): any;
     get headerTableAttributes(): any;
@@ -29,24 +33,35 @@ export declare abstract class PerspectiveTreeNode {
     abstract getNodeLoadProps(parentRows: any[]): PerspectiveDataLoadProps;
     get isRoot(): boolean;
     get rootNode(): PerspectiveTreeNode;
+    get isSortable(): boolean;
     matchChildRow(parentRow: any, childRow: any): boolean;
     hasTableCode(code: string): any;
-    get uniqueName(): any;
     get level(): any;
     get isExpanded(): boolean;
+    get isCheckedColumn(): boolean;
     get isChecked(): boolean;
+    get isCheckedNode(): boolean;
+    get isSecondaryChecked(): boolean;
+    get secondaryCheckable(): boolean;
     get columnTitle(): any;
     get filterType(): FilterType;
     get columnName(): any;
     get customJoinConfig(): PerspectiveCustomJoinConfig;
     get db(): DatabaseInfo;
+    get isCircular(): boolean;
+    hasDesignerIdInIncestors(designerId: string): boolean;
     getChildMatchColumns(): any[];
     getParentMatchColumns(): any[];
     parseFilterCondition(source?: any): any;
+    get hasUncheckedNodeInPath(): any;
     get childDataColumn(): any;
     toggleExpanded(value?: boolean): void;
     toggleChecked(value?: boolean): void;
-    includeInColumnSet(field: keyof PerspectiveConfigColumns, uniqueName: string, isIncluded: boolean): void;
+    toggleCheckedNode(value?: boolean): void;
+    toggleSecondaryChecked(value?: boolean): void;
+    createReferenceConfigColumns(): PerspectiveReferenceConfig['columns'];
+    ensureNodeConfig(cfg: PerspectiveConfig): [PerspectiveConfig, PerspectiveNodeConfig];
+    includeInNodeSet(field: 'expandedColumns' | 'uncheckedColumns' | 'checkedColumns', isIncluded: boolean): void;
     getFilter(): string;
     getDataLoadColumns(): any[];
     getChildrenCondition(source?: any): Condition;
@@ -55,11 +70,13 @@ export declare abstract class PerspectiveTreeNode {
     getBaseTableFromThis(): any;
     get filterInfo(): PerspectiveFilterColumnInfo;
     findChildNodeByUniquePath(uniquePath: string[]): any;
-    findNodeByUniqueName(uniqueName: string): PerspectiveTreeNode;
+    findNodeByDesignerId(designerId: string): PerspectiveTreeNode;
     get supportsParentFilter(): boolean;
     get isParentFilter(): boolean;
     buildParentFilterConditions(): Condition[];
     getParentJoinCondition(alias: string, parentAlias: string): Condition[];
+    get sortOrder(): "ASC" | "DESC";
+    get sortOrderIndex(): number;
 }
 export declare class PerspectiveTableColumnNode extends PerspectiveTreeNode {
     column: ColumnInfo;
@@ -68,11 +85,12 @@ export declare class PerspectiveTableColumnNode extends PerspectiveTreeNode {
     refTable: TableInfo;
     isView: boolean;
     isTable: boolean;
-    constructor(column: ColumnInfo, table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode);
+    constructor(column: ColumnInfo, table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
     matchChildRow(parentRow: any, childRow: any): boolean;
     getChildMatchColumns(): string[];
     getParentMatchColumns(): string[];
     getParentJoinCondition(alias: string, parentAlias: string): Condition[];
+    createReferenceConfigColumns(): PerspectiveReferenceConfig['columns'];
     getNodeLoadProps(parentRows: any[]): PerspectiveDataLoadProps;
     get icon(): "img circular" | "img autoincrement" | "img foreign-key" | "img column";
     get codeName(): string;
@@ -80,9 +98,15 @@ export declare class PerspectiveTableColumnNode extends PerspectiveTreeNode {
     get fieldName(): string;
     get title(): string;
     get isExpandable(): boolean;
+    get isSortable(): boolean;
     get filterType(): FilterType;
     get isCircular(): boolean;
-    get childNodes(): PerspectiveTreeNode[];
+    get isSecondaryChecked(): boolean;
+    get isChecked(): boolean;
+    get secondaryCheckable(): boolean;
+    toggleChecked(value?: boolean): void;
+    toggleSecondaryChecked(value?: boolean): void;
+    generateChildNodes(): PerspectiveTreeNode[];
     getBaseTableFromThis(): TableInfo;
     get filterInfo(): PerspectiveFilterColumnInfo;
     parseFilterCondition(source?: any): Condition;
@@ -98,12 +122,12 @@ export declare class PerspectiveTableColumnNode extends PerspectiveTreeNode {
 export declare class PerspectiveTableNode extends PerspectiveTreeNode {
     table: TableInfo | ViewInfo;
     dataProvider: PerspectiveDataProvider;
-    constructor(table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode);
+    constructor(table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
     getNodeLoadProps(parentRows: any[]): PerspectiveDataLoadProps;
     get codeName(): string;
     get title(): string;
     get isExpandable(): boolean;
-    get childNodes(): PerspectiveTreeNode[];
+    generateChildNodes(): PerspectiveTreeNode[];
     get icon(): string;
     getBaseTableFromThis(): TableInfo | ViewInfo;
     get headerTableAttributes(): {
@@ -119,28 +143,32 @@ export declare class PerspectiveTableReferenceNode extends PerspectiveTableNode
     foreignKey: ForeignKeyInfo;
     dataProvider: PerspectiveDataProvider;
     isMultiple: boolean;
-    constructor(foreignKey: ForeignKeyInfo, table: TableInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, isMultiple: boolean, parentNode: PerspectiveTreeNode);
+    constructor(foreignKey: ForeignKeyInfo, table: TableInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, isMultiple: boolean, parentNode: PerspectiveTreeNode, designerId: string);
     matchChildRow(parentRow: any, childRow: any): boolean;
     getChildMatchColumns(): string[];
     getParentMatchColumns(): string[];
     getNodeLoadProps(parentRows: any[]): PerspectiveDataLoadProps;
+    createReferenceConfigColumns(): PerspectiveReferenceConfig['columns'];
     get columnTitle(): string;
     get title(): string;
     get codeName(): string;
+    get isChecked(): boolean;
+    toggleChecked(value?: boolean): void;
     getParentJoinCondition(alias: string, parentAlias: string): Condition[];
 }
 export declare class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
     customJoin: PerspectiveCustomJoinConfig;
     dataProvider: PerspectiveDataProvider;
-    constructor(customJoin: PerspectiveCustomJoinConfig, table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode);
+    constructor(customJoin: PerspectiveCustomJoinConfig, table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
     matchChildRow(parentRow: any, childRow: any): boolean;
     getChildMatchColumns(): string[];
     getParentMatchColumns(): string[];
     getNodeLoadProps(parentRows: any[]): PerspectiveDataLoadProps;
-    get title(): string;
     get icon(): string;
     get codeName(): string;
     get customJoinConfig(): PerspectiveCustomJoinConfig;
+    get isChecked(): boolean;
+    toggleChecked(value?: boolean): void;
     getParentJoinCondition(alias: string, parentAlias: string): Condition[];
 }
-export declare function getTableChildPerspectiveNodes(table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentColumn: PerspectiveTreeNode): any[];
+export declare function getTableChildPerspectiveNodes(table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode): any[];