dbgate-datalib 5.1.0 → 5.1.1

package/lib/PerspectiveTreeNode.js

@@ -4,15 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTableChildPerspectiveNodes = exports.PerspectiveCustomJoinTreeNode = exports.PerspectiveTableReferenceNode = exports.PerspectiveTableNode = exports.PerspectiveTableColumnNode = exports.PerspectiveTreeNode = void 0;
+const dbgate_tools_1 = require("dbgate-tools");
+const PerspectiveConfig_1 = require("./PerspectiveConfig");
+const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const compact_1 = __importDefault(require("lodash/compact"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
 const flatten_1 = __importDefault(require("lodash/flatten"));
 const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
 const sortBy_1 = __importDefault(require("lodash/sortBy"));
 const cloneDeepWith_1 = __importDefault(require("lodash/cloneDeepWith"));
+const findIndex_1 = __importDefault(require("lodash/findIndex"));
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 const dbgate_filterparser_1 = require("dbgate-filterparser");
-const getPerspectiveDefaultColumns_1 = require("./getPerspectiveDefaultColumns");
+// import { getPerspectiveDefaultColumns } from './getPerspectiveDefaultColumns';
+const v1_1 = __importDefault(require("uuid/v1"));
 // export function groupPerspectiveLoadProps(
 //   ...list: PerspectiveDataLoadPropsWithNode[]
 // ): PerspectiveDataLoadPropsWithNode[] {
@@ -34,13 +39,23 @@ const getPerspectiveDefaultColumns_1 = require("./getPerspectiveDefaultColumns")
 //   return res;
 // }
 class PerspectiveTreeNode {
-    constructor(dbs, config, setConfig, parentNode, dataProvider, databaseConfig) {
+    constructor(dbs, config, setConfig, parentNode, dataProvider, databaseConfig, designerId) {
         this.dbs = dbs;
         this.config = config;
         this.setConfig = setConfig;
         this.parentNode = parentNode;
         this.dataProvider = dataProvider;
         this.databaseConfig = databaseConfig;
+        this.designerId = designerId;
+        this.childNodesCache = null;
+        this.nodeConfig = config.nodes.find(x => x.designerId == designerId);
+        this.parentNodeConfig = parentNode === null || parentNode === void 0 ? void 0 : parentNode.nodeConfig;
+    }
+    get childNodes() {
+        if (!this.childNodesCache) {
+            this.childNodesCache = this.generateChildNodes();
+        }
+        return this.childNodesCache;
     }
     get fieldName() {
         return this.codeName;
@@ -66,6 +81,9 @@ class PerspectiveTreeNode {
             return this;
         return (_a = this.parentNode) === null || _a === void 0 ? void 0 : _a.rootNode;
     }
+    get isSortable() {
+        return false;
+    }
     matchChildRow(parentRow, childRow) {
         return true;
     }
@@ -73,25 +91,37 @@ class PerspectiveTreeNode {
         var _a;
         return code == this.tableCode || ((_a = this.parentNode) === null || _a === void 0 ? void 0 : _a.hasTableCode(code));
     }
-    get uniqueName() {
-        if (this.parentNode)
-            return `${this.parentNode.uniqueName}::${this.codeName}`;
-        return this.codeName;
-    }
+    // get uniqueName() {
+    //   if (this.parentNode) return `${this.parentNode.uniqueName}::${this.codeName}`;
+    //   return this.codeName;
+    // }
     get level() {
         if (this.parentNode)
             return this.parentNode.level + 1;
         return 0;
     }
     get isExpanded() {
-        return this.config.expandedColumns.includes(this.uniqueName);
+        var _a, _b;
+        return (_b = (_a = this.parentNodeConfig) === null || _a === void 0 ? void 0 : _a.expandedColumns) === null || _b === void 0 ? void 0 : _b.includes(this.codeName);
     }
-    get isChecked() {
-        if (this.config.checkedColumns.includes(this.uniqueName))
+    get isCheckedColumn() {
+        var _a, _b;
+        if ((_b = (_a = this.parentNodeConfig) === null || _a === void 0 ? void 0 : _a.checkedColumns) === null || _b === void 0 ? void 0 : _b.includes(this.codeName))
             return true;
-        if (this.config.uncheckedColumns.includes(this.uniqueName))
-            return false;
-        return this.defaultChecked;
+        return false;
+    }
+    get isChecked() {
+        return this.isCheckedColumn;
+    }
+    get isCheckedNode() {
+        var _a, _b;
+        return !!this.designerId && !!((_b = (_a = this.config.nodes) === null || _a === void 0 ? void 0 : _a.find(x => x.designerId == this.designerId)) === null || _b === void 0 ? void 0 : _b.isNodeChecked);
+    }
+    get isSecondaryChecked() {
+        return false;
+    }
+    get secondaryCheckable() {
+        return false;
     }
     get columnTitle() {
         return this.title;
@@ -109,6 +139,15 @@ class PerspectiveTreeNode {
         var _a, _b;
         return (_b = (_a = this.dbs) === null || _a === void 0 ? void 0 : _a[this.databaseConfig.conid]) === null || _b === void 0 ? void 0 : _b[this.databaseConfig.database];
     }
+    get isCircular() {
+        return false;
+    }
+    hasDesignerIdInIncestors(designerId) {
+        var _a;
+        if (designerId == this.designerId)
+            return true;
+        return ((_a = this.parentNode) === null || _a === void 0 ? void 0 : _a.hasDesignerIdInIncestors(designerId)) || false;
+    }
     getChildMatchColumns() {
         return [];
     }
@@ -118,33 +157,69 @@ class PerspectiveTreeNode {
     parseFilterCondition(source = null) {
         return null;
     }
+    get hasUncheckedNodeInPath() {
+        if (!this.parentNode)
+            return false;
+        if (!this.isCheckedNode)
+            return true;
+        return this.parentNode.hasUncheckedNodeInPath;
+    }
     get childDataColumn() {
-        if (!this.isExpandable && this.isChecked) {
+        if (this.isCheckedColumn) {
             return this.codeName;
         }
         return null;
     }
     toggleExpanded(value) {
-        this.includeInColumnSet('expandedColumns', this.uniqueName, value == null ? !this.isExpanded : value);
+        this.includeInNodeSet('expandedColumns', value == null ? !this.isExpanded : value);
     }
     toggleChecked(value) {
-        if (this.defaultChecked) {
-            this.includeInColumnSet('uncheckedColumns', this.uniqueName, value == null ? this.isChecked : value);
-        }
-        else {
-            this.includeInColumnSet('checkedColumns', this.uniqueName, value == null ? !this.isChecked : value);
-        }
+        this.includeInNodeSet('checkedColumns', value == null ? !this.isChecked : value);
+    }
+    toggleCheckedNode(value) {
+        this.setConfig(cfg => {
+            var _a;
+            const oldCheckedValue = (_a = cfg.nodes.find(x => x.designerId == this.designerId)) === null || _a === void 0 ? void 0 : _a.isNodeChecked;
+            const [cfgChanged, nodeCfg] = this.ensureNodeConfig(cfg);
+            const res = Object.assign(Object.assign({}, cfgChanged), { nodes: cfgChanged.nodes.map(node => node.designerId == (this.designerId || nodeCfg.designerId)
+                    ? Object.assign(Object.assign({}, node), { isNodeChecked: value == null ? !oldCheckedValue : value }) : node) });
+            return res;
+        });
     }
-    includeInColumnSet(field, uniqueName, isIncluded) {
-        if (isIncluded) {
-            this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { [field]: [...(cfg[field] || []), uniqueName] })));
-        }
-        else {
-            this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { [field]: (cfg[field] || []).filter(x => x != uniqueName) })));
+    toggleSecondaryChecked(value) { }
+    createReferenceConfigColumns() {
+        return null;
+    }
+    ensureNodeConfig(cfg) {
+        var _a, _b;
+        let node = cfg.nodes.find(x => x.designerId == this.designerId);
+        if (!node) {
+            const nodeConfig = Object.assign(Object.assign({}, (0, PerspectiveConfig_1.createPerspectiveNodeConfig)(this.namedObject)), { isAutoGenerated: true, conid: (_a = this.parentNodeConfig) === null || _a === void 0 ? void 0 : _a.conid, database: (_b = this.parentNodeConfig) === null || _b === void 0 ? void 0 : _b.database });
+            const refConfig = {
+                designerId: (0, v1_1.default)(),
+                sourceId: this.parentNode.designerId,
+                targetId: nodeConfig.designerId,
+                isAutoGenerated: true,
+                columns: this.createReferenceConfigColumns(),
+            };
+            return [
+                Object.assign(Object.assign({}, cfg), { nodes: [...cfg.nodes, nodeConfig], references: [...cfg.references, refConfig] }),
+                nodeConfig,
+            ];
         }
+        return [cfg, node];
+    }
+    includeInNodeSet(field, isIncluded) {
+        this.setConfig(cfg => {
+            var _a;
+            const changedFields = n => (Object.assign(Object.assign({}, n), { [field]: isIncluded ? [...(n[field] || []), this.codeName] : (n[field] || []).filter(x => x != this.codeName) }));
+            const [cfgChanged, nodeCfg] = (_a = this.parentNode) === null || _a === void 0 ? void 0 : _a.ensureNodeConfig(cfg);
+            return Object.assign(Object.assign({}, cfgChanged), { nodes: cfgChanged.nodes.map(n => { var _a; return n.designerId == (((_a = this.parentNode) === null || _a === void 0 ? void 0 : _a.designerId) || (nodeCfg === null || nodeCfg === void 0 ? void 0 : nodeCfg.designerId)) ? changedFields(n) : n; }) });
+        });
     }
     getFilter() {
-        return this.config.filters[this.uniqueName];
+        var _a, _b;
+        return (_b = (_a = this.parentNodeConfig) === null || _a === void 0 ? void 0 : _a.filters) === null || _b === void 0 ? void 0 : _b[this.codeName];
     }
     getDataLoadColumns() {
         return (0, compact_1.default)((0, uniq_1.default)([
@@ -172,8 +247,8 @@ class PerspectiveTreeNode {
     getOrderBy(table) {
         var _a;
         const res = (0, compact_1.default)(this.childNodes.map(node => {
-            var _a, _b, _c, _d;
-            const sort = (_d = (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.sort) === null || _b === void 0 ? void 0 : _b[(_c = node === null || node === void 0 ? void 0 : node.parentNode) === null || _c === void 0 ? void 0 : _c.uniqueName]) === null || _d === void 0 ? void 0 : _d.find(x => x.uniqueName == node.uniqueName);
+            var _a, _b;
+            const sort = (_b = (_a = this.nodeConfig) === null || _a === void 0 ? void 0 : _a.sort) === null || _b === void 0 ? void 0 : _b.find(x => x.columnName == node.columnName);
             if (sort) {
                 return {
                     columnName: node.columnName,
@@ -212,13 +287,29 @@ class PerspectiveTreeNode {
         const child = this.childNodes.find(x => x.codeName == uniquePath[0]);
         return child === null || child === void 0 ? void 0 : child.findChildNodeByUniquePath(uniquePath.slice(1));
     }
-    findNodeByUniqueName(uniqueName) {
-        if (!uniqueName)
+    // findNodeByUniqueName(uniqueName: string): PerspectiveTreeNode {
+    //   if (!uniqueName) return null;
+    //   const uniquePath = uniqueName.split('::');
+    //   if (uniquePath[0] != this.codeName) return null;
+    //   return this.findChildNodeByUniquePath(uniquePath.slice(1));
+    // }
+    findNodeByDesignerId(designerId) {
+        if (!this.designerId) {
             return null;
-        const uniquePath = uniqueName.split('::');
-        if (uniquePath[0] != this.codeName)
+        }
+        if (!designerId) {
             return null;
-        return this.findChildNodeByUniquePath(uniquePath.slice(1));
+        }
+        if (designerId == this.designerId) {
+            return this;
+        }
+        for (const child of this.childNodes) {
+            const res = child.findNodeByDesignerId(designerId);
+            if (res) {
+                return res;
+            }
+        }
+        return null;
     }
     get supportsParentFilter() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -227,11 +318,14 @@ class PerspectiveTreeNode {
             ((_g = (_f = this.parentNode) === null || _f === void 0 ? void 0 : _f.databaseConfig) === null || _g === void 0 ? void 0 : _g.database) == ((_h = this.databaseConfig) === null || _h === void 0 ? void 0 : _h.database));
     }
     get isParentFilter() {
-        return !!(this.config.parentFilters || []).find(x => x.uniqueName == this.uniqueName);
+        var _a;
+        return !!((_a = this.nodeConfig) === null || _a === void 0 ? void 0 : _a.isParentFilter);
     }
     buildParentFilterConditions() {
         var _a;
-        const leafNodes = (0, compact_1.default)((((_a = this.config) === null || _a === void 0 ? void 0 : _a.parentFilters) || []).map(x => this.rootNode.findNodeByUniqueName(x.uniqueName)));
+        const leafNodes = (0, compact_1.default)((((_a = this.config) === null || _a === void 0 ? void 0 : _a.nodes) || [])
+            .filter(x => x.isParentFilter)
+            .map(x => this.rootNode.findNodeByDesignerId(x.designerId)));
         const conditions = (0, compact_1.default)(leafNodes.map(leafNode => {
             var _a, _b;
             if (leafNode == this)
@@ -249,7 +343,7 @@ class PerspectiveTreeNode {
             let node = leafNode;
             let index = 1;
             let lastAlias = 'pert_0';
-            while ((node === null || node === void 0 ? void 0 : node.parentNode) && ((_a = node === null || node === void 0 ? void 0 : node.parentNode) === null || _a === void 0 ? void 0 : _a.uniqueName) != (this === null || this === void 0 ? void 0 : this.uniqueName)) {
+            while ((node === null || node === void 0 ? void 0 : node.parentNode) && ((_a = node === null || node === void 0 ? void 0 : node.parentNode) === null || _a === void 0 ? void 0 : _a.designerId) != (this === null || this === void 0 ? void 0 : this.designerId)) {
                 node = node.parentNode;
                 let alias = `pert_${index}`;
                 select.from.relations.push({
@@ -260,8 +354,9 @@ class PerspectiveTreeNode {
                 });
                 lastAlias = alias;
                 lastNode = node;
+                index += 1;
             }
-            if (((_b = node === null || node === void 0 ? void 0 : node.parentNode) === null || _b === void 0 ? void 0 : _b.uniqueName) != (this === null || this === void 0 ? void 0 : this.uniqueName))
+            if (((_b = node === null || node === void 0 ? void 0 : node.parentNode) === null || _b === void 0 ? void 0 : _b.designerId) != (this === null || this === void 0 ? void 0 : this.designerId))
                 return null;
             select.where = {
                 conditionType: 'and',
@@ -280,12 +375,22 @@ class PerspectiveTreeNode {
     getParentJoinCondition(alias, parentAlias) {
         return [];
     }
+    get sortOrder() {
+        var _a, _b, _c;
+        return (_c = (_b = (_a = this.parentNodeConfig) === null || _a === void 0 ? void 0 : _a.sort) === null || _b === void 0 ? void 0 : _b.find(x => x.columnName == this.columnName)) === null || _c === void 0 ? void 0 : _c.order;
+    }
+    get sortOrderIndex() {
+        var _a, _b, _c;
+        return ((_b = (_a = this.parentNodeConfig) === null || _a === void 0 ? void 0 : _a.sort) === null || _b === void 0 ? void 0 : _b.length) > 1
+            ? (0, findIndex_1.default)((_c = this.parentNodeConfig) === null || _c === void 0 ? void 0 : _c.sort, x => x.columnName == this.columnName)
+            : -1;
+    }
 }
 exports.PerspectiveTreeNode = PerspectiveTreeNode;
 class PerspectiveTableColumnNode extends PerspectiveTreeNode {
-    constructor(column, table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode) {
+    constructor(column, table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId) {
         var _a, _b, _c, _d, _e;
-        super(dbs, config, setConfig, parentNode, dataProvider, databaseConfig);
+        super(dbs, config, setConfig, parentNode, dataProvider, databaseConfig, designerId);
         this.column = column;
         this.table = table;
         this.isTable = !!((_b = (_a = this.db) === null || _a === void 0 ? void 0 : _a.tables) === null || _b === void 0 ? void 0 : _b.find(x => x.schemaName == table.schemaName && x.pureName == table.pureName));
@@ -329,6 +434,13 @@ class PerspectiveTableColumnNode extends PerspectiveTreeNode {
             return res;
         });
     }
+    createReferenceConfigColumns() {
+        var _a, _b;
+        return (_b = (_a = this.foreignKey) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(col => ({
+            source: col.columnName,
+            target: col.refColumnName,
+        }));
+    }
     getNodeLoadProps(parentRows) {
         if (!this.foreignKey)
             return null;
@@ -367,6 +479,9 @@ class PerspectiveTableColumnNode extends PerspectiveTreeNode {
     get isExpandable() {
         return !!this.foreignKey;
     }
+    get isSortable() {
+        return true;
+    }
     get filterType() {
         return (0, dbgate_filterparser_1.getFilterType)(this.column.dataType);
     }
@@ -374,7 +489,29 @@ class PerspectiveTableColumnNode extends PerspectiveTreeNode {
         var _a, _b;
         return !!((_b = (_a = this.parentNode) === null || _a === void 0 ? void 0 : _a.parentNode) === null || _b === void 0 ? void 0 : _b.hasTableCode(this.tableCode));
     }
-    get childNodes() {
+    get isSecondaryChecked() {
+        return super.isCheckedColumn;
+    }
+    get isChecked() {
+        if (this.foreignKey)
+            return this.isCheckedNode;
+        return super.isCheckedColumn;
+    }
+    get secondaryCheckable() {
+        return !!this.foreignKey;
+    }
+    toggleChecked(value) {
+        if (this.foreignKey) {
+            this.toggleCheckedNode(value);
+        }
+        else {
+            super.toggleChecked(value);
+        }
+    }
+    toggleSecondaryChecked(value) {
+        super.toggleChecked(value == null ? !this.isSecondaryChecked : value);
+    }
+    generateChildNodes() {
         var _a, _b;
         if (!this.foreignKey)
             return [];
@@ -439,8 +576,8 @@ class PerspectiveTableColumnNode extends PerspectiveTreeNode {
 }
 exports.PerspectiveTableColumnNode = PerspectiveTableColumnNode;
 class PerspectiveTableNode extends PerspectiveTreeNode {
-    constructor(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode) {
-        super(dbs, config, setConfig, parentNode, dataProvider, databaseConfig);
+    constructor(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId) {
+        super(dbs, config, setConfig, parentNode, dataProvider, databaseConfig, designerId);
         this.table = table;
         this.dataProvider = dataProvider;
     }
@@ -458,12 +595,13 @@ class PerspectiveTableNode extends PerspectiveTreeNode {
         return this.table.schemaName ? `${this.table.schemaName}:${this.table.pureName}` : this.table.pureName;
     }
     get title() {
-        return this.table.pureName;
+        var _a;
+        return ((_a = this.nodeConfig) === null || _a === void 0 ? void 0 : _a.alias) || this.table.pureName;
     }
     get isExpandable() {
         return true;
     }
-    get childNodes() {
+    generateChildNodes() {
         return getTableChildPerspectiveNodes(this.table, this.dbs, this.config, this.setConfig, this.dataProvider, this.databaseConfig, this);
     }
     get icon() {
@@ -541,8 +679,8 @@ exports.PerspectiveTableNode = PerspectiveTableNode;
 //   }
 // }
 class PerspectiveTableReferenceNode extends PerspectiveTableNode {
-    constructor(foreignKey, table, dbs, config, setConfig, dataProvider, databaseConfig, isMultiple, parentNode) {
-        super(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode);
+    constructor(foreignKey, table, dbs, config, setConfig, dataProvider, databaseConfig, isMultiple, parentNode, designerId) {
+        super(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId);
         this.foreignKey = foreignKey;
         this.dataProvider = dataProvider;
         this.isMultiple = isMultiple;
@@ -576,6 +714,13 @@ class PerspectiveTableReferenceNode extends PerspectiveTableNode {
             condition: this.getChildrenCondition(),
         };
     }
+    createReferenceConfigColumns() {
+        var _a, _b;
+        return (_b = (_a = this.foreignKey) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(col => ({
+            source: col.refColumnName,
+            target: col.columnName,
+        }));
+    }
     get columnTitle() {
         return this.table.pureName;
     }
@@ -591,6 +736,12 @@ class PerspectiveTableReferenceNode extends PerspectiveTableNode {
         }
         return super.codeName;
     }
+    get isChecked() {
+        return this.isCheckedNode;
+    }
+    toggleChecked(value) {
+        this.toggleCheckedNode(value);
+    }
     getParentJoinCondition(alias, parentAlias) {
         if (!this.foreignKey)
             return [];
@@ -615,8 +766,8 @@ class PerspectiveTableReferenceNode extends PerspectiveTableNode {
 }
 exports.PerspectiveTableReferenceNode = PerspectiveTableReferenceNode;
 class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
-    constructor(customJoin, table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode) {
-        super(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode);
+    constructor(customJoin, table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId) {
+        super(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId);
         this.customJoin = customJoin;
         this.dataProvider = dataProvider;
     }
@@ -648,18 +799,24 @@ class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
             condition: this.getChildrenCondition(),
         };
     }
-    get title() {
-        return this.customJoin.joinName;
-    }
+    // get title() {
+    //   return this.customJoin.joinName || this.customJoin.refTableName;
+    // }
     get icon() {
         return 'icon custom-join';
     }
     get codeName() {
-        return this.customJoin.joinid;
+        return this.customJoin.refNodeDesignerId;
     }
     get customJoinConfig() {
         return this.customJoin;
     }
+    get isChecked() {
+        return this.isCheckedNode;
+    }
+    toggleChecked(value) {
+        this.toggleCheckedNode(value);
+    }
     getParentJoinCondition(alias, parentAlias) {
         return this.customJoin.columns.map(column => {
             const res = {
@@ -681,17 +838,45 @@ class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
     }
 }
 exports.PerspectiveCustomJoinTreeNode = PerspectiveCustomJoinTreeNode;
-function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvider, databaseConfig, parentColumn) {
-    var _a, _b, _c;
+function findDesignerIdForNode(config, parentNode, nodeCreateFunc) {
+    const node = nodeCreateFunc(null);
+    const refColumns = node.createReferenceConfigColumns();
+    if (!(refColumns === null || refColumns === void 0 ? void 0 : refColumns.length)) {
+        return node;
+    }
+    const ref1 = config.references.find(x => x.sourceId == parentNode.designerId &&
+        (0, isEqual_1.default)(refColumns.map(x => x.source), x.columns.map(x => x.source)) &&
+        (0, isEqual_1.default)(refColumns.map(x => x.target), x.columns.map(x => x.target)) &&
+        (0, dbgate_tools_1.equalFullName)(config.nodes.find(n => n.designerId == x.targetId), node.namedObject));
+    if (ref1 && !parentNode.hasDesignerIdInIncestors(ref1.targetId)) {
+        // console.log('FOUND1', node.title, ref1.targetId, refColumns);
+        return nodeCreateFunc(ref1.targetId);
+    }
+    const ref2 = config.references.find(x => x.targetId == parentNode.designerId &&
+        (0, isEqual_1.default)(refColumns.map(x => x.target), x.columns.map(x => x.source)) &&
+        (0, isEqual_1.default)(refColumns.map(x => x.source), x.columns.map(x => x.target)) &&
+        (0, dbgate_tools_1.equalFullName)(config.nodes.find(n => n.designerId == x.sourceId), node.namedObject));
+    if (ref2 && !parentNode.hasDesignerIdInIncestors(ref2.sourceId)) {
+        // console.log('FOUND2', node.title, ref2.sourceId, refColumns);
+        return nodeCreateFunc(ref2.sourceId);
+    }
+    return node;
+}
+function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode) {
+    var _a, _b, _c, _d;
     if (!table)
         return [];
-    const db = parentColumn.db;
-    const columnNodes = table.columns.map(col => new PerspectiveTableColumnNode(col, table, dbs, config, setConfig, dataProvider, databaseConfig, parentColumn));
-    const circularColumns = columnNodes.filter(x => x.isCircular).map(x => x.columnName);
-    const defaultColumns = (0, getPerspectiveDefaultColumns_1.getPerspectiveDefaultColumns)(table, db, circularColumns);
-    for (const node of columnNodes) {
-        node.defaultChecked = defaultColumns.includes(node.columnName);
-    }
+    const db = parentNode.db;
+    const columnNodes = table.columns.map(col => findDesignerIdForNode(config, parentNode, designerId => new PerspectiveTableColumnNode(col, table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId)));
+    // if (!columnNodes.find(x => x.isChecked)) {
+    //   const circularColumns = columnNodes.filter(x => x.isCircular).map(x => x.columnName);
+    //   const defaultColumns = getPerspectiveDefaultColumns(table, db, circularColumns);
+    //   for (const node of columnNodes) {
+    //     if (defaultColumns.includes(node.columnName)) {
+    //       no
+    //     }
+    //   }
+    // }
     const res = [];
     res.push(...columnNodes);
     const dependencies = [];
@@ -700,28 +885,75 @@ function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvid
             const tbl = db.tables.find(x => x.pureName == fk.pureName && x.schemaName == fk.schemaName);
             if (tbl) {
                 const isMultiple = (table === null || table === void 0 ? void 0 : table.dependencies.filter(x => x.pureName == fk.pureName && x.schemaName == fk.schemaName).length) >= 2;
-                dependencies.push(new PerspectiveTableReferenceNode(fk, tbl, dbs, config, setConfig, dataProvider, databaseConfig, isMultiple, parentColumn));
+                dependencies.push(findDesignerIdForNode(config, parentNode, designerId => new PerspectiveTableReferenceNode(fk, tbl, dbs, config, setConfig, dataProvider, databaseConfig, isMultiple, parentNode, designerId)));
             }
         }
     }
     res.push(...(0, sortBy_1.default)(dependencies, 'title'));
     const customs = [];
-    for (const join of config.customJoins || []) {
-        if (join.baseUniqueName == parentColumn.uniqueName) {
-            const newConfig = Object.assign({}, databaseConfig);
-            if (join.conid)
-                newConfig.conid = join.conid;
-            if (join.database)
-                newConfig.database = join.database;
-            const db = (_a = dbs === null || dbs === void 0 ? void 0 : dbs[newConfig.conid]) === null || _a === void 0 ? void 0 : _a[newConfig.database];
-            const table = (_b = db === null || db === void 0 ? void 0 : db.tables) === null || _b === void 0 ? void 0 : _b.find(x => x.pureName == join.refTableName && x.schemaName == join.refSchemaName);
-            const view = (_c = db === null || db === void 0 ? void 0 : db.views) === null || _c === void 0 ? void 0 : _c.find(x => x.pureName == join.refTableName && x.schemaName == join.refSchemaName);
-            if (table || view) {
-                customs.push(new PerspectiveCustomJoinTreeNode(join, table || view, dbs, config, setConfig, dataProvider, newConfig, parentColumn));
+    for (const node of config.nodes) {
+        if (node.designerId == ((_a = parentNode.parentNode) === null || _a === void 0 ? void 0 : _a.designerId) || res.find(x => x.designerId == node.designerId)) {
+            // already used as FK
+            continue;
+        }
+        for (const ref of config.references) {
+            if ((ref.sourceId == parentNode.designerId && ref.targetId == node.designerId) ||
+                (ref.targetId == parentNode.designerId && ref.sourceId == node.designerId)) {
+                const newConfig = Object.assign({}, databaseConfig);
+                if (node.conid)
+                    newConfig.conid = node.conid;
+                if (node.database)
+                    newConfig.database = node.database;
+                const db = (_b = dbs === null || dbs === void 0 ? void 0 : dbs[newConfig.conid]) === null || _b === void 0 ? void 0 : _b[newConfig.database];
+                const table = (_c = db === null || db === void 0 ? void 0 : db.tables) === null || _c === void 0 ? void 0 : _c.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
+                const view = (_d = db === null || db === void 0 ? void 0 : db.views) === null || _d === void 0 ? void 0 : _d.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
+                const join = {
+                    refNodeDesignerId: node.designerId,
+                    referenceDesignerId: ref.designerId,
+                    baseDesignerId: parentNode.designerId,
+                    joinName: node.alias,
+                    refTableName: node.pureName,
+                    refSchemaName: node.schemaName,
+                    conid: node.conid,
+                    database: node.database,
+                    columns: ref.sourceId == parentNode.designerId
+                        ? ref.columns.map(col => ({ baseColumnName: col.source, refColumnName: col.target }))
+                        : ref.columns.map(col => ({ baseColumnName: col.target, refColumnName: col.source })),
+                };
+                if (table || view) {
+                    customs.push(new PerspectiveCustomJoinTreeNode(join, table || view, dbs, config, setConfig, dataProvider, newConfig, parentNode, node.designerId));
+                }
             }
         }
     }
     res.push(...(0, sortBy_1.default)(customs, 'title'));
+    // const customs = [];
+    // for (const join of config.customJoins || []) {
+    //   if (join.baseUniqueName == parentColumn.uniqueName) {
+    //     const newConfig = { ...databaseConfig };
+    //     if (join.conid) newConfig.conid = join.conid;
+    //     if (join.database) newConfig.database = join.database;
+    //     const db = dbs?.[newConfig.conid]?.[newConfig.database];
+    //     const table = db?.tables?.find(x => x.pureName == join.refTableName && x.schemaName == join.refSchemaName);
+    //     const view = db?.views?.find(x => x.pureName == join.refTableName && x.schemaName == join.refSchemaName);
+    //     if (table || view) {
+    //       customs.push(
+    //         new PerspectiveCustomJoinTreeNode(
+    //           join,
+    //           table || view,
+    //           dbs,
+    //           config,
+    //           setConfig,
+    //           dataProvider,
+    //           newConfig,
+    //           parentColumn,
+    //           null
+    //         )
+    //       );
+    //     }
+    //   }
+    // }
+    // res.push(..._sortBy(customs, 'title'));
     return res;
 }
 exports.getTableChildPerspectiveNodes = getTableChildPerspectiveNodes;

package/lib/index.d.ts

@@ -18,3 +18,4 @@ export * from './PerspectiveDisplay';
 export * from './PerspectiveDataProvider';
 export * from './PerspectiveCache';
 export * from './PerspectiveConfig';
+export * from './processPerspectiveDefaultColunns';

package/lib/index.js

@@ -34,3 +34,4 @@ __exportStar(require("./PerspectiveDisplay"), exports);
 __exportStar(require("./PerspectiveDataProvider"), exports);
 __exportStar(require("./PerspectiveCache"), exports);
 __exportStar(require("./PerspectiveConfig"), exports);
+__exportStar(require("./processPerspectiveDefaultColunns"), exports);

package/lib/processPerspectiveDefaultColunns.d.ts

@@ -0,0 +1,4 @@
+import { MultipleDatabaseInfo, PerspectiveConfig } from './PerspectiveConfig';
+export declare function perspectiveNodesHaveStructure(config: PerspectiveConfig, dbInfos: MultipleDatabaseInfo, conid: string, database: string): boolean;
+export declare function shouldProcessPerspectiveDefaultColunns(config: PerspectiveConfig, dbInfos: MultipleDatabaseInfo, conid: string, database: string): boolean;
+export declare function processPerspectiveDefaultColunns(config: PerspectiveConfig, dbInfos: MultipleDatabaseInfo, conid: string, database: string): PerspectiveConfig;