node_query 1.13.0 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2e54cf10c098ebfaff54d05d36f482c2766b5308f4b8389b2b6a86c1bfb6363
-  data.tar.gz: 4d0b3f4ece89c3d4184c9b8159b924a2e321bafde7b598ee1789f17a41b73ee4
+  metadata.gz: '085d3a73c288ebe609e98d5ce1e7190afa6b3b9c80751b10c9f411559758f768'
+  data.tar.gz: 53d0498ea483d4d199a8116337efffa1885b4cf9b74c95d760898f5aee4d442e
 SHA512:
-  metadata.gz: 0a0245239a1a6739dc8a9c51ddc507ddec1fba5e11820678d002af9572e4ed3e810b4ff4835bf6c6c36019e750f252da6a1fbbe08aa2abf00374d7010d6e7e36
-  data.tar.gz: e5ae500ad6d17776a1c2becc86f451fa7cc222e731a309dcb86be654930e1b3d038ad649319fa7805e03c4ea54320959898413bbde79a07dfeb09a50831a897d
+  metadata.gz: 469b271b62d8f3bcd6883a9d6967af1c0a2b465fe4d06aab93efd18d043fd155543905c35751606de4c9d059add2cf27695f155205c8b4874181d8882a4de081
+  data.tar.gz: d6cefeec1185bf80aadfd2c2147b8e8d285a4a0950eb6227955d5075747fec74991d71a3c7a60e3633a90f1bf3d8dbb18bc77ee538454fdbf65deb6be2f99c02

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.13.2 (2023-05-18)
+
+* Replace `Parser` specific code
+
+## 1.13.1 (2023-05-16)
+
+* Require `parser` and `syntax_tree` in adapter
+* `SyntaxTreeParser#get_node_type` returns a symbol
+* Node type can be upcase
+
 ## 1.13.0 (2023-05-15)
 
 * Add `SyntaxTreeParser`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.13.0)
+    node_query (1.13.2)
 
 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.3.0)
+    syntax_tree_ext (0.3.1)
       syntax_tree
     thor (1.2.1)
 

data/lib/node_query/adapter/parser.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'parser'
+require 'parser_node_ext'
+
 class NodeQuery::ParserAdapter
   def is_node?(node)
     node.is_a?(Parser::AST::Node)

data/lib/node_query/adapter/syntax_tree.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
+require 'syntax_tree'
+require 'syntax_tree_ext'
+
 class NodeQuery::SyntaxTreeAdapter
   def is_node?(node)
     node.is_a?(SyntaxTree::Node)
   end
 
   def get_node_type(node)
-    node.class.name.split('::').last
+    node.class.name.split('::').last.to_sym
   end
 
   def get_source(node)
-    node.source
+    node.to_source
   end
 
   def get_children(node)

data/lib/node_query/compiler/comparable.rb

@@ -90,22 +90,7 @@ module NodeQuery::Compiler
     # @return the node value, could be integer, float, string, boolean, nil, range, and etc.
     def actual_value(node)
       if NodeQuery.adapter.is_node?(node)
-        case NodeQuery.adapter.get_node_type(node)
-        when :int, :float, :str, :sym
-          NodeQuery.adapter.get_children(node).last
-        when :true
-          true
-        when :false
-          false
-        when :nil
-          nil
-        when :array
-          NodeQuery.adapter.get_children(node).map { |child_node| actual_value(child_node) }
-        when :begin
-          actual_value(NodeQuery.adapter.get_children(node).first)
-        else
-          node
-        end
+        node.to_value
       else
         node
       end

data/lib/node_query/compiler/selector.rb

@@ -31,8 +31,8 @@ module NodeQuery::Compiler
     end
 
     # Check if node matches the selector.
-    # @param node [Parser::AST::Node] the node
-    # @param base_node [Parser::AST::Node] the base node for evaluated node
+    # @param node [Node] the node
+    # @param base_node [Node] the base node for evaluated node
     def match?(node, base_node, operator = "==")
       if node.is_a?(::Array)
         case operator
@@ -153,9 +153,9 @@ module NodeQuery::Compiler
             nodes << child_node if @rest.match?(child_node, child_node)
           end
         else
-          node.children.each do |child_node|
+          NodeQuery.adapter.get_children(node).each do |child_node|
             if NodeQuery.adapter.is_node?(child_node) && :begin == NodeQuery.adapter.get_node_type(child_node)
-              child_node.children.each do |child_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
             elsif @rest.match?(child_node, child_node)

data/lib/node_query/helper.rb

@@ -30,7 +30,7 @@ class NodeQuery::Helper
     # Recursively handle child nodes.
     # @param node [Node] ast node
     # @yield [child] Gives a child node.
-    # @yieldparam child [Parser::AST::Node] child node
+    # @yieldparam child [Node] child node
     def handle_recursive_child(node, &block)
       NodeQuery.adapter.get_children(node).each do |child|
         if NodeQuery.adapter.is_node?(child)

data/lib/node_query/node_rules.rb

@@ -95,14 +95,14 @@ class NodeQuery::NodeRules
 
     case expected
     when Symbol
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         actual_source = NodeQuery.adapter.get_source(actual)
         actual_source == ":#{expected}" || actual_source == expected.to_s
       else
         actual.to_sym == expected
       end
     when String
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         actual_source = NodeQuery.adapter.get_source(actual)
         actual_source == expected || actual_source == unwrap_quote(expected) ||
           unwrap_quote(actual_source) == expected || unwrap_quote(actual_source) == unwrap_quote(expected)
@@ -110,7 +110,7 @@ class NodeQuery::NodeRules
         actual.to_s == expected || wrap_quote(actual.to_s) == expected
       end
     when Regexp
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         actual.to_source =~ Regexp.new(expected.to_s, Regexp::MULTILINE)
       else
         actual.to_s =~ Regexp.new(expected.to_s, Regexp::MULTILINE)
@@ -120,13 +120,13 @@ class NodeQuery::NodeRules
 
       actual.zip(expected).all? { |a, e| match_value?(a, e) }
     when NilClass
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         :nil == actual.type
       else
         actual.nil?
       end
     when Numeric
-      if actual.is_a?(Parser::AST::Node)
+      if NodeQuery.adapter.is_node?(actual)
         actual.children[0] == expected
       else
         actual == expected
@@ -135,10 +135,12 @@ class NodeQuery::NodeRules
       :true == actual&.type
     when FalseClass
       :false == actual&.type
-    when Parser::AST::Node
-      actual == expected
     else
-      raise NodeQuery::MethodNotSupported, "#{expected} is not supported"
+      if NodeQuery.adapter.is_node?(expected)
+        actual == expected
+      else
+        raise NodeQuery::MethodNotSupported, "#{expected} is not supported"
+      end
     end
   end
 

data/lib/node_query/version.rb

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

data/lib/node_query.rb

@@ -18,7 +18,7 @@ class NodeQuery
   # @param [Hash] options options to configure
   # @option options [NodeQuery::Adapter] :adapter the adpater
   def self.configure(options)
-    @adapter = options.adapter
+    @adapter = options[:adapter]
   end
 
   # Get the adapter

data/lib/node_query_lexer.rex

@@ -7,7 +7,7 @@ macros
   CLOSE_ARRAY              /\)/
   OPEN_SELECTOR            /\(/
   CLOSE_SELECTOR           /\)/
-  NODE_TYPE                /\.[a-z]+/
+  NODE_TYPE                /\.[a-zA-Z]+/
   IDENTIFIER               /[@\*\-\.\w]*\w/
   IDENTIFIER_VALUE         /[@\.\w!&:\?<>=]+/
   FALSE                    /false/

data/lib/node_query_lexer.rex.rb

@@ -20,7 +20,7 @@ class NodeQueryLexer
   CLOSE_ARRAY         = /\)/
   OPEN_SELECTOR       = /\(/
   CLOSE_SELECTOR      = /\)/
-  NODE_TYPE           = /\.[a-z]+/
+  NODE_TYPE           = /\.[a-zA-Z]+/
   IDENTIFIER          = /[@\*\-\.\w]*\w/
   IDENTIFIER_VALUE    = /[@\.\w!&:\?<>=]+/
   FALSE               = /false/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies: []
 description: ast node query language
 email: