@ejfdelgado/ejflab-common 1.14.4 → 1.16.0

package/package.json

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

package/src/MyDates.js

@@ -448,6 +448,28 @@ class MyDates {
         var sDisplay = s > 0 ? s + (s == 1 ? " second" : " seconds") : "";
         return hDisplay + mDisplay + sDisplay;
     }
+
+    static age(dateMillis) {
+        if (typeof dateMillis == 'number' && !isNaN(dateMillis)) {
+            const dateOfBirth = new Date(dateMillis);
+            const dayOfBirth = dateOfBirth.getDate();
+            const millisDifference = new Date().getTime() - dateOfBirth.getTime();
+            const date = new Date(millisDifference);
+            const years = date.getFullYear() - 1970;
+            const months = date.getMonth();
+            let days = date.getDate();
+            if (days > dayOfBirth) {
+                days = date.getDate() - dayOfBirth;
+            }
+            const model = {
+                years,
+                months,
+                days
+            };
+            return model;
+        }
+        return null;
+    }
 }
 
 module.exports = {

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) {