synvert-core 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51aff3b9c1c43ab2e6b3c093b65a42cb97536b900cf0aa8d0081e7e8716346f0
-  data.tar.gz: 6902ad17b6fa2d1ab2a5d5294f3bb1f29903a12c7ad8dd15cc7dae56173a440a
+  metadata.gz: 741ca9c2f6f29e5bbafbc5b63d94b3cd9a56aa20e8a00f3f70830b73b1fb697e
+  data.tar.gz: a8bbf6e0c48a4af42578abb20807f3d86359fc069dc85ff90e12cf011f076998
 SHA512:
-  metadata.gz: 74cc5bb2cf144fba8bbd8ad647971efeba9473138d1cc5b416b45aa940c22f8929cefdd32b5e692c0dc1a9c9786d49dd8b441f1949a58256cec015a9697f2a43
-  data.tar.gz: c08abee0bf9fd0cba7cd5248f9020c4c30dadc25c06c5b358a122ccb09e7171878eae85cd498a0fb788aa2987fcf0302916c49cca0f9eaabc77b55e3a43d6a3a
+  metadata.gz: 7fcadf632c863b1f3ba410b65f63c741b594255567f337ebc86c51ae45e681484653b45eec01fc5c3e3a4ea170a6bd38e899bdf22f65b2e980d58cac8c11cfcd
+  data.tar.gz: 80ebe8f07ef9679c6921233d52b46979a6bfb895e4b63b974672dec193ef52ce08c40454d2a92fd509f12b8f3567065bb7d2dbee33af7bca37a96246e6373381

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.4.0 (2022-05-21)
+
+* Drop support `:first-child` and `:last-child`
+* Redefine goto scope in nql
+* Fix shift/reduce conflict
+
 ## 1.3.1 (2022-05-14)
 
 * Add `add_comma` option to remove extra comma

data/lib/synvert/core/node_query/compiler/{simple_selector.rb → basic_selector.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Synvert::Core::NodeQuery::Compiler
-  # SimpleSelector used to match nodes, it combines by node type and/or attribute list.
-  class SimpleSelector
-    # Initialize a SimpleSelector.
+  # BasicSelector used to match nodes, it combines by node type and/or attribute list.
+  class BasicSelector
+    # Initialize a BasicSelector.
     # @param node_type [String] the node type
     # @param attribute_list [Synvert::Core::NodeQuery::Compiler::AttributeList] the attribute list
     def initialize(node_type:, attribute_list: nil)
@@ -20,8 +20,7 @@ module Synvert::Core::NodeQuery::Compiler
     end
 
     def to_s
-      result = []
-      result << ".#{@node_type}" if @node_type
+      result = [".#{@node_type}"]
       result << @attribute_list.to_s if @attribute_list
       result.join('')
     end

data/lib/synvert/core/node_query/compiler/expression.rb

@@ -21,13 +21,14 @@ module Synvert::Core::NodeQuery::Compiler
     # Query nodes by the selector and the rest expression.
     #
     # @param node [Parser::AST::Node] node to match
-    # @param descendant_match [Boolean] whether to match in descendant node
     # @return [Array<Parser::AST::Node>] matching nodes.
-    def query_nodes(node, descendant_match = true)
-      matching_nodes = find_nodes_by_selector(node, descendant_match)
+    def query_nodes(node)
+      matching_nodes = @selector.query_nodes(node)
       return matching_nodes if @rest.nil?
 
-      matching_nodes.flat_map { |matching_node| find_nodes_by_rest(matching_node, descendant_match) }
+      matching_nodes.flat_map do |matching_node|
+        @rest.query_nodes(matching_node)
+      end
     end
 
     def to_s
@@ -36,23 +37,5 @@ module Synvert::Core::NodeQuery::Compiler
       result << @rest.to_s if @rest
       result.join(' ')
     end
-
-    private
-
-    # Find nodes by @rest
-    # @param node [Parser::AST::Node] node to match
-    # @param descendant_match [Boolean] whether to match in descendant node
-    def find_nodes_by_rest(node, descendant_match = false)
-      @rest.query_nodes(node, descendant_match)
-    end
-
-    # Find nodes with nil relationship.
-    # @param node [Parser::AST::Node] node to match
-    # @param descendant_match [Boolean] whether to match in descendant node
-    def find_nodes_by_selector(node, descendant_match = true)
-      return Array(node) if !@selector
-
-      @selector.query_nodes(node, descendant_match)
-    end
   end
 end

data/lib/synvert/core/node_query/compiler/selector.rb

@@ -7,17 +7,15 @@ module Synvert::Core::NodeQuery::Compiler
     # @param goto_scope [String] goto scope
     # @param relationship [Symbol] the relationship between the selectors, it can be descendant <code>nil</code>, child <code>></code>, next sibling <code>+</code> or subsequent sibing <code>~</code>.
     # @param rest [Synvert::Core::NodeQuery::Compiler::Selector] the rest selector
-    # @param simple_selector [Synvert::Core::NodeQuery::Compiler::SimpleSelector] the simple selector
+    # @param basic_selector [Synvert::Core::NodeQuery::Compiler::BasicSelector] the simple selector
     # @param attribute_list [Synvert::Core::NodeQuery::Compiler::AttributeList] the attribute list
-    # @param index [Integer] the index
     # @param pseudo_class [String] the pseudo class, can be <code>has</code> or <code>not_has</code>
     # @param pseudo_selector [Synvert::Core::NodeQuery::Compiler::Expression] the pseudo selector
-    def initialize(goto_scope: nil, relationship: nil, rest: nil, simple_selector: nil, index: nil, pseudo_class: nil, pseudo_selector: nil)
+    def initialize(goto_scope: nil, relationship: nil, rest: nil, basic_selector: nil, pseudo_class: nil, pseudo_selector: nil)
       @goto_scope = goto_scope
       @relationship = relationship
       @rest = rest
-      @simple_selector = simple_selector
-      @index = index
+      @basic_selector = basic_selector
       @pseudo_class = pseudo_class
       @pseudo_selector = pseudo_selector
     end
@@ -25,9 +23,7 @@ module Synvert::Core::NodeQuery::Compiler
     # Check if node matches the selector.
     # @param node [Parser::AST::Node] the node
     def match?(node)
-      node.is_a?(::Parser::AST::Node) &&
-        (!@simple_selector || @simple_selector.match?(node)) &&
-        match_pseudo_class?(node)
+      node.is_a?(::Parser::AST::Node) && (!@basic_selector || @basic_selector.match?(node)) && match_pseudo_class?(node)
     end
 
     # Query nodes by the selector.
@@ -38,47 +34,33 @@ module Synvert::Core::NodeQuery::Compiler
     # * If relationship is next sibling, it try to match next sibling node.
     # * If relationship is subsequent sibling, it will match in all sibling nodes.
     # @param node [Parser::AST::Node] node to match
-    # @param descendant_match [Boolean] whether to match in descendant node
     # @return [Array<Parser::AST::Node>] matching nodes.
-    def query_nodes(node, descendant_match = true)
+    def query_nodes(node)
       return find_nodes_by_relationship(node) if @relationship
 
       if node.is_a?(::Array)
-        return node.flat_map { |child_node| query_nodes(child_node, descendant_match) }
+        return node.flat_map { |child_node| query_nodes(child_node) }
       end
 
       return find_nodes_by_goto_scope(node) if @goto_scope
 
       nodes = []
       nodes << node if match?(node)
-      if descendant_match && @simple_selector
+      if @basic_selector
         node.recursive_children do |child_node|
           nodes << child_node if match?(child_node)
         end
       end
-      filter(nodes)
+      nodes
     end
 
     def to_s
       result = []
-      result << "<#{@goto_scope}> " if @goto_scope
+      result << "#{@goto_scope} " if @goto_scope
       result << "#{@relationship} " if @relationship
       result << @rest.to_s if @rest
-      result << @simple_selector.to_s if @simple_selector
+      result << @basic_selector.to_s if @basic_selector
       result << ":#{@pseudo_class}(#{@pseudo_selector})" if @pseudo_class
-      if @index
-        result <<
-          case @index
-          when 0
-            ':first-child'
-          when -1
-            ':last-child'
-          when (1..)
-            ":nth-child(#{@index + 1})"
-          else # ...-1
-            ":nth-last-child(#{-@index})"
-          end
-      end
       result.join('')
     end
 
@@ -88,7 +70,7 @@ module Synvert::Core::NodeQuery::Compiler
     # @param node [Parser::AST::Node] node to match
     def find_nodes_by_goto_scope(node)
       @goto_scope.split('.').each { |scope| node = node.send(scope) }
-      @rest.query_nodes(node, false)
+      @rest.query_nodes(node)
     end
 
     # Find ndoes by @relationship
@@ -114,7 +96,7 @@ module Synvert::Core::NodeQuery::Compiler
           nodes << sibling_node if @rest.match?(sibling_node)
         end
       end
-      return filter(nodes)
+      nodes
     end
 
     def match_pseudo_class?(node)
@@ -127,12 +109,5 @@ module Synvert::Core::NodeQuery::Compiler
         true
       end
     end
-
-    # Filter nodes by index.
-    def filter(nodes)
-      return nodes if @index.nil?
-
-      nodes[@index] ? [nodes[@index]] : []
-    end
   end
 end

data/lib/synvert/core/node_query/compiler.rb

@@ -8,7 +8,7 @@ module Synvert::Core::NodeQuery::Compiler
 
   autoload :Expression, 'synvert/core/node_query/compiler/expression'
   autoload :Selector, 'synvert/core/node_query/compiler/selector'
-  autoload :SimpleSelector, 'synvert/core/node_query/compiler/simple_selector'
+  autoload :BasicSelector, 'synvert/core/node_query/compiler/basic_selector'
   autoload :AttributeList, 'synvert/core/node_query/compiler/attribute_list'
   autoload :Attribute, 'synvert/core/node_query/compiler/attribute'
 

data/lib/synvert/core/node_query/lexer.rex

@@ -7,8 +7,6 @@ macros
   CLOSE_ARRAY              /\)/
   OPEN_SELECTOR            /\(/
   CLOSE_SELECTOR           /\)/
-  OPEN_GOTO_SCOPE          /</
-  CLOSE_GOTO_SCOPE         />/
   OPEN_DYNAMIC_ATTRIBUTE   /{{/
   CLOSE_DYNAMIC_ATTRIBUTE  /}}/
   NODE_TYPE                /\.[a-z]+/
@@ -29,23 +27,16 @@ rules
 
 # [:state]          pattern                       [actions]
                     /\s+/
