synvert-core 1.1.1 → 1.3.0

data/lib/synvert/core/node_query.rb

@@ -5,10 +5,10 @@
 # It supports the following selectors:
 #
 # * AST node type: +.class+, +.send+
-# * attribute value: +[receiver = nil]+, +[message = create]+
-# * attribute regex: <code>[key=~/\A:([^'"]+)\z/]</code>, <code>[key!~/\A:([^'"]+)\z/]</code>
-# * attribute conditions: +[message != nil]+, +[value > 1]+, +[value >= 1]+, +[value < 1]+, +[value <= 1]+
-# * nested attribute: +[caller.message = map]+, +[arguments.size = 2]+
+# * attribute value: +.send[receiver = nil]+, +.send[message = create]+
+# * attribute regex: <code>.send[key=~/\A:([^'"]+)\z/]</code>, <code>.send[key!~/\A:([^'"]+)\z/]</code>
+# * attribute conditions: +.send[message != nil]+, +.send[value > 1]+, +.send[value >= 1]+, +.send[value < 1]+, +.send[value <= 1]+
+# * nested attribute: +.send[caller.message = map]+, +.send[arguments.size = 2]+
 # * first or last child: +.def:first-child+, +.send:last-child+
 # * nth-child or nth-last-child: +.def:nth-child(2)+, +.send:nth-last-child(2)+
 # * descendant: +.class .send+
@@ -21,9 +21,9 @@
 #
 # * not_has: +.class:not_has(.def)+, it's same as +:not(:has())+ in css, just to make implementation easy.
 # * nested selector: +.send[arguments = [size = 2][first = .sym][last = .hash]]+
-# * array value: +.send[arguments = (a, b)]+
-# * IN operator: +.send[message IN (try, try!)]+
-# * NOT IN operator: +.send[message NOT IN (create, build)]+
+# * array value: +.send[arguments = (a b)]+
+# * IN operator: +.send[message IN (try try!)]+
+# * NOT IN operator: +.send[message NOT IN (create build)]+
 # * INCLUDES operator: +.send[arguments INCLUDES &block]+
 # * dynamic attribute value: +.hash > .pair[key={{value}}]+
 #

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.1.1'
+    VERSION = '1.3.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -1033,7 +1033,7 @@ describe Parser::AST::Node do
       node = parse(<<~EOS)
         class Synvert
           def foobar(foo, bar)
-            foo + bar
+            { foo => bar }
           end
         end
       EOS
@@ -1056,10 +1056,12 @@ describe Parser::AST::Node do
               ],
               body: [
                 {
-                  type: :send,
-                  receiver: { name: :foo, type: :lvar },
-                  message: :+,
-                  arguments: [{ name: :bar, type: :lvar }]
+                  type: :hash,
+                  pairs: {
+                    type: :pair,
+                    key: { type: :lvar, name: :foo },
+                    value: { type: :lvar, name: :bar }
+                  }
                 }
               ]
             }

data/spec/synvert/core/node_query/lexer_spec.rb

@@ -29,7 +29,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "create"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -42,7 +42,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "receiver"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNIL, nil],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -55,7 +55,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSTRING, "create"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -68,7 +68,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSTRING, "[]"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -81,7 +81,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -93,7 +93,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -106,7 +106,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tFLOAT, 1.1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -119,7 +119,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tBOOLEAN, true],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -132,7 +132,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "create!"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -145,7 +145,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "empty?"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -158,7 +158,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "<"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -169,7 +169,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "="],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -180,7 +180,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, ">"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -193,7 +193,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments.first"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSTRING, ""],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -206,7 +206,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "[]"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -219,20 +219,33 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :[]=],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
         assert_tokens source, expected_tokens
       end
 
+      it 'matches nil?' do
+        source = ".send[message=nil?]"
+        expected_tokens = [
+          [:tNODE_TYPE, "send"],
+          [:tOPEN_ATTRIBUTE, "["],
+          [:tKEY, "message"],
+          [:tOPERATOR, "=="],
+          [:tIDENTIFIER_VALUE, "nil?"],
+          [:tCLOSE_ATTRIBUTE, "]"]
+        ]
+        assert_tokens source, expected_tokens
+      end
+
       it 'matches attribute value' do
         source = '.pair[key={{value}}]'
         expected_tokens = [
           [:tNODE_TYPE, "pair"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "key"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_DYNAMIC_ATTRIBUTE, "{{"],
           [:tDYNAMIC_ATTRIBUTE, "value"],
           [:tCLOSE_DYNAMIC_ATTRIBUTE, "}}"],
@@ -252,11 +265,11 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "receiver"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -274,20 +287,20 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "size"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tINTEGER, 2],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "first"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNODE_TYPE, "str"],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "last"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNODE_TYPE, "str"],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -303,7 +316,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tNOT_EQUAL, "!="],
+          [:tOPERATOR, "!="],
           [:tIDENTIFIER_VALUE, "create"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -315,7 +328,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tGREATER_THAN, ">"],
+          [:tOPERATOR, ">"],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -327,7 +340,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tLESS_THAN, "<"],
+          [:tOPERATOR, "<"],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -339,7 +352,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tGREATER_THAN_OR_EQUAL, ">="],
+          [:tOPERATOR, ">="],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -351,7 +364,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tLESS_THAN_OR_EQUAL, "<="],
+          [:tOPERATOR, "<="],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -364,7 +377,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tMATCH, "=~"],
+          [:tOPERATOR, "=~"],
           [:tREGEXP, /create/i],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -377,7 +390,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tNOT_MATCH, "!~"],
+          [:tOPERATOR, "!~"],
           [:tREGEXP, /create/i],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -390,7 +403,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_ARRAY, "("],
           [:tCLOSE_ARRAY, ")"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -404,7 +417,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_ARRAY, "("],
           [:tSYMBOL, :create],
           [:tCLOSE_ARRAY, ")"],
@@ -419,7 +432,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tNOT_EQUAL, "!="],
+          [:tOPERATOR, "!="],
           [:tOPEN_ARRAY, "("],
           [:tSYMBOL, :create],
           [:tCLOSE_ARRAY, ")"],
@@ -429,15 +442,14 @@ module Synvert::Core::NodeQuery
       end
 
       it 'matches IN' do
-        source = '.send[message IN (create, build)]'
+        source = '.send[message IN (create build)]'
         expected_tokens = [
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tIN, "IN"],
+          [:tOPERATOR, "in"],
           [:tOPEN_ARRAY, "("],
           [:tIDENTIFIER_VALUE, "create"],
-          [:tCOMMA, ","],
           [:tIDENTIFIER_VALUE, "build"],
           [:tCLOSE_ARRAY, ")"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -446,15 +458,14 @@ module Synvert::Core::NodeQuery
       end
 
       it 'matches NOT IN' do
-        source = '.send[message NOT IN (create, build)]'
+        source = '.send[message NOT IN (create build)]'
         expected_tokens = [
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tNOT_IN, "NOT IN"],
+          [:tOPERATOR, "not_in"],
           [:tOPEN_ARRAY, "("],
           [:tIDENTIFIER_VALUE, "create"],
-          [:tCOMMA, ","],
           [:tIDENTIFIER_VALUE, "build"],
           [:tCLOSE_ARRAY, ")"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -468,7 +479,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tINCLUDES, "INCLUDES"],
+          [:tOPERATOR, "includes"],
           [:tIDENTIFIER_VALUE, "&block"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -483,7 +494,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "receiver.message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -498,7 +509,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tINDEX, 0]
@@ -512,7 +523,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tINDEX, -1]
@@ -526,7 +537,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tINDEX, 0]
@@ -540,7 +551,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tINDEX, -1]
@@ -560,7 +571,7 @@ module Synvert::Core::NodeQuery
     context 'child' do
       it 'matches' do
         source = '.def > .send'
-        expected_tokens = [[:tNODE_TYPE, "def"], [:tCHILD, ">"], [:tNODE_TYPE, "send"]]
+        expected_tokens = [[:tNODE_TYPE, "def"], [:tRELATIONSHIP, ">"], [:tNODE_TYPE, "send"]]
         assert_tokens source, expected_tokens
       end
     end
@@ -568,7 +579,7 @@ module Synvert::Core::NodeQuery
     context 'subsequent sibling' do
       it 'matches' do
         source = '.send ~ .send'
-        expected_tokens = [[:tNODE_TYPE, "send"], [:tSUBSEQUENT_SIBLING, "~"], [:tNODE_TYPE, "send"]]
+        expected_tokens = [[:tNODE_TYPE, "send"], [:tRELATIONSHIP, "~"], [:tNODE_TYPE, "send"]]
         assert_tokens source, expected_tokens
       end
     end
@@ -576,7 +587,7 @@ module Synvert::Core::NodeQuery
     context 'next sibling' do
       it 'matches' do
         source = '.send + .send'
-        expected_tokens = [[:tNODE_TYPE, "send"], [:tNEXT_SIBLING, "+"], [:tNODE_TYPE, "send"]]
+        expected_tokens = [[:tNODE_TYPE, "send"], [:tRELATIONSHIP, "+"], [:tNODE_TYPE, "send"]]
         assert_tokens source, expected_tokens
       end
     end
@@ -588,7 +599,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "class"],
           [:tPSEUDO_CLASS, "has"],
           [:tOPEN_SELECTOR, "("],
-          [:tCHILD, ">"],
+          [:tRELATIONSHIP, ">"],
           [:tNODE_TYPE, "def"],
           [:tCLOSE_SELECTOR, ")"]
         ]
@@ -603,12 +614,27 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "class"],
           [:tPSEUDO_CLASS, "not_has"],
           [:tOPEN_SELECTOR, "("],
-          [:tCHILD, ">"],
+          [:tRELATIONSHIP, ">"],
           [:tNODE_TYPE, "def"],
           [:tCLOSE_SELECTOR, ")"]
         ]
         assert_tokens source, expected_tokens
       end
     end
+
+    context 'goto_scope' do
+      it 'matches' do
+        source = '.block <body> > .def'
+        expected_tokens = [
+          [:tNODE_TYPE, "block"],
+          [:tOPEN_GOTO_SCOPE, "<"],
+          [:tIDENTIFIER, "body"],
+          [:tCLOSE_GOTO_SCOPE, ">"],
+          [:tRELATIONSHIP, ">"],
+          [:tNODE_TYPE, "def"]
+        ]
+        assert_tokens source, expected_tokens
+      end
+    end
   end
 end