synvert-core 1.28.5 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bec5627263e4ec474329e21a53a142f9d9320a888fd4b3d236ec538617d0ff3
-  data.tar.gz: 0b94c83241ddc9288b4487e76d8e2f75de6a2ec0636096d3dcb2fc1fcf042001
+  metadata.gz: 1dda2705261d25cdacf3eed0d8c7bb02b66cdcb8bb6774ffc7839b675f685f47
+  data.tar.gz: a45e9724ced71c2d55ec9f517fd1a51f571b5ec01dd6d83055e87056ec627579
 SHA512:
-  metadata.gz: 2a86dd8058630846880993ec83e7201153e98e8af1d87cbe75f3cf6f0b8dbf98affab6d360a6ded45d80597225e5a7c3117662b98c092362644a7133951243cf
-  data.tar.gz: f2846ce3d7893d5d068d408eaafc916297e20a9f4989f5b94a495e723dc2cd6b185542ec826fc478fb88fe09d749feb6397576b2e3175099d4970c43cc4f1e12
+  metadata.gz: c64807dda9469a101349d4987edc2092035c1bc342ade195e82acd4d3e74f04c49002c6810c5586f812dc7b3ed8ada54780b660cd0e73d8ab2c094d03688e608
+  data.tar.gz: e54c85411a4aa0776c94afafd3a8cf62d0d7a33df2106c3f16ab437138c0e47b94d27c40b33f0bf0098e39a3cf88bba917d1bee1bb5c8f0224aed84be7455d42

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.29.0 (2023-09-26)
+
+* Update `node_mutation` to 1.21.0
+* Revert "Combine actions within scope"
+* Add `group` dsl
+
 ## 1.28.5 (2023-09-25)
 
 * Update `node-query` to 1.13.11

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.28.5)
+    synvert-core (1.29.0)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.20.0)
+      node_mutation (>= 1.21.0)
       node_query (>= 1.13.11)
       parallel
       parser
@@ -50,7 +50,7 @@ GEM
     method_source (1.0.0)
     minitest (5.20.0)
     nenv (0.3.0)
-    node_mutation (1.20.0)
+    node_mutation (1.21.0)
     node_query (1.13.11)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -91,7 +91,7 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby

data/README.md

@@ -101,6 +101,7 @@ Actions:
 * [warn](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#warn-instance_method) - warn message
 * [replace_erb_stmt_with_expr](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#replace_erb_stmt_with_expr-instance_method) - replace erb stmt code to expr code
 * [noop](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#noop-instance_method) - no operation
+* [group](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#group-instance_method) - group actions
 * [add_action](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#add_action-instance_method) - add custom action
 
 Others:

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

@@ -37,9 +37,7 @@ module Synvert::Core
     #   @return current ast node
     # @!attribute [r] mutation_adapter
     #   @return NodeMutation Adapter
-    # @!attribute [r] current_mutation
-    #   @return current node mutation
-    attr_reader :file_path, :mutation_adapter, :current_mutation
+    attr_reader :file_path, :current_node, :mutation_adapter
     attr_accessor :current_node
 
     # Process the instance.
@@ -409,6 +407,16 @@ module Synvert::Core
       @current_mutation.noop(@current_node)
     end
 
+    # Group actions.
+    # @example
+    #     group do
+    #       delete :message, :dot
+    #       replace 'receiver.caller.message', with: 'flat_map'
+    #     end
+    def group(&block)
+      @current_mutation.group(&block)
+    end
+
     # Add a custom action.
     # @example
     #   remover_action = NodeMutation::RemoveAction.new(node)

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

@@ -29,9 +29,7 @@ module Synvert::Core
       @instance.process_with_node current_node do
         matching_nodes.each do |matching_node|
           @instance.process_with_node matching_node do
-            @instance.current_mutation.combine do
-              @instance.instance_eval(&@block)
-            end
+            @instance.instance_eval(&@block)
           end
         end
       end

data/lib/synvert/core/rewriter.rb

@@ -156,14 +156,15 @@ module Synvert::Core
       @test_results.map do |filename, test_results|
         new_actions = test_results.map(&:actions).flatten.sort_by(&:end)
         last_start = -1
-        conflicted = new_actions.any? do |action|
-          if last_start > action.end
-            true
-          else
-            last_start = action.start
-            false
+        conflicted =
+          new_actions.any? do |action|
+            if last_start > action.end
+              true
+            else
+              last_start = action.start
+              false
+            end
           end
-        end
         result = NodeMutation::Result.new(affected: true, conflicted: conflicted)
         result.actions = new_actions
         result.file_path = filename

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.28.5'
+    VERSION = '1.29.0'
   end
 end

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

@@ -262,6 +262,13 @@ module Synvert::Core
       instance.noop
     end
 
+    it 'parses group' do
+      instance.instance_variable_set(:@current_mutation, double)
+      instance.current_node = double
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:group)
+      instance.group {}
+    end
+
     it 'parses warn' do
       expect(Rewriter::Warning).to receive(:new).with(instance, 'foobar')
       instance.warn 'foobar'

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

@@ -6,9 +6,7 @@ module Synvert::Core
   describe Rewriter::WithinScope do
     let(:instance) {
       rewriter = Rewriter.new('foo', 'bar')
-      Rewriter::Instance.new(rewriter, 'file pattern').tap do |instance|
-        instance.instance_variable_set(:@current_mutation, NodeMutation.new('source'))
-      end
+      Rewriter::Instance.new(rewriter, 'file pattern')
     }
     let(:source) { <<~EOS }
       describe User 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.13.11"
-  spec.add_runtime_dependency "node_mutation", ">= 1.20.0"
+  spec.add_runtime_dependency "node_mutation", ">= 1.21.0"
   spec.add_runtime_dependency "parser"
   spec.add_runtime_dependency "parser_node_ext", ">= 1.2.0"
   spec.add_runtime_dependency "syntax_tree"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.28.5
+  version: 1.29.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-24 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement