node_query 1.14.1 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ca6c90b61fc096a8827b28f96e8af9c2f3bf114e09a0bc6f4fa4c2b6b0a5dcb
-  data.tar.gz: 14f2604eb60f8482d0c9182e2aa0054bbec3130c49504f519936d95d03a7611c
+  metadata.gz: 9b7a968afbfc580614cb1647fd59933e29ca42a51f16bd94d83bfdd2ff6d76f3
+  data.tar.gz: a58361e9a486604fd35e5645528ddb3ad1bf49f314ed704e57954678dfac9d78
 SHA512:
-  metadata.gz: 7d40bbebba507b8bf52b9c6981c060a07c827f01a30c78cf5dec7a916fb085f0377e1b3ca19a5ed8cef8117c3850cb1ff5055fcb48599522648bd22340d8397d
-  data.tar.gz: a9c3edcb83f845e350f5004a21278735e67c6357d28096011b8acd1908290bf1fa2e44d4f0223c0fcd4ace273bbdfc317043b509c160d6ea7bfd4f79fbe542fd
+  metadata.gz: 2468e0e6e5fc5b2fe8d9f93e9169394552991a6813af79428d14d6740b206a4f8e4b1eb37c8b7bbea826daf96157bd571d57ac0afdb302b0271ea2be8ffe088c
+  data.tar.gz: feecda8504d3b2477a3152b2993cd8b18a301d9f2e07f09e523b2a4cbed8791369ddffcf3c727dd5b059b34cf52aeec83b507451d14c9f4129aef177552022aa

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 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`
+
 ## 1.14.1 (2023-11-27)
 
 * Fix `ArrayValue` with `adapter` parameter

data/Gemfile

@@ -14,6 +14,6 @@ gem "guard-rspec"
 gem "guard-rake"
 gem "oedipus_lex"
 gem "racc"
-gem "parser"
 gem "parser_node_ext"
 gem "syntax_tree_ext"
+gem "prism_ext"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.14.1)
+    node_query (1.15.1)
 
 GEM
   remote: https://rubygems.org/
@@ -38,16 +38,19 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     oedipus_lex (2.6.0)
-    parser (3.2.2.3)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    parser_node_ext (1.2.1)
+    parser_node_ext (1.2.2)
       parser
     prettier_print (1.2.1)
+    prism (0.22.0)
+    prism_ext (0.2.0)
+      prism
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.2)
+    racc (1.7.3)
     rake (13.0.6)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
@@ -66,15 +69,16 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     shellany (0.0.1)
-    syntax_tree (6.1.1)
+    syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    syntax_tree_ext (0.6.4)
+    syntax_tree_ext (0.7.0)
       syntax_tree
     thor (1.2.1)
 
 PLATFORMS
   x86_64-darwin-21
   x86_64-darwin-22
+  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -83,8 +87,8 @@ DEPENDENCIES
   guard-rspec
   node_query!
   oedipus_lex
-  parser
   parser_node_ext
+  prism_ext
   racc
   rake (~> 13.0)
   rspec (~> 3.0)

data/README.md

@@ -258,7 +258,7 @@ It matches def node whose arguments are either id or name.
 .class .send
 ```
 
-It matches send node whose ansestor is class node.
+It matches send node whose ancestor is class node.
 
 #### Child combinator
 

data/lib/node_query/adapter/prism.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'prism'
+require 'prism_ext'
+
+class NodeQuery::PrismAdapter
+  def is_node?(node)
+    node.is_a?(Prism::Node)
+  end
+
+  def get_node_type(node)
+    node.type
+  end
+
+  def get_source(node)
+    node.slice
+  end
+
+  def get_children(node)
+    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 = 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...]
+    end
+
+    index = child_nodes.index(node)
+    child_nodes[index + 1...]
+  end
+end

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,10 +17,18 @@ 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)
-    node.siblings
+    child_nodes = node.parent_node.deconstruct_keys([]).except(:location, :comments).values
+    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...]
+    end
+
+    index = child_nodes.index(node)
+    child_nodes[index + 1...]
   end
 end

data/lib/node_query/compiler/selector.rb

@@ -93,7 +93,7 @@ module NodeQuery::Compiler
             end
           end
         else
-          NodeQuery.adapter.get_children(node).each do |child_node|
+          @adapter.get_children(node).each do |child_node|
             if match?(child_node, child_node)
               nodes << child_node
               break if options[:stop_at_first_match]
@@ -171,10 +171,10 @@ module NodeQuery::Compiler
           end
         end
       when '+'
-        next_sibling = node.siblings.first
+        next_sibling = @adapter.get_siblings(node).first
         nodes << next_sibling if @rest.match?(next_sibling, next_sibling)
       when '~'
-        node.siblings.each do |sibling_node|
+        @adapter.get_siblings(node).each do |sibling_node|
           nodes << sibling_node if @rest.match?(sibling_node, sibling_node)
         end
       end

data/lib/node_query/version.rb

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

data/lib/node_query.rb

@@ -11,6 +11,7 @@ class NodeQuery
   autoload :Adapter, "node_query/adapter"
   autoload :ParserAdapter, "node_query/adapter/parser"
   autoload :SyntaxTreeAdapter, "node_query/adapter/syntax_tree"
+  autoload :PrismAdapter, "node_query/adapter/prism"
   autoload :Compiler, "node_query/compiler"
   autoload :Helper, "node_query/helper"
   autoload :NodeRules, "node_query/node_rules"
@@ -65,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.14.1
+  version: 1.15.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies: []
 description: ast node query language
 email:
@@ -27,6 +27,7 @@ files:
 - lib/node_query.rb
 - lib/node_query/adapter.rb
 - lib/node_query/adapter/parser.rb
+- lib/node_query/adapter/prism.rb
 - lib/node_query/adapter/syntax_tree.rb
 - lib/node_query/compiler.rb
 - lib/node_query/compiler/array_value.rb
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: ast node query language