orthoses 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe5907a7edff87d73372b0e6f556d5f3b08a3ae6d7407447f249a25953d069e
-  data.tar.gz: 7564345ffdc6363a5ba03bb9c70299b17cb15cdb3cc501bcbd3b221c7b0a823a
+  metadata.gz: 894390a9b9736bc6c773da2d8522b76a47a4f345f1eb48c847b4dc2cf691cfe4
+  data.tar.gz: 9189fdd9d19a953227093f99cd04e8a20f258e231e40b40ed5e7582cd5ac107c
 SHA512:
-  metadata.gz: 35acabbfbd4ab4c549d8cefdecc829074ade2bc041093432b3a1ae52c095f1d2e8a4420d30754dfd0a1dfb9d09f999fb2885b4f87c7e14c2c3386afff886082f
-  data.tar.gz: 01f8881d042a106e720574902abc2227161c65c78b35277618aea2343f8be43dfdcb4d94735ce2f5a7fd62ffb5137e5c928e0bd1e9dd50cd583ecd6819c80d38
+  metadata.gz: 90d06b917b9fb9aa88a18bae14bd792fe85520a8d8cf9f75c8d422f080cfe992036f3b1d2b9e115f1a6ff315478899a2b275d6ae99bdd6c5598bdcc21e3ddf56
+  data.tar.gz: 4d134a532af9973901e87fa48d1e96d9ca1469b46fa266d548476d252f8651dce94b40ee3de799dd7aa10f5d961e06d330048b5c833af88eee536965779dd131

data/Gemfile.lock

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

data/lib/orthoses/avoid_recursive_ancestor_error.rb

@@ -7,16 +7,23 @@ module Orthoses
     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
+        set_object_mixins_recursive(store, "Object", object_mixins)
+
         object_mixins.each_key do |object_mixin|
           store[object_mixin].header = "module #{object_mixin} : BasicObject"
         end
       end
     end
+
+    def set_object_mixins_recursive(store, name, object_mixins)
+      store[name].to_decl.members.each do |member|
+        case member
+        when RBS::AST::Members::Mixin
+          member_name = member.name.relative!.to_s
+          object_mixins[member_name] = true
+          set_object_mixins_recursive(store, member_name, object_mixins)
+        end
+      end
+    end
   end
 end

data/lib/orthoses/constant.rb

@@ -27,10 +27,14 @@ module Orthoses
           Orthoses::Utils.each_const_recursive(base, on_error: @on_error) do |current, const, val|
             next if current.singleton_class?
             next if Utils.module_name(current).nil?
-            next if val.kind_of?(Module)
             next if cache[[current, const]]
             cache[[current, const]] = true
 
+            if val.kind_of?(Module)
+              will_add_key_and_content << [Utils.module_name(val), nil]
+              next
+            end
+
             rbs = Orthoses::Utils.object_to_rbs(val, strict: @strict)
             next unless rbs
             next unless @if.nil? || @if.call(current, const, val, rbs)
@@ -38,8 +42,12 @@ module Orthoses
             will_add_key_and_content << [Utils.module_name(current), "#{const}: #{rbs}"]
           end
         end
+
         will_add_key_and_content.each do |name, line|
-          store[name] << line
+          next unless name
+          content = store[name]
+          next unless line
+          content << line
         end
       end
     end

data/lib/orthoses/version.rb

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

data/sig/orthoses/avoid_recursive_ancestor_error.rbs

@@ -3,5 +3,6 @@
 class Orthoses::AvoidRecursiveAncestorError
   def initialize: (Orthoses::_Call loader) -> void
   def call: () -> Orthoses::store
+  def set_object_mixins_recursive: (untyped store, untyped name, untyped object_mixins) -> untyped
   @loader: Orthoses::_Call
 end

data/sig/orthoses/call_tracer.rbs

@@ -1,8 +1,8 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::CallTracer
-  attr_accessor result: Array[[ Method, Hash[Symbol, untyped] ]]
   def initialize: () -> void
 
   def trace: [T] (Method | UnboundMethod) ?{ () -> T } -> T
+  attr_accessor result: Array[[ Method, Hash[Symbol, untyped] ]]
 end

data/sig/orthoses/const_load_error.rbs

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

data/sig/orthoses/content.rbs

@@ -1,9 +1,6 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::Content
-  attr_reader name: String
-  attr_reader body: Array[String]
-  attr_accessor header: String?
   def initialize: (name: String) -> void
   def <<: (String) -> void
   def concat: (Array[String]) -> void
@@ -18,4 +15,7 @@ class Orthoses::Content
   def auto_header: () -> (nil | untyped)
   def temporary_type_params: (untyped name) -> untyped
   def type_params: (untyped name) -> untyped
+  attr_reader name: String
+  attr_reader body: Array[String]
+  attr_accessor header: String?
 end

data/sig/orthoses/utils.rbs

@@ -11,14 +11,10 @@ module Orthoses::Utils
 
   def self.rbs_type_name: (String) -> RBS::TypeName
 
-  attr_accessor self.rbs_collection_pathname: Pathname
-
   def self.rbs_environment: (?library: String | Array[String] | nil, ?collection: boolish, ?cache: boolish) -> RBS::Environment
 
   def self.object_to_rbs: (untyped object, strict: bool) -> String
 
-  UNBOUND_NAME_METHOD: UnboundMethod
-
   def self.module_name: (Module mod) -> String?
 
   def self.module_to_type_name: (Module) -> RBS::TypeName?
@@ -26,4 +22,8 @@ module Orthoses::Utils
   def self.known_type_params: (Module | String) -> Array[RBS::AST::TypeParam]
 
   def self.new_store: () -> Orthoses::store
+
+  UNBOUND_NAME_METHOD: UnboundMethod
+
+  attr_accessor self.rbs_collection_pathname: Pathname
 end

data/sig/orthoses.rbs

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs