node-red-contrib-boolean-logic-ultimate 1.1.23 → 1.1.25

package/CHANGELOG.md

@@ -4,7 +4,22 @@
 # CHANGELOG
 
 <p>
-<b>Version 1.1.23</b> November 2024<br/>
+<b>Version 1.1.25</b> January 2025<br/>
+- BREAKING CHANGE
+- BREAKING CHANGE
+- BREAKING CHANGE
+- Numerical values are now evaluated as string values and translated like any other word in translation table. That means, 1 and numbers major than 1 are not equal to true anymore, and 0 is not equal to false anymore. If you inputs numerical values as boolean (bad attitude), please fix your flows by change it to boolean.</br>
+- BREAKING CHANGE
+- BREAKING CHANGE
+- BREAKING CHANGE
+
+</p>
+<p>
+<b>Version 1.1.24</b> January 2025<br/>
+- Translator node. added js evaluation of the values. For example "{{value>=50}}:true".</br>
+</p>
+<p>
+<b>Version 1.1.23</b> December 2024<br/>
 - Math node. fixed multiply by zero issue.</br>
 </p>
 <p>

package/README.md

@@ -20,11 +20,22 @@ A set of Node-RED enhanced boolean logic and utility nodes, with persistent valu
 <br/>
 <br/>
 
-### HOME ASSISTANT COMPATIBLES INPUT VALUES
+# TRANSLATOR NODE
 
 Other than true/false, all nodes accepts [Homeassistant](https://www.home-assistant.io) output strings.  
 
 You can **even add your own input translation word list**, thanks to the translator-config node.
+The translator node can translate an input payload, to a true/false boolean values.<br />
+Each row in the text box, represents a translation command. <br/>
+There are some default translation's rows, to make the *boolean-logic-ultimate* nodes compatible with Homeassistant as default. <br/>
+You can add your own translation row.<br/>
+
+|           | Description                                                                                          |
+| --------- | ---------------------------------------------------------------------------------------------------- |
+| Translate | Add, delete or edit your own translation command. The row's translation command must be **input string:true(or false)**. For example: <code>open:true</code> <code>closed:false</code>. You can also use an expressions to be evaluated, like this <code>{{value>=50}}:true</code> and <code>{{value<50}}:false</code>. In this case, the tranlsator will evaluate (javascript eval) the expression and, if true, returns the choosen value. |
+
+![alt text](image.png)
+
 
 <br/>
 <br/>

package/boolean-logic-ultimate/translator-config.html

@@ -54,7 +54,7 @@ You can add your own translation row.<br/>
 
 |Property|Description|
 |--|--|
-| Translate | Add, delete or edit your own translation command. The row's translation command must be **input string:true(or false)**. For example: <code>open:true</code> <code>closed:false</code> |
+| Translate | Add, delete or edit your own translation command. The row's translation command must be **input string:true(or false)**. For example: <code>open:true</code> <code>closed:false</code>. You can also use an expressions to be evaluated, like this <code>{{value>=50}}:true</code> and <code>{{value<50}}:false</code>. In this case, the tranlsator will evaluate (javascript eval) the expression and, if true, returns the choosen value.  |
 
 <br/>
 

package/boolean-logic-ultimate/utils.js

@@ -4,20 +4,30 @@ module.exports.ToBoolean = function ToBoolean(value, _configTranslationNode) {
 
   if (typeof value === "boolean") {
     return value;
-  } else if (typeof value === "string") {
+  } else if (typeof value === "string" || typeof value === "number") {
+    if (typeof value === "number") value = value.toString(); // We work with strings
     try {
       let translationTable = [];
+      value = value.toLowerCase();
       if (_configTranslationNode === null) {
         translationTable = DEFAULTTRANSLATIONINPUT.split("\n");
       } else {
         translationTable = _configTranslationNode.commandText.split("\n");
       }
       for (let index = 0; index < translationTable.length; index++) {
-        let inputPayloadToBeTranslated = translationTable[index].split(":")[0];
-        //let outputBoolean = Boolean(translationTable[index].split(":")[1]);
-        if (
-          value.toLowerCase() === inputPayloadToBeTranslated.toLowerCase() &&
-          inputPayloadToBeTranslated.toLowerCase() !== ""
+        // HA Style evaluation in the format "{{value>=0}}"
+        let inputPayloadToBeTranslated = translationTable[index].toLowerCase().split(":")[0];
+        if (inputPayloadToBeTranslated.indexOf("{{") > -1 && inputPayloadToBeTranslated.indexOf("}}") > -1) {
+          // Eval content of the brackets {{value<=0}}, HA style
+          inputPayloadToBeTranslated = inputPayloadToBeTranslated.replace("{{", "").replace("}}", "").replace("value", value); // Set the word value to real value
+          if (eval(inputPayloadToBeTranslated)) {
+            return translationTable[index].split(":")[1] === "true"
+              ? true
+              : false;
+          } // Eval the operation
+        } else if (
+          // Normal string value
+          value === inputPayloadToBeTranslated
         ) {
           return translationTable[index].split(":")[1] === "true"
             ? true
@@ -27,15 +37,16 @@ module.exports.ToBoolean = function ToBoolean(value, _configTranslationNode) {
     } catch (error) {
       console.log("Boolean-Logic-Ultimate:utils:toBoolean: " + error.message);
     }
-  } else if (typeof value === "number") {
-    // Is it formated as a decimal number?
-    if (decimal.test(value)) {
-      res = parseFloat(value) != 0;
-    } else {
-      res = value.toLowerCase() === "true";
-    }
-    return res;
   }
+  // else if (typeof value === "number") {
+  //   // Is it formated as a decimal number?
+  //   if (decimal.test(value)) {
+  //     res = parseFloat(value) != 0;
+  //   } else {
+  //     res = value.toLowerCase() === "true";
+  //   }
+  //   return res;
+  // }
 };
 
 module.exports.ToAny = function ToAny(value, _configTranslationNode) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-boolean-logic-ultimate",
-    "version": "1.1.23",
+    "version": "1.1.25",
     "description": "A set of Node-RED enhanced boolean logic and utility nodes, flow interruption, blinker, invert, filter, toggle etc.., with persistent values after reboot. Compatible also with Homeassistant values.",
     "author": "Supergiovane (https://github.com/Supergiovane)",
     "dependencies": {