node_query 1.13.10 → 1.13.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 587cefdbcb8ef9ae22bdf3ec6f9a5ccbbe468c67801a841cdd96204634567b05
-  data.tar.gz: 4257ea586307071a0edb6ef6657af7a2227ed4b6006532d4186c1f02ed4d4711
+  metadata.gz: cdd226c05ade3d2dde453af11182b02cabe7111f27ab7eaa5677b5b48d3ac247
+  data.tar.gz: 06bde0578a6e5e113cd1675207f8bef58a77b07761e13bee0c9fdfc2d00cf8e5
 SHA512:
-  metadata.gz: 60efa801673c6243456a98a50249edb70d7c46443def3b160530d2d9ab7633e62b4c012c9ed5f08f13ea8d3756870d63b194c9529818a4f3b2cc6c5a6a134533
-  data.tar.gz: ab891c93073c30d513f6886c72d7c5054268de9772231c350d190597978250510f25120fbbb339e9d93c96710f73dc7609b0199bccaf5a595794e11fefb90952
+  metadata.gz: 3f2cd0d797d7c212481a481754aca0a448e6bafbee7a4b93b53c6c17255a40e066df5368cdae8304a9da99f3059042ff5798916519aeb25fea1c06c84282c620
+  data.tar.gz: 7249a00c56a7d527dee321375d6b3f05115fe3666ea8a126b7994935974e7dd7ec1d767296e2cd43d2987189c8c964eec5b065c42d7c7dd27d92c83f3b5d1b29

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.13.12 (2023-09-29)
+
+* `NODE_TYPE` can contain `_`
+* Update `syntax_tree_ext` to 0.6.4
+
+## 1.13.11 (2023-08-17)
+
+* Do not handle if `child_node` is nil
+
 ## 1.13.10 (2023-08-12)
 
 * Update `node_query_parser.y`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.13.10)
+    node_query (1.13.12)
 
 GEM
   remote: https://rubygems.org/
@@ -67,7 +67,7 @@ GEM
     shellany (0.0.1)
     syntax_tree (6.1.1)
       prettier_print (>= 1.2.0)
-    syntax_tree_ext (0.6.2)
+    syntax_tree_ext (0.6.4)
       syntax_tree
     thor (1.2.1)
 

data/lib/node_query/helper.rb

@@ -33,15 +33,7 @@ class NodeQuery::Helper
     # @yieldparam child [Node] child node
     def handle_recursive_child(node, &block)
       NodeQuery.adapter.get_children(node).each do |child|
-        if NodeQuery.adapter.is_node?(child)
-          block.call(child)
-          handle_recursive_child(child, &block)
-        elsif child.is_a?(Array)
-          child.each do |child_child|
-            block.call(child_child)
-            handle_recursive_child(child_child, &block)
-          end
-        end
+        handle_child(child, &block)
       end
     end
 
@@ -67,5 +59,18 @@ class NodeQuery::Helper
 
       node.to_s
     end
+
+    private
+
+    def handle_child(node, &block)
+      if NodeQuery.adapter.is_node?(node)
+        block.call(node)
+        handle_recursive_child(node, &block)
+      elsif node.is_a?(Array)
+        node.each do |child_node|
+          handle_child(child_node, &block) unless child_node.nil?
+        end
+      end
+    end
   end
 end

data/lib/node_query/version.rb

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

data/lib/node_query_lexer.rex

@@ -7,7 +7,7 @@ macros
   CLOSE_ARRAY              /\)/
   OPEN_SELECTOR            /\(/
   CLOSE_SELECTOR           /\)/
-  NODE_TYPE                /\.[a-zA-Z]+/
+  NODE_TYPE                /\.[a-zA-Z_]+/
   IDENTIFIER               /[@\*\-\.\w]*\w/
   IDENTIFIER_VALUE         /[@\.\w!&:\?<>=]+/
   OPERATOR                 /(\^=|\$=|\*=|!=|=~|!~|>=|<=|>|<|=|not includes|includes|not in|in)/i

data/lib/node_query_lexer.rex.rb

@@ -20,7 +20,7 @@ class NodeQueryLexer
   CLOSE_ARRAY         = /\)/
   OPEN_SELECTOR       = /\(/
   CLOSE_SELECTOR      = /\)/
-  NODE_TYPE           = /\.[a-zA-Z]+/
+  NODE_TYPE           = /\.[a-zA-Z_]+/
   IDENTIFIER          = /[@\*\-\.\w]*\w/
   IDENTIFIER_VALUE    = /[@\.\w!&:\?<>=]+/
   OPERATOR            = /(\^=|\$=|\*=|!=|=~|!~|>=|<=|>|<|=|not includes|includes|not in|in)/i

data/lib/node_query_parser.racc.rb

@@ -7,18 +7,18 @@
 require 'racc/parser.rb'
 class NodeQueryParser < Racc::Parser
 
-    def initialize
-      @lexer = NodeQueryLexer.new
-    end
-
-    def parse string
-      @lexer.parse string
-      do_parse
-    end
-
-    def next_token
-      @lexer.next_token
-    end
+  def initialize
+    @lexer = NodeQueryLexer.new
+  end
+
+  def parse string
+    @lexer.parse string
+    do_parse
+  end
+
+  def next_token
+    @lexer.next_token
+  end
 ##### State transition tables begin ###
 
 racc_action_table = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.13.10
+  version: 1.13.12
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-12 00:00:00.000000000 Z
+date: 2023-09-29 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.17
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: ast node query language