node_query 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9215c4354d5f17a61bd0703869547d2dc4eca4b074c5e689451034073c9554da
-  data.tar.gz: d602ad70ae5d1d8c53ea7192a1c401cbe67450ece27523fa4040e520e9b85558
+  metadata.gz: 9b7a968afbfc580614cb1647fd59933e29ca42a51f16bd94d83bfdd2ff6d76f3
+  data.tar.gz: a58361e9a486604fd35e5645528ddb3ad1bf49f314ed704e57954678dfac9d78
 SHA512:
-  metadata.gz: 4edce7905bb8b5835d0024f80d2e6a34e01602040c67250873e34d3ebd9c2396df5175608ffe1995048c36f681627b3570571a4f293fd35c9d93da76bb33c0aa
-  data.tar.gz: 9d812e03d9045f344a00a950dbc503ae185cb469844d3f62b98cb3db64659786552e9e46d2209ef809f6a189eae55b98c1a16bf9c2106d12f75519a24dc75d7f
+  metadata.gz: 2468e0e6e5fc5b2fe8d9f93e9169394552991a6813af79428d14d6740b206a4f8e4b1eb37c8b7bbea826daf96157bd571d57ac0afdb302b0271ea2be8ffe088c
+  data.tar.gz: feecda8504d3b2477a3152b2993cd8b18a301d9f2e07f09e523b2a4cbed8791369ddffcf3c727dd5b059b34cf52aeec83b507451d14c9f4129aef177552022aa

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.15.1 (2024-02-16)
+
+* Use `deconstruct_keys` to get prism children
+* Get `PrismAdapter`
+* Read prism node type
+
 ## 1.15.0 (2024-02-10)
 
 * Support `prism`

data/Gemfile.lock

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

data/lib/node_query/adapter/prism.rb

@@ -9,7 +9,7 @@ class NodeQuery::PrismAdapter
   end
 
   def get_node_type(node)
-    node.class.name.split('::').last.to_sym
+    node.type
   end
 
   def get_source(node)
@@ -17,11 +17,29 @@ class NodeQuery::PrismAdapter
   end
 
   def get_children(node)
-    node.child_nodes
+    keys = []
+    children = []
+    node.deconstruct_keys([]).each do |key, value|
+      next if [:flags, :location].include?(key)
+
+      if key.to_s.end_with?('_loc')
+        new_key = key.to_s[0..-5]
+        unless keys.include?(new_key)
+          keys << new_key
+          children << node.send(new_key)
+        end
+      else
+        unless keys.include?(key.to_s)
+          keys << key.to_s
+          children << value
+        end
+      end
+    end
+    children
   end
 
   def get_siblings(node)
-    child_nodes = node.parent_node.child_nodes
+    child_nodes = get_children(node.parent_node)
     if child_nodes.is_a?(Array) && child_nodes.size == 1 && child_nodes.first.is_a?(Array)
       index = child_nodes.first.index(node)
       return child_nodes.first[index + 1...]

data/lib/node_query/adapter/syntax_tree.rb

@@ -3,14 +3,6 @@
 require 'syntax_tree'
 require 'syntax_tree_ext'
 
-if RUBY_VERSION.to_i < 3
-  class Hash
-    def except(*keys)
-      self.reject { |k, _| keys.include?(k) }
-    end
-  end
-end
-
 class NodeQuery::SyntaxTreeAdapter
   def is_node?(node)
     node.is_a?(SyntaxTree::Node)
@@ -25,7 +17,8 @@ class NodeQuery::SyntaxTreeAdapter
   end
 
   def get_children(node)
-    node.deconstruct_keys([]).except(:location, :comments).values
+    node.deconstruct_keys([]).filter { |key, _value| ![:location, :comments].include?(key) }
+        .values
   end
 
   def get_siblings(node)

data/lib/node_query/version.rb

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

data/lib/node_query.rb

@@ -66,6 +66,8 @@ class NodeQuery
       ParserAdapter.new
     when :syntax_tree
       SyntaxTreeAdapter.new
+    when :prism
+      PrismAdapter.new
     else
       raise InvalidAdapterError, "adapter #{adapter} is not supported"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies: []
 description: ast node query language
 email: