node_query 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dfe6e9207a883cc7d7240f46bac3d4628443f9eb40bcd5af36802311ebad8ae
-  data.tar.gz: 1d4dbd34cb794d95fc594f020fd07706e5babc85a38ea303a2c9ce4a31ed2f0a
+  metadata.gz: 9215c4354d5f17a61bd0703869547d2dc4eca4b074c5e689451034073c9554da
+  data.tar.gz: d602ad70ae5d1d8c53ea7192a1c401cbe67450ece27523fa4040e520e9b85558
 SHA512:
-  metadata.gz: 70dc0235743a5191905c18633a633f620bdff6ffcd8bd4704b31d84ff724239e2e604e9999be9532022fa4d6b590bf3d2b886f468f0e4add83c4c1594f45ad58
-  data.tar.gz: 3831937eb116d7e49812631488cc12bbbcf1c923212e810e35ca98a15590b6241c3659ed24909d36206a28176d2d7a721f1ec9e2d10556c6fea62f2889e0d104
+  metadata.gz: 4edce7905bb8b5835d0024f80d2e6a34e01602040c67250873e34d3ebd9c2396df5175608ffe1995048c36f681627b3570571a4f293fd35c9d93da76bb33c0aa
+  data.tar.gz: 9d812e03d9045f344a00a950dbc503ae185cb469844d3f62b98cb3db64659786552e9e46d2209ef809f6a189eae55b98c1a16bf9c2106d12f75519a24dc75d7f

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.15.0 (2024-02-10)
+
+* Support `prism`
+
+## 1.14.1 (2023-11-27)
+
+* Fix `ArrayValue` with `adapter` parameter
+
 ## 1.14.0 (2023-11-27)
 
 * Add `adapter` parameter to `NodeQuery`

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.0)
+    node_query (1.15.0)
 
 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,33 @@
+# 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.class.name.split('::').last.to_sym
+  end
+
+  def get_source(node)
+    node.slice
+  end
+
+  def get_children(node)
+    node.child_nodes
+  end
+
+  def get_siblings(node)
+    child_nodes = node.parent_node.child_nodes
+    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

@@ -29,6 +29,13 @@ class NodeQuery::SyntaxTreeAdapter
   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.0"
+  VERSION = "1.15.0"
 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"

data/lib/node_query_parser.racc.rb

@@ -254,7 +254,7 @@ def _reduce_14(val, _values)
 end
 
 def _reduce_15(val, _values)
- NodeQuery::Compiler::Attribute.new(key: val[1], value: NodeQuery::Compiler::ArrayValue.new, operator: val[2], adapter: @adapter)
+ NodeQuery::Compiler::Attribute.new(key: val[1], value: NodeQuery::Compiler::ArrayValue.new(adapter: @adapter), operator: val[2], adapter: @adapter)
 end
 
 def _reduce_16(val, _values)

data/lib/node_query_parser.y

@@ -29,7 +29,7 @@ rule
 
   attribute
     : tOPEN_ATTRIBUTE tKEY tOPERATOR value tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: val[3], operator: val[2], adapter: @adapter) }
-    | tOPEN_ATTRIBUTE tKEY tOPERATOR tOPEN_ARRAY tCLOSE_ARRAY tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: NodeQuery::Compiler::ArrayValue.new, operator: val[2], adapter: @adapter) }
+    | tOPEN_ATTRIBUTE tKEY tOPERATOR tOPEN_ARRAY tCLOSE_ARRAY tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: NodeQuery::Compiler::ArrayValue.new(adapter: @adapter), operator: val[2], adapter: @adapter) }
     | tOPEN_ATTRIBUTE tKEY tOPERATOR tOPEN_ARRAY array_value tCLOSE_ARRAY tCLOSE_ATTRIBUTE { NodeQuery::Compiler::Attribute.new(key: val[1], value: val[4], operator: val[2], adapter: @adapter) }
 
   array_value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2024-02-10 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