synvert-core 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56b98032247ef28e548b34dfd8b2b49bad8744227cd61b4f300c7111b701ff91
-  data.tar.gz: ea75a1e4f442041665dbd9babdc2f7e4b55c4c78c87facef856e903f2d8c96d2
+  metadata.gz: 51aff3b9c1c43ab2e6b3c093b65a42cb97536b900cf0aa8d0081e7e8716346f0
+  data.tar.gz: 6902ad17b6fa2d1ab2a5d5294f3bb1f29903a12c7ad8dd15cc7dae56173a440a
 SHA512:
-  metadata.gz: 905c1f393a1702df43300432e210784790a30dff9a7bb0c798c742ec372a65ad8487b2097333f57afb1798c566f554ab9096ae92db8cd2541e5bb03769009882
-  data.tar.gz: bd03f1c285c5b5b42628df0b3c8777d6167d980c8c3e3b2f92badfc040b2bef5fe2bef3b848b5a6a166002a5e68f8f4f287ac6ee8fadc72a3ef6706fe191c821
+  metadata.gz: 74cc5bb2cf144fba8bbd8ad647971efeba9473138d1cc5b416b45aa940c22f8929cefdd32b5e692c0dc1a9c9786d49dd8b441f1949a58256cec015a9697f2a43
+  data.tar.gz: c08abee0bf9fd0cba7cd5248f9020c4c30dadc25c06c5b358a122ccb09e7171878eae85cd498a0fb788aa2987fcf0302916c49cca0f9eaabc77b55e3a43d6a3a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.3.1 (2022-05-14)
+
+* Add `add_comma` option to remove extra comma
+
 ## 1.3.0 (2022-05-12)
 
 * Support `*=`, `^=` and `$=` operators

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

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 # encoding: UTF-8
 #--

data/lib/synvert/core/node_query/parser.racc.rb

@@ -1,3 +1,4 @@
+# typed: true
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.6.0

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

@@ -7,9 +7,11 @@ module Synvert::Core
     #
     # @param instance [Synvert::Core::Rewriter::Instance]
     # @param selectors [Array<Symbol, String>] used to select child nodes
-    def initialize(instance, *selectors)
+    # @option and_comma [Boolean] delete extra comma.
+    def initialize(instance, *selectors, and_comma: false)
       super(instance, nil)
       @selectors = selectors
+      @and_comma = and_comma
     end
 
     # The rewritten code, always empty string.
@@ -26,7 +28,7 @@ module Synvert::Core
       @end_pos = @selectors.map { |selector| @node.child_node_range(selector) }
                            .compact.map(&:end_pos).max
       squeeze_spaces
-      remove_comma
+      remove_comma if @and_comma
     end
   end
 end

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

@@ -6,8 +6,11 @@ module Synvert::Core
     # Initialize a RemoveAction.
     #
     # @param instance [Synvert::Core::Rewriter::RemoveAction]
-    def initialize(instance)
+    # @param options [Hash] options.
+    # @option and_comma [Boolean] delete extra comma.
+    def initialize(instance, and_comma: false)
       super(instance, nil)
+      @and_comma = and_comma
     end
 
     # The rewritten code, always empty string.
@@ -27,7 +30,7 @@ module Synvert::Core
         @begin_pos = @node.loc.expression.begin_pos
         @end_pos = @node.loc.expression.end_pos
         squeeze_spaces
-        remove_comma
+        remove_comma if @and_command
       end
     end
 

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

@@ -333,8 +333,10 @@ module Synvert::Core
     #   with_node type: 'send', message: { in: %w[puts p] } do
     #     remove
     #   end
-    def remove
-      @actions << Rewriter::RemoveAction.new(self).process
+    # @param options [Hash] options.
+    # @option and_comma [Boolean] delete extra comma.
+    def remove(**options)
+      @actions << Rewriter::RemoveAction.new(self, **options).process
     end
 
     # Parse +delete+ dsl, it creates a {Synvert::Core::Rewriter::DeleteAction} to delete child nodes.
@@ -346,8 +348,10 @@ module Synvert::Core
     #     delete :receiver, :dot
     #   end
     # @param selectors [Array<Symbol>] selector names of child node.
-    def delete(*selectors)
-      @actions << Rewriter::DeleteAction.new(self, *selectors).process
+    # @param options [Hash]
+    # @option and_comma [Boolean] delete extra comma.
+    def delete(*selectors, **options)
+      @actions << Rewriter::DeleteAction.new(self, *selectors, **options).process
     end
 
     # Parse +wrap+ dsl, it creates a {Synvert::Core::Rewriter::WrapAction} to

data/lib/synvert/core/version.rb

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

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

@@ -167,16 +167,21 @@ module Synvert::Core
 
     it 'parses remove' do
       action = double
-      expect(Rewriter::RemoveAction).to receive(:new).with(instance).and_return(action)
+      expect(Rewriter::RemoveAction).to receive(:new).with(instance, { and_comma: true }).and_return(action)
       expect(action).to receive(:process)
-      instance.remove
+      instance.remove and_comma: true
     end
 
     it 'parses remove' do
       action = double
-      expect(Rewriter::DeleteAction).to receive(:new).with(instance, :dot, :message).and_return(action)
+      expect(Rewriter::DeleteAction).to receive(:new).with(
+        instance,
+        :dot,
+        :message,
+        { and_comma: true }
+      ).and_return(action)
       expect(action).to receive(:process)
-      instance.delete :dot, :message
+      instance.delete :dot, :message, and_comma: true
     end
 
     it 'parses wrap with' do

metadata

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