orthoses 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2941ebbe45d7ab2dc9ad009628db52419a6a3b18a1fd1ad870164ab017bbb5e1
-  data.tar.gz: 5a33b4b63f62b820f4642d56661cebd393c3381363a8f727655f123568b2784b
+  metadata.gz: 9a88a402248539e68e824aeb28c7a47a17b2b8c8920c454dbec4fe87305a5999
+  data.tar.gz: 1c9e0aa222e72261b5b5fd09649023c61eff09043823a4eb3e98d909aff93fc7
 SHA512:
-  metadata.gz: bd9a27c8a8f6752fc73c2c65b8dbb0edcb9885425667a8a067a6d56cc2bb32473db565ea41089ad0f8b26c598275afa83e2fb3bbde6f668fc095c942bb75af01
-  data.tar.gz: 4b6c157a129e1e3dfab42737ba1a4ba0f9c1c5ffe25defb693de3bce39f63fdcc746b155d030e273162e550ada315281553d921475bd4a333bf362a46e5a58bd
+  metadata.gz: b825842ed1899b7e51ee40376845a4e869563c2fbe66e56a16ebe62672291acdb2a9e9e66a29bf4a7a8d0e3644fb6d2848b268cc2a09fbbe9adc3f85ef955872
+  data.tar.gz: 21bfe767137adea2246fcbb1f6883266f0b76aa1c367faafe773fcf902184374cda1ee175d4b62eee99435714dfc1bec7b1403d20db4dab5de3faabc4df98754

data/Gemfile.lock

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

data/README.md

@@ -41,6 +41,38 @@ Orthoses::Builder.new do
 end.call
 ```
 
+## Utils
+
+`Orthoses::Utils` is a collection of useful methods.
+
+### Orthoses::Utils.unautoload!
+
+Load all const by recursive.
+
+### Orthoses::Utils.each_const_recursive
+
+Yield const by recursive.
+
+### Orthoses::Utils.rbs_defined_const?
+
+Checks if the const name is already defined.
+
+### Orthoses::Utils.rbs_defined_class?
+
+Checks if the class name is already defined.
+
+### Orthoses::Utils.rbs_environment
+
+Fetch cached `RBS::Environment`.
+
+### Orthoses::Utils.object_to_rbs
+
+Convert Ruby object to RBS string.
+
+### Orthoses::Utils.module_name
+
+Get true module name by `Module.instance_method(:name).bind(mod).call`.
+
 ## Middlewares
 
 ### Orthoses::Constant
@@ -48,10 +80,14 @@ end.call
 Add constant signature to class/module.
 Signatures are predicted from constant values.
 
+### Orthoses::Attribute
+
+Add `attr`, `attr_accessor`, `attr_reader` and `attr_writer` to output RBS.
+All type set `untyped`.
+
 ### Orthoses::Mixin
 
 Add module include/extend/prepend definition.
-It use `Module#{includeed,extended,prepended}` for capture.
 
 ### Orthoses::ObjectSpaceAll
 

data/lib/orthoses/content/header_builder.rb

@@ -45,11 +45,7 @@ module Orthoses
       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)
-
+        context = build_context(entry: primary)
         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]
@@ -65,7 +61,16 @@ module Orthoses
 
       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)}"
+        context = build_context(entry: entry)
+        resolved_name = @resolver.resolve(full_name, context: context) || full_name
+        "interface #{name_and_params(resolved_name.relative!, entry.decl.type_params)}"
+      end
+
+      def build_context(entry:)
+        context = entry.outer.length.times.map do |i|
+          entry.outer[0, i + 1].map(&:name).inject(:+).to_namespace.absolute!
+        end
+        context.push(RBS::Namespace.root)
       end
 
       def name_and_params(name, params)

data/lib/orthoses/content.rb

@@ -81,11 +81,6 @@ module Orthoses
     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)
@@ -94,6 +89,11 @@ module Orthoses
 
       return unless @header.nil?
 
+      if name.split('::').last.start_with?('_')
+        self.header = "interface #{name}"
+        return
+      end
+
       val = Object.const_get(name)
 
       case val

data/lib/orthoses/utils.rb

@@ -101,12 +101,16 @@ module Orthoses
     def self.object_to_rbs(object, strict:)
       case object
       when Class, Module
-        "singleton(#{object})"
+        if name = module_name(object)
+          "singleton(#{name})"
+        else
+          "untyped"
+        end
       when Integer, Symbol, String
         if strict
           object.inspect
         else
-          Utils.module_name(object.class) || 'untyped'
+          module_name(object.class) || 'untyped'
         end
       when true, false, nil
         object.inspect
@@ -151,7 +155,7 @@ module Orthoses
         # see also https://github.com/ruby/rbs/pull/975
         'untyped'
       else
-        Utils.module_name(object.class) || 'untyped'
+        module_name(object.class) || 'untyped'
       end
     end
 

data/lib/orthoses/version.rb

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

data/sig/orthoses/content/header_builder.rbs

@@ -7,6 +7,7 @@ class Orthoses::Content::HeaderBuilder
   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 build_context: (entry: untyped) -> untyped
   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.rbs

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: Framework for Generate RBS