@ejfdelgado/ejflab-common 1.15.0 → 1.16.1

package/package.json

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

package/src/MyDates.js

@@ -449,11 +449,14 @@ class MyDates {
         return hDisplay + mDisplay + sDisplay;
     }
 
-    static age(dateMillis) {
+    static age(dateMillis, currentMillis = null) {
+        if (!(typeof currentMillis == "number")) {
+            currentMillis = new Date().getTime();
+        }
         if (typeof dateMillis == 'number' && !isNaN(dateMillis)) {
             const dateOfBirth = new Date(dateMillis);
             const dayOfBirth = dateOfBirth.getDate();
-            const millisDifference = new Date().getTime() - dateOfBirth.getTime();
+            const millisDifference = currentMillis - dateOfBirth.getTime();
             const date = new Date(millisDifference);
             const years = date.getFullYear() - 1970;
             const months = date.getMonth();

package/src/MyTemplate.js

@@ -12,6 +12,15 @@ const pIfFin = "\\$\\s*\\[\\s*endif\\s*\\]";
 const pElse = "\\$\\s*\\[\\s*else\\s*\\]";
 
 class MyTemplate extends CsvWithFilters {
+    static localGetValue(data, key) {
+        // The key could be a JSON
+        let trimed = key.trim();
+        if (trimed.startsWith('"')) {
+            // treated as json string
+            return JSON.parse(key);
+        }
+        return SimpleObj.getValue(data, key);
+    }
     static interpolate(text, model) {
         const renderer = new MyTemplate();
         return renderer.render(text, model);
@@ -217,7 +226,7 @@ class MyTemplate extends CsvWithFilters {
         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 valor = MyTemplate.localGetValue(data, response.id);
             const temp = this.filterValue(valor, response, undefined, response.id);
             if (temp === undefined) {
                 return match;
@@ -227,7 +236,7 @@ class MyTemplate extends CsvWithFilters {
         });
         template = template.replace(myPattern, (match, g1) => {
             const response = this.getColumnDescription(g1)[0];
-            const valor = SimpleObj.getValue(data, response.id);
+            const valor = MyTemplate.localGetValue(data, response.id);
             if (!useStringify) {
                 const temp = this.filterValue(valor, response, undefined, response.id);
                 if (!skipUndefined) {

package/src/MyTemplate.test.js

@@ -94,6 +94,45 @@ function myTest() {
             exp: "My nada",
             skipUndefined: false,
         },
+        {
+            txt: ' $[for el1 in ${abuelo}] $[for el2 in ${el1.padre}] $[for el3 in ${el2.hijo}] ${el3.name} $[endfor] $[endfor] $[endfor] ',
+            data: {
+                abuelo: [
+                    {
+                        padre: [
+                            {
+                                hijo: [
+                                    {name: "Hugo"}
+                                ]
+                            },
+                            {
+                                hijo: [
+                                    {name: "Paco"}
+                                ]
+                            },
+                            {
+                                hijo: [
+                                    {name: "Luis"}
+                                ]
+                            },
+                        ]
+                    }
+                ]
+            },
+            exp: "    Hugo    Paco    Luis    ",
+            skipUndefined: false,
+        },
+        {
+            txt: "$[if ${choice_id} == null]NULL$[else]'${choice_id}'::uuid$[endif],",
+            data: {
+                choice_id: '3764d5b2-75ec-44fd-89e0-9414f12d5b60',
+                assessment_answered_id: '51b62095-b14b-42b2-931e-c8872ab72b6a',
+                question_id: 'a48dd6db-0243-4faf-bbbd-dd808e253025',
+                date_of_response: 1741050236700
+              },
+            exp: "'3764d5b2-75ec-44fd-89e0-9414f12d5b60'::uuid,",
+            skipUndefined: false,
+        },
     ];
 
     renderer.registerFunction("json", CsvFormatterFilters.json);
@@ -111,7 +150,7 @@ function myTest() {
         const actual = renderer.render(myCase.txt, myCase.data, myCase.skipUndefined === true);
         //console.log(actual);
         if (actual !== myCase.exp) {
-            throw Error(`expected:\n${myCase.exp}\nactual:\n${actual}`);
+            throw Error(`expected:\n${JSON.stringify(myCase.exp)}\nactual:\n${JSON.stringify(actual)}`);
         } else {
             console.log(`case ${i + 1} OK!`);
         }

package/src/MyTensorflow.test.js

@@ -2,7 +2,7 @@ const { MyTensorflow } = require("./MyTensorflow");
 const tf = require('@tensorflow/tfjs');
 const fs = require('fs');
 
-const test = () => {
+const test = async () => {
 
     const csvText = fs.readFileSync("./data/tensordata.csv", { encoding: "utf8" });
     const csvTestText = fs.readFileSync("./data/tensordata.test.csv", { encoding: "utf8" });