node_query 1.13.1 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f0ea7e92fbee3e2c0c28554dd021b1e2a07fd4c64b9dd7f1a6b5acbc7d8385f
-  data.tar.gz: cc317efc39dd07bc30c1cd54cd03eded67c82a92a37b809340add4c8372e77ea
+  metadata.gz: '09b566f97aa10b9630187ef0dee3b703480eb01347a44d799295c8a8d1111dcd'
+  data.tar.gz: a68b6f479e49aad2bf8dd7e3e03d4a53f0e7fe3c21dd77d7b9ac5adee3c1408b
 SHA512:
-  metadata.gz: b7bb08d7bacc6da4232f7e16a9397e565ae4b4523b8d177068672441aecdcaa49a01be8b3e614aeef138e365ad210bd1e121857690061324f889e8486105c79a
-  data.tar.gz: 2736927c6b34ee327b02e4230bc4b8879f8582f8a9840740c99bd122a9d53eecd5c099dc2e3b2407629047a88e3477e253d878fe56e835264e38a405ede78bc2
+  metadata.gz: c8eefe2252d378dceaae5dc878c3383e6c48004888440e0a7b87c93a70c168ba6ed102c84adac60426b922727d455270f23f95abc88d21a008f4aa6527e01315
+  data.tar.gz: 5996c60bd2df1bec0660b2468924a77f50b06e53d7206d09caaa723e3b06d82dab1ffc4133bdc0fe46c3e521a5c278b24f0cd9e584ae12e01ff05896a512aa21

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.13.3 (2023-06-14)
+
+* Use `deconstruct_key` to get syntax_tree node children
+* `handle_recursive_child` handles Array child node
+
+## 1.13.2 (2023-05-18)
+
+* Replace `Parser` specific code
+
 ## 1.13.1 (2023-05-16)
 
 * Require `parser` and `syntax_tree` in adapter

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.13.1)
+    node_query (1.13.3)
 
 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.3.0)
+    syntax_tree_ext (0.3.1)
       syntax_tree
     thor (1.2.1)
 

data/lib/node_query/adapter/syntax_tree.rb

@@ -13,11 +13,11 @@ class NodeQuery::SyntaxTreeAdapter
   end
 
   def get_source(node)
-    node.source
+    node.to_source
   end
 
   def get_children(node)
-    node.child_nodes
+    node.deconstruct_keys([]).except(:location, :comments).values
   end
 
   def get_siblings(node)

data/lib/node_query/compiler/comparable.rb

@@ -90,22 +90,7 @@ module NodeQuery::Compiler
     # @return the node value, could be integer, float, string, boolean, nil, range, and etc.
     def actual_value(node)
       if NodeQuery.adapter.is_node?(node)
-        case NodeQuery.adapter.get_node_type(node)
-        when :int, :float, :str, :sym
-          NodeQuery.adapter.get_children(node).last
-        when :true
-          true
-        when :false
-          false
-        when :nil
-          nil
-        when :array
-          NodeQuery.adapter.get_children(node).map { |child_node| actual_value(child_node) }
-        when :begin
-          actual_value(NodeQuery.adapter.get_children(node).first)
-        else
-          node
-        end
+        node.to_value
       else
         node
       end

data/lib/node_query/compiler/selector.rb

@@ -31,8 +31,8 @@ module NodeQuery::Compiler
     end
 
     # Check if node matches the selector.
-    # @param node [Parser::AST::Node] the node
-    # @param base_node [Parser::AST::Node] the base node for evaluated node
+    # @param node [Node] the node
+    # @param base_node [Node] the base node for evaluated node
     def match?(node, base_node, operator = "==")
       if node.is_a?(::Array)
         case operator
@@ -153,9 +153,9 @@ module NodeQuery::Compiler
             nodes << child_node if @rest.match?(child_node, child_node)
           end
         else
-          node.children.each do |child_node|
+          NodeQuery.adapter.get_children(node).each do |child_node|
             if NodeQuery.adapter.is_node?(child_node) && :begin == NodeQuery.adapter.get_node_type(child_node)
-              child_node.children.each do |child_child_node|
+              NodeQuery.adapter.get_children(child_node).each do |child_child_node|
                 nodes << child_child_node if @rest.match?(child_child_node, child_child_node)
               end
             elsif @rest.match?(child_node, child_node)

data/lib/node_query/helper.rb

@@ -30,12 +30,17 @@ class NodeQuery::Helper
     # Recursively handle child nodes.
     # @param node [Node] ast node
     # @yield [child] Gives a child node.
-    # @yieldparam child [Parser::AST::Node] child node
+    # @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
       end
     end

data/lib/node_query/node_rules.rb

@@ -95,14 +95,14 @@ class NodeQuery::NodeRules
 
     case expected
     when Symbol
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         actual_source = NodeQuery.adapter.get_source(actual)
         actual_source == ":#{expected}" || actual_source == expected.to_s
       else
         actual.to_sym == expected
       end
     when String
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         actual_source = NodeQuery.adapter.get_source(actual)
         actual_source == expected || actual_source == unwrap_quote(expected) ||
           unwrap_quote(actual_source) == expected || unwrap_quote(actual_source) == unwrap_quote(expected)
@@ -110,7 +110,7 @@ class NodeQuery::NodeRules
         actual.to_s == expected || wrap_quote(actual.to_s) == expected
       end
     when Regexp
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         actual.to_source =~ Regexp.new(expected.to_s, Regexp::MULTILINE)
       else
         actual.to_s =~ Regexp.new(expected.to_s, Regexp::MULTILINE)
@@ -120,13 +120,13 @@ class NodeQuery::NodeRules
 
       actual.zip(expected).all? { |a, e| match_value?(a, e) }
     when NilClass
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         :nil == actual.type
       else
         actual.nil?
       end
     when Numeric
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         actual.children[0] == expected
       else
         actual == expected
@@ -135,10 +135,12 @@ class NodeQuery::NodeRules
       :true == actual&.type
     when FalseClass
       :false == actual&.type
-    when Parser::AST::Node
-      actual == expected
     else
-      raise NodeQuery::MethodNotSupported, "#{expected} is not supported"
+      if NodeQuery.adapter.is_node?(expected)
+        actual == expected
+      else
+        raise NodeQuery::MethodNotSupported, "#{expected} is not supported"
+      end
     end
   end
 

data/lib/node_query/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-06-14 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.10
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: ast node query language