node_mutation 1.11.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d41515d4be39619d95802e531496159773a1202de61c8fa3c3d269d2a72926da
-  data.tar.gz: 2bd0415eec90cb45cdc2dcfacce1cf6529fcdf9f12e6fcd44054aa273e4c4b0b
+  metadata.gz: 377cc05adfb7a9f55647b1850a325d9ddcb20004e2574af39657248bd05a51b4
+  data.tar.gz: 233c08e3fa49855270f62c11e1d9587b77886e9a6edded54f27096a9dc951849
 SHA512:
-  metadata.gz: 656c00012eac7a7b6d2229933fb7e08fd7f0f9a986e90f7db69cc5129097702a2850cdf5494c6f1dae3d6f7da9d0ba642ffd7eb4362517a5c0f465a0d49a52d3
-  data.tar.gz: 4faced52fd71462a10c54970afb4412858c355c96bf8713e132f886535d3a1309aa792bc1f4e946c0549492c351c9750fa3ab1d05c3ecd0fda0d58f84c98427f
+  metadata.gz: 593a0319dc715d587137e840d66694ed6f8c5d4a73312eb20847eee8383b4f47910f25d1d14f1e3fb95bee3ee1ab6627a08fdd2fa40c837c1a4d8e3422237066
+  data.tar.gz: 9aca39fb58ae4b02687a310fdcc3a7f388ebc86bcdce29b8efff24069077e3ed9194c9556bd833737160c8a220af87c010eedfd588e71f98c5b3bdae0d578cd3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # NodeMutation
 
+## 1.12.1 (2023-03-23)
+
+* Define `Action`, `Location` and `Range` in `NodeMutation::Struct`
+
+## 1.12.0 (2023-03-23)
+
+* Support `{key}_pair` for a `hash` node
+
 ## 1.11.0 (2023-03-20)
 
 * Calculate position properly for `add_comma`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.11.0)
+    node_mutation (1.12.1)
       erubis
 
 GEM

data/lib/node_mutation/parser_adapter.rb

@@ -17,41 +17,36 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
   def rewritten_source(node, code)
     code.gsub(/{{(.+?)}}/m) do
       old_code = Regexp.last_match(1)
-      first_key = old_code.split('.').first
-      if node.respond_to?(first_key)
-        evaluated = child_node_by_name(node, old_code)
-        case evaluated
-        when Parser::AST::Node
-          if evaluated.type == :args
-            evaluated.loc.expression.source[1...-1]
+      evaluated = child_node_by_name(node, old_code)
+      case evaluated
+      when Parser::AST::Node
+        if evaluated.type == :args
+          evaluated.loc.expression.source[1...-1]
+        else
+          evaluated.loc.expression.source
+        end
+      when Array
+        if evaluated.size > 0
+          file_source = file_content(evaluated.first)
+          source = file_source[evaluated.first.loc.expression.begin_pos...evaluated.last.loc.expression.end_pos]
+          lines = source.split "\n"
+          lines_count = lines.length
+          if lines_count > 1 && lines_count == evaluated.size
+            new_code = []
+            lines.each_with_index { |line, index|
+              new_code << (index == 0 ? line : line[evaluated.first.indent - 2..-1])
+            }
+            new_code.join("\n")
           else
-            evaluated.loc.expression.source
+            source
           end
-        when Array
-          if evaluated.size > 0
-            file_source = file_content(evaluated.first)
-            source = file_source[evaluated.first.loc.expression.begin_pos...evaluated.last.loc.expression.end_pos]
-            lines = source.split "\n"
-            lines_count = lines.length
-            if lines_count > 1 && lines_count == evaluated.size
-              new_code = []
-              lines.each_with_index { |line, index|
-                new_code << (index == 0 ? line : line[evaluated.first.indent - 2..-1])
-              }
-              new_code.join("\n")
-            else
-              source
-            end
-          end
-        when String, Symbol, Integer, Float
-          evaluated
-        when NilClass
-          ''
-        else
-          raise "can not parse \"#{code}\""
         end
+      when String, Symbol, Integer, Float
+        evaluated
+      when NilClass
+        ''
       else
-        raise NodeMutation::MethodNotSupported, "#{first_key} is not supported for #{get_source(node)}"
+        raise "can not parse \"#{code}\""
       end
     end
   end
@@ -70,7 +65,7 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
               "#{direct_child_name} is not supported for #{get_source(node)}" unless child_node
         return child_node_range(child_node, nested_child_name) if nested_child_name
 
-        return NodeMutation::Range.new(child_node.loc.expression.begin_pos, child_node.loc.expression.end_pos)
+        return NodeMutation::Struct::Range.new(child_node.loc.expression.begin_pos, child_node.loc.expression.end_pos)
       end
 
       raise NodeMutation::MethodNotSupported,
@@ -79,35 +74,50 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
       child_node = node.send(direct_child_name)
       return child_node_range(child_node, nested_child_name) if nested_child_name
 
-      return NodeMutation::Range.new(child_node.loc.expression.begin_pos, child_node.loc.expression.end_pos)
+      return NodeMutation::Struct::Range.new(child_node.loc.expression.begin_pos, child_node.loc.expression.end_pos)
     end
 
     case [node.type, child_name.to_sym]
     when %i[block pipes], %i[def parentheses], %i[defs parentheses]
-      NodeMutation::Range.new(node.arguments.first.loc.expression.begin_pos - 1, node.arguments.last.loc.expression.end_pos + 1)
+      NodeMutation::Struct::Range.new(
+        node.arguments.first.loc.expression.begin_pos - 1,
+        node.arguments.last.loc.expression.end_pos + 1
+      )
     when %i[block arguments], %i[def arguments], %i[defs arguments]
-      NodeMutation::Range.new(node.arguments.first.loc.expression.begin_pos, node.arguments.last.loc.expression.end_pos)
+      NodeMutation::Struct::Range.new(
+        node.arguments.first.loc.expression.begin_pos,
+        node.arguments.last.loc.expression.end_pos
+      )
     when %i[class name], %i[const name], %i[def name], %i[defs name]
-      NodeMutation::Range.new(node.loc.name.begin_pos, node.loc.name.end_pos)
+      NodeMutation::Struct::Range.new(node.loc.name.begin_pos, node.loc.name.end_pos)
     when %i[defs dot]
-      NodeMutation::Range.new(node.loc.operator.begin_pos, node.loc.operator.end_pos) if node.loc.operator
+      NodeMutation::Struct::Range.new(node.loc.operator.begin_pos, node.loc.operator.end_pos) if node.loc.operator
     when %i[defs self]
-      NodeMutation::Range.new(node.loc.operator.begin_pos - 'self'.length, node.loc.operator.begin_pos)
+      NodeMutation::Struct::Range.new(node.loc.operator.begin_pos - 'self'.length, node.loc.operator.begin_pos)
     when %i[lvasgn variable], %i[ivasgn variable], %i[cvasgn variable], %i[gvasgn variable]
-      NodeMutation::Range.new(node.loc.name.begin_pos, node.loc.name.end_pos)
+      NodeMutation::Struct::Range.new(node.loc.name.begin_pos, node.loc.name.end_pos)
     when %i[send dot], %i[csend dot]
-      NodeMutation::Range.new(node.loc.dot.begin_pos, node.loc.dot.end_pos) if node.loc.dot
+      NodeMutation::Struct::Range.new(node.loc.dot.begin_pos, node.loc.dot.end_pos) if node.loc.dot
     when %i[send message], %i[csend message]
       if node.loc.operator
-        NodeMutation::Range.new(node.loc.selector.begin_pos, node.loc.operator.end_pos)
+        NodeMutation::Struct::Range.new(node.loc.selector.begin_pos, node.loc.operator.end_pos)
       else
-        NodeMutation::Range.new(node.loc.selector.begin_pos, node.loc.selector.end_pos)
+        NodeMutation::Struct::Range.new(node.loc.selector.begin_pos, node.loc.selector.end_pos)
       end
     when %i[send parentheses], %i[csend parentheses]
       if node.loc.begin && node.loc.end
-        NodeMutation::Range.new(node.loc.begin.begin_pos, node.loc.end.end_pos)
+        NodeMutation::Struct::Range.new(node.loc.begin.begin_pos, node.loc.end.end_pos)
       end
     else
+      if node.type == :hash && child_name.to_s.end_with?('_pair')
+        pair_node = node.pairs.find { |pair| pair.key.to_value.to_s == child_name.to_s[0..-6] }
+        raise NodeMutation::MethodNotSupported,
+              "#{direct_child_name} is not supported for #{get_source(node)}" unless pair_node
+        return child_node_range(pair, nested_child_name) if nested_child_name
+
+        return NodeMutation::Struct::Range.new(pair_node.loc.expression.begin_pos, pair_node.loc.expression.end_pos)
+      end
+
       raise NodeMutation::MethodNotSupported,
             "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
 
@@ -119,7 +129,7 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
 
       if child_node.is_a?(Parser::AST::Node)
         return(
-          NodeMutation::Range.new(child_node.loc.expression.begin_pos, child_node.loc.expression.end_pos)
+          NodeMutation::Struct::Range.new(child_node.loc.expression.begin_pos, child_node.loc.expression.end_pos)
         )
       end
 
