synvert-core 1.28.3 → 1.28.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea0617537582c8fe24441b78a96a9e7e3ec74ef50a85bd761f1a2c620bb67ae
-  data.tar.gz: 30aed9720e68b3014aced6cea3d80dcf48d746ffcc217b543c6211cd29545468
+  metadata.gz: 0bec5627263e4ec474329e21a53a142f9d9320a888fd4b3d236ec538617d0ff3
+  data.tar.gz: 0b94c83241ddc9288b4487e76d8e2f75de6a2ec0636096d3dcb2fc1fcf042001
 SHA512:
-  metadata.gz: b4c4d9a0fe6833d651c25d9a574818a54976c5ffcd6ef018208763f277b990735361fca476488bfa831e8a4d5dcb96bc4b092bfc10506b5e6306b6a5941f3dd6
-  data.tar.gz: 4abe08f1cc6cf27ef830dbfcedb943737d11a377e5f87df3d6a7f67eabc6c6d790e86de647fe81a495a147cc1e2c90950a933c378665add69864f66b18a80fc2
+  metadata.gz: 2a86dd8058630846880993ec83e7201153e98e8af1d87cbe75f3cf6f0b8dbf98affab6d360a6ded45d80597225e5a7c3117662b98c092362644a7133951243cf
+  data.tar.gz: f2846ce3d7893d5d068d408eaafc916297e20a9f4989f5b94a495e723dc2cd6b185542ec826fc478fb88fe09d749feb6397576b2e3175099d4970c43cc4f1e12

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 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
+* Update `node-query` to 1.13.9
+* Update `node_mutation` to 1.19.3
+
 ## 1.28.3 (2023-06-22)
 
 * Update `node_mutation` to 1.19.1

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.28.3)
+    synvert-core (1.28.5)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.19.1)
-      node_query (>= 1.13.5)
+      node_mutation (>= 1.20.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.3)
+    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.18.1)
+    minitest (5.20.0)
     nenv (0.3.0)
-    node_mutation (1.19.1)
-    node_query (1.13.5)
+    node_mutation (1.20.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.0)
+    syntax_tree_ext (0.6.4)
       syntax_tree
     thor (1.2.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby

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

@@ -37,7 +37,9 @@ module Synvert::Core
     #   @return current ast node
     # @!attribute [r] mutation_adapter
     #   @return NodeMutation Adapter
-    attr_reader :file_path, :current_node, :mutation_adapter
+    # @!attribute [r] current_mutation
+    #   @return current node mutation
+    attr_reader :file_path, :mutation_adapter, :current_mutation
     attr_accessor :current_node
 
     # Process the instance.

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

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

data/lib/synvert/core/rewriter.rb

@@ -91,7 +91,7 @@ module Synvert::Core
     # @!attribute [r] gem_spec
     #   @return [Rewriter::GemSpec] the gem spec
     # @!attribute [r] test_results
-    #   @return [Array<Object>] the test results
+    #   @return [Hash<String, Object>] the test results
     # @!attribute [rw] options
     #   @return [Hash] the rewriter options
     attr_reader :group,
@@ -121,7 +121,7 @@ module Synvert::Core
       @affected_files = Set.new
       @redo_until_no_change = false
       @options = DEFAULT_OPTIONS.dup
-      @test_results = []
+      @test_results = Hash.new { |h, k| h[k] = [] }
       self.class.register(@group, @name, self)
     end
 
@@ -153,7 +153,22 @@ module Synvert::Core
       if !@affected_files.empty? && @redo_until_no_change # redo
         test
       end
-      @test_results
+      @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
+          end
+        end
+        result = NodeMutation::Result.new(affected: true, conflicted: conflicted)
+        result.actions = new_actions
+        result.file_path = filename
+        result
+      end
     end
 
     # Add a warning.
@@ -287,7 +302,7 @@ module Synvert::Core
         result = NodeMutation::Result.new(affected: true, conflicted: false)
         result.actions = [NodeMutation::Struct::Action.new(:add_file, 0, 0, content)]
         result.file_path = filename
-        @test_results << result
+        merge_test_result(result)
         return
       end
 
@@ -314,7 +329,7 @@ module Synvert::Core
         result = NodeMutation::Result.new(affected: true, conflicted: false)
         result.actions = [NodeMutation::Struct::Action.new(:remove_file, 0, -1)]
         result.file_path = filename
-        @test_results << result
+        merge_test_result(result)
         return
       end
 
@@ -430,7 +445,13 @@ module Synvert::Core
     end
 
     def merge_test_results(results)
-      @test_results += results.compact.select { |result| result.affected? }
+      results.compact.select(&:affected?).each do |result|
+        merge_test_result(result)
+      end
+    end
+
+    def merge_test_result(result)
+      @test_results[result.file_path] << result
     end
   end
 end

data/lib/synvert/core/version.rb

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

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

@@ -6,7 +6,9 @@ module Synvert::Core
   describe Rewriter::WithinScope do
     let(:instance) {
       rewriter = Rewriter.new('foo', 'bar')
-      Rewriter::Instance.new(rewriter, 'file pattern')
+      Rewriter::Instance.new(rewriter, 'file pattern').tap do |instance|
+        instance.instance_variable_set(:@current_mutation, NodeMutation.new('source'))
+      end
     }
     let(:source) { <<~EOS }
       describe User do

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.5"
-  spec.add_runtime_dependency "node_mutation", ">= 1.19.1"
+  spec.add_runtime_dependency "node_query", ">= 1.13.11"
+  spec.add_runtime_dependency "node_mutation", ">= 1.20.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.3
+  version: 1.28.5
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-09-24 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.5
+        version: 1.13.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.5
+        version: 1.13.11
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 1.20.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
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.