node_query 1.13.6 → 1.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fc52310d059d7e75fec20edc82dbecbdfc4d35c1e020c11d00502c0e5fe5908
-  data.tar.gz: 69d60bdc00ee3f045c9c04984f8b8d6428c1ade3c390b451965abe0343d436cc
+  metadata.gz: cebf13af77b1b91af393dbf741b12ef1804de496d85f243b336decdb05ee5c8a
+  data.tar.gz: e4815863dc1b57e92f2e1bbc1858b8e35668e4a22d9392bc565af4f3993dcdc9
 SHA512:
-  metadata.gz: 6924c8b4f4cd528eba9702ffa65f8b5845cd6e2677af90f662e8e1586353f9ccf9b1fa37f6cdafcb7e12abeeb22af614d936f1f7261aa6dab5f7e458ff2f9667
-  data.tar.gz: c8787e460af35970f72751cedf04fe3f453b3b7afd451c9d80516979706785857be0380506b46f321c1ba3c885fee93eff5eac496853524c996ccfd1df359137
+  metadata.gz: e9fd0443d795e0dccef4c74ea9ff9fc242f96c4b2790b9f56ae5a03d4fc235ed7d950c1f9d7391961ca8450f0de075a103d9ba02db402199957de3d84ea153d6
+  data.tar.gz: 8aafbc1a54eea3af5fd5dcadced6ce5cf66d51ca0f76128bca1643401aab3c0b3c5673a11ed4cbca7955aa62698053c57525b2f57b03a3af6daf9b96b04554a9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.13.8 (2023-06-28)
+
+* Check `.to_value` instead of `.type`
+
+## 1.13.7 (2023-06-26)
+
+* Revert "Flatten syntax_tree children"
+
 ## 1.13.6 (2023-06-26)
 
 * Flatten syntax_tree children

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.13.6)
+    node_query (1.13.8)
 
 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.1)
+    syntax_tree_ext (0.6.2)
       syntax_tree
     thor (1.2.1)
 

data/lib/node_query/adapter/syntax_tree.rb

@@ -25,7 +25,7 @@ class NodeQuery::SyntaxTreeAdapter
   end
 
   def get_children(node)
-    node.deconstruct_keys([]).except(:location, :comments).values.flatten
+    node.deconstruct_keys([]).except(:location, :comments).values
   end
 
   def get_siblings(node)

data/lib/node_query/compiler/selector.rb

@@ -154,7 +154,11 @@ module NodeQuery::Compiler
           end
         else
           NodeQuery.adapter.get_children(node).each do |child_node|
-            if NodeQuery.adapter.is_node?(child_node) && :begin == NodeQuery.adapter.get_node_type(child_node)
+            if child_node.is_a?(Array) # SyntaxTree may return an array in child node.
+              child_node.each do |child_child_node|
+                nodes << child_child_node if @rest.match?(child_child_node, child_child_node)
+              end
+            elsif NodeQuery.adapter.is_node?(child_node) && :begin == NodeQuery.adapter.get_node_type(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

data/lib/node_query/node_rules.rb

@@ -121,7 +121,7 @@ class NodeQuery::NodeRules
       actual.zip(expected).all? { |a, e| match_value?(a, e) }
     when NilClass
       if NodeQuery.adapter.is_node?(actual)
-        :nil == actual.type
+        actual.to_value.nil?
       else
         actual.nil?
       end
@@ -132,9 +132,9 @@ class NodeQuery::NodeRules
         actual == expected
       end
     when TrueClass
-      :true == actual&.type
+      true == actual&.to_value
     when FalseClass
-      :false == actual&.type
+      false == actual&.to_value
     else
       if NodeQuery.adapter.is_node?(expected)
         actual == expected

data/lib/node_query/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.13.6
+  version: 1.13.8
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-26 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies: []
 description: ast node query language
 email: