synvert-core 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 603dafd1ddc6f40f8ef1479d359e39e1f4dbe90067bcfe51f721b15e9571c4d0
-  data.tar.gz: e423e49c531e6ba91f490657f34564f781f3313d82dbf9a863ee2c17985500a8
+  metadata.gz: b3972bef6a4c4b41b4211e2f45d889c6e3c71b08b1b2b039ca3511a620f79ccf
+  data.tar.gz: 7ddecb20188351e72e59b4a72c67a45d395638ae7a20d3c4d46f3fef0184de3c
 SHA512:
-  metadata.gz: e6177477cdf8c0cdd67d6dc533145017daebee61905b5e48b992261f6f458b8a949796aa86eb0cd8f161ffaa05b9325e1cd671b6d63fd645ece7f2101e67859c
-  data.tar.gz: c1daa4cca1056d9266c01037217cd6570f0b7ee0228491e408d43c7bf8bf753a52b2dbfbf20d6aa568876d7e1d7ee11727db40adbc56e17fc603ae091804475a
+  metadata.gz: b89480e5d9d05fe0651b5cd9edd1a4408a52364d449d0632baf062dd40251670b8c7d98370fa831f6961454498e9fbfffa67011a4fabb45f21e6031933643c36
+  data.tar.gz: c23844951b2938268289099f852f01d554e46a7aa80ad301011d05cc40a022864dd872a8097c71575a42e8770730dbfea2deea8d867af0412022506751cf2671

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.1 (2022-04-27)
+
+* Parse empty string properly in node query language
+* Parse `[]` and `[]=` properly in node query language
+
 ## 1.1.0 (2022-04-26)
 
 * Dynamic define Node methods by `TYPE_CHILDREN` const

data/lib/synvert/core/node_query/compiler/string.rb

@@ -16,17 +16,6 @@ module Synvert::Core::NodeQuery::Compiler
       SIMPLE_VALID_OPERATORS
     end
 
-    # Get the actual value of a node.
-    # @param node [Parser::AST::Node] the node
-    # @return [String] if node is a Parser::AST::Node, return the node source code, otherwise, return the string value.
-    def actual_value(node)
-      if node.is_a?(::Parser::AST::Node)
-        node.to_source
-      else
-        node.to_s
-      end
-    end
-
     def to_s
       "\"#{@value}\""
     end

data/lib/synvert/core/node_query/lexer.rex

@@ -54,6 +54,10 @@ rules
 :KEY                /in/i                         { @state = :VALUE; [:tIN, text] }
 :KEY                /#{IDENTIFIER}/               { [:tKEY, text] }
 :VALUE              /\s+/
+:VALUE              /\[\]=/                       { [:tIDENTIFIER_VALUE, text] }
+:VALUE              /\[\]/                        { [:tIDENTIFIER_VALUE, text] }
+:VALUE              /:\[\]=/                      { [:tSYMBOL, text[1..-1].to_sym] }
+:VALUE              /:\[\]/                       { [:tSYMBOL, text[1..-1].to_sym] }
 :VALUE              /#{OPEN_DYNAMIC_ATTRIBUTE}/   { @state = :DYNAMIC_ATTRIBUTE; [:tOPEN_DYNAMIC_ATTRIBUTE, text] }
 :VALUE              /#{OPEN_ARRAY}/               { @state = :ARRAY_VALUE; [:tOPEN_ARRAY, text] }
 :VALUE              /#{CLOSE_ATTRIBUTE}/          { @nested_count -= 1; @state = @nested_count == 0 ? nil : :VALUE; [:tCLOSE_ATTRIBUTE, text] }

data/lib/synvert/core/node_query/lexer.rex.rb

@@ -191,6 +191,14 @@ class Synvert::Core::NodeQuery::Lexer
           case
           when ss.skip(/\s+/) then
             # do nothing
+          when text = ss.scan(/\[\]=/) then
+            action { [:tIDENTIFIER_VALUE, text] }
+          when text = ss.scan(/\[\]/) then
+            action { [:tIDENTIFIER_VALUE, text] }
+          when text = ss.scan(/:\[\]=/) then
+            action { [:tSYMBOL, text[1..-1].to_sym] }
+          when text = ss.scan(/:\[\]/) then
+            action { [:tSYMBOL, text[1..-1].to_sym] }
           when text = ss.scan(/#{OPEN_DYNAMIC_ATTRIBUTE}/) then
             action { @state = :DYNAMIC_ATTRIBUTE; [:tOPEN_DYNAMIC_ATTRIBUTE, text] }
           when text = ss.scan(/#{OPEN_ARRAY}/) then

data/lib/synvert/core/version.rb

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

data/spec/synvert/core/node_ext_spec.rb

@@ -1037,29 +1037,35 @@ describe Parser::AST::Node do
           end
         end
       EOS
-      expect(node.to_hash).to eq({
-        type: :class,
-        parent_class: nil,
-        name: {
-          type: :const,
-          parent_const: nil,
-          name: :Synvert
-        },
-        body: [{
-          type: :def,
-          name: :foobar,
-          arguments: [
-            { type: :arg, name: :foo},
-            { type: :arg, name: :bar}
-          ],
-          body: [{
-            type: :send,
-            receiver: { name: :foo, type: :lvar },
-            message: :+,
-            arguments: [{ name: :bar, type: :lvar }]
-          }]
-        }]
-      })
+      expect(node.to_hash).to eq(
+        {
+          type: :class,
+          parent_class: nil,
+          name: {
+            type: :const,
+            parent_const: nil,
+            name: :Synvert
+          },
+          body: [
+            {
+              type: :def,
+              name: :foobar,
+              arguments: [
+                { type: :arg, name: :foo },
+                { type: :arg, name: :bar }
+              ],
+              body: [
+                {
+                  type: :send,
+                  receiver: { name: :foo, type: :lvar },
+                  message: :+,
+                  arguments: [{ name: :bar, type: :lvar }]
+                }
+              ]
+            }
+          ]
+        }
+      )
     end
   end
 end

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

@@ -200,6 +200,32 @@ module Synvert::Core::NodeQuery
         assert_tokens source, expected_tokens
       end
 
+      it 'matches :[] message' do
+        source = ".send[message=[]]"
+        expected_tokens = [
+          [:tNODE_TYPE, "send"],
+          [:tOPEN_ATTRIBUTE, "["],
+          [:tKEY, "message"],
+          [:tEQUAL, "="],
+          [:tIDENTIFIER_VALUE, "[]"],
+          [:tCLOSE_ATTRIBUTE, "]"]
+        ]
+        assert_tokens source, expected_tokens
+      end
+
+      it 'matches :[] message' do
+        source = ".send[message=:[]=]"
+        expected_tokens = [
+          [:tNODE_TYPE, "send"],
+          [:tOPEN_ATTRIBUTE, "["],
+          [:tKEY, "message"],
+          [:tEQUAL, "="],
+          [:tSYMBOL, :[]=],
+          [:tCLOSE_ATTRIBUTE, "]"]
+        ]
+        assert_tokens source, expected_tokens
+      end
+
       it 'matches attribute value' do
         source = '.pair[key={{value}}]'
         expected_tokens = [

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

@@ -118,6 +118,16 @@ module Synvert::Core::NodeQuery
       assert_parser(source)
     end
 
+    it 'parses []=' do
+      source = '.send[message=[]=]'
+      assert_parser(source)
+    end
+
+    it 'parses :[]' do
+      source = '.send[message=:[]]'
+      assert_parser(source)
+    end
+
     describe '#query_nodes' do
       let(:node) {
         parse(<<~EOS)
@@ -134,6 +144,8 @@ module Synvert::Core::NodeQuery
               { a: a, b: b }
               foo.merge(bar)
               arr[index]
+              arr[index] = value
+              call('')
             end
           end
         EOS
@@ -212,17 +224,17 @@ module Synvert::Core::NodeQuery
 
       it 'matches descendant node' do
         expression = parser.parse('.class .send[message=:create]')
-        expect(expression.query_nodes(node)).to eq [node.body.first.children.last, node.body.second.children.last]
+        expect(expression.query_nodes(node)).to eq [node.body.first.body.last, node.body.second.body.last]
       end
 
       it 'matches three level descendant node' do
         expression = parser.parse('.class .def .send[message=:create]')
-        expect(expression.query_nodes(node)).to eq [node.body.first.children.last, node.body.second.children.last]
+        expect(expression.query_nodes(node)).to eq [node.body.first.body.last, node.body.second.body.last]
       end
 
       it 'matches child node' do
         expression = parser.parse('.def > .send[message=:create]')
-        expect(expression.query_nodes(node)).to eq [node.body.first.children.last, node.body.second.children.last]
+        expect(expression.query_nodes(node)).to eq [node.body.first.body.last, node.body.second.body.last]
       end
 
       it 'matches next sibling node' do
@@ -246,17 +258,25 @@ module Synvert::Core::NodeQuery
       end
 
       it 'matches arguments.size' do
-        expression = parser.parse('.send[arguments.size=2]')
-        expect(expression.query_nodes(node)).to eq [node.body.first.children.last, node.body.second.children.last]
-        expression = parser.parse('.send[arguments.size>2]')
+        expression = parser.parse('.def .send[arguments.size=2]')
+        expect(expression.query_nodes(node)).to eq [
+          node.body.first.body.last,
+          node.body.second.body.last,
+          node.body.third.body.fourth
+        ]
+        expression = parser.parse('.def .send[arguments.size>2]')
         expect(expression.query_nodes(node)).to eq []
-        expression = parser.parse('.send[arguments.size>=2]')
-        expect(expression.query_nodes(node)).to eq [node.body.first.children.last, node.body.second.children.last]
+        expression = parser.parse('.def .send[arguments.size>=2]')
+        expect(expression.query_nodes(node)).to eq [
+          node.body.first.body.last,
+          node.body.second.body.last,
+          node.body.third.body.fourth
+        ]
       end
 
       it 'matches arguments' do
         expression = parser.parse('.send[arguments=[size=2][first=.sym][last=.hash]]')
-        expect(expression.query_nodes(node)).to eq [node.body.first.children.last, node.body.second.children.last]
+        expect(expression.query_nodes(node)).to eq [node.body.first.body.last, node.body.second.body.last]
       end
 
       it 'matches regexp value' do
@@ -277,9 +297,19 @@ module Synvert::Core::NodeQuery
       end
 
       it 'matches []' do
-        expression = parser.parse('.send[message="[]"]')
+        expression = parser.parse('.send[message=[]]')
         expect(expression.query_nodes(node)).to eq [node.body.last.body.third]
       end
+
+      it 'matches []=' do
+        expression = parser.parse('.send[message=:[]=]')
+        expect(expression.query_nodes(node)).to eq [node.body.last.body.fourth]
+      end
+
+      it 'matches empty string' do
+        expression = parser.parse('.send[message=call][arguments.first=""]')
+        expect(expression.query_nodes(node)).to eq [node.body.last.body.last]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport