@ejfdelgado/ejflab-common 1.10.1 → 1.10.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ejfdelgado/ejflab-common",
   "type": "commonjs",
-  "version": "1.10.1",
+  "version": "1.10.4",
   "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/steps/CommandTimeline.js

@@ -7,11 +7,14 @@ class CommandTimeline extends CommandBasic {
         const start = parseFloat(this.args[1]);
         const end = parseFloat(this.args[2]);
         const period = parseFloat(this.args[3]);
+        const n = parseFloat(this.args[4]);
         const timeline = {
             start,
             end,
             period,
+            n
         };
+        //console.log(`Timeline ${JSON.stringify(timeline)}`);
         this.context.registerTimeline(timeLineId, timeline);
     }
 }

package/src/flowchart/steps/CommandTimelineNext.js

@@ -10,12 +10,24 @@ class CommandTimelineNext extends CommandBasic {
         }
         if ([null, undefined].indexOf(timeline.t) >= 0) {
             timeline.t = timeline.start;
-        } else {
-            timeline.t = timeline.t + timeline.period;
-            if (timeline.t > timeline.end) {
-                timeline.t = timeline.end;
+        }
+        // Always start from the period and expect to read backwards
+        timeline.t = timeline.t + timeline.period;
+        if (timeline.t > timeline.end) {
+            timeline.t = timeline.end;
+        }
+
+        // Check if should create N array
+        if (typeof timeline.n == "number" && timeline.n > 0) {
+            const dperiod = timeline.period / timeline.n;
+            const list = new Array(timeline.n);
+            for (let i=0; i<list.length; i++) {
+                list[i] = {done: false};
             }
+            timeline.dperiod = dperiod;
+            timeline.list = list;
         }
+
         // Compute advance percentage
         const percentage = (timeline.t - timeline.start) / (timeline.end - timeline.start);
         SimpleObj.recreate(this.context.data, `scope.progressEach.${timeLineId}`, Math.ceil(percentage * 100));

package/src/flowchart/steps/StepProcess.js

@@ -82,23 +82,26 @@ class StepProcess extends StepBasic {
         for (let i = 1; i < this.args.length; i++) {
             const sourcePair = this.args[i];
             const partsSource = /^(in|out):(b\.([^.]+)\.([^.]+)|d\.(.+))$/i.exec(sourcePair);
-            if (partsSource == null) {
-                console.log(`${sourcePair} doesn't match ^(in|out)\.(b\.([^.]+)\.([^.]+)|d\.(.+))$`);
-                return false;
-            }
-            if (partsSource[1] == "in") {
-                // It's an input
-                const buffer = this.readInputFrom(!partsSource[5], partsSource[3], partsSource[4], partsSource[5]);
-                if (buffer === undefined) {
-                    return false;
+            if (partsSource !== null) {
+                if (partsSource[1] == "in") {
+                    // It's an input
+                    const buffer = this.readInputFrom(!partsSource[5], partsSource[3], partsSource[4], partsSource[5]);
+                    if (buffer === undefined) {
+                        return false;
+                    }
+                    inputs.push(buffer);
+                } else {
+                    // Its an output
+                    outputs.push(partsSource[2]);
                 }
-                inputs.push(buffer);
             } else {
-                // Its an output
-                outputs.push(partsSource[2]);
+                // Place the raw input
+                inputs.push(sourcePair);
             }
         }
 
+        const currentIndex = inputs[0];
+        const useIndexedN = (typeof currentIndex == "number");
         const namedInputs = {};
         if (!!inputConnectionsConf) {
             for (let i = 0; i < inputConnectionsConf.length; i++) {
@@ -107,7 +110,12 @@ class StepProcess extends StepBasic {
                 if (buffer === undefined) {
                     return false;
                 }
-                namedInputs[key] = buffer;
+                if (useIndexedN && buffer instanceof Array) {
+                    // Connect the indexed part of the array, even if it is undefined
+                    namedInputs[key] = buffer[currentIndex];
+                } else {
+                    namedInputs[key] = buffer;
+                }
             }
         }