node_query 1.13.8 → 1.13.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cebf13af77b1b91af393dbf741b12ef1804de496d85f243b336decdb05ee5c8a
-  data.tar.gz: e4815863dc1b57e92f2e1bbc1858b8e35668e4a22d9392bc565af4f3993dcdc9
+  metadata.gz: 587cefdbcb8ef9ae22bdf3ec6f9a5ccbbe468c67801a841cdd96204634567b05
+  data.tar.gz: 4257ea586307071a0edb6ef6657af7a2227ed4b6006532d4186c1f02ed4d4711
 SHA512:
-  metadata.gz: e9fd0443d795e0dccef4c74ea9ff9fc242f96c4b2790b9f56ae5a03d4fc235ed7d950c1f9d7391961ca8450f0de075a103d9ba02db402199957de3d84ea153d6
-  data.tar.gz: 8aafbc1a54eea3af5fd5dcadced6ce5cf66d51ca0f76128bca1643401aab3c0b3c5673a11ed4cbca7955aa62698053c57525b2f57b03a3af6daf9b96b04554a9
+  metadata.gz: 60efa801673c6243456a98a50249edb70d7c46443def3b160530d2d9ab7633e62b4c012c9ed5f08f13ea8d3756870d63b194c9529818a4f3b2cc6c5a6a134533
+  data.tar.gz: ab891c93073c30d513f6886c72d7c5054268de9772231c350d190597978250510f25120fbbb339e9d93c96710f73dc7609b0199bccaf5a595794e11fefb90952

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.13.10 (2023-08-12)
+
+* Update `node_query_parser.y`
+
+## 1.13.9 (2023-08-02)
+
+* Add `OPERATOR` macro
+* Use operator `=` instead of `==`
+
 ## 1.13.8 (2023-06-28)
 
 * Check `.to_value` instead of `.type`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.13.8)
+    node_query (1.13.10)
 
 GEM
   remote: https://rubygems.org/

data/lib/node_query/compiler/attribute.rb

@@ -7,7 +7,7 @@ module NodeQuery::Compiler
     # @param key [String] the key
     # @param value the value can be any class implement {NodeQuery::Compiler::Comparable}
     # @param operator [String] the operator
-    def initialize(key:, value:, operator: '==')
+    def initialize(key:, value:, operator: '=')
       @key = key
       @value = value
       @operator = operator

data/lib/node_query/compiler/basic_selector.rb

@@ -15,7 +15,7 @@ module NodeQuery::Compiler
     # @param node [Node] the node
     # @param base_node [Node] the base node for evaluated value
     # @return [Boolean]
