ruby_mod_kit 0.0.2 → 0.0.4

data/lib/ruby_mod_kit/node/statements_node.rb

@@ -3,21 +3,25 @@
 # rbs_inline: enabled
 
 module RubyModKit
-  class Node
+  module Node
     # Transpiler program node
-    class StatementsNode < Node
+    class StatementsNode < Node::BaseNode
       # @rbs @prism_node: Prism::StatementsNode
-      # @rbs @parent: Node
+      # @rbs @parent: Node::BaseNode
+      # @rbs @prev: Node::BaseNode | nil
 
-      attr_reader :prism_node #: Prism::StatementsNode
-      attr_reader :parent #: Node
+      private attr_reader :prism_node #: Prism::StatementsNode
+      attr_reader :parent #: Node::BaseNode
+      attr_reader :prev #: Node::BaseNode | nil
 
       # @rbs prism_node: Prism::StatementsNode
-      # @rbs parent: Node
+      # @rbs parent: Node::BaseNode
+      # @rbs prev: Node::BaseNode | nil
       # @rbs return: void
-      def initialize(prism_node, parent:)
+      def initialize(prism_node, parent:, prev: nil)
         @prism_node = prism_node
         @parent = parent
+        @prev = prev
         raise RubyModKit::Error unless prism_node.is_a?(Prism::StatementsNode)
 
         super()

data/lib/ruby_mod_kit/node/symbol_node.rb

@@ -3,21 +3,26 @@
 # rbs_inline: enabled
 
 module RubyModKit
-  class Node
+  module Node
     # Transpiler program node
-    class SymbolNode < Node
+    class SymbolNode < Node::BaseNode
       # @rbs @prism_node: Prism::SymbolNode
-      # @rbs @parent: Node
+      # @rbs @parent: Node::BaseNode
+      # @rbs @prev: Node::BaseNode | nil
+      # @rbs @value: nil | Symbol
 
-      attr_reader :prism_node #: Prism::SymbolNode
-      attr_reader :parent #: Node
+      private attr_reader :prism_node #: Prism::SymbolNode
+      attr_reader :parent #: Node::BaseNode
+      attr_reader :prev #: Node::BaseNode | nil
 
       # @rbs prism_node: Prism::SymbolNode
-      # @rbs parent: Node
+      # @rbs parent: Node::BaseNode
+      # @rbs prev: Node::BaseNode | nil
       # @rbs return: void
-      def initialize(prism_node, parent:)
+      def initialize(prism_node, parent:, prev: nil)
         @prism_node = prism_node
         @parent = parent
+        @prev = prev
         raise RubyModKit::Error unless prism_node.is_a?(Prism::SymbolNode)
 
         super()

data/lib/ruby_mod_kit/node/untyped_node.rb

@@ -3,21 +3,25 @@
 # rbs_inline: enabled
 
 module RubyModKit
-  class Node
+  module Node
     # Transpiler program node
-    class UntypedNode < Node
+    class UntypedNode < Node::BaseNode
       # @rbs @prism_node: Prism::Node
-      # @rbs @parent: Node
+      # @rbs @parent: Node::BaseNode
+      # @rbs @prev: Node::BaseNode | nil
 
-      attr_reader :prism_node #: Prism::Node
-      attr_reader :parent #: Node
+      private attr_reader :prism_node #: Prism::Node
+      attr_reader :parent #: Node::BaseNode
+      attr_reader :prev #: Node::BaseNode | nil
 
       # @rbs prism_node: Prism::Node
-      # @rbs parent: Node
+      # @rbs parent: Node::BaseNode
+      # @rbs prev: Node::BaseNode | nil
       # @rbs return: void
-      def initialize(prism_node, parent:)
+      def initialize(prism_node, parent:, prev: nil)
         @prism_node = prism_node
         @parent = parent
+        @prev = prev
         super()
       end
     end

data/lib/ruby_mod_kit/node/wrap.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# rbs_inline: enabled
+
+require_relative "call_node"
+require_relative "def_node"
+require_relative "def_parent_node"
+require_relative "parameter_node"
+require_relative "statements_node"
+require_relative "symbol_node"
+require_relative "untyped_node"
+
+module RubyModKit
+  # The namespace of transpile node.
+  module Node
+    class << self
+      # @rbs prism_node: Prism::Node
+      # @rbs parent: Node::BaseNode
+      # @rbs prev: Node::BaseNode | nil
+      # @rbs return: Node::BaseNode
+      def wrap(prism_node, parent:, prev: nil)
+        case prism_node
+        when Prism::CallNode
+          Node::CallNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::DefNode
+          Node::DefNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::ClassNode, Prism::ModuleNode
+          Node::DefParentNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::RequiredParameterNode, Prism::OptionalKeywordParameterNode,
+            Prism::OptionalParameterNode, Prism::RequiredKeywordParameterNode,
+            Prism::RestParameterNode
+          Node::ParameterNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::StatementsNode
+          Node::StatementsNode.new(prism_node, parent: parent, prev: prev)
+        when Prism::SymbolNode
+          Node::SymbolNode.new(prism_node, parent: parent, prev: prev)
+        else
+          Node::UntypedNode.new(prism_node, parent: parent, prev: prev)
+        end
+      end
+    end
+  end
+end

data/lib/ruby_mod_kit/node.rb

@@ -1,159 +1,12 @@
 # frozen_string_literal: true
 
-# rbs_inline: enabled
-
 module RubyModKit
-  # The class of transpile node.
-  class Node
-    # @rbs @location: Prism::Location
-    # @rbs @children: Array[Node]
-    # @rbs @ancestors: Array[Node]
-
-    attr_reader :location #: Prism::Location
-
-    # @rbs return: void
-    def initialize
-      @location = prism_node.location
-    end
-
-    # @rbs return: Array[Node]
-    def children
-      return @children if @children
-
-      @children = prism_node.child_nodes.compact.map do |prism_child_node|
-        wrap(prism_child_node)
-      end
-    end
-
-    # @rbs prism_node: Prism::Node
-    # @rbs return: Node
-    def wrap(prism_node)
-      case prism_node
-      when Prism::SymbolNode
-        Node::SymbolNode.new(prism_node, parent: self)
-      when Prism::ClassNode, Prism::ModuleNode
-        Node::DefParentNode.new(prism_node, parent: self)
-      when Prism::DefNode
-        Node::DefNode.new(prism_node, parent: self)
-      when Prism::RequiredParameterNode, Prism::OptionalKeywordParameterNode,
-           Prism::OptionalParameterNode, Prism::RequiredKeywordParameterNode,
-           Prism::RestParameterNode
-        Node::ParameterNode.new(prism_node, parent: self)
-      when Prism::StatementsNode
-        Node::StatementsNode.new(prism_node, parent: self)
-      when Prism::CallNode
-        Node::CallNode.new(prism_node, parent: self)
-      else
-        Node::UntypedNode.new(prism_node, parent: self)
-      end
-    end
-
-    # @rbs return: Array[Node]
-    def ancestors
-      return @ancestors if @ancestors
-
-      parent = @parent
-      @ancestors = if parent
-        [parent] + parent.ancestors
-      else
-        []
-      end
-    end
-
-    # @rbs return: Symbol
-    def name
-      raise(RubyModKit::Error, "Expected ParameterNode but #{self.class}:#{prism_node.inspect}")
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node | nil
-    def node_at(offset)
-      return nil unless include?(offset)
-
-      child = children.find { _1.include?(offset) }
-      child&.node_at(offset) || self
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node::StatementsNode | nil
-    def statements_node_at(offset)
-      node = node_at(offset) || return
-      [node, *node.ancestors].each { return _1 if _1.is_a?(Node::StatementsNode) }
-      nil
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node::DefNode | nil
-    def def_node_at(offset)
-      node = node_at(offset) || return
-      [node, *node.ancestors].each { return _1 if _1.is_a?(Node::DefNode) }
-      nil
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node::ParameterNode | nil
-    def parameter_node_at(offset)
-      node = node_at(offset) || return
-      [node, *node.ancestors].each { return _1 if _1.is_a?(Node::ParameterNode) }
-      nil
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: Node::DefParentNode | nil
-    def def_parent_node_at(offset)
-      node = node_at(offset) || return
-      [node, *node.ancestors].each { return _1 if _1.is_a?(Node::DefParentNode) }
-      nil
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: bool
-    def include?(offset)
-      self.offset <= offset && offset <= prism_node.location.end_offset
-    end
-
-    # @rbs return: Prism::Node & Prism::_Node
-    def prism_node
-      raise RubyModKit::Error
-    end
-
-    # @rbs return: Integer
-    def offset
-      location.start_offset
-    end
-
-    # @rbs return: String
-    def inspect
-      str = +"#<#{self.class} "
-      first = true
-      instance_variables.each do |ivar_name|
-        case ivar_name
-        when :@children, :@ancestors, :@parent
-          next
-        end
-
-        if first
-          first = false
-        else
-          str << ", "
-        end
-        str << "#{ivar_name}="
-        value = instance_variable_get(ivar_name)
-        str << (
-          case value
-          when Prism::Node
-            "#<#{value.class} location=#{value.location.inspect}>"
-          else
-            value.inspect
-          end
-        )
-      end
-      str << ">"
-      str
-    end
+  # The namespace of transpile node.
+  module Node
   end
 end
 
