synvert-core 1.30.3 → 1.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c2557aab985fb34048581b6b768d40c012a8f4e2403987a43350c837890d991
-  data.tar.gz: 2f9d14d1c0632282d9d5d259dc21a25db4f245b4aa44302baabfa63e14a4f25a
+  metadata.gz: 3346883848c81ac9a130e077d0aae4eec34df1fcc365c95b9971b558b346f1a9
+  data.tar.gz: 15f5f83ef0d59c08edcf2cd076a36d0e057e94fee8d0435ca679c1a3e094dd01
 SHA512:
-  metadata.gz: dbe85c0e46b4eff9be065c257105a4d22f15d1ee14ebacb0a3b6a638c8727862f984358e4204b3551ea567323eab784f35e1274f50c9ab8b2cad3417cbcdc299
-  data.tar.gz: 0a8ffa195df715505e6fdd5e7aa2694b9a34aba1ea4ba0e34256fca5763a4d9a722fdb16e2a417a28eb9fa197e3b3e597708103bb2bc9989773dfe2d9f15ca89
+  metadata.gz: a24728c75868284ed17baa5cdc9b9ab1d0961ba560ea00f7a71eaf0fe4bf3a01f322435002a9911e934d87a51a744f77b1c21b54bb8126739d31e0a50a9a991c
+  data.tar.gz: 65505c1d4f55b82d789f119463d535a67c11c85f18cbcbb0d7311d572f23e42085b44477d7d70c14e4019511cf5db7c502ac2e7278f0481720aaf64da7031e1f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.31.0 (2024-01-14)
+
+* Support `Configuration.test_result` in `add_file` and `remove_file` dsl
+* Get new source in `Rewriter#test`
+
 ## 1.30.3 (2024-01-13)
 
 * Add `Configuration.test_result` option

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.30.3)
+    synvert-core (1.31.0)
       activesupport (< 7.0.0)
       node_mutation (>= 1.21.6)
       node_query (>= 1.13.12)

data/lib/synvert/core/rewriter.rb

@@ -149,22 +149,26 @@ module Synvert::Core
       if !@affected_files.empty? && @redo_until_no_change # redo
         test
       end
-      @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
+      if Configuration.test_result == 'new_source'
+        @test_results.values.flatten
+      else
+        @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
-          end
-        result = NodeMutation::Result.new(affected: true, conflicted: conflicted)
-        result.actions = new_actions
-        result.file_path = filename
-        result
+          result = NodeMutation::Result.new(affected: true, conflicted: conflicted)
+          result.actions = new_actions
+          result.file_path = filename
+          result
+        end
       end
     end
 
@@ -289,7 +293,11 @@ module Synvert::Core
 
       unless @options[:write_to_file]
         result = NodeMutation::Result.new(affected: true, conflicted: false)
-        result.actions = [NodeMutation::Struct::Action.new(:add_file, 0, 0, content)]
+        if Configuration.test_result == 'new_source'
+          result.new_source = content
+        else
+          result.actions = [NodeMutation::Struct::Action.new(:add_file, 0, 0, content)]
+        end
         result.file_path = filename
         merge_test_result(result)
         return
@@ -316,7 +324,11 @@ module Synvert::Core
 
       unless @options[:write_to_file]
         result = NodeMutation::Result.new(affected: true, conflicted: false)
-        result.actions = [NodeMutation::Struct::Action.new(:remove_file, 0, -1)]
+        if Configuration.test_result == 'new_source'
+          result.new_source = nil
+        else
+          result.actions = [NodeMutation::Struct::Action.new(:remove_file, 0, -1)]
+        end
         result.file_path = filename
         merge_test_result(result)
         return

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.30.3'
+    VERSION = '1.31.0'
   end
 end

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

@@ -456,7 +456,7 @@ module Synvert::Core
         before { Configuration.test_result = 'new_source' }
         after { Configuration.test_result = nil }
 
-        it 'gets new_source if Configuration.test_result is new_source' do
+        it 'gets new_source' do
           instance =
             Rewriter::Instance.new rewriter, 'spec/models/post_spec.rb' do
               with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do

data/spec/synvert/core/rewriter_spec.rb

@@ -100,6 +100,31 @@ module Synvert::Core
           expect(results[0].actions).to eq [NodeMutation::Struct::Action.new(:replace, 6, 12, 'Synvert')]
         end
       end
+
+      context 'Configuration.test_result is new_source' do
+        before { Configuration.test_result = 'new_source' }
+        after { Configuration.test_result = nil }
+
+        it 'gets test results with new_source' do
+          rewriter =
+            Rewriter.new('group', 'name') do
+              within_files '**/*.rb' do
+                with_node node_type: 'class', name: 'Foobar' do
+                  replace :name, with: 'Synvert'
+                end
+              end
+            end
+          input = "class Foobar\nend"
+          FakeFS do
+            File.write("code.rb", input)
+            results = rewriter.test
+            expect(results[0].file_path).to eq '/code.rb'
+            expect(results[0].affected?).to be_truthy
+            expect(results[0].conflicted?).to be_falsey
+            expect(results[0].new_source).to eq "class Synvert\nend"
+          end
+        end
+      end
     end
 
     describe 'parses within_file' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.30.3
+  version: 1.31.0
 platform: ruby
 authors:
 - Richard Huang