node_query 1.15.0 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9215c4354d5f17a61bd0703869547d2dc4eca4b074c5e689451034073c9554da
-  data.tar.gz: d602ad70ae5d1d8c53ea7192a1c401cbe67450ece27523fa4040e520e9b85558
+  metadata.gz: 73328f35ddead7666ea7205aec6775a739ac3875addb68f0716787186149aac5
+  data.tar.gz: b789b58e27ad38de762a2b4f41f2cd0fc4747ef92c8db84ee13204a2f7f72cf0
 SHA512:
-  metadata.gz: 4edce7905bb8b5835d0024f80d2e6a34e01602040c67250873e34d3ebd9c2396df5175608ffe1995048c36f681627b3570571a4f293fd35c9d93da76bb33c0aa
-  data.tar.gz: 9d812e03d9045f344a00a950dbc503ae185cb469844d3f62b98cb3db64659786552e9e46d2209ef809f6a189eae55b98c1a16bf9c2106d12f75519a24dc75d7f
+  metadata.gz: 74fac5a891c4271fa838b955846c7ee816ef26efc557be71b70474225152c1f3ea84209a6301683bb40c6c0fe19aaddf0fec2aa8f934c1a8aa412eb131d19f3c
+  data.tar.gz: d8b25d7069670207d470760b024f47affcc013ecc31b89acb6ec985fb8e8b5716451ff991dceed202703c293fe2f4e5ddb41e8801e6b11692a21cb3f31208a16

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 1.15.2 (2024-04-07)
+
+* Update `prism_ext` to 0.3.0
+* Update `syntax_tree_ext` to 0.8.1
+* Update `parser_node_ext` to 1.3.0
+* Require `parent_node_ext` only when necessary
+
+## 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.2)
 
 GEM
   remote: https://rubygems.org/
@@ -41,11 +41,11 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    parser_node_ext (1.2.2)
+    parser_node_ext (1.3.0)
       parser
     prettier_print (1.2.1)
-    prism (0.22.0)
-    prism_ext (0.2.0)
+    prism (0.25.0)
+    prism_ext (0.3.0)
       prism
     pry (0.14.1)
       coderay (~> 1.1)
@@ -71,7 +71,7 @@ GEM
     shellany (0.0.1)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    syntax_tree_ext (0.7.0)
+    syntax_tree_ext (0.8.1)
       syntax_tree
     thor (1.2.1)
 

data/README.md

@@ -1,5 +1,8 @@
 # NodeQuery
 
+[![Build Status](https://github.com/synvert-hq/node-query-ruby/actions/workflows/main.yml/badge.svg)](https://github.com/synvert-hq/node-query-ruby/actions/workflows/main.yml)
+[![Gem Version](https://img.shields.io/gem/v/node_query.svg)](https://rubygems.org/gems/node_query)
+
 NodeQuery defines a NQL (node query language) and node rules to query AST nodes.
 
 ## Table of Contents
@@ -475,7 +478,7 @@ It matches def node whose arguments are id and name.
 ## Write Adapter
 
 Different parser, like parser, syntax_tree, will generate different AST nodes, to make NodeQuery work for them all,
-we define an [Adapter](https://github.com/xinminlabs/node-query-ruby/blob/main/lib/node_query/adapter.rb) interface,
+we define an [Adapter](https://github.com/synvert-hq/node-query-ruby/blob/main/lib/node_query/adapter.rb) interface,
 if you implement the Adapter interface, you can set it as NodeQuery's adapter.
 
 It provides 2 adapters
@@ -491,4 +494,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/xinminlabs/node-query-ruby.
+Bug reports and pull requests are welcome on GitHub at https://github.com/synvert-hq/node-query-ruby.

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,11 +17,12 @@ 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)
-    child_nodes = node.parent_node.deconstruct_keys([]).except(:location, :comments).values
+    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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class NodeQuery
-  VERSION = "1.15.0"
+  VERSION = "1.15.2"
 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

data/node_query.gemspec

@@ -10,12 +10,12 @@ Gem::Specification.new do |spec|
 
   spec.summary = "ast node query language"
   spec.description = "ast node query language"
-  spec.homepage = "https://github.com/xinminlabs/node-query-ruby"
+  spec.homepage = "https://github.com/synvert-hq/node-query-ruby"
   spec.required_ruby_version = ">= 2.6.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/xinminlabs/node-query-ruby"
-  spec.metadata["changelog_uri"] = "https://github.com/xinminlabs/node-query-ruby/blob/master/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://github.com/synvert-hq/node-query-ruby"
+  spec.metadata["changelog_uri"] = "https://github.com/synvert-hq/node-query-ruby/blob/master/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2024-04-07 00:00:00.000000000 Z
 dependencies: []
 description: ast node query language
 email:
@@ -58,12 +58,12 @@ files:
 - node_query.gemspec
 - sig/node_query.rbs
 - sig/node_query/adapter.rbs
-homepage: https://github.com/xinminlabs/node-query-ruby
+homepage: https://github.com/synvert-hq/node-query-ruby
 licenses: []
 metadata:
-  homepage_uri: https://github.com/xinminlabs/node-query-ruby
-  source_code_uri: https://github.com/xinminlabs/node-query-ruby
-  changelog_uri: https://github.com/xinminlabs/node-query-ruby/blob/master/CHANGELOG.md
+  homepage_uri: https://github.com/synvert-hq/node-query-ruby
+  source_code_uri: https://github.com/synvert-hq/node-query-ruby
+  changelog_uri: https://github.com/synvert-hq/node-query-ruby/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: