synvert-core 1.28.2 → 1.28.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 967c9d4d1272398a382d90b14f77c72af4c6c2adb0cc7970e40893ff41090564
-  data.tar.gz: aa819bf4c76328726e2586c3943af54b7bd28ec7262d799fbea704e65266361c
+  metadata.gz: cc7906502ebd8ee2093236003a46a312f11487be41316be86777128c1685bda1
+  data.tar.gz: 706c9c932dfbfb16ba5cff3374380b54ae8239d12e2ef98dd7c4c45dd765d7a0
 SHA512:
-  metadata.gz: 385ea78c97b34a315b74c0bee37a8dfd1d2a784e96c32bd1e781aa1bb6ba2dddef0634a975fdd96de480923c003f419eac575b3887337bb049281f1b41795ac7
-  data.tar.gz: d065f52a673872c4493612f2d350fd78deed5e6b00947e18fa747d2042d3e907cd7f0577306d9a9e5e98c48dd4854b5df1ee9595b82fea5e4411eaefd149a8bd
+  metadata.gz: 767ec7b8f201e7cdb28fd145ac83a5afbc0c96f4d1536dc7bd18c996f948a780ee70925c041b134078fbdfb6728605840e285badce8635beb6631b045220c4c4
+  data.tar.gz: 6514f640f49da23297fd5ce904fa71ab913bf6b2fd352c56fd04248e28ae303700b0fd72e548c25ca72839b787a1730d7dc862cdcc00f02fda126ed7ce90956e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # 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
+* Remove `node_ext`
+
 ## 1.28.2 (2023-06-17)
 
 * Update `node_query` to 1.13.5

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.28.2)
+    synvert-core (1.28.4)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.18.3)
-      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.18.3)
-    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.2'
+    VERSION = '1.28.4'
   end
 end

data/lib/synvert/core.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'synvert/core/version'
-require_relative './core/node_ext'
 require 'active_support'
 require 'active_support/core_ext'
 require 'node_query'

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.18.3"
+  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.2
+  version: 1.28.4
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-17 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.18.3
+        version: 1.19.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.3
+        version: 1.19.3
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,6 @@ files:
 - lib/synvert/core/engine/slim.rb
 - lib/synvert/core/errors.rb
 - lib/synvert/core/helper.rb
-- lib/synvert/core/node_ext.rb
 - lib/synvert/core/rewriter.rb
 - lib/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action.rb
 - lib/synvert/core/rewriter/condition.rb
@@ -173,7 +172,6 @@ files:
 - spec/synvert/core/engine/haml_spec.rb
 - spec/synvert/core/engine/slim_spec.rb
 - spec/synvert/core/helper_spec.rb
-- spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb
 - spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb
@@ -209,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.
@@ -220,7 +218,6 @@ test_files:
 - spec/synvert/core/engine/haml_spec.rb
 - spec/synvert/core/engine/slim_spec.rb
 - spec/synvert/core/helper_spec.rb
-- spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb
 - spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb

data/lib/synvert/core/node_ext.rb

