node_query 1.12.1 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35243974bb269cb011bc7fb7c4ca8877ef0338cd4cfb8dc80785a06e9b40ee6f
-  data.tar.gz: ad100af634d93ddaa21bd37b89c3d0d542645007ee9bcd73c0f8fd28fe7211ae
+  metadata.gz: 9f0ea7e92fbee3e2c0c28554dd021b1e2a07fd4c64b9dd7f1a6b5acbc7d8385f
+  data.tar.gz: cc317efc39dd07bc30c1cd54cd03eded67c82a92a37b809340add4c8372e77ea
 SHA512:
-  metadata.gz: 656a13c7124f155c6ed96c5d39a901edd248b4ee1d4b19b2d2205c2f244ba0057dec372087b5a4ba08c5d00e784ae5655a0fee1656befe3061df780e8edc9e7b
-  data.tar.gz: e811b204f0cc9848b9c65a85295049e37e7f1bf2cb1897f79236093af95a941133962ae425d125c103e123da9019960d00ddf4c41850e868cf5fabd7c245f64a
+  metadata.gz: b7bb08d7bacc6da4232f7e16a9397e565ae4b4523b8d177068672441aecdcaa49a01be8b3e614aeef138e365ad210bd1e121857690061324f889e8486105c79a
+  data.tar.gz: 2736927c6b34ee327b02e4230bc4b8879f8582f8a9840740c99bd122a9d53eecd5c099dc2e3b2407629047a88e3477e253d878fe56e835264e38a405ede78bc2

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 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`
+
 ## 1.12.1 (2023-04-06)
 
 * Fix when `actual` is nil

data/Gemfile

@@ -16,3 +16,4 @@ gem "oedipus_lex"
 gem "racc"
 gem "parser"
 gem "parser_node_ext"
+gem "syntax_tree_ext"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.12.1)
+    node_query (1.13.1)
 
 GEM
   remote: https://rubygems.org/
@@ -38,10 +38,11 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     oedipus_lex (2.6.0)
-    parser (3.2.1.1)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    parser_node_ext (1.0.0)
+    parser_node_ext (1.1.0)
       parser
+    prettier_print (1.2.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -64,6 +65,10 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     shellany (0.0.1)
+    syntax_tree (6.1.1)
+      prettier_print (>= 1.2.0)
+    syntax_tree_ext (0.3.0)
+      syntax_tree
     thor (1.2.1)
 
 PLATFORMS
@@ -82,6 +87,7 @@ DEPENDENCIES
   racc
   rake (~> 13.0)
   rspec (~> 3.0)
+  syntax_tree_ext
 
 BUNDLED WITH
    2.3.7

data/README.md

@@ -17,14 +17,14 @@ NodeQuery defines a NQL (node query language) and node rules to query AST nodes.
     - [nql matches method result](#nql-matches-method-result)
     - [nql matches operators](#nql-matches-operators)
     - [nql matches array node attribute](#nql-matches-array-node-attribute)
-    - [nql matches * in attribute key](#nql-matches--in-attribute-key)
+    - [nql matches \* in attribute key](#nql-matches--in-attribute-key)
     - [nql matches multiple selectors](#nql-matches-multiple-selectors)
       - [Descendant combinator](#descendant-combinator)
       - [Child combinator](#child-combinator)
       - [Adjacent sibling combinator](#adjacent-sibling-combinator)
       - [General sibling combinator](#general-sibling-combinator)
     - [nql matches goto scope](#nql-matches-goto-scope)
-    - [nql matches :has and :not_has pseudo selector](#nql-matches-has-and-not_has-pseudo-selector)
+    - [nql matches :has and :not\_has pseudo selector](#nql-matches-has-and-not_has-pseudo-selector)
     - [nql matches :first-child and :last-child pseudo selector](#nql-matches-first-child-and-last-child-pseudo-selector)
     - [nql matches multiple expressions](#nql-matches-multiple-expressions)
   - [Node Rules](#node-rules)
@@ -474,17 +474,18 @@ It matches def node whose arguments are id and name.
 
 ## Write Adapter
 
-Different parser, like parser, will generate different AST nodes, to make NodeQuery work for them all,
+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,
 if you implement the Adapter interface, you can set it as NodeQuery's adapter.
 
-```ruby
-NodeQuery.configure(adapter: ParserAdapter.new)
-```
+It provides 2 adapters
 
-Here is the ParserAdapter implementation:
+1. `ParserAdapter`
+2. `SyntaxTreeAdapter`
 
-[ParserAdapter](https://github.com/xinminlabs/node-query-ruby/blob/main/lib/node_query/parser_adapter.rb)
+```ruby
+NodeQuery.configure(adapter: SyntaxTreeAdapter.new) # default is ParserAdapter
+```
 
 ## Development
 

data/lib/node_query/{parser_adapter.rb → 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

@@ -0,0 +1,26 @@
+# 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.to_sym
+  end
+
+  def get_source(node)
+    node.source
+  end
+
+  def get_children(node)
+    node.child_nodes
+  end
+
+  def get_siblings(node)
+    node.siblings
+  end
+end

data/lib/node_query/version.rb

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

data/lib/node_query.rb

@@ -8,7 +8,8 @@ class NodeQuery
   class MethodNotSupported < StandardError; end
 
   autoload :Adapter, "node_query/adapter"
-  autoload :ParserAdapter, "node_query/parser_adapter"
+  autoload :ParserAdapter, "node_query/adapter/parser"
+  autoload :SyntaxTreeAdapter, "node_query/adapter/syntax_tree"
   autoload :Compiler, "node_query/compiler"
   autoload :Helper, "node_query/helper"
   autoload :NodeRules, "node_query/node_rules"
@@ -17,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/

data/lib/node_query_parser.racc.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.13.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies: []
 description: ast node query language
 email:
@@ -26,6 +26,8 @@ files:
 - Rakefile
 - lib/node_query.rb
 - lib/node_query/adapter.rb
+- lib/node_query/adapter/parser.rb
+- lib/node_query/adapter/syntax_tree.rb
 - lib/node_query/compiler.rb
 - lib/node_query/compiler/array_value.rb
 - lib/node_query/compiler/attribute.rb
@@ -47,7 +49,6 @@ files:
 - lib/node_query/compiler/symbol.rb
 - lib/node_query/helper.rb
 - lib/node_query/node_rules.rb
-- lib/node_query/parser_adapter.rb
 - lib/node_query/version.rb
 - lib/node_query_lexer.rex
 - lib/node_query_lexer.rex.rb