@ejfdelgado/ejflab-common 1.10.3 → 1.10.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ejfdelgado/ejflab-common",
   "type": "commonjs",
-  "version": "1.10.3",
+  "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);