Fix filter queries using bracket notation

.ruby-version

@@ -0,0 +1 @@
+3.3.6

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - Fix normalized string representations of node locations as returned by `JSONPathNode.path`.
 - Fix canonical string representations of instances of `JSONPath`, as returned by `to_s`.
+- Fixed filter queries with multiple bracketed segments. Previously we were failing to tokenize queries like `$[?@[0][0]]`. See [#15](https://github.com/jg-rp/ruby-json-p3/issues/15).
 
 ## [0.3.1] - 2024-12-05
 

Gemfile

@@ -13,8 +13,6 @@ gem "rubocop", "~> 1.21"
 
 gem "steep", "~> 1.8"
 
-gem "yard", "~> 0.9.37"
-
 gem "minitest-fail-fast", "~> 0.1.0"
 
 gem "stackprof", "~> 0.2.26"

Gemfile.lock

@@ -110,7 +110,6 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
     uri (1.0.2)
-    yard (0.9.37)
 
 PLATFORMS
   ruby
@@ -132,7 +131,6 @@ DEPENDENCIES
   rubocop-rake (~> 0.6.0)
   stackprof (~> 0.2.26)
   steep (~> 1.8)
-  yard (~> 0.9.37)
 
 BUNDLED WITH
-   2.5.17
+   2.6.3

lib/json_p3/lexer.rb

@@ -209,7 +209,7 @@ def lex_inside_bracketed_segment
         case c
         when "]"
           emit(:token_rbracket, "]")
-          return @filter_depth.positive? ? :lex_inside_filter : :lex_segment
+          return :lex_segment
         when ""
           error "unclosed bracketed selection"
           return nil

test/test_lexer.rb

@@ -462,6 +462,85 @@
       Token.new(:token_name, "foo", 2, "$.foo.&"),
       Token.new(:token_error, "&", 6, "$.foo.&", message: "unexpected shorthand selector '&'")
     ]
+  },
+  {
+    name: "relative query, bracket notation",
+    query: "$[?(@[0][0])]",
+    want: [
+      Token.new(:token_root, "$", 0, "$[?(@[0][0])]"),
+      Token.new(:token_lbracket, "[", 1, "$[?(@[0][0])]"),
+      Token.new(:token_filter, "?", 2, "$[?(@[0][0])]"),
+      Token.new(:token_lparen, "(", 3, "$[?(@[0][0])]"),
+      Token.new(:token_current, "@", 4, "$[?(@[0][0])]"),
+      Token.new(:token_lbracket, "[", 5, "$[?(@[0][0])]"),
+      Token.new(:token_index, "0", 6, "$[?(@[0][0])]"),
+      Token.new(:token_rbracket, "]", 7, "$[?(@[0][0])]"),
+      Token.new(:token_lbracket, "[", 8, "$[?(@[0][0])]"),
+      Token.new(:token_index, "0", 9, "$[?(@[0][0])]"),
+      Token.new(:token_rbracket, "]", 10, "$[?(@[0][0])]"),
+      Token.new(:token_rparen, ")", 11, "$[?(@[0][0])]"),
+      Token.new(:token_rbracket, "]", 12, "$[?(@[0][0])]"),
+      Token.new(:token_eoi, "", 13, "$[?(@[0][0])]")
+    ]
+  },
+  {
+    name: "relative query, more bracket notation",
+    query: "$[?(@[0][0][1])]",
+    want: [
+      Token.new(:token_root, "$", 0, "$[?(@[0][0][1])]"),
+      Token.new(:token_lbracket, "[", 1, "$[?(@[0][0][1])]"),
+      Token.new(:token_filter, "?", 2, "$[?(@[0][0][1])]"),
+      Token.new(:token_lparen, "(", 3, "$[?(@[0][0][1])]"),
+      Token.new(:token_current, "@", 4, "$[?(@[0][0][1])]"),
+      Token.new(:token_lbracket, "[", 5, "$[?(@[0][0][1])]"),
+      Token.new(:token_index, "0", 6, "$[?(@[0][0][1])]"),
+      Token.new(:token_rbracket, "]", 7, "$[?(@[0][0][1])]"),
+      Token.new(:token_lbracket, "[", 8, "$[?(@[0][0][1])]"),
+      Token.new(:token_index, "0", 9, "$[?(@[0][0][1])]"),
+      Token.new(:token_rbracket, "]", 10, "$[?(@[0][0][1])]"),
+      Token.new(:token_lbracket, "[", 11, "$[?(@[0][0][1])]"),
+      Token.new(:token_index, "1", 12, "$[?(@[0][0][1])]"),
+      Token.new(:token_rbracket, "]", 13, "$[?(@[0][0][1])]"),
+      Token.new(:token_rparen, ")", 14, "$[?(@[0][0][1])]"),
+      Token.new(:token_rbracket, "]", 15, "$[?(@[0][0][1])]"),
+      Token.new(:token_eoi, "", 16, "$[?(@[0][0][1])]")
+    ]
+  },
+  {
+    name: "relative query, bracket and dot notation",
+    query: "$[?(@[0].foo)]",
+    want: [
+      Token.new(:token_root, "$", 0, "$[?(@[0].foo)]"),
+      Token.new(:token_lbracket, "[", 1, "$[?(@[0].foo)]"),
+      Token.new(:token_filter, "?", 2, "$[?(@[0].foo)]"),
+      Token.new(:token_lparen, "(", 3, "$[?(@[0].foo)]"),
+      Token.new(:token_current, "@", 4, "$[?(@[0].foo)]"),
+      Token.new(:token_lbracket, "[", 5, "$[?(@[0].foo)]"),
+      Token.new(:token_index, "0", 6, "$[?(@[0].foo)]"),
+      Token.new(:token_rbracket, "]", 7, "$[?(@[0].foo)]"),
+      Token.new(:token_name, "foo", 9, "$[?(@[0].foo)]"),
+      Token.new(:token_rparen, ")", 12, "$[?(@[0].foo)]"),
+      Token.new(:token_rbracket, "]", 13, "$[?(@[0].foo)]"),
+      Token.new(:token_eoi, "", 14, "$[?(@[0].foo)]")
+    ]
+  },
+  {
+    name: "relative query, dot and bracket notation",
+    query: "$[?(@.foo[0])]",
+    want: [
+      Token.new(:token_root, "$", 0, "$[?(@.foo[0])]"),
+      Token.new(:token_lbracket, "[", 1, "$[?(@.foo[0])]"),
+      Token.new(:token_filter, "?", 2, "$[?(@.foo[0])]"),
+      Token.new(:token_lparen, "(", 3, "$[?(@.foo[0])]"),
+      Token.new(:token_current, "@", 4, "$[?(@.foo[0])]"),
+      Token.new(:token_name, "foo", 6, "$[?(@.foo[0])]"),
+      Token.new(:token_lbracket, "[", 9, "$[?(@.foo[0])]"),
+      Token.new(:token_index, "0", 10, "$[?(@.foo[0])]"),
+      Token.new(:token_rbracket, "]", 11, "$[?(@.foo[0])]"),
+      Token.new(:token_rparen, ")", 12, "$[?(@.foo[0])]"),
+      Token.new(:token_rbracket, "]", 13, "$[?(@.foo[0])]"),
+      Token.new(:token_eoi, "", 14, "$[?(@.foo[0])]")
+    ]
   }
 ].freeze