@ejfdelgado/ejflab-common 1.10.4 → 1.10.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ejfdelgado/ejflab-common",
   "type": "commonjs",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-common.git"

package/src/flowchart/FlowChartExec.js

@@ -13,6 +13,8 @@ const { StepCheckSrc } = require("./steps/StepCheckSrc");
 
 const { CommandInc } = require("./steps/CommandInc");
 const { CommandSet } = require("./steps/CommandSet");
+const { CommandTic } = require("./steps/CommandTic");
+const { CommandToc } = require("./steps/CommandToc");
 const { StepReadSrc } = require('./steps/StepReadSrc');
 const { StepTimeLineEnds } = require('./steps/StepTimeLineEnds');
 const { StepTimeLineHasMore } = require('./steps/StepTimeLineHasMore');
@@ -67,6 +69,8 @@ class FlowChartExec {
         // Nodes
         this.registry["inc"] = CommandInc;
         this.registry["set"] = CommandSet;
+        this.registry["tic"] = CommandTic;
+        this.registry["toc"] = CommandToc;
         this.registry["timeline"] = CommandTimeline;
         this.registry["timelineNext"] = CommandTimelineNext;
         this.registry["milvus"] = CommandMilvus;
@@ -283,6 +287,26 @@ class FlowChartExec {
         return response;
     }
 
+    removeIndexPathNodes(prefix) {
+        let count = 0;
+        const noPrefix = (node) => {
+            // Erase node ids...
+            delete this.nodesById[node.id];
+            let pased = node.prefix != prefix;
+            if (!pased) {
+                count++;
+            }
+            return pased;
+        };
+        this.flowchart.shapes = this.flowchart.shapes.filter(noPrefix);
+        this.flowchart.arrows = this.flowchart.arrows.filter(noPrefix);
+        console.log(`Removed ${count} nodes from flowchart with prefix ${prefix}`);
+        const foudPrefix = this.flowchart.prefixes.indexOf(prefix);
+        if (foudPrefix >= 0) {
+            this.flowchart.prefixes.splice(foudPrefix, 1);
+        }
+    }
+
     loadFlowChart(paths) {
         return this.loadFlowChartInternal(paths, true);
     }
@@ -318,6 +342,9 @@ class FlowChartExec {
             const xmlFlowText = fs.readFileSync(path, 'utf8');
             const parser = new XMLParser(options);
             const xmlFlow = parser.parse(xmlFlowText);
+            // Previous clear old prefix
+            this.removeIndexPathNodes(prefix);
+            // Loads new nodes for prefix
             const localFlowChart = this.processFlowChart(xmlFlow, prefix);
             this.interpretColor(localFlowChart.shapes);
             // 
@@ -337,11 +364,15 @@ class FlowChartExec {
                 localFlowChart.arrows.forEach(placeMetadata);
                 const startingPoints = this.getNodesWithText("start", undefined, localFlowChart);
                 if (this.actualNodes instanceof Array && startingPoints instanceof Array) {
+                    console.log(`Adding NEW #${startingPoints.length} starting points to flowchart`);
                     this.actualNodes.push(...startingPoints);
                 }
             }
             this.flowchart.shapes.push(...localFlowChart.shapes);
+            console.log(`Added ${localFlowChart.shapes.length} shapes with prefix ${prefix}`);
             this.flowchart.arrows.push(...localFlowChart.arrows);
+            console.log(`Added ${localFlowChart.arrows.length} arrows with prefix ${prefix}`);
+            console.log(`Added ${localFlowChart.arrows.length + localFlowChart.shapes.length} nodes with prefix ${prefix}`);
             this.flowchart.prefixes.push(prefix);
             if (check.flux) {
                 for (let key in check.flux) {

package/src/flowchart/steps/CommandSet.js

@@ -1,4 +1,3 @@
-const { SimpleObj } = require("../../SimpleObj");
 const { CommandBasic } = require("./CommandBasic");
 
 class CommandSet extends CommandBasic {

package/src/flowchart/steps/CommandTic.js

@@ -0,0 +1,13 @@
+const { CommandBasic } = require("./CommandBasic");
+
+class CommandTic extends CommandBasic {
+    async computation() {
+        const path = this.args[0];
+        const val = new Date().getTime();
+        this.writeArgument(`${path}.tic`, val);
+    }
+}
+
+module.exports = {
+    CommandTic
+};

package/src/flowchart/steps/CommandToc.js

@@ -0,0 +1,17 @@
+const { CommandBasic } = require("./CommandBasic");
+
+class CommandToc extends CommandBasic {
+    async computation() {
+        const path = this.args[0];
+        const val = new Date().getTime();
+        const tic = this.resolveArgument(`${path}.tic`);
+        this.writeArgument(`${path}.toc`, val);
+        if (typeof tic == "number") {
+            this.writeArgument(`${path}.gap`, val - tic);
+        }
+    }
+}
+
+module.exports = {
+    CommandToc
+};