json_p3 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db1ec71125b99bc877ba9856434a65e3f8e1c11a48b9566443c3b1a8b6860169
-  data.tar.gz: ad176fdda64b4f741e9f86ab48d4c8e3ccd767187fc0fc0fe28a4e6967a071d2
+  metadata.gz: c045dc201d7af17b4292488327d4bd01fbba11454df29c9ec78e344a1c6f3ea3
+  data.tar.gz: c10613058ceafbf844d39a0114be75255ae453aa0f78d0d422fac864d749f364
 SHA512:
-  metadata.gz: 3b153a665f534891e1ed1976ca6c180cd1c2427786b9f7b74fcea1953d7337135db669b3541d5eaba7fd2829dbd6c94e6c36236a4a6c6221d1bd5c0ac45f5a04
-  data.tar.gz: 52303daa1cd27c3f3ed7187949f6b9a2cf2c95483e61cd8cf7ced438f5511ad9067f39496b1fe53a85932a3de2be15ebfa2c791fdbc9002aceb0c85395c04839
+  metadata.gz: c04571664ae937194618544cb6aac078d91519fa6cd750e355f20d4c7a9ed9056880a9ba91fbc856475baec508ee2e779939ef6ccfeff9d9963a32f9ccf52ad2
+  data.tar.gz: 6232640619d2d65acebd920a1a3d19b77bc194b4b639b46cea9e44abb23d852f09e5eb85c004e5dc6e1aec3dd21ad2c36dabe7a59677cedeb8b776a256d375bf

data/.rubocop.yml

@@ -1,6 +1,8 @@
 require:
   - rubocop-minitest
   - rubocop-rake
+
+plugins:
   - rubocop-performance
 
 AllCops:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.4.1] - 2025-03-18
+
+- Fixed `JSONPathSyntaxError` claiming "unbalanced parentheses" when the query has balanced brackets.
+
 ## [0.4.0] - 2025-02-10
 
 - Added `JSONP3.find_enum`, `JSONP3::JSONPathEnvironment.find_enum` and `JSONP3::JSONPath.find_enum`. `find_enum` is like `find`, but returns an Enumerable (usually an Enumerator) of `JSONPathNode` instances instead of a `JSONPathNodeList`. `find_enum` can be more efficient for some combinations of query and data, especially for large data and recursive queries.

data/README.md

@@ -36,7 +36,7 @@ We follow <a href="https://datatracker.ietf.org/doc/html/rfc9535">RFC 9535</a> s
 Add `'json_p3'` to your Gemfile:
 
 ```
-gem 'json_p3', '~> 0.2.1'
+gem 'json_p3', '~> 0.4.0'
 ```
 
 Or

data/lib/json_p3/lexer.rb

@@ -20,6 +20,12 @@ module JSONP3 # rubocop:disable Style/Documentation
                                     tokens.last)
     end
 
+    unless lexer.bracket_stack.empty?
+      ch, index = *lexer.bracket_stack.last
+      msg = "unbalanced brackets"
+      raise JSONPathSyntaxError.new(msg, Token.new(:token_error, ch, index, query, message: msg))
+    end
+
     tokens
   end
 
@@ -33,11 +39,12 @@ module JSONP3 # rubocop:disable Style/Documentation
     S_ESCAPES = Set["b", "f", "n", "r", "t", "u", "/", "\\"].freeze
 
     # @dynamic tokens
-    attr_reader :tokens
+    attr_reader :tokens, :bracket_stack
 
     def initialize(query)
       @filter_depth = 0
-      @paren_stack = []
+      @func_call_stack = []
+      @bracket_stack = []
       @tokens = []
       @start = 0
       @query = query.freeze
@@ -135,6 +142,7 @@ module JSONP3 # rubocop:disable Style/Documentation
         emit(:token_double_dot, "..")
         :lex_descendant_segment
       when "["
+        @bracket_stack << ["[", @start]
         emit(:token_lbracket, "[")
         :lex_inside_bracketed_segment
       else
@@ -157,6 +165,7 @@ module JSONP3 # rubocop:disable Style/Documentation
         emit(:token_wild, "*")
         :lex_segment
       when "["
+        @bracket_stack << ["[", @start]
         emit(:token_lbracket, "[")
         :lex_inside_bracketed_segment
       else
@@ -208,6 +217,13 @@ module JSONP3 # rubocop:disable Style/Documentation
 
         case c
         when "]"
+          if @bracket_stack.empty? || @bracket_stack.last.first != "["
+            backup
+            error "unbalanced brackets"
+            return nil
+          end
+
+          @bracket_stack.pop
           emit(:token_rbracket, "]")
           return :lex_segment
         when ""
@@ -251,17 +267,13 @@ module JSONP3 # rubocop:disable Style/Documentation
           return nil
         when "]"
           @filter_depth -= 1
-          if @paren_stack.length == 1
-            error "unbalanced parentheses"
-            return nil
-          end
           backup
           return :lex_inside_bracketed_segment
         when ","
           emit(:token_comma, ",")
           # If we have unbalanced parens, we are inside a function call and a
           # comma separates arguments. Otherwise a comma separates selectors.
-          next if @paren_stack.length.positive?
+          next if @func_call_stack.length.positive?
 
           @filter_depth -= 1
           return :lex_inside_bracketed_segment
@@ -270,17 +282,25 @@ module JSONP3 # rubocop:disable Style/Documentation
         when '"'
           return :lex_double_quoted_string_inside_filter_expression
         when "("
+          @bracket_stack << ["(", @start]
           emit(:token_lparen, "(")
           # Are we in a function call? If so, a function argument contains parens.
-          @paren_stack[-1] += 1 if @paren_stack.length.positive?
+          @func_call_stack[-1] += 1 if @func_call_stack.length.positive?
         when ")"
+          if @bracket_stack.empty? || @bracket_stack.last.first != "("
+            backup
+            error "unbalanced brackets"
+            return nil
+          end
+
+          @bracket_stack.pop
           emit(:token_rparen, ")")
           # Are we closing a function call or a parenthesized expression?
-          if @paren_stack.length.positive?
-            if @paren_stack[-1] == 1
-              @paren_stack.pop
+          if @func_call_stack.length.positive?
+            if @func_call_stack[-1] == 1
+              @func_call_stack.pop
             else
-              @paren_stack[-1] -= 1
+              @func_call_stack[-1] -= 1
             end
           end
         when "$"
@@ -359,8 +379,9 @@ module JSONP3 # rubocop:disable Style/Documentation
             end
             # Function name
             # Keep track of parentheses for this function call.
-            @paren_stack << 1
+            @func_call_stack << 1
             emit :token_function
+            @bracket_stack << ["(", @start]
             self.next
             ignore # move past LPAREN
           else

data/lib/json_p3/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONP3
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/sig/json_p3.rbs

@@ -432,6 +432,8 @@ module JSONP3
 
     @paren_stack: Array[Integer]
 
+    @bracket_stack: Array[Array[untyped]]
+
     @tokens: Array[Token]
 
     @start: Integer
@@ -451,6 +453,9 @@ module JSONP3
     # @dynamic tokens
     attr_reader tokens: Array[Token]
 
+    # @dynamic tokens
+    attr_reader bracket_stack: Array[Array[untyped]]
+
     def initialize: (String query) -> void
 
     def run: () -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_p3
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Prior
@@ -36,7 +36,7 @@ cert_chain:
   6dM18fnfBc3yA4KI7AO8UAmRkTscMYV6f/K4YZR6ZYCNWRpY7rkg+arhf05aoSQf
   vn9bO1bzwdnG
   -----END CERTIFICATE-----
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies: []
 description: JSONPath following RFC 9535
 email: