orthoses 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2fbbb509545bf6efd770838fff4ac02168f0352f0f2e2561ed927eb3479a4bb
-  data.tar.gz: 259b1cf53cc3b2ea17ec3d6088260131ccd9d8562ec002b0d515cb817b96d228
+  metadata.gz: db149183688863139dfc513f92a150464497d1df409c495377817b4d3671db00
+  data.tar.gz: a02eb903127a7f6daf17750b9263ffee63a880b381ccfc47e76aa82e52252af3
 SHA512:
-  metadata.gz: 50aceef69e828e6fbd90cbb23813bd66676b399d4a5551728eebf9ae8c24544aeda11c7d57810826575c53b215da541d232eb5a8ecb26fb9cf2d5a99822c7a91
-  data.tar.gz: 36972f90ecdf75efa516c2fb576ea616f2b949a5930463f01ff9046335ae6571d7e98f9c33593bee21397cd29754da4abdfea038c956eaaa74d92deded56ba71
+  metadata.gz: 0ada92bd790f9ff1fd4b4e1293c1d4dad77c08c3c2e39f4513655ce910db7239e2a9e34373395e5abb4025d341c3596ef48b5dd46c05312cf6e2e8ec92152558
+  data.tar.gz: cb126e961ab83cc8ce683aa852279bac3a8cd166d73cd9f28f9e13cb482f8949d4b2f48928d617c2e4804b558160aea2feb6b91e66d91bfc0de86822869ba030

