node_mutation 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a919cd77334f1c935135667972c64670f1513a31c63dde2a71405dcb165077f
-  data.tar.gz: ce7faaade885a41905b1371b04cb2c94962cd044404f754a6bd1d0537b6c871a
+  metadata.gz: eb6a1cb69d0fdb6691831450fae1c126d25ae38495f5b68725b7500708534671
+  data.tar.gz: 643999af6c57ea3553668945af32e49074605940c7372c6292272c34271672a7
 SHA512:
-  metadata.gz: ee3c31054d31ba1b997e366f3c2ac0fd4d6b3587f9f49e59d12d72a23cb8b8d4b1f12dcfb7f5d72440cbd867b4ed5ef01e19cfcdfbaa11a9c3d4b7db53c047e6
-  data.tar.gz: 2295e27670dbaa6be22ef320cd3e13cbb69e86fcf2f8824f8be4ada1607deb98fa7d6d1891bb3a4360debd37abf5876f155276ddd7bf45b0aac6667df67920af
+  metadata.gz: 8088d0b9d08569fe3653a99c6a19ac7c5701b42a8e2d90668a5d1ea8cff354f5fe2f197ef319825f56ba0eeaef74380999a54fe84169818bc35bcc0263d11688
+  data.tar.gz: 55725a4fb619d3679531e4af3bbb098994b472b84b6aedecd5d88e9310959eda1c7ea261c76654b73963eb388cd786523bc1d58e561196b6a75cd024b912fcb4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # NodeMutation
 
+## 1.7.0 (2022-10-25)
+
+* Add a new strategy `ALLOW_INSERT_AT_SAME_POSITION`
+
+## 1.6.2 (2022-10-25)
+
+* Mark same position as conflict action
+
 ## 1.6.1 (2022-10-24)
 
 * Better error message when node does not respond to a key

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.6.1)
+    node_mutation (1.7.0)
       activesupport (< 7.0.0)
       erubis
 

data/lib/node_mutation/strategy.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+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.6.1"
+  VERSION = "1.7.0"
 end

data/lib/node_mutation.rb

@@ -9,9 +9,6 @@ class NodeMutation
   class MethodNotSupported < StandardError; end
   class ConflictActionError < StandardError; end
 
-  KEEP_RUNNING = 1
-  THROW_ERROR = 2
-
   autoload :Adapter, "node_mutation/adapter"
   autoload :ParserAdapter, "node_mutation/parser_adapter"
   autoload :Action, 'node_mutation/action'
@@ -25,6 +22,7 @@ class NodeMutation
   autoload :WrapAction, 'node_mutation/action/wrap_action'
   autoload :NoopAction, 'node_mutation/action/noop_action'
   autoload :Result, 'node_mutation/result'
+  autoload :Strategy, 'node_mutation/strategy'
 
   attr_reader :actions
 
@@ -47,10 +45,10 @@ class NodeMutation
   end
 
   # Get the strategy
-  # @return [Integer] current strategy, could be {NodeMutation::KEEP_RUNNING} or {NodeMutation::THROW_ERROR},
-  # by default is {NodeMutation::KEEP_RUNNING}
+  # @return [Integer] current strategy, could be {NodeMutation::Strategy::KEEP_RUNNING} or {NodeMutation::Strategy::THROW_ERROR},
+  # by default is {NodeMutation::Strategy::KEEP_RUNNING}
   def self.strategy
-    @strategy ||= KEEP_RUNNING
+    @strategy ||= Strategy::KEEP_RUNNING
   end
 
   # Initialize a NodeMutation.
@@ -214,7 +212,7 @@ class NodeMutation
     source = +@source
     @actions.sort_by! { |action| [action.start, action.end] }
     conflict_actions = get_conflict_actions
-    if conflict_actions.size > 0 && NodeMutation.strategy == THROW_ERROR
+    if conflict_actions.size > 0 && strategy?(Strategy::THROW_ERROR)
       raise ConflictActionError, "mutation actions are conflicted"
     end
     @actions.reverse_each do |action|
@@ -242,7 +240,7 @@ class NodeMutation
     conflict_actions = []
     @actions.sort_by! { |action| [action.start, action.end] }
     conflict_actions = get_conflict_actions
-    if conflict_actions.size > 0 && NodeMutation.strategy == THROW_ERROR
+    if conflict_actions.size > 0 && strategy?(Strategy::THROW_ERROR)
       raise ConflictActionError, "mutation actions are conflicted"
     end
     NodeMutation::Result.new(
@@ -262,19 +260,29 @@ class NodeMutation
     conflict_actions = []
     return [] if i < 0
 
-    start = @actions[i].start
+    begin_pos = @actions[i].start
+    end_pos = @actions[i].end
     while j > -1
-      if start < @actions[j].end
+      # 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
         conflict_actions << @actions.delete_at(j)
       else
         i = j
-        start = @actions[i].start
+        begin_pos = @actions[i].start
+        end_pos = @actions[i].end
       end
       j -= 1
     end
     conflict_actions
   end
 
+  def strategy?(strategy)
+    NodeMutation.strategy & strategy == strategy
+  end
+
   def format_actions(actions)
     actions.map { |action| OpenStruct.new(start: action.start, end: action.end, new_code: action.new_code ) }
   end

data/sig/node_mutation.rbs

@@ -13,11 +13,11 @@ module NodeMutation[T]
 
   attr_reader actions: Array[NodeMutation::Action]
 
-  def self.configure: (options: { adapter: NodeMutation::Adapter, strategry: Integer }) -> void
+  def self.configure: (options: { adapter: NodeMutation::Adapter, strategy: Integer }) -> void
 
   def self.adapter: () -> NodeMutation::Adapter
 
-  def self.strategry: () -> Integer
+  def self.strategy: () -> Integer
 
   def initialize: (source: String) -> NodeMutation
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-23 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -69,6 +69,7 @@ files:
 - lib/node_mutation/engine/erb.rb
 - lib/node_mutation/parser_adapter.rb
 - lib/node_mutation/result.rb
+- lib/node_mutation/strategy.rb
 - lib/node_mutation/version.rb
 - node_mutation.gemspec
 - sig/node_mutation.rbs