synvert-core 1.28.3 → 1.28.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea0617537582c8fe24441b78a96a9e7e3ec74ef50a85bd761f1a2c620bb67ae
-  data.tar.gz: 30aed9720e68b3014aced6cea3d80dcf48d746ffcc217b543c6211cd29545468
+  metadata.gz: cc7906502ebd8ee2093236003a46a312f11487be41316be86777128c1685bda1
+  data.tar.gz: 706c9c932dfbfb16ba5cff3374380b54ae8239d12e2ef98dd7c4c45dd765d7a0
 SHA512:
-  metadata.gz: b4c4d9a0fe6833d651c25d9a574818a54976c5ffcd6ef018208763f277b990735361fca476488bfa831e8a4d5dcb96bc4b092bfc10506b5e6306b6a5941f3dd6
-  data.tar.gz: 4abe08f1cc6cf27ef830dbfcedb943737d11a377e5f87df3d6a7f67eabc6c6d790e86de647fe81a495a147cc1e2c90950a933c378665add69864f66b18a80fc2
+  metadata.gz: 767ec7b8f201e7cdb28fd145ac83a5afbc0c96f4d1536dc7bd18c996f948a780ee70925c041b134078fbdfb6728605840e285badce8635beb6631b045220c4c4
+  data.tar.gz: 6514f640f49da23297fd5ce904fa71ab913bf6b2fd352c56fd04248e28ae303700b0fd72e548c25ca72839b787a1730d7dc862cdcc00f02fda126ed7ce90956e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 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,10 +1,10 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.28.3)
+    synvert-core (1.28.4)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.19.1)
-      node_query (>= 1.13.5)
+      node_mutation (>= 1.19.3)
+      node_query (>= 1.13.9)
       parallel
       parser
       parser_node_ext (>= 1.2.0)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.3)
+    activesupport (6.1.7.4)
       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.19.0)
     nenv (0.3.0)
-    node_mutation (1.19.1)
-    node_query (1.13.5)
+    node_mutation (1.19.3)
+    node_query (1.13.10)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -86,12 +86,12 @@ GEM
     shellany (0.0.1)
     syntax_tree (6.1.1)
       prettier_print (>= 1.2.0)
-    syntax_tree_ext (0.6.0)
+    syntax_tree_ext (0.6.3)
       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/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.4'
   end
 end

data/synvert-core-ruby.gemspec

@@ -20,8 +20,8 @@ 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.9"
+  spec.add_runtime_dependency "node_mutation", ">= 1.19.3"
   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.3
+  version: 1.28.4
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-08-16 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.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.5
+        version: 1.13.9
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 1.19.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 1.19.3
 - !ruby/object:Gem::Dependency
   name: parser
   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.