synvert-core 0.60.0 → 0.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e00ecd8d7f5d6ff82a17580d088cc323d0e94b53a1488e6be50cbeb4a44b13
-  data.tar.gz: 9e3f9dbb81cb07a27fdb8d0f2888d1c7827270d9b5bf9434ff0f649245de65a5
+  metadata.gz: ff83abb1009ca5d9fe97a1c2e64701c31942a1c235e2b5a9bfe6cec1875f0956
+  data.tar.gz: b983862aa7a7861801104d43dc19cd794a5b83e4c2be5b137888b2e92a6f8068
 SHA512:
-  metadata.gz: 6c777f93827fa6485a6636571500f8def9cd0c8b7d910f61da7c309a84124e70415d8d86e97037ec4ee574ae783936267e446e6e1b870523fdb0ea4abea09f03
-  data.tar.gz: 4fa8ef96adce5932eed3d927d0f878684c1bff3896829c9297df8cb20eda98f4324aed12a066e8c5b2b60996f87929cd31d911b2961414dc2e8c0356edfb3f35
+  metadata.gz: 6978c684ad91c8a59c9774129c5ab21162b66f4f3b4eb043337a008c2dd5a5df3634b7781442d03147ae8829b250bd73f279b31379f6b3861e852da75209ba26
+  data.tar.gz: 96299eb5b9b6254a3781abaff6e3d9f2ac6e1da8e1216b17990471558408bf6ceecb439175183819f3aadd860de94754639c4434705910469318e91abd57f124

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.61.0 (2021-12-10)
+
+* Add `Node#child_node_by_name`
+* Fix `Node#child_node_range` for array
+
 ## 0.60.0 (2021-12-02)
 
 * Add `to_string` to `sym` node

data/lib/synvert/core/node_ext.rb

@@ -343,6 +343,43 @@ module Parser::AST
       loc.expression.line
     end
 
+    # Get child node by child name.
+    #
+    # @param [String] name of child node.
+    # @return [Parser::AST::Node] the child node.
+    def child_node_by_name(child_name)
+      direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
+      if respond_to?(direct_child_name)
+        child_node = send(direct_child_name)
+
+        if nested_child_name
+          if child_node.is_a?(Array)
+            child_direct_child_name, child_nested_child_name = nested_child_name.split('.', 2)
+            child_direct_child_node = child_direct_child_name =~ /\A\d+\z/ ? child_node[child_direct_child_name.to_i - 1] : child_node.send(child_direct_child_name)
+            return child_direct_child_node.child_node_by_name(child_nested_child_name) if child_nested_child_name
+            return child_direct_child_node if child_direct_child_node
+
+            raise Synvert::Core::MethodNotSupported,
+                  "child_node_by_name is not handled for #{debug_info}, child_name: #{child_name}"
+          end
+
+          return child_node.child_node_by_name(nested_child_name)
+        end
+
+        return nil if child_node.nil?
+
+        return child_node if child_node.is_a?(Parser::AST::Node)
+
+        # arguments
+        return nil if child_node.empty?
+
+        return child_node
+      end
+
+      raise Synvert::Core::MethodNotSupported,
+            "child_node_by_name is not handled for #{debug_info}, child_name: #{child_name}"
+    end
+
     # Get the source range of child node.
     #
     # @param [String] name of child node.
@@ -382,10 +419,10 @@ module Parser::AST
 
           if nested_child_name
             if child_node.is_a?(Array)
-              child_direct_child_name, *child_nested_child_name = nested_child_name
-              child_direct_child_node = child_direct_child_name =~ /\A\d+\z/ ? child_node[child_direct_child_name] : child_node.send(child_direct_child_name)
-              if child_nested_child_name.length > 0
-                return child_direct_child_node.child_node_range(child_nested_child_name.join('.'))
+              child_direct_child_name, child_nested_child_name = nested_child_name.split('.', 2)
+              child_direct_child_node = child_direct_child_name =~ /\A\d+\z/ ? child_node[child_direct_child_name.to_i - 1] : child_node.send(child_direct_child_name)
+              if child_nested_child_name
+                return child_direct_child_node.child_node_range(child_nested_child_name)
               elsif child_direct_child_node
                 return (
                   Parser::Source::Range.new(
@@ -486,8 +523,8 @@ module Parser::AST
     def rewritten_source(code)
       code.gsub(/{{(.*?)}}/m) do
         old_code = Regexp.last_match(1)
-        if respond_to? old_code.split(/\.|\[/).first
-          evaluated = instance_eval old_code
+        if respond_to?(old_code.split('.').first)
+          evaluated = child_node_by_name(old_code)
           case evaluated
           when Parser::AST::Node
             if evaluated.type == :args

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.60.0'
+    VERSION = '0.61.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -554,6 +554,54 @@ describe Parser::AST::Node do
     end
   end
 
+  describe '#child_node_by_name' do
+    context 'block node' do
+      it 'checks caller' do
+        node = parse('Factory.define :user do |user|; end')
+        child_node = node.child_node_by_name(:caller)
+        expect(child_node).to eq node.caller
+      end
+
+      it 'checks arguments' do
+        node = parse('Factory.define :user do |user|; end')
+        child_node = node.child_node_by_name(:arguments)
+        expect(child_node).to eq node.arguments
+      end
+
+      it 'checks caller.receiver' do
+        node = parse('Factory.define :user do |user|; end')
+        child_node = node.child_node_by_name('caller.receiver')
+        expect(child_node).to eq node.caller.receiver
+      end
+
+      it 'checks caller.message' do
+        node = parse('Factory.define :user do |user|; end')
+        child_node = node.child_node_by_name('caller.message')
+        expect(child_node).to eq node.caller.message
+      end
+    end
+
+    context 'array' do
+      it 'checks array by index' do
+        node = parse('factory :admin, class: User do; end')
+        child_node = node.child_node_by_name('caller.arguments.2')
+        expect(child_node).to eq node.caller.arguments[1]
+      end
+
+      it 'checks array by method' do
+        node = parse('factory :admin, class: User do; end')
+        child_node = node.child_node_by_name('caller.arguments.second')
+        expect(child_node).to eq node.caller.arguments[1]
+      end
+
+      it "checks array' value" do
+        node = parse('factory :admin, class: User do; end')
+        child_node = node.child_node_by_name('caller.arguments.second.class_value')
+        expect(child_node).to eq node.caller.arguments[1].class_value
+      end
+    end
+  end
+
   describe '#child_node_range' do
     context 'block node' do
       it 'checks caller' do
@@ -720,6 +768,26 @@ describe Parser::AST::Node do
         expect(range).to be_nil
       end
     end
+
+    context 'array' do
+      it 'checks array by index' do
+        node = parse('factory :admin, class: User do; end')
+        range = node.child_node_range('caller.arguments.2')
+        expect(range.to_range).to eq(16...27)
+      end
+
+      it 'checks array by method' do
+        node = parse('factory :admin, class: User do; end')
+        range = node.child_node_range('caller.arguments.second')
+        expect(range.to_range).to eq(16...27)
+      end
+
+      it "checks array' value" do
+        node = parse('factory :admin, class: User do; end')
+        range = node.child_node_range('caller.arguments.second.class_value')
+        expect(range.to_range).to eq(23...27)
+      end
+    end
   end
 
   describe '#rewritten_source' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.61.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport