[JsonPath] Fix subexpression evaluation in filters

Author: alexandre-daubois

JsonCrawler.php

@@ -80,26 +80,31 @@ private function evaluate(JsonPath $query): array
                 throw new InvalidJsonStringInputException($e->getMessage(), $e);
             }
 
-            $current = [$data];
-
-            foreach ($tokens as $token) {
-                $next = [];
-                foreach ($current as $value) {
-                    $result = $this->evaluateToken($token, $value);
-                    $next = array_merge($next, $result);
-                }
-
-                $current = $next;
-            }
-
-            return $current;
+            return $this->evaluateTokensOnDecodedData($tokens, $data);
         } catch (InvalidArgumentException $e) {
             throw $e;
         } catch (\Throwable $e) {
             throw new JsonCrawlerException($query, $e->getMessage(), previous: $e);
         }
     }
 
+    private function evaluateTokensOnDecodedData(array $tokens, array $data): array
+    {
+        $current = [$data];
+
+        foreach ($tokens as $token) {
+            $next = [];
+            foreach ($current as $value) {
+                $result = $this->evaluateToken($token, $value);
+                $next = array_merge($next, $result);
+            }
+
+            $current = $next;
+        }
+
+        return $current;
+    }
+
     private function evaluateToken(JsonPathToken $token, mixed $value): array
     {
         return match ($token->type) {
@@ -246,10 +251,6 @@ private function evaluateFilter(string $expr, mixed $value): array
 
         $result = [];
         foreach ($value as $item) {
-            if (!\is_array($item)) {
-                continue;
-            }
-
             if ($this->evaluateFilterExpression($expr, $item)) {
                 $result[] = $item;
             }
@@ -258,7 +259,7 @@ private function evaluateFilter(string $expr, mixed $value): array
         return $result;
     }
 
-    private function evaluateFilterExpression(string $expr, array $context): bool
+    private function evaluateFilterExpression(string $expr, mixed $context): bool
     {
         $expr = trim($expr);
 
@@ -294,10 +295,12 @@ private function evaluateFilterExpression(string $expr, array $context): bool
             }
         }
 
-        if (str_starts_with($expr, '@.')) {
-            $path = substr($expr, 2);
+        if ('@' === $expr) {
+            return true;
+        }
 
-            return \array_key_exists($path, $context);
+        if (str_starts_with($expr, '@.')) {
+            return (bool) ($this->evaluateTokensOnDecodedData(JsonPathTokenizer::tokenize(new JsonPath('$'.substr($expr, 1))), $context)[0] ?? false);
         }
 
         // function calls
@@ -315,12 +318,16 @@ private function evaluateFilterExpression(string $expr, array $context): bool
         return false;
     }
 
-    private function evaluateScalar(string $expr, array $context): mixed
+    private function evaluateScalar(string $expr, mixed $context): mixed
     {
         if (is_numeric($expr)) {
             return str_contains($expr, '.') ? (float) $expr : (int) $expr;
         }
 
+        if ('@' === $expr) {
+            return $context;
+        }
+
         if ('true' === $expr) {
             return true;
         }
@@ -339,10 +346,12 @@ private function evaluateScalar(string $expr, array $context): mixed
         }
 
         // current node references
-        if (str_starts_with($expr, '@.')) {
-            $path = substr($expr, 2);
+        if (str_starts_with($expr, '@')) {
+            if (!\is_array($context)) {
+                return null;
+            }
 
-            return $context[$path] ?? null;
+            return $this->evaluateTokensOnDecodedData(JsonPathTokenizer::tokenize(new JsonPath('$'.substr($expr, 1))), $context)[0] ?? null;
         }
 
         // function calls

Tests/JsonCrawlerTest.php

@@ -151,6 +151,14 @@ public function testBooksWithIsbn()
         ], [$result[0]['isbn'], $result[1]['isbn']]);
     }
 
+    public function testBooksWithPublisherAddress()
+    {
+        $result = self::getBookstoreCrawler()->find('$..book[?(@.publisher.address)]');
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Sword of Honour', $result[0]['title']);
+    }
+
     public function testBooksWithBracketsAndFilter()
     {
         $result = self::getBookstoreCrawler()->find('$..["book"][?(@.isbn)]');
@@ -393,6 +401,50 @@ public function testValueFunction()
         $this->assertSame('Sayings of the Century', $result[0]['title']);
     }
 
+    public function testDeepExpressionInFilter()
+    {
+        $result = self::getBookstoreCrawler()->find('$.store.book[?(@.publisher.address.city == "Springfield")]');
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Sword of Honour', $result[0]['title']);
+    }
+
+    public function testWildcardInFilter()
+    {
+        $result = self::getBookstoreCrawler()->find('$.store.book[?(@.publisher.* == "my-publisher")]');
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Sword of Honour', $result[0]['title']);
+    }
+
+    public function testWildcardInFunction()
+    {
+        $result = self::getBookstoreCrawler()->find('$.store.book[?match(@.publisher.*.city, "Spring.+")]');
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Sword of Honour', $result[0]['title']);
+    }
+
+    public function testUseAtSymbolReturnsAll()
+    {
+        $result = self::getBookstoreCrawler()->find('$.store.bicycle[?(@ == @)]');
+
+        $this->assertSame([
+            'red',
+            399,
+        ], $result);
+    }
+
+    public function testUseAtSymbolAloneReturnsAll()
+    {
+        $result = self::getBookstoreCrawler()->find('$.store.bicycle[?(@)]');
+
+        $this->assertSame([
+            'red',
+            399,
+        ], $result);
+    }
+
     public function testValueFunctionWithOuterParentheses()
     {
         $result = self::getBookstoreCrawler()->find('$.store.book[?(value(@.price) == 8.95)]');
@@ -727,7 +779,15 @@ private static function getBookstoreCrawler(): JsonCrawler
                 "category": "fiction",
                 "author": "Evelyn Waugh",
                 "title": "Sword of Honour",
-                "price": 12.99
+                "price": 12.99,
+                "publisher": {
+                    "name": "my-publisher",
+                    "address": {
+                        "street": "1234 Elm St",
+                        "city": "Springfield",
+                        "state": "IL"
+                    }
+                }
             },
             {
                 "category": "fiction",