@ejfdelgado/ejflab-common 1.8.3 → 1.8.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ejfdelgado/ejflab-common",
   "type": "commonjs",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "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;
@@ -318,6 +320,10 @@ class FlowChartExec {
                 }
                 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);

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
+};