fix: Improved comparinson with None

Author: phorward

logics-js/logics.html

@@ -12,6 +12,7 @@
         let values = {
             "name": "Doe",
             "firstname": "John",
+            "demo_alter": 12,
             "person": {
                 "firstname": "Bernd",
                 "name": "Bommelunder"
@@ -31,7 +32,9 @@
             "roles": ["custom"],
         };
 
-        document.querySelector("#prompt").addEventListener(
+        let prompt = document.querySelector("#prompt");
+
+        prompt.addEventListener(
             "change",
             (e) => {
                 let calc;
@@ -55,9 +58,13 @@
                     li.style.color = "red";
                     li.appendChild(document.createTextNode(exception.toString()));
                 }
-
             }
-        )
+        );
+
+        // When prompt is already filled, execute imediatelly
+        if (prompt.value) {
+            window.setTimeout(() => prompt.dispatchEvent(new Event("change")), 125);
+        }
     </script>
 </body>
 </html>

logics-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "logics-js",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Logics is a user-friendly formula language with a subset of Python's expression syntax",
   "main": "logics.js",
   "type": "module",

logics-js/test/value.js

@@ -8,6 +8,8 @@ describe("Value", () => {
         // assert.strictEqual(none, null);
         // assert.isNull(none.toNullable());
         // assert.isFalse(none.toBoolean());
+        assert.ok(none.__cmp__(new Value(null)) == 0);
+        assert.ok(none.__cmp__(new Value(0)) < 0);
         assert.strictEqual(none.toBool(), false);
         assert.strictEqual(none.toInt(), 0);
         assert.strictEqual(none.toFloat(), 0.0);

logics-js/value.js

@@ -262,6 +262,8 @@ export default class Value {
     __cmp__(other) {
         let a, b;
 
+        // console.log(this.type(), other.type());
+
         // Dict types
         if (this.type() === "dict" || other.type() === "dict") {
             // fixme: Python cannot compare < and > on dict, only ==. Change this here, too?
@@ -323,6 +325,9 @@ export default class Value {
         } else if (this.type() === "float" || other.type() === "float") {
             a = this.toFloat();
             b = other.toFloat();
+        } else if (this.type() === "NoneType" || other.type() === "NoneType") {
+            a = this.type() === "NoneType" ? -1 : 0;
+            b = other.type() === "NoneType" ? -1 : 0;
         } else {
             a = this.toInt();
             b = other.toInt();

logics-py/logics/value.py

@@ -250,6 +250,11 @@ def __compare(self, op, other):
         value = self.value
         other = Value(other).value
 
+        if value is None:
+            value = -1
+        if other is None:
+            other = -1
+
         try:
             match op:
                 case "lt":

logics-py/logics/version.py

@@ -1 +1 @@
-__version__ = "0.4.0"
+__version__ = "0.4.1"

logics-py/tests/test_value.py

@@ -12,6 +12,7 @@ def test_conversion():
 def test_none():
     none = Value(None)
     assert none == None
+    assert none != 0
     assert bool(none) == False
     assert int(none) == 0
     assert float(none) == 0.0

tests/none.lgx

@@ -0,0 +1,7 @@
+#SET:none:None
+none == None
+#EXPECT:True
+none == 0
+#EXPECT:False
+none < 0
+#EXPECT:True