synvert-core 1.4.0 → 1.5.0

data/spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb

@@ -3,6 +3,26 @@
 require 'spec_helper'
 
 module Synvert::Core
-  describe Rewriter::ReplaceErbStmtWithExprAction do
+  RSpec.describe Rewriter::ReplaceErbStmtWithExprAction do
+    context 'replace with single line' do
+      subject {
+        source = "<% form_for post do |f| %>\n<% end %>"
+        source = Engine::Erb.encode(source)
+        node = Parser::CurrentRuby.parse(source).children[1]
+        described_class.new(node).process
+      }
+
+      it 'gets start' do
+        expect(subject.start).to eq '@output_buffer = output_buffer || ActionView::OutputBuffer.new;'.length
+      end
+
+      it 'gets end' do
+        expect(subject.end).to eq '@output_buffer = output_buffer || ActionView::OutputBuffer.new;;   ; form_for post do |f| ;   ;'.length
+      end
+
+      it 'gets new_code' do
+        expect(subject.new_code).to eq '@output_buffer.append=  form_for post do |f| ;  ;'
+      end
+    end
   end
 end

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

@@ -4,8 +4,6 @@ require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::Instance do
-    before { Rewriter::Instance.reset }
-
     let(:instance) {
       rewriter = Rewriter.new('foo', 'bar')
       Rewriter::Instance.new(rewriter, ['file pattern'])
@@ -98,97 +96,83 @@ module Synvert::Core
     end
 
     it 'parses append' do
-      action = double
-      expect(Rewriter::AppendAction).to receive(:new).with(
-        instance,
-        'include FactoryGirl::Syntax::Methods'
-      ).and_return(action)
-      expect(action).to receive(:process)
-      instance.append 'include FactoryGirl::Syntax::Methods'
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:append).with(instance.current_node, 'Foobar')
+      instance.append 'Foobar'
     end
 
     it 'parses prepend' do
-      action = double
-      expect(Rewriter::PrependAction).to receive(:new).with(
-        instance,
-        '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
-      ).and_return(action)
-      expect(action).to receive(:process)
-      instance.prepend '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:prepend).with(instance.current_node, 'Foobar')
+      instance.prepend 'Foobar'
     end
 
     it 'parses insert at end' do
-      action = double
-      expect(Rewriter::InsertAction).to receive(:new).with(
-        instance,
-        '.first',
-        at: 'end',
-        to: 'receiver'
-      ).and_return(action)
-      expect(action).to receive(:process)
-      instance.insert '.first', to: 'receiver'
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:insert).with(instance.current_node, 'Foobar', at: 'end', to: 'receiver')
+      instance.insert 'Foobar', to: 'receiver'
     end
 
     it 'parses insert at beginning' do
-      action = double
-      expect(Rewriter::InsertAction).to receive(:new).with(
-        instance,
-        'URI.',
-        at: 'beginning',
-        to: nil
-      ).and_return(action)
-      expect(action).to receive(:process)
-      instance.insert 'URI.', at: 'beginning'
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:insert).with(instance.current_node, 'Foobar', at: 'beginning', to: nil)
+      instance.insert 'Foobar', at: 'beginning'
     end
 
     it 'parses insert_after' do
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:insert_after).with(instance.current_node, 'Foobar')
+      instance.insert_after 'Foobar'
+    end
+
+    it 'parses replace_erb_stmt_with_expr' do
+      instance.current_mutation = double
+      instance.current_node = double
       action = double
-      expect(Rewriter::InsertAfterAction).to receive(:new).with(
-        instance,
-        '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
-      ).and_return(action)
+      expect(instance.current_mutation).to receive(:actions).and_return([])
+      expect(Rewriter::ReplaceErbStmtWithExprAction).to receive(:new).with(instance.current_node).and_return(action)
       expect(action).to receive(:process)
-      instance.insert_after '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
+      instance.replace_erb_stmt_with_expr
     end
 
     it 'parses replace_with' do
-      action = double
-      expect(Rewriter::ReplaceWithAction).to receive(:new).with(instance, 'create {{arguments}}').and_return(action)
-      expect(action).to receive(:process)
-      instance.replace_with 'create {{arguments}}'
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:replace_with).with(instance.current_node, 'Foobar')
+      instance.replace_with 'Foobar'
     end
 
     it 'parses replace with' do
