node_mutation 1.14.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5f41eba8034d3565eeda68905e0d6f8efff2a5ad56f0523f3aca6e57b334239
-  data.tar.gz: eb115a375da1d2e17ca62df7089ae22b243fc94e273b1a37378cc8ff215be6e9
+  metadata.gz: 382d91776358172b2310f5281edc413bf6066da9e333e150fa14a068219058bf
+  data.tar.gz: 5bdeef13cc69a5f4e6b9abef45ed95eeab57b13e95bed01a8fb0f25b02788140
 SHA512:
-  metadata.gz: f0bb8b60c6c9a822a883c2219303ba39bc649adade357ea82074cea9c4da8f0a33b6305bd45dc3e8b094a420b7f450dbd90fab80b498331e87c1a5fed8c68404
-  data.tar.gz: 69eab44d9cc1282ce4c7afb09a3ea80573728562538cbe75fde02458d915c5f8479c87098171d4421e5d157fac92a85f8ecce8b8c61bf29bd63dd6fd44a6128d
+  metadata.gz: b35c57db840700ed2a53ea3f0b1713185da7c36b4759537709ce726cf1094f862dcdd9cc2e5a19cdb99b0ef34ebe1436414e17c35915f6694b3c7ee66bf4a163
+  data.tar.gz: 2ad6b1ec1f27bad428cc299ffb95f3fce4bd57338365a60707736ae9936aaf15f445d89d8cf339224f4994391907a9df6d3e7ee2dfb2cc394782c2b83261645f

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # NodeMutation
 
+## 1.15.1 (2023-04-17)
+
+* Fix `wrap` code for newline
+
+## 1.15.0 (2023-04-17)
+
+* Add `indent` action
+* Use two `InsertAction` and one `IndentAction` instead of `WrapAction`
+* Drop `ALLOW_INSERT_AT_SAME_POSITION` strategy
+
 ## 1.14.0 (2023-04-04)
 
 * Add `transform_proc` to transform the actions

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.14.0)
+    node_mutation (1.15.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -35,18 +35,20 @@ mutation = NodeMutation.new(source)
 mutation.append node, 'include FactoryGirl::Syntax::Methods'
 # delete source code of the child ast node
 mutation.delete node, :dot, :message, and_comma: true
+# indent code
+mutation.indent node, tab_size: 1
 # insert code to the ast node.
 mutation.insert node, 'URI.', at: 'beginning'
 # prepend code to the ast node.
 mutation.prepend node, '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
 # remove source code of the ast node
-mutation.remove(node: Node)
+mutation.remove node, and_comma: true
 # replace child node of the ast node with new code
 mutation.replace node, :message, with: 'test'
 # replace the ast node with new code
 mutation.replace_with node, 'create {{arguments}}'
-# wrap node within a block, class or module
-mutation.wrap node, with: 'module Foo'
+# wrap node with prefix and suffix code
+mutation.wrap node, prefix: 'module Foo', suffix: 'end', newline: true
 # no operation
 mutation.noop
 ```
@@ -81,10 +83,9 @@ It provides 3 strategies to handle conflicts when processing actions:
 
 1. `Strategy.KEEP_RUNNING`: keep running and ignore the conflict action.
 2. `Strategy.THROW_ERROR`: throw error when conflict action is found.
-3. `Strategy.ALLOW_INSERT_AT_SAME_POSITION`: allow insert action at the same position.
 
 ```ruby
-NodeMutation.configure(strategy: Strategy.KEEP_RUNNING | Strategy.ALLOW_INSERT_AT_SAME_POSITION); // default is Strategy.THROW_ERROR
+NodeMutation.configure(strategy: Strategy.KEEP_RUNNING); // default is Strategy.THROW_ERROR
 ```
 
 ### tab_width

data/lib/node_mutation/action/indent_action.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# IndentAction to indent code.
+class NodeMutation::IndentAction < NodeMutation::Action
+  # Initialize a IndentAction.
+  #
+  # @param node [Node]
+  # @param tab_size [Integer] tab size
+  def initialize(node, tab_size = 1)
+    super(node, nil)
+    @tab_size = tab_size
+  end
+
+  # The rewritten source code with proper indent.
+  #
+  # @return [String] rewritten code.
+  def new_code
+    source = NodeMutation.adapter.get_source(@node)
+    source.each_line.map { |line| ' ' * NodeMutation.tab_width * @tab_size + line }.join
+  end
+
+  private
+
+  # Calculate the begin the end positions.
+  def calculate_position
+    @start = NodeMutation.adapter.get_start(@node)
+    @end = NodeMutation.adapter.get_end(@node)
+  end
+end

data/lib/node_mutation/strategy.rb

@@ -3,5 +3,4 @@
 class NodeMutation::Strategy
   KEEP_RUNNING = 0b1
   THROW_ERROR = 0b10
-  ALLOW_INSERT_AT_SAME_POSITION = 0b100
 end

data/lib/node_mutation/version.rb

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

data/lib/node_mutation.rb

@@ -11,12 +11,12 @@ class NodeMutation
   autoload :Action, 'node_mutation/action'
   autoload :AppendAction, 'node_mutation/action/append_action'
   autoload :DeleteAction, 'node_mutation/action/delete_action'
+  autoload :IndentAction, 'node_mutation/action/indent_action'
   autoload :InsertAction, 'node_mutation/action/insert_action'
   autoload :RemoveAction, 'node_mutation/action/remove_action'
   autoload :PrependAction, 'node_mutation/action/prepend_action'
   autoload :ReplaceAction, 'node_mutation/action/replace_action'
   autoload :ReplaceWithAction, 'node_mutation/action/replace_with_action'
-  autoload :WrapAction, 'node_mutation/action/wrap_action'
   autoload :NoopAction, 'node_mutation/action/noop_action'
   autoload :Result, 'node_mutation/result'
   autoload :Strategy, 'node_mutation/strategy'
@@ -188,22 +188,32 @@ class NodeMutation
     @actions << ReplaceWithAction.new(node, code).process
   end
 
-  # Wrap source code of the ast node with new code.
+  # Wrap source code of the ast node with prefix and suffix code.
   # @param node [Node] ast node
-  # @param with [String] code need to be wrapped with.
+  # @param prefix [String] prefix code need to be wrapped with.
+  # @param suffix [String] suffix code need to be wrapped with.
+  # @param newline [Boolean] add newline after prefix and before suffix.
   # @example
   # source code of the ast node is
   #     class Foobar
   #     end
   # then we call
-  #     wrap(node, with: 'module Synvert')
+  #     wrap(node, prefix: 'module Synvert', suffix: 'end', newline: true)
   # the source code will be rewritten to
   #     module Synvert
   #       class Foobar
   #       end
   #     end
-  def wrap(node, with:)
-    @actions << WrapAction.new(node, with: with).process
+  def wrap(node, prefix:, suffix:, newline: false)
+    if newline
+      indentation = NodeMutation.adapter.get_start_loc(node).column
+      @actions << InsertAction.new(node, prefix + "\n" + ' ' * indentation, at: 'beginning').process
+      @actions << InsertAction.new(node, "\n" + ' ' * indentation + suffix, at: 'end').process
+      @actions << IndentAction.new(node).process
+    else
+      @actions << InsertAction.new(node, prefix, at: 'beginning').process
+      @actions << InsertAction.new(node, suffix, at: 'end').process
+    end
   end
 
   # No operation.
@@ -277,11 +287,8 @@ class NodeMutation
     begin_pos = @actions[i].start
     end_pos = @actions[i].end
     while j > -1
-      # if we have two insert actions at same position.
-      same_position = begin_pos == @actions[j].start && begin_pos == end_pos && @actions[j].start == @actions[j].end
       # if we have two actions with overlapped range.
-      overlapped_position = begin_pos < @actions[j].end
-      if (!strategy?(Strategy::ALLOW_INSERT_AT_SAME_POSITION) && same_position) || overlapped_position
+      if begin_pos < @actions[j].end
         conflict_actions << @actions.delete_at(j)
       else
         i = j

data/sig/node_mutation/strategy.rbs

@@ -2,6 +2,4 @@ class NodeMutation::Strategy
   KEEP_RUNNING: Integer
 
   THROW_ERROR: Integer
-
-  ALLOW_INSERT_AT_SAME_POSITION: Integer
 end

data/sig/node_mutation.rbs

@@ -33,7 +33,7 @@ module NodeMutation[T]
 
   def replace_with: (node: T, code: String) -> void
 
-  def wrap: (node: T, with: String) -> void
+  def wrap: (node: T, prefix: String, suffix: String, newline: bool) -> void
 
   def noop: (node: T) -> void
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies: []
 description: ast node mutation apis
 email:
@@ -29,13 +29,13 @@ files:
 - lib/node_mutation/action.rb
 - lib/node_mutation/action/append_action.rb
 - lib/node_mutation/action/delete_action.rb
+- lib/node_mutation/action/indent_action.rb
 - lib/node_mutation/action/insert_action.rb
 - lib/node_mutation/action/noop_action.rb
 - lib/node_mutation/action/prepend_action.rb
 - lib/node_mutation/action/remove_action.rb
 - lib/node_mutation/action/replace_action.rb
 - lib/node_mutation/action/replace_with_action.rb
-- lib/node_mutation/action/wrap_action.rb
 - lib/node_mutation/adapter.rb
 - lib/node_mutation/parser_adapter.rb
 - lib/node_mutation/result.rb
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: ast node mutation apis

data/lib/node_mutation/action/wrap_action.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-# WrapAction to wrap node within a block, class or module.
-#
-# Note: if WrapAction is conflicted with another action (start and end are overlapped),
-# we have to put those 2 actions into 2 within_file scopes.
-class NodeMutation::WrapAction < NodeMutation::Action
-  # Initialize a WrapAction.
-  #
-  # @param node [Node]
-  # @param with [String] new code to wrap
-  def initialize(node, with:)
-    super(node, with)
-    @indent = NodeMutation.adapter.get_start_loc(@node).column
-  end
-
-  # The rewritten source code.
-  #
-  # @return [String] rewritten code.
-  def new_code
-    "#{@code}\n#{' ' * @indent}" +
-      NodeMutation.adapter.get_source(@node).split("\n").map { |line| "  #{line}" }
-                  .join("\n") +
-      "\n#{' ' * @indent}end"
-  end
-
-  private
-
-  # Calculate the begin the end positions.
-  def calculate_position
-    @start = NodeMutation.adapter.get_start(@node)
-    @end = NodeMutation.adapter.get_end(@node)
-  end
-end