synvert-core 1.28.4 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc7906502ebd8ee2093236003a46a312f11487be41316be86777128c1685bda1
-  data.tar.gz: 706c9c932dfbfb16ba5cff3374380b54ae8239d12e2ef98dd7c4c45dd765d7a0
+  metadata.gz: 1dda2705261d25cdacf3eed0d8c7bb02b66cdcb8bb6774ffc7839b675f685f47
+  data.tar.gz: a45e9724ced71c2d55ec9f517fd1a51f571b5ec01dd6d83055e87056ec627579
 SHA512:
-  metadata.gz: 767ec7b8f201e7cdb28fd145ac83a5afbc0c96f4d1536dc7bd18c996f948a780ee70925c041b134078fbdfb6728605840e285badce8635beb6631b045220c4c4
-  data.tar.gz: 6514f640f49da23297fd5ce904fa71ab913bf6b2fd352c56fd04248e28ae303700b0fd72e548c25ca72839b787a1730d7dc862cdcc00f02fda126ed7ce90956e
+  metadata.gz: c64807dda9469a101349d4987edc2092035c1bc342ade195e82acd4d3e74f04c49002c6810c5586f812dc7b3ed8ada54780b660cd0e73d8ab2c094d03688e608
+  data.tar.gz: e54c85411a4aa0776c94afafd3a8cf62d0d7a33df2106c3f16ab437138c0e47b94d27c40b33f0bf0098e39a3cf88bba917d1bee1bb5c8f0224aed84be7455d42

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 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
+* Update `node_mutation` to 1.20.0
+* Combine actions within scope
+* Iterate actions in engine
+
 ## 1.28.4 (2023-08-16)
 
 * Merge `test_results` based on file_path

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.28.4)
+    synvert-core (1.29.0)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.19.3)
-      node_query (>= 1.13.9)
+      node_mutation (>= 1.21.0)
+      node_query (>= 1.13.11)
       parallel
       parser
       parser_node_ext (>= 1.2.0)
       syntax_tree
-      syntax_tree_ext (>= 0.6.0)
+      syntax_tree_ext (>= 0.6.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.4)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -48,10 +48,10 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.19.0)
+    minitest (5.20.0)
     nenv (0.3.0)
-    node_mutation (1.19.3)
-    node_query (1.13.10)
+    node_mutation (1.21.0)
+    node_query (1.13.11)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -84,14 +84,14 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
     shellany (0.0.1)
-    syntax_tree (6.1.1)
+    syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    syntax_tree_ext (0.6.3)
+    syntax_tree_ext (0.6.4)
       syntax_tree
     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/engine/elegant.rb

@@ -34,7 +34,7 @@ module Synvert::Core
             start += index + END_LINE.length
           end
           indices.each do |index|
-            actions.each do |action|
+            NodeMutation::Helper.iterate_actions(actions) do |action|
               action.start -= END_LINE.length if action.start > index
               action.end -= END_LINE.length if action.end > index
             end

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

@@ -407,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.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.4'
+    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/synvert-core-ruby.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport", "< 7.0.0"
-  spec.add_runtime_dependency "node_query", ">= 1.13.9"
-  spec.add_runtime_dependency "node_mutation", ">= 1.19.3"
+  spec.add_runtime_dependency "node_query", ">= 1.13.11"
+  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"
-  spec.add_runtime_dependency "syntax_tree_ext", ">= 0.6.0"
+  spec.add_runtime_dependency "syntax_tree_ext", ">= 0.6.4"
   spec.add_runtime_dependency "parallel"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.28.4
+  version: 1.29.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-16 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.9
+        version: 1.13.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.9
+        version: 1.13.11
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.3
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.3
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement