@ejfdelgado/ejflab-common 1.14.3 → 1.15.0

package/package.json

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

package/src/CsvWithFilters.js

@@ -1,6 +1,6 @@
 
 class CsvWithFilters {
-    static PATTERN_FILTER = "\\s*([^|\\s]+)(\\s*\\|\\s*([^:\\s]+)\\s*(\\s*:\\s*([^:\\s]+)*)?)?";
+    static PATTERN_FILTER = "\\s*([^|\\s]+)(\\s*\\|\\s*([^:\\s]+)\\s*(:(.*))?)?";
     constructor() {
         this.filterRegistry = {
             classes: {
@@ -87,16 +87,11 @@ class CsvWithFilters {
                         }
                         const argumentos = [];
                         if (subpartes[5]) {
-                            argumentos.push(JSON.parse(subpartes[5]));
-                            let siguiente = null;
-                            siguiente = patron2.exec(completo);
-                            if (siguiente !== null) {
-                                siguiente[0].split(":").map((siguienteFixed) => {
-                                    if (siguienteFixed.trim().length > 0) {
-                                        argumentos.push(JSON.parse(siguienteFixed));
-                                    }
-
-                                });
+                            const allArguments = subpartes[5].split(":");
+                            for (let k = 0; k < allArguments.length; k++) {
+                                try {
+                                    argumentos.push(JSON.parse(allArguments[k]));
+                                } catch (err) { }
                             }
                         }
                         desc.argumentos = argumentos;

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.test.js

@@ -88,6 +88,12 @@ function myTest() {
             exp: "My 0 lastname is delgado",
             skipUndefined: false,
         },
+        {
+            txt: 'My ${ now | epoch2date : "mmm d yyyy" : "otro"}',
+            data: { now: new Date().getTime(), index: 0 },
+            exp: "My nada",
+            skipUndefined: false,
+        },
     ];
 
     renderer.registerFunction("json", CsvFormatterFilters.json);
@@ -96,6 +102,9 @@ function myTest() {
         return val + "-" + args.join("-");
     });
     renderer.registerFunction("rand", CsvFormatterFilters.rand);
+    renderer.registerFunction("epoch2date", (value, ...args) => {
+        return "nada";
+    });
 
     for (let i = 0; i < cases.length; i++) {
         const myCase = cases[i];