Handle standalone @ for selecting current node as value

Author: lucasnetau

src/Filters/QueryMatchFilter.php

@@ -20,7 +20,7 @@ class QueryMatchFilter extends AbstractFilter
     protected const MATCH_QUERY_NEGATION_WRAPPED = '^(?<negate>!)\((?<logicalexpr>.+)\)$';
     protected const MATCH_QUERY_NEGATION_UNWRAPPED = '^(?<negate>!)(?<logicalexpr>.+)$';
     protected const MATCH_QUERY_OPERATORS = '
-      @(\.(?<key>[^\s<>!=]+)|\[["\']?(?<keySquare>.*?)["\']?\])
+      (@\.(?<key>[^\s<>!=]+)|@\[["\']?(?<keySquare>.*?)["\']?\]|(?<node>@))
       (\s*(?<operator>==|=~|=|<>|!==|!=|>=|<=|>|<|in|!in|nin)\s*(?<comparisonValue>.+?(?=(&&|$))))?
       (\s*(?<logicaland>&&)\s*)?
     ';
@@ -60,9 +60,9 @@ public function filter($collection): array
         for ($logicalAndNum = 0; $logicalAndNum < \count($matches[0]); $logicalAndNum++) {
             $key = $matches['key'][$logicalAndNum] ?: $matches['keySquare'][$logicalAndNum];
 
-            if ($key === '') {
-                throw new RuntimeException('Malformed filter query: key was not set');
-            }
+          //  if ($key === '') {
+          //      throw new RuntimeException('Malformed filter query: key was not set');
+          //  }
 
             $operator = $matches['operator'][$logicalAndNum] ?? null;
             $comparisonValue = $matches['comparisonValue'][$logicalAndNum] ?? null;
@@ -87,14 +87,19 @@ public function filter($collection): array
                 $value1 = null;
 
                 $notNothing = AccessHelper::keyExists($value, $key, $this->magicIsAllowed);
-                if ($notNothing) {
-                    $value1 = AccessHelper::getValue($value, $key, $this->magicIsAllowed);
-                } elseif (\str_contains($key, '.')) {
-                    $foundValue = (new JSONPath($value))->find($key)->getData();
-                    if ($foundValue) {
-                        $value1 = $foundValue[0];
-                        $notNothing = true;
+                if ($key) {
+                    if ($notNothing) {
+                        $value1 = AccessHelper::getValue($value, $key, $this->magicIsAllowed);
+                    } elseif (\str_contains($key, '.')) {
+                        $foundValue = (new JSONPath($value))->find($key)->getData();
+                        if ($foundValue) {
+                            $value1 = $foundValue[0];
+                            $notNothing = true;
+                        }
                     }
+                } else {
+                    $value1 = $value;
+                    $notNothing = true;
                 }
 
                 $comparisonResult = null;

tests/data/baselineFailedQueries.txt

@@ -2,7 +2,6 @@ bracket_notation_with_quoted_closing_bracket_literal
 dot_notation_with_key_root_literal
 filter_expression_with_current_object
 filter_expression_with_different_grouped_operators
-filter_expression_with_equals_on_array_of_numbers
 filter_expression_with_tautological_comparison
 union_with_wildcard_and_number
 array_slice_with_large_number_for_end_and_negative_step