orthoses 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 245f65c0f676602acf06354591c87ed0d5ed7cd39b997a4db2736004da99476f
-  data.tar.gz: b8f5ec5da61b79d5cc1994f94cd71c6e9da1b36679dd8aef3f6d7c5fcd88bf46
+  metadata.gz: f3191a7b9ea732c52cbdcab6eb33dbee32226ddf1925fb4544bfb007f7a8d89a
+  data.tar.gz: 20194fdf983090f7aa1e1bb45931679d0297ac7c4b322022fdf3734c626012bb
 SHA512:
-  metadata.gz: 9278d20b972e610772ca19fa849ea147564b49bacf5d0bd81854fe636be99eb2061482569b88370588424f4d3e6059ccb2530c896f8ce9bf921acfd675771153
-  data.tar.gz: 4c271a0f6a3105fe3bb9813c392d47965cb709e2c86e38db6cc9cc3be54a009210a0cdef693a3c6b6ad441b2da5546e7c4a2284d2a0a2fb8c2aee47ffb6373a3
+  metadata.gz: e88b8032acd8a05caa7061b115c443d0128285919573ecd511cb180f2f3ae7099887095135597512106536f005a5a7e633b6a8fa66ce5b99f91e46820b7fe3b8
+  data.tar.gz: 5ea08ec94757c04b17658eee9aef976cd40f5dbc7174e3f30e399e053caa2c3f5f44db6ade7a079d13a86c3b7e9c9345a7d139ac627656ec27a9cd6b5bc17937

data/README.md

@@ -189,11 +189,6 @@ If it is unknown whether it is a class or a module, it is defined as an empty mo
 You can specify that the specified RBS should not be intentionally generated.
 This is useful when you want to exclude handwritten RBS.
 
-### Orthoses::ResolveTypeNames
-
-Call `RBS::Environment#resolve_type_names` and output.
-Using this middleware improves the efficiency of loading files after they are generated.
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/orthoses/content/header_builder.rb

@@ -29,7 +29,7 @@ module Orthoses
 
       def build_module(entry:, name_hint: nil)
         primary = entry.primary
-        full_name = name_hint || resolve_full_name(entry: primary).relative!
+        full_name = name_hint || resolve_full_name(entry: primary)
 
         self_types =
           if primary.decl.self_types.empty?
@@ -43,7 +43,7 @@ module Orthoses
 
       def build_class(entry:, name_hint: nil)
         primary = entry.primary
-        full_name = name_hint || resolve_full_name(entry: primary).relative!
+        full_name = name_hint || resolve_full_name(entry: primary)
 
         "class #{name_and_params(full_name, primary.decl.type_params)}#{build_super_class(primary)}"
       end
@@ -66,7 +66,7 @@ module Orthoses
       end
 
       def build_interface(entry:, name_hint: nil)
-        full_name = name_hint || resolve_full_name(entry: entry).relative!
+        full_name = name_hint || resolve_full_name(entry: entry)
         "interface #{name_and_params(full_name, entry.decl.type_params)}"
       end
 

data/lib/orthoses/create_file_by_name.rb

@@ -55,6 +55,10 @@ module Orthoses
         file_path = Pathname("#{@to}/#{group_name.split('::').map(&:underscore).join('/')}.rbs")
         file_path.dirname.mkpath
         file_path.open('w+') do |out|
+          if @resolve_type_names
+            out.puts "# resolve-type-names: false"
+            out.puts
+          end
           if @header
             out.puts @header
             out.puts

data/lib/orthoses/outputable/resolve_type_names.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+module Orthoses
+  module Outputable
+    class ResolveTypeNames
+      def initialize(loader)
+        @loader = loader
+      end
+
+      def call
+        @loader.call.tap do |store|
+          env = Utils.rbs_environment(cache: false)
+
+          signatures = store.map do |name, content|
+            buffer = RBS::Buffer.new(content: content.to_rbs, name: "orthoses-resolve_type_names-#{name.downcase}.rbs")
+            decls = [content.to_decl]
+
+            # Add as known types
+            env.add_signature(buffer: buffer, directives: [], decls: decls)
+
+            # Will resolve names
+            [buffer, [[], decls]]
+          end.to_h
+
+          # Reduce resolving names
+          env.signatures.replace(signatures)
+          env = env.resolve_type_names
+
+          store.each do |name, content|
+            out = StringIO.new
+            writer = RBS::Writer.new(out: out)
+            type_name = RBS::TypeName.parse(content.name).absolute!
+            entry, members = entry_and_members(env, type_name)
+            content.header = content_header(entry)
+            members.each do |member|
+              writer.write_member(member)
+            end
+            content.body.replace(out.string.lines)
+          end
+        end
+      end
+
+      private
+
+      def entry_and_members(env, type_name)
+        if type_name.class?
+          env.class_decls[type_name]&.then do |entry|
+            [entry, entry.decls.flat_map { |decl| decl.decl.members }]
+          end
+        elsif type_name.interface?
+          env.interface_decls[type_name]&.then do |entry|
+            [entry, [entry.decl.members]]
+          end
+        end.then do |entry, members|
+          unless entry
+            Orthoses.logger.warn "No entry for #{type_name}"
+            return
+          end
+          [entry, members]
+        end
+      end
+
+      def content_header(entry)
+        case entry
+        when RBS::Environment::ClassEntry
+          class_header(entry.primary.decl)
+        when RBS::Environment::ModuleEntry
+          module_header(entry.primary.decl)
+        when RBS::Environment::InterfaceEntry
+          interface_header(entry.decl)
+        else
+          raise "unexpected entry: #{entry}"
+        end
+      end
+
+      def class_header(decl)
+        super_class = if super_class = decl.super_class
+          " < #{name_and_args(super_class.name, super_class.args)}"
+        end
+        "class #{name_and_params(decl.name, decl.type_params)}#{super_class}"
+      end
+
+      def module_header(decl)
+        self_type = unless decl.self_types.empty?
+          " : #{decl.self_types.join(", ")}"
+        end
+        "module #{name_and_params(decl.name, decl.type_params)}#{self_type}"
+      end
+
+      def interface_header(decl)
+        "interface #{name_and_params(decl.name, decl.type_params)}"
+      end
+
+      module WriterCopy
+        def name_and_args(name, args)
+          if name && args
+            if args.empty?
+              "#{name}"
+            else
+              "#{name}[#{args.join(", ")}]"
+            end
+          end
+        end
+
+        def name_and_params(name, params)
+          if params.empty?
+            "#{name}"
+          else
+            ps = params.each.map do |param|
+              param.to_s
+            end
+
+            "#{name}[#{ps.join(", ")}]"
+          end
+        end
+      end
+      include WriterCopy
+    end
+  end
+end

data/lib/orthoses/outputable.rb

@@ -15,10 +15,18 @@ module Orthoses
   #     def call
   #       ...
   module Outputable
+    autoload :ResolveTypeNames, 'orthoses/outputable/resolve_type_names'
+
+    def initialize(loader, resolve_type_names: false, **)
+      @resolve_type_names = resolve_type_names
+      super(loader, **)
+    end
+
     def call
       @loader = AvoidRecursiveAncestorError.new(@loader)
       @loader = ConstantizableFilter.new(@loader)
       @loader = UniqContentBody.new(@loader)
+      @loader = ResolveTypeNames.new(@loader) if @resolve_type_names
       super
     end
   end

data/lib/orthoses/version.rb

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

data/lib/orthoses.rb

@@ -28,7 +28,6 @@ module Orthoses
   autoload :PP, 'orthoses/pp'
   autoload :RBSPrototypeRB, 'orthoses/rbs_prototype_rb'
   autoload :RBSPrototypeRuntime, 'orthoses/rbs_prototype_runtime'
-  autoload :ResolveTypeNames, 'orthoses/resolve_type_names'
   autoload :Sort, 'orthoses/sort'
   autoload :Store, 'orthoses/store'
   autoload :Tap, 'orthoses/tap'

data/sig/orthoses/_call.rbs

@@ -1,5 +1,5 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
-interface Orthoses::_Call
+interface ::Orthoses::_Call
   def call: () -> Orthoses::store
 end

data/sig/orthoses/_middle_ware.rbs

@@ -1,5 +1,5 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
-interface Orthoses::_MiddleWare
+interface ::Orthoses::_MiddleWare
   include Orthoses::_Call
 end

data/sig/orthoses/outputable.rbs

@@ -1,8 +1,12 @@
 # THIS IS GENERATED CODE from `$ rake sig`
 
 module Orthoses::Outputable
+  @resolve_type_names: untyped
+
   @loader: untyped
 
+  def initialize: (untyped loader, ?resolve_type_names: bool, **untyped) -> void
+
   def call: () -> untyped
 end
 
@@ -23,6 +27,23 @@ class Orthoses::Outputable::ConstantizableFilter
   def call: () -> untyped
 end
 
+class Orthoses::Outputable::ResolveTypeNames
+  @loader: untyped
+  def initialize: (untyped loader) -> void
+  def call: () -> untyped
+  private def entry_and_members: (untyped env, untyped type_name) -> untyped
+  private def content_header: (untyped entry) -> untyped
+  private def class_header: (untyped decl) -> ::String
+  private def module_header: (untyped decl) -> ::String
+  private def interface_header: (untyped decl) -> ::String
+end
+
+module Orthoses::Outputable::ResolveTypeNames::WriterCopy
+  def name_and_args: (untyped name, untyped args) -> (::String | nil)
+
+  def name_and_params: (untyped name, untyped params) -> ::String
+end
+
 # UniqContentBody is an internal middleware
 # It's using on orthoses/outputable.rb
 class Orthoses::Outputable::UniqContentBody

data/sig/orthoses/rbs_prototype_runtime.rbs

@@ -5,16 +5,16 @@
 #       patterns: ['Foo::*']
 class Orthoses::RBSPrototypeRuntime
   @loader: Orthoses::_Call
-  @patterns: Array[_ToS & Object | _Call & Object]?
+  @patterns: Array[(_ToS & Object) | (_Call & Object)]?
   @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 & Object | _Call & Object]?, ?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 initialize: (Orthoses::_Call loader, ?patterns: Array[(_ToS & Object) | (_Call & Object)]?, ?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
 
-interface Orthoses::RBSPrototypeRuntime::_Call
+interface ::Orthoses::RBSPrototypeRuntime::_Call
   def call: () -> (Array[String] | String)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - ksss
 bindir: exe
 cert_chain: []
-date: 2025-03-08 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -58,12 +58,12 @@ files:
 - lib/orthoses/outputable.rb
 - lib/orthoses/outputable/avoid_recursive_ancestor_error.rb
 - lib/orthoses/outputable/constantizable_filter.rb
+- lib/orthoses/outputable/resolve_type_names.rb
 - lib/orthoses/outputable/uniq_content_body.rb
 - lib/orthoses/path_helper.rb
 - lib/orthoses/pp.rb
 - lib/orthoses/rbs_prototype_rb.rb
 - lib/orthoses/rbs_prototype_runtime.rb
-- lib/orthoses/resolve_type_names.rb
 - lib/orthoses/shims.rb
 - lib/orthoses/sort.rb
 - lib/orthoses/store.rb
@@ -104,7 +104,6 @@ files:
 - sig/orthoses/pp.rbs
 - sig/orthoses/rbs_prototype_rb.rbs
 - sig/orthoses/rbs_prototype_runtime.rbs
-- sig/orthoses/resolve_type_names.rbs
 - sig/orthoses/sort.rbs
 - sig/orthoses/store.rbs
 - sig/orthoses/tap.rbs
@@ -125,14 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Framework for Generate RBS
 test_files: []

data/lib/orthoses/resolve_type_names.rb

@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-module Orthoses
-  # use Orthoses::ResolveTypeNames
-  class ResolveTypeNames
-    def initialize(loader)
-      @loader = loader
-    end
-
-    def call
-      @loader.call.tap do |store|
-        env = Utils.rbs_environment(cache: false)
-
-        signatures = store.map do |name, content|
-          buffer = RBS::Buffer.new(content: content.to_rbs, name: "orthoses-resolve_type_names-#{name.downcase}.rbs")
-          decls = [content.to_decl]
-
-          # Add as known types
-          env.add_signature(buffer: buffer, directives: [], decls: decls)
-
-          # Will resolve names
-          [buffer, [[], decls]]
-        end.to_h
-
-        # Reduce resolving names
-        env.signatures.replace(signatures)
-        env = env.resolve_type_names
-
-        store.each do |name, content|
-          out = StringIO.new
-          writer = RBS::Writer.new(out: out)
-          type_name = RBS::TypeName.parse(content.name).absolute!
-          entry = env.class_decls[type_name] || raise
-          content.header = content_header(entry)
-          entry.decls.each do |decl|
-            decl.decl.members.each do |member|
-              writer.write_member(member)
-            end
-          end
-          content.body.replace(out.string.lines)
-        end
-      end
-    end
-
-    private
-
-    def content_header(entry)
-      case primary_decl = entry.primary.decl
-      when RBS::AST::Declarations::Class
-        class_header(primary_decl)
-      when RBS::AST::Declarations::Module
-        module_header(primary_decl)
-      else
-        raise "unexpected decl: #{primary_decl.class}"
-      end
-    end
-
-    def class_header(decl)
-      super_class = if super_class = decl.super_class
-        " < #{name_and_args(super_class.name, super_class.args)}"
-      end
-      "class #{name_and_params(decl.name, decl.type_params)}#{super_class}"
-    end
-
-    def module_header(decl)
-      self_type = unless decl.self_types.empty?
-        " : #{decl.self_types.join(", ")}"
-      end
-      "module #{name_and_params(decl.name, decl.type_params)}#{self_type}"
-    end
-
-    module WriterCopy
-      def name_and_args(name, args)
-        if name && args
-          if args.empty?
-            "#{name}"
-          else
-            "#{name}[#{args.join(", ")}]"
-          end
-        end
-      end
-
-      def name_and_params(name, params)
-        if params.empty?
-          "#{name}"
-        else
-          ps = params.each.map do |param|
-            param.to_s
-          end
-
-          "#{name}[#{ps.join(", ")}]"
-        end
-      end
-    end
-    include WriterCopy
-  end
-end

data/sig/orthoses/resolve_type_names.rbs

@@ -1,17 +0,0 @@
-# THIS IS GENERATED CODE from `$ rake sig`
-
-# use Orthoses::ResolveTypeNames
-class Orthoses::ResolveTypeNames
-  @loader: untyped
-  def initialize: (untyped loader) -> void
-  def call: () -> untyped
-  private def content_header: (untyped entry) -> untyped
-  private def class_header: (untyped decl) -> ::String
-  private def module_header: (untyped decl) -> ::String
-end
-
-module Orthoses::ResolveTypeNames::WriterCopy
-  def name_and_args: (untyped name, untyped args) -> (::String | nil)
-
-  def name_and_params: (untyped name, untyped params) -> ::String
-end