Merge pull request #32 from TotalTechGeek/bugfix/resolve-issue-31

Resolve an issue with the unary operators.
TotalTechGeek · May 23, 2024 · afdeb79 · afdeb79
2 parents 4fcbe2e + 262ab5b
commit afdeb79
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 49 deletions.
diff --git a/bench/compatible.json b/bench/compatible.json
@@ -375,6 +375,15 @@
         {},
         false
     ],
+    [
+        {
+            "!": [
+                false
+            ]
+        },
+        {},
+        true
+    ],
     [
         {
             "!": false
@@ -1455,6 +1464,24 @@
         null,
         "apple"
     ],
+    [
+        {
+            "!": [
+                0
+            ]
+        },
+        {},
+        true
+    ],
+    [
+        {
+            "!!": [
+                0
+            ]
+        },
+        {},
+        false
+    ],
     [
         {
             "and": [
@@ -1475,6 +1502,24 @@
         {},
         true
     ],
+    [
+        {
+            "!": [
+                ""
+            ]
+        },
+        {},
+        true
+    ],
+    [
+        {
+            "!!": [
+                ""
+            ]
+        },
+        {},
+        false
+    ],
     [
         {
             "and": [
@@ -3503,5 +3548,21 @@
             "items": []
         },
         false
+    ],
+    [
+        {
+            "!": [
+                false
+            ]
+        },
+        {},
+        true
+    ],
+    [
+        {
+            "!!": false
+        },
+        {},
+        false
     ]
 ]
diff --git a/bench/incompatible.json b/bench/incompatible.json
@@ -1,13 +1,4 @@
 [
-    [
-        {
-            "!": [
-                false
-            ]
-        },
-        {},
-        true
-    ],
     [
         {
             "if": []
@@ -91,42 +82,6 @@
         {},
         true
     ],
-    [
-        {
-            "!": [
-                0
-            ]
-        },
-        {},
-        true
-    ],
-    [
-        {
-            "!!": [
-                0
-            ]
-        },
-        {},
-        false
-    ],
-    [
-        {
-            "!": [
-                ""
-            ]
-        },
-        {},
-        true
-    ],
-    [
-        {
-            "!!": [
-                ""
-            ]
-        },
-        {},
-        false
-    ],
     [
         {
             "if": [

diff --git a/bench/tests.json b/bench/tests.json
@@ -4033,5 +4033,15 @@
       },
       false
     ],
+    [
+      { "!": [false] },
+      {},
+      true
+    ],
+    [
+      { "!!": false },
+      {},
+      false
+    ],
     "EOF"
   ]
diff --git a/defaultMethods.js b/defaultMethods.js
@@ -365,9 +365,9 @@ const defaultMethods = {
     },
     traverse: false
   },
-  not: (value) => !value,
-  '!': (value) => !value,
-  '!!': (value) => Boolean(value),
+  not: (value) => Array.isArray(value) ? !value[0] : !value,
+  '!': (value) => Array.isArray(value) ? !value[0] : !value,
+  '!!': (value) => Boolean(Array.isArray(value) ? value[0] : value),
   cat: (arr) => (typeof arr === 'string' ? arr : arr.join('')),
   keys: (obj) => Object.keys(obj),
   eachKey: {
@@ -793,10 +793,12 @@ defaultMethods.not.compile = defaultMethods['!'].compile = function (
   data,
   buildState
 ) {
+  if (Array.isArray(data)) return `(!(${buildString(data[0], buildState)}))`
   return `(!(${buildString(data, buildState)}))`
 }
 // @ts-ignore Allow custom attribute
 defaultMethods['!!'].compile = function (data, buildState) {
+  if (Array.isArray(data)) return `(!!(${buildString(data[0], buildState)}))`
   return `(!!(${buildString(data, buildState)}))`
 }
 defaultMethods.none.deterministic = defaultMethods.some.deterministic

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "json-logic-engine",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Construct complex rules with JSON & process them.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",