data/Gemfile.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: .
+  specs:
+    orthoses (0.5.0)
+      rbs (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    concurrent-ruby (1.1.10)
+    ffi (1.15.5)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    language_server-protocol (3.16.0.3)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    minitest (5.15.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rbs (2.5.0)
+    rgot (1.1.0)
+    steep (1.0.0)
+      activesupport (>= 5.1)
+      language_server-protocol (>= 3.15, < 4.0)
+      listen (~> 3.0)
+      parallel (>= 1.0.0)
+      parser (>= 3.0)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (>= 2.3.2)
+      terminal-table (>= 2, < 4)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  orthoses!
+  rake (~> 13.0)
+  rgot (~> 1.1)
+  steep
+
+BUNDLED WITH
+   2.3.9

data/README.md

@@ -103,6 +103,22 @@ class Tempfile < File
 end
 ```
 
+### Orthoses::Writer
+
+Write output RBS to `io` option object.
+`io` should be able to call `#write` method.
+This is useful when you want to combine outputs into a single output.
+
+### Orthoses::RBSPrototypeRB
+
+Run `rbs prototype rb` command process to `paths` option files.
+`content_filter` option could filter with content decl.
+`mixin_filter` option could filter with mixin(include, extend, prepend) decl.
+
+### Orthoses::AvoidRecursiveAncestorError
+
+Mixin a module into an Object class raises `RBS::RecursiveAncestorError` when validation.
+Please add this middleware then.
 
 ## Development
 

data/examples/minitest/Rakefile

@@ -0,0 +1,56 @@
+file :src do
+  sh "git clone https://github.com/minitest/minitest.git src"
+end
+
+desc "generate minitest"
+task :minitest => :src do
+  $:.unshift(File.expand_path("src/lib"))
+
+  out = Pathname('out')
+  out.rmtree rescue nil
+  require 'orthoses'
+
+  Orthoses::Builder.new do
+    use Orthoses::CreateFileByName,
+      base_dir: out.to_s
+    use Orthoses::Filter, if: ->(name, content) {
+      name.start_with?("Minitest") || name == "Kernel"
+    }
+    use Orthoses::Constant,
+      strict: false,
+      if: ->(current, const, val, rbs){
+        !Orthoses::Utils.rbs_defined_const?("#{current}::#{const}")
+      }
+    use Orthoses::Mixin
+    use Orthoses::Attribute
+    use Orthoses::RBSPrototypeRB,
+      paths: Dir.glob('src/lib/minitest{.rb,/*.rb}'),
+      constant_filter: ->(_) { false },
+      mixin_filter: ->(_) { false },
+      attribute_filter: ->(_) { false }
+    run ->(){
+      require_relative 'src/lib/minitest'
+      require_relative 'src/lib/minitest/test'
+      require_relative 'src/lib/minitest/spec'
+      require_relative 'src/lib/minitest/parallel'
+      require_relative 'src/lib/minitest/mock'
+      require_relative 'src/lib/minitest/benchmark'
+
+      require_relative 'src/lib/minitest/pride_plugin'
+    }
+  end.call
+
+  sh "rbs -r mutex_m -I #{out} validate --silent"
+  out.join("manifest.yaml").write <<~YAML
+    dependencies:
+      - name: mutex_m
+  YAML
+  tmp = out.join("kernel.rbs").read
+  out.join("kernel.rbs").open("w") do |f|
+    f.puts "%a{annotate:rdoc:skip}"
+    f.write tmp
+  end
+  sh "rbs annotate --gems out"
+end
+
+task default: :minitest

data/examples/simple_middleware.rb

@@ -0,0 +1,11 @@
+module Orthoses
+  class Simple
+    def initialize(loader)
+      @loader = loader
+    end
+
+    def call
+      @loader.call
+    end
+  end
+end

data/examples/simple_middleware.rbs

@@ -0,0 +1,7 @@
+module Orthoses
+  class Simple
+    @loader: Orthoses::_Call
+    include Orthoses::_MiddleWare
+    def initialize: (Orthoses::_Call loader) -> void
+  end
+end

data/lib/orthoses/attribute.rb

@@ -0,0 +1,98 @@
+module Orthoses
+  class Attribute
+    module Hook
+      def attr(*names)
+        super
+      end
+
+      def attr_accessor(*names)
+        super
+      end
+
+      def attr_reader(*names)
+        super
+      end
+
+      def attr_writer(*names)
+        super
+      end
+    end
+
+    def initialize(loader)
+      @loader = loader
+    end
+
+    def call
+      Module.prepend(Hook)
+
+      attr = CallTracer.new
+      attr_accessor = CallTracer.new
+      attr_reader = CallTracer.new
+      attr_writer = CallTracer.new
+
+      store = attr.trace(Hook.method(:attr)) do
+        attr_accessor.trace(Hook.method(:attr_accessor)) do
+          attr_reader.trace(Hook.method(:attr_reader)) do
+            attr_writer.trace(Hook.method(:attr_writer)) do
+              @loader.call
+            end
+          end
+        end
+      end
+
+      store["Module"].body.delete("prepend Orthoses::Attribute::Hook")
+
+      attr.result.each do |method, argument|
+        m = method.receiver.to_s.match(/#<Class:([\w:]+)>/)
+        if m && m[1]
+          receiver_name = m[1]
+          prefix = "self."
+        else
+          receiver_name = Utils.module_name(method.receiver) or next
+          prefix = nil
+        end
+        content = store[receiver_name]
+        if argument[:names][1].equal?(true)
+          content << "attr_accessor #{prefix}#{argument[:names][0]}: untyped"
+        elsif argument[:names][1].equal?(false)
+          content << "attr_reader #{prefix}#{argument[:names][0]}: untyped"
+        else
+          argument[:names].each do |name|
+            content << "attr_reader #{prefix}#{name}: untyped"
+          end
+        end
+      end
+
+      each_definition(attr_accessor) do |receiver_name, name|
+        store[receiver_name] << "attr_accessor #{name}: untyped"
+      end
+      each_definition(attr_reader) do |receiver_name, name|
+        store[receiver_name] << "attr_reader #{name}: untyped"
+      end
+      each_definition(attr_writer) do |receiver_name, name|
+        store[receiver_name] << "attr_writer #{name}: untyped"
+      end
+
+      store
+    end
+
+    private
+
+    def each_definition(call_tracer)
+      call_tracer.result.each do |method, argument|
+        m = method.receiver.to_s.match(/#<Class:([\w:]+)>/)
+        if m && m[1]
+          receiver_name = m[1]
+          argument[:names].each do |name|
+            yield [receiver_name, "self.#{name}"]
+          end
+        else
+          receiver_name = Utils.module_name(method.receiver) or next
+          argument[:names].each do |name|
+            yield [receiver_name, name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/orthoses/avoid_recursive_ancestor_error.rb

@@ -0,0 +1,22 @@
+module Orthoses
+  class AvoidRecursiveAncestorError
+    def initialize(loader)
+      @loader = loader
+    end
+
+    def call
+      @loader.call.tap do |store|
+        object_mixins = {}
+        store["Object"].to_decl.members.each do |member|
+          case member
+          when RBS::AST::Members::Mixin
+            object_mixins[member.name.relative!.to_s] = true
+          end
+        end
+        object_mixins.each_key do |object_mixin|
+          store[object_mixin].header = "module #{object_mixin} : BasicObject"
+        end
+      end
+    end
+  end
+end

data/lib/orthoses/builder.rb

@@ -27,6 +27,7 @@ module Orthoses
     end
 
     def use(middleware, *args, **key, &block)
+      Orthoses.logger.debug("use #{middleware}")
       @use << proc do |loader|
         middleware.new(loader, *args, **key, &block).tap do |m|
           m.extend CallLogable

data/lib/orthoses/call_tracer.rb

@@ -20,7 +20,7 @@ module Orthoses
     end
 
     def trace(target, &block)
-      TracePoint.new(:call) do |tp|
+      t = TracePoint.new(:call) do |tp|
         called_method = tp.self.method(tp.method_id)
         argument = tp.parameters.each_with_object({}) do |op_name, hash|
           name = op_name[1]
@@ -47,7 +47,8 @@ module Orthoses
           end
         end
         @result << [called_method, argument]
-      end.enable(target: target, &block)
+      end
+      t.enable(target: target, &block)
     end
   end
 end

data/lib/orthoses/content/duplication_checker.rb

@@ -4,24 +4,35 @@ module Orthoses
     class DuplicationChecker
       def initialize(decl)
         @decl = decl
-        @uniq_map = {}
       end
 
-      def <<(member)
-        key = member_key(member)
-        if @uniq_map.key?(key)
-          Orthoses.logger.warn("#{@decl.name}::#{member_to_s(member)} was droped since duplication")
-        else
-          @uniq_map[key] = member
+      def update_decl
+        uniq_map = {}
+        @decl.members.each do |member|
+          key = member_key(member)
+          drop_member = uniq_map[key]
+          uniq_map[key] = member
+          if drop_member
+            Orthoses.logger.warn("#{@decl.name}::#{drop_member} was droped since duplication")
+          end
         end
-      end
-
-      def uniq_members
-        @uniq_map.values
+        drop_known_method_definition(uniq_map)
+        @decl.members.replace(uniq_map.values)
       end
 
       private
 
+      def drop_known_method_definition(uniq_map)
+        env = Utils.rbs_environment(collection: true)
+        if m_entry = env.class_decls[@decl.name.absolute!]
+          m_entry.decls.each do |d|
+            d.decl.members.grep_v(RBS::AST::Members::LocationOnly).each do |member|
+              uniq_map.delete(member_key(member))
+            end
+          end
+        end
+      end
+
       def member_to_s(member)
         out = StringIO.new
         RBS::Writer.new(out: out).write_member(member)
@@ -36,7 +47,14 @@ module Orthoses
         when RBS::AST::Members::LocationOnly
           [member.class]
         when RBS::AST::Members::Alias
-          [member.class, member.new_name, member.old_name, member.kind]
+          [RBS::AST::Members::MethodDefinition, member.new_name, member.kind]
+        when RBS::AST::Members::AttrAccessor
+          # FIXME: how to check "#{member.name}=" ?
+          [RBS::AST::Members::MethodDefinition, member.name, member.kind]
+        when RBS::AST::Members::AttrReader
+          [RBS::AST::Members::MethodDefinition, member.name, member.kind]
+        when RBS::AST::Members::AttrWriter
+          [RBS::AST::Members::MethodDefinition, "#{member.name}=", member.kind]
         else
           [member.class, member.name]
         end

data/lib/orthoses/content/environment.rb

@@ -0,0 +1,106 @@
+module Orthoses
+  class Content
+    class Environment
+      class << self
+        def load_from_paths(paths)
+          new.tap do |env|
+            paths.each do |path|
+              Orthoses.logger.debug("Load #{path}")
+              buffer = RBS::Buffer.new(name: path.to_s, content: File.read(path.to_s, encoding: "UTF-8"))
+              RBS::Parser.parse_signature(buffer).each do |decl|
+                env << decl
+              end
+            end
+          end
+        end
+      end
+
+      def initialize(constant_filter: nil, mixin_filter: nil, attribute_filter: nil)
+        @load_env = RBS::Environment.new
+        @known_env = Utils.rbs_environment(collection: true, cache: false)
+        @constant_filter = constant_filter
+        @mixin_filter = mixin_filter
+        @attribute_filter = attribute_filter
+      end
+
+      def <<(decl)
+        @load_env << decl
+        @known_env << decl
+      rescue RBS::DuplicatedDeclarationError => err
+        Orthoses.logger.warn(err.inspect)
+      end
+
+      def write_to(store:)
+        each do |add_content|
+          content = store[add_content.name]
+          content.header = add_content.header
+          content.concat(add_content.body)
+        end
+      end
+
+      def each
+        avoid_generic_parameter_mismatch_error
+
+        header_builder = HeaderBuilder.new(env: @known_env)
+
+        @load_env.class_decls.each do |type_name, m_entry|
+          name = type_name.relative!.to_s
+          content = Content.new(name: name)
+          content.header = header_builder.build(entry: m_entry, name_hint: name)
+          decls_to_lines(m_entry.decls.map(&:decl)).each do |line|
+            content << line
+          end
+          yield content
+        end
+
+        @load_env.interface_decls.each do |type_name, s_entry|
+          name = type_name.relative!.to_s
+          content = Content.new(name: name)
+          content.header = header_builder.build(entry: s_entry)
+          decls_to_lines([s_entry.decl]).each do |line|
+            content << line
+          end
+          yield content
+        end
+      end
+
+      private
+
+      # Avoid `RBS::GenericParameterMismatchError` from like rbs_prototype_rb
+      #     class Array # <= RBS::GenericParameterMismatchError
+      #     end
+      def avoid_generic_parameter_mismatch_error
+        @known_env.class_decls.each do |type_name, m_entry|
+          tmp_primary_d = m_entry.decls.find { |d| !d.decl.type_params.empty? }
+          next unless tmp_primary_d
+          m_entry.decls.each do |d|
+            if d.decl.type_params.empty?
+              d.decl.type_params.replace(tmp_primary_d.decl.type_params)
+            end
+          end
+        end
+      end
+
+      def decls_to_lines(decls)
+        out = StringIO.new
+        writer = RBS::Writer.new(out: out)
+        decls.each do |decl|
+          next unless decl.respond_to?(:members)
+          decl.members.each do |member|
+            next if member.respond_to?(:members)
+            case member
+            when RBS::AST::Declarations::Constant
+              next unless @constant_filter.nil? || @constant_filter.call(member)
+            when RBS::AST::Members::Mixin
+              next unless @mixin_filter.nil? || @mixin_filter.call(member)
+            when RBS::AST::Members::Attribute
+              next unless @attribute_filter.nil? || @attribute_filter.call(member)
+            end
+            writer.write_member(member)
+          end
+        end
+        out.string.each_line(chomp: true).to_a
+      end
+    end
+  end
+end

data/lib/orthoses/content/header_builder.rb

@@ -0,0 +1,94 @@
+module Orthoses
+  class Content
+    class HeaderBuilder
+      def initialize(env:)
+        @env = env
+        @resolver = RBS::TypeNameResolver.from_env(env)
+      end
+
+      def build(entry:, name_hint: nil)
+        case entry
+        when RBS::Environment::ModuleEntry
+          build_module(entry: entry, name_hint: name_hint)
+        when RBS::Environment::ClassEntry
+          build_class(entry: entry, name_hint: name_hint)
+        when RBS::Environment::SingleEntry
+          build_interface(entry: entry, name_hint: name_hint)
+        else
+          raise
+        end
+      end
+
+      private
+
+      def build_module(entry:, name_hint: nil)
+        primary = entry.primary
+        full_name = name_hint || primary.decl.name.relative!
+
+        self_types =
+          if primary.decl.self_types.empty?
+            nil
+          else
+            " : #{primary.decl.self_types.join(', ')}"
+          end
+
+        "module #{name_and_params(full_name, primary.decl.type_params)}#{self_types}"
+      end
+
+      def build_class(entry:, name_hint: nil)
+        primary = entry.primary
+        full_name = name_hint || primary.decl.name.relative!
+
+        "class #{name_and_params(full_name, primary.decl.type_params)}#{build_super_class(primary)}"
+      end
+
+      def build_super_class(primary)
+        return nil if primary.decl.super_class.then { |s| s.nil? || s.name.relative!.to_s.then { |n| n == "Object" || n == "Random::Base" } }
+
+        context = primary.outer.length.times.map do |i|
+          primary.outer[0, i + 1].map(&:name).inject(:+).to_namespace.absolute!
+        end
+        context.push(RBS::Namespace.root)
+
+        super_class_name = @resolver.resolve(primary.decl.super_class.name, context: context) || primary.decl.super_class.name
+        if primary.decl.super_class.args.empty?
+          if super_class_entry = @env.class_decls[super_class_name]
+            super_primary = super_class_entry.primary
+            " < #{name_and_args(super_class_name, super_primary.decl.type_params.map { :untyped })}"
+          else
+            " < #{name_and_args(super_class_name, [])}"
+          end
+        else
+          " < #{name_and_args(super_class_name, primary.decl.super_class.args)}"
+        end
+      end
+
+      def build_interface(entry:, name_hint: nil)
+        full_name = name_hint || entry.decl.name.relative!
+        "interface #{name_and_params(full_name, entry.decl.type_params)}"
+      end
+
+      def name_and_params(name, params)
+        if params.empty?
+          "#{name}"
+        else
+          ps = params.each.map do |param|
+            param.to_s
+          end
+
+          "#{name}[#{ps.join(", ")}]"
+        end
+      end
+
+      def name_and_args(name, args)
+        if name && args
+          if args.empty?
+            "#{name}"
+          else
+            "#{name}[#{args.join(", ")}]"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/orthoses/content.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'orthoses/content/duplication_checker'
+require 'orthoses/content/environment'
+require 'orthoses/content/header_builder'
 
 module Orthoses
   # Common interface for output.
@@ -19,31 +21,79 @@ module Orthoses
     attr_accessor :header
 
     def initialize(name:)
+      Orthoses.logger.debug("Create Orthoses::Content for #{name}")
       @name = name
       @body = []
       @header = nil
     end
 
     def <<(line)
-      Orthoses.logger.debug("[#{name}] << #{line} on #{__FILE__}:#{__LINE__}")
       @body << line
     end
 
     def concat(other)
-      Orthoses.logger.debug("[#{name}] concat #{other} on #{__FILE__}:#{__LINE__}")
       @body.concat(other)
     end
 
     def to_rbs
-      if @header.nil?
-        auto_header
-      end
-      body_uniq("#{@header}\n#{@body.map { |b| "  #{b}\n" }.join}end\n")
+      auto_header
+      uniqed_body_string
+    end
+
+    def to_decl
+      auto_header
+      uniqed_body_decl
     end
 
     private
 
+    def original_rbs
+      <<~RBS
+        #{@header}
+          #{@body.join("\n")}
+        end
+      RBS
+    end
+
+    def uniqed_body_string
+      out = StringIO.new
+      writer = RBS::Writer.new(out: out)
+      writer.write_decl(uniqed_body_decl)
+      out.string
+    end
+
+    def uniqed_body_decl
+      buffer = RBS::Buffer.new(
+        name: "orthoses/content.rb",
+        content: original_rbs
+      )
+      parsed_decls = RBS::Parser.parse_signature(buffer)
+      unless parsed_decls.length == 1
+        raise "expect decls.length == 1, but got #{parsed_decls.length}"
+      end
+      parsed_decl = parsed_decls.first or raise
+      parsed_decl.tap do |decl|
+        DuplicationChecker.new(decl).update_decl
+      end
+    rescue RBS::ParsingError
+      Orthoses.logger.error "```rbs\n#{original_rbs}```"
+      raise
+    end
+
     def auto_header
+      if name.split('::').last.start_with?('_')
+        self.header = "interface #{name}"
+        return
+      end
+
+      env = Utils.rbs_environment(collection: true)
+      if entry = env.class_decls[TypeName(name).absolute!]
+        @header = Content::HeaderBuilder.new(env: env).build(entry: entry)
+        return
+      end
+
+      return unless @header.nil?
+
       val = Object.const_get(name)
 
       case val
@@ -87,28 +137,5 @@ module Orthoses
         end
       end
     end
-
-    def body_uniq(rbs)
-      buffer = RBS::Buffer.new(
-        name: "orthoses/content.rb",
-        content: rbs
-      )
-      out = StringIO.new
-      writer = RBS::Writer.new(out: out)
-      decls = RBS::Parser.parse_signature(buffer).map do |parsed_decl|
-        parsed_decl.tap do |decl|
-          duplicate_checker = DuplicationChecker.new(decl)
-          decl.members.each do |member|
-            duplicate_checker << member
-          end
-          decl.members.replace(duplicate_checker.uniq_members)
-        end
-      end
-      writer.write(decls)
-      out.string
-    rescue RBS::ParsingError
-      Orthoses.logger.error "```rbs\n#{rbs}```"
-      raise
-    end
   end
 end

data/lib/orthoses/create_file_by_name.rb

@@ -28,6 +28,12 @@ module Orthoses
       store = @loader.call
 
       store.each do |name, content|
+        rbs = begin
+          content.to_rbs
+        rescue NameError, LoadError => err
+          Orthoses.logger.error(err.inspect)
+          next
+        end
         file_path = Pathname("#{@base_dir}/#{name.to_s.split('::').map(&:underscore).join('/')}.rbs")
         file_path.dirname.mkpath
         file_path.open('w+') do |out|
@@ -35,7 +41,7 @@ module Orthoses
             out.puts @header
             out.puts
           end
-          out.puts content.to_rbs
+          out.puts rbs
         end
         Orthoses.logger.info("Generate file to #{file_path.to_s}")
       end

data/lib/orthoses/delegate_class.rb

@@ -29,7 +29,6 @@ module Orthoses
           next unless subclass_name
           delegate_to_class_name = Utils.module_name(delegate_to_class)
           next unless delegate_to_class_name
-          next unless store[subclass_name].header.nil?
 
           header = "class #{subclass_name} < ::#{delegate_to_class_name}#{temporary_type_params(delegate_to_class_name)}"
           store[subclass_name].header = header

data/lib/orthoses/load_rbs.rb

@@ -11,79 +11,9 @@ module Orthoses
 
     def call
       @loader.call.tap do |store|
-        tmp_env = RBS::Environment.new
-
-        @paths.each do |path|
-          Orthoses.logger.debug("Load #{path}")
-          buffer = RBS::Buffer.new(name: path.to_s, content: File.read(path.to_s, encoding: "UTF-8"))
-          decls = RBS::Parser.parse_signature(buffer)
-          decls.each { |decl| tmp_env << decl }
-        end
-
-        tmp_env.class_decls.each do |type_name, m_entry|
-          name = type_name.relative!.to_s
-          content = store[name]
-          case decl = m_entry.decls.first.decl
-          when RBS::AST::Declarations::Module
-            self_types = decl.self_types.empty? ? nil : " : #{decl.self_types.join(', ')}"
-            content.header = "module #{name_and_params(name, decl.type_params)}#{self_types}"
-          when RBS::AST::Declarations::Class
-            super_class = decl.super_class.nil? ? nil : " < #{name_and_args(decl.super_class.name, decl.super_class.args)}"
-            content.header = "class #{name_and_params(name, decl.type_params)}#{super_class}"
-          end
-          decls_to_lines(m_entry.decls.map(&:decl)).each do |line|
-            content << line
-          end
-        end
-
-        tmp_env.interface_decls.each do |type_name, s_entry|
-          name = type_name.relative!.to_s
-          content = store[name]
-          decl = s_entry.decl
-          content.header = "interface #{name_and_params(name, decl.type_params)}"
-          decls_to_lines([decl]).each do |line|
-            content << line
-          end
-        end
-      end
-    end
-
-    private
-
-    def name_and_params(name, params)
-      if params.empty?
-        "#{name}"
-      else
-        ps = params.each.map do |param|
-          param.to_s
-        end
-
-        "#{name}[#{ps.join(", ")}]"
-      end
-    end
-
-    def name_and_args(name, args)
-      if name && args
-        if args.empty?
-          "#{name}"
-        else
-          "#{name}[#{args.join(", ")}]"
-        end
-      end
-    end
-
-    def decls_to_lines(decls)
-      out = StringIO.new
-      writer = RBS::Writer.new(out: out)
-      decls.each do |decl|
-        if decl.respond_to?(:members)
-          decl.members.each do |member|
-            next if member.respond_to?(:members)
-            writer.write_member(member)
-          end
-        end
+        env = Content::Environment.load_from_paths(@paths)
+        env.write_to(store: store)
       end
-      out.string.each_line(chomp: true).to_a
     end
   end
 end

data/lib/orthoses/mixin.rb

@@ -37,15 +37,7 @@ module Orthoses
           next unless known_type_params.nil? || known_type_params.empty?
           next unless @if.nil? || @if.call(base_mod, how, mod)
 
-          if base_mod_name == "Object"
-            # avoid RecursiveAncestorError
-            content = store[mod_name]
-            if content.header.nil?
-              content.header = "module #{Utils.module_to_type_name(mod)} : ::BasicObject"
-            end
-          else
-            store[mod_name]
-          end
+          store[mod_name]
 
           "#{how} #{mod_name}"
         end

data/lib/orthoses/rbs_prototype_rb.rb

@@ -0,0 +1,37 @@
+module Orthoses
+  # Call `rbs prototype rb` and add to store
+  #     use Orthoses::RBSPrototypeRB,
+  #       paths: Dir.glob("lib/**/*.rb")
+  class RBSPrototypeRB
+    def initialize(loader, paths:, constant_filter: nil, mixin_filter: nil, attribute_filter: nil)
+      @loader = loader
+      @paths = paths
+      @constant_filter = constant_filter
+      @mixin_filter = mixin_filter
+      @attribute_filter = attribute_filter
+    end
+
+    def call
+      @loader.call.tap do |store|
+        parser = RBS::Prototype::RB.new
+        @paths.each do |path|
+          begin
+            Orthoses.logger.debug("parse #{path} by RBS::Prototype::RB")
+            parser.parse File.read(path.to_s)
+          rescue => err
+            Orthoses.logger.error("Parse error #{err.inspect} by RBS::Prototype::RB #{path}")
+          end
+        end
+        env = Orthoses::Content::Environment.new(
+          constant_filter: @constant_filter,
+          mixin_filter: @mixin_filter,
+          attribute_filter: @attribute_filter,
+        )
+        parser.decls.each do |decl|
+          env << decl
+        end
+        env.write_to(store: store)
+      end
+    end
+  end
+end

data/lib/orthoses/utils.rb

@@ -46,9 +46,9 @@ module Orthoses
       RBS::Namespace.parse(name).to_type_name
     end
 
-    def self.rbs_environment(library: nil, collection: false)
+    def self.rbs_environment(library: nil, collection: false, cache: true)
       @env_cache ||= {}
-      if hit = @env_cache[[library, collection]]
+      if cache && hit = @env_cache[[library, collection]]
         return hit
       end
 
@@ -63,16 +63,17 @@ module Orthoses
       when "stdlib"
         RBS::Repository::DEFAULT_STDLIB_ROOT.each_entry do |path|
           lib = path.to_s
-          loader.add(library: lib.to_s) unless lib == "." || lib == ".."
+          loader.add(library: lib.to_s, version: nil) unless lib == "." || lib == ".."
         end
       else
         Array(library).each do |lib|
-          loader.add(library: lib.to_s)
+          loader.add(library: lib.to_s, version: nil)
         end
       end
 
-      environment = RBS::Environment.from_loader(loader).resolve_type_names
-      @env_cache[[library, collection]] = environment
+      RBS::Environment.from_loader(loader).resolve_type_names.tap do |env|
+        @env_cache[[library, collection]] = env if cache
+      end
     end
 
     def self.object_to_rbs(object, strict:)
@@ -117,10 +118,16 @@ module Orthoses
             "{ #{object.map { |k, v| "#{k}: #{object_to_rbs(v, strict: strict)}" }.join(', ')} }"
           else
             keys = object.keys.map { |k| object_to_rbs(k, strict: strict) }.uniq
-            values = object.values.map { |k| object_to_rbs(k, strict: strict) }.uniq
+            values = object.values.map { |v| object_to_rbs(v, strict: strict) }.uniq
             "Hash[#{keys.join(' | ')}, #{values.join(' | ')}]"
           end
         end
+      when Range
+        type = object_to_rbs(object.begin || object.end, strict: false)
+        "Range[#{type}]"
+      when ARGF
+        # see also https://github.com/ruby/rbs/pull/975
+        'untyped'
       else
         Utils.module_name(object.class) || 'untyped'
       end

data/lib/orthoses/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orthoses
-  VERSION = "0.2.0"
+  VERSION = "0.5.0"
 end

data/lib/orthoses/writer.rb

@@ -0,0 +1,16 @@
+module Orthoses
+  class Writer
+    def initialize(loader, io:)
+      @loader = loader
+      @io = io
+    end
+
+    def call
+      @loader.call.tap do |store|
+        store.each do |name, content|
+          @io.write content.to_rbs
+        end
+      end
+    end
+  end
+end

data/lib/orthoses.rb

@@ -3,6 +3,8 @@
 require 'rbs'
 require 'pathname'
 
+require_relative 'orthoses/attribute'
+require_relative 'orthoses/avoid_recursive_ancestor_error'
 require_relative 'orthoses/builder'
 require_relative 'orthoses/call_tracer'
 require_relative 'orthoses/constant'
@@ -14,11 +16,13 @@ require_relative 'orthoses/mixin'
 require_relative 'orthoses/load_rbs'
 require_relative 'orthoses/object_space_all'
 require_relative 'orthoses/pp'
+require_relative 'orthoses/rbs_prototype_rb'
 require_relative 'orthoses/store'
 require_relative 'orthoses/tap'
 require_relative 'orthoses/utils'
 require_relative 'orthoses/version'
 require_relative 'orthoses/walk'
+require_relative 'orthoses/writer'
 
 module Orthoses
   class ConstLoadError < StandardError

data/sig/orthoses/attribute/hook.rbs

@@ -0,0 +1,4 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+module Orthoses::Attribute::Hook
+end

data/sig/orthoses/attribute.rbs

@@ -0,0 +1,4 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::Attribute
+end

data/sig/orthoses/avoid_recursive_ancestor_error.rbs

@@ -0,0 +1,7 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::AvoidRecursiveAncestorError
+  @loader: Orthoses::_Call
+  include Orthoses::_MiddleWare
+  def initialize: (Orthoses::_Call loader) -> void
+end

data/sig/orthoses/call_tracer.rbs

@@ -2,4 +2,5 @@
 
 class Orthoses::CallTracer
   attr_accessor result: Array[[ Method, Hash[Symbol, untyped] ]]
+  def trace: [T] (Method | UnboundMethod) ?{ () -> T } -> T
 end

data/sig/orthoses/const_load_error.rbs

@@ -1,6 +1,6 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
-class Orthoses::ConstLoadError < StandardError
+class Orthoses::ConstLoadError < ::StandardError
   attr_reader root: Module
   attr_reader const: Symbol
   attr_reader error: untyped

data/sig/orthoses/content/environment.rbs

@@ -0,0 +1,13 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::Content::Environment
+  type constant_filter = ^(RBS::AST::Declarations::Constant) -> boolish
+  type mixin_filter = ^(RBS::AST::Members::Mixin) -> boolish
+  @env: RBS::Environment
+  @constant_filter: constant_filter?
+  @mixin_filter: mixin_filter?
+  def initialize: (?constant_filter: constant_filter?, ?mixin_filter: mixin_filter?) -> void
+  def <<: (RBS::AST::Declarations::t decl) -> RBS::Environment
+  def write_to: (store: Orthoses::store) -> void
+  def each: () { (Orthoses::Content) -> void } -> void
+end

data/sig/orthoses/content/header_builder.rbs

@@ -0,0 +1,4 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::Content::HeaderBuilder
+end

data/sig/orthoses/content.rbs

@@ -8,4 +8,7 @@ class Orthoses::Content
   def <<: (String) -> void
   def concat: (Array[String]) -> void
   def to_rbs: () -> String
+  private
+  def uniqed_body_string: () -> String
+  def uniqed_body_decl: () -> RBS::AST::Declarations::t
 end

data/sig/orthoses/delegate_class.rbs

@@ -1,4 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::DelegateClass
+  @loader: Orthoses::_Call
+  include Orthoses::_MiddleWare
+  def initialize: (Orthoses::_Call loader) -> void
 end

data/sig/orthoses/load_rbs.rbs

@@ -1,4 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::LoadRBS
+  @loader: Orthoses::_Call
+  @paths: Array[_ToS]
+  include Orthoses::_MiddleWare
+  def initialize: (Orthoses::_Call loader, paths: Array[_ToS]) -> void
 end

data/sig/orthoses/name_space_error.rbs

@@ -1,4 +1,4 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
-class Orthoses::NameSpaceError < StandardError
+class Orthoses::NameSpaceError < ::StandardError
 end

data/sig/orthoses/object_space_all.rbs

@@ -1,4 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::ObjectSpaceAll
+  @loader: Orthoses::_Call
+  include Orthoses::_MiddleWare
+  def initialize: (Orthoses::_Call loader, ?if: ^(Module) -> boolish) -> void
 end

data/sig/orthoses/rbs_prototype_rb.rbs

@@ -0,0 +1,10 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::RBSPrototypeRB
+  @loader: Orthoses::_Call
+  include Orthoses::_MiddleWare
+  def initialize: (Orthoses::_Call loader, paths: Array[_ToS], ?constant_filter: Orthoses::Content::Environment::constant_filter?, ?mixin_filter: Orthoses::Content::Environment::mixin_filter?) -> void
+  @paths: Array[_ToS]
+  @constant_filter: Orthoses::Content::Environment::constant_filter?
+  @mixin_filter: Orthoses::Content::Environment::mixin_filter?
+end

data/sig/orthoses/tap.rbs

@@ -1,4 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::Tap
+  @loader: Orthoses::_Call
+  include Orthoses::_MiddleWare
+  def initialize: (Orthoses::_Call loader) -> void
 end

data/sig/orthoses/utils.rbs

@@ -1,8 +1,6 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 module Orthoses::Utils
-  UNBOUND_NAME_METHOD: UnboundMethod
-
   def self.unautoload!: () -> void
 
   def self.each_const_recursive: (Module root, ?cache: Hash[untyped, true], ?on_error: ^(Orthoses::ConstLoadError) -> void?) ?{ (Module, Symbol, untyped) -> void } -> void
@@ -24,4 +22,6 @@ module Orthoses::Utils
   def self.known_type_params: (Module | String) -> Array[RBS::AST::TypeParam]
 
   def self.new_store: () -> Orthoses::store
+
+  UNBOUND_NAME_METHOD: UnboundMethod
 end

data/sig/orthoses/writer.rbs

@@ -0,0 +1,7 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::Writer
+  @loader: Orthoses::_Call
+  include Orthoses::_MiddleWare
+  def initialize: (Orthoses::_Call loader, io: _Writer) -> void
+end

data/sig/orthoses.rbs

@@ -1,9 +1,9 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 module Orthoses
-  VERSION: String
-
   attr_accessor self.logger: ::Logger
 
   type store = Hash[String, Orthoses::Content]
+
+  VERSION: "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -33,14 +33,22 @@ extra_rdoc_files: []
 files:
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
+- examples/minitest/Rakefile
+- examples/simple_middleware.rb
+- examples/simple_middleware.rbs
 - lib/orthoses.rb
+- lib/orthoses/attribute.rb
+- lib/orthoses/avoid_recursive_ancestor_error.rb
 - lib/orthoses/builder.rb
 - lib/orthoses/call_tracer.rb
 - lib/orthoses/constant.rb
 - lib/orthoses/content.rb
 - lib/orthoses/content/duplication_checker.rb
+- lib/orthoses/content/environment.rb
+- lib/orthoses/content/header_builder.rb
 - lib/orthoses/create_file_by_name.rb
 - lib/orthoses/delegate_class.rb
 - lib/orthoses/filter.rb
@@ -48,15 +56,20 @@ files:
 - lib/orthoses/mixin.rb
 - lib/orthoses/object_space_all.rb
 - lib/orthoses/pp.rb
+- lib/orthoses/rbs_prototype_rb.rb
 - lib/orthoses/store.rb
 - lib/orthoses/tap.rb
 - lib/orthoses/utils.rb
 - lib/orthoses/version.rb
 - lib/orthoses/walk.rb
+- lib/orthoses/writer.rb
 - orthoses.gemspec
 - sig/orthoses.rbs
 - sig/orthoses/_call.rbs
 - sig/orthoses/_middle_ware.rbs
+- sig/orthoses/attribute.rbs
+- sig/orthoses/attribute/hook.rbs
+- sig/orthoses/avoid_recursive_ancestor_error.rbs
 - sig/orthoses/builder.rbs
 - sig/orthoses/builder/call_logable.rbs
 - sig/orthoses/call_tracer.rbs
@@ -64,6 +77,8 @@ files:
 - sig/orthoses/constant.rbs
 - sig/orthoses/content.rbs
 - sig/orthoses/content/duplication_checker.rbs
+- sig/orthoses/content/environment.rbs
+- sig/orthoses/content/header_builder.rbs
 - sig/orthoses/create_file_by_name.rbs
 - sig/orthoses/delegate_class.rbs
 - sig/orthoses/filter.rbs
@@ -72,10 +87,12 @@ files:
 - sig/orthoses/name_space_error.rbs
 - sig/orthoses/object_space_all.rbs
 - sig/orthoses/pp.rbs
+- sig/orthoses/rbs_prototype_rb.rbs
 - sig/orthoses/store.rbs
 - sig/orthoses/tap.rbs
 - sig/orthoses/utils.rbs
 - sig/orthoses/walk.rbs
+- sig/orthoses/writer.rbs
 homepage: https://github.com/ksss/orthoses
 licenses:
 - MIT
@@ -97,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Framework for Generate RBS