@ejfdelgado/ejflab-common 1.16.0 → 1.16.2

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@ejfdelgado/ejflab-common",
   "type": "commonjs",
-  "version": "1.16.0",
+  "version": "1.16.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-common.git"
   },
   "description": "",
   "scripts": {
+    "bip": "ffplay /sound/finish.mp3 -nodisp -nostats -hide_banner -autoexit",
     "mylogin": "npm login",
-    "mypublish": "npm publish --access=public",
+    "mypublish": "npm publish --access=public && npm run bip",
     "clean": "rm -rf node_modules && npm cache clean --force && rm package-lock.json && npm install"
   },
   "engines": {

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.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" });

package/src/MyThrottle.js

@@ -13,6 +13,8 @@ function debounce(fn, delay) {
 }
 
 /*
+IMPORTANT, the throttled function MUST be an async function, otherwise it will not work!
+
 const GAP_ms = 500;
 Si quieres tener en cuenta solo la primera invocación e ignorar las repetidas invocaciones con intervalos de menos de gap:
 new MyThrottle(GAP_ms, true);
@@ -29,7 +31,7 @@ class MyThrottle {
         this.isIgnoring = false;
     }
 
-    throttle(promisedFunction) {
+    throttle(promisedFunction, args = []) {
         const afterGap = () => {
             if (this.useFirst) {
                 if (calledTime == this.lastCalledTime) {
@@ -59,7 +61,7 @@ class MyThrottle {
             // Use first
             this.isCalling = true;
             this.isIgnoring = true;
-            promisedFunction().finally(afterCall);
+            promisedFunction(...args).finally(afterCall);
             setTimeout(afterGap, this.timeGap);
         } else {
             // Use last
@@ -67,7 +69,7 @@ class MyThrottle {
                 if (calledTime == this.lastCalledTime) {
                     // Call!
                     this.isCalling = true;
-                    promisedFunction().finally(afterCall);
+                    promisedFunction(...args).finally(afterCall);
                 } else {
                     console.log("Ignoring...");
                 }