Merge pull request #48 from Galbar/add_support_for_not_symbol

add support for '!' as synonym of 'not'
Galbar · Apr 7, 2021 · ad493c7 · ad493c7
2 parents 8b5e984 + 48bf831
commit ad493c7
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -118,9 +118,9 @@ indexlist   = index (',' index)*
 arrayslice  = index? ':' index? ':' index?
 filterexpr  = '?(' ors ')'
 
-ors         = ands (' ' (or|\|\|) ' ' ands)*
-ands        = expr (' ' (and|&&) ' ' expr)*
-expr        = 'not'? (value | comp)
+ors         = ands (' ' ( 'or' | '\|\|' ) ' ' ands)*
+ands        = expr (' ' ( 'and' | '&&' ) ' ' expr)*
+expr        = ( 'not ' | '! ' )? (value | comp)
 comp        = value ('==' | '!=' | '<' | '>' | '<=' | '>=' | '=~') value
 value       = (jsonpath | childpath | number | string | boolean | regpattern | null | length)
 length      = (jsonpath | childpath) '.length'

diff --git a/src/Galbar/JsonPath/JsonObject.php b/src/Galbar/JsonPath/JsonObject.php
@@ -128,7 +128,7 @@ class JsonObject
     const RE_NEXT_SUBEXPR = '/.*?(\(|\)|\[|\])/';
     const RE_OR = '/\s+(or|\|\|)\s+/';
     const RE_AND = '/\s+(and|&&)\s+/';
-    const RE_NOT = '/^not\s+(.*)/';
+    const RE_NOT = '/^(not|!)\s+(.*)/';
 
     // Tokens
     const TOK_ROOT = '$';
@@ -465,7 +465,7 @@ private function booleanExpressionAnds(&$jsonObject, $expression)
         foreach ($values as $subexpr) {
             $not = false;
             if (preg_match(self::RE_NOT, $subexpr, $match)) {
-                $subexpr = $match[1];
+                $subexpr = $match[2];
                 $not = true;
             }
 

diff --git a/tests/Galbar/JsonPath/JsonObjectTest.php b/tests/Galbar/JsonPath/JsonObjectTest.php
@@ -336,6 +336,12 @@ public function testGetProvider()
                 ),
                 "$.store.book[?(not @.category == 'fiction')].price"
             ),
+            array(
+                array(
+                    8.95
+                ),
+                "$.store.book[?(! @.category == 'fiction')].price"
+            ),
             array(
                 array(
                     8.95
@@ -354,12 +360,24 @@ public function testGetProvider()
                 ),
                 "$.store[?(not @..price or @..color == 'red')].available"
             ),
+            array(
+                array(
+                    true
+                ),
+                "$.store[?(! @..price or @..color == 'red')].available"
+            ),
             array(
                 array(
                     true
                 ),
                 "$.store[?(not @..price || @..color == 'red')].available"
             ),
+            array(
+                array(
+                    true
+                ),
+                "$.store[?(! @..price || @..color == 'red')].available"
+            ),
             array(
                 false,
                 "$.store[?(@.price.length == 3)]"
@@ -623,6 +641,12 @@ public function testSmartGetProvider()
                 ),
                 "$.store.book[?(not @.category == 'fiction')].price"
             ),
+            array(
+                array(
+                    8.95
+                ),
+                "$.store.book[?(! @.category == 'fiction')].price"
+            ),
             array(
                 array(
                     8.95
@@ -641,12 +665,24 @@ public function testSmartGetProvider()
                 ),
                 "$.store[?(not @..price or @..color == 'red')].available"
             ),
+            array(
+                array(
+                    true
+                ),
+                "$.store[?(! @..price or @..color == 'red')].available"
+            ),
             array(
                 array(
                     true
                 ),
                 "$.store[?(not @..price || @..color == 'red')].available"
             ),
+            array(
+                array(
+                    true
+                ),
+                "$.store[?(! @..price || @..color == 'red')].available"
+            ),
             array(
                 false,
                 "$.store[?(@.price.length == 3)]"