+require_relative "node/base_node"
 require_relative "node/symbol_node"
 require_relative "node/def_parent_node"
 require_relative "node/call_node"
@@ -162,3 +15,4 @@ require_relative "node/parameter_node"
 require_relative "node/program_node"
 require_relative "node/statements_node"
 require_relative "node/untyped_node"
+require_relative "node/wrap"

data/lib/ruby_mod_kit/version.rb

@@ -3,5 +3,5 @@
 # rbs_inline: enabled
 
 module RubyModKit
-  VERSION = "0.0.2" #: String
+  VERSION = "0.0.4" #: String
 end

data/lib/ruby_mod_kit.rb

@@ -14,9 +14,10 @@ module RubyModKit
     # @rbs file: String
     # @rbs *args: String
     # @rbs output: String | nil
+    # @rbs config: nil | Config
     # @rbs return: void
-    def execute_file(file, *args, output: nil)
-      rb_script = transpile_file(file, output: output)
+    def execute_file(file, *args, output: nil, config: nil)
+      rb_script = transpile_file(file, output: output, config: config)
       if output
         execute_rb_file(output, *args)
       else
@@ -26,9 +27,10 @@ module RubyModKit
 
     # @rbs file: String
     # @rbs output: String | IO | nil
+    # @rbs config: nil | Config
     # @rbs return: String
-    def transpile_file(file, output: nil)
-      rb_script = transpile(File.read(file), filename: file)
+    def transpile_file(file, output: nil, config: nil)
+      rb_script = transpile(File.read(file), filename: file, config: config)
       case output
       when IO
         output.write(rb_script)
@@ -40,9 +42,10 @@ module RubyModKit
 
     # @rbs src: String
     # @rbs filename: String | nil
+    # @rbs config: nil | Config
     # @rbs return: String
-    def transpile(src, filename: nil)
-      Transpiler.new.transpile(src, filename: filename)
+    def transpile(src, filename: nil, config: nil)
+      Generation.resolve(src, filename: filename, config: config).script
     end
 
     # @rbs file: String
@@ -65,13 +68,29 @@ module RubyModKit
       ARGV.replace(args)
       eval(rb_script, TOPLEVEL_BINDING) # rubocop:disable Security/Eval
     end
+
+    # @rbs type: String
+    # @rbs return: String
+    def unify_type(type)
+      type[/\A\(([^()]*)\)\z/, 1] || type
+    end
   end
 end
 
 require_relative "ruby_mod_kit/version"
-require_relative "ruby_mod_kit/transpiler"
+
+require_relative "ruby_mod_kit/config"
+require_relative "ruby_mod_kit/corrector"
+require_relative "ruby_mod_kit/corrector_manager"
+require_relative "ruby_mod_kit/feature"
 require_relative "ruby_mod_kit/generation"
 require_relative "ruby_mod_kit/memo"
-require_relative "ruby_mod_kit/node"
+require_relative "ruby_mod_kit/memo_pad"
 require_relative "ruby_mod_kit/mission"
+require_relative "ruby_mod_kit/node"
 require_relative "ruby_mod_kit/offset_diff"
+
+require_relative "ruby_mod_kit/feature/instance_variable_parameter"
+require_relative "ruby_mod_kit/feature/overload"
+require_relative "ruby_mod_kit/feature/type"
+require_relative "ruby_mod_kit/feature/type/rbs_inline"

data/ruby_mod_kit.gemspec

@@ -26,7 +26,13 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject do |f|
       next true if File.expand_path(f) == __FILE__
       next false if f =~ %r{\Aexamples/.*rbm?\z}
-      next true if f.start_with?(*%w[bin/ test/ spec/ features/ coverage/ bin/ .git])
+      next true if f.start_with?(
+        *%w[
+          bin/ test/ spec/ features/ coverage/ bin/ .git
+          lib/internal/ sig/generated/internal/
+          sig/rubocop
+        ],
+      )
       next true if %w[Gemfile Gemfile.lock .rspec .rubocop.yml Rakefile Steepfile].include?(f)
       next true if f.end_with?(".rbm")
 

data/sig/generated/ruby_mod_kit/cli.rbs

@@ -10,5 +10,10 @@ module RubyModKit
     # @rbs *args: String
     # @rbs return: void
     def transpile: (*String args) -> void
+
+    private
+
+    # @rbs return: Config | nil
+    def config: () -> (Config | nil)
   end
 end

data/sig/generated/ruby_mod_kit/config.rbs

@@ -0,0 +1,21 @@
+# Generated from lib/ruby_mod_kit/config.rb with RBS::Inline
+
+module RubyModKit
+  # config class
+  class Config
+    @features: Array[Config]
+
+    attr_reader features: Array[Config]
+
+    DEFAULT_FEATURES: Array[String]
+
+    # @rbs features: Array[String]
+    # @rbs return: void
+    def initialize: (?features: Array[String]) -> void
+
+    # @rbs path: String
+    # @rbs if_none: nil | Symbol
+    # @rbs return: Config | nil
+    def self.load: (String path, ?if_none: nil | Symbol) -> (Config | nil)
+  end
+end

data/sig/generated/ruby_mod_kit/core_ext/eval.rbs

@@ -1,5 +1,6 @@
 # Generated from lib/ruby_mod_kit/core_ext/eval.rb with RBS::Inline
 
+# Define RubyMotKit.eval
 module RubyModKit
   module CoreExt
     # the extension for eval
@@ -11,4 +12,6 @@ module RubyModKit
       def self?.eval: (String expr, *Object rest, ?transpile: bool) -> Object
     end
   end
+
+  include CoreExt::Eval
 end

data/sig/generated/ruby_mod_kit/core_ext/load.rbs

@@ -1,5 +1,6 @@
 # Generated from lib/ruby_mod_kit/core_ext/load.rb with RBS::Inline
 
+# Define RubyMotKit.load/require
 module RubyModKit
   module CoreExt
     # the extension for load/require
@@ -8,12 +9,12 @@ module RubyModKit
 
       # @rbs path: String
       # @rbs wrap: bool
-      # @rbs return: void
-      def self?.load: (String path, ?bool wrap) -> void
+      # @rbs return: bool
+      def self?.load: (String path, ?bool wrap) -> bool
 
       # @rbs path: String
-      # @rbs return: void
-      def self?.require: (String path) -> void
+      # @rbs return: bool
+      def self?.require: (String path) -> bool
 
       # @rbs return: Array[String]
       def self.loaded_features: () -> Array[String]
@@ -27,4 +28,6 @@ module RubyModKit
       def self.require_path: (String path, ?expanded: bool) -> (String | nil)
     end
   end
+
+  include CoreExt::Load
 end

data/sig/generated/ruby_mod_kit/corrector.rbs

@@ -0,0 +1,14 @@
+# Generated from lib/ruby_mod_kit/corrector.rb with RBS::Inline
+
+module RubyModKit
+  # the base class of corrector
+  class Corrector
+    # @rbs return: Array[Symbol]
+    def correctable_error_types: () -> Array[Symbol]
+
+    # @rbs _parse_error: Prism::ParseError
+    # @rbs _generation: Generation
+    # @rbs return: void
+    def correct: (untyped _parse_error, untyped _generation) -> void
+  end
+end

data/sig/generated/ruby_mod_kit/corrector_manager.rbs

@@ -0,0 +1,22 @@
+# Generated from lib/ruby_mod_kit/corrector_manager.rb with RBS::Inline
+
+module RubyModKit
+  # the class to manege parse error correctors
+  class CorrectorManager
+    @previous_error_messages: Array[String]
+
+    @correctors_error_map: Hash[Symbol, Array[Corrector]]
+
+    # @rbs features: Array[Feature]
+    # @rbs return: void
+    def initialize: (Array[Feature] features) -> void
+
+    # @rbs generation: Generation
+    # @rbs return: bool
+    def perform: (Generation generation) -> bool
+
+    # @rbs generation: Generation
+    # @rbs return: void
+    def check_prev_errors: (Generation generation) -> void
+  end
+end

data/sig/generated/ruby_mod_kit/feature/instance_variable_parameter/instance_variable_parameter_corrector.rbs

@@ -0,0 +1,18 @@
+# Generated from lib/ruby_mod_kit/feature/instance_variable_parameter/instance_variable_parameter_corrector.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class InstanceVariableParameter
+      # the class to correct `def foo(@bar) ...` -> `def foo(bar) ...`
+      class InstanceVariableParameterCorrector < Corrector
+        # @rbs return: Array[Symbol]
+        def correctable_error_types: () -> Array[Symbol]
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs return: void
+        def correct: (Prism::ParseError parse_error, Generation generation) -> void
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/instance_variable_parameter/instance_variable_parameter_mission.rbs

@@ -0,0 +1,14 @@
+# Generated from lib/ruby_mod_kit/feature/instance_variable_parameter/instance_variable_parameter_mission.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class InstanceVariableParameter
+      # The mission for instance variable arguments
+      class InstanceVariableParameterMission < Mission
+        # @rbs generation: Generation
+        # @rbs return: bool
+        def perform: (Generation generation) -> bool
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/instance_variable_parameter.rbs

@@ -0,0 +1,14 @@
+# Generated from lib/ruby_mod_kit/feature/instance_variable_parameter.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    # namespace for instance_variable parameter feature
+    class InstanceVariableParameter < Feature
+      # @rbs return: Array[Corrector]
+      def create_correctors: () -> Array[Corrector]
+
+      # @rbs return: Array[Mission]
+      def create_missions: () -> Array[Mission]
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/overload/overload_mission.rbs

@@ -0,0 +1,21 @@
+# Generated from lib/ruby_mod_kit/feature/overload/overload_mission.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Overload
+      # The mission for overload
+      class OverloadMission < Mission
+        @modified: bool
+
+        OVERLOAD_METHOD_MAP: Hash[Symbol, String]
+
+        # @rbs return: void
+        def initialize: () -> void
+
+        # @rbs generation: Generation
+        # @rbs return: bool
+        def perform: (Generation generation) -> bool
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/overload.rbs

@@ -0,0 +1,11 @@
+# Generated from lib/ruby_mod_kit/feature/overload.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    # namespace for overload feature
+    class Overload < Feature
+      # @rbs return: Array[Mission]
+      def create_missions: () -> Array[Mission]
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/instance_variable_colon_corrector.rbs

@@ -0,0 +1,24 @@
+# Generated from lib/ruby_mod_kit/feature/type/instance_variable_colon_corrector.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      # the class to correct `@var: Type` -> `# @rbs @var: Type`
+      class InstanceVariableColonCorrector < Corrector
+        VISIBILITIES: Array[Symbol]
+
+        ATTR_PATTERNS: Array[Symbol]
+
+        REGEXP: Regexp
+
+        # @rbs return: Array[Symbol]
+        def correctable_error_types: () -> Array[Symbol]
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs return: void
+        def correct: (Prism::ParseError parse_error, Generation generation) -> void
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/parameter_arrow_corrector.rbs

@@ -0,0 +1,33 @@
+# Generated from lib/ruby_mod_kit/feature/type/parameter_arrow_corrector.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      # the class to correct `def foo(Bar => bar, *Buz => buz)` -> `def foo(bar, *buz)`
+      class ParameterArrowCorrector < Corrector
+        # @rbs return: Array[Symbol]
+        def correctable_error_types: () -> Array[Symbol]
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs return: void
+        def correct: (Prism::ParseError parse_error, Generation generation) -> void
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs return: void
+        def remove_arrow_before_parameter: (Prism::ParseError parse_error, Generation generation) -> void
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs return: void
+        def remove_arrow_after_quailifier: (Prism::ParseError parse_error, Generation generation) -> void
+
+        # @rbs parse_error: Prism::ParseError
+        # @rbs generation: Generation
+        # @rbs return: void
+        def wrap_parameter_type_for_next_parse: (Prism::ParseError parse_error, Generation generation) -> void
+      end
+    end
+  end
+end