@@ -127,7 +137,10 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
       return nil if child_node.empty?
 
       return(
-        NodeMutation::Range.new(child_node.first.loc.expression.begin_pos, child_node.last.loc.expression.end_pos)
+        NodeMutation::Struct::Range.new(
+          child_node.first.loc.expression.begin_pos,
+          child_node.last.loc.expression.end_pos
+        )
       )
     end
   end
@@ -142,12 +155,12 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
 
   def get_start_loc(node)
     begin_loc = node.loc.expression.begin
-    NodeMutation::Location.new(begin_loc.line, begin_loc.column)
+    NodeMutation::Struct::Location.new(begin_loc.line, begin_loc.column)
   end
 
   def get_end_loc(node)
     end_loc = node.loc.expression.end
-    NodeMutation::Location.new(end_loc.line, end_loc.column)
+    NodeMutation::Struct::Location.new(end_loc.line, end_loc.column)
   end
 
   def get_indent(node)
@@ -178,6 +191,15 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
       return child_node
     end
 
+    if node.is_a?(Parser::AST::Node) && node.type == :hash && direct_child_name.end_with?('_pair')
+      pair_node = node.pairs.find { |pair| pair.key.to_value.to_s == direct_child_name[0..-6] }
+      raise NodeMutation::MethodNotSupported,
+            "#{direct_child_name} is not supported for #{get_source(node)}" unless pair_node
+      return child_node_by_name(pair_node, nested_child_name) if nested_child_name
+
+      return pair_node
+    end
+
     if node.respond_to?(direct_child_name)
       child_node = node.send(direct_child_name)
     elsif direct_child_name.include?('(') && direct_child_name.include?(')')

data/lib/node_mutation/result.rb

@@ -1,41 +1,31 @@
 # frozen_string_literal: true
 
 class NodeMutation::Result
-  attr_accessor :file_path
+  attr_accessor :file_path, :new_source
+  attr_reader :actions
 
-  def initialize(options)
-    @options = options
+  def initialize(affected:, conflicted:)
+    @affected = affected
+    @conflicted = conflicted
+    @actions = []
   end
 
   def affected?
-    @options[:affected]
+    @affected
   end
 
   def conflicted?
-    @options[:conflicted]
+    @conflicted
   end
 
-  def actions
-    @options[:actions]
-  end
-
-  def new_source
-    @options[:new_source]
+  def actions=(actions)
+    @actions = actions.map { |action| NodeMutation::Struct::Action.new(action.start, action.end, action.new_code) }
   end
 
   def to_json(*args)
-    to_hash.to_json(*args)
-  end
-
-  def to_hash
-    hash = { file_path: file_path }
-    @options.each do |key, value|
-      if key == :actions
-        hash[:actions] = value.map { |action| { start: action.start, end: action.end, new_code: action.new_code } }
-      else
-        hash[key] = value
-      end
-    end
-    hash
+    data = { affected: affected?, conflicted: conflicted? }
+    data[:new_source] = new_source if new_source
+    data[:actions] = actions unless actions.empty?
+    data.to_json(*args)
   end
 end

data/lib/node_mutation/struct.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class NodeMutation::Struct
+  Action = Struct.new(:start, :end, :new_code)
+  Location = Struct.new(:line, :column)
+  Range = Struct.new(:start, :end)
+end

data/lib/node_mutation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class NodeMutation
-  VERSION = "1.11.0"
+  VERSION = "1.12.1"
 end

data/lib/node_mutation.rb

@@ -18,10 +18,9 @@ class NodeMutation
   autoload :ReplaceWithAction, 'node_mutation/action/replace_with_action'
   autoload :WrapAction, 'node_mutation/action/wrap_action'
   autoload :NoopAction, 'node_mutation/action/noop_action'
-  autoload :Range, 'node_mutation/range'
-  autoload :Location, 'node_mutation/location'
   autoload :Result, 'node_mutation/result'
   autoload :Strategy, 'node_mutation/strategy'
+  autoload :Struct, 'node_mutation/struct'
 
   attr_reader :actions
 
@@ -229,7 +228,9 @@ class NodeMutation
     @actions.reverse_each do |action|
       source[action.start...action.end] = action.new_code if action.new_code
     end
-    NodeMutation::Result.new(affected: true, conflicted: !conflict_actions.empty?, new_source: source)
+    result = NodeMutation::Result.new(affected: true, conflicted: !conflict_actions.empty?)
+    result.new_source = source
+    result
   end
 
   # Test actions and return the actions.
@@ -241,7 +242,7 @@ class NodeMutation
   # @return {NodeMutation::Result}
   def test
     if @actions.length == 0
-      return NodeMutation::Result.new(affected: false, conflicted: false, actions: [])
+      return NodeMutation::Result.new(affected: false, conflicted: false)
     end
 
     @actions.sort_by! { |action| [action.start, action.end] }
@@ -250,7 +251,9 @@ class NodeMutation
       raise ConflictActionError, "mutation actions are conflicted"
     end
 
-    NodeMutation::Result.new(affected: true, conflicted: !conflict_actions.empty?, actions: @actions)
+    result = NodeMutation::Result.new(affected: true, conflicted: !conflict_actions.empty?)
+    result.actions = @actions
+    result
   end
 
   private

data/sig/node_mutation/adapter.rbs

@@ -5,15 +5,15 @@ class NodeMutation::Adapter[T]
 
   def file_content: (node: T) -> String
 
-  def child_node_range: (node: T, child_name: String) -> NodeMutation::Range
+  def child_node_range: (node: T, child_name: String) -> NodeMutation::Struct::Range
 
   def get_start: (node: T) -> Integer
 
   def get_end: (node: T) -> Integer
 
-  def get_start_loc: (node: T) -> NodeMutation::Location
+  def get_start_loc: (node: T) -> NodeMutation::Struct::Location
 
-  def get_end_loc: (node: T) -> NodeMutation::Location
+  def get_end_loc: (node: T) -> NodeMutation::Struct::Location
 
   def get_indent: (node: T) -> Integer
 end

data/sig/node_mutation/result.rbs

@@ -1,5 +1,7 @@
 class NodeMutation::Result
   attr_accessor file_path (): String
+  attr_accessor new_source (): String
+  attr_accessor actions (): Array[NodeMutation::Struct::Action]
 
   def initialize: (source: String) -> NodeMutation::Result
 
@@ -7,9 +9,5 @@ class NodeMutation::Result
 
   def conflicted?: () -> bool
 
-  def new_source: () -> String
-
-  def actions: () -> Array[Hash]
-
   def to_json: (*args) -> String
 end

data/sig/node_mutation/strategy.rbs

@@ -0,0 +1,7 @@
+class NodeMutation::Strategy
+  KEEP_RUNNING: Integer
+
+  THROW_ERROR: Integer
+
+  ALLOW_INSERT_AT_SAME_POSITION: Integer
+end

data/sig/node_mutation/struct.rbs

@@ -0,0 +1,17 @@
+class NodeMutation::Struct
+  class Action < ::Struct
+    prop :start, Integer
+    prop :end, Integer
+    prop :new_code, String
+  end
+
+  class Location < ::Struct
+    prop :line, Integer
+    prop :column, Integer
+  end
+
+  class Range < ::Struct
+    prop :start, Integer
+    prop :end, Integer
+  end
+end

data/sig/node_mutation.rbs

@@ -1,5 +1,5 @@
 module NodeMutation[T]
-  VERSION: Stringo
+  VERSION: String
 
   class MethodNotSupported < StandardError
   end
@@ -7,10 +7,6 @@ module NodeMutation[T]
   class ConflictActionError < StandardError
   end
 
-  KEEP_RUNNING: Integer
-
-  THROW_ERROR: Integer
-
   attr_reader actions: Array[NodeMutation::Action]
 
   def self.configure: (options: { adapter: NodeMutation::Adapter, strategy: Integer, tab_width: Integer }) -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -51,16 +51,17 @@ files:
 - lib/node_mutation/action/replace_with_action.rb
 - lib/node_mutation/action/wrap_action.rb
 - lib/node_mutation/adapter.rb
-- lib/node_mutation/location.rb
 - lib/node_mutation/parser_adapter.rb
-- lib/node_mutation/range.rb
 - lib/node_mutation/result.rb
 - lib/node_mutation/strategy.rb
+- lib/node_mutation/struct.rb
 - lib/node_mutation/version.rb
 - node_mutation.gemspec
 - sig/node_mutation.rbs
 - sig/node_mutation/adapter.rbs
 - sig/node_mutation/result.rbs
+- sig/node_mutation/strategy.rbs
+- sig/node_mutation/struct.rbs
 homepage: https://github.com/xinminlabs/node-mutation-ruby
 licenses: []
 metadata:
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: ast node mutation apis

data/lib/node_mutation/location.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-NodeMutation::Location = Struct.new(:line, :column)

data/lib/node_mutation/range.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-NodeMutation::Range = Struct.new(:start, :end)