-    def match?(node, base_node, _operator = '==')
+    def match?(node, base_node, _operator = '=')
       return false unless node
 
       @node_type.to_sym == NodeQuery.adapter.get_node_type(node) && (!@attribute_list || @attribute_list.match?(

data/lib/node_query/compiler/comparable.rb

@@ -3,17 +3,17 @@
 module NodeQuery::Compiler
   # Compare acutal value with expected value.
   module Comparable
-    SIMPLE_VALID_OPERATORS = ['==', '!=', 'includes', 'not_includes']
-    STRING_VALID_OPERATORS = ['==', '!=', '^=', '$=', '*=', 'includes', 'not_includes']
-    NUMBER_VALID_OPERATORS = ['==', '!=', '>', '>=', '<', '<=', 'includes', 'not_includes']
-    ARRAY_VALID_OPERATORS = ['==', '!=', 'in', 'not_in']
+    SIMPLE_VALID_OPERATORS = ['=', '!=', 'includes', 'not_includes']
+    STRING_VALID_OPERATORS = ['=', '!=', '^=', '$=', '*=', 'includes', 'not_includes']
+    NUMBER_VALID_OPERATORS = ['=', '!=', '>', '>=', '<', '<=', 'includes', 'not_includes']
+    ARRAY_VALID_OPERATORS = ['=', '!=', 'in', 'not_in']
     REGEXP_VALID_OPERATORS = ['=~', '!~']
 
     # Check if the actual value matches the expected value.
     #
     # @param node [Node] node to calculate actual value
     # @param base_node [Node] the base node for evaluated value
-    # @param operator [String] operator to compare with expected value, operator can be <code>'=='</code>, <code>'!='</code>, <code>'>'</code>, <code>'>='</code>, <code>'<'</code>, <code>'<='</code>, <code>'includes'</code>, <code>'in'</code>, <code>'not_in'</code>, <code>'=~'</code>, <code>'!~'</code>
+    # @param operator [String] operator to compare with expected value, operator can be <code>'='</code>, <code>'!='</code>, <code>'>'</code>, <code>'>='</code>, <code>'<'</code>, <code>'<='</code>, <code>'includes'</code>, <code>'in'</code>, <code>'not_in'</code>, <code>'=~'</code>, <code>'!~'</code>
     # @return [Boolean] true if actual value matches the expected value
     # @raise [NodeQuery::Compiler::InvalidOperatorError] if operator is invalid
     def match?(node, base_node, operator)
@@ -51,9 +51,9 @@ module NodeQuery::Compiler
         actual <= expected
       when 'in'
         if node.is_a?(Array)
-          node.all? { |child| expected.any? { |expected_child| expected_child.match?(child, base_node, '==') } }
+          node.all? { |child| expected.any? { |expected_child| expected_child.match?(child, base_node, '=') } }
         else
-          expected.any? { |expected_child| expected_child.match?(node, base_node, '==') }
+          expected.any? { |expected_child| expected_child.match?(node, base_node, '=') }
         end
       when 'not_in'
         if node.is_a?(Array)
@@ -69,7 +69,7 @@ module NodeQuery::Compiler
         if expected.is_a?(::Array)
           actual.is_a?(::Array) && actual.size == expected.size &&
             actual.zip(expected).all? { |actual_child, expected_child|
-              expected_child.match?(actual_child, base_node, '==')
+              expected_child.match?(actual_child, base_node, '=')
             }
         else
           is_equal?(actual, expected)

data/lib/node_query/compiler/selector.rb

@@ -33,7 +33,7 @@ module NodeQuery::Compiler
     # Check if node matches the selector.
     # @param node [Node] the node
     # @param base_node [Node] the base node for evaluated node
-    def match?(node, base_node, operator = "==")
+    def match?(node, base_node, operator = "=")
       if node.is_a?(::Array)
         case operator
         when "not_includes"

data/lib/node_query/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class NodeQuery
-  VERSION = "1.13.8"
+  VERSION = "1.13.10"
 end

data/lib/node_query_lexer.rex

@@ -10,6 +10,7 @@ macros
   NODE_TYPE                /\.[a-zA-Z]+/
   IDENTIFIER               /[@\*\-\.\w]*\w/
   IDENTIFIER_VALUE         /[@\.\w!&:\?<>=]+/
+  OPERATOR                 /(\^=|\$=|\*=|!=|=~|!~|>=|<=|>|<|=|not includes|includes|not in|in)/i
   FALSE                    /false/
   FLOAT                    /\-?\d+\.\d+/
   INTEGER                  /\-?\d+/
@@ -39,21 +40,7 @@ rules
                     /#{CLOSE_SELECTOR}/           { [:tCLOSE_SELECTOR, text] }
                     /#{OPEN_ATTRIBUTE}/           { @nested_count += 1; @state = :KEY; [:tOPEN_ATTRIBUTE, text] }
 :KEY                /\s+/
-:KEY                /\^=/                         { @state = :VALUE; [:tOPERATOR, '^='] }
-:KEY                /\$=/                         { @state = :VALUE; [:tOPERATOR, '$='] }
-:KEY                /\*=/                         { @state = :VALUE; [:tOPERATOR, '*='] }
-:KEY                /!=/                          { @state = :VALUE; [:tOPERATOR, '!='] }
-:KEY                /=~/                          { @state = :VALUE; [:tOPERATOR, '=~'] }
-:KEY                /!~/                          { @state = :VALUE; [:tOPERATOR, '!~'] }
-:KEY                />=/                          { @state = :VALUE; [:tOPERATOR, '>='] }
-:KEY                /<=/                          { @state = :VALUE; [:tOPERATOR, '<='] }
-:KEY                />/                           { @state = :VALUE; [:tOPERATOR, '>'] }
-:KEY                /</                           { @state = :VALUE; [:tOPERATOR, '<'] }
-:KEY                /=/                           { @state = :VALUE; [:tOPERATOR, '=='] }
-:KEY                /not includes/i               { @state = :VALUE; [:tOPERATOR, 'not_includes'] }
-:KEY                /includes/i                   { @state = :VALUE; [:tOPERATOR, 'includes'] }
-:KEY                /not in/i                     { @state = :VALUE; [:tOPERATOR, 'not_in'] }
-:KEY                /in/i                         { @state = :VALUE; [:tOPERATOR, 'in'] }
+:KEY                /#{OPERATOR}/                 { @state = :VALUE; [:tOPERATOR, text.downcase.sub(' ', '_')] }
 :KEY                /#{IDENTIFIER}/               { [:tKEY, text] }
 :VALUE              /\s+/
 :VALUE              /\[\]=/                       { [:tIDENTIFIER_VALUE, text] }

data/lib/node_query_lexer.rex.rb

@@ -23,6 +23,7 @@ class NodeQueryLexer
   NODE_TYPE           = /\.[a-zA-Z]+/
   IDENTIFIER          = /[@\*\-\.\w]*\w/
   IDENTIFIER_VALUE    = /[@\.\w!&:\?<>=]+/
+  OPERATOR            = /(\^=|\$=|\*=|!=|=~|!~|>=|<=|>|<|=|not includes|includes|not in|in)/i
   FALSE               = /false/
   FLOAT               = /\-?\d+\.\d+/
   INTEGER             = /\-?\d+/
@@ -157,36 +158,8 @@ class NodeQueryLexer
           case
           when ss.skip(/\s+/) then
             # do nothing
-          when ss.skip(/\^=/) then
-            action { @state = :VALUE; [:tOPERATOR, '^='] }
-          when ss.skip(/\$=/) then
-            action { @state = :VALUE; [:tOPERATOR, '$='] }
-          when ss.skip(/\*=/) then
-            action { @state = :VALUE; [:tOPERATOR, '*='] }
-          when ss.skip(/!=/) then
-            action { @state = :VALUE; [:tOPERATOR, '!='] }
-          when ss.skip(/=~/) then
-            action { @state = :VALUE; [:tOPERATOR, '=~'] }
-          when ss.skip(/!~/) then
-            action { @state = :VALUE; [:tOPERATOR, '!~'] }
-          when ss.skip(/>=/) then
-            action { @state = :VALUE; [:tOPERATOR, '>='] }
-          when ss.skip(/<=/) then
-            action { @state = :VALUE; [:tOPERATOR, '<='] }
-          when ss.skip(/>/) then
-            action { @state = :VALUE; [:tOPERATOR, '>'] }
-          when ss.skip(/</) then
-            action { @state = :VALUE; [:tOPERATOR, '<'] }
-          when ss.skip(/=/) then
-            action { @state = :VALUE; [:tOPERATOR, '=='] }
-          when ss.skip(/not includes/i) then
-            action { @state = :VALUE; [:tOPERATOR, 'not_includes'] }
-          when ss.skip(/includes/i) then
-            action { @state = :VALUE; [:tOPERATOR, 'includes'] }
-          when ss.skip(/not in/i) then
-            action { @state = :VALUE; [:tOPERATOR, 'not_in'] }
-          when ss.skip(/in/i) then
-            action { @state = :VALUE; [:tOPERATOR, 'in'] }
+          when text = ss.scan(/#{OPERATOR}/) then
+            action { @state = :VALUE; [:tOPERATOR, text.downcase.sub(' ', '_')] }
           when text = ss.scan(/#{IDENTIFIER}/) then
             action { [:tKEY, text] }
           else

data/lib/node_query_parser.racc.rb

@@ -22,90 +22,90 @@ class NodeQueryParser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-     8,     7,     8,     7,     9,    37,     5,     6,     5,     6,
-    28,    10,    12,    13,    17,    18,    22,    30,    31,    32,
-    33,    34,    35,    36,     8,     7,    23,    24,    25,    37,
-     5,     6,     8,     7,    17,    38,    41,    37,     5,     6,
-   nil,    30,    31,    32,    33,    34,    35,    36,   nil,    30,
-    31,    32,    33,    34,    35,    36,     8,     7,     8,     7,
-     8,     7,     5,     6,     5,     6,     5,     6,     8,     7,
-     8,     7,   nil,   nil,     5,     6,     5,     6 ]
+     8,     7,     9,    36,     5,     6,     8,     7,    27,    10,
+     5,     6,    12,    13,    18,    29,    30,    31,    32,    33,
+    34,    35,     8,     7,    19,    36,     5,     6,    18,     8,
+     7,    38,    36,     5,     6,    23,    24,    29,    30,    31,
+    32,    33,    34,    35,    29,    30,    31,    32,    33,    34,
+    35,     8,     7,     8,     7,     5,     6,     5,     6,     8,
+     7,     8,     7,     5,     6,     5,     6,     8,     7,    25,
+    37,     5,     6,    41,    42,    44 ]
 
 racc_action_check = [
-    25,    25,     0,     0,     1,    25,    25,    25,     0,     0,
-    25,     2,     4,     5,     8,     9,    17,    25,    25,    25,
-    25,    25,    25,    25,    28,    28,    20,    21,    22,    28,
-    28,    28,    40,    40,    24,    28,    39,    40,    40,    40,
-   nil,    28,    28,    28,    28,    28,    28,    28,   nil,    40,
-    40,    40,    40,    40,    40,    40,     3,     3,     6,     6,
-     7,     7,     3,     3,     6,     6,     7,     7,    10,    10,
-    13,    13,   nil,   nil,    10,    10,    13,    13 ]
+    25,    25,     1,    25,    25,    25,     0,     0,    25,     2,
+     0,     0,     4,     5,     8,    25,    25,    25,    25,    25,
+    25,    25,    27,    27,     9,    27,    27,    27,    17,    40,
+    40,    27,    40,    40,    40,    18,    21,    27,    27,    27,
+    27,    27,    27,    27,    40,    40,    40,    40,    40,    40,
+    40,     3,     3,     6,     6,     3,     3,     6,     6,     7,
+     7,    10,    10,     7,     7,    10,    10,    13,    13,    23,
+    26,    13,    13,    38,    39,    42 ]
 
 racc_action_pointer = [
-    -1,     4,     9,    53,    -5,    -2,    55,    57,     3,    15,
-    65,   nil,   nil,    67,   nil,   nil,   nil,    10,   nil,   nil,
-    10,    15,    10,   nil,    23,    -3,   nil,   nil,    21,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,
-    29,   nil,   nil ]
+     3,     2,     7,    48,    -3,     0,    50,    56,     5,    24,
+    58,   nil,   nil,    64,   nil,   nil,   nil,    19,    30,   nil,
+   nil,    22,   nil,    53,   nil,    -3,    60,    19,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    63,    62,
+    26,   nil,    65,   nil,   nil ]
 
 racc_action_default = [
    -28,   -28,    -2,    -4,    -6,   -28,   -28,   -28,   -10,   -28,
-   -28,    -3,    -5,   -28,    -8,    -9,   -11,   -28,    43,    -1,
-   -28,   -28,   -28,    -7,   -13,   -28,   -12,   -14,   -28,   -19,
-   -20,   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -15,   -28,
-   -18,   -16,   -17 ]
+   -28,    -3,    -5,   -28,    -8,    -9,   -11,   -13,   -28,    45,
+    -1,   -28,   -12,   -28,    -7,   -28,   -28,   -28,   -19,   -20,
+   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -14,   -28,   -28,
+   -18,   -15,   -28,   -17,   -16 ]
 
 racc_goto_table = [
-    14,    15,    16,    39,     1,    11,    21,    20,    27,   nil,
-   nil,   nil,   nil,   nil,    19,    42,   nil,   nil,    26,    29,
-   nil,   nil,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    29 ]
+    14,    15,    39,     1,    11,    16,    26,    21,   nil,   nil,
+   nil,   nil,   nil,    20,    22,    43,   nil,   nil,   nil,    28,
+   nil,    28,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    28 ]
 
 racc_goto_check = [
-     3,     3,     5,     8,     1,     2,     6,     3,     7,   nil,
-   nil,   nil,   nil,   nil,     1,     8,   nil,   nil,     5,     3,
-   nil,   nil,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     3,     3,     8,     1,     2,     5,     7,     3,   nil,   nil,
+   nil,   nil,   nil,     1,     5,     8,   nil,   nil,   nil,     3,
+   nil,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,     3 ]
 
 racc_goto_pointer = [
-   nil,     4,     2,    -6,   nil,    -6,   -11,   -17,   -25 ]
+   nil,     3,     1,    -6,   nil,    -3,   nil,   -19,   -25 ]
 
 racc_goto_default = [
-   nil,   nil,     2,     3,     4,   nil,   nil,    40,   nil ]
+   nil,   nil,     2,     3,     4,   nil,    17,    40,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 28, :_reduce_1,
-  1, 28, :_reduce_2,
-  2, 29, :_reduce_3,
-  1, 29, :_reduce_4,
-  2, 30, :_reduce_5,
-  1, 30, :_reduce_6,
-  4, 30, :_reduce_7,
-  2, 30, :_reduce_8,
-  2, 30, :_reduce_9,
-  1, 31, :_reduce_10,
-  2, 31, :_reduce_11,
-  4, 32, :_reduce_12,
-  3, 32, :_reduce_13,
-  3, 33, :_reduce_14,
-  4, 33, :_reduce_15,
-  5, 33, :_reduce_16,
-  2, 35, :_reduce_17,
-  1, 35, :_reduce_18,
-  1, 34, :_reduce_none,
-  1, 34, :_reduce_20,
-  1, 34, :_reduce_21,
-  1, 34, :_reduce_22,
-  1, 34, :_reduce_23,
-  1, 34, :_reduce_24,
-  1, 34, :_reduce_25,
-  1, 34, :_reduce_26,
-  1, 34, :_reduce_27 ]
+  3, 26, :_reduce_1,
+  1, 26, :_reduce_2,
+  2, 27, :_reduce_3,
+  1, 27, :_reduce_4,
+  2, 28, :_reduce_5,
+  1, 28, :_reduce_6,
+  4, 28, :_reduce_7,
+  2, 28, :_reduce_8,
+  2, 28, :_reduce_9,
+  1, 29, :_reduce_10,
+  2, 29, :_reduce_11,
+  2, 30, :_reduce_12,
+  1, 30, :_reduce_13,
+  5, 31, :_reduce_14,
+  6, 31, :_reduce_15,
+  7, 31, :_reduce_16,
+  2, 33, :_reduce_17,
+  1, 33, :_reduce_18,
+  1, 32, :_reduce_none,
+  1, 32, :_reduce_20,
+  1, 32, :_reduce_21,
+  1, 32, :_reduce_22,
+  1, 32, :_reduce_23,
+  1, 32, :_reduce_24,
+  1, 32, :_reduce_25,
+  1, 32, :_reduce_26,
+  1, 32, :_reduce_27 ]
 
 racc_reduce_n = 28
 
-racc_shift_n = 43
+racc_shift_n = 45
 
 racc_token_table = {
   false => 0,
@@ -113,30 +113,28 @@ racc_token_table = {
   :tCOMMA => 2,
   :tNODE_TYPE => 3,
   :tGOTO_SCOPE => 4,
-  :tATTRIBUTE => 5,
-  :tKEY => 6,
-  :tIDENTIFIER => 7,
-  :tIDENTIFIER_VALUE => 8,
-  :tPSEUDO_CLASS => 9,
-  :tRELATIONSHIP => 10,
-  :tOPEN_ATTRIBUTE => 11,
-  :tCLOSE_ATTRIBUTE => 12,
-  :tOPEN_ARRAY => 13,
-  :tCLOSE_ARRAY => 14,
-  :tOPEN_SELECTOR => 15,
-  :tCLOSE_SELECTOR => 16,
-  :tPOSITION => 17,
-  :tOPERATOR => 18,
-  :tARRAY_VALUE => 19,
-  :tBOOLEAN => 20,
-  :tFLOAT => 21,
-  :tINTEGER => 22,
-  :tNIL => 23,
-  :tREGEXP => 24,
-  :tSTRING => 25,
-  :tSYMBOL => 26 }
-
-racc_nt_base = 27
+  :tKEY => 5,
+  :tIDENTIFIER_VALUE => 6,
+  :tPSEUDO_CLASS => 7,
+  :tRELATIONSHIP => 8,
+  :tOPEN_ATTRIBUTE => 9,
+  :tCLOSE_ATTRIBUTE => 10,
+  :tOPEN_ARRAY => 11,
+  :tCLOSE_ARRAY => 12,
+  :tOPEN_SELECTOR => 13,
+  :tCLOSE_SELECTOR => 14,
+  :tPOSITION => 15,
+  :tOPERATOR => 16,
+  :tARRAY_VALUE => 17,
+  :tBOOLEAN => 18,
+  :tFLOAT => 19,
+  :tINTEGER => 20,
+  :tNIL => 21,
+  :tREGEXP => 22,
+  :tSTRING => 23,
+  :tSYMBOL => 24 }
+
+racc_nt_base = 25
 
 racc_use_result_var = false
 
@@ -162,9 +160,7 @@ Racc_token_to_s_table = [
   "tCOMMA",
   "tNODE_TYPE",
   "tGOTO_SCOPE",
-  "tATTRIBUTE",
   "tKEY",
-  "tIDENTIFIER",
   "tIDENTIFIER_VALUE",
   "tPSEUDO_CLASS",
   "tRELATIONSHIP",
@@ -245,23 +241,23 @@ def _reduce_11(val, _values)
 end
 
 def _reduce_12(val, _values)
- NodeQuery::Compiler::AttributeList.new(attribute: val[1], rest: val[3])
+ NodeQuery::Compiler::AttributeList.new(attribute: val[0], rest: val[1])
 end
 
 def _reduce_13(val, _values)
- NodeQuery::Compiler::AttributeList.new(attribute: val[1])
+ NodeQuery::Compiler::AttributeList.new(attribute: val[0])
 end
 
 def _reduce_14(val, _values)
- NodeQuery::Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1])
+ NodeQuery::Compiler::Attribute.new(key: val[1], value: val[3], operator: val[2])
 end
 
 def _reduce_15(val, _values)
- NodeQuery::Compiler::Attribute.new(key: val[0], value: NodeQuery::Compiler::ArrayValue.new, operator: val[1])
+ NodeQuery::Compiler::Attribute.new(key: val[1], value: NodeQuery::Compiler::ArrayValue.new, operator: val[2])
 end
 
 def _reduce_16(val, _values)
- NodeQuery::Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1])
+ NodeQuery::Compiler::Attribute.new(key: val[1], value: val[4], operator: val[2])
 end
 
 def _reduce_17(val, _values)

data/lib/node_query_parser.y

@@ -1,6 +1,6 @@
 class NodeQueryParser
 options no_result_var
-token tCOMMA tNODE_TYPE tGOTO_SCOPE tATTRIBUTE tKEY tIDENTIFIER tIDENTIFIER_VALUE tPSEUDO_CLASS tRELATIONSHIP
+token tCOMMA tNODE_TYPE tGOTO_SCOPE tKEY tIDENTIFIER_VALUE tPSEUDO_CLASS tRELATIONSHIP
       tOPEN_ATTRIBUTE tCLOSE_ATTRIBUTE tOPEN_ARRAY tCLOSE_ARRAY tOPEN_SELECTOR tCLOSE_SELECTOR tPOSITION
       tOPERATOR tARRAY_VALUE tBOOLEAN tFLOAT tINTEGER tNIL tREGEXP tSTRING tSYMBOL
 rule
@@ -24,13 +24,13 @@ rule
     | tNODE_TYPE attribute_list { NodeQuery::Compiler::BasicSelector.new(node_type: val[0], attribute_list: val[1]) }
 
   attribute_list
-    : tOPEN_ATTRIBUTE attribute tCLOSE_ATTRIBUTE attribute_list { NodeQuery::Compiler::AttributeList.new(attribute: val[1], rest: val[3]) }
-    | tOPEN_ATTRIBUTE attribute tCLOSE_ATTRIBUTE { NodeQuery::Compiler::AttributeList.new(attribute: val[1]) }
+    : attribute attribute_list { NodeQuery::Compiler::AttributeList.new(attribute: val[0], rest: val[1]) }
+    | attribute { NodeQuery::Compiler::AttributeList.new(attribute: val[0]) }
 
   attribute
-    : tKEY tOPERATOR value { NodeQuery::Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1]) }
-    | tKEY tOPERATOR tOPEN_ARRAY tCLOSE_ARRAY { NodeQuery::Compiler::Attribute.new(key: val[0], value: NodeQuery::Compiler::ArrayValue.new, operator: val[1]) }
-    | tKEY tOPERATOR tOPEN_ARRAY array_value tCLOSE_ARRAY { NodeQuery::Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1]) }
+    : tOPEN_ATTRIBUTE tKEY tOPERATOR value tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: val[3], operator: val[2]) }
+    | tOPEN_ATTRIBUTE tKEY tOPERATOR tOPEN_ARRAY tCLOSE_ARRAY tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: NodeQuery::Compiler::ArrayValue.new, operator: val[2]) }
+    | tOPEN_ATTRIBUTE tKEY tOPERATOR tOPEN_ARRAY array_value tCLOSE_ARRAY tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: val[4], operator: val[2]) }
 
   array_value
     : value array_value { NodeQuery::Compiler::ArrayValue.new(value: val[0], rest: val[1]) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.13.8
+  version: 1.13.10
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-08-12 00:00:00.000000000 Z
 dependencies: []
 description: ast node query language
 email:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: ast node query language