dbgate-datalib 5.1.6 → 5.1.7-alpha.13

package/lib/PerspectiveCache.js

@@ -9,6 +9,7 @@ const zip_1 = __importDefault(require("lodash/zip"));
 const difference_1 = __importDefault(require("lodash/difference"));
 const debug_1 = __importDefault(require("debug"));
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
+const perspectiveTools_1 = require("./perspectiveTools");
 const dbg = (0, debug_1.default)('dbgate:PerspectiveCache');
 class PerspectiveBindingGroup {
     constructor(table) {
@@ -16,7 +17,7 @@ class PerspectiveBindingGroup {
         this.loadedRows = [];
     }
     matchRow(row) {
-        return this.table.bindingColumns.every((column, index) => row[column] == this.bindingValues[index]);
+        return this.table.bindingColumns.every((column, index) => (0, perspectiveTools_1.perspectiveValueMatcher)(row[column], this.bindingValues[index]));
     }
 }
 exports.PerspectiveBindingGroup = PerspectiveBindingGroup;
@@ -57,7 +58,9 @@ class PerspectiveCacheTable {
         return uncached;
     }
     storeGroupSize(props, bindingValues, count) {
-        const originalBindingValue = props.bindingValues.find(v => (0, zip_1.default)(v, bindingValues).every(([x, y]) => x == y));
+        const originalBindingValue = props.bindingValues.find(v => (0, zip_1.default)(v, bindingValues).every(([x, y]) => (0, perspectiveTools_1.perspectiveValueMatcher)(x, y)));
+        // console.log('storeGroupSize NEW', bindingValues);
+        // console.log('storeGroupSize ORIGINAL', originalBindingValue);
         if (originalBindingValue) {
             const key = (0, json_stable_stringify_1.default)(originalBindingValue);
             // console.log('SET SIZE', originalBindingValue, bindingValues, key, count);

package/lib/PerspectiveDataPattern.js

@@ -41,7 +41,7 @@ function addObjectToColumns(columns, row) {
             if (!column.types.includes(type)) {
                 column.types.push(type);
             }
-            if ((0, isPlainObject_1.default)(value)) {
+            if ((0, isPlainObject_1.default)(value) && type != 'oid') {
                 addObjectToColumns(column.columns, value);
             }
             if ((0, isArray_1.default)(value)) {

package/lib/PerspectiveDataProvider.js

@@ -48,10 +48,11 @@ class PerspectiveDataProvider {
     loadDataNested(props) {
         return __awaiter(this, void 0, void 0, function* () {
             const tableCache = this.cache.getTableCache(props);
+            // console.log('loadDataNested', props);
             const uncached = tableCache.getUncachedBindingGroups(props);
             if (uncached.length > 0) {
                 const counts = yield this.loader.loadGrouping(Object.assign(Object.assign({}, props), { bindingValues: uncached }));
-                // console.log('COUNTS', counts);
+                // console.log('loadDataNested COUNTS', counts);
                 for (const resetItem of uncached) {
                     tableCache.storeGroupSize(props, resetItem, 0);
                 }
@@ -170,6 +171,13 @@ class PerspectiveDataProvider {
                     offset: tableCache.loadedCount,
                     limit: props.topCount - tableCache.loadedCount,
                 } }));
+            if (!nextRows) {
+                // return tableCache.getRowsResult(props);
+                return {
+                    rows: [],
+                    incomplete: false,
+                };
+            }
             if (nextRows.errorMessage) {
                 throw new Error(nextRows.errorMessage);
             }

package/lib/PerspectiveTreeNode.d.ts

@@ -39,6 +39,9 @@ export declare abstract class PerspectiveTreeNode {
     get isSortable(): boolean;
     get generatesHiearchicGridColumn(): boolean;
     get generatesDataGridColumn(): boolean;
+    get validParentDesignerId(): any;
+    get preloadedLevelData(): boolean;
+    get findByDesignerIdWithoutDesignerId(): boolean;
     matchChildRow(parentRow: any, childRow: any): boolean;
     hasTableCode(code: string): any;
     get level(): any;
@@ -135,6 +138,7 @@ export declare class PerspectivePatternColumnNode extends PerspectiveTreeNode {
     refTable: TableInfo;
     constructor(table: TableInfo | ViewInfo | CollectionInfo, column: PerspectiveDataPatternColumn, tableColumn: ColumnInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
     get isChildColumn(): boolean;
+    get findByDesignerIdWithoutDesignerId(): boolean;
     getNodeLoadProps(parentRows: any[]): PerspectiveDataLoadProps;
     get generatesHiearchicGridColumn(): boolean;
     get icon(): "img column" | "img json";
@@ -145,6 +149,9 @@ export declare class PerspectivePatternColumnNode extends PerspectiveTreeNode {
     get isExpandable(): boolean;
     get isSortable(): boolean;
     get filterType(): FilterType;
+    get preloadedLevelData(): boolean;
+    generatePatternChildNodes(): PerspectivePatternColumnNode[];
+    hasCheckedJoinChild(): boolean;
     generateChildNodes(): PerspectiveTreeNode[];
     get filterInfo(): PerspectiveFilterColumnInfo;
     parseFilterCondition(source?: any): {};

package/lib/PerspectiveTreeNode.js

@@ -18,6 +18,7 @@ const json_stable_stringify_1 = __importDefault(require("json-stable-stringify")
 const dbgate_filterparser_1 = require("dbgate-filterparser");
 // import { getPerspectiveDefaultColumns } from './getPerspectiveDefaultColumns';
 const v1_1 = __importDefault(require("uuid/v1"));
+const perspectiveTools_1 = require("./perspectiveTools");
 // export function groupPerspectiveLoadProps(
 //   ...list: PerspectiveDataLoadPropsWithNode[]
 // ): PerspectiveDataLoadPropsWithNode[] {
@@ -102,6 +103,18 @@ class PerspectiveTreeNode {
     get generatesDataGridColumn() {
         return this.isCheckedColumn;
     }
+    get validParentDesignerId() {
+        var _a;
+        if (this.designerId)
+            return this.designerId;
+        return (_a = this.parentNode) === null || _a === void 0 ? void 0 : _a.validParentDesignerId;
+    }
+    get preloadedLevelData() {
+        return false;
+    }
+    get findByDesignerIdWithoutDesignerId() {
+        return false;
+    }
     matchChildRow(parentRow, childRow) {
         return true;
     }
@@ -178,7 +191,7 @@ class PerspectiveTreeNode {
     get hasUncheckedNodeInPath() {
         if (!this.parentNode)
             return false;
-        if (!this.isCheckedNode)
+        if (this.designerId && !this.isCheckedNode)
             return true;
         return this.parentNode.hasUncheckedNodeInPath;
     }
@@ -334,7 +347,7 @@ class PerspectiveTreeNode {
     //   return this.findChildNodeByUniquePath(uniquePath.slice(1));
     // }
     findNodeByDesignerId(designerId) {
-        if (!this.designerId) {
+        if (!this.designerId && !this.findByDesignerIdWithoutDesignerId) {
             return null;
         }
         if (!designerId) {
@@ -631,13 +644,19 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
         this.column = column;
         this.tableColumn = tableColumn;
         this.parentNodeConfig = (_a = this.tableNodeOrParent) === null || _a === void 0 ? void 0 : _a.nodeConfig;
+        // console.log('PATTERN COLUMN', column);
     }
     get isChildColumn() {
         return this.parentNode instanceof PerspectivePatternColumnNode;
     }
+    get findByDesignerIdWithoutDesignerId() {
+        return this.isExpandable;
+    }
     // matchChildRow(parentRow: any, childRow: any): boolean {
-    //   if (!this.foreignKey) return false;
-    //   return parentRow[this.foreignKey.columns[0].columnName] == childRow[this.foreignKey.columns[0].refColumnName];
+    //   console.log('MATCH PATTENR ROW', parentRow, childRow);
+    //   return false;
+    //   // if (!this.foreignKey) return false;
+    //   // return parentRow[this.foreignKey.columns[0].columnName] == childRow[this.foreignKey.columns[0].refColumnName];
     // }
     // getChildMatchColumns() {
     //   if (!this.foreignKey) return [];
@@ -674,12 +693,18 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
     //   }));
     // }
     getNodeLoadProps(parentRows) {
+        // console.log('GETTING PATTERN', parentRows);
         return null;
     }
     get generatesHiearchicGridColumn() {
         var _a, _b, _c;
+        // return true;
         // console.log('generatesHiearchicGridColumn', this.parentTableNode?.nodeConfig?.checkedColumns, this.codeName + '::');
-        return !!((_c = (_b = (_a = this.tableNodeOrParent) === null || _a === void 0 ? void 0 : _a.nodeConfig) === null || _b === void 0 ? void 0 : _b.checkedColumns) === null || _c === void 0 ? void 0 : _c.find(x => x.startsWith(this.codeName + '::')));
+        if ((_c = (_b = (_a = this.tableNodeOrParent) === null || _a === void 0 ? void 0 : _a.nodeConfig) === null || _b === void 0 ? void 0 : _b.checkedColumns) === null || _c === void 0 ? void 0 : _c.find(x => x.startsWith(this.codeName + '::'))) {
+            return true;
+        }
+        // return false;
+        return this.hasCheckedJoinChild();
     }
     // get generatesHiearchicGridColumn() {
     //   // return this.config &&;
@@ -716,9 +741,81 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
             return (0, dbgate_filterparser_1.getFilterType)(this.tableColumn.dataType);
         return 'mongo';
     }
-    generateChildNodes() {
+    get preloadedLevelData() {
+        return true;
+    }
+    generatePatternChildNodes() {
         return this.column.columns.map(column => new PerspectivePatternColumnNode(this.table, column, this.tableColumn, this.dbs, this.config, this.setConfig, this.dataProvider, this.databaseConfig, this, null));
-        return [];
+    }
+    hasCheckedJoinChild() {
+        for (const node of this.childNodes) {
+            if (node instanceof PerspectivePatternColumnNode) {
+                if (node.hasCheckedJoinChild())
+                    return true;
+            }
+            if (node.isCheckedNode)
+                return true;
+        }
+        return false;
+    }
+    generateChildNodes() {
+        var _a, _b, _c, _d, _e;
+        const patternChildren = this.generatePatternChildNodes();
+        const customs = [];
+        // console.log('GETTING CHILDREN', this.config.nodes, this.config.references);
+        for (const node of this.config.nodes) {
+            for (const ref of this.config.references) {
+                const validDesignerId = this.validParentDesignerId;
+                if ((ref.sourceId == validDesignerId && ref.targetId == node.designerId) ||
+                    (ref.targetId == validDesignerId && ref.sourceId == node.designerId)) {
+                    // console.log('TESTING REF', ref, this.codeName);
+                    if (ref.columns.length != 1)
+                        continue;
+                    // console.log('CP1');
+                    if (ref.sourceId == validDesignerId &&
+                        this.codeName == (0, perspectiveTools_1.getPerspectiveParentColumnName)(ref.columns[0].source)) {
+                        if (ref.columns[0].target.includes('::'))
+                            continue;
+                    }
+                    else if (ref.targetId == validDesignerId &&
+                        this.codeName == (0, perspectiveTools_1.getPerspectiveParentColumnName)(ref.columns[0].target)) {
+                        if (ref.columns[0].source.includes('::'))
+                            continue;
+                    }
+                    else {
+                        continue;
+                    }
+                    // console.log('CP2');
+                    const newConfig = Object.assign({}, this.databaseConfig);
+                    if (node.conid)
+                        newConfig.conid = node.conid;
+                    if (node.database)
+                        newConfig.database = node.database;
+                    const db = (_b = (_a = this.dbs) === null || _a === void 0 ? void 0 : _a[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 collection = (_e = db === null || db === void 0 ? void 0 : db.collections) === null || _e === void 0 ? void 0 : _e.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
+                    const join = {
+                        refNodeDesignerId: node.designerId,
+                        referenceDesignerId: ref.designerId,
+                        baseDesignerId: validDesignerId,
+                        joinName: node.alias,
+                        refTableName: node.pureName,
+                        refSchemaName: node.schemaName,
+                        conid: node.conid,
+                        database: node.database,
+                        columns: ref.sourceId == validDesignerId
+                            ? ref.columns.map(col => ({ baseColumnName: col.source, refColumnName: col.target }))
+                            : ref.columns.map(col => ({ baseColumnName: col.target, refColumnName: col.source })),
+                    };
+                    if (table || view || collection) {
+                        customs.push(new PerspectiveCustomJoinTreeNode(join, table || view || collection, this.dbs, this.config, this.setConfig, this.dataProvider, newConfig, this, node.designerId));
+                    }
+                }
+            }
+        }
+        return [...patternChildren, ...customs];
+        // return [];
         // if (!this.foreignKey) return [];
         // const tbl = this?.db?.tables?.find(
         //   x => x.pureName == this.foreignKey?.refTableName && x.schemaName == this.foreignKey?.refSchemaName
@@ -919,8 +1016,9 @@ class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
         this.dataProvider = dataProvider;
     }
     matchChildRow(parentRow, childRow) {
+        // console.log('MATCH ROW', parentRow, childRow);
         for (const column of this.customJoin.columns) {
-            if (parentRow[column.baseColumnName] != childRow[column.refColumnName]) {
+            if (!(0, perspectiveTools_1.perspectiveValueMatcher)(parentRow[(0, perspectiveTools_1.getPerspectiveMostNestedChildColumnName)(column.baseColumnName)], childRow[column.refColumnName])) {
                 return false;
             }
         }
@@ -934,13 +1032,55 @@ class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
     }
     getNodeLoadProps(parentRows) {
         // console.log('CUSTOM JOIN', this.customJoin);
+        // console.log('PARENT ROWS', parentRows);
         // console.log('this.getDataLoadColumns()', this.getDataLoadColumns());
         const isMongo = (0, dbgate_tools_1.isCollectionInfo)(this.table);
+        // const bindingValues = [];
+        // for (const row of parentRows) {
+        //   const rowBindingValueArrays = [];
+        //   for (const col of this.customJoin.columns) {
+        //     const path = col.baseColumnName.split('::');
+        //     const values = [];
+        //     function processSubpath(parent, subpath) {
+        //       if (subpath.length == 0) {
+        //         values.push(parent);
+        //         return;
+        //       }
+        //       if (parent == null) {
+        //         return;
+        //       }
+        //       const obj = parent[subpath[0]];
+        //       if (_isArray(obj)) {
+        //         for (const elem of obj) {
+        //           processSubpath(elem, subpath.slice(1));
+        //         }
+        //       } else {
+        //         processSubpath(obj, subpath.slice(1));
+        //       }
+        //     }
+        //     processSubpath(row, path);
+        //     rowBindingValueArrays.push(values);
+        //   }
+        //   const valueCount = Math.max(...rowBindingValueArrays.map(x => x.length));
+        //   for (let i = 0; i < valueCount; i += 1) {
+        //     const value = Array(this.customJoin.columns.length);
+        //     for (let col = 0; col < this.customJoin.columns.length; col++) {
+        //       value[col] = rowBindingValueArrays[col][i % rowBindingValueArrays[col].length];
+        //     }
+        //     bindingValues.push(value);
+        //   }
+        // }
+        const bindingValues = parentRows.map(row => this.customJoin.columns.map(x => row[(0, perspectiveTools_1.getPerspectiveMostNestedChildColumnName)(x.baseColumnName)]));
+        // console.log('bindingValues', bindingValues);
+        // console.log(
+        //   'bindingValues UNIQ',
+        //   _uniqBy(bindingValues, x => JSON.stringify(x))
+        // );
         return {
             schemaName: this.table.schemaName,
             pureName: this.table.pureName,
             bindingColumns: this.getParentMatchColumns(),
-            bindingValues: (0, uniqBy_1.default)(parentRows.map(row => this.customJoin.columns.map(x => row[x.baseColumnName])), json_stable_stringify_1.default),
+            bindingValues: (0, uniqBy_1.default)(bindingValues, x => JSON.stringify(x)),
             dataColumns: this.getDataLoadColumns(),
             allColumns: isMongo,
             databaseConfig: this.databaseConfig,
@@ -1059,6 +1199,9 @@ function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvid
         for (const ref of config.references) {
             if ((ref.sourceId == parentNode.designerId && ref.targetId == node.designerId) ||
                 (ref.targetId == parentNode.designerId && ref.sourceId == node.designerId)) {
+                if (ref.columns.find(x => x.source.includes('::') || x.target.includes('::'))) {
+                    continue;
+                }
                 const newConfig = Object.assign({}, databaseConfig);
                 if (node.conid)
                     newConfig.conid = node.conid;

package/lib/index.d.ts

@@ -21,3 +21,4 @@ export * from './PerspectiveConfig';
 export * from './processPerspectiveDefaultColunns';
 export * from './PerspectiveDataPattern';
 export * from './PerspectiveDataLoader';
+export * from './perspectiveTools';

package/lib/index.js

@@ -37,3 +37,4 @@ __exportStar(require("./PerspectiveConfig"), exports);
 __exportStar(require("./processPerspectiveDefaultColunns"), exports);
 __exportStar(require("./PerspectiveDataPattern"), exports);
 __exportStar(require("./PerspectiveDataLoader"), exports);
+__exportStar(require("./perspectiveTools"), exports);

package/lib/perspectiveTools.d.ts

@@ -0,0 +1,3 @@
+export declare function getPerspectiveParentColumnName(columnName: string): string;
+export declare function getPerspectiveMostNestedChildColumnName(columnName: string): string;
+export declare function perspectiveValueMatcher(value1: any, value2: any): boolean;

package/lib/perspectiveTools.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.perspectiveValueMatcher = exports.getPerspectiveMostNestedChildColumnName = exports.getPerspectiveParentColumnName = void 0;
+function getPerspectiveParentColumnName(columnName) {
+    const path = columnName.split('::');
+    if (path.length >= 2)
+        return path.slice(0, -1).join('::');
+    return null;
+}
+exports.getPerspectiveParentColumnName = getPerspectiveParentColumnName;
+function getPerspectiveMostNestedChildColumnName(columnName) {
+    const path = columnName.split('::');
+    return path[path.length - 1];
+}
+exports.getPerspectiveMostNestedChildColumnName = getPerspectiveMostNestedChildColumnName;
+// export function perspectiveValueMatcher(value1, value2): boolean {
+//   if (value1?.$oid && value2?.$oid) return value1.$oid == value2.$oid;
+//   if (Array.isArray(value1)) return !!value1.find(x => perspectiveValueMatcher(x, value2));
+//   if (Array.isArray(value2)) return !!value2.find(x => perspectiveValueMatcher(value1, x));
+//   return value1 == value2;
+// }
+function perspectiveValueMatcher(value1, value2) {
+    if ((value1 === null || value1 === void 0 ? void 0 : value1.$oid) && (value2 === null || value2 === void 0 ? void 0 : value2.$oid))
+        return value1.$oid == value2.$oid;
+    return value1 == value2;
+}
+exports.perspectiveValueMatcher = perspectiveValueMatcher;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.1.6",
+  "version": "5.1.7-alpha.13",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,12 +13,12 @@
     "lib"
   ],
   "dependencies": {
-    "dbgate-sqltree": "^5.1.6",
-    "dbgate-tools": "^5.1.6",
-    "dbgate-filterparser": "^5.1.6"
+    "dbgate-sqltree": "^5.1.7-alpha.13",
+    "dbgate-tools": "^5.1.7-alpha.13",
+    "dbgate-filterparser": "^5.1.7-alpha.13"
   },
   "devDependencies": {
-    "dbgate-types": "^5.1.6",
+    "dbgate-types": "^5.1.7-alpha.13",
     "@types/node": "^13.7.0",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",