@@ -1,130 +0,0 @@
-# frozen_string_literal: true
-
-require 'parser'
-
-module Parser::AST
-  # Extend Parser::AST::Node.
-  # {https://github.com/whitequark/parser/blob/master/lib/parser/ast/node.rb}
-  #
-  # Rules
-  #
-  # Synvert compares ast nodes with key / value pairs, each ast node has
-  # multiple attributes, e.g. +receiver+, +message+ and +arguments+, it
-  # matches only when all of key / value pairs match.
-  #
-  # +type: 'send', message: :include, arguments: ['FactoryGirl::Syntax::Methods']+
-  #
-  # Synvert does comparison based on the value type
-  #
-  # 1. if value is a symbol, then compares ast node value as symbol, e.g. +message: :include+
-  # 2. if value is a string, then compares ast node original source code, e.g. +name: 'Synvert::Application'+
-  # 3. if value is a regexp, then compares ast node original source code, e.g. +message: /find_all_by_/+
-  # 4. if value is an array, then compares each ast node, e.g. +arguments: ['FactoryGirl::Syntax::Methods']+
-  # 5. if value is nil, then check if ast node is nil, e.g. +arguments: [nil]+
-  # 6. if value is true or false, then check if ast node is :true or :false, e.g. +arguments: [false]+
-  # 7. if value is ast, then compare ast node directly, e.g. +to_ast: Parser::CurrentRuby.parse("self.class.serialized_attributes")+
-  #
-  # It can also compare nested key / value pairs, like
-  #
-  # +type: 'send', receiver: { type: 'send', receiver: { type: 'send', message: 'config' }, message: 'active_record' }, message: 'identity_map='+
-  #
-  # Source Code to Ast Node
-  # {https://playground.synvert.net/ruby}
-  class Node
-    # Get the file name of node.
-    #
-    # @return [String] file name.
-    def filename
-      loc.expression&.source_buffer.name
-    end
-
-    # Get the column of node.
-    #
-    # @return [Integer] column.
-    def column
-      loc.expression.column
-    end
-
-    # Get the line of node.
-    #
-    # @return [Integer] line.
-    def line
-      loc.expression.line
-    end
-
-    # Strip curly braces for hash.
-    # @example
-    #   node # s(:hash, s(:pair, s(:sym, :foo), s(:str, "bar")))
-    #   node.strip_curly_braces # "foo: 'bar'"
-    # @return [String]
-    def strip_curly_braces
-      return to_source unless type == :hash
-
-      to_source.sub(/^{(.*)}$/) { Regexp.last_match(1).strip }
-    end
-
-    # Wrap curly braces for hash.
-    # @example
-    #   node # s(:hash, s(:pair, s(:sym, :foo), s(:str, "bar")))
-    #   node.wrap_curly_braces # "{ foo: 'bar' }"
-    # @return [String]
-    def wrap_curly_braces
-      return to_source unless type == :hash
-
-      "{ #{to_source} }"
-    end
-
-    # Get single quote string.
-    # @example
-    #   node # s(:str, "foobar")
-    #   node.to_single_quote # "'foobar'"
-    # @return [String]
-    def to_single_quote
-      return to_source unless type == :str
-
-      "'#{to_value}'"
-    end
-
-    # Convert string to symbol.
-    # @example
-    #   node # s(:str, "foobar")
-    #   node.to_symbol # ":foobar"
-    # @return [String]
-    def to_symbol
-      return to_source unless type == :str
-
-      ":#{to_value}"
-    end
-
-    # Convert symbol to string.
-    # @example
-    #   node # s(:sym, :foobar)
-    #   node.to_string # "foobar"
-    # @return [String]
-    def to_string
-      return to_source unless type == :sym
-
-      to_value.to_s
-    end
-
-    # Convert lambda {} to -> {}
-    # @example
-    #   node # s(:block, s(:send, nil, :lambda), s(:args), s(:send, nil, :foobar))
-    #   node.to_lambda_literal # "-> { foobar }"
-    # @return [String]
-    def to_lambda_literal
-      if type == :block && caller.type == :send && caller.receiver.nil? && caller.message == :lambda
-        new_source = to_source
-        if arguments.size > 1
-          new_source = new_source[0...arguments.first.loc.expression.begin_pos - 2] + new_source[arguments.last.loc.expression.end_pos + 1..-1]
-          new_source = new_source.sub('lambda', "->(#{arguments.map(&:to_source).join(', ')})")
-        else
-          new_source = new_source.sub('lambda', '->')
-        end
-        new_source
-      else
-        to_source
-      end
-    end
-  end
-end

data/spec/synvert/core/node_ext_spec.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Parser::AST::Node do
-  describe '#strip_curly_braces' do
-    context 'hash node' do
-      it 'removes curly braces' do
-        node = parser_parse("{ foo: 'bar' }")
-        expect(node.strip_curly_braces).to eq("foo: 'bar'")
-      end
-    end
-
-    context 'other node' do
-      it 'do nothing' do
-        node = parser_parse("'foobar'")
-        expect(node.strip_curly_braces).to eq("'foobar'")
-      end
-    end
-  end
-
-  describe '#wrap_curly_braces' do
-    context 'hash node' do
-      it 'adds curly braces' do
-        node = parser_parse("test(foo: 'bar')").arguments.first
-        expect(node.to_source).to eq("foo: 'bar'")
-        expect(node.wrap_curly_braces).to eq("{ foo: 'bar' }")
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse("'foobar'")
-        expect(node.wrap_curly_braces).to eq("'foobar'")
-      end
-    end
-  end
-
-  describe '#to_single_quote' do
-    context 'str node' do
-      it 'converts double quote to single quote' do
-        node = parser_parse('"foobar"')
-        expect(node.to_source).to eq '"foobar"'
-        expect(node.to_single_quote).to eq "'foobar'"
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse(':foobar')
-        expect(node.to_single_quote).to eq ':foobar'
-      end
-    end
-  end
-
-  describe '#to_symbol' do
-    context 'str node' do
-      it 'converts string to symbol' do
-        node = parser_parse("'foobar'")
-        expect(node.to_symbol).to eq ':foobar'
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse(':foobar')
-        expect(node.to_symbol).to eq ':foobar'
-      end
-    end
-  end
-
-  describe '#to_string' do
-    context 'sym node' do
-      it 'converts symbol to string' do
-        node = parser_parse(':foobar')
-        expect(node.to_string).to eq 'foobar'
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse("'foobar'")
-        expect(node.to_string).to eq "'foobar'"
-      end
-    end
-  end
-
-  describe '#to_lambda_literal' do
-    context 'lambda node' do
-      it 'converts to lambda literal without arguments' do
-        node = parser_parse('lambda { foobar }')
-        expect(node.to_lambda_literal).to eq('-> { foobar }')
-      end
-
-      it 'converts to lambda literal with arguments' do
-        node = parser_parse('lambda { |x, y| foobar }')
-        expect(node.to_lambda_literal).to eq('->(x, y) { foobar }')
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse(':foobar')
-        expect(node.to_lambda_literal).to eq ':foobar'
-      end
-    end
-  end
-end