-      action = double
-      expect(Rewriter::ReplaceAction).to receive(:new).with(instance, :message, with: 'test').and_return(action)
-      expect(action).to receive(:process)
-      instance.replace :message, with: 'test'
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:replace).with(instance.current_node, :message, with: 'Foobar')
+      instance.replace :message, with: 'Foobar'
     end
 
     it 'parses remove' do
-      action = double
-      expect(Rewriter::RemoveAction).to receive(:new).with(instance, { and_comma: true }).and_return(action)
-      expect(action).to receive(:process)
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:remove).with(instance.current_node, and_comma: true)
       instance.remove and_comma: true
     end
 
-    it 'parses remove' do
-      action = double
-      expect(Rewriter::DeleteAction).to receive(:new).with(
-        instance,
-        :dot,
-        :message,
-        { and_comma: true }
-      ).and_return(action)
-      expect(action).to receive(:process)
+    it 'parses delete' do
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:delete).with(instance.current_node, :dot, :message, and_comma: true)
       instance.delete :dot, :message, and_comma: true
     end
 
     it 'parses wrap with' do
-      action = double
-      expect(Rewriter::WrapAction).to receive(:new).with(instance, with: 'module Foo', indent: nil).and_return(action)
-      expect(action).to receive(:process)
-      instance.wrap with: 'module Foo'
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(instance.current_mutation).to receive(:wrap).with(instance.current_node, with: 'module Foobar')
+      instance.wrap with: 'module Foobar'
     end
 
     it 'parses warn' do
@@ -251,32 +235,6 @@ module Synvert::Core
         instance.process
       end
 
-      it 'does not read file if already read' do
-        instance =
-          Rewriter::Instance.new rewriter, ['spec/spec_helper.rb'] do
-            with_node type: 'block', caller: { receiver: 'RSpec', message: 'configure' } do
-              unless_exist_node type: 'send', message: 'include', arguments: ['FactoryGirl::Syntax::Methods'] do
-                insert '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
-              end
-            end
-          end
-        input = <<~EOS
-          RSpec.configure do |config|
-            config.include FactoryGirl::Syntax::Methods
-          end
-        EOS
-        output = <<~EOS
-          RSpec.configure do |config|
-            config.include FactoryGirl::Syntax::Methods
-          end
-        EOS
-        expect(Dir).to receive(:glob).with('./spec/spec_helper.rb').and_return(['spec/spec_helper.rb']).twice
-        expect(File).to receive(:read).with('spec/spec_helper.rb', encoding: 'UTF-8').and_return(input).once
-        expect(File).not_to receive(:write).with('spec/spec_helper.rb', output)
-        instance.process
-        instance.process
-      end
-
       it 'updates file_source and file_ast when writing a file' do
         instance =
           Rewriter::Instance.new rewriter, ['spec/**/*_spec.rb'] do
@@ -308,32 +266,6 @@ module Synvert::Core
       end
     end
 
-    describe '#get_conflict_actions' do
-      let(:rewriter) { Rewriter.new('foo', 'bar') }
-
-      it 'has no conflict' do
-        action1 = double(begin_pos: 10, end_pos: 20)
-        action2 = double(begin_pos: 30, end_pos: 40)
-        action3 = double(begin_pos: 50, end_pos: 60)
-        instance = Rewriter::Instance.new rewriter, ['spec/spec_helper.rb']
-        instance.instance_variable_set :@actions, [action1, action2, action3]
-        conflict_actions = instance.send(:get_conflict_actions)
-        expect(conflict_actions).to eq []
-        expect(instance.instance_variable_get(:@actions)).to eq [action1, action2, action3]
-      end
-
-      it 'has no conflict' do
-        action1 = double(begin_pos: 30, end_pos: 40)
-        action2 = double(begin_pos: 50, end_pos: 60)
-        action3 = double(begin_pos: 10, end_pos: 20)
-        instance = Rewriter::Instance.new rewriter, ['spec/spec_helper.rb']
-        instance.instance_variable_set :@actions, [action1, action2, action3]
-        conflict_actions = instance.send(:get_conflict_actions)
-        expect(conflict_actions).to eq [action2, action1]
-        expect(instance.instance_variable_get(:@actions)).to eq [action3]
-      end
-    end
-
     describe '#process_with_node' do
       it 'resets current_node' do
         node1 = double

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

@@ -14,10 +14,7 @@ module Synvert::Core
     EOS
 
     let(:node) { Parser::CurrentRuby.parse(source) }
-    before do
-      Rewriter::Instance.reset
-      instance.current_node = node
-    end
+    before { instance.current_node = node }
 
     describe '#process' do
       it 'call block with child node' do

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

@@ -18,10 +18,7 @@ module Synvert::Core
 
     let(:node) { Parser::CurrentRuby.parse(source) }
 
-    before do
-      Rewriter::Instance.reset
-      instance.current_node = node
-    end
+    before { instance.current_node = node }
 
     describe '#process' do
       it 'not call block if no matching node' do

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

@@ -18,10 +18,7 @@ module Synvert::Core
 
     let(:node) { Parser::CurrentRuby.parse(source) }
 
-    before do
-      Rewriter::Instance.reset
-      instance.current_node = node
-    end
+    before { instance.current_node = node }
 
     describe '#process' do
       it 'not call block if no matching node' do

data/synvert-core-ruby.gemspec

@@ -14,13 +14,15 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/xinminlabs/synvert-core-ruby"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0") +
-                       %w[lib/synvert/core/node_query/lexer.rex.rb lib/synvert/core/node_query/parser.racc.rb]
+  spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "erubis"
+  spec.add_runtime_dependency "node_query"
+  spec.add_runtime_dependency "node_mutation"
   spec.add_runtime_dependency "parser"
+  spec.add_runtime_dependency "parser_node_ext"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-21 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: node_query
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: node_mutation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parser_node_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: convert ruby code to better syntax automatically.
 email:
 - flyerhzm@gmail.com
@@ -69,48 +111,13 @@ files:
 - README.md
 - Rakefile
 - lib/synvert/core.rb
-- lib/synvert/core/array_ext.rb
 - lib/synvert/core/configuration.rb
 - lib/synvert/core/engine.rb
 - lib/synvert/core/engine/erb.rb
 - lib/synvert/core/exceptions.rb
 - lib/synvert/core/node_ext.rb
-- lib/synvert/core/node_query.rb
-- lib/synvert/core/node_query/compiler.rb
-- lib/synvert/core/node_query/compiler/array.rb
-- lib/synvert/core/node_query/compiler/attribute.rb
-- lib/synvert/core/node_query/compiler/attribute_list.rb
-- lib/synvert/core/node_query/compiler/basic_selector.rb
-- lib/synvert/core/node_query/compiler/boolean.rb
-- lib/synvert/core/node_query/compiler/comparable.rb
-- lib/synvert/core/node_query/compiler/dynamic_attribute.rb
-- lib/synvert/core/node_query/compiler/expression.rb
-- lib/synvert/core/node_query/compiler/float.rb
-- lib/synvert/core/node_query/compiler/identifier.rb
-- lib/synvert/core/node_query/compiler/integer.rb
-- lib/synvert/core/node_query/compiler/invalid_operator_error.rb
-- lib/synvert/core/node_query/compiler/nil.rb
-- lib/synvert/core/node_query/compiler/parse_error.rb
-- lib/synvert/core/node_query/compiler/regexp.rb
-- lib/synvert/core/node_query/compiler/selector.rb
-- lib/synvert/core/node_query/compiler/string.rb
-- lib/synvert/core/node_query/compiler/symbol.rb
-- lib/synvert/core/node_query/lexer.rex
-- lib/synvert/core/node_query/lexer.rex.rb
-- lib/synvert/core/node_query/parser.racc.rb
-- lib/synvert/core/node_query/parser.y
 - lib/synvert/core/rewriter.rb
-- lib/synvert/core/rewriter/action.rb
-- lib/synvert/core/rewriter/action/append_action.rb
-- lib/synvert/core/rewriter/action/delete_action.rb
-- lib/synvert/core/rewriter/action/insert_action.rb
-- lib/synvert/core/rewriter/action/insert_after_action.rb
-- lib/synvert/core/rewriter/action/prepend_action.rb
-- lib/synvert/core/rewriter/action/remove_action.rb
-- lib/synvert/core/rewriter/action/replace_action.rb
 - lib/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action.rb
-- lib/synvert/core/rewriter/action/replace_with_action.rb
-- lib/synvert/core/rewriter/action/wrap_action.rb
 - lib/synvert/core/rewriter/any_value.rb
 - lib/synvert/core/rewriter/condition.rb
 - lib/synvert/core/rewriter/condition/if_exist_condition.rb
@@ -130,19 +137,7 @@ files:
 - spec/support/parser_helper.rb
 - spec/synvert/core/engine/erb_spec.rb
 - spec/synvert/core/node_ext_spec.rb
-- spec/synvert/core/node_query/lexer_spec.rb
-- spec/synvert/core/node_query/parser_spec.rb
-- spec/synvert/core/rewriter/action/append_action_spec.rb
-- spec/synvert/core/rewriter/action/delete_action_spec.rb
-- spec/synvert/core/rewriter/action/insert_action_spec.rb
-- spec/synvert/core/rewriter/action/insert_after_action_spec.rb
-- spec/synvert/core/rewriter/action/prepend_action_spec.rb
-- spec/synvert/core/rewriter/action/remove_action_spec.rb
-- spec/synvert/core/rewriter/action/replace_action_spec.rb
 - spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb
-- spec/synvert/core/rewriter/action/replace_with_action_spec.rb
-- spec/synvert/core/rewriter/action/wrap_action_spec.rb
-- spec/synvert/core/rewriter/action_spec.rb
 - spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/unless_exist_condition_spec.rb
@@ -186,19 +181,7 @@ test_files:
 - spec/support/parser_helper.rb
 - spec/synvert/core/engine/erb_spec.rb
 - spec/synvert/core/node_ext_spec.rb
-- spec/synvert/core/node_query/lexer_spec.rb
-- spec/synvert/core/node_query/parser_spec.rb
-- spec/synvert/core/rewriter/action/append_action_spec.rb
-- spec/synvert/core/rewriter/action/delete_action_spec.rb
-- spec/synvert/core/rewriter/action/insert_action_spec.rb
-- spec/synvert/core/rewriter/action/insert_after_action_spec.rb
-- spec/synvert/core/rewriter/action/prepend_action_spec.rb
-- spec/synvert/core/rewriter/action/remove_action_spec.rb
-- spec/synvert/core/rewriter/action/replace_action_spec.rb
 - spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb
-- spec/synvert/core/rewriter/action/replace_with_action_spec.rb
-- spec/synvert/core/rewriter/action/wrap_action_spec.rb
-- spec/synvert/core/rewriter/action_spec.rb
 - spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/unless_exist_condition_spec.rb

data/lib/synvert/core/array_ext.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-# Extend Array.
-class Array
-  # Get child node by the name.
-  #
-  # @param child_name [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.split('.', 2)
-    child_direct_child_node = direct_child_name =~ /\A\d+\z/ ? self[direct_child_name.to_i - 1] : self.send(direct_child_name)
-    return child_direct_child_node.child_node_by_name(nested_child_name) if 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
-
-  # Get the source range of child node.
-  #
-  # @param child_name [String] name of child node.
-  # @return [Parser::Source::Range] source range of child node.
-  def child_node_range(child_name)
-    direct_child_name, nested_child_name = child_name.split('.', 2)
-    child_direct_child_node = direct_child_name =~ /\A\d+\z/ ? self[direct_child_name.to_i - 1] : self.send(direct_child_name)
-    if nested_child_name
-      return child_direct_child_node.child_node_range(nested_child_name)
-    elsif child_direct_child_node
-      return (
-        Parser::Source::Range.new(
-          '(string)',
-          child_direct_child_node.loc.expression.begin_pos,
-          child_direct_child_node.loc.expression.end_pos
-        )
-      )
-    else
-      raise Synvert::Core::MethodNotSupported,
-            "child_node_range is not handled for #{debug_info}, child_name: #{child_name}"
-    end
-  end
-
-  # Return the debug info.
-  #
-  # @return [String] file, line, source and node.
-  def debug_info
-    map(&:debug_info).join("\n")
-  end
-end

data/lib/synvert/core/node_query/compiler/array.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Synvert::Core::NodeQuery::Compiler
-  # Array represents a ruby array value.
-  class Array
-    include Comparable
-
-    # Initialize an Array.
-    # @param value the first value of the array
-    # @param rest the rest value of the array
-    def initialize(value: nil, rest: nil)
-      @value = value
-      @rest = rest
-    end
-
-    # Get the expected value.
-    # @return [Array]
-    def expected_value
-      expected = []
-      expected.push(@value) if @value
-      expected += @rest.expected_value if @rest
-      expected
-    end
-
-    # Get valid operators.
-    def valid_operators
-      ARRAY_VALID_OPERATORS
-    end
-
-    def to_s
-      [@value, @rest].compact.join(' ')
-    end
-  end
-end

data/lib/synvert/core/node_query/compiler/attribute.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Synvert::Core::NodeQuery::Compiler
-  # Attribute is a pair of key, value and operator,
-  class Attribute
-    # Initialize a Attribute.
-    # @param key [String] the key
-    # @param value the value can be any class implement {Synvert::Core::NodeQuery::Compiler::Comparable}
-    # @param operator [Symbol] the operator
-    def initialize(key:, value:, operator: '==')
-      @key = key
-      @value = value
-      @operator = operator
-    end
-
-    # Check if the node matches the attribute.
-    # @param node [Parser::AST::Node] the node
-    # @return [Boolean]
-    def match?(node)
-      @value.base_node = node if @value.is_a?(DynamicAttribute)
-      node && @value.match?(node.child_node_by_name(@key), @operator)
-    end
-
-    def to_s
-      case @operator
-      when '^=', '$=', '*=', '!=', '=~', '!~', '>=', '>', '<=', '<'
-        "#{@key}#{@operator}#{@value}"
-      when 'in'
-        "#{@key} in (#{@value})"
-      when 'not_in'
-        "#{@key} not in (#{@value})"
-      when 'includes'
-        "#{@key} includes #{@value}"
-      else
-        "#{@key}=#{@value}"
-      end
-    end
-  end
-end

data/lib/synvert/core/node_query/compiler/attribute_list.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Synvert::Core::NodeQuery::Compiler
-  # AttributeList contains one or more {Synvert::Core::NodeQuery::Compiler::Attribute}.
-  class AttributeList
-    # Initialize a AttributeList.
-    # @param attribute [Synvert::Core::NodeQuery::Compiler::Attribute] the attribute
-    # @param rest [Synvert::Core::NodeQuery::Compiler::AttributeList] the rest attribute list
-    def initialize(attribute:, rest: nil)
-      @attribute = attribute
-      @rest = rest
-    end
-
-    # Check if the node matches the attribute list.
-    # @return [Boolean]
-    def match?(node)
-      @attribute.match?(node) && (!@rest || @rest.match?(node))
-    end
-
-    def to_s
-      "[#{@attribute}]#{@rest}"
-    end
-  end
-end

data/lib/synvert/core/node_query/compiler/basic_selector.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Synvert::Core::NodeQuery::Compiler
-  # BasicSelector used to match nodes, it combines by node type and/or attribute list.
-  class BasicSelector
-    # Initialize a BasicSelector.
-    # @param node_type [String] the node type
-    # @param attribute_list [Synvert::Core::NodeQuery::Compiler::AttributeList] the attribute list
-    def initialize(node_type:, attribute_list: nil)
-      @node_type = node_type
-      @attribute_list = attribute_list
-    end
-
-    # Check if node matches the selector.
-    # @param node [Parser::AST::Node] the node
-    def match?(node, _operator = '==')
-      return false unless node
-
-      @node_type.to_sym == node.type && (!@attribute_list || @attribute_list.match?(node))
-    end
-
-    def to_s
-      result = [".#{@node_type}"]
-      result << @attribute_list.to_s if @attribute_list
-      result.join('')
-    end
-  end
-end

data/lib/synvert/core/node_query/compiler/boolean.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Synvert::Core::NodeQuery::Compiler
-  # Boolean represents a ruby boolean value.
-  class Boolean
-    include Comparable
-
-    # Initialize a Boolean.
-    # @param value [Boolean] the boolean value
-    def initialize(value:)
-      @value = value
-    end
-
-    # Get valid operators.
-    def valid_operators
-      SIMPLE_VALID_OPERATORS
-    end
-
-    def to_s
-      @value.to_s
-    end
-  end
-end