orthoses 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4d2682b08812b2f8fa633aa299702d38fd509439e4e2ac0b8751a64358b32a
-  data.tar.gz: 28118eed7d772c490670f83277ccdabc4d2938ca329f5051f8aebd40be1f08a6
+  metadata.gz: ae5d17d8e6292f29138e1cbfe8feaf07425c55bdc2db58e0110ab1587bef062a
+  data.tar.gz: 724784da1b64edba217ea75a344ba67f787a4be3f53949b2c94c5ab00b15846f
 SHA512:
-  metadata.gz: 1f4262320cb3d9ef5304cbdb53af7cb0e0895bac03e7d98697cf38fc73dabc25b579c6fd4a213ae5c0d97d1763f88dabde2f7f1e6455a084c424ef6b042a3acb
-  data.tar.gz: 35e2b8378b602ad6b853ba7f543d807aab514d0f2a7d8b931230912084d40c7222e45d09cfe4b3eddd614f62bcce578cac2b6e14dac08f5578089ecbb7d7895c
+  metadata.gz: f27081184ca9da7caa25fcd25dbac29dfa2b7cd3ef32bf00f49cf7232fd182b7b7f3d13f4f88f254e0b98cf93d5fbfbb5f47a65cc4edbd1cf68822c43d143fb2
+  data.tar.gz: ca45ade090eb276344b7a30457d74a7467d48caeb94b875b86fbfe51777841bbc04fcb85ea4c4df9b7399b7d8d3ec7fe03f2f5fab08dda5f2908e383ebb0365f

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

@@ -115,16 +115,16 @@ module Orthoses
     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)
+        eval("::#{val.superclass.to_s}")
       rescue NameError
         return nil
       end
 
-      super_module_name = Utils.module_name(val.superclass)
-      return nil unless super_module_name
-
       # https://github.com/ruby/rbs/pull/977
       return nil unless super_module_name != "Random::Base"
 

data/lib/orthoses/lazy_trace_point.rb

@@ -32,7 +32,8 @@ module Orthoses
     end
     ::Module.prepend MethodAddedHook
 
-    module SignletonMethodAddedHook
+    class ::BasicObject
+      undef singleton_method_added
       def singleton_method_added(id)
         begin
           if h = SINGLETON_METHOD_ADDED_HOOKS[id]
@@ -42,10 +43,8 @@ module Orthoses
           end
         rescue TypeError => e
         end
-        super
       end
     end
-    ::BasicObject.prepend SignletonMethodAddedHook
 
     def enable(target: nil, &block)
       return super unless target.kind_of?(String)

data/lib/orthoses/version.rb

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

data/sig/orthoses/content/environment.rbs

@@ -10,13 +10,14 @@ class Orthoses::Content::Environment
   @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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -101,7 +101,6 @@ files:
 - sig/orthoses/filter.rbs
 - sig/orthoses/lazy_trace_point.rbs
 - sig/orthoses/lazy_trace_point/method_added_hook.rbs
-- sig/orthoses/lazy_trace_point/signleton_method_added_hook.rbs
 - sig/orthoses/load_rbs.rbs
 - sig/orthoses/missing_name.rbs
 - sig/orthoses/missing_name/missing_class.rbs

data/sig/orthoses/lazy_trace_point/signleton_method_added_hook.rbs

@@ -1,5 +0,0 @@
-# THIS IS GENERATED CODE from `$ rake sig`
-
-module Orthoses::LazyTracePoint::SignletonMethodAddedHook
-  def singleton_method_added: (untyped id) -> untyped
-end