orthoses 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 894390a9b9736bc6c773da2d8522b76a47a4f345f1eb48c847b4dc2cf691cfe4
-  data.tar.gz: 9189fdd9d19a953227093f99cd04e8a20f258e231e40b40ed5e7582cd5ac107c
+  metadata.gz: 2941ebbe45d7ab2dc9ad009628db52419a6a3b18a1fd1ad870164ab017bbb5e1
+  data.tar.gz: 5a33b4b63f62b820f4642d56661cebd393c3381363a8f727655f123568b2784b
 SHA512:
-  metadata.gz: 90d06b917b9fb9aa88a18bae14bd792fe85520a8d8cf9f75c8d422f080cfe992036f3b1d2b9e115f1a6ff315478899a2b275d6ae99bdd6c5598bdcc21e3ddf56
-  data.tar.gz: 4d134a532af9973901e87fa48d1e96d9ca1469b46fa266d548476d252f8651dce94b40ee3de799dd7aa10f5d961e06d330048b5c833af88eee536965779dd131
+  metadata.gz: bd9a27c8a8f6752fc73c2c65b8dbb0edcb9885425667a8a067a6d56cc2bb32473db565ea41089ad0f8b26c598275afa83e2fb3bbde6f668fc095c942bb75af01
+  data.tar.gz: 4b6c157a129e1e3dfab42737ba1a4ba0f9c1c5ffe25defb693de3bce39f63fdcc746b155d030e273162e550ada315281553d921475bd4a333bf362a46e5a58bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orthoses (0.7.0)
+    orthoses (0.8.0)
       rbs (~> 2.0)
 
 GEM

data/lib/orthoses/attribute.rb

@@ -23,17 +23,17 @@ module Orthoses
     end
 
     def call
-      Module.prepend(Hook)
+      ::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
+      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
@@ -42,22 +42,23 @@ module Orthoses
 
       store["Module"].body.delete("prepend Orthoses::Attribute::Hook")
 
-      attr.result.each do |method, argument|
-        m = method.receiver.to_s.match(/#<Class:([\w:]+)>/)
+      attr.captures.each do |capture|
+        m = capture.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
+          receiver_name = Utils.module_name(capture.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"
+        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
-          argument[:names].each do |name|
+          names.each do |name|
             content << "attr_reader #{prefix}#{name}: untyped"
           end
         end
@@ -79,16 +80,17 @@ module Orthoses
     private
 
     def each_definition(call_tracer)
-      call_tracer.result.each do |method, argument|
-        m = method.receiver.to_s.match(/#<Class:([\w:]+)>/)
+      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]
-          argument[:names].each do |name|
+          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|
+          receiver_name = Utils.module_name(capture.method.receiver) or next
+          names.each do |name|
             yield [receiver_name, name]
           end
         end

data/lib/orthoses/call_tracer.rb

@@ -7,16 +7,19 @@ module Orthoses
   #     scope.trace(ActiveRecord::Base.method(:scope)) do
   #       @loader.call
   #     end
-  #     scope.result.each do |method, argument|
-  #       argument[:name]
-  #       argument[:body]
-  #       argument[:block]
+  #     scope.captures.each do |capture|
+  #       capture.argument[:name]
+  #       capture.argument[:body]
+  #       capture.argument[:block]
   #     end
   class CallTracer
-    attr_accessor :result
+    class Capture < Struct.new(:method, :argument, keyword_init: true)
+    end
+
+    attr_accessor :captures
 
     def initialize
-      @result = []
+      @captures = []
     end
 
     def trace(target, &block)
@@ -46,7 +49,11 @@ module Orthoses
             end
           end
         end
-        @result << [called_method, argument]
+
+        @captures << Capture.new(
+          method: called_method,
+          argument: argument,
+        )
       end
       t.enable(target: target, &block)
     end

data/lib/orthoses/content/environment.rb

@@ -86,15 +86,29 @@ module Orthoses
         writer = RBS::Writer.new(out: out)
         decls.each do |decl|
           next unless decl.respond_to?(:members)
+          last_visibility = :public
           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::MethodDefinition
+              if last_visibility == :private && member.kind != :singleton_instance
+                member.instance_variable_set(:@visibility, :private)
+              end
             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)
+              if last_visibility == :private
+                member.instance_variable_set(:@visibility, :private)
+              end
+            when RBS::AST::Members::Public
+              last_visibility = :public
+              next
+            when RBS::AST::Members::Private
+              last_visibility = :private
+              next
             end
             writer.write_member(member)
           end

data/lib/orthoses/delegate_class.rb

@@ -2,31 +2,44 @@
 
 module Orthoses
   class DelegateClass
+    module Hook
+      def inherited(subclass)
+        super
+      end
+    end
+
     def initialize(loader)
       @loader = loader
     end
 
     def call
       require 'delegate'
-      classes = []
-      Class.class_eval do
-        define_method(:inherited) do |subclass|
-          classes << [subclass, self]
-        end
-      end
+      ::Class.prepend(Hook)
+
+      inherited = CallTracer.new
+
       delegate_class_super_map = {}
       delegate_class_tracer = TracePoint.new(:return) do |tp|
         return_value = tp.return_value
         superclass = tp.binding.local_variable_get(:superclass)
         delegate_class_super_map[return_value] = superclass
       end
+
       store = delegate_class_tracer.enable(target: method(:DelegateClass)) do
-        @loader.call
+        inherited.trace(Hook.instance_method(:inherited)) do
+          @loader.call
+        end
       end
-      classes.each do |subclass, superclass|
+
+      store["Class"].body.delete("prepend Orthoses::DelegateClass::Hook")
+
+      inherited.captures.each do |capture|
+        superclass = capture.method.receiver
         if delegate_to_class = delegate_class_super_map[superclass]
+          subclass = capture.argument[:subclass]
           subclass_name = Utils.module_name(subclass)
           next unless subclass_name
+
           delegate_to_class_name = Utils.module_name(delegate_to_class)
           next unless delegate_to_class_name
 
@@ -34,6 +47,7 @@ module Orthoses
           store[subclass_name].header = header
         end
       end
+
       store
     end
 

data/lib/orthoses/mixin.rb

@@ -2,49 +2,71 @@
 
 module Orthoses
   class Mixin
+    module Hook
+      def include(*modules)
+        super
+      end
+      def extend(*modules)
+        super
+      end
+      def prepend(*modules)
+        super
+      end
+    end
+
     def initialize(loader, if: nil)
       @loader = loader
       @if = binding.local_variable_get(:if)
     end
 
     def call
-      modules = Hash.new { |h, k| h[k] = [] }
-      ::Module.module_eval do
-        define_method(:included) do |mod|
-          modules[mod] << [:include, self]
-        end
+      ::Module.prepend(Hook)
 
-        define_method(:extended) do |mod|
-          modules[mod] << [:extend, self]
-        end
+      include = CallTracer.new
+      extend = CallTracer.new
+      prepend = CallTracer.new
 
-        define_method(:prepended) do |mod|
-          modules[mod] << [:prepend, self]
+      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
         end
       end
 
-      store = @loader.call
+      store["Module"].body.delete("prepend Orthoses::Mixin::Hook")
+
+      collect_definitions(store, include, :include)
+      collect_definitions(store, extend, :extend)
+      collect_definitions(store, prepend, :prepend)
+
+      store
+    end
+
+    private
 
-      modules.each do |base_mod, how_mods|
+    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
 
-        lines = how_mods.filter.map do |how, mod|
+        content = store[base_mod_name]
+        capture.argument[:modules].each do |mod|
           mod_name = Utils.module_name(mod)
           next unless mod_name
+
           known_type_params = Utils.known_type_params(mod)
           next unless known_type_params.nil? || known_type_params.empty?
+
           next unless @if.nil? || @if.call(base_mod, how, mod)
 
           store[mod_name]
-
-          "#{how} #{mod_name}"
+          content << "#{how} #{mod_name}"
         end
-        store[base_mod_name].concat(lines)
       end
-
-      store
     end
   end
 end

data/lib/orthoses/version.rb

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

data/sig/orthoses/attribute.rbs

@@ -3,7 +3,6 @@
 class Orthoses::Attribute
   def initialize: (Orthoses::_Call loader) -> void
   def call: () -> Orthoses::store
-  private
-  def each_definition: (untyped call_tracer) { (untyped) -> untyped } -> untyped
+  private def each_definition: (untyped call_tracer) { (untyped) -> untyped } -> untyped
   @loader: Orthoses::_Call
 end

data/sig/orthoses/builder.rbs

@@ -1,8 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::Builder
-  def initialize: () { () -> untyped } -> void
-  def use: (untyped middleware, *untyped args, **untyped key) { () -> untyped } -> untyped
+  def initialize: () ?{ () -> untyped } -> void
+  def use: (untyped middleware, *untyped args, **untyped key) ?{ () -> untyped } -> untyped
   def run: (untyped loader) -> untyped
   def to_loader: () -> untyped
 

data/sig/orthoses/call_tracer/capture.rbs

@@ -0,0 +1,6 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::CallTracer::Capture < ::Struct[untyped]
+  def method: () -> Method
+  def argument: () -> Hash[Symbol, untyped]
+end

data/sig/orthoses/call_tracer.rbs

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

data/sig/orthoses/content/duplication_checker.rbs

@@ -3,8 +3,7 @@
 class Orthoses::Content::DuplicationChecker
   def initialize: (untyped decl) -> void
   def update_decl: () -> untyped
-  private
-  def drop_known_method_definition: (untyped uniq_map) -> untyped
-  def member_to_s: (untyped member) -> untyped
-  def member_key: (untyped member) -> untyped
+  private def drop_known_method_definition: (untyped uniq_map) -> untyped
+  private def member_to_s: (untyped member) -> untyped
+  private def member_key: (untyped member) -> untyped
 end

data/sig/orthoses/content/environment.rbs

@@ -7,12 +7,11 @@ class Orthoses::Content::Environment
   def <<: (RBS::AST::Declarations::t decl) -> RBS::Environment
   def write_to: (store: Orthoses::store) -> void
   def each: () { (Orthoses::Content) -> void } -> void
-  private
   # Avoid `RBS::GenericParameterMismatchError` from like rbs_prototype_rb
   #     class Array # <= RBS::GenericParameterMismatchError
   #     end
-  def avoid_generic_parameter_mismatch_error: () -> untyped
-  def decls_to_lines: (untyped decls) -> untyped
+  private def avoid_generic_parameter_mismatch_error: () -> untyped
+  private def decls_to_lines: (untyped decls) -> untyped
   type constant_filter = ^(RBS::AST::Declarations::Constant) -> boolish
   type mixin_filter = ^(RBS::AST::Members::Mixin) -> boolish
   type attribute_filter = ^(RBS::AST::Members::Attribute) -> boolish

data/sig/orthoses/content/header_builder.rbs

@@ -3,11 +3,10 @@
 class Orthoses::Content::HeaderBuilder
   def initialize: (env: untyped) -> void
   def build: (entry: untyped, ?name_hint: untyped?) -> untyped
-  private
-  def build_module: (entry: untyped, ?name_hint: untyped?) -> ::String
-  def build_class: (entry: untyped, ?name_hint: untyped?) -> ::String
-  def build_super_class: (untyped primary) -> (nil | untyped)
-  def build_interface: (entry: untyped, ?name_hint: untyped?) -> ::String
-  def name_and_params: (untyped name, untyped params) -> ::String
-  def name_and_args: (untyped name, untyped args) -> (::String | nil)
+  private def build_module: (entry: untyped, ?name_hint: untyped?) -> ::String
+  private def build_class: (entry: untyped, ?name_hint: untyped?) -> ::String
+  private def build_super_class: (untyped primary) -> (nil | untyped)
+  private def build_interface: (entry: untyped, ?name_hint: untyped?) -> ::String
+  private def name_and_params: (untyped name, untyped params) -> ::String
+  private def name_and_args: (untyped name, untyped args) -> (::String | nil)
 end

data/sig/orthoses/content.rbs

@@ -6,15 +6,13 @@ class Orthoses::Content
   def concat: (Array[String]) -> void
   def to_rbs: () -> String
   def to_decl: () -> untyped
+  private def original_rbs: () -> ::String
 
-  private
-  def original_rbs: () -> ::String
-
-  def uniqed_body_string: () -> String
-  def uniqed_body_decl: () -> RBS::AST::Declarations::t
-  def auto_header: () -> (nil | untyped)
-  def temporary_type_params: (untyped name) -> untyped
-  def type_params: (untyped name) -> untyped
+  private def uniqed_body_string: () -> String
+  private def uniqed_body_decl: () -> RBS::AST::Declarations::t
+  private def auto_header: () -> (nil | untyped)
+  private def temporary_type_params: (untyped name) -> untyped
+  private def type_params: (untyped name) -> untyped
   attr_reader name: String
   attr_reader body: Array[String]
   attr_accessor header: String?

data/sig/orthoses/delegate_class/hook.rbs

@@ -0,0 +1,5 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+module Orthoses::DelegateClass::Hook
+  def inherited: (untyped subclass) -> untyped
+end

data/sig/orthoses/mixin/hook.rbs

@@ -0,0 +1,9 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+module Orthoses::Mixin::Hook
+  def include: (*untyped modules) -> untyped
+
+  def extend: (*untyped modules) -> untyped
+
+  def prepend: (*untyped modules) -> untyped
+end

data/sig/orthoses/mixin.rbs

@@ -1,6 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::Mixin
-  def initialize: (untyped loader, ?if: untyped?) -> void
-  def call: () -> untyped
+  def initialize: (Orthoses::_Call loader) -> void
+  def call: () -> Orthoses::store
+  private def collect_definitions: (Orthoses::store store, Orthoses::CallTracer call_tracer, :include | :extend | :prepend how) -> void
+  @loader: Orthoses::_Call
 end

data/sig/orthoses/utils.rbs

@@ -19,7 +19,7 @@ module Orthoses::Utils
 
   def self.module_to_type_name: (Module) -> RBS::TypeName?
 
-  def self.known_type_params: (Module | String) -> Array[RBS::AST::TypeParam]
+  def self.known_type_params: (Module | String) -> Array[RBS::AST::TypeParam]?
 
   def self.new_store: () -> Orthoses::store
 

data/sig/orthoses.rbs

@@ -1,7 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 module Orthoses
-  VERSION: "0.7.0"
+  VERSION: "0.8.0"
 
   attr_accessor self.logger: ::Logger
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-04 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -73,6 +73,7 @@ files:
 - sig/orthoses/builder.rbs
 - sig/orthoses/builder/call_logable.rbs
 - sig/orthoses/call_tracer.rbs
+- sig/orthoses/call_tracer/capture.rbs
 - sig/orthoses/const_load_error.rbs
 - sig/orthoses/constant.rbs
 - sig/orthoses/content.rbs
@@ -81,9 +82,11 @@ files:
 - sig/orthoses/content/header_builder.rbs
 - sig/orthoses/create_file_by_name.rbs
 - sig/orthoses/delegate_class.rbs
+- sig/orthoses/delegate_class/hook.rbs
 - sig/orthoses/filter.rbs
 - sig/orthoses/load_rbs.rbs
 - sig/orthoses/mixin.rbs
+- sig/orthoses/mixin/hook.rbs
 - sig/orthoses/name_space_error.rbs
 - sig/orthoses/object_space_all.rbs
 - sig/orthoses/pp.rbs