synvert-core 1.30.3 → 1.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c2557aab985fb34048581b6b768d40c012a8f4e2403987a43350c837890d991
-  data.tar.gz: 2f9d14d1c0632282d9d5d259dc21a25db4f245b4aa44302baabfa63e14a4f25a
+  metadata.gz: b6afbabeda5ddf0d37764d420af4dea4751ede79c6f1c58319b854e351825f82
+  data.tar.gz: 18b68174ac1418246ccfbeabac6797fd5f695bdaf2a341c6c2427aa6628b96fd
 SHA512:
-  metadata.gz: dbe85c0e46b4eff9be065c257105a4d22f15d1ee14ebacb0a3b6a638c8727862f984358e4204b3551ea567323eab784f35e1274f50c9ab8b2cad3417cbcdc299
-  data.tar.gz: 0a8ffa195df715505e6fdd5e7aa2694b9a34aba1ea4ba0e34256fca5763a4d9a722fdb16e2a417a28eb9fa197e3b3e597708103bb2bc9989773dfe2d9f15ca89
+  metadata.gz: c081ce34db2a4f400d14e2fac14b7cab18ccc5099e16079f4c8a88eb8aeb7004a7f61a8ca4e2538146fb8ea0610f099cfc5da6f403efb965e57db31afc3e459a
+  data.tar.gz: 75f4b8858fb303d11226719ae9c87304de3a07c56005cd888335e7386ede75a3345f6500857968a7608e67f364f477450f5c3fa1d8e2089eb2d16e991d434cfc

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.31.1 (2024-01-30)
+
+* Update `node_mutation` to 1.22.4
+* Remove `redo_until_no_change` dsl
+
+## 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,9 +1,9 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.30.3)
+    synvert-core (1.31.1)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.21.6)
+      node_mutation (>= 1.22.4)
       node_query (>= 1.13.12)
       parallel
       parser
@@ -22,7 +22,7 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     diff-lcs (1.5.0)
     fakefs (2.4.0)
     ffi (1.15.5)
@@ -48,15 +48,15 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.21.1)
+    minitest (5.21.2)
     nenv (0.3.0)
-    node_mutation (1.22.2)
+    node_mutation (1.22.4)
     node_query (1.14.1)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.24.0)
-    parser (3.3.0.3)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     parser_node_ext (1.2.1)

data/README.md

@@ -70,7 +70,6 @@ DSLs are as follows
 * [helper_method](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#helper_method-instance_method) - define a helper method
 * [add_snippet](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#add_snippet-instance_method) - call another rewriter
 * [call_helper](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#call_helper-instance_method) - call a shared rewriter
-* [redo_until_no_change](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#redo_until_no_change-instance_method) - run the snippet until no change
 
 Scopes:
 

data/lib/synvert/core/rewriter.rb

@@ -119,7 +119,6 @@ module Synvert::Core
       @sub_snippets = []
       @warnings = []
       @affected_files = Set.new
-      @redo_until_no_change = false
       @options = DEFAULT_OPTIONS.dup
       @test_results = Hash.new { |h, k| h[k] = [] }
       self.class.register(@group, @name, self)
@@ -130,8 +129,6 @@ module Synvert::Core
     def process
       @affected_files = Set.new
       instance_eval(&@block)
-
-      process if !@affected_files.empty? && @redo_until_no_change # redo
     end
 
     # Process rewriter with sandbox mode.
@@ -146,25 +143,26 @@ module Synvert::Core
       @affected_files = Set.new
       instance_eval(&@block)
 
-      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 +287,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 +318,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
@@ -394,15 +400,6 @@ module Synvert::Core
       @helpers << { name: name, block: block }
     end
 
-    # Rerun the snippet until no change.
-    # @example
-    #   Synvert::Rewriter.new 'ruby', 'nested_class_definition' do
-    #     redo_until_no_change
-    #   end
-    def redo_until_no_change
-      @redo_until_no_change = true
-    end
-
     private
 
     # Handle one file.

data/lib/synvert/core/utils.rb

@@ -16,7 +16,7 @@ module Synvert::Core
           uri = URI.parse(format_url(snippet_name))
           return uri.open.read if remote_snippet_exists?(uri)
 
-          raise Errors::SnippetNotFound.new("#{snippet_name} nout found")
+          raise Errors::SnippetNotFound.new("#{snippet_name} not found")
         elsif is_valid_file?(snippet_name)
           return File.read(snippet_name)
         else
@@ -26,7 +26,7 @@ module Synvert::Core
           snippet_uri = URI.parse(format_url(remote_snippet_url(snippet_name)))
           return snippet_uri.open.read if remote_snippet_exists?(snippet_uri)
 
-          raise Errors::SnippetNotFound.new("#{snippet_name} nout found")
+          raise Errors::SnippetNotFound.new("#{snippet_name} not found")
         end
       end
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.30.3'
+    VERSION = '1.31.1'
   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
@@ -357,15 +382,6 @@ module Synvert::Core
       expect(instance.dynamic_helper('arg1', 'arg2')).to eq 'dynamic result'
     end
 
-    it 'parses redo_until_no_change' do
-      rewriter =
-        Rewriter.new 'group', 'name' do
-          redo_until_no_change
-        end
-      rewriter.process
-      expect(rewriter.instance_variable_get('@redo_until_no_change')).to be_truthy
-    end
-
     describe 'class methods' do
       before :each do
         Rewriter.clear

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.12"
-  spec.add_runtime_dependency "node_mutation", ">= 1.21.6"
+  spec.add_runtime_dependency "node_mutation", ">= 1.22.4"
   spec.add_runtime_dependency "parser"
   spec.add_runtime_dependency "parser_node_ext", ">= 1.2.1"
   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.30.3
+  version: 1.31.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.6
+        version: 1.22.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.6
+        version: 1.22.4
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement