node_query 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3638d51ca40eb891535cc2320377e3492023439946460a1c0a81af02f211c3ce
-  data.tar.gz: 4919be334676677f9ad144db4358be354ca81f8244294e3ea1fbf07d6d0a9845
+  metadata.gz: ac9505065daaa42db8776813e028b75fb79ba48a72482bf35eb9cc5d79ac8994
+  data.tar.gz: 5d844d6c156a48c1412f66268cfd7c5c33f59a06c4f168a3bba323a06ec28ff6
 SHA512:
-  metadata.gz: af54774545d5b284e3d6bd1977094f108553526fc9613ceebe0c96e46be9ac26c5c66db2e4301cef483cf66e4c02f04f19e1e8180e8025d360e5c2b0437c2efa
-  data.tar.gz: ca74ee091e6ec5d603ce4efaed4927e4d08a123563f95f7e09807e7c8433447ef53390ba727f7500037d60fc74ea5fb1601dfeba52e2cc569e54bd25eea14fc9
+  metadata.gz: d08239f6b06b6ee91b8d0de6bb446c85134bab339b7d1b2a02c42030c8ca5d4fba18e4fffd8753b178b60e27f8adcefc759fb61b8f525b81d1cf6926082e0c23
+  data.tar.gz: e3526ce4933636ba5dca462df668a66f5e9fc92c63bb92a2ef655a9fa16d598997ae1aa7e9eb036d3896b08cf363a04ad3ea296bf7935708228eefa3731ce3c3

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.9.0 (2022-10-23)
+
+* Support `NOT INCLUDES` operator
+* `includes` / `not_includes` a selector
+
+## 1.8.1 (2022-10-15)
+
+* Fix `filter_by_position` with empty nodes
+
 ## 1.8.0 (2022-10-14)
 
 * Support `:first-child` and `:last-child`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.8.0)
+    node_query (1.9.0)
       activesupport (< 7.0.0)
 
 GEM

data/README.md

@@ -210,6 +210,12 @@ Value of name is neither User nor Account
 
 Value of arguments includes id
 
+```
+.def[arguments NOT INCLUDES id]
+```
+
+Value of arguments not includes id
+
 ```
 .class[name=~/User/]
 ```
@@ -434,6 +440,12 @@ Value of name is neither User nor Account
 
 Value of arguments includes id
 
+```
+{ node_type: 'def', arguments: { not_includes: 'id' } }
+```
+
+Value of arguments not includes id
+
 ```
 { node_type: 'class', name: /User/ }
 ```

data/lib/node_query/compiler/attribute.rb

@@ -31,6 +31,8 @@ module NodeQuery::Compiler
         "#{@key} not in (#{@value})"
       when 'includes'
         "#{@key} includes #{@value}"
+      when 'not_includes'
+        "#{@key} not includes #{@value}"
       else
         "#{@key}=#{@value}"
       end

data/lib/node_query/compiler/comparable.rb

@@ -3,9 +3,9 @@
 module NodeQuery::Compiler
   # Compare acutal value with expected value.
   module Comparable
-    SIMPLE_VALID_OPERATORS = ['==', '!=', 'includes']
-    STRING_VALID_OPERATORS = ['==', '!=', '^=', '$=', '*=', 'includes']
-    NUMBER_VALID_OPERATORS = ['==', '!=', '>', '>=', '<', '<=', 'includes']
+    SIMPLE_VALID_OPERATORS = ['==', '!=', 'includes', 'not_includes']
+    STRING_VALID_OPERATORS = ['==', '!=', '^=', '$=', '*=', 'includes', 'not_includes']
+    NUMBER_VALID_OPERATORS = ['==', '!=', '>', '>=', '<', '<=', 'includes', 'not_includes']
     ARRAY_VALID_OPERATORS = ['==', '!=', 'in', 'not_in']
     REGEXP_VALID_OPERATORS = ['=~', '!~']
 
@@ -60,7 +60,9 @@ module NodeQuery::Compiler
           expected.all? { |expected_child| expected_child.match?(node, base_node, '!=') }
         end
       when 'includes'
-        actual.any? { |actual_child| actual_child == expected }
+        actual.any? { |actual_child| expected.match?(actual_child) }
+      when 'not_includes'
+        actual.none? { |actual_child| expected.match?(actual_child) }
       else
         if expected.is_a?(::Array)
           actual.is_a?(::Array) && actual.size == expected.size &&

data/lib/node_query/compiler/selector.rb

@@ -25,8 +25,18 @@ module NodeQuery::Compiler
     # 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
-    def match?(node, base_node)
-      NodeQuery.adapter.is_node?(node) && (!@basic_selector || @basic_selector.match?(node, base_node)) && match_pseudo_class?(node)
+    def match?(node, base_node, operator = "==")
+      if node.is_a?(::Array)
+        case operator
+        when "not_includes"
+          return node.none? { |child_node| match?(child_node, base_node) }
+        when "includes"
+          return node.any? { |child_node| match?(child_node, base_node) }
+        else
+          return false
+        end
+      end
+      NodeQuery.adapter.is_node?(node) && (!@basic_selector || (operator == "!=" ? !@basic_selector.match?(node, base_node) : @basic_selector.match?(node, base_node))) && match_pseudo_class?(node)
     end
 
     # Query nodes by the selector.
@@ -98,6 +108,7 @@ module NodeQuery::Compiler
     # @return [Array<Node>|Node] first node or last node or nodes
     def filter_by_position(nodes)
       return nodes unless @position
+      return nodes if nodes.empty?
 
       case @position
       when 'first-child'

data/lib/node_query/node_rules.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class NodeQuery::NodeRules
-  KEYWORDS = %i[any includes not in not_in gt gte lt lte]
+  KEYWORDS = %i[not_includes includes not in not_in gt gte lt lte]
 
   # Initialize a NodeRules.
   # @param rules [Hash] the nod rules
@@ -57,8 +57,10 @@ class NodeQuery::NodeRules
       expected = expected_value(@rules, multi_keys)
       expected = NodeQuery::Helper.evaluate_node_value(node, expected) if expected.is_a?(String)
       case last_key
-      when :any, :includes
+      when :includes
         actual.any? { |actual_value| match_value?(actual_value, expected) }
+      when :not_includes
+        actual.all? { |actual_value| !match_value?(actual_value, expected) }
       when :not
         !match_value?(actual, expected)
       when :in

data/lib/node_query/version.rb

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

data/lib/node_query_lexer.rex

@@ -50,6 +50,7 @@ rules
 :KEY                />/                           { @state = :VALUE; [:tOPERATOR, '>'] }
 :KEY                /</                           { @state = :VALUE; [:tOPERATOR, '<'] }
 :KEY                /=/                           { @state = :VALUE; [:tOPERATOR, '=='] }
+:KEY                /not includes/i               { @state = :VALUE; [:tOPERATOR, 'not_includes'] }
 :KEY                /includes/i                   { @state = :VALUE; [:tOPERATOR, 'includes'] }
 :KEY                /not in/i                     { @state = :VALUE; [:tOPERATOR, 'not_in'] }
 :KEY                /in/i                         { @state = :VALUE; [:tOPERATOR, 'in'] }

data/lib/node_query_lexer.rex.rb

@@ -179,6 +179,8 @@ class NodeQueryLexer
             action { @state = :VALUE; [:tOPERATOR, '<'] }
           when ss.skip(/=/) then
             action { @state = :VALUE; [:tOPERATOR, '=='] }
+          when ss.skip(/not includes/i) then
+            action { @state = :VALUE; [:tOPERATOR, 'not_includes'] }
           when ss.skip(/includes/i) then
             action { @state = :VALUE; [:tOPERATOR, 'includes'] }
           when ss.skip(/not in/i) then

data/lib/node_query_parser.racc.rb

@@ -22,31 +22,31 @@ class NodeQueryParser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-     8,     8,     7,     9,    10,    37,    12,     5,     6,    13,
-    28,    17,    18,    22,    23,    24,    25,    30,    31,    32,
-    33,    34,    35,    36,     8,    17,     8,     7,    41,    37,
-   nil,     8,     5,     6,   nil,    38,    37,   nil,   nil,   nil,
-   nil,    30,    31,    32,    33,    34,    35,    36,    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 ]
+     8,     7,     8,     7,     9,    37,     5,     6,     5,     6,
+    28,    10,    12,    13,    17,    18,    22,    30,    31,    32,
+    33,    34,    35,    36,     8,     7,    23,    24,    25,    37,
+     5,     6,     8,     7,    17,    38,    41,    37,     5,     6,
+   nil,    30,    31,    32,    33,    34,    35,    36,   nil,    30,
+    31,    32,    33,    34,    35,    36,     8,     7,     8,     7,
+     8,     7,     5,     6,     5,     6,     5,     6,     8,     7,
+     8,     7,   nil,   nil,     5,     6,     5,     6 ]
 
 racc_action_check = [
-    25,     0,     0,     1,     2,    25,     4,     0,     0,     5,
-    25,     8,     9,    17,    20,    21,    22,    25,    25,    25,
-    25,    25,    25,    25,    28,    24,     3,     3,    39,    28,
-   nil,    40,     3,     3,   nil,    28,    40,   nil,   nil,   nil,
-   nil,    28,    28,    28,    28,    28,    28,    28,    40,    40,
-    40,    40,    40,    40,    40,     6,     6,     7,     7,    10,
-    10,     6,     6,     7,     7,    10,    10,    13,    13,   nil,
-   nil,   nil,   nil,    13,    13 ]
+    25,    25,     0,     0,     1,    25,    25,    25,     0,     0,
+    25,     2,     4,     5,     8,     9,    17,    25,    25,    25,
+    25,    25,    25,    25,    28,    28,    20,    21,    22,    28,
+    28,    28,    40,    40,    24,    28,    39,    40,    40,    40,
+   nil,    28,    28,    28,    28,    28,    28,    28,   nil,    40,
+    40,    40,    40,    40,    40,    40,     3,     3,     6,     6,
+     7,     7,     3,     3,     6,     6,     7,     7,    10,    10,
+    13,    13,   nil,   nil,    10,    10,    13,    13 ]
 
 racc_action_pointer = [
-    -2,     3,     2,    23,   -11,    -6,    52,    54,     0,    12,
-    56,   nil,   nil,    64,   nil,   nil,   nil,     7,   nil,   nil,
-    -2,     3,    -2,   nil,    14,    -3,   nil,   nil,    21,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    14,
-    28,   nil,   nil ]
+    -1,     4,     9,    53,    -5,    -2,    55,    57,     3,    15,
+    65,   nil,   nil,    67,   nil,   nil,   nil,    10,   nil,   nil,
+    10,    15,    10,   nil,    23,    -3,   nil,   nil,    21,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,
+    29,   nil,   nil ]
 
 racc_action_default = [
    -28,   -28,    -2,    -4,    -6,   -28,   -28,   -28,   -10,   -28,
@@ -56,15 +56,19 @@ racc_action_default = [
    -18,   -16,   -17 ]
 
 racc_goto_table = [
-    16,    39,    29,    11,     1,    29,    21,    27,    14,    15,
-   nil,   nil,   nil,    42,    19,    20,    26,    29 ]
+    14,    15,    16,    39,     1,    11,    21,    20,    27,   nil,
+   nil,   nil,   nil,   nil,    19,    42,   nil,   nil,    26,    29,
+   nil,   nil,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    29 ]
 
 racc_goto_check = [
-     5,     8,     4,     2,     1,     4,     6,     7,     3,     3,
-   nil,   nil,   nil,     8,     1,     3,     5,     4 ]
+     3,     3,     5,     8,     1,     2,     6,     3,     7,   nil,
+   nil,   nil,   nil,   nil,     1,     8,   nil,   nil,     5,     3,
+   nil,   nil,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,     3 ]
 
 racc_goto_pointer = [
-   nil,     4,     0,     2,   -23,    -8,   -11,   -18,   -27 ]
+   nil,     4,     2,    -6,   nil,    -6,   -11,   -17,   -25 ]
 
 racc_goto_default = [
    nil,   nil,     2,     3,     4,   nil,   nil,    40,   nil ]

data/lib/node_query_parser.y

@@ -37,7 +37,7 @@ rule
     | value { NodeQuery::Compiler::ArrayValue.new(value: val[0]) }
 
   value
-    : basic_selector
+    : selector
     | tBOOLEAN { NodeQuery::Compiler::Boolean.new(value: val[0]) }
     | tFLOAT { NodeQuery::Compiler::Float.new(value: val[0]) }
     | tINTEGER { NodeQuery::Compiler::Integer.new(value: val[0])}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport