synvert-core 0.57.1 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d308267b7dc3f8561869a44ab25b6ffb329f4dfbc04ae66e960de167faa1ee4a
-  data.tar.gz: c6863adae12f49e7d8c0eb79c336f11b5dfaead8b7679a32c32a2131a0cd2ccf
+  metadata.gz: 991e04b61994a2fd44aaaa4cb35564a56d359ffd2b9277fb805f6fb684a2f3ce
+  data.tar.gz: 0d969850a6915e9861937fa2a4e77ee36d93954b0aa764ffa3a56396d83becba
 SHA512:
-  metadata.gz: ce3db59d4d4d047c4abafbe3130252615bf601fc980c601d93552777105c646eb76174e04ae5e7af16004570f4d091c7549c40c5b5b0e803ab8eb916607ae34a
-  data.tar.gz: 2095af835a69d267a8d78112752aa553c002cb0699f3ca082b2ef0600e95b772eba9aae76cbd863ae3e8d7a7101c92942e03ae89e34d0c3abd6a636a5b65ac29
+  metadata.gz: 4d7a0dfe005762899d89eaede4db3219b1d6d03c94d640b1b2168234402747e658f9e19a537f6f129b8cc1e8741ca45cddfa32ed354d8e8361a08a544b41e99f
+  data.tar.gz: fe58dedc331361f6cfbf1627e55f677e61073271a40ad7ea62bb57233ab9350f8c99750f5346360511d64e3ba0f35d112683029b377e866f3591a9a3f7ea575c

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 # CHANGELOG
 
-## 0.57.1 (2021-10-18)
+## 0.58.0 (2021-10-23)
 
 * Support `left_value` and `right_value` for `and` and `or` node
+* Rewrite `within_node` and `within_direct_node`, `WithinScope` accepts `recursive` and `direct` options
 
 ## 0.57.0 (2021-10-02)
 

data/lib/synvert/core/node_ext.rb

@@ -432,8 +432,8 @@ module Parser::AST
     def recursive_children(&block)
       children.each do |child|
         if child.is_a?(Parser::AST::Node)
-          yield child
-          child.recursive_children(&block)
+          result = yield child
+          child.recursive_children(&block) unless result == :stop
         end
       end
     end

data/lib/synvert/core/rewriter/instance.rb

@@ -161,9 +161,11 @@ module Synvert::Core
     # then continue operating on each matching ast node.
     #
     # @param rules [Hash] rules to find mathing ast nodes.
+    # @param options [Hash] optional, set if recursive or not.
     # @param block [Block] block code to continue operating on the matching nodes.
-    def within_node(rules, &block)
-      Rewriter::WithinScope.new(self, rules, { recursive: true }, &block).process
+    def within_node(rules, options = nil, &block)
+      options ||= { recursive: true }
+      Rewriter::WithinScope.new(self, rules, options, &block).process
     end
 
     alias with_node within_node
@@ -174,7 +176,7 @@ module Synvert::Core
     # @param rules [Hash] rules to find mathing ast nodes.
     # @param block [Block] block code to continue operating on the matching nodes.
     def within_direct_node(rules, &block)
-      Rewriter::WithinScope.new(self, rules, { recursive: false }, &block).process
+      Rewriter::WithinScope.new(self, rules, { direct: true }, &block).process
     end
 
     alias with_direct_node within_direct_node

data/lib/synvert/core/rewriter/scope/within_scope.rb

@@ -9,7 +9,7 @@ module Synvert::Core
     # @param rules [Hash]
     # @param options [Hash]
     # @param block [Block]
-    def initialize(instance, rules, options = { recursive: true }, &block)
+    def initialize(instance, rules, options = {}, &block)
       @instance = instance
       @rules = rules
       @options = options
@@ -23,7 +23,14 @@ module Synvert::Core
       current_node = @instance.current_node
       return unless current_node
 
-      matching_nodes = find_matching_nodes(current_node)
+      matching_nodes =
+        if @options[:direct]
+          find_direct_matching_nodes(current_node)
+        elsif @options[:recursive]
+          find_recursive_matching_nodes(current_node)
+        else
+          find_matching_nodes(current_node)
+        end
       @instance.process_with_node current_node do
         matching_nodes.each do |matching_node|
           @instance.process_with_node matching_node do
@@ -35,36 +42,73 @@ module Synvert::Core
 
     private
 
-    def find_matching_nodes(current_node)
+    # Find the matching nodes only in current or direct children.
+    def find_direct_matching_nodes(current_node)
       matching_nodes = []
-      if @options[:recursive]
-        if current_node.is_a?(Parser::AST::Node)
-          matching_nodes << current_node if current_node.match? @rules
-          current_node.recursive_children do |child_node|
-            matching_nodes << child_node if child_node.match? @rules
-          end
-        else
-          current_node.each do |node|
-            matching_nodes << node if node.match? @rules
-            node.recursive_children do |child_node|
-              matching_nodes << child_node if child_node.match? @rules
-            end
-          end
-        end
-      elsif current_node.is_a?(Parser::AST::Node)
+      if current_node.is_a?(Parser::AST::Node)
         if current_node.type == :begin
           current_node.children.each do |child_node|
-            matching_nodes << child_node if child_node.match? @rules
+            matching_nodes << child_node if child_node.match?(@rules)
           end
-        elsif current_node.match? @rules
+        elsif current_node.match?(@rules)
           matching_nodes << current_node
         end
       else
         current_node.each do |child_node|
-          matching_nodes << child_node if child_node.match? @rules
+          matching_nodes << child_node if child_node.match?(@rules)
+        end
+      end
+      matching_nodes
+    end
+
+    # Find matching nodes in all recursive children.
+    def find_recursive_matching_nodes(current_node)
+      matching_nodes = []
+      if current_node.is_a?(Parser::AST::Node)
+        matching_nodes << current_node if current_node.match?(@rules)
+        current_node.recursive_children do |child_node|
+          matching_nodes << child_node if child_node.match?(@rules)
+        end
+      else
+        current_node.each do |node|
+          matching_nodes << node if node.match?(@rules)
+          node.recursive_children do |child_node|
+            matching_nodes << child_node if child_node.match?(@rules)
+          end
+        end
+      end
+      matching_nodes
+    end
+
+    # Find matching nodes in recursive children but do not continue on matching nodes.
+    def find_matching_nodes(current_node)
+      matching_nodes = []
+      if current_node.is_a?(Parser::AST::Node)
+        if current_node.match?(@rules)
+          matching_nodes << current_node
+          return matching_nodes
+        end
+        current_node.recursive_children do |child_node|
+          if child_node.match?(@rules)
+            matching_nodes << child_node
+            break :stop
+          end
+        end
+      else
+        current_node.each do |node|
+          if node.match?(@rules)
+            matching_nodes << node
+            next
+          end
+          node.recursive_children do |child_node|
+            if child_node.match?(@rules)
+              matching_nodes << child_node
+              break :stop
+            end
+          end
         end
       end
       matching_nodes
     end
   end
-end
+end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.57.1'
+    VERSION = '0.58.0'
   end
 end

data/spec/synvert/core/rewriter/instance_spec.rb

@@ -31,13 +31,23 @@ module Synvert::Core
       instance.with_node(type: 'send', message: 'create', &block)
     end
 
-    it 'parses within_direct_node' do
+    it 'parses within_node with recursive false' do
       scope = double
       block = proc {}
       expect(Rewriter::WithinScope).to receive(:new)
         .with(instance, { type: 'send', message: 'create' }, { recursive: false }, &block)
         .and_return(scope)
       expect(scope).to receive(:process)
+      instance.within_node({ type: 'send', message: 'create' }, { recursive: false }, &block)
+    end
+
+    it 'parses within_direct_node' do
+      scope = double
+      block = proc {}
+      expect(Rewriter::WithinScope).to receive(:new)
+        .with(instance, { type: 'send', message: 'create' }, { direct: true }, &block)
+        .and_return(scope)
+      expect(scope).to receive(:process)
       instance.within_direct_node(type: 'send', message: 'create', &block)
     end
 
@@ -45,7 +55,7 @@ module Synvert::Core
       scope = double
       block = proc {}
       expect(Rewriter::WithinScope).to receive(:new)
-        .with(instance, { type: 'send', message: 'create' }, { recursive: false }, &block)
+        .with(instance, { type: 'send', message: 'create' }, { direct: true }, &block)
         .and_return(scope)
       expect(scope).to receive(:process)
       instance.with_direct_node(type: 'send', message: 'create', &block)

data/spec/synvert/core/rewriter/scope/within_scope_spec.rb

@@ -51,6 +51,33 @@ module Synvert::Core
         expect(type_in_scope).to eq :send
         expect(instance.current_node.type).to eq :block
       end
+
+      it 'matches multiple block nodes' do
+        block_nodes = []
+        scope = Rewriter::WithinScope.new(instance, { type: 'block' }, { recursive: true }) do
+          block_nodes << node
+        end
+        scope.process
+        expect(block_nodes.size).to eq 2
+      end
+
+      it 'matches only one block node if no recursive' do
+        block_nodes = []
+        scope = Rewriter::WithinScope.new(instance, { type: 'block' } , { recursive: false }) do
+          block_nodes << node
+        end
+        scope.process
+        expect(block_nodes.size).to eq 1
+      end
+
+      it 'matches only one direct node' do
+        block_nodes = []
+        scope = Rewriter::WithinScope.new(instance, { type: 'block' } , { direct: true }) do
+          block_nodes << node
+        end
+        scope.process
+        expect(block_nodes.size).to eq 1
+      end
     end
   end
 end

metadata

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