node_query 1.2.0 → 1.3.0

data/lib/node_query_parser.racc.rb

@@ -22,86 +22,85 @@ class NodeQueryParser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-     8,     8,     7,     9,    10,    37,    12,     5,     6,    16,
+     8,     8,     7,     9,    10,    36,    12,     5,     6,    16,
     27,    17,    21,    22,    23,    24,    29,    30,    31,    32,
-    33,    34,    35,    36,     8,    16,    41,     8,     7,    37,
-   nil,   nil,     8,     5,     6,    38,   nil,    37,   nil,   nil,
-    29,    30,    31,    32,    33,    34,    35,    36,    29,    30,
-    31,    32,    33,    34,    35,    36,     8,     7,     8,     7,
-     8,     7,     5,     6,     5,     6,     5,     6,     8,     7,
-   nil,   nil,   nil,   nil,     5,     6 ]
+    33,    34,    35,     8,    16,     8,     7,    40,    36,   nil,
+     8,     5,     6,   nil,    37,    36,   nil,   nil,   nil,    29,
+    30,    31,    32,    33,    34,    35,    29,    30,    31,    32,
+    33,    34,    35,     8,     7,     8,     7,     8,     7,     5,
+     6,     5,     6,     5,     6,     8,     7,   nil,   nil,   nil,
+   nil,     5,     6 ]
 
 racc_action_check = [
     24,     0,     0,     1,     2,    24,     5,     0,     0,     8,
     24,     9,    16,    19,    20,    21,    24,    24,    24,    24,
-    24,    24,    24,    24,    27,    23,    39,     3,     3,    27,
-   nil,   nil,    40,     3,     3,    27,   nil,    40,   nil,   nil,
-    27,    27,    27,    27,    27,    27,    27,    27,    40,    40,
-    40,    40,    40,    40,    40,    40,     6,     6,     7,     7,
-    10,    10,     6,     6,     7,     7,    10,    10,    12,    12,
-   nil,   nil,   nil,   nil,    12,    12 ]
+    24,    24,    24,    27,    23,     3,     3,    38,    27,   nil,
+    39,     3,     3,   nil,    27,    39,   nil,   nil,   nil,    27,
+    27,    27,    27,    27,    27,    27,    39,    39,    39,    39,
+    39,    39,    39,     6,     6,     7,     7,    10,    10,     6,
+     6,     7,     7,    10,    10,    12,    12,   nil,   nil,   nil,
+   nil,    12,    12 ]
 
 racc_action_pointer = [
-    -2,     3,     2,    24,   nil,    -9,    53,    55,    -2,    11,
-    57,   nil,    65,   nil,   nil,   nil,     6,   nil,   nil,    -3,
-     2,    -2,   nil,    14,    -3,   nil,   nil,    21,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,
-    29,   nil,   nil ]
+    -2,     3,     2,    22,   nil,    -9,    50,    52,    -2,    11,
+    54,   nil,    62,   nil,   nil,   nil,     6,   nil,   nil,    -3,
+     2,    -2,   nil,    13,    -3,   nil,   nil,    20,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,    27,
+   nil,   nil ]
 
 racc_action_default = [
-   -28,   -28,    -2,    -4,    -5,   -28,   -28,   -28,    -9,   -28,
-   -28,    -3,   -28,    -7,    -8,   -10,   -28,    43,    -1,   -28,
-   -28,   -28,    -6,   -12,   -28,   -11,   -13,   -28,   -18,   -19,
-   -20,   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -14,   -28,
-   -17,   -15,   -16 ]
+   -27,   -27,    -2,    -4,    -5,   -27,   -27,   -27,    -9,   -27,
+   -27,    -3,   -27,    -7,    -8,   -10,   -27,    42,    -1,   -27,
+   -27,   -27,    -6,   -12,   -27,   -11,   -13,   -27,   -18,   -19,
+   -20,   -21,   -22,   -23,   -24,   -25,   -26,   -14,   -27,   -17,
+   -15,   -16 ]
 
 racc_goto_table = [
-    28,    39,    15,    28,    11,     1,    13,    14,    20,    26,
-   nil,   nil,    19,   nil,    42,    18,    28,    25 ]
+    28,    15,    38,    28,    13,    14,    11,     1,    20,    26,
+    19,   nil,   nil,   nil,    41,    28,    25,    18 ]
 
 racc_goto_check = [
-     4,     8,     5,     4,     2,     1,     3,     3,     6,     7,
-   nil,   nil,     3,   nil,     8,     1,     4,     5 ]
+     4,     5,     8,     4,     3,     3,     2,     1,     6,     7,
+     3,   nil,   nil,   nil,     8,     4,     5,     1 ]
 
 racc_goto_pointer = [
-   nil,     5,     1,     0,   -24,    -6,    -8,   -15,   -26 ]
+   nil,     7,     3,    -2,   -24,    -7,    -8,   -15,   -25 ]
 
 racc_goto_default = [
-   nil,   nil,     2,     3,     4,   nil,   nil,    40,   nil ]
+   nil,   nil,     2,     3,     4,   nil,   nil,    39,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 28, :_reduce_1,
-  1, 28, :_reduce_2,
-  2, 29, :_reduce_3,
-  1, 29, :_reduce_4,
-  1, 30, :_reduce_5,
-  4, 30, :_reduce_6,
-  2, 30, :_reduce_7,
-  2, 30, :_reduce_8,
-  1, 31, :_reduce_9,
-  2, 31, :_reduce_10,
-  4, 32, :_reduce_11,
-  3, 32, :_reduce_12,
-  3, 33, :_reduce_13,
-  4, 33, :_reduce_14,
-  5, 33, :_reduce_15,
-  2, 35, :_reduce_16,
-  1, 35, :_reduce_17,
-  1, 34, :_reduce_none,
-  1, 34, :_reduce_19,
-  1, 34, :_reduce_20,
-  1, 34, :_reduce_21,
-  1, 34, :_reduce_22,
-  1, 34, :_reduce_23,
-  1, 34, :_reduce_24,
-  1, 34, :_reduce_25,
-  1, 34, :_reduce_26,
-  1, 34, :_reduce_27 ]
-
-racc_reduce_n = 28
-
-racc_shift_n = 43
+  3, 27, :_reduce_1,
+  1, 27, :_reduce_2,
+  2, 28, :_reduce_3,
+  1, 28, :_reduce_4,
+  1, 29, :_reduce_5,
+  4, 29, :_reduce_6,
+  2, 29, :_reduce_7,
+  2, 29, :_reduce_8,
+  1, 30, :_reduce_9,
+  2, 30, :_reduce_10,
+  4, 31, :_reduce_11,
+  3, 31, :_reduce_12,
+  3, 32, :_reduce_13,
+  4, 32, :_reduce_14,
+  5, 32, :_reduce_15,
+  2, 34, :_reduce_16,
+  1, 34, :_reduce_17,
+  1, 33, :_reduce_none,
+  1, 33, :_reduce_19,
+  1, 33, :_reduce_20,
+  1, 33, :_reduce_21,
+  1, 33, :_reduce_22,
+  1, 33, :_reduce_23,
+  1, 33, :_reduce_24,
+  1, 33, :_reduce_25,
+  1, 33, :_reduce_26 ]
+
+racc_reduce_n = 27
+
+racc_shift_n = 42
 
 racc_token_table = {
   false => 0,
@@ -123,16 +122,15 @@ racc_token_table = {
   :tCLOSE_SELECTOR => 16,
   :tOPERATOR => 17,
   :tARRAY_VALUE => 18,
-  :tDYNAMIC_ATTRIBUTE => 19,
-  :tBOOLEAN => 20,
-  :tFLOAT => 21,
-  :tINTEGER => 22,
-  :tNIL => 23,
-  :tREGEXP => 24,
-  :tSTRING => 25,
-  :tSYMBOL => 26 }
+  :tBOOLEAN => 19,
+  :tFLOAT => 20,
+  :tINTEGER => 21,
+  :tNIL => 22,
+  :tREGEXP => 23,
+  :tSTRING => 24,
+  :tSYMBOL => 25 }
 
