synvert-core 0.53.0 → 0.54.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a56859d257b024e86f223d076c77d4effd93d6ffef44de99091d49a62a12841e
-  data.tar.gz: f0b8658b8701417180ae578eb2ba5c7607e634327ced470e2ad0017980a2e0d8
+  metadata.gz: f668f4f483fc617cfd11bf3e8cc786fc390316a160c8b7f64b9fdb034d639797
+  data.tar.gz: 8beb643a216285270c886d90e0057cf4b44c3e2b20b1d558dada21700461b84e
 SHA512:
-  metadata.gz: 320beadaca69f8e9613f1cd15c5c6fd71bf7bd51881af453ade6e99f56e9516b782264b0d63d4398bbd4fe61af8cb3c7df78d517d0e29762f76de2c2d2091255
-  data.tar.gz: 22a208b06b416f70e191e7215e21016d603a06ff91a0c7ad8795333906179f46b325e0507ffafd65b7fcebc639e99a6aaba5428632ac6f19b87a2b41dedf9e47
+  metadata.gz: d1a0ec10d76c9dfcc400ee3342504a3b4617d49681eccacf464dab47b5344504f4e5d83161a853f6a96f36187d6b6b9f6d58abbc3deb1de93f42a10b6d8adc29
+  data.tar.gz: 7308355c918ccb01446fd4d2d74d8a14d9ea3817db2b71fc1745ab6aae6b49f8d9180910e5f786fccaf548a6e4f64d09b5b8c4b033d15c3509cfcba3119f21e3

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 0.54.3 (2021-09-09)
+
+* Fix remove action `begin_pos` and `end_pos`
+
+## 0.54.2 (2021-09-09)
+
+* Fix `nil` match
+
+## 0.54.1 (2021-09-08)
+
+* Rewrite `remove` action
+
+## 0.54.0 (2021-08-28)
+
+* Change `goto_scope` param from array to string
+
 ## 0.53.0 (2021-08-22)
 
 * Fix nested child in Node#child_node_range

data/README.md

@@ -1,6 +1,6 @@
 # synvert-core-ruby
 
-<img src="https://xinminlabs.github.io/synvert/img/logo_96.png" alt="logo" width="32" height="32" />
+<img src="https://synvert.xinminlabs.com/img/logo_96.png" alt="logo" width="32" height="32" />
 
 ![Main workflow](https://github.com/xinminlabs/synvert-core-ruby/actions/workflows/main.yml/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/synvert-core.png)](http://badge.fury.io/rb/synvert-core)
@@ -36,5 +36,5 @@ Or install it yourself as:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
-[1]: https://xinminlabs.github.io/synvert/
+[1]: https://synvert.xinminlabs.com
 [2]: https://rubydoc.info/github/xinminlabs/synvert-core-ruby/master/frames

data/lib/synvert/core/node_ext.rb

@@ -576,7 +576,11 @@ module Parser::AST
 
         actual.zip(expected).all? { |a, e| match_value?(a, e) }
       when NilClass
-        actual.nil?
+        if actual.is_a?(Parser::AST::Node)
+          :nil == actual.type
+        else
+          actual.nil?
+        end
       when Numeric
         if actual.is_a?(Parser::AST::Node)
           actual.children[0] == expected

data/lib/synvert/core/rewriter/action/delete_action.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # RemoveAction to delete code.
+  # DeleteAction to delete child nodes.
   class Rewriter::DeleteAction < Rewriter::Action
     def initialize(instance, *selectors)
       super(instance, nil)
       @selectors = selectors
     end
 
-    # Begin position of code to replace.
+    # Begin position of code to delete.
     #
     # @return [Integer] begin position.
     def begin_pos
       @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
     end
 
-    # End position of code to replace.
+    # End position of code to delete.
     #
     # @return [Integer] end position.
     def end_pos

data/lib/synvert/core/rewriter/action/insert_action.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # AddAction to add code to the node.
+  # InsertAction to add code to the node.
   class Rewriter::InsertAction < Rewriter::Action
     def initialize(instance, code, at:)
       super(instance, code)

data/lib/synvert/core/rewriter/action/remove_action.rb

@@ -1,29 +1,57 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # RemoveAction to remove code.
+  # RemoveAction to remove current node.
   class Rewriter::RemoveAction < Rewriter::Action
-    def initialize(instance, code = nil)
-      super
+    def initialize(instance)
+      super(instance, nil)
     end
 
     # Begin position of code to replace.
     #
     # @return [Integer] begin position.
     def begin_pos
-      @node.loc.expression.begin_pos
+      if take_whole_line?
+        start_index
+      else
+        @node.loc.expression.begin_pos
+      end
     end
 
     # End position of code to replace.
     #
     # @return [Integer] end position.
     def end_pos
-      @node.loc.expression.end_pos
+      if take_whole_line?
+        end_index
+      else
+        @node.loc.expression.end_pos
+      end
     end
 
     # The rewritten code, always empty string.
     def rewritten_code
       ''
     end
+
+    private
+
+    def take_whole_line?
+      @node.to_source == file_source[start_index...end_index].strip
+    end
+
+    def start_index
+      index = file_source[0..@node.loc.expression.begin_pos].rindex("\n")
+      index ? index + "\n".length : @node.loc.expression.begin_pos
+    end
+
+    def end_index
+      index = file_source[@node.loc.expression.end_pos..-1].index("\n")
+      index ? @node.loc.expression.end_pos + index + "\n".length : @node.loc.expression.end_pos
+    end
+
+    def file_source
+      @file_source ||= @instance.file_source
+    end
   end
 end

data/lib/synvert/core/rewriter/instance.rb

@@ -64,6 +64,11 @@ module Synvert::Core
     #   @return current filename
     attr_accessor :current_node, :current_file
 
+    # Current file source
+    def file_source
+      self.class.file_source(current_file)
+    end
+
     # Initialize an instance.
     #
     # @param rewriter [Synvert::Core::Rewriter]
@@ -107,7 +112,6 @@ module Synvert::Core
             conflict_actions = get_conflict_actions
             @actions.reverse_each do |action|
               source[action.begin_pos...action.end_pos] = action.rewritten_code
-              source = remove_code_or_whole_line(source, action.line)
             end
             @actions = []
 
@@ -139,7 +143,7 @@ module Synvert::Core
 
     # Set current_node properly, process and set current_node back to original current_node.
     #
-    # @param node [Parser::AST::Node] node set to current_node
+    # @param node [Parser::AST::Node] node set to other_node
     # @yield process
     def process_with_other_node(node)
       original_node = current_node
@@ -177,10 +181,10 @@ module Synvert::Core
     # Parse goto_node dsl, it creates a [Synvert::Core::Rewriter::GotoScope] to go to a child node,
     # then continue operating on the child node.
     #
-    # @param *child_node_names [Array] the name of the child nodes.
+    # @param child_node_name [Symbol|String] the name of the child nodes.
     # @param block [Block] block code to continue operating on the matching nodes.
-    def goto_node(*child_node_names, &block)
-      Rewriter::GotoScope.new(self, *child_node_names, &block).process
+    def goto_node(child_node_name, &block)
+      Rewriter::GotoScope.new(self, child_node_name, &block).process
     end
 
     # Parse if_exist_node dsl, it creates a [Synvert::Core::Rewriter::IfExistCondition] to check
@@ -323,25 +327,6 @@ module Synvert::Core
       conflict_actions
     end
 
-    # It checks if code is removed and that line is empty.
-    #
-    # @param source [String] source code of file
-    # @param line [String] the line number
-    def remove_code_or_whole_line(source, line)
-      newline_at_end_of_line = source[-1] == "\n"
-      source_arr = source.split("\n")
-      if source_arr[line - 1] && source_arr[line - 1].strip.empty?
-        source_arr.delete_at(line - 1)
-        if source_arr[line - 2] && source_arr[line - 2].strip.empty? && source_arr[line - 1] &&
-             source_arr[line - 1].strip.empty?
-          source_arr.delete_at(line - 1)
-        end
-        source_arr.join("\n") + (newline_at_end_of_line ? "\n" : '')
-      else
-        source
-      end
-    end
-
     # It updates a file with new source code.
     #
     # @param file_path [String] the file path

data/lib/synvert/core/rewriter/scope/goto_scope.rb

@@ -6,11 +6,11 @@ module Synvert::Core
     # Initialize a scope
     #
     # @param instance [Synvert::Core::Rewriter::Instance]
-    # @param *child_node_names [Array]
+    # @param child_node_name [Symbol|string]
     # @param block [Block]
-    def initialize(instance, *child_node_names, &block)
+    def initialize(instance, child_node_name, &block)
       @instance = instance
-      @child_node_names = child_node_names
+      @child_node_name = child_node_name
       @block = block
     end
 
@@ -20,7 +20,7 @@ module Synvert::Core
       return unless current_node
 
       child_node = current_node
-      @child_node_names.each do |child_node_name|
+      @child_node_name.to_s.split('.').each do |child_node_name|
         child_node = child_node_name.is_a?(Parser::AST::Node) ? child_node_name : child_node.send(child_node_name)
       end
       @instance.process_with_other_node child_node do

data/lib/synvert/core/rewriter.rb

@@ -81,7 +81,7 @@ module Synvert::Core
       def fetch(group, name)
         group = group.to_s
         name = name.to_s
-        if exist? group, name
+        if rewriters[group] && rewriters[group][name]
           rewriters[group][name]
         else
           raise RewriterNotFound, "Rewriter #{group} #{name} not found"
@@ -96,34 +96,13 @@ module Synvert::Core
       # @return [Synvert::Core::Rewriter] the registered rewriter.
       # @raise [Synvert::Core::RewriterNotFound] if the registered rewriter is not found.
       def call(group, name, sandbox = false)
-        group = group.to_s
-        name = name.to_s
-        if exist? group, name
-          rewriter = rewriters[group][name]
-          if sandbox
-            rewriter.process_with_sandbox
-          else
-            rewriter.process
-          end
-          rewriter
-        else
-          raise RewriterNotFound, "Rewriter #{group}/#{name} not found"
-        end
-      end
-
-      # Check if one rewriter exist.
-      #
-      # @param group [String] the rewriter group.
-      # @param name [String] the rewriter name.
-      # @return [Boolean] true if the rewriter exist.
-      def exist?(group, name)
-        group = group.to_s
-        name = name.to_s
-        if rewriters[group] && rewriters[group][name]
-          true
+        rewriter = fetch(group, name)
+        if sandbox
+          rewriter.process_with_sandbox
         else
-          false
+          rewriter.process
         end
+        rewriter
       end
 
       # Get all available rewriters

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.53.0'
+    VERSION = '0.54.3'
   end
 end

data/spec/synvert/core/rewriter/action/remove_action_spec.rb

@@ -7,7 +7,7 @@ module Synvert::Core
     subject {
       source = "user = User.new params[:user]\nuser.save\nrender\n"
       send_node = Parser::CurrentRuby.parse(source).children[1]
-      instance = double(current_node: send_node)
+      instance = double(current_node: send_node, file_source: source)
       Rewriter::RemoveAction.new(instance)
     }
 
@@ -16,7 +16,7 @@ module Synvert::Core
     end
 
     it 'gets end_pos' do
-      expect(subject.end_pos).to eq "user = User.new params[:user]\nuser.save".length
+      expect(subject.end_pos).to eq "user = User.new params[:user]\nuser.save\n".length
     end
 
     it 'gets rewritten_code' do

data/spec/synvert/core/rewriter/instance_spec.rb

@@ -54,9 +54,9 @@ module Synvert::Core
     it 'parses goto_node' do
       scope = double
       block = proc {}
-      expect(Rewriter::GotoScope).to receive(:new).with(instance, :caller, :receiver, &block).and_return(scope)
+      expect(Rewriter::GotoScope).to receive(:new).with(instance, 'caller.receiver', &block).and_return(scope)
       expect(scope).to receive(:process)
-      instance.goto_node(:caller, :receiver, &block)
+      instance.goto_node('caller.receiver', &block)
     end
 
     it 'parses if_exist_node' do

data/spec/synvert/core/rewriter/scope/goto_scope_spec.rb

@@ -24,7 +24,7 @@ module Synvert::Core
         run = false
         type_in_scope = nil
         scope =
-          Rewriter::GotoScope.new instance, :caller, :receiver do
+          Rewriter::GotoScope.new instance, 'caller.receiver' do
             run = true
             type_in_scope = node.type
           end

data/spec/synvert/core/rewriter_spec.rb

@@ -249,17 +249,6 @@ module Synvert::Core
         expect { Rewriter.call 'group', 'rewriter' }.to raise_error(RewriterNotFound)
       end
 
-      context 'exist?' do
-        it 'returns true if rewriter exists' do
-          Rewriter.new 'group', 'rewriter'
-          expect(Rewriter.exist?('group', 'rewriter')).to be_truthy
-        end
-
-        it 'returns false if rewriter does not exist' do
-          expect(Rewriter.exist?('group', 'rewriter')).to be_falsey
-        end
-      end
-
       context 'available' do
         it 'lists empty rewriters' do
           expect(Rewriter.availables).to eq({})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.54.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport