node_mutation 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd49bceca35429738e6137151b99634e0ef83801214ba58e80c5e1d67b299b07
-  data.tar.gz: ef1f95f7edcf89b73b3eeb11137e374c813460cd4c5c8c67b970a5b29acc4e47
+  metadata.gz: 3bac003e717da366c7a0d9e1e0ee939db7173805fa2f9882b9141d089503cf00
+  data.tar.gz: 0e1a8f58718b689cb50bd5177496cc0b782594abff2b90cc532f3770fffce6fe
 SHA512:
-  metadata.gz: 71f84423b7cc2edd182ce760c984c1fef78f17ca267c72fb02f2eea9674dad5cf7c284180e03dbb888b5872e1157110e656d1f3587df17fe72140110594f0665
-  data.tar.gz: 951e9c6ba7afb239dab12428b40509e7d66178fe4776a317ebe5757a8d142e4fabe59ed1e75c5bedc4fe6a08e531c5176112cd48131b91422d1366e9d36af89a
+  metadata.gz: dee5df5d9cc61048b5b16b916527a8a031c80e16ff967bc547d65336a524bfd87e7135ebd72a8ac0aa1f3da6379520949c07d8a7c52baa13ea4a9d2a628c8318
+  data.tar.gz: 3252841fb0ec840591e21bcd28a5ab987271b6900664b7cd25397f7254d93130903d79f328763e67667bd5671101ec449e260a1a54b399939e5fdc9ff90910ff

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # NodeMutation
 
+## 1.21.0 (2023-09-26)
+
+* Rename `combine` dsl to `group`
+
 ## 1.20.0 (2023-09-24)
 
 * Add `CombinedAction` to combine multiple actions.

data/Gemfile.lock

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

data/lib/node_mutation/action/{combined_action.rb → group_action.rb}

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-# CombinedAction combines multiple actions.
-class NodeMutation::CombinedAction < NodeMutation::Action
+# GroupAction is compose of multiple actions.
+class NodeMutation::GroupAction < NodeMutation::Action
   DEFAULT_START = 2**30
 
   attr_accessor :actions
 
   def initialize
     @actions = []
-    @type = :combined
+    @type = :group
   end
 
   def new_code

data/lib/node_mutation/helper.rb

@@ -4,7 +4,7 @@ class NodeMutation::Helper
   # It iterates over all actions, and calls the given block with each action.
   def self.iterate_actions(actions, &block)
     actions.each do |action|
-      if action.is_a?(NodeMutation::CombinedAction)
+      if action.is_a?(NodeMutation::GroupAction)
         iterate_actions(action.actions, &block)
       else
         block.call(action)

data/lib/node_mutation/version.rb

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

data/lib/node_mutation.rb

@@ -11,7 +11,7 @@ class NodeMutation
   autoload :SyntaxTreeAdapter, "node_mutation/adapter/syntax_tree"
   autoload :Action, 'node_mutation/action'
   autoload :AppendAction, 'node_mutation/action/append_action'
-  autoload :CombinedAction, 'node_mutation/action/combined_action'
+  autoload :GroupAction, 'node_mutation/action/group_action'
   autoload :DeleteAction, 'node_mutation/action/delete_action'
   autoload :IndentAction, 'node_mutation/action/indent_action'
   autoload :InsertAction, 'node_mutation/action/insert_action'
@@ -210,13 +210,13 @@ class NodeMutation
   def wrap(node, prefix:, suffix:, newline: false)
     if newline
       indentation = NodeMutation.adapter.get_start_loc(node).column
-      combine do
+      group do
         insert node, prefix + "\n" + (' ' * indentation), at: 'beginning'
         insert node, "\n" + (' ' * indentation) + suffix, at: 'end'
         indent node
       end
     else
-      combine do
+      group do
         insert node, prefix, at: 'beginning'
         insert node, suffix, at: 'end'
       end
@@ -244,14 +244,14 @@ class NodeMutation
     @actions << NoopAction.new(node).process
   end
 
-  # Combine multiple actions
-  def combine
+  # group multiple actions
+  def group
     current_actions = @actions
-    combined_action = CombinedAction.new
-    @actions = combined_action.actions
+    group_action = GroupAction.new
+    @actions = group_action.actions
     yield
     @actions = current_actions
-    @actions << combined_action.process
+    @actions << group_action.process
   end
 
   # Process actions and return the new source.
@@ -308,13 +308,13 @@ class NodeMutation
 
   private
 
-  # It flattens a series of actions by removing any CombinedAction
+  # It flattens a series of actions by removing any GroupAction
   # objects that contain only a single action. This is done recursively.
   def flatten_actions(actions)
     new_actions = []
     actions.each do |action|
-      if action.is_a?(CombinedAction)
-        new_actions << flatten_combined_action(action)
+      if action.is_a?(GroupAction)
+        new_actions << flatten_group_action(action)
       else
         new_actions << action
       end
@@ -322,13 +322,13 @@ class NodeMutation
     new_actions.compact
   end
 
-  # It flattens a combined action.
-  def flatten_combined_action(action)
+  # It flattens a group action.
+  def flatten_group_action(action)
     if action.actions.empty?
       nil
     elsif action.actions.size == 1
-      if action.actions.first.is_a?(CombinedAction)
-        flatten_combined_action(action.actions.first)
+      if action.actions.first.is_a?(GroupAction)
+        flatten_group_action(action.actions.first)
       else
         action.actions.first
       end
@@ -344,7 +344,7 @@ class NodeMutation
   def sort_actions!(actions)
     actions.sort_by! { |action| [action.start, action.end] }
     actions.each do |action|
-      sort_actions!(action.actions) if action.is_a?(CombinedAction)
+      sort_actions!(action.actions) if action.is_a?(GroupAction)
     end
   end
 
@@ -354,7 +354,7 @@ class NodeMutation
   # @return [String] new source code
   def rewrite_source(source, actions)
     actions.reverse_each do |action|
-      if action.is_a?(CombinedAction)
+      if action.is_a?(GroupAction)
         source = rewrite_source(source, action.actions)
       else
         source[action.start...action.end] = action.new_code if action.new_code
@@ -385,7 +385,7 @@ class NodeMutation
       j -= 1
     end
     actions.each do |action|
-      conflict_actions.concat(get_conflict_actions(action.actions)) if action.is_a?(CombinedAction)
+      conflict_actions.concat(get_conflict_actions(action.actions)) if action.is_a?(GroupAction)
     end
     conflict_actions
   end

data/sig/node_mutation.rbs

@@ -39,7 +39,7 @@ class NodeMutation[T]
 
   def noop: (node: T) -> void
 
-  def combine: () { () -> void } -> void
+  def group: () { () -> void } -> void
 
   def process: () -> NodeMutation::Result
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-24 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies: []
 description: ast node mutation apis
 email:
@@ -28,8 +28,8 @@ files:
 - lib/node_mutation.rb
 - lib/node_mutation/action.rb
 - lib/node_mutation/action/append_action.rb
-- lib/node_mutation/action/combined_action.rb
 - lib/node_mutation/action/delete_action.rb
+- lib/node_mutation/action/group_action.rb
 - lib/node_mutation/action/indent_action.rb
 - lib/node_mutation/action/insert_action.rb
 - lib/node_mutation/action/noop_action.rb