synvert-core 1.21.7 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d33e2874a1d23b725a4d2bb62e8cfd03d71b9c82e22fbe9a349336ac19f6eab
-  data.tar.gz: 74a56b255b08c5f017fe0717dbd644cfc61983a06c6c7c0b0ec86f77d6566ff1
+  metadata.gz: 80a767738290801342257194e72b784fa8d1849f5a7a2098dabf5776cc33735b
+  data.tar.gz: 7e6a0b109c9c281a3ead5e623107c30417288dc4ca694d0bdafcd71ccac67fc8
 SHA512:
-  metadata.gz: a98c6ded4885bebda395ad253cb826ce1e82ad06d734cc0bfbd00b592676c6dde8aac530d30d2d27beb3b7ca314519a782de91fa0e97905ea4c1fd62122eef98
-  data.tar.gz: ec1d2ac24a8f9066bb228363b961cc1e93da96f501cbfb166fb398cb21a3bd80d5ee496b261e0901289b6fed3d9749fdf04cd5b2db458853caf742ceca5c5691
+  metadata.gz: 7abe8e7fbe261f1739974eb51b70cbf86a4a674bcdd8c2fcadce42962deb0a2be2532d28bdb808a211dd4e86c8bbd7150fb6d8def0ac263e9fcceba491f4b240
+  data.tar.gz: 906b75c024ca0464d60bdadaf8dcf761f2e18d3df2704d66423eefcf1bdf98cae57804b368358ac0838053f76fee4a36c4989f774b630489291aaf5e05933f4a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.22.1 (2023-03-31)
+
+* Fix indent when `insert_after` or `insert_before` to a child node
+* Update `node_mutation` to 1.13.0
+
+## 1.22.0 (2023-03-24)
+
+* Add `and_comma` option to `insert`, `insert_before`, `insert_after` api
+
 ## 1.21.7 (2023-03-23)
 
 * Polish `erb` engine

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.21.7)
+    synvert-core (1.22.1)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.12.1)
+      node_mutation (>= 1.13.0)
       node_query (>= 1.12.0)
       parallel
       parser
@@ -49,7 +49,7 @@ GEM
     method_source (1.0.0)
     minitest (5.18.0)
     nenv (0.3.0)
-    node_mutation (1.12.1)
+    node_mutation (1.13.0)
       erubis
     node_query (1.12.0)
     notiffany (0.1.3)

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

@@ -250,8 +250,9 @@ module Synvert::Core
     # @param code [String] code need to be inserted.
     # @param at [String] insert position, beginning or end
     # @param to [String] where to insert, if it is nil, will insert to current node.
-    def insert(code, at: 'end', to: nil)
-      @current_mutation.insert(@current_node, code, at: at, to: to)
+    # @param and_comma [Boolean] insert extra comma.
+    def insert(code, at: 'end', to: nil, and_comma: false)
+      @current_mutation.insert(@current_node, code, at: at, to: to, and_comma: and_comma)
     end
 
     # It inserts the code next to the current node.
@@ -264,9 +265,11 @@ module Synvert::Core
     #     insert_after "{{receiver}}.secret_key_base = \"#{SecureRandom.hex(64)}\""
     #   end
     # @param code [String] code need to be inserted.
-    def insert_after(code, to: nil)
-      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node).column
-      @current_mutation.insert(@current_node, "\n#{column}#{code}", at: 'end', to: to)
+    # @param to [String] where to insert, if it is nil, will insert to current node.
+    # @param and_comma [Boolean] insert extra comma.
+    def insert_after(code, to: nil, and_comma: false)
+      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node, to).column
+      @current_mutation.insert(@current_node, "\n#{column}#{code}", at: 'end', to: to, and_comma: and_comma)
     end
 
     # It inserts the code previous to the current node.
@@ -279,9 +282,11 @@ module Synvert::Core
     #     insert_before "{{receiver}}.secret_key_base = \"#{SecureRandom.hex(64)}\""
     #   end
     # @param code [String] code need to be inserted.
-    def insert_before(code, to: nil)
-      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node).column
-      @current_mutation.insert(@current_node, "#{code}\n#{column}", at: 'beginning', to: to)
+    # @param to [String] where to insert, if it is nil, will insert to current node.
+    # @param and_comma [Boolean] insert extra comma.
+    def insert_before(code, to: nil, and_comma: false)
+      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node, to).column
+      @current_mutation.insert(@current_node, "#{code}\n#{column}", at: 'beginning', to: to, and_comma: and_comma)
     end
 
     # It replaces erb stmt code to expr code.
@@ -332,10 +337,9 @@ module Synvert::Core
     #   with_node type: 'send', message: { in: %w[puts p] } do
     #     remove
     #   end
-    # @param options [Hash] options.
     # @option and_comma [Boolean] delete extra comma.
-    def remove(**options)
-      @current_mutation.remove(@current_node, **options)
+    def remove(and_comma: false)
+      @current_mutation.remove(@current_node, and_comma: and_comma)
     end
 
     # It deletes child nodes.
@@ -347,10 +351,9 @@ module Synvert::Core
     #     delete :receiver, :dot
     #   end
     # @param selectors [Array<Symbol>] selector names of child node.
-    # @param options [Hash]
     # @option and_comma [Boolean] delete extra comma.
-    def delete(*selectors, **options)
-      @current_mutation.delete(@current_node, *selectors, **options)
+    def delete(*selectors, and_comma: false)
+      @current_mutation.delete(@current_node, *selectors, and_comma: and_comma)
     end
 
     # It wraps current node with code.

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.21.7'
+    VERSION = '1.22.1'
   end
 end

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

@@ -128,7 +128,8 @@ module Synvert::Core
         instance.current_node,
         'Foobar',
         at: 'end',
-        to: 'receiver'
+        to: 'receiver',
+        and_comma: false
       )
       instance.insert 'Foobar', to: 'receiver'
     end
@@ -140,7 +141,8 @@ module Synvert::Core
         instance.current_node,
         'Foobar',
         at: 'beginning',
-        to: nil
+        to: nil,
+        and_comma: false
       )
       instance.insert 'Foobar', at: 'beginning'
     end
@@ -153,9 +155,10 @@ module Synvert::Core
         instance.current_node,
         "\n  Foobar",
         at: 'end',
-        to: nil
+        to: 'caller',
+        and_comma: false
       )
-      instance.insert_after 'Foobar'
+      instance.insert_after 'Foobar', to: 'caller'
     end
 
     it 'parses insert_before' do
@@ -166,9 +169,10 @@ module Synvert::Core
         instance.current_node,
         "Foobar\n  ",
         at: 'beginning',
-        to: nil
+        to: 'caller',
+        and_comma: false
       )
-      instance.insert_before 'Foobar'
+      instance.insert_before 'Foobar', to: 'caller'
     end
 
     it 'parses replace_erb_stmt_with_expr' do

data/synvert-core-ruby.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport", "< 7.0.0"
   spec.add_runtime_dependency "node_query", ">= 1.12.0"
-  spec.add_runtime_dependency "node_mutation", ">= 1.12.1"
+  spec.add_runtime_dependency "node_mutation", ">= 1.13.0"
   spec.add_runtime_dependency "parser"
   spec.add_runtime_dependency "parser_node_ext", ">= 1.0.0"
   spec.add_runtime_dependency "parallel"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.21.7
+  version: 1.22.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement