@saltcorn/data 0.7.4-beta.3 → 0.7.4

package/dist/diagram/cy_generate_utils.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.generateCyCode = void 0;
+exports.generateCyCode = exports.genereateCyCfg = void 0;
 const cy_raster_1 = __importDefault(require("./cy_raster"));
 const cyStyle = [
     {
@@ -48,11 +48,43 @@ const cyStyle = [
             "background-color": "green",
         },
     },
+    {
+        selector: "node[type='table']",
+        style: {
+            "background-color": "gray",
+        },
+    },
+    {
+        selector: "node[type='trigger']",
+        style: {
+            "background-color": "yellow",
+        },
+    },
 ];
 /**
- * generates code to initalise cytoscape.js and draw the application object tree
+ * generates a cfg to re-init cytoscape.js on ajax requests
+ * @param entryNodes roots for the graphs,
+                     if not set, roots will be used how the db delivers them
+ * @returns cytoscape.js cfg object
+ */
+function genereateCyCfg(entryNodes) {
+    const raster = new cy_raster_1.default(entryNodes);
+    return {
+        elements: {
+            nodes: raster.buildCyNodes(),
+            edges: raster.buildCyEdges(),
+        },
+        style: cyStyle,
+        layout: {
+            name: "preset",
+        },
+    };
+}
+exports.genereateCyCfg = genereateCyCfg;
+/**
+ * generates code to initalise cytoscape.js when the page loads the first time
  * @param entryNodes roots for the graphs,
-                     if not set roots, will be used how the db delivers them
+                     if not set, roots will be used how the db delivers them
  * @returns cytoscape.js code as string
  */
 function generateCyCode(entryNodes) {

package/dist/diagram/cy_generate_utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"cy_generate_utils.js","sourceRoot":"","sources":["../../diagram/cy_generate_utils.ts"],"names":[],"mappings":";;;;;;AACA,4DAA0C;AAE1C,MAAM,OAAO,GAAG;IACd;QACE,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE;YACL,KAAK,EAAE,CAAC;YACR,YAAY,EAAE,MAAM;YACpB,oBAAoB,EAAE,MAAM;YAC5B,oBAAoB,EAAE,UAAU;YAChC,aAAa,EAAE,CAAC;SACjB;KACF;IACD;QACE,QAAQ,EAAE,yBAAyB;QACnC,KAAK,EAAE;YACL,aAAa,EAAE,QAAQ;SACxB;KACF;IACD;QACE,QAAQ,EAAE,8BAA8B;QACxC,KAAK,EAAE;YACL,aAAa,EAAE,kBAAkB;YACjC,wBAAwB,EAAE,CAAC,EAAE;SAC9B;KACF;IACD;QACE,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE;YACL,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE,SAAS;SACjB;KACF;IACD;QACE,QAAQ,EAAE,mBAAmB;QAC7B,KAAK,EAAE;YACL,kBAAkB,EAAE,MAAM;SAC3B;KACF;IACD;QACE,QAAQ,EAAE,mBAAmB;QAC7B,KAAK,EAAE;YACL,kBAAkB,EAAE,OAAO;SAC5B;KACF;CACF,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,UAAuB;IACpD,MAAM,MAAM,GAAG,IAAI,mBAAe,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;IACtC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;IACtC,OAAO;;;;eAIM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;eACvB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;;aAEzB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;;;;MAI9B,CAAC;AACP,CAAC;AAhBD,wCAgBC"}
+{"version":3,"file":"cy_generate_utils.js","sourceRoot":"","sources":["../../diagram/cy_generate_utils.ts"],"names":[],"mappings":";;;;;;AACA,4DAA0C;AAE1C,MAAM,OAAO,GAAG;IACd;QACE,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE;YACL,KAAK,EAAE,CAAC;YACR,YAAY,EAAE,MAAM;YACpB,oBAAoB,EAAE,MAAM;YAC5B,oBAAoB,EAAE,UAAU;YAChC,aAAa,EAAE,CAAC;SACjB;KACF;IACD;QACE,QAAQ,EAAE,yBAAyB;QACnC,KAAK,EAAE;YACL,aAAa,EAAE,QAAQ;SACxB;KACF;IACD;QACE,QAAQ,EAAE,8BAA8B;QACxC,KAAK,EAAE;YACL,aAAa,EAAE,kBAAkB;YACjC,wBAAwB,EAAE,CAAC,EAAE;SAC9B;KACF;IACD;QACE,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE;YACL,KAAK,EAAE,aAAa;YACpB,KAAK,EAAE,SAAS;SACjB;KACF;IACD;QACE,QAAQ,EAAE,mBAAmB;QAC7B,KAAK,EAAE;YACL,kBAAkB,EAAE,MAAM;SAC3B;KACF;IACD;QACE,QAAQ,EAAE,mBAAmB;QAC7B,KAAK,EAAE;YACL,kBAAkB,EAAE,OAAO;SAC5B;KACF;IACD;QACE,QAAQ,EAAE,oBAAoB;QAC9B,KAAK,EAAE;YACL,kBAAkB,EAAE,MAAM;SAC3B;KACF;IACD;QACE,QAAQ,EAAE,sBAAsB;QAChC,KAAK,EAAE;YACL,kBAAkB,EAAE,QAAQ;SAC7B;KACF;CACF,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,UAAuB;IACpD,MAAM,MAAM,GAAG,IAAI,mBAAe,CAAC,UAAU,CAAC,CAAC;IAC/C,OAAO;QACL,QAAQ,EAAE;YACR,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE;YAC5B,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE;SAC7B;QACD,KAAK,EAAE,OAAO;QACd,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;SACf;KACF,CAAC;AACJ,CAAC;AAZD,wCAYC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,UAAuB;IACpD,MAAM,MAAM,GAAG,IAAI,mBAAe,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;IACtC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;IACtC,OAAO;;;;eAIM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;eACvB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;;aAEzB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;;;;MAI9B,CAAC;AACP,CAAC;AAhBD,wCAgBC"}

package/dist/diagram/cy_raster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cy_raster.d.ts","sourceRoot":"","sources":["../../diagram/cy_raster.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAG1B;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;gBAEtB,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC;IAKnC,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,UAAU;IAiBX,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAM5C,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ;IAQzD;;;OAGG;IACI,YAAY,IAAI,GAAG,EAAE;IA2B5B;;;OAGG;IACI,YAAY,IAAI,GAAG,EAAE;IAa5B,SAAS,IAAI,MAAM;IAInB,SAAS,IAAI,MAAM;IAInB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI5B,OAAO,CAAC,kBAAkB;CAiB3B;AAwID,aAAK,QAAQ,GAAG,YAAY,GAAG,iBAAiB,CAAC"}
+{"version":3,"file":"cy_raster.d.ts","sourceRoot":"","sources":["../../diagram/cy_raster.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;gBAEtB,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC;IAKnC,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,UAAU;IAqBX,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAM5C,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ;IAQzD;;;OAGG;IACI,YAAY,IAAI,GAAG,EAAE;IA2B5B;;;OAGG;IACI,YAAY,IAAI,GAAG,EAAE;IAa5B,SAAS,IAAI,MAAM;IAInB,SAAS,IAAI,MAAM;IAInB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI5B,OAAO,CAAC,kBAAkB;CAiB3B;AAyND,aAAK,QAAQ,GAAG,YAAY,GAAG,iBAAiB,CAAC"}

package/dist/diagram/cy_raster.js

@@ -30,16 +30,20 @@ class CytoscapeRaster {
         let startRow = 10;
         let startCol = 2;
         const visitor = buildVisitor(this);
+        let maxRowInLine = 0;
         for (const node of entryNodes) {
             const dummyRoot = new node_1.default("dummy", "");
             dummyRoot.linked.push(node);
             const usedSpace = traverse(dummyRoot, visitor, startRow, startCol);
-            if (usedSpace.maxCol < 5) {
+            if (usedSpace.maxRow > maxRowInLine)
+                maxRowInLine = usedSpace.maxRow;
+            if (usedSpace.maxCol < 10) {
                 startCol = usedSpace.maxCol;
             }
             else {
-                startRow = usedSpace.maxRow;
+                startRow = maxRowInLine;
                 startCol = 2;
+                maxRowInLine = 0;
             }
         }
     }
@@ -132,17 +136,44 @@ class CytoscapeRaster {
 }
 exports.default = CytoscapeRaster;
 const buildVisitor = (raster) => {
+    const allignTablesAndTrigger = (source, tables, row, col) => {
+        const triggerRow = row;
+        let tableRow = row;
+        let triggerCol = col;
+        let tableCol = col;
+        let anyNewTables = false;
+        for (const table of tables) {
+            if (!raster.hasId(table.cyId)) {
+                anyNewTables = true;
+                for (const trigger of table.trigger) {
+                    raster.addNode(trigger, triggerRow, triggerCol--);
+                    raster.addLink(table, trigger, "new_target");
+                }
+                if (table.trigger.length > 0)
+                    tableRow = row + 1;
+                raster.addNode(table, tableRow, tableCol);
+                raster.addLink(source, table, "new_target");
+                tableCol = triggerCol;
+            }
+            else {
+                raster.addLink(source, table, "existing_target");
+            }
+        }
+        return { row: anyNewTables ? ++tableRow : tableRow, col: tableCol };
+    };
     return {
         linked(source, target, row, col, noLink) {
+            let insertRow = row;
+            let insertCol = col;
             if (!raster.hasId(target.cyId)) {
-                const pos = { row: row, col: col };
-                const embedDepth = maxEmbedDepth(target.embedded, raster);
-                if (embedDepth > 0)
-                    pos.col += embedDepth + 1;
-                raster.addNode(target, pos.row, pos.col);
+                insertCol += leftDepth(target, raster);
+                const newInsertPos = allignTablesAndTrigger(target, target.tables, insertRow, insertCol);
+                if (newInsertPos)
+                    insertRow = newInsertPos.row;
+                raster.addNode(target, insertRow, insertCol);
                 if (!noLink)
                     raster.addLink(source, target, "new_target");
-                return pos;
+                return { row: insertRow, col: insertCol };
             }
             else {
                 raster.addLink(source, target, "existing_target");
@@ -150,28 +181,31 @@ const buildVisitor = (raster) => {
             }
         },
         embedded(source, target, row, col) {
+            let insertRow = row;
+            let insertCol = col;
             if (!raster.hasId(target.cyId)) {
-                raster.addNode(target, row, col);
+                const newInsertPos = allignTablesAndTrigger(target, target.tables, insertRow, insertCol);
+                if (newInsertPos)
+                    insertRow = newInsertPos.row;
+                raster.addNode(target, insertRow, insertCol);
                 raster.addLink(source, target, "new_target");
-                return { row, col };
+                return { row: insertRow, col: insertCol };
             }
             else {
                 raster.addLink(source, target, "existing_target");
                 return null;
             }
         },
-        table(node, row, col) {
-            return true;
-        },
     };
 };
 const traverse = (node, visitor, startRow, startCol) => {
-    let maxRow = 0;
-    let maxCol = 0;
+    let maxRow = startRow;
+    let rootEmbedMax = maxRow;
+    let maxCol = startCol;
     const go = (current, row, col, ignoreLinks, parentIsDummy, shiftEmbedsY) => {
         let insertEmbedCol = col - 1;
         let insertLinkedCol = col + 1;
-        let insertEmbedRow = row > maxRow ? row : maxRow;
+        let insertEmbedRow = row > maxRow ? row : maxRow + 1;
         let insertLinkedRow = insertEmbedRow;
         // put links from embeds to the parent
         const embeddedLinks = new Array();
@@ -180,7 +214,12 @@ const traverse = (node, visitor, startRow, startCol) => {
             insertEmbedRow++;
         // align embeds
         for (const embedded of current.embedded) {
-            if (visitor.embedded(current, embedded, insertEmbedRow, insertEmbedCol)) {
+            if (maxRow > insertEmbedRow)
+                insertEmbedRow = maxRow;
+            const rasterPos = visitor.embedded(current, embedded, insertEmbedRow, insertEmbedCol);
+            if (rasterPos) {
+                insertEmbedRow = rasterPos.row;
+                insertEmbedCol = rasterPos.col;
                 go(embedded, insertEmbedRow, insertEmbedCol, true);
                 if (++insertEmbedRow > maxRow)
                     maxRow = insertEmbedRow;
@@ -188,6 +227,7 @@ const traverse = (node, visitor, startRow, startCol) => {
         }
         if (parentIsDummy) {
             // branches left from the root shouldn't affect right branches
+            rootEmbedMax = maxRow;
             maxRow = 0;
             insertEmbedRow = row;
             insertLinkedRow = row;
@@ -200,6 +240,9 @@ const traverse = (node, visitor, startRow, startCol) => {
                 const rasterPos = visitor.linked(current, linked, insertLinkedRow, insertLinkedCol, currentIsDummy);
                 if (rasterPos) {
                     insertLinkedCol = rasterPos.col;
+                    insertLinkedRow = rasterPos.row;
+                    if (insertLinkedRow > maxRow)
+                        maxRow = insertLinkedRow;
                     go(linked, insertLinkedRow, insertLinkedCol, false, currentIsDummy, shiftEmbedsY);
                     if (maxRow > insertLinkedRow)
                         insertLinkedRow = maxRow;
@@ -214,7 +257,29 @@ const traverse = (node, visitor, startRow, startCol) => {
             maxCol = insertEmbedCol;
     };
     go(node, startRow, startCol, false);
-    return { maxRow: maxRow + 1, maxCol };
+    return {
+        maxRow: (rootEmbedMax > maxRow ? rootEmbedMax : maxRow) + 1,
+        maxCol,
+    };
+};
+const leftDepth = (node, raster) => {
+    const tblDepth = tableDepth(node, raster);
+    const embedDepth = maxEmbedDepth(node.embedded, raster);
+    return tblDepth > embedDepth ? tblDepth : embedDepth;
+};
+const tableDepth = (parent, raster) => {
+    const usedIds = new Set();
+    let depth = 0;
+    for (const tbl of parent.tables || []) {
+        const triggerCount = tbl.trigger.length;
+        if (!raster.hasId(tbl.cyId)) {
+            usedIds.add(tbl.cyId);
+            if (tbl.trigger.length > 1) {
+                depth += triggerCount > 1 ? triggerCount : 1;
+            }
+        }
+    }
+    return depth;
 };
 const maxEmbedDepth = (nodes, raster) => {
     let max = 0;
@@ -226,14 +291,15 @@ const maxEmbedDepth = (nodes, raster) => {
     return max;
 };
 const embedDepth = (parent, raster) => {
-    if (parent.embedded.length === 0)
+    if (raster.hasId(parent.cyId))
         return 0;
     let maxDepth = 0;
     for (const node of parent.embedded) {
         const branchDepth = embedDepth(node, raster);
         maxDepth = branchDepth > maxDepth ? branchDepth : maxDepth;
     }
-    return maxDepth + (!raster.hasId(parent.cyId) ? 1 : 0);
+    let tblSpace = tableDepth(parent, raster);
+    return maxDepth + (tblSpace > 1 ? tblSpace : 1);
 };
 const collectEmbeddedLinks = (parent, result) => {
     for (const embedded of parent.embedded) {

package/dist/diagram/cy_raster.js.map

@@ -1 +1 @@
-{"version":3,"file":"cy_raster.js","sourceRoot":"","sources":["../../diagram/cy_raster.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cy_raster.js","sourceRoot":"","sources":["../../diagram/cy_raster.ts"],"names":[],"mappings":"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"}

package/dist/diagram/node.d.ts

@@ -1,4 +1,4 @@
-export declare type NodeType = "view" | "page" | "table" | "dummy";
+export declare type NodeType = "view" | "page" | "table" | "trigger" | "dummy";
 /**
  * resembles a page or a view in the application object tree
  */
@@ -9,8 +9,9 @@ export default class Node {
     linked: Node[];
     embedded: Node[];
     tables: Node[];
+    trigger: Node[];
     /**
-     * @param type page or view
+     * @param type saltcorn-entity type
      * @param label
      */
     constructor(type: NodeType, label: string);

package/dist/diagram/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../diagram/node.ts"],"names":[],"mappings":"AAAA,oBAAY,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AAE3D;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IACvB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,SAAqB;IAC3B,QAAQ,SAAqB;IAC7B,MAAM,SAAqB;IAE3B;;;OAGG;gBACS,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM;CAK1C"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../diagram/node.ts"],"names":[],"mappings":"AAAA,oBAAY,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC;AAEvE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IACvB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,SAAqB;IAC3B,QAAQ,SAAqB;IAC7B,MAAM,SAAqB;IAC3B,OAAO,SAAqB;IAE5B;;;OAGG;gBACS,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM;CAK1C"}

package/dist/diagram/node.js

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 class Node {
     /**
-     * @param type page or view
+     * @param type saltcorn-entity type
      * @param label
      */
     constructor(type, label) {
         this.linked = new Array();
         this.embedded = new Array();
         this.tables = new Array();
+        this.trigger = new Array();
         this.type = type;
         this.label = label;
         this.cyId = `${type}_${label}`;

package/dist/diagram/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../diagram/node.ts"],"names":[],"mappings":";;AAEA;;GAEG;AACH,MAAqB,IAAI;IAQvB;;;OAGG;IACH,YAAY,IAAc,EAAE,KAAa;QARzC,WAAM,GAAG,IAAI,KAAK,EAAQ,CAAC;QAC3B,aAAQ,GAAG,IAAI,KAAK,EAAQ,CAAC;QAC7B,WAAM,GAAG,IAAI,KAAK,EAAQ,CAAC;QAOzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;IACjC,CAAC;CACF;AAjBD,uBAiBC"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../diagram/node.ts"],"names":[],"mappings":";;AAEA;;GAEG;AACH,MAAqB,IAAI;IASvB;;;OAGG;IACH,YAAY,IAAc,EAAE,KAAa;QATzC,WAAM,GAAG,IAAI,KAAK,EAAQ,CAAC;QAC3B,aAAQ,GAAG,IAAI,KAAK,EAAQ,CAAC;QAC7B,WAAM,GAAG,IAAI,KAAK,EAAQ,CAAC;QAC3B,YAAO,GAAG,IAAI,KAAK,EAAQ,CAAC;QAO1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;IACjC,CAAC;CACF;AAlBD,uBAkBC"}

package/dist/diagram/node_extract_utils.d.ts

@@ -1,12 +1,24 @@
 import Node from "./node";
 import { AbstractPage as Page } from "@saltcorn/types/model-abstracts/abstract_page";
 import type { ConnectedObjects } from "@saltcorn/types/base_types";
+export declare type ExtractOpts = {
+    entryPages?: Array<Page>;
+    showViews: boolean;
+    viewFilterIds?: Set<number>;
+    showPages: boolean;
+    pageFilterIds?: Set<number>;
+    showTables: boolean;
+    tableFilterIds?: Set<number>;
+    showTrigger: boolean;
+    triggerFilterIds?: Set<number>;
+};
 /**
  * builds object trees for 'views/pages' with branches for all possible paths
- * @param entryPages if given, those will be the start nodes of the first graphs
+ * @param opts filter and entry pages options.
+ * If 'entryPages' is an array, those will be the start nodes of the first graphs
  * @returns root nodes
  */
-export declare function buildObjectTrees(entryPages?: Array<Page>): Promise<Array<Node>>;
+export declare function buildObjectTrees(opts: ExtractOpts): Promise<Array<Node>>;
 /**
  * extracts all 'views/pages' aligned in the layout
  * @param layout view or page layout

package/dist/diagram/node_extract_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node_extract_utils.d.ts","sourceRoot":"","sources":["../../diagram/node_extract_utils.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAG1B,OAAO,EAAE,YAAY,IAAI,IAAI,EAAE,MAAM,+CAA+C,CAAC;AAMrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnE;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,GAAE,KAAK,CAAC,IAAI,CAAqB,GAC1C,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAQtB;AAoBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,GAAG,GAAG,gBAAgB,CAqC/D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,gBAAgB,CAanE;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,GAAG,GACjB,gBAAgB,GAAG,IAAI,CAkBzB"}
+{"version":3,"file":"node_extract_utils.d.ts","sourceRoot":"","sources":["../../diagram/node_extract_utils.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAG1B,OAAO,EAAE,YAAY,IAAI,IAAI,EAAE,MAAM,+CAA+C,CAAC;AAOrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,oBAAY,WAAW,GAAG;IACxB,UAAU,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAChC,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAgBtB;AAwBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,GAAG,GAAG,gBAAgB,CAqC/D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,gBAAgB,CAanE;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,GAAG,GACjB,gBAAgB,GAAG,IAAI,CAkBzB"}

package/dist/diagram/node_extract_utils.js

@@ -8,26 +8,39 @@ const node_1 = __importDefault(require("./node"));
 const layout_1 = __importDefault(require("../models/layout"));
 const { traverseSync } = layout_1.default;
 const { parse_view_select, } = require("../base-plugin/viewtemplates/viewable_fields");
+const trigger_1 = __importDefault(require("../models/trigger"));
 /**
  * builds object trees for 'views/pages' with branches for all possible paths
- * @param entryPages if given, those will be the start nodes of the first graphs
+ * @param opts filter and entry pages options.
+ * If 'entryPages' is an array, those will be the start nodes of the first graphs
  * @returns root nodes
  */
-async function buildObjectTrees(entryPages = new Array()) {
-    const helper = new ExtractHelper();
-    const entryPageTrees = await buildTree("page", entryPages, helper);
-    const allPages = await require("../models/page").find();
-    const pageTrees = await buildTree("page", allPages, helper);
-    const allViews = await require("../models/view").find();
-    const viewTrees = await buildTree("view", allViews, helper);
-    return [...entryPageTrees, ...pageTrees, ...viewTrees];
+async function buildObjectTrees(opts) {
+    const result = new Array();
+    const helper = new ExtractHelper(opts);
+    if (opts.showPages) {
+        const entryPages = opts.entryPages ? opts.entryPages : new Array();
+        const entryPageTrees = await buildTree("page", entryPages, helper);
+        const allPages = await require("../models/page").find();
+        const pageTrees = await buildTree("page", allPages, helper);
+        result.push(...entryPageTrees, ...pageTrees);
+    }
+    if (opts.showViews) {
+        const allViews = await require("../models/view").find();
+        const viewTrees = await buildTree("view", allViews, helper);
+        result.push(...viewTrees);
+    }
+    return result;
 }
 exports.buildObjectTrees = buildObjectTrees;
 async function buildTree(type, objects, helper) {
     const result = new Array();
     for (const object of objects) {
         const node = new node_1.default(type, object.name);
-        if (!helper.cyIds.has(node.cyId)) {
+        const includeObject = type === "page"
+            ? includePage(object, helper.opts)
+            : includeView(object, helper.opts);
+        if (includeObject && !helper.cyIds.has(node.cyId)) {
             helper.cyIds.add(node.cyId);
             const connected = await object.connected_objects();
             await helper.handleNodeConnections(node, connected);
@@ -136,29 +149,46 @@ exports.extractViewToCreate = extractViewToCreate;
  * helper to keep track of added nodes ('cyIds')
  */
 class ExtractHelper {
-    constructor() {
+    constructor(opts) {
         this.cyIds = new Set();
+        this.opts = opts;
     }
     async handleNodeConnections(oldNode, connected) {
-        for (const embeddedView of connected.embeddedViews || []) {
-            if (embeddedView)
-                await this.addEmbeddedView(oldNode, embeddedView);
-        }
-        for (const linkedPage of connected.linkedPages || []) {
-            if (linkedPage)
-                await this.addLinkedPageNode(oldNode, linkedPage);
-        }
-        for (const linkedView of connected.linkedViews || []) {
-            if (linkedView)
-                await this.addLinkedViewNode(oldNode, linkedView);
-        }
-        for (const table of connected.tables || []) {
-            if (table) {
-                const tableNode = new node_1.default("table", table.name);
-                this.cyIds.add(tableNode.cyId);
-                oldNode.tables.push(tableNode);
+        if (this.opts.showViews)
+            for (const embeddedView of connected.embeddedViews || []) {
+                if (embeddedView && includeView(embeddedView, this.opts))
+                    await this.addEmbeddedView(oldNode, embeddedView);
+            }
+        if (this.opts.showPages)
+            for (const linkedPage of connected.linkedPages || []) {
+                if (linkedPage && includePage(linkedPage, this.opts))
+                    await this.addLinkedPageNode(oldNode, linkedPage);
+            }
+        if (this.opts.showViews)
+            for (const linkedView of connected.linkedViews || []) {
+                if (linkedView && includeView(linkedView, this.opts))
+                    await this.addLinkedViewNode(oldNode, linkedView);
+            }
+        if (this.opts.showTables)
+            for (const table of connected.tables || []) {
+                if (table && includeTable(table, this.opts)) {
+                    const tableNode = new node_1.default("table", table.name);
+                    this.cyIds.add(tableNode.cyId);
+                    if (this.opts.showTrigger) {
+                        const triggerNodes = new Array();
+                        for (const trigger of await trigger_1.default.getAllTableTriggers(table)) {
+                            if (trigger && includeTrigger(trigger, this.opts)) {
+                                const newNode = new node_1.default("trigger", trigger.name);
+                                this.cyIds.add(newNode.cyId);
+                                triggerNodes.push(newNode);
+                            }
+                        }
+                        if (triggerNodes.length > 0)
+                            tableNode.trigger = triggerNodes;
+                    }
+                    oldNode.tables.push(tableNode);
+                }
             }
-        }
     }
     async addLinkedViewNode(oldNode, newView) {
         const newNode = new node_1.default("view", newView.name);
@@ -188,4 +218,36 @@ class ExtractHelper {
         }
     }
 }
+const includePage = (page, opts) => {
+    if (opts.showPages)
+        return checkFilterIds(page.id, opts.pageFilterIds);
+    else
+        return false;
+};
+const includeView = (view, opts) => {
+    if (opts.showViews)
+        return checkFilterIds(view.id, opts.viewFilterIds);
+    else
+        return false;
+};
+const includeTable = (table, opts) => {
+    if (opts.showTables)
+        return checkFilterIds(table.id, opts.tableFilterIds);
+    else
+        return false;
+};
+const includeTrigger = (trigger, opts) => {
+    if (opts.showTrigger)
+        return checkFilterIds(trigger.id, opts.triggerFilterIds);
+    else
+        return false;
+};
+const checkFilterIds = (id, filterIds) => {
+    if (!filterIds)
+        return true;
+    else if (!id)
+        return false;
+    else
+        return filterIds.has(id);
+};
 //# sourceMappingURL=node_extract_utils.js.map

package/dist/diagram/node_extract_utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"node_extract_utils.js","sourceRoot":"","sources":["../../diagram/node_extract_utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"node_extract_utils.js","sourceRoot":"","sources":["../../diagram/node_extract_utils.ts"],"names":[],"mappings":"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"}

package/dist/models/expression.js

@@ -264,10 +264,10 @@ function get_expression_function(expression, fields) {
 function eval_expression(expression, row, user) {
     const field_names = Object.keys(row);
     const args = field_names.includes("user")
-        ? `{${field_names.join()}}`
-        : `{${field_names.join()}}, user`;
+        ? `row, {${field_names.join()}}`
+        : `row, {${field_names.join()}}, user`;
     const { getState } = require("../db/state");
-    return (0, vm_1.runInNewContext)(`(${args})=>(${expression})`, getState().function_context)(row, user);
+    return (0, vm_1.runInNewContext)(`(${args})=>(${expression})`, getState().function_context)(row, row, user);
 }
 /**
  * @param {string} expression