node_mutation 1.16.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e76d23c3a0be62554de359db928e7f0e70fe75b6c13ecb0655add5af735333
-  data.tar.gz: 1777be0d1e8c4044fa175dcc8f9f9e3431283fdf039392cba9f8fe4fd656c676
+  metadata.gz: d7b6c582369f095034122ac0dc0d1cafaba27a86049bb80c36b1d8f50dc8876c
+  data.tar.gz: d81a61d2316dad6242b81df48b61752459638e44c03935af6f618b006f5fa339
 SHA512:
-  metadata.gz: ef64c7156966a2d80c4bf823e0c3330d8934cf52306a9f179bac7105b52c82e78bb9b0d958510165a541fd1fe550b3eec7c7e78eaf3aa7f3207a5b0df1f9e4e3
-  data.tar.gz: 969399df03dc8e3f5c15e55f37a3664bf0945a41e5ff244542319b8a2c20d6afff54dc3aee72b6b4e6c90c6ce84428b6008d14d3dc81e343c68296e78b387218
+  metadata.gz: 3f16a4e2b54ac9820c35e3d0bd31b2d3b6a23a08144e8a2486d8093fea95087e2b75a27924af69908ba4c6c6f88f0bcd56d5a9ea944fbb395ae422b18e0fff2b
+  data.tar.gz: e2a1ea1260c204562d957a7d756811c565212e56c6660d7e03c90b15341b03728859fa3158fce7d51ec50ad30cbb7c070606698b548b6f4fa3ca9fe73a27235c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # NodeMutation
 
+## 1.17.1 (2023-05-16)
+
+* Require `parser` and `syntax_tree` in adapter
+
+## 1.17.0 (2023-05-15)
+
+* Add `SyntaxTreeAdapter`
+
 ## 1.16.0 (2023-05-10)
 
 * Support {key}_value for a hash node

data/Gemfile

@@ -11,5 +11,6 @@ gem "rspec", "~> 3.0"
 
 gem "parser"
 gem "parser_node_ext"
+gem "syntax_tree_ext"
 gem "guard"
 gem "guard-rspec"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.16.0)
+    node_mutation (1.17.1)
 
 GEM
   remote: https://rubygems.org/
@@ -34,10 +34,11 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parser (3.2.1.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    parser_node_ext (1.0.0)
+    parser_node_ext (1.1.0)
       parser
+    prettier_print (1.2.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -59,6 +60,10 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     shellany (0.0.1)
+    syntax_tree (6.1.1)
+      prettier_print (>= 1.2.0)
+    syntax_tree_ext (0.3.0)
+      syntax_tree
     thor (1.2.1)
 
 PLATFORMS
@@ -74,6 +79,7 @@ DEPENDENCIES
   parser_node_ext
   rake (~> 13.0)
   rspec (~> 3.0)
+  syntax_tree_ext
 
 BUNDLED WITH
    2.3.7

data/README.md

@@ -74,7 +74,7 @@ we define an [Adapter](https://github.com/xinminlabs/node-mutation-ruby/blob/mai
 if you implement the Adapter interface, you can set it as NodeMutation's adapter.
 
 ```ruby
-NodeMutation.configure(adapter: ParserAdapter.new) // default is ParserAdapter
+NodeMutation.configure(adapter: SyntaxTreeAdapter.new) // default is ParserAdapter
 ```
 
 ### strategy

data/lib/node_mutation/{parser_adapter.rb → adapter/parser.rb}

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-INDEX_REGEXP = /\A-?\d+\z/
+require 'parser'
+require 'parser_node_ext'
 
 class NodeMutation::ParserAdapter < NodeMutation::Adapter
   def get_source(node)
@@ -111,24 +112,6 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
         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
-
-      if node.type == :hash && child_name.to_s.end_with?('_value')
-        pair_node = node.pairs.find { |pair| pair.key.to_value.to_s == child_name.to_s[0..-7] }
-        raise NodeMutation::MethodNotSupported,
-              "#{direct_child_name} is not supported for #{get_source(node)}" unless pair_node
-        return child_node_range(pair.value, nested_child_name) if nested_child_name
-
-        return NodeMutation::Struct::Range.new(pair_node.value.loc.expression.begin_pos, pair_node.value.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)
 
@@ -206,24 +189,6 @@ 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.is_a?(Parser::AST::Node) && node.type == :hash && direct_child_name.end_with?('_value')
-      pair_node = node.pairs.find { |pair| pair.key.to_value.to_s == direct_child_name[0..-7] }
-      raise NodeMutation::MethodNotSupported,
-            "#{direct_child_name} is not supported for #{get_source(node)}" unless pair_node
-      return child_node_by_name(pair_node.value, nested_child_name) if nested_child_name
-
-      return pair_node.value
-    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/adapter/syntax_tree.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require 'syntax_tree'
+require 'syntax_tree_ext'
+
+class NodeMutation::SyntaxTreeAdapter < NodeMutation::Adapter
+  def get_source(node)
+    if node.is_a?(Array)
+      return node.first.source[node.first.location.start_char...node.last.location.end_char]
+    end
+
+    node.source[node.location.start_char...node.location.end_char]
+  end
+
+  def rewritten_source(node, code)
+    code.gsub(/{{(.+?)}}/m) do
+      old_code = Regexp.last_match(1)
+      evaluated = child_node_by_name(node, old_code)
+      case evaluated
+      when SyntaxTree::Node
+        get_source(evaluated)
+      when Array
+        if evaluated.size > 0
+          source = get_source(evaluated)
+          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
+    end
+  end
+
+  def child_node_range(node, child_name)
+    child_node = child_node_by_name(node, child_name)
+    return nil if child_node.nil?
+
+    if child_node.is_a?(Array)
+      return NodeMutation::Struct::Range.new(child_node.first.location.start_char, child_node.last.location.end_char)
+    end
+
+    return NodeMutation::Struct::Range.new(child_node.location.start_char, child_node.location.end_char)
+  end
+
+  def get_start(node, child_name = nil)
+    node = child_node_by_name(node, child_name) if child_name
+    node.location.start_char
+  end
+
+  def get_end(node, child_name = nil)
+    node = child_node_by_name(node, child_name) if child_name
+    node.location.end_char
+  end
+
+  def get_start_loc(node, child_name = nil)
+    node = child_node_by_name(node, child_name) if child_name
+    NodeMutation::Struct::Location.new(node.location.start_line, node.location.start_column)
+  end
+
+  def get_end_loc(node, child_name = nil)
+    node = child_node_by_name(node, child_name) if child_name
+    NodeMutation::Struct::Location.new(node.location.end_line, node.location.end_column)
+  end
+
+  def get_indent(node)
+    node.location.start_column
+  end
+
+  private
+
+  def child_node_by_name(node, child_name)
+    direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
+
+    if node.is_a?(Array)
+      if direct_child_name =~ INDEX_REGEXP
+        child_node = node[direct_child_name.to_i]
+        raise NodeMutation::MethodNotSupported,
+              "#{direct_child_name} is not supported for #{get_source(node)}" unless child_node
+        return child_node_by_name(child_node, nested_child_name) if nested_child_name
+
+        return child_node
+      end
+
+      raise NodeMutation::MethodNotSupported,
+            "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
+
+      child_node = node.send(direct_child_name)
+      return child_node_by_name(child_node, nested_child_name) if nested_child_name
+
+      return child_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?(')')
+      child_node = node.instance_eval(direct_child_name)
+    else
+      raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}"
+    end
+
+    return child_node_by_name(child_node, nested_child_name) if nested_child_name
+
+    child_node
+  end
+end

data/lib/node_mutation/adapter.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class NodeMutation::Adapter
+  INDEX_REGEXP = /\A-?\d+\z/
+
   # Get source code of the ast node
   # @param node [Node] ast node
   # @return [String] source code

data/lib/node_mutation/version.rb

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

data/lib/node_mutation.rb

@@ -7,7 +7,8 @@ class NodeMutation
   class ConflictActionError < StandardError; end
 
   autoload :Adapter, "node_mutation/adapter"
-  autoload :ParserAdapter, "node_mutation/parser_adapter"
+  autoload :ParserAdapter, "node_mutation/adapter/parser"
+  autoload :SyntaxTreeAdapter, "node_mutation/adapter/syntax_tree"
   autoload :Action, 'node_mutation/action'
   autoload :AppendAction, 'node_mutation/action/append_action'
   autoload :DeleteAction, 'node_mutation/action/delete_action'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies: []
 description: ast node mutation apis
 email:
@@ -37,7 +37,8 @@ files:
 - lib/node_mutation/action/replace_action.rb
 - lib/node_mutation/action/replace_with_action.rb
 - lib/node_mutation/adapter.rb
-- lib/node_mutation/parser_adapter.rb
+- lib/node_mutation/adapter/parser.rb
+- lib/node_mutation/adapter/syntax_tree.rb
 - lib/node_mutation/result.rb
 - lib/node_mutation/strategy.rb
 - lib/node_mutation/struct.rb