@ejfdelgado/ejflab-common 1.8.3 → 1.8.5

package/package.json

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

package/src/MyTemplate.js

@@ -209,7 +209,7 @@ class MyTemplate extends CsvWithFilters {
         } while (iteration.times > 0);
 
         // Replace values
-        return this.replaceBareValues(template, data, "\\{", "\\}", "}", false, skipUndefined);
+        return this.replaceBareValues(template, data, undefined, undefined, undefined, false, skipUndefined);
     }
     replaceBareValues(template, data, open = "\\{", close = "\\}", closeNoScape = "}", useStringify = false, skipUndefined = false) {
         const myPattern = new RegExp("\\$\\s*" + open + "([^" + closeNoScape + "]+)\\s*" + close, "g");

package/src/flowchart/FlowChartExec.js

@@ -28,6 +28,7 @@ const { CommandMongo } = require('./steps/CommandMongo');
 const { CommandMinio } = require('./steps/CommandMinio');
 const { CommandPostgres } = require('./steps/CommandPostgres.js');
 const { StepMultiple } = require('./steps/StepMultiple.js');
+const { StepMultipleDone } = require('./steps/StepMultipleDone.js');
 
 class FlowChartExec {
     executionPromise = null;
@@ -61,6 +62,7 @@ class FlowChartExec {
         this.registry["process"] = StepProcess;
         this.registry["require"] = StepCheckProcessor;
         this.registry["multiple"] = StepMultiple;
+        this.registry["multipleDone"] = StepMultipleDone;
 
         // Nodes
         this.registry["inc"] = CommandInc;
@@ -276,12 +278,13 @@ class FlowChartExec {
         return this.loadFlowChartInternal(paths, true);
     }
 
-    complementFlowChart(paths, indexPath) {
-        console.log("complementFlowChart...");
-        return this.loadFlowChartInternal(paths, false, indexPath);
+    complementFlowChart(paths, indexPath, parentNode) {
+        //console.log(`complementFlowChart indexPath=${indexPath}`);
+        return this.loadFlowChartInternal(paths, false, indexPath, parentNode);
     }
 
-    loadFlowChartInternal(paths, initialize, indexPath) {
+    loadFlowChartInternal(paths, initialize, indexPath, parentNode = {}) {
+        //console.log(`loadFlowChartInternal indexPath=${indexPath}`);
         if (initialize) {
             this.flowchart = {
                 shapes: [],
@@ -314,10 +317,19 @@ class FlowChartExec {
                 // Write metadata of node
                 const placeMetadata = (node) => {
                     node.indexPath = indexPath;
+                    // Read the parent meta
+                    if (parentNode.meta) {
+                        SimpleObj.recreate(node, "meta", JSON.parse(JSON.stringify(parentNode.meta)));
+                    }
                     SimpleObj.recreate(node, `meta.${indexPath}`, index);
+                    //console.log(node.prefix + ":" + JSON.stringify(node.meta));
                 }
                 localFlowChart.shapes.forEach(placeMetadata);
                 localFlowChart.arrows.forEach(placeMetadata);
+                const startingPoints = this.getNodesWithText("start", undefined, localFlowChart);
+                if (this.actualNodes instanceof Array && startingPoints instanceof Array) {
+                    this.actualNodes.push(...startingPoints);
+                }
             }
             this.flowchart.shapes.push(...localFlowChart.shapes);
             this.flowchart.arrows.push(...localFlowChart.arrows);
@@ -385,7 +397,9 @@ class FlowChartExec {
                 if (node.meta) {
                     // Render skiping meta
                     const skipUndefined = true;
+                    //console.log(`${rendered} ${JSON.stringify(node.meta)}`);
                     rendered = this.renderer.render(rendered, node.meta, skipUndefined);
+                    //console.log(`${rendered}`);
                 }
                 rendered = this.renderer.render(rendered, this.data);
                 let value;
@@ -412,7 +426,7 @@ class FlowChartExec {
             let instance = this.createInstance(commandName, id, txt, args);
             index++;
             const response1 = `${commandName}${JSON.stringify(args)}`;
-            const { canContinue, abort } = await instance.executeAsNode(args, argsTxt);
+            const { canContinue, abort } = await instance.executeAsNode(args, argsTxt, node);
             if (abort) {
                 // Panic and halt all
                 this.mustEnd = true;
@@ -449,7 +463,7 @@ class FlowChartExec {
             }
             index++;
             const response1 = `${commandName}${JSON.stringify(args)}`;
-            const { canContinue, abort } = await instance.executeAsArrow(args, argsTxt);
+            const { canContinue, abort } = await instance.executeAsArrow(args, argsTxt, node);
             if (abort) {
                 // Panic and halt all
                 this.mustEnd = true;

package/src/flowchart/steps/StepBasic.js

@@ -66,7 +66,8 @@ class StepBasic {
             SimpleObj.recreate(this.context.data, `performance.${id}.time`, val.time);
         }
     }
-    async executeAsNode(args, argsTxtIndividual) {
+    async executeAsNode(args, argsTxtIndividual, node) {
+        this.node = node;
         this.argsTxtIndividual = argsTxtIndividual;
         const answer = {
             canContinue: false,
@@ -100,7 +101,8 @@ class StepBasic {
             return answer;
         }
     }
-    async executeAsArrow(args, argsTxtIndividual) {
+    async executeAsArrow(args, argsTxtIndividual, node) {
+        this.node = node;
         this.argsTxtIndividual = argsTxtIndividual;
         const answer = {
             canContinue: false,

package/src/flowchart/steps/StepMultiple.js

@@ -38,13 +38,15 @@ class StepMultiple extends StepBasic {
         }
         if (routeMultiple) {
             const extraConfiguration = {};
-
+            let prefixName = `${flowChartTemplateName}_`;
+            if (typeof this.node.prefix == "string") {
+                prefixName = this.node.prefix + "_" + prefixName;
+            }
             for (let i = 0; i < this.list.length; i++) {
-                extraConfiguration[`${flowChartTemplateName}_${i}`] = routeMultiple;
+                extraConfiguration[prefixName + i] = routeMultiple;
             }
             this.completePaths(extraConfiguration, WORKSPACE);
-
-            roomData.model.flowchart = this.context.complementFlowChart(extraConfiguration, indexPath);
+            roomData.model.flowchart = this.context.complementFlowChart(extraConfiguration, indexPath, this.node);
             let changes = roomData.builder.trackDifferences(roomData.model, [], null, ["flowchart"]);
             roomData.model = roomData.builder.affect(changes);
             superContext.emitToRoom(room, "flowChartModified");

package/src/flowchart/steps/StepMultipleDone.js

@@ -0,0 +1,30 @@
+const { StepBasic } = require("./StepBasic");
+const { SimpleObj } = require("../../SimpleObj");
+
+class StepMultipleDone extends StepBasic {
+    list = [];
+    constructor(context, id, commandName, argsTxt) {
+        super(context, id, commandName, argsTxt);
+        super.alwaysEvaluateCanContinue = true;
+    }
+    async execFirst() { }
+
+    async canContinue() {
+        this.list = SimpleObj.getValue(this.context.data, this.args[0], []);
+        if (!(this.list instanceof Array)) {
+            console.log(`In StepMultipleDone, warning ${this.args[0]} is not a list!`);
+            return true;
+        }
+        for (let i = 0; i < this.list.length; i++) {
+            const element = this.list[i];
+            if (element.done !== true) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
+module.exports = {
+    StepMultipleDone
+};