-racc_nt_base = 27
+racc_nt_base = 26
 
 racc_use_result_var = false
 
@@ -172,7 +170,6 @@ Racc_token_to_s_table = [
   "tCLOSE_SELECTOR",
   "tOPERATOR",
   "tARRAY_VALUE",
-  "tDYNAMIC_ATTRIBUTE",
   "tBOOLEAN",
   "tFLOAT",
   "tINTEGER",
@@ -267,38 +264,34 @@ end
 # reduce 18 omitted
 
 def _reduce_19(val, _values)
- NodeQuery::Compiler::EvaluatedValue.new(value: val[0])
-end
-
-def _reduce_20(val, _values)
  NodeQuery::Compiler::Boolean.new(value: val[0])
 end
 
-def _reduce_21(val, _values)
+def _reduce_20(val, _values)
  NodeQuery::Compiler::Float.new(value: val[0])
 end
 
-def _reduce_22(val, _values)
+def _reduce_21(val, _values)
  NodeQuery::Compiler::Integer.new(value: val[0])
 end
 
-def _reduce_23(val, _values)
+def _reduce_22(val, _values)
  NodeQuery::Compiler::Nil.new(value: val[0])
 end
 
-def _reduce_24(val, _values)
+def _reduce_23(val, _values)
  NodeQuery::Compiler::Regexp.new(value: val[0])
 end
 
-def _reduce_25(val, _values)
+def _reduce_24(val, _values)
  NodeQuery::Compiler::String.new(value: val[0])
 end
 
-def _reduce_26(val, _values)
+def _reduce_25(val, _values)
  NodeQuery::Compiler::Symbol.new(value: val[0])
 end
 
-def _reduce_27(val, _values)
+def _reduce_26(val, _values)
  NodeQuery::Compiler::Identifier.new(value: val[0])
 end
 

data/lib/node_query_parser.y

@@ -2,7 +2,7 @@ class NodeQueryParser
 options no_result_var
 token tCOMMA tNODE_TYPE tGOTO_SCOPE tATTRIBUTE tKEY tIDENTIFIER tIDENTIFIER_VALUE tPSEUDO_CLASS tRELATIONSHIP
       tOPEN_ATTRIBUTE tCLOSE_ATTRIBUTE tOPEN_ARRAY tCLOSE_ARRAY tOPEN_SELECTOR tCLOSE_SELECTOR
-      tOPERATOR tARRAY_VALUE tDYNAMIC_ATTRIBUTE tBOOLEAN tFLOAT tINTEGER tNIL tREGEXP tSTRING tSYMBOL
+      tOPERATOR tARRAY_VALUE tBOOLEAN tFLOAT tINTEGER tNIL tREGEXP tSTRING tSYMBOL
 rule
   expression_list
     : expression tCOMMA expression_list { NodeQuery::Compiler::ExpressionList.new(expression: val[0], rest: val[2]) }
@@ -37,7 +37,6 @@ rule
 
   value
     : basic_selector
-    | tDYNAMIC_ATTRIBUTE { NodeQuery::Compiler::EvaluatedValue.new(value: val[0]) }
     | tBOOLEAN { NodeQuery::Compiler::Boolean.new(value: val[0]) }
     | tFLOAT { NodeQuery::Compiler::Float.new(value: val[0]) }
     | tINTEGER { NodeQuery::Compiler::Integer.new(value: val[0])}

data/node_query.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", "< 7.0.0"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

data/sig/node_query.rbs

@@ -5,7 +5,9 @@ class NodeQuery[T]
 
   def self.adapter: () -> NodeQuery::Adapter
 
-  def initialize: (nql: String) -> NodeQuery
+  def initialize: (nqlOrRues: String | Hash) -> NodeQuery
 
-  def parse: (node: T) -> Array[T]
+  def query_nodes: (node: T, including_self: boolean) -> Array[T]
+
+  def match_node?: (node: T) -> boolean
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.0
 description: ast node query language
 email:
 - flyerhzm@gmail.com
@@ -47,7 +47,6 @@ files:
 - lib/node_query/compiler/basic_selector.rb
 - lib/node_query/compiler/boolean.rb
 - lib/node_query/compiler/comparable.rb
-- lib/node_query/compiler/evaluated_value.rb
 - lib/node_query/compiler/expression.rb
 - lib/node_query/compiler/expression_list.rb
 - lib/node_query/compiler/float.rb
@@ -61,6 +60,7 @@ files:
 - lib/node_query/compiler/string.rb
 - 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

data/lib/node_query/compiler/evaluated_value.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module NodeQuery::Compiler
-  # EvaluatedValue represents a ruby dynamic attribute.
-  # e.g. code is <code>{ a: a }</code>, query is <code>'.hash > .pair[key={{value}}]'</code>,
-  # <code>{{value}}</code> is the dynamic attribute.
-  class EvaluatedValue
-    include Comparable
-
-    attr_accessor :base_node
-
-    # Initialize an EvaluatedValue.
-    # @param value [String] the dynamic attribute value
-    def initialize(value:)
-      @value = value
-    end
-
-    # Get the actual value of a node.
-    # @param node [Node] the node
-    # @return [String] if node is a {Node}, return the node source code, otherwise return the node itself.
-    def actual_value(node)
-      if node.is_a?(::Parser::AST::Node)
-        NodeQuery.adapter.get_source(node)
-      else
-        node
-      end
-    end
-
-    # Get the expected value.
-    # @return [String] Query the node by @value from base_node, if the node is a {Node}, return the node source code, otherwise return the node itself.
-    def expected_value
-      node = NodeQuery::Helper.get_target_node(base_node, @value)
-      if node.is_a?(::Parser::AST::Node)
-        NodeQuery.adapter.get_source(node)
-      else
-        node
-      end
-    end
-
-    # Get valid operators.
-    # @return [Array] valid operators
-    def valid_operators
-      SIMPLE_VALID_OPERATORS
-    end
-
-    def to_s
-      "{{#{@value}}}"
-    end
-  end
-end