-                    /:first-child/                { [:tINDEX, 0] }
-                    /:last-child/                 { [:tINDEX, -1] }
-                    /:nth-child\(\d+\)/           { [:tINDEX, text.sub(':nth-child(', '').to_i - 1] }
-                    /:nth-last-child\(\d+\)/      { [:tINDEX, -text.sub(':nth-last-child(', '').to_i] }
                     /:has/                        { [:tPSEUDO_CLASS, text[1..-1]] }
                     /:not_has/                    { [:tPSEUDO_CLASS, text[1..-1]] }
                     /#{NODE_TYPE}/                { [:tNODE_TYPE, text[1..]] }
+                    /#{IDENTIFIER}/               { [:tGOTO_SCOPE, text] }
                     />/                           { [:tRELATIONSHIP, text] }
                     /~/                           { [:tRELATIONSHIP, text] }
                     /\+/                          { [:tRELATIONSHIP, text] }
                     /#{OPEN_SELECTOR}/            { [:tOPEN_SELECTOR, text] }
                     /#{CLOSE_SELECTOR}/           { [:tCLOSE_SELECTOR, text] }
-                    /#{OPEN_GOTO_SCOPE}/          { @state = :GOTO_SCOPE; [:tOPEN_GOTO_SCOPE, text] }
                     /#{OPEN_ATTRIBUTE}/           { @nested_count += 1; @state = :KEY; [:tOPEN_ATTRIBUTE, text] }
-:GOTO_SCOPE         /\s+/
-:GOTO_SCOPE         /#{IDENTIFIER}/               { [:tIDENTIFIER, text] }
-:GOTO_SCOPE         /#{CLOSE_GOTO_SCOPE}/         { @state = nil; [:tCLOSE_GOTO_SCOPE, text] }
 :KEY                /\s+/
 :KEY                /\^=/                         { @state = :VALUE; [:tOPERATOR, '^='] }
 :KEY                /\$=/                         { @state = :VALUE; [:tOPERATOR, '$='] }

data/lib/synvert/core/node_query/lexer.rex.rb

@@ -1,4 +1,3 @@
-# typed: false
 # frozen_string_literal: true
 # encoding: UTF-8
 #--
@@ -21,8 +20,6 @@ class Synvert::Core::NodeQuery::Lexer
   CLOSE_ARRAY             = /\)/
   OPEN_SELECTOR           = /\(/
   CLOSE_SELECTOR          = /\)/
-  OPEN_GOTO_SCOPE         = /</
-  CLOSE_GOTO_SCOPE        = />/
   OPEN_DYNAMIC_ATTRIBUTE  = /{{/
   CLOSE_DYNAMIC_ATTRIBUTE = /}}/
   NODE_TYPE               = /\.[a-z]+/
@@ -128,20 +125,14 @@ class Synvert::Core::NodeQuery::Lexer
           case
           when ss.skip(/\s+/) then
             # do nothing
-          when ss.skip(/:first-child/) then
-            action { [:tINDEX, 0] }
-          when ss.skip(/:last-child/) then
-            action { [:tINDEX, -1] }
-          when text = ss.scan(/:nth-child\(\d+\)/) then
-            action { [:tINDEX, text.sub(':nth-child(', '').to_i - 1] }
-          when text = ss.scan(/:nth-last-child\(\d+\)/) then
-            action { [:tINDEX, -text.sub(':nth-last-child(', '').to_i] }
           when text = ss.scan(/:has/) then
             action { [:tPSEUDO_CLASS, text[1..-1]] }
           when text = ss.scan(/:not_has/) then
             action { [:tPSEUDO_CLASS, text[1..-1]] }
           when text = ss.scan(/#{NODE_TYPE}/) then
             action { [:tNODE_TYPE, text[1..]] }
+          when text = ss.scan(/#{IDENTIFIER}/) then
+            action { [:tGOTO_SCOPE, text] }
           when text = ss.scan(/>/) then
             action { [:tRELATIONSHIP, text] }
           when text = ss.scan(/~/) then
@@ -152,26 +143,12 @@ class Synvert::Core::NodeQuery::Lexer
             action { [:tOPEN_SELECTOR, text] }
           when text = ss.scan(/#{CLOSE_SELECTOR}/) then
             action { [:tCLOSE_SELECTOR, text] }
-          when text = ss.scan(/#{OPEN_GOTO_SCOPE}/) then
-            action { @state = :GOTO_SCOPE; [:tOPEN_GOTO_SCOPE, text] }
           when text = ss.scan(/#{OPEN_ATTRIBUTE}/) then
             action { @nested_count += 1; @state = :KEY; [:tOPEN_ATTRIBUTE, text] }
           else
             text = ss.string[ss.pos .. -1]
             raise ScanError, "can not match (#{state.inspect}) at #{location}: '#{text}'"
           end
-        when :GOTO_SCOPE then
-          case
-          when ss.skip(/\s+/) then
-            # do nothing
-          when text = ss.scan(/#{IDENTIFIER}/) then
-            action { [:tIDENTIFIER, text] }
-          when text = ss.scan(/#{CLOSE_GOTO_SCOPE}/) then
-            action { @state = nil; [:tCLOSE_GOTO_SCOPE, text] }
-          else
-            text = ss.string[ss.pos .. -1]
-            raise ScanError, "can not match (#{state.inspect}) at #{location}: '#{text}'"
-          end
         when :KEY then
           case
           when ss.skip(/\s+/) then

data/lib/synvert/core/node_query/parser.racc.rb

@@ -1,4 +1,3 @@
-# typed: true
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.6.0
@@ -26,98 +25,94 @@ module Synvert
 ##### State transition tables begin ###
 
 racc_action_table = [
-     7,     8,     7,    12,    41,    10,    11,     7,     4,     5,
-    33,    41,    31,    14,    16,    17,    18,    33,     6,    20,
-    42,    34,    35,    36,    37,    38,    39,    40,    34,    35,
-    36,    37,    38,    39,    40,     7,     7,    22,    24,    41,
-    26,    27,     4,     5,    28,    33,    16,     7,    45,    46,
-    48,   nil,     6,     4,     5,   nil,    34,    35,    36,    37,
-    38,    39,    40,     6,     7,   nil,     7,   nil,     7,   nil,
-     4,     5,     4,     5,     4,     5,   nil,   nil,   nil,   nil,
-     6,   nil,     6,   nil,     6 ]
+     7,     7,     6,     8,    10,    34,    14,     4,     5,    15,
+    26,    18,    24,    19,    20,    21,    14,    38,    39,    27,
+    28,    29,    30,    31,    32,    33,     7,    41,     7,     6,
+   nil,    34,   nil,     7,     4,     5,    26,   nil,    34,    35,
+   nil,   nil,   nil,    26,   nil,    27,    28,    29,    30,    31,
+    32,    33,    27,    28,    29,    30,    31,    32,    33,     7,
+     6,     7,     6,     7,     6,     4,     5,     4,     5,     4,
+     5 ]
 
 racc_action_check = [
-    27,     1,     0,     4,    27,     3,     3,    31,     0,     0,
-    27,    31,    27,     6,     7,     8,    11,    31,     0,    14,
-    31,    27,    27,    27,    27,    27,    27,    27,    31,    31,
-    31,    31,    31,    31,    31,    44,     2,    16,    19,    44,
-    21,    22,     2,     2,    23,    44,    26,     5,    33,    43,
-    45,   nil,     2,     5,     5,   nil,    44,    44,    44,    44,
-    44,    44,    44,     5,    12,   nil,    18,   nil,    20,   nil,
-    12,    12,    18,    18,    20,    20,   nil,   nil,   nil,   nil,
-    12,   nil,    18,   nil,    20 ]
+    21,     0,     0,     1,     4,    21,     7,     0,     0,     8,
+    21,    14,    21,    16,    17,    18,    20,    26,    36,    21,
+    21,    21,    21,    21,    21,    21,    24,    38,     2,     2,
+   nil,    24,   nil,    37,     2,     2,    24,   nil,    37,    24,
+   nil,   nil,   nil,    37,   nil,    24,    24,    24,    24,    24,
+    24,    24,    37,    37,    37,    37,    37,    37,    37,     5,
+     5,     6,     6,    10,    10,     5,     5,     6,     6,    10,
+    10 ]
 
 racc_action_pointer = [
-     0,     1,    34,    -2,   -13,    45,     8,     4,    15,   nil,
-   nil,     0,    62,   nil,     0,   nil,    33,   nil,    64,    21,
-    66,    29,    21,    27,   nil,   nil,    36,    -2,   nil,   nil,
-   nil,     5,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    34,    33,    37,   nil,   nil,   nil ]
+    -1,     3,    26,   nil,   -12,    57,    59,    -4,     9,   nil,
+    61,   nil,   nil,   nil,     6,   nil,    -4,     3,    -3,   nil,
+     6,    -2,   nil,   nil,    24,   nil,    -3,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     3,    31,    14,   nil,
+   nil,   nil ]
 
 racc_action_default = [
-   -28,   -28,    -2,    -3,   -28,   -28,   -28,    -9,   -28,    -1,
-    -4,   -28,   -28,    -7,   -28,   -10,   -28,    49,   -28,   -28,
-   -28,   -28,   -28,   -28,    -6,    -8,   -12,   -28,    -5,   -11,
-   -13,   -28,   -18,   -28,   -20,   -21,   -22,   -23,   -24,   -25,
-   -26,   -27,   -14,   -28,   -17,   -28,   -15,   -16,   -19 ]
+   -26,   -26,    -2,    -3,   -26,   -26,   -26,    -7,   -26,    -1,
+   -26,    -5,    -6,    -8,   -26,    42,   -26,   -26,   -26,    -4,
+   -10,   -26,    -9,   -11,   -26,   -16,   -26,   -18,   -19,   -20,
+   -21,   -22,   -23,   -24,   -25,   -12,   -26,   -15,   -26,   -13,
+   -14,   -17 ]
 
 racc_goto_table = [
-    15,    32,    13,    43,     1,    32,     9,    21,    30,    19,
-   nil,   nil,   nil,   nil,   nil,    23,    47,    25,    32,    29 ]
+    25,    13,    36,    25,    11,    12,     1,    17,     9,    16,
+    23,   nil,   nil,   nil,    22,    40,    25 ]
 
 racc_goto_check = [
-     4,     3,     2,     7,     1,     3,     1,     5,     6,     2,
-   nil,   nil,   nil,   nil,   nil,     2,     7,     2,     3,     4 ]
+     3,     4,     7,     3,     2,     2,     1,     5,     1,     2,
+     6,   nil,   nil,   nil,     4,     7,     3 ]
 
 racc_goto_pointer = [
-   nil,     4,    -3,   -26,    -7,    -9,   -19,   -28 ]
+   nil,     6,    -1,   -21,    -6,    -7,   -11,   -22 ]
 
 racc_goto_default = [
-   nil,   nil,     2,     3,   nil,   nil,    44,   nil ]
+   nil,   nil,     2,     3,   nil,   nil,    37,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  2, 31, :_reduce_1,
-  1, 31, :_reduce_2,
-  1, 32, :_reduce_3,
-  2, 32, :_reduce_4,
-  5, 32, :_reduce_5,
-  4, 32, :_reduce_6,
-  2, 32, :_reduce_7,
-  4, 32, :_reduce_8,
-  1, 33, :_reduce_9,
-  2, 33, :_reduce_10,
-  4, 34, :_reduce_11,
-  3, 34, :_reduce_12,
-  3, 35, :_reduce_13,
-  4, 35, :_reduce_14,
-  5, 35, :_reduce_15,
-  2, 37, :_reduce_16,
-  1, 37, :_reduce_17,
-  1, 36, :_reduce_none,
-  3, 36, :_reduce_19,
-  1, 36, :_reduce_20,
-  1, 36, :_reduce_21,
-  1, 36, :_reduce_22,
-  1, 36, :_reduce_23,
-  1, 36, :_reduce_24,
-  1, 36, :_reduce_25,
-  1, 36, :_reduce_26,
-  1, 36, :_reduce_27 ]
-
-racc_reduce_n = 28
-
-racc_shift_n = 49
+  2, 29, :_reduce_1,
+  1, 29, :_reduce_2,
+  1, 30, :_reduce_3,
+  4, 30, :_reduce_4,
+  2, 30, :_reduce_5,
+  2, 30, :_reduce_6,
+  1, 31, :_reduce_7,
+  2, 31, :_reduce_8,
+  4, 32, :_reduce_9,
+  3, 32, :_reduce_10,
+  3, 33, :_reduce_11,
+  4, 33, :_reduce_12,
+  5, 33, :_reduce_13,
+  2, 35, :_reduce_14,
+  1, 35, :_reduce_15,
+  1, 34, :_reduce_none,
+  3, 34, :_reduce_17,
+  1, 34, :_reduce_18,
+  1, 34, :_reduce_19,
+  1, 34, :_reduce_20,
+  1, 34, :_reduce_21,
+  1, 34, :_reduce_22,
+  1, 34, :_reduce_23,
+  1, 34, :_reduce_24,
+  1, 34, :_reduce_25 ]
+
+racc_reduce_n = 26
+
+racc_shift_n = 42
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :tNODE_TYPE => 2,
-  :tATTRIBUTE => 3,
-  :tKEY => 4,
-  :tIDENTIFIER => 5,
-  :tIDENTIFIER_VALUE => 6,
-  :tINDEX => 7,
+  :tGOTO_SCOPE => 3,
+  :tATTRIBUTE => 4,
+  :tKEY => 5,
+  :tIDENTIFIER => 6,
+  :tIDENTIFIER_VALUE => 7,
   :tPSEUDO_CLASS => 8,
   :tRELATIONSHIP => 9,
   :tOPEN_ATTRIBUTE => 10,
@@ -128,20 +123,18 @@ racc_token_table = {
   :tCLOSE_ARRAY => 15,
   :tOPEN_SELECTOR => 16,
   :tCLOSE_SELECTOR => 17,
-  :tOPEN_GOTO_SCOPE => 18,
-  :tCLOSE_GOTO_SCOPE => 19,
-  :tOPERATOR => 20,
-  :tARRAY_VALUE => 21,
-  :tDYNAMIC_ATTRIBUTE => 22,
-  :tBOOLEAN => 23,
-  :tFLOAT => 24,
-  :tINTEGER => 25,
-  :tNIL => 26,
-  :tREGEXP => 27,
-  :tSTRING => 28,
-  :tSYMBOL => 29 }
-
-racc_nt_base = 30
+  :tOPERATOR => 18,
+  :tARRAY_VALUE => 19,
+  :tDYNAMIC_ATTRIBUTE => 20,
+  :tBOOLEAN => 21,
+  :tFLOAT => 22,
+  :tINTEGER => 23,
+  :tNIL => 24,
+  :tREGEXP => 25,
+  :tSTRING => 26,
+  :tSYMBOL => 27 }
+
+racc_nt_base = 28
 
 racc_use_result_var = false
 
@@ -165,11 +158,11 @@ Racc_token_to_s_table = [
   "$end",
   "error",
   "tNODE_TYPE",
+  "tGOTO_SCOPE",
   "tATTRIBUTE",
   "tKEY",
   "tIDENTIFIER",
   "tIDENTIFIER_VALUE",
-  "tINDEX",
   "tPSEUDO_CLASS",
   "tRELATIONSHIP",
   "tOPEN_ATTRIBUTE",
@@ -180,8 +173,6 @@ Racc_token_to_s_table = [
   "tCLOSE_ARRAY",
   "tOPEN_SELECTOR",
   "tCLOSE_SELECTOR",
-  "tOPEN_GOTO_SCOPE",
-  "tCLOSE_GOTO_SCOPE",
   "tOPERATOR",
   "tARRAY_VALUE",
   "tDYNAMIC_ATTRIBUTE",
@@ -195,7 +186,7 @@ Racc_token_to_s_table = [
   "$start",
   "expression",
   "selector",
-  "simple_selector",
+  "basic_selector",
   "attribute_list",
   "attribute",
   "value",
@@ -216,100 +207,92 @@ def _reduce_2(val, _values)
 end
 
 def _reduce_3(val, _values)
- Compiler::Selector.new(simple_selector: val[0])
+ Compiler::Selector.new(basic_selector: val[0])
 end
 
 def _reduce_4(val, _values)
- Compiler::Selector.new(simple_selector: val[0], index: val[1])
+ Compiler::Selector.new(pseudo_class: val[0], pseudo_selector: val[2])
 end
 
 def _reduce_5(val, _values)
- Compiler::Selector.new(simple_selector: val[0], pseudo_class: val[1], pseudo_selector: val[3])
+ Compiler::Selector.new(relationship: val[0], rest: val[1])
 end
 
 def _reduce_6(val, _values)
- Compiler::Selector.new(pseudo_class: val[0], pseudo_selector: val[2])
+ Compiler::Selector.new(goto_scope: val[0], rest: val[1])
 end
 
 def _reduce_7(val, _values)
- Compiler::Selector.new(relationship: val[0], rest: val[1])
+ Compiler::BasicSelector.new(node_type: val[0])
 end
 
 def _reduce_8(val, _values)
- Compiler::Selector.new(goto_scope: val[1], rest: val[3])
+ Compiler::BasicSelector.new(node_type: val[0], attribute_list: val[1])
 end
 
 def _reduce_9(val, _values)
- Compiler::SimpleSelector.new(node_type: val[0])
-end
-
-def _reduce_10(val, _values)
- Compiler::SimpleSelector.new(node_type: val[0], attribute_list: val[1])
-end
-
-def _reduce_11(val, _values)
  Compiler::AttributeList.new(attribute: val[1], rest: val[3])
 end
 
-def _reduce_12(val, _values)
+def _reduce_10(val, _values)
  Compiler::AttributeList.new(attribute: val[1])
 end
 
-def _reduce_13(val, _values)
+def _reduce_11(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1])
 end
 
-def _reduce_14(val, _values)
+def _reduce_12(val, _values)
  Compiler::Attribute.new(key: val[0], value: Compiler::Array.new, operator: val[1])
 end
 
-def _reduce_15(val, _values)
+def _reduce_13(val, _values)
  Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1])
 end
 
-def _reduce_16(val, _values)
+def _reduce_14(val, _values)
  Compiler::Array.new(value: val[0], rest: val[1])
 end
 
-def _reduce_17(val, _values)
+def _reduce_15(val, _values)
  Compiler::Array.new(value: val[0])
 end
 
-# reduce 18 omitted
+# reduce 16 omitted
 
-def _reduce_19(val, _values)
+def _reduce_17(val, _values)
  Compiler::DynamicAttribute.new(value: val[1])
 end
 
-def _reduce_20(val, _values)
+def _reduce_18(val, _values)
  Compiler::Boolean.new(value: val[0])
 end
 
-def _reduce_21(val, _values)
+def _reduce_19(val, _values)
  Compiler::Float.new(value: val[0])
 end
 
-def _reduce_22(val, _values)
+def _reduce_20(val, _values)
  Compiler::Integer.new(value: val[0])
 end
 
-def _reduce_23(val, _values)
+def _reduce_21(val, _values)
  Compiler::Nil.new(value: val[0])
 end
 
-def _reduce_24(val, _values)
+def _reduce_22(val, _values)
  Compiler::Regexp.new(value: val[0])
 end
 
-def _reduce_25(val, _values)
+def _reduce_23(val, _values)
  Compiler::String.new(value: val[0])
 end
 
-def _reduce_26(val, _values)
+def _reduce_24(val, _values)
  Compiler::Symbol.new(value: val[0])
 end
 
-def _reduce_27(val, _values)
+def _reduce_25(val, _values)
  Compiler::Identifier.new(value: val[0])
 end
 

data/lib/synvert/core/node_query/parser.y

@@ -1,8 +1,8 @@
 class Synvert::Core::NodeQuery::Parser
 options no_result_var
-token tNODE_TYPE tATTRIBUTE tKEY tIDENTIFIER tIDENTIFIER_VALUE tINDEX tPSEUDO_CLASS tRELATIONSHIP
+token tNODE_TYPE tGOTO_SCOPE tATTRIBUTE tKEY tIDENTIFIER tIDENTIFIER_VALUE tPSEUDO_CLASS tRELATIONSHIP
       tOPEN_ATTRIBUTE tCLOSE_ATTRIBUTE tOPEN_DYNAMIC_ATTRIBUTE tCLOSE_DYNAMIC_ATTRIBUTE
-      tOPEN_ARRAY tCLOSE_ARRAY tOPEN_SELECTOR tCLOSE_SELECTOR tOPEN_GOTO_SCOPE tCLOSE_GOTO_SCOPE
+      tOPEN_ARRAY tCLOSE_ARRAY tOPEN_SELECTOR tCLOSE_SELECTOR
       tOPERATOR tARRAY_VALUE tDYNAMIC_ATTRIBUTE tBOOLEAN tFLOAT tINTEGER tNIL tREGEXP tSTRING tSYMBOL
 rule
   expression
@@ -10,16 +10,14 @@ rule
     | selector { Compiler::Expression.new(selector: val[0]) }
 
   selector
-    : simple_selector { Compiler::Selector.new(simple_selector: val[0]) }
-    | simple_selector tINDEX { Compiler::Selector.new(simple_selector: val[0], index: val[1]) }
-    | simple_selector tPSEUDO_CLASS tOPEN_SELECTOR selector tCLOSE_SELECTOR { Compiler::Selector.new(simple_selector: val[0], pseudo_class: val[1], pseudo_selector: val[3]) }
+    : basic_selector { Compiler::Selector.new(basic_selector: val[0]) }
     | tPSEUDO_CLASS tOPEN_SELECTOR selector tCLOSE_SELECTOR { Compiler::Selector.new(pseudo_class: val[0], pseudo_selector: val[2]) }
     | tRELATIONSHIP selector { Compiler::Selector.new(relationship: val[0], rest: val[1]) }
-    | tOPEN_GOTO_SCOPE tIDENTIFIER tCLOSE_GOTO_SCOPE selector { Compiler::Selector.new(goto_scope: val[1], rest: val[3]) }
+    | tGOTO_SCOPE selector { Compiler::Selector.new(goto_scope: val[0], rest: val[1]) }
 
-  simple_selector
-    : tNODE_TYPE { Compiler::SimpleSelector.new(node_type: val[0]) }
-    | tNODE_TYPE attribute_list { Compiler::SimpleSelector.new(node_type: val[0], attribute_list: val[1]) }
+  basic_selector
+    : tNODE_TYPE { Compiler::BasicSelector.new(node_type: val[0]) }
+    | tNODE_TYPE attribute_list { Compiler::BasicSelector.new(node_type: val[0], attribute_list: val[1]) }
 
   attribute_list
     : tOPEN_ATTRIBUTE attribute tCLOSE_ATTRIBUTE attribute_list { Compiler::AttributeList.new(attribute: val[1], rest: val[3]) }
@@ -35,7 +33,7 @@ rule
     | value { Compiler::Array.new(value: val[0]) }
 
   value
-    : simple_selector
+    : basic_selector
     | tOPEN_DYNAMIC_ATTRIBUTE tDYNAMIC_ATTRIBUTE tCLOSE_DYNAMIC_ATTRIBUTE { Compiler::DynamicAttribute.new(value: val[1]) }
     | tBOOLEAN { Compiler::Boolean.new(value: val[0]) }
     | tFLOAT { Compiler::Float.new(value: val[0]) }

data/lib/synvert/core/node_query.rb

@@ -9,12 +9,10 @@
 # * attribute regex: <code>.send[key=~/\A:([^'"]+)\z/]</code>, <code>.send[key!~/\A:([^'"]+)\z/]</code>
 # * attribute conditions: +.send[message != nil]+, +.send[value > 1]+, +.send[value >= 1]+, +.send[value < 1]+, +.send[value <= 1]+
 # * nested attribute: +.send[caller.message = map]+, +.send[arguments.size = 2]+
-# * first or last child: +.def:first-child+, +.send:last-child+
-# * nth-child or nth-last-child: +.def:nth-child(2)+, +.send:nth-last-child(2)+
 # * descendant: +.class .send+
 # * child: +.class > .def+
-# * following sibling: <code>.def:first-child + .def</code>
-# * subsequnt sibling: +.def:first-child ~ .def+
+# * following sibling: <code>.def + .def</code>
+# * subsequnt sibling: +.def ~ .def+
 # * has: +.class:has(.def)+
 #
 # It also supports some custom selectors:
@@ -26,6 +24,7 @@
 # * NOT IN operator: +.send[message NOT IN (create build)]+
 # * INCLUDES operator: +.send[arguments INCLUDES &block]+
 # * dynamic attribute value: +.hash > .pair[key={{value}}]+
+# * goto scope: +.class body > .def+
 #
 # @example
 #   # it matches methods call nodes, like `puts message` or `p message`

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.3.1'
+    VERSION = '1.4.0'
   end
 end

data/spec/synvert/core/node_query/lexer_spec.rb

@@ -502,64 +502,6 @@ module Synvert::Core::NodeQuery
       end
     end
 
-    context 'position' do
-      it 'matches :first-child' do
-        source = '.send[arguments=:create]:first-child'
-        expected_tokens = [
-          [:tNODE_TYPE, "send"],
-          [:tOPEN_ATTRIBUTE, "["],
-          [:tKEY, "arguments"],
-          [:tOPERATOR, "=="],
-          [:tSYMBOL, :create],
-          [:tCLOSE_ATTRIBUTE, "]"],
-          [:tINDEX, 0]
-        ]
-        assert_tokens source, expected_tokens
-      end
-
-      it 'matches :last-child' do
-        source = '.send[arguments=:create]:last-child'
-        expected_tokens = [
-          [:tNODE_TYPE, "send"],
-          [:tOPEN_ATTRIBUTE, "["],
-          [:tKEY, "arguments"],
-          [:tOPERATOR, "=="],
-          [:tSYMBOL, :create],
-          [:tCLOSE_ATTRIBUTE, "]"],
-          [:tINDEX, -1]
-        ]
-        assert_tokens source, expected_tokens
-      end
-
-      it 'matches :nth-child(1)' do
-        source = '.send[arguments=:create]:nth-child(1)'
-        expected_tokens = [
-          [:tNODE_TYPE, "send"],
-          [:tOPEN_ATTRIBUTE, "["],
-          [:tKEY, "arguments"],
-          [:tOPERATOR, "=="],
-          [:tSYMBOL, :create],
-          [:tCLOSE_ATTRIBUTE, "]"],
-          [:tINDEX, 0]
-        ]
-        assert_tokens source, expected_tokens
-      end
-
-      it 'matches :nth-last-child(1)' do
-        source = '.send[arguments=:create]:nth-last-child(1)'
-        expected_tokens = [
-          [:tNODE_TYPE, "send"],
-          [:tOPEN_ATTRIBUTE, "["],
-          [:tKEY, "arguments"],
-          [:tOPERATOR, "=="],
-          [:tSYMBOL, :create],
-          [:tCLOSE_ATTRIBUTE, "]"],
-          [:tINDEX, -1]
-        ]
-        assert_tokens source, expected_tokens
-      end
-    end
-
     context 'descendant' do
       it 'matches' do
         source = '.class .send'
@@ -624,12 +566,10 @@ module Synvert::Core::NodeQuery
 
     context 'goto_scope' do
       it 'matches' do
-        source = '.block <body> > .def'
+        source = '.block body > .def'
         expected_tokens = [
           [:tNODE_TYPE, "block"],
-          [:tOPEN_GOTO_SCOPE, "<"],
-          [:tIDENTIFIER, "body"],
-          [:tCLOSE_GOTO_SCOPE, ">"],
+          [:tGOTO_SCOPE, "body"],
           [:tRELATIONSHIP, ">"],
           [:tNODE_TYPE, "def"]
         ]

data/spec/synvert/core/node_query/parser_spec.rb

@@ -30,37 +30,17 @@ module Synvert::Core::NodeQuery
       end
 
       it 'parses scope' do
-        source = '.block <body> > .send'
-        assert_parser(source)
-      end
-
-      it 'parses :first-child' do
-        source = '.class .def:first-child'
-        assert_parser(source)
-      end
-
-      it 'parses :last-child' do
-        source = '.class .def:last-child'
-        assert_parser(source)
-      end
-
-      it 'parses :nth-child(n)' do
-        source = '.class .def:nth-child(2)'
-        assert_parser(source)
-      end
-
-      it 'parses :nth-last-child(n)' do
-        source = '.class .def:nth-last-child(2)'
+        source = '.block body > .send'
         assert_parser(source)
       end
 
       it 'parses :has selector' do
-        source = '.class:has(> .def)'
+        source = '.class :has(> .def)'
         assert_parser(source)
       end
 
       it 'parses :not_has selector' do
-        source = '.class:not_has(> .def)'
+        source = '.class :not_has(> .def)'
         assert_parser(source)
       end
 
@@ -195,31 +175,6 @@ module Synvert::Core::NodeQuery
         expect(expression.query_nodes(node)).to eq node.body
       end
 
-      it 'matches first def node' do
-        expression = parser.parse('.def:first-child')
-        expect(expression.query_nodes(node)).to eq [node.body.first]
-      end
-
-      it 'matches nested first node' do
-        expression = parser.parse('.def[arguments.size=0] .send:first-child')
-        expect(expression.query_nodes(node)).to eq [node.body.first.body.first, node.body.second.body.first]
-      end
-
-      it 'matches last def node' do
-        expression = parser.parse('.def:last-child')
-        expect(expression.query_nodes(node)).to eq [node.body.last]
-      end
-
-      it 'matches nth-child node' do
-        expression = parser.parse('.def:nth-child(2)')
-        expect(expression.query_nodes(node)).to eq [node.body.second]
-      end
-
-      it 'matches nth-last-child node' do
-        expression = parser.parse('.def:nth-last-child(2)')
-        expect(expression.query_nodes(node)).to eq [node.body[-2]]
-      end
-
       it 'matches start with' do
         expression = parser.parse('.def[name^=foo]')
         expect(expression.query_nodes(node)).to eq [node.body.first, node.body.last]
@@ -297,15 +252,15 @@ module Synvert::Core::NodeQuery
       end
 
       it 'matches goto scope' do
-        expression = parser.parse('.def <body> > .send[message=:create]')
+        expression = parser.parse('.def body > .send[message=:create]')
         expect(expression.query_nodes(node)).to eq [node.body.first.body.last, node.body.second.body.last]
 
-        expression = parser.parse('.def <body> .send[message=:create]')
+        expression = parser.parse('.def body .send[message=:create]')
         expect(expression.query_nodes(node)).to eq [node.body.first.body.last, node.body.second.body.last]
       end
 
       it 'matches multiple goto scope' do
-        expression = parser.parse('.block <caller.arguments> .const[name=Synvert]')
+        expression = parser.parse('.block caller.arguments .const[name=Synvert]')
         expect(expression.query_nodes(test_node)).to eq [test_node.caller.arguments.first]
       end
 

data/spec/synvert/core/rewriter/scope/query_scope_spec.rb

@@ -64,6 +64,13 @@ module Synvert::Core
           scope.process
         }.to raise_error(NodeQuery::Compiler::ParseError)
 
+        scope = described_class.new(instance, '.block <caller.arguments> .hash') {}
+        expect {
+          scope.process
+        }.to raise_error(NodeQuery::Compiler::ParseError)
+      end
+
+      it 'raises InvalidOperatorError' do
         scope = described_class.new(instance, '.send[receiver IN FactoryGirl]') {}
         expect {
           scope.process

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-14 00:00:00.000000000 Z
+date: 2022-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,7 @@ files:
 - lib/synvert/core/node_query/compiler/array.rb
 - lib/synvert/core/node_query/compiler/attribute.rb
 - lib/synvert/core/node_query/compiler/attribute_list.rb
+- lib/synvert/core/node_query/compiler/basic_selector.rb
 - lib/synvert/core/node_query/compiler/boolean.rb
 - lib/synvert/core/node_query/compiler/comparable.rb
 - lib/synvert/core/node_query/compiler/dynamic_attribute.rb
@@ -92,7 +93,6 @@ files:
 - lib/synvert/core/node_query/compiler/parse_error.rb
 - lib/synvert/core/node_query/compiler/regexp.rb
 - lib/synvert/core/node_query/compiler/selector.rb
-- lib/synvert/core/node_query/compiler/simple_selector.rb
 - lib/synvert/core/node_query/compiler/string.rb
 - lib/synvert/core/node_query/compiler/symbol.rb
 - lib/synvert/core/node_query/lexer.rex