orthoses 1.8.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bbf41507135a45b3b2a45ffff90500a68a39f4497bf1fcbd72d94579fd27ae8
-  data.tar.gz: 8a6daa8a64d8bfbda565e24ec53622ca5530f5624e80f0c6fdfed5ca13b10786
+  metadata.gz: ae5d17d8e6292f29138e1cbfe8feaf07425c55bdc2db58e0110ab1587bef062a
+  data.tar.gz: 724784da1b64edba217ea75a344ba67f787a4be3f53949b2c94c5ab00b15846f
 SHA512:
-  metadata.gz: c9d4a29dfc22972be165a703c4e86272a6e045ab34a91f76b560eeb329dca0795dab6eef59f419b50b7da4c390fcfa71d74d217baad3aa65b43f0000a2f7a126
-  data.tar.gz: 5579c33080fb673b50445fc8193f2876f8065e9ccc7ad2042020539a688f1242bfbe9dab265a780057040051f555f20b04ff62734ef844d25fea099a835d1c2a
+  metadata.gz: f27081184ca9da7caa25fcd25dbac29dfa2b7cd3ef32bf00f49cf7232fd182b7b7f3d13f4f88f254e0b98cf93d5fbfbb5f47a65cc4edbd1cf68822c43d143fb2
+  data.tar.gz: ca45ade090eb276344b7a30457d74a7467d48caeb94b875b86fbfe51777841bbc04fcb85ea4c4df9b7399b7d8d3ec7fe03f2f5fab08dda5f2908e383ebb0365f

data/lib/orthoses/attribute.rb

@@ -1,98 +1,71 @@
 module Orthoses
   class Attribute
+    CALL_GRAPH = {}
+
     module Hook
       def attr(*names)
+        (CALL_GRAPH[self]||=[]) << [:attr, names]
         super
       end
 
       def attr_accessor(*names)
+        (CALL_GRAPH[self]||=[]) << [:attr_accessor, names]
         super
       end
 
       def attr_reader(*names)
+        (CALL_GRAPH[self]||=[]) << [:attr_reader, names]
         super
       end
 
       def attr_writer(*names)
+        (CALL_GRAPH[self]||=[]) << [:attr_writer, names]
         super
       end
     end
 
     def initialize(loader)
+      CALL_GRAPH.clear
       @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.instance_method(:attr)) do
-        attr_accessor.trace(Hook.instance_method(:attr_accessor)) do
-          attr_reader.trace(Hook.instance_method(:attr_reader)) do
-            attr_writer.trace(Hook.instance_method(:attr_writer)) do
-              @loader.call
-            end
-          end
-        end
-      end
+      store = @loader.call
 
-      attr.captures.each do |capture|
-        m = capture.method.receiver.to_s.match(/#<Class:([\w:]+)>/)
+      CALL_GRAPH.dup.each do |base_mod, calls|
+        m = base_mod.to_s.match(/#<Class:([\w:]+)>/)
         if m && m[1]
           receiver_name = m[1]
           prefix = "self."
         else
-          receiver_name = Utils.module_name(capture.method.receiver) or next
+          receiver_name = Utils.module_name(base_mod) or next
           prefix = nil
         end
         content = store[receiver_name]
-        names = capture.argument[:names]
-        if names[1].equal?(true)
-          content << "attr_accessor #{prefix}#{names[0]}: untyped"
-        elsif names[1].equal?(false)
-          content << "attr_reader #{prefix}#{names[0]}: untyped"
-        else
-          names.each do |name|
-            content << "attr_reader #{prefix}#{name}: untyped"
+
+        calls.each do |(a, names)|
+          case a
+          when :attr
+            if names[1].equal?(true)
+              content << "attr_accessor #{prefix}#{names[0]}: untyped"
+            elsif names[1].equal?(false)
+              content << "attr_reader #{prefix}#{names[0]}: untyped"
+            else
+              names.each do |name|
+                content << "attr_reader #{prefix}#{name}: untyped"
+              end
+            end
+          else
+            names.each do |name|
+              content << "#{a} #{prefix}#{name}: untyped"
+            end
           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.captures.each do |capture|
-        m = capture.method.receiver.to_s.match(/#<Class:([\w:]+)>/)
-        names = capture.argument[:names]
-        if m && m[1]
-          receiver_name = m[1]
-          names.each do |name|
-            yield [receiver_name, "self.#{name}"]
-          end
-        else
-          receiver_name = Utils.module_name(capture.method.receiver) or next
-          names.each do |name|
-            yield [receiver_name, name]
-          end
-        end
-      end
-    end
   end
 end

data/lib/orthoses/constant.rb

@@ -14,7 +14,6 @@ module Orthoses
       @loader.call.tap do |store|
         will_add_key_and_content = []
         store.each do |name, _|
-          next if name == :Module
           next if name.start_with?('#<')
 
           begin

data/lib/orthoses/content/duplication_checker.rb

@@ -14,6 +14,7 @@ module Orthoses
 
         uniq_members
         drop_set_method_definition
+        drop_by_singleton_instance
         drop_known_method_definition
         drop_known_const_definition
 
@@ -40,6 +41,14 @@ module Orthoses
         end
       end
 
+      def drop_by_singleton_instance
+        singleton_instances = @uniq_map.values.select { |v| v.instance_of?(RBS::AST::Members::MethodDefinition) && v.kind == :singleton_instance }
+        singleton_instances.each do |member|
+          @uniq_map.delete([member.class, member.name, :instance])
+          @uniq_map.delete([member.class, member.name, :singleton])
+        end
+      end
+
       def drop_set_method_definition
         attr_accessors = @uniq_map.values.grep(RBS::AST::Members::AttrAccessor)
         attr_accessors.each do |member|
@@ -59,18 +68,26 @@ module Orthoses
       def drop_known_method_definition_recur(d)
         d.decl.members.each do |member|
           case member
+          when RBS::AST::Members::MethodDefinition
+            if member.kind == :singleton_instance
+              @uniq_map.delete([member.class, member.name, :instance])
+              @uniq_map.delete([member.class, member.name, :singleton])
+            end
+            @uniq_map.delete(member_key(member))
           when RBS::AST::Members::LocationOnly
             # ignore
           when RBS::AST::Members::AttrAccessor
             @uniq_map.delete([RBS::AST::Members::MethodDefinition, member.name, member.kind])
             @uniq_map.delete([RBS::AST::Members::MethodDefinition, :"#{member.name}=", member.kind])
-          else
-            if member.kind_of?(RBS::AST::Members::Include) && member.name.interface?
+          when RBS::AST::Members::Include
+            if member.name.interface?
               # If interface is included, it is shared in the same namespace.
               drop_known_method_definition_recur(@known_env.interface_decls[member.name])
             else
               @uniq_map.delete(member_key(member))
             end
+          else
+            @uniq_map.delete(member_key(member))
           end
         end
       end

data/lib/orthoses/content/environment.rb

@@ -33,10 +33,14 @@ module Orthoses
       end
 
       def <<(decl)
-        @load_env << decl
-        @known_env << decl
-      rescue RBS::DuplicatedDeclarationError => err
-        Orthoses.logger.warn(err.inspect)
+        begin
+          @load_env << decl
+          @known_env << decl
+        rescue RBS::DuplicatedDeclarationError => err
+          Orthoses.logger.warn(err.inspect)
+        end
+
+        self
       end
 
       def write_to(store:)
@@ -58,9 +62,13 @@ module Orthoses
           content = Content.new(name: name)
           content.comment = m_entry.primary.decl.comment&.string&.gsub(/^/, "# ")
           content.header = header_builder.build(entry: m_entry, name_hint: name)
-          decls_to_lines(m_entry.decls.map(&:decl)).each do |line|
+          decls = m_entry.decls.map(&:decl)
+          decls_to_lines(decls).each do |line|
             content << line
           end
+          detect_mixin_and_build_content(decls).each do |mixin_content|
+            yield mixin_content
+          end
           yield content
         end
 
@@ -92,6 +100,14 @@ module Orthoses
         end
       end
 
+      def detect_mixin_and_build_content(decls)
+        decls.flat_map do |decl|
+          decl.members.grep(RBS::AST::Members::Mixin).map do |decl|
+            Content.new(name: decl.name.relative!.to_s)
+          end
+        end
+      end
+
       def decls_to_lines(decls)
         out = StringIO.new
         writer = RBS::Writer.new(out: out)

data/lib/orthoses/content.rb

@@ -102,19 +102,7 @@ module Orthoses
 
       case val
       when Class
-        superclass =
-          if val.superclass && val.superclass != Object
-            super_module_name = Utils.module_name(val.superclass)
-
-            if super_module_name && super_module_name != "Random::Base" # https://github.com/ruby/rbs/pull/977
-              " < ::#{super_module_name}#{temporary_type_params(super_module_name)}"
-            else
-              nil
-            end
-          else
-            nil
-          end
-        self.header = "class #{Utils.module_name(val)}#{type_params(name)}#{superclass}"
+        self.header = "class #{Utils.module_name(val)}#{type_params(name)}#{build_super_class(val)}"
       when Module
         self.header = "module #{Utils.module_name(val)}#{type_params(name)}"
       else
@@ -124,6 +112,25 @@ module Orthoses
 
     private
 
+    def build_super_class(val)
+      return nil unless val.superclass && val.superclass != Object
+
+      super_module_name = Utils.module_name(val.superclass)
+      return nil unless super_module_name
+
+      begin
+        # check private const
+        eval("::#{val.superclass.to_s}")
+      rescue NameError
+        return nil
+      end
+
+      # https://github.com/ruby/rbs/pull/977
+      return nil unless super_module_name != "Random::Base"
+
+      " < ::#{super_module_name}#{temporary_type_params(super_module_name)}"
+    end
+
     class ArrayIO
       def initialize
         @outs = []

data/lib/orthoses/lazy_trace_point.rb

@@ -10,32 +10,43 @@ module Orthoses
   #     ...
   #   end
   class LazyTracePoint < TracePoint
+    METHOD_METHOD = ::Kernel.instance_method(:method)
+    INSTANCE_METHOD_METHOD = ::Module.instance_method(:instance_method)
+    UNBOUND_NAME_METHOD = ::Module.instance_method(:name)
+    METHOD_ADDED_HOOKS = {}
+    SINGLETON_METHOD_ADDED_HOOKS = {}
+
     # for TracePoint target
-    ::Module.prepend(Module.new{
+    module MethodAddedHook
       def method_added(id)
+        begin
+          if h = METHOD_ADDED_HOOKS[id]
+            if mod_name = UNBOUND_NAME_METHOD.bind(self).call
+              h[mod_name]&.call(self, id)
+            end
+          end
+        rescue TypeError => e
+        end
         super
       end
-    })
-    ::BasicObject.prepend(Module.new{
+    end
+    ::Module.prepend MethodAddedHook
+
+    class ::BasicObject
+      undef singleton_method_added
       def singleton_method_added(id)
-        super
+        begin
+          if h = SINGLETON_METHOD_ADDED_HOOKS[id]
+            if mod_name = UNBOUND_NAME_METHOD.bind(self).call
+              h[mod_name]&.call(self, id)
+            end
+          end
+        rescue TypeError => e
+        end
       end
-    })
-
-    METHOD_METHOD = ::Kernel.instance_method(:method)
-    INSTANCE_METHOD_METHOD = ::Module.instance_method(:instance_method)
-    UNBOUND_NAME_METHOD = ::Module.instance_method(:name)
-    METHOD_ADDED_METHOD = ::Module.instance_method(:method_added)
-    SINGLETON_METHOD_ADDED_METHOD = ::BasicObject.instance_method(:singleton_method_added)
-
-    def initialize(*events, &block)
-      @mod_name = nil
-      @instance_method_id = nil
-      @singleton_method_id = nil
-      super
     end
 
-    def enable(target: nil, target_line: nil, target_thread: nil, &block)
+    def enable(target: nil, &block)
       return super unless target.kind_of?(String)
 
       case
@@ -59,43 +70,25 @@ module Orthoses
     private
 
     def trace_instance_method(&block)
-      # try to load
       target = Object.const_get(@mod_name).instance_method(@instance_method_id)
       enable(target: target, &block)
     rescue NameError
-      TracePoint.new(:call) do |tp|
-        id = tp.binding.local_variable_get(:id)
-        next unless id == @instance_method_id
-
-        mod_name = UNBOUND_NAME_METHOD.bind(tp.self).call
-
-        next unless mod_name
-        next unless mod_name == @mod_name
-
-        enable(target: INSTANCE_METHOD_METHOD.bind(tp.self).call(id))
-        tp.disable
-      end.enable(target: METHOD_ADDED_METHOD, &block)
+      (METHOD_ADDED_HOOKS[@instance_method_id] ||= {})[@mod_name] = ->(const, id) {
+        enable(target: INSTANCE_METHOD_METHOD.bind(const).call(id))
+      }
+      block&.call
     ensure
       disable
     end
 
     def trace_singleton_method(&block)
-      # try to load
       target = Object.const_get(@mod_name).method(@singleton_method_id)
       enable(target: target, &block)
     rescue NameError
-      TracePoint.new(:call) do |tp|
-        id = tp.binding.local_variable_get(:id)
-        next unless id == @singleton_method_id
-
-        mod_name = UNBOUND_NAME_METHOD.bind(tp.self).call
-
-        next unless mod_name
-        next unless mod_name == @mod_name
-
-        enable(target: METHOD_METHOD.bind(tp.self).call(id))
-        tp.disable
-      end.enable(target: SINGLETON_METHOD_ADDED_METHOD, &block)
+      (SINGLETON_METHOD_ADDED_HOOKS[@singleton_method_id] ||= {})[@mod_name] = ->(const, id) {
+        enable(target: METHOD_METHOD.bind(const).call(id))
+      }
+      block&.call
     ensure
       disable
     end

data/lib/orthoses/mixin.rb

@@ -2,19 +2,31 @@
 
 module Orthoses
   class Mixin
+    CALL_GRAPH = {}
+
     module Hook
       def include(*modules)
+        modules.each do |m|
+          (CALL_GRAPH[self]||=[]) << [:include, m]
+        end
         super
       end
       def extend(*modules)
+        modules.each do |m|
+          (CALL_GRAPH[self]||=[]) << [:extend, m]
+        end
         super
       end
       def prepend(*modules)
+        modules.each do |m|
+          (CALL_GRAPH[self]||=[]) << [:prepend, m]
+        end
         super
       end
     end
 
     def initialize(loader, if: nil)
+      CALL_GRAPH.clear
       @loader = loader
       @if = binding.local_variable_get(:if)
     end
@@ -22,56 +34,34 @@ module Orthoses
     def call
       ::Module.prepend(Hook)
 
-      include = CallTracer.new
-      extend = CallTracer.new
-      prepend = CallTracer.new
+      store = @loader.call
 
-      store = include.trace(Hook.instance_method(:include)) do
-        extend.trace(Hook.instance_method(:extend)) do
-          prepend.trace(Hook.instance_method(:prepend)) do
-            @loader.call
-          end
+      CALL_GRAPH.dup.each do |base_mod, mixins|
+        base_mod_name = Utils.module_name(base_mod) or next
+        content = store[base_mod_name]
+        mixins.each do |(how, mod)|
+          mod_name = Utils.module_name(mod) or next
+          next if mod_name.start_with?("Orthoses")
+          next unless @if.nil? || @if.call(base_mod, how, mod)
+
+          store[mod_name].header = "module #{mod_name}"
+          content << "#{how} #{mod_name}#{type_params_sig(mod)}"
         end
       end
 
-      collect_definitions(store, include, :include)
-      collect_definitions(store, extend, :extend)
-      collect_definitions(store, prepend, :prepend)
-
       store
     end
 
     private
 
-    def collect_definitions(store, call_tracer, how)
-      call_tracer.captures.each do |capture|
-        base_mod = capture.method.receiver
-        next unless base_mod.kind_of?(Module)
-
-        base_mod_name = Utils.module_name(base_mod)
-        next unless base_mod_name
-        next if base_mod_name.include?("#")
-
-        content = store[base_mod_name]
-        capture.argument[:modules].each do |mod|
-          mod_name = Utils.module_name(mod)
-          next unless mod_name
-
-          next if mod_name.start_with?("Orthoses")
-
-          type_params_sig = ""
-          if type_params = Utils.known_type_params(mod)
-            if !type_params.empty?
-              type_params_sig = "[#{type_params.map{"untyped"}.join(", ")}]"
-            end 
-          end
-
-          next unless @if.nil? || @if.call(base_mod, how, mod)
-
-          store[mod_name].header = "module #{mod_name}"
-          content << "#{how} #{mod_name}#{type_params_sig}"
+    def type_params_sig(mod)
+      if type_params = Utils.known_type_params(mod)
+        if !type_params.empty?
+          return "[#{type_params.map{"untyped"}.join(", ")}]"
         end
       end
+
+      ""
     end
   end
 end

data/lib/orthoses/rbs_prototype_runtime.rb

@@ -5,7 +5,7 @@ module Orthoses
   class RBSPrototypeRuntime
     def initialize(
       loader,
-      patterns:,
+      patterns: nil,
       method_definition_filter: nil,
       alias_filter: nil,
       constant_filter: nil,
@@ -31,9 +31,9 @@ module Orthoses
           attribute_filter: @attribute_filter,
         )
 
-        patterns = @patterns
+        patterns = @patterns || store.keys
         env = RBS::Environment.new
-        merge = true
+        merge = false
         owners_included = []
         RBS::Prototype::Runtime.new(
           patterns: patterns,

data/lib/orthoses/trace/attribute.rb

@@ -3,6 +3,24 @@
 module Orthoses
   class Trace
     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
+
       include Targetable
 
       def initialize(loader, patterns:)
@@ -13,17 +31,17 @@ module Orthoses
       end
 
       def call
-        ::Module.prepend(Orthoses::Attribute::Hook)
-        store = nil
-        build_trace_hook.enable(target: Orthoses::Attribute::Hook.instance_method(:attr)) do
-          build_trace_hook.enable(target: Orthoses::Attribute::Hook.instance_method(:attr_accessor)) do
-            build_trace_hook.enable(target: Orthoses::Attribute::Hook.instance_method(:attr_reader)) do
-              build_trace_hook.enable(target: Orthoses::Attribute::Hook.instance_method(:attr_writer)) do
-                store = @loader.call
+        ::Module.prepend(Hook)
+        store =
+          build_trace_hook.enable(target: Hook.instance_method(:attr)) do
+            build_trace_hook.enable(target: Hook.instance_method(:attr_accessor)) do
+              build_trace_hook.enable(target: Hook.instance_method(:attr_reader)) do
+                build_trace_hook.enable(target: Hook.instance_method(:attr_writer)) do
+                  @loader.call
+                end
               end
             end
           end
-        end
 
         @captured_dict.each do |mod_name, captures|
           captures.each do |(kind, prefix, name), types|

data/lib/orthoses/utils.rb

@@ -182,7 +182,7 @@ module Orthoses
           raise TypeError
         end
       rbs_environment.class_decls[type_name]&.then do |entry|
-        entry.decls.first.decl.type_params
+        entry.type_params
       end
     end
 

data/lib/orthoses/version.rb

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

data/sig/orthoses/attribute.rbs

@@ -1,8 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Attribute
+  @loader: Orthoses::_Call
   def initialize: (Orthoses::_Call loader) -> void
   def call: () -> Orthoses::store
-  private def each_definition: (untyped call_tracer) { (untyped) -> untyped } -> untyped
-  @loader: Orthoses::_Call
+  CALL_GRAPH: Hash[untyped, untyped]
 end

data/sig/orthoses/autoload.rbs

@@ -1,6 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Autoload
+  @loader: untyped
   def initialize: (untyped loader) -> void
   def call: () -> untyped
 end

data/sig/orthoses/builder.rbs

@@ -10,6 +10,8 @@
 #     run ->() { require 'foo' }
 #   end
 class Orthoses::Builder
+  @use: untyped
+  @runner: untyped
   def initialize: () ?{ () [self: Orthoses::Builder] -> untyped } -> void
   def use: (untyped middleware, *untyped args, **untyped key) ?{ (*untyped, **untyped) -> untyped } -> untyped
   def run: (untyped loader) -> untyped

data/sig/orthoses/call_tracer/lazy.rbs

@@ -13,6 +13,8 @@
 #       capture.argument[:block]
 #     end
 class Orthoses::CallTracer::Lazy
+  @captures: untyped
+  @lazy_trace_point: untyped
   def initialize: () -> void
   def trace: (String name) ?{ () -> untyped } -> untyped
   attr_reader captures: Array[Orthoses::CallTracer::Capture]

data/sig/orthoses/call_tracer.rbs

@@ -1,6 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::CallTracer
+  @captures: untyped
+  @target_tp: untyped
   def initialize: () -> void
   def trace: (Method | UnboundMethod) ?{ () -> untyped } -> untyped
   attr_accessor captures: Array[Capture]

data/sig/orthoses/const_load_error.rbs

@@ -1,6 +1,9 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::ConstLoadError < ::StandardError
+  @root: untyped
+  @const: untyped
+  @error: untyped
   def initialize: (root: Module, const: Symbol, error: untyped) -> void
   def message: () -> ::String
   attr_reader root: Module

data/sig/orthoses/constant.rbs

@@ -1,10 +1,10 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Constant
-  def initialize: (Orthoses::_Call loader, ?strict: bool, ?if: ^(Module, Symbol, untyped) -> boolish | nil, ?on_error: ^(Orthoses::ConstLoadError) -> void | nil) -> void
-  def call: () -> Orthoses::store
   @loader: Orthoses::_Call
   @strict: bool
   @if: ^(Module mod, Symbol const, untyped val, String rbs) -> boolish?
   @on_error: ^(Orthoses::ConstLoadError) -> void | nil
+  def initialize: (Orthoses::_Call loader, ?strict: bool, ?if: ^(Module, Symbol, untyped) -> boolish | nil, ?on_error: ^(Orthoses::ConstLoadError) -> void | nil) -> void
+  def call: () -> Orthoses::store
 end

data/sig/orthoses/content/array_io.rbs

@@ -1,6 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Content::ArrayIO
+  @outs: untyped
   def initialize: () -> void
   def puts: (untyped line) -> untyped
   def to_a: () -> untyped

data/sig/orthoses/content/duplication_checker.rbs

@@ -2,9 +2,14 @@
 
 # Check and drop duplication method, const etc...
 class Orthoses::Content::DuplicationChecker
+  @decl: untyped
+  @known_env: untyped
+  @builder: untyped
+  @uniq_map: untyped
   def initialize: (untyped decl, ?env: untyped?) -> void
   def update_decl: () -> (nil | untyped)
   private def uniq_members: () -> untyped
+  private def drop_by_singleton_instance: () -> untyped
   private def drop_set_method_definition: () -> untyped
   private def drop_known_method_definition: () -> untyped
   private def drop_known_method_definition_recur: (untyped d) -> untyped

data/sig/orthoses/content/environment.rbs

@@ -1,26 +1,27 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Content::Environment
+  @load_env: RBS::Environment
+  @known_env: RBS::Environment
+  @method_definition_filter: method_definition_filter?
+  @alias_filter: alias_filter?
+  @constant_filter: constant_filter?
+  @mixin_filter: mixin_filter?
+  @attribute_filter: attribute_filter?
   def self.load_from_paths: (untyped paths) -> untyped
   def initialize: (?method_definition_filter: method_definition_filter?, ?alias_filter: alias_filter?, ?constant_filter: constant_filter?, ?mixin_filter: mixin_filter?, ?attribute_filter: attribute_filter?) -> void
-  def <<: (RBS::AST::Declarations::t decl) -> RBS::Environment
+  def <<: (RBS::AST::Declarations::t decl) -> self
   def write_to: (store: Orthoses::store) -> void
   def each: () { (Orthoses::Content) -> void } -> void
   # Avoid `RBS::GenericParameterMismatchError` from like rbs_prototype_rb
   #     class Array # <= RBS::GenericParameterMismatchError
   #     end
   private def avoid_generic_parameter_mismatch_error: () -> untyped
+  private def detect_mixin_and_build_content: (untyped decls) -> untyped
   private def decls_to_lines: (untyped decls) -> untyped
   type method_definition_filter = ^(RBS::AST::Members::MethodDefinition) -> boolish
   type alias_filter = ^(RBS::AST::Members::Alias) -> boolish
   type constant_filter = ^(RBS::AST::Declarations::Constant) -> boolish
   type mixin_filter = ^(RBS::AST::Members::Mixin) -> boolish
   type attribute_filter = ^(RBS::AST::Members::Attribute) -> boolish
-  @load_env: RBS::Environment
-  @known_env: RBS::Environment
-  @method_definition_filter: method_definition_filter?
-  @alias_filter: alias_filter?
-  @constant_filter: constant_filter?
-  @mixin_filter: mixin_filter?
-  @attribute_filter: attribute_filter?
 end

data/sig/orthoses/content/header_builder.rbs

@@ -1,6 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Content::HeaderBuilder
+  @env: untyped
+  @resolver: untyped
   def initialize: (env: untyped) -> void
   def build: (entry: untyped, ?name_hint: untyped?) -> untyped
   private def build_module: (entry: untyped, ?name_hint: untyped?) -> ::String

data/sig/orthoses/content.rbs

@@ -1,6 +1,10 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Content
+  @name: untyped
+  @body: untyped
+  @header: untyped
+  @comment: untyped
   def initialize: (name: String) -> void
   def <<: (String) -> void
   def concat: (Array[String]) -> void
@@ -13,6 +17,7 @@ class Orthoses::Content
   def sort!: () -> untyped
   def original_rbs: () -> untyped
   def auto_header: () -> (nil | untyped)
+  private def build_super_class: (untyped val) -> (nil | ::String)
   private def decl_to_lines: (untyped decl) -> untyped
   private def uniqed_body_string: () -> String
   private def uniqed_body_decl: () -> RBS::AST::Declarations::t

data/sig/orthoses/create_file_by_name.rbs

@@ -1,7 +1,12 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::CreateFileByName
+  @loader: Orthoses::_Call
+  @to: untyped
+  @header: untyped
+  @depth: untyped
+  @rmtree: untyped
+  @if: untyped
   def initialize: (Orthoses::_Call loader, to: String, ?header: String?, ?depth: Integer?, ?rmtree: boolish) -> void
   def call: () -> Orthoses::store
-  @loader: Orthoses::_Call
 end

data/sig/orthoses/delegate_class.rbs

@@ -1,8 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::DelegateClass
+  @loader: Orthoses::_Call
   def initialize: (Orthoses::_Call loader) -> void
   def call: () -> Orthoses::store
   def temporary_type_params: (untyped name) -> untyped
-  @loader: Orthoses::_Call
 end

data/sig/orthoses/filter.rbs

@@ -6,8 +6,9 @@
 #     Orthoses.rbs_defined_class?(name)
 #   end
 class Orthoses::Filter
-  def initialize: (Orthoses::_Call loader) { (String, Orthoses::Content) -> boolish } -> void
-  def call: () -> Orthoses::store
   @loader: Orthoses::_Call
+  @if: untyped
   @block: ^(String, Orthoses::Content) -> boolish
+  def initialize: (Orthoses::_Call loader) { (String, Orthoses::Content) -> boolish } -> void
+  def call: () -> Orthoses::store
 end

data/sig/orthoses/lazy_trace_point/method_added_hook.rbs

@@ -0,0 +1,6 @@
+# THIS IS GENERATED CODE from `$ rake sig`
+
+# for TracePoint target
+module Orthoses::LazyTracePoint::MethodAddedHook
+  def method_added: (untyped id) -> untyped
+end

data/sig/orthoses/lazy_trace_point.rbs

@@ -9,15 +9,15 @@
 #     ...
 #   end
 class Orthoses::LazyTracePoint < ::TracePoint
-  def method_added: (untyped id) -> untyped
-  def singleton_method_added: (untyped id) -> untyped
-  def initialize: (*untyped events) { () -> untyped } -> void
-  def enable: (?target: untyped?, ?target_line: untyped?, ?target_thread: untyped?) ?{ () -> untyped } -> untyped
+  @mod_name: untyped
+  @instance_method_id: untyped
+  @singleton_method_id: untyped
+  def enable: (?target: untyped?) ?{ () -> untyped } -> untyped
   private def trace_instance_method: () ?{ () -> untyped } -> untyped
   private def trace_singleton_method: () ?{ () -> untyped } -> untyped
   INSTANCE_METHOD_METHOD: UnboundMethod
-  METHOD_ADDED_METHOD: UnboundMethod
+  METHOD_ADDED_HOOKS: Hash[untyped, untyped]
   METHOD_METHOD: UnboundMethod
-  SINGLETON_METHOD_ADDED_METHOD: UnboundMethod
+  SINGLETON_METHOD_ADDED_HOOKS: Hash[untyped, untyped]
   UNBOUND_NAME_METHOD: UnboundMethod
 end

data/sig/orthoses/load_rbs.rbs

@@ -1,9 +1,9 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::LoadRBS
+  @loader: Orthoses::_Call
+  @paths: paths
   def initialize: (Orthoses::_Call loader, paths: paths) -> void
   def call: () -> Orthoses::store
   type paths = Array[String] | ^() -> Array[String]
-  @loader: Orthoses::_Call
-  @paths: paths
 end

data/sig/orthoses/missing_name/missing_class.rbs

@@ -1,6 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::MissingName::MissingClass
+  @store: untyped
   def initialize: (untyped store) -> void
   def call: () -> untyped
   private def recur: (untyped content) -> untyped

data/sig/orthoses/missing_name/missing_module.rbs

@@ -1,6 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::MissingName::MissingModule
+  @store: untyped
   def initialize: (untyped store) -> void
   def call: () -> untyped
   private def split_name: (untyped key_name) -> untyped

data/sig/orthoses/missing_name.rbs

@@ -1,6 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::MissingName
+  @loader: untyped
   def initialize: (untyped loader) -> void
   def call: () -> untyped
 end

data/sig/orthoses/mixin.rbs

@@ -1,8 +1,10 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Mixin
+  @loader: Orthoses::_Call
+  @if: untyped
   def initialize: (Orthoses::_Call loader, ?if: nil | ^(Module base_mod, :include | :extend | :prepend how, Module mod) -> boolish) -> void
   def call: () -> Orthoses::store
-  private def collect_definitions: (Orthoses::store store, Orthoses::CallTracer call_tracer, :include | :extend | :prepend how) -> void
-  @loader: Orthoses::_Call
+  private def type_params_sig: (untyped mod) -> String
+  CALL_GRAPH: Hash[untyped, [ :include | :extend | :prepend, untyped ]]
 end

data/sig/orthoses/object_space_all.rbs

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

data/sig/orthoses/outputable/avoid_recursive_ancestor_error.rbs

@@ -3,8 +3,8 @@
 # AvoidRecursiveAncestorError is an internal middleware
 # It's using on orthoses/outputable.rb
 class Orthoses::Outputable::AvoidRecursiveAncestorError
+  @loader: Orthoses::_Call
   def initialize: (Orthoses::_Call loader) -> void
   def call: () -> Orthoses::store
   private def collect_mixin_recursive: (untyped store, untyped name, untyped mixins) -> untyped
-  @loader: Orthoses::_Call
 end

data/sig/orthoses/outputable/constantizable_filter.rbs

@@ -3,6 +3,7 @@
 # Constantizable is an internal middleware
 # It's using on orthoses/outputable.rb
 class Orthoses::Outputable::ConstantizableFilter
+  @loader: untyped
   def initialize: (untyped loader) -> void
   def call: () -> untyped
 end

data/sig/orthoses/outputable/uniq_content_body.rbs

@@ -3,6 +3,7 @@
 # UniqContentBody is an internal middleware
 # It's using on orthoses/outputable.rb
 class Orthoses::Outputable::UniqContentBody
+  @loader: untyped
   def initialize: (untyped loader) -> void
   def call: () -> untyped
 end

data/sig/orthoses/outputable.rbs

@@ -1,5 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 module Orthoses::Outputable
+  @loader: untyped
+
   def call: () -> untyped
 end

data/sig/orthoses/path_helper.rbs

@@ -1,6 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::PathHelper
+  @current: untyped
+  @base_dir: untyped
   def self.best_version_paths: (untyped current, untyped base_dir) -> untyped
   def initialize: (untyped current, untyped base_dir) -> void
   def best_version_paths: () -> untyped

data/sig/orthoses/pp.rbs

@@ -3,6 +3,7 @@
 # Debug current stored values
 #   use Orthoses::PP
 class Orthoses::PP
+  @loader: untyped
   def initialize: (untyped loader) -> void
   def call: () -> untyped
 end

data/sig/orthoses/rbs_prototype_rb.rbs

@@ -6,8 +6,6 @@
 #       method_definition_filter: ->(member) { false },
 #       alias_filter: ->(member) { false }
 class Orthoses::RBSPrototypeRB
-  def initialize: (Orthoses::_Call loader, paths: Array[_ToS], ?method_definition_filter: Orthoses::Content::Environment::method_definition_filter?, ?alias_filter: Orthoses::Content::Environment::alias_filter?, ?constant_filter: Orthoses::Content::Environment::constant_filter?, ?mixin_filter: Orthoses::Content::Environment::mixin_filter?, ?attribute_filter: Orthoses::Content::Environment::attribute_filter?) -> void
-  def call: () -> Orthoses::store
   @loader: Orthoses::_Call
   @paths: Array[_ToS]
   @method_definition_filter: Orthoses::Content::Environment::method_definition_filter?
@@ -15,4 +13,6 @@ class Orthoses::RBSPrototypeRB
   @constant_filter: Orthoses::Content::Environment::constant_filter?
   @mixin_filter: Orthoses::Content::Environment::mixin_filter?
   @attribute_filter: Orthoses::Content::Environment::attribute_filter?
+  def initialize: (Orthoses::_Call loader, paths: Array[_ToS], ?method_definition_filter: Orthoses::Content::Environment::method_definition_filter?, ?alias_filter: Orthoses::Content::Environment::alias_filter?, ?constant_filter: Orthoses::Content::Environment::constant_filter?, ?mixin_filter: Orthoses::Content::Environment::mixin_filter?, ?attribute_filter: Orthoses::Content::Environment::attribute_filter?) -> void
+  def call: () -> Orthoses::store
 end

data/sig/orthoses/rbs_prototype_runtime.rbs

@@ -4,13 +4,13 @@
 #     use Orthoses::RBSPrototypeRuntime,
 #       patterns: ['Foo::*']
 class Orthoses::RBSPrototypeRuntime
-  def initialize: (Orthoses::_Call loader, patterns: Array[_ToS], ?method_definition_filter: Orthoses::Content::Environment::method_definition_filter?, ?alias_filter: Orthoses::Content::Environment::alias_filter?, ?constant_filter: Orthoses::Content::Environment::constant_filter?, ?mixin_filter: Orthoses::Content::Environment::mixin_filter?, ?attribute_filter: Orthoses::Content::Environment::attribute_filter?) -> void
-  def call: () -> Orthoses::store
   @loader: Orthoses::_Call
-  @patterns: Array[_ToS]
+  @patterns: Array[_ToS]?
   @method_definition_filter: Orthoses::Content::Environment::method_definition_filter?
   @alias_filter: Orthoses::Content::Environment::alias_filter?
   @constant_filter: Orthoses::Content::Environment::constant_filter?
   @mixin_filter: Orthoses::Content::Environment::mixin_filter?
   @attribute_filter: Orthoses::Content::Environment::attribute_filter?
+  def initialize: (Orthoses::_Call loader, ?patterns: Array[_ToS], ?method_definition_filter: Orthoses::Content::Environment::method_definition_filter?, ?alias_filter: Orthoses::Content::Environment::alias_filter?, ?constant_filter: Orthoses::Content::Environment::constant_filter?, ?mixin_filter: Orthoses::Content::Environment::mixin_filter?, ?attribute_filter: Orthoses::Content::Environment::attribute_filter?) -> void
+  def call: () -> Orthoses::store
 end

data/sig/orthoses/sort.rbs

@@ -2,6 +2,7 @@
 
 # use Orthoses::Sort
 class Orthoses::Sort
+  @loader: untyped
   def initialize: (untyped loader) -> void
   def call: () -> untyped
 end

data/sig/orthoses/store.rbs

@@ -3,6 +3,7 @@
 # Internal middleware for return store object
 # Builder set this middleware on last stack by default
 class Orthoses::Store
+  @loader: untyped
   def initialize: (untyped loader) -> void
   def call: () -> untyped
 end

data/sig/orthoses/tap.rbs

@@ -4,7 +4,8 @@
 #   store["Foo::Bar"] << "def baz: () -> void"
 # end
 class Orthoses::Tap
+  @loader: Orthoses::_Call
+  @block: untyped
   def initialize: (Orthoses::_Call loader) -> void
   def call: () -> Orthoses::store
-  @loader: Orthoses::_Call
 end

data/sig/orthoses/trace/attribute/hook.rbs

@@ -0,0 +1,11 @@
+# THIS IS GENERATED CODE from `$ rake sig`
+
+module Orthoses::Trace::Attribute::Hook
+  def attr: (*untyped names) -> untyped
+
+  def attr_accessor: (*untyped names) -> untyped
+
+  def attr_reader: (*untyped names) -> untyped
+
+  def attr_writer: (*untyped names) -> untyped
+end

data/sig/orthoses/trace/attribute.rbs

@@ -1,6 +1,9 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Trace::Attribute
+  @loader: untyped
+  @patterns: untyped
+  @captured_dict: untyped
   def initialize: (untyped loader, patterns: untyped) -> void
   def call: () -> untyped
   private def build_trace_hook: () -> untyped

data/sig/orthoses/trace/method.rbs

@@ -1,6 +1,11 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Trace::Method
+  @loader: untyped
+  @patterns: untyped
+  @stack: untyped
+  @args_return_map: untyped
+  @alias_map: untyped
   def initialize: (untyped loader, patterns: untyped) -> void
   def call: () -> untyped
   private def build_trace_point: () -> untyped

data/sig/orthoses/trace.rbs

@@ -1,6 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Trace
+  @loader: untyped
+  @patterns: untyped
   def initialize: (untyped loader, patterns: untyped) -> void
   def call: () -> untyped
 end

data/sig/orthoses/utils/type_list.rbs

@@ -2,6 +2,7 @@
 
 # internal
 class Orthoses::Utils::TypeList
+  @types: untyped
   def initialize: (untyped types) -> void
   def inject: () -> untyped
   FALSE_TYPE: RBS::Types::Literal

data/sig/orthoses/utils.rbs

@@ -1,6 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 module Orthoses::Utils
+  self.@env_cache: untyped
+
   def self.unautoload!: () -> untyped
 
   def self.each_const_recursive: (Module root, ?cache: Hash[untyped, true], ?on_error: nil | ^(Orthoses::ConstLoadError) -> void) ?{ (Module, Symbol, untyped) -> void } -> void

data/sig/orthoses/walk.rbs

@@ -1,8 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Walk
-  def initialize: (Orthoses::_Call loader, root: Module | String) -> void
-  def call: () -> Orthoses::store
   @loader: Orthoses::_Call
   @root: Module | String
+  def initialize: (Orthoses::_Call loader, root: Module | String) -> void
+  def call: () -> Orthoses::store
 end

data/sig/orthoses/writer.rbs

@@ -1,7 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 class Orthoses::Writer
+  @loader: Orthoses::_Call
+  @io: untyped
   def initialize: (Orthoses::_Call loader, io: _Writer) -> void
   def call: () -> Orthoses::store
-  @loader: Orthoses::_Call
 end

data/sig/orthoses.rbs

@@ -1,13 +1,13 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 module Orthoses
-  VERSION: "1.8.0"
+  INSTANCE_METHOD_METHOD: UnboundMethod
 
-  attr_accessor self.logger: ::Logger
+  METHOD_METHOD: UnboundMethod
 
-  type store = Hash[String, Orthoses::Content]
+  VERSION: String
 
-  INSTANCE_METHOD_METHOD: UnboundMethod
+  attr_accessor self.logger: ::Logger
 
-  METHOD_METHOD: UnboundMethod
+  type store = Hash[String, Orthoses::Content]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.10.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -100,6 +100,7 @@ files:
 - sig/orthoses/delegate_class/hook.rbs
 - sig/orthoses/filter.rbs
 - sig/orthoses/lazy_trace_point.rbs
+- sig/orthoses/lazy_trace_point/method_added_hook.rbs
 - sig/orthoses/load_rbs.rbs
 - sig/orthoses/missing_name.rbs
 - sig/orthoses/missing_name/missing_class.rbs
@@ -121,6 +122,7 @@ files:
 - sig/orthoses/tap.rbs
 - sig/orthoses/trace.rbs
 - sig/orthoses/trace/attribute.rbs
+- sig/orthoses/trace/attribute/hook.rbs
 - sig/orthoses/trace/method.rbs
 - sig/orthoses/trace/method/info.rbs
 - sig/orthoses/trace/targetable.rbs