@ejfdelgado/ejflab-common 1.10.3 → 1.10.5

package/package.json

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

package/src/MyTemplate.js

@@ -213,6 +213,18 @@ class MyTemplate extends CsvWithFilters {
     }
     replaceBareValues(template, data, open = "\\{", close = "\\}", closeNoScape = "}", useStringify = false, skipUndefined = false) {
         const myPattern = new RegExp("\\$\\s*" + open + "([^" + closeNoScape + "]+)\\s*" + close, "g");
+        // Segond level replace
+        const myPattern2d = new RegExp("(\\$\\s*" + open + "[^$" + closeNoScape + "]+)\\$" + open + "([^" + closeNoScape + "]+)" + close + "([^" + closeNoScape + "]*" + close + ")", "g");
+        template = template.replace(myPattern2d, (match, g1, g2, g3) => {
+            const response = this.getColumnDescription(g2)[0];
+            const valor = SimpleObj.getValue(data, response.id);
+            const temp = this.filterValue(valor, response, undefined, response.id);
+            if (temp === undefined) {
+                return match;
+            } else {
+                return g1 + temp + g3;
+            }
+        });
         template = template.replace(myPattern, (match, g1) => {
             const response = this.getColumnDescription(g1)[0];
             const valor = SimpleObj.getValue(data, response.id);

package/src/MyTemplate.test.js

@@ -76,6 +76,18 @@ function myTest() {
             exp: "my name is undefined Delgado and I like undefined undefined",
             skipUndefined: false,
         },
+        {
+            txt: "My ${index} lastname is ${lastname.${index}}",
+            data: { lastname: ["delgado", "leyton"], index: 0 },
+            exp: "My 0 lastname is delgado",
+            skipUndefined: false,
+        },
+        {
+            txt: "My ${index} lastname is ${lastname.${index}.detail}",
+            data: { lastname: [{ detail: "delgado" }, { detail: "leyton" }], index: 0 },
+            exp: "My 0 lastname is delgado",
+            skipUndefined: false,
+        },
     ];
 
     renderer.registerFunction("json", CsvFormatterFilters.json);

package/src/flowchart/FlowChartExec.js

@@ -283,6 +283,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 +338,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 +360,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) {