dbgate-datalib 5.1.4 → 5.1.6

package/lib/ViewGridDisplay.d.ts

@@ -1,5 +1,5 @@
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
-import { EngineDriver, ViewInfo, ColumnInfo } from 'dbgate-types';
+import type { EngineDriver, ViewInfo, ColumnInfo } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
 export declare class ViewGridDisplay extends GridDisplay {
     view: ViewInfo;

package/lib/deleteCascade.d.ts

@@ -1,5 +1,5 @@
 import { Command } from 'dbgate-sqltree';
-import { DatabaseInfo } from 'dbgate-types';
+import type { DatabaseInfo } from 'dbgate-types';
 import { ChangeSet } from './ChangeSet';
 export interface ChangeSetDeleteCascade {
     title: string;

package/lib/index.d.ts

@@ -19,3 +19,5 @@ export * from './PerspectiveDataProvider';
 export * from './PerspectiveCache';
 export * from './PerspectiveConfig';
 export * from './processPerspectiveDefaultColunns';
+export * from './PerspectiveDataPattern';
+export * from './PerspectiveDataLoader';

package/lib/index.js

@@ -35,3 +35,5 @@ __exportStar(require("./PerspectiveDataProvider"), exports);
 __exportStar(require("./PerspectiveCache"), exports);
 __exportStar(require("./PerspectiveConfig"), exports);
 __exportStar(require("./processPerspectiveDefaultColunns"), exports);
+__exportStar(require("./PerspectiveDataPattern"), exports);
+__exportStar(require("./PerspectiveDataLoader"), exports);

package/lib/processPerspectiveDefaultColunns.d.ts

@@ -1,4 +1,5 @@
 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;
+import { PerspectiveDataPatternDict } from './PerspectiveDataPattern';
+export declare function perspectiveNodesHaveStructure(config: PerspectiveConfig, dbInfos: MultipleDatabaseInfo, dataPatterns: PerspectiveDataPatternDict, conid: string, database: string): boolean;
+export declare function shouldProcessPerspectiveDefaultColunns(config: PerspectiveConfig, dbInfos: MultipleDatabaseInfo, dataPatterns: PerspectiveDataPatternDict, conid: string, database: string): boolean;
+export declare function processPerspectiveDefaultColunns(config: PerspectiveConfig, dbInfos: MultipleDatabaseInfo, dataPatterns: PerspectiveDataPatternDict, conid: string, database: string): PerspectiveConfig;

package/lib/processPerspectiveDefaultColunns.js

@@ -3,16 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processPerspectiveDefaultColunns = exports.shouldProcessPerspectiveDefaultColunns = exports.perspectiveNodesHaveStructure = void 0;
 const dbgate_tools_1 = require("dbgate-tools");
 const PerspectiveTreeNode_1 = require("./PerspectiveTreeNode");
+const namePredicates = [
+    x => x.toLowerCase() == 'name',
+    x => x.toLowerCase() == 'title',
+    x => x.toLowerCase().includes('name'),
+    x => x.toLowerCase().includes('title'),
+    x => x.toLowerCase().includes('subject'),
+];
 function getPerspectiveDefaultColumns(table, db, circularColumns) {
     const columns = table.columns.map(x => x.columnName);
     const predicates = [
-        x => x.toLowerCase() == 'name',
-        x => x.toLowerCase() == 'title',
-        x => x.toLowerCase().includes('name'),
-        x => x.toLowerCase().includes('title'),
-        x => x.toLowerCase().includes('subject'),
-        // x => x.toLowerCase().includes('text'),
-        // x => x.toLowerCase().includes('desc'),
+        ...namePredicates,
         x => {
             var _a, _b, _c;
             return (_c = (_b = (_a = table.columns
@@ -37,7 +38,16 @@ function getPerspectiveDefaultColumns(table, db, circularColumns) {
     }
     return [[columns[0]], null];
 }
-function perspectiveNodesHaveStructure(config, dbInfos, conid, database) {
+function getPerspectiveDefaultCollectionColumns(pattern) {
+    const columns = pattern.columns.map(x => x.name);
+    const predicates = [...namePredicates, x => { var _a, _b; return (_b = (_a = pattern.columns.find(y => y.name == x)) === null || _a === void 0 ? void 0 : _a.types) === null || _b === void 0 ? void 0 : _b.includes('string'); }];
+    for (const predicate of predicates) {
+        const col = columns.find(predicate);
+        if (col)
+            return [col];
+    }
+}
+function perspectiveNodesHaveStructure(config, dbInfos, dataPatterns, conid, database) {
     var _a;
     for (const node of config.nodes) {
         const db = (_a = dbInfos === null || dbInfos === void 0 ? void 0 : dbInfos[node.conid || conid]) === null || _a === void 0 ? void 0 : _a[node.database || database];
@@ -45,20 +55,23 @@ function perspectiveNodesHaveStructure(config, dbInfos, conid, database) {
             return false;
         const table = db.tables.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
         const view = db.views.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
-        if (!table && !view)
+        const collection = db.collections.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
+        if (!table && !view && !collection)
+            return false;
+        if (collection && !(dataPatterns === null || dataPatterns === void 0 ? void 0 : dataPatterns[node.designerId]))
             return false;
     }
     return true;
 }
 exports.perspectiveNodesHaveStructure = perspectiveNodesHaveStructure;
-function shouldProcessPerspectiveDefaultColunns(config, dbInfos, conid, database) {
+function shouldProcessPerspectiveDefaultColunns(config, dbInfos, dataPatterns, conid, database) {
     const nodesNotProcessed = config.nodes.filter(x => !x.defaultColumnsProcessed);
     if (nodesNotProcessed.length == 0)
         return false;
-    return perspectiveNodesHaveStructure(config, dbInfos, conid, database);
+    return perspectiveNodesHaveStructure(config, dbInfos, dataPatterns, conid, database);
 }
 exports.shouldProcessPerspectiveDefaultColunns = shouldProcessPerspectiveDefaultColunns;
-function processPerspectiveDefaultColunnsStep(config, dbInfos, conid, database) {
+function processPerspectiveDefaultColunnsStep(config, dbInfos, dataPatterns, conid, database) {
     var _a, _b;
     const rootNode = config.nodes.find(x => x.designerId == config.rootDesignerId);
     if (!rootNode)
@@ -77,6 +90,7 @@ function processPerspectiveDefaultColunnsStep(config, dbInfos, conid, database)
             continue;
         const table = db.tables.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
         const view = db.views.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
+        const collection = db.collections.find(x => x.pureName == node.pureName && x.schemaName == node.schemaName);
         if (table || view) {
             const treeNode = root.findNodeByDesignerId(node.designerId);
             if (!treeNode) {
@@ -105,15 +119,20 @@ function processPerspectiveDefaultColunnsStep(config, dbInfos, conid, database)
                         ? Object.assign(Object.assign({}, n), { defaultColumnsProcessed: true, checkedColumns: defaultColumns }) : n) });
             }
         }
+        if (collection) {
+            const defaultColumns = getPerspectiveDefaultCollectionColumns(dataPatterns === null || dataPatterns === void 0 ? void 0 : dataPatterns[node.designerId]);
+            return Object.assign(Object.assign({}, config), { nodes: config.nodes.map(n => n.designerId == node.designerId
+                    ? Object.assign(Object.assign({}, n), { defaultColumnsProcessed: true, checkedColumns: defaultColumns }) : n) });
+        }
     }
     return null;
 }
 function markAllProcessed(config) {
     return Object.assign(Object.assign({}, config), { nodes: config.nodes.map(x => (Object.assign(Object.assign({}, x), { defaultColumnsProcessed: true }))) });
 }
-function processPerspectiveDefaultColunns(config, dbInfos, conid, database) {
+function processPerspectiveDefaultColunns(config, dbInfos, dataPatterns, conid, database) {
     while (config.nodes.filter(x => !x.defaultColumnsProcessed).length > 0) {
-        const newConfig = processPerspectiveDefaultColunnsStep(config, dbInfos, conid, database);
+        const newConfig = processPerspectiveDefaultColunnsStep(config, dbInfos, dataPatterns, conid, database);
         if (!newConfig) {
             return markAllProcessed(config);
         }

package/lib/tests/PerspectiveDisplay.test.js

@@ -13,7 +13,7 @@ const artistDataAlbumTrack_1 = __importDefault(require("./artistDataAlbumTrack")
 const processPerspectiveDefaultColunns_1 = require("../processPerspectiveDefaultColunns");
 test('test flat view', () => {
     const artistTable = chinookDbInfo_1.chinookDbInfo.tables.find(x => x.pureName == 'Artist');
-    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)((0, PerspectiveConfig_1.createPerspectiveConfig)({ pureName: 'Artist' }), { conid: { db: chinookDbInfo_1.chinookDbInfo } }, 'conid', 'db');
+    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)((0, PerspectiveConfig_1.createPerspectiveConfig)({ pureName: 'Artist' }), { conid: { db: chinookDbInfo_1.chinookDbInfo } }, null, 'conid', 'db');
     const root = new PerspectiveTreeNode_1.PerspectiveTableNode(artistTable, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, configColumns, null, null, { conid: 'conid', database: 'db' }, null, configColumns.rootDesignerId);
     const display = new PerspectiveDisplay_1.PerspectiveDisplay(root, artistDataFlat_1.default);
     expect(display.rows.length).toEqual(4);
@@ -32,7 +32,7 @@ test('test one level nesting', () => {
         designerId: '1',
         columns: [{ source: 'ArtistId', target: 'ArtistId' }],
     });
-    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)(config, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, 'conid', 'db');
+    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)(config, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, null, 'conid', 'db');
     // const config = createPerspectiveConfig({ pureName: 'Artist' });
     // config.nodes[0].checkedColumns = ['Album'];
     const root = new PerspectiveTreeNode_1.PerspectiveTableNode(artistTable, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, configColumns, null, null, { conid: 'conid', database: 'db' }, null, configColumns.nodes[0].designerId);
@@ -73,7 +73,7 @@ test('test two level nesting', () => {
         designerId: '2',
         columns: [{ source: 'AlbumId', target: 'AlbumId' }],
     });
-    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)(config, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, 'conid', 'db');
+    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)(config, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, null, 'conid', 'db');
     const root = new PerspectiveTreeNode_1.PerspectiveTableNode(artistTable, { conid: { db: chinookDbInfo_1.chinookDbInfo } }, configColumns, null, null, { conid: 'conid', database: 'db' }, null, configColumns.nodes[0].designerId);
     const display = new PerspectiveDisplay_1.PerspectiveDisplay(root, artistDataAlbumTrack_1.default);
     console.log(display.rows);

package/lib/tests/PerspectiveDisplayNoSql.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/tests/PerspectiveDisplayNoSql.test.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const PerspectiveDisplay_1 = require("../PerspectiveDisplay");
+const PerspectiveTreeNode_1 = require("../PerspectiveTreeNode");
+const PerspectiveConfig_1 = require("../PerspectiveConfig");
+const processPerspectiveDefaultColunns_1 = require("../processPerspectiveDefaultColunns");
+const dbgate_tools_1 = require("dbgate-tools");
+const PerspectiveDataPattern_1 = require("../PerspectiveDataPattern");
+const PerspectiveDataProvider_1 = require("../PerspectiveDataProvider");
+const accountData = [
+    {
+        name: 'jan',
+        email: 'jan@foo.co',
+        follows: [{ name: 'lucie' }, { name: 'petr' }],
+        nested: { email: 'jan@nest.cz' },
+    },
+    {
+        name: 'romeo',
+        email: 'romeo@foo.co',
+        follows: [{ name: 'julie' }, { name: 'wiliam' }],
+        nested: { email: 'romeo@nest.cz' },
+    },
+];
+function createDisplay(cfgFunc) {
+    const collectionInfo = {
+        objectTypeField: 'collections',
+        pureName: 'Account',
+    };
+    const dbInfo = Object.assign(Object.assign({}, dbgate_tools_1.DatabaseAnalyser.createEmptyStructure()), { collections: [collectionInfo] });
+    const config = (0, PerspectiveConfig_1.createPerspectiveConfig)({ pureName: 'Account' });
+    const dataPatterns = {
+        [config.rootDesignerId]: (0, PerspectiveDataPattern_1.analyseDataPattern)({
+            conid: 'conid',
+            database: 'db',
+            pureName: 'Account',
+        }, accountData),
+    };
+    const configColumns = (0, processPerspectiveDefaultColunns_1.processPerspectiveDefaultColunns)(config, { conid: { db: dbInfo } }, dataPatterns, 'conid', 'db');
+    if (cfgFunc) {
+        cfgFunc(configColumns.nodes[0]);
+    }
+    const root = new PerspectiveTreeNode_1.PerspectiveTableNode(collectionInfo, { conid: { db: dbInfo } }, configColumns, null, new PerspectiveDataProvider_1.PerspectiveDataProvider(null, null, dataPatterns), { conid: 'conid', database: 'db' }, null, configColumns.rootDesignerId);
+    const display = new PerspectiveDisplay_1.PerspectiveDisplay(root, accountData);
+    return display;
+}
+test('test nosql display', () => {
+    const display = createDisplay();
+    expect(display.rows.length).toEqual(2);
+    expect(display.rows[0].rowData).toEqual(['jan']);
+    expect(display.rows[1].rowData).toEqual(['romeo']);
+});
+test('test nosql nested array display', () => {
+    const display = createDisplay(cfg => {
+        cfg.checkedColumns = ['name', 'follows::name'];
+    });
+    expect(display.rows.length).toEqual(4);
+    expect(display.rows[0].rowData).toEqual(['jan', 'lucie']);
+    expect(display.rows[1].rowData).toEqual([undefined, 'petr']);
+    expect(display.rows[2].rowData).toEqual(['romeo', 'julie']);
+    expect(display.rows[3].rowData).toEqual([undefined, 'wiliam']);
+});
+test('test nosql nested object', () => {
+    const display = createDisplay(cfg => {
+        cfg.checkedColumns = ['name', 'nested::email'];
+    });
+    expect(display.rows.length).toEqual(2);
+    expect(display.rows[0].rowData).toEqual(['jan', 'jan@nest.cz']);
+    expect(display.rows[1].rowData).toEqual(['romeo', 'romeo@nest.cz']);
+});

package/lib/tests/chinookDbInfo.d.ts

@@ -1,2 +1,2 @@
-import { DatabaseInfo } from 'dbgate-types';
+import type { DatabaseInfo } from 'dbgate-types';
 export declare const chinookDbInfo: DatabaseInfo;

package/package.json

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