fix: resolve issue #15 where filters with bracket notation returned empty results

Author: sean2077

jsonpath/jsonpath.py

@@ -53,7 +53,7 @@ class JSONPath:
     # operators
     REP_SLICE_CONTENT = re.compile(r"^(-?\d*)?:(-?\d*)?(:-?\d*)?$")
     REP_SELECT_CONTENT = re.compile(r"^([\w.']+)(, ?[\w.']+)+$")
-    REP_FILTER_CONTENT = re.compile(r"@\.(.*?)(?=<=|>=|==|!=|>|<| in| not| is)|len\(@\.(.*?)\)")
+    REP_FILTER_CONTENT = re.compile(r"@([.\[].*?)(?=<=|>=|==|!=|>|<| in| not| is)|len\(@([.\[].*?)\)")
 
     # annotations
     f: list
@@ -94,15 +94,15 @@ def _parse_expr(self, expr):
         # pick up special patterns
         expr = JSONPath.REP_GET_QUOTE.sub(self._get_quote, expr)
         expr = JSONPath.REP_GET_BACKQUOTE.sub(self._get_backquote, expr)
+        expr = JSONPath.REP_GET_PAREN.sub(self._get_paren, expr)
         expr = JSONPath.REP_GET_BRACKET.sub(self._get_bracket, expr)
         expr = re.sub(r"\.(\.#B)", r"\1", expr)
-        expr = JSONPath.REP_GET_PAREN.sub(self._get_paren, expr)
         # split
         expr = JSONPath.REP_DOUBLEDOT.sub(f"{JSONPath.SEP}..{JSONPath.SEP}", expr)
         expr = JSONPath.REP_DOT.sub(JSONPath.SEP, expr)
         # put back
-        expr = JSONPath.REP_PUT_PAREN.sub(self._put_paren, expr)
         expr = JSONPath.REP_PUT_BRACKET.sub(self._put_bracket, expr)
+        expr = JSONPath.REP_PUT_PAREN.sub(self._put_paren, expr)
         expr = JSONPath.REP_PUT_BACKQUOTE.sub(self._put_backquote, expr)
         expr = JSONPath.REP_PUT_QUOTE.sub(self._put_quote, expr)
         if expr.startswith("$;"):
@@ -147,12 +147,15 @@ def _put_paren(self, m):
     @staticmethod
     def _gen_obj(m):
         content = m.group(1) or m.group(2)  # group 2 is for len()
-        ret = "__obj"
-        for e in content.split("."):
-            if len(e) >= 2 and ((e[0] == "'" and e[-1] == "'") or (e[0] == '"' and e[-1] == '"')):
-                e = e[1:-1]
-            ret += f'["{e}"]'
-        return ret
+
+        def repl(m):
+            g = m.group(1)
+            if g[0] in ("'", '"'):
+                return f"[{g}]"
+            return f"['{g}']"
+
+        content = re.sub(r"\.(\w+|'[^']*'|\"[^\"]*\")", repl, content)
+        return "__obj" + content
 
     @staticmethod
     def _traverse(f, obj, i: int, path: str, *args):
@@ -275,6 +278,8 @@ def _trace(self, obj, i: int, path):
         if step.startswith("?(") and step.endswith(")"):
             step = step[2:-1]
             step = JSONPath.REP_FILTER_CONTENT.sub(self._gen_obj, step)
+            if isinstance(obj, dict):
+                self._filter(obj, i + 1, path, step)
             self._traverse(self._filter, obj, i + 1, path, step)
             return
 

tests/test_issues.py

@@ -44,3 +44,23 @@ def test_issue_16_quoted_keys():
     assert JSONPath('$.\'user-list\'[?(@."city-name"=="Austin")]').parse(data) == [
         {"city-name": "Austin", "name": "John"}
     ]
+
+
+def test_issue_15_bracket_notation_in_filter():
+    data = {
+        "tool": {
+            "books": [
+                {"properties": [{"name": "moq", "value": "x"}, {"name": "url", "value": "1"}]},
+                {"properties": [{"name": "url", "value": "3"}]},
+                {"properties": [{"name": "moq", "value": "q"}, {"name": "url", "value": "4"}]},
+            ]
+        }
+    }
+
+    # Case 1: Bracket notation in filter
+    expr = "$['tool']['books'][*]['properties'][*][?(@['name'] == 'moq')]['value']"
+    assert JSONPath(expr).parse(data) == ["x", "q"]
+
+    # Case 2: Dot notation in filter (already working, but good to keep)
+    expr_dot = "$.tool.books.[*].properties.[*].[?(@.name=='moq')].value"
+    assert JSONPath(expr_dot).parse(data) == ["x", "q"]